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

Proposed by Nate Muench (Mink)
Status: Rejected
Rejected by: James Page
Proposed branch: lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1
Merge into: lp:ubuntu/precise/open-vm-tools
Diff against target: 84320 lines (+20936/-47724)
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 (+75/-0)
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-merge1
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Review via email: mp+88968@code.launchpad.net

Description of the change

I think I did this merge the right way this time.

I felt it was time to sync with Debian again (since they're doing unstable releases again), so I did. I kept as much as our additions to the packaging as possible.

A few notable things from this branch (I tried to be as accurate as possible in my changelog):
- The October & November merges from Debian are not included
  * October because the changes there were added previously (in the 2011.03.28-387002-0ubuntu4 merge in Oneiric).
  * November because we don't have the procps version they have, isn't in the Precise repos yet. I'll add it when it does.
- I removed the stable numbering from the version (the 2:8.8.0+ part)
  * It was to lessen the headache of the sync
- Precise has a newer version of glib (and debian has a older version in unstable). So I had to add a CFLAG so every thing would compile correctly
- In open-vm-tools.init, I added modprobe [-r] vmxnet
  * vmxnet wasn't properly loaded
- Also in open-vm-tools.init, I added modprobe [-r] pcnet32, to be run before and after the vmxnet module is loaded
  * After reboot, pcnet32 was still being used (even if vmxnet was loaded). If vmxnet were to have a compile failure, we would still have network connectivity (because pcnet32 is reloaded).

If there are any issues with this packaging, we still have time to make necessary fixes before Precise is released. This merge is just so we have kernel modules that compile successfully. I can confirm that everything that needs to work, is working.

I'm planning on doing monthly uploads of open-vm-tools (waiting on Debian, and testing the packaging before I upload it) until the Feature Freeze. I was planning on doing this during the Oneiric cycle, but issues with GCC prevented it.

The urgency for this is high because of the significant amount of bug reports being filed saying the modules aren't building.

My prep branch:
https://code.launchpad.net/~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge-prep1

My blueprint (I though it might be good idea to create one):
https://blueprints.launchpad.net/ubuntu/+spec/open-vm-tools-precise.sid-merge

My Virtual Test repo (which has this packaging built, and ready for installation):
https://launchpad.net/~n-muench/+archive/virtual-test/+packages

This is the same as the last attempted merge, but this time I did the diff (of the old and new debian folders, sans the changelog) correctly.

To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

Hi Nate

Thanks for preparing this MP; I've reviewed and it looks good.

I only have one comment which is about the package version number; I don't think this is technically a merge as you are really re-syncing the package changes and not including the Debian upstream changelog entries inbetween ubuntu changelog entries so I think the use of -1ubuntu1 is a little misleading and inconsistent with early re-syncs of the packaging.

Please could you update to use a 0ubuntu1 package version.

Thanks

James

review: Needs Fixing
Revision history for this message
Serge Hallyn (serge-hallyn) wrote :

Looking at the diffs between sid and your proposal, and between precise and your proposal, it looks good, thanks. Just two comments:

1. Please keep the changelog entries from unstable from between the current precise up to the latest unstable version, in the new changelog.

2. I'm curious why debian doesn't pass -Xusr/sbin/vmware-user-suid-wrapper to dh_fixperms. It seems right that we do. Is there a reason why they don't need to, or would it be appropriate to file a bug against the debian package to add it?

thanks again.

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

I haven't really done a full Debian merge before (but I'm learning).

But I have 2 clarifications:

1a) Do you want all the missing unstable changelog entries including the 2 missing ones (from the already merged change & and the one we can't merge (because procps in Precise doesn't allow us to use use the addition from the November merge).

1b) Do you wanted sorted by date? If so, then Colin's merge be in between the October and November uploads.

2) Do you want me to maintain Debian's versioning? I drop it basically for consistency for what we have.

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

I've updated my Prep branch (https://code.launchpad.net/~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge-prep1). I included the Ubuntu changelog entries (and the 2 missing entries from Debian), sorted by time stamp.

Should simplify the creation of the diff for merging the 2 changelogs (well, unless I screw it up again (I'll try not to), like last time).

Unmerged revisions

27. By Nate Muench (Mink)

* Sync with Debian unstable. Fixes building on Precise
  (LP: #898289, LP: #905612)
* Items merged from Debian unstable:
  - debian/control:
    + open-vm-tools recommends open-vm-dkms. (LP: #598933)
    + open-vm-tools now suggests open-vm-toolbox. (LP: #604998)
  (From 2011.08.21-471295-1 release)
  - Updating maintainer and uploaders fields.
  - Removing vcs fields.
  - Removing references to Daniel's old email address.
  - Updating years in copyright file.
  - Updating to standards version 3.9.2.
  - Updating to debhelper version 8.
  - Switching to source format 3.0 (quilt).
  - Removing manual chrpath setting.
  - Removing exclusion from plugins from debhelper shlibs.
  - Rediffing kvers.patch.
  (From 2011.09.23-491607-1 release)
  - Marking binary architecture-dependend packages as linux and kfreebsd
  only.
  - Removing liburiparser-dev from build-depends as upstream dropped
  unity support.
  - Building with libproc-dev on amd64 again.
  - Dropping disabling of dnet support.
  (From 2011.09.23-491607-2 release)
  - Adding doxygen to build-depends for api documentation.
  - Adding libcunit1-dev to build-depends for test suites.
  - Minimizing rules file.
  - Adding open-vm-tools-dev package, containing only the api
    documentation for now.
  (From 2011.09.23-491607-3 release)
  - Sorting overrides in rules alphabetically.
  - Compacting copyright file.
  - Adding udev rule to set timeout for vmware scsi devices
  (From 2011.12.20-562307-1 release)
  - Adding patch to correct typo in upstreams dkms configuration
* Remaining Changes:
  - Remove Stable part of version numbering.
  - debian folder:
    + Re-added open-vm-dkms.postinst & open-vm-dkms.prerm.
      * Allows dkms modules to compile upon installation.
  - debian/control:
    + Re-add open-vm-source and make into a transitional package
      for open-vm-toolbox.
    + Return dependancies that were moved to open-vm-tools back to
      open-vm-toolbox.
  - debian/rules and debian/open-vm-toolbox.lintian-overrides:
    + Make vmware-user-suid-wrapper suid-root
  - debian/rules:
    + Added CFLAGS field with -Wno-deprecated-declarations
      * Will suppress issues with glib 2.31 or later.
    + Add line to copy vmware-xdg-detect-de into place.
    + Install vmware-user.desktop through toolbox package.
  - debian/open-vm-tools.init:
    + Re-add 'modprobe [-r] vmblock'.
    + Add 'modprobe [-r] vmxnet'.
      * Incase it's not loaded during boot.
    + Remove and re-add pcnet32 module
      * Will be done before (remove) and after (readd) vmxnet module
        is added.
      * If vmxnet doesn't exist (aka modules fail to build), pcnet32 can be
        still used for network connectivity.
      * Workaround until a better fix can be done.
  - Re-add gnome-session to debian/local/xautostart.conf
  - Manpages removed (from debian/manpages):
    + vmmemctl.9
    + vmxnet3.9
    + Remove references to manpages that have been removed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2011-07-22 16:41:03 +0000
+++ ChangeLog 2012-01-18 00:02:26 +0000
@@ -1,3 +1,28 @@
12011.12.20 Marcelo Vanzin <mvanzin@vmware.com>
2 This release tag contains commits up to the following id:
3 dfca5cf9d1c2335c5d001deedd9266c84956b508
4
5
62011.11.20 Marcelo Vanzin <mvanzin@vmware.com>
7 This release tag contains commits up to the following id:
8 6c197b8e5eccf32bfee0e2452d8926968182aada
9
10
112011.10.26 Marcelo Vanzin <mvanzin@vmware.com>
12 This release tag contains commits up to the following id:
13 6271fde90248a4fd49e38aa61498db9e1dbf37c3
14
15
162011.09.23 Marcelo Vanzin <mvanzin@vmware.com>
17 This release tag contains commits up to the following id:
18 05baddbed1c5e47e9789a44d30bb217d7184232a
19
20
212011.08.21 Marcelo Vanzin <mvanzin@vmware.com>
22 This release tag contains commits up to the following id:
23 2b3d76ba776f55d06fb5b62499b189ebd6bc1c75
24
25
12011.07.19 Marcelo Vanzin <mvanzin@vmware.com>262011.07.19 Marcelo Vanzin <mvanzin@vmware.com>
2 This release tag contains commits up to the following id:27 This release tag contains commits up to the following id:
3 5bed6f1369ca6e9c2c7fbaf4205d86e50f219c5f28 5bed6f1369ca6e9c2c7fbaf4205d86e50f219c5f
429
=== modified file 'Makefile.in'
--- Makefile.in 2011-07-22 16:41:03 +0000
+++ Makefile.in 2012-01-18 00:02:26 +0000
@@ -170,8 +170,6 @@
170FGREP = @FGREP@170FGREP = @FGREP@
171FUSE_CPPFLAGS = @FUSE_CPPFLAGS@171FUSE_CPPFLAGS = @FUSE_CPPFLAGS@
172FUSE_LIBS = @FUSE_LIBS@172FUSE_LIBS = @FUSE_LIBS@
173GIO_CPPFLAGS = @GIO_CPPFLAGS@
174GIO_LIBS = @GIO_LIBS@
175GLIB2_CPPFLAGS = @GLIB2_CPPFLAGS@173GLIB2_CPPFLAGS = @GLIB2_CPPFLAGS@
176GLIB2_LIBS = @GLIB2_LIBS@174GLIB2_LIBS = @GLIB2_LIBS@
177GMODULE_CPPFLAGS = @GMODULE_CPPFLAGS@175GMODULE_CPPFLAGS = @GMODULE_CPPFLAGS@
@@ -200,8 +198,6 @@
200LD = @LD@198LD = @LD@
201LDFLAGS = @LDFLAGS@199LDFLAGS = @LDFLAGS@
202LIBOBJS = @LIBOBJS@200LIBOBJS = @LIBOBJS@
203LIBPNG_CPPFLAGS = @LIBPNG_CPPFLAGS@
204LIBPNG_LIBS = @LIBPNG_LIBS@
205LIBS = @LIBS@201LIBS = @LIBS@
206LIBTOOL = @LIBTOOL@202LIBTOOL = @LIBTOOL@
207LIBVMTOOLS_LIBADD = @LIBVMTOOLS_LIBADD@203LIBVMTOOLS_LIBADD = @LIBVMTOOLS_LIBADD@
@@ -252,8 +248,6 @@
252TARGET_OS = @TARGET_OS@248TARGET_OS = @TARGET_OS@
253TEST_PLUGIN_INSTALLDIR = @TEST_PLUGIN_INSTALLDIR@249TEST_PLUGIN_INSTALLDIR = @TEST_PLUGIN_INSTALLDIR@
254TOOLS_VERSION = @TOOLS_VERSION@250TOOLS_VERSION = @TOOLS_VERSION@
255URIPARSER_CPPFLAGS = @URIPARSER_CPPFLAGS@
256URIPARSER_LIBS = @URIPARSER_LIBS@
257VERSION = @VERSION@251VERSION = @VERSION@
258VIX_LIBADD = @VIX_LIBADD@252VIX_LIBADD = @VIX_LIBADD@
259VMSVC_PLUGIN_INSTALLDIR = @VMSVC_PLUGIN_INSTALLDIR@253VMSVC_PLUGIN_INSTALLDIR = @VMSVC_PLUGIN_INSTALLDIR@
@@ -268,8 +262,6 @@
268X_EXTRA_LIBS = @X_EXTRA_LIBS@262X_EXTRA_LIBS = @X_EXTRA_LIBS@
269X_LIBS = @X_LIBS@263X_LIBS = @X_LIBS@
270X_PRE_LIBS = @X_PRE_LIBS@264X_PRE_LIBS = @X_PRE_LIBS@
271ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
272ZLIB_LIBS = @ZLIB_LIBS@
273abs_builddir = @abs_builddir@265abs_builddir = @abs_builddir@
274abs_srcdir = @abs_srcdir@266abs_srcdir = @abs_srcdir@
275abs_top_builddir = @abs_top_builddir@267abs_top_builddir = @abs_top_builddir@
276268
=== modified file 'NEWS'
--- NEWS 2011-07-22 16:41:03 +0000
+++ NEWS 2012-01-18 00:02:26 +0000
@@ -1,3 +1,46 @@
1open-vm-tools 2011.12.20 changes:
2 * Updates for new Linux kernel releases, including some fixes for
3 Fedora's re-versioned 3.x kernels.
4
5 * VMCI sockets has some changes for a new socket type, targeted
6 at replacing the "backdoor" communication used by the tools services.
7
8 * HGFS has better session support.
9
10 * Miscelaneous bug fixes and small enhancements in other parts
11 of the code.
12
13open-vm-tools 2011.11.20 changes:
14 * Updates for new Linux kernel releases.
15
16 * Better Unity and DnD compatibility with newer Linux distros.
17
18 * Other minor fixes and cleanups.
19
20open-vm-tools 2011.10.26 changes:
21 * Mostly cleanups and bug fixes.
22
23 * Code can now compile with uClibc, with some caveats.
24
25open-vm-tools 2011.09.23 changes:
26 * open-vm-tools now can use the built in Linux freeze / thaw
27 support for block devices, making the vmsync driver unnecessary
28 in kernels supporting that feature.
29
30 * The VMCI driver has been simplified, removing VM-to-VM
31 communication support (which is being removed from VMware products).
32
33 * The Unity team decided to remove the Unity plugin from open-vm-tools,
34 given its partial brokenness due to reliance on internally-modified
35 version of GNOME libraries, among other reasons.
36
37 * Other bug fixes and code cleanup.
38
39open-vm-tools 2011.08.21 changes:
40 * Enabled several VIX APIs on FreeBSD.
41
42 * Minor bug fixes and code cleanup.
43
1open-vm-tools 2011.07.19 changes:44open-vm-tools 2011.07.19 changes:
2 * Fix an issue in the HGFS driver that could lead to a kernel45 * Fix an issue in the HGFS driver that could lead to a kernel
3 panic.46 panic.
447
=== modified file 'autom4te.cache/output.0'
--- autom4te.cache/output.0 2011-07-22 16:41:03 +0000
+++ autom4te.cache/output.0 2012-01-18 00:02:26 +0000
@@ -1,6 +1,6 @@
1@%:@! /bin/sh1@%:@! /bin/sh
2@%:@ Guess values for system-dependent variables and create Makefiles.2@%:@ Guess values for system-dependent variables and create Makefiles.
3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.12.20.
4@%:@4@%:@
5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
6@%:@ 6@%:@
@@ -701,8 +701,8 @@
701# Identity of this package.701# Identity of this package.
702PACKAGE_NAME='open-vm-tools'702PACKAGE_NAME='open-vm-tools'
703PACKAGE_TARNAME='open-vm-tools'703PACKAGE_TARNAME='open-vm-tools'
704PACKAGE_VERSION='2011.07.19'704PACKAGE_VERSION='2011.12.20'
705PACKAGE_STRING='open-vm-tools 2011.07.19'705PACKAGE_STRING='open-vm-tools 2011.12.20'
706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
707PACKAGE_URL=''707PACKAGE_URL=''
708708
@@ -777,6 +777,8 @@
777TARGET_OS777TARGET_OS
778TOOLS_VERSION778TOOLS_VERSION
779HGFS_LIBS779HGFS_LIBS
780USE_PRINTF_WRAPPERS_FALSE
781USE_PRINTF_WRAPPERS_TRUE
780USE_SLASH_PROC_FALSE782USE_SLASH_PROC_FALSE
781USE_SLASH_PROC_TRUE783USE_SLASH_PROC_TRUE
782HAVE_PAM_FALSE784HAVE_PAM_FALSE
@@ -795,8 +797,6 @@
795WITH_ROOT_PRIVILEGES_TRUE797WITH_ROOT_PRIVILEGES_TRUE
796ENABLE_TESTS_FALSE798ENABLE_TESTS_FALSE
797ENABLE_TESTS_TRUE799ENABLE_TESTS_TRUE
798ENABLE_UNITY_FALSE
799ENABLE_UNITY_TRUE
800HAVE_XCOMPOSITE_FALSE800HAVE_XCOMPOSITE_FALSE
801HAVE_XCOMPOSITE_TRUE801HAVE_XCOMPOSITE_TRUE
802HAVE_XSM_FALSE802HAVE_XSM_FALSE
@@ -836,14 +836,6 @@
836GTKMM_CPPFLAGS836GTKMM_CPPFLAGS
837GTK_LIBS837GTK_LIBS
838GTK_CPPFLAGS838GTK_CPPFLAGS
839GIO_LIBS
840GIO_CPPFLAGS
841ZLIB_LIBS
842ZLIB_CPPFLAGS
843LIBPNG_LIBS
844LIBPNG_CPPFLAGS
845URIPARSER_LIBS
846URIPARSER_CPPFLAGS
847CUNIT_LIBS839CUNIT_LIBS
848CUNIT_CPPFLAGS840CUNIT_CPPFLAGS
849PAM_LIBS841PAM_LIBS
@@ -986,7 +978,6 @@
986with_kernel_release978with_kernel_release
987with_linuxdir979with_linuxdir
988enable_multimon980enable_multimon
989enable_unity
990with_gtk2981with_gtk2
991with_gtkmm982with_gtkmm
992enable_docs983enable_docs
@@ -1561,7 +1552,7 @@
1561 # Omit some internal or obsolete options to make the list less imposing.1552 # Omit some internal or obsolete options to make the list less imposing.
1562 # This message is too long to be a string in the A/UX 3.1 sh.1553 # This message is too long to be a string in the A/UX 3.1 sh.
1563 cat <<_ACEOF1554 cat <<_ACEOF
1564\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.1555\`configure' configures open-vm-tools 2011.12.20 to adapt to many kinds of systems.
15651556
1566Usage: $0 [OPTION]... [VAR=VALUE]...1557Usage: $0 [OPTION]... [VAR=VALUE]...
15671558
@@ -1635,7 +1626,7 @@
16351626
1636if test -n "$ac_init_help"; then1627if test -n "$ac_init_help"; then
1637 case $ac_init_help in1628 case $ac_init_help in
1638 short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;1629 short | recursive ) echo "Configuration of open-vm-tools 2011.12.20:";;
1639 esac1630 esac
1640 cat <<\_ACEOF1631 cat <<\_ACEOF
16411632
@@ -1644,7 +1635,6 @@
1644 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)1635 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1645 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]1636 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1646 --disable-multimon disables multimon, enabled by default1637 --disable-multimon disables multimon, enabled by default
1647 --disable-unity disables Unity, enabled by default
1648 --disable-docs disables generation of API documentation; by1638 --disable-docs disables generation of API documentation; by
1649 default, docs are built if doxygen is available.1639 default, docs are built if doxygen is available.
1650 --disable-tests disable compilation of test code.1640 --disable-tests disable compilation of test code.
@@ -1762,7 +1752,7 @@
1762test -n "$ac_init_help" && exit $ac_status1752test -n "$ac_init_help" && exit $ac_status
1763if $ac_init_version; then1753if $ac_init_version; then
1764 cat <<\_ACEOF1754 cat <<\_ACEOF
1765open-vm-tools configure 2011.07.191755open-vm-tools configure 2011.12.20
1766generated by GNU Autoconf 2.671756generated by GNU Autoconf 2.67
17671757
1768Copyright (C) 2010 Free Software Foundation, Inc.1758Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2454,7 +2444,7 @@
2454This file contains any messages produced by compilers while2444This file contains any messages produced by compilers while
2455running configure, to aid debugging if configure makes a mistake.2445running configure, to aid debugging if configure makes a mistake.
24562446
2457It was created by open-vm-tools $as_me 2011.07.19, which was2447It was created by open-vm-tools $as_me 2011.12.20, which was
2458generated by GNU Autoconf 2.67. Invocation command line was2448generated by GNU Autoconf 2.67. Invocation command line was
24592449
2460 $ $0 $@2450 $ $0 $@
@@ -3044,14 +3034,6 @@
3044fi3034fi
30453035
30463036
3047@%:@ Check whether --enable-unity was given.
3048if test "${enable_unity+set}" = set; then :
3049 enableval=$enable_unity; enable_unity="$enableval"
3050else
3051 enable_unity="yes"
3052fi
3053
3054
30553037
3056@%:@ Check whether --with-gtk2 was given.3038@%:@ Check whether --with-gtk2 was given.
3057if test "${with_gtk2+set}" = set; then :3039if test "${with_gtk2+set}" = set; then :
@@ -3086,11 +3068,6 @@
3086fi3068fi
30873069
30883070
3089# If we're not going to use Gtk 2.0, disable Unity.
3090if test "$with_gtk2" != "yes"; then
3091 enable_unity="no"
3092fi
3093
3094am__api_version='1.11'3071am__api_version='1.11'
30953072
3096# Find a good install program. We prefer a C program (faster),3073# Find a good install program. We prefer a C program (faster),
@@ -3529,7 +3506,7 @@
35293506
3530# Define the identity of the package.3507# Define the identity of the package.
3531 PACKAGE='open-vm-tools'3508 PACKAGE='open-vm-tools'
3532 VERSION='2011.07.19'3509 VERSION='2011.12.20'
35333510
35343511
3535cat >>confdefs.h <<_ACEOF3512cat >>confdefs.h <<_ACEOF
@@ -17819,8 +17796,7 @@
17819#17796#
17820# Check for PAM.17797# Check for PAM.
17821#17798#
17822if test "$os" = "linux"; then17799
17823
17824@%:@ Check whether --with-pam was given.17800@%:@ Check whether --with-pam was given.
17825if test "${with_pam+set}" = set; then :17801if test "${with_pam+set}" = set; then :
17826 withval=$with_pam; 17802 withval=$with_pam;
@@ -17829,8 +17805,8 @@
17829fi17805fi
1783017806
1783117807
17832 if test "$with_pam" = "yes"; then17808if test "$with_pam" = "yes"; then
17833 17809
17834 if test -z "$CUSTOM_PAM_CPPFLAGS"; then17810 if test -z "$CUSTOM_PAM_CPPFLAGS"; then
17835 if test "$os" = freebsd; then17811 if test "$os" = freebsd; then
17836 CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"17812 CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"
@@ -17842,7 +17818,7 @@
17842 fi17818 fi
17843 fi17819 fi
1784417820
17845 17821
17846 17822
17847 if test -z "pam"; then17823 if test -z "pam"; then
17848 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 17824 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
@@ -18054,7 +18030,6 @@
1805418030
18055 fi18031 fi
1805618032
18057 fi
18058fi18033fi
1805918034
18060#18035#
@@ -18298,7 +18273,6 @@
18298# If the user explicitly disables X11, then don't try to detect the X-related libraries18273# If the user explicitly disables X11, then don't try to detect the X-related libraries
18299if test "$have_x" = "disabled"; then18274if test "$have_x" = "disabled"; then
18300 enable_multimon="no"18275 enable_multimon="no"
18301 enable_unity="no"
18302elif test "$have_x" != "yes"; then18276elif test "$have_x" != "yes"; then
18303 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 18277 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
18304else18278else
@@ -18402,12 +18376,6 @@
18402 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 18376 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
18403fi18377fi
1840418378
18405 else
18406 if test "$enable_unity" != "no"; then
18407 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Unity due to --disable-multimon." >&5
18408$as_echo "$as_me: WARNING: Disabling Unity due to --disable-multimon." >&2;}
18409 enable_unity="no"
18410 fi
18411 fi18379 fi
1841218380
18413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&518381 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&5
@@ -18704,939 +18672,6 @@
18704 have_xcomposite="yes"18672 have_xcomposite="yes"
18705 fi18673 fi
1870618674
18707 # If we're building with support for Unity, we'll need a few additional
18708 # libraries.
18709 if test "$enable_unity" != "no"; then
18710 # Unity needs the X11 Screen Saver extension library. It should be
18711 # in the same place as the X11 libraries, so no need for any fancy
18712 # path checking.
18713
18714 have_header=1
18715 if test -n "X11/extensions/scrnsaver.h"; then
18716 ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "$ac_includes_default"
18717if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = x""yes; then :
18718
18719else
18720
18721 have_header=0;
18722 as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
18723
18724fi
18725
18726
18727 fi
18728
18729 if test $have_header = 1; then
18730 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryExtension in -lXss" >&5
18731$as_echo_n "checking for XScreenSaverQueryExtension in -lXss... " >&6; }
18732if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then :
18733 $as_echo_n "(cached) " >&6
18734else
18735 ac_check_lib_save_LIBS=$LIBS
18736LIBS="-lXss $COMMON_XLIBS $LIBS"
18737cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18738/* end confdefs.h. */
18739
18740/* Override any GCC internal prototype to avoid an error.
18741 Use char because int might match the return type of a GCC
18742 builtin and then its argument prototype would still apply. */
18743#ifdef __cplusplus
18744extern "C"
18745#endif
18746char XScreenSaverQueryExtension ();
18747int
18748main ()
18749{
18750return XScreenSaverQueryExtension ();
18751 ;
18752 return 0;
18753}
18754_ACEOF
18755if ac_fn_c_try_link "$LINENO"; then :
18756 ac_cv_lib_Xss_XScreenSaverQueryExtension=yes
18757else
18758 ac_cv_lib_Xss_XScreenSaverQueryExtension=no
18759fi
18760rm -f core conftest.err conftest.$ac_objext \
18761 conftest$ac_exeext conftest.$ac_ext
18762LIBS=$ac_check_lib_save_LIBS
18763fi
18764{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverQueryExtension" >&5
18765$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryExtension" >&6; }
18766if test "x$ac_cv_lib_Xss_XScreenSaverQueryExtension" = x""yes; then :
18767 COMMON_XLIBS="-lXss $COMMON_XLIBS"
18768else
18769 as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
18770fi
18771
18772 fi
18773
18774
18775 # Check for the uriparser library and headers. The upstream uriparser
18776 # doesn't appear to ship with either a pkg-config file or a
18777 # uriparser-config binary, so we'll look for it the old-fashioned
18778 # way.
18779 #
18780 # Note that we look for uriFreeQueryListA because it's a relatively
18781 # new symbol that our code needs (it isn't present in the uriparser
18782 # that shipped with Ubuntu Hardy).
18783
18784 if test -z "$CUSTOM_URIPARSER_CPPFLAGS"; then
18785 if test "$os" = freebsd; then
18786 CUSTOM_URIPARSER_CPPFLAGS="-I/usr/local/include"
18787 else
18788 CUSTOM_URIPARSER_CPPFLAGS="-I/usr/include"
18789 fi
18790 if test -n "uriparser"; then
18791 CUSTOM_URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}/uriparser"
18792 fi
18793 fi
18794
18795
18796
18797 if test -z "uriparser"; then
18798 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
18799 fi
18800 if test -z "URIPARSER"; then
18801 as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
18802 fi
18803
18804 ac_vmw_have_lib=0
18805 ac_vmw_have_lib_func=0
18806 ac_vmw_have_lib_header=0
18807 ac_vmw_custom_libs=
18808
18809 #
18810 # First, try any user-defined CUSTOM_* flags.
18811 #
18812 if test -n "${CUSTOM_URIPARSER_CPPFLAGS}" || test -n "${CUSTOM_URIPARSER_LIBS}"; then
18813 ac_vmw_custom_libs="${CUSTOM_URIPARSER_LIBS} -luriparser"
18814 if test -n "Uri.h"; then
18815 ORIGINAL_CPPFLAGS="$CPPFLAGS"
18816 CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS} $CPPFLAGS"
18817
18818 ac_fn_c_check_header_mongrel "$LINENO" "Uri.h" "ac_cv_header_Uri_h" "$ac_includes_default"
18819if test "x$ac_cv_header_Uri_h" = x""yes; then :
18820 ac_vmw_have_lib_header=1
18821fi
18822
18823
18824
18825 CPPFLAGS="$ORIGINAL_CPPFLAGS"
18826 else
18827 ac_vmw_have_lib_header=1
18828 fi
18829
18830 # Check a specific function in the library if requested.
18831 # If it hasn't, just pick a random function from libc, just to make
18832 # sure the linker can find the library being tested.
18833 if test $ac_vmw_have_lib_header -eq 1; then
18834 if test -n "uriFreeQueryListA"; then
18835 ac_vmw_function=uriFreeQueryListA
18836 else
18837 ac_vmw_function=strlen
18838 fi
18839 as_ac_Lib=`$as_echo "ac_cv_lib_uriparser_$ac_vmw_function" | $as_tr_sh`
18840{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -luriparser" >&5
18841$as_echo_n "checking for $ac_vmw_function in -luriparser... " >&6; }
18842if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
18843 $as_echo_n "(cached) " >&6
18844else
18845 ac_check_lib_save_LIBS=$LIBS
18846LIBS="-luriparser $ac_vmw_custom_libs $LIBS"
18847cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18848/* end confdefs.h. */
18849
18850/* Override any GCC internal prototype to avoid an error.
18851 Use char because int might match the return type of a GCC
18852 builtin and then its argument prototype would still apply. */
18853#ifdef __cplusplus
18854extern "C"
18855#endif
18856char $ac_vmw_function ();
18857int
18858main ()
18859{
18860return $ac_vmw_function ();
18861 ;
18862 return 0;
18863}
18864_ACEOF
18865if ac_fn_c_try_link "$LINENO"; then :
18866 eval "$as_ac_Lib=yes"
18867else
18868 eval "$as_ac_Lib=no"
18869fi
18870rm -f core conftest.err conftest.$ac_objext \
18871 conftest$ac_exeext conftest.$ac_ext
18872LIBS=$ac_check_lib_save_LIBS
18873fi
18874eval ac_res=\$$as_ac_Lib
18875 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
18876$as_echo "$ac_res" >&6; }
18877if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
18878 ac_vmw_have_lib_func=1
18879fi
18880
18881 fi
18882
18883 if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
18884 URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}"
18885 URIPARSER_LIBS="$ac_vmw_custom_libs"
18886 ac_vmw_have_lib=1
18887 fi
18888 fi
18889
18890 # If that didn't work, try with pkg-config.
18891 if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
18892 if test -n ""; then
18893 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for >= (via pkg-config)" >&5
18894$as_echo_n "checking for >= (via pkg-config)... " >&6; }
18895 if pkg-config --exists ' >= '; then
18896 ac_vmw_have_lib=1
18897 fi
18898 else
18899 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (via pkg-config)" >&5
18900$as_echo_n "checking for (via pkg-config)... " >&6; }
18901 if pkg-config --exists ''; then
18902 ac_vmw_have_lib=1
18903 fi
18904 fi
18905
18906 if test $ac_vmw_have_lib -eq 1; then
18907 # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
18908 # fails on OpenSolaris B71. So be pessimistic.
18909 ac_vmw_cppflags="`pkg-config --cflags `"
18910 ac_vmw_ret1=$?
18911 ac_vmw_libs="`pkg-config --libs `"
18912 ac_vmw_ret2=$?
18913 if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
18914 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
18915$as_echo "yes" >&6; }
18916 URIPARSER_CPPFLAGS="$ac_vmw_cppflags"
18917 URIPARSER_LIBS="$ac_vmw_libs"
18918 else
18919 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18920$as_echo "no" >&6; }
18921 fi
18922 else
18923 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18924$as_echo "no" >&6; }
18925 fi
18926 fi
18927
18928 # If we still haven't found the lib, try with the library's custom "config" script.
18929 # Before checking, flush the AC_PATH_PROG cached variable.
18930 unset ac_cv_path_ac_vmw_lib_cfg
18931 unset ac_vmw_lib_cfg
18932 if test $ac_vmw_have_lib -eq 0 && test -n ""; then
18933 # Extract the first word of "", so it can be a program name with args.
18934set dummy ; ac_word=$2
18935{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18936$as_echo_n "checking for $ac_word... " >&6; }
18937if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
18938 $as_echo_n "(cached) " >&6
18939else
18940 case $ac_vmw_lib_cfg in
18941 [\\/]* | ?:[\\/]*)
18942 ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
18943 ;;
18944 *)
18945 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18946for as_dir in $PATH
18947do
18948 IFS=$as_save_IFS
18949 test -z "$as_dir" && as_dir=.
18950 for ac_exec_ext in '' $ac_executable_extensions; do
18951 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18952 ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
18953 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18954 break 2
18955 fi
18956done
18957 done
18958IFS=$as_save_IFS
18959
18960 test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
18961 ;;
18962esac
18963fi
18964ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
18965if test -n "$ac_vmw_lib_cfg"; then
18966 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
18967$as_echo "$ac_vmw_lib_cfg" >&6; }
18968else
18969 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18970$as_echo "no" >&6; }
18971fi
18972
18973
18974 if test "$ac_vmw_lib_cfg" != "no"; then
18975 # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
18976 # so single it out here to avoid having to replicate all the rest of the
18977 # logic elsewhere.
18978 if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
18979 URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
18980 URIPARSER_LIBS="`$ac_vmw_lib_cfg --ldflags`"
18981 else
18982 URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
18983 URIPARSER_LIBS="`$ac_vmw_lib_cfg --libs`"
18984 fi
18985 ac_vmw_have_lib=1
18986 fi
18987 fi
18988
18989 # Finish by executing the user provided action. The call to "true" is needed
18990 # because the actions are optional, and we need something inside the block.
18991 if test $ac_vmw_have_lib -eq 1; then
18992
18993
18994 true
18995
18996 else
18997 true
18998 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
18999 fi
19000
19001
19002 # Check for libpng.
19003
19004
19005 if test -z "png12"; then
19006 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
19007 fi
19008 if test -z "LIBPNG"; then
19009 as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
19010 fi
19011
19012 ac_vmw_have_lib=0
19013 ac_vmw_have_lib_func=0
19014 ac_vmw_have_lib_header=0
19015 ac_vmw_custom_libs=
19016
19017 #
19018 # First, try any user-defined CUSTOM_* flags.
19019 #
19020 if test -n "${CUSTOM_LIBPNG_CPPFLAGS}" || test -n "${CUSTOM_LIBPNG_LIBS}"; then
19021 ac_vmw_custom_libs="${CUSTOM_LIBPNG_LIBS} -lpng12"
19022 if test -n "png.h"; then
19023 ORIGINAL_CPPFLAGS="$CPPFLAGS"
19024 CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS} $CPPFLAGS"
19025
19026 ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
19027if test "x$ac_cv_header_png_h" = x""yes; then :
19028 ac_vmw_have_lib_header=1
19029fi
19030
19031
19032
19033 CPPFLAGS="$ORIGINAL_CPPFLAGS"
19034 else
19035 ac_vmw_have_lib_header=1
19036 fi
19037
19038 # Check a specific function in the library if requested.
19039 # If it hasn't, just pick a random function from libc, just to make
19040 # sure the linker can find the library being tested.
19041 if test $ac_vmw_have_lib_header -eq 1; then
19042 if test -n "png_access_version_number"; then
19043 ac_vmw_function=png_access_version_number
19044 else
19045 ac_vmw_function=strlen
19046 fi
19047 as_ac_Lib=`$as_echo "ac_cv_lib_png12_$ac_vmw_function" | $as_tr_sh`
19048{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lpng12" >&5
19049$as_echo_n "checking for $ac_vmw_function in -lpng12... " >&6; }
19050if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
19051 $as_echo_n "(cached) " >&6
19052else
19053 ac_check_lib_save_LIBS=$LIBS
19054LIBS="-lpng12 $ac_vmw_custom_libs $LIBS"
19055cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19056/* end confdefs.h. */
19057
19058/* Override any GCC internal prototype to avoid an error.
19059 Use char because int might match the return type of a GCC
19060 builtin and then its argument prototype would still apply. */
19061#ifdef __cplusplus
19062extern "C"
19063#endif
19064char $ac_vmw_function ();
19065int
19066main ()
19067{
19068return $ac_vmw_function ();
19069 ;
19070 return 0;
19071}
19072_ACEOF
19073if ac_fn_c_try_link "$LINENO"; then :
19074 eval "$as_ac_Lib=yes"
19075else
19076 eval "$as_ac_Lib=no"
19077fi
19078rm -f core conftest.err conftest.$ac_objext \
19079 conftest$ac_exeext conftest.$ac_ext
19080LIBS=$ac_check_lib_save_LIBS
19081fi
19082eval ac_res=\$$as_ac_Lib
19083 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
19084$as_echo "$ac_res" >&6; }
19085if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
19086 ac_vmw_have_lib_func=1
19087fi
19088
19089 fi
19090
19091 if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
19092 LIBPNG_CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS}"
19093 LIBPNG_LIBS="$ac_vmw_custom_libs"
19094 ac_vmw_have_lib=1
19095 fi
19096 fi
19097
19098 # If that didn't work, try with pkg-config.
19099 if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "libpng12"; then
19100 if test -n ""; then
19101 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 >= (via pkg-config)" >&5
19102$as_echo_n "checking for libpng12 >= (via pkg-config)... " >&6; }
19103 if pkg-config --exists 'libpng12 >= '; then
19104 ac_vmw_have_lib=1
19105 fi
19106 else
19107 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 (via pkg-config)" >&5
19108$as_echo_n "checking for libpng12 (via pkg-config)... " >&6; }
19109 if pkg-config --exists 'libpng12'; then
19110 ac_vmw_have_lib=1
19111 fi
19112 fi
19113
19114 if test $ac_vmw_have_lib -eq 1; then
19115 # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
19116 # fails on OpenSolaris B71. So be pessimistic.
19117 ac_vmw_cppflags="`pkg-config --cflags libpng12`"
19118 ac_vmw_ret1=$?
19119 ac_vmw_libs="`pkg-config --libs libpng12`"
19120 ac_vmw_ret2=$?
19121 if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
19122 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
19123$as_echo "yes" >&6; }
19124 LIBPNG_CPPFLAGS="$ac_vmw_cppflags"
19125 LIBPNG_LIBS="$ac_vmw_libs"
19126 else
19127 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19128$as_echo "no" >&6; }
19129 fi
19130 else
19131 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19132$as_echo "no" >&6; }
19133 fi
19134 fi
19135
19136 # If we still haven't found the lib, try with the library's custom "config" script.
19137 # Before checking, flush the AC_PATH_PROG cached variable.
19138 unset ac_cv_path_ac_vmw_lib_cfg
19139 unset ac_vmw_lib_cfg
19140 if test $ac_vmw_have_lib -eq 0 && test -n "libpng-config"; then
19141 # Extract the first word of "libpng-config", so it can be a program name with args.
19142set dummy libpng-config; ac_word=$2
19143{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19144$as_echo_n "checking for $ac_word... " >&6; }
19145if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
19146 $as_echo_n "(cached) " >&6
19147else
19148 case $ac_vmw_lib_cfg in
19149 [\\/]* | ?:[\\/]*)
19150 ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
19151 ;;
19152 *)
19153 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19154for as_dir in $PATH
19155do
19156 IFS=$as_save_IFS
19157 test -z "$as_dir" && as_dir=.
19158 for ac_exec_ext in '' $ac_executable_extensions; do
19159 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19160 ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
19161 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19162 break 2
19163 fi
19164done
19165 done
19166IFS=$as_save_IFS
19167
19168 test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
19169 ;;
19170esac
19171fi
19172ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
19173if test -n "$ac_vmw_lib_cfg"; then
19174 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
19175$as_echo "$ac_vmw_lib_cfg" >&6; }
19176else
19177 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19178$as_echo "no" >&6; }
19179fi
19180
19181
19182 if test "$ac_vmw_lib_cfg" != "no"; then
19183 # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
19184 # so single it out here to avoid having to replicate all the rest of the
19185 # logic elsewhere.
19186 if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
19187 LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
19188 LIBPNG_LIBS="`$ac_vmw_lib_cfg --ldflags`"
19189 else
19190 LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
19191 LIBPNG_LIBS="`$ac_vmw_lib_cfg --libs`"
19192 fi
19193 ac_vmw_have_lib=1
19194 fi
19195 fi
19196
19197 # Finish by executing the user provided action. The call to "true" is needed
19198 # because the actions are optional, and we need something inside the block.
19199 if test $ac_vmw_have_lib -eq 1; then
19200
19201
19202 true
19203
19204 else
19205 true
19206 as_fn_error $? "libpng not found. Please configure without Unity (using --disable-unity) or install the libpng devel package" "$LINENO" 5
19207 fi
19208
19209
19210 # Check for the zlib library and headers. Like uriparser, there
19211 # isn't a pkg-config or zlib-config file.
19212
19213 if test -z "$CUSTOM_ZLIB_CPPFLAGS"; then
19214 if test "$os" = freebsd; then
19215 CUSTOM_ZLIB_CPPFLAGS="-I/usr/local/include"
19216 else
19217 CUSTOM_ZLIB_CPPFLAGS="-I/usr/include"
19218 fi
19219 if test -n ""; then
19220 CUSTOM_ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}/"
19221 fi
19222 fi
19223
19224
19225
19226 if test -z "z"; then
19227 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
19228 fi
19229 if test -z "ZLIB"; then
19230 as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
19231 fi
19232
19233 ac_vmw_have_lib=0
19234 ac_vmw_have_lib_func=0
19235 ac_vmw_have_lib_header=0
19236 ac_vmw_custom_libs=
19237
19238 #
19239 # First, try any user-defined CUSTOM_* flags.
19240 #
19241 if test -n "${CUSTOM_ZLIB_CPPFLAGS}" || test -n "${CUSTOM_ZLIB_LIBS}"; then
19242 ac_vmw_custom_libs="${CUSTOM_ZLIB_LIBS} -lz"
19243 if test -n "zlib.h"; then
19244 ORIGINAL_CPPFLAGS="$CPPFLAGS"
19245 CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS} $CPPFLAGS"
19246
19247 ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
19248if test "x$ac_cv_header_zlib_h" = x""yes; then :
19249 ac_vmw_have_lib_header=1
19250fi
19251
19252
19253
19254 CPPFLAGS="$ORIGINAL_CPPFLAGS"
19255 else
19256 ac_vmw_have_lib_header=1
19257 fi
19258
19259 # Check a specific function in the library if requested.
19260 # If it hasn't, just pick a random function from libc, just to make
19261 # sure the linker can find the library being tested.
19262 if test $ac_vmw_have_lib_header -eq 1; then
19263 if test -n "zlibVersion"; then
19264 ac_vmw_function=zlibVersion
19265 else
19266 ac_vmw_function=strlen
19267 fi
19268 as_ac_Lib=`$as_echo "ac_cv_lib_z_$ac_vmw_function" | $as_tr_sh`
19269{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lz" >&5
19270$as_echo_n "checking for $ac_vmw_function in -lz... " >&6; }
19271if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
19272 $as_echo_n "(cached) " >&6
19273else
19274 ac_check_lib_save_LIBS=$LIBS
19275LIBS="-lz $ac_vmw_custom_libs $LIBS"
19276cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19277/* end confdefs.h. */
19278
19279/* Override any GCC internal prototype to avoid an error.
19280 Use char because int might match the return type of a GCC
19281 builtin and then its argument prototype would still apply. */
19282#ifdef __cplusplus
19283extern "C"
19284#endif
19285char $ac_vmw_function ();
19286int
19287main ()
19288{
19289return $ac_vmw_function ();
19290 ;
19291 return 0;
19292}
19293_ACEOF
19294if ac_fn_c_try_link "$LINENO"; then :
19295 eval "$as_ac_Lib=yes"
19296else
19297 eval "$as_ac_Lib=no"
19298fi
19299rm -f core conftest.err conftest.$ac_objext \
19300 conftest$ac_exeext conftest.$ac_ext
19301LIBS=$ac_check_lib_save_LIBS
19302fi
19303eval ac_res=\$$as_ac_Lib
19304 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
19305$as_echo "$ac_res" >&6; }
19306if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
19307 ac_vmw_have_lib_func=1
19308fi
19309
19310 fi
19311
19312 if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
19313 ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}"
19314 ZLIB_LIBS="$ac_vmw_custom_libs"
19315 ac_vmw_have_lib=1
19316 fi
19317 fi
19318
19319 # If that didn't work, try with pkg-config.
19320 if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
19321 if test -n ""; then
19322 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for >= (via pkg-config)" >&5
19323$as_echo_n "checking for >= (via pkg-config)... " >&6; }
19324 if pkg-config --exists ' >= '; then
19325 ac_vmw_have_lib=1
19326 fi
19327 else
19328 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (via pkg-config)" >&5
19329$as_echo_n "checking for (via pkg-config)... " >&6; }
19330 if pkg-config --exists ''; then
19331 ac_vmw_have_lib=1
19332 fi
19333 fi
19334
19335 if test $ac_vmw_have_lib -eq 1; then
19336 # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
19337 # fails on OpenSolaris B71. So be pessimistic.
19338 ac_vmw_cppflags="`pkg-config --cflags `"
19339 ac_vmw_ret1=$?
19340 ac_vmw_libs="`pkg-config --libs `"
19341 ac_vmw_ret2=$?
19342 if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
19343 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
19344$as_echo "yes" >&6; }
19345 ZLIB_CPPFLAGS="$ac_vmw_cppflags"
19346 ZLIB_LIBS="$ac_vmw_libs"
19347 else
19348 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19349$as_echo "no" >&6; }
19350 fi
19351 else
19352 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19353$as_echo "no" >&6; }
19354 fi
19355 fi
19356
19357 # If we still haven't found the lib, try with the library's custom "config" script.
19358 # Before checking, flush the AC_PATH_PROG cached variable.
19359 unset ac_cv_path_ac_vmw_lib_cfg
19360 unset ac_vmw_lib_cfg
19361 if test $ac_vmw_have_lib -eq 0 && test -n ""; then
19362 # Extract the first word of "", so it can be a program name with args.
19363set dummy ; ac_word=$2
19364{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19365$as_echo_n "checking for $ac_word... " >&6; }
19366if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
19367 $as_echo_n "(cached) " >&6
19368else
19369 case $ac_vmw_lib_cfg in
19370 [\\/]* | ?:[\\/]*)
19371 ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
19372 ;;
19373 *)
19374 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19375for as_dir in $PATH
19376do
19377 IFS=$as_save_IFS
19378 test -z "$as_dir" && as_dir=.
19379 for ac_exec_ext in '' $ac_executable_extensions; do
19380 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19381 ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
19382 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19383 break 2
19384 fi
19385done
19386 done
19387IFS=$as_save_IFS
19388
19389 test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
19390 ;;
19391esac
19392fi
19393ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
19394if test -n "$ac_vmw_lib_cfg"; then
19395 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
19396$as_echo "$ac_vmw_lib_cfg" >&6; }
19397else
19398 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19399$as_echo "no" >&6; }
19400fi
19401
19402
19403 if test "$ac_vmw_lib_cfg" != "no"; then
19404 # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
19405 # so single it out here to avoid having to replicate all the rest of the
19406 # logic elsewhere.
19407 if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
19408 ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
19409 ZLIB_LIBS="`$ac_vmw_lib_cfg --ldflags`"
19410 else
19411 ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
19412 ZLIB_LIBS="`$ac_vmw_lib_cfg --libs`"
19413 fi
19414 ac_vmw_have_lib=1
19415 fi
19416 fi
19417
19418 # Finish by executing the user provided action. The call to "true" is needed
19419 # because the actions are optional, and we need something inside the block.
19420 if test $ac_vmw_have_lib -eq 1; then
19421
19422
19423 true
19424
19425 else
19426 true
19427 as_fn_error $? "zlib library not found. Please configure without Unity (using --disable-unity) or install the zlib devel package." "$LINENO" 5
19428 fi
19429
19430
19431 # Check for gio 2.24.
19432
19433
19434 if test -z "gio-2.0"; then
19435 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
19436 fi
19437 if test -z "GIO"; then
19438 as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
19439 fi
19440
19441 ac_vmw_have_lib=0
19442 ac_vmw_have_lib_func=0
19443 ac_vmw_have_lib_header=0
19444 ac_vmw_custom_libs=
19445
19446 #
19447 # First, try any user-defined CUSTOM_* flags.
19448 #
19449 if test -n "${CUSTOM_GIO_CPPFLAGS}" || test -n "${CUSTOM_GIO_LIBS}"; then
19450 ac_vmw_custom_libs="${CUSTOM_GIO_LIBS} -lgio-2.0"
19451 if test -n "gio/gio.h"; then
19452 ORIGINAL_CPPFLAGS="$CPPFLAGS"
19453 CPPFLAGS="${CUSTOM_GIO_CPPFLAGS} $CPPFLAGS"
19454
19455 ac_fn_c_check_header_mongrel "$LINENO" "gio/gio.h" "ac_cv_header_gio_gio_h" "$ac_includes_default"
19456if test "x$ac_cv_header_gio_gio_h" = x""yes; then :
19457 ac_vmw_have_lib_header=1
19458fi
19459
19460
19461
19462 CPPFLAGS="$ORIGINAL_CPPFLAGS"
19463 else
19464 ac_vmw_have_lib_header=1
19465 fi
19466
19467 # Check a specific function in the library if requested.
19468 # If it hasn't, just pick a random function from libc, just to make
19469 # sure the linker can find the library being tested.
19470 if test $ac_vmw_have_lib_header -eq 1; then
19471 if test -n "g_desktop_app_info_get_filename"; then
19472 ac_vmw_function=g_desktop_app_info_get_filename
19473 else
19474 ac_vmw_function=strlen
19475 fi
19476 as_ac_Lib=`$as_echo "ac_cv_lib_gio-2.0_$ac_vmw_function" | $as_tr_sh`
19477{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lgio-2.0" >&5
19478$as_echo_n "checking for $ac_vmw_function in -lgio-2.0... " >&6; }
19479if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
19480 $as_echo_n "(cached) " >&6
19481else
19482 ac_check_lib_save_LIBS=$LIBS
19483LIBS="-lgio-2.0 $ac_vmw_custom_libs $LIBS"
19484cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19485/* end confdefs.h. */
19486
19487/* Override any GCC internal prototype to avoid an error.
19488 Use char because int might match the return type of a GCC
19489 builtin and then its argument prototype would still apply. */
19490#ifdef __cplusplus
19491extern "C"
19492#endif
19493char $ac_vmw_function ();
19494int
19495main ()
19496{
19497return $ac_vmw_function ();
19498 ;
19499 return 0;
19500}
19501_ACEOF
19502if ac_fn_c_try_link "$LINENO"; then :
19503 eval "$as_ac_Lib=yes"
19504else
19505 eval "$as_ac_Lib=no"
19506fi
19507rm -f core conftest.err conftest.$ac_objext \
19508 conftest$ac_exeext conftest.$ac_ext
19509LIBS=$ac_check_lib_save_LIBS
19510fi
19511eval ac_res=\$$as_ac_Lib
19512 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
19513$as_echo "$ac_res" >&6; }
19514if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
19515 ac_vmw_have_lib_func=1
19516fi
19517
19518 fi
19519
19520 if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
19521 GIO_CPPFLAGS="${CUSTOM_GIO_CPPFLAGS}"
19522 GIO_LIBS="$ac_vmw_custom_libs"
19523 ac_vmw_have_lib=1
19524 fi
19525 fi
19526
19527 # If that didn't work, try with pkg-config.
19528 if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "gio-unix-2.0"; then
19529 if test -n "2.24.0"; then
19530 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)" >&5
19531$as_echo_n "checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)... " >&6; }
19532 if pkg-config --exists 'gio-unix-2.0 >= 2.24.0'; then
19533 ac_vmw_have_lib=1
19534 fi
19535 else
19536 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 (via pkg-config)" >&5
19537$as_echo_n "checking for gio-unix-2.0 (via pkg-config)... " >&6; }
19538 if pkg-config --exists 'gio-unix-2.0'; then
19539 ac_vmw_have_lib=1
19540 fi
19541 fi
19542
19543 if test $ac_vmw_have_lib -eq 1; then
19544 # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
19545 # fails on OpenSolaris B71. So be pessimistic.
19546 ac_vmw_cppflags="`pkg-config --cflags gio-unix-2.0`"
19547 ac_vmw_ret1=$?
19548 ac_vmw_libs="`pkg-config --libs gio-unix-2.0`"
19549 ac_vmw_ret2=$?
19550 if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
19551 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
19552$as_echo "yes" >&6; }
19553 GIO_CPPFLAGS="$ac_vmw_cppflags"
19554 GIO_LIBS="$ac_vmw_libs"
19555 else
19556 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19557$as_echo "no" >&6; }
19558 fi
19559 else
19560 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19561$as_echo "no" >&6; }
19562 fi
19563 fi
19564
19565 # If we still haven't found the lib, try with the library's custom "config" script.
19566 # Before checking, flush the AC_PATH_PROG cached variable.
19567 unset ac_cv_path_ac_vmw_lib_cfg
19568 unset ac_vmw_lib_cfg
19569 if test $ac_vmw_have_lib -eq 0 && test -n ""; then
19570 # Extract the first word of "", so it can be a program name with args.
19571set dummy ; ac_word=$2
19572{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19573$as_echo_n "checking for $ac_word... " >&6; }
19574if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
19575 $as_echo_n "(cached) " >&6
19576else
19577 case $ac_vmw_lib_cfg in
19578 [\\/]* | ?:[\\/]*)
19579 ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
19580 ;;
19581 *)
19582 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19583for as_dir in $PATH
19584do
19585 IFS=$as_save_IFS
19586 test -z "$as_dir" && as_dir=.
19587 for ac_exec_ext in '' $ac_executable_extensions; do
19588 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19589 ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
19590 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19591 break 2
19592 fi
19593done
19594 done
19595IFS=$as_save_IFS
19596
19597 test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
19598 ;;
19599esac
19600fi
19601ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
19602if test -n "$ac_vmw_lib_cfg"; then
19603 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
19604$as_echo "$ac_vmw_lib_cfg" >&6; }
19605else
19606 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19607$as_echo "no" >&6; }
19608fi
19609
19610
19611 if test "$ac_vmw_lib_cfg" != "no"; then
19612 # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
19613 # so single it out here to avoid having to replicate all the rest of the
19614 # logic elsewhere.
19615 if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
19616 GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
19617 GIO_LIBS="`$ac_vmw_lib_cfg --ldflags`"
19618 else
19619 GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
19620 GIO_LIBS="`$ac_vmw_lib_cfg --libs`"
19621 fi
19622 ac_vmw_have_lib=1
19623 fi
19624 fi
19625
19626 # Finish by executing the user provided action. The call to "true" is needed
19627 # because the actions are optional, and we need something inside the block.
19628 if test $ac_vmw_have_lib -eq 1; then
19629
19630
19631 true
19632
19633 else
19634 true
19635 as_fn_error $? "GLib/GIO 2.24+ not found. Please configure without Unity (using --disable-unity) or upgrade the Glib devel package." "$LINENO" 5
19636 fi
19637
19638 fi # End of library checks for Unity.
19639
19640 # Check whether we have gtk+ 2.0.18675 # Check whether we have gtk+ 2.0.
19641 if test "$with_gtk2" != "no"; then18676 if test "$with_gtk2" != "no"; then
19642 # gdk_display_get_default_group (added in gtk+ 2.4.0) is function currently18677 # gdk_display_get_default_group (added in gtk+ 2.4.0) is function currently
@@ -19847,53 +18882,6 @@
19847 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 18882 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
19848 fi18883 fi
1984918884
19850
19851 # Unity requires libgdk_pixbuf_xlib, which most systems don't seem to
19852 # provide via "pkg-config --libs gtk+-2.0".
19853 if test "$enable_unity" != "no"; then
19854 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0" >&5
19855$as_echo_n "checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0... " >&6; }
19856if test "${ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init+set}" = set; then :
19857 $as_echo_n "(cached) " >&6
19858else
19859 ac_check_lib_save_LIBS=$LIBS
19860LIBS="-lgdk_pixbuf_xlib-2.0 $GTK_LIBS $LIBS"
19861cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19862/* end confdefs.h. */
19863
19864/* Override any GCC internal prototype to avoid an error.
19865 Use char because int might match the return type of a GCC
19866 builtin and then its argument prototype would still apply. */
19867#ifdef __cplusplus
19868extern "C"
19869#endif
19870char gdk_pixbuf_xlib_init ();
19871int
19872main ()
19873{
19874return gdk_pixbuf_xlib_init ();
19875 ;
19876 return 0;
19877}
19878_ACEOF
19879if ac_fn_c_try_link "$LINENO"; then :
19880 ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=yes
19881else
19882 ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=no
19883fi
19884rm -f core conftest.err conftest.$ac_objext \
19885 conftest$ac_exeext conftest.$ac_ext
19886LIBS=$ac_check_lib_save_LIBS
19887fi
19888{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&5
19889$as_echo "$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&6; }
19890if test "x$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" = x""yes; then :
19891 GTK_LIBS="$GTK_LIBS -lgdk_pixbuf_xlib-2.0"
19892else
19893 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
19894fi
19895
19896 fi
19897 fi18885 fi
1989818886
19899 #18887 #
@@ -21834,6 +20822,8 @@
2183420822
21835 # Easier to give all modules the ICU defines/includes...20823 # Easier to give all modules the ICU defines/includes...
21836 CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"20824 CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
20825else
20826 CPPFLAGS="$CPPFLAGS -DNO_ICU"
21837fi20827fi
2183820828
21839# Extract the first word of "rpcgen", so it can be a program name with args.20829# Extract the first word of "rpcgen", so it can be a program name with args.
@@ -22090,6 +21080,50 @@
2209021080
22091fi21081fi
2209221082
21083bsdPrintfWrappers=no
21084if test "$os" = "linux"; then
21085 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ecvt in -lc" >&5
21086$as_echo_n "checking for ecvt in -lc... " >&6; }
21087if test "${ac_cv_lib_c_ecvt+set}" = set; then :
21088 $as_echo_n "(cached) " >&6
21089else
21090 ac_check_lib_save_LIBS=$LIBS
21091LIBS="-lc $LIBS"
21092cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21093/* end confdefs.h. */
21094
21095/* Override any GCC internal prototype to avoid an error.
21096 Use char because int might match the return type of a GCC
21097 builtin and then its argument prototype would still apply. */
21098#ifdef __cplusplus
21099extern "C"
21100#endif
21101char ecvt ();
21102int
21103main ()
21104{
21105return ecvt ();
21106 ;
21107 return 0;
21108}
21109_ACEOF
21110if ac_fn_c_try_link "$LINENO"; then :
21111 ac_cv_lib_c_ecvt=yes
21112else
21113 ac_cv_lib_c_ecvt=no
21114fi
21115rm -f core conftest.err conftest.$ac_objext \
21116 conftest$ac_exeext conftest.$ac_ext
21117LIBS=$ac_check_lib_save_LIBS
21118fi
21119{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_ecvt" >&5
21120$as_echo "$ac_cv_lib_c_ecvt" >&6; }
21121if test "x$ac_cv_lib_c_ecvt" = x""yes; then :
21122 bsdPrintfWrappers=yes
21123fi
21124
21125fi
21126
22093###21127###
22094### Typdefs, structs, and compiler quarks.21128### Typdefs, structs, and compiler quarks.
22095###21129###
@@ -22555,7 +21589,7 @@
22555 CFLAGS="$ORIGINAL_CFLAGS$NEW_CFLAG"21589 CFLAGS="$ORIGINAL_CFLAGS$NEW_CFLAG"
22556done21590done
22557CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"21591CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"
22558CPPFLAGS="$CPPFLAGS -DNO_CORE_ICU"21592CPPFLAGS="$CPPFLAGS"
2255921593
22560# -fvisibility is used by "core service" plugins, but not required.21594# -fvisibility is used by "core service" plugins, but not required.
22561ORIGINAL_CFLAGS="$CFLAGS"21595ORIGINAL_CFLAGS="$CFLAGS"
@@ -22584,6 +21618,34 @@
22584rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext21618rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22585CFLAGS="$ORIGINAL_CFLAGS"21619CFLAGS="$ORIGINAL_CFLAGS"
2258621620
21621# Detect "unused-but-set-variable" gcc warning and disable it.
21622ORIGINAL_CFLAGS="$CFLAGS"
21623CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
21624{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
21625$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
21626cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21627/* end confdefs.h. */
21628
21629int
21630main ()
21631{
21632return 0;
21633 ;
21634 return 0;
21635}
21636_ACEOF
21637if ac_fn_c_try_compile "$LINENO"; then :
21638 ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
21639 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
21640$as_echo "yes" >&6; }
21641else
21642 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
21643$as_echo "no" >&6; }
21644fi
21645rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
21646CFLAGS="$ORIGINAL_CFLAGS"
21647
21648
22587BUILDDIR="`pwd`"21649BUILDDIR="`pwd`"
2258821650
22589INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"21651INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
@@ -22767,6 +21829,7 @@
22767fi21829fi
2276821830
22769if test "$os" = "freebsd"; then21831if test "$os" = "freebsd"; then
21832 LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
22770 MODULES_DIR="/boot/modules"21833 MODULES_DIR="/boot/modules"
2277121834
22772 if test "$osVersion" -ge 302000; then21835 if test "$osVersion" -ge 302000; then
@@ -22924,14 +21987,6 @@
22924 HAVE_XCOMPOSITE_FALSE=21987 HAVE_XCOMPOSITE_FALSE=
22925fi21988fi
2292621989
22927 if test "$enable_unity" = "yes"; then
22928 ENABLE_UNITY_TRUE=
22929 ENABLE_UNITY_FALSE='#'
22930else
22931 ENABLE_UNITY_TRUE='#'
22932 ENABLE_UNITY_FALSE=
22933fi
22934
22935 if test "$have_cunit" = "yes"; then21990 if test "$have_cunit" = "yes"; then
22936 ENABLE_TESTS_TRUE=21991 ENABLE_TESTS_TRUE=
22937 ENABLE_TESTS_FALSE='#'21992 ENABLE_TESTS_FALSE='#'
@@ -23004,6 +22059,14 @@
23004 USE_SLASH_PROC_FALSE=22059 USE_SLASH_PROC_FALSE=
23005fi22060fi
2300622061
22062 if test "$bsdPrintfWrappers" = "yes"; then
22063 USE_PRINTF_WRAPPERS_TRUE=
22064 USE_PRINTF_WRAPPERS_FALSE='#'
22065else
22066 USE_PRINTF_WRAPPERS_TRUE='#'
22067 USE_PRINTF_WRAPPERS_FALSE=
22068fi
22069
2300722070
23008if test "$have_xsm" != "yes"; then22071if test "$have_xsm" != "yes"; then
23009$as_echo "@%:@define NO_XSM 1" >>confdefs.h22072$as_echo "@%:@define NO_XSM 1" >>confdefs.h
@@ -23113,7 +22176,7 @@
23113###22176###
23114### Create the Makefiles22177### Create the Makefiles
23115###22178###
23116ac_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"22179ac_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"
2311722180
2311822181
23119###22182###
@@ -23325,10 +22388,6 @@
23325 as_fn_error $? "conditional \"HAVE_XCOMPOSITE\" was never defined.22388 as_fn_error $? "conditional \"HAVE_XCOMPOSITE\" was never defined.
23326Usually this means the macro was only invoked conditionally." "$LINENO" 5 22389Usually this means the macro was only invoked conditionally." "$LINENO" 5
23327fi22390fi
23328if test -z "${ENABLE_UNITY_TRUE}" && test -z "${ENABLE_UNITY_FALSE}"; then
23329 as_fn_error $? "conditional \"ENABLE_UNITY\" was never defined.
23330Usually this means the macro was only invoked conditionally." "$LINENO" 5
23331fi
23332if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then22391if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
23333 as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.22392 as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
23334Usually this means the macro was only invoked conditionally." "$LINENO" 5 22393Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23365,6 +22424,10 @@
23365 as_fn_error $? "conditional \"USE_SLASH_PROC\" was never defined.22424 as_fn_error $? "conditional \"USE_SLASH_PROC\" was never defined.
23366Usually this means the macro was only invoked conditionally." "$LINENO" 5 22425Usually this means the macro was only invoked conditionally." "$LINENO" 5
23367fi22426fi
22427if test -z "${USE_PRINTF_WRAPPERS_TRUE}" && test -z "${USE_PRINTF_WRAPPERS_FALSE}"; then
22428 as_fn_error $? "conditional \"USE_PRINTF_WRAPPERS\" was never defined.
22429Usually this means the macro was only invoked conditionally." "$LINENO" 5
22430fi
2336822431
23369: ${CONFIG_STATUS=./config.status}22432: ${CONFIG_STATUS=./config.status}
23370ac_write_fail=022433ac_write_fail=0
@@ -23773,7 +22836,7 @@
23773# report actual input values of CONFIG_FILES etc. instead of their22836# report actual input values of CONFIG_FILES etc. instead of their
23774# values after options handling.22837# values after options handling.
23775ac_log="22838ac_log="
23776This file was extended by open-vm-tools $as_me 2011.07.19, which was22839This file was extended by open-vm-tools $as_me 2011.12.20, which was
23777generated by GNU Autoconf 2.67. Invocation command line was22840generated by GNU Autoconf 2.67. Invocation command line was
2377822841
23779 CONFIG_FILES = $CONFIG_FILES22842 CONFIG_FILES = $CONFIG_FILES
@@ -23830,7 +22893,7 @@
23830cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=122893cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
23831ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"22894ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
23832ac_cs_version="\\22895ac_cs_version="\\
23833open-vm-tools config.status 2011.07.1922896open-vm-tools config.status 2011.12.20
23834configured by $0, generated by GNU Autoconf 2.67,22897configured by $0, generated by GNU Autoconf 2.67,
23835 with options \\"\$ac_cs_config\\"22898 with options \\"\$ac_cs_config\\"
2383622899
@@ -24311,6 +23374,7 @@
24311 "lib/err/Makefile") CONFIG_FILES="$CONFIG_FILES lib/err/Makefile" ;;23374 "lib/err/Makefile") CONFIG_FILES="$CONFIG_FILES lib/err/Makefile" ;;
24312 "lib/file/Makefile") CONFIG_FILES="$CONFIG_FILES lib/file/Makefile" ;;23375 "lib/file/Makefile") CONFIG_FILES="$CONFIG_FILES lib/file/Makefile" ;;
24313 "lib/foundryMsg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/foundryMsg/Makefile" ;;23376 "lib/foundryMsg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/foundryMsg/Makefile" ;;
23377 "lib/glibUtils/Makefile") CONFIG_FILES="$CONFIG_FILES lib/glibUtils/Makefile" ;;
24314 "lib/guestApp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestApp/Makefile" ;;23378 "lib/guestApp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestApp/Makefile" ;;
24315 "lib/guestRpc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestRpc/Makefile" ;;23379 "lib/guestRpc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestRpc/Makefile" ;;
24316 "lib/hgfs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfs/Makefile" ;;23380 "lib/hgfs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfs/Makefile" ;;
@@ -24319,7 +23383,6 @@
24319 "lib/hgfsServer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServer/Makefile" ;;23383 "lib/hgfsServer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServer/Makefile" ;;
24320 "lib/hgfsServerManagerGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerManagerGuest/Makefile" ;;23384 "lib/hgfsServerManagerGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerManagerGuest/Makefile" ;;
24321 "lib/hgfsServerPolicyGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerPolicyGuest/Makefile" ;;23385 "lib/hgfsServerPolicyGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerPolicyGuest/Makefile" ;;
24322 "lib/image/Makefile") CONFIG_FILES="$CONFIG_FILES lib/image/Makefile" ;;
24323 "lib/impersonate/Makefile") CONFIG_FILES="$CONFIG_FILES lib/impersonate/Makefile" ;;23386 "lib/impersonate/Makefile") CONFIG_FILES="$CONFIG_FILES lib/impersonate/Makefile" ;;
24324 "lib/lock/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lock/Makefile" ;;23387 "lib/lock/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lock/Makefile" ;;
24325 "lib/message/Makefile") CONFIG_FILES="$CONFIG_FILES lib/message/Makefile" ;;23388 "lib/message/Makefile") CONFIG_FILES="$CONFIG_FILES lib/message/Makefile" ;;
@@ -24329,8 +23392,6 @@
24329 "lib/panicDefault/Makefile") CONFIG_FILES="$CONFIG_FILES lib/panicDefault/Makefile" ;;23392 "lib/panicDefault/Makefile") CONFIG_FILES="$CONFIG_FILES lib/panicDefault/Makefile" ;;
24330 "lib/printer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/printer/Makefile" ;;23393 "lib/printer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/printer/Makefile" ;;
24331 "lib/procMgr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/procMgr/Makefile" ;;23394 "lib/procMgr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/procMgr/Makefile" ;;
24332 "lib/raster/Makefile") CONFIG_FILES="$CONFIG_FILES lib/raster/Makefile" ;;
24333 "lib/region/Makefile") CONFIG_FILES="$CONFIG_FILES lib/region/Makefile" ;;
24334 "lib/rpcChannel/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcChannel/Makefile" ;;23395 "lib/rpcChannel/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcChannel/Makefile" ;;
24335 "lib/rpcIn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcIn/Makefile" ;;23396 "lib/rpcIn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcIn/Makefile" ;;
24336 "lib/rpcOut/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcOut/Makefile" ;;23397 "lib/rpcOut/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcOut/Makefile" ;;
@@ -24357,7 +23418,6 @@
24357 "services/plugins/powerOps/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/powerOps/Makefile" ;;23418 "services/plugins/powerOps/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/powerOps/Makefile" ;;
24358 "services/plugins/resolutionSet/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/resolutionSet/Makefile" ;;23419 "services/plugins/resolutionSet/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/resolutionSet/Makefile" ;;
24359 "services/plugins/timeSync/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/timeSync/Makefile" ;;23420 "services/plugins/timeSync/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/timeSync/Makefile" ;;
24360 "services/plugins/unity/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/unity/Makefile" ;;
24361 "services/plugins/vix/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vix/Makefile" ;;23421 "services/plugins/vix/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vix/Makefile" ;;
24362 "services/plugins/vmbackup/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vmbackup/Makefile" ;;23422 "services/plugins/vmbackup/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vmbackup/Makefile" ;;
24363 "vmware-user-suid-wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES vmware-user-suid-wrapper/Makefile" ;;23423 "vmware-user-suid-wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES vmware-user-suid-wrapper/Makefile" ;;
2436423424
=== modified file 'autom4te.cache/output.1'
--- autom4te.cache/output.1 2011-07-22 16:41:03 +0000
+++ autom4te.cache/output.1 2012-01-18 00:02:26 +0000
@@ -1,6 +1,6 @@
1@%:@! /bin/sh1@%:@! /bin/sh
2@%:@ Guess values for system-dependent variables and create Makefiles.2@%:@ Guess values for system-dependent variables and create Makefiles.
3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.12.20.
4@%:@4@%:@
5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
6@%:@ 6@%:@
@@ -701,8 +701,8 @@
701# Identity of this package.701# Identity of this package.
702PACKAGE_NAME='open-vm-tools'702PACKAGE_NAME='open-vm-tools'
703PACKAGE_TARNAME='open-vm-tools'703PACKAGE_TARNAME='open-vm-tools'
704PACKAGE_VERSION='2011.07.19'704PACKAGE_VERSION='2011.12.20'
705PACKAGE_STRING='open-vm-tools 2011.07.19'705PACKAGE_STRING='open-vm-tools 2011.12.20'
706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
707PACKAGE_URL=''707PACKAGE_URL=''
708708
@@ -777,6 +777,8 @@
777TARGET_OS777TARGET_OS
778TOOLS_VERSION778TOOLS_VERSION
779HGFS_LIBS779HGFS_LIBS
780USE_PRINTF_WRAPPERS_FALSE
781USE_PRINTF_WRAPPERS_TRUE
780USE_SLASH_PROC_FALSE782USE_SLASH_PROC_FALSE
781USE_SLASH_PROC_TRUE783USE_SLASH_PROC_TRUE
782HAVE_PAM_FALSE784HAVE_PAM_FALSE
@@ -795,8 +797,6 @@
795WITH_ROOT_PRIVILEGES_TRUE797WITH_ROOT_PRIVILEGES_TRUE
796ENABLE_TESTS_FALSE798ENABLE_TESTS_FALSE
797ENABLE_TESTS_TRUE799ENABLE_TESTS_TRUE
798ENABLE_UNITY_FALSE
799ENABLE_UNITY_TRUE
800HAVE_XCOMPOSITE_FALSE800HAVE_XCOMPOSITE_FALSE
801HAVE_XCOMPOSITE_TRUE801HAVE_XCOMPOSITE_TRUE
802HAVE_XSM_FALSE802HAVE_XSM_FALSE
@@ -836,14 +836,6 @@
836GTKMM_CPPFLAGS836GTKMM_CPPFLAGS
837GTK_LIBS837GTK_LIBS
838GTK_CPPFLAGS838GTK_CPPFLAGS
839GIO_LIBS
840GIO_CPPFLAGS
841ZLIB_LIBS
842ZLIB_CPPFLAGS
843LIBPNG_LIBS
844LIBPNG_CPPFLAGS
845URIPARSER_LIBS
846URIPARSER_CPPFLAGS
847CUNIT_LIBS839CUNIT_LIBS
848CUNIT_CPPFLAGS840CUNIT_CPPFLAGS
849PAM_LIBS841PAM_LIBS
@@ -986,7 +978,6 @@
986with_kernel_release978with_kernel_release
987with_linuxdir979with_linuxdir
988enable_multimon980enable_multimon
989enable_unity
990with_gtk2981with_gtk2
991with_gtkmm982with_gtkmm
992enable_docs983enable_docs
@@ -1561,7 +1552,7 @@
1561 # Omit some internal or obsolete options to make the list less imposing.1552 # Omit some internal or obsolete options to make the list less imposing.
1562 # This message is too long to be a string in the A/UX 3.1 sh.1553 # This message is too long to be a string in the A/UX 3.1 sh.
1563 cat <<_ACEOF1554 cat <<_ACEOF
1564\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.1555\`configure' configures open-vm-tools 2011.12.20 to adapt to many kinds of systems.
15651556
1566Usage: $0 [OPTION]... [VAR=VALUE]...1557Usage: $0 [OPTION]... [VAR=VALUE]...
15671558
@@ -1635,7 +1626,7 @@
16351626
1636if test -n "$ac_init_help"; then1627if test -n "$ac_init_help"; then
1637 case $ac_init_help in1628 case $ac_init_help in
1638 short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;1629 short | recursive ) echo "Configuration of open-vm-tools 2011.12.20:";;
1639 esac1630 esac
1640 cat <<\_ACEOF1631 cat <<\_ACEOF
16411632
@@ -1644,7 +1635,6 @@
1644 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)1635 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1645 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]1636 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1646 --disable-multimon disables multimon, enabled by default1637 --disable-multimon disables multimon, enabled by default
1647 --disable-unity disables Unity, enabled by default
1648 --disable-docs disables generation of API documentation; by1638 --disable-docs disables generation of API documentation; by
1649 default, docs are built if doxygen is available.1639 default, docs are built if doxygen is available.
1650 --disable-tests disable compilation of test code.1640 --disable-tests disable compilation of test code.
@@ -1762,7 +1752,7 @@
1762test -n "$ac_init_help" && exit $ac_status1752test -n "$ac_init_help" && exit $ac_status
1763if $ac_init_version; then1753if $ac_init_version; then
1764 cat <<\_ACEOF1754 cat <<\_ACEOF
1765open-vm-tools configure 2011.07.191755open-vm-tools configure 2011.12.20
1766generated by GNU Autoconf 2.671756generated by GNU Autoconf 2.67
17671757
1768Copyright (C) 2010 Free Software Foundation, Inc.1758Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2454,7 +2444,7 @@
2454This file contains any messages produced by compilers while2444This file contains any messages produced by compilers while
2455running configure, to aid debugging if configure makes a mistake.2445running configure, to aid debugging if configure makes a mistake.
24562446
2457It was created by open-vm-tools $as_me 2011.07.19, which was2447It was created by open-vm-tools $as_me 2011.12.20, which was
2458generated by GNU Autoconf 2.67. Invocation command line was2448generated by GNU Autoconf 2.67. Invocation command line was
24592449
2460 $ $0 $@2450 $ $0 $@
@@ -3044,14 +3034,6 @@
3044fi3034fi
30453035
30463036
3047@%:@ Check whether --enable-unity was given.
3048if test "${enable_unity+set}" = set; then :
3049 enableval=$enable_unity; enable_unity="$enableval"
3050else
3051 enable_unity="yes"
3052fi
3053
3054
30553037
3056@%:@ Check whether --with-gtk2 was given.3038@%:@ Check whether --with-gtk2 was given.
3057if test "${with_gtk2+set}" = set; then :3039if test "${with_gtk2+set}" = set; then :
@@ -3086,11 +3068,6 @@
3086fi3068fi
30873069
30883070
3089# If we're not going to use Gtk 2.0, disable Unity.
3090if test "$with_gtk2" != "yes"; then
3091 enable_unity="no"
3092fi
3093
3094am__api_version='1.11'3071am__api_version='1.11'
30953072
3096# Find a good install program. We prefer a C program (faster),3073# Find a good install program. We prefer a C program (faster),
@@ -3529,7 +3506,7 @@
35293506
3530# Define the identity of the package.3507# Define the identity of the package.
3531 PACKAGE='open-vm-tools'3508 PACKAGE='open-vm-tools'
3532 VERSION='2011.07.19'3509 VERSION='2011.12.20'
35333510
35343511
3535cat >>confdefs.h <<_ACEOF3512cat >>confdefs.h <<_ACEOF
@@ -17819,8 +17796,7 @@
17819#17796#
17820# Check for PAM.17797# Check for PAM.
17821#17798#
17822if test "$os" = "linux"; then17799
17823
17824@%:@ Check whether --with-pam was given.17800@%:@ Check whether --with-pam was given.
17825if test "${with_pam+set}" = set; then :17801if test "${with_pam+set}" = set; then :
17826 withval=$with_pam; 17802 withval=$with_pam;
@@ -17829,8 +17805,8 @@
17829fi17805fi
1783017806
1783117807
17832 if test "$with_pam" = "yes"; then17808if test "$with_pam" = "yes"; then
17833 17809
17834 if test -z "$CUSTOM_PAM_CPPFLAGS"; then17810 if test -z "$CUSTOM_PAM_CPPFLAGS"; then
17835 if test "$os" = freebsd; then17811 if test "$os" = freebsd; then
17836 CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"17812 CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"
@@ -17842,7 +17818,7 @@
17842 fi17818 fi
17843 fi17819 fi
1784417820
17845 17821
17846 17822
17847 if test -z "pam"; then17823 if test -z "pam"; then
17848 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 17824 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
@@ -18054,7 +18030,6 @@
1805418030
18055 fi18031 fi
1805618032
18057 fi
18058fi18033fi
1805918034
18060#18035#
@@ -18298,7 +18273,6 @@
18298# If the user explicitly disables X11, then don't try to detect the X-related libraries18273# If the user explicitly disables X11, then don't try to detect the X-related libraries
18299if test "$have_x" = "disabled"; then18274if test "$have_x" = "disabled"; then
18300 enable_multimon="no"18275 enable_multimon="no"
18301 enable_unity="no"
18302elif test "$have_x" != "yes"; then18276elif test "$have_x" != "yes"; then
18303 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 18277 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
18304else18278else
@@ -18402,12 +18376,6 @@
18402 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 18376 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
18403fi18377fi
1840418378
18405 else
18406 if test "$enable_unity" != "no"; then
18407 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Unity due to --disable-multimon." >&5
18408$as_echo "$as_me: WARNING: Disabling Unity due to --disable-multimon." >&2;}
18409 enable_unity="no"
18410 fi
18411 fi18379 fi
1841218380
18413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&518381 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&5
@@ -18704,939 +18672,6 @@
18704 have_xcomposite="yes"18672 have_xcomposite="yes"
18705 fi18673 fi
1870618674
18707 # If we're building with support for Unity, we'll need a few additional
18708 # libraries.
18709 if test "$enable_unity" != "no"; then
18710 # Unity needs the X11 Screen Saver extension library. It should be
18711 # in the same place as the X11 libraries, so no need for any fancy
18712 # path checking.
18713
18714 have_header=1
18715 if test -n "X11/extensions/scrnsaver.h"; then
18716 ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "$ac_includes_default"
18717if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = x""yes; then :
18718
18719else
18720
18721 have_header=0;
18722 as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
18723
18724fi
18725
18726
18727 fi
18728
18729 if test $have_header = 1; then
18730 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryExtension in -lXss" >&5
18731$as_echo_n "checking for XScreenSaverQueryExtension in -lXss... " >&6; }
18732if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then :
18733 $as_echo_n "(cached) " >&6
18734else
18735 ac_check_lib_save_LIBS=$LIBS
18736LIBS="-lXss $COMMON_XLIBS $LIBS"
18737cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18738/* end confdefs.h. */
18739
18740/* Override any GCC internal prototype to avoid an error.
18741 Use char because int might match the return type of a GCC
18742 builtin and then its argument prototype would still apply. */
18743#ifdef __cplusplus
18744extern "C"
18745#endif
18746char XScreenSaverQueryExtension ();
18747int
18748main ()
18749{
18750return XScreenSaverQueryExtension ();
18751 ;
18752 return 0;
18753}
18754_ACEOF
18755if ac_fn_c_try_link "$LINENO"; then :
18756 ac_cv_lib_Xss_XScreenSaverQueryExtension=yes
18757else
18758 ac_cv_lib_Xss_XScreenSaverQueryExtension=no
18759fi
18760rm -f core conftest.err conftest.$ac_objext \
18761 conftest$ac_exeext conftest.$ac_ext
18762LIBS=$ac_check_lib_save_LIBS
18763fi
18764{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverQueryExtension" >&5
18765$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryExtension" >&6; }
18766if test "x$ac_cv_lib_Xss_XScreenSaverQueryExtension" = x""yes; then :
18767 COMMON_XLIBS="-lXss $COMMON_XLIBS"
18768else
18769 as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
18770fi
18771
18772 fi
18773
18774
18775 # Check for the uriparser library and headers. The upstream uriparser
18776 # doesn't appear to ship with either a pkg-config file or a
18777 # uriparser-config binary, so we'll look for it the old-fashioned
18778 # way.
18779 #
18780 # Note that we look for uriFreeQueryListA because it's a relatively
18781 # new symbol that our code needs (it isn't present in the uriparser
18782 # that shipped with Ubuntu Hardy).
18783
18784 if test -z "$CUSTOM_URIPARSER_CPPFLAGS"; then
18785 if test "$os" = freebsd; then
18786 CUSTOM_URIPARSER_CPPFLAGS="-I/usr/local/include"
18787 else
18788 CUSTOM_URIPARSER_CPPFLAGS="-I/usr/include"
18789 fi
18790 if test -n "uriparser"; then
18791 CUSTOM_URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}/uriparser"
18792 fi
18793 fi
18794
18795
18796
18797 if test -z "uriparser"; then
18798 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
18799 fi
18800 if test -z "URIPARSER"; then
18801 as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
18802 fi
18803
18804 ac_vmw_have_lib=0
18805 ac_vmw_have_lib_func=0
18806 ac_vmw_have_lib_header=0
18807 ac_vmw_custom_libs=
18808
18809 #
18810 # First, try any user-defined CUSTOM_* flags.
18811 #
18812 if test -n "${CUSTOM_URIPARSER_CPPFLAGS}" || test -n "${CUSTOM_URIPARSER_LIBS}"; then
18813 ac_vmw_custom_libs="${CUSTOM_URIPARSER_LIBS} -luriparser"
18814 if test -n "Uri.h"; then
18815 ORIGINAL_CPPFLAGS="$CPPFLAGS"
18816 CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS} $CPPFLAGS"
18817
18818 ac_fn_c_check_header_mongrel "$LINENO" "Uri.h" "ac_cv_header_Uri_h" "$ac_includes_default"
18819if test "x$ac_cv_header_Uri_h" = x""yes; then :
18820 ac_vmw_have_lib_header=1
18821fi
18822
18823
18824
18825 CPPFLAGS="$ORIGINAL_CPPFLAGS"
18826 else
18827 ac_vmw_have_lib_header=1
18828 fi
18829
18830 # Check a specific function in the library if requested.
18831 # If it hasn't, just pick a random function from libc, just to make
18832 # sure the linker can find the library being tested.
18833 if test $ac_vmw_have_lib_header -eq 1; then
18834 if test -n "uriFreeQueryListA"; then
18835 ac_vmw_function=uriFreeQueryListA
18836 else
18837 ac_vmw_function=strlen
18838 fi
18839 as_ac_Lib=`$as_echo "ac_cv_lib_uriparser_$ac_vmw_function" | $as_tr_sh`
18840{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -luriparser" >&5
18841$as_echo_n "checking for $ac_vmw_function in -luriparser... " >&6; }
18842if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
18843 $as_echo_n "(cached) " >&6
18844else
18845 ac_check_lib_save_LIBS=$LIBS
18846LIBS="-luriparser $ac_vmw_custom_libs $LIBS"
18847cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18848/* end confdefs.h. */
18849
18850/* Override any GCC internal prototype to avoid an error.
18851 Use char because int might match the return type of a GCC
18852 builtin and then its argument prototype would still apply. */
18853#ifdef __cplusplus
18854extern "C"
18855#endif
18856char $ac_vmw_function ();
18857int
18858main ()
18859{
18860return $ac_vmw_function ();
18861 ;
18862 return 0;
18863}
18864_ACEOF
18865if ac_fn_c_try_link "$LINENO"; then :
18866 eval "$as_ac_Lib=yes"
18867else
18868 eval "$as_ac_Lib=no"
18869fi
18870rm -f core conftest.err conftest.$ac_objext \
18871 conftest$ac_exeext conftest.$ac_ext
18872LIBS=$ac_check_lib_save_LIBS
18873fi
18874eval ac_res=\$$as_ac_Lib
18875 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
18876$as_echo "$ac_res" >&6; }
18877if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
18878 ac_vmw_have_lib_func=1
18879fi
18880
18881 fi
18882
18883 if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
18884 URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}"
18885 URIPARSER_LIBS="$ac_vmw_custom_libs"
18886 ac_vmw_have_lib=1
18887 fi
18888 fi
18889
18890 # If that didn't work, try with pkg-config.
18891 if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
18892 if test -n ""; then
18893 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for >= (via pkg-config)" >&5
18894$as_echo_n "checking for >= (via pkg-config)... " >&6; }
18895 if pkg-config --exists ' >= '; then
18896 ac_vmw_have_lib=1
18897 fi
18898 else
18899 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (via pkg-config)" >&5
18900$as_echo_n "checking for (via pkg-config)... " >&6; }
18901 if pkg-config --exists ''; then
18902 ac_vmw_have_lib=1
18903 fi
18904 fi
18905
18906 if test $ac_vmw_have_lib -eq 1; then
18907 # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
18908 # fails on OpenSolaris B71. So be pessimistic.
18909 ac_vmw_cppflags="`pkg-config --cflags `"
18910 ac_vmw_ret1=$?
18911 ac_vmw_libs="`pkg-config --libs `"
18912 ac_vmw_ret2=$?
18913 if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
18914 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
18915$as_echo "yes" >&6; }
18916 URIPARSER_CPPFLAGS="$ac_vmw_cppflags"
18917 URIPARSER_LIBS="$ac_vmw_libs"
18918 else
18919 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18920$as_echo "no" >&6; }
18921 fi
18922 else
18923 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18924$as_echo "no" >&6; }
18925 fi
18926 fi
18927
18928 # If we still haven't found the lib, try with the library's custom "config" script.
18929 # Before checking, flush the AC_PATH_PROG cached variable.
18930 unset ac_cv_path_ac_vmw_lib_cfg
18931 unset ac_vmw_lib_cfg
18932 if test $ac_vmw_have_lib -eq 0 && test -n ""; then
18933 # Extract the first word of "", so it can be a program name with args.
18934set dummy ; ac_word=$2
18935{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18936$as_echo_n "checking for $ac_word... " >&6; }
18937if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
18938 $as_echo_n "(cached) " >&6
18939else
18940 case $ac_vmw_lib_cfg in
18941 [\\/]* | ?:[\\/]*)
18942 ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
18943 ;;
18944 *)
18945 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18946for as_dir in $PATH
18947do
18948 IFS=$as_save_IFS
18949 test -z "$as_dir" && as_dir=.
18950 for ac_exec_ext in '' $ac_executable_extensions; do
18951 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18952 ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
18953 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18954 break 2
18955 fi
18956done
18957 done
18958IFS=$as_save_IFS
18959
18960 test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
18961 ;;
18962esac
18963fi
18964ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
18965if test -n "$ac_vmw_lib_cfg"; then
18966 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
18967$as_echo "$ac_vmw_lib_cfg" >&6; }
18968else
18969 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18970$as_echo "no" >&6; }
18971fi
18972
18973
18974 if test "$ac_vmw_lib_cfg" != "no"; then
18975 # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
18976 # so single it out here to avoid having to replicate all the rest of the
18977 # logic elsewhere.
18978 if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
18979 URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
18980 URIPARSER_LIBS="`$ac_vmw_lib_cfg --ldflags`"
18981 else
18982 URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
18983 URIPARSER_LIBS="`$ac_vmw_lib_cfg --libs`"
18984 fi
18985 ac_vmw_have_lib=1
18986 fi
18987 fi
18988
18989 # Finish by executing the user provided action. The call to "true" is needed
18990 # because the actions are optional, and we need something inside the block.
18991 if test $ac_vmw_have_lib -eq 1; then
18992
18993
18994 true
18995
18996 else
18997 true
18998 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
18999 fi
19000
19001
19002 # Check for libpng.
19003
19004
19005 if test -z "png12"; then
19006 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
19007 fi
19008 if test -z "LIBPNG"; then
19009 as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
19010 fi
19011
19012 ac_vmw_have_lib=0
19013 ac_vmw_have_lib_func=0
19014 ac_vmw_have_lib_header=0
19015 ac_vmw_custom_libs=
19016
19017 #
19018 # First, try any user-defined CUSTOM_* flags.
19019 #
19020 if test -n "${CUSTOM_LIBPNG_CPPFLAGS}" || test -n "${CUSTOM_LIBPNG_LIBS}"; then
19021 ac_vmw_custom_libs="${CUSTOM_LIBPNG_LIBS} -lpng12"
19022 if test -n "png.h"; then
19023 ORIGINAL_CPPFLAGS="$CPPFLAGS"
19024 CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS} $CPPFLAGS"
19025
19026 ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
19027if test "x$ac_cv_header_png_h" = x""yes; then :
19028 ac_vmw_have_lib_header=1
19029fi
19030
19031
19032
19033 CPPFLAGS="$ORIGINAL_CPPFLAGS"
19034 else
19035 ac_vmw_have_lib_header=1
19036 fi
19037
19038 # Check a specific function in the library if requested.
19039 # If it hasn't, just pick a random function from libc, just to make
19040 # sure the linker can find the library being tested.
19041 if test $ac_vmw_have_lib_header -eq 1; then
19042 if test -n "png_access_version_number"; then
19043 ac_vmw_function=png_access_version_number
19044 else
19045 ac_vmw_function=strlen
19046 fi
19047 as_ac_Lib=`$as_echo "ac_cv_lib_png12_$ac_vmw_function" | $as_tr_sh`
19048{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lpng12" >&5
19049$as_echo_n "checking for $ac_vmw_function in -lpng12... " >&6; }
19050if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
19051 $as_echo_n "(cached) " >&6
19052else
19053 ac_check_lib_save_LIBS=$LIBS
19054LIBS="-lpng12 $ac_vmw_custom_libs $LIBS"
19055cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19056/* end confdefs.h. */
19057
19058/* Override any GCC internal prototype to avoid an error.
19059 Use char because int might match the return type of a GCC
19060 builtin and then its argument prototype would still apply. */
19061#ifdef __cplusplus
19062extern "C"
19063#endif
19064char $ac_vmw_function ();
19065int
19066main ()
19067{
19068return $ac_vmw_function ();
19069 ;
19070 return 0;
19071}
19072_ACEOF
19073if ac_fn_c_try_link "$LINENO"; then :
19074 eval "$as_ac_Lib=yes"
19075else
19076 eval "$as_ac_Lib=no"
19077fi
19078rm -f core conftest.err conftest.$ac_objext \
19079 conftest$ac_exeext conftest.$ac_ext
19080LIBS=$ac_check_lib_save_LIBS
19081fi
19082eval ac_res=\$$as_ac_Lib
19083 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
19084$as_echo "$ac_res" >&6; }
19085if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
19086 ac_vmw_have_lib_func=1
19087fi
19088
19089 fi
19090
19091 if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
19092 LIBPNG_CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS}"
19093 LIBPNG_LIBS="$ac_vmw_custom_libs"
19094 ac_vmw_have_lib=1
19095 fi
19096 fi
19097
19098 # If that didn't work, try with pkg-config.
19099 if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "libpng12"; then
19100 if test -n ""; then
19101 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 >= (via pkg-config)" >&5
19102$as_echo_n "checking for libpng12 >= (via pkg-config)... " >&6; }
19103 if pkg-config --exists 'libpng12 >= '; then
19104 ac_vmw_have_lib=1
19105 fi
19106 else
19107 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 (via pkg-config)" >&5
19108$as_echo_n "checking for libpng12 (via pkg-config)... " >&6; }
19109 if pkg-config --exists 'libpng12'; then
19110 ac_vmw_have_lib=1
19111 fi
19112 fi
19113
19114 if test $ac_vmw_have_lib -eq 1; then
19115 # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
19116 # fails on OpenSolaris B71. So be pessimistic.
19117 ac_vmw_cppflags="`pkg-config --cflags libpng12`"
19118 ac_vmw_ret1=$?
19119 ac_vmw_libs="`pkg-config --libs libpng12`"
19120 ac_vmw_ret2=$?
19121 if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
19122 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
19123$as_echo "yes" >&6; }
19124 LIBPNG_CPPFLAGS="$ac_vmw_cppflags"
19125 LIBPNG_LIBS="$ac_vmw_libs"
19126 else
19127 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19128$as_echo "no" >&6; }
19129 fi
19130 else
19131 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19132$as_echo "no" >&6; }
19133 fi
19134 fi
19135
19136 # If we still haven't found the lib, try with the library's custom "config" script.
19137 # Before checking, flush the AC_PATH_PROG cached variable.
19138 unset ac_cv_path_ac_vmw_lib_cfg
19139 unset ac_vmw_lib_cfg
19140 if test $ac_vmw_have_lib -eq 0 && test -n "libpng-config"; then
19141 # Extract the first word of "libpng-config", so it can be a program name with args.
19142set dummy libpng-config; ac_word=$2
19143{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19144$as_echo_n "checking for $ac_word... " >&6; }
19145if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
19146 $as_echo_n "(cached) " >&6
19147else
19148 case $ac_vmw_lib_cfg in
19149 [\\/]* | ?:[\\/]*)
19150 ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
19151 ;;
19152 *)
19153 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19154for as_dir in $PATH
19155do
19156 IFS=$as_save_IFS
19157 test -z "$as_dir" && as_dir=.
19158 for ac_exec_ext in '' $ac_executable_extensions; do
19159 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19160 ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
19161 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19162 break 2
19163 fi
19164done
19165 done
19166IFS=$as_save_IFS
19167
19168 test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
19169 ;;
19170esac
19171fi
19172ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
19173if test -n "$ac_vmw_lib_cfg"; then
19174 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
19175$as_echo "$ac_vmw_lib_cfg" >&6; }
19176else
19177 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19178$as_echo "no" >&6; }
19179fi
19180
19181
19182 if test "$ac_vmw_lib_cfg" != "no"; then
19183 # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
19184 # so single it out here to avoid having to replicate all the rest of the
19185 # logic elsewhere.
19186 if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
19187 LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
19188 LIBPNG_LIBS="`$ac_vmw_lib_cfg --ldflags`"
19189 else
19190 LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
19191 LIBPNG_LIBS="`$ac_vmw_lib_cfg --libs`"
19192 fi
19193 ac_vmw_have_lib=1
19194 fi
19195 fi
19196
19197 # Finish by executing the user provided action. The call to "true" is needed
19198 # because the actions are optional, and we need something inside the block.
19199 if test $ac_vmw_have_lib -eq 1; then
19200
19201
19202 true
19203
19204 else
19205 true
19206 as_fn_error $? "libpng not found. Please configure without Unity (using --disable-unity) or install the libpng devel package" "$LINENO" 5
19207 fi
19208
19209
19210 # Check for the zlib library and headers. Like uriparser, there
19211 # isn't a pkg-config or zlib-config file.
19212
19213 if test -z "$CUSTOM_ZLIB_CPPFLAGS"; then
19214 if test "$os" = freebsd; then
19215 CUSTOM_ZLIB_CPPFLAGS="-I/usr/local/include"
19216 else
19217 CUSTOM_ZLIB_CPPFLAGS="-I/usr/include"
19218 fi
19219 if test -n ""; then
19220 CUSTOM_ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}/"
19221 fi
19222 fi
19223
19224
19225
19226 if test -z "z"; then
19227 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
19228 fi
19229 if test -z "ZLIB"; then
19230 as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
19231 fi
19232
19233 ac_vmw_have_lib=0
19234 ac_vmw_have_lib_func=0
19235 ac_vmw_have_lib_header=0
19236 ac_vmw_custom_libs=
19237
19238 #
19239 # First, try any user-defined CUSTOM_* flags.
19240 #
19241 if test -n "${CUSTOM_ZLIB_CPPFLAGS}" || test -n "${CUSTOM_ZLIB_LIBS}"; then
19242 ac_vmw_custom_libs="${CUSTOM_ZLIB_LIBS} -lz"
19243 if test -n "zlib.h"; then
19244 ORIGINAL_CPPFLAGS="$CPPFLAGS"
19245 CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS} $CPPFLAGS"
19246
19247 ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
19248if test "x$ac_cv_header_zlib_h" = x""yes; then :
19249 ac_vmw_have_lib_header=1
19250fi
19251
19252
19253
19254 CPPFLAGS="$ORIGINAL_CPPFLAGS"
19255 else
19256 ac_vmw_have_lib_header=1
19257 fi
19258
19259 # Check a specific function in the library if requested.
19260 # If it hasn't, just pick a random function from libc, just to make
19261 # sure the linker can find the library being tested.
19262 if test $ac_vmw_have_lib_header -eq 1; then
19263 if test -n "zlibVersion"; then
19264 ac_vmw_function=zlibVersion
19265 else
19266 ac_vmw_function=strlen
19267 fi
19268 as_ac_Lib=`$as_echo "ac_cv_lib_z_$ac_vmw_function" | $as_tr_sh`
19269{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lz" >&5
19270$as_echo_n "checking for $ac_vmw_function in -lz... " >&6; }
19271if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
19272 $as_echo_n "(cached) " >&6
19273else
19274 ac_check_lib_save_LIBS=$LIBS
19275LIBS="-lz $ac_vmw_custom_libs $LIBS"
19276cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19277/* end confdefs.h. */
19278
19279/* Override any GCC internal prototype to avoid an error.
19280 Use char because int might match the return type of a GCC
19281 builtin and then its argument prototype would still apply. */
19282#ifdef __cplusplus
19283extern "C"
19284#endif
19285char $ac_vmw_function ();
19286int
19287main ()
19288{
19289return $ac_vmw_function ();
19290 ;
19291 return 0;
19292}
19293_ACEOF
19294if ac_fn_c_try_link "$LINENO"; then :
19295 eval "$as_ac_Lib=yes"
19296else
19297 eval "$as_ac_Lib=no"
19298fi
19299rm -f core conftest.err conftest.$ac_objext \
19300 conftest$ac_exeext conftest.$ac_ext
19301LIBS=$ac_check_lib_save_LIBS
19302fi
19303eval ac_res=\$$as_ac_Lib
19304 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
19305$as_echo "$ac_res" >&6; }
19306if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
19307 ac_vmw_have_lib_func=1
19308fi
19309
19310 fi
19311
19312 if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
19313 ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}"
19314 ZLIB_LIBS="$ac_vmw_custom_libs"
19315 ac_vmw_have_lib=1
19316 fi
19317 fi
19318
19319 # If that didn't work, try with pkg-config.
19320 if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
19321 if test -n ""; then
19322 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for >= (via pkg-config)" >&5
19323$as_echo_n "checking for >= (via pkg-config)... " >&6; }
19324 if pkg-config --exists ' >= '; then
19325 ac_vmw_have_lib=1
19326 fi
19327 else
19328 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (via pkg-config)" >&5
19329$as_echo_n "checking for (via pkg-config)... " >&6; }
19330 if pkg-config --exists ''; then
19331 ac_vmw_have_lib=1
19332 fi
19333 fi
19334
19335 if test $ac_vmw_have_lib -eq 1; then
19336 # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
19337 # fails on OpenSolaris B71. So be pessimistic.
19338 ac_vmw_cppflags="`pkg-config --cflags `"
19339 ac_vmw_ret1=$?
19340 ac_vmw_libs="`pkg-config --libs `"
19341 ac_vmw_ret2=$?
19342 if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
19343 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
19344$as_echo "yes" >&6; }
19345 ZLIB_CPPFLAGS="$ac_vmw_cppflags"
19346 ZLIB_LIBS="$ac_vmw_libs"
19347 else
19348 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19349$as_echo "no" >&6; }
19350 fi
19351 else
19352 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19353$as_echo "no" >&6; }
19354 fi
19355 fi
19356
19357 # If we still haven't found the lib, try with the library's custom "config" script.
19358 # Before checking, flush the AC_PATH_PROG cached variable.
19359 unset ac_cv_path_ac_vmw_lib_cfg
19360 unset ac_vmw_lib_cfg
19361 if test $ac_vmw_have_lib -eq 0 && test -n ""; then
19362 # Extract the first word of "", so it can be a program name with args.
19363set dummy ; ac_word=$2
19364{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19365$as_echo_n "checking for $ac_word... " >&6; }
19366if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
19367 $as_echo_n "(cached) " >&6
19368else
19369 case $ac_vmw_lib_cfg in
19370 [\\/]* | ?:[\\/]*)
19371 ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
19372 ;;
19373 *)
19374 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19375for as_dir in $PATH
19376do
19377 IFS=$as_save_IFS
19378 test -z "$as_dir" && as_dir=.
19379 for ac_exec_ext in '' $ac_executable_extensions; do
19380 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19381 ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
19382 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19383 break 2
19384 fi
19385done
19386 done
19387IFS=$as_save_IFS
19388
19389 test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
19390 ;;
19391esac
19392fi
19393ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
19394if test -n "$ac_vmw_lib_cfg"; then
19395 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
19396$as_echo "$ac_vmw_lib_cfg" >&6; }
19397else
19398 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19399$as_echo "no" >&6; }
19400fi
19401
19402
19403 if test "$ac_vmw_lib_cfg" != "no"; then
19404 # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
19405 # so single it out here to avoid having to replicate all the rest of the
19406 # logic elsewhere.
19407 if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
19408 ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
19409 ZLIB_LIBS="`$ac_vmw_lib_cfg --ldflags`"
19410 else
19411 ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
19412 ZLIB_LIBS="`$ac_vmw_lib_cfg --libs`"
19413 fi
19414 ac_vmw_have_lib=1
19415 fi
19416 fi
19417
19418 # Finish by executing the user provided action. The call to "true" is needed
19419 # because the actions are optional, and we need something inside the block.
19420 if test $ac_vmw_have_lib -eq 1; then
19421
19422
19423 true
19424
19425 else
19426 true
19427 as_fn_error $? "zlib library not found. Please configure without Unity (using --disable-unity) or install the zlib devel package." "$LINENO" 5
19428 fi
19429
19430
19431 # Check for gio 2.24.
19432
19433
19434 if test -z "gio-2.0"; then
19435 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
19436 fi
19437 if test -z "GIO"; then
19438 as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
19439 fi
19440
19441 ac_vmw_have_lib=0
19442 ac_vmw_have_lib_func=0
19443 ac_vmw_have_lib_header=0
19444 ac_vmw_custom_libs=
19445
19446 #
19447 # First, try any user-defined CUSTOM_* flags.
19448 #
19449 if test -n "${CUSTOM_GIO_CPPFLAGS}" || test -n "${CUSTOM_GIO_LIBS}"; then
19450 ac_vmw_custom_libs="${CUSTOM_GIO_LIBS} -lgio-2.0"
19451 if test -n "gio/gio.h"; then
19452 ORIGINAL_CPPFLAGS="$CPPFLAGS"
19453 CPPFLAGS="${CUSTOM_GIO_CPPFLAGS} $CPPFLAGS"
19454
19455 ac_fn_c_check_header_mongrel "$LINENO" "gio/gio.h" "ac_cv_header_gio_gio_h" "$ac_includes_default"
19456if test "x$ac_cv_header_gio_gio_h" = x""yes; then :
19457 ac_vmw_have_lib_header=1
19458fi
19459
19460
19461
19462 CPPFLAGS="$ORIGINAL_CPPFLAGS"
19463 else
19464 ac_vmw_have_lib_header=1
19465 fi
19466
19467 # Check a specific function in the library if requested.
19468 # If it hasn't, just pick a random function from libc, just to make
19469 # sure the linker can find the library being tested.
19470 if test $ac_vmw_have_lib_header -eq 1; then
19471 if test -n "g_desktop_app_info_get_filename"; then
19472 ac_vmw_function=g_desktop_app_info_get_filename
19473 else
19474 ac_vmw_function=strlen
19475 fi
19476 as_ac_Lib=`$as_echo "ac_cv_lib_gio-2.0_$ac_vmw_function" | $as_tr_sh`
19477{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lgio-2.0" >&5
19478$as_echo_n "checking for $ac_vmw_function in -lgio-2.0... " >&6; }
19479if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
19480 $as_echo_n "(cached) " >&6
19481else
19482 ac_check_lib_save_LIBS=$LIBS
19483LIBS="-lgio-2.0 $ac_vmw_custom_libs $LIBS"
19484cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19485/* end confdefs.h. */
19486
19487/* Override any GCC internal prototype to avoid an error.
19488 Use char because int might match the return type of a GCC
19489 builtin and then its argument prototype would still apply. */
19490#ifdef __cplusplus
19491extern "C"
19492#endif
19493char $ac_vmw_function ();
19494int
19495main ()
19496{
19497return $ac_vmw_function ();
19498 ;
19499 return 0;
19500}
19501_ACEOF
19502if ac_fn_c_try_link "$LINENO"; then :
19503 eval "$as_ac_Lib=yes"
19504else
19505 eval "$as_ac_Lib=no"
19506fi
19507rm -f core conftest.err conftest.$ac_objext \
19508 conftest$ac_exeext conftest.$ac_ext
19509LIBS=$ac_check_lib_save_LIBS
19510fi
19511eval ac_res=\$$as_ac_Lib
19512 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
19513$as_echo "$ac_res" >&6; }
19514if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
19515 ac_vmw_have_lib_func=1
19516fi
19517
19518 fi
19519
19520 if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
19521 GIO_CPPFLAGS="${CUSTOM_GIO_CPPFLAGS}"
19522 GIO_LIBS="$ac_vmw_custom_libs"
19523 ac_vmw_have_lib=1
19524 fi
19525 fi
19526
19527 # If that didn't work, try with pkg-config.
19528 if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "gio-unix-2.0"; then
19529 if test -n "2.24.0"; then
19530 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)" >&5
19531$as_echo_n "checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)... " >&6; }
19532 if pkg-config --exists 'gio-unix-2.0 >= 2.24.0'; then
19533 ac_vmw_have_lib=1
19534 fi
19535 else
19536 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 (via pkg-config)" >&5
19537$as_echo_n "checking for gio-unix-2.0 (via pkg-config)... " >&6; }
19538 if pkg-config --exists 'gio-unix-2.0'; then
19539 ac_vmw_have_lib=1
19540 fi
19541 fi
19542
19543 if test $ac_vmw_have_lib -eq 1; then
19544 # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
19545 # fails on OpenSolaris B71. So be pessimistic.
19546 ac_vmw_cppflags="`pkg-config --cflags gio-unix-2.0`"
19547 ac_vmw_ret1=$?
19548 ac_vmw_libs="`pkg-config --libs gio-unix-2.0`"
19549 ac_vmw_ret2=$?
19550 if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
19551 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
19552$as_echo "yes" >&6; }
19553 GIO_CPPFLAGS="$ac_vmw_cppflags"
19554 GIO_LIBS="$ac_vmw_libs"
19555 else
19556 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19557$as_echo "no" >&6; }
19558 fi
19559 else
19560 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19561$as_echo "no" >&6; }
19562 fi
19563 fi
19564
19565 # If we still haven't found the lib, try with the library's custom "config" script.
19566 # Before checking, flush the AC_PATH_PROG cached variable.
19567 unset ac_cv_path_ac_vmw_lib_cfg
19568 unset ac_vmw_lib_cfg
19569 if test $ac_vmw_have_lib -eq 0 && test -n ""; then
19570 # Extract the first word of "", so it can be a program name with args.
19571set dummy ; ac_word=$2
19572{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
19573$as_echo_n "checking for $ac_word... " >&6; }
19574if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
19575 $as_echo_n "(cached) " >&6
19576else
19577 case $ac_vmw_lib_cfg in
19578 [\\/]* | ?:[\\/]*)
19579 ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
19580 ;;
19581 *)
19582 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
19583for as_dir in $PATH
19584do
19585 IFS=$as_save_IFS
19586 test -z "$as_dir" && as_dir=.
19587 for ac_exec_ext in '' $ac_executable_extensions; do
19588 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
19589 ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
19590 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
19591 break 2
19592 fi
19593done
19594 done
19595IFS=$as_save_IFS
19596
19597 test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
19598 ;;
19599esac
19600fi
19601ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
19602if test -n "$ac_vmw_lib_cfg"; then
19603 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
19604$as_echo "$ac_vmw_lib_cfg" >&6; }
19605else
19606 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
19607$as_echo "no" >&6; }
19608fi
19609
19610
19611 if test "$ac_vmw_lib_cfg" != "no"; then
19612 # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
19613 # so single it out here to avoid having to replicate all the rest of the
19614 # logic elsewhere.
19615 if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
19616 GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
19617 GIO_LIBS="`$ac_vmw_lib_cfg --ldflags`"
19618 else
19619 GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
19620 GIO_LIBS="`$ac_vmw_lib_cfg --libs`"
19621 fi
19622 ac_vmw_have_lib=1
19623 fi
19624 fi
19625
19626 # Finish by executing the user provided action. The call to "true" is needed
19627 # because the actions are optional, and we need something inside the block.
19628 if test $ac_vmw_have_lib -eq 1; then
19629
19630
19631 true
19632
19633 else
19634 true
19635 as_fn_error $? "GLib/GIO 2.24+ not found. Please configure without Unity (using --disable-unity) or upgrade the Glib devel package." "$LINENO" 5
19636 fi
19637
19638 fi # End of library checks for Unity.
19639
19640 # Check whether we have gtk+ 2.0.18675 # Check whether we have gtk+ 2.0.
19641 if test "$with_gtk2" != "no"; then18676 if test "$with_gtk2" != "no"; then
19642 # gdk_display_get_default_group (added in gtk+ 2.4.0) is function currently18677 # gdk_display_get_default_group (added in gtk+ 2.4.0) is function currently
@@ -19847,53 +18882,6 @@
19847 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 18882 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
19848 fi18883 fi
1984918884
19850
19851 # Unity requires libgdk_pixbuf_xlib, which most systems don't seem to
19852 # provide via "pkg-config --libs gtk+-2.0".
19853 if test "$enable_unity" != "no"; then
19854 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0" >&5
19855$as_echo_n "checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0... " >&6; }
19856if test "${ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init+set}" = set; then :
19857 $as_echo_n "(cached) " >&6
19858else
19859 ac_check_lib_save_LIBS=$LIBS
19860LIBS="-lgdk_pixbuf_xlib-2.0 $GTK_LIBS $LIBS"
19861cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19862/* end confdefs.h. */
19863
19864/* Override any GCC internal prototype to avoid an error.
19865 Use char because int might match the return type of a GCC
19866 builtin and then its argument prototype would still apply. */
19867#ifdef __cplusplus
19868extern "C"
19869#endif
19870char gdk_pixbuf_xlib_init ();
19871int
19872main ()
19873{
19874return gdk_pixbuf_xlib_init ();
19875 ;
19876 return 0;
19877}
19878_ACEOF
19879if ac_fn_c_try_link "$LINENO"; then :
19880 ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=yes
19881else
19882 ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=no
19883fi
19884rm -f core conftest.err conftest.$ac_objext \
19885 conftest$ac_exeext conftest.$ac_ext
19886LIBS=$ac_check_lib_save_LIBS
19887fi
19888{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&5
19889$as_echo "$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&6; }
19890if test "x$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" = x""yes; then :
19891 GTK_LIBS="$GTK_LIBS -lgdk_pixbuf_xlib-2.0"
19892else
19893 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
19894fi
19895
19896 fi
19897 fi18885 fi
1989818886
19899 #18887 #
@@ -21834,6 +20822,8 @@
2183420822
21835 # Easier to give all modules the ICU defines/includes...20823 # Easier to give all modules the ICU defines/includes...
21836 CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"20824 CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
20825else
20826 CPPFLAGS="$CPPFLAGS -DNO_ICU"
21837fi20827fi
2183820828
21839# Extract the first word of "rpcgen", so it can be a program name with args.20829# Extract the first word of "rpcgen", so it can be a program name with args.
@@ -22090,6 +21080,50 @@
2209021080
22091fi21081fi
2209221082
21083bsdPrintfWrappers=no
21084if test "$os" = "linux"; then
21085 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ecvt in -lc" >&5
21086$as_echo_n "checking for ecvt in -lc... " >&6; }
21087if test "${ac_cv_lib_c_ecvt+set}" = set; then :
21088 $as_echo_n "(cached) " >&6
21089else
21090 ac_check_lib_save_LIBS=$LIBS
21091LIBS="-lc $LIBS"
21092cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21093/* end confdefs.h. */
21094
21095/* Override any GCC internal prototype to avoid an error.
21096 Use char because int might match the return type of a GCC
21097 builtin and then its argument prototype would still apply. */
21098#ifdef __cplusplus
21099extern "C"
21100#endif
21101char ecvt ();
21102int
21103main ()
21104{
21105return ecvt ();
21106 ;
21107 return 0;
21108}
21109_ACEOF
21110if ac_fn_c_try_link "$LINENO"; then :
21111 ac_cv_lib_c_ecvt=yes
21112else
21113 ac_cv_lib_c_ecvt=no
21114fi
21115rm -f core conftest.err conftest.$ac_objext \
21116 conftest$ac_exeext conftest.$ac_ext
21117LIBS=$ac_check_lib_save_LIBS
21118fi
21119{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_ecvt" >&5
21120$as_echo "$ac_cv_lib_c_ecvt" >&6; }
21121if test "x$ac_cv_lib_c_ecvt" = x""yes; then :
21122 bsdPrintfWrappers=yes
21123fi
21124
21125fi
21126
22093###21127###
22094### Typdefs, structs, and compiler quarks.21128### Typdefs, structs, and compiler quarks.
22095###21129###
@@ -22555,7 +21589,7 @@
22555 CFLAGS="$ORIGINAL_CFLAGS$NEW_CFLAG"21589 CFLAGS="$ORIGINAL_CFLAGS$NEW_CFLAG"
22556done21590done
22557CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"21591CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"
22558CPPFLAGS="$CPPFLAGS -DNO_CORE_ICU"21592CPPFLAGS="$CPPFLAGS"
2255921593
22560# -fvisibility is used by "core service" plugins, but not required.21594# -fvisibility is used by "core service" plugins, but not required.
22561ORIGINAL_CFLAGS="$CFLAGS"21595ORIGINAL_CFLAGS="$CFLAGS"
@@ -22584,6 +21618,34 @@
22584rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext21618rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22585CFLAGS="$ORIGINAL_CFLAGS"21619CFLAGS="$ORIGINAL_CFLAGS"
2258621620
21621# Detect "unused-but-set-variable" gcc warning and disable it.
21622ORIGINAL_CFLAGS="$CFLAGS"
21623CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
21624{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
21625$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
21626cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21627/* end confdefs.h. */
21628
21629int
21630main ()
21631{
21632return 0;
21633 ;
21634 return 0;
21635}
21636_ACEOF
21637if ac_fn_c_try_compile "$LINENO"; then :
21638 ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
21639 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
21640$as_echo "yes" >&6; }
21641else
21642 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
21643$as_echo "no" >&6; }
21644fi
21645rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
21646CFLAGS="$ORIGINAL_CFLAGS"
21647
21648
22587BUILDDIR="`pwd`"21649BUILDDIR="`pwd`"
2258821650
22589INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"21651INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
@@ -22767,6 +21829,7 @@
22767fi21829fi
2276821830
22769if test "$os" = "freebsd"; then21831if test "$os" = "freebsd"; then
21832 LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
22770 MODULES_DIR="/boot/modules"21833 MODULES_DIR="/boot/modules"
2277121834
22772 if test "$osVersion" -ge 302000; then21835 if test "$osVersion" -ge 302000; then
@@ -22924,14 +21987,6 @@
22924 HAVE_XCOMPOSITE_FALSE=21987 HAVE_XCOMPOSITE_FALSE=
22925fi21988fi
2292621989
22927 if test "$enable_unity" = "yes"; then
22928 ENABLE_UNITY_TRUE=
22929 ENABLE_UNITY_FALSE='#'
22930else
22931 ENABLE_UNITY_TRUE='#'
22932 ENABLE_UNITY_FALSE=
22933fi
22934
22935 if test "$have_cunit" = "yes"; then21990 if test "$have_cunit" = "yes"; then
22936 ENABLE_TESTS_TRUE=21991 ENABLE_TESTS_TRUE=
22937 ENABLE_TESTS_FALSE='#'21992 ENABLE_TESTS_FALSE='#'
@@ -23004,6 +22059,14 @@
23004 USE_SLASH_PROC_FALSE=22059 USE_SLASH_PROC_FALSE=
23005fi22060fi
2300622061
22062 if test "$bsdPrintfWrappers" = "yes"; then
22063 USE_PRINTF_WRAPPERS_TRUE=
22064 USE_PRINTF_WRAPPERS_FALSE='#'
22065else
22066 USE_PRINTF_WRAPPERS_TRUE='#'
22067 USE_PRINTF_WRAPPERS_FALSE=
22068fi
22069
2300722070
23008if test "$have_xsm" != "yes"; then22071if test "$have_xsm" != "yes"; then
23009$as_echo "@%:@define NO_XSM 1" >>confdefs.h22072$as_echo "@%:@define NO_XSM 1" >>confdefs.h
@@ -23113,7 +22176,7 @@
23113###22176###
23114### Create the Makefiles22177### Create the Makefiles
23115###22178###
23116ac_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"22179ac_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"
2311722180
2311822181
23119###22182###
@@ -23325,10 +22388,6 @@
23325 as_fn_error $? "conditional \"HAVE_XCOMPOSITE\" was never defined.22388 as_fn_error $? "conditional \"HAVE_XCOMPOSITE\" was never defined.
23326Usually this means the macro was only invoked conditionally." "$LINENO" 5 22389Usually this means the macro was only invoked conditionally." "$LINENO" 5
23327fi22390fi
23328if test -z "${ENABLE_UNITY_TRUE}" && test -z "${ENABLE_UNITY_FALSE}"; then
23329 as_fn_error $? "conditional \"ENABLE_UNITY\" was never defined.
23330Usually this means the macro was only invoked conditionally." "$LINENO" 5
23331fi
23332if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then22391if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
23333 as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.22392 as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
23334Usually this means the macro was only invoked conditionally." "$LINENO" 5 22393Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23365,6 +22424,10 @@
23365 as_fn_error $? "conditional \"USE_SLASH_PROC\" was never defined.22424 as_fn_error $? "conditional \"USE_SLASH_PROC\" was never defined.
23366Usually this means the macro was only invoked conditionally." "$LINENO" 5 22425Usually this means the macro was only invoked conditionally." "$LINENO" 5
23367fi22426fi
22427if test -z "${USE_PRINTF_WRAPPERS_TRUE}" && test -z "${USE_PRINTF_WRAPPERS_FALSE}"; then
22428 as_fn_error $? "conditional \"USE_PRINTF_WRAPPERS\" was never defined.
22429Usually this means the macro was only invoked conditionally." "$LINENO" 5
22430fi
2336822431
23369: ${CONFIG_STATUS=./config.status}22432: ${CONFIG_STATUS=./config.status}
23370ac_write_fail=022433ac_write_fail=0
@@ -23773,7 +22836,7 @@
23773# report actual input values of CONFIG_FILES etc. instead of their22836# report actual input values of CONFIG_FILES etc. instead of their
23774# values after options handling.22837# values after options handling.
23775ac_log="22838ac_log="
23776This file was extended by open-vm-tools $as_me 2011.07.19, which was22839This file was extended by open-vm-tools $as_me 2011.12.20, which was
23777generated by GNU Autoconf 2.67. Invocation command line was22840generated by GNU Autoconf 2.67. Invocation command line was
2377822841
23779 CONFIG_FILES = $CONFIG_FILES22842 CONFIG_FILES = $CONFIG_FILES
@@ -23830,7 +22893,7 @@
23830cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=122893cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
23831ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"22894ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
23832ac_cs_version="\\22895ac_cs_version="\\
23833open-vm-tools config.status 2011.07.1922896open-vm-tools config.status 2011.12.20
23834configured by $0, generated by GNU Autoconf 2.67,22897configured by $0, generated by GNU Autoconf 2.67,
23835 with options \\"\$ac_cs_config\\"22898 with options \\"\$ac_cs_config\\"
2383622899
@@ -24311,6 +23374,7 @@
24311 "lib/err/Makefile") CONFIG_FILES="$CONFIG_FILES lib/err/Makefile" ;;23374 "lib/err/Makefile") CONFIG_FILES="$CONFIG_FILES lib/err/Makefile" ;;
24312 "lib/file/Makefile") CONFIG_FILES="$CONFIG_FILES lib/file/Makefile" ;;23375 "lib/file/Makefile") CONFIG_FILES="$CONFIG_FILES lib/file/Makefile" ;;
24313 "lib/foundryMsg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/foundryMsg/Makefile" ;;23376 "lib/foundryMsg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/foundryMsg/Makefile" ;;
23377 "lib/glibUtils/Makefile") CONFIG_FILES="$CONFIG_FILES lib/glibUtils/Makefile" ;;
24314 "lib/guestApp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestApp/Makefile" ;;23378 "lib/guestApp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestApp/Makefile" ;;
24315 "lib/guestRpc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestRpc/Makefile" ;;23379 "lib/guestRpc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestRpc/Makefile" ;;
24316 "lib/hgfs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfs/Makefile" ;;23380 "lib/hgfs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfs/Makefile" ;;
@@ -24319,7 +23383,6 @@
24319 "lib/hgfsServer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServer/Makefile" ;;23383 "lib/hgfsServer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServer/Makefile" ;;
24320 "lib/hgfsServerManagerGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerManagerGuest/Makefile" ;;23384 "lib/hgfsServerManagerGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerManagerGuest/Makefile" ;;
24321 "lib/hgfsServerPolicyGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerPolicyGuest/Makefile" ;;23385 "lib/hgfsServerPolicyGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerPolicyGuest/Makefile" ;;
24322 "lib/image/Makefile") CONFIG_FILES="$CONFIG_FILES lib/image/Makefile" ;;
24323 "lib/impersonate/Makefile") CONFIG_FILES="$CONFIG_FILES lib/impersonate/Makefile" ;;23386 "lib/impersonate/Makefile") CONFIG_FILES="$CONFIG_FILES lib/impersonate/Makefile" ;;
24324 "lib/lock/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lock/Makefile" ;;23387 "lib/lock/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lock/Makefile" ;;
24325 "lib/message/Makefile") CONFIG_FILES="$CONFIG_FILES lib/message/Makefile" ;;23388 "lib/message/Makefile") CONFIG_FILES="$CONFIG_FILES lib/message/Makefile" ;;
@@ -24329,8 +23392,6 @@
24329 "lib/panicDefault/Makefile") CONFIG_FILES="$CONFIG_FILES lib/panicDefault/Makefile" ;;23392 "lib/panicDefault/Makefile") CONFIG_FILES="$CONFIG_FILES lib/panicDefault/Makefile" ;;
24330 "lib/printer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/printer/Makefile" ;;23393 "lib/printer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/printer/Makefile" ;;
24331 "lib/procMgr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/procMgr/Makefile" ;;23394 "lib/procMgr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/procMgr/Makefile" ;;
24332 "lib/raster/Makefile") CONFIG_FILES="$CONFIG_FILES lib/raster/Makefile" ;;
24333 "lib/region/Makefile") CONFIG_FILES="$CONFIG_FILES lib/region/Makefile" ;;
24334 "lib/rpcChannel/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcChannel/Makefile" ;;23395 "lib/rpcChannel/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcChannel/Makefile" ;;
24335 "lib/rpcIn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcIn/Makefile" ;;23396 "lib/rpcIn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcIn/Makefile" ;;
24336 "lib/rpcOut/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcOut/Makefile" ;;23397 "lib/rpcOut/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcOut/Makefile" ;;
@@ -24357,7 +23418,6 @@
24357 "services/plugins/powerOps/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/powerOps/Makefile" ;;23418 "services/plugins/powerOps/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/powerOps/Makefile" ;;
24358 "services/plugins/resolutionSet/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/resolutionSet/Makefile" ;;23419 "services/plugins/resolutionSet/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/resolutionSet/Makefile" ;;
24359 "services/plugins/timeSync/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/timeSync/Makefile" ;;23420 "services/plugins/timeSync/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/timeSync/Makefile" ;;
24360 "services/plugins/unity/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/unity/Makefile" ;;
24361 "services/plugins/vix/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vix/Makefile" ;;23421 "services/plugins/vix/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vix/Makefile" ;;
24362 "services/plugins/vmbackup/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vmbackup/Makefile" ;;23422 "services/plugins/vmbackup/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vmbackup/Makefile" ;;
24363 "vmware-user-suid-wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES vmware-user-suid-wrapper/Makefile" ;;23423 "vmware-user-suid-wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES vmware-user-suid-wrapper/Makefile" ;;
2436423424
=== modified file 'autom4te.cache/output.2'
--- autom4te.cache/output.2 2011-07-22 16:41:03 +0000
+++ autom4te.cache/output.2 2012-01-18 00:02:26 +0000
@@ -1,6 +1,6 @@
1@%:@! /bin/sh1@%:@! /bin/sh
2@%:@ Guess values for system-dependent variables and create Makefiles.2@%:@ Guess values for system-dependent variables and create Makefiles.
3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.12.20.
4@%:@4@%:@
5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
6@%:@ 6@%:@
@@ -701,8 +701,8 @@
701# Identity of this package.701# Identity of this package.
702PACKAGE_NAME='open-vm-tools'702PACKAGE_NAME='open-vm-tools'
703PACKAGE_TARNAME='open-vm-tools'703PACKAGE_TARNAME='open-vm-tools'
704PACKAGE_VERSION='2011.07.19'704PACKAGE_VERSION='2011.12.20'
705PACKAGE_STRING='open-vm-tools 2011.07.19'705PACKAGE_STRING='open-vm-tools 2011.12.20'
706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
707PACKAGE_URL=''707PACKAGE_URL=''
708708
@@ -777,6 +777,8 @@
777TARGET_OS777TARGET_OS
778TOOLS_VERSION778TOOLS_VERSION
779HGFS_LIBS779HGFS_LIBS
780USE_PRINTF_WRAPPERS_FALSE
781USE_PRINTF_WRAPPERS_TRUE
780USE_SLASH_PROC_FALSE782USE_SLASH_PROC_FALSE
781USE_SLASH_PROC_TRUE783USE_SLASH_PROC_TRUE
782HAVE_PAM_FALSE784HAVE_PAM_FALSE
@@ -795,8 +797,6 @@
795WITH_ROOT_PRIVILEGES_TRUE797WITH_ROOT_PRIVILEGES_TRUE
796ENABLE_TESTS_FALSE798ENABLE_TESTS_FALSE
797ENABLE_TESTS_TRUE799ENABLE_TESTS_TRUE
798ENABLE_UNITY_FALSE
799ENABLE_UNITY_TRUE
800HAVE_XCOMPOSITE_FALSE800HAVE_XCOMPOSITE_FALSE
801HAVE_XCOMPOSITE_TRUE801HAVE_XCOMPOSITE_TRUE
802HAVE_XSM_FALSE802HAVE_XSM_FALSE
@@ -836,14 +836,6 @@
836GTKMM_CPPFLAGS836GTKMM_CPPFLAGS
837GTK_LIBS837GTK_LIBS
838GTK_CPPFLAGS838GTK_CPPFLAGS
839GIO_LIBS
840GIO_CPPFLAGS
841ZLIB_LIBS
842ZLIB_CPPFLAGS
843LIBPNG_LIBS
844LIBPNG_CPPFLAGS
845URIPARSER_LIBS
846URIPARSER_CPPFLAGS
847CUNIT_LIBS839CUNIT_LIBS
848CUNIT_CPPFLAGS840CUNIT_CPPFLAGS
849PAM_LIBS841PAM_LIBS
@@ -986,7 +978,6 @@
986with_kernel_release978with_kernel_release
987with_linuxdir979with_linuxdir
988enable_multimon980enable_multimon
989enable_unity
990with_gtk2981with_gtk2
991with_gtkmm982with_gtkmm
992enable_docs983enable_docs
@@ -1561,7 +1552,7 @@
1561 # Omit some internal or obsolete options to make the list less imposing.1552 # Omit some internal or obsolete options to make the list less imposing.
1562 # This message is too long to be a string in the A/UX 3.1 sh.1553 # This message is too long to be a string in the A/UX 3.1 sh.
1563 cat <<_ACEOF1554 cat <<_ACEOF
1564\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.1555\`configure' configures open-vm-tools 2011.12.20 to adapt to many kinds of systems.
15651556
1566Usage: $0 [OPTION]... [VAR=VALUE]...1557Usage: $0 [OPTION]... [VAR=VALUE]...
15671558
@@ -1635,7 +1626,7 @@
16351626
1636if test -n "$ac_init_help"; then1627if test -n "$ac_init_help"; then
1637 case $ac_init_help in1628 case $ac_init_help in
1638 short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;1629 short | recursive ) echo "Configuration of open-vm-tools 2011.12.20:";;
1639 esac1630 esac
1640 cat <<\_ACEOF1631 cat <<\_ACEOF
16411632
@@ -1644,7 +1635,6 @@
1644 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)1635 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1645 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]1636 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1646 --disable-multimon disables multimon, enabled by default1637 --disable-multimon disables multimon, enabled by default
1647 --disable-unity disables Unity, enabled by default
1648 --disable-docs disables generation of API documentation; by1638 --disable-docs disables generation of API documentation; by
1649 default, docs are built if doxygen is available.1639 default, docs are built if doxygen is available.
1650 --disable-tests disable compilation of test code.1640 --disable-tests disable compilation of test code.
@@ -1762,7 +1752,7 @@
1762test -n "$ac_init_help" && exit $ac_status1752test -n "$ac_init_help" && exit $ac_status
1763if $ac_init_version; then1753if $ac_init_version; then
1764 cat <<\_ACEOF1754 cat <<\_ACEOF
1765open-vm-tools configure 2011.07.191755open-vm-tools configure 2011.12.20
1766generated by GNU Autoconf 2.671756generated by GNU Autoconf 2.67
17671757
1768Copyright (C) 2010 Free Software Foundation, Inc.1758Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2454,7 +2444,7 @@
2454This file contains any messages produced by compilers while2444This file contains any messages produced by compilers while
2455running configure, to aid debugging if configure makes a mistake.2445running configure, to aid debugging if configure makes a mistake.
24562446
2457It was created by open-vm-tools $as_me 2011.07.19, which was2447It was created by open-vm-tools $as_me 2011.12.20, which was
2458generated by GNU Autoconf 2.67. Invocation command line was2448generated by GNU Autoconf 2.67. Invocation command line was
24592449
2460 $ $0 $@2450 $ $0 $@
@@ -3044,14 +3034,6 @@
3044fi3034fi
30453035
30463036
3047@%:@ Check whether --enable-unity was given.
3048if test "${enable_unity+set}" = set; then :
3049 enableval=$enable_unity; enable_unity="$enableval"
3050else
3051 enable_unity="yes"
3052fi
3053
3054
30553037
3056@%:@ Check whether --with-gtk2 was given.3038@%:@ Check whether --with-gtk2 was given.
3057if test "${with_gtk2+set}" = set; then :3039if test "${with_gtk2+set}" = set; then :
@@ -3086,11 +3068,6 @@
3086fi3068fi
30873069
30883070
3089# If we're not going to use Gtk 2.0, disable Unity.
3090if test "$with_gtk2" != "yes"; then
3091 enable_unity="no"
3092fi
3093
3094am__api_version='1.11'3071am__api_version='1.11'
30953072
3096# Find a good install program. We prefer a C program (faster),3073# Find a good install program. We prefer a C program (faster),
@@ -3529,7 +3506,7 @@
35293506
3530# Define the identity of the package.3507# Define the identity of the package.
3531 PACKAGE='open-vm-tools'3508 PACKAGE='open-vm-tools'
3532 VERSION='2011.07.19'3509 VERSION='2011.12.20'
35333510
35343511
3535cat >>confdefs.h <<_ACEOF3512cat >>confdefs.h <<_ACEOF
@@ -17819,8 +17796,7 @@
17819#17796#
17820# Check for PAM.17797# Check for PAM.
17821#17798#
17822if test "$os" = "linux"; then17799
17823
17824@%:@ Check whether --with-pam was given.17800@%:@ Check whether --with-pam was given.
17825if test "${with_pam+set}" = set; then :17801if test "${with_pam+set}" = set; then :
17826 withval=$with_pam; 17802 withval=$with_pam;
@@ -17829,8 +17805,8 @@
17829fi17805fi
1783017806
1783117807
17832 if test "$with_pam" = "yes"; then17808if test "$with_pam" = "yes"; then
17833 17809
17834 if test -z "$CUSTOM_PAM_CPPFLAGS"; then17810 if test -z "$CUSTOM_PAM_CPPFLAGS"; then
17835 if test "$os" = freebsd; then17811 if test "$os" = freebsd; then
17836 CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"17812 CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"
@@ -17842,7 +17818,7 @@
17842 fi17818 fi
17843 fi17819 fi
1784417820
17845 17821
17846 17822
17847 if test -z "pam"; then17823 if test -z "pam"; then
17848 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 17824 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
@@ -18054,7 +18030,6 @@
1805418030
18055 fi18031 fi
1805618032
18057 fi
18058fi18033fi
1805918034
18060#18035#
@@ -18298,7 +18273,6 @@
18298# If the user explicitly disables X11, then don't try to detect the X-related libraries18273# If the user explicitly disables X11, then don't try to detect the X-related libraries
18299if test "$have_x" = "disabled"; then18274if test "$have_x" = "disabled"; then
18300 enable_multimon="no"18275 enable_multimon="no"
18301 enable_unity="no"
18302elif test "$have_x" != "yes"; then18276elif test "$have_x" != "yes"; then
18303 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 18277 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
18304else18278else
@@ -18402,12 +18376,6 @@
18402 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 18376 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
18403fi18377fi
1840418378
18405 else
18406 if test "$enable_unity" != "no"; then
18407 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Unity due to --disable-multimon." >&5
18408$as_echo "$as_me: WARNING: Disabling Unity due to --disable-multimon." >&2;}
18409 enable_unity="no"
18410 fi
18411 fi18379 fi
1841218380
18413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&518381 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&5
@@ -18704,939 +18672,6 @@
18704 have_xcomposite="yes"18672 have_xcomposite="yes"
18705 fi18673 fi
1870618674
18707 # If we're building with support for Unity, we'll need a few additional
18708 # libraries.
18709 if test "$enable_unity" != "no"; then
18710 # Unity needs the X11 Screen Saver extension library. It should be
18711 # in the same place as the X11 libraries, so no need for any fancy
18712 # path checking.
18713
18714 have_header=1
18715 if test -n "X11/extensions/scrnsaver.h"; then
18716 ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "$ac_includes_default"
18717if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = x""yes; then :
18718
18719else
18720
18721 have_header=0;
18722 as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
18723
18724fi
18725
18726
18727 fi
18728
18729 if test $have_header = 1; then
18730 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryExtension in -lXss" >&5
18731$as_echo_n "checking for XScreenSaverQueryExtension in -lXss... " >&6; }
18732if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then :
18733 $as_echo_n "(cached) " >&6
18734else
18735 ac_check_lib_save_LIBS=$LIBS
18736LIBS="-lXss $COMMON_XLIBS $LIBS"
18737cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18738/* end confdefs.h. */
18739
18740/* Override any GCC internal prototype to avoid an error.
18741 Use char because int might match the return type of a GCC
18742 builtin and then its argument prototype would still apply. */
18743#ifdef __cplusplus
18744extern "C"
18745#endif
18746char XScreenSaverQueryExtension ();
18747int
18748main ()
18749{
18750return XScreenSaverQueryExtension ();
18751 ;
18752 return 0;
18753}
18754_ACEOF
18755if ac_fn_c_try_link "$LINENO"; then :
18756 ac_cv_lib_Xss_XScreenSaverQueryExtension=yes
18757else
18758 ac_cv_lib_Xss_XScreenSaverQueryExtension=no
18759fi
18760rm -f core conftest.err conftest.$ac_objext \
18761 conftest$ac_exeext conftest.$ac_ext
18762LIBS=$ac_check_lib_save_LIBS
18763fi
18764{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverQueryExtension" >&5
18765$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryExtension" >&6; }
18766if test "x$ac_cv_lib_Xss_XScreenSaverQueryExtension" = x""yes; then :
18767 COMMON_XLIBS="-lXss $COMMON_XLIBS"
18768else
18769 as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
18770fi
18771
18772 fi
18773
18774
18775 # Check for the uriparser library and headers. The upstream uriparser
18776 # doesn't appear to ship with either a pkg-config file or a
18777 # uriparser-config binary, so we'll look for it the old-fashioned
18778 # way.
18779 #
18780 # Note that we look for uriFreeQueryListA because it's a relatively
18781 # new symbol that our code needs (it isn't present in the uriparser
18782 # that shipped with Ubuntu Hardy).
18783
18784 if test -z "$CUSTOM_URIPARSER_CPPFLAGS"; then
18785 if test "$os" = freebsd; then
18786 CUSTOM_URIPARSER_CPPFLAGS="-I/usr/local/include"
18787 else
18788 CUSTOM_URIPARSER_CPPFLAGS="-I/usr/include"
18789 fi
18790 if test -n "uriparser"; then
18791 CUSTOM_URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}/uriparser"
18792 fi
18793 fi
18794
18795
18796
18797 if test -z "uriparser"; then
18798 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
18799 fi
18800 if test -z "URIPARSER"; then
18801 as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
18802 fi
18803
18804 ac_vmw_have_lib=0
18805 ac_vmw_have_lib_func=0
18806 ac_vmw_have_lib_header=0
18807 ac_vmw_custom_libs=
18808
18809 #
18810 # First, try any user-defined CUSTOM_* flags.
18811 #
18812 if test -n "${CUSTOM_URIPARSER_CPPFLAGS}" || test -n "${CUSTOM_URIPARSER_LIBS}"; then
18813 ac_vmw_custom_libs="${CUSTOM_URIPARSER_LIBS} -luriparser"
18814 if test -n "Uri.h"; then
18815 ORIGINAL_CPPFLAGS="$CPPFLAGS"
18816 CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS} $CPPFLAGS"
18817
18818 ac_fn_c_check_header_mongrel "$LINENO" "Uri.h" "ac_cv_header_Uri_h" "$ac_includes_default"
18819if test "x$ac_cv_header_Uri_h" = x""yes; then :
18820 ac_vmw_have_lib_header=1
18821fi
18822
18823
18824
18825 CPPFLAGS="$ORIGINAL_CPPFLAGS"
18826 else
18827 ac_vmw_have_lib_header=1
18828 fi
18829
18830 # Check a specific function in the library if requested.
18831 # If it hasn't, just pick a random function from libc, just to make
18832 # sure the linker can find the library being tested.
18833 if test $ac_vmw_have_lib_header -eq 1; then
18834 if test -n "uriFreeQueryListA"; then
18835 ac_vmw_function=uriFreeQueryListA
18836 else
18837 ac_vmw_function=strlen
18838 fi
18839 as_ac_Lib=`$as_echo "ac_cv_lib_uriparser_$ac_vmw_function" | $as_tr_sh`
18840{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -luriparser" >&5
18841$as_echo_n "checking for $ac_vmw_function in -luriparser... " >&6; }
18842if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
18843 $as_echo_n "(cached) " >&6
18844else
18845 ac_check_lib_save_LIBS=$LIBS
18846LIBS="-luriparser $ac_vmw_custom_libs $LIBS"
18847cat confdefs.h - <<_ACEOF >conftest.$ac_ext
18848/* end confdefs.h. */
18849
18850/* Override any GCC internal prototype to avoid an error.
18851 Use char because int might match the return type of a GCC
18852 builtin and then its argument prototype would still apply. */
18853#ifdef __cplusplus
18854extern "C"
18855#endif
18856char $ac_vmw_function ();
18857int
18858main ()
18859{
18860return $ac_vmw_function ();
18861 ;
18862 return 0;
18863}
18864_ACEOF
18865if ac_fn_c_try_link "$LINENO"; then :
18866 eval "$as_ac_Lib=yes"
18867else
18868 eval "$as_ac_Lib=no"
18869fi
18870rm -f core conftest.err conftest.$ac_objext \
18871 conftest$ac_exeext conftest.$ac_ext
18872LIBS=$ac_check_lib_save_LIBS
18873fi
18874eval ac_res=\$$as_ac_Lib
18875 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
18876$as_echo "$ac_res" >&6; }
18877if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
18878 ac_vmw_have_lib_func=1
18879fi
18880
18881 fi
18882
18883 if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
18884 URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}"
18885 URIPARSER_LIBS="$ac_vmw_custom_libs"
18886 ac_vmw_have_lib=1
18887 fi
18888 fi
18889
18890 # If that didn't work, try with pkg-config.
18891 if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
18892 if test -n ""; then
18893 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for >= (via pkg-config)" >&5
18894$as_echo_n "checking for >= (via pkg-config)... " >&6; }
18895 if pkg-config --exists ' >= '; then
18896 ac_vmw_have_lib=1
18897 fi
18898 else
18899 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (via pkg-config)" >&5
18900$as_echo_n "checking for (via pkg-config)... " >&6; }
18901 if pkg-config --exists ''; then
18902 ac_vmw_have_lib=1
18903 fi
18904 fi
18905
18906 if test $ac_vmw_have_lib -eq 1; then
18907 # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
18908 # fails on OpenSolaris B71. So be pessimistic.
18909 ac_vmw_cppflags="`pkg-config --cflags `"
18910 ac_vmw_ret1=$?
18911 ac_vmw_libs="`pkg-config --libs `"
18912 ac_vmw_ret2=$?
18913 if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
18914 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
18915$as_echo "yes" >&6; }
18916 URIPARSER_CPPFLAGS="$ac_vmw_cppflags"
18917 URIPARSER_LIBS="$ac_vmw_libs"
18918 else
18919 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18920$as_echo "no" >&6; }
18921 fi
18922 else
18923 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18924$as_echo "no" >&6; }
18925 fi
18926 fi
18927
18928 # If we still haven't found the lib, try with the library's custom "config" script.
18929 # Before checking, flush the AC_PATH_PROG cached variable.
18930 unset ac_cv_path_ac_vmw_lib_cfg
18931 unset ac_vmw_lib_cfg
18932 if test $ac_vmw_have_lib -eq 0 && test -n ""; then
18933 # Extract the first word of "", so it can be a program name with args.
18934set dummy ; ac_word=$2
18935{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
18936$as_echo_n "checking for $ac_word... " >&6; }
18937if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
18938 $as_echo_n "(cached) " >&6
18939else
18940 case $ac_vmw_lib_cfg in
18941 [\\/]* | ?:[\\/]*)
18942 ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
18943 ;;
18944 *)
18945 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
18946for as_dir in $PATH
18947do
18948 IFS=$as_save_IFS
18949 test -z "$as_dir" && as_dir=.
18950 for ac_exec_ext in '' $ac_executable_extensions; do
18951 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
18952 ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
18953 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
18954 break 2
18955 fi
18956done
18957 done
18958IFS=$as_save_IFS
18959
18960 test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
18961 ;;
18962esac
18963fi
18964ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
18965if test -n "$ac_vmw_lib_cfg"; then
18966 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
18967$as_echo "$ac_vmw_lib_cfg" >&6; }
18968else
18969 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18970$as_echo "no" >&6; }
18971fi
18972
18973
18974 if test "$ac_vmw_lib_cfg" != "no"; then
18975 # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
18976 # so single it out here to avoid having to replicate all the rest of the
18977 # logic elsewhere.
18978 if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
18979 URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
18980 URIPARSER_LIBS="`$ac_vmw_lib_cfg --ldflags`"
18981 else
18982 URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
18983 URIPARSER_LIBS="`$ac_vmw_lib_cfg --libs`"
18984 fi
18985 ac_vmw_have_lib=1
18986 fi
18987 fi
18988
18989 # Finish by executing the user provided action. The call to "true" is needed
18990 # because the actions are optional, and we need something inside the block.
18991 if test $ac_vmw_have_lib -eq 1; then
18992
18993
18994 true
18995
18996 else
18997 true
18998 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
18999 fi
19000
19001
19002 # Check for libpng.
19003
19004
19005 if test -z "png12"; then
19006 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
19007 fi
19008 if test -z "LIBPNG"; then
19009 as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
19010 fi
19011
19012 ac_vmw_have_lib=0
19013 ac_vmw_have_lib_func=0
19014 ac_vmw_have_lib_header=0
19015 ac_vmw_custom_libs=
19016
19017 #
19018 # First, try any user-defined CUSTOM_* flags.
19019 #
19020 if test -n "${CUSTOM_LIBPNG_CPPFLAGS}" || test -n "${CUSTOM_LIBPNG_LIBS}"; then
19021 ac_vmw_custom_libs="${CUSTOM_LIBPNG_LIBS} -lpng12"
19022 if test -n "png.h"; then
19023 ORIGINAL_CPPFLAGS="$CPPFLAGS"
19024 CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS} $CPPFLAGS"
19025
19026 ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
19027if test "x$ac_cv_header_png_h" = x""yes; then :
19028 ac_vmw_have_lib_header=1
19029fi
19030
19031
19032
19033 CPPFLAGS="$ORIGINAL_CPPFLAGS"
19034 else
19035 ac_vmw_have_lib_header=1
19036 fi
19037
19038 # Check a specific function in the library if requested.
19039 # If it hasn't, just pick a random function from libc, just to make
19040 # sure the linker can find the library being tested.
19041 if test $ac_vmw_have_lib_header -eq 1; then
19042 if test -n "png_access_version_number"; then
19043 ac_vmw_function=png_access_version_number
19044 else
19045 ac_vmw_function=strlen
19046 fi
19047 as_ac_Lib=`$as_echo "ac_cv_lib_png12_$ac_vmw_function" | $as_tr_sh`
19048{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lpng12" >&5
19049$as_echo_n "checking for $ac_vmw_function in -lpng12... " >&6; }
19050if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
19051 $as_echo_n "(cached) " >&6
19052else
19053 ac_check_lib_save_LIBS=$LIBS
19054LIBS="-lpng12 $ac_vmw_custom_libs $LIBS"
19055cat confdefs.h - <<_ACEOF >conftest.$ac_ext
19056/* end confdefs.h. */
19057
19058/* Override any GCC internal prototype to avoid an error.
19059