Merge lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.march-merge into lp:ubuntu/precise/open-vm-tools
- Precise (12.04)
- open-vm-tools.march-merge
- Merge into precise
Proposed by
Nate Muench (Mink)
Status: | Needs review |
---|---|
Proposed branch: | lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.march-merge |
Merge into: | lp:ubuntu/precise/open-vm-tools |
Diff against target: |
64535 lines (+20964/-14077) 231 files modified
.pc/01-kvers.patch/modules/linux/vmblock/Makefile (+0/-171) .pc/01-kvers.patch/modules/linux/vmci/Makefile (+0/-171) .pc/01-kvers.patch/modules/linux/vmhgfs/Makefile (+0/-171) .pc/01-kvers.patch/modules/linux/vmsync/Makefile (+0/-171) .pc/01-kvers.patch/modules/linux/vmxnet/Makefile (+0/-171) .pc/01-kvers.patch/modules/linux/vsock/Makefile (+0/-171) .pc/03-dkms.patch/modules/linux/dkms.conf (+0/-39) .pc/applied-patches (+0/-2) ChangeLog (+5/-0) Makefile.in (+3/-1) NEWS (+11/-0) aclocal.m4 (+2/-2) autom4te.cache/output.0 (+2703/-2074) autom4te.cache/output.1 (+2703/-2074) autom4te.cache/output.2 (+2703/-2074) autom4te.cache/requests (+30/-6) autom4te.cache/traces.0 (+230/-186) autom4te.cache/traces.1 (+18/-44) autom4te.cache/traces.2 (+230/-186) checkvm/Makefile.in (+3/-1) config/config.guess (+4/-5) config/config.sub (+5/-14) config/ltmain.sh (+2627/-1404) configure (+2569/-1940) configure.ac (+2/-2) debian/changelog (+9/-0) docs/Makefile.in (+3/-1) docs/api/Makefile.in (+3/-1) hgfsclient/Makefile.in (+3/-1) hgfsmounter/Makefile.in (+3/-1) lib/Makefile.in (+3/-1) lib/appUtil/Makefile.in (+3/-1) lib/auth/Makefile.in (+3/-1) lib/backdoor/Makefile.in (+3/-1) lib/dict/Makefile.in (+3/-1) lib/dynxdr/Makefile.in (+3/-1) lib/err/Makefile.in (+3/-1) lib/err/errPosix.c (+1/-1) lib/file/Makefile.in (+3/-1) lib/file/file.c (+61/-17) lib/file/fileIO.c (+56/-42) lib/file/fileIOPosix.c (+22/-2) lib/file/fileInt.h (+6/-6) lib/file/fileLockPosix.c (+1/-1) lib/file/fileLockPrimitive.c (+6/-3) lib/file/filePosix.c (+34/-15) lib/file/fileStandAlone.c (+0/-15) lib/file/fileTempPosix.c (+2/-2) lib/foundryMsg/Makefile.in (+3/-1) lib/foundryMsg/foundryMsg.c (+23/-0) lib/foundryMsg/vixTranslateErrOpenSource.c (+57/-10) lib/glibUtils/Makefile.in (+3/-1) lib/guestApp/Makefile.in (+3/-1) lib/guestRpc/Makefile.in (+3/-1) lib/hgfs/Makefile.in (+3/-1) lib/hgfs/hgfsUtil.c (+8/-2) lib/hgfsBd/Makefile.in (+3/-1) lib/hgfsHelper/Makefile.in (+3/-1) lib/hgfsServer/Makefile.in (+3/-1) lib/hgfsServer/hgfsServer.c (+51/-34) lib/hgfsServer/hgfsServerLinux.c (+1/-1) lib/hgfsServer/hgfsServerPacketUtil.c (+1/-1) lib/hgfsServer/hgfsServerParameters.c (+26/-23) lib/hgfsServerManagerGuest/Makefile.in (+3/-1) lib/hgfsServerPolicyGuest/Makefile.in (+3/-1) lib/impersonate/Makefile.in (+3/-1) lib/include/backdoor_def.h (+4/-1) lib/include/buildNumber.h (+6/-6) lib/include/file.h (+6/-1) lib/include/fileIO.h (+2/-0) lib/include/guest_os.h (+13/-66) lib/include/guest_os_tables.h (+240/-0) lib/include/hashTable.h (+2/-0) lib/include/hgfs.h (+3/-0) lib/include/log.h (+5/-22) lib/include/loglevel_user.h (+3/-0) lib/include/memaligned.h (+1/-0) lib/include/msgid.h (+2/-1) lib/include/mutexRankLib.h (+18/-2) lib/include/posix.h (+1/-1) lib/include/procMgr.h (+3/-2) lib/include/sigPosixRegs.h (+12/-0) lib/include/userlock.h (+1/-0) lib/include/util.h (+90/-44) lib/include/vix.h (+1/-0) lib/include/vixCommands.h (+241/-1) lib/include/vixOpenSource.h (+65/-0) lib/include/vm_assert.h (+9/-0) lib/include/vm_atomic.h (+1/-1) lib/include/vm_basic_asm.h (+41/-0) lib/include/vm_basic_defs.h (+14/-0) lib/include/vm_basic_types.h (+16/-3) lib/include/vm_device_version.h (+3/-0) lib/include/vm_legal.h (+2/-2) lib/include/vm_product.h (+17/-1) lib/include/vm_version.h (+7/-24) lib/include/x86cpuid.h (+34/-10) lib/lock/Makefile.in (+3/-1) lib/lock/ul.c (+5/-4) lib/lock/ulCondVar.c (+6/-4) lib/lock/ulExcl.c (+256/-192) lib/lock/ulInt.h (+84/-70) lib/lock/ulRW.c (+299/-210) lib/lock/ulRec.c (+272/-190) lib/lock/ulSema.c (+93/-83) lib/lock/ulStats.c (+19/-10) lib/message/Makefile.in (+3/-1) lib/misc/Makefile.in (+3/-1) lib/misc/codesetOld.c (+19/-0) lib/misc/hostinfoPosix.c (+193/-57) lib/misc/idLinux.c (+12/-2) lib/misc/machineID.c (+7/-17) lib/misc/msgfmt.c (+21/-14) lib/misc/posixPosix.c (+26/-15) lib/misc/utilMem.c (+190/-109) lib/misc/util_misc.c (+6/-1) lib/misc/vthreadBase.c (+5/-0) lib/netUtil/Makefile.in (+3/-1) lib/panic/Makefile.in (+3/-1) lib/panicDefault/Makefile.in (+3/-1) lib/printer/Makefile.in (+3/-1) lib/procMgr/Makefile.in (+3/-1) lib/procMgr/procMgrPosix.c (+174/-31) lib/procMgr/procMgrSolaris.c (+105/-25) lib/rpcChannel/Makefile.in (+3/-1) lib/rpcIn/Makefile.in (+3/-1) lib/rpcOut/Makefile.in (+3/-1) lib/rpcVmx/Makefile.in (+3/-1) lib/slashProc/Makefile.in (+3/-1) lib/string/Makefile.in (+3/-1) lib/string/bsd_output_shared.c (+1/-1) lib/string/bsd_vsnprintf.c (+48/-1) lib/stubs/Makefile.in (+3/-1) lib/syncDriver/Makefile.in (+3/-1) lib/system/Makefile.in (+3/-1) lib/unicode/Makefile.in (+3/-1) lib/user/Makefile.in (+3/-1) lib/user/util.c (+4/-4) lib/vmCheck/Makefile.in (+3/-1) lib/vmSignal/Makefile.in (+3/-1) lib/wiper/Makefile.in (+3/-1) lib/xdg/Makefile.in (+3/-1) libguestlib/Makefile.in (+3/-1) libhgfs/Makefile.in (+3/-1) libvmtools/Makefile.in (+3/-1) libvmtools/i18n.c (+1/-2) m4/libtool.m4 (+1261/-803) m4/ltoptions.m4 (+7/-6) m4/ltversion.m4 (+6/-6) m4/lt~obsolete.m4 (+9/-3) modules/Makefile.in (+3/-1) modules/freebsd/vmxnet/if_vxn.c (+6/-0) modules/linux/dkms.conf (+3/-3) modules/linux/dkms.sh (+2/-2) modules/linux/shared/autoconf/file_operations_fsync.c (+47/-0) modules/linux/shared/compat_ethtool.h (+6/-0) modules/linux/shared/compat_fs.h (+6/-0) modules/linux/shared/compat_netdevice.h (+6/-0) modules/linux/shared/vmciKernelAPI1.h (+10/-0) modules/linux/shared/vmci_iocontrols.h (+1/-1) modules/linux/shared/vmci_kernel_if.h (+0/-2) modules/linux/vmblock/Makefile (+1/-1) modules/linux/vmci/Makefile (+1/-1) modules/linux/vmci/common/vmciCommonInt.h (+6/-2) modules/linux/vmci/common/vmciContext.c (+1/-10) modules/linux/vmci/common/vmciDriver.c (+8/-3) modules/linux/vmci/common/vmciPageChannel.c (+108/-66) modules/linux/vmci/common/vmciRoute.c (+16/-1) modules/linux/vmci/linux/driver.c (+15/-4) modules/linux/vmci/linux/vmci_version.h (+4/-4) modules/linux/vmci/shared/vmci_page_channel.h (+25/-1) modules/linux/vmhgfs/Makefile (+1/-1) modules/linux/vmhgfs/Makefile.kernel (+1/-0) modules/linux/vmhgfs/dentry.c (+13/-0) modules/linux/vmhgfs/file.c (+2/-2) modules/linux/vmhgfs/filesystem.c (+67/-47) modules/linux/vmhgfs/inode.c (+6/-6) modules/linux/vmsync/Makefile (+1/-1) modules/linux/vmxnet/Makefile (+1/-1) modules/linux/vmxnet/vmxnet.c (+28/-3) modules/linux/vmxnet/vmxnet_version.h (+3/-3) modules/linux/vsock/Makefile (+1/-1) modules/linux/vsock/linux/vmci_sockets_packet.h (+111/-0) modules/linux/vsock/linux/vsockPacket.h (+3/-82) modules/linux/vsock/linux/vsock_version.h (+4/-4) modules/shared/vmxnet/eth_public.h (+1/-1) modules/shared/vmxnet/vmnet_def.h (+3/-3) modules/solaris/vmxnet/vmxnet.c (+4/-0) modules/solaris/vmxnet3/vmxnet3_main.c (+2/-0) modules/solaris/vmxnet3/vmxnet3_solaris.h (+1/-1) modules/solaris/vmxnet3/vmxnet3_solaris_compat.h (+7/-5) rpctool/Makefile.in (+3/-1) scripts/Makefile.in (+3/-1) scripts/linux/network (+57/-35) services/Makefile.in (+3/-1) services/plugins/Makefile.in (+3/-1) services/plugins/desktopEvents/Makefile.in (+3/-1) services/plugins/desktopEvents/desktopEvents.c (+8/-0) services/plugins/dndcp/Makefile.in (+3/-1) services/plugins/dndcp/dnd/dndLinux.c (+19/-2) services/plugins/dndcp/stringxx/string.cc (+10/-3) services/plugins/dndcp/stringxx/string.hh (+1/-1) services/plugins/guestInfo/Makefile.in (+3/-1) services/plugins/guestInfo/getlib/Makefile.in (+3/-1) services/plugins/hgfsServer/Makefile.in (+3/-1) services/plugins/powerOps/Makefile.in (+3/-1) services/plugins/resolutionSet/Makefile.in (+3/-1) services/plugins/timeSync/Makefile.in (+3/-1) services/plugins/vix/Makefile.in (+3/-1) services/plugins/vix/vixTools.c (+1458/-111) services/plugins/vix/vixToolsInt.h (+25/-2) services/plugins/vmbackup/Makefile.in (+3/-1) services/vmtoolsd/Makefile.in (+3/-1) services/vmtoolsd/l10n/de.vmsg (+1/-1) services/vmtoolsd/l10n/ja.vmsg (+1/-1) services/vmtoolsd/l10n/ko.vmsg (+1/-1) tests/Makefile.in (+3/-1) tests/testDebug/Makefile.in (+3/-1) tests/testPlugin/Makefile.in (+3/-1) tests/testVmblock/Makefile.in (+3/-1) tests/vmrpcdbg/Makefile.in (+3/-1) toolbox/Makefile.in (+3/-1) toolbox/l10n/de.vmsg (+79/-80) toolbox/l10n/ja.vmsg (+74/-75) toolbox/l10n/ko.vmsg (+77/-78) toolbox/l10n/zh_CN.vmsg (+169/-43) toolbox/toolboxcmd-shrink.c (+22/-4) vmblock-fuse/Makefile.in (+3/-1) vmblockmounter/Makefile.in (+3/-1) vmware-user-suid-wrapper/Makefile.in (+3/-1) xferlogs/Makefile.in (+3/-1) |
To merge this branch: | bzr merge lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.march-merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Fabrice Coutadeur (community) | Needs Fixing | ||
Review via email: mp+98932@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Unmerged revisions
- 28. By Nate Muench (Mink)
-
* Merge latest upstream git tag.
* debian/rules: Removed glib2.0 compatibility CFLAG.
- Packaging can now build without it.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed directory '.pc/01-kvers.patch' |
2 | === removed directory '.pc/01-kvers.patch/modules' |
3 | === removed directory '.pc/01-kvers.patch/modules/linux' |
4 | === removed directory '.pc/01-kvers.patch/modules/linux/vmblock' |
5 | === removed file '.pc/01-kvers.patch/modules/linux/vmblock/Makefile' |
6 | --- .pc/01-kvers.patch/modules/linux/vmblock/Makefile 2011-12-26 11:27:02 +0000 |
7 | +++ .pc/01-kvers.patch/modules/linux/vmblock/Makefile 1970-01-01 00:00:00 +0000 |
8 | @@ -1,171 +0,0 @@ |
9 | -#!/usr/bin/make -f |
10 | -########################################################## |
11 | -# Copyright (C) 1998 VMware, Inc. All rights reserved. |
12 | -# |
13 | -# This program is free software; you can redistribute it and/or modify it |
14 | -# under the terms of the GNU General Public License as published by the |
15 | -# Free Software Foundation version 2 and no later version. |
16 | -# |
17 | -# This program is distributed in the hope that it will be useful, but |
18 | -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
19 | -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
20 | -# for more details. |
21 | -# |
22 | -# You should have received a copy of the GNU General Public License along |
23 | -# with this program; if not, write to the Free Software Foundation, Inc., |
24 | -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
25 | -# |
26 | -########################################################## |
27 | - |
28 | -#### |
29 | -#### VMware kernel module Makefile to be distributed externally |
30 | -#### |
31 | - |
32 | -#### |
33 | -#### SRCROOT _must_ be a relative path. |
34 | -#### |
35 | -SRCROOT = . |
36 | - |
37 | -# |
38 | -# open-vm-tools doesn't replicate shared source files for different modules; |
39 | -# instead, files are kept in shared locations. So define a few useful macros |
40 | -# to be able to handle both cases cleanly. |
41 | -# |
42 | -INCLUDE := |
43 | -ifdef OVT_SOURCE_DIR |
44 | -AUTOCONF_DIR := $(OVT_SOURCE_DIR)/modules/linux/shared/autoconf |
45 | -VMLIB_PATH = $(OVT_SOURCE_DIR)/lib/$(1) |
46 | -INCLUDE += -I$(OVT_SOURCE_DIR)/modules/linux/shared |
47 | -INCLUDE += -I$(OVT_SOURCE_DIR)/lib/include |
48 | -else |
49 | -AUTOCONF_DIR := $(SRCROOT)/shared/autoconf |
50 | -INCLUDE += -I$(SRCROOT)/shared |
51 | -endif |
52 | - |
53 | - |
54 | -VM_UNAME = $(shell uname -r) |
55 | - |
56 | -# Header directory for the running kernel |
57 | -ifdef LINUXINCLUDE |
58 | -HEADER_DIR = $(LINUXINCLUDE) |
59 | -else |
60 | -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include |
61 | -endif |
62 | - |
63 | -BUILD_DIR = $(HEADER_DIR)/.. |
64 | - |
65 | -DRIVER := vmblock |
66 | -PRODUCT := tools-source |
67 | - |
68 | -# Grep program |
69 | -GREP = /bin/grep |
70 | - |
71 | -vm_check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ |
72 | - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) |
73 | -vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) |
74 | - |
75 | -ifndef VM_KBUILD |
76 | -VM_KBUILD := no |
77 | -ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) |
78 | -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) |
79 | -VM_KBUILD := 26 |
80 | -endif |
81 | -endif |
82 | -export VM_KBUILD |
83 | -endif |
84 | - |
85 | -ifndef VM_KBUILD_SHOWN |
86 | -ifeq ($(VM_KBUILD), no) |
87 | -VM_DUMMY := $(shell echo >&2 "Using standalone build system.") |
88 | -else |
89 | -ifeq ($(VM_KBUILD), 24) |
90 | -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") |
91 | -else |
92 | -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") |
93 | -endif |
94 | -endif |
95 | -VM_KBUILD_SHOWN := yes |
96 | -export VM_KBUILD_SHOWN |
97 | -endif |
98 | - |
99 | -ifneq ($(VM_KBUILD), no) |
100 | - |
101 | -VMCCVER := $(shell $(CC) -dumpversion) |
102 | - |
103 | -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... |
104 | -ifeq ($(VERSION),) |
105 | - |
106 | -ifeq ($(VM_KBUILD), 24) |
107 | -DRIVER_KO := $(DRIVER).o |
108 | -else |
109 | -DRIVER_KO := $(DRIVER).ko |
110 | -endif |
111 | - |
112 | -.PHONY: $(DRIVER_KO) |
113 | - |
114 | -auto-build: $(DRIVER_KO) |
115 | - cp -f $< $(SRCROOT)/../$(DRIVER).o |
116 | - |
117 | -# $(DRIVER_KO) is a phony target, so compare file times explicitly |
118 | -$(DRIVER): $(DRIVER_KO) |
119 | - if [ $< -nt $@ ] || [ ! -e $@ ] ; then cp -f $< $@; fi |
120 | - |
121 | -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler |
122 | -VM_CCVER := $(VMCCVER) |
123 | -export VM_CCVER |
124 | -VM_CC := $(CC) |
125 | -export VM_CC |
126 | - |
127 | -MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES)) |
128 | - |
129 | -# |
130 | -# Define a setup target that gets built before the actual driver. |
131 | -# This target may not be used at all, but if it is then it will be defined |
132 | -# in Makefile.kernel |
133 | -# |
134 | -prebuild:: ; |
135 | -postbuild:: ; |
136 | - |
137 | -$(DRIVER_KO): prebuild |
138 | - $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
139 | - MODULEBUILDDIR=$(MODULEBUILDDIR) modules |
140 | - $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
141 | - MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild |
142 | -endif |
143 | - |
144 | -vm_check_build = $(shell if $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \ |
145 | - $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) $(LINUXINCLUDE) \ |
146 | - $(EXTRA_CFLAGS) -Iinclude2/asm/mach-default \ |
147 | - -DKBUILD_BASENAME=\"$(DRIVER)\" \ |
148 | - -Werror -S -o /dev/null -xc $(1) \ |
149 | - > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi) |
150 | - |
151 | -CC_WARNINGS := -Wall -Wstrict-prototypes |
152 | -CC_OPTS := $(GLOBAL_DEFS) $(CC_WARNINGS) -DVMW_USING_KBUILD |
153 | -ifdef VMX86_DEVEL |
154 | -CC_OPTS += -DVMX86_DEVEL |
155 | -endif |
156 | -ifdef VMX86_DEBUG |
157 | -CC_OPTS += -DVMX86_DEBUG |
158 | -endif |
159 | - |
160 | -include $(SRCROOT)/Makefile.kernel |
161 | - |
162 | -ifdef TOPDIR |
163 | -ifeq ($(VM_KBUILD), 24) |
164 | - |
165 | -O_TARGET := $(DRIVER).o |
166 | - |
167 | -obj-y := $($(DRIVER)-y) |
168 | - |
169 | -include $(TOPDIR)/Rules.make |
170 | -endif |
171 | -endif |
172 | - |
173 | -else |
174 | - |
175 | -include $(SRCROOT)/Makefile.normal |
176 | - |
177 | -endif |
178 | - |
179 | -#.SILENT: |
180 | |
181 | === removed directory '.pc/01-kvers.patch/modules/linux/vmci' |
182 | === removed file '.pc/01-kvers.patch/modules/linux/vmci/Makefile' |
183 | --- .pc/01-kvers.patch/modules/linux/vmci/Makefile 2011-12-26 11:27:02 +0000 |
184 | +++ .pc/01-kvers.patch/modules/linux/vmci/Makefile 1970-01-01 00:00:00 +0000 |
185 | @@ -1,171 +0,0 @@ |
186 | -#!/usr/bin/make -f |
187 | -########################################################## |
188 | -# Copyright (C) 1998 VMware, Inc. All rights reserved. |
189 | -# |
190 | -# This program is free software; you can redistribute it and/or modify it |
191 | -# under the terms of the GNU General Public License as published by the |
192 | -# Free Software Foundation version 2 and no later version. |
193 | -# |
194 | -# This program is distributed in the hope that it will be useful, but |
195 | -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
196 | -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
197 | -# for more details. |
198 | -# |
199 | -# You should have received a copy of the GNU General Public License along |
200 | -# with this program; if not, write to the Free Software Foundation, Inc., |
201 | -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
202 | -# |
203 | -########################################################## |
204 | - |
205 | -#### |
206 | -#### VMware kernel module Makefile to be distributed externally |
207 | -#### |
208 | - |
209 | -#### |
210 | -#### SRCROOT _must_ be a relative path. |
211 | -#### |
212 | -SRCROOT = . |
213 | - |
214 | -# |
215 | -# open-vm-tools doesn't replicate shared source files for different modules; |
216 | -# instead, files are kept in shared locations. So define a few useful macros |
217 | -# to be able to handle both cases cleanly. |
218 | -# |
219 | -INCLUDE := |
220 | -ifdef OVT_SOURCE_DIR |
221 | -AUTOCONF_DIR := $(OVT_SOURCE_DIR)/modules/linux/shared/autoconf |
222 | -VMLIB_PATH = $(OVT_SOURCE_DIR)/lib/$(1) |
223 | -INCLUDE += -I$(OVT_SOURCE_DIR)/modules/linux/shared |
224 | -INCLUDE += -I$(OVT_SOURCE_DIR)/lib/include |
225 | -else |
226 | -AUTOCONF_DIR := $(SRCROOT)/shared/autoconf |
227 | -INCLUDE += -I$(SRCROOT)/shared |
228 | -endif |
229 | - |
230 | - |
231 | -VM_UNAME = $(shell uname -r) |
232 | - |
233 | -# Header directory for the running kernel |
234 | -ifdef LINUXINCLUDE |
235 | -HEADER_DIR = $(LINUXINCLUDE) |
236 | -else |
237 | -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include |
238 | -endif |
239 | - |
240 | -BUILD_DIR = $(HEADER_DIR)/.. |
241 | - |
242 | -DRIVER := vmci |
243 | -PRODUCT := tools-source |
244 | - |
245 | -# Grep program |
246 | -GREP = /bin/grep |
247 | - |
248 | -vm_check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ |
249 | - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) |
250 | -vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) |
251 | - |
252 | -ifndef VM_KBUILD |
253 | -VM_KBUILD := no |
254 | -ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) |
255 | -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) |
256 | -VM_KBUILD := 26 |
257 | -endif |
258 | -endif |
259 | -export VM_KBUILD |
260 | -endif |
261 | - |
262 | -ifndef VM_KBUILD_SHOWN |
263 | -ifeq ($(VM_KBUILD), no) |
264 | -VM_DUMMY := $(shell echo >&2 "Using standalone build system.") |
265 | -else |
266 | -ifeq ($(VM_KBUILD), 24) |
267 | -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") |
268 | -else |
269 | -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") |
270 | -endif |
271 | -endif |
272 | -VM_KBUILD_SHOWN := yes |
273 | -export VM_KBUILD_SHOWN |
274 | -endif |
275 | - |
276 | -ifneq ($(VM_KBUILD), no) |
277 | - |
278 | -VMCCVER := $(shell $(CC) -dumpversion) |
279 | - |
280 | -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... |
281 | -ifeq ($(VERSION),) |
282 | - |
283 | -ifeq ($(VM_KBUILD), 24) |
284 | -DRIVER_KO := $(DRIVER).o |
285 | -else |
286 | -DRIVER_KO := $(DRIVER).ko |
287 | -endif |
288 | - |
289 | -.PHONY: $(DRIVER_KO) |
290 | - |
291 | -auto-build: $(DRIVER_KO) |
292 | - cp -f $< $(SRCROOT)/../$(DRIVER).o |
293 | - |
294 | -# $(DRIVER_KO) is a phony target, so compare file times explicitly |
295 | -$(DRIVER): $(DRIVER_KO) |
296 | - if [ $< -nt $@ ] || [ ! -e $@ ] ; then cp -f $< $@; fi |
297 | - |
298 | -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler |
299 | -VM_CCVER := $(VMCCVER) |
300 | -export VM_CCVER |
301 | -VM_CC := $(CC) |
302 | -export VM_CC |
303 | - |
304 | -MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES)) |
305 | - |
306 | -# |
307 | -# Define a setup target that gets built before the actual driver. |
308 | -# This target may not be used at all, but if it is then it will be defined |
309 | -# in Makefile.kernel |
310 | -# |
311 | -prebuild:: ; |
312 | -postbuild:: ; |
313 | - |
314 | -$(DRIVER_KO): prebuild |
315 | - $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
316 | - MODULEBUILDDIR=$(MODULEBUILDDIR) modules |
317 | - $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
318 | - MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild |
319 | -endif |
320 | - |
321 | -vm_check_build = $(shell if $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \ |
322 | - $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) $(LINUXINCLUDE) \ |
323 | - $(EXTRA_CFLAGS) -Iinclude2/asm/mach-default \ |
324 | - -DKBUILD_BASENAME=\"$(DRIVER)\" \ |
325 | - -Werror -S -o /dev/null -xc $(1) \ |
326 | - > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi) |
327 | - |
328 | -CC_WARNINGS := -Wall -Wstrict-prototypes |
329 | -CC_OPTS := $(GLOBAL_DEFS) $(CC_WARNINGS) -DVMW_USING_KBUILD |
330 | -ifdef VMX86_DEVEL |
331 | -CC_OPTS += -DVMX86_DEVEL |
332 | -endif |
333 | -ifdef VMX86_DEBUG |
334 | -CC_OPTS += -DVMX86_DEBUG |
335 | -endif |
336 | - |
337 | -include $(SRCROOT)/Makefile.kernel |
338 | - |
339 | -ifdef TOPDIR |
340 | -ifeq ($(VM_KBUILD), 24) |
341 | - |
342 | -O_TARGET := $(DRIVER).o |
343 | - |
344 | -obj-y := $($(DRIVER)-y) |
345 | - |
346 | -include $(TOPDIR)/Rules.make |
347 | -endif |
348 | -endif |
349 | - |
350 | -else |
351 | - |
352 | -include $(SRCROOT)/Makefile.normal |
353 | - |
354 | -endif |
355 | - |
356 | -#.SILENT: |
357 | |
358 | === removed directory '.pc/01-kvers.patch/modules/linux/vmhgfs' |
359 | === removed file '.pc/01-kvers.patch/modules/linux/vmhgfs/Makefile' |
360 | --- .pc/01-kvers.patch/modules/linux/vmhgfs/Makefile 2011-12-26 11:27:02 +0000 |
361 | +++ .pc/01-kvers.patch/modules/linux/vmhgfs/Makefile 1970-01-01 00:00:00 +0000 |
362 | @@ -1,171 +0,0 @@ |
363 | -#!/usr/bin/make -f |
364 | -########################################################## |
365 | -# Copyright (C) 1998 VMware, Inc. All rights reserved. |
366 | -# |
367 | -# This program is free software; you can redistribute it and/or modify it |
368 | -# under the terms of the GNU General Public License as published by the |
369 | -# Free Software Foundation version 2 and no later version. |
370 | -# |
371 | -# This program is distributed in the hope that it will be useful, but |
372 | -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
373 | -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
374 | -# for more details. |
375 | -# |
376 | -# You should have received a copy of the GNU General Public License along |
377 | -# with this program; if not, write to the Free Software Foundation, Inc., |
378 | -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
379 | -# |
380 | -########################################################## |
381 | - |
382 | -#### |
383 | -#### VMware kernel module Makefile to be distributed externally |
384 | -#### |
385 | - |
386 | -#### |
387 | -#### SRCROOT _must_ be a relative path. |
388 | -#### |
389 | -SRCROOT = . |
390 | - |
391 | -# |
392 | -# open-vm-tools doesn't replicate shared source files for different modules; |
393 | -# instead, files are kept in shared locations. So define a few useful macros |
394 | -# to be able to handle both cases cleanly. |
395 | -# |
396 | -INCLUDE := |
397 | -ifdef OVT_SOURCE_DIR |
398 | -AUTOCONF_DIR := $(OVT_SOURCE_DIR)/modules/linux/shared/autoconf |
399 | -VMLIB_PATH = $(OVT_SOURCE_DIR)/lib/$(1) |
400 | -INCLUDE += -I$(OVT_SOURCE_DIR)/modules/linux/shared |
401 | -INCLUDE += -I$(OVT_SOURCE_DIR)/lib/include |
402 | -else |
403 | -AUTOCONF_DIR := $(SRCROOT)/shared/autoconf |
404 | -INCLUDE += -I$(SRCROOT)/shared |
405 | -endif |
406 | - |
407 | - |
408 | -VM_UNAME = $(shell uname -r) |
409 | - |
410 | -# Header directory for the running kernel |
411 | -ifdef LINUXINCLUDE |
412 | -HEADER_DIR = $(LINUXINCLUDE) |
413 | -else |
414 | -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include |
415 | -endif |
416 | - |
417 | -BUILD_DIR = $(HEADER_DIR)/.. |
418 | - |
419 | -DRIVER := vmhgfs |
420 | -PRODUCT := tools |
421 | - |
422 | -# Grep program |
423 | -GREP = /bin/grep |
424 | - |
425 | -vm_check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ |
426 | - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) |
427 | -vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) |
428 | - |
429 | -ifndef VM_KBUILD |
430 | -VM_KBUILD := no |
431 | -ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) |
432 | -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) |
433 | -VM_KBUILD := 26 |
434 | -endif |
435 | -endif |
436 | -export VM_KBUILD |
437 | -endif |
438 | - |
439 | -ifndef VM_KBUILD_SHOWN |
440 | -ifeq ($(VM_KBUILD), no) |
441 | -VM_DUMMY := $(shell echo >&2 "Using standalone build system.") |
442 | -else |
443 | -ifeq ($(VM_KBUILD), 24) |
444 | -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") |
445 | -else |
446 | -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") |
447 | -endif |
448 | -endif |
449 | -VM_KBUILD_SHOWN := yes |
450 | -export VM_KBUILD_SHOWN |
451 | -endif |
452 | - |
453 | -ifneq ($(VM_KBUILD), no) |
454 | - |
455 | -VMCCVER := $(shell $(CC) -dumpversion) |
456 | - |
457 | -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... |
458 | -ifeq ($(VERSION),) |
459 | - |
460 | -ifeq ($(VM_KBUILD), 24) |
461 | -DRIVER_KO := $(DRIVER).o |
462 | -else |
463 | -DRIVER_KO := $(DRIVER).ko |
464 | -endif |
465 | - |
466 | -.PHONY: $(DRIVER_KO) |
467 | - |
468 | -auto-build: $(DRIVER_KO) |
469 | - cp -f $< $(SRCROOT)/../$(DRIVER).o |
470 | - |
471 | -# $(DRIVER_KO) is a phony target, so compare file times explicitly |
472 | -$(DRIVER): $(DRIVER_KO) |
473 | - if [ $< -nt $@ ] || [ ! -e $@ ] ; then cp -f $< $@; fi |
474 | - |
475 | -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler |
476 | -VM_CCVER := $(VMCCVER) |
477 | -export VM_CCVER |
478 | -VM_CC := $(CC) |
479 | -export VM_CC |
480 | - |
481 | -MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES)) |
482 | - |
483 | -# |
484 | -# Define a setup target that gets built before the actual driver. |
485 | -# This target may not be used at all, but if it is then it will be defined |
486 | -# in Makefile.kernel |
487 | -# |
488 | -prebuild:: ; |
489 | -postbuild:: ; |
490 | - |
491 | -$(DRIVER_KO): prebuild |
492 | - $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
493 | - MODULEBUILDDIR=$(MODULEBUILDDIR) modules |
494 | - $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
495 | - MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild |
496 | -endif |
497 | - |
498 | -vm_check_build = $(shell if $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \ |
499 | - $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) $(LINUXINCLUDE) \ |
500 | - $(EXTRA_CFLAGS) -Iinclude2/asm/mach-default \ |
501 | - -DKBUILD_BASENAME=\"$(DRIVER)\" \ |
502 | - -Werror -S -o /dev/null -xc $(1) \ |
503 | - > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi) |
504 | - |
505 | -CC_WARNINGS := -Wall -Wstrict-prototypes |
506 | -CC_OPTS := $(GLOBAL_DEFS) $(CC_WARNINGS) -DVMW_USING_KBUILD |
507 | -ifdef VMX86_DEVEL |
508 | -CC_OPTS += -DVMX86_DEVEL |
509 | -endif |
510 | -ifdef VMX86_DEBUG |
511 | -CC_OPTS += -DVMX86_DEBUG |
512 | -endif |
513 | - |
514 | -include $(SRCROOT)/Makefile.kernel |
515 | - |
516 | -ifdef TOPDIR |
517 | -ifeq ($(VM_KBUILD), 24) |
518 | - |
519 | -O_TARGET := $(DRIVER).o |
520 | - |
521 | -obj-y := $($(DRIVER)-y) |
522 | - |
523 | -include $(TOPDIR)/Rules.make |
524 | -endif |
525 | -endif |
526 | - |
527 | -else |
528 | - |
529 | -include $(SRCROOT)/Makefile.normal |
530 | - |
531 | -endif |
532 | - |
533 | -#.SILENT: |
534 | |
535 | === removed directory '.pc/01-kvers.patch/modules/linux/vmsync' |
536 | === removed file '.pc/01-kvers.patch/modules/linux/vmsync/Makefile' |
537 | --- .pc/01-kvers.patch/modules/linux/vmsync/Makefile 2011-12-26 11:27:02 +0000 |
538 | +++ .pc/01-kvers.patch/modules/linux/vmsync/Makefile 1970-01-01 00:00:00 +0000 |
539 | @@ -1,171 +0,0 @@ |
540 | -#!/usr/bin/make -f |
541 | -########################################################## |
542 | -# Copyright (C) 1998 VMware, Inc. All rights reserved. |
543 | -# |
544 | -# This program is free software; you can redistribute it and/or modify it |
545 | -# under the terms of the GNU General Public License as published by the |
546 | -# Free Software Foundation version 2 and no later version. |
547 | -# |
548 | -# This program is distributed in the hope that it will be useful, but |
549 | -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
550 | -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
551 | -# for more details. |
552 | -# |
553 | -# You should have received a copy of the GNU General Public License along |
554 | -# with this program; if not, write to the Free Software Foundation, Inc., |
555 | -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
556 | -# |
557 | -########################################################## |
558 | - |
559 | -#### |
560 | -#### VMware kernel module Makefile to be distributed externally |
561 | -#### |
562 | - |
563 | -#### |
564 | -#### SRCROOT _must_ be a relative path. |
565 | -#### |
566 | -SRCROOT = . |
567 | - |
568 | -# |
569 | -# open-vm-tools doesn't replicate shared source files for different modules; |
570 | -# instead, files are kept in shared locations. So define a few useful macros |
571 | -# to be able to handle both cases cleanly. |
572 | -# |
573 | -INCLUDE := |
574 | -ifdef OVT_SOURCE_DIR |
575 | -AUTOCONF_DIR := $(OVT_SOURCE_DIR)/modules/linux/shared/autoconf |
576 | -VMLIB_PATH = $(OVT_SOURCE_DIR)/lib/$(1) |
577 | -INCLUDE += -I$(OVT_SOURCE_DIR)/modules/linux/shared |
578 | -INCLUDE += -I$(OVT_SOURCE_DIR)/lib/include |
579 | -else |
580 | -AUTOCONF_DIR := $(SRCROOT)/shared/autoconf |
581 | -INCLUDE += -I$(SRCROOT)/shared |
582 | -endif |
583 | - |
584 | - |
585 | -VM_UNAME = $(shell uname -r) |
586 | - |
587 | -# Header directory for the running kernel |
588 | -ifdef LINUXINCLUDE |
589 | -HEADER_DIR = $(LINUXINCLUDE) |
590 | -else |
591 | -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include |
592 | -endif |
593 | - |
594 | -BUILD_DIR = $(HEADER_DIR)/.. |
595 | - |
596 | -DRIVER := vmsync |
597 | -PRODUCT := tools |
598 | - |
599 | -# Grep program |
600 | -GREP = /bin/grep |
601 | - |
602 | -vm_check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ |
603 | - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) |
604 | -vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) |
605 | - |
606 | -ifndef VM_KBUILD |
607 | -VM_KBUILD := no |
608 | -ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) |
609 | -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) |
610 | -VM_KBUILD := 26 |
611 | -endif |
612 | -endif |
613 | -export VM_KBUILD |
614 | -endif |
615 | - |
616 | -ifndef VM_KBUILD_SHOWN |
617 | -ifeq ($(VM_KBUILD), no) |
618 | -VM_DUMMY := $(shell echo >&2 "Using standalone build system.") |
619 | -else |
620 | -ifeq ($(VM_KBUILD), 24) |
621 | -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") |
622 | -else |
623 | -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") |
624 | -endif |
625 | -endif |
626 | -VM_KBUILD_SHOWN := yes |
627 | -export VM_KBUILD_SHOWN |
628 | -endif |
629 | - |
630 | -ifneq ($(VM_KBUILD), no) |
631 | - |
632 | -VMCCVER := $(shell $(CC) -dumpversion) |
633 | - |
634 | -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... |
635 | -ifeq ($(VERSION),) |
636 | - |
637 | -ifeq ($(VM_KBUILD), 24) |
638 | -DRIVER_KO := $(DRIVER).o |
639 | -else |
640 | -DRIVER_KO := $(DRIVER).ko |
641 | -endif |
642 | - |
643 | -.PHONY: $(DRIVER_KO) |
644 | - |
645 | -auto-build: $(DRIVER_KO) |
646 | - cp -f $< $(SRCROOT)/../$(DRIVER).o |
647 | - |
648 | -# $(DRIVER_KO) is a phony target, so compare file times explicitly |
649 | -$(DRIVER): $(DRIVER_KO) |
650 | - if [ $< -nt $@ ] || [ ! -e $@ ] ; then cp -f $< $@; fi |
651 | - |
652 | -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler |
653 | -VM_CCVER := $(VMCCVER) |
654 | -export VM_CCVER |
655 | -VM_CC := $(CC) |
656 | -export VM_CC |
657 | - |
658 | -MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES)) |
659 | - |
660 | -# |
661 | -# Define a setup target that gets built before the actual driver. |
662 | -# This target may not be used at all, but if it is then it will be defined |
663 | -# in Makefile.kernel |
664 | -# |
665 | -prebuild:: ; |
666 | -postbuild:: ; |
667 | - |
668 | -$(DRIVER_KO): prebuild |
669 | - $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
670 | - MODULEBUILDDIR=$(MODULEBUILDDIR) modules |
671 | - $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
672 | - MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild |
673 | -endif |
674 | - |
675 | -vm_check_build = $(shell if $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \ |
676 | - $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) $(LINUXINCLUDE) \ |
677 | - $(EXTRA_CFLAGS) -Iinclude2/asm/mach-default \ |
678 | - -DKBUILD_BASENAME=\"$(DRIVER)\" \ |
679 | - -Werror -S -o /dev/null -xc $(1) \ |
680 | - > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi) |
681 | - |
682 | -CC_WARNINGS := -Wall -Wstrict-prototypes |
683 | -CC_OPTS := $(GLOBAL_DEFS) $(CC_WARNINGS) -DVMW_USING_KBUILD |
684 | -ifdef VMX86_DEVEL |
685 | -CC_OPTS += -DVMX86_DEVEL |
686 | -endif |
687 | -ifdef VMX86_DEBUG |
688 | -CC_OPTS += -DVMX86_DEBUG |
689 | -endif |
690 | - |
691 | -include $(SRCROOT)/Makefile.kernel |
692 | - |
693 | -ifdef TOPDIR |
694 | -ifeq ($(VM_KBUILD), 24) |
695 | - |
696 | -O_TARGET := $(DRIVER).o |
697 | - |
698 | -obj-y := $($(DRIVER)-y) |
699 | - |
700 | -include $(TOPDIR)/Rules.make |
701 | -endif |
702 | -endif |
703 | - |
704 | -else |
705 | - |
706 | -include $(SRCROOT)/Makefile.normal |
707 | - |
708 | -endif |
709 | - |
710 | -#.SILENT: |
711 | |
712 | === removed directory '.pc/01-kvers.patch/modules/linux/vmxnet' |
713 | === removed file '.pc/01-kvers.patch/modules/linux/vmxnet/Makefile' |
714 | --- .pc/01-kvers.patch/modules/linux/vmxnet/Makefile 2011-12-26 11:27:02 +0000 |
715 | +++ .pc/01-kvers.patch/modules/linux/vmxnet/Makefile 1970-01-01 00:00:00 +0000 |
716 | @@ -1,171 +0,0 @@ |
717 | -#!/usr/bin/make -f |
718 | -########################################################## |
719 | -# Copyright (C) 1998 VMware, Inc. All rights reserved. |
720 | -# |
721 | -# This program is free software; you can redistribute it and/or modify it |
722 | -# under the terms of the GNU General Public License as published by the |
723 | -# Free Software Foundation version 2 and no later version. |
724 | -# |
725 | -# This program is distributed in the hope that it will be useful, but |
726 | -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
727 | -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
728 | -# for more details. |
729 | -# |
730 | -# You should have received a copy of the GNU General Public License along |
731 | -# with this program; if not, write to the Free Software Foundation, Inc., |
732 | -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
733 | -# |
734 | -########################################################## |
735 | - |
736 | -#### |
737 | -#### VMware kernel module Makefile to be distributed externally |
738 | -#### |
739 | - |
740 | -#### |
741 | -#### SRCROOT _must_ be a relative path. |
742 | -#### |
743 | -SRCROOT = . |
744 | - |
745 | -# |
746 | -# open-vm-tools doesn't replicate shared source files for different modules; |
747 | -# instead, files are kept in shared locations. So define a few useful macros |
748 | -# to be able to handle both cases cleanly. |
749 | -# |
750 | -INCLUDE := |
751 | -ifdef OVT_SOURCE_DIR |
752 | -AUTOCONF_DIR := $(OVT_SOURCE_DIR)/modules/linux/shared/autoconf |
753 | -VMLIB_PATH = $(OVT_SOURCE_DIR)/lib/$(1) |
754 | -INCLUDE += -I$(OVT_SOURCE_DIR)/modules/linux/shared |
755 | -INCLUDE += -I$(OVT_SOURCE_DIR)/lib/include |
756 | -else |
757 | -AUTOCONF_DIR := $(SRCROOT)/shared/autoconf |
758 | -INCLUDE += -I$(SRCROOT)/shared |
759 | -endif |
760 | - |
761 | - |
762 | -VM_UNAME = $(shell uname -r) |
763 | - |
764 | -# Header directory for the running kernel |
765 | -ifdef LINUXINCLUDE |
766 | -HEADER_DIR = $(LINUXINCLUDE) |
767 | -else |
768 | -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include |
769 | -endif |
770 | - |
771 | -BUILD_DIR = $(HEADER_DIR)/.. |
772 | - |
773 | -DRIVER := vmxnet |
774 | -PRODUCT := tools-source |
775 | - |
776 | -# Grep program |
777 | -GREP = /bin/grep |
778 | - |
779 | -vm_check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ |
780 | - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) |
781 | -vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) |
782 | - |
783 | -ifndef VM_KBUILD |
784 | -VM_KBUILD := no |
785 | -ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) |
786 | -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) |
787 | -VM_KBUILD := 26 |
788 | -endif |
789 | -endif |
790 | -export VM_KBUILD |
791 | -endif |
792 | - |
793 | -ifndef VM_KBUILD_SHOWN |
794 | -ifeq ($(VM_KBUILD), no) |
795 | -VM_DUMMY := $(shell echo >&2 "Using standalone build system.") |
796 | -else |
797 | -ifeq ($(VM_KBUILD), 24) |
798 | -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") |
799 | -else |
800 | -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") |
801 | -endif |
802 | -endif |
803 | -VM_KBUILD_SHOWN := yes |
804 | -export VM_KBUILD_SHOWN |
805 | -endif |
806 | - |
807 | -ifneq ($(VM_KBUILD), no) |
808 | - |
809 | -VMCCVER := $(shell $(CC) -dumpversion) |
810 | - |
811 | -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... |
812 | -ifeq ($(VERSION),) |
813 | - |
814 | -ifeq ($(VM_KBUILD), 24) |
815 | -DRIVER_KO := $(DRIVER).o |
816 | -else |
817 | -DRIVER_KO := $(DRIVER).ko |
818 | -endif |
819 | - |
820 | -.PHONY: $(DRIVER_KO) |
821 | - |
822 | -auto-build: $(DRIVER_KO) |
823 | - cp -f $< $(SRCROOT)/../$(DRIVER).o |
824 | - |
825 | -# $(DRIVER_KO) is a phony target, so compare file times explicitly |
826 | -$(DRIVER): $(DRIVER_KO) |
827 | - if [ $< -nt $@ ] || [ ! -e $@ ] ; then cp -f $< $@; fi |
828 | - |
829 | -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler |
830 | -VM_CCVER := $(VMCCVER) |
831 | -export VM_CCVER |
832 | -VM_CC := $(CC) |
833 | -export VM_CC |
834 | - |
835 | -MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES)) |
836 | - |
837 | -# |
838 | -# Define a setup target that gets built before the actual driver. |
839 | -# This target may not be used at all, but if it is then it will be defined |
840 | -# in Makefile.kernel |
841 | -# |
842 | -prebuild:: ; |
843 | -postbuild:: ; |
844 | - |
845 | -$(DRIVER_KO): prebuild |
846 | - $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
847 | - MODULEBUILDDIR=$(MODULEBUILDDIR) modules |
848 | - $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
849 | - MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild |
850 | -endif |
851 | - |
852 | -vm_check_build = $(shell if $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \ |
853 | - $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) $(LINUXINCLUDE) \ |
854 | - $(EXTRA_CFLAGS) -Iinclude2/asm/mach-default \ |
855 | - -DKBUILD_BASENAME=\"$(DRIVER)\" \ |
856 | - -Werror -S -o /dev/null -xc $(1) \ |
857 | - > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi) |
858 | - |
859 | -CC_WARNINGS := -Wall -Wstrict-prototypes |
860 | -CC_OPTS := $(GLOBAL_DEFS) $(CC_WARNINGS) -DVMW_USING_KBUILD |
861 | -ifdef VMX86_DEVEL |
862 | -CC_OPTS += -DVMX86_DEVEL |
863 | -endif |
864 | -ifdef VMX86_DEBUG |
865 | -CC_OPTS += -DVMX86_DEBUG |
866 | -endif |
867 | - |
868 | -include $(SRCROOT)/Makefile.kernel |
869 | - |
870 | -ifdef TOPDIR |
871 | -ifeq ($(VM_KBUILD), 24) |
872 | - |
873 | -O_TARGET := $(DRIVER).o |
874 | - |
875 | -obj-y := $($(DRIVER)-y) |
876 | - |
877 | -include $(TOPDIR)/Rules.make |
878 | -endif |
879 | -endif |
880 | - |
881 | -else |
882 | - |
883 | -include $(SRCROOT)/Makefile.normal |
884 | - |
885 | -endif |
886 | - |
887 | -#.SILENT: |
888 | |
889 | === removed directory '.pc/01-kvers.patch/modules/linux/vsock' |
890 | === removed file '.pc/01-kvers.patch/modules/linux/vsock/Makefile' |
891 | --- .pc/01-kvers.patch/modules/linux/vsock/Makefile 2011-12-26 11:27:02 +0000 |
892 | +++ .pc/01-kvers.patch/modules/linux/vsock/Makefile 1970-01-01 00:00:00 +0000 |
893 | @@ -1,171 +0,0 @@ |
894 | -#!/usr/bin/make -f |
895 | -########################################################## |
896 | -# Copyright (C) 1998 VMware, Inc. All rights reserved. |
897 | -# |
898 | -# This program is free software; you can redistribute it and/or modify it |
899 | -# under the terms of the GNU General Public License as published by the |
900 | -# Free Software Foundation version 2 and no later version. |
901 | -# |
902 | -# This program is distributed in the hope that it will be useful, but |
903 | -# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
904 | -# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
905 | -# for more details. |
906 | -# |
907 | -# You should have received a copy of the GNU General Public License along |
908 | -# with this program; if not, write to the Free Software Foundation, Inc., |
909 | -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
910 | -# |
911 | -########################################################## |
912 | - |
913 | -#### |
914 | -#### VMware kernel module Makefile to be distributed externally |
915 | -#### |
916 | - |
917 | -#### |
918 | -#### SRCROOT _must_ be a relative path. |
919 | -#### |
920 | -SRCROOT = . |
921 | - |
922 | -# |
923 | -# open-vm-tools doesn't replicate shared source files for different modules; |
924 | -# instead, files are kept in shared locations. So define a few useful macros |
925 | -# to be able to handle both cases cleanly. |
926 | -# |
927 | -INCLUDE := |
928 | -ifdef OVT_SOURCE_DIR |
929 | -AUTOCONF_DIR := $(OVT_SOURCE_DIR)/modules/linux/shared/autoconf |
930 | -VMLIB_PATH = $(OVT_SOURCE_DIR)/lib/$(1) |
931 | -INCLUDE += -I$(OVT_SOURCE_DIR)/modules/linux/shared |
932 | -INCLUDE += -I$(OVT_SOURCE_DIR)/lib/include |
933 | -else |
934 | -AUTOCONF_DIR := $(SRCROOT)/shared/autoconf |
935 | -INCLUDE += -I$(SRCROOT)/shared |
936 | -endif |
937 | - |
938 | - |
939 | -VM_UNAME = $(shell uname -r) |
940 | - |
941 | -# Header directory for the running kernel |
942 | -ifdef LINUXINCLUDE |
943 | -HEADER_DIR = $(LINUXINCLUDE) |
944 | -else |
945 | -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include |
946 | -endif |
947 | - |
948 | -BUILD_DIR = $(HEADER_DIR)/.. |
949 | - |
950 | -DRIVER := vsock |
951 | -PRODUCT := tools-source |
952 | - |
953 | -# Grep program |
954 | -GREP = /bin/grep |
955 | - |
956 | -vm_check_gcc = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \ |
957 | - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) |
958 | -vm_check_file = $(shell if test -f $(1); then echo "yes"; else echo "no"; fi) |
959 | - |
960 | -ifndef VM_KBUILD |
961 | -VM_KBUILD := no |
962 | -ifeq ($(call vm_check_file,$(BUILD_DIR)/Makefile), yes) |
963 | -ifneq ($(call vm_check_file,$(BUILD_DIR)/Rules.make), yes) |
964 | -VM_KBUILD := 26 |
965 | -endif |
966 | -endif |
967 | -export VM_KBUILD |
968 | -endif |
969 | - |
970 | -ifndef VM_KBUILD_SHOWN |
971 | -ifeq ($(VM_KBUILD), no) |
972 | -VM_DUMMY := $(shell echo >&2 "Using standalone build system.") |
973 | -else |
974 | -ifeq ($(VM_KBUILD), 24) |
975 | -VM_DUMMY := $(shell echo >&2 "Using 2.4.x kernel build system.") |
976 | -else |
977 | -VM_DUMMY := $(shell echo >&2 "Using 2.6.x kernel build system.") |
978 | -endif |
979 | -endif |
980 | -VM_KBUILD_SHOWN := yes |
981 | -export VM_KBUILD_SHOWN |
982 | -endif |
983 | - |
984 | -ifneq ($(VM_KBUILD), no) |
985 | - |
986 | -VMCCVER := $(shell $(CC) -dumpversion) |
987 | - |
988 | -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... |
989 | -ifeq ($(VERSION),) |
990 | - |
991 | -ifeq ($(VM_KBUILD), 24) |
992 | -DRIVER_KO := $(DRIVER).o |
993 | -else |
994 | -DRIVER_KO := $(DRIVER).ko |
995 | -endif |
996 | - |
997 | -.PHONY: $(DRIVER_KO) |
998 | - |
999 | -auto-build: $(DRIVER_KO) |
1000 | - cp -f $< $(SRCROOT)/../$(DRIVER).o |
1001 | - |
1002 | -# $(DRIVER_KO) is a phony target, so compare file times explicitly |
1003 | -$(DRIVER): $(DRIVER_KO) |
1004 | - if [ $< -nt $@ ] || [ ! -e $@ ] ; then cp -f $< $@; fi |
1005 | - |
1006 | -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler |
1007 | -VM_CCVER := $(VMCCVER) |
1008 | -export VM_CCVER |
1009 | -VM_CC := $(CC) |
1010 | -export VM_CC |
1011 | - |
1012 | -MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES)) |
1013 | - |
1014 | -# |
1015 | -# Define a setup target that gets built before the actual driver. |
1016 | -# This target may not be used at all, but if it is then it will be defined |
1017 | -# in Makefile.kernel |
1018 | -# |
1019 | -prebuild:: ; |
1020 | -postbuild:: ; |
1021 | - |
1022 | -$(DRIVER_KO): prebuild |
1023 | - $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
1024 | - MODULEBUILDDIR=$(MODULEBUILDDIR) modules |
1025 | - $(MAKE) -C $$PWD SRCROOT=$$PWD/$(SRCROOT) \ |
1026 | - MODULEBUILDDIR=$(MODULEBUILDDIR) postbuild |
1027 | -endif |
1028 | - |
1029 | -vm_check_build = $(shell if $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \ |
1030 | - $(CPPFLAGS) $(CFLAGS) $(CFLAGS_KERNEL) $(LINUXINCLUDE) \ |
1031 | - $(EXTRA_CFLAGS) -Iinclude2/asm/mach-default \ |
1032 | - -DKBUILD_BASENAME=\"$(DRIVER)\" \ |
1033 | - -Werror -S -o /dev/null -xc $(1) \ |
1034 | - > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi) |
1035 | - |
1036 | -CC_WARNINGS := -Wall -Wstrict-prototypes |
1037 | -CC_OPTS := $(GLOBAL_DEFS) $(CC_WARNINGS) -DVMW_USING_KBUILD |
1038 | -ifdef VMX86_DEVEL |
1039 | -CC_OPTS += -DVMX86_DEVEL |
1040 | -endif |
1041 | -ifdef VMX86_DEBUG |
1042 | -CC_OPTS += -DVMX86_DEBUG |
1043 | -endif |
1044 | - |
1045 | -include $(SRCROOT)/Makefile.kernel |
1046 | - |
1047 | -ifdef TOPDIR |
1048 | -ifeq ($(VM_KBUILD), 24) |
1049 | - |
1050 | -O_TARGET := $(DRIVER).o |
1051 | - |
1052 | -obj-y := $($(DRIVER)-y) |
1053 | - |
1054 | -include $(TOPDIR)/Rules.make |
1055 | -endif |
1056 | -endif |
1057 | - |
1058 | -else |
1059 | - |
1060 | -include $(SRCROOT)/Makefile.normal |
1061 | - |
1062 | -endif |
1063 | - |
1064 | -#.SILENT: |
1065 | |
1066 | === removed directory '.pc/03-dkms.patch' |
1067 | === removed directory '.pc/03-dkms.patch/modules' |
1068 | === removed directory '.pc/03-dkms.patch/modules/linux' |
1069 | === removed file '.pc/03-dkms.patch/modules/linux/dkms.conf' |
1070 | --- .pc/03-dkms.patch/modules/linux/dkms.conf 2011-12-26 11:27:02 +0000 |
1071 | +++ .pc/03-dkms.patch/modules/linux/dkms.conf 1970-01-01 00:00:00 +0000 |
1072 | @@ -1,39 +0,0 @@ |
1073 | -PACKAGE_NAME=open-vm-tools |
1074 | -PACKAGE_VERSION=2011.12.20 |
1075 | -MAKE_CMD_TMPL="make VM_UNAME=\$kernelver \ |
1076 | - MODULEBUILDDIR=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build" |
1077 | - |
1078 | -# The vsock module depends on symbols exported by the vmci module, so it |
1079 | -# needs to be built afterwards; the MODULEBUILDDIR variable tells the makefiles |
1080 | -# where to store / retrive those symbol files. |
1081 | -MAKE[0]="$MAKE_CMD_TMPL -C vmblock; \ |
1082 | - $MAKE_CMD_TMPL -C vmci; \ |
1083 | - $MAKE_CMD_TMPL -C vmhgfs; \ |
1084 | - $MAKE_CMD_TMPL -C vmsync; \ |
1085 | - $MAKE_CMD_TMPL -C vmxnet; \ |
1086 | - $MAKE_CMD_TMPL -C vsock" |
1087 | -CLEAN[0]="$MAKE_CMD_TMPL -C vmblock clean; \ |
1088 | - $MAKE_CMD_TMPL -C vmci clean; \ |
1089 | - $MAKE_CMD_TMPL -C vmhgfs clean; \ |
1090 | - $MAKE_CMD_TMPL -C vmsync clean"; \ |
1091 | - $MAKE_CMD_TMPL -C vmxnet clean; \ |
1092 | - $MAKE_CMD_TMPL -C vsock clean |
1093 | -BUILT_MODULE_NAME[0]="vmblock" |
1094 | -BUILT_MODULE_NAME[1]="vmci" |
1095 | -BUILT_MODULE_NAME[2]="vmhgfs" |
1096 | -BUILT_MODULE_NAME[3]="vmsync" |
1097 | -BUILT_MODULE_NAME[4]="vmxnet" |
1098 | -BUILT_MODULE_NAME[5]="vsock" |
1099 | -BUILT_MODULE_LOCATION[0]="vmblock/" |
1100 | -BUILT_MODULE_LOCATION[1]="vmci/" |
1101 | -BUILT_MODULE_LOCATION[2]="vmhgfs/" |
1102 | -BUILT_MODULE_LOCATION[3]="vmsync/" |
1103 | -BUILT_MODULE_LOCATION[4]="vmxnet/" |
1104 | -BUILT_MODULE_LOCATION[5]="vsock/" |
1105 | -DEST_MODULE_LOCATION[0]="/kernel/fs/vmblock" |
1106 | -DEST_MODULE_LOCATION[1]="/kernel/drivers/misc" |
1107 | -DEST_MODULE_LOCATION[2]="/kernel/fs/vmhgfs" |
1108 | -DEST_MODULE_LOCATION[3]="/kernel/drivers/misc" |
1109 | -DEST_MODULE_LOCATION[4]="/kernel/drivers/net" |
1110 | -DEST_MODULE_LOCATION[5]="/kernel/net/vsock" |
1111 | -AUTOINSTALL="YES" |
1112 | |
1113 | === removed file '.pc/applied-patches' |
1114 | --- .pc/applied-patches 2012-01-23 16:09:45 +0000 |
1115 | +++ .pc/applied-patches 1970-01-01 00:00:00 +0000 |
1116 | @@ -1,2 +0,0 @@ |
1117 | -01-kvers.patch |
1118 | -03-dkms.patch |
1119 | |
1120 | === modified file 'ChangeLog' |
1121 | --- ChangeLog 2012-01-23 16:09:45 +0000 |
1122 | +++ ChangeLog 2012-03-22 21:41:20 +0000 |
1123 | @@ -1,3 +1,8 @@ |
1124 | +2012.03.13 Dmitry Torokhov <dtor@vmware.com> |
1125 | + This release tag contains commits up to the following id: |
1126 | + 0114aabd54bf2db4556563b7149c4fbbdec3d87b |
1127 | + |
1128 | + |
1129 | 2011.12.20 Marcelo Vanzin <mvanzin@vmware.com> |
1130 | This release tag contains commits up to the following id: |
1131 | dfca5cf9d1c2335c5d001deedd9266c84956b508 |
1132 | |
1133 | === modified file 'Makefile.in' |
1134 | --- Makefile.in 2012-01-23 16:09:45 +0000 |
1135 | +++ Makefile.in 2012-03-22 21:41:20 +0000 |
1136 | @@ -157,6 +157,7 @@ |
1137 | CYGPATH_W = @CYGPATH_W@ |
1138 | DEFS = @DEFS@ |
1139 | DEPDIR = @DEPDIR@ |
1140 | +DLLTOOL = @DLLTOOL@ |
1141 | DNET_CPPFLAGS = @DNET_CPPFLAGS@ |
1142 | DNET_LIBS = @DNET_LIBS@ |
1143 | DOT = @DOT@ |
1144 | @@ -209,6 +210,7 @@ |
1145 | LN_S = @LN_S@ |
1146 | LTLIBOBJS = @LTLIBOBJS@ |
1147 | MAKEINFO = @MAKEINFO@ |
1148 | +MANIFEST_TOOL = @MANIFEST_TOOL@ |
1149 | MKDIR_P = @MKDIR_P@ |
1150 | MODULES = @MODULES@ |
1151 | MODULES_DIR = @MODULES_DIR@ |
1152 | @@ -266,6 +268,7 @@ |
1153 | abs_srcdir = @abs_srcdir@ |
1154 | abs_top_builddir = @abs_top_builddir@ |
1155 | abs_top_srcdir = @abs_top_srcdir@ |
1156 | +ac_ct_AR = @ac_ct_AR@ |
1157 | ac_ct_CC = @ac_ct_CC@ |
1158 | ac_ct_CXX = @ac_ct_CXX@ |
1159 | ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
1160 | @@ -303,7 +306,6 @@ |
1161 | libexecdir = @libexecdir@ |
1162 | localedir = @localedir@ |
1163 | localstatedir = @localstatedir@ |
1164 | -lt_ECHO = @lt_ECHO@ |
1165 | mandir = @mandir@ |
1166 | mkdir_p = @mkdir_p@ |
1167 | oldincludedir = @oldincludedir@ |
1168 | |
1169 | === modified file 'NEWS' |
1170 | --- NEWS 2012-01-23 16:09:45 +0000 |
1171 | +++ NEWS 2012-03-22 21:41:20 +0000 |
1172 | @@ -1,3 +1,14 @@ |
1173 | +open-vm-tools 2012.03.13 changes: |
1174 | + * Updates for newer Linux kernel releases (3.3). |
1175 | + |
1176 | + * Updates for Solaris 11. |
1177 | + |
1178 | + * Updates for FreeBSD 9.0. |
1179 | + |
1180 | + * Translation updates. |
1181 | + |
1182 | + * Other fixes and cleanups. |
1183 | + |
1184 | open-vm-tools 2011.12.20 changes: |
1185 | * Updates for new Linux kernel releases, including some fixes for |
1186 | Fedora's re-versioned 3.x kernels. |
1187 | |
1188 | === modified file 'aclocal.m4' |
1189 | --- aclocal.m4 2012-01-23 16:09:45 +0000 |
1190 | +++ aclocal.m4 2012-03-22 21:41:20 +0000 |
1191 | @@ -13,8 +13,8 @@ |
1192 | |
1193 | m4_ifndef([AC_AUTOCONF_VERSION], |
1194 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1195 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, |
1196 | -[m4_warning([this file was generated for autoconf 2.67. |
1197 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, |
1198 | +[m4_warning([this file was generated for autoconf 2.68. |
1199 | You have another version of autoconf. It may work, but is not guaranteed to. |
1200 | If you have problems, you may need to regenerate the build system entirely. |
1201 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
1202 | |
1203 | === modified file 'autom4te.cache/output.0' |
1204 | --- autom4te.cache/output.0 2012-01-23 16:09:45 +0000 |
1205 | +++ autom4te.cache/output.0 2012-03-22 21:41:20 +0000 |
1206 | @@ -1,6 +1,6 @@ |
1207 | @%:@! /bin/sh |
1208 | @%:@ Guess values for system-dependent variables and create Makefiles. |
1209 | -@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.12.20. |
1210 | +@%:@ Generated by GNU Autoconf 2.68 for open-vm-tools 2012.03.13. |
1211 | @%:@ |
1212 | @%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>. |
1213 | @%:@ |
1214 | @@ -91,6 +91,7 @@ |
1215 | IFS=" "" $as_nl" |
1216 | |
1217 | # Find who we are. Look in the path if we contain no directory separator. |
1218 | +as_myself= |
1219 | case $0 in @%:@(( |
1220 | *[\\/]* ) as_myself=$0 ;; |
1221 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1222 | @@ -173,7 +174,15 @@ |
1223 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
1224 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
1225 | test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 |
1226 | -test \$(( 1 + 1 )) = 2 || exit 1" |
1227 | +test \$(( 1 + 1 )) = 2 || exit 1 |
1228 | + |
1229 | + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( |
1230 | + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
1231 | + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO |
1232 | + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO |
1233 | + PATH=/empty FPATH=/empty; export PATH FPATH |
1234 | + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ |
1235 | + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" |
1236 | if (eval "$as_required") 2>/dev/null; then : |
1237 | as_have_required=yes |
1238 | else |
1239 | @@ -216,11 +225,18 @@ |
1240 | # We cannot yet assume a decent shell, so we have to provide a |
1241 | # neutralization value for shells without unset; and this also |
1242 | # works around shells that cannot unset nonexistent variables. |
1243 | + # Preserve -v and -x to the replacement shell. |
1244 | BASH_ENV=/dev/null |
1245 | ENV=/dev/null |
1246 | (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
1247 | export CONFIG_SHELL |
1248 | - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
1249 | + case $- in @%:@ (((( |
1250 | + *v*x* | *x*v* ) as_opts=-vx ;; |
1251 | + *v* ) as_opts=-v ;; |
1252 | + *x* ) as_opts=-x ;; |
1253 | + * ) as_opts= ;; |
1254 | + esac |
1255 | + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} |
1256 | fi |
1257 | |
1258 | if test x$as_have_required = xno; then : |
1259 | @@ -528,155 +544,8 @@ |
1260 | # Sed expression to map a string onto a valid variable name. |
1261 | as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" |
1262 | |
1263 | - |
1264 | - |
1265 | -# Check that we are running under the correct shell. |
1266 | SHELL=${CONFIG_SHELL-/bin/sh} |
1267 | |
1268 | -case X$lt_ECHO in |
1269 | -X*--fallback-echo) |
1270 | - # Remove one level of quotation (which was required for Make). |
1271 | - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` |
1272 | - ;; |
1273 | -esac |
1274 | - |
1275 | -ECHO=${lt_ECHO-echo} |
1276 | -if test "X$1" = X--no-reexec; then |
1277 | - # Discard the --no-reexec flag, and continue. |
1278 | - shift |
1279 | -elif test "X$1" = X--fallback-echo; then |
1280 | - # Avoid inline document here, it may be left over |
1281 | - : |
1282 | -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then |
1283 | - # Yippee, $ECHO works! |
1284 | - : |
1285 | -else |
1286 | - # Restart under the correct shell. |
1287 | - exec $SHELL "$0" --no-reexec ${1+"$@"} |
1288 | -fi |
1289 | - |
1290 | -if test "X$1" = X--fallback-echo; then |
1291 | - # used as fallback echo |
1292 | - shift |
1293 | - cat <<_LT_EOF |
1294 | -$* |
1295 | -_LT_EOF |
1296 | - exit 0 |
1297 | -fi |
1298 | - |
1299 | -# The HP-UX ksh and POSIX shell print the target directory to stdout |
1300 | -# if CDPATH is set. |
1301 | -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1302 | - |
1303 | -if test -z "$lt_ECHO"; then |
1304 | - if test "X${echo_test_string+set}" != Xset; then |
1305 | - # find a string as large as possible, as long as the shell can cope with it |
1306 | - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do |
1307 | - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... |
1308 | - if { echo_test_string=`eval $cmd`; } 2>/dev/null && |
1309 | - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null |
1310 | - then |
1311 | - break |
1312 | - fi |
1313 | - done |
1314 | - fi |
1315 | - |
1316 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
1317 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
1318 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1319 | - : |
1320 | - else |
1321 | - # The Solaris, AIX, and Digital Unix default echo programs unquote |
1322 | - # backslashes. This makes it impossible to quote backslashes using |
1323 | - # echo "$something" | sed 's/\\/\\\\/g' |
1324 | - # |
1325 | - # So, first we look for a working echo in the user's PATH. |
1326 | - |
1327 | - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR |
1328 | - for dir in $PATH /usr/ucb; do |
1329 | - IFS="$lt_save_ifs" |
1330 | - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && |
1331 | - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && |
1332 | - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && |
1333 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1334 | - ECHO="$dir/echo" |
1335 | - break |
1336 | - fi |
1337 | - done |
1338 | - IFS="$lt_save_ifs" |
1339 | - |
1340 | - if test "X$ECHO" = Xecho; then |
1341 | - # We didn't find a better echo, so look for alternatives. |
1342 | - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && |
1343 | - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && |
1344 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1345 | - # This shell has a builtin print -r that does the trick. |
1346 | - ECHO='print -r' |
1347 | - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && |
1348 | - test "X$CONFIG_SHELL" != X/bin/ksh; then |
1349 | - # If we have ksh, try running configure again with it. |
1350 | - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
1351 | - export ORIGINAL_CONFIG_SHELL |
1352 | - CONFIG_SHELL=/bin/ksh |
1353 | - export CONFIG_SHELL |
1354 | - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} |
1355 | - else |
1356 | - # Try using printf. |
1357 | - ECHO='printf %s\n' |
1358 | - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && |
1359 | - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && |
1360 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1361 | - # Cool, printf works |
1362 | - : |
1363 | - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && |
1364 | - test "X$echo_testing_string" = 'X\t' && |
1365 | - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
1366 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1367 | - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL |
1368 | - export CONFIG_SHELL |
1369 | - SHELL="$CONFIG_SHELL" |
1370 | - export SHELL |
1371 | - ECHO="$CONFIG_SHELL $0 --fallback-echo" |
1372 | - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && |
1373 | - test "X$echo_testing_string" = 'X\t' && |
1374 | - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && |
1375 | - test "X$echo_testing_string" = "X$echo_test_string"; then |
1376 | - ECHO="$CONFIG_SHELL $0 --fallback-echo" |
1377 | - else |
1378 | - # maybe with a smaller string... |
1379 | - prev=: |
1380 | - |
1381 | - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do |
1382 | - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null |
1383 | - then |
1384 | - break |
1385 | - fi |
1386 | - prev="$cmd" |
1387 | - done |
1388 | - |
1389 | - if test "$prev" != 'sed 50q "$0"'; then |
1390 | - echo_test_string=`eval $prev` |
1391 | - export echo_test_string |
1392 | - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} |
1393 | - else |
1394 | - # Oops. We lost completely, so just stick with echo. |
1395 | - ECHO=echo |
1396 | - fi |
1397 | - fi |
1398 | - fi |
1399 | - fi |
1400 | - fi |
1401 | -fi |
1402 | - |
1403 | -# Copy echo and quote the copy suitably for passing to libtool from |
1404 | -# the Makefile, instead of quoting the original, which is used later. |
1405 | -lt_ECHO=$ECHO |
1406 | -if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then |
1407 | - lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" |
1408 | -fi |
1409 | - |
1410 | - |
1411 | - |
1412 | |
1413 | test -n "$DJDIR" || exec 7<&0 </dev/null |
1414 | exec 6>&1 |
1415 | @@ -701,8 +570,8 @@ |
1416 | # Identity of this package. |
1417 | PACKAGE_NAME='open-vm-tools' |
1418 | PACKAGE_TARNAME='open-vm-tools' |
1419 | -PACKAGE_VERSION='2011.12.20' |
1420 | -PACKAGE_STRING='open-vm-tools 2011.12.20' |
1421 | +PACKAGE_VERSION='2012.03.13' |
1422 | +PACKAGE_STRING='open-vm-tools 2012.03.13' |
1423 | PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net' |
1424 | PACKAGE_URL='' |
1425 | |
1426 | @@ -864,9 +733,11 @@ |
1427 | LIPO |
1428 | NMEDIT |
1429 | DSYMUTIL |
1430 | -lt_ECHO |
1431 | +MANIFEST_TOOL |
1432 | RANLIB |
1433 | +ac_ct_AR |
1434 | AR |
1435 | +DLLTOOL |
1436 | OBJDUMP |
1437 | NM |
1438 | ac_ct_DUMPBIN |
1439 | @@ -988,6 +859,7 @@ |
1440 | with_pic |
1441 | enable_fast_install |
1442 | with_gnu_ld |
1443 | +with_sysroot |
1444 | enable_libtool_lock |
1445 | with_x |
1446 | with_pam |
1447 | @@ -1414,7 +1286,7 @@ |
1448 | $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
1449 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && |
1450 | $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
1451 | - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} |
1452 | + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" |
1453 | ;; |
1454 | |
1455 | esac |
1456 | @@ -1552,7 +1424,7 @@ |
1457 | # Omit some internal or obsolete options to make the list less imposing. |
1458 | # This message is too long to be a string in the A/UX 3.1 sh. |
1459 | cat <<_ACEOF |
1460 | -\`configure' configures open-vm-tools 2011.12.20 to adapt to many kinds of systems. |
1461 | +\`configure' configures open-vm-tools 2012.03.13 to adapt to many kinds of systems. |
1462 | |
1463 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1464 | |
1465 | @@ -1626,7 +1498,7 @@ |
1466 | |
1467 | if test -n "$ac_init_help"; then |
1468 | case $ac_init_help in |
1469 | - short | recursive ) echo "Configuration of open-vm-tools 2011.12.20:";; |
1470 | + short | recursive ) echo "Configuration of open-vm-tools 2012.03.13:";; |
1471 | esac |
1472 | cat <<\_ACEOF |
1473 | |
1474 | @@ -1662,6 +1534,8 @@ |
1475 | --with-pic try to use only PIC/non-PIC objects @<:@default=use |
1476 | both@:>@ |
1477 | --with-gnu-ld assume the C compiler uses GNU ld @<:@default=no@:>@ |
1478 | + --with-sysroot=DIR Search for dependent libraries within DIR |
1479 | + (or the compiler's sysroot if not specified). |
1480 | --with-x use the X Window System |
1481 | --without-pam compiles without PAM support. |
1482 | --with-pam-prefix specifies where pam files go. Default is |
1483 | @@ -1752,8 +1626,8 @@ |
1484 | test -n "$ac_init_help" && exit $ac_status |
1485 | if $ac_init_version; then |
1486 | cat <<\_ACEOF |
1487 | -open-vm-tools configure 2011.12.20 |
1488 | -generated by GNU Autoconf 2.67 |
1489 | +open-vm-tools configure 2012.03.13 |
1490 | +generated by GNU Autoconf 2.68 |
1491 | |
1492 | Copyright (C) 2010 Free Software Foundation, Inc. |
1493 | This configure script is free software; the Free Software Foundation |
1494 | @@ -1799,7 +1673,7 @@ |
1495 | |
1496 | ac_retval=1 |
1497 | fi |
1498 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1499 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1500 | as_fn_set_status $ac_retval |
1501 | |
1502 | } @%:@ ac_fn_c_try_compile |
1503 | @@ -1836,7 +1710,7 @@ |
1504 | |
1505 | ac_retval=1 |
1506 | fi |
1507 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1508 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1509 | as_fn_set_status $ac_retval |
1510 | |
1511 | } @%:@ ac_fn_c_try_cpp |
1512 | @@ -1874,7 +1748,7 @@ |
1513 | |
1514 | ac_retval=1 |
1515 | fi |
1516 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1517 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1518 | as_fn_set_status $ac_retval |
1519 | |
1520 | } @%:@ ac_fn_cxx_try_compile |
1521 | @@ -1920,7 +1794,7 @@ |
1522 | # interfere with the next link command; also delete a directory that is |
1523 | # left behind by Apple's compiler. We do this before executing the actions. |
1524 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
1525 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1526 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1527 | as_fn_set_status $ac_retval |
1528 | |
1529 | } @%:@ ac_fn_c_try_link |
1530 | @@ -1934,7 +1808,7 @@ |
1531 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1532 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1533 | $as_echo_n "checking for $2... " >&6; } |
1534 | -if eval "test \"\${$3+set}\"" = set; then : |
1535 | +if eval \${$3+:} false; then : |
1536 | $as_echo_n "(cached) " >&6 |
1537 | else |
1538 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1539 | @@ -1952,7 +1826,7 @@ |
1540 | eval ac_res=\$$3 |
1541 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1542 | $as_echo "$ac_res" >&6; } |
1543 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1544 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1545 | |
1546 | } @%:@ ac_fn_c_check_header_compile |
1547 | |
1548 | @@ -1993,7 +1867,7 @@ |
1549 | ac_retval=$ac_status |
1550 | fi |
1551 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
1552 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1553 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1554 | as_fn_set_status $ac_retval |
1555 | |
1556 | } @%:@ ac_fn_c_try_run |
1557 | @@ -2006,7 +1880,7 @@ |
1558 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1559 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1560 | $as_echo_n "checking for $2... " >&6; } |
1561 | -if eval "test \"\${$3+set}\"" = set; then : |
1562 | +if eval \${$3+:} false; then : |
1563 | $as_echo_n "(cached) " >&6 |
1564 | else |
1565 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1566 | @@ -2061,7 +1935,7 @@ |
1567 | eval ac_res=\$$3 |
1568 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1569 | $as_echo "$ac_res" >&6; } |
1570 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1571 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1572 | |
1573 | } @%:@ ac_fn_c_check_func |
1574 | |
1575 | @@ -2097,7 +1971,7 @@ |
1576 | |
1577 | ac_retval=1 |
1578 | fi |
1579 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1580 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1581 | as_fn_set_status $ac_retval |
1582 | |
1583 | } @%:@ ac_fn_cxx_try_cpp |
1584 | @@ -2143,7 +2017,7 @@ |
1585 | # interfere with the next link command; also delete a directory that is |
1586 | # left behind by Apple's compiler. We do this before executing the actions. |
1587 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
1588 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1589 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1590 | as_fn_set_status $ac_retval |
1591 | |
1592 | } @%:@ ac_fn_cxx_try_link |
1593 | @@ -2156,10 +2030,10 @@ |
1594 | ac_fn_c_check_header_mongrel () |
1595 | { |
1596 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1597 | - if eval "test \"\${$3+set}\"" = set; then : |
1598 | + if eval \${$3+:} false; then : |
1599 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1600 | $as_echo_n "checking for $2... " >&6; } |
1601 | -if eval "test \"\${$3+set}\"" = set; then : |
1602 | +if eval \${$3+:} false; then : |
1603 | $as_echo_n "(cached) " >&6 |
1604 | fi |
1605 | eval ac_res=\$$3 |
1606 | @@ -2226,7 +2100,7 @@ |
1607 | esac |
1608 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1609 | $as_echo_n "checking for $2... " >&6; } |
1610 | -if eval "test \"\${$3+set}\"" = set; then : |
1611 | +if eval \${$3+:} false; then : |
1612 | $as_echo_n "(cached) " >&6 |
1613 | else |
1614 | eval "$3=\$ac_header_compiler" |
1615 | @@ -2235,7 +2109,7 @@ |
1616 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1617 | $as_echo "$ac_res" >&6; } |
1618 | fi |
1619 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1620 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1621 | |
1622 | } @%:@ ac_fn_c_check_header_mongrel |
1623 | |
1624 | @@ -2247,10 +2121,10 @@ |
1625 | ac_fn_cxx_check_header_mongrel () |
1626 | { |
1627 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1628 | - if eval "test \"\${$3+set}\"" = set; then : |
1629 | + if eval \${$3+:} false; then : |
1630 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1631 | $as_echo_n "checking for $2... " >&6; } |
1632 | -if eval "test \"\${$3+set}\"" = set; then : |
1633 | +if eval \${$3+:} false; then : |
1634 | $as_echo_n "(cached) " >&6 |
1635 | fi |
1636 | eval ac_res=\$$3 |
1637 | @@ -2317,7 +2191,7 @@ |
1638 | esac |
1639 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1640 | $as_echo_n "checking for $2... " >&6; } |
1641 | -if eval "test \"\${$3+set}\"" = set; then : |
1642 | +if eval \${$3+:} false; then : |
1643 | $as_echo_n "(cached) " >&6 |
1644 | else |
1645 | eval "$3=\$ac_header_compiler" |
1646 | @@ -2326,7 +2200,7 @@ |
1647 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1648 | $as_echo "$ac_res" >&6; } |
1649 | fi |
1650 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1651 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1652 | |
1653 | } @%:@ ac_fn_cxx_check_header_mongrel |
1654 | |
1655 | @@ -2339,7 +2213,7 @@ |
1656 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1657 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1658 | $as_echo_n "checking for $2... " >&6; } |
1659 | -if eval "test \"\${$3+set}\"" = set; then : |
1660 | +if eval \${$3+:} false; then : |
1661 | $as_echo_n "(cached) " >&6 |
1662 | else |
1663 | eval "$3=no" |
1664 | @@ -2380,7 +2254,7 @@ |
1665 | eval ac_res=\$$3 |
1666 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1667 | $as_echo "$ac_res" >&6; } |
1668 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1669 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1670 | |
1671 | } @%:@ ac_fn_c_check_type |
1672 | |
1673 | @@ -2393,7 +2267,7 @@ |
1674 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1675 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 |
1676 | $as_echo_n "checking for $2.$3... " >&6; } |
1677 | -if eval "test \"\${$4+set}\"" = set; then : |
1678 | +if eval \${$4+:} false; then : |
1679 | $as_echo_n "(cached) " >&6 |
1680 | else |
1681 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1682 | @@ -2437,15 +2311,15 @@ |
1683 | eval ac_res=\$$4 |
1684 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1685 | $as_echo "$ac_res" >&6; } |
1686 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1687 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1688 | |
1689 | } @%:@ ac_fn_c_check_member |
1690 | cat >config.log <<_ACEOF |
1691 | This file contains any messages produced by compilers while |
1692 | running configure, to aid debugging if configure makes a mistake. |
1693 | |
1694 | -It was created by open-vm-tools $as_me 2011.12.20, which was |
1695 | -generated by GNU Autoconf 2.67. Invocation command line was |
1696 | +It was created by open-vm-tools $as_me 2012.03.13, which was |
1697 | +generated by GNU Autoconf 2.68. Invocation command line was |
1698 | |
1699 | $ $0 $@ |
1700 | |
1701 | @@ -2703,7 +2577,7 @@ |
1702 | || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1703 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1704 | as_fn_error $? "failed to load site script $ac_site_file |
1705 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1706 | +See \`config.log' for more details" "$LINENO" 5; } |
1707 | fi |
1708 | done |
1709 | |
1710 | @@ -2779,7 +2653,7 @@ |
1711 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1712 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
1713 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
1714 | - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
1715 | + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
1716 | fi |
1717 | ## -------------------- ## |
1718 | ## Main body of script. ## |
1719 | @@ -2833,7 +2707,7 @@ |
1720 | fi |
1721 | done |
1722 | if test -z "$ac_aux_dir"; then |
1723 | - as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 |
1724 | + as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5 |
1725 | fi |
1726 | |
1727 | # These three variables are undocumented and unsupported, |
1728 | @@ -2849,27 +2723,27 @@ |
1729 | |
1730 | # Make sure we can run config.sub. |
1731 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
1732 | - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
1733 | + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
1734 | |
1735 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
1736 | $as_echo_n "checking build system type... " >&6; } |
1737 | -if test "${ac_cv_build+set}" = set; then : |
1738 | +if ${ac_cv_build+:} false; then : |
1739 | $as_echo_n "(cached) " >&6 |
1740 | else |
1741 | ac_build_alias=$build_alias |
1742 | test "x$ac_build_alias" = x && |
1743 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
1744 | test "x$ac_build_alias" = x && |
1745 | - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 |
1746 | + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 |
1747 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
1748 | - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
1749 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
1750 | |
1751 | fi |
1752 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 |
1753 | $as_echo "$ac_cv_build" >&6; } |
1754 | case $ac_cv_build in |
1755 | *-*-*) ;; |
1756 | -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; |
1757 | +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; |
1758 | esac |
1759 | build=$ac_cv_build |
1760 | ac_save_IFS=$IFS; IFS='-' |
1761 | @@ -2887,14 +2761,14 @@ |
1762 | |
1763 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 |
1764 | $as_echo_n "checking host system type... " >&6; } |
1765 | -if test "${ac_cv_host+set}" = set; then : |
1766 | +if ${ac_cv_host+:} false; then : |
1767 | $as_echo_n "(cached) " >&6 |
1768 | else |
1769 | if test "x$host_alias" = x; then |
1770 | ac_cv_host=$ac_cv_build |
1771 | else |
1772 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
1773 | - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
1774 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
1775 | fi |
1776 | |
1777 | fi |
1778 | @@ -2902,7 +2776,7 @@ |
1779 | $as_echo "$ac_cv_host" >&6; } |
1780 | case $ac_cv_host in |
1781 | *-*-*) ;; |
1782 | -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; |
1783 | +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; |
1784 | esac |
1785 | host=$ac_cv_host |
1786 | ac_save_IFS=$IFS; IFS='-' |
1787 | @@ -2929,7 +2803,7 @@ |
1788 | userSpaceBitness="64" |
1789 | ;; |
1790 | *) |
1791 | - as_fn_error $? "Unknown architecture." "$LINENO" 5 |
1792 | + as_fn_error $? "Unknown architecture." "$LINENO" 5 |
1793 | ;; |
1794 | esac |
1795 | |
1796 | @@ -3002,14 +2876,14 @@ |
1797 | case "$os" in |
1798 | linux) |
1799 | if test "$osVersion" -lt 206009; then |
1800 | - as_fn_error $? "Kernels prior to 2.6.9 are not supported in this release of open-vm-tools. Configure using --without-kernel-modules to suppress building kernel drivers." "$LINENO" 5 |
1801 | + as_fn_error $? "Kernels prior to 2.6.9 are not supported in this release of open-vm-tools. Configure using --without-kernel-modules to suppress building kernel drivers." "$LINENO" 5 |
1802 | fi |
1803 | if test ! -d "$LINUXDIR/kernel/"; then |
1804 | - as_fn_error $? "$LINUXDIR/kernel does not exist" "$LINENO" 5 |
1805 | + as_fn_error $? "$LINUXDIR/kernel does not exist" "$LINENO" 5 |
1806 | fi |
1807 | LINUXINCLUDE="$LINUXDIR/build/include" |
1808 | if test ! -d "$LINUXINCLUDE"; then |
1809 | - as_fn_error $? "Can't find include dir under $LINUXDIR" "$LINENO" 5 |
1810 | + as_fn_error $? "Can't find include dir under $LINUXDIR" "$LINENO" 5 |
1811 | fi |
1812 | ;; |
1813 | |
1814 | @@ -3019,7 +2893,7 @@ |
1815 | freebsd_sysdir="$SYSDIR" |
1816 | fi |
1817 | if test ! -f "$freebsd_sysdir/conf/kmod.mk"; then |
1818 | - as_fn_error $? "FreeBSD kernel tree not found. Please install the kernel sources (or provide the location using SYSDIR) or configure using --without-kernel-modules." "$LINENO" 5 |
1819 | + as_fn_error $? "FreeBSD kernel tree not found. Please install the kernel sources (or provide the location using SYSDIR) or configure using --without-kernel-modules." "$LINENO" 5 |
1820 | fi |
1821 | ;; |
1822 | esac |
1823 | @@ -3087,7 +2961,7 @@ |
1824 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 |
1825 | $as_echo_n "checking for a BSD-compatible install... " >&6; } |
1826 | if test -z "$INSTALL"; then |
1827 | -if test "${ac_cv_path_install+set}" = set; then : |
1828 | +if ${ac_cv_path_install+:} false; then : |
1829 | $as_echo_n "(cached) " >&6 |
1830 | else |
1831 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1832 | @@ -3174,11 +3048,11 @@ |
1833 | ' |
1834 | case `pwd` in |
1835 | *[\\\"\#\$\&\'\`$am_lf]*) |
1836 | - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; |
1837 | + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; |
1838 | esac |
1839 | case $srcdir in |
1840 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
1841 | - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; |
1842 | + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
1843 | esac |
1844 | |
1845 | # Do `set' in a subshell so we don't clobber the current shell's |
1846 | @@ -3201,7 +3075,7 @@ |
1847 | # broken ls alias from the environment. This has actually |
1848 | # happened. Such a system could not be considered "sane". |
1849 | as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
1850 | -alias in your environment" "$LINENO" 5 |
1851 | +alias in your environment" "$LINENO" 5 |
1852 | fi |
1853 | |
1854 | test "$2" = conftest.file |
1855 | @@ -3211,7 +3085,7 @@ |
1856 | : |
1857 | else |
1858 | as_fn_error $? "newly created file is older than distributed files! |
1859 | -Check your system clock" "$LINENO" 5 |
1860 | +Check your system clock" "$LINENO" 5 |
1861 | fi |
1862 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1863 | $as_echo "yes" >&6; } |
1864 | @@ -3264,7 +3138,7 @@ |
1865 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
1866 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1867 | $as_echo_n "checking for $ac_word... " >&6; } |
1868 | -if test "${ac_cv_prog_STRIP+set}" = set; then : |
1869 | +if ${ac_cv_prog_STRIP+:} false; then : |
1870 | $as_echo_n "(cached) " >&6 |
1871 | else |
1872 | if test -n "$STRIP"; then |
1873 | @@ -3304,7 +3178,7 @@ |
1874 | set dummy strip; ac_word=$2 |
1875 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1876 | $as_echo_n "checking for $ac_word... " >&6; } |
1877 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
1878 | +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : |
1879 | $as_echo_n "(cached) " >&6 |
1880 | else |
1881 | if test -n "$ac_ct_STRIP"; then |
1882 | @@ -3357,7 +3231,7 @@ |
1883 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 |
1884 | $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } |
1885 | if test -z "$MKDIR_P"; then |
1886 | - if test "${ac_cv_path_mkdir+set}" = set; then : |
1887 | + if ${ac_cv_path_mkdir+:} false; then : |
1888 | $as_echo_n "(cached) " >&6 |
1889 | else |
1890 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1891 | @@ -3408,7 +3282,7 @@ |
1892 | set dummy $ac_prog; ac_word=$2 |
1893 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1894 | $as_echo_n "checking for $ac_word... " >&6; } |
1895 | -if test "${ac_cv_prog_AWK+set}" = set; then : |
1896 | +if ${ac_cv_prog_AWK+:} false; then : |
1897 | $as_echo_n "(cached) " >&6 |
1898 | else |
1899 | if test -n "$AWK"; then |
1900 | @@ -3448,7 +3322,7 @@ |
1901 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
1902 | set x ${MAKE-make} |
1903 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
1904 | -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : |
1905 | +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : |
1906 | $as_echo_n "(cached) " >&6 |
1907 | else |
1908 | cat >conftest.make <<\_ACEOF |
1909 | @@ -3490,7 +3364,7 @@ |
1910 | am__isrc=' -I$(srcdir)' |
1911 | # test to see if srcdir already configured |
1912 | if test -f $srcdir/config.status; then |
1913 | - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
1914 | + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
1915 | fi |
1916 | fi |
1917 | |
1918 | @@ -3506,7 +3380,7 @@ |
1919 | |
1920 | # Define the identity of the package. |
1921 | PACKAGE='open-vm-tools' |
1922 | - VERSION='2011.12.20' |
1923 | + VERSION='2012.03.13' |
1924 | |
1925 | |
1926 | cat >>confdefs.h <<_ACEOF |
1927 | @@ -3640,7 +3514,7 @@ |
1928 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
1929 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1930 | $as_echo_n "checking for $ac_word... " >&6; } |
1931 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1932 | +if ${ac_cv_prog_CC+:} false; then : |
1933 | $as_echo_n "(cached) " >&6 |
1934 | else |
1935 | if test -n "$CC"; then |
1936 | @@ -3680,7 +3554,7 @@ |
1937 | set dummy gcc; ac_word=$2 |
1938 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1939 | $as_echo_n "checking for $ac_word... " >&6; } |
1940 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
1941 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
1942 | $as_echo_n "(cached) " >&6 |
1943 | else |
1944 | if test -n "$ac_ct_CC"; then |
1945 | @@ -3733,7 +3607,7 @@ |
1946 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
1947 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1948 | $as_echo_n "checking for $ac_word... " >&6; } |
1949 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1950 | +if ${ac_cv_prog_CC+:} false; then : |
1951 | $as_echo_n "(cached) " >&6 |
1952 | else |
1953 | if test -n "$CC"; then |
1954 | @@ -3773,7 +3647,7 @@ |
1955 | set dummy cc; ac_word=$2 |
1956 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1957 | $as_echo_n "checking for $ac_word... " >&6; } |
1958 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1959 | +if ${ac_cv_prog_CC+:} false; then : |
1960 | $as_echo_n "(cached) " >&6 |
1961 | else |
1962 | if test -n "$CC"; then |
1963 | @@ -3832,7 +3706,7 @@ |
1964 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
1965 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1966 | $as_echo_n "checking for $ac_word... " >&6; } |
1967 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1968 | +if ${ac_cv_prog_CC+:} false; then : |
1969 | $as_echo_n "(cached) " >&6 |
1970 | else |
1971 | if test -n "$CC"; then |
1972 | @@ -3876,7 +3750,7 @@ |
1973 | set dummy $ac_prog; ac_word=$2 |
1974 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1975 | $as_echo_n "checking for $ac_word... " >&6; } |
1976 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
1977 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
1978 | $as_echo_n "(cached) " >&6 |
1979 | else |
1980 | if test -n "$ac_ct_CC"; then |
1981 | @@ -3931,7 +3805,7 @@ |
1982 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1983 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1984 | as_fn_error $? "no acceptable C compiler found in \$PATH |
1985 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1986 | +See \`config.log' for more details" "$LINENO" 5; } |
1987 | |
1988 | # Provide some information about the compiler. |
1989 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
1990 | @@ -4046,7 +3920,7 @@ |
1991 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1992 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1993 | as_fn_error 77 "C compiler cannot create executables |
1994 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1995 | +See \`config.log' for more details" "$LINENO" 5; } |
1996 | else |
1997 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1998 | $as_echo "yes" >&6; } |
1999 | @@ -4089,7 +3963,7 @@ |
2000 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2001 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2002 | as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
2003 | -See \`config.log' for more details" "$LINENO" 5 ; } |
2004 | +See \`config.log' for more details" "$LINENO" 5; } |
2005 | fi |
2006 | rm -f conftest conftest$ac_cv_exeext |
2007 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
2008 | @@ -4148,7 +4022,7 @@ |
2009 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2010 | as_fn_error $? "cannot run C compiled programs. |
2011 | If you meant to cross compile, use \`--host'. |
2012 | -See \`config.log' for more details" "$LINENO" 5 ; } |
2013 | +See \`config.log' for more details" "$LINENO" 5; } |
2014 | fi |
2015 | fi |
2016 | fi |
2017 | @@ -4159,7 +4033,7 @@ |
2018 | ac_clean_files=$ac_clean_files_save |
2019 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
2020 | $as_echo_n "checking for suffix of object files... " >&6; } |
2021 | -if test "${ac_cv_objext+set}" = set; then : |
2022 | +if ${ac_cv_objext+:} false; then : |
2023 | $as_echo_n "(cached) " >&6 |
2024 | else |
2025 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2026 | @@ -4200,7 +4074,7 @@ |
2027 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2028 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2029 | as_fn_error $? "cannot compute suffix of object files: cannot compile |
2030 | -See \`config.log' for more details" "$LINENO" 5 ; } |
2031 | +See \`config.log' for more details" "$LINENO" 5; } |
2032 | fi |
2033 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
2034 | fi |
2035 | @@ -4210,7 +4084,7 @@ |
2036 | ac_objext=$OBJEXT |
2037 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
2038 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
2039 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
2040 | +if ${ac_cv_c_compiler_gnu+:} false; then : |
2041 | $as_echo_n "(cached) " >&6 |
2042 | else |
2043 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2044 | @@ -4247,7 +4121,7 @@ |
2045 | ac_save_CFLAGS=$CFLAGS |
2046 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
2047 | $as_echo_n "checking whether $CC accepts -g... " >&6; } |
2048 | -if test "${ac_cv_prog_cc_g+set}" = set; then : |
2049 | +if ${ac_cv_prog_cc_g+:} false; then : |
2050 | $as_echo_n "(cached) " >&6 |
2051 | else |
2052 | ac_save_c_werror_flag=$ac_c_werror_flag |
2053 | @@ -4325,7 +4199,7 @@ |
2054 | fi |
2055 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
2056 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
2057 | -if test "${ac_cv_prog_cc_c89+set}" = set; then : |
2058 | +if ${ac_cv_prog_cc_c89+:} false; then : |
2059 | $as_echo_n "(cached) " >&6 |
2060 | else |
2061 | ac_cv_prog_cc_c89=no |
2062 | @@ -4424,7 +4298,7 @@ |
2063 | |
2064 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
2065 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
2066 | -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : |
2067 | +if ${am_cv_CC_dependencies_compiler_type+:} false; then : |
2068 | $as_echo_n "(cached) " >&6 |
2069 | else |
2070 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
2071 | @@ -4559,7 +4433,7 @@ |
2072 | CPP= |
2073 | fi |
2074 | if test -z "$CPP"; then |
2075 | - if test "${ac_cv_prog_CPP+set}" = set; then : |
2076 | + if ${ac_cv_prog_CPP+:} false; then : |
2077 | $as_echo_n "(cached) " >&6 |
2078 | else |
2079 | # Double quotes because CPP needs to be expanded |
2080 | @@ -4675,7 +4549,7 @@ |
2081 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2082 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2083 | as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
2084 | -See \`config.log' for more details" "$LINENO" 5 ; } |
2085 | +See \`config.log' for more details" "$LINENO" 5; } |
2086 | fi |
2087 | |
2088 | ac_ext=c |
2089 | @@ -4694,7 +4568,7 @@ |
2090 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
2091 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2092 | $as_echo_n "checking for $ac_word... " >&6; } |
2093 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2094 | +if ${ac_cv_prog_CC+:} false; then : |
2095 | $as_echo_n "(cached) " >&6 |
2096 | else |
2097 | if test -n "$CC"; then |
2098 | @@ -4734,7 +4608,7 @@ |
2099 | set dummy gcc; ac_word=$2 |
2100 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2101 | $as_echo_n "checking for $ac_word... " >&6; } |
2102 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
2103 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
2104 | $as_echo_n "(cached) " >&6 |
2105 | else |
2106 | if test -n "$ac_ct_CC"; then |
2107 | @@ -4787,7 +4661,7 @@ |
2108 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
2109 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2110 | $as_echo_n "checking for $ac_word... " >&6; } |
2111 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2112 | +if ${ac_cv_prog_CC+:} false; then : |
2113 | $as_echo_n "(cached) " >&6 |
2114 | else |
2115 | if test -n "$CC"; then |
2116 | @@ -4827,7 +4701,7 @@ |
2117 | set dummy cc; ac_word=$2 |
2118 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2119 | $as_echo_n "checking for $ac_word... " >&6; } |
2120 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2121 | +if ${ac_cv_prog_CC+:} false; then : |
2122 | $as_echo_n "(cached) " >&6 |
2123 | else |
2124 | if test -n "$CC"; then |
2125 | @@ -4886,7 +4760,7 @@ |
2126 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
2127 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2128 | $as_echo_n "checking for $ac_word... " >&6; } |
2129 | -if test "${ac_cv_prog_CC+set}" = set; then : |
2130 | +if ${ac_cv_prog_CC+:} false; then : |
2131 | $as_echo_n "(cached) " >&6 |
2132 | else |
2133 | if test -n "$CC"; then |
2134 | @@ -4930,7 +4804,7 @@ |
2135 | set dummy $ac_prog; ac_word=$2 |
2136 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2137 | $as_echo_n "checking for $ac_word... " >&6; } |
2138 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
2139 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
2140 | $as_echo_n "(cached) " >&6 |
2141 | else |
2142 | if test -n "$ac_ct_CC"; then |
2143 | @@ -4985,7 +4859,7 @@ |
2144 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2145 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2146 | as_fn_error $? "no acceptable C compiler found in \$PATH |
2147 | -See \`config.log' for more details" "$LINENO" 5 ; } |
2148 | +See \`config.log' for more details" "$LINENO" 5; } |
2149 | |
2150 | # Provide some information about the compiler. |
2151 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
2152 | @@ -5014,7 +4888,7 @@ |
2153 | |
2154 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
2155 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
2156 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
2157 | +if ${ac_cv_c_compiler_gnu+:} false; then : |
2158 | $as_echo_n "(cached) " >&6 |
2159 | else |
2160 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2161 | @@ -5051,7 +4925,7 @@ |
2162 | ac_save_CFLAGS=$CFLAGS |
2163 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
2164 | $as_echo_n "checking whether $CC accepts -g... " >&6; } |
2165 | -if test "${ac_cv_prog_cc_g+set}" = set; then : |
2166 | +if ${ac_cv_prog_cc_g+:} false; then : |
2167 | $as_echo_n "(cached) " >&6 |
2168 | else |
2169 | ac_save_c_werror_flag=$ac_c_werror_flag |
2170 | @@ -5129,7 +5003,7 @@ |
2171 | fi |
2172 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
2173 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
2174 | -if test "${ac_cv_prog_cc_c89+set}" = set; then : |
2175 | +if ${ac_cv_prog_cc_c89+:} false; then : |
2176 | $as_echo_n "(cached) " >&6 |
2177 | else |
2178 | ac_cv_prog_cc_c89=no |
2179 | @@ -5228,7 +5102,7 @@ |
2180 | |
2181 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
2182 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
2183 | -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : |
2184 | +if ${am_cv_CC_dependencies_compiler_type+:} false; then : |
2185 | $as_echo_n "(cached) " >&6 |
2186 | else |
2187 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
2188 | @@ -5370,7 +5244,7 @@ |
2189 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
2190 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2191 | $as_echo_n "checking for $ac_word... " >&6; } |
2192 | -if test "${ac_cv_prog_CXX+set}" = set; then : |
2193 | +if ${ac_cv_prog_CXX+:} false; then : |
2194 | $as_echo_n "(cached) " >&6 |
2195 | else |
2196 | if test -n "$CXX"; then |
2197 | @@ -5414,7 +5288,7 @@ |
2198 | set dummy $ac_prog; ac_word=$2 |
2199 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2200 | $as_echo_n "checking for $ac_word... " >&6; } |
2201 | -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : |
2202 | +if ${ac_cv_prog_ac_ct_CXX+:} false; then : |
2203 | $as_echo_n "(cached) " >&6 |
2204 | else |
2205 | if test -n "$ac_ct_CXX"; then |
2206 | @@ -5492,7 +5366,7 @@ |
2207 | |
2208 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 |
2209 | $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } |
2210 | -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : |
2211 | +if ${ac_cv_cxx_compiler_gnu+:} false; then : |
2212 | $as_echo_n "(cached) " >&6 |
2213 | else |
2214 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2215 | @@ -5529,7 +5403,7 @@ |
2216 | ac_save_CXXFLAGS=$CXXFLAGS |
2217 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 |
2218 | $as_echo_n "checking whether $CXX accepts -g... " >&6; } |
2219 | -if test "${ac_cv_prog_cxx_g+set}" = set; then : |
2220 | +if ${ac_cv_prog_cxx_g+:} false; then : |
2221 | $as_echo_n "(cached) " >&6 |
2222 | else |
2223 | ac_save_cxx_werror_flag=$ac_cxx_werror_flag |
2224 | @@ -5615,7 +5489,7 @@ |
2225 | |
2226 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
2227 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
2228 | -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : |
2229 | +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : |
2230 | $as_echo_n "(cached) " >&6 |
2231 | else |
2232 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
2233 | @@ -5751,7 +5625,7 @@ |
2234 | fi |
2235 | set dummy $CC; ac_cc=`$as_echo "$2" | |
2236 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
2237 | -if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : |
2238 | +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : |
2239 | $as_echo_n "(cached) " >&6 |
2240 | else |
2241 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2242 | @@ -5873,7 +5747,7 @@ |
2243 | |
2244 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 |
2245 | $as_echo_n "checking for a sed that does not truncate output... " >&6; } |
2246 | -if test "${ac_cv_path_SED+set}" = set; then : |
2247 | +if ${ac_cv_path_SED+:} false; then : |
2248 | $as_echo_n "(cached) " >&6 |
2249 | else |
2250 | ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ |
2251 | @@ -5928,7 +5802,7 @@ |
2252 | done |
2253 | IFS=$as_save_IFS |
2254 | if test -z "$ac_cv_path_SED"; then |
2255 | - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
2256 | + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
2257 | fi |
2258 | else |
2259 | ac_cv_path_SED=$SED |
2260 | @@ -5962,8 +5836,8 @@ |
2261 | |
2262 | |
2263 | |
2264 | -macro_version='2.2.6b' |
2265 | -macro_revision='1.3017' |
2266 | +macro_version='2.4' |
2267 | +macro_revision='1.3293' |
2268 | |
2269 | |
2270 | |
2271 | @@ -5979,9 +5853,78 @@ |
2272 | |
2273 | ltmain="$ac_aux_dir/ltmain.sh" |
2274 | |
2275 | +# Backslashify metacharacters that are still active within |
2276 | +# double-quoted strings. |
2277 | +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' |
2278 | + |
2279 | +# Same as above, but do not quote variable references. |
2280 | +double_quote_subst='s/\(["`\\]\)/\\\1/g' |
2281 | + |
2282 | +# Sed substitution to delay expansion of an escaped shell variable in a |
2283 | +# double_quote_subst'ed string. |
2284 | +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
2285 | + |
2286 | +# Sed substitution to delay expansion of an escaped single quote. |
2287 | +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
2288 | + |
2289 | +# Sed substitution to avoid accidental globbing in evaled expressions |
2290 | +no_glob_subst='s/\*/\\\*/g' |
2291 | + |
2292 | +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' |
2293 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO |
2294 | +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO |
2295 | + |
2296 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 |
2297 | +$as_echo_n "checking how to print strings... " >&6; } |
2298 | +# Test print first, because it will be a builtin if present. |
2299 | +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ |
2300 | + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then |
2301 | + ECHO='print -r --' |
2302 | +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then |
2303 | + ECHO='printf %s\n' |
2304 | +else |
2305 | + # Use this function as a fallback that always works. |
2306 | + func_fallback_echo () |
2307 | + { |
2308 | + eval 'cat <<_LTECHO_EOF |
2309 | +$1 |
2310 | +_LTECHO_EOF' |
2311 | + } |
2312 | + ECHO='func_fallback_echo' |
2313 | +fi |
2314 | + |
2315 | +# func_echo_all arg... |
2316 | +# Invoke $ECHO with all args, space-separated. |
2317 | +func_echo_all () |
2318 | +{ |
2319 | + $ECHO "" |
2320 | +} |
2321 | + |
2322 | +case "$ECHO" in |
2323 | + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 |
2324 | +$as_echo "printf" >&6; } ;; |
2325 | + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 |
2326 | +$as_echo "print -r" >&6; } ;; |
2327 | + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 |
2328 | +$as_echo "cat" >&6; } ;; |
2329 | +esac |
2330 | + |
2331 | + |
2332 | + |
2333 | + |
2334 | + |
2335 | + |
2336 | + |
2337 | + |
2338 | + |
2339 | + |
2340 | + |
2341 | + |
2342 | + |
2343 | + |
2344 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 |
2345 | $as_echo_n "checking for a sed that does not truncate output... " >&6; } |
2346 | -if test "${ac_cv_path_SED+set}" = set; then : |
2347 | +if ${ac_cv_path_SED+:} false; then : |
2348 | $as_echo_n "(cached) " >&6 |
2349 | else |
2350 | ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ |
2351 | @@ -6036,7 +5979,7 @@ |
2352 | done |
2353 | IFS=$as_save_IFS |
2354 | if test -z "$ac_cv_path_SED"; then |
2355 | - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
2356 | + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
2357 | fi |
2358 | else |
2359 | ac_cv_path_SED=$SED |
2360 | @@ -6063,7 +6006,7 @@ |
2361 | |
2362 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 |
2363 | $as_echo_n "checking for grep that handles long lines and -e... " >&6; } |
2364 | -if test "${ac_cv_path_GREP+set}" = set; then : |
2365 | +if ${ac_cv_path_GREP+:} false; then : |
2366 | $as_echo_n "(cached) " >&6 |
2367 | else |
2368 | if test -z "$GREP"; then |
2369 | @@ -6112,7 +6055,7 @@ |
2370 | done |
2371 | IFS=$as_save_IFS |
2372 | if test -z "$ac_cv_path_GREP"; then |
2373 | - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
2374 | + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
2375 | fi |
2376 | else |
2377 | ac_cv_path_GREP=$GREP |
2378 | @@ -6126,7 +6069,7 @@ |
2379 | |
2380 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 |
2381 | $as_echo_n "checking for egrep... " >&6; } |
2382 | -if test "${ac_cv_path_EGREP+set}" = set; then : |
2383 | +if ${ac_cv_path_EGREP+:} false; then : |
2384 | $as_echo_n "(cached) " >&6 |
2385 | else |
2386 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 |
2387 | @@ -6178,7 +6121,7 @@ |
2388 | done |
2389 | IFS=$as_save_IFS |
2390 | if test -z "$ac_cv_path_EGREP"; then |
2391 | - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
2392 | + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
2393 | fi |
2394 | else |
2395 | ac_cv_path_EGREP=$EGREP |
2396 | @@ -6193,7 +6136,7 @@ |
2397 | |
2398 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 |
2399 | $as_echo_n "checking for fgrep... " >&6; } |
2400 | -if test "${ac_cv_path_FGREP+set}" = set; then : |
2401 | +if ${ac_cv_path_FGREP+:} false; then : |
2402 | $as_echo_n "(cached) " >&6 |
2403 | else |
2404 | if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 |
2405 | @@ -6245,7 +6188,7 @@ |
2406 | done |
2407 | IFS=$as_save_IFS |
2408 | if test -z "$ac_cv_path_FGREP"; then |
2409 | - as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
2410 | + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
2411 | fi |
2412 | else |
2413 | ac_cv_path_FGREP=$FGREP |
2414 | @@ -6324,7 +6267,7 @@ |
2415 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 |
2416 | $as_echo_n "checking for non-GNU ld... " >&6; } |
2417 | fi |
2418 | -if test "${lt_cv_path_LD+set}" = set; then : |
2419 | +if ${lt_cv_path_LD+:} false; then : |
2420 | $as_echo_n "(cached) " >&6 |
2421 | else |
2422 | if test -z "$LD"; then |
2423 | @@ -6361,10 +6304,10 @@ |
2424 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2425 | $as_echo "no" >&6; } |
2426 | fi |
2427 | -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
2428 | +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
2429 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
2430 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
2431 | -if test "${lt_cv_prog_gnu_ld+set}" = set; then : |
2432 | +if ${lt_cv_prog_gnu_ld+:} false; then : |
2433 | $as_echo_n "(cached) " >&6 |
2434 | else |
2435 | # I'd rather use --version here, but apparently some GNU lds only accept -v. |
2436 | @@ -6391,7 +6334,7 @@ |
2437 | |
2438 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 |
2439 | $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } |
2440 | -if test "${lt_cv_path_NM+set}" = set; then : |
2441 | +if ${lt_cv_path_NM+:} false; then : |
2442 | $as_echo_n "(cached) " >&6 |
2443 | else |
2444 | if test -n "$NM"; then |
2445 | @@ -6444,14 +6387,17 @@ |
2446 | NM="$lt_cv_path_NM" |
2447 | else |
2448 | # Didn't find any BSD compatible name lister, look for dumpbin. |
2449 | - if test -n "$ac_tool_prefix"; then |
2450 | - for ac_prog in "dumpbin -symbols" "link -dump -symbols" |
2451 | + if test -n "$DUMPBIN"; then : |
2452 | + # Let the user override the test. |
2453 | + else |
2454 | + if test -n "$ac_tool_prefix"; then |
2455 | + for ac_prog in dumpbin "link -dump" |
2456 | do |
2457 | # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
2458 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
2459 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2460 | $as_echo_n "checking for $ac_word... " >&6; } |
2461 | -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : |
2462 | +if ${ac_cv_prog_DUMPBIN+:} false; then : |
2463 | $as_echo_n "(cached) " >&6 |
2464 | else |
2465 | if test -n "$DUMPBIN"; then |
2466 | @@ -6489,13 +6435,13 @@ |
2467 | fi |
2468 | if test -z "$DUMPBIN"; then |
2469 | ac_ct_DUMPBIN=$DUMPBIN |
2470 | - for ac_prog in "dumpbin -symbols" "link -dump -symbols" |
2471 | + for ac_prog in dumpbin "link -dump" |
2472 | do |
2473 | # Extract the first word of "$ac_prog", so it can be a program name with args. |
2474 | set dummy $ac_prog; ac_word=$2 |
2475 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2476 | $as_echo_n "checking for $ac_word... " >&6; } |
2477 | -if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then : |
2478 | +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : |
2479 | $as_echo_n "(cached) " >&6 |
2480 | else |
2481 | if test -n "$ac_ct_DUMPBIN"; then |
2482 | @@ -6544,6 +6490,15 @@ |
2483 | fi |
2484 | fi |
2485 | |
2486 | + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in |
2487 | + *COFF*) |
2488 | + DUMPBIN="$DUMPBIN -symbols" |
2489 | + ;; |
2490 | + *) |
2491 | + DUMPBIN=: |
2492 | + ;; |
2493 | + esac |
2494 | + fi |
2495 | |
2496 | if test "$DUMPBIN" != ":"; then |
2497 | NM="$DUMPBIN" |
2498 | @@ -6558,18 +6513,18 @@ |
2499 | |
2500 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 |
2501 | $as_echo_n "checking the name lister ($NM) interface... " >&6; } |
2502 | -if test "${lt_cv_nm_interface+set}" = set; then : |
2503 | +if ${lt_cv_nm_interface+:} false; then : |
2504 | $as_echo_n "(cached) " >&6 |
2505 | else |
2506 | lt_cv_nm_interface="BSD nm" |
2507 | echo "int some_variable = 0;" > conftest.$ac_ext |
2508 | - (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&5) |
2509 | + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) |
2510 | (eval "$ac_compile" 2>conftest.err) |
2511 | cat conftest.err >&5 |
2512 | - (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
2513 | + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
2514 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
2515 | cat conftest.err >&5 |
2516 | - (eval echo "\"\$as_me:__oline__: output\"" >&5) |
2517 | + (eval echo "\"\$as_me:$LINENO: output\"" >&5) |
2518 | cat conftest.out >&5 |
2519 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
2520 | lt_cv_nm_interface="MS dumpbin" |
2521 | @@ -6582,7 +6537,7 @@ |
2522 | # find the maximum length of command line arguments |
2523 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 |
2524 | $as_echo_n "checking the maximum length of command line arguments... " >&6; } |
2525 | -if test "${lt_cv_sys_max_cmd_len+set}" = set; then : |
2526 | +if ${lt_cv_sys_max_cmd_len+:} false; then : |
2527 | $as_echo_n "(cached) " >&6 |
2528 | else |
2529 | i=0 |
2530 | @@ -6615,6 +6570,11 @@ |
2531 | lt_cv_sys_max_cmd_len=8192; |
2532 | ;; |
2533 | |
2534 | + mint*) |
2535 | + # On MiNT this can take a long time and run out of memory. |
2536 | + lt_cv_sys_max_cmd_len=8192; |
2537 | + ;; |
2538 | + |
2539 | amigaos*) |
2540 | # On AmigaOS with pdksh, this test takes hours, literally. |
2541 | # So we just punt and use a minimum line length of 8192. |
2542 | @@ -6679,8 +6639,8 @@ |
2543 | # If test is not a shell built-in, we'll probably end up computing a |
2544 | # maximum length that is only half of the actual maximum length, but |
2545 | # we can't tell. |
2546 | - while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ |
2547 | - = "XX$teststring$teststring"; } >/dev/null 2>&1 && |
2548 | + while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
2549 | + = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2550 | test $i != 17 # 1/2 MB should be enough |
2551 | do |
2552 | i=`expr $i + 1` |
2553 | @@ -6722,8 +6682,8 @@ |
2554 | # Try some XSI features |
2555 | xsi_shell=no |
2556 | ( _lt_dummy="a/b/c" |
2557 | - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ |
2558 | - = c,a/b,, \ |
2559 | + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ |
2560 | + = c,a/b,b/c, \ |
2561 | && eval 'test $(( 1 + 1 )) -eq 2 \ |
2562 | && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ |
2563 | && xsi_shell=yes |
2564 | @@ -6772,9 +6732,83 @@ |
2565 | |
2566 | |
2567 | |
2568 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 |
2569 | +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } |
2570 | +if ${lt_cv_to_host_file_cmd+:} false; then : |
2571 | + $as_echo_n "(cached) " >&6 |
2572 | +else |
2573 | + case $host in |
2574 | + *-*-mingw* ) |
2575 | + case $build in |
2576 | + *-*-mingw* ) # actually msys |
2577 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 |
2578 | + ;; |
2579 | + *-*-cygwin* ) |
2580 | + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 |
2581 | + ;; |
2582 | + * ) # otherwise, assume *nix |
2583 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 |
2584 | + ;; |
2585 | + esac |
2586 | + ;; |
2587 | + *-*-cygwin* ) |
2588 | + case $build in |
2589 | + *-*-mingw* ) # actually msys |
2590 | + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin |
2591 | + ;; |
2592 | + *-*-cygwin* ) |
2593 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
2594 | + ;; |
2595 | + * ) # otherwise, assume *nix |
2596 | + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin |
2597 | + ;; |
2598 | + esac |
2599 | + ;; |
2600 | + * ) # unhandled hosts (and "normal" native builds) |
2601 | + lt_cv_to_host_file_cmd=func_convert_file_noop |
2602 | + ;; |
2603 | +esac |
2604 | + |
2605 | +fi |
2606 | + |
2607 | +to_host_file_cmd=$lt_cv_to_host_file_cmd |
2608 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 |
2609 | +$as_echo "$lt_cv_to_host_file_cmd" >&6; } |
2610 | + |
2611 | + |
2612 | + |
2613 | + |
2614 | + |
2615 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 |
2616 | +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } |
2617 | +if ${lt_cv_to_tool_file_cmd+:} false; then : |
2618 | + $as_echo_n "(cached) " >&6 |
2619 | +else |
2620 | + #assume ordinary cross tools, or native build. |
2621 | +lt_cv_to_tool_file_cmd=func_convert_file_noop |
2622 | +case $host in |
2623 | + *-*-mingw* ) |
2624 | + case $build in |
2625 | + *-*-mingw* ) # actually msys |
2626 | + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 |
2627 | + ;; |
2628 | + esac |
2629 | + ;; |
2630 | +esac |
2631 | + |
2632 | +fi |
2633 | + |
2634 | +to_tool_file_cmd=$lt_cv_to_tool_file_cmd |
2635 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 |
2636 | +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } |
2637 | + |
2638 | + |
2639 | + |
2640 | + |
2641 | + |
2642 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 |
2643 | $as_echo_n "checking for $LD option to reload object files... " >&6; } |
2644 | -if test "${lt_cv_ld_reload_flag+set}" = set; then : |
2645 | +if ${lt_cv_ld_reload_flag+:} false; then : |
2646 | $as_echo_n "(cached) " >&6 |
2647 | else |
2648 | lt_cv_ld_reload_flag='-r' |
2649 | @@ -6788,6 +6822,11 @@ |
2650 | esac |
2651 | reload_cmds='$LD$reload_flag -o $output$reload_objs' |
2652 | case $host_os in |
2653 | + cygwin* | mingw* | pw32* | cegcc*) |
2654 | + if test "$GCC" != yes; then |
2655 | + reload_cmds=false |
2656 | + fi |
2657 | + ;; |
2658 | darwin*) |
2659 | if test "$GCC" = yes; then |
2660 | reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' |
2661 | @@ -6810,7 +6849,7 @@ |
2662 | set dummy ${ac_tool_prefix}objdump; ac_word=$2 |
2663 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2664 | $as_echo_n "checking for $ac_word... " >&6; } |
2665 | -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : |
2666 | +if ${ac_cv_prog_OBJDUMP+:} false; then : |
2667 | $as_echo_n "(cached) " >&6 |
2668 | else |
2669 | if test -n "$OBJDUMP"; then |
2670 | @@ -6850,7 +6889,7 @@ |
2671 | set dummy objdump; ac_word=$2 |
2672 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2673 | $as_echo_n "checking for $ac_word... " >&6; } |
2674 | -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : |
2675 | +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : |
2676 | $as_echo_n "(cached) " >&6 |
2677 | else |
2678 | if test -n "$ac_ct_OBJDUMP"; then |
2679 | @@ -6909,7 +6948,7 @@ |
2680 | |
2681 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 |
2682 | $as_echo_n "checking how to recognize dependent libraries... " >&6; } |
2683 | -if test "${lt_cv_deplibs_check_method+set}" = set; then : |
2684 | +if ${lt_cv_deplibs_check_method+:} false; then : |
2685 | $as_echo_n "(cached) " >&6 |
2686 | else |
2687 | lt_cv_file_magic_cmd='$MAGIC_CMD' |
2688 | @@ -6951,16 +6990,18 @@ |
2689 | # Base MSYS/MinGW do not provide the 'file' command needed by |
2690 | # func_win32_libid shell function, so use a weaker test based on 'objdump', |
2691 | # unless we find 'file', for example because we are cross-compiling. |
2692 | - if ( file / ) >/dev/null 2>&1; then |
2693 | + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. |
2694 | + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then |
2695 | lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' |
2696 | lt_cv_file_magic_cmd='func_win32_libid' |
2697 | else |
2698 | - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' |
2699 | + # Keep this pattern in sync with the one in func_win32_libid. |
2700 | + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' |
2701 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2702 | fi |
2703 | ;; |
2704 | |
2705 | -cegcc) |
2706 | +cegcc*) |
2707 | # use the weaker test based on 'objdump'. See mingw*. |
2708 | lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' |
2709 | lt_cv_file_magic_cmd='$OBJDUMP -f' |
2710 | @@ -6990,6 +7031,10 @@ |
2711 | lt_cv_deplibs_check_method=pass_all |
2712 | ;; |
2713 | |
2714 | +haiku*) |
2715 | + lt_cv_deplibs_check_method=pass_all |
2716 | + ;; |
2717 | + |
2718 | hpux10.20* | hpux11*) |
2719 | lt_cv_file_magic_cmd=/usr/bin/file |
2720 | case $host_cpu in |
2721 | @@ -6998,11 +7043,11 @@ |
2722 | lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so |
2723 | ;; |
2724 | hppa*64*) |
2725 | - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' |
2726 | + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' |
2727 | lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl |
2728 | ;; |
2729 | *) |
2730 | - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' |
2731 | + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' |
2732 | lt_cv_file_magic_test_file=/usr/lib/libc.sl |
2733 | ;; |
2734 | esac |
2735 | @@ -7028,7 +7073,7 @@ |
2736 | lt_cv_deplibs_check_method=pass_all |
2737 | ;; |
2738 | |
2739 | -netbsd* | netbsdelf*-gnu) |
2740 | +netbsd*) |
2741 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
2742 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
2743 | else |
2744 | @@ -7105,6 +7150,21 @@ |
2745 | fi |
2746 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 |
2747 | $as_echo "$lt_cv_deplibs_check_method" >&6; } |
2748 | + |
2749 | +file_magic_glob= |
2750 | +want_nocaseglob=no |
2751 | +if test "$build" = "$host"; then |
2752 | + case $host_os in |
2753 | + mingw* | pw32*) |
2754 | + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then |
2755 | + want_nocaseglob=yes |
2756 | + else |
2757 | + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` |
2758 | + fi |
2759 | + ;; |
2760 | + esac |
2761 | +fi |
2762 | + |
2763 | file_magic_cmd=$lt_cv_file_magic_cmd |
2764 | deplibs_check_method=$lt_cv_deplibs_check_method |
2765 | test -z "$deplibs_check_method" && deplibs_check_method=unknown |
2766 | @@ -7120,12 +7180,166 @@ |
2767 | |
2768 | |
2769 | |
2770 | -if test -n "$ac_tool_prefix"; then |
2771 | - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. |
2772 | -set dummy ${ac_tool_prefix}ar; ac_word=$2 |
2773 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2774 | -$as_echo_n "checking for $ac_word... " >&6; } |
2775 | -if test "${ac_cv_prog_AR+set}" = set; then : |
2776 | + |
2777 | + |
2778 | + |
2779 | + |
2780 | + |
2781 | + |
2782 | + |
2783 | + |
2784 | + |
2785 | + |
2786 | +if test -n "$ac_tool_prefix"; then |
2787 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
2788 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
2789 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2790 | +$as_echo_n "checking for $ac_word... " >&6; } |
2791 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
2792 | + $as_echo_n "(cached) " >&6 |
2793 | +else |
2794 | + if test -n "$DLLTOOL"; then |
2795 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
2796 | +else |
2797 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2798 | +for as_dir in $PATH |
2799 | +do |
2800 | + IFS=$as_save_IFS |
2801 | + test -z "$as_dir" && as_dir=. |
2802 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2803 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2804 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
2805 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2806 | + break 2 |
2807 | + fi |
2808 | +done |
2809 | + done |
2810 | +IFS=$as_save_IFS |
2811 | + |
2812 | +fi |
2813 | +fi |
2814 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
2815 | +if test -n "$DLLTOOL"; then |
2816 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
2817 | +$as_echo "$DLLTOOL" >&6; } |
2818 | +else |
2819 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2820 | +$as_echo "no" >&6; } |
2821 | +fi |
2822 | + |
2823 | + |
2824 | +fi |
2825 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
2826 | + ac_ct_DLLTOOL=$DLLTOOL |
2827 | + # Extract the first word of "dlltool", so it can be a program name with args. |
2828 | +set dummy dlltool; ac_word=$2 |
2829 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2830 | +$as_echo_n "checking for $ac_word... " >&6; } |
2831 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
2832 | + $as_echo_n "(cached) " >&6 |
2833 | +else |
2834 | + if test -n "$ac_ct_DLLTOOL"; then |
2835 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
2836 | +else |
2837 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2838 | +for as_dir in $PATH |
2839 | +do |
2840 | + IFS=$as_save_IFS |
2841 | + test -z "$as_dir" && as_dir=. |
2842 | + for ac_exec_ext in '' $ac_executable_extensions; do |
2843 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2844 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
2845 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2846 | + break 2 |
2847 | + fi |
2848 | +done |
2849 | + done |
2850 | +IFS=$as_save_IFS |
2851 | + |
2852 | +fi |
2853 | +fi |
2854 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
2855 | +if test -n "$ac_ct_DLLTOOL"; then |
2856 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
2857 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
2858 | +else |
2859 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2860 | +$as_echo "no" >&6; } |
2861 | +fi |
2862 | + |
2863 | + if test "x$ac_ct_DLLTOOL" = x; then |
2864 | + DLLTOOL="false" |
2865 | + else |
2866 | + case $cross_compiling:$ac_tool_warned in |
2867 | +yes:) |
2868 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
2869 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
2870 | +ac_tool_warned=yes ;; |
2871 | +esac |
2872 | + DLLTOOL=$ac_ct_DLLTOOL |
2873 | + fi |
2874 | +else |
2875 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
2876 | +fi |
2877 | + |
2878 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
2879 | + |
2880 | + |
2881 | + |
2882 | + |
2883 | + |
2884 | + |
2885 | + |
2886 | + |
2887 | + |
2888 | + |
2889 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 |
2890 | +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } |
2891 | +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : |
2892 | + $as_echo_n "(cached) " >&6 |
2893 | +else |
2894 | + lt_cv_sharedlib_from_linklib_cmd='unknown' |
2895 | + |
2896 | +case $host_os in |
2897 | +cygwin* | mingw* | pw32* | cegcc*) |
2898 | + # two different shell functions defined in ltmain.sh |
2899 | + # decide which to use based on capabilities of $DLLTOOL |
2900 | + case `$DLLTOOL --help 2>&1` in |
2901 | + *--identify-strict*) |
2902 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib |
2903 | + ;; |
2904 | + *) |
2905 | + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback |
2906 | + ;; |
2907 | + esac |
2908 | + ;; |
2909 | +*) |
2910 | + # fallback: assume linklib IS sharedlib |
2911 | + lt_cv_sharedlib_from_linklib_cmd="$ECHO" |
2912 | + ;; |
2913 | +esac |
2914 | + |
2915 | +fi |
2916 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 |
2917 | +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } |
2918 | +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd |
2919 | +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO |
2920 | + |
2921 | + |
2922 | + |
2923 | + |
2924 | + |
2925 | + |
2926 | + |
2927 | + |
2928 | +if test -n "$ac_tool_prefix"; then |
2929 | + for ac_prog in ar |
2930 | + do |
2931 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
2932 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
2933 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2934 | +$as_echo_n "checking for $ac_word... " >&6; } |
2935 | +if ${ac_cv_prog_AR+:} false; then : |
2936 | $as_echo_n "(cached) " >&6 |
2937 | else |
2938 | if test -n "$AR"; then |
2939 | @@ -7138,7 +7352,7 @@ |
2940 | test -z "$as_dir" && as_dir=. |
2941 | for ac_exec_ext in '' $ac_executable_extensions; do |
2942 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2943 | - ac_cv_prog_AR="${ac_tool_prefix}ar" |
2944 | + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" |
2945 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2946 | break 2 |
2947 | fi |
2948 | @@ -7158,14 +7372,18 @@ |
2949 | fi |
2950 | |
2951 | |
2952 | + test -n "$AR" && break |
2953 | + done |
2954 | fi |
2955 | -if test -z "$ac_cv_prog_AR"; then |
2956 | +if test -z "$AR"; then |
2957 | ac_ct_AR=$AR |
2958 | - # Extract the first word of "ar", so it can be a program name with args. |
2959 | -set dummy ar; ac_word=$2 |
2960 | + for ac_prog in ar |
2961 | +do |
2962 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
2963 | +set dummy $ac_prog; ac_word=$2 |
2964 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2965 | $as_echo_n "checking for $ac_word... " >&6; } |
2966 | -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : |
2967 | +if ${ac_cv_prog_ac_ct_AR+:} false; then : |
2968 | $as_echo_n "(cached) " >&6 |
2969 | else |
2970 | if test -n "$ac_ct_AR"; then |
2971 | @@ -7178,7 +7396,7 @@ |
2972 | test -z "$as_dir" && as_dir=. |
2973 | for ac_exec_ext in '' $ac_executable_extensions; do |
2974 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2975 | - ac_cv_prog_ac_ct_AR="ar" |
2976 | + ac_cv_prog_ac_ct_AR="$ac_prog" |
2977 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2978 | break 2 |
2979 | fi |
2980 | @@ -7197,6 +7415,10 @@ |
2981 | $as_echo "no" >&6; } |
2982 | fi |
2983 | |
2984 | + |
2985 | + test -n "$ac_ct_AR" && break |
2986 | +done |
2987 | + |
2988 | if test "x$ac_ct_AR" = x; then |
2989 | AR="false" |
2990 | else |
2991 | @@ -7208,21 +7430,77 @@ |
2992 | esac |
2993 | AR=$ac_ct_AR |
2994 | fi |
2995 | -else |
2996 | - AR="$ac_cv_prog_AR" |
2997 | -fi |
2998 | - |
2999 | -test -z "$AR" && AR=ar |
3000 | -test -z "$AR_FLAGS" && AR_FLAGS=cru |
3001 | - |
3002 | - |
3003 | - |
3004 | - |
3005 | - |
3006 | - |
3007 | - |
3008 | - |
3009 | - |
3010 | +fi |
3011 | + |
3012 | +: ${AR=ar} |
3013 | +: ${AR_FLAGS=cru} |
3014 | + |
3015 | + |
3016 | + |
3017 | + |
3018 | + |
3019 | + |
3020 | + |
3021 | + |
3022 | + |
3023 | + |
3024 | + |
3025 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 |
3026 | +$as_echo_n "checking for archiver @FILE support... " >&6; } |
3027 | +if ${lt_cv_ar_at_file+:} false; then : |
3028 | + $as_echo_n "(cached) " >&6 |
3029 | +else |
3030 | + lt_cv_ar_at_file=no |
3031 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3032 | +/* end confdefs.h. */ |
3033 | + |
3034 | +int |
3035 | +main () |
3036 | +{ |
3037 | + |
3038 | + ; |
3039 | + return 0; |
3040 | +} |
3041 | +_ACEOF |
3042 | +if ac_fn_c_try_compile "$LINENO"; then : |
3043 | + echo conftest.$ac_objext > conftest.lst |
3044 | + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' |
3045 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
3046 | + (eval $lt_ar_try) 2>&5 |
3047 | + ac_status=$? |
3048 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3049 | + test $ac_status = 0; } |
3050 | + if test "$ac_status" -eq 0; then |
3051 | + # Ensure the archiver fails upon bogus file names. |
3052 | + rm -f conftest.$ac_objext libconftest.a |
3053 | + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 |
3054 | + (eval $lt_ar_try) 2>&5 |
3055 | + ac_status=$? |
3056 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3057 | + test $ac_status = 0; } |
3058 | + if test "$ac_status" -ne 0; then |
3059 | + lt_cv_ar_at_file=@ |
3060 | + fi |
3061 | + fi |
3062 | + rm -f conftest.* libconftest.a |
3063 | + |
3064 | +fi |
3065 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3066 | + |
3067 | +fi |
3068 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 |
3069 | +$as_echo "$lt_cv_ar_at_file" >&6; } |
3070 | + |
3071 | +if test "x$lt_cv_ar_at_file" = xno; then |
3072 | + archiver_list_spec= |
3073 | +else |
3074 | + archiver_list_spec=$lt_cv_ar_at_file |
3075 | +fi |
3076 | + |
3077 | + |
3078 | + |
3079 | + |
3080 | + |
3081 | |
3082 | |
3083 | if test -n "$ac_tool_prefix"; then |
3084 | @@ -7230,7 +7508,7 @@ |
3085 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
3086 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3087 | $as_echo_n "checking for $ac_word... " >&6; } |
3088 | -if test "${ac_cv_prog_STRIP+set}" = set; then : |
3089 | +if ${ac_cv_prog_STRIP+:} false; then : |
3090 | $as_echo_n "(cached) " >&6 |
3091 | else |
3092 | if test -n "$STRIP"; then |
3093 | @@ -7270,7 +7548,7 @@ |
3094 | set dummy strip; ac_word=$2 |
3095 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3096 | $as_echo_n "checking for $ac_word... " >&6; } |
3097 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
3098 | +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : |
3099 | $as_echo_n "(cached) " >&6 |
3100 | else |
3101 | if test -n "$ac_ct_STRIP"; then |
3102 | @@ -7329,7 +7607,7 @@ |
3103 | set dummy ${ac_tool_prefix}ranlib; ac_word=$2 |
3104 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3105 | $as_echo_n "checking for $ac_word... " >&6; } |
3106 | -if test "${ac_cv_prog_RANLIB+set}" = set; then : |
3107 | +if ${ac_cv_prog_RANLIB+:} false; then : |
3108 | $as_echo_n "(cached) " >&6 |
3109 | else |
3110 | if test -n "$RANLIB"; then |
3111 | @@ -7369,7 +7647,7 @@ |
3112 | set dummy ranlib; ac_word=$2 |
3113 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3114 | $as_echo_n "checking for $ac_word... " >&6; } |
3115 | -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : |
3116 | +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : |
3117 | $as_echo_n "(cached) " >&6 |
3118 | else |
3119 | if test -n "$ac_ct_RANLIB"; then |
3120 | @@ -7440,6 +7718,18 @@ |
3121 | old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
3122 | fi |
3123 | |
3124 | +case $host_os in |
3125 | + darwin*) |
3126 | + lock_old_archive_extraction=yes ;; |
3127 | + *) |
3128 | + lock_old_archive_extraction=no ;; |
3129 | +esac |
3130 | + |
3131 | + |
3132 | + |
3133 | + |
3134 | + |
3135 | + |
3136 | |
3137 | |
3138 | |
3139 | @@ -7486,7 +7776,7 @@ |
3140 | # Check for command to grab the raw symbol name followed by C symbol from nm. |
3141 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 |
3142 | $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } |
3143 | -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then : |
3144 | +if ${lt_cv_sys_global_symbol_pipe+:} false; then : |
3145 | $as_echo_n "(cached) " >&6 |
3146 | else |
3147 | |
3148 | @@ -7547,8 +7837,8 @@ |
3149 | lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" |
3150 | |
3151 | # Transform an extracted symbol line into symbol name and symbol address |
3152 | -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
3153 | -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
3154 | +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" |
3155 | +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" |
3156 | |
3157 | # Handle CRLF in mingw tool chain |
3158 | opt_cr= |
3159 | @@ -7584,6 +7874,7 @@ |
3160 | else |
3161 | lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" |
3162 | fi |
3163 | + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" |
3164 | |
3165 | # Check to see that the pipe works correctly. |
3166 | pipe_works=no |
3167 | @@ -7609,8 +7900,8 @@ |
3168 | test $ac_status = 0; }; then |
3169 | # Now try to grab the symbols. |
3170 | nlist=conftest.nm |
3171 | - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 |
3172 | - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 |
3173 | + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 |
3174 | + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 |
3175 | ac_status=$? |
3176 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3177 | test $ac_status = 0; } && test -s "$nlist"; then |
3178 | @@ -7625,6 +7916,18 @@ |
3179 | if $GREP ' nm_test_var$' "$nlist" >/dev/null; then |
3180 | if $GREP ' nm_test_func$' "$nlist" >/dev/null; then |
3181 | cat <<_LT_EOF > conftest.$ac_ext |
3182 | +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ |
3183 | +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) |
3184 | +/* DATA imports from DLLs on WIN32 con't be const, because runtime |
3185 | + relocations are performed -- see ld's documentation on pseudo-relocs. */ |
3186 | +# define LT@&t@_DLSYM_CONST |
3187 | +#elif defined(__osf__) |
3188 | +/* This system does not cope well with relocations in const data. */ |
3189 | +# define LT@&t@_DLSYM_CONST |
3190 | +#else |
3191 | +# define LT@&t@_DLSYM_CONST const |
3192 | +#endif |
3193 | + |
3194 | #ifdef __cplusplus |
3195 | extern "C" { |
3196 | #endif |
3197 | @@ -7636,7 +7939,7 @@ |
3198 | cat <<_LT_EOF >> conftest.$ac_ext |
3199 | |
3200 | /* The mapping between symbol names and symbols. */ |
3201 | -const struct { |
3202 | +LT@&t@_DLSYM_CONST struct { |
3203 | const char *name; |
3204 | void *address; |
3205 | } |
3206 | @@ -7662,8 +7965,8 @@ |
3207 | _LT_EOF |
3208 | # Now try linking the two files. |
3209 | mv conftest.$ac_objext conftstm.$ac_objext |
3210 | - lt_save_LIBS="$LIBS" |
3211 | - lt_save_CFLAGS="$CFLAGS" |
3212 | + lt_globsym_save_LIBS=$LIBS |
3213 | + lt_globsym_save_CFLAGS=$CFLAGS |
3214 | LIBS="conftstm.$ac_objext" |
3215 | CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" |
3216 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 |
3217 | @@ -7673,8 +7976,8 @@ |
3218 | test $ac_status = 0; } && test -s conftest${ac_exeext}; then |
3219 | pipe_works=yes |
3220 | fi |
3221 | - LIBS="$lt_save_LIBS" |
3222 | - CFLAGS="$lt_save_CFLAGS" |
3223 | + LIBS=$lt_globsym_save_LIBS |
3224 | + CFLAGS=$lt_globsym_save_CFLAGS |
3225 | else |
3226 | echo "cannot find nm_test_func in $nlist" >&5 |
3227 | fi |
3228 | @@ -7711,27 +8014,75 @@ |
3229 | $as_echo "ok" >&6; } |
3230 | fi |
3231 | |
3232 | - |
3233 | - |
3234 | - |
3235 | - |
3236 | - |
3237 | - |
3238 | - |
3239 | - |
3240 | - |
3241 | - |
3242 | - |
3243 | - |
3244 | - |
3245 | - |
3246 | - |
3247 | - |
3248 | - |
3249 | - |
3250 | - |
3251 | - |
3252 | - |
3253 | +# Response file support. |
3254 | +if test "$lt_cv_nm_interface" = "MS dumpbin"; then |
3255 | + nm_file_list_spec='@' |
3256 | +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then |
3257 | + nm_file_list_spec='@' |
3258 | +fi |
3259 | + |
3260 | + |
3261 | + |
3262 | + |
3263 | + |
3264 | + |
3265 | + |
3266 | + |
3267 | + |
3268 | + |
3269 | + |
3270 | + |
3271 | + |
3272 | + |
3273 | + |
3274 | + |
3275 | + |
3276 | + |
3277 | + |
3278 | + |
3279 | + |
3280 | + |
3281 | + |
3282 | + |
3283 | + |
3284 | + |
3285 | + |
3286 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 |
3287 | +$as_echo_n "checking for sysroot... " >&6; } |
3288 | + |
3289 | +@%:@ Check whether --with-sysroot was given. |
3290 | +if test "${with_sysroot+set}" = set; then : |
3291 | + withval=$with_sysroot; |
3292 | +else |
3293 | + with_sysroot=no |
3294 | +fi |
3295 | + |
3296 | + |
3297 | +lt_sysroot= |
3298 | +case ${with_sysroot} in #( |
3299 | + yes) |
3300 | + if test "$GCC" = yes; then |
3301 | + lt_sysroot=`$CC --print-sysroot 2>/dev/null` |
3302 | + fi |
3303 | + ;; #( |
3304 | + /*) |
3305 | + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` |
3306 | + ;; #( |
3307 | + no|'') |
3308 | + ;; #( |
3309 | + *) |
3310 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 |
3311 | +$as_echo "${with_sysroot}" >&6; } |
3312 | + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 |
3313 | + ;; |
3314 | +esac |
3315 | + |
3316 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 |
3317 | +$as_echo "${lt_sysroot:-no}" >&6; } |
3318 | + |
3319 | + |
3320 | + |
3321 | + |
3322 | |
3323 | @%:@ Check whether --enable-libtool-lock was given. |
3324 | if test "${enable_libtool_lock+set}" = set; then : |
3325 | @@ -7764,7 +8115,7 @@ |
3326 | ;; |
3327 | *-*-irix6*) |
3328 | # Find out which ABI we are using. |
3329 | - echo '#line __oline__ "configure"' > conftest.$ac_ext |
3330 | + echo '#line '$LINENO' "configure"' > conftest.$ac_ext |
3331 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
3332 | (eval $ac_compile) 2>&5 |
3333 | ac_status=$? |
3334 | @@ -7858,7 +8209,7 @@ |
3335 | CFLAGS="$CFLAGS -belf" |
3336 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 |
3337 | $as_echo_n "checking whether the C compiler needs -belf... " >&6; } |
3338 | -if test "${lt_cv_cc_needs_belf+set}" = set; then : |
3339 | +if ${lt_cv_cc_needs_belf+:} false; then : |
3340 | $as_echo_n "(cached) " >&6 |
3341 | else |
3342 | ac_ext=c |
3343 | @@ -7926,6 +8277,123 @@ |
3344 | |
3345 | need_locks="$enable_libtool_lock" |
3346 | |
3347 | +if test -n "$ac_tool_prefix"; then |
3348 | + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. |
3349 | +set dummy ${ac_tool_prefix}mt; ac_word=$2 |
3350 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3351 | +$as_echo_n "checking for $ac_word... " >&6; } |
3352 | +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : |
3353 | + $as_echo_n "(cached) " >&6 |
3354 | +else |
3355 | + if test -n "$MANIFEST_TOOL"; then |
3356 | + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. |
3357 | +else |
3358 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3359 | +for as_dir in $PATH |
3360 | +do |
3361 | + IFS=$as_save_IFS |
3362 | + test -z "$as_dir" && as_dir=. |
3363 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3364 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3365 | + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" |
3366 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3367 | + break 2 |
3368 | + fi |
3369 | +done |
3370 | + done |
3371 | +IFS=$as_save_IFS |
3372 | + |
3373 | +fi |
3374 | +fi |
3375 | +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL |
3376 | +if test -n "$MANIFEST_TOOL"; then |
3377 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 |
3378 | +$as_echo "$MANIFEST_TOOL" >&6; } |
3379 | +else |
3380 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3381 | +$as_echo "no" >&6; } |
3382 | +fi |
3383 | + |
3384 | + |
3385 | +fi |
3386 | +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then |
3387 | + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL |
3388 | + # Extract the first word of "mt", so it can be a program name with args. |
3389 | +set dummy mt; ac_word=$2 |
3390 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3391 | +$as_echo_n "checking for $ac_word... " >&6; } |
3392 | +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : |
3393 | + $as_echo_n "(cached) " >&6 |
3394 | +else |
3395 | + if test -n "$ac_ct_MANIFEST_TOOL"; then |
3396 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. |
3397 | +else |
3398 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3399 | +for as_dir in $PATH |
3400 | +do |
3401 | + IFS=$as_save_IFS |
3402 | + test -z "$as_dir" && as_dir=. |
3403 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3404 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3405 | + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" |
3406 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3407 | + break 2 |
3408 | + fi |
3409 | +done |
3410 | + done |
3411 | +IFS=$as_save_IFS |
3412 | + |
3413 | +fi |
3414 | +fi |
3415 | +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL |
3416 | +if test -n "$ac_ct_MANIFEST_TOOL"; then |
3417 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 |
3418 | +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } |
3419 | +else |
3420 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3421 | +$as_echo "no" >&6; } |
3422 | +fi |
3423 | + |
3424 | + if test "x$ac_ct_MANIFEST_TOOL" = x; then |
3425 | + MANIFEST_TOOL=":" |
3426 | + else |
3427 | + case $cross_compiling:$ac_tool_warned in |
3428 | +yes:) |
3429 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3430 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3431 | +ac_tool_warned=yes ;; |
3432 | +esac |
3433 | + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL |
3434 | + fi |
3435 | +else |
3436 | + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" |
3437 | +fi |
3438 | + |
3439 | +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt |
3440 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 |
3441 | +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } |
3442 | +if ${lt_cv_path_mainfest_tool+:} false; then : |
3443 | + $as_echo_n "(cached) " >&6 |
3444 | +else |
3445 | + lt_cv_path_mainfest_tool=no |
3446 | + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 |
3447 | + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out |
3448 | + cat conftest.err >&5 |
3449 | + if $GREP 'Manifest Tool' conftest.out > /dev/null; then |
3450 | + lt_cv_path_mainfest_tool=yes |
3451 | + fi |
3452 | + rm -f conftest* |
3453 | +fi |
3454 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 |
3455 | +$as_echo "$lt_cv_path_mainfest_tool" >&6; } |
3456 | +if test "x$lt_cv_path_mainfest_tool" != xyes; then |
3457 | + MANIFEST_TOOL=: |
3458 | +fi |
3459 | + |
3460 | + |
3461 | + |
3462 | + |
3463 | + |
3464 | |
3465 | case $host_os in |
3466 | rhapsody* | darwin*) |
3467 | @@ -7934,7 +8402,7 @@ |
3468 | set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 |
3469 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3470 | $as_echo_n "checking for $ac_word... " >&6; } |
3471 | -if test "${ac_cv_prog_DSYMUTIL+set}" = set; then : |
3472 | +if ${ac_cv_prog_DSYMUTIL+:} false; then : |
3473 | $as_echo_n "(cached) " >&6 |
3474 | else |
3475 | if test -n "$DSYMUTIL"; then |
3476 | @@ -7974,7 +8442,7 @@ |
3477 | set dummy dsymutil; ac_word=$2 |
3478 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3479 | $as_echo_n "checking for $ac_word... " >&6; } |
3480 | -if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then : |
3481 | +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : |
3482 | $as_echo_n "(cached) " >&6 |
3483 | else |
3484 | if test -n "$ac_ct_DSYMUTIL"; then |
3485 | @@ -8026,7 +8494,7 @@ |
3486 | set dummy ${ac_tool_prefix}nmedit; ac_word=$2 |
3487 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3488 | $as_echo_n "checking for $ac_word... " >&6; } |
3489 | -if test "${ac_cv_prog_NMEDIT+set}" = set; then : |
3490 | +if ${ac_cv_prog_NMEDIT+:} false; then : |
3491 | $as_echo_n "(cached) " >&6 |
3492 | else |
3493 | if test -n "$NMEDIT"; then |
3494 | @@ -8066,7 +8534,7 @@ |
3495 | set dummy nmedit; ac_word=$2 |
3496 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3497 | $as_echo_n "checking for $ac_word... " >&6; } |
3498 | -if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then : |
3499 | +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : |
3500 | $as_echo_n "(cached) " >&6 |
3501 | else |
3502 | if test -n "$ac_ct_NMEDIT"; then |
3503 | @@ -8118,7 +8586,7 @@ |
3504 | set dummy ${ac_tool_prefix}lipo; ac_word=$2 |
3505 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3506 | $as_echo_n "checking for $ac_word... " >&6; } |
3507 | -if test "${ac_cv_prog_LIPO+set}" = set; then : |
3508 | +if ${ac_cv_prog_LIPO+:} false; then : |
3509 | $as_echo_n "(cached) " >&6 |
3510 | else |
3511 | if test -n "$LIPO"; then |
3512 | @@ -8158,7 +8626,7 @@ |
3513 | set dummy lipo; ac_word=$2 |
3514 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3515 | $as_echo_n "checking for $ac_word... " >&6; } |
3516 | -if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then : |
3517 | +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : |
3518 | $as_echo_n "(cached) " >&6 |
3519 | else |
3520 | if test -n "$ac_ct_LIPO"; then |
3521 | @@ -8210,7 +8678,7 @@ |
3522 | set dummy ${ac_tool_prefix}otool; ac_word=$2 |
3523 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3524 | $as_echo_n "checking for $ac_word... " >&6; } |
3525 | -if test "${ac_cv_prog_OTOOL+set}" = set; then : |
3526 | +if ${ac_cv_prog_OTOOL+:} false; then : |
3527 | $as_echo_n "(cached) " >&6 |
3528 | else |
3529 | if test -n "$OTOOL"; then |
3530 | @@ -8250,7 +8718,7 @@ |
3531 | set dummy otool; ac_word=$2 |
3532 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3533 | $as_echo_n "checking for $ac_word... " >&6; } |
3534 | -if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then : |
3535 | +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : |
3536 | $as_echo_n "(cached) " >&6 |
3537 | else |
3538 | if test -n "$ac_ct_OTOOL"; then |
3539 | @@ -8302,7 +8770,7 @@ |
3540 | set dummy ${ac_tool_prefix}otool64; ac_word=$2 |
3541 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3542 | $as_echo_n "checking for $ac_word... " >&6; } |
3543 | -if test "${ac_cv_prog_OTOOL64+set}" = set; then : |
3544 | +if ${ac_cv_prog_OTOOL64+:} false; then : |
3545 | $as_echo_n "(cached) " >&6 |
3546 | else |
3547 | if test -n "$OTOOL64"; then |
3548 | @@ -8342,7 +8810,7 @@ |
3549 | set dummy otool64; ac_word=$2 |
3550 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3551 | $as_echo_n "checking for $ac_word... " >&6; } |
3552 | -if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then : |
3553 | +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : |
3554 | $as_echo_n "(cached) " >&6 |
3555 | else |
3556 | if test -n "$ac_ct_OTOOL64"; then |
3557 | @@ -8417,7 +8885,7 @@ |
3558 | |
3559 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 |
3560 | $as_echo_n "checking for -single_module linker flag... " >&6; } |
3561 | -if test "${lt_cv_apple_cc_single_mod+set}" = set; then : |
3562 | +if ${lt_cv_apple_cc_single_mod+:} false; then : |
3563 | $as_echo_n "(cached) " >&6 |
3564 | else |
3565 | lt_cv_apple_cc_single_mod=no |
3566 | @@ -8446,7 +8914,7 @@ |
3567 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } |
3568 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 |
3569 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } |
3570 | -if test "${lt_cv_ld_exported_symbols_list+set}" = set; then : |
3571 | +if ${lt_cv_ld_exported_symbols_list+:} false; then : |
3572 | $as_echo_n "(cached) " >&6 |
3573 | else |
3574 | lt_cv_ld_exported_symbols_list=no |
3575 | @@ -8476,6 +8944,38 @@ |
3576 | fi |
3577 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
3578 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
3579 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 |
3580 | +$as_echo_n "checking for -force_load linker flag... " >&6; } |
3581 | +if ${lt_cv_ld_force_load+:} false; then : |
3582 | + $as_echo_n "(cached) " >&6 |
3583 | +else |
3584 | + lt_cv_ld_force_load=no |
3585 | + cat > conftest.c << _LT_EOF |
3586 | +int forced_loaded() { return 2;} |
3587 | +_LT_EOF |
3588 | + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 |
3589 | + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 |
3590 | + echo "$AR cru libconftest.a conftest.o" >&5 |
3591 | + $AR cru libconftest.a conftest.o 2>&5 |
3592 | + echo "$RANLIB libconftest.a" >&5 |
3593 | + $RANLIB libconftest.a 2>&5 |
3594 | + cat > conftest.c << _LT_EOF |
3595 | +int main() { return 0;} |
3596 | +_LT_EOF |
3597 | + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 |
3598 | + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
3599 | + _lt_result=$? |
3600 | + if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
3601 | + lt_cv_ld_force_load=yes |
3602 | + else |
3603 | + cat conftest.err >&5 |
3604 | + fi |
3605 | + rm -f conftest.err libconftest.a conftest conftest.c |
3606 | + rm -rf conftest.dSYM |
3607 | + |
3608 | +fi |
3609 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 |
3610 | +$as_echo "$lt_cv_ld_force_load" >&6; } |
3611 | case $host_os in |
3612 | rhapsody* | darwin1.[012]) |
3613 | _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; |
3614 | @@ -8503,7 +9003,7 @@ |
3615 | else |
3616 | _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' |
3617 | fi |
3618 | - if test "$DSYMUTIL" != ":"; then |
3619 | + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then |
3620 | _lt_dsymutil='~$DSYMUTIL $lib || :' |
3621 | else |
3622 | _lt_dsymutil= |
3623 | @@ -8514,7 +9014,7 @@ |
3624 | |
3625 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
3626 | $as_echo_n "checking for ANSI C header files... " >&6; } |
3627 | -if test "${ac_cv_header_stdc+set}" = set; then : |
3628 | +if ${ac_cv_header_stdc+:} false; then : |
3629 | $as_echo_n "(cached) " >&6 |
3630 | else |
3631 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3632 | @@ -8645,7 +9145,7 @@ |
3633 | do : |
3634 | ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default |
3635 | " |
3636 | -if test "x$ac_cv_header_dlfcn_h" = x""yes; then : |
3637 | +if test "x$ac_cv_header_dlfcn_h" = xyes; then : |
3638 | cat >>confdefs.h <<_ACEOF |
3639 | @%:@define HAVE_DLFCN_H 1 |
3640 | _ACEOF |
3641 | @@ -8656,528 +9156,14 @@ |
3642 | |
3643 | |
3644 | |
3645 | -ac_ext=cpp |
3646 | -ac_cpp='$CXXCPP $CPPFLAGS' |
3647 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
3648 | -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
3649 | -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
3650 | -if test -z "$CXX"; then |
3651 | - if test -n "$CCC"; then |
3652 | - CXX=$CCC |
3653 | - else |
3654 | - if test -n "$ac_tool_prefix"; then |
3655 | - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC |
3656 | - do |
3657 | - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
3658 | -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
3659 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3660 | -$as_echo_n "checking for $ac_word... " >&6; } |
3661 | -if test "${ac_cv_prog_CXX+set}" = set; then : |
3662 | - $as_echo_n "(cached) " >&6 |
3663 | -else |
3664 | - if test -n "$CXX"; then |
3665 | - ac_cv_prog_CXX="$CXX" # Let the user override the test. |
3666 | -else |
3667 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3668 | -for as_dir in $PATH |
3669 | -do |
3670 | - IFS=$as_save_IFS |
3671 | - test -z "$as_dir" && as_dir=. |
3672 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3673 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3674 | - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" |
3675 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3676 | - break 2 |
3677 | - fi |
3678 | -done |
3679 | - done |
3680 | -IFS=$as_save_IFS |
3681 | - |
3682 | -fi |
3683 | -fi |
3684 | -CXX=$ac_cv_prog_CXX |
3685 | -if test -n "$CXX"; then |
3686 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 |
3687 | -$as_echo "$CXX" >&6; } |
3688 | -else |
3689 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3690 | -$as_echo "no" >&6; } |
3691 | -fi |
3692 | - |
3693 | - |
3694 | - test -n "$CXX" && break |
3695 | - done |
3696 | -fi |
3697 | -if test -z "$CXX"; then |
3698 | - ac_ct_CXX=$CXX |
3699 | - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC |
3700 | -do |
3701 | - # Extract the first word of "$ac_prog", so it can be a program name with args. |
3702 | -set dummy $ac_prog; ac_word=$2 |
3703 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3704 | -$as_echo_n "checking for $ac_word... " >&6; } |
3705 | -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : |
3706 | - $as_echo_n "(cached) " >&6 |
3707 | -else |
3708 | - if test -n "$ac_ct_CXX"; then |
3709 | - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. |
3710 | -else |
3711 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3712 | -for as_dir in $PATH |
3713 | -do |
3714 | - IFS=$as_save_IFS |
3715 | - test -z "$as_dir" && as_dir=. |
3716 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3717 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
3718 | - ac_cv_prog_ac_ct_CXX="$ac_prog" |
3719 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3720 | - break 2 |
3721 | - fi |
3722 | -done |
3723 | - done |
3724 | -IFS=$as_save_IFS |
3725 | - |
3726 | -fi |
3727 | -fi |
3728 | -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX |
3729 | -if test -n "$ac_ct_CXX"; then |
3730 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 |
3731 | -$as_echo "$ac_ct_CXX" >&6; } |
3732 | -else |
3733 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3734 | -$as_echo "no" >&6; } |
3735 | -fi |
3736 | - |
3737 | - |
3738 | - test -n "$ac_ct_CXX" && break |
3739 | -done |
3740 | - |
3741 | - if test "x$ac_ct_CXX" = x; then |
3742 | - CXX="g++" |
3743 | - else |
3744 | - case $cross_compiling:$ac_tool_warned in |
3745 | -yes:) |
3746 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3747 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3748 | -ac_tool_warned=yes ;; |
3749 | -esac |
3750 | - CXX=$ac_ct_CXX |
3751 | - fi |
3752 | -fi |
3753 | - |
3754 | - fi |
3755 | -fi |
3756 | -# Provide some information about the compiler. |
3757 | -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 |
3758 | -set X $ac_compile |
3759 | -ac_compiler=$2 |
3760 | -for ac_option in --version -v -V -qversion; do |
3761 | - { { ac_try="$ac_compiler $ac_option >&5" |
3762 | -case "(($ac_try" in |
3763 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
3764 | - *) ac_try_echo=$ac_try;; |
3765 | -esac |
3766 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
3767 | -$as_echo "$ac_try_echo"; } >&5 |
3768 | - (eval "$ac_compiler $ac_option >&5") 2>conftest.err |
3769 | - ac_status=$? |
3770 | - if test -s conftest.err; then |
3771 | - sed '10a\ |
3772 | -... rest of stderr output deleted ... |
3773 | - 10q' conftest.err >conftest.er1 |
3774 | - cat conftest.er1 >&5 |
3775 | - fi |
3776 | - rm -f conftest.er1 conftest.err |
3777 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
3778 | - test $ac_status = 0; } |
3779 | -done |
3780 | - |
3781 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 |
3782 | -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } |
3783 | -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : |
3784 | - $as_echo_n "(cached) " >&6 |
3785 | -else |
3786 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3787 | -/* end confdefs.h. */ |
3788 | - |
3789 | -int |
3790 | -main () |
3791 | -{ |
3792 | -#ifndef __GNUC__ |
3793 | - choke me |
3794 | -#endif |
3795 | - |
3796 | - ; |
3797 | - return 0; |
3798 | -} |
3799 | -_ACEOF |
3800 | -if ac_fn_cxx_try_compile "$LINENO"; then : |
3801 | - ac_compiler_gnu=yes |
3802 | -else |
3803 | - ac_compiler_gnu=no |
3804 | -fi |
3805 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3806 | -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu |
3807 | - |
3808 | -fi |
3809 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 |
3810 | -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } |
3811 | -if test $ac_compiler_gnu = yes; then |
3812 | - GXX=yes |
3813 | -else |
3814 | - GXX= |
3815 | -fi |
3816 | -ac_test_CXXFLAGS=${CXXFLAGS+set} |
3817 | -ac_save_CXXFLAGS=$CXXFLAGS |
3818 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 |
3819 | -$as_echo_n "checking whether $CXX accepts -g... " >&6; } |
3820 | -if test "${ac_cv_prog_cxx_g+set}" = set; then : |
3821 | - $as_echo_n "(cached) " >&6 |
3822 | -else |
3823 | - ac_save_cxx_werror_flag=$ac_cxx_werror_flag |
3824 | - ac_cxx_werror_flag=yes |
3825 | - ac_cv_prog_cxx_g=no |
3826 | - CXXFLAGS="-g" |
3827 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3828 | -/* end confdefs.h. */ |
3829 | - |
3830 | -int |
3831 | -main () |
3832 | -{ |
3833 | - |
3834 | - ; |
3835 | - return 0; |
3836 | -} |
3837 | -_ACEOF |
3838 | -if ac_fn_cxx_try_compile "$LINENO"; then : |
3839 | - ac_cv_prog_cxx_g=yes |
3840 | -else |
3841 | - CXXFLAGS="" |
3842 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3843 | -/* end confdefs.h. */ |
3844 | - |
3845 | -int |
3846 | -main () |
3847 | -{ |
3848 | - |
3849 | - ; |
3850 | - return 0; |
3851 | -} |
3852 | -_ACEOF |
3853 | -if ac_fn_cxx_try_compile "$LINENO"; then : |
3854 | - |
3855 | -else |
3856 | - ac_cxx_werror_flag=$ac_save_cxx_werror_flag |
3857 | - CXXFLAGS="-g" |
3858 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3859 | -/* end confdefs.h. */ |
3860 | - |
3861 | -int |
3862 | -main () |
3863 | -{ |
3864 | - |
3865 | - ; |
3866 | - return 0; |
3867 | -} |
3868 | -_ACEOF |
3869 | -if ac_fn_cxx_try_compile "$LINENO"; then : |
3870 | - ac_cv_prog_cxx_g=yes |
3871 | -fi |
3872 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3873 | -fi |
3874 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3875 | -fi |
3876 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
3877 | - ac_cxx_werror_flag=$ac_save_cxx_werror_flag |
3878 | -fi |
3879 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 |
3880 | -$as_echo "$ac_cv_prog_cxx_g" >&6; } |
3881 | -if test "$ac_test_CXXFLAGS" = set; then |
3882 | - CXXFLAGS=$ac_save_CXXFLAGS |
3883 | -elif test $ac_cv_prog_cxx_g = yes; then |
3884 | - if test "$GXX" = yes; then |
3885 | - CXXFLAGS="-g -O2" |
3886 | - else |
3887 | - CXXFLAGS="-g" |
3888 | - fi |
3889 | -else |
3890 | - if test "$GXX" = yes; then |
3891 | - CXXFLAGS="-O2" |
3892 | - else |
3893 | - CXXFLAGS= |
3894 | - fi |
3895 | -fi |
3896 | -ac_ext=c |
3897 | -ac_cpp='$CPP $CPPFLAGS' |
3898 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
3899 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
3900 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu |
3901 | - |
3902 | -depcc="$CXX" am_compiler_list= |
3903 | - |
3904 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
3905 | -$as_echo_n "checking dependency style of $depcc... " >&6; } |
3906 | -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then : |
3907 | - $as_echo_n "(cached) " >&6 |
3908 | -else |
3909 | - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
3910 | - # We make a subdir and do the tests there. Otherwise we can end up |
3911 | - # making bogus files that we don't know about and never remove. For |
3912 | - # instance it was reported that on HP-UX the gcc test will end up |
3913 | - # making a dummy file named `D' -- because `-MD' means `put the output |
3914 | - # in D'. |
3915 | - mkdir conftest.dir |
3916 | - # Copy depcomp to subdir because otherwise we won't find it if we're |
3917 | - # using a relative directory. |
3918 | - cp "$am_depcomp" conftest.dir |
3919 | - cd conftest.dir |
3920 | - # We will build objects and dependencies in a subdirectory because |
3921 | - # it helps to detect inapplicable dependency modes. For instance |
3922 | - # both Tru64's cc and ICC support -MD to output dependencies as a |
3923 | - # side effect of compilation, but ICC will put the dependencies in |
3924 | - # the current directory while Tru64 will put them in the object |
3925 | - # directory. |
3926 | - mkdir sub |
3927 | - |
3928 | - am_cv_CXX_dependencies_compiler_type=none |
3929 | - if test "$am_compiler_list" = ""; then |
3930 | - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` |
3931 | - fi |
3932 | - am__universal=false |
3933 | - case " $depcc " in #( |
3934 | - *\ -arch\ *\ -arch\ *) am__universal=true ;; |
3935 | - esac |
3936 | - |
3937 | - for depmode in $am_compiler_list; do |
3938 | - # Setup a source with many dependencies, because some compilers |
3939 | - # like to wrap large dependency lists on column 80 (with \), and |
3940 | - # we should not choose a depcomp mode which is confused by this. |
3941 | - # |
3942 | - # We need to recreate these files for each test, as the compiler may |
3943 | - # overwrite some of them when testing with obscure command lines. |
3944 | - # This happens at least with the AIX C compiler. |
3945 | - : > sub/conftest.c |
3946 | - for i in 1 2 3 4 5 6; do |
3947 | - echo '#include "conftst'$i'.h"' >> sub/conftest.c |
3948 | - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
3949 | - # Solaris 8's {/usr,}/bin/sh. |
3950 | - touch sub/conftst$i.h |
3951 | - done |
3952 | - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
3953 | - |
3954 | - # We check with `-c' and `-o' for the sake of the "dashmstdout" |
3955 | - # mode. It turns out that the SunPro C++ compiler does not properly |
3956 | - # handle `-M -o', and we need to detect this. Also, some Intel |
3957 | - # versions had trouble with output in subdirs |
3958 | - am__obj=sub/conftest.${OBJEXT-o} |
3959 | - am__minus_obj="-o $am__obj" |
3960 | - case $depmode in |
3961 | - gcc) |
3962 | - # This depmode causes a compiler race in universal mode. |
3963 | - test "$am__universal" = false || continue |
3964 | - ;; |
3965 | - nosideeffect) |
3966 | - # after this tag, mechanisms are not by side-effect, so they'll |
3967 | - # only be used when explicitly requested |
3968 | - if test "x$enable_dependency_tracking" = xyes; then |
3969 | - continue |
3970 | - else |
3971 | - break |
3972 | - fi |
3973 | - ;; |
3974 | - msvisualcpp | msvcmsys) |
3975 | - # This compiler won't grok `-c -o', but also, the minuso test has |
3976 | - # not run yet. These depmodes are late enough in the game, and |
3977 | - # so weak that their functioning should not be impacted. |
3978 | - am__obj=conftest.${OBJEXT-o} |
3979 | - am__minus_obj= |
3980 | - ;; |
3981 | - none) break ;; |
3982 | - esac |
3983 | - if depmode=$depmode \ |
3984 | - source=sub/conftest.c object=$am__obj \ |
3985 | - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
3986 | - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ |
3987 | - >/dev/null 2>conftest.err && |
3988 | - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
3989 | - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
3990 | - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && |
3991 | - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
3992 | - # icc doesn't choke on unknown options, it will just issue warnings |
3993 | - # or remarks (even with -Werror). So we grep stderr for any message |
3994 | - # that says an option was ignored or not supported. |
3995 | - # When given -MP, icc 7.0 and 7.1 complain thusly: |
3996 | - # icc: Command line warning: ignoring option '-M'; no argument required |
3997 | - # The diagnosis changed in icc 8.0: |
3998 | - # icc: Command line remark: option '-MP' not supported |
3999 | - if (grep 'ignoring option' conftest.err || |
4000 | - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else |
4001 | - am_cv_CXX_dependencies_compiler_type=$depmode |
4002 | - break |
4003 | - fi |
4004 | - fi |
4005 | - done |
4006 | - |
4007 | - cd .. |
4008 | - rm -rf conftest.dir |
4009 | -else |
4010 | - am_cv_CXX_dependencies_compiler_type=none |
4011 | -fi |
4012 | - |
4013 | -fi |
4014 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 |
4015 | -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } |
4016 | -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type |
4017 | - |
4018 | - if |
4019 | - test "x$enable_dependency_tracking" != xno \ |
4020 | - && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then |
4021 | - am__fastdepCXX_TRUE= |
4022 | - am__fastdepCXX_FALSE='#' |
4023 | -else |
4024 | - am__fastdepCXX_TRUE='#' |
4025 | - am__fastdepCXX_FALSE= |
4026 | -fi |
4027 | - |
4028 | - |
4029 | -if test -n "$CXX" && ( test "X$CXX" != "Xno" && |
4030 | - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || |
4031 | - (test "X$CXX" != "Xg++"))) ; then |
4032 | - ac_ext=cpp |
4033 | -ac_cpp='$CXXCPP $CPPFLAGS' |
4034 | -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
4035 | -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
4036 | -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu |
4037 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 |
4038 | -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } |
4039 | -if test -z "$CXXCPP"; then |
4040 | - if test "${ac_cv_prog_CXXCPP+set}" = set; then : |
4041 | - $as_echo_n "(cached) " >&6 |
4042 | -else |
4043 | - # Double quotes because CXXCPP needs to be expanded |
4044 | - for CXXCPP in "$CXX -E" "/lib/cpp" |
4045 | - do |
4046 | - ac_preproc_ok=false |
4047 | -for ac_cxx_preproc_warn_flag in '' yes |
4048 | -do |
4049 | - # Use a header file that comes with gcc, so configuring glibc |
4050 | - # with a fresh cross-compiler works. |
4051 | - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
4052 | - # <limits.h> exists even on freestanding compilers. |
4053 | - # On the NeXT, cc -E runs the code through the compiler's parser, |
4054 | - # not just through cpp. "Syntax error" is here to catch this case. |
4055 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4056 | -/* end confdefs.h. */ |
4057 | -@%:@ifdef __STDC__ |
4058 | -@%:@ include <limits.h> |
4059 | -@%:@else |
4060 | -@%:@ include <assert.h> |
4061 | -@%:@endif |
4062 | - Syntax error |
4063 | -_ACEOF |
4064 | -if ac_fn_cxx_try_cpp "$LINENO"; then : |
4065 | - |
4066 | -else |
4067 | - # Broken: fails on valid input. |
4068 | -continue |
4069 | -fi |
4070 | -rm -f conftest.err conftest.i conftest.$ac_ext |
4071 | - |
4072 | - # OK, works on sane cases. Now check whether nonexistent headers |
4073 | - # can be detected and how. |
4074 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4075 | -/* end confdefs.h. */ |
4076 | -@%:@include <ac_nonexistent.h> |
4077 | -_ACEOF |
4078 | -if ac_fn_cxx_try_cpp "$LINENO"; then : |
4079 | - # Broken: success on invalid input. |
4080 | -continue |
4081 | -else |
4082 | - # Passes both tests. |
4083 | -ac_preproc_ok=: |
4084 | -break |
4085 | -fi |
4086 | -rm -f conftest.err conftest.i conftest.$ac_ext |
4087 | - |
4088 | -done |
4089 | -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
4090 | -rm -f conftest.i conftest.err conftest.$ac_ext |
4091 | -if $ac_preproc_ok; then : |
4092 | - break |
4093 | -fi |
4094 | - |
4095 | - done |
4096 | - ac_cv_prog_CXXCPP=$CXXCPP |
4097 | - |
4098 | -fi |
4099 | - CXXCPP=$ac_cv_prog_CXXCPP |
4100 | -else |
4101 | - ac_cv_prog_CXXCPP=$CXXCPP |
4102 | -fi |
4103 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 |
4104 | -$as_echo "$CXXCPP" >&6; } |
4105 | -ac_preproc_ok=false |
4106 | -for ac_cxx_preproc_warn_flag in '' yes |
4107 | -do |
4108 | - # Use a header file that comes with gcc, so configuring glibc |
4109 | - # with a fresh cross-compiler works. |
4110 | - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since |
4111 | - # <limits.h> exists even on freestanding compilers. |
4112 | - # On the NeXT, cc -E runs the code through the compiler's parser, |
4113 | - # not just through cpp. "Syntax error" is here to catch this case. |
4114 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4115 | -/* end confdefs.h. */ |
4116 | -@%:@ifdef __STDC__ |
4117 | -@%:@ include <limits.h> |
4118 | -@%:@else |
4119 | -@%:@ include <assert.h> |
4120 | -@%:@endif |
4121 | - Syntax error |
4122 | -_ACEOF |
4123 | -if ac_fn_cxx_try_cpp "$LINENO"; then : |
4124 | - |
4125 | -else |
4126 | - # Broken: fails on valid input. |
4127 | -continue |
4128 | -fi |
4129 | -rm -f conftest.err conftest.i conftest.$ac_ext |
4130 | - |
4131 | - # OK, works on sane cases. Now check whether nonexistent headers |
4132 | - # can be detected and how. |
4133 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4134 | -/* end confdefs.h. */ |
4135 | -@%:@include <ac_nonexistent.h> |
4136 | -_ACEOF |
4137 | -if ac_fn_cxx_try_cpp "$LINENO"; then : |
4138 | - # Broken: success on invalid input. |
4139 | -continue |
4140 | -else |
4141 | - # Passes both tests. |
4142 | -ac_preproc_ok=: |
4143 | -break |
4144 | -fi |
4145 | -rm -f conftest.err conftest.i conftest.$ac_ext |
4146 | - |
4147 | -done |
4148 | -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
4149 | -rm -f conftest.i conftest.err conftest.$ac_ext |
4150 | -if $ac_preproc_ok; then : |
4151 | - |
4152 | -else |
4153 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4154 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4155 | -_lt_caught_CXX_error=yes; } |
4156 | -fi |
4157 | - |
4158 | -ac_ext=c |
4159 | -ac_cpp='$CPP $CPPFLAGS' |
4160 | -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
4161 | -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
4162 | -ac_compiler_gnu=$ac_cv_c_compiler_gnu |
4163 | - |
4164 | -else |
4165 | - _lt_caught_CXX_error=yes |
4166 | -fi |
4167 | + |
4168 | +func_stripname_cnf () |
4169 | +{ |
4170 | + case ${2} in |
4171 | + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; |
4172 | + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; |
4173 | + esac |
4174 | +} # func_stripname_cnf |
4175 | |
4176 | |
4177 | |
4178 | @@ -9312,6 +9298,7 @@ |
4179 | LIBTOOL='$(SHELL) $(top_builddir)/libtool' |
4180 | |
4181 | |
4182 | + |
4183 | |
4184 | |
4185 | |
4186 | @@ -9356,7 +9343,7 @@ |
4187 | |
4188 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 |
4189 | $as_echo_n "checking for objdir... " >&6; } |
4190 | -if test "${lt_cv_objdir+set}" = set; then : |
4191 | +if ${lt_cv_objdir+:} false; then : |
4192 | $as_echo_n "(cached) " >&6 |
4193 | else |
4194 | rm -f .libs 2>/dev/null |
4195 | @@ -9384,19 +9371,6 @@ |
4196 | |
4197 | |
4198 | |
4199 | - |
4200 | - |
4201 | - |
4202 | - |
4203 | - |
4204 | - |
4205 | - |
4206 | - |
4207 | - |
4208 | - |
4209 | - |
4210 | - |
4211 | - |
4212 | case $host_os in |
4213 | aix3*) |
4214 | # AIX sometimes has problems with the GCC collect2 program. For some |
4215 | @@ -9409,23 +9383,6 @@ |
4216 | ;; |
4217 | esac |
4218 | |
4219 | -# Sed substitution that helps us do robust quoting. It backslashifies |
4220 | -# metacharacters that are still active within double-quoted strings. |
4221 | -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' |
4222 | - |
4223 | -# Same as above, but do not quote variable references. |
4224 | -double_quote_subst='s/\(["`\\]\)/\\\1/g' |
4225 | - |
4226 | -# Sed substitution to delay expansion of an escaped shell variable in a |
4227 | -# double_quote_subst'ed string. |
4228 | -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' |
4229 | - |
4230 | -# Sed substitution to delay expansion of an escaped single quote. |
4231 | -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' |
4232 | - |
4233 | -# Sed substitution to avoid accidental globbing in evaled expressions |
4234 | -no_glob_subst='s/\*/\\\*/g' |
4235 | - |
4236 | # Global variables: |
4237 | ofile=libtool |
4238 | can_build_shared=yes |
4239 | @@ -9454,7 +9411,7 @@ |
4240 | *) break;; |
4241 | esac |
4242 | done |
4243 | -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` |
4244 | +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` |
4245 | |
4246 | |
4247 | # Only perform the check for file, if the check method requires it |
4248 | @@ -9464,7 +9421,7 @@ |
4249 | if test "$file_magic_cmd" = '$MAGIC_CMD'; then |
4250 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 |
4251 | $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } |
4252 | -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : |
4253 | +if ${lt_cv_path_MAGIC_CMD+:} false; then : |
4254 | $as_echo_n "(cached) " >&6 |
4255 | else |
4256 | case $MAGIC_CMD in |
4257 | @@ -9530,7 +9487,7 @@ |
4258 | if test -n "$ac_tool_prefix"; then |
4259 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 |
4260 | $as_echo_n "checking for file... " >&6; } |
4261 | -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then : |
4262 | +if ${lt_cv_path_MAGIC_CMD+:} false; then : |
4263 | $as_echo_n "(cached) " >&6 |
4264 | else |
4265 | case $MAGIC_CMD in |
4266 | @@ -9663,11 +9620,16 @@ |
4267 | lt_prog_compiler_no_builtin_flag= |
4268 | |
4269 | if test "$GCC" = yes; then |
4270 | - lt_prog_compiler_no_builtin_flag=' -fno-builtin' |
4271 | + case $cc_basename in |
4272 | + nvcc*) |
4273 | + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; |
4274 | + *) |
4275 | + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; |
4276 | + esac |
4277 | |
4278 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 |
4279 | $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } |
4280 | -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then : |
4281 | +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : |
4282 | $as_echo_n "(cached) " >&6 |
4283 | else |
4284 | lt_cv_prog_compiler_rtti_exceptions=no |
4285 | @@ -9683,15 +9645,15 @@ |
4286 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4287 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
4288 | -e 's:$: $lt_compiler_flag:'` |
4289 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5) |
4290 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
4291 | (eval "$lt_compile" 2>conftest.err) |
4292 | ac_status=$? |
4293 | cat conftest.err >&5 |
4294 | - echo "$as_me:__oline__: \$? = $ac_status" >&5 |
4295 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4296 | if (exit $ac_status) && test -s "$ac_outfile"; then |
4297 | # The compiler can only warn and ignore the option if not recognized |
4298 | # So say no if there are warnings other than the usual output. |
4299 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
4300 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
4301 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4302 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
4303 | lt_cv_prog_compiler_rtti_exceptions=yes |
4304 | @@ -9720,8 +9682,6 @@ |
4305 | lt_prog_compiler_pic= |
4306 | lt_prog_compiler_static= |
4307 | |
4308 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
4309 | -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4310 | |
4311 | if test "$GCC" = yes; then |
4312 | lt_prog_compiler_wl='-Wl,' |
4313 | @@ -9769,6 +9729,12 @@ |
4314 | lt_prog_compiler_pic='-fno-common' |
4315 | ;; |
4316 | |
4317 | + haiku*) |
4318 | + # PIC is the default for Haiku. |
4319 | + # The "-static" flag exists, but is broken. |
4320 | + lt_prog_compiler_static= |
4321 | + ;; |
4322 | + |
4323 | hpux*) |
4324 | # PIC is the default for 64-bit PA HP-UX, but not for 32-bit |
4325 | # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag |
4326 | @@ -9811,6 +9777,13 @@ |
4327 | lt_prog_compiler_pic='-fPIC' |
4328 | ;; |
4329 | esac |
4330 | + |
4331 | + case $cc_basename in |
4332 | + nvcc*) # Cuda Compiler Driver 2.2 |
4333 | + lt_prog_compiler_wl='-Xlinker ' |
4334 | + lt_prog_compiler_pic='-Xcompiler -fPIC' |
4335 | + ;; |
4336 | + esac |
4337 | else |
4338 | # PORTME Check for flag to pass linker flags through the system compiler. |
4339 | case $host_os in |
4340 | @@ -9873,7 +9846,13 @@ |
4341 | lt_prog_compiler_pic='--shared' |
4342 | lt_prog_compiler_static='--static' |
4343 | ;; |
4344 | - pgcc* | pgf77* | pgf90* | pgf95*) |
4345 | + nagfor*) |
4346 | + # NAG Fortran compiler |
4347 | + lt_prog_compiler_wl='-Wl,-Wl,,' |
4348 | + lt_prog_compiler_pic='-PIC' |
4349 | + lt_prog_compiler_static='-Bstatic' |
4350 | + ;; |
4351 | + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
4352 | # Portland Group compilers (*not* the Pentium gcc compiler, |
4353 | # which looks to be a dead project) |
4354 | lt_prog_compiler_wl='-Wl,' |
4355 | @@ -9885,26 +9864,26 @@ |
4356 | # All Alpha code is PIC. |
4357 | lt_prog_compiler_static='-non_shared' |
4358 | ;; |
4359 | - xl*) |
4360 | - # IBM XL C 8.0/Fortran 10.1 on PPC |
4361 | + xl* | bgxl* | bgf* | mpixl*) |
4362 | + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene |
4363 | lt_prog_compiler_wl='-Wl,' |
4364 | lt_prog_compiler_pic='-qpic' |
4365 | lt_prog_compiler_static='-qstaticlink' |
4366 | ;; |
4367 | *) |
4368 | case `$CC -V 2>&1 | sed 5q` in |
4369 | + *Sun\ F* | *Sun*Fortran*) |
4370 | + # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4371 | + lt_prog_compiler_pic='-KPIC' |
4372 | + lt_prog_compiler_static='-Bstatic' |
4373 | + lt_prog_compiler_wl='' |
4374 | + ;; |
4375 | *Sun\ C*) |
4376 | # Sun C 5.9 |
4377 | lt_prog_compiler_pic='-KPIC' |
4378 | lt_prog_compiler_static='-Bstatic' |
4379 | lt_prog_compiler_wl='-Wl,' |
4380 | ;; |
4381 | - *Sun\ F*) |
4382 | - # Sun Fortran 8.3 passes all unrecognized flags to the linker |
4383 | - lt_prog_compiler_pic='-KPIC' |
4384 | - lt_prog_compiler_static='-Bstatic' |
4385 | - lt_prog_compiler_wl='' |
4386 | - ;; |
4387 | esac |
4388 | ;; |
4389 | esac |
4390 | @@ -9935,7 +9914,7 @@ |
4391 | lt_prog_compiler_pic='-KPIC' |
4392 | lt_prog_compiler_static='-Bstatic' |
4393 | case $cc_basename in |
4394 | - f77* | f90* | f95*) |
4395 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
4396 | lt_prog_compiler_wl='-Qoption ld ';; |
4397 | *) |
4398 | lt_prog_compiler_wl='-Wl,';; |
4399 | @@ -9992,13 +9971,17 @@ |
4400 | lt_prog_compiler_pic="$lt_prog_compiler_pic@&t@ -DPIC" |
4401 | ;; |
4402 | esac |
4403 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 |
4404 | -$as_echo "$lt_prog_compiler_pic" >&6; } |
4405 | - |
4406 | - |
4407 | - |
4408 | - |
4409 | - |
4410 | + |
4411 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 |
4412 | +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } |
4413 | +if ${lt_cv_prog_compiler_pic+:} false; then : |
4414 | + $as_echo_n "(cached) " >&6 |
4415 | +else |
4416 | + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic |
4417 | +fi |
4418 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 |
4419 | +$as_echo "$lt_cv_prog_compiler_pic" >&6; } |
4420 | +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic |
4421 | |
4422 | # |
4423 | # Check to make sure the PIC flag actually works. |
4424 | @@ -10006,7 +9989,7 @@ |
4425 | if test -n "$lt_prog_compiler_pic"; then |
4426 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 |
4427 | $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } |
4428 | -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then : |
4429 | +if ${lt_cv_prog_compiler_pic_works+:} false; then : |
4430 | $as_echo_n "(cached) " >&6 |
4431 | else |
4432 | lt_cv_prog_compiler_pic_works=no |
4433 | @@ -10022,15 +10005,15 @@ |
4434 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4435 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
4436 | -e 's:$: $lt_compiler_flag:'` |
4437 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5) |
4438 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
4439 | (eval "$lt_compile" 2>conftest.err) |
4440 | ac_status=$? |
4441 | cat conftest.err >&5 |
4442 | - echo "$as_me:__oline__: \$? = $ac_status" >&5 |
4443 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4444 | if (exit $ac_status) && test -s "$ac_outfile"; then |
4445 | # The compiler can only warn and ignore the option if not recognized |
4446 | # So say no if there are warnings other than the usual output. |
4447 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp |
4448 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp |
4449 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4450 | if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then |
4451 | lt_cv_prog_compiler_pic_works=yes |
4452 | @@ -10059,13 +10042,18 @@ |
4453 | |
4454 | |
4455 | |
4456 | + |
4457 | + |
4458 | + |
4459 | + |
4460 | + |
4461 | # |
4462 | # Check to make sure the static flag actually works. |
4463 | # |
4464 | wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" |
4465 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 |
4466 | $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } |
4467 | -if test "${lt_cv_prog_compiler_static_works+set}" = set; then : |
4468 | +if ${lt_cv_prog_compiler_static_works+:} false; then : |
4469 | $as_echo_n "(cached) " >&6 |
4470 | else |
4471 | lt_cv_prog_compiler_static_works=no |
4472 | @@ -10078,7 +10066,7 @@ |
4473 | if test -s conftest.err; then |
4474 | # Append any errors to the config.log. |
4475 | cat conftest.err 1>&5 |
4476 | - $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp |
4477 | + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp |
4478 | $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 |
4479 | if diff conftest.exp conftest.er2 >/dev/null; then |
4480 | lt_cv_prog_compiler_static_works=yes |
4481 | @@ -10108,7 +10096,7 @@ |
4482 | |
4483 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 |
4484 | $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } |
4485 | -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : |
4486 | +if ${lt_cv_prog_compiler_c_o+:} false; then : |
4487 | $as_echo_n "(cached) " >&6 |
4488 | else |
4489 | lt_cv_prog_compiler_c_o=no |
4490 | @@ -10127,16 +10115,16 @@ |
4491 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4492 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
4493 | -e 's:$: $lt_compiler_flag:'` |
4494 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5) |
4495 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
4496 | (eval "$lt_compile" 2>out/conftest.err) |
4497 | ac_status=$? |
4498 | cat out/conftest.err >&5 |
4499 | - echo "$as_me:__oline__: \$? = $ac_status" >&5 |
4500 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4501 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
4502 | then |
4503 | # The compiler can only warn and ignore the option if not recognized |
4504 | # So say no if there are warnings |
4505 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
4506 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
4507 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
4508 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
4509 | lt_cv_prog_compiler_c_o=yes |
4510 | @@ -10163,7 +10151,7 @@ |
4511 | |
4512 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 |
4513 | $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } |
4514 | -if test "${lt_cv_prog_compiler_c_o+set}" = set; then : |
4515 | +if ${lt_cv_prog_compiler_c_o+:} false; then : |
4516 | $as_echo_n "(cached) " >&6 |
4517 | else |
4518 | lt_cv_prog_compiler_c_o=no |
4519 | @@ -10182,16 +10170,16 @@ |
4520 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
4521 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
4522 | -e 's:$: $lt_compiler_flag:'` |
4523 | - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5) |
4524 | + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) |
4525 | (eval "$lt_compile" 2>out/conftest.err) |
4526 | ac_status=$? |
4527 | cat out/conftest.err >&5 |
4528 | - echo "$as_me:__oline__: \$? = $ac_status" >&5 |
4529 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
4530 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
4531 | then |
4532 | # The compiler can only warn and ignore the option if not recognized |
4533 | # So say no if there are warnings |
4534 | - $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp |
4535 | + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp |
4536 | $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 |
4537 | if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then |
4538 | lt_cv_prog_compiler_c_o=yes |
4539 | @@ -10301,13 +10289,36 @@ |
4540 | openbsd*) |
4541 | with_gnu_ld=no |
4542 | ;; |
4543 | - linux* | k*bsd*-gnu) |
4544 | - link_all_deplibs=no |
4545 | - ;; |
4546 | esac |
4547 | |
4548 | ld_shlibs=yes |
4549 | + |
4550 | + # On some targets, GNU ld is compatible enough with the native linker |
4551 | + # that we're better off using the native interface for both. |
4552 | + lt_use_gnu_ld_interface=no |
4553 | if test "$with_gnu_ld" = yes; then |
4554 | + case $host_os in |
4555 | + aix*) |
4556 | + # The AIX port of GNU ld has always aspired to compatibility |
4557 | + # with the native linker. However, as the warning in the GNU ld |
4558 | + # block says, versions before 2.19.5* couldn't really create working |
4559 | + # shared libraries, regardless of the interface used. |
4560 | + case `$LD -v 2>&1` in |
4561 | + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; |
4562 | + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; |
4563 | + *\ \(GNU\ Binutils\)\ [3-9]*) ;; |
4564 | + *) |
4565 | + lt_use_gnu_ld_interface=yes |
4566 | + ;; |
4567 | + esac |
4568 | + ;; |
4569 | + *) |
4570 | + lt_use_gnu_ld_interface=yes |
4571 | + ;; |
4572 | + esac |
4573 | + fi |
4574 | + |
4575 | + if test "$lt_use_gnu_ld_interface" = yes; then |
4576 | # If archive_cmds runs LD, not CC, wlarc should be empty |
4577 | wlarc='${wl}' |
4578 | |
4579 | @@ -10341,11 +10352,12 @@ |
4580 | ld_shlibs=no |
4581 | cat <<_LT_EOF 1>&2 |
4582 | |
4583 | -*** Warning: the GNU linker, at least up to release 2.9.1, is reported |
4584 | +*** Warning: the GNU linker, at least up to release 2.19, is reported |
4585 | *** to be unable to reliably create shared libraries on AIX. |
4586 | *** Therefore, libtool is disabling shared libraries support. If you |
4587 | -*** really care for shared libraries, you may want to modify your PATH |
4588 | -*** so that a non-GNU linker is found, and then restart. |
4589 | +*** really care for shared libraries, you may want to install binutils |
4590 | +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. |
4591 | +*** You will then need to restart the configuration process. |
4592 | |
4593 | _LT_EOF |
4594 | fi |
4595 | @@ -10381,10 +10393,12 @@ |
4596 | # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, |
4597 | # as there is no search path for DLLs. |
4598 | hardcode_libdir_flag_spec='-L$libdir' |
4599 | + export_dynamic_flag_spec='${wl}--export-all-symbols' |
4600 | allow_undefined_flag=unsupported |
4601 | always_export_symbols=no |
4602 | enable_shared_with_static_runtimes=yes |
4603 | - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
4604 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' |
4605 | + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' |
4606 | |
4607 | if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then |
4608 | archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' |
4609 | @@ -10402,6 +10416,11 @@ |
4610 | fi |
4611 | ;; |
4612 | |
4613 | + haiku*) |
4614 | + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4615 | + link_all_deplibs=yes |
4616 | + ;; |
4617 | + |
4618 | interix[3-9]*) |
4619 | hardcode_direct=no |
4620 | hardcode_shlibpath_var=no |
4621 | @@ -10427,15 +10446,16 @@ |
4622 | if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ |
4623 | && test "$tmp_diet" = no |
4624 | then |
4625 | - tmp_addflag= |
4626 | + tmp_addflag=' $pic_flag' |
4627 | tmp_sharedflag='-shared' |
4628 | case $cc_basename,$host_cpu in |
4629 | pgcc*) # Portland Group C compiler |
4630 | - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4631 | + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4632 | tmp_addflag=' $pic_flag' |
4633 | ;; |
4634 | - pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers |
4635 | - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4636 | + pgf77* | pgf90* | pgf95* | pgfortran*) |
4637 | + # Portland Group f77 and f90 compilers |
4638 | + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4639 | tmp_addflag=' $pic_flag -Mnomain' ;; |
4640 | ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 |
4641 | tmp_addflag=' -i_dynamic' ;; |
4642 | @@ -10446,13 +10466,17 @@ |
4643 | lf95*) # Lahey Fortran 8.1 |
4644 | whole_archive_flag_spec= |
4645 | tmp_sharedflag='--shared' ;; |
4646 | - xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
4647 | + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) |
4648 | tmp_sharedflag='-qmkshrobj' |
4649 | tmp_addflag= ;; |
4650 | + nvcc*) # Cuda Compiler Driver 2.2 |
4651 | + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4652 | + compiler_needs_object=yes |
4653 | + ;; |
4654 | esac |
4655 | case `$CC -V 2>&1 | sed 5q` in |
4656 | *Sun\ C*) # Sun C 5.9 |
4657 | - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' |
4658 | + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' |
4659 | compiler_needs_object=yes |
4660 | tmp_sharedflag='-G' ;; |
4661 | *Sun\ F*) # Sun Fortran 8.3 |
4662 | @@ -10468,17 +10492,17 @@ |
4663 | fi |
4664 | |
4665 | case $cc_basename in |
4666 | - xlf*) |
4667 | + xlf* | bgf* | bgxlf* | mpixlf*) |
4668 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
4669 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
4670 | hardcode_libdir_flag_spec= |
4671 | hardcode_libdir_flag_spec_ld='-rpath $libdir' |
4672 | - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' |
4673 | + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
4674 | if test "x$supports_anon_versioning" = xyes; then |
4675 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
4676 | cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ |
4677 | echo "local: *; };" >> $output_objdir/$libname.ver~ |
4678 | - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
4679 | + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' |
4680 | fi |
4681 | ;; |
4682 | esac |
4683 | @@ -10487,13 +10511,13 @@ |
4684 | fi |
4685 | ;; |
4686 | |
4687 | - netbsd* | netbsdelf*-gnu) |
4688 | + netbsd*) |
4689 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
4690 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
4691 | wlarc= |
4692 | else |
4693 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4694 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4695 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4696 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4697 | fi |
4698 | ;; |
4699 | |
4700 | @@ -10511,8 +10535,8 @@ |
4701 | |
4702 | _LT_EOF |
4703 | elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
4704 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4705 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4706 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4707 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4708 | else |
4709 | ld_shlibs=no |
4710 | fi |
4711 | @@ -10558,8 +10582,8 @@ |
4712 | |
4713 | *) |
4714 | if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then |
4715 | - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4716 | - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4717 | + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
4718 | + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' |
4719 | else |
4720 | ld_shlibs=no |
4721 | fi |
4722 | @@ -10599,8 +10623,10 @@ |
4723 | else |
4724 | # If we're using GNU nm, then we don't want the "-C" option. |
4725 | # -C means demangle to AIX nm, but means don't demangle with GNU nm |
4726 | + # Also, AIX nm treats weak defined symbols like other global |
4727 | + # defined symbols, whereas GNU nm marks them as "W". |
4728 | if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then |
4729 | - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4730 | + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4731 | else |
4732 | export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' |
4733 | fi |
4734 | @@ -10662,7 +10688,6 @@ |
4735 | if test "$aix_use_runtimelinking" = yes; then |
4736 | shared_flag="$shared_flag "'${wl}-G' |
4737 | fi |
4738 | - link_all_deplibs=no |
4739 | else |
4740 | # not using gcc |
4741 | if test "$host_cpu" = ia64; then |
4742 | @@ -10688,7 +10713,13 @@ |
4743 | allow_undefined_flag='-berok' |
4744 | # Determine the default libpath from the value encoded in an |
4745 | # empty executable. |
4746 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4747 | + if test "${lt_cv_aix_libpath+set}" = set; then |
4748 | + aix_libpath=$lt_cv_aix_libpath |
4749 | +else |
4750 | + if ${lt_cv_aix_libpath_+:} false; then : |
4751 | + $as_echo_n "(cached) " >&6 |
4752 | +else |
4753 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4754 | /* end confdefs.h. */ |
4755 | |
4756 | int |
4757 | @@ -10701,25 +10732,32 @@ |
4758 | _ACEOF |
4759 | if ac_fn_c_try_link "$LINENO"; then : |
4760 | |
4761 | -lt_aix_libpath_sed=' |
4762 | - /Import File Strings/,/^$/ { |
4763 | - /^0/ { |
4764 | - s/^0 *\(.*\)$/\1/ |
4765 | - p |
4766 | - } |
4767 | - }' |
4768 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4769 | -# Check for a 64-bit object if we didn't find anything. |
4770 | -if test -z "$aix_libpath"; then |
4771 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4772 | -fi |
4773 | + lt_aix_libpath_sed=' |
4774 | + /Import File Strings/,/^$/ { |
4775 | + /^0/ { |
4776 | + s/^0 *\([^ ]*\) *$/\1/ |
4777 | + p |
4778 | + } |
4779 | + }' |
4780 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4781 | + # Check for a 64-bit object if we didn't find anything. |
4782 | + if test -z "$lt_cv_aix_libpath_"; then |
4783 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4784 | + fi |
4785 | fi |
4786 | rm -f core conftest.err conftest.$ac_objext \ |
4787 | conftest$ac_exeext conftest.$ac_ext |
4788 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4789 | + if test -z "$lt_cv_aix_libpath_"; then |
4790 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
4791 | + fi |
4792 | + |
4793 | +fi |
4794 | + |
4795 | + aix_libpath=$lt_cv_aix_libpath_ |
4796 | +fi |
4797 | |
4798 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4799 | - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4800 | + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" |
4801 | else |
4802 | if test "$host_cpu" = ia64; then |
4803 | hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
4804 | @@ -10728,7 +10766,13 @@ |
4805 | else |
4806 | # Determine the default libpath from the value encoded in an |
4807 | # empty executable. |
4808 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4809 | + if test "${lt_cv_aix_libpath+set}" = set; then |
4810 | + aix_libpath=$lt_cv_aix_libpath |
4811 | +else |
4812 | + if ${lt_cv_aix_libpath_+:} false; then : |
4813 | + $as_echo_n "(cached) " >&6 |
4814 | +else |
4815 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4816 | /* end confdefs.h. */ |
4817 | |
4818 | int |
4819 | @@ -10741,30 +10785,42 @@ |
4820 | _ACEOF |
4821 | if ac_fn_c_try_link "$LINENO"; then : |
4822 | |
4823 | -lt_aix_libpath_sed=' |
4824 | - /Import File Strings/,/^$/ { |
4825 | - /^0/ { |
4826 | - s/^0 *\(.*\)$/\1/ |
4827 | - p |
4828 | - } |
4829 | - }' |
4830 | -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4831 | -# Check for a 64-bit object if we didn't find anything. |
4832 | -if test -z "$aix_libpath"; then |
4833 | - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4834 | -fi |
4835 | + lt_aix_libpath_sed=' |
4836 | + /Import File Strings/,/^$/ { |
4837 | + /^0/ { |
4838 | + s/^0 *\([^ ]*\) *$/\1/ |
4839 | + p |
4840 | + } |
4841 | + }' |
4842 | + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4843 | + # Check for a 64-bit object if we didn't find anything. |
4844 | + if test -z "$lt_cv_aix_libpath_"; then |
4845 | + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` |
4846 | + fi |
4847 | fi |
4848 | rm -f core conftest.err conftest.$ac_objext \ |
4849 | conftest$ac_exeext conftest.$ac_ext |
4850 | -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi |
4851 | + if test -z "$lt_cv_aix_libpath_"; then |
4852 | + lt_cv_aix_libpath_="/usr/lib:/lib" |
4853 | + fi |
4854 | + |
4855 | +fi |
4856 | + |
4857 | + aix_libpath=$lt_cv_aix_libpath_ |
4858 | +fi |
4859 | |
4860 | hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4861 | # Warning - without using the other run time loading flags, |
4862 | # -berok will link without error, but may produce a broken library. |
4863 | no_undefined_flag=' ${wl}-bernotok' |
4864 | allow_undefined_flag=' ${wl}-berok' |
4865 | - # Exported symbols can be pulled into shared objects from archives |
4866 | - whole_archive_flag_spec='$convenience' |
4867 | + if test "$with_gnu_ld" = yes; then |
4868 | + # We only use this code for GNU lds that support --whole-archive. |
4869 | + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' |
4870 | + else |
4871 | + # Exported symbols can be pulled into shared objects from archives |
4872 | + whole_archive_flag_spec='$convenience' |
4873 | + fi |
4874 | archive_cmds_need_lc=yes |
4875 | # This is similar to how AIX traditionally builds its shared libraries. |
4876 | archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' |
4877 | @@ -10796,20 +10852,63 @@ |
4878 | # Microsoft Visual C++. |
4879 | # hardcode_libdir_flag_spec is actually meaningless, as there is |
4880 | # no search path for DLLs. |
4881 | - hardcode_libdir_flag_spec=' ' |
4882 | - allow_undefined_flag=unsupported |
4883 | - # Tell ltmain to make .lib files, not .a files. |
4884 | - libext=lib |
4885 | - # Tell ltmain to make .dll files, not .so files. |
4886 | - shrext_cmds=".dll" |
4887 | - # FIXME: Setting linknames here is a bad hack. |
4888 | - archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' |
4889 | - # The linker will automatically build a .lib file if we build a DLL. |
4890 | - old_archive_from_new_cmds='true' |
4891 | - # FIXME: Should let the user specify the lib program. |
4892 | - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
4893 | - fix_srcfile_path='`cygpath -w "$srcfile"`' |
4894 | - enable_shared_with_static_runtimes=yes |
4895 | + case $cc_basename in |
4896 | + cl*) |
4897 | + # Native MSVC |
4898 | + hardcode_libdir_flag_spec=' ' |
4899 | + allow_undefined_flag=unsupported |
4900 | + always_export_symbols=yes |
4901 | + file_list_spec='@' |
4902 | + # Tell ltmain to make .lib files, not .a files. |
4903 | + libext=lib |
4904 | + # Tell ltmain to make .dll files, not .so files. |
4905 | + shrext_cmds=".dll" |
4906 | + # FIXME: Setting linknames here is a bad hack. |
4907 | + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' |
4908 | + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then |
4909 | + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; |
4910 | + else |
4911 | + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; |
4912 | + fi~ |
4913 | + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ |
4914 | + linknames=' |
4915 | + # The linker will not automatically build a static lib if we build a DLL. |
4916 | + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
4917 | + enable_shared_with_static_runtimes=yes |
4918 | + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
4919 | + # Don't use ranlib |
4920 | + old_postinstall_cmds='chmod 644 $oldlib' |
4921 | + postlink_cmds='lt_outputfile="@OUTPUT@"~ |
4922 | + lt_tool_outputfile="@TOOL_OUTPUT@"~ |
4923 | + case $lt_outputfile in |
4924 | + *.exe|*.EXE) ;; |
4925 | + *) |
4926 | + lt_outputfile="$lt_outputfile.exe" |
4927 | + lt_tool_outputfile="$lt_tool_outputfile.exe" |
4928 | + ;; |
4929 | + esac~ |
4930 | + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then |
4931 | + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; |
4932 | + $RM "$lt_outputfile.manifest"; |
4933 | + fi' |
4934 | + ;; |
4935 | + *) |
4936 | + # Assume MSVC wrapper |
4937 | + hardcode_libdir_flag_spec=' ' |
4938 | + allow_undefined_flag=unsupported |
4939 | + # Tell ltmain to make .lib files, not .a files. |
4940 | + libext=lib |
4941 | + # Tell ltmain to make .dll files, not .so files. |
4942 | + shrext_cmds=".dll" |
4943 | + # FIXME: Setting linknames here is a bad hack. |
4944 | + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' |
4945 | + # The linker will automatically build a .lib file if we build a DLL. |
4946 | + old_archive_from_new_cmds='true' |
4947 | + # FIXME: Should let the user specify the lib program. |
4948 | + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' |
4949 | + enable_shared_with_static_runtimes=yes |
4950 | + ;; |
4951 | + esac |
4952 | ;; |
4953 | |
4954 | darwin* | rhapsody*) |
4955 | @@ -10819,7 +10918,11 @@ |
4956 | hardcode_direct=no |
4957 | hardcode_automatic=yes |
4958 | hardcode_shlibpath_var=unsupported |
4959 | - whole_archive_flag_spec='' |
4960 | + if test "$lt_cv_ld_force_load" = "yes"; then |
4961 | + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
4962 | + else |
4963 | + whole_archive_flag_spec='' |
4964 | + fi |
4965 | link_all_deplibs=yes |
4966 | allow_undefined_flag="$_lt_dar_allow_undefined" |
4967 | case $cc_basename in |
4968 | @@ -10827,7 +10930,7 @@ |
4969 | *) _lt_dar_can_shared=$GCC ;; |
4970 | esac |
4971 | if test "$_lt_dar_can_shared" = "yes"; then |
4972 | - output_verbose_link_cmd=echo |
4973 | + output_verbose_link_cmd=func_echo_all |
4974 | archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" |
4975 | module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" |
4976 | archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" |
4977 | @@ -10870,7 +10973,7 @@ |
4978 | |
4979 | # FreeBSD 3 and greater uses gcc -shared to do shared libraries. |
4980 | freebsd* | dragonfly*) |
4981 | - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' |
4982 | + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' |
4983 | hardcode_libdir_flag_spec='-R$libdir' |
4984 | hardcode_direct=yes |
4985 | hardcode_shlibpath_var=no |
4986 | @@ -10878,7 +10981,7 @@ |
4987 | |
4988 | hpux9*) |
4989 | if test "$GCC" = yes; then |
4990 | - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4991 | + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4992 | else |
4993 | archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' |
4994 | fi |
4995 | @@ -10893,8 +10996,8 @@ |
4996 | ;; |
4997 | |
4998 | hpux10*) |
4999 | - if test "$GCC" = yes -a "$with_gnu_ld" = no; then |
5000 | - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' |
The diff has been truncated for viewing.
Hi,
Thanks for your work! Anyway, ss we are past Feature Freeze, you need to get a FFe first. Please check https:/ /wiki.ubuntu. com/FreezeExcep tionProcess# FeatureFreeze_ for_new_ upstream_ versions to see how to get it.
Thanks,
Fabrice