~ubuntu-branches/ubuntu/trusty/protobuf/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/autogen.diff

Committer: Bazaar Package Importer
Author(s): Matthias Klose
Date: 2011-05-31 14:41:47 UTC
mfrom: (2.2.8 sid)
Revision ID: james.westby@ubuntu.com-20110531144147-s41g5fozgvyo462l

Tags: 2.4.0a-2ubuntu1

* Merge with Debian; remaining changes:
- Fix linking with -lpthread.

files added:
.pc/autogen.diff/m4/lt~obsolete.m4

debian/libprotobuf-lite7.install

debian/libprotobuf-lite7.shlibs

debian/libprotobuf7.install

debian/libprotobuf7.shlibs

debian/libprotoc7.install

debian/libprotoc7.shlibs

debian/python-protobuf.README.Debian

java/src/main/java/com/google/protobuf/LazyStringArrayList.java

java/src/main/java/com/google/protobuf/LazyStringList.java

java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java

java/src/main/java/com/google/protobuf/MessageOrBuilder.java

java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java

java/src/main/java/com/google/protobuf/SingleFieldBuilder.java

java/src/main/java/com/google/protobuf/SmallSortedMap.java

java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java

java/src/test/java/com/google/protobuf/DeprecatedFieldTest.java

java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java

java/src/test/java/com/google/protobuf/LazyStringArrayListTest.java

java/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java

java/src/test/java/com/google/protobuf/NestedBuildersTest.java

java/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java

java/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java

java/src/test/java/com/google/protobuf/SmallSortedMapTest.java

java/src/test/java/com/google/protobuf/TestBadIdentifiers.java

java/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java

java/src/test/java/com/google/protobuf/nested_builders_test.proto

java/src/test/java/com/google/protobuf/nested_extension.proto

java/src/test/java/com/google/protobuf/nested_extension_lite.proto

java/src/test/java/com/google/protobuf/non_nested_extension.proto

java/src/test/java/com/google/protobuf/non_nested_extension_lite.proto

java/src/test/java/com/google/protobuf/test_bad_identifiers.proto

python/google/protobuf/internal/api_implementation.py

python/google/protobuf/internal/cpp_message.py

python/google/protobuf/internal/python_message.py

python/google/protobuf/pyext

python/google/protobuf/pyext/python-proto2.cc

python/google/protobuf/pyext/python_descriptor.cc

python/google/protobuf/pyext/python_descriptor.h

python/google/protobuf/pyext/python_protobuf.cc

python/google/protobuf/pyext/python_protobuf.h

src/google/protobuf/compiler/java/java_string_field.cc

src/google/protobuf/compiler/java/java_string_field.h

files removed:
.pc/autogen.diff/config.h.in

.pc/autogen.diff/depcomp

.pc/autogen.diff/gtest/build-aux/config.h.in

.pc/autogen.diff/gtest/build-aux/depcomp

.pc/autogen.diff/gtest/build-aux/install-sh

.pc/autogen.diff/gtest/build-aux/missing

.pc/autogen.diff/install-sh

.pc/autogen.diff/m4/ltsugar.m4

.pc/autogen.diff/missing

.pc/default_python_version

.pc/default_python_version/python

.pc/default_python_version/python/mox.py

.pc/default_python_version/python/stubout.py

debian/libprotobuf-lite6.install

debian/libprotobuf-lite6.shlibs

debian/libprotobuf6.install

debian/libprotobuf6.shlibs

debian/libprotoc6.install

debian/libprotoc6.shlibs

debian/patches/default_python_version

src/google/protobuf/stubs/hash.cc

files modified:
.pc/applied-patches

.pc/autogen.diff/Makefile.in

.pc/autogen.diff/aclocal.m4

.pc/autogen.diff/config.guess

.pc/autogen.diff/config.sub

.pc/autogen.diff/configure

.pc/autogen.diff/gtest/Makefile.in

.pc/autogen.diff/gtest/aclocal.m4

.pc/autogen.diff/gtest/build-aux/config.guess

.pc/autogen.diff/gtest/build-aux/config.sub

.pc/autogen.diff/gtest/build-aux/ltmain.sh

.pc/autogen.diff/gtest/configure

.pc/autogen.diff/ltmain.sh

.pc/autogen.diff/m4/libtool.m4

.pc/autogen.diff/m4/ltoptions.m4

.pc/autogen.diff/m4/ltversion.m4

.pc/autogen.diff/src/Makefile.in

.pc/disable-setuptools-download.diff/python/ez_setup.py

.pc/link-pthread.diff/m4/acx_pthread.m4

CHANGES.txt

CONTRIBUTORS.txt

Makefile.am

Makefile.in

aclocal.m4

config.guess

config.h.in

config.sub

configure

configure.ac

debian/changelog

debian/control

debian/java-build.xml

debian/libprotobuf-java.links

debian/patches/autogen.diff

debian/patches/series

debian/pkg-test.sh

debian/rules

debian/watch

gtest/Makefile.in

gtest/aclocal.m4

gtest/build-aux/config.guess

gtest/build-aux/config.sub

gtest/build-aux/ltmain.sh

gtest/configure

java/pom.xml

java/src/main/java/com/google/protobuf/AbstractMessage.java

java/src/main/java/com/google/protobuf/AbstractMessageLite.java

java/src/main/java/com/google/protobuf/ByteString.java

java/src/main/java/com/google/protobuf/CodedInputStream.java

java/src/main/java/com/google/protobuf/CodedOutputStream.java

java/src/main/java/com/google/protobuf/Descriptors.java

java/src/main/java/com/google/protobuf/FieldSet.java

java/src/main/java/com/google/protobuf/GeneratedMessage.java

java/src/main/java/com/google/protobuf/GeneratedMessageLite.java

java/src/main/java/com/google/protobuf/Internal.java

java/src/main/java/com/google/protobuf/Message.java

java/src/main/java/com/google/protobuf/MessageLite.java

java/src/main/java/com/google/protobuf/ServiceException.java

java/src/main/java/com/google/protobuf/TextFormat.java

java/src/main/java/com/google/protobuf/WireFormat.java

java/src/test/java/com/google/protobuf/AbstractMessageTest.java

java/src/test/java/com/google/protobuf/CodedInputStreamTest.java

java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java

java/src/test/java/com/google/protobuf/DescriptorsTest.java

java/src/test/java/com/google/protobuf/GeneratedMessageTest.java

java/src/test/java/com/google/protobuf/LiteTest.java

java/src/test/java/com/google/protobuf/ServiceTest.java

java/src/test/java/com/google/protobuf/TestUtil.java

java/src/test/java/com/google/protobuf/TextFormatTest.java

java/src/test/java/com/google/protobuf/multiple_files_test.proto

ltmain.sh

m4/acx_pthread.m4

m4/libtool.m4

m4/ltoptions.m4

m4/ltversion.m4

m4/lt~obsolete.m4

m4/stl_hash.m4

python/README.txt

python/ez_setup.py

python/google/protobuf/descriptor.py

python/google/protobuf/internal/containers.py

python/google/protobuf/internal/decoder.py

python/google/protobuf/internal/encoder.py

python/google/protobuf/internal/generator_test.py

python/google/protobuf/internal/message_test.py

python/google/protobuf/internal/reflection_test.py

python/google/protobuf/internal/text_format_test.py

python/google/protobuf/message.py

python/google/protobuf/reflection.py

python/google/protobuf/text_format.py

python/mox.py

python/setup.py

python/stubout.py

src/Makefile.am

src/Makefile.in

src/google/protobuf/compiler/code_generator.cc

src/google/protobuf/compiler/code_generator.h

src/google/protobuf/compiler/command_line_interface.cc

src/google/protobuf/compiler/command_line_interface.h

src/google/protobuf/compiler/command_line_interface_unittest.cc

src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

src/google/protobuf/compiler/cpp/cpp_enum_field.cc

src/google/protobuf/compiler/cpp/cpp_file.cc

src/google/protobuf/compiler/cpp/cpp_generator.cc

src/google/protobuf/compiler/cpp/cpp_generator.h

src/google/protobuf/compiler/cpp/cpp_helpers.cc

src/google/protobuf/compiler/cpp/cpp_helpers.h

src/google/protobuf/compiler/cpp/cpp_message.cc

src/google/protobuf/compiler/cpp/cpp_message_field.cc

src/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc

src/google/protobuf/compiler/cpp/cpp_primitive_field.cc

src/google/protobuf/compiler/cpp/cpp_string_field.cc

src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto

src/google/protobuf/compiler/cpp/cpp_unittest.cc

src/google/protobuf/compiler/importer.cc

src/google/protobuf/compiler/java/java_enum.cc

src/google/protobuf/compiler/java/java_enum_field.cc

src/google/protobuf/compiler/java/java_enum_field.h

src/google/protobuf/compiler/java/java_extension.cc

src/google/protobuf/compiler/java/java_extension.h

src/google/protobuf/compiler/java/java_field.cc

src/google/protobuf/compiler/java/java_field.h

src/google/protobuf/compiler/java/java_file.cc

src/google/protobuf/compiler/java/java_file.h

src/google/protobuf/compiler/java/java_generator.cc

src/google/protobuf/compiler/java/java_generator.h

src/google/protobuf/compiler/java/java_helpers.cc

src/google/protobuf/compiler/java/java_helpers.h

src/google/protobuf/compiler/java/java_message.cc

src/google/protobuf/compiler/java/java_message.h

src/google/protobuf/compiler/java/java_message_field.cc

src/google/protobuf/compiler/java/java_message_field.h

src/google/protobuf/compiler/java/java_plugin_unittest.cc

src/google/protobuf/compiler/java/java_primitive_field.cc

src/google/protobuf/compiler/java/java_primitive_field.h

src/google/protobuf/compiler/java/java_service.cc

src/google/protobuf/compiler/mock_code_generator.cc

src/google/protobuf/compiler/mock_code_generator.h

src/google/protobuf/compiler/parser.cc

src/google/protobuf/compiler/parser.h

src/google/protobuf/compiler/parser_unittest.cc

src/google/protobuf/compiler/plugin.cc

src/google/protobuf/compiler/plugin.h

src/google/protobuf/compiler/plugin.pb.cc

src/google/protobuf/compiler/plugin.pb.h

src/google/protobuf/compiler/plugin.proto

src/google/protobuf/compiler/python/python_generator.cc

src/google/protobuf/compiler/python/python_generator.h

src/google/protobuf/compiler/python/python_plugin_unittest.cc

src/google/protobuf/compiler/subprocess.cc

src/google/protobuf/compiler/subprocess.h

src/google/protobuf/compiler/zip_output_unittest.sh

src/google/protobuf/compiler/zip_writer.cc

src/google/protobuf/compiler/zip_writer.h

src/google/protobuf/descriptor.cc

src/google/protobuf/descriptor.pb.cc

src/google/protobuf/descriptor.pb.h

src/google/protobuf/descriptor.proto

src/google/protobuf/descriptor_database.cc

src/google/protobuf/descriptor_unittest.cc

src/google/protobuf/extension_set.cc

src/google/protobuf/extension_set.h

src/google/protobuf/generated_message_reflection.cc

src/google/protobuf/generated_message_util.cc

src/google/protobuf/generated_message_util.h

src/google/protobuf/io/coded_stream.cc

src/google/protobuf/io/coded_stream.h

src/google/protobuf/io/coded_stream_unittest.cc

src/google/protobuf/io/gzip_stream.cc

src/google/protobuf/io/printer.cc

src/google/protobuf/io/printer.h

src/google/protobuf/io/tokenizer.cc

src/google/protobuf/io/tokenizer.h

src/google/protobuf/io/tokenizer_unittest.cc

src/google/protobuf/io/zero_copy_stream_unittest.cc

src/google/protobuf/message.h

src/google/protobuf/repeated_field.cc

src/google/protobuf/repeated_field.h

src/google/protobuf/repeated_field_unittest.cc

src/google/protobuf/stubs/common.cc

src/google/protobuf/stubs/common.h

src/google/protobuf/stubs/common_unittest.cc

src/google/protobuf/stubs/strutil.h

src/google/protobuf/text_format.cc

src/google/protobuf/text_format.h

src/google/protobuf/text_format_unittest.cc

src/google/protobuf/unittest.proto

src/google/protobuf/unittest_custom_options.proto

src/google/protobuf/unittest_no_generic_services.proto

src/google/protobuf/wire_format_lite_inl.h

vsprojects/libprotobuf-lite.vcproj

vsprojects/libprotobuf.vcproj

vsprojects/libprotoc.vcproj

vsprojects/protobuf.sln

vsprojects/protoc.vcproj

vsprojects/test_plugin.vcproj

Show diffs side-by-side

added added

removed removed

debian/patches/autogen.diff

Description: Upstream changes introduced in version 2.3.0-4ubuntu1

This patch has been created by dpkg-source during the package build.

Here's the last changelog entry, hopefully it gives details on why

those changes were made:

protobuf (2.3.0-4ubuntu1) natty; urgency=low

* Merge from debian unstable. Remaining changes:

- Don't use python2.4 use python instead (submited to Debian

as Bug#600261)

The person named in the Author field signed this changelog entry.

Author: Michael Vogt <michael.vogt@ubuntu.com>

---

The information above should follow the Patch Tagging Guidelines, please

checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here

are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>

Bug: <url in upstream bugtracker>

Bug-Debian: http://bugs.debian.org/<bugnumber>

Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>

Forwarded: <no|not-needed|url proving that it has been forwarded>

Reviewed-By: <name and email of someone who approved the patch>

Last-Update: <YYYY-MM-DD>

--- protobuf-2.3.0.orig/config.guess

+++ protobuf-2.3.0/config.guess

--- protobuf-2.4.0a.orig/config.sub

+++ protobuf-2.4.0a/config.sub

@@ -1,10 +1,10 @@

#! /bin/sh

# Configuration validation subroutine script.

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

-# Free Software Foundation, Inc.

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,

+# 2011 Free Software Foundation, Inc.

-timestamp='2009-06-11'

+timestamp='2011-03-23'

# This file is (in principle) common to ALL GNU software.

# The presence of a machine in this file suggests that SOME GNU software

@@ -32,13 +32,16 @@ timestamp='2009-06-11'

# Please send patches to <config-patches@gnu.org>. Submit a context

-# diff and a properly formatted ChangeLog entry.

+# diff and a properly formatted GNU ChangeLog entry.

# Configuration subroutine to validate and canonicalize a configuration type.

# Supply the specified configuration type as an argument.

# If it is invalid, we print an error message on stderr and exit with code 1.

# Otherwise, we print the canonical config type on stdout and succeed.

+# You can get the latest version of this script from:

+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

# This file is supposed to be the same for all GNU packages

# and recognize all the CPU types, system types and aliases

# that are meaningful with *any* GNU software.

@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch

version="\

GNU config.sub ($timestamp)

-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free

+Software Foundation, Inc.

This is free software; see the source for copying conditions. There is NO

warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

@@ -120,8 +124,9 @@ esac

# Here we must recognize all the valid KERNEL-OS combinations.

maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`

case $maybe_os in

+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \

+ knetbsd*-gnu* | netbsd*-gnu* | \

kopensolaris*-gnu* | \

storm-chaos* | os2-emx* | rtmk-nova*)

os=-$maybe_os

@@ -149,12 +154,12 @@ case $os in

-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\

-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

- -apple | -axis | -knuth | -cray)

+ -apple | -axis | -knuth | -cray | -microblaze)

os=

basic_machine=$1

;;

- -bluegene*)

- os=-cnk

+ -bluegene*)

+ os=-cnk

;;

-sim | -cisco | -oki | -wec | -winbond)

os=

@@ -170,10 +175,10 @@ case $os in

os=-chorusos

basic_machine=$1

;;

- -chorusrdb)

- os=-chorusrdb

+ -chorusrdb)

+ os=-chorusrdb

basic_machine=$1

- ;;

+ ;;

-hiux*)

os=-hiuxwe2

;;

@@ -278,26 +283,39 @@ case $basic_machine in

| moxie \

| mt \

| msp430 \

+ | nds32 | nds32le | nds32be \

| nios | nios2 \

| ns16k | ns32k \

+ | open8 \

| or32 \

| pdp10 | pdp11 | pj | pjl \

100

+ | powerpc | powerpc64 | powerpc64le | powerpcle \

101

| pyramid \

102

+ | rx \

103

| score \

104

105

| sh64 | sh64le \

106

107

| sparcv8 | sparcv9 | sparcv9b | sparcv9v \

108

- | spu | strongarm \

109

110

+ | spu \

111

112

+ | ubicom32 \

113

| v850 | v850e \

114

| we32k \

115

- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \

116

+ | x86 | xc16x | xstormy16 | xtensa \

117

| z8k | z80)

118

basic_machine=$basic_machine-unknown

119

;;

120

- m6811 | m68hc11 | m6812 | m68hc12)

121

+ c54x)

122

+ basic_machine=tic54x-unknown

123

+ ;;

124

+ c55x)

125

+ basic_machine=tic55x-unknown

126

+ ;;

127

+ c6x)

128

+ basic_machine=tic6x-unknown

129

+ ;;

130

+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)

131

# Motorola 68HC11/12.

132

basic_machine=$basic_machine-unknown

133

os=-none

134

@@ -308,6 +326,18 @@ case $basic_machine in

135

basic_machine=mt-unknown

136

;;

137

138

+ strongarm | thumb | xscale)

139

+ basic_machine=arm-unknown

140

+ ;;

141

142

+ xscaleeb)

143

+ basic_machine=armeb-unknown

144

+ ;;

145

146

+ xscaleel)

147

+ basic_machine=armel-unknown

148

+ ;;

149

150

# We use `pc' rather than `unknown'

151

# because (1) that's what they normally are, and

152

# (2) the word "unknown" tends to confuse beginning users.

153

@@ -328,7 +358,7 @@ case $basic_machine in

154

155

| avr-* | avr32-* \

156

| bfin-* | bs2000-* \

157

- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \

158

+ | c[123]* | c30-* | [cjt]90-* | c4x-* \

159

| clipper-* | craynv-* | cydra-* \

160

| d10v-* | d30v-* | dlx-* \

161

| elxsi-* \

162

@@ -340,7 +370,7 @@ case $basic_machine in

163

| lm32-* \

164

| m32c-* | m32r-* | m32rle-* \

165

| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \

166

- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \

167

+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \

168

169

| mips16-* \

170

| mips64-* | mips64el-* \

171

@@ -362,24 +392,28 @@ case $basic_machine in

172

| mmix-* \

173

| mt-* \

174

| msp430-* \

175

+ | nds32-* | nds32le-* | nds32be-* \

176

| nios-* | nios2-* \

177

| none-* | np1-* | ns16k-* | ns32k-* \

178

+ | open8-* \

179

| orion-* \

180

| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

181

182

+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \

183

| pyramid-* \

184

- | romp-* | rs6000-* \

185

+ | romp-* | rs6000-* | rx-* \

186

| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

187

188

189

| sparclite-* \

190

191

- | tahoe-* | thumb-* \

192

193

+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \

194

+ | tahoe-* \

195

+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \

196

+ | tile-* | tilegx-* \

197

| tron-* \

198

+ | ubicom32-* \

199

| v850-* | v850e-* | vax-* \

200

| we32k-* \

201

- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \

202

+ | x86-* | x86_64-* | xc16x-* | xps100-* \

203

| xstormy16-* | xtensa*-* \

204

| ymp-* \

205

| z8k-* | z80-*)

206

@@ -404,7 +438,7 @@ case $basic_machine in

207

basic_machine=a29k-amd

208

os=-udi

209

;;

210

- abacus)

211

+ abacus)

212

basic_machine=abacus-unknown

213

;;

214

adobe68k)

215

@@ -474,11 +508,20 @@ case $basic_machine in

216

basic_machine=powerpc-ibm

217

os=-cnk

218

;;

219

+ c54x-*)

220

+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`

221

+ ;;

222

+ c55x-*)

223

+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`

224

+ ;;

225

+ c6x-*)

226

+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`

227

+ ;;

228

c90)

229

basic_machine=c90-cray

230

os=-unicos

231

;;

232

- cegcc)

233

+ cegcc)

234

basic_machine=arm-unknown

235

os=-cegcc

236

;;

237

@@ -510,7 +553,7 @@ case $basic_machine in

238

basic_machine=craynv-cray

239

os=-unicosmp

240

;;

241

- cr16)

242

+ cr16 | cr16-*)

243

basic_machine=cr16-unknown

244

os=-elf

245

;;

246

@@ -726,6 +769,9 @@ case $basic_machine in

247

basic_machine=ns32k-utek

248

os=-sysv

249

;;

250

+ microblaze)

251

+ basic_machine=microblaze-xilinx

252

+ ;;

253

mingw32)

254

basic_machine=i386-pc

255

os=-mingw32

256

@@ -830,6 +876,12 @@ case $basic_machine in

257

np1)

258

basic_machine=np1-gould

259

;;

260

+ neo-tandem)

261

+ basic_machine=neo-tandem

262

+ ;;

263

+ nse-tandem)

264

+ basic_machine=nse-tandem

265

+ ;;

266

nsr-tandem)

267

basic_machine=nsr-tandem

268

;;

269

@@ -912,9 +964,10 @@ case $basic_machine in

270

;;

271

power) basic_machine=power-ibm

272

;;

273

- ppc) basic_machine=powerpc-unknown

274

+ ppc | ppcbe) basic_machine=powerpc-unknown

275

;;

276

- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`

277

+ ppc-* | ppcbe-*)

278

+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`

279

;;

280

ppcle | powerpclittle | ppc-le | powerpc-little)

281

basic_machine=powerpcle-unknown

282

@@ -1008,6 +1061,9 @@ case $basic_machine in

283

basic_machine=i860-stratus

284

os=-sysv4

285

;;

286

+ strongarm-* | thumb-*)

287

+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`

288

+ ;;

289

sun2)

290

basic_machine=m68000-sun

291

;;

292

@@ -1064,17 +1120,10 @@ case $basic_machine in

293

basic_machine=t90-cray

294

os=-unicos

295

;;

296

- tic54x | c54x*)

297

- basic_machine=tic54x-unknown

298

- os=-coff

299

- ;;

300

- tic55x | c55x*)

301

- basic_machine=tic55x-unknown

302

- os=-coff

303

- ;;

304

- tic6x | c6x*)

305

- basic_machine=tic6x-unknown

306

- os=-coff

307

+ # This must be matched before tile*.

308

+ tilegx*)

309

+ basic_machine=tilegx-unknown

310

+ os=-linux-gnu

311

;;

312

tile*)

313

basic_machine=tile-unknown

314

@@ -1147,6 +1196,9 @@ case $basic_machine in

315

xps | xps100)

316

basic_machine=xps100-honeywell

317

;;

318

+ xscale-* | xscalee[bl]-*)

319

+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`

320

+ ;;

321

ymp)

322

basic_machine=ymp-cray

323

os=-unicos

324

@@ -1244,9 +1296,12 @@ esac

325

if [ x"$os" != x"" ]

326

then

327

case $os in

328

- # First match some system type aliases

329

- # that might get confused with valid system types.

330

+ # First match some system type aliases

331

+ # that might get confused with valid system types.

332

# -solaris* is a basic system type, with this one exception.

333

+ -auroraux)

334

+ os=-auroraux

335

+ ;;

336

-solaris1 | -solaris1.*)

337

os=`echo $os | sed -e 's|solaris1|sunos4|'`

338

;;

339

@@ -1268,8 +1323,8 @@ case $os in

340

# -sysv* is not here because it comes later, after sysvr4.

341

342

| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\

343

344

- | -kopensolaris* \

345

346

+ | -sym* | -kopensolaris* \

347

348

| -aos* | -aros* \

349

350

@@ -1282,7 +1337,8 @@ case $os in

351

| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

352

| -chorusos* | -chorusrdb* | -cegcc* \

353

354

- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \

355

+ | -mingw32* | -linux-gnu* | -linux-android* \

356

+ | -linux-newlib* | -linux-uclibc* \

357

| -uxpv* | -beos* | -mpeix* | -udk* \

358

359

360

@@ -1290,7 +1346,7 @@ case $os in

361

362

363

| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \

364

365

366

# Remember, each alternative MUST END IN *, to match a version number.

367

;;

368

-qnx*)

369

@@ -1329,7 +1385,7 @@ case $os in

370

-opened*)

371

os=-openedition

372

;;

373

- -os400*)

374

+ -os400*)

375

os=-os400

376

;;

377

-wince*)

378

@@ -1378,7 +1434,7 @@ case $os in

379

-sinix*)

380

os=-sysv4

381

;;

382

- -tpf*)

383

+ -tpf*)

384

os=-tpf

385

;;

386

-triton*)

387

@@ -1423,6 +1479,8 @@ case $os in

388

-dicos*)

389

os=-dicos

390

;;

391

+ -nacl*)

392

+ ;;

393

-none)

394

;;

395

396

@@ -1445,10 +1503,10 @@ else

397

# system, and we'll never get to this point.

398

399

case $basic_machine in

400

- score-*)

401

+ score-*)

402

os=-elf

403

;;

404

- spu-*)

405

+ spu-*)

406

os=-elf

407

;;

408

*-acorn)

409

@@ -1460,8 +1518,17 @@ case $basic_machine in

410

arm*-semi)

411

os=-aout

412

;;

413

- c4x-* | tic4x-*)

414

- os=-coff

415

+ c4x-* | tic4x-*)

416

+ os=-coff

417

+ ;;

418

+ tic54x-*)

419

+ os=-coff

420

+ ;;

421

+ tic55x-*)

422

+ os=-coff

423

+ ;;

424

+ tic6x-*)

425

+ os=-coff

426

;;

427

# This must come before the *-dec entry.

428

pdp10-*)

429

@@ -1488,7 +1555,7 @@ case $basic_machine in

430

m68*-cisco)

431

os=-aout

432

;;

433

- mep-*)

434

+ mep-*)

435

os=-elf

436

;;

437

mips*-cisco)

438

@@ -1515,7 +1582,7 @@ case $basic_machine in

439

*-ibm)

440

os=-aix

441

;;

442

- *-knuth)

443

+ *-knuth)

444

os=-mmixware

445

;;

446

*-wec)

447

--- protobuf-2.4.0a.orig/config.guess

448

+++ protobuf-2.4.0a/config.guess

449

@@ -1,10 +1,10 @@

450

#! /bin/sh

451

# Attempt to guess a canonical system name.

452

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,

-# Inc.

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

+# Free Software Foundation, Inc.

453

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

454

-# Free Software Foundation, Inc.

455

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,

456

+# 2011 Free Software Foundation, Inc.

457

-timestamp='2007-07-22'

+timestamp='2009-12-30'

458

-timestamp='2009-06-10'

459

+timestamp='2011-05-11'

460

461

# This file is free software; you can redistribute it and/or modify it

462

# under the terms of the GNU General Public License as published by

@@ -27,16 +27,16 @@ timestamp='2007-07-22'

463

@@ -27,16 +27,16 @@ timestamp='2009-06-10'

464

# the same distribution terms that you use for the rest of that program.

465

466

486

GNU config.guess ($timestamp)

487

488

Originally written by Per Bothner.

-Free Software Foundation, Inc.

489

490

-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

491

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free

492

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free

493

+Software Foundation, Inc.

494

495

This is free software; see the source for copying conditions. There is NO

496

warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

@@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

arm*|i386|m68k|ns32k|sh3*|sparc|vax)

eval $set_cc_for_build

if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \

- | grep __ELF__ >/dev/null

+ | grep -q __ELF__

then

# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).

# Return netbsd for either. FIX?

@@ -324,14 +325,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

case `/usr/bin/uname -p` in

sparc) echo sparc-icl-nx7; exit ;;

esac ;;

+ s390x:SunOS:*:*)

+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

+ exit ;;

sun4H:SunOS:5.*:*)

echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

exit ;;

497

@@ -180,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

498

499

;;

500

501

- os=netbsd

502

+ os=netbsd

503

;;

504

esac

505

# The OS release

506

@@ -223,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

507

UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`

508

;;

509

*5.*)

510

- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`

511

+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`

512

;;

513

esac

514

# According to Compaq, /usr/sbin/psrinfo has been available on

515

@@ -269,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

516

# A Xn.n version is an unreleased experimental baselevel.

517

# 1.2 uses "1.2" for uname -r.

518

echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

519

- exit ;;

520

+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.

521

+ exitcode=$?

522

+ trap '' 0

523

+ exit $exitcode ;;

524

Alpha\ *:Windows_NT*:*)

525

# How do we know it's Interix rather than the generic POSIX subsystem?

526

# Should we change UNAME_MACHINE based on the output of uname instead

527

@@ -295,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

528

echo s390-ibm-zvmoe

529

exit ;;

530

*:OS400:*:*)

531

- echo powerpc-ibm-os400

532

+ echo powerpc-ibm-os400

533

exit ;;

534

arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)

535

echo arm-acorn-riscix${UNAME_RELEASE}

536

@@ -333,6 +337,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

537

sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)

538

echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

539

exit ;;

101

541

+ echo i386-pc-auroraux${UNAME_RELEASE}

102

542

+ exit ;;

103

543

i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)

104

- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

105

+ eval $set_cc_for_build

106

+ SUN_ARCH="i386"

107

+ # If there is a compiler, see if it is configured for 64-bit objects.

108

+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.

109

+ # This test works for both compilers.

110

+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then

111

+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \

112

+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \

113

+ grep IS_64BIT_ARCH >/dev/null

114

+ then

115

+ SUN_ARCH="x86_64"

116

+ fi

117

+ fi

118

+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

119

exit ;;

120

sun4*:SunOS:6*:*)

121

# According to config.sub, this is the proper way to canonicalize

122

@@ -532,7 +552,7 @@ EOF

544

eval $set_cc_for_build

545

SUN_ARCH="i386"

546

@@ -391,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

547

# MiNT. But MiNT is downward compatible to TOS, so this should

548

# be no problem.

549

atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)

550

- echo m68k-atari-mint${UNAME_RELEASE}

551

+ echo m68k-atari-mint${UNAME_RELEASE}

552

exit ;;

553

atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)

554

echo m68k-atari-mint${UNAME_RELEASE}

555

- exit ;;

556

+ exit ;;

557

*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)

558

- echo m68k-atari-mint${UNAME_RELEASE}

559

+ echo m68k-atari-mint${UNAME_RELEASE}

560

exit ;;

561

milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)

562

- echo m68k-milan-mint${UNAME_RELEASE}

563

- exit ;;

564

+ echo m68k-milan-mint${UNAME_RELEASE}

565

+ exit ;;

566

hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)

567

- echo m68k-hades-mint${UNAME_RELEASE}

568

- exit ;;

569

+ echo m68k-hades-mint${UNAME_RELEASE}

570

+ exit ;;

571

*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)

572

- echo m68k-unknown-mint${UNAME_RELEASE}

573

- exit ;;

574

+ echo m68k-unknown-mint${UNAME_RELEASE}

575

+ exit ;;

576

m68k:machten:*:*)

577

echo m68k-apple-machten${UNAME_RELEASE}

578

exit ;;

579

@@ -477,8 +484,8 @@ EOF

580

echo m88k-motorola-sysv3

581

exit ;;

582

AViiON:dgux:*:*)

583

- # DG/UX returns AViiON for all architectures

584

- UNAME_PROCESSOR=`/usr/bin/uname -p`

585

+ # DG/UX returns AViiON for all architectures

586

+ UNAME_PROCESSOR=`/usr/bin/uname -p`

587

if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]

588

then

589

if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \

590

@@ -491,7 +498,7 @@ EOF

591

else

592

echo i586-dg-dgux${UNAME_RELEASE}

593

594

- exit ;;

595

+ exit ;;

596

M88*:DolphinOS:*:*) # DolphinOS (SVR3)

597

echo m88k-dolphin-sysv3

598

exit ;;

599

@@ -548,7 +555,7 @@ EOF

123

600

echo rs6000-ibm-aix3.2

124

601

125

602

exit ;;

126

- *:AIX:*:[45])

127

+ *:AIX:*:[456])

603

- *:AIX:*:[456])

604

+ *:AIX:*:[4567])

128

605

IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`

129

606

if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then

130

607

IBM_ARCH=rs6000

131

@@ -640,7 +660,7 @@ EOF

132

# => hppa64-hp-hpux11.23

608

@@ -591,52 +598,52 @@ EOF

609

9000/[678][0-9][0-9])

610

if [ -x /usr/bin/getconf ]; then

611

sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`

612

- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`

613

- case "${sc_cpu_version}" in

614

- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0

615

- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1

616

- 532) # CPU_PA_RISC2_0

617

- case "${sc_kernel_bits}" in

618

- 32) HP_ARCH="hppa2.0n" ;;

619

- 64) HP_ARCH="hppa2.0w" ;;

620

+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`

621

+ case "${sc_cpu_version}" in

622

+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0

623

+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1

624

+ 532) # CPU_PA_RISC2_0

625

+ case "${sc_kernel_bits}" in

626

+ 32) HP_ARCH="hppa2.0n" ;;

627

+ 64) HP_ARCH="hppa2.0w" ;;

628

'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20

629

- esac ;;

630

- esac

631

+ esac ;;

632

+ esac

633

634

if [ "${HP_ARCH}" = "" ]; then

635

eval $set_cc_for_build

636

- sed 's/^ //' << EOF >$dummy.c

637

+ sed 's/^ //' << EOF >$dummy.c

638

639

+ #define _HPUX_SOURCE

640

+ #include <stdlib.h>

641

+ #include <unistd.h>

133

642

134

if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |

135

- grep __LP64__ >/dev/null

136

+ grep -q __LP64__

137

then

138

HP_ARCH="hppa2.0w"

139

else

140

@@ -791,18 +811,24 @@ EOF

643

- #define _HPUX_SOURCE

644

- #include <stdlib.h>

645

- #include <unistd.h>

646

647

- int main ()

648

- {

649

- #if defined(_SC_KERNEL_BITS)

650

- long bits = sysconf(_SC_KERNEL_BITS);

651

- #endif

652

- long cpu = sysconf (_SC_CPU_VERSION);

653

654

- switch (cpu)

655

- {

656

- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

657

- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;

658

- case CPU_PA_RISC2_0:

659

- #if defined(_SC_KERNEL_BITS)

660

- switch (bits)

661

- {

662

- case 64: puts ("hppa2.0w"); break;

663

- case 32: puts ("hppa2.0n"); break;

664

- default: puts ("hppa2.0"); break;

665

- } break;

666

- #else /* !defined(_SC_KERNEL_BITS) */

667

- puts ("hppa2.0"); break;

668

- #endif

669

- default: puts ("hppa1.0"); break;

670

- }

671

- exit (0);

672

- }

673

+ int main ()

674

+ {

675

+ #if defined(_SC_KERNEL_BITS)

676

+ long bits = sysconf(_SC_KERNEL_BITS);

677

+ #endif

678

+ long cpu = sysconf (_SC_CPU_VERSION);

679

680

+ switch (cpu)

681

+ {

682

+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

683

+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;

684

+ case CPU_PA_RISC2_0:

685

+ #if defined(_SC_KERNEL_BITS)

686

+ switch (bits)

687

+ {

688

+ case 64: puts ("hppa2.0w"); break;

689

+ case 32: puts ("hppa2.0n"); break;

690

+ default: puts ("hppa2.0"); break;

691

+ } break;

692

+ #else /* !defined(_SC_KERNEL_BITS) */

693

+ puts ("hppa2.0"); break;

694

+ #endif

695

+ default: puts ("hppa1.0"); break;

696

+ }

697

+ exit (0);

698

+ }

699

EOF

700

(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`

701

test -z "$HP_ARCH" && HP_ARCH=hppa

702

@@ -727,22 +734,22 @@ EOF

703

exit ;;

704

C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)

705

echo c1-convex-bsd

706

- exit ;;

707

+ exit ;;

708

C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)

709

if getsysinfo -f scalar_acc

710

then echo c32-convex-bsd

711

else echo c2-convex-bsd

712

713

- exit ;;

714

+ exit ;;

715

C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)

716

echo c34-convex-bsd

717

- exit ;;

718

+ exit ;;

719

C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)

720

echo c38-convex-bsd

721

- exit ;;

722

+ exit ;;

723

C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)

724

echo c4-convex-bsd

725

- exit ;;

726

+ exit ;;

727

CRAY*Y-MP:*:*:*)

728

echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

729

exit ;;

730

@@ -766,14 +773,14 @@ EOF

731

exit ;;

732

F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)

733

FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

734

- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

735

- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`

736

- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

737

- exit ;;

738

+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

739

+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`

740

+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

741

+ exit ;;

742

5000:UNIX_System_V:4.*:*)

743

- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

744

- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`

745

- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

746

+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

747

+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`

748

+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

749

exit ;;

750

i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)

751

echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}

752

@@ -801,18 +808,18 @@ EOF

753

echo ${UNAME_MACHINE}-pc-mingw32

754

exit ;;

755

i*:windows32*:*)

756

- # uname -m includes "-pc" on this system.

757

- echo ${UNAME_MACHINE}-mingw32

758

+ # uname -m includes "-pc" on this system.

759

+ echo ${UNAME_MACHINE}-mingw32

760

exit ;;

141

761

i*:PW*:*)

142

762

echo ${UNAME_MACHINE}-pc-pw32

143

763

exit ;;

144

764

- *:Interix*:[3456]*)

765

- case ${UNAME_MACHINE} in

145

766

+ *:Interix*:*)

146

case ${UNAME_MACHINE} in

767

+ case ${UNAME_MACHINE} in

147

768

x86)

148

769

echo i586-pc-interix${UNAME_RELEASE}

149

770

exit ;;

150

- EM64T | authenticamd)

771

- EM64T | authenticamd | genuineintel)

151

772

+ authenticamd | genuineintel | EM64T)

152

773

echo x86_64-unknown-interix${UNAME_RELEASE}

153

774

exit ;;

154

+ IA64)

155

+ echo ia64-unknown-interix${UNAME_RELEASE}

156

+ exit ;;

157

esac ;;

158

[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)

159

echo i${UNAME_MACHINE}-pc-mks

160

exit ;;

161

+ 8664:Windows_NT:*)

162

+ echo x86_64-pc-mks

163

+ exit ;;

164

i*:Windows_NT*:* | Pentium*:Windows_NT*:*)

165

# How do we know it's Interix rather than the generic POSIX subsystem?

166

# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we

167

@@ -832,8 +858,29 @@ EOF

775

IA64)

776

@@ -854,6 +861,20 @@ EOF

168

777

i*86:Minix:*:*)

169

778

echo ${UNAME_MACHINE}-pc-minix

170

779

exit ;;

177

786

+ EV6) UNAME_MACHINE=alphaev6 ;;

178

787

+ EV67) UNAME_MACHINE=alphaev67 ;;

179

788

+ EV68*) UNAME_MACHINE=alphaev68 ;;

180

+ esac

789

+ esac

181

790

+ objdump --private-headers /bin/sh | grep -q ld.so.1

182

791

+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi

183

792

+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}

184

793

+ exit ;;

185

794

arm*:Linux:*:*)

186

- echo ${UNAME_MACHINE}-unknown-linux-gnu

187

+ eval $set_cc_for_build

188

+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \

189

+ | grep -q __ARM_EABI__

190

+ then

191

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

192

+ else

193

+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi

194

+ fi

795

eval $set_cc_for_build

796

if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \

797

@@ -861,7 +882,13 @@ EOF

798

then

799

echo ${UNAME_MACHINE}-unknown-linux-gnu

800

else

801

- echo ${UNAME_MACHINE}-unknown-linux-gnueabi

802

+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \

803

+ | grep -q __ARM_PCS_VFP

804

+ then

805

+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi

806

+ else

807

+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf

808

+ fi

809

195

810

exit ;;

196

811

avr32*:Linux:*:*)

197

echo ${UNAME_MACHINE}-unknown-linux-gnu

198

@@ -847,6 +894,17 @@ EOF

812

@@ -874,7 +901,18 @@ EOF

813

echo crisv32-axis-linux-gnu

814

exit ;;

199

815

frv:Linux:*:*)

200

echo frv-unknown-linux-gnu

201

exit ;;

816

- echo frv-unknown-linux-gnu

817

+ echo frv-unknown-linux-gnu

818

+ exit ;;

202

819

+ i*86:Linux:*:*)

203

820

+ LIBC=gnu

204

821

+ eval $set_cc_for_build

209

826

+EOF

210

827

+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`

211

828

+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"

212

+ exit ;;

829

exit ;;

213

830

ia64:Linux:*:*)

214

831

echo ${UNAME_MACHINE}-unknown-linux-gnu

215

exit ;;

216

@@ -856,74 +914,33 @@ EOF

217

m68*:Linux:*:*)

218

echo ${UNAME_MACHINE}-unknown-linux-gnu

219

exit ;;

220

- mips:Linux:*:*)

221

+ mips:Linux:*:* | mips64:Linux:*:*)

222

eval $set_cc_for_build

223

sed 's/^ //' << EOF >$dummy.c

224

#undef CPU

225

- #undef mips

226

- #undef mipsel

227

+ #undef ${UNAME_MACHINE}

228

+ #undef ${UNAME_MACHINE}el

229

#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)

230

- CPU=mipsel

231

+ CPU=${UNAME_MACHINE}el

232

#else

233

#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)

234

- CPU=mips

235

+ CPU=${UNAME_MACHINE}

236

#else

237

CPU=

832

@@ -901,39 +939,18 @@ EOF

238

833

#endif

239

834

#endif

240

835

EOF

243

838

- s: ::g

244

839

- p

245

840

- }'`"

246

- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }

247

- ;;

248

- mips64:Linux:*:*)

249

- eval $set_cc_for_build

250

- sed 's/^ //' << EOF >$dummy.c

251

- #undef CPU

252

- #undef mips64

253

- #undef mips64el

254

- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)

255

- CPU=mips64el

256

- #else

257

- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)

258

- CPU=mips64

259

- #else

260

- CPU=

261

- #endif

262

- #endif

263

-EOF

264

- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '

265

- /^CPU/{

266

- s: ::g

267

- p

268

- }'`"

269

841

+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`

270

842

test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }

271

843

;;

277

849

- exit ;;

278

850

- ppc64:Linux:*:*)

279

851

- echo powerpc64-unknown-linux-gnu

280

+ padre:Linux:*:*)

281

+ echo sparc-unknown-linux-gnu

282

exit ;;

852

- exit ;;

283

853

- alpha:Linux:*:*)

284

854

- case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in

285

855

- EV5) UNAME_MACHINE=alphaev5 ;;

290

860

- EV67) UNAME_MACHINE=alphaev67 ;;

291

861

- EV68*) UNAME_MACHINE=alphaev68 ;;

292

862

- esac

293

- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null

863

- objdump --private-headers /bin/sh | grep -q ld.so.1

294

864

- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi

295

865

- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}

866

- exit ;;

867

padre:Linux:*:*)

868

echo sparc-unknown-linux-gnu

869

exit ;;

296

870

+ parisc64:Linux:*:* | hppa64:Linux:*:*)

297

871

+ echo hppa64-unknown-linux-gnu

298

exit ;;

872

+ exit ;;

299

873

parisc:Linux:*:* | hppa:Linux:*:*)

300

874

# Look for CPU level

301

@@ -933,8 +950,11 @@ EOF

875

case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in

876

@@ -942,14 +959,17 @@ EOF

302

877

*) echo hppa-unknown-linux-gnu ;;

303

878

esac

304

879

exit ;;

312

887

exit ;;

313

888

s390:Linux:*:* | s390x:Linux:*:*)

314

889

echo ${UNAME_MACHINE}-ibm-linux

315

@@ -954,72 +974,9 @@ EOF

316

x86_64:Linux:*:*)

890

exit ;;

891

sh64*:Linux:*:*)

892

- echo ${UNAME_MACHINE}-unknown-linux-gnu

893

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

894

exit ;;

895

sh*:Linux:*:*)

896

echo ${UNAME_MACHINE}-unknown-linux-gnu

897

@@ -957,6 +977,9 @@ EOF

898

sparc:Linux:*:* | sparc64:Linux:*:*)

899

echo ${UNAME_MACHINE}-unknown-linux-gnu

900

exit ;;

901

+ tile*:Linux:*:*)

902

+ echo ${UNAME_MACHINE}-tilera-linux-gnu

903

+ exit ;;

904

vax:Linux:*:*)

905

echo ${UNAME_MACHINE}-dec-linux-gnu

906

exit ;;

907

@@ -964,60 +987,8 @@ EOF

317

908

echo x86_64-unknown-linux-gnu

318

909

exit ;;

319

- xtensa:Linux:*:*)

320

- echo xtensa-unknown-linux-gnu

321

+ xtensa*:Linux:*:*)

322

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

910

xtensa*:Linux:*:*)

911

- echo ${UNAME_MACHINE}-unknown-linux-gnu

912

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

323

913

exit ;;

324

914

- i*86:Linux:*:*)

325

915

- # The BFD linker knows what the default object file format is, so

336

926

- elf32-i386)

337

927

- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"

338

928

- ;;

339

- a.out-i386-linux)

340

- echo "${UNAME_MACHINE}-pc-linux-gnuaout"

341

- exit ;;

342

- coff-i386)

343

- echo "${UNAME_MACHINE}-pc-linux-gnucoff"

344

- exit ;;

345

- "")

346

- # Either a pre-BFD a.out linker (linux-gnuoldld) or

347

- # one that does not give us useful --help.

348

- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"

349

- exit ;;

350

929

- esac

351

930

- # Determine whether the default compiler is a.out or elf

352

931

- eval $set_cc_for_build

387

966

i*86:DYNIX/ptx:4*:*)

388

967

# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.

389

968

# earlier versions are messed up and put the nodename in both

390

@@ -1048,7 +1005,7 @@ EOF

391

i*86:syllable:*:*)

392

echo ${UNAME_MACHINE}-pc-syllable

393

exit ;;

394

- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)

395

+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)

396

echo i386-unknown-lynxos${UNAME_RELEASE}

397

exit ;;

398

i*86:*DOS:*:*)

399

@@ -1092,8 +1049,11 @@ EOF

969

@@ -1025,11 +996,11 @@ EOF

970

echo i386-sequent-sysv4

971

exit ;;

972

i*86:UNIX_SV:4.2MP:2.*)

973

- # Unixware is an offshoot of SVR4, but it has its own version

974

- # number series starting with 2...

975

- # I am not positive that other SVR4 systems won't match this,

976

+ # Unixware is an offshoot of SVR4, but it has its own version

977

+ # number series starting with 2...

978

+ # I am not positive that other SVR4 systems won't match this,

979

# I just have to hope. -- rms.

980

- # Use sysv4.2uw... so that sysv4* matches it.

981

+ # Use sysv4.2uw... so that sysv4* matches it.

982

echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}

983

exit ;;

984

i*86:OS/2:*:*)

985

@@ -1061,7 +1032,7 @@ EOF

986

987

exit ;;

988

i*86:*:5:[678]*)

989

- # UnixWare 7.x, OpenUNIX and OpenServer 6.

990

+ # UnixWare 7.x, OpenUNIX and OpenServer 6.

991

case `/bin/uname -X | grep "^Machine"` in

992

*486*) UNAME_MACHINE=i486 ;;

993

*Pentium) UNAME_MACHINE=i586 ;;

994

@@ -1089,13 +1060,13 @@ EOF

995

exit ;;

400

996

pc:*:*:*)

401

997

# Left here for compatibility:

402

# uname -m prints for DJGPP always 'pc', but it prints nothing about

403

- # the processor, so we play safe by assuming i386.

404

- echo i386-pc-msdosdjgpp

405

+ # the processor, so we play safe by assuming i586.

406

+ # Note: whatever this is, it MUST be the same as what config.sub

407

+ # prints for the "djgpp" host, or else GDB configury will decide that

408

+ # this is a cross-build.

409

+ echo i586-pc-msdosdjgpp

410

exit ;;

998

- # uname -m prints for DJGPP always 'pc', but it prints nothing about

999

- # the processor, so we play safe by assuming i586.

1000

+ # uname -m prints for DJGPP always 'pc', but it prints nothing about

1001

+ # the processor, so we play safe by assuming i586.

1002

# Note: whatever this is, it MUST be the same as what config.sub

1003

# prints for the "djgpp" host, or else GDB configury will decide that

1004

# this is a cross-build.

1005

echo i586-pc-msdosdjgpp

1006

- exit ;;

1007

+ exit ;;

411

1008

Intel:Mach:3*:*)

412

1009

echo i386-pc-mach3

413

@@ -1131,6 +1091,16 @@ EOF

1010

exit ;;

1011

@@ -1130,8 +1101,8 @@ EOF

1012

/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \

1013

&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;

414

1014

3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)

415

/bin/uname -p 2>/dev/null | grep 86 >/dev/null \

416

&& { echo i486-ncr-sysv4; exit; } ;;

417

+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)

418

+ OS_REL='.3'

419

+ test -r /etc/.relid \

420

+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`

1015

- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \

1016

- && { echo i486-ncr-sysv4; exit; } ;;

421

1017

+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \

422

+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }

423

+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \

424

+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }

425

+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \

426

+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;

427

m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)

428

echo m68k-unknown-lynxos${UNAME_RELEASE}

429

exit ;;

430

@@ -1143,7 +1113,7 @@ EOF

431

rs6000:LynxOS:2.*:*)

432

echo rs6000-unknown-lynxos${UNAME_RELEASE}

433

exit ;;

434

- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)

435

+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)

436

echo powerpc-unknown-lynxos${UNAME_RELEASE}

437

exit ;;

438

SM[BE]S:UNIX_SV:*:*)

439

@@ -1206,6 +1176,9 @@ EOF

440

BePC:BeOS:*:*) # BeOS running on Intel PC compatible.

441

echo i586-pc-beos

442

exit ;;

443

+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.

444

+ echo i586-pc-haiku

445

+ exit ;;

446

SX-4:SUPER-UX:*:*)

447

echo sx4-nec-superux${UNAME_RELEASE}

448

exit ;;

449

@@ -1233,6 +1206,16 @@ EOF

1018

+ && { echo i486-ncr-sysv4; exit; } ;;

1019

NCR*:*:4.2:* | MPRAS*:*:4.2:*)

1020

OS_REL='.3'

1021

test -r /etc/.relid \

1022

@@ -1174,10 +1145,10 @@ EOF

1023

echo ns32k-sni-sysv

1024

1025

exit ;;

1026

- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort

1027

- # says <Richard.M.Bartel@ccMail.Census.GOV>

1028

- echo i586-unisys-sysv4

1029

- exit ;;

1030

+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort

1031

+ # says <Richard.M.Bartel@ccMail.Census.GOV>

1032

+ echo i586-unisys-sysv4

1033

+ exit ;;

1034

*:UNIX_System_V:4*:FTX*)

1035

# From Gerald Hewes <hewes@openmarket.com>.

1036

# How about differentiating between stratus architectures? -djm

1037

@@ -1203,11 +1174,11 @@ EOF

1038

exit ;;

1039

R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)

1040

if [ -d /usr/nec ]; then

1041

- echo mips-nec-sysv${UNAME_RELEASE}

1042

+ echo mips-nec-sysv${UNAME_RELEASE}

1043

else

1044

- echo mips-unknown-sysv${UNAME_RELEASE}

1045

+ echo mips-unknown-sysv${UNAME_RELEASE}

1046

1047

- exit ;;

1048

+ exit ;;

1049

BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.

1050

echo powerpc-be-beos

1051

exit ;;

1052

@@ -1247,6 +1218,16 @@ EOF

450

1053

*:Darwin:*:*)

451

1054

UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown

452

1055

case $UNAME_PROCESSOR in

463

1066

unknown) UNAME_PROCESSOR=powerpc ;;

464

1067

esac

465

1068

echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

466

@@ -1314,6 +1297,9 @@ EOF

467

i*86:rdos:*:*)

468

echo ${UNAME_MACHINE}-pc-rdos

1069

@@ -1262,6 +1243,9 @@ EOF

1070

*:QNX:*:4*)

1071

echo i386-pc-qnx

469

1072

exit ;;

470

+ i*86:AROS:*:*)

471

+ echo ${UNAME_MACHINE}-pc-aros

1073

+ NEO-?:NONSTOP_KERNEL:*:*)

1074

+ echo neo-tandem-nsk${UNAME_RELEASE}

472

1075

+ exit ;;

473

esac

474

475

#echo '(No uname command or uname output not recognized.)' 1>&2

476

@@ -1474,9 +1460,9 @@ This script, last modified $timestamp, h

477

the operating system you are using. It is advised that you

478

download the most up to date version of the config scripts from

479

480

- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess

481

+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD

482

and

483

- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

484

+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

485

486

If the version you run ($0) is already up to date, please

487

send the following data and any information you think might be

488

--- protobuf-2.3.0.orig/ltmain.sh

489

+++ protobuf-2.3.0/ltmain.sh

490

@@ -1,6 +1,6 @@

491

# Generated from ltmain.m4sh.

492

493

-# ltmain.sh (GNU libtool) 2.2.4

494

+# ltmain.sh (GNU libtool) 2.2.6b

495

# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

496

497

498

@@ -65,7 +65,7 @@

499

# compiler: $LTCC

500

# compiler flags: $LTCFLAGS

501

# linker: $LD (gnu? $with_gnu_ld)

502

-# $progname: (GNU libtool) 2.2.4

503

+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1

504

# automake: $automake_version

505

# autoconf: $autoconf_version

506

507

@@ -73,9 +73,9 @@

508

509

PROGRAM=ltmain.sh

510

PACKAGE=libtool

511

-VERSION=2.2.4

512

+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"

513

TIMESTAMP=""

514

-package_revision=1.2976

515

+package_revision=1.3017

516

517

# Be Bourne compatible

518

if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

519

@@ -116,15 +116,15 @@ $lt_unset CDPATH

520

521

: ${CP="cp -f"}

522

: ${ECHO="echo"}

523

-: ${EGREP="/usr/bin/grep -E"}

524

-: ${FGREP="/usr/bin/grep -F"}

525

-: ${GREP="/usr/bin/grep"}

526

+: ${EGREP="/bin/grep -E"}

527

+: ${FGREP="/bin/grep -F"}

528

+: ${GREP="/bin/grep"}

529

: ${LN_S="ln -s"}

530

: ${MAKE="make"}

531

: ${MKDIR="mkdir"}

532

: ${MV="mv -f"}

533

: ${RM="rm -f"}

534

-: ${SED="/opt/local/bin/gsed"}

535

+: ${SED="/bin/sed"}

536

: ${SHELL="${CONFIG_SHELL-/bin/sh}"}

537

: ${Xsed="$SED -e 1s/^X//"}

538

539

@@ -805,7 +805,7 @@ func_enable_tag ()

540

541

542

case $host in

543

- *cygwin* | *mingw* | *pw32*)

544

+ *cygwin* | *mingw* | *pw32* | *cegcc*)

545

# don't eliminate duplications in $postdeps and $predeps

546

opt_duplicate_compiler_generated_deps=:

547

;;

548

@@ -893,8 +893,9 @@ $opt_help || {

549

# determined imposters.

550

func_lalib_p ()

551

{

552

- $SED -e 4q "$1" 2>/dev/null \

553

- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1

554

+ test -f "$1" &&

555

+ $SED -e 4q "$1" 2>/dev/null \

556

+ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1

557

}

558

559

# func_lalib_unsafe_p file

560

@@ -907,7 +908,7 @@ func_lalib_p ()

561

func_lalib_unsafe_p ()

562

{

563

lalib_p=no

564

- if test -r "$1" && exec 5<&0 <"$1"; then

565

+ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then

566

for lalib_p_l in 1 2 3 4

567

568

read lalib_p_line

569

@@ -1275,7 +1276,7 @@ func_mode_compile ()

570

571

# On Cygwin there's no "real" PIC flag so we must build both object types

572

case $host_os in

573

- cygwin* | mingw* | pw32* | os2*)

574

+ cygwin* | mingw* | pw32* | os2* | cegcc*)

575

pic_mode=default

576

;;

577

esac

578

@@ -2046,7 +2047,7 @@ func_mode_install ()

579

'exit $?'

580

tstripme="$stripme"

581

case $host_os in

582

- cygwin* | mingw* | pw32*)

583

+ cygwin* | mingw* | pw32* | cegcc*)

584

case $realname in

585

*.dll.a)

586

tstripme=""

587

@@ -2152,7 +2153,7 @@ func_mode_install ()

588

589

# Do a test to see if this is really a libtool program.

590

case $host in

591

- *cygwin*|*mingw*)

592

+ *cygwin* | *mingw*)

593

if func_ltwrapper_executable_p "$file"; then

594

func_ltwrapper_scriptname "$file"

595

wrapper=$func_ltwrapper_scriptname_result

596

@@ -2358,7 +2359,7 @@ extern \"C\" {

597

$RM $export_symbols

598

eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'

599

case $host in

600

- *cygwin* | *mingw* )

601

+ *cygwin* | *mingw* | *cegcc* )

602

eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'

603

eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'

604

;;

605

@@ -2370,7 +2371,7 @@ extern \"C\" {

606

eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'

607

eval '$MV "$nlist"T "$nlist"'

608

case $host in

609

- *cygwin | *mingw* )

610

+ *cygwin | *mingw* | *cegcc* )

611

eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'

612

eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'

613

;;

614

@@ -2426,7 +2427,7 @@ typedef struct {

615

} lt_dlsymlist;

616

617

case $host in

618

- *cygwin* | *mingw* )

619

+ *cygwin* | *mingw* | *cegcc* )

620

$ECHO >> "$output_objdir/$my_dlsyms" "\

621

/* DATA imports from DLLs on WIN32 con't be const, because

622

runtime relocations are performed -- see ld's documentation

623

@@ -2512,7 +2513,7 @@ static const void *lt_preloaded_setup()

624

# Transform the symbol file into the correct name.

625

symfileobj="$output_objdir/${my_outputname}S.$objext"

626

case $host in

627

- *cygwin* | *mingw* )

628

+ *cygwin* | *mingw* | *cegcc* )

629

if test -f "$output_objdir/$my_outputname.def"; then

630

compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

631

finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

632

@@ -2691,25 +2692,16 @@ func_extract_archives ()

633

634

635

636

-# func_emit_wrapper arg

637

+# func_emit_wrapper_part1 [arg=no]

638

639

-# emit a libtool wrapper script on stdout

640

-# don't directly open a file because we may want to

641

-# incorporate the script contents within a cygwin/mingw

642

-# wrapper executable. Must ONLY be called from within

643

-# func_mode_link because it depends on a number of variable

644

-# set therein.

645

646

-# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR

647

-# variable will take. If 'yes', then the emitted script

648

-# will assume that the directory in which it is stored is

649

-# the '.lib' directory. This is a cygwin/mingw-specific

650

-# behavior.

651

-func_emit_wrapper ()

652

+# Emit the first part of a libtool wrapper script on stdout.

653

+# For more information, see the description associated with

654

+# func_emit_wrapper(), below.

655

+func_emit_wrapper_part1 ()

656

{

657

- func_emit_wrapper_arg1=no

658

+ func_emit_wrapper_part1_arg1=no

659

if test -n "$1" ; then

660

- func_emit_wrapper_arg1=$1

661

+ func_emit_wrapper_part1_arg1=$1

662

663

664

$ECHO "\

665

@@ -2794,10 +2786,27 @@ else

666

file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`

667

file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`

668

done

669

670

671

+# end: func_emit_wrapper_part1

672

673

+# func_emit_wrapper_part2 [arg=no]

674

675

+# Emit the second part of a libtool wrapper script on stdout.

676

+# For more information, see the description associated with

677

+# func_emit_wrapper(), below.

678

+func_emit_wrapper_part2 ()

679

680

+ func_emit_wrapper_part2_arg1=no

681

+ if test -n "$1" ; then

682

+ func_emit_wrapper_part2_arg1=$1

683

+ fi

684

685

+ $ECHO "\

686

687

# Usually 'no', except on cygwin/mingw when embedded into

688

# the cwrapper.

689

- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1

690

+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1

691

if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then

692

# special case for '.'

693

if test \"\$thisdir\" = \".\"; then

694

@@ -2888,7 +2897,7 @@ else

695

696

case $host in

697

# Backslashes separate directories on plain windows

698

- *-*-mingw | *-*-os2*)

699

+ *-*-mingw | *-*-os2* | *-cegcc*)

700

$ECHO "\

701

exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}

702

703

@@ -2914,7 +2923,207 @@ else

704

fi\

705

706

}

707

-# end: func_emit_wrapper

708

+# end: func_emit_wrapper_part2

709

710

711

+# func_emit_wrapper [arg=no]

712

713

+# Emit a libtool wrapper script on stdout.

714

+# Don't directly open a file because we may want to

715

+# incorporate the script contents within a cygwin/mingw

716

+# wrapper executable. Must ONLY be called from within

717

+# func_mode_link because it depends on a number of variables

718

+# set therein.

719

720

+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR

721

+# variable will take. If 'yes', then the emitted script

722

+# will assume that the directory in which it is stored is

723

+# the $objdir directory. This is a cygwin/mingw-specific

724

+# behavior.

725

+func_emit_wrapper ()

726

727

+ func_emit_wrapper_arg1=no

728

+ if test -n "$1" ; then

729

+ func_emit_wrapper_arg1=$1

730

+ fi

731

732

+ # split this up so that func_emit_cwrapperexe_src

733

+ # can call each part independently.

734

+ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"

735

+ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"

736

737

738

739

+# func_to_host_path arg

740

741

+# Convert paths to host format when used with build tools.

742

+# Intended for use with "native" mingw (where libtool itself

743

+# is running under the msys shell), or in the following cross-

744

+# build environments:

745

+# $build $host

746

+# mingw (msys) mingw [e.g. native]

747

+# cygwin mingw

748

+# *nix + wine mingw

749

+# where wine is equipped with the `winepath' executable.

750

+# In the native mingw case, the (msys) shell automatically

751

+# converts paths for any non-msys applications it launches,

752

+# but that facility isn't available from inside the cwrapper.

753

+# Similar accommodations are necessary for $host mingw and

754

+# $build cygwin. Calling this function does no harm for other

755

+# $host/$build combinations not listed above.

756

757

+# ARG is the path (on $build) that should be converted to

758

+# the proper representation for $host. The result is stored

759

+# in $func_to_host_path_result.

760

+func_to_host_path ()

761

762

+ func_to_host_path_result="$1"

763

+ if test -n "$1" ; then

764

+ case $host in

765

+ *mingw* )

766

+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'

767

+ case $build in

768

+ *mingw* ) # actually, msys

769

+ # awkward: cmd appends spaces to result

770

+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"

771

+ func_to_host_path_tmp1=`( cmd //c echo "$1" |\

772

+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`

773

+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

774

+ $SED -e "$lt_sed_naive_backslashify"`

775

+ ;;

776

+ *cygwin* )

777

+ func_to_host_path_tmp1=`cygpath -w "$1"`

778

+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

779

+ $SED -e "$lt_sed_naive_backslashify"`

780

+ ;;

781

+ * )

782

+ # Unfortunately, winepath does not exit with a non-zero

783

+ # error code, so we are forced to check the contents of

784

+ # stdout. On the other hand, if the command is not

785

+ # found, the shell will set an exit code of 127 and print

786

+ # *an error message* to stdout. So we must check for both

787

+ # error code of zero AND non-empty stdout, which explains

788

+ # the odd construction:

789

+ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`

790

+ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then

791

+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

792

+ $SED -e "$lt_sed_naive_backslashify"`

793

+ else

794

+ # Allow warning below.

795

+ func_to_host_path_result=""

796

+ fi

797

+ ;;

798

+ esac

799

+ if test -z "$func_to_host_path_result" ; then

800

+ func_error "Could not determine host path corresponding to"

801

+ func_error " '$1'"

802

+ func_error "Continuing, but uninstalled executables may not work."

803

+ # Fallback:

804

+ func_to_host_path_result="$1"

805

+ fi

806

+ ;;

807

+ esac

808

+ fi

809

810

+# end: func_to_host_path

811

812

+# func_to_host_pathlist arg

813

814

+# Convert pathlists to host format when used with build tools.

815

+# See func_to_host_path(), above. This function supports the

816

+# following $build/$host combinations (but does no harm for

817

+# combinations not listed here):

818

+# $build $host

819

+# mingw (msys) mingw [e.g. native]

820

+# cygwin mingw

821

+# *nix + wine mingw

822

823

+# Path separators are also converted from $build format to

824

+# $host format. If ARG begins or ends with a path separator

825

+# character, it is preserved (but converted to $host format)

826

+# on output.

827

828

+# ARG is a pathlist (on $build) that should be converted to

829

+# the proper representation on $host. The result is stored

830

+# in $func_to_host_pathlist_result.

831

+func_to_host_pathlist ()

832

833

+ func_to_host_pathlist_result="$1"

834

+ if test -n "$1" ; then

835

+ case $host in

836

+ *mingw* )

837

+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'

838

+ # Remove leading and trailing path separator characters from

839

+ # ARG. msys behavior is inconsistent here, cygpath turns them

840

+ # into '.;' and ';.', and winepath ignores them completely.

841

+ func_to_host_pathlist_tmp2="$1"

842

+ # Once set for this call, this variable should not be

843

+ # reassigned. It is used in tha fallback case.

844

+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\

845

+ $SED -e 's|^:*||' -e 's|:*$||'`

846

+ case $build in

847

+ *mingw* ) # Actually, msys.

848

+ # Awkward: cmd appends spaces to result.

849

+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"

850

+ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\

851

+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`

852

+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\

853

+ $SED -e "$lt_sed_naive_backslashify"`

854

+ ;;

855

+ *cygwin* )

856

+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`

857

+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\

858

+ $SED -e "$lt_sed_naive_backslashify"`

859

+ ;;

860

+ * )

861

+ # unfortunately, winepath doesn't convert pathlists

862

+ func_to_host_pathlist_result=""

863

+ func_to_host_pathlist_oldIFS=$IFS

864

+ IFS=:

865

+ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do

866

+ IFS=$func_to_host_pathlist_oldIFS

867

+ if test -n "$func_to_host_pathlist_f" ; then

868

+ func_to_host_path "$func_to_host_pathlist_f"

869

+ if test -n "$func_to_host_path_result" ; then

870

+ if test -z "$func_to_host_pathlist_result" ; then

871

+ func_to_host_pathlist_result="$func_to_host_path_result"

872

+ else

873

+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"

874

+ fi

875

+ fi

876

+ fi

877

+ IFS=:

878

+ done

879

+ IFS=$func_to_host_pathlist_oldIFS

880

+ ;;

881

+ esac

882

+ if test -z "$func_to_host_pathlist_result" ; then

883

+ func_error "Could not determine the host path(s) corresponding to"

884

+ func_error " '$1'"

885

+ func_error "Continuing, but uninstalled executables may not work."

886

+ # Fallback. This may break if $1 contains DOS-style drive

887

+ # specifications. The fix is not to complicate the expression

888

+ # below, but for the user to provide a working wine installation

889

+ # with winepath so that path translation in the cross-to-mingw

890

+ # case works properly.

891

+ lt_replace_pathsep_nix_to_dos="s|:|;|g"

892

+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\

893

+ $SED -e "$lt_replace_pathsep_nix_to_dos"`

894

+ fi

895

+ # Now, add the leading and trailing path separators back

896

+ case "$1" in

897

+ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"

898

+ ;;

899

+ esac

900

+ case "$1" in

901

+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"

902

+ ;;

903

+ esac

904

+ ;;

905

+ esac

906

+ fi

907

908

+# end: func_to_host_pathlist

909

910

# func_emit_cwrapperexe_src

911

# emit the source code for a wrapper executable on stdout

912

@@ -2951,6 +3160,12 @@ EOF

913

# include <stdint.h>

914

# ifdef __CYGWIN__

915

# include <io.h>

916

+# define HAVE_SETENV

917

+# ifdef __STRICT_ANSI__

918

+char *realpath (const char *, char *);

919

+int putenv (char *);

920

+int setenv (const char *, const char *, int);

921

+# endif

922

# endif

923

#endif

924

#include <malloc.h>

925

@@ -3057,29 +3272,105 @@ int make_executable (const char *path);

926

int check_executable (const char *path);

927

char *strendzap (char *str, const char *pat);

928

void lt_fatal (const char *message, ...);

929

+void lt_setenv (const char *name, const char *value);

930

+char *lt_extend_str (const char *orig_value, const char *add, int to_end);

931

+void lt_opt_process_env_set (const char *arg);

932

+void lt_opt_process_env_prepend (const char *arg);

933

+void lt_opt_process_env_append (const char *arg);

934

+int lt_split_name_value (const char *arg, char** name, char** value);

935

+void lt_update_exe_path (const char *name, const char *value);

936

+void lt_update_lib_path (const char *name, const char *value);

937

938

-static const char *script_text =

939

+static const char *script_text_part1 =

940

EOF

941

942

- func_emit_wrapper yes |

943

+ func_emit_wrapper_part1 yes |

944

+ $SED -e 's/$[\\"]$/\\\1/g' \

945

+ -e 's/^/ "/' -e 's/$/\\n"/'

946

+ echo ";"

947

+ cat <<EOF

948

949

+static const char *script_text_part2 =

950

+EOF

951

+ func_emit_wrapper_part2 yes |

952

$SED -e 's/$[\\"]$/\\\1/g' \

953

-e 's/^/ "/' -e 's/$/\\n"/'

954

echo ";"

955

956

cat <<EOF

957

const char * MAGIC_EXE = "$magic_exe";

958

+const char * LIB_PATH_VARNAME = "$shlibpath_var";

959

+EOF

960

961

+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then

962

+ func_to_host_pathlist "$temp_rpath"

963

+ cat <<EOF

964

+const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";

965

+EOF

966

+ else

967

+ cat <<"EOF"

968

+const char * LIB_PATH_VALUE = "";

969

+EOF

970

+ fi

971

972

+ if test -n "$dllsearchpath"; then

973

+ func_to_host_pathlist "$dllsearchpath:"

974

+ cat <<EOF

975

+const char * EXE_PATH_VARNAME = "PATH";

976

+const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";

977

+EOF

978

+ else

979

+ cat <<"EOF"

980

+const char * EXE_PATH_VARNAME = "";

981

+const char * EXE_PATH_VALUE = "";

982

+EOF

983

+ fi

984

985

+ if test "$fast_install" = yes; then

986

+ cat <<EOF

987

+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */

988

+EOF

989

+ else

990

+ cat <<EOF

991

+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */

992

+EOF

993

+ fi

994

995

996

+ cat <<"EOF"

997

998

+#define LTWRAPPER_OPTION_PREFIX "--lt-"

999

+#define LTWRAPPER_OPTION_PREFIX_LENGTH 5

1000

1001

+static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;

1002

+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;

1003

1004

+static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";

1005

1006

+static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;

1007

+static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";

1008

+ /* argument is putenv-style "foo=bar", value of foo is set to bar */

1009

1010

+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;

1011

+static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";

1012

+ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */

1013

1014

+static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;

1015

+static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";

1016

+ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */

1017

1018

int

1019

main (int argc, char *argv[])

1020

{

1021

char **newargz;

1022

+ int newargc;

1023

char *tmp_pathspec;

1024

char *actual_cwrapper_path;

1025

- char *shwrapper_name;

1026

+ char *actual_cwrapper_name;

1027

+ char *target_name;

1028

+ char *lt_argv_zero;

1029

intptr_t rval = 127;

1030

- FILE *shwrapper;

1031

1032

- const char *dumpscript_opt = "--lt-dump-script";

1033

int i;

1034

1035

program_name = (char *) xstrdup (base_name (argv[0]));

1036

@@ -3099,38 +3390,14 @@ EOF

1037

;;

1038

esac

1039

1040

- cat <<EOF

1041

- printf ("%s", script_text);

1042

+ cat <<"EOF"

1043

+ printf ("%s", script_text_part1);

1044

+ printf ("%s", script_text_part2);

1045

return 0;

1046

}

1047

}

1048

1049

- newargz = XMALLOC (char *, argc + 2);

1050

-EOF

1051

1052

- if test -n "$TARGETSHELL" ; then

1053

- # no path translation at all

1054

- lt_newargv0=$TARGETSHELL

1055

- else

1056

- case "$host" in

1057

- *mingw* )

1058

- # awkward: cmd appends spaces to result

1059

- lt_sed_strip_trailing_spaces="s/[ ]*\$//"

1060

- lt_newargv0=`( cmd //c echo $SHELL | $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo $SHELL`

1061

- case $lt_newargv0 in

1062

- *.exe | *.EXE) ;;

1063

- *) lt_newargv0=$lt_newargv0.exe ;;

1064

- esac

1065

- ;;

1066

- * ) lt_newargv0=$SHELL ;;

1067

- esac

1068

- fi

1069

1070

- cat <<EOF

1071

- newargz[0] = (char *) xstrdup ("$lt_newargv0");

1072

-EOF

1073

1074

- cat <<"EOF"

1075

+ newargz = XMALLOC (char *, argc + 1);

1076

tmp_pathspec = find_executable (argv[0]);

1077

if (tmp_pathspec == NULL)

1078

lt_fatal ("Couldn't find %s", argv[0]);

1079

@@ -3142,39 +3409,60 @@ EOF

1080

actual_cwrapper_path));

1081

XFREE (tmp_pathspec);

1082

1083

- shwrapper_name = (char *) xstrdup (base_name (actual_cwrapper_path));

1084

- strendzap (actual_cwrapper_path, shwrapper_name);

1085

+ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));

1086

+ strendzap (actual_cwrapper_path, actual_cwrapper_name);

1087

1088

- /* shwrapper_name transforms */

1089

- strendzap (shwrapper_name, ".exe");

1090

- tmp_pathspec = XMALLOC (char, (strlen (shwrapper_name) +

1091

- strlen ("_ltshwrapperTMP") + 1));

1092

- strcpy (tmp_pathspec, shwrapper_name);

1093

- strcat (tmp_pathspec, "_ltshwrapperTMP");

1094

- XFREE (shwrapper_name);

1095

- shwrapper_name = tmp_pathspec;

1096

+ /* wrapper name transforms */

1097

+ strendzap (actual_cwrapper_name, ".exe");

1098

+ tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);

1099

+ XFREE (actual_cwrapper_name);

1100

+ actual_cwrapper_name = tmp_pathspec;

1101

tmp_pathspec = 0;

1102

- LTWRAPPER_DEBUGPRINTF (("(main) libtool shell wrapper name: %s\n",

1103

- shwrapper_name));

1104

1105

+ /* target_name transforms -- use actual target program name; might have lt- prefix */

1106

+ target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));

1107

+ strendzap (target_name, ".exe");

1108

+ tmp_pathspec = lt_extend_str (target_name, ".exe", 1);

1109

+ XFREE (target_name);

1110

+ target_name = tmp_pathspec;

1111

+ tmp_pathspec = 0;

1112

1113

+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",

1114

+ target_name));

1115

EOF

1116

1117

cat <<EOF

1118

- newargz[1] =

1119

+ newargz[0] =

1120

XMALLOC (char, (strlen (actual_cwrapper_path) +

1121

- strlen ("$objdir") + 1 + strlen (shwrapper_name) + 1));

1122

- strcpy (newargz[1], actual_cwrapper_path);

1123

- strcat (newargz[1], "$objdir");

1124

- strcat (newargz[1], "/");

1125

- strcat (newargz[1], shwrapper_name);

1126

+ strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));

1127

+ strcpy (newargz[0], actual_cwrapper_path);

1128

+ strcat (newargz[0], "$objdir");

1129

+ strcat (newargz[0], "/");

1130

EOF

1131

1132

+ cat <<"EOF"

1133

+ /* stop here, and copy so we don't have to do this twice */

1134

+ tmp_pathspec = xstrdup (newargz[0]);

1135

1136

+ /* do NOT want the lt- prefix here, so use actual_cwrapper_name */

1137

+ strcat (newargz[0], actual_cwrapper_name);

1138

1139

+ /* DO want the lt- prefix here if it exists, so use target_name */

1140

+ lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);

1141

+ XFREE (tmp_pathspec);

1142

+ tmp_pathspec = NULL;

1143

+EOF

1144

1145

case $host_os in

1146

mingw*)

1147

cat <<"EOF"

1148

{

1149

char* p;

1150

- while ((p = strchr (newargz[1], '\\')) != NULL)

1151

+ while ((p = strchr (newargz[0], '\\')) != NULL)

1152

+ {

1153

+ *p = '/';

1154

+ }

1155

+ while ((p = strchr (lt_argv_zero, '\\')) != NULL)

1156

{

1157

*p = '/';

1158

}

1159

@@ -3184,55 +3472,114 @@ EOF

1160

esac

1161

1162

cat <<"EOF"

1163

- XFREE (shwrapper_name);

1164

+ XFREE (target_name);

1165

XFREE (actual_cwrapper_path);

1166

+ XFREE (actual_cwrapper_name);

1167

1168

- /* always write in binary mode */

1169

- if ((shwrapper = fopen (newargz[1], FOPEN_WB)) == 0)

1170

- {

1171

- lt_fatal ("Could not open %s for writing", newargz[1]);

1172

- }

1173

- fprintf (shwrapper, "%s", script_text);

1174

- fclose (shwrapper);

1175

1176

- make_executable (newargz[1]);

1177

+ lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */

1178

+ lt_setenv ("DUALCASE", "1"); /* for MSK sh */

1179

+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);

1180

+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);

1181

1182

+ newargc=0;

1183

for (i = 1; i < argc; i++)

1184

- newargz[i + 1] = xstrdup (argv[i]);

1185

- newargz[argc + 1] = NULL;

1186

+ {

1187

+ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)

1188

+ {

1189

+ if (argv[i][env_set_opt_len] == '=')

1190

+ {

1191

+ const char *p = argv[i] + env_set_opt_len + 1;

1192

+ lt_opt_process_env_set (p);

1193

+ }

1194

+ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)

1195

+ {

1196

+ lt_opt_process_env_set (argv[++i]); /* don't copy */

1197

+ }

1198

+ else

1199

+ lt_fatal ("%s missing required argument", env_set_opt);

1200

+ continue;

1201

+ }

1202

+ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)

1203

+ {

1204

+ if (argv[i][env_prepend_opt_len] == '=')

1205

+ {

1206

+ const char *p = argv[i] + env_prepend_opt_len + 1;

1207

+ lt_opt_process_env_prepend (p);

1208

+ }

1209

+ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)

1210

+ {

1211

+ lt_opt_process_env_prepend (argv[++i]); /* don't copy */

1212

+ }

1213

+ else

1214

+ lt_fatal ("%s missing required argument", env_prepend_opt);

1215

+ continue;

1216

+ }

1217

+ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)

1218

+ {

1219

+ if (argv[i][env_append_opt_len] == '=')

1220

+ {

1221

+ const char *p = argv[i] + env_append_opt_len + 1;

1222

+ lt_opt_process_env_append (p);

1223

+ }

1224

+ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)

1225

+ {

1226

+ lt_opt_process_env_append (argv[++i]); /* don't copy */

1227

+ }

1228

+ else

1229

+ lt_fatal ("%s missing required argument", env_append_opt);

1230

+ continue;

1231

+ }

1232

+ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)

1233

+ {

1234

+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX

1235

+ namespace, but it is not one of the ones we know about and

1236

+ have already dealt with, above (inluding dump-script), then

1237

+ report an error. Otherwise, targets might begin to believe

1238

+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX

1239

+ namespace. The first time any user complains about this, we'll

1240

+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option

1241

+ or a configure.ac-settable value.

1242

+ */

1243

+ lt_fatal ("Unrecognized option in %s namespace: '%s'",

1244

+ ltwrapper_option_prefix, argv[i]);

1245

+ }

1246

+ /* otherwise ... */

1247

+ newargz[++newargc] = xstrdup (argv[i]);

1248

+ }

1249

+ newargz[++newargc] = NULL;

1250

1251

- for (i = 0; i < argc + 1; i++)

1252

+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));

1253

+ for (i = 0; i < newargc; i++)

1254

{

1255

- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, newargz[i]));

1256

+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));

1257

}

1258

1259

EOF

1260

1261

case $host_os in

1262

mingw*)

1263

- cat <<EOF

1264

+ cat <<"EOF"

1265

/* execv doesn't actually work on mingw as expected on unix */

1266

- rval = _spawnv (_P_WAIT, "$lt_newargv0", (const char * const *) newargz);

1267

+ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);

1268

if (rval == -1)

1269

{

1270

/* failed to start process */

1271

- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"$lt_newargv0\": errno = %d\n", errno));

1272

+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));

1273

return 127;

1274

}

1275

return rval;

1276

1277

EOF

1278

;;

1279

1280

- cat <<EOF

1281

- execv ("$lt_newargv0", newargz);

1282

+ cat <<"EOF"

1283

+ execv (lt_argv_zero, newargz);

1284

return rval; /* =127, but avoids unused variable warning */

1285

1286

EOF

1287

;;

1288

esac

1289

1290

cat <<"EOF"

1291

1292

1293

void *

1294

xmalloc (size_t num)

1295

@@ -3506,6 +3853,177 @@ lt_fatal (const char *message, ...)

1296

lt_error_core (EXIT_FAILURE, "FATAL", message, ap);

1297

va_end (ap);

1298

}

1299

1300

+void

1301

+lt_setenv (const char *name, const char *value)

1302

1303

+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",

1304

+ (name ? name : "<NULL>"),

1305

+ (value ? value : "<NULL>")));

1306

+ {

1307

+#ifdef HAVE_SETENV

1308

+ /* always make a copy, for consistency with !HAVE_SETENV */

1309

+ char *str = xstrdup (value);

1310

+ setenv (name, str, 1);

1311

+#else

1312

+ int len = strlen (name) + 1 + strlen (value) + 1;

1313

+ char *str = XMALLOC (char, len);

1314

+ sprintf (str, "%s=%s", name, value);

1315

+ if (putenv (str) != EXIT_SUCCESS)

1316

+ {

1317

+ XFREE (str);

1318

+ }

1319

+#endif

1320

+ }

1321

1322

1323

+char *

1324

+lt_extend_str (const char *orig_value, const char *add, int to_end)

1325

1326

+ char *new_value;

1327

+ if (orig_value && *orig_value)

1328

+ {

1329

+ int orig_value_len = strlen (orig_value);

1330

+ int add_len = strlen (add);

1331

+ new_value = XMALLOC (char, add_len + orig_value_len + 1);

1332

+ if (to_end)

1333

+ {

1334

+ strcpy (new_value, orig_value);

1335

+ strcpy (new_value + orig_value_len, add);

1336

+ }

1337

+ else

1338

+ {

1339

+ strcpy (new_value, add);

1340

+ strcpy (new_value + add_len, orig_value);

1341

+ }

1342

+ }

1343

+ else

1344

+ {

1345

+ new_value = xstrdup (add);

1346

+ }

1347

+ return new_value;

1348

1349

1350

+int

1351

+lt_split_name_value (const char *arg, char** name, char** value)

1352

1353

+ const char *p;

1354

+ int len;

1355

+ if (!arg || !*arg)

1356

+ return 1;

1357

1358

+ p = strchr (arg, (int)'=');

1359

1360

+ if (!p)

1361

+ return 1;

1362

1363

+ *value = xstrdup (++p);

1364

1365

+ len = strlen (arg) - strlen (*value);

1366

+ *name = XMALLOC (char, len);

1367

+ strncpy (*name, arg, len-1);

1368

+ (*name)[len - 1] = '\0';

1369

1370

+ return 0;

1371

1372

1373

+void

1374

+lt_opt_process_env_set (const char *arg)

1375

1376

+ char *name = NULL;

1377

+ char *value = NULL;

1378

1379

+ if (lt_split_name_value (arg, &name, &value) != 0)

1380

+ {

1381

+ XFREE (name);

1382

+ XFREE (value);

1383

+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);

1384

+ }

1385

1386

+ lt_setenv (name, value);

1387

+ XFREE (name);

1388

+ XFREE (value);

1389

1390

1391

+void

1392

+lt_opt_process_env_prepend (const char *arg)

1393

1394

+ char *name = NULL;

1395

+ char *value = NULL;

1396

+ char *new_value = NULL;

1397

1398

+ if (lt_split_name_value (arg, &name, &value) != 0)

1399

+ {

1400

+ XFREE (name);

1401

+ XFREE (value);

1402

+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);

1403

+ }

1404

1405

+ new_value = lt_extend_str (getenv (name), value, 0);

1406

+ lt_setenv (name, new_value);

1407

+ XFREE (new_value);

1408

+ XFREE (name);

1409

+ XFREE (value);

1410

1411

1412

+void

1413

+lt_opt_process_env_append (const char *arg)

1414

1415

+ char *name = NULL;

1416

+ char *value = NULL;

1417

+ char *new_value = NULL;

1418

1419

+ if (lt_split_name_value (arg, &name, &value) != 0)

1420

+ {

1421

+ XFREE (name);

1422

+ XFREE (value);

1423

+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);

1424

+ }

1425

1426

+ new_value = lt_extend_str (getenv (name), value, 1);

1427

+ lt_setenv (name, new_value);

1428

+ XFREE (new_value);

1429

+ XFREE (name);

1430

+ XFREE (value);

1431

1432

1433

+void

1434

+lt_update_exe_path (const char *name, const char *value)

1435

1436

+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",

1437

+ (name ? name : "<NULL>"),

1438

+ (value ? value : "<NULL>")));

1439

1440

+ if (name && *name && value && *value)

1441

+ {

1442

+ char *new_value = lt_extend_str (getenv (name), value, 0);

1443

+ /* some systems can't cope with a ':'-terminated path #' */

1444

+ int len = strlen (new_value);

1445

+ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))

1446

+ {

1447

+ new_value[len-1] = '\0';

1448

+ }

1449

+ lt_setenv (name, new_value);

1450

+ XFREE (new_value);

1451

+ }

1452

1453

1454

+void

1455

+lt_update_lib_path (const char *name, const char *value)

1456

1457

+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",

1458

+ (name ? name : "<NULL>"),

1459

+ (value ? value : "<NULL>")));

1460

1461

+ if (name && *name && value && *value)

1462

+ {

1463

+ char *new_value = lt_extend_str (getenv (name), value, 0);

1464

+ lt_setenv (name, new_value);

1465

+ XFREE (new_value);

1466

+ }

1467

1468

1469

1470

EOF

1471

}

1472

# end: func_emit_cwrapperexe_src

1473

@@ -3515,7 +4033,7 @@ func_mode_link ()

1474

{

1475

$opt_debug

1476

case $host in

1477

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)

1478

+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)

1479

# It is impossible to link a dll without this setting, and

1480

# we shouldn't force the makefile maintainer to figure out

1481

# which system we are compiling for in order to pass an extra

1482

@@ -3959,6 +4477,13 @@ func_mode_link ()

1483

-L*)

1484

func_stripname '-L' '' "$arg"

1485

dir=$func_stripname_result

1486

+ if test -z "$dir"; then

1487

+ if test "$#" -gt 0; then

1488

+ func_fatal_error "require no space between \`-L' and \`$1'"

1489

+ else

1490

+ func_fatal_error "need path for \`-L' option"

1491

+ fi

1492

+ fi

1493

# We need an absolute path.

1494

case $dir in

1495

[\\/]* | [A-Za-z]:[\\/]*) ;;

1496

@@ -3977,14 +4502,16 @@ func_mode_link ()

1497

;;

1498

esac

1499

case $host in

1500

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)

1501

+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)

1502

testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`

1503

case :$dllsearchpath: in

1504

*":$dir:"*) ;;

1505

+ ::) dllsearchpath=$dir;;

1506

*) dllsearchpath="$dllsearchpath:$dir";;

1507

esac

1508

case :$dllsearchpath: in

1509

*":$testbindir:"*) ;;

1510

+ ::) dllsearchpath=$testbindir;;

1511

*) dllsearchpath="$dllsearchpath:$testbindir";;

1512

esac

1513

;;

1514

@@ -3995,7 +4522,7 @@ func_mode_link ()

1515

-l*)

1516

if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then

1517

case $host in

1518

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)

1519

+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)

1520

# These systems don't actually have a C or math library (as such)

1521

continue

1522

;;

1523

@@ -4072,7 +4599,7 @@ func_mode_link ()

1524

1525

-no-install)

1526

case $host in

1527

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)

1528

1529

# The PATH hackery in wrapper scripts is required on Windows

1530

# and Darwin in order for the loader to find any dlls it needs.

1531

func_warning "\`-no-install' is ignored for $host"

1532

@@ -4506,7 +5033,10 @@ func_mode_link ()

1533

case $pass in

1534

dlopen) libs="$dlfiles" ;;

1535

dlpreopen) libs="$dlprefiles" ;;

1536

- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;

1537

+ link)

1538

+ libs="$deplibs %DEPLIBS%"

1539

+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"

1540

+ ;;

1541

esac

1542

1543

if test "$linkmode,$pass" = "lib,dlpreopen"; then

1544

@@ -4817,19 +5347,19 @@ func_mode_link ()

1545

# It is a libtool convenience library, so add in its objects.

1546

convenience="$convenience $ladir/$objdir/$old_library"

1547

old_convenience="$old_convenience $ladir/$objdir/$old_library"

1548

+ tmp_libs=

1549

+ for deplib in $dependency_libs; do

1550

+ deplibs="$deplib $deplibs"

1551

+ if $opt_duplicate_deps ; then

1552

+ case "$tmp_libs " in

1553

+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

1554

+ esac

1555

+ fi

1556

+ tmp_libs="$tmp_libs $deplib"

1557

+ done

1558

elif test "$linkmode" != prog && test "$linkmode" != lib; then

1559

func_fatal_error "\`$lib' is not a convenience library"

1560

1561

- tmp_libs=

1562

- for deplib in $dependency_libs; do

1563

- deplibs="$deplib $deplibs"

1564

- if $opt_duplicate_deps ; then

1565

- case "$tmp_libs " in

1566

- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

1567

- esac

1568

- fi

1569

- tmp_libs="$tmp_libs $deplib"

1570

- done

1571

continue

1572

fi # $pass = conv

1573

1574

@@ -5029,7 +5559,7 @@ func_mode_link ()

1575

if test -n "$library_names" &&

1576

{ test "$use_static_libs" = no || test -z "$old_library"; }; then

1577

case $host in

1578

- *cygwin* | *mingw*)

1579

+ *cygwin* | *mingw* | *cegcc*)

1580

# No point in relinking DLLs because paths are not encoded

1581

notinst_deplibs="$notinst_deplibs $lib"

1582

need_relink=no

1583

@@ -5099,7 +5629,7 @@ func_mode_link ()

1584

elif test -n "$soname_spec"; then

1585

# bleh windows

1586

case $host in

1587

- *cygwin* | mingw*)

1588

+ *cygwin* | mingw* | *cegcc*)

1589

func_arith $current - $age

1590

major=$func_arith_result

1591

versuffix="-$major"

1592

@@ -5366,6 +5896,7 @@ func_mode_link ()

1593

if test "$link_all_deplibs" != no; then

1594

# Add the search paths of all dependency libraries

1595

for deplib in $dependency_libs; do

1596

+ path=

1597

case $deplib in

1598

-L*) path="$deplib" ;;

1599

*.la)

1600

@@ -5679,6 +6210,9 @@ func_mode_link ()

1601

revision="$number_minor"

1602

lt_irix_increment=no

1603

;;

1604

+ *)

1605

+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"

1606

+ ;;

1607

esac

1608

;;

1609

no)

1610

@@ -5878,7 +6412,7 @@ func_mode_link ()

1611

tempremovelist=`$ECHO "$output_objdir/*"`

1612

for p in $tempremovelist; do

1613

case $p in

1614

- *.$objext)

1615

+ *.$objext | *.gcno)

1616

;;

1617

$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)

1618

if test "X$precious_files_regex" != "X"; then

1619

@@ -5949,7 +6483,7 @@ func_mode_link ()

1620

if test "$build_libtool_libs" = yes; then

1621

if test -n "$rpath"; then

1622

case $host in

1623

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)

1624

1625

# these systems don't actually have a c library (as such)!

1626

;;

1627

*-*-rhapsody* | *-*-darwin1.[012])

1628

@@ -6448,7 +6982,7 @@ EOF

1629

1630

orig_export_symbols=

1631

case $host_os in

1632

- cygwin* | mingw*)

1633

+ cygwin* | mingw* | cegcc*)

1634

if test -n "$export_symbols" && test -z "$export_symbols_regex"; then

1635

# exporting using user supplied symfile

1636

if test "x`$SED 1q $export_symbols`" != xEXPORTS; then

1637

@@ -7073,14 +7607,16 @@ EOF

1638

esac

1639

1640

case $host in

1641

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)

1642

+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)

1643

testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`

1644

case :$dllsearchpath: in

1645

*":$libdir:"*) ;;

1646

+ ::) dllsearchpath=$libdir;;

1647

*) dllsearchpath="$dllsearchpath:$libdir";;

1648

esac

1649

case :$dllsearchpath: in

1650

*":$testbindir:"*) ;;

1651

+ ::) dllsearchpath=$testbindir;;

1652

*) dllsearchpath="$dllsearchpath:$testbindir";;

1653

esac

1654

;;

1655

@@ -7150,6 +7686,10 @@ EOF

1656

wrappers_required=no

1657

1658

;;

1659

+ *cegcc)

1660

+ # Disable wrappers for cegcc, we are cross compiling anyway.

1661

+ wrappers_required=no

1662

+ ;;

1663

1664

if test "$need_relink" = no || test "$build_libtool_libs" != yes; then

1665

wrappers_required=no

1666

@@ -7302,11 +7842,10 @@ EOF

1667

1668

func_emit_cwrapperexe_src > $cwrappersource

1669

1670

- # we should really use a build-platform specific compiler

1671

- # here, but OTOH, the wrappers (shell script and this C one)

1672

- # are only useful if you want to execute the "real" binary.

1673

- # Since the "real" binary is built for $host, then this

1674

- # wrapper might as well be built for $host, too.

1675

+ # The wrapper executable is built using the $host compiler,

1676

+ # because it contains $host paths and files. If cross-

1677

+ # compiling, it, like the target executable, must be

1678

+ # executed on the $host or under an emulation environment.

1679

$opt_dry_run || {

1680

$LTCC $LTCFLAGS -o $cwrapper $cwrappersource

1681

$STRIP $cwrapper

1682

@@ -7591,7 +8130,7 @@ EOF

1683

# place dlname in correct position for cygwin

1684

tdlname=$dlname

1685

case $host,$output,$installed,$module,$dlname in

1686

- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;

1687

+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;

1688

esac

1689

$ECHO > $output "\

1690

# $outputname - a libtool library file

1691

--- protobuf-2.3.0.orig/Makefile.in

1692

+++ protobuf-2.3.0/Makefile.in

1693

@@ -1,8 +1,9 @@

1694

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

1695

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

1696

# @configure_input@

1697

1698

1699

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

1700

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

1701

+# Inc.

1702

# This Makefile.in is free software; the Free Software Foundation

1703

# gives unlimited permission to copy and/or distribute it,

1704

# with or without modifications, as long as this notice is preserved.

1705

@@ -16,8 +17,9 @@

1706

1707

VPATH = @srcdir@

1708

pkgdatadir = $(datadir)/@PACKAGE@

1709

-pkglibdir = $(libdir)/@PACKAGE@

1710

pkgincludedir = $(includedir)/@PACKAGE@

1711

+pkglibdir = $(libdir)/@PACKAGE@

1712

+pkglibexecdir = $(libexecdir)/@PACKAGE@

1713

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

1714

install_sh_DATA = $(install_sh) -c -m 644

1715

install_sh_PROGRAM = $(install_sh) -c

1716

@@ -53,6 +55,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat

1717

mkinstalldirs = $(install_sh) -d

1718

CONFIG_HEADER = config.h

1719

CONFIG_CLEAN_FILES = protobuf.pc protobuf-lite.pc

1720

+CONFIG_CLEAN_VPATH_FILES =

1721

SOURCES =

1722

DIST_SOURCES =

1723

RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

1724

@@ -67,21 +70,63 @@ am__vpath_adj = case $$p in \

1725

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

1726

*) f=$$p;; \

1727

esac;

1728

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

1729

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

1730

+am__install_max = 40

1731

+am__nobase_strip_setup = \

1732

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

1733

+am__nobase_strip = \

1734

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

1735

+am__nobase_list = $(am__nobase_strip_setup); \

1736

+ for p in $$list; do echo "$$p $$p"; done | \

1737

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

1738

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

1739

+ if (++n[$$2] == $(am__install_max)) \

1740

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

1741

+ END { for (dir in files) print dir, files[dir] }'

1742

+am__base_list = \

1743

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

1744

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

1745

am__installdirs = "$(DESTDIR)$(pkgconfigdir)"

1746

-pkgconfigDATA_INSTALL = $(INSTALL_DATA)

1747

DATA = $(pkgconfig_DATA)

1748

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

1749

distclean-recursive maintainer-clean-recursive

1750

+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

1751

+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

1752

+ distdir dist dist-all distcheck

1753

ETAGS = etags

1754

CTAGS = ctags

1755

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

1756

distdir = $(PACKAGE)-$(VERSION)

1757

top_distdir = $(distdir)

1758

am__remove_distdir = \

1759

- { test ! -d $(distdir) \

1760

- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \

1761

- && rm -fr $(distdir); }; }

1762

+ { test ! -d "$(distdir)" \

1763

+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \

1764

+ && rm -fr "$(distdir)"; }; }

1765

+am__relativize = \

1766

+ dir0=`pwd`; \

1767

+ sed_first='s,^$[^/]*$/.*$$,\1,'; \

1768

+ sed_rest='s,^[^/]*/*,,'; \

1769

+ sed_last='s,^.*/$[^/]*$$$,\1,'; \

1770

+ sed_butlast='s,/*[^/]*$$,,'; \

1771

+ while test -n "$$dir1"; do \

1772

+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \

1773

+ if test "$$first" != "."; then \

1774

+ if test "$$first" = ".."; then \

1775

+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

1776

+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

1777

+ else \

1778

+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

1779

+ if test "$$first2" = "$$first"; then \

1780

+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

1781

+ else \

1782

+ dir2="../$$dir2"; \

1783

+ fi; \

1784

+ dir0="$$dir0"/"$$first"; \

1785

+ fi; \

1786

+ fi; \

1787

+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

1788

+ done; \

1789

+ reldir="$$dir2"

1790

DIST_ARCHIVES = $(distdir).tar.gz

1791

GZIP_ENV = --best

1792

distuninstallcheck_listfiles = find . -type f -print

1793

@@ -131,6 +176,7 @@ MAKEINFO = @MAKEINFO@

1794

MKDIR_P = @MKDIR_P@

1795

NM = @NM@

1796

NMEDIT = @NMEDIT@

1797

+OBJDUMP = @OBJDUMP@

1798

OBJEXT = @OBJEXT@

1799

OTOOL = @OTOOL@

1800

OTOOL64 = @OTOOL64@

1801

@@ -139,6 +185,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

1802

PACKAGE_NAME = @PACKAGE_NAME@

1803

PACKAGE_STRING = @PACKAGE_STRING@

1804

PACKAGE_TARNAME = @PACKAGE_TARNAME@

1805

+PACKAGE_URL = @PACKAGE_URL@

1806

PACKAGE_VERSION = @PACKAGE_VERSION@

1807

PATH_SEPARATOR = @PATH_SEPARATOR@

1808

POW_LIB = @POW_LIB@

1809

@@ -209,6 +256,7 @@ target_alias = @target_alias@

1810

target_cpu = @target_cpu@

1811

target_os = @target_os@

1812

target_vendor = @target_vendor@

1813

+top_build_prefix = @top_build_prefix@

1814

top_builddir = @top_builddir@

1815

top_srcdir = @top_srcdir@

1816

ACLOCAL_AMFLAGS = -I m4

1817

@@ -361,15 +409,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi

1818

@for dep in $?; do \

1819

case '$(am__configure_deps)' in \

1820

*$$dep*) \

1821

- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \

1822

- cd $(srcdir) && $(AUTOMAKE) --foreign \

1823

+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \

1824

+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \

1825

&& exit 0; \

1826

exit 1;; \

1827

esac; \

1828

done; \

1829

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \

1830

- cd $(top_srcdir) && \

1831

- $(AUTOMAKE) --foreign Makefile

1832

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \

1833

+ $(am__cd) $(top_srcdir) && \

1834

+ $(AUTOMAKE) --foreign Makefile

1835

.PRECIOUS: Makefile

1836

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

1837

@case '$?' in \

1838

@@ -385,9 +433,10 @@ $(top_builddir)/config.status: $(top_src

1839

$(SHELL) ./config.status --recheck

1840

1841

$(top_srcdir)/configure: $(am__configure_deps)

1842

- cd $(srcdir) && $(AUTOCONF)

1843

+ $(am__cd) $(srcdir) && $(AUTOCONF)

1844

$(ACLOCAL_M4): $(am__aclocal_m4_deps)

1845

- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

1846

+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

1847

+$(am__aclocal_m4_deps):

1848

1849

config.h: stamp-h1

1850

@if test ! -f $@; then \

1851

@@ -399,7 +448,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_bu

1852

@rm -f stamp-h1

1853

cd $(top_builddir) && $(SHELL) ./config.status config.h

1854

$(srcdir)/config.h.in: $(am__configure_deps)

1855

- cd $(top_srcdir) && $(AUTOHEADER)

1856

+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))

1857

rm -f stamp-h1

1858

touch $@

1859

1860

@@ -417,24 +466,27 @@ clean-libtool:

1861

-rm -rf .libs _libs

1862

1863

distclean-libtool:

1864

- -rm -f libtool

1865

+ -rm -f libtool config.lt

1866

install-pkgconfigDATA: $(pkgconfig_DATA)

1867

@$(NORMAL_INSTALL)

1868

test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"

1869

- @list='$(pkgconfig_DATA)'; for p in $$list; do \

1870

+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \

1871

+ for p in $$list; do \

1872

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

1873

- f=$(am__strip_dir) \

1874

- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \

1875

- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \

1876

+ echo "$$d$$p"; \

1877

+ done | $(am__base_list) | \

1878

+ while read files; do \

1879

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \

1880

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \

1881

done

1882

1883

uninstall-pkgconfigDATA:

1884

@$(NORMAL_UNINSTALL)

1885

- @list='$(pkgconfig_DATA)'; for p in $$list; do \

1886

- f=$(am__strip_dir) \

1887

- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \

1888

- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \

1889

- done

1890

+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \

1891

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

1892

+ test -n "$$files" || exit 0; \

1893

+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \

1894

+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files

1895

1896

# This directory's subdirectories are mostly independent; you can cd

1897

# into them and run `make' without going through this Makefile.

1898

@@ -443,7 +495,7 @@ uninstall-pkgconfigDATA:

1899

# (which will cause the Makefiles to be regenerated when you run `make');

1900

# (2) otherwise, pass the desired values on the `make' command line.

1901

$(RECURSIVE_TARGETS):

1902

- @failcom='exit 1'; \

1903

+ @fail= failcom='exit 1'; \

1904

for f in x $$MAKEFLAGS; do \

1905

case $$f in \

1906

*=* | --[!k]*);; \

1907

@@ -460,7 +512,7 @@ $(RECURSIVE_TARGETS):

1908

else \

1909

local_target="$$target"; \

1910

fi; \

1911

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

1912

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

1913

|| eval $$failcom; \

1914

done; \

1915

if test "$$dot_seen" = "no"; then \

1916

@@ -468,7 +520,7 @@ $(RECURSIVE_TARGETS):

1917

fi; test -z "$$fail"

1918

1919

$(RECURSIVE_CLEAN_TARGETS):

1920

- @failcom='exit 1'; \

1921

+ @fail= failcom='exit 1'; \

1922

for f in x $$MAKEFLAGS; do \

1923

case $$f in \

1924

*=* | --[!k]*);; \

1925

@@ -494,16 +546,16 @@ $(RECURSIVE_CLEAN_TARGETS):

1926

else \

1927

local_target="$$target"; \

1928

fi; \

1929

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

1930

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

1931

|| eval $$failcom; \

1932

done && test -z "$$fail"

1933

tags-recursive:

1934

list='$(SUBDIRS)'; for subdir in $$list; do \

1935

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

1936

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

1937

done

1938

ctags-recursive:

1939

list='$(SUBDIRS)'; for subdir in $$list; do \

1940

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

1941

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

1942

done

1943

1944

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

1945

@@ -511,14 +563,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS

1946

unique=`for i in $$list; do \

1947

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

1948

done | \

1949

- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

1950

+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

1951

END { if (nonempty) { for (i in files) print i; }; }'`; \

1952

mkid -fID $$unique

1953

tags: TAGS

1954

1955

TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \

1956

$(TAGS_FILES) $(LISP)

1957

- tags=; \

1958

+ set x; \

1959

here=`pwd`; \

1960

if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

1961

include_option=--etags-include; \

1962

@@ -530,7 +582,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE

1963

list='$(SUBDIRS)'; for subdir in $$list; do \

1964

if test "$$subdir" = .; then :; else \

1965

test ! -f $$subdir/TAGS || \

1966

- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

1967

+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

1968

fi; \

1969

done; \

1970

list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \

1971

@@ -539,36 +591,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE

1972

done | \

1973

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

1974

END { if (nonempty) { for (i in files) print i; }; }'`; \

1975

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

1976

+ shift; \

1977

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

1978

test -n "$$unique" || unique=$$empty_fix; \

1979

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

1980

- $$tags $$unique; \

1981

+ if test $$# -gt 0; then \

1982

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

1983

+ "$$@" $$unique; \

1984

+ else \

1985

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

1986

+ $$unique; \

1987

+ fi; \

1988

1989

ctags: CTAGS

1990

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \

1991

$(TAGS_FILES) $(LISP)

1992

- tags=; \

1993

list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \

1994

unique=`for i in $$list; do \

1995

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

1996

done | \

1997

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

1998

END { if (nonempty) { for (i in files) print i; }; }'`; \

1999

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

2000

+ test -z "$(CTAGS_ARGS)$$unique" \

2001

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

2002

- $$tags $$unique

2003

+ $$unique

2004

2005

GTAGS:

2006

here=`$(am__cd) $(top_builddir) && pwd` \

2007

- && cd $(top_srcdir) \

2008

- && gtags -i $(GTAGS_ARGS) $$here

2009

+ && $(am__cd) $(top_srcdir) \

2010

+ && gtags -i $(GTAGS_ARGS) "$$here"

2011

2012

distclean-tags:

2013

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

2014

2015

distdir: $(DISTFILES)

2016

$(am__remove_distdir)

2017

- test -d $(distdir) || mkdir $(distdir)

2018

+ test -d "$(distdir)" || mkdir "$(distdir)"

2019

@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

2020

topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

2021

list='$(DISTFILES)'; \

2022

@@ -584,38 +641,55 @@ distdir: $(DISTFILES)

2023

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

2024

if test -d $$d/$$file; then \

2025

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

2026

+ if test -d "$(distdir)/$$file"; then \

2027

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

2028

+ fi; \

2029

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

2030

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

2031

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

2032

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

2033

fi; \

2034

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

2035

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

2036

else \

2037

- test -f $(distdir)/$$file \

2038

- || cp -p $$d/$$file $(distdir)/$$file \

2039

+ test -f "$(distdir)/$$file" \

2040

+ || cp -p $$d/$$file "$(distdir)/$$file" \

2041

|| exit 1; \

2042

fi; \

2043

done

2044

- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

2045

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

2046

if test "$$subdir" = .; then :; else \

2047

test -d "$(distdir)/$$subdir" \

2048

|| $(MKDIR_P) "$(distdir)/$$subdir" \

2049

|| exit 1; \

2050

- distdir=`$(am__cd) $(distdir) && pwd`; \

2051

- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

2052

- (cd $$subdir && \

2053

+ fi; \

2054

+ done

2055

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

2056

+ if test "$$subdir" = .; then :; else \

2057

+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

2058

+ $(am__relativize); \

2059

+ new_distdir=$$reldir; \

2060

+ dir1=$$subdir; dir2="$(top_distdir)"; \

2061

+ $(am__relativize); \

2062

+ new_top_distdir=$$reldir; \

2063

+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

2064

+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

2065

+ ($(am__cd) $$subdir && \

2066

$(MAKE) $(AM_MAKEFLAGS) \

2067

- top_distdir="$$top_distdir" \

2068

- distdir="$$distdir/$$subdir" \

2069

+ top_distdir="$$new_top_distdir" \

2070

+ distdir="$$new_distdir" \

2071

am__remove_distdir=: \

2072

am__skip_length_check=: \

2073

+ am__skip_mode_fix=: \

2074

distdir) \

2075

|| exit 1; \

2076

fi; \

2077

done

2078

- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \

2079

+ -test -n "$(am__skip_mode_fix)" \

2080

+ || find "$(distdir)" -type d ! -perm -755 \

2081

+ -exec chmod u+rwx,go+rx {} \; -o \

2082

! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \

2083

! -type d ! -perm -400 -exec chmod a+r {} \; -o \

2084

! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \

2085

- || chmod -R a+r $(distdir)

2086

+ || chmod -R a+r "$(distdir)"

2087

dist-gzip: distdir

2088

tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz

2089

$(am__remove_distdir)

2090

@@ -628,6 +702,10 @@ dist-lzma: distdir

2091

tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma

2092

$(am__remove_distdir)

2093

2094

+dist-xz: distdir

2095

+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz

2096

+ $(am__remove_distdir)

2097

2098

dist-tarZ: distdir

2099

tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z

2100

$(am__remove_distdir)

2101

@@ -651,15 +729,17 @@ dist dist-all: distdir

2102

distcheck: dist

2103

case '$(DIST_ARCHIVES)' in \

2104

*.tar.gz*) \

2105

- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\

2106

+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\

2107

*.tar.bz2*) \

2108

- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\

2109

+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\

2110

*.tar.lzma*) \

2111

- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\

2112

+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\

2113

+ *.tar.xz*) \

2114

+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\

2115

*.tar.Z*) \

2116

uncompress -c $(distdir).tar.Z | $(am__untar) ;;\

2117

*.shar.gz*) \

2118

- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\

2119

+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\

2120

*.zip*) \

2121

unzip $(distdir).zip ;;\

2122

esac

2123

@@ -667,9 +747,11 @@ distcheck: dist

2124

mkdir $(distdir)/_build

2125

mkdir $(distdir)/_inst

2126

chmod a-w $(distdir)

2127

+ test -d $(distdir)/_build || exit 0; \

2128

dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \

2129

&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \

2130

- && cd $(distdir)/_build \

2131

+ && am__cwd=`pwd` \

2132

+ && $(am__cd) $(distdir)/_build \

2133

&& ../configure --srcdir=.. --prefix="$$dc_install_base" \

2134

$(DISTCHECK_CONFIGURE_FLAGS) \

2135

&& $(MAKE) $(AM_MAKEFLAGS) \

2136

@@ -691,13 +773,15 @@ distcheck: dist

2137

&& rm -rf "$$dc_destdir" \

2138

&& $(MAKE) $(AM_MAKEFLAGS) dist \

2139

&& rm -rf $(DIST_ARCHIVES) \

2140

- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck

2141

+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \

2142

+ && cd "$$am__cwd" \

2143

+ || exit 1

2144

$(am__remove_distdir)

2145

@(echo "$(distdir) archives ready for distribution: "; \

2146

list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \

2147

sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'

2148

distuninstallcheck:

2149

- @cd $(distuninstallcheck_dir) \

2150

+ @$(am__cd) '$(distuninstallcheck_dir)' \

2151

&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \

2152

|| { echo "ERROR: files left after uninstall:" ; \

2153

if test -n "$(DESTDIR)"; then \

2154

@@ -743,6 +827,7 @@ clean-generic:

2155

2156

distclean-generic:

2157

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

2158

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

2159

2160

maintainer-clean-generic:

2161

@echo "This command is intended for maintainers to use"

2162

@@ -764,6 +849,8 @@ dvi-am:

2163

2164

html: html-recursive

2165

2166

+html-am:

2167

2168

info: info-recursive

2169

2170

info-am:

2171

@@ -772,18 +859,28 @@ install-data-am: install-pkgconfigDATA

2172

2173

install-dvi: install-dvi-recursive

2174

2175

+install-dvi-am:

2176

2177

install-exec-am:

2178

2179

install-html: install-html-recursive

2180

2181

+install-html-am:

2182

2183

install-info: install-info-recursive

2184

2185

+install-info-am:

2186

2187

install-man:

2188

2189

install-pdf: install-pdf-recursive

2190

2191

+install-pdf-am:

2192

2193

install-ps: install-ps-recursive

2194

2195

+install-ps-am:

2196

2197

installcheck-am:

2198

2199

maintainer-clean: maintainer-clean-recursive

2200

@@ -806,25 +903,26 @@ ps-am:

2201

2202

uninstall-am: uninstall-pkgconfigDATA

2203

2204

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

2205

- install-strip

2206

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \

2207

+ ctags-recursive install-am install-strip tags-recursive

2208

2209

.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

2210

all all-am am--refresh check check-am check-local clean \

2211

clean-generic clean-libtool clean-local ctags ctags-recursive \

2212

dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \

2213

- dist-tarZ dist-zip distcheck distclean distclean-generic \

2214

- distclean-hdr distclean-libtool distclean-tags distcleancheck \

2215

- distdir distuninstallcheck dvi dvi-am html html-am info \

2216

- info-am install install-am install-data install-data-am \

2217

- install-dvi install-dvi-am install-exec install-exec-am \

2218

- install-html install-html-am install-info install-info-am \

2219

- install-man install-pdf install-pdf-am install-pkgconfigDATA \

2220

- install-ps install-ps-am install-strip installcheck \

2221

- installcheck-am installdirs installdirs-am maintainer-clean \

2222

- maintainer-clean-generic mostlyclean mostlyclean-generic \

2223

- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \

2224

- uninstall uninstall-am uninstall-pkgconfigDATA

2225

+ dist-tarZ dist-xz dist-zip distcheck distclean \

2226

+ distclean-generic distclean-hdr distclean-libtool \

2227

+ distclean-tags distcleancheck distdir distuninstallcheck dvi \

2228

+ dvi-am html html-am info info-am install install-am \

2229

+ install-data install-data-am install-dvi install-dvi-am \

2230

+ install-exec install-exec-am install-html install-html-am \

2231

+ install-info install-info-am install-man install-pdf \

2232

+ install-pdf-am install-pkgconfigDATA install-ps install-ps-am \

2233

+ install-strip installcheck installcheck-am installdirs \

2234

+ installdirs-am maintainer-clean maintainer-clean-generic \

2235

+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \

2236

+ ps ps-am tags tags-recursive uninstall uninstall-am \

2237

+ uninstall-pkgconfigDATA

2238

2239

2240

# Build gtest before we build protobuf tests. We don't add gtest to SUBDIRS

2241

@@ -847,6 +945,7 @@ clean-local:

2242

echo "Making clean in gtest"; \

2243

cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \

2244

2245

2246

# Tell versions [3.59,3.63) of GNU make to not export all variables.

2247

# Otherwise a system limit (for SysV at least) may be exceeded.

2248

.NOEXPORT:

2249

--- protobuf-2.3.0.orig/aclocal.m4

2250

+++ protobuf-2.3.0/aclocal.m4

2251

@@ -1,7 +1,7 @@

2252

-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-

2253

+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-

2254

2255

2256

-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

2257

+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

2258

# This file is free software; the Free Software Foundation

2259

# gives unlimited permission to copy and/or distribute it,

2260

# with or without modifications, as long as this notice is preserved.

2261

@@ -13,13 +13,13 @@

1076

NSE-?:NONSTOP_KERNEL:*:*)

1077

echo nse-tandem-nsk${UNAME_RELEASE}

1078

exit ;;

1079

@@ -1307,13 +1291,13 @@ EOF

1080

echo pdp10-unknown-its

1081

exit ;;

1082

SEI:*:*:SEIUX)

1083

- echo mips-sei-seiux${UNAME_RELEASE}

1084

+ echo mips-sei-seiux${UNAME_RELEASE}

1085

exit ;;

1086

*:DragonFly:*:*)

1087

echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`

1088

exit ;;

1089

*:*VMS:*:*)

1090

- UNAME_MACHINE=`(uname -p) 2>/dev/null`

1091

+ UNAME_MACHINE=`(uname -p) 2>/dev/null`

1092

case "${UNAME_MACHINE}" in

1093

A*) echo alpha-dec-vms ; exit ;;

1094

I*) echo ia64-dec-vms ; exit ;;

1095

@@ -1353,11 +1337,11 @@ main ()

1096

#include <sys/param.h>

1097

printf ("m68k-sony-newsos%s\n",

1098

#ifdef NEWSOS4

1099

- "4"

1100

+ "4"

1101

#else

1102

- ""

1103

+ ""

1104

#endif

1105

- ); exit (0);

1106

+ ); exit (0);

1107

#endif

1108

#endif

1109

1110

--- protobuf-2.4.0a.orig/aclocal.m4

1111

+++ protobuf-2.4.0a/aclocal.m4

1112

@@ -13,8 +13,8 @@

2262

1113

2263

1114

m4_ifndef([AC_AUTOCONF_VERSION],

2264

1115

[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

2265

-m4_if(AC_AUTOCONF_VERSION, [2.61],,

2266

-[m4_warning([this file was generated for autoconf 2.61.

2267

+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,

2268

+[m4_warning([this file was generated for autoconf 2.67.

1116

-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,

1117

-[m4_warning([this file was generated for autoconf 2.65.

1118

+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,

1119

+[m4_warning([this file was generated for autoconf 2.68.

2269

1120

You have another version of autoconf. It may work, but is not guaranteed to.

2270

1121

If you have problems, you may need to regenerate the build system entirely.

2271

1122

To do so, use the procedure documented by the package, typically `autoreconf'.])])

2272

2273

2274

2275

2276

# This file is free software; the Free Software Foundation

2277

# gives unlimited permission to copy and/or distribute it,

2278

@@ -31,10 +31,10 @@ To do so, use the procedure documented b

2279

# generated from the m4 files accompanying Automake X.Y.

2280

# (This private macro should not be called outside this file.)

2281

AC_DEFUN([AM_AUTOMAKE_VERSION],

2282

-[am__api_version='1.10'

2283

+[am__api_version='1.11'

2284

dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

2285

dnl require some minimum version. Point them to the right macro.

2286

-m4_if([$1], [1.10.1], [],

2287

+m4_if([$1], [1.11.1], [],

2288

[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

2289

])

2290

2291

@@ -48,12 +48,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])

2292

# AM_SET_CURRENT_AUTOMAKE_VERSION

2293

# -------------------------------

2294

# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

2295

-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

2296

+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

2297

AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

2298

-[AM_AUTOMAKE_VERSION([1.10.1])dnl

2299

+[AM_AUTOMAKE_VERSION([1.11.1])dnl

2300

m4_ifndef([AC_AUTOCONF_VERSION],

2301

[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

2302

-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])

2303

+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

2304

2305

# AM_AUX_DIR_EXPAND -*- Autoconf -*-

2306

2307

@@ -110,14 +110,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`

2308

2309

# AM_CONDITIONAL -*- Autoconf -*-

2310

2311

2312

2313

# Free Software Foundation, Inc.

2314

2315

# This file is free software; the Free Software Foundation

2316

# gives unlimited permission to copy and/or distribute it,

2317

# with or without modifications, as long as this notice is preserved.

2318

2319

-# serial 8

2320

+# serial 9

2321

2322

# AM_CONDITIONAL(NAME, SHELL-CONDITION)

2323

# -------------------------------------

2324

@@ -130,6 +130,7 @@ AC_SUBST([$1_TRUE])dnl

2325

AC_SUBST([$1_FALSE])dnl

2326

_AM_SUBST_NOTMAKE([$1_TRUE])dnl

2327

_AM_SUBST_NOTMAKE([$1_FALSE])dnl

2328

+m4_define([_AM_COND_VALUE_$1], [$2])dnl

2329

if $2; then

2330

$1_TRUE=

2331

$1_FALSE='#'

2332

@@ -143,14 +144,14 @@ AC_CONFIG_COMMANDS_PRE(

2333

Usually this means the macro was only invoked conditionally.]])

2334

fi])])

2335

2336

2337

2338

# Free Software Foundation, Inc.

2339

2340

# This file is free software; the Free Software Foundation

2341

# gives unlimited permission to copy and/or distribute it,

2342

# with or without modifications, as long as this notice is preserved.

2343

2344

-# serial 9

2345

+# serial 10

2346

2347

# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be

2348

# written in clear, in which case automake, when reading aclocal.m4,

2349

@@ -207,6 +208,16 @@ AC_CACHE_CHECK([dependency style of $dep

2350

if test "$am_compiler_list" = ""; then

2351

am_compiler_list=`sed -n ['s/^#*$[a-zA-Z0-9]*$)$/\1/p'] < ./depcomp`

2352

2353

+ am__universal=false

2354

+ m4_case([$1], [CC],

2355

+ [case " $depcc " in #(

2356

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

2357

+ esac],

2358

+ [CXX],

2359

+ [case " $depcc " in #(

2360

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

2361

+ esac])

2362

2363

for depmode in $am_compiler_list; do

2364

# Setup a source with many dependencies, because some compilers

2365

# like to wrap large dependency lists on column 80 (with \), and

2366

@@ -224,7 +235,17 @@ AC_CACHE_CHECK([dependency style of $dep

2367

done

2368

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

2369

2370

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

2371

+ # mode. It turns out that the SunPro C++ compiler does not properly

2372

+ # handle `-M -o', and we need to detect this. Also, some Intel

2373

+ # versions had trouble with output in subdirs

2374

+ am__obj=sub/conftest.${OBJEXT-o}

2375

+ am__minus_obj="-o $am__obj"

2376

case $depmode in

2377

+ gcc)

2378

+ # This depmode causes a compiler race in universal mode.

2379

+ test "$am__universal" = false || continue

2380

+ ;;

2381

nosideeffect)

2382

# after this tag, mechanisms are not by side-effect, so they'll

2383

# only be used when explicitly requested

2384

@@ -234,19 +255,23 @@ AC_CACHE_CHECK([dependency style of $dep

2385

break

2386

2387

;;

2388

+ msvisualcpp | msvcmsys)

2389

+ # This compiler won't grok `-c -o', but also, the minuso test has

2390

+ # not run yet. These depmodes are late enough in the game, and

2391

+ # so weak that their functioning should not be impacted.

2392

+ am__obj=conftest.${OBJEXT-o}

2393

+ am__minus_obj=

2394

+ ;;

2395

none) break ;;

2396

esac

2397

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

2398

- # mode. It turns out that the SunPro C++ compiler does not properly

2399

- # handle `-M -o', and we need to detect this.

2400

if depmode=$depmode \

2401

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

2402

+ source=sub/conftest.c object=$am__obj \

2403

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

2404

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

2405

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

2406

>/dev/null 2>conftest.err &&

2407

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

2408

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

2409

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

2410

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

2411

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

2412

# icc doesn't choke on unknown options, it will just issue warnings

2413

# or remarks (even with -Werror). So we grep stderr for any message

2414

@@ -303,57 +328,68 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl

2415

2416

# Generate code to set up dependency tracking. -*- Autoconf -*-

2417

2418

2419

2420

# Free Software Foundation, Inc.

2421

2422

# This file is free software; the Free Software Foundation

2423

# gives unlimited permission to copy and/or distribute it,

2424

# with or without modifications, as long as this notice is preserved.

2425

2426

-#serial 3

2427

+#serial 5

2428

2429

# _AM_OUTPUT_DEPENDENCY_COMMANDS

2430

# ------------------------------

2431

AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

2432

-[for mf in $CONFIG_FILES; do

2433

- # Strip MF so we end up with the name of the file.

2434

- mf=`echo "$mf" | sed -e 's/:.*$//'`

2435

- # Check whether this is an Automake generated Makefile or not.

2436

- # We used to match only the files named `Makefile.in', but

2437

- # some people rename them; so instead we look at the file content.

2438

- # Grep'ing the first line is not enough: some people post-process

2439

- # each Makefile.in and add a new line on top of each file to say so.

2440

- # Grep'ing the whole file is not good either: AIX grep has a line

2441

- # limit of 2048, but all sed's we know have understand at least 4000.

2442

- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

2443

- dirpart=`AS_DIRNAME("$mf")`

2444

- else

2445

- continue

2446

- fi

2447

- # Extract the definition of DEPDIR, am__include, and am__quote

2448

- # from the Makefile without running `make'.

2449

- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

2450

- test -z "$DEPDIR" && continue

2451

- am__include=`sed -n 's/^am__include = //p' < "$mf"`

2452

- test -z "am__include" && continue

2453

- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

2454

- # When using ansi2knr, U may be empty or an underscore; expand it

2455

- U=`sed -n 's/^U = //p' < "$mf"`

2456

- # Find all dependency output files, they are included files with

2457

- # $(DEPDIR) in their names. We invoke sed twice because it is the

2458

- # simplest approach to changing $(DEPDIR) to its actual value in the

2459

- # expansion.

2460

- for file in `sed -n "

2461

- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

2462

- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

2463

- # Make sure the directory exists.

2464

- test -f "$dirpart/$file" && continue

2465

- fdir=`AS_DIRNAME(["$file"])`

2466

- AS_MKDIR_P([$dirpart/$fdir])

2467

- # echo "creating $dirpart/$file"

2468

- echo '# dummy' > "$dirpart/$file"

2469

+[{

2470

+ # Autoconf 2.62 quotes --file arguments for eval, but not when files

2471

+ # are listed without --file. Let's play safe and only enable the eval

2472

+ # if we detect the quoting.

2473

+ case $CONFIG_FILES in

2474

+ *\'*) eval set x "$CONFIG_FILES" ;;

2475

+ *) set x $CONFIG_FILES ;;

2476

+ esac

2477

+ shift

2478

+ for mf

2479

+ do

2480

+ # Strip MF so we end up with the name of the file.

2481

+ mf=`echo "$mf" | sed -e 's/:.*$//'`

2482

+ # Check whether this is an Automake generated Makefile or not.

2483

+ # We used to match only the files named `Makefile.in', but

2484

+ # some people rename them; so instead we look at the file content.

2485

+ # Grep'ing the first line is not enough: some people post-process

2486

+ # each Makefile.in and add a new line on top of each file to say so.

2487

+ # Grep'ing the whole file is not good either: AIX grep has a line

2488

+ # limit of 2048, but all sed's we know have understand at least 4000.

2489

+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

2490

+ dirpart=`AS_DIRNAME("$mf")`

2491

+ else

2492

+ continue

2493

+ fi

2494

+ # Extract the definition of DEPDIR, am__include, and am__quote

2495

+ # from the Makefile without running `make'.

2496

+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

2497

+ test -z "$DEPDIR" && continue

2498

+ am__include=`sed -n 's/^am__include = //p' < "$mf"`

2499

+ test -z "am__include" && continue

2500

+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

2501

+ # When using ansi2knr, U may be empty or an underscore; expand it

2502

+ U=`sed -n 's/^U = //p' < "$mf"`

2503

+ # Find all dependency output files, they are included files with

2504

+ # $(DEPDIR) in their names. We invoke sed twice because it is the

2505

+ # simplest approach to changing $(DEPDIR) to its actual value in the

2506

+ # expansion.

2507

+ for file in `sed -n "

2508

+ s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

2509

+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

2510

+ # Make sure the directory exists.

2511

+ test -f "$dirpart/$file" && continue

2512

+ fdir=`AS_DIRNAME(["$file"])`

2513

+ AS_MKDIR_P([$dirpart/$fdir])

2514

+ # echo "creating $dirpart/$file"

2515

+ echo '# dummy' > "$dirpart/$file"

2516

+ done

2517

done

2518

-done

2519

2520

])# _AM_OUTPUT_DEPENDENCY_COMMANDS

2521

2522

2523

@@ -373,13 +409,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]

2524

# Do all the work for Automake. -*- Autoconf -*-

2525

2526

2527

-# 2005, 2006, 2008 Free Software Foundation, Inc.

2528

+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.

2529

2530

# This file is free software; the Free Software Foundation

2531

# gives unlimited permission to copy and/or distribute it,

2532

# with or without modifications, as long as this notice is preserved.

2533

2534

-# serial 13

2535

+# serial 16

2536

2537

# This macro actually does too much. Some checks are only needed if

2538

# your package does certain things. But this isn't really a big deal.

2539

@@ -396,7 +432,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]

2540

# arguments mandatory, and then we can depend on a new Autoconf

2541

# release and drop the old call support.

2542

AC_DEFUN([AM_INIT_AUTOMAKE],

2543

-[AC_PREREQ([2.60])dnl

2544

+[AC_PREREQ([2.62])dnl

2545

dnl Autoconf wants to disallow AM_ names. We explicitly allow

2546

dnl the ones we care about.

2547

m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl

2548

@@ -447,8 +483,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)

2549

AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})

2550

AM_MISSING_PROG(AUTOHEADER, autoheader)

2551

AM_MISSING_PROG(MAKEINFO, makeinfo)

2552

-AM_PROG_INSTALL_SH

2553

-AM_PROG_INSTALL_STRIP

2554

+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl

2555

+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl

2556

AC_REQUIRE([AM_PROG_MKDIR_P])dnl

2557

# We need awk for the "check" target. The system "awk" is bad on

2558

# some platforms.

2559

@@ -456,23 +492,36 @@ AC_REQUIRE([AC_PROG_AWK])dnl

2560

AC_REQUIRE([AC_PROG_MAKE_SET])dnl

2561

AC_REQUIRE([AM_SET_LEADING_DOT])dnl

2562

_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],

2563

- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],

2564

- [_AM_PROG_TAR([v7])])])

2565

+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],

2566

+ [_AM_PROG_TAR([v7])])])

2567

_AM_IF_OPTION([no-dependencies],,

2568

[AC_PROVIDE_IFELSE([AC_PROG_CC],

2569

- [_AM_DEPENDENCIES(CC)],

2570

- [define([AC_PROG_CC],

2571

- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl

2572

+ [_AM_DEPENDENCIES(CC)],

2573

+ [define([AC_PROG_CC],

2574

+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl

2575

AC_PROVIDE_IFELSE([AC_PROG_CXX],

2576

- [_AM_DEPENDENCIES(CXX)],

2577

- [define([AC_PROG_CXX],

2578

- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

2579

+ [_AM_DEPENDENCIES(CXX)],

2580

+ [define([AC_PROG_CXX],

2581

+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

2582

AC_PROVIDE_IFELSE([AC_PROG_OBJC],

2583

- [_AM_DEPENDENCIES(OBJC)],

2584

- [define([AC_PROG_OBJC],

2585

- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

2586

-])

2587

-])

2588

+ [_AM_DEPENDENCIES(OBJC)],

2589

+ [define([AC_PROG_OBJC],

2590

+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

2591

+])

2592

+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl

2593

+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the

2594

+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro

2595

+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.

2596

+AC_CONFIG_COMMANDS_PRE(dnl

2597

+[m4_provide_if([_AM_COMPILER_EXEEXT],

2598

+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl

2599

+])

2600

2601

+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not

2602

+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further

2603

+dnl mangled by Autoconf and run in a shell conditional statement.

2604

+m4_define([_AC_COMPILER_EXEEXT],

2605

+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])

2606

2607

2608

# When config.status generates a header, we must update the stamp-h file.

2609

@@ -496,7 +545,7 @@ for _am_header in $config_headers :; do

2610

done

2611

echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

2612

2613

2614

2615

2616

# This file is free software; the Free Software Foundation

2617

# gives unlimited permission to copy and/or distribute it,

2618

@@ -507,7 +556,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNA

2619

# Define $install_sh.

2620

AC_DEFUN([AM_PROG_INSTALL_SH],

2621

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

2622

-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}

2623

+if test x"${install_sh}" != xset; then

2624

+ case $am_aux_dir in

2625

+ *\ * | *\ *)

2626

+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

2627

+ *)

2628

+ install_sh="\${SHELL} $am_aux_dir/install-sh"

2629

+ esac

2630

+fi

2631

AC_SUBST(install_sh)])

2632

2633

2634

@@ -533,13 +589,13 @@ AC_SUBST([am__leading_dot])])

2635

2636

# Check to see how 'make' treats includes. -*- Autoconf -*-

2637

2638

2639

2640

2641

# This file is free software; the Free Software Foundation

2642

# gives unlimited permission to copy and/or distribute it,

2643

# with or without modifications, as long as this notice is preserved.

2644

2645

-# serial 3

2646

+# serial 4

2647

2648

# AM_MAKE_INCLUDE()

2649

# -----------------

2650

@@ -548,7 +604,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],

2651

[am_make=${MAKE-make}

2652

cat > confinc << 'END'

2653

am__doit:

2654

- @echo done

2655

+ @echo this is the am__doit target

2656

.PHONY: am__doit

2657

END

2658

# If we don't find an include directive, just comment out the code.

2659

@@ -558,24 +614,24 @@ am__quote=

2660

_am_result=none

2661

# First try GNU make style include.

2662

echo "include confinc" > confmf

2663

-# We grep out `Entering directory' and `Leaving directory'

2664

-# messages which can occur if `w' ends up in MAKEFLAGS.

2665

-# In particular we don't look at `^make:' because GNU make might

2666

-# be invoked under some other name (usually "gmake"), in which

2667

-# case it prints its new name instead of `make'.

2668

-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then

2669

- am__include=include

2670

- am__quote=

2671

- _am_result=GNU

2672

-fi

2673

+# Ignore all kinds of additional output from `make'.

2674

+case `$am_make -s -f confmf 2> /dev/null` in #(

2675

+*the\ am__doit\ target*)

2676

+ am__include=include

2677

+ am__quote=

2678

+ _am_result=GNU

2679

+ ;;

2680

+esac

2681

# Now try BSD make style include.

2682

if test "$am__include" = "#"; then

2683

echo '.include "confinc"' > confmf

2684

- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then

2685

- am__include=.include

2686

- am__quote="\""

2687

- _am_result=BSD

2688

- fi

2689

+ case `$am_make -s -f confmf 2> /dev/null` in #(

2690

+ *the\ am__doit\ target*)

2691

+ am__include=.include

2692

+ am__quote="\""

2693

+ _am_result=BSD

2694

+ ;;

2695

+ esac

2696

2697

AC_SUBST([am__include])

2698

AC_SUBST([am__quote])

2699

@@ -585,14 +641,14 @@ rm -f confinc confmf

2700

2701

# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-

2702

2703

2704

2705

# Free Software Foundation, Inc.

2706

2707

# This file is free software; the Free Software Foundation

2708

# gives unlimited permission to copy and/or distribute it,

2709

# with or without modifications, as long as this notice is preserved.

2710

2711

-# serial 5

2712

+# serial 6

2713

2714

# AM_MISSING_PROG(NAME, PROGRAM)

2715

# ------------------------------

2716

@@ -609,7 +665,14 @@ AC_SUBST($1)])

2717

AC_DEFUN([AM_MISSING_HAS_RUN],

2718

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

2719

AC_REQUIRE_AUX_FILE([missing])dnl

2720

-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"

2721

+if test x"${MISSING+set}" != xset; then

2722

+ case $am_aux_dir in

2723

+ *\ * | *\ *)

2724

+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;

2725

+ *)

2726

+ MISSING="\${SHELL} $am_aux_dir/missing" ;;

2727

+ esac

2728

+fi

2729

# Use eval to expand $SHELL

2730

if eval "$MISSING --run true"; then

2731

am_missing_run="$MISSING --run "

2732

@@ -647,13 +710,13 @@ esac

2733

2734

# Helper functions for option handling. -*- Autoconf -*-

2735

2736

2737

2738

2739

# This file is free software; the Free Software Foundation

2740

# gives unlimited permission to copy and/or distribute it,

2741

# with or without modifications, as long as this notice is preserved.

2742

2743

-# serial 3

2744

+# serial 4

2745

2746

# _AM_MANGLE_OPTION(NAME)

2747

# -----------------------

2748

@@ -670,7 +733,7 @@ AC_DEFUN([_AM_SET_OPTION],

2749

# ----------------------------------

2750

# OPTIONS is a space-separated list of Automake options.

2751

AC_DEFUN([_AM_SET_OPTIONS],

2752

-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

2753

+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

2754

2755

# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])

2756

# -------------------------------------------

2757

@@ -680,14 +743,14 @@ AC_DEFUN([_AM_IF_OPTION],

2758

2759

# Check to make sure that the build environment is sane. -*- Autoconf -*-

2760

2761

2762

2763

# Free Software Foundation, Inc.

2764

2765

# This file is free software; the Free Software Foundation

2766

# gives unlimited permission to copy and/or distribute it,

2767

# with or without modifications, as long as this notice is preserved.

2768

2769

-# serial 4

2770

+# serial 5

2771

2772

# AM_SANITY_CHECK

2773

# ---------------

2774

@@ -696,16 +759,29 @@ AC_DEFUN([AM_SANITY_CHECK],

2775

# Just in case

2776

sleep 1

2777

echo timestamp > conftest.file

2778

+# Reject unsafe characters in $srcdir or the absolute working directory

2779

+# name. Accept space and tab only in the latter.

2780

+am_lf='

2781

2782

+case `pwd` in

2783

+ *[[\\\"\#\$\&\'\`$am_lf]]*)

2784

+ AC_MSG_ERROR([unsafe absolute working directory name]);;

2785

+esac

2786

+case $srcdir in

2787

+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)

2788

+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;

2789

+esac

2790

2791

# Do `set' in a subshell so we don't clobber the current shell's

2792

# arguments. Must try -L first in case configure is actually a

2793

# symlink; some systems play weird games with the mod time of symlinks

2794

# (eg FreeBSD returns the mod time of the symlink's containing

2795

# directory).

2796

if (

2797

- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`

2798

+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

2799

if test "$[*]" = "X"; then

2800

# -L didn't work.

2801

- set X `ls -t $srcdir/configure conftest.file`

2802

+ set X `ls -t "$srcdir/configure" conftest.file`

2803

2804

rm -f conftest.file

2805

if test "$[*]" != "X $srcdir/configure conftest.file" \

2806

@@ -758,18 +834,25 @@ fi

2807

INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

2808

AC_SUBST([INSTALL_STRIP_PROGRAM])])

2809

2810

2811

2812

2813

# This file is free software; the Free Software Foundation

2814

# gives unlimited permission to copy and/or distribute it,

2815

# with or without modifications, as long as this notice is preserved.

2816

2817

+# serial 2

2818

2819

# _AM_SUBST_NOTMAKE(VARIABLE)

2820

# ---------------------------

2821

# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.

2822

# This macro is traced by Automake.

2823

AC_DEFUN([_AM_SUBST_NOTMAKE])

2824

2825

+# AM_SUBST_NOTMAKE(VARIABLE)

2826

+# ---------------------------

2827

+# Public sister of _AM_SUBST_NOTMAKE.

2828

+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

2829

2830

# Check how to create a tarball. -*- Autoconf -*-

2831

2832

2833

--- protobuf-2.3.0.orig/config.h.in

2834

+++ protobuf-2.3.0/config.h.in

2835

@@ -100,6 +100,9 @@

2836

/* Define to the one symbol short name of this package. */

2837

#undef PACKAGE_TARNAME

2838

2839

+/* Define to the home page for this package. */

2840

+#undef PACKAGE_URL

2841

2842

/* Define to the version of this package. */

2843

#undef PACKAGE_VERSION

2844

2845

@@ -110,20 +113,30 @@

2846

/* Define to 1 if you have the ANSI C header files. */

2847

#undef STDC_HEADERS

2848

2849

-/* Version number of package */

2850

-#undef VERSION

2851

2852

-/* Define to 1 if on AIX 3.

2853

- System headers sometimes define this.

2854

- We just want to avoid a redefinition error message. */

2855

+/* Enable extensions on AIX 3, Interix. */

2856

#ifndef _ALL_SOURCE

2857

# undef _ALL_SOURCE

2858

#endif

2859

2860

/* Enable GNU extensions on systems that have them. */

2861

#ifndef _GNU_SOURCE

2862

# undef _GNU_SOURCE

2863

#endif

2864

+/* Enable threading extensions on Solaris. */

2865

+#ifndef _POSIX_PTHREAD_SEMANTICS

2866

+# undef _POSIX_PTHREAD_SEMANTICS

2867

+#endif

2868

+/* Enable extensions on HP NonStop. */

2869

+#ifndef _TANDEM_SOURCE

2870

+# undef _TANDEM_SOURCE

2871

+#endif

2872

+/* Enable general extensions on Solaris. */

2873

+#ifndef __EXTENSIONS__

2874

+# undef __EXTENSIONS__

2875

+#endif

2876

2877

2878

+/* Version number of package */

2879

+#undef VERSION

2880

2881

/* Define to 1 if on MINIX. */

2882

#undef _MINIX

2883

@@ -134,14 +147,3 @@

2884

2885

/* Define to 1 if you need to in order for `stat' and other things to work. */

2886

#undef _POSIX_SOURCE

2887

2888

-/* Enable extensions on Solaris. */

2889

-#ifndef __EXTENSIONS__

2890

-# undef __EXTENSIONS__

2891

-#endif

2892

-#ifndef _POSIX_PTHREAD_SEMANTICS

2893

-# undef _POSIX_PTHREAD_SEMANTICS

2894

-#endif

2895

-#ifndef _TANDEM_SOURCE

2896

-# undef _TANDEM_SOURCE

2897

-#endif

2898

--- protobuf-2.3.0.orig/configure

2899

+++ protobuf-2.3.0/configure

2900

@@ -1,62 +1,85 @@

1123

--- protobuf-2.4.0a.orig/configure

1124

+++ protobuf-2.4.0a/configure

1125

@@ -1,13 +1,13 @@

2901

1126

#! /bin/sh

2902

1127

# Guess values for system-dependent variables and create Makefiles.

2903

-# Generated by GNU Autoconf 2.61 for Protocol Buffers 2.3.0.

2904

+# Generated by GNU Autoconf 2.67 for Protocol Buffers 2.3.0.

1128

-# Generated by GNU Autoconf 2.65 for Protocol Buffers 2.4.0a.

1129

+# Generated by GNU Autoconf 2.68 for Protocol Buffers 2.4.0a.

2905

1130

2906

1131

# Report bugs to <protobuf@googlegroups.com>.

2907

1132

2908

1133

2909

1134

2910

-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

1135

-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

1136

-# Inc.

2911

1137

+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software

2912

1138

+# Foundation, Inc.

2913

2914

1139

1140

2915

1141

# This configure script is free software; the Free Software Foundation

2916

# gives unlimited permission to copy, distribute and modify it.

2917

-## --------------------- ##

2918

-## M4sh Initialization. ##

2919

-## --------------------- ##

2920

+## -------------------- ##

2921

+## M4sh Initialization. ##

2922

+## -------------------- ##

2923

2924

# Be more Bourne compatible

2925

DUALCASE=1; export DUALCASE # for MKS sh

2926

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

2927

+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :

2928

emulate sh

2929

NULLCMD=:

2930

- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

2931

+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

2932

# is contrary to our usage. Disable this feature.

2933

alias -g '${1+"$@"}'='"$@"'

2934

setopt NO_GLOB_SUBST

2935

else

2936

- case `(set -o) 2>/dev/null` in

2937

- *posix*) set -o posix ;;

2938

+ case `(set -o) 2>/dev/null` in #(

2939

+ *posix*) :

2940

+ set -o posix ;; #(

2941

+ *) :

2942

+ ;;

2943

esac

2944

2945

2946

2947

2948

2949

2950

-# PATH needs CR

2951

-# Avoid depending upon Character Ranges.

2952

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

2953

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

2954

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

2955

-as_cr_digits='0123456789'

2956

-as_cr_alnum=$as_cr_Letters$as_cr_digits

2957

2958

-# The user is always right.

2959

-if test "${PATH_SEPARATOR+set}" != set; then

2960

- echo "#! /bin/sh" >conf$$.sh

2961

- echo "exit 0" >>conf$$.sh

2962

- chmod +x conf$$.sh

2963

- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

2964

- PATH_SEPARATOR=';'

2965

+as_nl='

2966

2967

+export as_nl

2968

+# Printing a long string crashes Solaris 7 /usr/bin/printf.

2969

+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

2970

+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

2971

+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

2972

+# Prefer a ksh shell builtin over an external printf program on Solaris,

2973

+# but without wasting forks for bash or zsh.

2974

+if test -z "$BASH_VERSION$ZSH_VERSION" \

2975

+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then

2976

+ as_echo='print -r --'

2977

+ as_echo_n='print -rn --'

2978

+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

2979

+ as_echo='printf %s\n'

2980

+ as_echo_n='printf %s'

2981

+else

2982

+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then

2983

+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'

2984

+ as_echo_n='/usr/ucb/echo -n'

2985

else

2986

- PATH_SEPARATOR=:

2987

+ as_echo_body='eval expr "X$1" : "X\$.*\$"'

2988

+ as_echo_n_body='eval

2989

+ arg=$1;

2990

+ case $arg in #(

2991

+ *"$as_nl"*)

2992

+ expr "X$arg" : "X\$.*\$$as_nl";

2993

+ arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;

2994

+ esac;

2995

+ expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"

2996

+ '

2997

+ export as_echo_n_body

2998

+ as_echo_n='sh -c $as_echo_n_body as_echo'

2999

3000

- rm -f conf$$.sh

3001

+ export as_echo_body

3002

+ as_echo='sh -c $as_echo_body as_echo'

3003

3004

3005

-# Support unset when possible.

3006

-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

3007

- as_unset=unset

3008

-else

3009

- as_unset=false

3010

+# The user is always right.

3011

+if test "${PATH_SEPARATOR+set}" != set; then

3012

+ PATH_SEPARATOR=:

3013

+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {

3014

+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||

3015

+ PATH_SEPARATOR=';'

3016

+ }

3017

3018

3019

3020

@@ -65,20 +88,18 @@ fi

3021

# there to prevent editors from complaining about space-tab.

3022

# (If _AS_PATH_WALK were called with IFS unset, it would disable word

3023

# splitting by setting IFS to empty value.)

3024

-as_nl='

3025

1142

@@ -91,6 +91,7 @@ fi

3026

1143

IFS=" "" $as_nl"

3027

1144

3028

1145

# Find who we are. Look in the path if we contain no directory separator.

3029

-case $0 in

3030

+case $0 in #((

1146

+as_myself=

1147

case $0 in #((

3031

1148

*[\\/]* ) as_myself=$0 ;;

3032

1149

*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3033

for as_dir in $PATH

3034

3035

IFS=$as_save_IFS

3036

test -z "$as_dir" && as_dir=.

3037

- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

3038

-done

3039

+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

3040

+ done

3041

IFS=$as_save_IFS

3042

3043

;;

3044

@@ -89,354 +110,322 @@ if test "x$as_myself" = x; then

3045

as_myself=$0

3046

3047

if test ! -f "$as_myself"; then

3048

- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

3049

- { (exit 1); exit 1; }

3050

+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

3051

+ exit 1

3052

3053

3054

-# Work around bugs in pre-3.0 UWIN ksh.

3055

-for as_var in ENV MAIL MAILPATH

3056

-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

3057

+# Unset variables that we do not need and which cause bugs (e.g. in

3058

+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"

3059

+# suppresses any "Segmentation fault" message there. '((' could

3060

+# trigger a bug in pdksh 5.2.14.

3061

+for as_var in BASH_ENV ENV MAIL MAILPATH

3062

+do eval test x\${$as_var+set} = xset \

3063

+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :

3064

done

3065

PS1='$ '

3066

PS2='> '

3067

PS4='+ '

3068

3069

# NLS nuisances.

3070

-for as_var in \

3071

- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \

3072

- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \

3073

- LC_TELEPHONE LC_TIME

3074

-do

3075

- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

3076

- eval $as_var=C; export $as_var

3077

- else

3078

- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

3079

- fi

3080

-done

3081

3082

-# Required to use basename.

3083

-if expr a : '$a$' >/dev/null 2>&1 &&

3084

- test "X`expr 00001 : '.*$...$'`" = X001; then

3085

- as_expr=expr

3086

-else

3087

- as_expr=false

3088

-fi

3089

3090

-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then

3091

- as_basename=basename

3092

-else

3093

- as_basename=false

3094

-fi

3095

3096

3097

-# Name of the executable.

3098

-as_me=`$as_basename -- "$0" ||

3099

-$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

3100

- X"$0" : 'X$//$$' \| \

3101

- X"$0" : 'X$/$' \| . 2>/dev/null ||

3102

-echo X/"$0" |

3103

- sed '/^.*\/$[^/][^/]*$\/*$/{

3104

- s//\1/

3105

- q

3106

- }

3107

- /^X\/$\/\/$$/{

3108

- s//\1/

3109

- q

3110

- }

3111

- /^X\/$\/$.*/{

3112

- s//\1/

3113

- q

3114

- }

3115

- s/.*/./; q'`

3116

+LC_ALL=C

3117

+export LC_ALL

3118

+LANGUAGE=C

3119

+export LANGUAGE

3120

3121

# CDPATH.

3122

-$as_unset CDPATH

3123

3124

+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

3125

3126

if test "x$CONFIG_SHELL" = x; then

3127

- if (eval ":") 2>/dev/null; then

3128

- as_have_required=yes

3129

+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :

3130

+ emulate sh

3131

+ NULLCMD=:

3132

+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which

3133

+ # is contrary to our usage. Disable this feature.

3134

+ alias -g '\${1+\"\$@\"}'='\"\$@\"'

3135

+ setopt NO_GLOB_SUBST

3136

else

3137

- as_have_required=no

3138

+ case \`(set -o) 2>/dev/null\` in #(

3139

+ *posix*) :

3140

+ set -o posix ;; #(

3141

+ *) :

3142

+ ;;

3143

+esac

3144

3145

3146

- if test $as_have_required = yes && (eval ":

3147

-(as_func_return () {

3148

- (exit \$1)

3149

3150

-as_func_success () {

3151

- as_func_return 0

3152

3153

-as_func_failure () {

3154

- as_func_return 1

3155

3156

-as_func_ret_success () {

3157

- return 0

3158

3159

-as_func_ret_failure () {

3160

- return 1

3161

3162

3163

+ as_required="as_fn_return () { (exit \$1); }

3164

+as_fn_success () { as_fn_return 0; }

3165

+as_fn_failure () { as_fn_return 1; }

3166

+as_fn_ret_success () { return 0; }

3167

+as_fn_ret_failure () { return 1; }

3168

3169

exitcode=0

3170

-if as_func_success; then

3171

- :

3172

-else

3173

- exitcode=1

3174

- echo as_func_success failed.

3175

-fi

3176

3177

-if as_func_failure; then

3178

- exitcode=1

3179

- echo as_func_failure succeeded.

3180

-fi

3181

3182

-if as_func_ret_success; then

3183

- :

3184

-else

3185

- exitcode=1

3186

- echo as_func_ret_success failed.

3187

-fi

3188

3189

-if as_func_ret_failure; then

3190

- exitcode=1

3191

- echo as_func_ret_failure succeeded.

3192

-fi

3193

3194

-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then

3195

- :

3196

+as_fn_success || { exitcode=1; echo as_fn_success failed.; }

3197

+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }

3198

+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }

3199

+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }

3200

+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :

3201

3202

+else

3203

+ exitcode=1; echo positional parameters were not saved.

3204

+fi

3205

+test x\$exitcode = x0 || exit 1"

3206

+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO

3207

+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO

3208

+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&

3209

+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1

3210

+test \$(( 1 + 1 )) = 2 || exit 1"

3211

+ if (eval "$as_required") 2>/dev/null; then :

3212

+ as_have_required=yes

3213

else

3214

- exitcode=1

3215

- echo positional parameters were not saved.

3216

+ as_have_required=no

3217

3218

+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :

3219

3220

-test \$exitcode = 0) || { (exit 1); exit 1; }

3221

3222

3223

- as_lineno_1=\$LINENO

3224

- as_lineno_2=\$LINENO

3225

- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&

3226

- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }

3227

-") 2> /dev/null; then

3228

- :

3229

else

3230

- as_candidate_shells=

3231

- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3232

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3233

+as_found=false

3234

for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH

3235

3236

IFS=$as_save_IFS

3237

test -z "$as_dir" && as_dir=.

3238

- case $as_dir in

3239

+ as_found=:

3240

+ case $as_dir in #(

3241

/*)

3242

for as_base in sh bash ksh sh5; do

3243

- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"

3244

+ # Try only shells that exist, to save several forks.

3245

+ as_shell=$as_dir/$as_base

3246

+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&

3247

+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :

3248

+ CONFIG_SHELL=$as_shell as_have_required=yes

3249

+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :

3250

+ break 2

3251

+fi

3252

+fi

3253

done;;

3254

esac

3255

+ as_found=false

3256

done

3257

+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&

3258

+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :

3259

+ CONFIG_SHELL=$SHELL as_have_required=yes

3260

+fi; }

3261

IFS=$as_save_IFS

3262

3263

3264

- for as_shell in $as_candidate_shells $SHELL; do

3265

- # Try only shells that exist, to save several forks.

3266

- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&

3267

- { ("$as_shell") 2> /dev/null <<\_ASEOF

3268

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

3269

- emulate sh

3270

- NULLCMD=:

3271

- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

3272

- # is contrary to our usage. Disable this feature.

3273

- alias -g '${1+"$@"}'='"$@"'

3274

- setopt NO_GLOB_SUBST

3275

-else

3276

- case `(set -o) 2>/dev/null` in

3277

- *posix*) set -o posix ;;

3278

-esac

3279

3280

+ if test "x$CONFIG_SHELL" != x; then :

3281

+ # We cannot yet assume a decent shell, so we have to provide a

3282

+ # neutralization value for shells without unset; and this also

3283

+ # works around shells that cannot unset nonexistent variables.

3284

+ BASH_ENV=/dev/null

3285

+ ENV=/dev/null

3286

+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

3287

+ export CONFIG_SHELL

3288

+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}

3289

+fi

3290

3291

+ if test x$as_have_required = xno; then :

3292

+ $as_echo "$0: This script requires a shell more modern than all"

3293

+ $as_echo "$0: the shells that I found on your system."

3294

+ if test x${ZSH_VERSION+set} = xset ; then

3295

+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"

3296

+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."

3297

+ else

3298

+ $as_echo "$0: Please tell bug-autoconf@gnu.org and

3299

+$0: protobuf@googlegroups.com about your system, including

3300

+$0: any error possibly output before this message. Then

3301

+$0: install a modern shell, or manually run the script

3302

+$0: under such a shell if you do have one."

3303

+ fi

3304

+ exit 1

3305

3306

3307

3308

3309

-_ASEOF

3310

-}; then

3311

- CONFIG_SHELL=$as_shell

3312

- as_have_required=yes

3313

- if { "$as_shell" 2> /dev/null <<\_ASEOF

3314

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

3315

- emulate sh

3316

- NULLCMD=:

3317

- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

3318

- # is contrary to our usage. Disable this feature.

3319

- alias -g '${1+"$@"}'='"$@"'

3320

- setopt NO_GLOB_SUBST

3321

-else

3322

- case `(set -o) 2>/dev/null` in

3323

- *posix*) set -o posix ;;

3324

-esac

3325

3326

3327

3328

3329

3330

-(as_func_return () {

3331

- (exit $1)

3332

3333

-as_func_success () {

3334

- as_func_return 0

3335

3336

-as_func_failure () {

3337

- as_func_return 1

3338

3339

-as_func_ret_success () {

3340

- return 0

3341

3342

-as_func_ret_failure () {

3343

- return 1

3344

3345

3346

-exitcode=0

3347

-if as_func_success; then

3348

- :

3349

-else

3350

- exitcode=1

3351

- echo as_func_success failed.

3352

3353

+SHELL=${CONFIG_SHELL-/bin/sh}

3354

+export SHELL

3355

+# Unset more variables known to interfere with behavior of common tools.

3356

+CLICOLOR_FORCE= GREP_OPTIONS=

3357

+unset CLICOLOR_FORCE GREP_OPTIONS

3358

3359

-if as_func_failure; then

3360

- exitcode=1

3361

- echo as_func_failure succeeded.

3362

-fi

3363

+## --------------------- ##

3364

+## M4sh Shell Functions. ##

3365

+## --------------------- ##

3366

+# as_fn_unset VAR

3367

+# ---------------

3368

+# Portably unset VAR.

3369

+as_fn_unset ()

3370

3371

+ { eval $1=; unset $1;}

3372

3373

+as_unset=as_fn_unset

3374

3375

+# as_fn_set_status STATUS

3376

+# -----------------------

3377

+# Set $? to STATUS, without forking.

3378

+as_fn_set_status ()

3379

3380

+ return $1

3381

+} # as_fn_set_status

3382

3383

+# as_fn_exit STATUS

3384

+# -----------------

3385

+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.

3386

+as_fn_exit ()

3387

3388

+ set +e

3389

+ as_fn_set_status $1

3390

+ exit $1

3391

+} # as_fn_exit

3392

3393

+# as_fn_mkdir_p

3394

+# -------------

3395

+# Create "$as_dir" as a directory, including parents if necessary.

3396

+as_fn_mkdir_p ()

3397

3398

3399

-if as_func_ret_success; then

3400

- :

3401

-else

3402

- exitcode=1

3403

- echo as_func_ret_success failed.

3404

-fi

3405

+ case $as_dir in #(

3406

+ -*) as_dir=./$as_dir;;

3407

+ esac

3408

+ test -d "$as_dir" || eval $as_mkdir_p || {

3409

+ as_dirs=

3410

+ while :; do

3411

+ case $as_dir in #(

3412

+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

3413

+ *) as_qdir=$as_dir;;

3414

+ esac

3415

+ as_dirs="'$as_qdir' $as_dirs"

3416

+ as_dir=`$as_dirname -- "$as_dir" ||

3417

+$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

3418

+ X"$as_dir" : 'X$//$[^/]' \| \

3419

+ X"$as_dir" : 'X$//$$' \| \

3420

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

3421

+$as_echo X"$as_dir" |

3422

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

3423

+ s//\1/

3424

+ q

3425

+ }

3426

+ /^X$\/\/$[^/].*/{

3427

+ s//\1/

3428

+ q

3429

+ }

3430

+ /^X$\/\/$$/{

3431

+ s//\1/

3432

+ q

3433

+ }

3434

+ /^X$\/$.*/{

3435

+ s//\1/

3436

+ q

3437

+ }

3438

+ s/.*/./; q'`

3439

+ test -d "$as_dir" && break

3440

+ done

3441

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

1150

@@ -173,7 +174,15 @@ test x\$exitcode = x0 || exit 1"

1151

as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO

1152

eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&

1153

test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1

1154

-test \$(( 1 + 1 )) = 2 || exit 1"

1155

+test \$(( 1 + 1 )) = 2 || exit 1

1156

1157

+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (

1158

+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

1159

+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO

1160

+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO

1161

+ PATH=/empty FPATH=/empty; export PATH FPATH

1162

+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\

1163

+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"

1164

if (eval "$as_required") 2>/dev/null; then :

1165

as_have_required=yes

1166

else

1167

@@ -216,11 +225,18 @@ IFS=$as_save_IFS

1168

# We cannot yet assume a decent shell, so we have to provide a

1169

# neutralization value for shells without unset; and this also

1170

# works around shells that cannot unset nonexistent variables.

1171

+ # Preserve -v and -x to the replacement shell.

1172

BASH_ENV=/dev/null

1173

ENV=/dev/null

1174

(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

1175

export CONFIG_SHELL

1176

- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}

1177

+ case $- in # ((((

1178

+ *v*x* | *x*v* ) as_opts=-vx ;;

1179

+ *v* ) as_opts=-v ;;

1180

+ *x* ) as_opts=-x ;;

1181

+ * ) as_opts= ;;

1182

+ esac

1183

+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}

1184

1185

1186

if test x$as_have_required = xno; then :

1187

@@ -319,7 +335,7 @@ $as_echo X"$as_dir" |

1188

test -d "$as_dir" && break

1189

done

1190

test -z "$as_dirs" || eval "mkdir $as_dirs"

1191

- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"

3442

1192

+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"

3443

1193

3444

-if as_func_ret_failure; then

3445

- exitcode=1

3446

- echo as_func_ret_failure succeeded.

3447

-fi

3448

3449

-if ( set x; as_func_ret_success y && test x = "$1" ); then

3450

- :

3451

+} # as_fn_mkdir_p

3452

+# as_fn_append VAR VALUE

3453

+# ----------------------

3454

+# Append the text in VALUE to the end of the definition contained in VAR. Take

3455

+# advantage of any shell optimizations that allow amortized linear growth over

3456

+# repeated appends, instead of the typical quadratic growth present in naive

3457

+# implementations.

3458

+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :

3459

+ eval 'as_fn_append ()

3460

+ {

3461

+ eval $1+=\$2

3462

+ }'

3463

else

3464

- exitcode=1

3465

- echo positional parameters were not saved.

3466

-fi

3467

3468

-test $exitcode = 0) || { (exit 1); exit 1; }

3469

3470

3471

- as_lineno_1=$LINENO

3472

- as_lineno_2=$LINENO

3473

- test "x$as_lineno_1" != "x$as_lineno_2" &&

3474

- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }

3475

3476

-_ASEOF

3477

-}; then

3478

- break

3479

-fi

3480

3481

-fi

3482

3483

- done

3484

3485

- if test "x$CONFIG_SHELL" != x; then

3486

- for as_var in BASH_ENV ENV

3487

- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

3488

- done

3489

- export CONFIG_SHELL

3490

- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}

3491

-fi

3492

3493

3494

- if test $as_have_required = no; then

3495

- echo This script requires a shell more modern than all the

3496

- echo shells that I found on your system. Please install a

3497

- echo modern shell, or manually run the script under such a

3498

- echo shell if you do have one.

3499

- { (exit 1); exit 1; }

3500

-fi

3501

3502

3503

-fi

3504

3505

-fi

3506

+ as_fn_append ()

3507

+ {

3508

+ eval $1=\$$1\$2

3509

+ }

3510

+fi # as_fn_append

3511

3512

+# as_fn_arith ARG...

3513

+# ------------------

3514

+# Perform arithmetic evaluation on the ARGs, and store the result in the

3515

+# global $as_val. Take advantage of shells that can avoid forks. The arguments

3516

+# must be portable across $(()) and expr.

3517

+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :

3518

+ eval 'as_fn_arith ()

3519

+ {

3520

+ as_val=$(( $* ))

3521

+ }'

3522

+else

3523

+ as_fn_arith ()

3524

+ {

3525

+ as_val=`expr "$@" || test $? -eq 1`

3526

+ }

3527

+fi # as_fn_arith

3528

3529

3530

-(eval "as_func_return () {

3531

- (exit \$1)

3532

3533

-as_func_success () {

3534

- as_func_return 0

3535

3536

-as_func_failure () {

3537

- as_func_return 1

3538

3539

-as_func_ret_success () {

3540

- return 0

3541

3542

-as_func_ret_failure () {

3543

- return 1

3544

1194

1195

} # as_fn_mkdir_p

1196

@@ -359,19 +375,19 @@ else

1197

fi # as_fn_arith

1198

1199

1200

-# as_fn_error ERROR [LINENO LOG_FD]

1201

-# ---------------------------------

3545

1202

+# as_fn_error STATUS ERROR [LINENO LOG_FD]

3546

1203

+# ----------------------------------------

3547

+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

3548

+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

1204

# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

1205

# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

1206

-# script with status $?, using 1 if that was 0.

3549

1207

+# script with STATUS, using 1 if that was 0.

3550

+as_fn_error ()

3551

1208

as_fn_error ()

1209

{

1210

- as_status=$?; test $as_status -eq 0 && as_status=1

1211

- if test "$3"; then

1212

- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

1213

- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3

3552

1214

+ as_status=$1; test $as_status -eq 0 && as_status=1

3553

1215

+ if test "$4"; then

3554

1216

+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

3555

1217

+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4

3556

+ fi

1218

1219

- $as_echo "$as_me: error: $1" >&2

3557

1220

+ $as_echo "$as_me: error: $2" >&2

3558

+ as_fn_exit $as_status

3559

+} # as_fn_error

3560

3561

-exitcode=0

3562

-if as_func_success; then

3563

- :

3564

+if expr a : '$a$' >/dev/null 2>&1 &&

3565

+ test "X`expr 00001 : '.*$...$'`" = X001; then

3566

+ as_expr=expr

3567

else

3568

- exitcode=1

3569

- echo as_func_success failed.

3570

-fi

3571

3572

-if as_func_failure; then

3573

- exitcode=1

3574

- echo as_func_failure succeeded.

3575

+ as_expr=false

3576

3577

3578

-if as_func_ret_success; then

3579

- :

3580

+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then

3581

+ as_basename=basename

3582

else

3583

- exitcode=1

3584

- echo as_func_ret_success failed.

3585

-fi

3586

3587

-if as_func_ret_failure; then

3588

- exitcode=1

3589

- echo as_func_ret_failure succeeded.

3590

+ as_basename=false

3591

3592

3593

-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then

3594

- :

3595

+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

3596

+ as_dirname=dirname

3597

else

3598

- exitcode=1

3599

- echo positional parameters were not saved.

3600

+ as_dirname=false

3601

3602

3603

-test \$exitcode = 0") || {

3604

- echo No shell found that supports shell functions.

3605

- echo Please tell autoconf@gnu.org about your system,

3606

- echo including any error possibly output before this

3607

- echo message

3608

3609

+as_me=`$as_basename -- "$0" ||

3610

+$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

3611

+ X"$0" : 'X$//$$' \| \

3612

+ X"$0" : 'X$/$' \| . 2>/dev/null ||

3613

+$as_echo X/"$0" |

3614

+ sed '/^.*\/$[^/][^/]*$\/*$/{

3615

+ s//\1/

3616

+ q

3617

+ }

3618

+ /^X\/$\/\/$$/{

3619

+ s//\1/

3620

+ q

3621

+ }

3622

+ /^X\/$\/$.*/{

3623

+ s//\1/

3624

+ q

3625

+ }

3626

+ s/.*/./; q'`

3627

3628

+# Avoid depending upon Character Ranges.

3629

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

3630

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

3631

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

3632

+as_cr_digits='0123456789'

3633

+as_cr_alnum=$as_cr_Letters$as_cr_digits

3634

3635

3636

- as_lineno_1=$LINENO

3637

- as_lineno_2=$LINENO

3638

- test "x$as_lineno_1" != "x$as_lineno_2" &&

3639

- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {

3640

3641

- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO

3642

- # uniformly replaced by the line number. The first 'sed' inserts a

3643

- # line-number line after each line using $LINENO; the second 'sed'

3644

- # does the real work. The second script uses 'N' to pair each

3645

- # line-number line with the line containing $LINENO, and appends

3646

- # trailing '-' during substitution so that $LINENO is not a special

3647

- # case at line end.

3648

- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

3649

- # scripts with optimization help from Paolo Bonzini. Blame Lee

3650

- # E. McMahon (1931-1989) for sed's syntax. :-)

3651

+ as_lineno_1=$LINENO as_lineno_1a=$LINENO

3652

+ as_lineno_2=$LINENO as_lineno_2a=$LINENO

3653

+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&

3654

+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {

3655

+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)

3656

sed -n '

3657

3658

/[$]LINENO/=

3659

@@ -453,8 +442,7 @@ test \$exitcode = 0") || {

3660

s/-\n.*//

3661

' >$as_me.lineno &&

3662

chmod +x "$as_me.lineno" ||

3663

- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

3664

- { (exit 1); exit 1; }; }

3665

+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }

3666

3667

# Don't try to exec as it changes $[0], causing all sort of problems

3668

# (the dirname of $[0] is not the place where we might find the

3669

@@ -464,49 +452,40 @@ test \$exitcode = 0") || {

3670

exit

3671

}

3672

3673

3674

-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

3675

- as_dirname=dirname

3676

-else

3677

- as_dirname=false

3678

-fi

3679

3680

ECHO_C= ECHO_N= ECHO_T=

3681

-case `echo -n x` in

3682

+case `echo -n x` in #(((((

3683

-n*)

3684

- case `echo 'x\c'` in

3685

+ case `echo 'xy\c'` in

3686

*c*) ECHO_T=' ';; # ECHO_T is single tab character.

3687

- *) ECHO_C='\c';;

3688

+ xy) ECHO_C='\c';;

3689

+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null

3690

+ ECHO_T=' ';;

3691

esac;;

3692

3693

ECHO_N='-n';;

3694

esac

3695

3696

-if expr a : '$a$' >/dev/null 2>&1 &&

3697

- test "X`expr 00001 : '.*$...$'`" = X001; then

3698

- as_expr=expr

3699

-else

3700

- as_expr=false

3701

-fi

3702

3703

rm -f conf$$ conf$$.exe conf$$.file

3704

if test -d conf$$.dir; then

3705

rm -f conf$$.dir/conf$$.file

3706

else

3707

rm -f conf$$.dir

3708

- mkdir conf$$.dir

3709

+ mkdir conf$$.dir 2>/dev/null

3710

3711

-echo >conf$$.file

3712

-if ln -s conf$$.file conf$$ 2>/dev/null; then

3713

- as_ln_s='ln -s'

3714

- # ... but there are two gotchas:

3715

- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

3716

- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

3717

- # In both cases, we have to default to `cp -p'.

3718

- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

3719

+if (echo >conf$$.file) 2>/dev/null; then

3720

+ if ln -s conf$$.file conf$$ 2>/dev/null; then

3721

+ as_ln_s='ln -s'

3722

+ # ... but there are two gotchas:

3723

+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

3724

+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

3725

+ # In both cases, we have to default to `cp -p'.

3726

+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

3727

+ as_ln_s='cp -p'

3728

+ elif ln conf$$.file conf$$ 2>/dev/null; then

3729

+ as_ln_s=ln

3730

+ else

3731

as_ln_s='cp -p'

3732

-elif ln conf$$.file conf$$ 2>/dev/null; then

3733

- as_ln_s=ln

3734

+ fi

3735

else

3736

as_ln_s='cp -p'

3737

3738

@@ -514,7 +493,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$

3739

rmdir conf$$.dir 2>/dev/null

3740

3741

if mkdir -p . 2>/dev/null; then

3742

- as_mkdir_p=:

3743

+ as_mkdir_p='mkdir -p "$as_dir"'

3744

else

3745

test -d ./-p && rmdir ./-p

3746

as_mkdir_p=false

3747

@@ -531,12 +510,12 @@ else

3748

as_test_x='

3749

eval sh -c '\''

3750

if test -d "$1"; then

3751

- test -d "$1/.";

3752

+ test -d "$1/.";

3753

else

3754

- case $1 in

3755

- -*)set "./$1";;

3756

+ case $1 in #(

3757

+ -*)set "./$1";;

3758

esac;

3759

- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

3760

+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((

3761

???[sx]*):;;*)false;;esac;fi

3762

'\'' sh

3763

3764

@@ -551,7 +530,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr

3765

3766

3767

3768

3769

# Check that we are running under the correct shell.

1221

as_fn_exit $as_status

1222

} # as_fn_error

1223

1224

@@ -528,161 +544,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P

1225

# Sed expression to map a string onto a valid variable name.

1226

as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

1227

1228

1229

1230

-# Check that we are running under the correct shell.

3770

1231

SHELL=${CONFIG_SHELL-/bin/sh}

3771

1232

3772

@@ -700,10 +678,11 @@ fi

3773

3774

3775

3776

-exec 7<&0 </dev/null 6>&1

3777

+test -n "$DJDIR" || exec 7<&0 </dev/null

3778

+exec 6>&1

1233

-case X$lt_ECHO in

1234

-X*--fallback-echo)

1235

- # Remove one level of quotation (which was required for Make).

1236

- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`

1237

- ;;

1238

-esac

1239

1240

-ECHO=${lt_ECHO-echo}

1241

-if test "X$1" = X--no-reexec; then

1242

- # Discard the --no-reexec flag, and continue.

1243

- shift

1244

-elif test "X$1" = X--fallback-echo; then

1245

- # Avoid inline document here, it may be left over

1246

- :

1247

-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then

1248

- # Yippee, $ECHO works!

1249

- :

1250

-else

1251

- # Restart under the correct shell.

1252

- exec $SHELL "$0" --no-reexec ${1+"$@"}

1253

-fi

1254

1255

-if test "X$1" = X--fallback-echo; then

1256

- # used as fallback echo

1257

- shift

1258

- cat <<_LT_EOF

1259

-$*

1260

-_LT_EOF

1261

- exit 0

1262

-fi

1263

1264

-# The HP-UX ksh and POSIX shell print the target directory to stdout

1265

-# if CDPATH is set.

1266

-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

1267

1268

-if test -z "$lt_ECHO"; then

1269

- if test "X${echo_test_string+set}" != Xset; then

1270

- # find a string as large as possible, as long as the shell can cope with it

1271

- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do

1272

- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...

1273

- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&

1274

- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null

1275

- then

1276

- break

1277

- fi

1278

- done

1279

- fi

1280

1281

- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&

1282

- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&

1283

- test "X$echo_testing_string" = "X$echo_test_string"; then

1284

- :

1285

- else

1286

- # The Solaris, AIX, and Digital Unix default echo programs unquote

1287

- # backslashes. This makes it impossible to quote backslashes using

1288

- # echo "$something" | sed 's/\\/\\\\/g'

1289

- #

1290

- # So, first we look for a working echo in the user's PATH.

1291

1292

- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

1293

- for dir in $PATH /usr/ucb; do

1294

- IFS="$lt_save_ifs"

1295

- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&

1296

- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&

1297

- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&

1298

- test "X$echo_testing_string" = "X$echo_test_string"; then

1299

- ECHO="$dir/echo"

1300

- break

1301

- fi

1302

- done

1303

- IFS="$lt_save_ifs"

1304

1305

- if test "X$ECHO" = Xecho; then

1306

- # We didn't find a better echo, so look for alternatives.

1307

- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&

1308

- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&

1309

- test "X$echo_testing_string" = "X$echo_test_string"; then

1310

- # This shell has a builtin print -r that does the trick.

1311

- ECHO='print -r'

1312

- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&

1313

- test "X$CONFIG_SHELL" != X/bin/ksh; then

1314

- # If we have ksh, try running configure again with it.

1315

- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}

1316

- export ORIGINAL_CONFIG_SHELL

1317

- CONFIG_SHELL=/bin/ksh

1318

- export CONFIG_SHELL

1319

- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}

1320

- else

1321

- # Try using printf.

1322

- ECHO='printf %s\n'

1323

- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&

1324

- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&

1325

- test "X$echo_testing_string" = "X$echo_test_string"; then

1326

- # Cool, printf works

1327

- :

1328

- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&

1329

- test "X$echo_testing_string" = 'X\t' &&

1330

- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&

1331

- test "X$echo_testing_string" = "X$echo_test_string"; then

1332

- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL

1333

- export CONFIG_SHELL

1334

- SHELL="$CONFIG_SHELL"

1335

- export SHELL

1336

- ECHO="$CONFIG_SHELL $0 --fallback-echo"

1337

- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&

1338

- test "X$echo_testing_string" = 'X\t' &&

1339

- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&

1340

- test "X$echo_testing_string" = "X$echo_test_string"; then

1341

- ECHO="$CONFIG_SHELL $0 --fallback-echo"

1342

- else

1343

- # maybe with a smaller string...

1344

- prev=:

1345

1346

- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do

1347

- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null

1348

- then

1349

- break

1350

- fi

1351

- prev="$cmd"

1352

- done

1353

1354

- if test "$prev" != 'sed 50q "$0"'; then

1355

- echo_test_string=`eval $prev`

1356

- export echo_test_string

1357

- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}

1358

- else

1359

- # Oops. We lost completely, so just stick with echo.

1360

- ECHO=echo

1361

- fi

1362

- fi

1363

- fi

1364

- fi

1365

- fi

1366

-fi

1367

1368

-# Copy echo and quote the copy suitably for passing to libtool from

1369

-# the Makefile, instead of quoting the original, which is used later.

1370

-lt_ECHO=$ECHO

1371

-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then

1372

- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"

1373

-fi

1374

1375

1376

1377

1378

test -n "$DJDIR" || exec 7<&0 </dev/null

1379

exec 6>&1

3779

1380

3780

1381

# Name of the host.

3781

1382

-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,

3783

1384

# so uname gets run too.

3784

1385

ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`

3785

1386

3786

@@ -718,7 +697,6 @@ cross_compiling=no

3787

subdirs=

3788

MFLAGS=

3789

MAKEFLAGS=

3790

-SHELL=${CONFIG_SHELL-/bin/sh}

3791

3792

# Identity of this package.

3793

PACKAGE_NAME='Protocol Buffers'

3794

@@ -726,6 +704,7 @@ PACKAGE_TARNAME='protobuf'

3795

PACKAGE_VERSION='2.3.0'

3796

PACKAGE_STRING='Protocol Buffers 2.3.0'

3797

PACKAGE_BUGREPORT='protobuf@googlegroups.com'

3798

+PACKAGE_URL=''

3799

3800

ac_unique_file="src/google/protobuf/message.cc"

3801

# Factoring default headers for most tests.

3802

@@ -764,136 +743,155 @@ ac_includes_default="\

3803

# include <unistd.h>

3804

#endif"

3805

3806

-ac_subst_vars='SHELL

3807

-PATH_SEPARATOR

3808

-PACKAGE_NAME

3809

-PACKAGE_TARNAME

3810

-PACKAGE_VERSION

3811

-PACKAGE_STRING

3812

-PACKAGE_BUGREPORT

3813

-exec_prefix

3814

-prefix

3815

-program_transform_name

3816

-bindir

3817

-sbindir

3818

-libexecdir

3819

-datarootdir

3820

-datadir

3821

-sysconfdir

3822

-sharedstatedir

3823

-localstatedir

3824

-includedir

3825

-oldincludedir

3826

-docdir

3827

-infodir

3828

-htmldir

3829

-dvidir

3830

-pdfdir

3831

-psdir

3832

-libdir

3833

-localedir

3834

-mandir

3835

-DEFS

3836

-ECHO_C

3837

-ECHO_N

3838

-ECHO_T

3839

-LIBS

3840

-build_alias

3841

-host_alias

3842

-target_alias

3843

-build

3844

-build_cpu

3845

-build_vendor

3846

-build_os

3847

-host

3848

-host_cpu

3849

-host_vendor

3850

-host_os

3851

-target

3852

-target_cpu

3853

-target_vendor

3854

-target_os

3855

-INSTALL_PROGRAM

3856

-INSTALL_SCRIPT

3857

-INSTALL_DATA

3858

-am__isrc

3859

-CYGPATH_W

3860

-PACKAGE

3861

-VERSION

3862

-ACLOCAL

3863

-AUTOCONF

3864

-AUTOMAKE

3865

-AUTOHEADER

3866

-MAKEINFO

3867

-install_sh

3868

-STRIP

3869

-INSTALL_STRIP_PROGRAM

3870

-mkdir_p

3871

-AWK

3872

-SET_MAKE

3873

-am__leading_dot

3874

-AMTAR

3875

-am__tar

3876

-am__untar

3877

-CC

3878

-CFLAGS

3879

-LDFLAGS

3880

-CPPFLAGS

3881

-ac_ct_CC

3882

-EXEEXT

3883

-OBJEXT

3884

-DEPDIR

3885

-am__include

3886

-am__quote

3887

-AMDEP_TRUE

3888

-AMDEP_FALSE

3889

-AMDEPBACKSLASH

3890

-CCDEPMODE

3891

-am__fastdepCC_TRUE

3892

-am__fastdepCC_FALSE

3893

-CXX

3894

-CXXFLAGS

3895

-ac_ct_CXX

3896

-CXXDEPMODE

3897

-am__fastdepCXX_TRUE

3898

-am__fastdepCXX_FALSE

3899

-CXXCPP

3900

-GREP

3901

-EGREP

3902

-GCC_TRUE

3903

-GCC_FALSE

3904

-PROTOBUF_OPT_FLAG

3905

-ISAINFO

3906

-LIBTOOL

3907

-SED

3908

-FGREP

3909

-LD

3910

-DUMPBIN

3911

-ac_ct_DUMPBIN

3912

-NM

3913

-LN_S

3914

-AR

3915

-RANLIB

1387

@@ -764,9 +633,11 @@ OTOOL

1388

LIPO

1389

NMEDIT

1390

DSYMUTIL

3916

1391

-lt_ECHO

3917

-DSYMUTIL

3918

-NMEDIT

3919

-LIPO

3920

-OTOOL

3921

-OTOOL64

3922

-LIBOBJS

3923

-POW_LIB

3924

-HAVE_ZLIB_TRUE

3925

-HAVE_ZLIB_FALSE

3926

-PROTOC

3927

-USE_EXTERNAL_PROTOC_TRUE

3928

-USE_EXTERNAL_PROTOC_FALSE

3929

-acx_pthread_config

3930

-PTHREAD_CC

3931

-PTHREAD_LIBS

3932

-PTHREAD_CFLAGS

3933

+enable_option_checking=no

3934

+ac_subst_vars='am__EXEEXT_FALSE

3935

+am__EXEEXT_TRUE

3936

+LTLIBOBJS

3937

subdirs

3938

-LTLIBOBJS'

3939

+PTHREAD_CFLAGS

3940

+PTHREAD_LIBS

3941

+PTHREAD_CC

3942

+acx_pthread_config

3943

+USE_EXTERNAL_PROTOC_FALSE

3944

+USE_EXTERNAL_PROTOC_TRUE

3945

+PROTOC

3946

+HAVE_ZLIB_FALSE

3947

+HAVE_ZLIB_TRUE

3948

+POW_LIB

3949

+LIBOBJS

3950

+OTOOL64

3951

+OTOOL

3952

+LIPO

3953

+NMEDIT

3954

+DSYMUTIL

3955

+lt_ECHO

3956

+RANLIB

3957

+AR

3958

+OBJDUMP

3959

+LN_S

3960

+NM

3961

+ac_ct_DUMPBIN

3962

+DUMPBIN

3963

+LD

3964

+FGREP

3965

+SED

3966

+LIBTOOL

3967

+ISAINFO

3968

+PROTOBUF_OPT_FLAG

3969

+GCC_FALSE

3970

+GCC_TRUE

3971

+EGREP

3972

+GREP

3973

+CXXCPP

3974

+am__fastdepCXX_FALSE

3975

+am__fastdepCXX_TRUE

3976

+CXXDEPMODE

3977

+ac_ct_CXX

3978

+CXXFLAGS

3979

+CXX

3980

+am__fastdepCC_FALSE

3981

+am__fastdepCC_TRUE

3982

+CCDEPMODE

3983

+AMDEPBACKSLASH

3984

+AMDEP_FALSE

3985

+AMDEP_TRUE

3986

+am__quote

3987

+am__include

3988

+DEPDIR

3989

+OBJEXT

3990

+EXEEXT

3991

+ac_ct_CC

3992

+CPPFLAGS

3993

+LDFLAGS

3994

+CFLAGS

3995

+CC

3996

+am__untar

3997

+am__tar

3998

+AMTAR

3999

+am__leading_dot

4000

+SET_MAKE

4001

+AWK

4002

+mkdir_p

4003

+MKDIR_P

4004

+INSTALL_STRIP_PROGRAM

4005

+STRIP

4006

+install_sh

4007

+MAKEINFO

4008

+AUTOHEADER

4009

+AUTOMAKE

4010

+AUTOCONF

4011

+ACLOCAL

4012

+VERSION

4013

+PACKAGE

4014

+CYGPATH_W

4015

+am__isrc

4016

+INSTALL_DATA

4017

+INSTALL_SCRIPT

4018

+INSTALL_PROGRAM

4019

+target_os

4020

+target_vendor

4021

+target_cpu

4022

+target

4023

+host_os

4024

+host_vendor

4025

+host_cpu

4026

+host

4027

+build_os

4028

+build_vendor

4029

+build_cpu

4030

+build

4031

+target_alias

4032

+host_alias

4033

+build_alias

4034

+LIBS

4035

+ECHO_T

4036

+ECHO_N

4037

+ECHO_C

4038

+DEFS

4039

+mandir

4040

+localedir

4041

+libdir

4042

+psdir

4043

+pdfdir

4044

+dvidir

4045

+htmldir

4046

+infodir

4047

+docdir

4048

+oldincludedir

4049

+includedir

4050

+localstatedir

4051

+sharedstatedir

4052

+sysconfdir

4053

+datadir

4054

+datarootdir

4055

+libexecdir

4056

+sbindir

4057

+bindir

4058

+program_transform_name

4059

+prefix

4060

+exec_prefix

4061

+PACKAGE_URL

4062

+PACKAGE_BUGREPORT

4063

+PACKAGE_STRING

4064

+PACKAGE_VERSION

4065

+PACKAGE_TARNAME

4066

+PACKAGE_NAME

4067

+PATH_SEPARATOR

4068

+SHELL'

4069

ac_subst_files=''

4070

+ac_user_opts='

4071

+enable_option_checking

4072

+with_zlib

4073

+with_protoc

4074

+enable_dependency_tracking

4075

+enable_64bit_solaris

4076

+enable_shared

4077

+enable_static

4078

+with_pic

4079

+enable_fast_install

4080

+with_gnu_ld

4081

+enable_libtool_lock

4082

1392

+MANIFEST_TOOL

1393

RANLIB

1394

+ac_ct_AR

1395

1396

+DLLTOOL

1397

OBJDUMP

1398

LN_S

1399

1400

@@ -890,6 +761,7 @@ enable_static

1401

with_pic

1402

enable_fast_install

1403

with_gnu_ld

1404

+with_sysroot

1405

enable_libtool_lock

1406

4083

1407

ac_precious_vars='build_alias

4084

host_alias

4085

target_alias

4086

@@ -911,6 +909,8 @@ ac_subdirs_all='gtest'

4087

# Initialize some variables set by options.

4088

ac_init_help=

4089

ac_init_version=false

4090

+ac_unrecognized_opts=

4091

+ac_unrecognized_sep=

4092

# The variables have the same names as the options, with

4093

# dashes changed to underlines.

4094

cache_file=/dev/null

4095

@@ -966,8 +966,9 @@ do

1408

@@ -966,8 +838,9 @@ do

4096

1409

4097

1410

4098

1411

case $ac_option in

4104

1417

esac

4105

1418

4106

1419

# Accept the important Cygnus configure options, so we can diagnose typos.

4107

@@ -1009,13 +1010,20 @@ do

4108

datarootdir=$ac_optarg ;;

4109

4110

-disable-* | --disable-*)

4111

- ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'`

4112

+ ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`

4113

# Reject names that are not valid shell variable names.

4114

- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&

4115

- { echo "$as_me: error: invalid feature name: $ac_feature" >&2

4116

- { (exit 1); exit 1; }; }

4117

- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`

4118

- eval enable_$ac_feature=no ;;

4119

+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

4120

+ as_fn_error $? "invalid feature name: $ac_useropt"

4121

+ ac_useropt_orig=$ac_useropt

4122

+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

4123

+ case $ac_user_opts in

4124

+ *"

4125

+"enable_$ac_useropt"

4126

+"*) ;;

4127

+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"

4128

+ ac_unrecognized_sep=', ';;

4129

+ esac

4130

+ eval enable_$ac_useropt=no ;;

4131

4132

-docdir | --docdir | --docdi | --doc | --do)

4133

ac_prev=docdir ;;

4134

@@ -1028,13 +1036,20 @@ do

4135

dvidir=$ac_optarg ;;

4136

4137

-enable-* | --enable-*)

4138

- ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`

4139

+ ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`

4140

# Reject names that are not valid shell variable names.

4141

- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&

4142

- { echo "$as_me: error: invalid feature name: $ac_feature" >&2

4143

- { (exit 1); exit 1; }; }

4144

- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`

4145

- eval enable_$ac_feature=\$ac_optarg ;;

4146

+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

4147

+ as_fn_error $? "invalid feature name: $ac_useropt"

4148

+ ac_useropt_orig=$ac_useropt

4149

+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

4150

+ case $ac_user_opts in

4151

+ *"

4152

+"enable_$ac_useropt"

4153

+"*) ;;

4154

+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"

4155

+ ac_unrecognized_sep=', ';;

4156

+ esac

4157

+ eval enable_$ac_useropt=\$ac_optarg ;;

4158

4159

-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \

4160

4161

@@ -1225,22 +1240,36 @@ do

4162

ac_init_version=: ;;

4163

4164

-with-* | --with-*)

4165

- ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'`

4166

+ ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`

4167

# Reject names that are not valid shell variable names.

4168

- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&

4169

- { echo "$as_me: error: invalid package name: $ac_package" >&2

4170

- { (exit 1); exit 1; }; }

4171

- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`

4172

- eval with_$ac_package=\$ac_optarg ;;

4173

+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

4174

+ as_fn_error $? "invalid package name: $ac_useropt"

4175

+ ac_useropt_orig=$ac_useropt

4176

+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

4177

+ case $ac_user_opts in

4178

+ *"

4179

+"with_$ac_useropt"

4180

+"*) ;;

4181

+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"

4182

+ ac_unrecognized_sep=', ';;

4183

+ esac

4184

+ eval with_$ac_useropt=\$ac_optarg ;;

4185

4186

-without-* | --without-*)

4187

- ac_package=`expr "x$ac_option" : 'x-*without-$.*$'`

4188

+ ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`

4189

# Reject names that are not valid shell variable names.

4190

- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&

4191

- { echo "$as_me: error: invalid package name: $ac_package" >&2

4192

- { (exit 1); exit 1; }; }

4193

- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`

4194

- eval with_$ac_package=no ;;

4195

+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

4196

+ as_fn_error $? "invalid package name: $ac_useropt"

4197

+ ac_useropt_orig=$ac_useropt

4198

+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

4199

+ case $ac_user_opts in

4200

+ *"

4201

+"with_$ac_useropt"

4202

+"*) ;;

4203

+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"

4204

+ ac_unrecognized_sep=', ';;

4205

+ esac

4206

+ eval with_$ac_useropt=no ;;

4207

4208

--x)

4209

# Obsolete; use --with-x.

4210

@@ -1260,25 +1289,25 @@ do

1420

@@ -1012,7 +885,7 @@ do

1421

ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`

1422

# Reject names that are not valid shell variable names.

1423

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

1424

- as_fn_error "invalid feature name: $ac_useropt"

1425

+ as_fn_error $? "invalid feature name: $ac_useropt"

1426

ac_useropt_orig=$ac_useropt

1427

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

1428

case $ac_user_opts in

1429

@@ -1038,7 +911,7 @@ do

1430

ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`

1431

# Reject names that are not valid shell variable names.

1432

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

1433

- as_fn_error "invalid feature name: $ac_useropt"

1434

+ as_fn_error $? "invalid feature name: $ac_useropt"

1435

ac_useropt_orig=$ac_useropt

1436

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

1437

case $ac_user_opts in

1438

@@ -1242,7 +1115,7 @@ do

1439

ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`

1440

# Reject names that are not valid shell variable names.

1441

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

1442

- as_fn_error "invalid package name: $ac_useropt"

1443

+ as_fn_error $? "invalid package name: $ac_useropt"

1444

ac_useropt_orig=$ac_useropt

1445

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

1446

case $ac_user_opts in

1447

@@ -1258,7 +1131,7 @@ do

1448

ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`

1449

# Reject names that are not valid shell variable names.

1450

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

1451

- as_fn_error "invalid package name: $ac_useropt"

1452

+ as_fn_error $? "invalid package name: $ac_useropt"

1453

ac_useropt_orig=$ac_useropt

1454

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

1455

case $ac_user_opts in

1456

@@ -1288,8 +1161,8 @@ do

4211

1457

4212

1458

x_libraries=$ac_optarg ;;

4213

1459

4214

- -*) { echo "$as_me: error: unrecognized option: $ac_option

4215

-Try \`$0 --help' for more information." >&2

4216

- { (exit 1); exit 1; }; }

1460

- -*) as_fn_error "unrecognized option: \`$ac_option'

1461

-Try \`$0 --help' for more information."

4217

1462

+ -*) as_fn_error $? "unrecognized option: \`$ac_option'

4218

1463

+Try \`$0 --help' for more information"

4219

1464

;;

4220

1465

4221

1466

*=*)

4222

ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`

1467

@@ -1297,7 +1170,7 @@ Try \`$0 --help' for more information."

4223

1468

# Reject names that are not valid shell variable names.

4224

- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&

4225

- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2

4226

- { (exit 1); exit 1; }; }

4227

+ case $ac_envvar in #(

4228

+ '' | [0-9]* | *[!_$as_cr_alnum]* )

1469

case $ac_envvar in #(

1470

'' | [0-9]* | *[!_$as_cr_alnum]* )

1471

- as_fn_error "invalid variable name: \`$ac_envvar'" ;;

4229

1472

+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;

4230

+ esac

1473

esac

4231

1474

eval $ac_envvar=\$ac_optarg

4232

1475

export $ac_envvar ;;

4233

4234

4235

# FIXME: should be removed in autoconf 3.0.

4236

- echo "$as_me: WARNING: you should use --build, --host, --target" >&2

4237

+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2

1476

@@ -1307,7 +1180,7 @@ Try \`$0 --help' for more information."

1477

$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2

4238

1478

expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&

4239

- echo "$as_me: WARNING: invalid host type: $ac_option" >&2

4240

+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2

4241

: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}

1479

$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2

1480

- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}

1481

+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"

4242

1482

;;

4243

1483

4244

@@ -1287,23 +1316,36 @@ done

1484

esac

1485

@@ -1315,13 +1188,13 @@ done

4245

1486

4246

1487

if test -n "$ac_prev"; then

4247

1488

ac_option=--`echo $ac_prev | sed 's/_/-/g'`

4248

- { echo "$as_me: error: missing argument to $ac_option" >&2

4249

- { (exit 1); exit 1; }; }

1489

- as_fn_error "missing argument to $ac_option"

4250

1490

+ as_fn_error $? "missing argument to $ac_option"

4251

+fi

4252

4253

+if test -n "$ac_unrecognized_opts"; then

4254

+ case $enable_option_checking in

4255

+ no) ;;

1491

1492

1493

if test -n "$ac_unrecognized_opts"; then

1494

case $enable_option_checking in

1495

no) ;;

1496

- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;

4256

1497

+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;

4257

+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;

4258

+ esac

1498

*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;

1499

esac

4259

1500

4260

4261

-# Be sure to have absolute directory names.

4262

+# Check all directory arguments for consistency.

4263

for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \

4264

datadir sysconfdir sharedstatedir localstatedir includedir \

4265

oldincludedir docdir infodir htmldir dvidir pdfdir psdir \

4266

libdir localedir mandir

4267

4268

eval ac_val=\$$ac_var

4269

+ # Remove trailing slashes.

4270

+ case $ac_val in

4271

+ */ )

4272

+ ac_val=`expr "X$ac_val" : 'X$.*[^/]$' \| "X$ac_val" : 'X$.*$'`

4273

+ eval $ac_var=\$ac_val;;

4274

+ esac

4275

+ # Be sure to have absolute directory names.

4276

case $ac_val in

1501

@@ -1344,7 +1217,7 @@ do

4277

1502

[\\/$]* | ?:[\\/]* ) continue;;

4278

1503

NONE | '' ) case $ac_var in *prefix ) continue;; esac;;

4279

1504

esac

4280

- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2

4281

- { (exit 1); exit 1; }; }

1505

- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"

4282

1506

+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"

4283

1507

done

4284

1508

4285

1509

# There might be people who depend on the old broken behavior: `$host'

4286

@@ -1317,8 +1359,8 @@ target=$target_alias

1510

@@ -1358,8 +1231,8 @@ target=$target_alias

4287

1511

if test "x$host_alias" != x; then

4288

1512

if test "x$build_alias" = x; then

4289

1513

cross_compiling=maybe

4290

- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.

1514

- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.

4291

1515

- If a cross compiler is detected then cross compile mode will be used." >&2

4292

1516

+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.

4293

1517

+ If a cross compiler is detected then cross compile mode will be used" >&2

4294

1518

elif test "x$build_alias" != "x$host_alias"; then

4295

1519

cross_compiling=yes

4296

1520

4297

@@ -1333,23 +1375,21 @@ test "$silent" = yes && exec 6>/dev/null

1521

@@ -1374,9 +1247,9 @@ test "$silent" = yes && exec 6>/dev/null

4298

1522

ac_pwd=`pwd` && test -n "$ac_pwd" &&

4299

1523

ac_ls_di=`ls -di .` &&

4300

1524

ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||

4301

- { echo "$as_me: error: Working directory cannot be determined" >&2

4302

- { (exit 1); exit 1; }; }

1525

- as_fn_error "working directory cannot be determined"

4303

1526

+ as_fn_error $? "working directory cannot be determined"

4304

1527

test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||

4305

- { echo "$as_me: error: pwd does not report name of working directory" >&2

4306

- { (exit 1); exit 1; }; }

1528

- as_fn_error "pwd does not report name of working directory"

4307

1529

+ as_fn_error $? "pwd does not report name of working directory"

4308

1530

4309

1531

4310

1532

# Find the source files, if location was not specified.

4311

if test -z "$srcdir"; then

4312

ac_srcdir_defaulted=yes

4313

# Try the directory containing this script, then the parent directory.

4314

- ac_confdir=`$as_dirname -- "$0" ||

4315

-$as_expr X"$0" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

4316

- X"$0" : 'X$//$[^/]' \| \

4317

- X"$0" : 'X$//$$' \| \

4318

- X"$0" : 'X$/$' \| . 2>/dev/null ||

4319

-echo X"$0" |

4320

+ ac_confdir=`$as_dirname -- "$as_myself" ||

4321

+$as_expr X"$as_myself" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

4322

+ X"$as_myself" : 'X$//$[^/]' \| \

4323

+ X"$as_myself" : 'X$//$$' \| \

4324

+ X"$as_myself" : 'X$/$' \| . 2>/dev/null ||

4325

+$as_echo X"$as_myself" |

4326

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

4327

s//\1/

4328

4329

@@ -1376,13 +1416,11 @@ else

1533

@@ -1415,11 +1288,11 @@ else

4330

1534

4331

1535

if test ! -r "$srcdir/$ac_unique_file"; then

4332

1536

test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."

4333

- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2

4334

- { (exit 1); exit 1; }; }

1537

- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"

4335

1538

+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"

4336

1539

4337

1540

ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"

4338

1541

ac_abs_confdir=`(

4339

- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2

4340

- { (exit 1); exit 1; }; }

1542

- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"

4341

1543

+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"

4342

1544

pwd)`

4343

1545

# When building in place, set srcdir=.

4344

1546

if test "$ac_abs_confdir" = "$ac_pwd"; then

4345

@@ -1422,7 +1460,7 @@ Configuration:

1547

@@ -1459,7 +1332,7 @@ Configuration:

4346

1548

--help=short display options specific to this package

4347

1549

--help=recursive display the short help of all the included packages

4348

1550

-V, --version display version information and exit

4351

1553

--cache-file=FILE cache test results in FILE [disabled]

4352

1554

-C, --config-cache alias for \`--cache-file=config.cache'

4353

1555

-n, --no-create do not create output files

4354

@@ -1430,9 +1468,9 @@ Configuration:

4355

4356

Installation directories:

4357

--prefix=PREFIX install architecture-independent files in PREFIX

4358

- [$ac_default_prefix]

4359

+ [$ac_default_prefix]

4360

--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX

4361

- [PREFIX]

4362

+ [PREFIX]

4363

4364

By default, \`make install' will install all the files in

4365

\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify

4366

@@ -1442,25 +1480,25 @@ for instance \`--prefix=\$HOME'.

4367

For better control, use the options below.

4368

4369

Fine tuning of the installation directories:

4370

- --bindir=DIR user executables [EPREFIX/bin]

4371

- --sbindir=DIR system admin executables [EPREFIX/sbin]

4372

- --libexecdir=DIR program executables [EPREFIX/libexec]

4373

- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]

4374

- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]

4375

- --localstatedir=DIR modifiable single-machine data [PREFIX/var]

4376

- --libdir=DIR object code libraries [EPREFIX/lib]

4377

- --includedir=DIR C header files [PREFIX/include]

4378

- --oldincludedir=DIR C header files for non-gcc [/usr/include]

4379

- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]

4380

- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]

4381

- --infodir=DIR info documentation [DATAROOTDIR/info]

4382

- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]

4383

- --mandir=DIR man documentation [DATAROOTDIR/man]

4384

- --docdir=DIR documentation root [DATAROOTDIR/doc/protobuf]

4385

- --htmldir=DIR html documentation [DOCDIR]

4386

- --dvidir=DIR dvi documentation [DOCDIR]

4387

- --pdfdir=DIR pdf documentation [DOCDIR]

4388

- --psdir=DIR ps documentation [DOCDIR]

4389

+ --bindir=DIR user executables [EPREFIX/bin]

4390

+ --sbindir=DIR system admin executables [EPREFIX/sbin]

4391

+ --libexecdir=DIR program executables [EPREFIX/libexec]

4392

+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]

4393

+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]

4394

+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]

4395

+ --libdir=DIR object code libraries [EPREFIX/lib]

4396

+ --includedir=DIR C header files [PREFIX/include]

4397

+ --oldincludedir=DIR C header files for non-gcc [/usr/include]

4398

+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]

4399

+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]

4400

+ --infodir=DIR info documentation [DATAROOTDIR/info]

4401

+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]

4402

+ --mandir=DIR man documentation [DATAROOTDIR/man]

4403

+ --docdir=DIR documentation root [DATAROOTDIR/doc/protobuf]

4404

+ --htmldir=DIR html documentation [DOCDIR]

4405

+ --dvidir=DIR dvi documentation [DOCDIR]

4406

+ --pdfdir=DIR pdf documentation [DOCDIR]

4407

+ --psdir=DIR ps documentation [DOCDIR]

4408

_ACEOF

4409

1556

@@ -1544,6 +1417,8 @@ Optional Packages:

1557

--with-pic try to use only PIC/non-PIC objects [default=use

1558

both]

1559

--with-gnu-ld assume the C compiler uses GNU ld [default=no]

1560

+ --with-sysroot=DIR Search for dependent libraries within DIR

1561

+ (or the compiler's sysroot if not specified).

1562

1563

Some influential environment variables:

1564

CC C compiler command

1565

@@ -1624,9 +1499,9 @@ test -n "$ac_init_help" && exit $ac_stat

1566

if $ac_init_version; then

4410

1567

cat <<\_ACEOF

4411

@@ -1470,135 +1508,721 @@ Program names:

4412

--program-suffix=SUFFIX append SUFFIX to installed program names

4413

--program-transform-name=PROGRAM run sed PROGRAM on installed program names

1568

Protocol Buffers configure 2.4.0a

1569

-generated by GNU Autoconf 2.65

1570

+generated by GNU Autoconf 2.68

4414

1571

4415

-System types:

4416

- --build=BUILD configure for building on BUILD [guessed]

4417

- --host=HOST cross-compile to build programs to run on HOST [BUILD]

4418

- --target=TARGET configure for building compilers for TARGET [HOST]

4419

+System types:

4420

+ --build=BUILD configure for building on BUILD [guessed]

4421

+ --host=HOST cross-compile to build programs to run on HOST [BUILD]

4422

+ --target=TARGET configure for building compilers for TARGET [HOST]

4423

+_ACEOF

4424

+fi

4425

4426

+if test -n "$ac_init_help"; then

4427

+ case $ac_init_help in

4428

+ short | recursive ) echo "Configuration of Protocol Buffers 2.3.0:";;

4429

+ esac

4430

+ cat <<\_ACEOF

4431

4432

+Optional Features:

4433

+ --disable-option-checking ignore unrecognized --enable/--with options

4434

+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)

4435

+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]

4436

+ --disable-dependency-tracking speeds up one-time build

4437

+ --enable-dependency-tracking do not reject slow dependency extractors

4438

+ --disable-64bit-solaris Build 64 bit binary on Solaris [default=on]

4439

+ --enable-shared[=PKGS] build shared libraries [default=yes]

4440

+ --enable-static[=PKGS] build static libraries [default=yes]

4441

+ --enable-fast-install[=PKGS]

4442

+ optimize for fast installation [default=yes]

4443

+ --disable-libtool-lock avoid locking (might break parallel builds)

4444

4445

+Optional Packages:

4446

+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]

4447

+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)

4448

+ --with-zlib include classes for streaming compressed data in and

4449

+ out [default=check]

4450

+ --with-protoc=COMMAND use the given protoc command instead of building a

4451

+ new one when building tests (useful for

4452

+ cross-compiling)

4453

+ --with-pic try to use only PIC/non-PIC objects [default=use

4454

+ both]

4455

+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]

4456

4457

+Some influential environment variables:

4458

+ CC C compiler command

4459

+ CFLAGS C compiler flags

4460

+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a

4461

+ nonstandard directory <lib dir>

4462

+ LIBS libraries to pass to the linker, e.g. -l<library>

4463

+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if

4464

+ you have headers in a nonstandard directory <include dir>

4465

+ CXX C++ compiler command

4466

+ CXXFLAGS C++ compiler flags

4467

+ CXXCPP C++ preprocessor

4468

4469

+Use these variables to override the choices made by `configure' or to help

4470

+it to find libraries and programs with nonstandard names/locations.

4471

4472

+Report bugs to <protobuf@googlegroups.com>.

4473

+_ACEOF

4474

+ac_status=$?

4475

+fi

4476

4477

+if test "$ac_init_help" = "recursive"; then

4478

+ # If there are subdirs, report their specific --help.

4479

+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue

4480

+ test -d "$ac_dir" ||

4481

+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||

4482

+ continue

4483

+ ac_builddir=.

4484

4485

+case "$ac_dir" in

4486

+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

4487

+*)

4488

+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`

4489

+ # A ".." for each directory in $ac_dir_suffix.

4490

+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`

4491

+ case $ac_top_builddir_sub in

4492

+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;

4493

+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

4494

+ esac ;;

4495

+esac

4496

+ac_abs_top_builddir=$ac_pwd

4497

+ac_abs_builddir=$ac_pwd$ac_dir_suffix

4498

+# for backward compatibility:

4499

+ac_top_builddir=$ac_top_build_prefix

4500

4501

+case $srcdir in

4502

+ .) # We are building in place.

4503

+ ac_srcdir=.

4504

+ ac_top_srcdir=$ac_top_builddir_sub

4505

+ ac_abs_top_srcdir=$ac_pwd ;;

4506

+ [\\/]* | ?:[\\/]* ) # Absolute name.

4507

+ ac_srcdir=$srcdir$ac_dir_suffix;

4508

+ ac_top_srcdir=$srcdir

4509

+ ac_abs_top_srcdir=$srcdir ;;

4510

+ *) # Relative name.

4511

+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix

4512

+ ac_top_srcdir=$ac_top_build_prefix$srcdir

4513

+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;

4514

+esac

4515

+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

4516

4517

+ cd "$ac_dir" || { ac_status=$?; continue; }

4518

+ # Check for guested configure.

4519

+ if test -f "$ac_srcdir/configure.gnu"; then

4520

+ echo &&

4521

+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive

4522

+ elif test -f "$ac_srcdir/configure"; then

4523

+ echo &&

4524

+ $SHELL "$ac_srcdir/configure" --help=recursive

4525

+ else

4526

+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2

4527

+ fi || ac_status=$?

4528

+ cd "$ac_pwd" || { ac_status=$?; break; }

4529

+ done

4530

+fi

4531

4532

+test -n "$ac_init_help" && exit $ac_status

4533

+if $ac_init_version; then

4534

+ cat <<\_ACEOF

4535

+Protocol Buffers configure 2.3.0

4536

+generated by GNU Autoconf 2.67

4537

1572

4538

1573

4539

+This configure script is free software; the Free Software Foundation

4540

+gives unlimited permission to copy, distribute and modify it.

4541

+_ACEOF

4542

+ exit

4543

+fi

4544

4545

+## ------------------------ ##

4546

+## Autoconf initialization. ##

4547

+## ------------------------ ##

4548

4549

+# ac_fn_c_try_compile LINENO

4550

+# --------------------------

4551

+# Try to compile conftest.$ac_ext, and return whether this succeeded.

4552

+ac_fn_c_try_compile ()

4553

4554

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

4555

+ rm -f conftest.$ac_objext

4556

+ if { { ac_try="$ac_compile"

4557

+case "(($ac_try" in

4558

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4559

+ *) ac_try_echo=$ac_try;;

4560

+esac

4561

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

4562

+$as_echo "$ac_try_echo"; } >&5

4563

+ (eval "$ac_compile") 2>conftest.err

4564

+ ac_status=$?

4565

+ if test -s conftest.err; then

4566

+ grep -v '^ *+' conftest.err >conftest.er1

4567

+ cat conftest.er1 >&5

4568

+ mv -f conftest.er1 conftest.err

4569

+ fi

4570

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

4571

+ test $ac_status = 0; } && {

4572

+ test -z "$ac_c_werror_flag" ||

4573

+ test ! -s conftest.err

4574

+ } && test -s conftest.$ac_objext; then :

4575

+ ac_retval=0

4576

+else

4577

+ $as_echo "$as_me: failed program was:" >&5

4578

+sed 's/^/| /' conftest.$ac_ext >&5

4579

4580

+ ac_retval=1

4581

+fi

4582

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

4583

+ as_fn_set_status $ac_retval

4584

4585

+} # ac_fn_c_try_compile

4586

4587

+# ac_fn_cxx_try_compile LINENO

4588

+# ----------------------------

4589

+# Try to compile conftest.$ac_ext, and return whether this succeeded.

4590

+ac_fn_cxx_try_compile ()

4591

4592

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

4593

+ rm -f conftest.$ac_objext

4594

+ if { { ac_try="$ac_compile"

4595

+case "(($ac_try" in

4596

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4597

+ *) ac_try_echo=$ac_try;;

4598

+esac

4599

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

4600

+$as_echo "$ac_try_echo"; } >&5

4601

+ (eval "$ac_compile") 2>conftest.err

4602

+ ac_status=$?

4603

+ if test -s conftest.err; then

4604

+ grep -v '^ *+' conftest.err >conftest.er1

4605

+ cat conftest.er1 >&5

4606

+ mv -f conftest.er1 conftest.err

4607

+ fi

4608

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

4609

+ test $ac_status = 0; } && {

4610

+ test -z "$ac_cxx_werror_flag" ||

4611

+ test ! -s conftest.err

4612

+ } && test -s conftest.$ac_objext; then :

4613

+ ac_retval=0

4614

+else

4615

+ $as_echo "$as_me: failed program was:" >&5

4616

+sed 's/^/| /' conftest.$ac_ext >&5

4617

4618

+ ac_retval=1

4619

+fi

4620

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

4621

+ as_fn_set_status $ac_retval

4622

4623

+} # ac_fn_cxx_try_compile

4624

4625

+# ac_fn_cxx_try_cpp LINENO

4626

+# ------------------------

4627

+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.

4628

+ac_fn_cxx_try_cpp ()

4629

4630

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

4631

+ if { { ac_try="$ac_cpp conftest.$ac_ext"

4632

+case "(($ac_try" in

4633

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4634

+ *) ac_try_echo=$ac_try;;

4635

+esac

4636

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

4637

+$as_echo "$ac_try_echo"; } >&5

4638

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err

4639

+ ac_status=$?

4640

+ if test -s conftest.err; then

4641

+ grep -v '^ *+' conftest.err >conftest.er1

4642

+ cat conftest.er1 >&5

4643

+ mv -f conftest.er1 conftest.err

4644

+ fi

4645

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

1574

This configure script is free software; the Free Software Foundation

1575

gives unlimited permission to copy, distribute and modify it.

1576

_ACEOF

1577

@@ -1670,7 +1545,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

1578

1579

ac_retval=1

1580

1581

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1582

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1583

as_fn_set_status $ac_retval

1584

1585

} # ac_fn_c_try_compile

1586

@@ -1708,7 +1583,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

1587

1588

ac_retval=1

1589

1590

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1591

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1592

as_fn_set_status $ac_retval

1593

1594

} # ac_fn_cxx_try_compile

1595

@@ -1734,7 +1609,7 @@ $as_echo "$ac_try_echo"; } >&5

1596

mv -f conftest.er1 conftest.err

1597

1598

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

1599

- test $ac_status = 0; } >/dev/null && {

4646

1600

+ test $ac_status = 0; } > conftest.i && {

4647

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

4648

+ test ! -s conftest.err

4649

+ }; then :

4650

+ ac_retval=0

4651

+else

4652

+ $as_echo "$as_me: failed program was:" >&5

4653

+sed 's/^/| /' conftest.$ac_ext >&5

4654

4655

+ ac_retval=1

4656

+fi

4657

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

4658

+ as_fn_set_status $ac_retval

4659

4660

+} # ac_fn_cxx_try_cpp

4661

4662

+# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES

4663

+# ---------------------------------------------------------

4664

+# Tests whether HEADER exists, giving a warning if it cannot be compiled using

4665

+# the include files in INCLUDES and setting the cache variable VAR

4666

+# accordingly.

4667

+ac_fn_cxx_check_header_mongrel ()

4668

4669

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

4670

+ if eval "test \"\${$3+set}\"" = set; then :

4671

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

4672

+$as_echo_n "checking for $2... " >&6; }

4673

+if eval "test \"\${$3+set}\"" = set; then :

4674

+ $as_echo_n "(cached) " >&6

4675

+fi

4676

+eval ac_res=\$$3

4677

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

4678

+$as_echo "$ac_res" >&6; }

4679

+else

4680

+ # Is the header compilable?

4681

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5

4682

+$as_echo_n "checking $2 usability... " >&6; }

4683

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4684

+/* end confdefs.h. */

4685

+$4

4686

+#include <$2>

4687

+_ACEOF

4688

+if ac_fn_cxx_try_compile "$LINENO"; then :

4689

+ ac_header_compiler=yes

4690

+else

4691

+ ac_header_compiler=no

4692

+fi

4693

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4694

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5

4695

+$as_echo "$ac_header_compiler" >&6; }

4696

4697

+# Is the header present?

4698

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5

4699

+$as_echo_n "checking $2 presence... " >&6; }

4700

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4701

+/* end confdefs.h. */

4702

+#include <$2>

4703

+_ACEOF

4704

+if ac_fn_cxx_try_cpp "$LINENO"; then :

4705

+ ac_header_preproc=yes

4706

+else

4707

+ ac_header_preproc=no

4708

+fi

1601

test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

1602

test ! -s conftest.err

1603

}; then :

1604

@@ -1745,7 +1620,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

1605

1606

ac_retval=1

1607

1608

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1609

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1610

as_fn_set_status $ac_retval

1611

1612

} # ac_fn_cxx_try_cpp

1613

@@ -1758,10 +1633,10 @@ fi

1614

ac_fn_cxx_check_header_mongrel ()

1615

{

1616

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

1617

- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

1618

+ if eval \${$3+:} false; then :

1619

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

1620

$as_echo_n "checking for $2... " >&6; }

1621

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

1622

+if eval \${$3+:} false; then :

1623

$as_echo_n "(cached) " >&6

1624

1625

eval ac_res=\$$3

1626

@@ -1797,7 +1672,7 @@ if ac_fn_cxx_try_cpp "$LINENO"; then :

1627

else

1628

ac_header_preproc=no

1629

1630

-rm -f conftest.err conftest.$ac_ext

4709

1631

+rm -f conftest.err conftest.i conftest.$ac_ext

4710

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5

4711

+$as_echo "$ac_header_preproc" >&6; }

4712

4713

+# So? What about this header?

4714

+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((

4715

+ yes:no: )

4716

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5

4717

+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}

4718

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

4719

+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

4720

+ ;;

4721

+ no:yes:* )

4722

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5

4723

+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}

4724

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5

4725

+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}

4726

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5

4727

+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}

4728

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5

4729

+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}

4730

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

4731

+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

1632

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5

1633

$as_echo "$ac_header_preproc" >&6; }

1634

1635

@@ -1820,17 +1695,15 @@ $as_echo "$as_me: WARNING: $2: see the A

1636

$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}

1637

{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

1638

$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

1639

-( cat <<\_ASBOX

1640

-## ---------------------------------------- ##

4732

1641

+( $as_echo "## ---------------------------------------- ##

4733

+## Report this to protobuf@googlegroups.com ##

1642

## Report this to protobuf@googlegroups.com ##

1643

-## ---------------------------------------- ##

1644

-_ASBOX

4734

1645

+## ---------------------------------------- ##"

4735

+ ) | sed "s/^/$as_me: WARNING: /" >&2

4736

+ ;;

4737

+esac

4738

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

4739

+$as_echo_n "checking for $2... " >&6; }

4740

+if eval "test \"\${$3+set}\"" = set; then :

4741

+ $as_echo_n "(cached) " >&6

4742

+else

4743

+ eval "$3=\$ac_header_compiler"

4744

+fi

4745

+eval ac_res=\$$3

4746

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

4747

+$as_echo "$ac_res" >&6; }

4748

+fi

4749

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

4750

4751

+} # ac_fn_cxx_check_header_mongrel

4752

4753

+# ac_fn_cxx_try_run LINENO

4754

+# ------------------------

4755

+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes

4756

+# that executables *can* be run.

4757

+ac_fn_cxx_try_run ()

4758

4759

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

4760

+ if { { ac_try="$ac_link"

4761

+case "(($ac_try" in

4762

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4763

+ *) ac_try_echo=$ac_try;;

4764

+esac

4765

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

4766

+$as_echo "$ac_try_echo"; } >&5

4767

+ (eval "$ac_link") 2>&5

4768

+ ac_status=$?

4769

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

4770

+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'

4771

+ { { case "(($ac_try" in

4772

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4773

+ *) ac_try_echo=$ac_try;;

4774

+esac

4775

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

4776

+$as_echo "$ac_try_echo"; } >&5

4777

+ (eval "$ac_try") 2>&5

4778

+ ac_status=$?

4779

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

4780

+ test $ac_status = 0; }; }; then :

4781

+ ac_retval=0

4782

+else

4783

+ $as_echo "$as_me: program exited with status $ac_status" >&5

4784

+ $as_echo "$as_me: failed program was:" >&5

4785

+sed 's/^/| /' conftest.$ac_ext >&5

4786

4787

+ ac_retval=$ac_status

4788

+fi

4789

+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo

4790

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

4791

+ as_fn_set_status $ac_retval

4792

4793

+} # ac_fn_cxx_try_run

4794

4795

+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES

4796

+# ---------------------------------------------------------

4797

+# Tests whether HEADER exists and can be compiled using the include files in

4798

+# INCLUDES, setting the cache variable VAR accordingly.

4799

+ac_fn_cxx_check_header_compile ()

4800

4801

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

4802

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

4803

+$as_echo_n "checking for $2... " >&6; }

4804

+if eval "test \"\${$3+set}\"" = set; then :

4805

+ $as_echo_n "(cached) " >&6

4806

+else

4807

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4808

+/* end confdefs.h. */

4809

+$4

4810

+#include <$2>

4811

+_ACEOF

4812

+if ac_fn_cxx_try_compile "$LINENO"; then :

4813

+ eval "$3=yes"

4814

+else

4815

+ eval "$3=no"

4816

+fi

4817

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4818

+fi

4819

+eval ac_res=\$$3

4820

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

4821

+$as_echo "$ac_res" >&6; }

4822

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

4823

4824

+} # ac_fn_cxx_check_header_compile

4825

1646

) | sed "s/^/$as_me: WARNING: /" >&2

1647

;;

1648

esac

1649

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

1650

$as_echo_n "checking for $2... " >&6; }

1651

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

1652

+if eval \${$3+:} false; then :

1653

$as_echo_n "(cached) " >&6

1654

else

1655

eval "$3=\$ac_header_compiler"

1656

@@ -1839,7 +1712,7 @@ eval ac_res=\$$3

1657

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

1658

$as_echo "$ac_res" >&6; }

1659

1660

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1661

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1662

1663

} # ac_fn_cxx_check_header_mongrel

1664

1665

@@ -1880,7 +1753,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

1666

ac_retval=$ac_status

1667

1668

rm -rf conftest.dSYM conftest_ipa8_conftest.oo

1669

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1670

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1671

as_fn_set_status $ac_retval

1672

1673

} # ac_fn_cxx_try_run

1674

@@ -1894,7 +1767,7 @@ ac_fn_cxx_check_header_compile ()

1675

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

1676

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

1677

$as_echo_n "checking for $2... " >&6; }

1678

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

1679

+if eval \${$3+:} false; then :

1680

$as_echo_n "(cached) " >&6

1681

else

1682

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

1683

@@ -1912,19 +1785,22 @@ fi

1684

eval ac_res=\$$3

1685

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

1686

$as_echo "$ac_res" >&6; }

1687

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1688

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1689

1690

} # ac_fn_cxx_check_header_compile

1691

1692

-# ac_fn_cxx_check_decl LINENO SYMBOL VAR

1693

-# --------------------------------------

1694

-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.

4826

1695

+# ac_fn_cxx_check_decl LINENO SYMBOL VAR INCLUDES

4827

1696

+# -----------------------------------------------

4828

1697

+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR

4829

1698

+# accordingly.

4830

+ac_fn_cxx_check_decl ()

4831

4832

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

1699

ac_fn_cxx_check_decl ()

1700

{

1701

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

1702

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5

1703

-$as_echo_n "checking whether $2 is declared... " >&6; }

1704

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

4833

1705

+ as_decl_name=`echo $2|sed 's/ *(.*//'`

4834

1706

+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`

4835

1707

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5

4836

1708

+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }

4837

+if eval "test \"\${$3+set}\"" = set; then :

4838

+ $as_echo_n "(cached) " >&6

4839

+else

4840

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4841

+/* end confdefs.h. */

4842

+$4

4843

+int

4844

+main ()

4845

1709

+if eval \${$3+:} false; then :

1710

$as_echo_n "(cached) " >&6

1711

else

1712

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

1713

@@ -1933,8 +1809,12 @@ $4

1714

int

1715

main ()

1716

{

1717

-#ifndef $2

1718

- (void) $2;

4846

1719

+#ifndef $as_decl_name

4847

1720

+#ifdef __cplusplus

4848

1721

+ (void) $as_decl_use;

4849

1722

+#else

4850

1723

+ (void) $as_decl_name;

4851

1724

+#endif

4852

+#endif

4853

4854

+ ;

4855

+ return 0;

4856

4857

_ACEOF

4858

+if ac_fn_cxx_try_compile "$LINENO"; then :

4859

+ eval "$3=yes"

4860

+else

4861

+ eval "$3=no"

4862

+fi

4863

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4864

4865

+eval ac_res=\$$3

4866

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

4867

+$as_echo "$ac_res" >&6; }

4868

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

4869

4870

+} # ac_fn_cxx_check_decl

4871

4872

+# ac_fn_c_try_link LINENO

4873

+# -----------------------

4874

+# Try to link conftest.$ac_ext, and return whether this succeeded.

4875

+ac_fn_c_try_link ()

4876

4877

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

4878

+ rm -f conftest.$ac_objext conftest$ac_exeext

4879

+ if { { ac_try="$ac_link"

4880

+case "(($ac_try" in

4881

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4882

+ *) ac_try_echo=$ac_try;;

4883

+esac

4884

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

4885

+$as_echo "$ac_try_echo"; } >&5

4886

+ (eval "$ac_link") 2>conftest.err

4887

+ ac_status=$?

4888

+ if test -s conftest.err; then

4889

+ grep -v '^ *+' conftest.err >conftest.er1

4890

+ cat conftest.er1 >&5

4891

+ mv -f conftest.er1 conftest.err

4892

+ fi

4893

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

4894

+ test $ac_status = 0; } && {

4895

+ test -z "$ac_c_werror_flag" ||

4896

+ test ! -s conftest.err

4897

+ } && test -s conftest$ac_exeext && {

4898

+ test "$cross_compiling" = yes ||

4899

+ $as_test_x conftest$ac_exeext

4900

+ }; then :

4901

+ ac_retval=0

4902

+else

4903

+ $as_echo "$as_me: failed program was:" >&5

4904

+sed 's/^/| /' conftest.$ac_ext >&5

4905

4906

-if test -n "$ac_init_help"; then

4907

- case $ac_init_help in

4908

- short | recursive ) echo "Configuration of Protocol Buffers 2.3.0:";;

4909

- esac

4910

- cat <<\_ACEOF

4911

+ ac_retval=1

4912

+fi

4913

+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information

4914

+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would

4915

+ # interfere with the next link command; also delete a directory that is

4916

+ # left behind by Apple's compiler. We do this before executing the actions.

4917

+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo

4918

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

4919

+ as_fn_set_status $ac_retval

4920

4921

+} # ac_fn_c_try_link

4922

4923

+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES

4924

+# -------------------------------------------------------

4925

+# Tests whether HEADER exists and can be compiled using the include files in

4926

+# INCLUDES, setting the cache variable VAR accordingly.

4927

+ac_fn_c_check_header_compile ()

4928

4929

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

4930

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

4931

+$as_echo_n "checking for $2... " >&6; }

4932

+if eval "test \"\${$3+set}\"" = set; then :

4933

+ $as_echo_n "(cached) " >&6

4934

+else

4935

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4936

+/* end confdefs.h. */

4937

+$4

4938

+#include <$2>

4939

+_ACEOF

4940

+if ac_fn_c_try_compile "$LINENO"; then :

4941

+ eval "$3=yes"

4942

+else

4943

+ eval "$3=no"

4944

+fi

4945

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4946

+fi

4947

+eval ac_res=\$$3

4948

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

4949

+$as_echo "$ac_res" >&6; }

4950

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

4951

4952

+} # ac_fn_c_check_header_compile

4953

4954

+# ac_fn_c_check_func LINENO FUNC VAR

4955

+# ----------------------------------

4956

+# Tests whether FUNC exists, setting the cache variable VAR accordingly

4957

+ac_fn_c_check_func ()

4958

4959

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

4960

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

4961

+$as_echo_n "checking for $2... " >&6; }

4962

+if eval "test \"\${$3+set}\"" = set; then :

4963

+ $as_echo_n "(cached) " >&6

4964

+else

4965

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4966

+/* end confdefs.h. */

4967

+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.

4968

+ For example, HP-UX 11i <limits.h> declares gettimeofday. */

4969

+#define $2 innocuous_$2

4970

4971

-Optional Features:

4972

- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)

4973

- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]

4974

- --disable-dependency-tracking speeds up one-time build

4975

- --enable-dependency-tracking do not reject slow dependency extractors

4976

- --disable-64bit-solaris Build 64 bit binary on Solaris [default=on]

4977

- --enable-shared[=PKGS] build shared libraries [default=yes]

4978

- --enable-static[=PKGS] build static libraries [default=yes]

4979

- --enable-fast-install[=PKGS]

4980

- optimize for fast installation [default=yes]

4981

- --disable-libtool-lock avoid locking (might break parallel builds)

4982

+/* System header to define __stub macros and hopefully few prototypes,

4983

+ which can conflict with char $2 (); below.

4984

+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

4985

+ <limits.h> exists even on freestanding compilers. */

4986

4987

-Optional Packages:

4988

- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]

4989

- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)

4990

- --with-zlib include classes for streaming compressed data in and

4991

- out [default=check]

4992

- --with-protoc=COMMAND use the given protoc command instead of building a

4993

- new one when building tests (useful for

4994

- cross-compiling)

4995

- --with-pic try to use only PIC/non-PIC objects [default=use

4996

- both]

4997

- --with-gnu-ld assume the C compiler uses GNU ld [default=no]

4998

+#ifdef __STDC__

4999

+# include <limits.h>

5000

+#else

5001

+# include <assert.h>

5002

+#endif

5003

5004

-Some influential environment variables:

5005

- CC C compiler command

5006

- CFLAGS C compiler flags

5007

- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a

5008

- nonstandard directory <lib dir>

5009

- LIBS libraries to pass to the linker, e.g. -l<library>

5010

- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if

5011

- you have headers in a nonstandard directory <include dir>

5012

- CXX C++ compiler command

5013

- CXXFLAGS C++ compiler flags

5014

- CXXCPP C++ preprocessor

5015

+#undef $2

5016

5017

-Use these variables to override the choices made by `configure' or to help

5018

-it to find libraries and programs with nonstandard names/locations.

5019

+/* Override any GCC internal prototype to avoid an error.

5020

+ Use char because int might match the return type of a GCC

5021

+ builtin and then its argument prototype would still apply. */

5022

+#ifdef __cplusplus

5023

+extern "C"

5024

+#endif

5025

+char $2 ();

5026

+/* The GNU C library defines this for functions which it implements

5027

+ to always fail with ENOSYS. Some functions are actually named

5028

+ something starting with __ and the normal name is an alias. */

5029

+#if defined __stub_$2 || defined __stub___$2

5030

+choke me

5031

+#endif

5032

5033

-Report bugs to <protobuf@googlegroups.com>.

5034

+int

5035

+main ()

5036

5037

+return $2 ();

5038

+ ;

5039

+ return 0;

5040

5041

_ACEOF

5042

-ac_status=$?

5043

+if ac_fn_c_try_link "$LINENO"; then :

5044

+ eval "$3=yes"

5045

+else

5046

+ eval "$3=no"

5047

5048

+rm -f core conftest.err conftest.$ac_objext \

5049

+ conftest$ac_exeext conftest.$ac_ext

5050

+fi

5051

+eval ac_res=\$$3

5052

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

5053

+$as_echo "$ac_res" >&6; }

5054

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

5055

5056

-if test "$ac_init_help" = "recursive"; then

5057

- # If there are subdirs, report their specific --help.

5058

- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue

5059

- test -d "$ac_dir" || continue

5060

- ac_builddir=.

5061

5062

-case "$ac_dir" in

5063

-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

5064

-*)

5065

- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

5066

- # A ".." for each directory in $ac_dir_suffix.

5067

- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

5068

- case $ac_top_builddir_sub in

5069

- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;

5070

- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

5071

- esac ;;

5072

-esac

5073

-ac_abs_top_builddir=$ac_pwd

5074

-ac_abs_builddir=$ac_pwd$ac_dir_suffix

5075

-# for backward compatibility:

5076

-ac_top_builddir=$ac_top_build_prefix

5077

+} # ac_fn_c_check_func

5078

5079

-case $srcdir in

5080

- .) # We are building in place.

5081

- ac_srcdir=.

5082

- ac_top_srcdir=$ac_top_builddir_sub

5083

- ac_abs_top_srcdir=$ac_pwd ;;

5084

- [\\/]* | ?:[\\/]* ) # Absolute name.

5085

- ac_srcdir=$srcdir$ac_dir_suffix;

5086

- ac_top_srcdir=$srcdir

5087

- ac_abs_top_srcdir=$srcdir ;;

5088

- *) # Relative name.

5089

- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix

5090

- ac_top_srcdir=$ac_top_build_prefix$srcdir

5091

- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;

5092

+# ac_fn_cxx_try_link LINENO

5093

+# -------------------------

5094

+# Try to link conftest.$ac_ext, and return whether this succeeded.

5095

+ac_fn_cxx_try_link ()

5096

5097

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

5098

+ rm -f conftest.$ac_objext conftest$ac_exeext

5099

+ if { { ac_try="$ac_link"

5100

+case "(($ac_try" in

5101

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5102

+ *) ac_try_echo=$ac_try;;

5103

esac

5104

-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

5105

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

5106

+$as_echo "$ac_try_echo"; } >&5

5107

+ (eval "$ac_link") 2>conftest.err

5108

+ ac_status=$?

5109

+ if test -s conftest.err; then

5110

+ grep -v '^ *+' conftest.err >conftest.er1

5111

+ cat conftest.er1 >&5

5112

+ mv -f conftest.er1 conftest.err

5113

+ fi

5114

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

5115

+ test $ac_status = 0; } && {

5116

+ test -z "$ac_cxx_werror_flag" ||

5117

+ test ! -s conftest.err

5118

+ } && test -s conftest$ac_exeext && {

5119

+ test "$cross_compiling" = yes ||

5120

+ $as_test_x conftest$ac_exeext

5121

+ }; then :

5122

+ ac_retval=0

5123

+else

5124

+ $as_echo "$as_me: failed program was:" >&5

5125

+sed 's/^/| /' conftest.$ac_ext >&5

5126

5127

- cd "$ac_dir" || { ac_status=$?; continue; }

5128

- # Check for guested configure.

5129

- if test -f "$ac_srcdir/configure.gnu"; then

5130

- echo &&

5131

- $SHELL "$ac_srcdir/configure.gnu" --help=recursive

5132

- elif test -f "$ac_srcdir/configure"; then

5133

- echo &&

5134

- $SHELL "$ac_srcdir/configure" --help=recursive

5135

- else

5136

- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2

5137

- fi || ac_status=$?

5138

- cd "$ac_pwd" || { ac_status=$?; break; }

5139

- done

5140

+ ac_retval=1

5141

5142

+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information

5143

+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would

5144

+ # interfere with the next link command; also delete a directory that is

5145

+ # left behind by Apple's compiler. We do this before executing the actions.

5146

+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo

5147

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

5148

+ as_fn_set_status $ac_retval

5149

5150

+} # ac_fn_cxx_try_link

5151

5152

+# ac_fn_cxx_check_func LINENO FUNC VAR

5153

+# ------------------------------------

5154

+# Tests whether FUNC exists, setting the cache variable VAR accordingly

5155

+ac_fn_cxx_check_func ()

5156

5157

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

5158

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

5159

+$as_echo_n "checking for $2... " >&6; }

5160

+if eval "test \"\${$3+set}\"" = set; then :

5161

+ $as_echo_n "(cached) " >&6

5162

+else

5163

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5164

+/* end confdefs.h. */

5165

+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.

5166

+ For example, HP-UX 11i <limits.h> declares gettimeofday. */

5167

+#define $2 innocuous_$2

5168

5169

-test -n "$ac_init_help" && exit $ac_status

5170

-if $ac_init_version; then

5171

- cat <<\_ACEOF

5172

-Protocol Buffers configure 2.3.0

5173

-generated by GNU Autoconf 2.61

5174

+/* System header to define __stub macros and hopefully few prototypes,

5175

+ which can conflict with char $2 (); below.

5176

+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

5177

+ <limits.h> exists even on freestanding compilers. */

5178

5179

5180

-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

5181

-This configure script is free software; the Free Software Foundation

5182

-gives unlimited permission to copy, distribute and modify it.

5183

+#ifdef __STDC__

5184

+# include <limits.h>

5185

+#else

5186

+# include <assert.h>

5187

+#endif

5188

5189

+#undef $2

5190

5191

+/* Override any GCC internal prototype to avoid an error.

5192

+ Use char because int might match the return type of a GCC

5193

+ builtin and then its argument prototype would still apply. */

5194

+#ifdef __cplusplus

5195

+extern "C"

5196

+#endif

5197

+char $2 ();

5198

+/* The GNU C library defines this for functions which it implements

5199

+ to always fail with ENOSYS. Some functions are actually named

5200

+ something starting with __ and the normal name is an alias. */

5201

+#if defined __stub_$2 || defined __stub___$2

5202

+choke me

5203

+#endif

5204

5205

+int

5206

+main ()

5207

5208

+return $2 ();

5209

+ ;

5210

+ return 0;

5211

5212

_ACEOF

5213

- exit

5214

+if ac_fn_cxx_try_link "$LINENO"; then :

5215

+ eval "$3=yes"

5216

+else

5217

+ eval "$3=no"

5218

5219

+rm -f core conftest.err conftest.$ac_objext \

5220

+ conftest$ac_exeext conftest.$ac_ext

5221

+fi

5222

+eval ac_res=\$$3

5223

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

5224

+$as_echo "$ac_res" >&6; }

5225

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

5226

5227

+} # ac_fn_cxx_check_func

1725

#endif

1726

1727

;

1728

@@ -1951,7 +1831,7 @@ fi

1729

eval ac_res=\$$3

1730

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

1731

$as_echo "$ac_res" >&6; }

1732

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1733

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1734

1735

} # ac_fn_cxx_check_decl

1736

1737

@@ -1996,7 +1876,7 @@ fi

1738

# interfere with the next link command; also delete a directory that is

1739

# left behind by Apple's compiler. We do this before executing the actions.

1740

rm -rf conftest.dSYM conftest_ipa8_conftest.oo

1741

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1742

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1743

as_fn_set_status $ac_retval

1744

1745

} # ac_fn_c_try_link

1746

@@ -2010,7 +1890,7 @@ ac_fn_c_check_header_compile ()

1747

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

1748

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

1749

$as_echo_n "checking for $2... " >&6; }

1750

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

1751

+if eval \${$3+:} false; then :

1752

$as_echo_n "(cached) " >&6

1753

else

1754

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

1755

@@ -2028,7 +1908,7 @@ fi

1756

eval ac_res=\$$3

1757

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

1758

$as_echo "$ac_res" >&6; }

1759

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1760

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1761

1762

} # ac_fn_c_check_header_compile

1763

1764

@@ -2040,7 +1920,7 @@ ac_fn_c_check_func ()

1765

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

1766

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

1767

$as_echo_n "checking for $2... " >&6; }

1768

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

1769

+if eval \${$3+:} false; then :

1770

$as_echo_n "(cached) " >&6

1771

else

1772

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

1773

@@ -2095,7 +1975,7 @@ fi

1774

eval ac_res=\$$3

1775

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

1776

$as_echo "$ac_res" >&6; }

1777

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1778

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1779

1780

} # ac_fn_c_check_func

1781

1782

@@ -2140,7 +2020,7 @@ fi

1783

# interfere with the next link command; also delete a directory that is

1784

# left behind by Apple's compiler. We do this before executing the actions.

1785

rm -rf conftest.dSYM conftest_ipa8_conftest.oo

1786

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1787

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1788

as_fn_set_status $ac_retval

1789

1790

} # ac_fn_cxx_try_link

1791

@@ -2153,7 +2033,7 @@ ac_fn_cxx_check_func ()

1792

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

1793

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

1794

$as_echo_n "checking for $2... " >&6; }

1795

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

1796

+if eval \${$3+:} false; then :

1797

$as_echo_n "(cached) " >&6

1798

else

1799

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

1800

@@ -2208,7 +2088,7 @@ fi

1801

eval ac_res=\$$3

1802

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

1803

$as_echo "$ac_res" >&6; }

1804

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

1805

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

1806

1807

} # ac_fn_cxx_check_func

5228

1808

cat >config.log <<_ACEOF

5229

This file contains any messages produced by compilers while

1809

@@ -2216,7 +2096,7 @@ This file contains any messages produced

5230

1810

running configure, to aid debugging if configure makes a mistake.

5231

1811

5232

It was created by Protocol Buffers $as_me 2.3.0, which was

5233

-generated by GNU Autoconf 2.61. Invocation command line was

5234

+generated by GNU Autoconf 2.67. Invocation command line was

1812

It was created by Protocol Buffers $as_me 2.4.0a, which was

1813

-generated by GNU Autoconf 2.65. Invocation command line was

1814

+generated by GNU Autoconf 2.68. Invocation command line was

5235

1815

5236

1816

$ $0 $@

5237

1817

5238

@@ -1634,8 +2258,8 @@ for as_dir in $PATH

5239

5240

IFS=$as_save_IFS

5241

test -z "$as_dir" && as_dir=.

5242

- echo "PATH: $as_dir"

5243

-done

5244

+ $as_echo "PATH: $as_dir"

5245

+ done

5246

IFS=$as_save_IFS

5247

5248

} >&5

5249

@@ -1669,12 +2293,12 @@ do

5250

5251

continue ;;

5252

*\'*)

5253

- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

5254

+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

5255

esac

5256

case $ac_pass in

5257

- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;

5258

+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;

5259

5260

- ac_configure_args1="$ac_configure_args1 '$ac_arg'"

5261

+ as_fn_append ac_configure_args1 " '$ac_arg'"

5262

if test $ac_must_keep_next = true; then

5263

ac_must_keep_next=false # Got value, back to normal.

5264

else

5265

@@ -1690,13 +2314,13 @@ do

5266

-* ) ac_must_keep_next=true ;;

5267

esac

5268

5269

- ac_configure_args="$ac_configure_args '$ac_arg'"

5270

+ as_fn_append ac_configure_args " '$ac_arg'"

5271

;;

5272

esac

5273

done

5274

done

5275

-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }

5276

-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }

5277

+{ ac_configure_args0=; unset ac_configure_args0;}

5278

+{ ac_configure_args1=; unset ac_configure_args1;}

5279

5280

# When interrupted or exit'd, cleanup temporary files, and complete

5281

# config.log. We remove comments because anyway the quotes in there

5282

@@ -1708,11 +2332,9 @@ trap 'exit_status=$?

1818

@@ -2326,11 +2206,9 @@ trap 'exit_status=$?

5283

1819

{

5284

1820

echo

5285

1821

5293

1829

echo

5294

1830

# The following way of writing the cache mishandles newlines in values,

5295

1831

(

5296

@@ -1721,12 +2343,13 @@ _ASBOX

5297

case $ac_val in #(

5298

*${as_nl}*)

5299

case $ac_var in #(

5300

- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5

5301

-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;

5302

+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5

5303

+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;

5304

esac

5305

case $ac_var in #(

5306

_ | IFS | as_nl) ;; #(

5307

- *) $as_unset $ac_var ;;

5308

+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

5309

+ *) { eval $ac_var=; unset $ac_var;} ;;

5310

esac ;;

5311

esac

5312

done

5313

@@ -1745,128 +2368,136 @@ echo "$as_me: WARNING: Cache variable $a

1832

@@ -2364,11 +2242,9 @@ $as_echo "$as_me: WARNING: cache variabl

5314

1833

)

5315

1834

echo

5316

1835

5324

1843

echo

5325

1844

for ac_var in $ac_subst_vars

5326

1845

5327

eval ac_val=\$$ac_var

5328

case $ac_val in

5329

- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

5330

+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

5331

esac

5332

- echo "$ac_var='\''$ac_val'\''"

5333

+ $as_echo "$ac_var='\''$ac_val'\''"

5334

done | sort

1846

@@ -2381,11 +2257,9 @@ _ASBOX

5335

1847

echo

5336

1848

5337

1849

if test -n "$ac_subst_files"; then

5345

1857

echo

5346

1858

for ac_var in $ac_subst_files

5347

1859

5348

eval ac_val=\$$ac_var

5349

case $ac_val in

5350

- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

5351

+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

5352

esac

5353

- echo "$ac_var='\''$ac_val'\''"

5354

+ $as_echo "$ac_var='\''$ac_val'\''"

5355

done | sort

5356

echo

1860

@@ -2399,11 +2273,9 @@ _ASBOX

5357

1861

5358

1862

5359

1863

if test -s confdefs.h; then

5367

1871

echo

5368

1872

cat confdefs.h

5369

1873

echo

5370

5371

test "$ac_signal" != 0 &&

5372

- echo "$as_me: caught signal $ac_signal"

5373

- echo "$as_me: exit $exit_status"

5374

+ $as_echo "$as_me: caught signal $ac_signal"

5375

+ $as_echo "$as_me: exit $exit_status"

5376

} >&5

5377

rm -f core *.core core.conftest.* &&

5378

rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&

5379

exit $exit_status

5380

' 0

5381

for ac_signal in 1 2 13 15; do

5382

- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal

5383

+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal

5384

done

5385

ac_signal=0

5386

5387

# confdefs.h avoids OS command line length limits that DEFS can exceed.

5388

rm -f -r conftest* confdefs.h

5389

5390

+$as_echo "/* confdefs.h */" > confdefs.h

5391

5392

# Predefined preprocessor variables.

5393

5394

cat >>confdefs.h <<_ACEOF

5395

#define PACKAGE_NAME "$PACKAGE_NAME"

5396

_ACEOF

5397

5398

5399

cat >>confdefs.h <<_ACEOF

5400

#define PACKAGE_TARNAME "$PACKAGE_TARNAME"

5401

_ACEOF

5402

5403

5404

cat >>confdefs.h <<_ACEOF

5405

#define PACKAGE_VERSION "$PACKAGE_VERSION"

5406

_ACEOF

5407

5408

5409

cat >>confdefs.h <<_ACEOF

5410

#define PACKAGE_STRING "$PACKAGE_STRING"

5411

_ACEOF

5412

5413

5414

cat >>confdefs.h <<_ACEOF

5415

#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"

5416

_ACEOF

5417

5418

+cat >>confdefs.h <<_ACEOF

5419

+#define PACKAGE_URL "$PACKAGE_URL"

5420

+_ACEOF

5421

5422

5423

# Let the site file select an alternate cache file if it wants to.

5424

-# Prefer explicitly selected file to automatically selected ones.

5425

+# Prefer an explicitly selected file to automatically selected ones.

5426

+ac_site_file1=NONE

5427

+ac_site_file2=NONE

1874

@@ -2458,7 +2330,12 @@ _ACEOF

1875

ac_site_file1=NONE

1876

ac_site_file2=NONE

5428

1877

if test -n "$CONFIG_SITE"; then

5429

- set x "$CONFIG_SITE"

1878

- ac_site_file1=$CONFIG_SITE

5430

1879

+ # We do not want a PATH search for config.site.

5431

1880

+ case $CONFIG_SITE in #((

5432

1881

+ -*) ac_site_file1=./$CONFIG_SITE;;

5434

1883

+ *) ac_site_file1=./$CONFIG_SITE;;

5435

1884

+ esac

5436

1885

elif test "x$prefix" != xNONE; then

5437

- set x "$prefix/share/config.site" "$prefix/etc/config.site"

5438

+ ac_site_file1=$prefix/share/config.site

5439

+ ac_site_file2=$prefix/etc/config.site

5440

else

5441

- set x "$ac_default_prefix/share/config.site" \

5442

- "$ac_default_prefix/etc/config.site"

5443

+ ac_site_file1=$ac_default_prefix/share/config.site

5444

+ ac_site_file2=$ac_default_prefix/etc/config.site

5445

5446

-shift

5447

-for ac_site_file

5448

+for ac_site_file in "$ac_site_file1" "$ac_site_file2"

5449

5450

- if test -r "$ac_site_file"; then

5451

- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5

5452

-echo "$as_me: loading site script $ac_site_file" >&6;}

5453

+ test "x$ac_site_file" = xNONE && continue

5454

+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then

5455

+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5

5456

+$as_echo "$as_me: loading site script $ac_site_file" >&6;}

1886

ac_site_file1=$prefix/share/config.site

1887

ac_site_file2=$prefix/etc/config.site

1888

@@ -2473,7 +2350,11 @@ do

1889

{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5

1890

$as_echo "$as_me: loading site script $ac_site_file" >&6;}

5457

1891

sed 's/^/| /' "$ac_site_file" >&5

5458

1892

- . "$ac_site_file"

5459

1893

+ . "$ac_site_file" \

5460

1894

+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

5461

1895

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

5462

1896

+as_fn_error $? "failed to load site script $ac_site_file

5463

+See \`config.log' for more details" "$LINENO" 5 ; }

1897

+See \`config.log' for more details" "$LINENO" 5; }

5464

1898

5465

1899

done

5466

1900

5467

if test -r "$cache_file"; then

5468

- # Some versions of bash will fail to source /dev/null (special

5469

- # files actually), so we avoid doing that.

5470

- if test -f "$cache_file"; then

5471

- { echo "$as_me:$LINENO: loading cache $cache_file" >&5

5472

-echo "$as_me: loading cache $cache_file" >&6;}

5473

+ # Some versions of bash will fail to source /dev/null (special files

5474

+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.

5475

+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then

5476

+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5

5477

+$as_echo "$as_me: loading cache $cache_file" >&6;}

5478

case $cache_file in

5479

[\\/]* | ?:[\\/]* ) . "$cache_file";;

5480

*) . "./$cache_file";;

5481

esac

5482

5483

else

5484

- { echo "$as_me:$LINENO: creating cache $cache_file" >&5

5485

-echo "$as_me: creating cache $cache_file" >&6;}

5486

+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5

5487

+$as_echo "$as_me: creating cache $cache_file" >&6;}

5488

>$cache_file

5489

5490

5491

@@ -1880,68 +2511,56 @@ for ac_var in $ac_precious_vars; do

5492

eval ac_new_val=\$ac_env_${ac_var}_value

5493

case $ac_old_set,$ac_new_set in

5494

set,)

5495

- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

5496

-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}

5497

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

5498

+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}

5499

ac_cache_corrupted=: ;;

5500

,set)

5501

- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5

5502

-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}

5503

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5

5504

+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}

5505

ac_cache_corrupted=: ;;

5506

,);;

5507

5508

if test "x$ac_old_val" != "x$ac_new_val"; then

5509

- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5

5510

-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

5511

- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5

5512

-echo "$as_me: former value: $ac_old_val" >&2;}

5513

- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5

5514

-echo "$as_me: current value: $ac_new_val" >&2;}

5515

- ac_cache_corrupted=:

5516

- fi;;

5517

- esac

5518

- # Pass precious variables to config.status.

5519

- if test "$ac_new_set" = set; then

5520

- case $ac_new_val in

5521

- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;

5522

- *) ac_arg=$ac_var=$ac_new_val ;;

5523

- esac

5524

- case " $ac_configure_args " in

5525

- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.

5526

- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;

5527

- esac

5528

- fi

5529

-done

5530

-if $ac_cache_corrupted; then

5531

- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5

5532

-echo "$as_me: error: changes in the environment can compromise the build" >&2;}

5533

- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5

5534

-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}

5535

- { (exit 1); exit 1; }; }

5536

-fi

5537

5538

5539

5540

5541

5542

5543

5544

5545

5546

5547

5548

5549

5550

5551

5552

5553

5554

5555

5556

5557

5558

5559

5560

5561

+ # differences in whitespace do not lead to failure.

5562

+ ac_old_val_w=`echo x $ac_old_val`

5563

+ ac_new_val_w=`echo x $ac_new_val`

5564

+ if test "$ac_old_val_w" != "$ac_new_val_w"; then

5565

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5

5566

+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

5567

+ ac_cache_corrupted=:

5568

+ else

5569

+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5

5570

+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}

5571

+ eval $ac_var=\$ac_old_val

5572

+ fi

5573

+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5

5574

+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}

5575

+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5

5576

+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}

5577

+ fi;;

5578

+ esac

5579

+ # Pass precious variables to config.status.

5580

+ if test "$ac_new_set" = set; then

5581

+ case $ac_new_val in

5582

+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;

5583

+ *) ac_arg=$ac_var=$ac_new_val ;;

5584

+ esac

5585

+ case " $ac_configure_args " in

5586

+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.

5587

+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;

5588

+ esac

5589

+ fi

5590

+done

5591

+if $ac_cache_corrupted; then

5592

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

5593

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

5594

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5

5595

+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}

1901

@@ -2549,7 +2430,7 @@ if $ac_cache_corrupted; then

1902

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

1903

{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5

1904

$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}

1905

- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5

5596

1906

+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5

5597

+fi

5598

+## -------------------- ##

5599

+## Main body of script. ##

5600

+## -------------------- ##

5601

5602

ac_ext=c

5603

ac_cpp='$CPP $CPPFLAGS'

5604

@@ -1959,15 +2578,13 @@ ac_config_headers="$ac_config_headers co

5605

5606

# autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily

5607

# the best choice for libprotobuf.

5608

-if test "x${ac_cv_env_CFLAGS_set}" = "x"; then

5609

+if test "x${ac_cv_env_CFLAGS_set}" = "x"; then :

5610

CFLAGS=""

5611

5612

5613

-if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then

5614

+if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then :

5615

CXXFLAGS=""

5616

5617

5618

1907

1908

## -------------------- ##

1909

## Main body of script. ##

1910

@@ -2580,16 +2461,22 @@ fi

1911

5619

1912

ac_aux_dir=

5620

1913

for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do

5621

if test -f "$ac_dir/install-sh"; then

5622

@@ -1985,9 +2602,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s

5623

1914

- for ac_t in install-sh install.sh shtool; do

1915

- if test -f "$ac_dir/$ac_t"; then

1916

- ac_aux_dir=$ac_dir

1917

- ac_install_sh="$ac_aux_dir/$ac_t -c"

1918

- break 2

1919

- fi

1920

- done

1921

+ if test -f "$ac_dir/install-sh"; then

1922

+ ac_aux_dir=$ac_dir

1923

+ ac_install_sh="$ac_aux_dir/install-sh -c"

1924

+ break

1925

+ elif test -f "$ac_dir/install.sh"; then

1926

+ ac_aux_dir=$ac_dir

1927

+ ac_install_sh="$ac_aux_dir/install.sh -c"

1928

+ break

1929

+ elif test -f "$ac_dir/shtool"; then

1930

+ ac_aux_dir=$ac_dir

1931

+ ac_install_sh="$ac_aux_dir/shtool install -c"

1932

+ break

1933

+ fi

5624

1934

done

5625

1935

if test -z "$ac_aux_dir"; then

5626

- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5

5627

-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}

5628

- { (exit 1); exit 1; }; }

1936

- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5

5629

1937

+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5

5630

1938

5631

1939

5632

1940

# These three variables are undocumented and unsupported,

5633

@@ -2001,35 +2616,27 @@ ac_configure="$SHELL $ac_aux_dir/configu

1941

@@ -2603,27 +2490,27 @@ ac_configure="$SHELL $ac_aux_dir/configu

5634

1942

5635

1943

# Make sure we can run config.sub.

5636

1944

$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||

5637

- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5

5638

-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}

5639

- { (exit 1); exit 1; }; }

5640

5641

-{ echo "$as_me:$LINENO: checking build system type" >&5

5642

-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }

5643

-if test "${ac_cv_build+set}" = set; then

5644

- echo $ECHO_N "(cached) $ECHO_C" >&6

1945

- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5

5645

1946

+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5

5646

5647

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5

5648

+$as_echo_n "checking build system type... " >&6; }

5649

+if test "${ac_cv_build+set}" = set; then :

5650

+ $as_echo_n "(cached) " >&6

1947

1948

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5

1949

$as_echo_n "checking build system type... " >&6; }

1950

-if test "${ac_cv_build+set}" = set; then :

1951

+if ${ac_cv_build+:} false; then :

1952

$as_echo_n "(cached) " >&6

5651

1953

else

5652

1954

ac_build_alias=$build_alias

5653

1955

test "x$ac_build_alias" = x &&

5654

1956

ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`

5655

1957

test "x$ac_build_alias" = x &&

5656

- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5

5657

-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}

5658

- { (exit 1); exit 1; }; }

1958

- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5

5659

1959

+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5

5660

1960

ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||

5661

- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5

5662

-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}

5663

- { (exit 1); exit 1; }; }

1961

- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5

5664

1962

+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5

5665

1963

5666

1964

5667

-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5

5668

-echo "${ECHO_T}$ac_cv_build" >&6; }

5669

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5

5670

+$as_echo "$ac_cv_build" >&6; }

1965

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5

1966

$as_echo "$ac_cv_build" >&6; }

5671

1967

case $ac_cv_build in

5672

1968

*-*-*) ;;

5673

-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5

5674

-echo "$as_me: error: invalid value of canonical build" >&2;}

5675

- { (exit 1); exit 1; }; };;

5676

+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;

1969

-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;

1970

+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;

5677

1971

esac

5678

1972

build=$ac_cv_build

5679

1973

ac_save_IFS=$IFS; IFS='-'

5680

@@ -2045,28 +2652,24 @@ IFS=$ac_save_IFS

5681

case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac

5682

5683

5684

-{ echo "$as_me:$LINENO: checking host system type" >&5

5685

-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }

5686

-if test "${ac_cv_host+set}" = set; then

5687

- echo $ECHO_N "(cached) $ECHO_C" >&6

5688

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5

5689

+$as_echo_n "checking host system type... " >&6; }

5690

+if test "${ac_cv_host+set}" = set; then :

5691

+ $as_echo_n "(cached) " >&6

1974

@@ -2641,14 +2528,14 @@ case $build_os in *\ *) build_os=`echo "

1975

1976

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5

1977

$as_echo_n "checking host system type... " >&6; }

1978

-if test "${ac_cv_host+set}" = set; then :

1979

+if ${ac_cv_host+:} false; then :

1980

$as_echo_n "(cached) " >&6

5692

1981

else

5693

1982

if test "x$host_alias" = x; then

5694

1983

ac_cv_host=$ac_cv_build

5695

1984

else

5696

1985

ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||

5697

- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5

5698

-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}

5699

- { (exit 1); exit 1; }; }

1986

- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5

5700

1987

+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5

5701

1988

5702

1989

5703

1990

5704

-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5

5705

-echo "${ECHO_T}$ac_cv_host" >&6; }

5706

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5

5707

+$as_echo "$ac_cv_host" >&6; }

1991

@@ -2656,7 +2543,7 @@ fi

1992

$as_echo "$ac_cv_host" >&6; }

5708

1993

case $ac_cv_host in

5709

1994

*-*-*) ;;

5710

-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5

5711

-echo "$as_me: error: invalid value of canonical host" >&2;}

5712

- { (exit 1); exit 1; }; };;

5713

+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;

1995

-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;

1996

+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;

5714

1997

esac

5715

1998

host=$ac_cv_host

5716

1999

ac_save_IFS=$IFS; IFS='-'

5717

@@ -2082,28 +2685,24 @@ IFS=$ac_save_IFS

5718

case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac

5719

5720

5721

-{ echo "$as_me:$LINENO: checking target system type" >&5

5722

-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }

5723

-if test "${ac_cv_target+set}" = set; then

5724

- echo $ECHO_N "(cached) $ECHO_C" >&6

5725

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5

5726

+$as_echo_n "checking target system type... " >&6; }

5727

+if test "${ac_cv_target+set}" = set; then :

5728

+ $as_echo_n "(cached) " >&6

2000

@@ -2674,14 +2561,14 @@ case $host_os in *\ *) host_os=`echo "$h

2001

2002

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5

2003

$as_echo_n "checking target system type... " >&6; }

2004

-if test "${ac_cv_target+set}" = set; then :

2005

+if ${ac_cv_target+:} false; then :

2006

$as_echo_n "(cached) " >&6

5729

2007

else

5730

2008

if test "x$target_alias" = x; then

5731

2009

ac_cv_target=$ac_cv_host

5732

2010

else

5733

2011

ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||

5734

- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5

5735

-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}

5736

- { (exit 1); exit 1; }; }

2012

- as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5

5737

2013

+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5

5738

2014

5739

2015

5740

2016

5741

-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5

5742

-echo "${ECHO_T}$ac_cv_target" >&6; }

5743

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5

5744

+$as_echo "$ac_cv_target" >&6; }

2017

@@ -2689,7 +2576,7 @@ fi

2018

$as_echo "$ac_cv_target" >&6; }

5745

2019

case $ac_cv_target in

5746

2020

*-*-*) ;;

5747

-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5

5748

-echo "$as_me: error: invalid value of canonical target" >&2;}

5749

- { (exit 1); exit 1; }; };;

5750

+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;

2021

-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;

2022

+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;

5751

2023

esac

5752

2024

target=$ac_cv_target

5753

2025

ac_save_IFS=$IFS; IFS='-'

5754

@@ -2126,7 +2725,7 @@ test -n "$target_alias" &&

5755

NONENONEs,x,x, &&

5756

program_prefix=${target_alias}-

5757

5758

-am__api_version='1.10'

5759

+am__api_version='1.11'

5760

5761

# Find a good install program. We prefer a C program (faster),

5762

# so one script is as good as another. But avoid the broken or

5763

@@ -2141,22 +2740,23 @@ am__api_version='1.10'

5764

# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"

5765

# OS/2's system install, which has a completely different semantic

5766

# ./install, which can be erroneously created by make from ./install.sh.

5767

-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5

5768

-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }

5769

+# Reject install programs that cannot install multiple files.

5770

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5

5771

+$as_echo_n "checking for a BSD-compatible install... " >&6; }

2026

@@ -2731,7 +2618,7 @@ am__api_version='1.11'

2027

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5

2028

$as_echo_n "checking for a BSD-compatible install... " >&6; }

5772

2029

if test -z "$INSTALL"; then

5773

-if test "${ac_cv_path_install+set}" = set; then

5774

- echo $ECHO_N "(cached) $ECHO_C" >&6

5775

+if test "${ac_cv_path_install+set}" = set; then :

5776

+ $as_echo_n "(cached) " >&6

2030

-if test "${ac_cv_path_install+set}" = set; then :

2031

+if ${ac_cv_path_install+:} false; then :

2032

$as_echo_n "(cached) " >&6

5777

2033

else

5778

2034

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

5779

for as_dir in $PATH

5780

5781

IFS=$as_save_IFS

5782

test -z "$as_dir" && as_dir=.

5783

- # Account for people who put trailing slashes in PATH elements.

5784

-case $as_dir/ in

5785

- ./ | .// | /cC/* | \

5786

+ # Account for people who put trailing slashes in PATH elements.

5787

+case $as_dir/ in #((

5788

+ ./ | .// | /[cC]/* | \

5789

/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \

5790

- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \

5791

+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \

5792

/usr/ucb/* ) ;;

5793

5794

# OSF1 and SCO ODT 3.0 have their own names for install.

5795

@@ -2174,17 +2774,29 @@ case $as_dir/ in

5796

# program-specific install script used by HP pwplus--don't use.

5797

5798

else

5799

- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"

5800

- break 3

5801

+ rm -rf conftest.one conftest.two conftest.dir

5802

+ echo one > conftest.one

5803

+ echo two > conftest.two

5804

+ mkdir conftest.dir

5805

+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&

5806

+ test -s conftest.one && test -s conftest.two &&

5807

+ test -s conftest.dir/conftest.one &&

5808

+ test -s conftest.dir/conftest.two

5809

+ then

5810

+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"

5811

+ break 3

5812

+ fi

5813

5814

5815

done

5816

done

5817

;;

5818

esac

5819

-done

5820

5821

+ done

5822

IFS=$as_save_IFS

5823

5824

+rm -rf conftest.one conftest.two conftest.dir

5825

5826

5827

if test "${ac_cv_path_install+set}" = set; then

5828

@@ -2197,8 +2809,8 @@ fi

5829

INSTALL=$ac_install_sh

5830

5831

5832

-{ echo "$as_me:$LINENO: result: $INSTALL" >&5

5833

-echo "${ECHO_T}$INSTALL" >&6; }

5834

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5

5835

+$as_echo "$INSTALL" >&6; }

5836

5837

# Use test -z because SunOS4 sh mishandles braces in ${var-val}.

5838

# It thinks the first close brace ends the variable substitution.

5839

@@ -2208,21 +2820,34 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR

5840

5841

test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

5842

5843

-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5

5844

-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }

5845

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5

5846

+$as_echo_n "checking whether build environment is sane... " >&6; }

5847

# Just in case

5848

sleep 1

5849

echo timestamp > conftest.file

5850

+# Reject unsafe characters in $srcdir or the absolute working directory

5851

+# name. Accept space and tab only in the latter.

5852

+am_lf='

5853

5854

+case `pwd` in

5855

+ *[\\\"\#\$\&\'\`$am_lf]*)

5856

+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;

5857

+esac

5858

+case $srcdir in

5859

+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)

5860

+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;

5861

+esac

5862

2035

@@ -2818,11 +2705,11 @@ am_lf='

2036

2037

case `pwd` in

2038

*[\\\"\#\$\&\'\`$am_lf]*)

2039

- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;

2040

+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;

2041

esac

2042

case $srcdir in

2043

*[\\\"\#\$\&\'\`$am_lf\ \ ]*)

2044

- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;

2045

+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;

2046

esac

2047

5863

2048

# Do `set' in a subshell so we don't clobber the current shell's

5864

# arguments. Must try -L first in case configure is actually a

5865

# symlink; some systems play weird games with the mod time of symlinks

5866

# (eg FreeBSD returns the mod time of the symlink's containing

5867

# directory).

5868

if (

5869

- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`

5870

+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

5871

if test "$*" = "X"; then

5872

# -L didn't work.

5873

- set X `ls -t $srcdir/configure conftest.file`

5874

+ set X `ls -t "$srcdir/configure" conftest.file`

5875

5876

rm -f conftest.file

5877

if test "$*" != "X $srcdir/configure conftest.file" \

5878

@@ -2232,11 +2857,8 @@ if (

2049

@@ -2844,7 +2731,7 @@ if (

5879

2050

# if, for instance, CONFIG_SHELL is bash and it inherits a

5880

2051

# broken ls alias from the environment. This has actually

5881

2052

# happened. Such a system could not be considered "sane".

5882

- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken

5883

-alias in your environment" >&5

5884

-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken

5885

-alias in your environment" >&2;}

5886

- { (exit 1); exit 1; }; }

2053

- as_fn_error "ls -t appears to fail. Make sure there is not a broken

5887

2054

+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken

5888

+alias in your environment" "$LINENO" 5

2055

alias in your environment" "$LINENO" 5

5889

2056

5890

2057

5891

test "$2" = conftest.file

5892

@@ -2245,52 +2867,162 @@ then

2058

@@ -2854,7 +2741,7 @@ then

5893

2059

# Ok.

5894

2060

5895

2061

else

5896

- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!

5897

-Check your system clock" >&5

5898

-echo "$as_me: error: newly created file is older than distributed files!

5899

-Check your system clock" >&2;}

5900

- { (exit 1); exit 1; }; }

2062

- as_fn_error "newly created file is older than distributed files!

5901

2063

+ as_fn_error $? "newly created file is older than distributed files!

5902

+Check your system clock" "$LINENO" 5

5903

5904

-{ echo "$as_me:$LINENO: result: yes" >&5

5905

-echo "${ECHO_T}yes" >&6; }

5906

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

5907

+$as_echo "yes" >&6; }

5908

test "$program_prefix" != NONE &&

5909

program_transform_name="s&^&$program_prefix&;$program_transform_name"

5910

# Use a double $ so make ignores it.

5911

test "$program_suffix" != NONE &&

5912

program_transform_name="s&\$&$program_suffix&;$program_transform_name"

5913

-# Double any \ or $. echo might interpret backslashes.

5914

+# Double any \ or $.

5915

# By default was `s,x,x', remove it if useless.

5916

-cat <<\_ACEOF >conftest.sed

5917

-s/[\\$]/&&/g;s/;s,x,x,$//

5918

-_ACEOF

5919

-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`

5920

-rm -f conftest.sed

5921

+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'

5922

+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`

5923

5924

# expand $ac_aux_dir to an absolute path

5925

am_aux_dir=`cd $ac_aux_dir && pwd`

5926

5927

-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"

5928

+if test x"${MISSING+set}" != xset; then

5929

+ case $am_aux_dir in

5930

+ *\ * | *\ *)

5931

+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;

5932

+ *)

5933

+ MISSING="\${SHELL} $am_aux_dir/missing" ;;

5934

+ esac

5935

+fi

5936

# Use eval to expand $SHELL

5937

if eval "$MISSING --run true"; then

5938

am_missing_run="$MISSING --run "

5939

else

5940

am_missing_run=

5941

- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5

5942

-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

5943

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5

5944

+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

5945

+fi

5946

5947

+if test x"${install_sh}" != xset; then

5948

+ case $am_aux_dir in

5949

+ *\ * | *\ *)

5950

+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

5951

+ *)

5952

+ install_sh="\${SHELL} $am_aux_dir/install-sh"

5953

+ esac

5954

+fi

5955

5956

+# Installed binaries are usually stripped using `strip' when the user

5957

+# run `make install-strip'. However `strip' might not be the right

5958

+# tool to use in cross-compilation environments, therefore Automake

5959

+# will honor the `STRIP' environment variable to overrule this program.

5960

+if test "$cross_compiling" != no; then

5961

+ if test -n "$ac_tool_prefix"; then

5962

+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

5963

+set dummy ${ac_tool_prefix}strip; ac_word=$2

5964

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5965

+$as_echo_n "checking for $ac_word... " >&6; }

5966

+if test "${ac_cv_prog_STRIP+set}" = set; then :

5967

+ $as_echo_n "(cached) " >&6

5968

+else

5969

+ if test -n "$STRIP"; then

5970

+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

5971

+else

5972

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

5973

+for as_dir in $PATH

5974

+do

5975

+ IFS=$as_save_IFS

5976

+ test -z "$as_dir" && as_dir=.

5977

+ for ac_exec_ext in '' $ac_executable_extensions; do

5978

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5979

+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"

5980

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5981

+ break 2

5982

+ fi

5983

+done

5984

+ done

5985

+IFS=$as_save_IFS

5986

5987

+fi

5988

+fi

5989

+STRIP=$ac_cv_prog_STRIP

5990

+if test -n "$STRIP"; then

5991

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5

5992

+$as_echo "$STRIP" >&6; }

5993

+else

5994

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5995

+$as_echo "no" >&6; }

5996

+fi

5997

5998

5999

+fi

6000

+if test -z "$ac_cv_prog_STRIP"; then

6001

+ ac_ct_STRIP=$STRIP

6002

+ # Extract the first word of "strip", so it can be a program name with args.

6003

+set dummy strip; ac_word=$2

6004

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6005

+$as_echo_n "checking for $ac_word... " >&6; }

6006

+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :

6007

+ $as_echo_n "(cached) " >&6

6008

+else

6009

+ if test -n "$ac_ct_STRIP"; then

6010

+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

6011

+else

6012

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

6013

+for as_dir in $PATH

6014

+do

6015

+ IFS=$as_save_IFS

6016

+ test -z "$as_dir" && as_dir=.

6017

+ for ac_exec_ext in '' $ac_executable_extensions; do

6018

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6019

+ ac_cv_prog_ac_ct_STRIP="strip"

6020

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6021

+ break 2

6022

+ fi

6023

+done

6024

+ done

6025

+IFS=$as_save_IFS

6026

6027

6028

+fi

6029

+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

6030

+if test -n "$ac_ct_STRIP"; then

6031

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5

6032

+$as_echo "$ac_ct_STRIP" >&6; }

6033

+else

6034

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6035

+$as_echo "no" >&6; }

6036

+fi

6037

6038

+ if test "x$ac_ct_STRIP" = x; then

6039

+ STRIP=":"

6040

+ else

6041

+ case $cross_compiling:$ac_tool_warned in

6042

+yes:)

6043

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

6044

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6045

+ac_tool_warned=yes ;;

6046

+esac

6047

+ STRIP=$ac_ct_STRIP

6048

+ fi

6049

+else

6050

+ STRIP="$ac_cv_prog_STRIP"

6051

+fi

6052

6053

+fi

6054

+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

6055

6056

-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5

6057

-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }

6058

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5

6059

+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }

2064

Check your system clock" "$LINENO" 5

2065

2066

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

2067

@@ -2908,7 +2795,7 @@ if test "$cross_compiling" != no; then

2068

set dummy ${ac_tool_prefix}strip; ac_word=$2

2069

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2070

$as_echo_n "checking for $ac_word... " >&6; }

2071

-if test "${ac_cv_prog_STRIP+set}" = set; then :

2072

+if ${ac_cv_prog_STRIP+:} false; then :

2073

$as_echo_n "(cached) " >&6

2074

else

2075

if test -n "$STRIP"; then

2076

@@ -2948,7 +2835,7 @@ if test -z "$ac_cv_prog_STRIP"; then

2077

set dummy strip; ac_word=$2

2078

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2079

$as_echo_n "checking for $ac_word... " >&6; }

2080

-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :

2081

+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :

2082

$as_echo_n "(cached) " >&6

2083

else

2084

if test -n "$ac_ct_STRIP"; then

2085

@@ -3001,7 +2888,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c

2086

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5

2087

$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }

6060

2088

if test -z "$MKDIR_P"; then

6061

- if test "${ac_cv_path_mkdir+set}" = set; then

6062

- echo $ECHO_N "(cached) $ECHO_C" >&6

6063

+ if test "${ac_cv_path_mkdir+set}" = set; then :

6064

+ $as_echo_n "(cached) " >&6

2089

- if test "${ac_cv_path_mkdir+set}" = set; then :

2090

+ if ${ac_cv_path_mkdir+:} false; then :

2091

$as_echo_n "(cached) " >&6

6065

2092

else

6066

2093

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

6067

for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin

6068

6069

IFS=$as_save_IFS

6070

test -z "$as_dir" && as_dir=.

6071

- for ac_prog in mkdir gmkdir; do

6072

+ for ac_prog in mkdir gmkdir; do

6073

for ac_exec_ext in '' $ac_executable_extensions; do

6074

{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue

6075

case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(

6076

@@ -2302,11 +3034,12 @@ do

6077

esac

6078

done

6079

done

6080

-done

6081

+ done

6082

IFS=$as_save_IFS

6083

6084

6085

6086

+ test -d ./--version && rmdir ./--version

6087

if test "${ac_cv_path_mkdir+set}" = set; then

6088

MKDIR_P="$ac_cv_path_mkdir -p"

6089

else

6090

@@ -2314,12 +3047,11 @@ fi

6091

# value for MKDIR_P within a source directory, because that will

6092

# break other packages using the cache if that directory is

6093

# removed, or if the value is a relative name.

6094

- test -d ./--version && rmdir ./--version

6095

MKDIR_P="$ac_install_sh -d"

6096

6097

6098

-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5

6099

-echo "${ECHO_T}$MKDIR_P" >&6; }

6100

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5

6101

+$as_echo "$MKDIR_P" >&6; }

6102

6103

mkdir_p="$MKDIR_P"

6104

case $mkdir_p in

6105

@@ -2331,10 +3063,10 @@ for ac_prog in gawk mawk nawk awk

6106

6107

# Extract the first word of "$ac_prog", so it can be a program name with args.

2094

@@ -3052,7 +2939,7 @@ do

6108

2095

set dummy $ac_prog; ac_word=$2

6109

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6110

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6111

-if test "${ac_cv_prog_AWK+set}" = set; then

6112

- echo $ECHO_N "(cached) $ECHO_C" >&6

6113

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6114

+$as_echo_n "checking for $ac_word... " >&6; }

6115

+if test "${ac_cv_prog_AWK+set}" = set; then :

6116

+ $as_echo_n "(cached) " >&6

2096

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2097

$as_echo_n "checking for $ac_word... " >&6; }

2098

-if test "${ac_cv_prog_AWK+set}" = set; then :

2099

+if ${ac_cv_prog_AWK+:} false; then :

2100

$as_echo_n "(cached) " >&6

6117

2101

else

6118

2102

if test -n "$AWK"; then

6119

ac_cv_prog_AWK="$AWK" # Let the user override the test.

6120

@@ -2344,43 +3076,44 @@ for as_dir in $PATH

6121

6122

IFS=$as_save_IFS

6123

test -z "$as_dir" && as_dir=.

6124

- for ac_exec_ext in '' $ac_executable_extensions; do

6125

+ for ac_exec_ext in '' $ac_executable_extensions; do

6126

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6127

ac_cv_prog_AWK="$ac_prog"

6128

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6129

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6130

break 2

6131

6132

done

6133

-done

6134

+ done

6135

IFS=$as_save_IFS

6136

6137

6138

6139

AWK=$ac_cv_prog_AWK

6140

if test -n "$AWK"; then

6141

- { echo "$as_me:$LINENO: result: $AWK" >&5

6142

-echo "${ECHO_T}$AWK" >&6; }

6143

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5

6144

+$as_echo "$AWK" >&6; }

6145

else

6146

- { echo "$as_me:$LINENO: result: no" >&5

6147

-echo "${ECHO_T}no" >&6; }

6148

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6149

+$as_echo "no" >&6; }

6150

6151

6152

6153

test -n "$AWK" && break

6154

done

6155

6156

-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5

6157

-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }

6158

-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

6159

-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then

6160

- echo $ECHO_N "(cached) $ECHO_C" >&6

6161

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5

6162

+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }

6163

+set x ${MAKE-make}

6164

+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

6165

+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :

6166

+ $as_echo_n "(cached) " >&6

2103

@@ -3092,7 +2979,7 @@ done

2104

$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }

2105

set x ${MAKE-make}

2106

ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

2107

-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :

2108

+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :

2109

$as_echo_n "(cached) " >&6

6167

2110

else

6168

2111

cat >conftest.make <<\_ACEOF

6169

SHELL = /bin/sh

2112

@@ -3100,7 +2987,7 @@ SHELL = /bin/sh

6170

2113

all:

6171

2114

@echo '@@@%%%=$(MAKE)=@@@%%%'

6172

2115

_ACEOF

6175

2118

case `${MAKE-make} -f conftest.make 2>/dev/null` in

6176

2119

*@@@%%%=?*=@@@%%%*)

6177

2120

eval ac_cv_prog_make_${ac_make}_set=yes;;

6178

@@ -2390,12 +3123,12 @@ esac

6179

rm -f conftest.make

6180

6181

if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then

6182

- { echo "$as_me:$LINENO: result: yes" >&5

6183

-echo "${ECHO_T}yes" >&6; }

6184

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

6185

+$as_echo "yes" >&6; }

6186

SET_MAKE=

6187

else

6188

- { echo "$as_me:$LINENO: result: no" >&5

6189

-echo "${ECHO_T}no" >&6; }

6190

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6191

+$as_echo "no" >&6; }

6192

SET_MAKE="MAKE=${MAKE-make}"

6193

6194

6195

@@ -2414,9 +3147,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"

2121

@@ -3134,7 +3021,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"

6196

2122

am__isrc=' -I$(srcdir)'

6197

2123

# test to see if srcdir already configured

6198

2124

if test -f $srcdir/config.status; then

6199

- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5

6200

-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}

6201

- { (exit 1); exit 1; }; }

2125

- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5

6202

2126

+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5

6203

2127

6204

2128

6205

2129

6206

@@ -2460,112 +3191,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru

6207

6208

MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}

6209

6210

-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}

6211

6212

-# Installed binaries are usually stripped using `strip' when the user

6213

-# run `make install-strip'. However `strip' might not be the right

6214

-# tool to use in cross-compilation environments, therefore Automake

6215

-# will honor the `STRIP' environment variable to overrule this program.

6216

-if test "$cross_compiling" != no; then

6217

- if test -n "$ac_tool_prefix"; then

6218

- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

6219

-set dummy ${ac_tool_prefix}strip; ac_word=$2

6220

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6221

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6222

-if test "${ac_cv_prog_STRIP+set}" = set; then

6223

- echo $ECHO_N "(cached) $ECHO_C" >&6

6224

-else

6225

- if test -n "$STRIP"; then

6226

- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

6227

-else

6228

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

6229

-for as_dir in $PATH

6230

-do

6231

- IFS=$as_save_IFS

6232

- test -z "$as_dir" && as_dir=.

6233

- for ac_exec_ext in '' $ac_executable_extensions; do

6234

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6235

- ac_cv_prog_STRIP="${ac_tool_prefix}strip"

6236

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6237

- break 2

6238

- fi

6239

-done

6240

-done

6241

-IFS=$as_save_IFS

6242

6243

-fi

6244

-fi

6245

-STRIP=$ac_cv_prog_STRIP

6246

-if test -n "$STRIP"; then

6247

- { echo "$as_me:$LINENO: result: $STRIP" >&5

6248

-echo "${ECHO_T}$STRIP" >&6; }

6249

-else

6250

- { echo "$as_me:$LINENO: result: no" >&5

6251

-echo "${ECHO_T}no" >&6; }

6252

-fi

6253

6254

6255

-fi

6256

-if test -z "$ac_cv_prog_STRIP"; then

6257

- ac_ct_STRIP=$STRIP

6258

- # Extract the first word of "strip", so it can be a program name with args.

6259

-set dummy strip; ac_word=$2

6260

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6261

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6262

-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then

6263

- echo $ECHO_N "(cached) $ECHO_C" >&6

6264

-else

6265

- if test -n "$ac_ct_STRIP"; then

6266

- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

6267

-else

6268

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

6269

-for as_dir in $PATH

6270

-do

6271

- IFS=$as_save_IFS

6272

- test -z "$as_dir" && as_dir=.

6273

- for ac_exec_ext in '' $ac_executable_extensions; do

6274

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6275

- ac_cv_prog_ac_ct_STRIP="strip"

6276

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6277

- break 2

6278

- fi

6279

-done

6280

-done

6281

-IFS=$as_save_IFS

6282

6283

-fi

6284

-fi

6285

-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

6286

-if test -n "$ac_ct_STRIP"; then

6287

- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

6288

-echo "${ECHO_T}$ac_ct_STRIP" >&6; }

6289

-else

6290

- { echo "$as_me:$LINENO: result: no" >&5

6291

-echo "${ECHO_T}no" >&6; }

6292

-fi

6293

6294

- if test "x$ac_ct_STRIP" = x; then

6295

- STRIP=":"

6296

- else

6297

- case $cross_compiling:$ac_tool_warned in

6298

-yes:)

6299

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6300

-whose name does not start with the host triplet. If you think this

6301

-configuration is useful to you, please write to autoconf@gnu.org." >&5

6302

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6303

-whose name does not start with the host triplet. If you think this

6304

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6305

-ac_tool_warned=yes ;;

6306

-esac

6307

- STRIP=$ac_ct_STRIP

6308

- fi

6309

-else

6310

- STRIP="$ac_cv_prog_STRIP"

6311

-fi

6312

6313

-fi

6314

-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

6315

6316

# We need awk for the "check" target. The system "awk" is bad on

6317

# some platforms.

6318

# Always define AMTAR for backward compatibility.

6319

@@ -2581,7 +3206,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am

6320

6321

6322

# Check whether --with-zlib was given.

6323

-if test "${with_zlib+set}" = set; then

6324

+if test "${with_zlib+set}" = set; then :

6325

withval=$with_zlib;

6326

else

6327

with_zlib=check

6328

@@ -2590,7 +3215,7 @@ fi

6329

6330

6331

# Check whether --with-protoc was given.

6332

-if test "${with_protoc+set}" = set; then

6333

+if test "${with_protoc+set}" = set; then :

6334

withval=$with_protoc;

6335

else

6336

with_protoc=no

6337

@@ -2606,10 +3231,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

6338

if test -n "$ac_tool_prefix"; then

6339

# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

2130

@@ -3220,7 +3107,7 @@ if test -n "$ac_tool_prefix"; then

6340

2131

set dummy ${ac_tool_prefix}gcc; ac_word=$2

6341

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6342

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6343

-if test "${ac_cv_prog_CC+set}" = set; then

6344

- echo $ECHO_N "(cached) $ECHO_C" >&6

6345

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6346

+$as_echo_n "checking for $ac_word... " >&6; }

6347

+if test "${ac_cv_prog_CC+set}" = set; then :

6348

+ $as_echo_n "(cached) " >&6

2132

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2133

$as_echo_n "checking for $ac_word... " >&6; }

2134

-if test "${ac_cv_prog_CC+set}" = set; then :

2135

+if ${ac_cv_prog_CC+:} false; then :

2136

$as_echo_n "(cached) " >&6

6349

2137

else

6350

2138

if test -n "$CC"; then

6351

ac_cv_prog_CC="$CC" # Let the user override the test.

6352

@@ -2619,25 +3244,25 @@ for as_dir in $PATH

6353

6354

IFS=$as_save_IFS

6355

test -z "$as_dir" && as_dir=.

6356

- for ac_exec_ext in '' $ac_executable_extensions; do

6357

+ for ac_exec_ext in '' $ac_executable_extensions; do

6358

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6359

ac_cv_prog_CC="${ac_tool_prefix}gcc"

6360

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6361

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6362

break 2

6363

6364

done

6365

-done

6366

+ done

6367

IFS=$as_save_IFS

6368

6369

6370

6371

CC=$ac_cv_prog_CC

6372

if test -n "$CC"; then

6373

- { echo "$as_me:$LINENO: result: $CC" >&5

6374

-echo "${ECHO_T}$CC" >&6; }

6375

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

6376

+$as_echo "$CC" >&6; }

6377

else

6378

- { echo "$as_me:$LINENO: result: no" >&5

6379

-echo "${ECHO_T}no" >&6; }

6380

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6381

+$as_echo "no" >&6; }

6382

6383

6384

6385

@@ -2646,10 +3271,10 @@ if test -z "$ac_cv_prog_CC"; then

6386

ac_ct_CC=$CC

6387

# Extract the first word of "gcc", so it can be a program name with args.

2139

@@ -3260,7 +3147,7 @@ if test -z "$ac_cv_prog_CC"; then

6388

2140

set dummy gcc; ac_word=$2

6389

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6390

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6391

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

6392

- echo $ECHO_N "(cached) $ECHO_C" >&6

6393

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6394

+$as_echo_n "checking for $ac_word... " >&6; }

6395

+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

6396

+ $as_echo_n "(cached) " >&6

2141

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2142

$as_echo_n "checking for $ac_word... " >&6; }

2143

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

2144

+if ${ac_cv_prog_ac_ct_CC+:} false; then :

2145

$as_echo_n "(cached) " >&6

6397

2146

else

6398

2147

if test -n "$ac_ct_CC"; then

6399

ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

6400

@@ -2659,25 +3284,25 @@ for as_dir in $PATH

6401

6402

IFS=$as_save_IFS

6403

test -z "$as_dir" && as_dir=.

6404

- for ac_exec_ext in '' $ac_executable_extensions; do

6405

+ for ac_exec_ext in '' $ac_executable_extensions; do

6406

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6407

ac_cv_prog_ac_ct_CC="gcc"

6408

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6409

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6410

break 2

6411

6412

done

6413

-done

6414

+ done

6415

IFS=$as_save_IFS

6416

6417

6418

6419

ac_ct_CC=$ac_cv_prog_ac_ct_CC

6420

if test -n "$ac_ct_CC"; then

6421

- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

6422

-echo "${ECHO_T}$ac_ct_CC" >&6; }

6423

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

6424

+$as_echo "$ac_ct_CC" >&6; }

6425

else

6426

- { echo "$as_me:$LINENO: result: no" >&5

6427

-echo "${ECHO_T}no" >&6; }

6428

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6429

+$as_echo "no" >&6; }

6430

6431

6432

if test "x$ac_ct_CC" = x; then

6433

@@ -2685,12 +3310,8 @@ fi

6434

else

6435

case $cross_compiling:$ac_tool_warned in

6436

yes:)

6437

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6438

-whose name does not start with the host triplet. If you think this

6439

-configuration is useful to you, please write to autoconf@gnu.org." >&5

6440

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6441

-whose name does not start with the host triplet. If you think this

6442

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6443

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

6444

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6445

ac_tool_warned=yes ;;

6446

esac

6447

CC=$ac_ct_CC

6448

@@ -2703,10 +3324,10 @@ if test -z "$CC"; then

6449

if test -n "$ac_tool_prefix"; then

6450

# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

2148

@@ -3313,7 +3200,7 @@ if test -z "$CC"; then

6451

2149

set dummy ${ac_tool_prefix}cc; ac_word=$2

6452

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6453

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6454

-if test "${ac_cv_prog_CC+set}" = set; then

6455

- echo $ECHO_N "(cached) $ECHO_C" >&6

6456

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6457

+$as_echo_n "checking for $ac_word... " >&6; }

6458

+if test "${ac_cv_prog_CC+set}" = set; then :

6459

+ $as_echo_n "(cached) " >&6

2150

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2151

$as_echo_n "checking for $ac_word... " >&6; }

2152

-if test "${ac_cv_prog_CC+set}" = set; then :

2153

+if ${ac_cv_prog_CC+:} false; then :

2154

$as_echo_n "(cached) " >&6

6460

2155

else

6461

2156

if test -n "$CC"; then

6462

ac_cv_prog_CC="$CC" # Let the user override the test.

6463

@@ -2716,25 +3337,25 @@ for as_dir in $PATH

6464

6465

IFS=$as_save_IFS

6466

test -z "$as_dir" && as_dir=.

6467

- for ac_exec_ext in '' $ac_executable_extensions; do

6468

+ for ac_exec_ext in '' $ac_executable_extensions; do

6469

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6470

ac_cv_prog_CC="${ac_tool_prefix}cc"

6471

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6472

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6473

break 2

6474

6475

done

6476

-done

6477

+ done

6478

IFS=$as_save_IFS

6479

6480

6481

6482

CC=$ac_cv_prog_CC

6483

if test -n "$CC"; then

6484

- { echo "$as_me:$LINENO: result: $CC" >&5

6485

-echo "${ECHO_T}$CC" >&6; }

6486

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

6487

+$as_echo "$CC" >&6; }

6488

else

6489

- { echo "$as_me:$LINENO: result: no" >&5

6490

-echo "${ECHO_T}no" >&6; }

6491

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6492

+$as_echo "no" >&6; }

6493

6494

6495

6496

@@ -2743,10 +3364,10 @@ fi

6497

if test -z "$CC"; then

6498

# Extract the first word of "cc", so it can be a program name with args.

2157

@@ -3353,7 +3240,7 @@ if test -z "$CC"; then

6499

2158

set dummy cc; ac_word=$2

6500

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6501

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6502

-if test "${ac_cv_prog_CC+set}" = set; then

6503

- echo $ECHO_N "(cached) $ECHO_C" >&6

6504

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6505

+$as_echo_n "checking for $ac_word... " >&6; }

6506

+if test "${ac_cv_prog_CC+set}" = set; then :

6507

+ $as_echo_n "(cached) " >&6

2159

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2160

$as_echo_n "checking for $ac_word... " >&6; }

2161

-if test "${ac_cv_prog_CC+set}" = set; then :

2162

+if ${ac_cv_prog_CC+:} false; then :

2163

$as_echo_n "(cached) " >&6

6508

2164

else

6509

2165

if test -n "$CC"; then

6510

ac_cv_prog_CC="$CC" # Let the user override the test.

6511

@@ -2757,18 +3378,18 @@ for as_dir in $PATH

6512

6513

IFS=$as_save_IFS

6514

test -z "$as_dir" && as_dir=.

6515

- for ac_exec_ext in '' $ac_executable_extensions; do

6516

+ for ac_exec_ext in '' $ac_executable_extensions; do

6517

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6518

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

6519

ac_prog_rejected=yes

6520

continue

6521

6522

ac_cv_prog_CC="cc"

6523

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6524

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6525

break 2

6526

6527

done

6528

-done

6529

+ done

6530

IFS=$as_save_IFS

6531

6532

if test $ac_prog_rejected = yes; then

6533

@@ -2787,11 +3408,11 @@ fi

6534

6535

CC=$ac_cv_prog_CC

6536

if test -n "$CC"; then

6537

- { echo "$as_me:$LINENO: result: $CC" >&5

6538

-echo "${ECHO_T}$CC" >&6; }

6539

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

6540

+$as_echo "$CC" >&6; }

6541

else

6542

- { echo "$as_me:$LINENO: result: no" >&5

6543

-echo "${ECHO_T}no" >&6; }

6544

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6545

+$as_echo "no" >&6; }

6546

6547

6548

6549

@@ -2802,10 +3423,10 @@ if test -z "$CC"; then

6550

6551

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

2166

@@ -3412,7 +3299,7 @@ if test -z "$CC"; then

6552

2167

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

6553

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6554

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6555

-if test "${ac_cv_prog_CC+set}" = set; then

6556

- echo $ECHO_N "(cached) $ECHO_C" >&6

6557

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6558

+$as_echo_n "checking for $ac_word... " >&6; }

6559

+if test "${ac_cv_prog_CC+set}" = set; then :

6560

+ $as_echo_n "(cached) " >&6

2168

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2169

$as_echo_n "checking for $ac_word... " >&6; }

2170

-if test "${ac_cv_prog_CC+set}" = set; then :

2171

+if ${ac_cv_prog_CC+:} false; then :

2172

$as_echo_n "(cached) " >&6

6561

2173

else

6562

2174

if test -n "$CC"; then

6563

ac_cv_prog_CC="$CC" # Let the user override the test.

6564

@@ -2815,25 +3436,25 @@ for as_dir in $PATH

6565

6566

IFS=$as_save_IFS

6567

test -z "$as_dir" && as_dir=.

6568

- for ac_exec_ext in '' $ac_executable_extensions; do

6569

+ for ac_exec_ext in '' $ac_executable_extensions; do

6570

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6571

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

6572

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6573

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6574

break 2

6575

6576

done

6577

-done

6578

+ done

6579

IFS=$as_save_IFS

6580

6581

6582

6583

CC=$ac_cv_prog_CC

6584

if test -n "$CC"; then

6585

- { echo "$as_me:$LINENO: result: $CC" >&5

6586

-echo "${ECHO_T}$CC" >&6; }

6587

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

6588

+$as_echo "$CC" >&6; }

6589

else

6590

- { echo "$as_me:$LINENO: result: no" >&5

6591

-echo "${ECHO_T}no" >&6; }

6592

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6593

+$as_echo "no" >&6; }

6594

6595

6596

6597

@@ -2846,10 +3467,10 @@ if test -z "$CC"; then

6598

6599

# Extract the first word of "$ac_prog", so it can be a program name with args.

2175

@@ -3456,7 +3343,7 @@ do

6600

2176

set dummy $ac_prog; ac_word=$2

6601

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6602

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6603

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

6604

- echo $ECHO_N "(cached) $ECHO_C" >&6

6605

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6606

+$as_echo_n "checking for $ac_word... " >&6; }

6607

+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

6608

+ $as_echo_n "(cached) " >&6

2177

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2178

$as_echo_n "checking for $ac_word... " >&6; }

2179

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

2180

+if ${ac_cv_prog_ac_ct_CC+:} false; then :

2181

$as_echo_n "(cached) " >&6

6609

2182

else

6610

2183

if test -n "$ac_ct_CC"; then

6611

ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

6612

@@ -2859,25 +3480,25 @@ for as_dir in $PATH

6613

6614

IFS=$as_save_IFS

6615

test -z "$as_dir" && as_dir=.

6616

- for ac_exec_ext in '' $ac_executable_extensions; do

6617

+ for ac_exec_ext in '' $ac_executable_extensions; do

6618

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6619

ac_cv_prog_ac_ct_CC="$ac_prog"

6620

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6621

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6622

break 2

6623

6624

done

6625

-done

6626

+ done

6627

IFS=$as_save_IFS

6628

6629

6630

6631

ac_ct_CC=$ac_cv_prog_ac_ct_CC

6632

if test -n "$ac_ct_CC"; then

6633

- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

6634

-echo "${ECHO_T}$ac_ct_CC" >&6; }

6635

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

6636

+$as_echo "$ac_ct_CC" >&6; }

6637

else

6638

- { echo "$as_me:$LINENO: result: no" >&5

6639

-echo "${ECHO_T}no" >&6; }

6640

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6641

+$as_echo "no" >&6; }

6642

6643

6644

6645

@@ -2889,12 +3510,8 @@ done

6646

else

6647

case $cross_compiling:$ac_tool_warned in

6648

yes:)

6649

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6650

-whose name does not start with the host triplet. If you think this

6651

-configuration is useful to you, please write to autoconf@gnu.org." >&5

6652

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6653

-whose name does not start with the host triplet. If you think this

6654

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6655

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

6656

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6657

ac_tool_warned=yes ;;

6658

esac

6659

CC=$ac_ct_CC

6660

@@ -2904,51 +3521,37 @@ fi

6661

6662

6663

6664

-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH

6665

-See \`config.log' for more details." >&5

6666

-echo "$as_me: error: no acceptable C compiler found in \$PATH

6667

-See \`config.log' for more details." >&2;}

6668

- { (exit 1); exit 1; }; }

6669

+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

6670

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2184

@@ -3510,8 +3397,8 @@ fi

2185

2186

test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

2187

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2188

-as_fn_error "no acceptable C compiler found in \$PATH

2189

-See \`config.log' for more details." "$LINENO" 5; }

6671

2190

+as_fn_error $? "no acceptable C compiler found in \$PATH

6672

+See \`config.log' for more details" "$LINENO" 5 ; }

2191

+See \`config.log' for more details" "$LINENO" 5; }

6673

2192

6674

2193

# Provide some information about the compiler.

6675

-echo "$as_me:$LINENO: checking for C compiler version" >&5

6676

-ac_compiler=`set X $ac_compile; echo $2`

6677

-{ (ac_try="$ac_compiler --version >&5"

6678

-case "(($ac_try" in

6679

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6680

- *) ac_try_echo=$ac_try;;

6681

-esac

6682

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6683

- (eval "$ac_compiler --version >&5") 2>&5

6684

- ac_status=$?

6685

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6686

- (exit $ac_status); }

6687

-{ (ac_try="$ac_compiler -v >&5"

6688

-case "(($ac_try" in

6689

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6690

- *) ac_try_echo=$ac_try;;

6691

-esac

6692

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6693

- (eval "$ac_compiler -v >&5") 2>&5

6694

- ac_status=$?

6695

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6696

- (exit $ac_status); }

6697

-{ (ac_try="$ac_compiler -V >&5"

6698

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

6699

+set X $ac_compile

6700

+ac_compiler=$2

6701

+for ac_option in --version -v -V -qversion; do

6702

+ { { ac_try="$ac_compiler $ac_option >&5"

6703

case "(($ac_try" in

6704

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6705

*) ac_try_echo=$ac_try;;

6706

esac

6707

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6708

- (eval "$ac_compiler -V >&5") 2>&5

6709

- ac_status=$?

6710

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6711

- (exit $ac_status); }

6712

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

6713

+$as_echo "$ac_try_echo"; } >&5

6714

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

6715

+ ac_status=$?

6716

+ if test -s conftest.err; then

6717

+ sed '10a\

6718

+... rest of stderr output deleted ...

6719

+ 10q' conftest.err >conftest.er1

6720

+ cat conftest.er1 >&5

6721

+ fi

6722

+ rm -f conftest.er1 conftest.err

6723

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6724

+ test $ac_status = 0; }

6725

+done

6726

6727

-cat >conftest.$ac_ext <<_ACEOF

6728

-/* confdefs.h. */

6729

-_ACEOF

6730

-cat confdefs.h >>conftest.$ac_ext

6731

-cat >>conftest.$ac_ext <<_ACEOF

6732

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6733

/* end confdefs.h. */

6734

6735

int

6736

@@ -2960,42 +3563,38 @@ main ()

6737

}

6738

_ACEOF

6739

ac_clean_files_save=$ac_clean_files

6740

-ac_clean_files="$ac_clean_files a.out a.exe b.out"

6741

+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"

6742

# Try to create an executable without -o first, disregard a.out.

6743

# It will help us diagnose broken compilers, and finding out an intuition

6744

# of exeext.

6745

-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

6746

-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }

6747

-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

6748

6749

-# List of possible output files, starting from the most likely.

6750

-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)

6751

-# only as a last resort. b.out is created by i960 compilers.

6752

-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'

6753

6754

-# The IRIX 6 linker writes into existing files which may not be

6755

-# executable, retaining their permissions. Remove them first so a

6756

-# subsequent execution test works.

6757

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5

6758

+$as_echo_n "checking whether the C compiler works... " >&6; }

6759

+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

6760

6761

+# The possible output files:

6762

+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"

6763

6764

ac_rmfiles=

6765

for ac_file in $ac_files

6766

6767

case $ac_file in

6768

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

6769

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;

6770

* ) ac_rmfiles="$ac_rmfiles $ac_file";;

6771

esac

6772

done

6773

rm -f $ac_rmfiles

6774

6775

-if { (ac_try="$ac_link_default"

6776

+if { { ac_try="$ac_link_default"

6777

case "(($ac_try" in

6778

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6779

*) ac_try_echo=$ac_try;;

6780

esac

6781

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6782

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

6783

+$as_echo "$ac_try_echo"; } >&5

6784

(eval "$ac_link_default") 2>&5

6785

ac_status=$?

6786

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6787

- (exit $ac_status); }; then

6788

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6789

+ test $ac_status = 0; }; then :

6790

# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.

6791

# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'

6792

# in a Makefile. We should not override ac_cv_exeext if it was cached,

6793

@@ -3005,14 +3604,14 @@ for ac_file in $ac_files ''

6794

6795

test -f "$ac_file" || continue

6796

case $ac_file in

6797

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )

6798

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )

6799

;;

6800

[ab].out )

6801

# We found the default executable, but exeext='' is most

6802

# certainly right.

6803

break;;

6804

*.* )

6805

- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;

6806

+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;

6807

then :; else

6808

ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

6809

6810

@@ -3029,80 +3628,43 @@ done

6811

test "$ac_cv_exeext" = no && ac_cv_exeext=

6812

6813

else

6814

- ac_file=''

6815

-fi

6816

6817

-{ echo "$as_me:$LINENO: result: $ac_file" >&5

6818

-echo "${ECHO_T}$ac_file" >&6; }

6819

-if test -z "$ac_file"; then

6820

- echo "$as_me: failed program was:" >&5

6821

-sed 's/^/| /' conftest.$ac_ext >&5

6822

6823

-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables

6824

-See \`config.log' for more details." >&5

6825

-echo "$as_me: error: C compiler cannot create executables

6826

-See \`config.log' for more details." >&2;}

6827

- { (exit 77); exit 77; }; }

6828

-fi

6829

6830

-ac_exeext=$ac_cv_exeext

6831

6832

-# Check that the compiler produces executables we can run. If not, either

6833

-# the compiler is broken, or we cross compile.

6834

-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5

6835

-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }

6836

-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0

6837

-# If not cross compiling, check that we can run a simple program.

6838

-if test "$cross_compiling" != yes; then

6839

- if { ac_try='./$ac_file'

6840

- { (case "(($ac_try" in

6841

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6842

- *) ac_try_echo=$ac_try;;

6843

-esac

6844

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6845

- (eval "$ac_try") 2>&5

6846

- ac_status=$?

6847

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6848

- (exit $ac_status); }; }; then

6849

- cross_compiling=no

6850

- else

6851

- if test "$cross_compiling" = maybe; then

6852

- cross_compiling=yes

6853

- else

6854

- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.

6855

-If you meant to cross compile, use \`--host'.

6856

-See \`config.log' for more details." >&5

6857

-echo "$as_me: error: cannot run C compiled programs.

6858

-If you meant to cross compile, use \`--host'.

6859

-See \`config.log' for more details." >&2;}

6860

- { (exit 1); exit 1; }; }

6861

- fi

6862

- fi

6863

+ ac_file=''

6864

6865

-{ echo "$as_me:$LINENO: result: yes" >&5

6866

-echo "${ECHO_T}yes" >&6; }

6867

+if test -z "$ac_file"; then :

6868

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6869

+$as_echo "no" >&6; }

6870

+$as_echo "$as_me: failed program was:" >&5

6871

+sed 's/^/| /' conftest.$ac_ext >&5

6872

6873

+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

6874

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2194

$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

2195

@@ -3625,9 +3512,8 @@ sed 's/^/| /' conftest.$ac_ext >&5

2196

2197

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

2198

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2199

-{ as_fn_set_status 77

2200

-as_fn_error "C compiler cannot create executables

2201

-See \`config.log' for more details." "$LINENO" 5; }; }

6875

2202

+as_fn_error 77 "C compiler cannot create executables

6876

+See \`config.log' for more details" "$LINENO" 5 ; }

6877

+else

6878

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

6879

+$as_echo "yes" >&6; }

6880

+fi

6881

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5

6882

+$as_echo_n "checking for C compiler default output file name... " >&6; }

6883

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5

6884

+$as_echo "$ac_file" >&6; }

6885

+ac_exeext=$ac_cv_exeext

6886

6887

-rm -f a.out a.exe conftest$ac_cv_exeext b.out

6888

+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out

6889

ac_clean_files=$ac_clean_files_save

6890

-# Check that the compiler produces executables we can run. If not, either

6891

-# the compiler is broken, or we cross compile.

6892

-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

6893

-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }

6894

-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5

6895

-echo "${ECHO_T}$cross_compiling" >&6; }

6896

6897

-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5

6898

-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }

6899

-if { (ac_try="$ac_link"

6900

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5

6901

+$as_echo_n "checking for suffix of executables... " >&6; }

6902

+if { { ac_try="$ac_link"

6903

case "(($ac_try" in

6904

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6905

*) ac_try_echo=$ac_try;;

6906

esac

6907

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6908

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

6909

+$as_echo "$ac_try_echo"; } >&5

6910

(eval "$ac_link") 2>&5

6911

ac_status=$?

6912

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6913

- (exit $ac_status); }; then

6914

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6915

+ test $ac_status = 0; }; then :

6916

# If both `conftest.exe' and `conftest' are `present' (well, observable)

6917

# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will

6918

# work properly (i.e., refer to `conftest.exe'), while it won't with

6919

@@ -3110,37 +3672,90 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec

6920

for ac_file in conftest.exe conftest conftest.*; do

6921

test -f "$ac_file" || continue

6922

case $ac_file in

6923

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

6924

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;

6925

*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

6926

break;;

6927

* ) break;;

6928

esac

6929

done

6930

else

6931

- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link

6932

-See \`config.log' for more details." >&5

6933

-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link

6934

-See \`config.log' for more details." >&2;}

6935

- { (exit 1); exit 1; }; }

6936

-fi

6937

6938

-rm -f conftest$ac_cv_exeext

6939

-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5

6940

-echo "${ECHO_T}$ac_cv_exeext" >&6; }

6941

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

6942

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2203

+See \`config.log' for more details" "$LINENO" 5; }

2204

else

2205

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

2206

$as_echo "yes" >&6; }

2207

@@ -3669,8 +3555,8 @@ done

2208

else

2209

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

2210

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2211

-as_fn_error "cannot compute suffix of executables: cannot compile and link

2212

-See \`config.log' for more details." "$LINENO" 5; }

6943

2213

+as_fn_error $? "cannot compute suffix of executables: cannot compile and link

6944

+See \`config.log' for more details" "$LINENO" 5 ; }

6945

+fi

6946

+rm -f conftest conftest$ac_cv_exeext

6947

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5

6948

+$as_echo "$ac_cv_exeext" >&6; }

6949

6950

rm -f conftest.$ac_ext

6951

EXEEXT=$ac_cv_exeext

6952

ac_exeext=$EXEEXT

6953

-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5

6954

-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }

6955

-if test "${ac_cv_objext+set}" = set; then

6956

- echo $ECHO_N "(cached) $ECHO_C" >&6

6957

-else

6958

- cat >conftest.$ac_ext <<_ACEOF

6959

-/* confdefs.h. */

6960

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6961

+/* end confdefs.h. */

6962

+#include <stdio.h>

6963

+int

6964

+main ()

6965

6966

+FILE *f = fopen ("conftest.out", "w");

6967

+ return ferror (f) || fclose (f) != 0;

6968

6969

+ ;

6970

+ return 0;

6971

6972

_ACEOF

6973

-cat confdefs.h >>conftest.$ac_ext

6974

-cat >>conftest.$ac_ext <<_ACEOF

6975

+ac_clean_files="$ac_clean_files conftest.out"

6976

+# Check that the compiler produces executables we can run. If not, either

6977

+# the compiler is broken, or we cross compile.

6978

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5

6979

+$as_echo_n "checking whether we are cross compiling... " >&6; }

6980

+if test "$cross_compiling" != yes; then

6981

+ { { ac_try="$ac_link"

6982

+case "(($ac_try" in

6983

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6984

+ *) ac_try_echo=$ac_try;;

6985

+esac

6986

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

6987

+$as_echo "$ac_try_echo"; } >&5

6988

+ (eval "$ac_link") 2>&5

6989

+ ac_status=$?

6990

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6991

+ test $ac_status = 0; }

6992

+ if { ac_try='./conftest$ac_cv_exeext'

6993

+ { { case "(($ac_try" in

6994

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6995

+ *) ac_try_echo=$ac_try;;

6996

+esac

6997

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

6998

+$as_echo "$ac_try_echo"; } >&5

6999

+ (eval "$ac_try") 2>&5

7000

+ ac_status=$?

7001

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

7002

+ test $ac_status = 0; }; }; then

7003

+ cross_compiling=no

7004

+ else

7005

+ if test "$cross_compiling" = maybe; then

7006

+ cross_compiling=yes

7007

+ else

7008

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

7009

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2214

+See \`config.log' for more details" "$LINENO" 5; }

2215

2216

rm -f conftest conftest$ac_cv_exeext

2217

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5

2218

@@ -3727,9 +3613,9 @@ $as_echo "$ac_try_echo"; } >&5

2219

else

2220

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

2221

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2222

-as_fn_error "cannot run C compiled programs.

7010

2223

+as_fn_error $? "cannot run C compiled programs.

7011

+If you meant to cross compile, use \`--host'.

7012

+See \`config.log' for more details" "$LINENO" 5 ; }

7013

+ fi

7014

+ fi

7015

+fi

7016

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5

7017

+$as_echo "$cross_compiling" >&6; }

7018

7019

+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out

7020

+ac_clean_files=$ac_clean_files_save

7021

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5

7022

+$as_echo_n "checking for suffix of object files... " >&6; }

7023

+if test "${ac_cv_objext+set}" = set; then :

7024

+ $as_echo_n "(cached) " >&6

7025

+else

7026

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7027

/* end confdefs.h. */

7028

7029

int

7030

@@ -3152,51 +3767,46 @@ main ()

7031

}

7032

_ACEOF

7033

rm -f conftest.o conftest.obj

7034

-if { (ac_try="$ac_compile"

7035

+if { { ac_try="$ac_compile"

7036

case "(($ac_try" in

7037

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7038

*) ac_try_echo=$ac_try;;

7039

esac

7040

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7041

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

7042

+$as_echo "$ac_try_echo"; } >&5

7043

(eval "$ac_compile") 2>&5

7044

ac_status=$?

7045

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7046

- (exit $ac_status); }; then

7047

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

7048

+ test $ac_status = 0; }; then :

7049

for ac_file in conftest.o conftest.obj conftest.*; do

7050

test -f "$ac_file" || continue;

7051

case $ac_file in

7052

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;

7053

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;

7054

*) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`

7055

break;;

7056

esac

7057

done

2224

If you meant to cross compile, use \`--host'.

2225

-See \`config.log' for more details." "$LINENO" 5; }

2226

+See \`config.log' for more details" "$LINENO" 5; }

2227

2228

2229

2230

@@ -3740,7 +3626,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex

2231

ac_clean_files=$ac_clean_files_save

2232

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5

2233

$as_echo_n "checking for suffix of object files... " >&6; }

2234

-if test "${ac_cv_objext+set}" = set; then :

2235

+if ${ac_cv_objext+:} false; then :

2236

$as_echo_n "(cached) " >&6

7058

2237

else

7059

- echo "$as_me: failed program was:" >&5

7060

+ $as_echo "$as_me: failed program was:" >&5

7061

sed 's/^/| /' conftest.$ac_ext >&5

2238

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2239

@@ -3780,8 +3666,8 @@ sed 's/^/| /' conftest.$ac_ext >&5

7062

2240

7063

-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile

7064

-See \`config.log' for more details." >&5

7065

-echo "$as_me: error: cannot compute suffix of object files: cannot compile

7066

-See \`config.log' for more details." >&2;}

7067

- { (exit 1); exit 1; }; }

7068

+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

7069

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2241

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

2242

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2243

-as_fn_error "cannot compute suffix of object files: cannot compile

2244

-See \`config.log' for more details." "$LINENO" 5; }

7070

2245

+as_fn_error $? "cannot compute suffix of object files: cannot compile

7071

+See \`config.log' for more details" "$LINENO" 5 ; }

2246

+See \`config.log' for more details" "$LINENO" 5; }

7072

2247

7073

7074

2248

rm -f conftest.$ac_cv_objext conftest.$ac_ext

7075

2249

7076

-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5

7077

-echo "${ECHO_T}$ac_cv_objext" >&6; }

7078

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5

7079

+$as_echo "$ac_cv_objext" >&6; }

7080

OBJEXT=$ac_cv_objext

2250

@@ -3791,7 +3677,7 @@ OBJEXT=$ac_cv_objext

7081

2251

ac_objext=$OBJEXT

7082

-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

7083

-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }

7084

-if test "${ac_cv_c_compiler_gnu+set}" = set; then

7085

- echo $ECHO_N "(cached) $ECHO_C" >&6

7086

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5

7087

+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }

7088

+if test "${ac_cv_c_compiler_gnu+set}" = set; then :

7089

+ $as_echo_n "(cached) " >&6

7090

else

7091

- cat >conftest.$ac_ext <<_ACEOF

7092

-/* confdefs.h. */

7093

-_ACEOF

7094

-cat confdefs.h >>conftest.$ac_ext

7095

-cat >>conftest.$ac_ext <<_ACEOF

7096

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7097

/* end confdefs.h. */

7098

7099

int

7100

@@ -3210,54 +3820,34 @@ main ()

7101

return 0;

7102

}

7103

_ACEOF

7104

-rm -f conftest.$ac_objext

7105

-if { (ac_try="$ac_compile"

7106

-case "(($ac_try" in

7107

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7108

- *) ac_try_echo=$ac_try;;

7109

-esac

7110

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7111

- (eval "$ac_compile") 2>conftest.er1

7112

- ac_status=$?

7113

- grep -v '^ *+' conftest.er1 >conftest.err

7114

- rm -f conftest.er1

7115

- cat conftest.err >&5

7116

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7117

- (exit $ac_status); } && {

7118

- test -z "$ac_c_werror_flag" ||

7119

- test ! -s conftest.err

7120

- } && test -s conftest.$ac_objext; then

7121

+if ac_fn_c_try_compile "$LINENO"; then :

7122

ac_compiler_gnu=yes

7123

else

7124

- echo "$as_me: failed program was:" >&5

7125

-sed 's/^/| /' conftest.$ac_ext >&5

7126

7127

- ac_compiler_gnu=no

7128

+ ac_compiler_gnu=no

7129

7130

7131

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7132

ac_cv_c_compiler_gnu=$ac_compiler_gnu

7133

7134

7135

-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

7136

-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }

7137

-GCC=`test $ac_compiler_gnu = yes && echo yes`

7138

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5

7139

+$as_echo "$ac_cv_c_compiler_gnu" >&6; }

7140

+if test $ac_compiler_gnu = yes; then

7141

+ GCC=yes

7142

+else

7143

+ GCC=

7144

+fi

7145

ac_test_CFLAGS=${CFLAGS+set}

2252

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5

2253

$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }

2254

-if test "${ac_cv_c_compiler_gnu+set}" = set; then :

2255

+if ${ac_cv_c_compiler_gnu+:} false; then :

2256

$as_echo_n "(cached) " >&6

2257

else

2258

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2259

@@ -3828,7 +3714,7 @@ ac_test_CFLAGS=${CFLAGS+set}

7146

2260

ac_save_CFLAGS=$CFLAGS

7147

-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

7148

-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }

7149

-if test "${ac_cv_prog_cc_g+set}" = set; then

7150

- echo $ECHO_N "(cached) $ECHO_C" >&6

7151

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5

7152

+$as_echo_n "checking whether $CC accepts -g... " >&6; }

7153

+if test "${ac_cv_prog_cc_g+set}" = set; then :

7154

+ $as_echo_n "(cached) " >&6

2261

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5

2262

$as_echo_n "checking whether $CC accepts -g... " >&6; }

2263

-if test "${ac_cv_prog_cc_g+set}" = set; then :

2264

+if ${ac_cv_prog_cc_g+:} false; then :

2265

$as_echo_n "(cached) " >&6

7155

2266

else

7156

2267

ac_save_c_werror_flag=$ac_c_werror_flag

7157

ac_c_werror_flag=yes

7158

ac_cv_prog_cc_g=no

7159

CFLAGS="-g"

7160

- cat >conftest.$ac_ext <<_ACEOF

7161

-/* confdefs.h. */

7162

-_ACEOF

7163

-cat confdefs.h >>conftest.$ac_ext

7164

-cat >>conftest.$ac_ext <<_ACEOF

7165

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7166

/* end confdefs.h. */

7167

7168

int

7169

@@ -3268,34 +3858,11 @@ main ()

7170

return 0;

7171

}

7172

_ACEOF

7173

-rm -f conftest.$ac_objext

7174

-if { (ac_try="$ac_compile"

7175

-case "(($ac_try" in

7176

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7177

- *) ac_try_echo=$ac_try;;

7178

-esac

7179

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7180

- (eval "$ac_compile") 2>conftest.er1

7181

- ac_status=$?

7182

- grep -v '^ *+' conftest.er1 >conftest.err

7183

- rm -f conftest.er1

7184

- cat conftest.err >&5

7185

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7186

- (exit $ac_status); } && {

7187

- test -z "$ac_c_werror_flag" ||

7188

- test ! -s conftest.err

7189

- } && test -s conftest.$ac_objext; then

7190

+if ac_fn_c_try_compile "$LINENO"; then :

7191

ac_cv_prog_cc_g=yes

7192

else

7193

- echo "$as_me: failed program was:" >&5

7194

-sed 's/^/| /' conftest.$ac_ext >&5

7195

7196

- CFLAGS=""

7197

- cat >conftest.$ac_ext <<_ACEOF

7198

-/* confdefs.h. */

7199

-_ACEOF

7200

-cat confdefs.h >>conftest.$ac_ext

7201

-cat >>conftest.$ac_ext <<_ACEOF

7202

+ CFLAGS=""

7203

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7204

/* end confdefs.h. */

7205

7206

int

7207

@@ -3306,35 +3873,12 @@ main ()

7208

return 0;

7209

}

7210

_ACEOF

7211

-rm -f conftest.$ac_objext

7212

-if { (ac_try="$ac_compile"

7213

-case "(($ac_try" in

7214

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7215

- *) ac_try_echo=$ac_try;;

7216

-esac

7217

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7218

- (eval "$ac_compile") 2>conftest.er1

7219

- ac_status=$?

7220

- grep -v '^ *+' conftest.er1 >conftest.err

7221

- rm -f conftest.er1

7222

- cat conftest.err >&5

7223

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7224

- (exit $ac_status); } && {

7225

- test -z "$ac_c_werror_flag" ||

7226

- test ! -s conftest.err

7227

- } && test -s conftest.$ac_objext; then

7228

- :

7229

-else

7230

- echo "$as_me: failed program was:" >&5

7231

-sed 's/^/| /' conftest.$ac_ext >&5

7232

+if ac_fn_c_try_compile "$LINENO"; then :

7233

7234

- ac_c_werror_flag=$ac_save_c_werror_flag

7235

+else

7236

+ ac_c_werror_flag=$ac_save_c_werror_flag

7237

CFLAGS="-g"

7238

- cat >conftest.$ac_ext <<_ACEOF

7239

-/* confdefs.h. */

7240

-_ACEOF

7241

-cat confdefs.h >>conftest.$ac_ext

7242

-cat >>conftest.$ac_ext <<_ACEOF

7243

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7244

/* end confdefs.h. */

7245

7246

int

7247

@@ -3345,42 +3889,18 @@ main ()

7248

return 0;

7249

}

7250

_ACEOF

7251

-rm -f conftest.$ac_objext

7252

-if { (ac_try="$ac_compile"

7253

-case "(($ac_try" in

7254

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7255

- *) ac_try_echo=$ac_try;;

7256

-esac

7257

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7258

- (eval "$ac_compile") 2>conftest.er1

7259

- ac_status=$?

7260

- grep -v '^ *+' conftest.er1 >conftest.err

7261

- rm -f conftest.er1

7262

- cat conftest.err >&5

7263

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7264

- (exit $ac_status); } && {

7265

- test -z "$ac_c_werror_flag" ||

7266

- test ! -s conftest.err

7267

- } && test -s conftest.$ac_objext; then

7268

+if ac_fn_c_try_compile "$LINENO"; then :

7269

ac_cv_prog_cc_g=yes

7270

-else

7271

- echo "$as_me: failed program was:" >&5

7272

-sed 's/^/| /' conftest.$ac_ext >&5

7273

7274

7275

7276

7277

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7278

7279

7280

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7281

7282

7283

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7284

ac_c_werror_flag=$ac_save_c_werror_flag

7285

7286

-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

7287

-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }

7288

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5

7289

+$as_echo "$ac_cv_prog_cc_g" >&6; }

7290

if test "$ac_test_CFLAGS" = set; then

7291

CFLAGS=$ac_save_CFLAGS

7292

elif test $ac_cv_prog_cc_g = yes; then

7293

@@ -3396,18 +3916,14 @@ else

7294

CFLAGS=

7295

7296

7297

-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

7298

-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }

7299

-if test "${ac_cv_prog_cc_c89+set}" = set; then

7300

- echo $ECHO_N "(cached) $ECHO_C" >&6

7301

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5

7302

+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }

7303

+if test "${ac_cv_prog_cc_c89+set}" = set; then :

7304

+ $as_echo_n "(cached) " >&6

2268

@@ -3906,7 +3792,7 @@ else

2269

2270

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5

2271

$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }

2272

-if test "${ac_cv_prog_cc_c89+set}" = set; then :

2273

+if ${ac_cv_prog_cc_c89+:} false; then :

2274

$as_echo_n "(cached) " >&6

7305

2275

else

7306

2276

ac_cv_prog_cc_c89=no

7307

ac_save_CC=$CC

7308

-cat >conftest.$ac_ext <<_ACEOF

7309

-/* confdefs.h. */

7310

-_ACEOF

7311

-cat confdefs.h >>conftest.$ac_ext

7312

-cat >>conftest.$ac_ext <<_ACEOF

7313

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7314

/* end confdefs.h. */

7315

#include <stdarg.h>

7316

#include <stdio.h>

7317

@@ -3464,31 +3980,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang

7318

-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

7319

7320

CC="$ac_save_CC $ac_arg"

7321

- rm -f conftest.$ac_objext

7322

-if { (ac_try="$ac_compile"

7323

-case "(($ac_try" in

7324

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7325

- *) ac_try_echo=$ac_try;;

7326

-esac

7327

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7328

- (eval "$ac_compile") 2>conftest.er1

7329

- ac_status=$?

7330

- grep -v '^ *+' conftest.er1 >conftest.err

7331

- rm -f conftest.er1

7332

- cat conftest.err >&5

7333

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7334

- (exit $ac_status); } && {

7335

- test -z "$ac_c_werror_flag" ||

7336

- test ! -s conftest.err

7337

- } && test -s conftest.$ac_objext; then

7338

+ if ac_fn_c_try_compile "$LINENO"; then :

7339

ac_cv_prog_cc_c89=$ac_arg

7340

-else

7341

- echo "$as_me: failed program was:" >&5

7342

-sed 's/^/| /' conftest.$ac_ext >&5

7343

7344

7345

7346

7347

rm -f core conftest.err conftest.$ac_objext

7348

test "x$ac_cv_prog_cc_c89" != "xno" && break

7349

done

7350

@@ -3499,17 +3993,19 @@ fi

7351

# AC_CACHE_VAL

7352

case "x$ac_cv_prog_cc_c89" in

7353

7354

- { echo "$as_me:$LINENO: result: none needed" >&5

7355

-echo "${ECHO_T}none needed" >&6; } ;;

7356

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5

7357

+$as_echo "none needed" >&6; } ;;

7358

xno)

7359

- { echo "$as_me:$LINENO: result: unsupported" >&5

7360

-echo "${ECHO_T}unsupported" >&6; } ;;

7361

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5

7362

+$as_echo "unsupported" >&6; } ;;

7363

7364

CC="$CC $ac_cv_prog_cc_c89"

7365

- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

7366

-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;

7367

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5

7368

+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;

7369

esac

7370

+if test "x$ac_cv_prog_cc_c89" != xno; then :

7371

7372

+fi

7373

7374

ac_ext=c

7375

ac_cpp='$CPP $CPPFLAGS'

7376

@@ -3524,44 +4020,44 @@ ac_config_commands="$ac_config_commands

7377

am_make=${MAKE-make}

7378

cat > confinc << 'END'

7379

am__doit:

7380

- @echo done

7381

+ @echo this is the am__doit target

7382

.PHONY: am__doit

7383

END

7384

# If we don't find an include directive, just comment out the code.

7385

-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5

7386

-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }

7387

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5

7388

+$as_echo_n "checking for style of include used by $am_make... " >&6; }

7389

am__include="#"

7390

am__quote=

7391

_am_result=none

7392

# First try GNU make style include.

7393

echo "include confinc" > confmf

7394

-# We grep out `Entering directory' and `Leaving directory'

7395

-# messages which can occur if `w' ends up in MAKEFLAGS.

7396

-# In particular we don't look at `^make:' because GNU make might

7397

-# be invoked under some other name (usually "gmake"), in which

7398

-# case it prints its new name instead of `make'.

7399

-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then

7400

- am__include=include

7401

- am__quote=

7402

- _am_result=GNU

7403

-fi

7404

+# Ignore all kinds of additional output from `make'.

7405

+case `$am_make -s -f confmf 2> /dev/null` in #(

7406

+*the\ am__doit\ target*)

7407

+ am__include=include

7408

+ am__quote=

7409

+ _am_result=GNU

7410

+ ;;

7411

+esac

7412

# Now try BSD make style include.

7413

if test "$am__include" = "#"; then

7414

echo '.include "confinc"' > confmf

7415

- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then

7416

- am__include=.include

7417

- am__quote="\""

7418

- _am_result=BSD

7419

- fi

7420

+ case `$am_make -s -f confmf 2> /dev/null` in #(

7421

+ *the\ am__doit\ target*)

7422

+ am__include=.include

7423

+ am__quote="\""

7424

+ _am_result=BSD

7425

+ ;;

7426

+ esac

7427

7428

7429

7430

-{ echo "$as_me:$LINENO: result: $_am_result" >&5

7431

-echo "${ECHO_T}$_am_result" >&6; }

7432

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5

7433

+$as_echo "$_am_result" >&6; }

7434

rm -f confinc confmf

7435

7436

# Check whether --enable-dependency-tracking was given.

7437

-if test "${enable_dependency_tracking+set}" = set; then

7438

+if test "${enable_dependency_tracking+set}" = set; then :

7439

enableval=$enable_dependency_tracking;

7440

7441

7442

@@ -3581,10 +4077,10 @@ fi

7443

7444

depcc="$CC" am_compiler_list=

7445

7446

-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

7447

-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

7448

-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then

7449

- echo $ECHO_N "(cached) $ECHO_C" >&6

7450

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

7451

+$as_echo_n "checking dependency style of $depcc... " >&6; }

7452

+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :

7453

+ $as_echo_n "(cached) " >&6

2277

@@ -4067,7 +3953,7 @@ depcc="$CC" am_compiler_list=

2278

2279

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

2280

$as_echo_n "checking dependency style of $depcc... " >&6; }

2281

-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :

2282

+if ${am_cv_CC_dependencies_compiler_type+:} false; then :

2283

$as_echo_n "(cached) " >&6

7454

2284

else

7455

2285

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

7456

# We make a subdir and do the tests there. Otherwise we can end up

7457

@@ -3609,6 +4105,11 @@ else

7458

if test "$am_compiler_list" = ""; then

7459

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

7460

7461

+ am__universal=false

7462

+ case " $depcc " in #(

7463

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

7464

+ esac

7465

7466

for depmode in $am_compiler_list; do

7467

# Setup a source with many dependencies, because some compilers

7468

# like to wrap large dependency lists on column 80 (with \), and

7469

@@ -3626,7 +4127,17 @@ else

7470

done

7471

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

7472

7473

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

7474

+ # mode. It turns out that the SunPro C++ compiler does not properly

7475

+ # handle `-M -o', and we need to detect this. Also, some Intel

7476

+ # versions had trouble with output in subdirs

7477

+ am__obj=sub/conftest.${OBJEXT-o}

7478

+ am__minus_obj="-o $am__obj"

7479

case $depmode in

7480

+ gcc)

7481

+ # This depmode causes a compiler race in universal mode.

7482

+ test "$am__universal" = false || continue

7483

+ ;;

7484

nosideeffect)

7485

# after this tag, mechanisms are not by side-effect, so they'll

7486

# only be used when explicitly requested

7487

@@ -3636,19 +4147,23 @@ else

7488

break

7489

7490

;;

7491

+ msvisualcpp | msvcmsys)

7492

+ # This compiler won't grok `-c -o', but also, the minuso test has

7493

+ # not run yet. These depmodes are late enough in the game, and

7494

+ # so weak that their functioning should not be impacted.

7495

+ am__obj=conftest.${OBJEXT-o}

7496

+ am__minus_obj=

7497

+ ;;

7498

none) break ;;

7499

esac

7500

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

7501

- # mode. It turns out that the SunPro C++ compiler does not properly

7502

- # handle `-M -o', and we need to detect this.

7503

if depmode=$depmode \

7504

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

7505

+ source=sub/conftest.c object=$am__obj \

7506

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

7507

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

7508

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

7509

>/dev/null 2>conftest.err &&

7510

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

7511

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

7512

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

7513

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

7514

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

7515

# icc doesn't choke on unknown options, it will just issue warnings

7516

# or remarks (even with -Werror). So we grep stderr for any message

7517

@@ -3672,8 +4187,8 @@ else

7518

7519

7520

7521

-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

7522

-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }

7523

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5

7524

+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }

7525

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

7526

7527

7528

@@ -3701,10 +4216,10 @@ if test -z "$CXX"; then

7529

7530

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

2286

@@ -4206,7 +4092,7 @@ if test -z "$CXX"; then

7531

2287

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

7532

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

7533

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

7534

-if test "${ac_cv_prog_CXX+set}" = set; then

7535

- echo $ECHO_N "(cached) $ECHO_C" >&6

7536

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7537

+$as_echo_n "checking for $ac_word... " >&6; }

7538

+if test "${ac_cv_prog_CXX+set}" = set; then :

7539

+ $as_echo_n "(cached) " >&6

2288

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2289

$as_echo_n "checking for $ac_word... " >&6; }

2290

-if test "${ac_cv_prog_CXX+set}" = set; then :

2291

+if ${ac_cv_prog_CXX+:} false; then :

2292

$as_echo_n "(cached) " >&6

7540

2293

else

7541

2294

if test -n "$CXX"; then

7542

ac_cv_prog_CXX="$CXX" # Let the user override the test.

7543

@@ -3714,25 +4229,25 @@ for as_dir in $PATH

7544

7545

IFS=$as_save_IFS

7546

test -z "$as_dir" && as_dir=.

7547

- for ac_exec_ext in '' $ac_executable_extensions; do

7548

+ for ac_exec_ext in '' $ac_executable_extensions; do

7549

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

7550

ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

7551

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7552

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7553

break 2

7554

7555

done

7556

-done

7557

+ done

7558

IFS=$as_save_IFS

7559

7560

7561

7562

CXX=$ac_cv_prog_CXX

7563

if test -n "$CXX"; then

7564

- { echo "$as_me:$LINENO: result: $CXX" >&5

7565

-echo "${ECHO_T}$CXX" >&6; }

7566

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5

7567

+$as_echo "$CXX" >&6; }

7568

else

7569

- { echo "$as_me:$LINENO: result: no" >&5

7570

-echo "${ECHO_T}no" >&6; }

7571

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7572

+$as_echo "no" >&6; }

7573

7574

7575

7576

@@ -3745,10 +4260,10 @@ if test -z "$CXX"; then

7577

7578

# Extract the first word of "$ac_prog", so it can be a program name with args.

2295

@@ -4250,7 +4136,7 @@ do

7579

2296

set dummy $ac_prog; ac_word=$2

7580

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

7581

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

7582

-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then

7583

- echo $ECHO_N "(cached) $ECHO_C" >&6

7584

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7585

+$as_echo_n "checking for $ac_word... " >&6; }

7586

+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :

7587

+ $as_echo_n "(cached) " >&6

2297

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2298

$as_echo_n "checking for $ac_word... " >&6; }

2299

-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :

2300

+if ${ac_cv_prog_ac_ct_CXX+:} false; then :

2301

$as_echo_n "(cached) " >&6

7588

2302

else

7589

2303

if test -n "$ac_ct_CXX"; then

7590

ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.

7591

@@ -3758,25 +4273,25 @@ for as_dir in $PATH

7592

7593

IFS=$as_save_IFS

7594

test -z "$as_dir" && as_dir=.

7595

- for ac_exec_ext in '' $ac_executable_extensions; do

7596

+ for ac_exec_ext in '' $ac_executable_extensions; do

7597

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

7598

ac_cv_prog_ac_ct_CXX="$ac_prog"

7599

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7600

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7601

break 2

7602

7603

done

7604

-done

7605

+ done

7606

IFS=$as_save_IFS

7607

7608

7609

7610

ac_ct_CXX=$ac_cv_prog_ac_ct_CXX

7611

if test -n "$ac_ct_CXX"; then

7612

- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

7613

-echo "${ECHO_T}$ac_ct_CXX" >&6; }

7614

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5

7615

+$as_echo "$ac_ct_CXX" >&6; }

7616

else

7617

- { echo "$as_me:$LINENO: result: no" >&5

7618

-echo "${ECHO_T}no" >&6; }

7619

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7620

+$as_echo "no" >&6; }

7621

7622

7623

7624

@@ -3788,12 +4303,8 @@ done

7625

else

7626

case $cross_compiling:$ac_tool_warned in

7627

yes:)

7628

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

7629

-whose name does not start with the host triplet. If you think this

7630

-configuration is useful to you, please write to autoconf@gnu.org." >&5

7631

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

7632

-whose name does not start with the host triplet. If you think this

7633

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

7634

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

7635

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

7636

ac_tool_warned=yes ;;

7637

esac

7638

CXX=$ac_ct_CXX

7639

@@ -3803,49 +4314,36 @@ fi

7640

7641

7642

# Provide some information about the compiler.

7643

-echo "$as_me:$LINENO: checking for C++ compiler version" >&5

7644

-ac_compiler=`set X $ac_compile; echo $2`

7645

-{ (ac_try="$ac_compiler --version >&5"

7646

-case "(($ac_try" in

7647

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7648

- *) ac_try_echo=$ac_try;;

7649

-esac

7650

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7651

- (eval "$ac_compiler --version >&5") 2>&5

7652

- ac_status=$?

7653

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7654

- (exit $ac_status); }

7655

-{ (ac_try="$ac_compiler -v >&5"

7656

-case "(($ac_try" in

7657

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7658

- *) ac_try_echo=$ac_try;;

7659

-esac

7660

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7661

- (eval "$ac_compiler -v >&5") 2>&5

7662

- ac_status=$?

7663

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7664

- (exit $ac_status); }

7665

-{ (ac_try="$ac_compiler -V >&5"

7666

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5

7667

+set X $ac_compile

7668

+ac_compiler=$2

7669

+for ac_option in --version -v -V -qversion; do

7670

+ { { ac_try="$ac_compiler $ac_option >&5"

7671

case "(($ac_try" in

7672

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7673

*) ac_try_echo=$ac_try;;

7674

esac

7675

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7676

- (eval "$ac_compiler -V >&5") 2>&5

7677

- ac_status=$?

7678

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7679

- (exit $ac_status); }

7680

7681

-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

7682

-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }

7683

-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then

7684

- echo $ECHO_N "(cached) $ECHO_C" >&6

7685

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

7686

+$as_echo "$ac_try_echo"; } >&5

7687

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

7688

+ ac_status=$?

7689

+ if test -s conftest.err; then

7690

+ sed '10a\

7691

+... rest of stderr output deleted ...

7692

+ 10q' conftest.err >conftest.er1

7693

+ cat conftest.er1 >&5

7694

+ fi

7695

+ rm -f conftest.er1 conftest.err

7696

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

7697

+ test $ac_status = 0; }

7698

+done

7699

7700

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5

7701

+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }

7702

+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :

7703

+ $as_echo_n "(cached) " >&6

7704

else

7705

- cat >conftest.$ac_ext <<_ACEOF

7706

-/* confdefs.h. */

7707

-_ACEOF

7708

-cat confdefs.h >>conftest.$ac_ext

7709

-cat >>conftest.$ac_ext <<_ACEOF

7710

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7711

/* end confdefs.h. */

7712

7713

int

7714

@@ -3859,54 +4357,34 @@ main ()

7715

return 0;

7716

}

7717

_ACEOF

7718

-rm -f conftest.$ac_objext

7719

-if { (ac_try="$ac_compile"

7720

-case "(($ac_try" in

7721

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7722

- *) ac_try_echo=$ac_try;;

7723

-esac

7724

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7725

- (eval "$ac_compile") 2>conftest.er1

7726

- ac_status=$?

7727

- grep -v '^ *+' conftest.er1 >conftest.err

7728

- rm -f conftest.er1

7729

- cat conftest.err >&5

7730

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7731

- (exit $ac_status); } && {

7732

- test -z "$ac_cxx_werror_flag" ||

7733

- test ! -s conftest.err

7734

- } && test -s conftest.$ac_objext; then

7735

+if ac_fn_cxx_try_compile "$LINENO"; then :

7736

ac_compiler_gnu=yes

7737

else

7738

- echo "$as_me: failed program was:" >&5

7739

-sed 's/^/| /' conftest.$ac_ext >&5

7740

7741

- ac_compiler_gnu=no

7742

+ ac_compiler_gnu=no

7743

7744

7745

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7746

ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

7747

7748

7749

-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

7750

-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }

7751

-GXX=`test $ac_compiler_gnu = yes && echo yes`

7752

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5

7753

+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }

7754

+if test $ac_compiler_gnu = yes; then

7755

+ GXX=yes

7756

+else

7757

+ GXX=

7758

+fi

7759

ac_test_CXXFLAGS=${CXXFLAGS+set}

2304

@@ -4328,7 +4214,7 @@ done

2305

2306

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5

2307

$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }

2308

-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :

2309

+if ${ac_cv_cxx_compiler_gnu+:} false; then :

2310

$as_echo_n "(cached) " >&6

2311

else

2312

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2313

@@ -4365,7 +4251,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}

7760

2314

ac_save_CXXFLAGS=$CXXFLAGS

7761

-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

7762

-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }

7763

-if test "${ac_cv_prog_cxx_g+set}" = set; then

7764

- echo $ECHO_N "(cached) $ECHO_C" >&6

7765

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5

7766

+$as_echo_n "checking whether $CXX accepts -g... " >&6; }

7767

+if test "${ac_cv_prog_cxx_g+set}" = set; then :

7768

+ $as_echo_n "(cached) " >&6

2315

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5

2316

$as_echo_n "checking whether $CXX accepts -g... " >&6; }

2317

-if test "${ac_cv_prog_cxx_g+set}" = set; then :

2318

+if ${ac_cv_prog_cxx_g+:} false; then :

2319

$as_echo_n "(cached) " >&6

7769

2320

else

7770

2321

ac_save_cxx_werror_flag=$ac_cxx_werror_flag

7771

ac_cxx_werror_flag=yes

7772

ac_cv_prog_cxx_g=no

7773

CXXFLAGS="-g"

7774

- cat >conftest.$ac_ext <<_ACEOF

7775

-/* confdefs.h. */

7776

-_ACEOF

7777

-cat confdefs.h >>conftest.$ac_ext

7778

-cat >>conftest.$ac_ext <<_ACEOF

7779

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7780

/* end confdefs.h. */

7781

7782

int

7783

@@ -3917,34 +4395,11 @@ main ()

7784

return 0;

7785

}

7786

_ACEOF

7787

-rm -f conftest.$ac_objext

7788

-if { (ac_try="$ac_compile"

7789

-case "(($ac_try" in

7790

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7791

- *) ac_try_echo=$ac_try;;

7792

-esac

7793

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7794

- (eval "$ac_compile") 2>conftest.er1

7795

- ac_status=$?

7796

- grep -v '^ *+' conftest.er1 >conftest.err

7797

- rm -f conftest.er1

7798

- cat conftest.err >&5

7799

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7800

- (exit $ac_status); } && {

7801

- test -z "$ac_cxx_werror_flag" ||

7802

- test ! -s conftest.err

7803

- } && test -s conftest.$ac_objext; then

7804

+if ac_fn_cxx_try_compile "$LINENO"; then :

7805

ac_cv_prog_cxx_g=yes

7806

else

7807

- echo "$as_me: failed program was:" >&5

7808

-sed 's/^/| /' conftest.$ac_ext >&5

7809

7810

- CXXFLAGS=""

7811

- cat >conftest.$ac_ext <<_ACEOF

7812

-/* confdefs.h. */

7813

-_ACEOF

7814

-cat confdefs.h >>conftest.$ac_ext

7815

-cat >>conftest.$ac_ext <<_ACEOF

7816

+ CXXFLAGS=""

7817

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7818

/* end confdefs.h. */

7819

7820

int

7821

@@ -3955,35 +4410,12 @@ main ()

7822

return 0;

7823

}

7824

_ACEOF

7825

-rm -f conftest.$ac_objext

7826

-if { (ac_try="$ac_compile"

7827

-case "(($ac_try" in

7828

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7829

- *) ac_try_echo=$ac_try;;

7830

-esac

7831

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7832

- (eval "$ac_compile") 2>conftest.er1

7833

- ac_status=$?

7834

- grep -v '^ *+' conftest.er1 >conftest.err

7835

- rm -f conftest.er1

7836

- cat conftest.err >&5

7837

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7838

- (exit $ac_status); } && {

7839

- test -z "$ac_cxx_werror_flag" ||

7840

- test ! -s conftest.err

7841

- } && test -s conftest.$ac_objext; then

7842

- :

7843

-else

7844

- echo "$as_me: failed program was:" >&5

7845

-sed 's/^/| /' conftest.$ac_ext >&5

7846

+if ac_fn_cxx_try_compile "$LINENO"; then :

7847

7848

- ac_cxx_werror_flag=$ac_save_cxx_werror_flag

7849

+else

7850

+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag

7851

CXXFLAGS="-g"

7852

- cat >conftest.$ac_ext <<_ACEOF

7853

-/* confdefs.h. */

7854

-_ACEOF

7855

-cat confdefs.h >>conftest.$ac_ext

7856

-cat >>conftest.$ac_ext <<_ACEOF

7857

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7858

/* end confdefs.h. */

7859

7860

int

7861

@@ -3994,42 +4426,18 @@ main ()

7862

return 0;

7863

}

7864

_ACEOF

7865

-rm -f conftest.$ac_objext

7866

-if { (ac_try="$ac_compile"

7867

-case "(($ac_try" in

7868

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7869

- *) ac_try_echo=$ac_try;;

7870

-esac

7871

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7872

- (eval "$ac_compile") 2>conftest.er1

7873

- ac_status=$?

7874

- grep -v '^ *+' conftest.er1 >conftest.err

7875

- rm -f conftest.er1

7876

- cat conftest.err >&5

7877

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7878

- (exit $ac_status); } && {

7879

- test -z "$ac_cxx_werror_flag" ||

7880

- test ! -s conftest.err

7881

- } && test -s conftest.$ac_objext; then

7882

+if ac_fn_cxx_try_compile "$LINENO"; then :

7883

ac_cv_prog_cxx_g=yes

7884

-else

7885

- echo "$as_me: failed program was:" >&5

7886

-sed 's/^/| /' conftest.$ac_ext >&5

7887

7888

7889

7890

7891

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7892

7893

7894

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7895

7896

7897

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7898

ac_cxx_werror_flag=$ac_save_cxx_werror_flag

7899

7900

-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

7901

-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }

7902

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5

7903

+$as_echo "$ac_cv_prog_cxx_g" >&6; }

7904

if test "$ac_test_CXXFLAGS" = set; then

7905

CXXFLAGS=$ac_save_CXXFLAGS

7906

elif test $ac_cv_prog_cxx_g = yes; then

7907

@@ -4053,10 +4461,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

7908

7909

depcc="$CXX" am_compiler_list=

7910

7911

-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

7912

-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

7913

-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then

7914

- echo $ECHO_N "(cached) $ECHO_C" >&6

7915

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

7916

+$as_echo_n "checking dependency style of $depcc... " >&6; }

7917

+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :

7918

+ $as_echo_n "(cached) " >&6

2322

@@ -4451,7 +4337,7 @@ depcc="$CXX" am_compiler_list=

2323

2324

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

2325

$as_echo_n "checking dependency style of $depcc... " >&6; }

2326

-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :

2327

+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :

2328

$as_echo_n "(cached) " >&6

7919

2329

else

7920

2330

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

7921

# We make a subdir and do the tests there. Otherwise we can end up

7922

@@ -4081,6 +4489,11 @@ else

7923

if test "$am_compiler_list" = ""; then

7924

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

7925

7926

+ am__universal=false

7927

+ case " $depcc " in #(

7928

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

7929

+ esac

7930

7931

for depmode in $am_compiler_list; do

7932

# Setup a source with many dependencies, because some compilers

7933

# like to wrap large dependency lists on column 80 (with \), and

7934

@@ -4098,7 +4511,17 @@ else

7935

done

7936

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

7937

7938

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

7939

+ # mode. It turns out that the SunPro C++ compiler does not properly

7940

+ # handle `-M -o', and we need to detect this. Also, some Intel

7941

+ # versions had trouble with output in subdirs

7942

+ am__obj=sub/conftest.${OBJEXT-o}

7943

+ am__minus_obj="-o $am__obj"

7944

case $depmode in

7945

+ gcc)

7946

+ # This depmode causes a compiler race in universal mode.

7947

+ test "$am__universal" = false || continue

7948

+ ;;

7949

nosideeffect)

7950

# after this tag, mechanisms are not by side-effect, so they'll

7951

# only be used when explicitly requested

7952

@@ -4108,19 +4531,23 @@ else

7953

break

7954

7955

;;

7956

+ msvisualcpp | msvcmsys)

7957

+ # This compiler won't grok `-c -o', but also, the minuso test has

7958

+ # not run yet. These depmodes are late enough in the game, and

7959

+ # so weak that their functioning should not be impacted.

7960

+ am__obj=conftest.${OBJEXT-o}

7961

+ am__minus_obj=

7962

+ ;;

7963

none) break ;;

7964

esac

7965

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

7966

- # mode. It turns out that the SunPro C++ compiler does not properly

7967

- # handle `-M -o', and we need to detect this.

7968

if depmode=$depmode \

7969

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

7970

+ source=sub/conftest.c object=$am__obj \

7971

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

7972

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

7973

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

7974

>/dev/null 2>conftest.err &&

7975

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

7976

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

7977

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

7978

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

7979

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

7980

# icc doesn't choke on unknown options, it will just issue warnings

7981

# or remarks (even with -Werror). So we grep stderr for any message

7982

@@ -4144,8 +4571,8 @@ else

7983

7984

7985

7986

-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5

7987

-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }

7988

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5

7989

+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }

7990

CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

7991

7992

7993

@@ -4166,22 +4593,16 @@ ac_link='$CXX -o conftest$ac_exeext $CXX

7994

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

7995

7996

7997

-cat >>confdefs.h <<\_ACEOF

7998

-#define _GNU_SOURCE 1

7999

-_ACEOF

8000

8001

8002

8003

ac_ext=cpp

8004

ac_cpp='$CXXCPP $CPPFLAGS'

8005

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

8006

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

8007

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

8008

-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5

8009

-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }

8010

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5

8011

+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }

2331

@@ -4589,7 +4475,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

2332

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5

2333

$as_echo_n "checking how to run the C++ preprocessor... " >&6; }

8012

2334

if test -z "$CXXCPP"; then

8013

- if test "${ac_cv_prog_CXXCPP+set}" = set; then

8014

- echo $ECHO_N "(cached) $ECHO_C" >&6

8015

+ if test "${ac_cv_prog_CXXCPP+set}" = set; then :

8016

+ $as_echo_n "(cached) " >&6

2335

- if test "${ac_cv_prog_CXXCPP+set}" = set; then :

2336

+ if ${ac_cv_prog_CXXCPP+:} false; then :

2337

$as_echo_n "(cached) " >&6

8017

2338

else

8018

2339

# Double quotes because CXXCPP needs to be expanded

8019

for CXXCPP in "$CXX -E" "/lib/cpp"

8020

@@ -4195,11 +4616,7 @@ do

8021

# <limits.h> exists even on freestanding compilers.

8022

# On the NeXT, cc -E runs the code through the compiler's parser,

8023

# not just through cpp. "Syntax error" is here to catch this case.

8024

- cat >conftest.$ac_ext <<_ACEOF

8025

-/* confdefs.h. */

8026

-_ACEOF

8027

-cat confdefs.h >>conftest.$ac_ext

8028

-cat >>conftest.$ac_ext <<_ACEOF

8029

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8030

/* end confdefs.h. */

8031

#ifdef __STDC__

8032

# include <limits.h>

8033

@@ -4208,76 +4625,34 @@ cat >>conftest.$ac_ext <<_ACEOF

8034

#endif

8035

Syntax error

8036

_ACEOF

8037

-if { (ac_try="$ac_cpp conftest.$ac_ext"

8038

-case "(($ac_try" in

8039

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8040

- *) ac_try_echo=$ac_try;;

8041

-esac

8042

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8043

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

8044

- ac_status=$?

8045

- grep -v '^ *+' conftest.er1 >conftest.err

8046

- rm -f conftest.er1

8047

- cat conftest.err >&5

8048

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8049

- (exit $ac_status); } >/dev/null && {

8050

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

8051

- test ! -s conftest.err

8052

- }; then

8053

- :

8054

-else

8055

- echo "$as_me: failed program was:" >&5

8056

-sed 's/^/| /' conftest.$ac_ext >&5

8057

+if ac_fn_cxx_try_cpp "$LINENO"; then :

8058

8059

+else

2340

@@ -4619,7 +4505,7 @@ else

8060

2341

# Broken: fails on valid input.

8061

2342

continue

8062

2343

8063

8064

2344

-rm -f conftest.err conftest.$ac_ext

8065

2345

+rm -f conftest.err conftest.i conftest.$ac_ext

8066

2346

8067

2347

# OK, works on sane cases. Now check whether nonexistent headers

8068

2348

# can be detected and how.

8069

- cat >conftest.$ac_ext <<_ACEOF

8070

-/* confdefs.h. */

8071

-_ACEOF

8072

-cat confdefs.h >>conftest.$ac_ext

8073

-cat >>conftest.$ac_ext <<_ACEOF

8074

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8075

/* end confdefs.h. */

8076

#include <ac_nonexistent.h>

8077

_ACEOF

8078

-if { (ac_try="$ac_cpp conftest.$ac_ext"

8079

-case "(($ac_try" in

8080

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8081

- *) ac_try_echo=$ac_try;;

8082

-esac

8083

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8084

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

8085

- ac_status=$?

8086

- grep -v '^ *+' conftest.er1 >conftest.err

8087

- rm -f conftest.er1

8088

- cat conftest.err >&5

8089

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8090

- (exit $ac_status); } >/dev/null && {

8091

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

8092

- test ! -s conftest.err

8093

- }; then

8094

+if ac_fn_cxx_try_cpp "$LINENO"; then :

8095

# Broken: success on invalid input.

8096

continue

8097

else

8098

- echo "$as_me: failed program was:" >&5

8099

-sed 's/^/| /' conftest.$ac_ext >&5

8100

8101

# Passes both tests.

2349

@@ -4635,11 +4521,11 @@ else

8102

2350

ac_preproc_ok=:

8103

2351

break

8104

2352

8105

8106

2353

-rm -f conftest.err conftest.$ac_ext

8107

2354

+rm -f conftest.err conftest.i conftest.$ac_ext

8108

2355

8109

2356

done

8110

2357

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

8111

2358

-rm -f conftest.err conftest.$ac_ext

8112

-if $ac_preproc_ok; then

8113

2359

+rm -f conftest.i conftest.err conftest.$ac_ext

8114

+if $ac_preproc_ok; then :

2360

if $ac_preproc_ok; then :

8115

2361

break

8116

2362

8117

8118

@@ -4289,8 +4664,8 @@ fi

8119

else

8120

ac_cv_prog_CXXCPP=$CXXCPP

8121

8122

-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5

8123

-echo "${ECHO_T}$CXXCPP" >&6; }

8124

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5

8125

+$as_echo "$CXXCPP" >&6; }

8126

ac_preproc_ok=false

8127

for ac_cxx_preproc_warn_flag in '' yes

8128

8129

@@ -4300,96 +4675,49 @@ do

8130

# <limits.h> exists even on freestanding compilers.

8131

# On the NeXT, cc -E runs the code through the compiler's parser,

8132

# not just through cpp. "Syntax error" is here to catch this case.

8133

- cat >conftest.$ac_ext <<_ACEOF

8134

-/* confdefs.h. */

8135

-_ACEOF

8136

-cat confdefs.h >>conftest.$ac_ext

8137

-cat >>conftest.$ac_ext <<_ACEOF

8138

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8139

/* end confdefs.h. */

8140

#ifdef __STDC__

8141

# include <limits.h>

8142

-#else

8143

-# include <assert.h>

8144

-#endif

8145

- Syntax error

8146

-_ACEOF

8147

-if { (ac_try="$ac_cpp conftest.$ac_ext"

8148

-case "(($ac_try" in

8149

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8150

- *) ac_try_echo=$ac_try;;

8151

-esac

8152

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8153

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

8154

- ac_status=$?

8155

- grep -v '^ *+' conftest.er1 >conftest.err

8156

- rm -f conftest.er1

8157

- cat conftest.err >&5

8158

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8159

- (exit $ac_status); } >/dev/null && {

8160

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

8161

- test ! -s conftest.err

8162

- }; then

8163

- :

8164

-else

8165

- echo "$as_me: failed program was:" >&5

8166

-sed 's/^/| /' conftest.$ac_ext >&5

8167

+#else

8168

+# include <assert.h>

8169

+#endif

8170

+ Syntax error

8171

+_ACEOF

8172

+if ac_fn_cxx_try_cpp "$LINENO"; then :

8173

8174

+else

2363

@@ -4678,7 +4564,7 @@ else

8175

2364

# Broken: fails on valid input.

8176

2365

continue

8177

2366

8178

8179

2367

-rm -f conftest.err conftest.$ac_ext

8180

2368

+rm -f conftest.err conftest.i conftest.$ac_ext

8181

2369

8182

2370

# OK, works on sane cases. Now check whether nonexistent headers

8183

2371

# can be detected and how.

8184

- cat >conftest.$ac_ext <<_ACEOF

8185

-/* confdefs.h. */

8186

-_ACEOF

8187

-cat confdefs.h >>conftest.$ac_ext

8188

-cat >>conftest.$ac_ext <<_ACEOF

8189

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8190

/* end confdefs.h. */

8191

#include <ac_nonexistent.h>

8192

_ACEOF

8193

-if { (ac_try="$ac_cpp conftest.$ac_ext"

8194

-case "(($ac_try" in

8195

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8196

- *) ac_try_echo=$ac_try;;

8197

-esac

8198

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8199

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

8200

- ac_status=$?

8201

- grep -v '^ *+' conftest.er1 >conftest.err

8202

- rm -f conftest.er1

8203

- cat conftest.err >&5

8204

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8205

- (exit $ac_status); } >/dev/null && {

8206

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

8207

- test ! -s conftest.err

8208

- }; then

8209

+if ac_fn_cxx_try_cpp "$LINENO"; then :

8210

# Broken: success on invalid input.

8211

continue

8212

else

8213

- echo "$as_me: failed program was:" >&5

8214

-sed 's/^/| /' conftest.$ac_ext >&5

8215

8216

# Passes both tests.

2372

@@ -4694,18 +4580,18 @@ else

8217

2373

ac_preproc_ok=:

8218

2374

break

8219

2375

8220

8221

2376

-rm -f conftest.err conftest.$ac_ext

8222

2377

+rm -f conftest.err conftest.i conftest.$ac_ext

8223

2378

8224

2379

done

8225

2380

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

8226

2381

-rm -f conftest.err conftest.$ac_ext

8227

-if $ac_preproc_ok; then

8228

- :

8229

2382

+rm -f conftest.i conftest.err conftest.$ac_ext

8230

+if $ac_preproc_ok; then :

8231

2383

if $ac_preproc_ok; then :

2384

8232

2385

else

8233

- { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check

8234

-See \`config.log' for more details." >&5

8235

-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check

8236

-See \`config.log' for more details." >&2;}

8237

- { (exit 1); exit 1; }; }

8238

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

8239

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2386

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

2387

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2388

-as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check

2389

-See \`config.log' for more details." "$LINENO" 5; }

8240

2390

+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check

8241

+See \`config.log' for more details" "$LINENO" 5 ; }

2391

+See \`config.log' for more details" "$LINENO" 5; }

8242

2392

8243

2393

8244

2394

ac_ext=cpp

8245

@@ -4399,45 +4727,40 @@ ac_link='$CXX -o conftest$ac_exeext $CXX

8246

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

8247

8248

8249

-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5

8250

-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }

8251

-if test "${ac_cv_path_GREP+set}" = set; then

8252

- echo $ECHO_N "(cached) $ECHO_C" >&6

8253

-else

8254

- # Extract the first word of "grep ggrep" to use in msg output

8255

-if test -z "$GREP"; then

8256

-set dummy grep ggrep; ac_prog_name=$2

8257

-if test "${ac_cv_path_GREP+set}" = set; then

8258

- echo $ECHO_N "(cached) $ECHO_C" >&6

8259

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5

8260

+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }

8261

+if test "${ac_cv_path_GREP+set}" = set; then :

8262

+ $as_echo_n "(cached) " >&6

2395

@@ -4717,7 +4603,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

2396

2397

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5

2398

$as_echo_n "checking for grep that handles long lines and -e... " >&6; }

2399

-if test "${ac_cv_path_GREP+set}" = set; then :

2400

+if ${ac_cv_path_GREP+:} false; then :

2401

$as_echo_n "(cached) " >&6

8263

2402

else

8264

+ if test -z "$GREP"; then

8265

ac_path_GREP_found=false

8266

-# Loop through the user's path and test for each of PROGNAME-LIST

8267

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

8268

+ # Loop through the user's path and test for each of PROGNAME-LIST

8269

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

8270

for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

8271

8272

IFS=$as_save_IFS

8273

test -z "$as_dir" && as_dir=.

8274

- for ac_prog in grep ggrep; do

8275

- for ac_exec_ext in '' $ac_executable_extensions; do

8276

- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

8277

- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

8278

- # Check for GNU ac_path_GREP and select it if it is found.

8279

+ for ac_prog in grep ggrep; do

8280

+ for ac_exec_ext in '' $ac_executable_extensions; do

8281

+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

8282

+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

8283

+# Check for GNU ac_path_GREP and select it if it is found.

8284

# Check for GNU $ac_path_GREP

8285

case `"$ac_path_GREP" --version 2>&1` in

8286

*GNU*)

8287

ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;

8288

8289

ac_count=0

8290

- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

8291

+ $as_echo_n 0123456789 >"conftest.in"

8292

while :

8293

8294

cat "conftest.in" "conftest.in" >"conftest.tmp"

8295

mv "conftest.tmp" "conftest.in"

8296

cp "conftest.in" "conftest.nl"

8297

- echo 'GREP' >> "conftest.nl"

8298

+ $as_echo 'GREP' >> "conftest.nl"

8299

"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break

8300

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

8301

- ac_count=`expr $ac_count + 1`

8302

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

8303

if test $ac_count -gt ${ac_path_GREP_max-0}; then

8304

# Best one so far, save it but keep looking for a better one

8305

ac_cv_path_GREP="$ac_path_GREP"

8306

@@ -4449,77 +4772,61 @@ case `"$ac_path_GREP" --version 2>&1` in

8307

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

8308

esac

8309

8310

8311

- $ac_path_GREP_found && break 3

8312

+ $ac_path_GREP_found && break 3

8313

+ done

8314

+ done

2403

if test -z "$GREP"; then

2404

@@ -4766,7 +4652,7 @@ esac

8315

2405

done

8316

-done

8317

8318

-done

8319

2406

IFS=$as_save_IFS

8320

8321

8322

-fi

8323

8324

-GREP="$ac_cv_path_GREP"

8325

-if test -z "$GREP"; then

8326

- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

8327

-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

8328

- { (exit 1); exit 1; }; }

8329

-fi

8330

8331

+ if test -z "$ac_cv_path_GREP"; then

2407

if test -z "$ac_cv_path_GREP"; then

2408

- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

8332

2409

+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

8333

+ fi

2410

8334

2411

else

8335

2412

ac_cv_path_GREP=$GREP

8336

8337

8338

8339

8340

-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5

8341

-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }

8342

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5

8343

+$as_echo "$ac_cv_path_GREP" >&6; }

8344

GREP="$ac_cv_path_GREP"

8345

8346

8347

-{ echo "$as_me:$LINENO: checking for egrep" >&5

8348

-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }

8349

-if test "${ac_cv_path_EGREP+set}" = set; then

8350

- echo $ECHO_N "(cached) $ECHO_C" >&6

8351

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5

8352

+$as_echo_n "checking for egrep... " >&6; }

8353

+if test "${ac_cv_path_EGREP+set}" = set; then :

8354

+ $as_echo_n "(cached) " >&6

2413

@@ -4780,7 +4666,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }

2414

2415

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5

2416

$as_echo_n "checking for egrep... " >&6; }

2417

-if test "${ac_cv_path_EGREP+set}" = set; then :

2418

+if ${ac_cv_path_EGREP+:} false; then :

2419

$as_echo_n "(cached) " >&6

8355

2420

else

8356

2421

if echo a | $GREP -E '(a|b)' >/dev/null 2>&1

8357

then ac_cv_path_EGREP="$GREP -E"

8358

else

8359

- # Extract the first word of "egrep" to use in msg output

8360

-if test -z "$EGREP"; then

8361

-set dummy egrep; ac_prog_name=$2

8362

-if test "${ac_cv_path_EGREP+set}" = set; then

8363

- echo $ECHO_N "(cached) $ECHO_C" >&6

8364

-else

8365

+ if test -z "$EGREP"; then

8366

ac_path_EGREP_found=false

8367

-# Loop through the user's path and test for each of PROGNAME-LIST

8368

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

8369

+ # Loop through the user's path and test for each of PROGNAME-LIST

8370

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

8371

for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

8372

8373

IFS=$as_save_IFS

8374

test -z "$as_dir" && as_dir=.

8375

- for ac_prog in egrep; do

8376

- for ac_exec_ext in '' $ac_executable_extensions; do

8377

- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

8378

- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

8379

- # Check for GNU ac_path_EGREP and select it if it is found.

8380

+ for ac_prog in egrep; do

8381

+ for ac_exec_ext in '' $ac_executable_extensions; do

8382

+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

8383

+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

8384

+# Check for GNU ac_path_EGREP and select it if it is found.

8385

# Check for GNU $ac_path_EGREP

8386

case `"$ac_path_EGREP" --version 2>&1` in

8387

*GNU*)

8388

ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;

8389

8390

ac_count=0

8391

- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

8392

+ $as_echo_n 0123456789 >"conftest.in"

8393

while :

8394

8395

cat "conftest.in" "conftest.in" >"conftest.tmp"

8396

mv "conftest.tmp" "conftest.in"

8397

cp "conftest.in" "conftest.nl"

8398

- echo 'EGREP' >> "conftest.nl"

8399

+ $as_echo 'EGREP' >> "conftest.nl"

8400

"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break

8401

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

8402

- ac_count=`expr $ac_count + 1`

8403

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

8404

if test $ac_count -gt ${ac_path_EGREP_max-0}; then

8405

# Best one so far, save it but keep looking for a better one

8406

ac_cv_path_EGREP="$ac_path_EGREP"

8407

@@ -4531,75 +4838,31 @@ case `"$ac_path_EGREP" --version 2>&1` i

8408

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

8409

esac

8410

8411

8412

- $ac_path_EGREP_found && break 3

8413

+ $ac_path_EGREP_found && break 3

8414

+ done

8415

+ done

2422

@@ -4832,7 +4718,7 @@ esac

8416

2423

done

8417

-done

8418

8419

-done

8420

2424

IFS=$as_save_IFS

8421

8422

8423

-fi

8424

8425

-EGREP="$ac_cv_path_EGREP"

8426

-if test -z "$EGREP"; then

8427

- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

8428

-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

8429

- { (exit 1); exit 1; }; }

8430

-fi

8431

8432

+ if test -z "$ac_cv_path_EGREP"; then

2425

if test -z "$ac_cv_path_EGREP"; then

2426

- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

8433

2427

+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

8434

+ fi

2428

8435

2429

else

8436

2430

ac_cv_path_EGREP=$EGREP

8437

8438

8439

8440

8441

8442

-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5

8443

-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }

8444

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5

8445

+$as_echo "$ac_cv_path_EGREP" >&6; }

8446

EGREP="$ac_cv_path_EGREP"

8447

8448

8449

8450

-{ echo "$as_me:$LINENO: checking for AIX" >&5

8451

-echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }

8452

-cat >conftest.$ac_ext <<_ACEOF

8453

-/* confdefs.h. */

8454

-_ACEOF

8455

-cat confdefs.h >>conftest.$ac_ext

8456

-cat >>conftest.$ac_ext <<_ACEOF

8457

-/* end confdefs.h. */

8458

-#ifdef _AIX

8459

- yes

8460

-#endif

8461

8462

-_ACEOF

8463

-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

8464

- $EGREP "yes" >/dev/null 2>&1; then

8465

- { echo "$as_me:$LINENO: result: yes" >&5

8466

-echo "${ECHO_T}yes" >&6; }

8467

-cat >>confdefs.h <<\_ACEOF

8468

-#define _ALL_SOURCE 1

8469

-_ACEOF

8470

8471

-else

8472

- { echo "$as_me:$LINENO: result: no" >&5

8473

-echo "${ECHO_T}no" >&6; }

8474

-fi

8475

-rm -f conftest*

8476

8477

8478

-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5

8479

-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }

8480

-if test "${ac_cv_header_stdc+set}" = set; then

8481

- echo $ECHO_N "(cached) $ECHO_C" >&6

8482

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5

8483

+$as_echo_n "checking for ANSI C header files... " >&6; }

8484

+if test "${ac_cv_header_stdc+set}" = set; then :

8485

+ $as_echo_n "(cached) " >&6

8486

else

8487

- cat >conftest.$ac_ext <<_ACEOF

8488

-/* confdefs.h. */

8489

-_ACEOF

8490

-cat confdefs.h >>conftest.$ac_ext

8491

-cat >>conftest.$ac_ext <<_ACEOF

8492

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8493

/* end confdefs.h. */

8494

#include <stdlib.h>

8495

#include <stdarg.h>

8496

@@ -4614,402 +4877,143 @@ main ()

8497

return 0;

8498

}

8499

_ACEOF

8500

-rm -f conftest.$ac_objext

8501

-if { (ac_try="$ac_compile"

8502

-case "(($ac_try" in

8503

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8504

- *) ac_try_echo=$ac_try;;

8505

-esac

8506

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8507

- (eval "$ac_compile") 2>conftest.er1

8508

- ac_status=$?

8509

- grep -v '^ *+' conftest.er1 >conftest.err

8510

- rm -f conftest.er1

8511

- cat conftest.err >&5

8512

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8513

- (exit $ac_status); } && {

8514

- test -z "$ac_cxx_werror_flag" ||

8515

- test ! -s conftest.err

8516

- } && test -s conftest.$ac_objext; then

8517

+if ac_fn_cxx_try_compile "$LINENO"; then :

8518

ac_cv_header_stdc=yes

8519

-else

8520

- echo "$as_me: failed program was:" >&5

8521

-sed 's/^/| /' conftest.$ac_ext >&5

8522

8523

- ac_cv_header_stdc=no

8524

-fi

8525

8526

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

8527

8528

-if test $ac_cv_header_stdc = yes; then

8529

- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.

8530

- cat >conftest.$ac_ext <<_ACEOF

8531

-/* confdefs.h. */

8532

-_ACEOF

8533

-cat confdefs.h >>conftest.$ac_ext

8534

-cat >>conftest.$ac_ext <<_ACEOF

8535

-/* end confdefs.h. */

8536

-#include <string.h>

8537

8538

-_ACEOF

8539

-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

8540

- $EGREP "memchr" >/dev/null 2>&1; then

8541

- :

8542

-else

8543

- ac_cv_header_stdc=no

8544

-fi

8545

-rm -f conftest*

8546

8547

-fi

8548

8549

-if test $ac_cv_header_stdc = yes; then

8550

- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.

8551

- cat >conftest.$ac_ext <<_ACEOF

8552

-/* confdefs.h. */

8553

-_ACEOF

8554

-cat confdefs.h >>conftest.$ac_ext

8555

-cat >>conftest.$ac_ext <<_ACEOF

8556

-/* end confdefs.h. */

8557

-#include <stdlib.h>

8558

8559

-_ACEOF

8560

-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

8561

- $EGREP "free" >/dev/null 2>&1; then

8562

- :

8563

-else

8564

- ac_cv_header_stdc=no

8565

-fi

8566

-rm -f conftest*

8567

8568

-fi

8569

8570

-if test $ac_cv_header_stdc = yes; then

8571

- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.

8572

- if test "$cross_compiling" = yes; then

8573

- :

8574

-else

8575

- cat >conftest.$ac_ext <<_ACEOF

8576

-/* confdefs.h. */

8577

-_ACEOF

8578

-cat confdefs.h >>conftest.$ac_ext

8579

-cat >>conftest.$ac_ext <<_ACEOF

8580

-/* end confdefs.h. */

8581

-#include <ctype.h>

8582

-#include <stdlib.h>

8583

-#if ((' ' & 0x0FF) == 0x020)

8584

-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')

8585

-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))

8586

-#else

8587

-# define ISLOWER(c) \

8588

- (('a' <= (c) && (c) <= 'i') \

8589

- || ('j' <= (c) && (c) <= 'r') \

8590

- || ('s' <= (c) && (c) <= 'z'))

8591

-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))

8592

-#endif

8593

8594

-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))

8595

-int

8596

-main ()

8597

8598

- int i;

8599

- for (i = 0; i < 256; i++)

8600

- if (XOR (islower (i), ISLOWER (i))

8601

- || toupper (i) != TOUPPER (i))

8602

- return 2;

8603

- return 0;

8604

8605

-_ACEOF

8606

-rm -f conftest$ac_exeext

8607

-if { (ac_try="$ac_link"

8608

-case "(($ac_try" in

8609

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8610

- *) ac_try_echo=$ac_try;;

8611

-esac

8612

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8613

- (eval "$ac_link") 2>&5

8614

- ac_status=$?

8615

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8616

- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

8617

- { (case "(($ac_try" in

8618

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8619

- *) ac_try_echo=$ac_try;;

8620

-esac

8621

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8622

- (eval "$ac_try") 2>&5

8623

- ac_status=$?

8624

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8625

- (exit $ac_status); }; }; then

8626

- :

8627

-else

8628

- echo "$as_me: program exited with status $ac_status" >&5

8629

-echo "$as_me: failed program was:" >&5

8630

-sed 's/^/| /' conftest.$ac_ext >&5

8631

8632

-( exit $ac_status )

8633

-ac_cv_header_stdc=no

8634

-fi

8635

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

8636

-fi

8637

8638

8639

-fi

8640

-fi

8641

-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

8642

-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }

8643

-if test $ac_cv_header_stdc = yes; then

8644

8645

-cat >>confdefs.h <<\_ACEOF

8646

-#define STDC_HEADERS 1

8647

-_ACEOF

8648

8649

-fi

8650

8651

-# On IRIX 5.3, sys/types and inttypes.h are conflicting.

8652

8653

8654

8655

8656

8657

8658

8659

8660

8661

-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

8662

- inttypes.h stdint.h unistd.h

8663

-do

8664

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

8665

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5

8666

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

8667

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

8668

- echo $ECHO_N "(cached) $ECHO_C" >&6

8669

-else

8670

- cat >conftest.$ac_ext <<_ACEOF

8671

-/* confdefs.h. */

8672

-_ACEOF

8673

-cat confdefs.h >>conftest.$ac_ext

8674

-cat >>conftest.$ac_ext <<_ACEOF

8675

-/* end confdefs.h. */

8676

-$ac_includes_default

8677

8678

-#include <$ac_header>

8679

-_ACEOF

8680

-rm -f conftest.$ac_objext

8681

-if { (ac_try="$ac_compile"

8682

-case "(($ac_try" in

8683

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8684

- *) ac_try_echo=$ac_try;;

8685

-esac

8686

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8687

- (eval "$ac_compile") 2>conftest.er1

8688

- ac_status=$?

8689

- grep -v '^ *+' conftest.er1 >conftest.err

8690

- rm -f conftest.er1

8691

- cat conftest.err >&5

8692

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8693

- (exit $ac_status); } && {

8694

- test -z "$ac_cxx_werror_flag" ||

8695

- test ! -s conftest.err

8696

- } && test -s conftest.$ac_objext; then

8697

- eval "$as_ac_Header=yes"

8698

-else

8699

- echo "$as_me: failed program was:" >&5

8700

-sed 's/^/| /' conftest.$ac_ext >&5

8701

8702

- eval "$as_ac_Header=no"

8703

-fi

8704

8705

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

8706

-fi

8707

-ac_res=`eval echo '${'$as_ac_Header'}'`

8708

- { echo "$as_me:$LINENO: result: $ac_res" >&5

8709

-echo "${ECHO_T}$ac_res" >&6; }

8710

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

8711

- cat >>confdefs.h <<_ACEOF

8712

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

8713

-_ACEOF

8714

8715

-fi

8716

8717

-done

8718

8719

8720

-if test "${ac_cv_header_minix_config_h+set}" = set; then

8721

- { echo "$as_me:$LINENO: checking for minix/config.h" >&5

8722

-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }

8723

-if test "${ac_cv_header_minix_config_h+set}" = set; then

8724

- echo $ECHO_N "(cached) $ECHO_C" >&6

8725

-fi

8726

-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5

8727

-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }

8728

-else

8729

- # Is the header compilable?

8730

-{ echo "$as_me:$LINENO: checking minix/config.h usability" >&5

8731

-echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }

8732

-cat >conftest.$ac_ext <<_ACEOF

8733

-/* confdefs.h. */

8734

-_ACEOF

8735

-cat confdefs.h >>conftest.$ac_ext

8736

-cat >>conftest.$ac_ext <<_ACEOF

8737

-/* end confdefs.h. */

8738

-$ac_includes_default

8739

-#include <minix/config.h>

8740

-_ACEOF

8741

-rm -f conftest.$ac_objext

8742

-if { (ac_try="$ac_compile"

8743

-case "(($ac_try" in

8744

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8745

- *) ac_try_echo=$ac_try;;

8746

-esac

8747

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8748

- (eval "$ac_compile") 2>conftest.er1

8749

- ac_status=$?

8750

- grep -v '^ *+' conftest.er1 >conftest.err

8751

- rm -f conftest.er1

8752

- cat conftest.err >&5

8753

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8754

- (exit $ac_status); } && {

8755

- test -z "$ac_cxx_werror_flag" ||

8756

- test ! -s conftest.err

8757

- } && test -s conftest.$ac_objext; then

8758

- ac_header_compiler=yes

8759

-else

8760

- echo "$as_me: failed program was:" >&5

8761

-sed 's/^/| /' conftest.$ac_ext >&5

8762

8763

- ac_header_compiler=no

8764

-fi

8765

8766

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

8767

-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

8768

-echo "${ECHO_T}$ac_header_compiler" >&6; }

8769

8770

-# Is the header present?

8771

-{ echo "$as_me:$LINENO: checking minix/config.h presence" >&5

8772

-echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }

8773

-cat >conftest.$ac_ext <<_ACEOF

8774

-/* confdefs.h. */

8775

-_ACEOF

8776

-cat confdefs.h >>conftest.$ac_ext

8777

-cat >>conftest.$ac_ext <<_ACEOF

8778

-/* end confdefs.h. */

8779

-#include <minix/config.h>

8780

-_ACEOF

8781

-if { (ac_try="$ac_cpp conftest.$ac_ext"

8782

-case "(($ac_try" in

8783

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8784

- *) ac_try_echo=$ac_try;;

8785

-esac

8786

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8787

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

8788

- ac_status=$?

8789

- grep -v '^ *+' conftest.er1 >conftest.err

8790

- rm -f conftest.er1

8791

- cat conftest.err >&5

8792

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8793

- (exit $ac_status); } >/dev/null && {

8794

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

8795

- test ! -s conftest.err

8796

- }; then

8797

- ac_header_preproc=yes

8798

-else

8799

- echo "$as_me: failed program was:" >&5

8800

-sed 's/^/| /' conftest.$ac_ext >&5

8801

8802

- ac_header_preproc=no

8803

+else

8804

+ ac_cv_header_stdc=no

8805

8806

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

8807

8808

-rm -f conftest.err conftest.$ac_ext

8809

-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

8810

-echo "${ECHO_T}$ac_header_preproc" >&6; }

8811

+if test $ac_cv_header_stdc = yes; then

8812

+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.

8813

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8814

+/* end confdefs.h. */

8815

+#include <string.h>

8816

8817

+_ACEOF

8818

+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

8819

+ $EGREP "memchr" >/dev/null 2>&1; then :

8820

8821

-# So? What about this header?

8822

-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in

8823

- yes:no: )

8824

- { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5

8825

-echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

8826

- { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5

8827

-echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}

8828

- ac_header_preproc=yes

8829

- ;;

8830

- no:yes:* )

8831

- { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5

8832

-echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}

8833

- { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5

8834

-echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}

8835

- { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5

8836

-echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}

8837

- { echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5

8838

-echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;}

8839

- { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5

8840

-echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}

8841

- { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5

8842

-echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}

8843

- ( cat <<\_ASBOX

8844

-## ---------------------------------------- ##

8845

-## Report this to protobuf@googlegroups.com ##

8846

-## ---------------------------------------- ##

8847

-_ASBOX

8848

- ) | sed "s/^/$as_me: WARNING: /" >&2

8849

- ;;

8850

-esac

8851

-{ echo "$as_me:$LINENO: checking for minix/config.h" >&5

8852

-echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6; }

8853

-if test "${ac_cv_header_minix_config_h+set}" = set; then

8854

- echo $ECHO_N "(cached) $ECHO_C" >&6

8855

else

8856

- ac_cv_header_minix_config_h=$ac_header_preproc

8857

+ ac_cv_header_stdc=no

8858

8859

-{ echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5

8860

-echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }

8861

+rm -f conftest*

8862

8863

8864

-if test $ac_cv_header_minix_config_h = yes; then

8865

- MINIX=yes

8866

8867

+if test $ac_cv_header_stdc = yes; then

8868

+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.

8869

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8870

+/* end confdefs.h. */

8871

+#include <stdlib.h>

8872

8873

+_ACEOF

8874

+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

8875

+ $EGREP "free" >/dev/null 2>&1; then :

8876

8877

else

8878

- MINIX=

8879

+ ac_cv_header_stdc=no

8880

8881

+rm -f conftest*

8882

8883

+fi

8884

8885

-if test "$MINIX" = yes; then

8886

+if test $ac_cv_header_stdc = yes; then

8887

+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.

8888

+ if test "$cross_compiling" = yes; then :

8889

+ :

8890

+else

8891

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8892

+/* end confdefs.h. */

8893

+#include <ctype.h>

8894

+#include <stdlib.h>

8895

+#if ((' ' & 0x0FF) == 0x020)

8896

+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')

8897

+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))

8898

+#else

8899

+# define ISLOWER(c) \

8900

+ (('a' <= (c) && (c) <= 'i') \

8901

+ || ('j' <= (c) && (c) <= 'r') \

8902

+ || ('s' <= (c) && (c) <= 'z'))

8903

+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))

8904

+#endif

8905

8906

-cat >>confdefs.h <<\_ACEOF

8907

-#define _POSIX_SOURCE 1

8908

+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))

8909

+int

8910

+main ()

8911

8912

+ int i;

8913

+ for (i = 0; i < 256; i++)

8914

+ if (XOR (islower (i), ISLOWER (i))

8915

+ || toupper (i) != TOUPPER (i))

8916

+ return 2;

8917

+ return 0;

8918

8919

_ACEOF

8920

+if ac_fn_cxx_try_run "$LINENO"; then :

8921

8922

+else

8923

+ ac_cv_header_stdc=no

8924

+fi

8925

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

8926

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

8927

+fi

8928

8929

+fi

8930

+fi

8931

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5

8932

+$as_echo "$ac_cv_header_stdc" >&6; }

8933

+if test $ac_cv_header_stdc = yes; then

8934

8935

-cat >>confdefs.h <<\_ACEOF

8936

-#define _POSIX_1_SOURCE 2

8937

-_ACEOF

8938

+$as_echo "#define STDC_HEADERS 1" >>confdefs.h

8939

8940

+fi

8941

8942

-cat >>confdefs.h <<\_ACEOF

8943

-#define _MINIX 1

8944

+# On IRIX 5.3, sys/types and inttypes.h are conflicting.

8945

+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

8946

+ inttypes.h stdint.h unistd.h

8947

+do :

8948

+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

8949

+ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default

8950

2431

@@ -4847,7 +4733,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }

2432

2433

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5

2434

$as_echo_n "checking for ANSI C header files... " >&6; }

2435

-if test "${ac_cv_header_stdc+set}" = set; then :

2436

+if ${ac_cv_header_stdc+:} false; then :

2437

$as_echo_n "(cached) " >&6

2438

else

2439

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2440

@@ -4964,8 +4850,7 @@ do :

2441

as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

2442

ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default

2443

2444

-eval as_val=\$$as_ac_Header

2445

- if test "x$as_val" = x""yes; then :

8951

2446

+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :

8952

+ cat >>confdefs.h <<_ACEOF

8953

+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

8954

_ACEOF

8955

8956

8957

8958

+done

8959

8960

8961

8962

+ ac_fn_cxx_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"

8963

+if test "x$ac_cv_header_minix_config_h" = x""yes; then :

8964

+ MINIX=yes

8965

+else

8966

+ MINIX=

8967

+fi

8968

8969

8970

+ if test "$MINIX" = yes; then

8971

8972

+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h

8973

8974

8975

+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h

8976

8977

8978

+$as_echo "#define _MINIX 1" >>confdefs.h

8979

8980

+ fi

8981

8982

8983

- { echo "$as_me:$LINENO: checking whether it is safe to define __EXTENSIONS__" >&5

8984

-echo $ECHO_N "checking whether it is safe to define __EXTENSIONS__... $ECHO_C" >&6; }

8985

-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then

8986

- echo $ECHO_N "(cached) $ECHO_C" >&6

8987

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5

8988

+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }

8989

+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :

8990

+ $as_echo_n "(cached) " >&6

8991

else

8992

- cat >conftest.$ac_ext <<_ACEOF

8993

-/* confdefs.h. */

8994

-_ACEOF

8995

-cat confdefs.h >>conftest.$ac_ext

8996

-cat >>conftest.$ac_ext <<_ACEOF

8997

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8998

/* end confdefs.h. */

8999

9000

# define __EXTENSIONS__ 1

9001

@@ -5022,47 +5026,28 @@ main ()

9002

return 0;

9003

}

9004

_ACEOF

9005

-rm -f conftest.$ac_objext

9006

-if { (ac_try="$ac_compile"

9007

-case "(($ac_try" in

9008

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9009

- *) ac_try_echo=$ac_try;;

9010

-esac

9011

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9012

- (eval "$ac_compile") 2>conftest.er1

9013

- ac_status=$?

9014

- grep -v '^ *+' conftest.er1 >conftest.err

9015

- rm -f conftest.er1

9016

- cat conftest.err >&5

9017

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9018

- (exit $ac_status); } && {

9019

- test -z "$ac_cxx_werror_flag" ||

9020

- test ! -s conftest.err

9021

- } && test -s conftest.$ac_objext; then

9022

+if ac_fn_cxx_try_compile "$LINENO"; then :

9023

ac_cv_safe_to_define___extensions__=yes

9024

else

9025

- echo "$as_me: failed program was:" >&5

9026

-sed 's/^/| /' conftest.$ac_ext >&5

9027

9028

- ac_cv_safe_to_define___extensions__=no

9029

+ ac_cv_safe_to_define___extensions__=no

9030

9031

9032

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

9033

9034

-{ echo "$as_me:$LINENO: result: $ac_cv_safe_to_define___extensions__" >&5

9035

-echo "${ECHO_T}$ac_cv_safe_to_define___extensions__" >&6; }

9036

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5

9037

+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }

9038

test $ac_cv_safe_to_define___extensions__ = yes &&

9039

- cat >>confdefs.h <<\_ACEOF

9040

-#define __EXTENSIONS__ 1

9041

-_ACEOF

9042

+ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h

9043

9044

+ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h

9045

9046

+ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h

9047

9048

+ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h

9049

9050

+ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h

9051

9052

9053

- cat >>confdefs.h <<\_ACEOF

9054

-#define _POSIX_PTHREAD_SEMANTICS 1

9055

-_ACEOF

9056

9057

- cat >>confdefs.h <<\_ACEOF

9058

-#define _TANDEM_SOURCE 1

9059

-_ACEOF

9060

9061

9062

9063

@@ -5077,30 +5062,29 @@ fi

9064

# let the Makefile know if we're gcc

9065

9066

# test_util.cc takes forever to compile with GCC and optimization turned on.

9067

-{ echo "$as_me:$LINENO: checking C++ compiler flags..." >&5

9068

-echo $ECHO_N "checking C++ compiler flags...... $ECHO_C" >&6; }

9069

-if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then

9070

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking C++ compiler flags..." >&5

9071

+$as_echo_n "checking C++ compiler flags...... " >&6; }

9072

+if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then :

9073

9074

- if test "$GCC" = "yes"; then

9075

+ if test "$GCC" = "yes"; then :

9076

9077

PROTOBUF_OPT_FLAG="-O2"

9078

CXXFLAGS="${CXXFLAGS} -g"

9079

9080

9081

9082

9083

# Protocol Buffers contains several checks that are intended to be used only

9084

# for debugging and which might hurt performance. Most users are probably

9085

# end users who don't want these checks, so add -DNDEBUG by default.

9086

CXXFLAGS="$CXXFLAGS -DNDEBUG"

9087

9088

- { echo "$as_me:$LINENO: result: use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&5

9089

-echo "${ECHO_T}use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&6; }

9090

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&5

9091

+$as_echo "use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&6; }

9092

9093

else

9094

9095

- { echo "$as_me:$LINENO: result: use user-supplied: $CXXFLAGS" >&5

9096

-echo "${ECHO_T}use user-supplied: $CXXFLAGS" >&6; }

9097

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: use user-supplied: $CXXFLAGS" >&5

9098

+$as_echo "use user-supplied: $CXXFLAGS" >&6; }

9099

9100

9101

9102

@@ -5108,66 +5092,14 @@ fi

9103

9104

9105

9106

9107

ac_ext=cpp

9108

ac_cpp='$CXXCPP $CPPFLAGS'

9109

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

9110

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

2447

cat >>confdefs.h <<_ACEOF

2448

#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

2449

_ACEOF

2450

@@ -4977,7 +4862,7 @@ done

2451

2452

2453

ac_fn_cxx_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"

2454

-if test "x$ac_cv_header_minix_config_h" = x""yes; then :

2455

+if test "x$ac_cv_header_minix_config_h" = xyes; then :

2456

MINIX=yes

2457

else

2458

MINIX=

2459

@@ -4999,7 +4884,7 @@ $as_echo "#define _MINIX 1" >>confdefs.h

2460

2461

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5

2462

$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }

2463

-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :

2464

+if ${ac_cv_safe_to_define___extensions__+:} false; then :

2465

$as_echo_n "(cached) " >&6

2466

else

2467

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2468

@@ -5088,7 +4973,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX

9111

2469

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

9112

2470

9113

- { echo "$as_me:$LINENO: checking whether __SUNPRO_CC is declared" >&5

9114

-echo $ECHO_N "checking whether __SUNPRO_CC is declared... $ECHO_C" >&6; }

9115

-if test "${ac_cv_have_decl___SUNPRO_CC+set}" = set; then

9116

- echo $ECHO_N "(cached) $ECHO_C" >&6

9117

-else

9118

- cat >conftest.$ac_ext <<_ACEOF

9119

-/* confdefs.h. */

9120

-_ACEOF

9121

-cat confdefs.h >>conftest.$ac_ext

9122

-cat >>conftest.$ac_ext <<_ACEOF

9123

-/* end confdefs.h. */

9124

-$ac_includes_default

9125

-int

9126

-main ()

9127

9128

-#ifndef __SUNPRO_CC

9129

- (void) __SUNPRO_CC;

9130

-#endif

9131

9132

- ;

9133

- return 0;

9134

9135

-_ACEOF

9136

-rm -f conftest.$ac_objext

9137

-if { (ac_try="$ac_compile"

9138

-case "(($ac_try" in

9139

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9140

- *) ac_try_echo=$ac_try;;

9141

-esac

9142

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9143

- (eval "$ac_compile") 2>conftest.er1

9144

- ac_status=$?

9145

- grep -v '^ *+' conftest.er1 >conftest.err

9146

- rm -f conftest.er1

9147

- cat conftest.err >&5

9148

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9149

- (exit $ac_status); } && {

9150

- test -z "$ac_cxx_werror_flag" ||

9151

- test ! -s conftest.err

9152

- } && test -s conftest.$ac_objext; then

9153

- ac_cv_have_decl___SUNPRO_CC=yes

9154

-else

9155

- echo "$as_me: failed program was:" >&5

9156

-sed 's/^/| /' conftest.$ac_ext >&5

9157

9158

- ac_cv_have_decl___SUNPRO_CC=no

9159

-fi

9160

9161

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

9162

-fi

9163

-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_CC" >&5

9164

-echo "${ECHO_T}$ac_cv_have_decl___SUNPRO_CC" >&6; }

9165

-if test $ac_cv_have_decl___SUNPRO_CC = yes; then

9166

+ ac_fn_cxx_check_decl "$LINENO" "__SUNPRO_CC" "ac_cv_have_decl___SUNPRO_CC" "$ac_includes_default"

9167

+if test "x$ac_cv_have_decl___SUNPRO_CC" = x""yes; then :

2471

ac_fn_cxx_check_decl "$LINENO" "__SUNPRO_CC" "ac_cv_have_decl___SUNPRO_CC" "$ac_includes_default"

2472

-if test "x$ac_cv_have_decl___SUNPRO_CC" = x""yes; then :

2473

+if test "x$ac_cv_have_decl___SUNPRO_CC" = xyes; then :

9168

2474

SUNCC="yes"

9169

2475

else

9170

2476

SUNCC="no"

9171

@@ -5182,30 +5114,29 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

9172

9173

9174

# Check whether --enable-64bit-solaris was given.

9175

-if test "${enable_64bit_solaris+set}" = set; then

9176

+if test "${enable_64bit_solaris+set}" = set; then :

9177

enableval=$enable_64bit_solaris; ac_enable_64bit="$enableval"

9178

else

9179

ac_enable_64bit="yes"

9180

9181

9182

9183

- if test "$SUNCC" = "yes" -a "x${ac_cv_env_CXXFLAGS_set}" = "x"; then

9184

+ if test "$SUNCC" = "yes" -a "x${ac_cv_env_CXXFLAGS_set}" = "x"; then :

9185

9186

CXXFLAGS="-g0 -xO3 -xlibmil -xdepend -xbuiltin -mt -compat=5 -library=stlport4 -library=Crun -template=no%extdef ${CXXFLAGS}"

9187

9188

9189

9190

9191

case $host_os in

9192

*solaris*)

9193

for ac_prog in isainfo

9194

9195

# Extract the first word of "$ac_prog", so it can be a program name with args.

2477

@@ -5124,7 +5009,7 @@ do

9196

2478

set dummy $ac_prog; ac_word=$2

9197

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

9198

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

9199

-if test "${ac_cv_prog_ISAINFO+set}" = set; then

9200

- echo $ECHO_N "(cached) $ECHO_C" >&6

9201

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9202

+$as_echo_n "checking for $ac_word... " >&6; }

9203

+if test "${ac_cv_prog_ISAINFO+set}" = set; then :

9204

+ $as_echo_n "(cached) " >&6

2479

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2480

$as_echo_n "checking for $ac_word... " >&6; }

2481

-if test "${ac_cv_prog_ISAINFO+set}" = set; then :

2482

+if ${ac_cv_prog_ISAINFO+:} false; then :

2483

$as_echo_n "(cached) " >&6

9205

2484

else

9206

2485

if test -n "$ISAINFO"; then

9207

ac_cv_prog_ISAINFO="$ISAINFO" # Let the user override the test.

9208

@@ -5215,25 +5146,25 @@ for as_dir in $PATH

9209

9210

IFS=$as_save_IFS

9211

test -z "$as_dir" && as_dir=.

9212

- for ac_exec_ext in '' $ac_executable_extensions; do

9213

+ for ac_exec_ext in '' $ac_executable_extensions; do

9214

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9215

ac_cv_prog_ISAINFO="$ac_prog"

9216

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9217

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9218

break 2

9219

9220

done

9221

-done

9222

+ done

9223

IFS=$as_save_IFS

9224

9225

9226

9227

ISAINFO=$ac_cv_prog_ISAINFO

9228

if test -n "$ISAINFO"; then

9229

- { echo "$as_me:$LINENO: result: $ISAINFO" >&5

9230

-echo "${ECHO_T}$ISAINFO" >&6; }

9231

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ISAINFO" >&5

9232

+$as_echo "$ISAINFO" >&6; }

9233

else

9234

- { echo "$as_me:$LINENO: result: no" >&5

9235

-echo "${ECHO_T}no" >&6; }

9236

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9237

+$as_echo "no" >&6; }

9238

9239

9240

9241

@@ -5241,29 +5172,27 @@ fi

9242

done

9243

test -n "$ISAINFO" || ISAINFO="no"

9244

9245

- if test "x$ISAINFO" != "xno"; then

9246

+ if test "x$ISAINFO" != "xno"; then :

9247

isainfo_b=`${ISAINFO} -b`

9248

else

9249

isainfo_b="x"

9250

9251

9252

9253

- if test "$isainfo_b" != "x"; then

9254

+ if test "$isainfo_b" != "x"; then :

9255

9256

9257

isainfo_k=`${ISAINFO} -k`

9258

9259

- if test "x$ac_enable_64bit" = "xyes"; then

9260

+ if test "x$ac_enable_64bit" = "xyes"; then :

9261

9262

9263

- if test "x$libdir" = "x\${exec_prefix}/lib"; then

9264

+ if test "x$libdir" = "x\${exec_prefix}/lib"; then :

9265

9266

libdir="${libdir}/${isainfo_k}"

9267

9268

9269

9270

9271

- if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then

9272

+ if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then :

9273

9274

CXXFLAGS="${CXXFLAGS} -m64"

9275

ac_cv_env_CXXFLAGS_set=set

9276

@@ -5271,8 +5200,7 @@ fi

9277

9278

9279

9280

9281

- if test "x${ac_cv_env_CFLAGS_set}" = "x"; then

9282

+ if test "x${ac_cv_env_CFLAGS_set}" = "x"; then :

9283

9284

CFLAGS="${CFLAGS} -m64"

9285

ac_cv_env_CFLAGS_set=set

9286

@@ -5280,19 +5208,15 @@ fi

9287

9288

9289

9290

9291

- if test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes" ; then

9292

+ if test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes" ; then :

9293

9294

CXXFLAGS="-xmemalign=8s ${CXXFLAGS}"

9295

9296

9297

9298

9299

9300

9301

9302

9303

9304

;;

9305

esac

9306

9307

@@ -5302,14 +5226,14 @@ fi

9308

# to the link

9309

case `pwd` in

9310

*\ * | *\ *)

9311

- { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5

9312

-echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;

9313

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5

9314

+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;

9315

esac

9316

9317

9318

9319

-macro_version='2.2.4'

9320

-macro_revision='1.2976'

9321

+macro_version='2.2.6b'

9322

+macro_revision='1.3017'

9323

9324

9325

9326

@@ -5325,51 +5249,46 @@ macro_revision='1.2976'

2486

@@ -5221,8 +5106,8 @@ esac

2487

2488

2489

2490

-macro_version='2.2.6b'

2491

-macro_revision='1.3017'

2492

+macro_version='2.4'

2493

+macro_revision='1.3293'

2494

2495

2496

2497

@@ -5238,9 +5123,78 @@ macro_revision='1.3017'

9327

2498

9328

2499

ltmain="$ac_aux_dir/ltmain.sh"

9329

2500

9330

-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5

9331

-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }

9332

-if test "${ac_cv_path_SED+set}" = set; then

9333

- echo $ECHO_N "(cached) $ECHO_C" >&6

9334

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5

9335

+$as_echo_n "checking for a sed that does not truncate output... " >&6; }

9336

+if test "${ac_cv_path_SED+set}" = set; then :

9337

+ $as_echo_n "(cached) " >&6

2501

+# Backslashify metacharacters that are still active within

2502

+# double-quoted strings.

2503

+sed_quote_subst='s/$["`$\\]$/\\\1/g'

2504

2505

+# Same as above, but do not quote variable references.

2506

+double_quote_subst='s/$["`\\]$/\\\1/g'

2507

2508

+# Sed substitution to delay expansion of an escaped shell variable in a

2509

+# double_quote_subst'ed string.

2510

+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'

2511

2512

+# Sed substitution to delay expansion of an escaped single quote.

2513

+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'

2514

2515

+# Sed substitution to avoid accidental globbing in evaled expressions

2516

+no_glob_subst='s/\*/\\\*/g'

2517

2518

+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

2519

+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO

2520

+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

2521

2522

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5

2523

+$as_echo_n "checking how to print strings... " >&6; }

2524

+# Test print first, because it will be a builtin if present.

2525

+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

2526

+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then

2527

+ ECHO='print -r --'

2528

+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

2529

+ ECHO='printf %s\n'

2530

+else

2531

+ # Use this function as a fallback that always works.

2532

+ func_fallback_echo ()

2533

+ {

2534

+ eval 'cat <<_LTECHO_EOF

2535

+$1

2536

+_LTECHO_EOF'

2537

+ }

2538

+ ECHO='func_fallback_echo'

2539

+fi

2540

2541

+# func_echo_all arg...

2542

+# Invoke $ECHO with all args, space-separated.

2543

+func_echo_all ()

2544

2545

+ $ECHO ""

2546

2547

2548

+case "$ECHO" in

2549

+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5

2550

+$as_echo "printf" >&6; } ;;

2551

+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5

2552

+$as_echo "print -r" >&6; } ;;

2553

+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5

2554

+$as_echo "cat" >&6; } ;;

2555

+esac

2556

2557

2558

2559

2560

2561

2562

2563

2564

2565

2566

2567

2568

2569

2570

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5

2571

$as_echo_n "checking for a sed that does not truncate output... " >&6; }

2572

-if test "${ac_cv_path_SED+set}" = set; then :

2573

+if ${ac_cv_path_SED+:} false; then :

2574

$as_echo_n "(cached) " >&6

9338

2575

else

9339

2576

ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/

9340

for ac_i in 1 2 3 4 5 6 7; do

9341

ac_script="$ac_script$as_nl$ac_script"

9342

done

9343

- echo "$ac_script" | sed 99q >conftest.sed

9344

- $as_unset ac_script || ac_script=

9345

- # Extract the first word of "sed gsed" to use in msg output

9346

-if test -z "$SED"; then

9347

-set dummy sed gsed; ac_prog_name=$2

9348

-if test "${ac_cv_path_SED+set}" = set; then

9349

- echo $ECHO_N "(cached) $ECHO_C" >&6

9350

-else

9351

+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed

9352

+ { ac_script=; unset ac_script;}

9353

+ if test -z "$SED"; then

9354

ac_path_SED_found=false

9355

-# Loop through the user's path and test for each of PROGNAME-LIST

9356

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

9357

+ # Loop through the user's path and test for each of PROGNAME-LIST

9358

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

9359

for as_dir in $PATH

9360

9361

IFS=$as_save_IFS

9362

test -z "$as_dir" && as_dir=.

9363

- for ac_prog in sed gsed; do

9364

- for ac_exec_ext in '' $ac_executable_extensions; do

9365

- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"

9366

- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue

9367

- # Check for GNU ac_path_SED and select it if it is found.

9368

+ for ac_prog in sed gsed; do

9369

+ for ac_exec_ext in '' $ac_executable_extensions; do

9370

+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"

9371

+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue

9372

+# Check for GNU ac_path_SED and select it if it is found.

9373

# Check for GNU $ac_path_SED

9374

case `"$ac_path_SED" --version 2>&1` in

9375

*GNU*)

9376

ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;

9377

9378

ac_count=0

9379

- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

9380

+ $as_echo_n 0123456789 >"conftest.in"

9381

while :

9382

9383

cat "conftest.in" "conftest.in" >"conftest.tmp"

9384

mv "conftest.tmp" "conftest.in"

9385

cp "conftest.in" "conftest.nl"

9386

- echo '' >> "conftest.nl"

9387

+ $as_echo '' >> "conftest.nl"

9388

"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break

9389

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

9390

- ac_count=`expr $ac_count + 1`

9391

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

9392

if test $ac_count -gt ${ac_path_SED_max-0}; then

9393

# Best one so far, save it but keep looking for a better one

9394

ac_cv_path_SED="$ac_path_SED"

9395

@@ -5381,31 +5300,21 @@ case `"$ac_path_SED" --version 2>&1` in

9396

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

9397

esac

9398

9399

9400

- $ac_path_SED_found && break 3

9401

+ $ac_path_SED_found && break 3

9402

+ done

9403

+ done

2577

@@ -5295,7 +5249,7 @@ esac

9404

2578

done

9405

-done

9406

9407

-done

9408

2579

IFS=$as_save_IFS

9409

9410

9411

-fi

9412

9413

-SED="$ac_cv_path_SED"

9414

-if test -z "$SED"; then

9415

- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5

9416

-echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}

9417

- { (exit 1); exit 1; }; }

9418

-fi

9419

9420

+ if test -z "$ac_cv_path_SED"; then

2580

if test -z "$ac_cv_path_SED"; then

2581

- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5

9421

2582

+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5

9422

+ fi

2583

9423

2584

else

9424

2585

ac_cv_path_SED=$SED

9425

9426

9427

9428

-{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5

9429

-echo "${ECHO_T}$ac_cv_path_SED" >&6; }

9430

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5

9431

+$as_echo "$ac_cv_path_SED" >&6; }

9432

SED="$ac_cv_path_SED"

9433

rm -f conftest.sed

9434

9435

@@ -5422,48 +5331,43 @@ Xsed="$SED -e 1s/^X//"

9436

9437

9438

9439

-{ echo "$as_me:$LINENO: checking for fgrep" >&5

9440

-echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }

9441

-if test "${ac_cv_path_FGREP+set}" = set; then

9442

- echo $ECHO_N "(cached) $ECHO_C" >&6

9443

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5

9444

+$as_echo_n "checking for fgrep... " >&6; }

9445

+if test "${ac_cv_path_FGREP+set}" = set; then :

9446

+ $as_echo_n "(cached) " >&6

2586

@@ -5322,7 +5276,7 @@ Xsed="$SED -e 1s/^X//"

2587

2588

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5

2589

$as_echo_n "checking for fgrep... " >&6; }

2590

-if test "${ac_cv_path_FGREP+set}" = set; then :

2591

+if ${ac_cv_path_FGREP+:} false; then :

2592

$as_echo_n "(cached) " >&6

9447

2593

else

9448

2594

if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1

9449

then ac_cv_path_FGREP="$GREP -F"

9450

else

9451

- # Extract the first word of "fgrep" to use in msg output

9452

-if test -z "$FGREP"; then

9453

-set dummy fgrep; ac_prog_name=$2

9454

-if test "${ac_cv_path_FGREP+set}" = set; then

9455

- echo $ECHO_N "(cached) $ECHO_C" >&6

9456

-else

9457

+ if test -z "$FGREP"; then

9458

ac_path_FGREP_found=false

9459

-# Loop through the user's path and test for each of PROGNAME-LIST

9460

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

9461

+ # Loop through the user's path and test for each of PROGNAME-LIST

9462

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

9463

for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

9464

9465

IFS=$as_save_IFS

9466

test -z "$as_dir" && as_dir=.

9467

- for ac_prog in fgrep; do

9468

- for ac_exec_ext in '' $ac_executable_extensions; do

9469

- ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"

9470

- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue

9471

- # Check for GNU ac_path_FGREP and select it if it is found.

9472

+ for ac_prog in fgrep; do

9473

+ for ac_exec_ext in '' $ac_executable_extensions; do

9474

+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"

9475

+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue

9476

+# Check for GNU ac_path_FGREP and select it if it is found.

9477

# Check for GNU $ac_path_FGREP

9478

case `"$ac_path_FGREP" --version 2>&1` in

9479

*GNU*)

9480

ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;

9481

9482

ac_count=0

9483

- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

9484

+ $as_echo_n 0123456789 >"conftest.in"

9485

while :

9486

9487

cat "conftest.in" "conftest.in" >"conftest.tmp"

9488

mv "conftest.tmp" "conftest.in"

9489

cp "conftest.in" "conftest.nl"

9490

- echo 'FGREP' >> "conftest.nl"

9491

+ $as_echo 'FGREP' >> "conftest.nl"

9492

"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break

9493

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

9494

- ac_count=`expr $ac_count + 1`

9495

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

9496

if test $ac_count -gt ${ac_path_FGREP_max-0}; then

9497

# Best one so far, save it but keep looking for a better one

9498

ac_cv_path_FGREP="$ac_path_FGREP"

9499

@@ -5475,33 +5379,22 @@ case `"$ac_path_FGREP" --version 2>&1` i

9500

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

9501

esac

9502

9503

9504

- $ac_path_FGREP_found && break 3

9505

+ $ac_path_FGREP_found && break 3

9506

+ done

9507

+ done

2595

@@ -5374,7 +5328,7 @@ esac

9508

2596

done

9509

-done

9510

9511

-done

9512

2597

IFS=$as_save_IFS

9513

9514

9515

-fi

9516

9517

-FGREP="$ac_cv_path_FGREP"

9518

-if test -z "$FGREP"; then

9519

- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

9520

-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

9521

- { (exit 1); exit 1; }; }

9522

-fi

9523

9524

+ if test -z "$ac_cv_path_FGREP"; then

2598

if test -z "$ac_cv_path_FGREP"; then

2599

- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

9525

2600

+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

9526

+ fi

2601

9527

2602

else

9528

2603

ac_cv_path_FGREP=$FGREP

9529

9530

9531

9532

9533

9534

-{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5

9535

-echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }

9536

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5

9537

+$as_echo "$ac_cv_path_FGREP" >&6; }

9538

FGREP="$ac_cv_path_FGREP"

9539

9540

9541

@@ -5526,7 +5419,7 @@ test -z "$GREP" && GREP=grep

9542

9543

9544

# Check whether --with-gnu-ld was given.

9545

-if test "${with_gnu_ld+set}" = set; then

9546

+if test "${with_gnu_ld+set}" = set; then :

9547

withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

9548

else

9549

with_gnu_ld=no

9550

@@ -5535,8 +5428,8 @@ fi

9551

ac_prog=ld

9552

if test "$GCC" = yes; then

9553

# Check if gcc -print-prog-name=ld gives a path.

9554

- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

9555

-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

9556

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5

9557

+$as_echo_n "checking for ld used by $CC... " >&6; }

9558

case $host in

9559

*-*-mingw*)

9560

# gcc leaves a trailing carriage return which upsets mingw

9561

@@ -5565,14 +5458,14 @@ echo $ECHO_N "checking for ld used by $C

9562

;;

9563

esac

9564

elif test "$with_gnu_ld" = yes; then

9565

- { echo "$as_me:$LINENO: checking for GNU ld" >&5

9566

-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

9567

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5

9568

+$as_echo_n "checking for GNU ld... " >&6; }

9569

else

9570

- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

9571

-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

9572

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5

9573

+$as_echo_n "checking for non-GNU ld... " >&6; }

9574

9575

-if test "${lt_cv_path_LD+set}" = set; then

9576

- echo $ECHO_N "(cached) $ECHO_C" >&6

9577

+if test "${lt_cv_path_LD+set}" = set; then :

9578

+ $as_echo_n "(cached) " >&6

2604

@@ -5453,7 +5407,7 @@ else

2605

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5

2606

$as_echo_n "checking for non-GNU ld... " >&6; }

2607

2608

-if test "${lt_cv_path_LD+set}" = set; then :

2609

+if ${lt_cv_path_LD+:} false; then :

2610

$as_echo_n "(cached) " >&6

9579

2611

else

9580

2612

if test -z "$LD"; then

9581

lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

9582

@@ -5602,19 +5495,17 @@ fi

9583

9584

LD="$lt_cv_path_LD"

9585

if test -n "$LD"; then

9586

- { echo "$as_me:$LINENO: result: $LD" >&5

9587

-echo "${ECHO_T}$LD" >&6; }

9588

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5

9589

+$as_echo "$LD" >&6; }

9590

else

9591

- { echo "$as_me:$LINENO: result: no" >&5

9592

-echo "${ECHO_T}no" >&6; }

9593

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9594

+$as_echo "no" >&6; }

2613

@@ -5490,10 +5444,10 @@ else

2614

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

2615

$as_echo "no" >&6; }

9595

2616

9596

-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

9597

-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

9598

- { (exit 1); exit 1; }; }

9599

-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

9600

-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

9601

-if test "${lt_cv_prog_gnu_ld+set}" = set; then

9602

- echo $ECHO_N "(cached) $ECHO_C" >&6

2617

-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5

9603

2618

+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5

9604

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

9605

+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

9606

+if test "${lt_cv_prog_gnu_ld+set}" = set; then :

9607

+ $as_echo_n "(cached) " >&6

2619

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

2620

$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

2621

-if test "${lt_cv_prog_gnu_ld+set}" = set; then :

2622

+if ${lt_cv_prog_gnu_ld+:} false; then :

2623

$as_echo_n "(cached) " >&6

9608

2624

else

9609

2625

# I'd rather use --version here, but apparently some GNU lds only accept -v.

9610

case `$LD -v 2>&1 </dev/null` in

9611

@@ -5626,8 +5517,8 @@ case `$LD -v 2>&1 </dev/null` in

9612

;;

9613

esac

9614

9615

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

9616

-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

9617

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5

9618

+$as_echo "$lt_cv_prog_gnu_ld" >&6; }

9619

with_gnu_ld=$lt_cv_prog_gnu_ld

9620

9621

9622

@@ -5638,10 +5529,10 @@ with_gnu_ld=$lt_cv_prog_gnu_ld

9623

9624

9625

9626

-{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5

9627

-echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }

9628

-if test "${lt_cv_path_NM+set}" = set; then

9629

- echo $ECHO_N "(cached) $ECHO_C" >&6

9630

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5

9631

+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }

9632

+if test "${lt_cv_path_NM+set}" = set; then :

9633

+ $as_echo_n "(cached) " >&6

2626

@@ -5520,7 +5474,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld

2627

2628

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5

2629

$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }

2630

-if test "${lt_cv_path_NM+set}" = set; then :

2631

+if ${lt_cv_path_NM+:} false; then :

2632

$as_echo_n "(cached) " >&6

9634

2633

else

9635

2634

if test -n "$NM"; then

9636

# Let the user override the test.

9637

@@ -5687,8 +5578,8 @@ else

9638

: ${lt_cv_path_NM=no}

9639

9640

9641

-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5

9642

-echo "${ECHO_T}$lt_cv_path_NM" >&6; }

9643

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5

9644

+$as_echo "$lt_cv_path_NM" >&6; }

9645

if test "$lt_cv_path_NM" != "no"; then

2635

@@ -5573,14 +5527,17 @@ if test "$lt_cv_path_NM" != "no"; then

9646

2636

NM="$lt_cv_path_NM"

9647

2637

else

9648

@@ -5698,10 +5589,10 @@ else

2638

# Didn't find any BSD compatible name lister, look for dumpbin.

2639

- if test -n "$ac_tool_prefix"; then

2640

- for ac_prog in "dumpbin -symbols" "link -dump -symbols"

2641

+ if test -n "$DUMPBIN"; then :

2642

+ # Let the user override the test.

2643

+ else

2644

+ if test -n "$ac_tool_prefix"; then

2645

+ for ac_prog in dumpbin "link -dump"

9649

2646

9650

2647

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

9651

2648

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

9652

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

9653

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

9654

-if test "${ac_cv_prog_DUMPBIN+set}" = set; then

9655

- echo $ECHO_N "(cached) $ECHO_C" >&6

9656

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9657

+$as_echo_n "checking for $ac_word... " >&6; }

9658

+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :

9659

+ $as_echo_n "(cached) " >&6

2649

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2650

$as_echo_n "checking for $ac_word... " >&6; }

2651

-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :

2652

+if ${ac_cv_prog_DUMPBIN+:} false; then :

2653

$as_echo_n "(cached) " >&6

9660

2654

else

9661

2655

if test -n "$DUMPBIN"; then

9662

ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.

9663

@@ -5711,25 +5602,25 @@ for as_dir in $PATH

9664

9665

IFS=$as_save_IFS

9666

test -z "$as_dir" && as_dir=.

9667

- for ac_exec_ext in '' $ac_executable_extensions; do

9668

+ for ac_exec_ext in '' $ac_executable_extensions; do

9669

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9670

ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"

9671

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9672

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9673

break 2

9674

9675

done

9676

-done

9677

+ done

9678

IFS=$as_save_IFS

9679

9680

9681

9682

DUMPBIN=$ac_cv_prog_DUMPBIN

9683

if test -n "$DUMPBIN"; then

9684

- { echo "$as_me:$LINENO: result: $DUMPBIN" >&5

9685

-echo "${ECHO_T}$DUMPBIN" >&6; }

9686

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5

9687

+$as_echo "$DUMPBIN" >&6; }

9688

else

9689

- { echo "$as_me:$LINENO: result: no" >&5

9690

-echo "${ECHO_T}no" >&6; }

9691

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9692

+$as_echo "no" >&6; }

9693

9694

9695

9696

@@ -5742,10 +5633,10 @@ if test -z "$DUMPBIN"; then

2656

@@ -5618,13 +5575,13 @@ fi

2657

2658

if test -z "$DUMPBIN"; then

2659

ac_ct_DUMPBIN=$DUMPBIN

2660

- for ac_prog in "dumpbin -symbols" "link -dump -symbols"

2661

+ for ac_prog in dumpbin "link -dump"

9697

2662

9698

2663

# Extract the first word of "$ac_prog", so it can be a program name with args.

9699

2664

set dummy $ac_prog; ac_word=$2

9700

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

9701

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

9702

-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then

9703

- echo $ECHO_N "(cached) $ECHO_C" >&6

9704

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9705

+$as_echo_n "checking for $ac_word... " >&6; }

9706

+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :

9707

+ $as_echo_n "(cached) " >&6

2665

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2666

$as_echo_n "checking for $ac_word... " >&6; }

2667

-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :

2668

+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :

2669

$as_echo_n "(cached) " >&6

9708

2670

else

9709

2671

if test -n "$ac_ct_DUMPBIN"; then

9710

ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.

9711

@@ -5755,25 +5646,25 @@ for as_dir in $PATH

9712

9713

IFS=$as_save_IFS

9714

test -z "$as_dir" && as_dir=.

9715

- for ac_exec_ext in '' $ac_executable_extensions; do

9716

+ for ac_exec_ext in '' $ac_executable_extensions; do

9717

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9718

ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"

9719

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9720

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9721

break 2

2672

@@ -5673,6 +5630,15 @@ esac

9722

2673

9723

done

9724

-done

9725

+ done

9726

IFS=$as_save_IFS

9727

9728

9729

9730

ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN

9731

if test -n "$ac_ct_DUMPBIN"; then

9732

- { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5

9733

-echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }

9734

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5

9735

+$as_echo "$ac_ct_DUMPBIN" >&6; }

9736

else

9737

- { echo "$as_me:$LINENO: result: no" >&5

9738

-echo "${ECHO_T}no" >&6; }

9739

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9740

+$as_echo "no" >&6; }

9741

9742

9743

9744

@@ -5785,12 +5676,8 @@ done

9745

else

9746

case $cross_compiling:$ac_tool_warned in

9747

yes:)

9748

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

9749

-whose name does not start with the host triplet. If you think this

9750

-configuration is useful to you, please write to autoconf@gnu.org." >&5

9751

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

9752

-whose name does not start with the host triplet. If you think this

9753

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

9754

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

9755

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

9756

ac_tool_warned=yes ;;

9757

esac

9758

DUMPBIN=$ac_ct_DUMPBIN

9759

@@ -5809,45 +5696,45 @@ test -z "$NM" && NM=nm

9760

9761

9762

9763

-{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5

9764

-echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }

9765

-if test "${lt_cv_nm_interface+set}" = set; then

9766

- echo $ECHO_N "(cached) $ECHO_C" >&6

9767

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5

9768

+$as_echo_n "checking the name lister ($NM) interface... " >&6; }

9769

+if test "${lt_cv_nm_interface+set}" = set; then :

9770

+ $as_echo_n "(cached) " >&6

2674

2675

2676

+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in

2677

+ *COFF*)

2678

+ DUMPBIN="$DUMPBIN -symbols"

2679

+ ;;

2680

+ *)

2681

+ DUMPBIN=:

2682

+ ;;

2683

+ esac

2684

+ fi

2685

2686

if test "$DUMPBIN" != ":"; then

2687

NM="$DUMPBIN"

2688

@@ -5687,18 +5653,18 @@ test -z "$NM" && NM=nm

2689

2690

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5

2691

$as_echo_n "checking the name lister ($NM) interface... " >&6; }

2692

-if test "${lt_cv_nm_interface+set}" = set; then :

2693

+if ${lt_cv_nm_interface+:} false; then :

2694

$as_echo_n "(cached) " >&6

9771

2695

else

9772

2696

lt_cv_nm_interface="BSD nm"

9773

2697

echo "int some_variable = 0;" > conftest.$ac_ext

9774

- (eval echo "\"\$as_me:5819: $ac_compile\"" >&5)

9775

+ (eval echo "\"\$as_me:5706: $ac_compile\"" >&5)

2698

- (eval echo "\"\$as_me:5695: $ac_compile\"" >&5)

2699

+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)

9776

2700

(eval "$ac_compile" 2>conftest.err)

9777

2701

cat conftest.err >&5

9778

- (eval echo "\"\$as_me:5822: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

9779

+ (eval echo "\"\$as_me:5709: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

2702

- (eval echo "\"\$as_me:5698: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

2703

+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

9780

2704

(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

9781

2705

cat conftest.err >&5

9782

- (eval echo "\"\$as_me:5825: output\"" >&5)

9783

+ (eval echo "\"\$as_me:5712: output\"" >&5)

2706

- (eval echo "\"\$as_me:5701: output\"" >&5)

2707

+ (eval echo "\"\$as_me:$LINENO: output\"" >&5)

9784

2708

cat conftest.out >&5

9785

2709

if $GREP 'External.*some_variable' conftest.out > /dev/null; then

9786

2710

lt_cv_nm_interface="MS dumpbin"

9787

9788

rm -f conftest*

9789

9790

-{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5

9791

-echo "${ECHO_T}$lt_cv_nm_interface" >&6; }

9792

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5

9793

+$as_echo "$lt_cv_nm_interface" >&6; }

9794

9795

-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5

9796

-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }

9797

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5

9798

+$as_echo_n "checking whether ln -s works... " >&6; }

9799

LN_S=$as_ln_s

9800

if test "$LN_S" = "ln -s"; then

9801

- { echo "$as_me:$LINENO: result: yes" >&5

9802

-echo "${ECHO_T}yes" >&6; }

9803

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

9804

+$as_echo "yes" >&6; }

9805

else

9806

- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5

9807

-echo "${ECHO_T}no, using $LN_S" >&6; }

9808

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5

9809

+$as_echo "no, using $LN_S" >&6; }

9810

9811

2711

@@ -5722,7 +5688,7 @@ fi

9812

2712

# find the maximum length of command line arguments

9813

-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5

9814

-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }

9815

-if test "${lt_cv_sys_max_cmd_len+set}" = set; then

9816

- echo $ECHO_N "(cached) $ECHO_C" >&6

9817

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5

9818

+$as_echo_n "checking the maximum length of command line arguments... " >&6; }

9819

+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :

9820

+ $as_echo_n "(cached) " >&6

2713

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5

2714

$as_echo_n "checking the maximum length of command line arguments... " >&6; }

2715

-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :

2716

+if ${lt_cv_sys_max_cmd_len+:} false; then :

2717

$as_echo_n "(cached) " >&6

9821

2718

else

9822

2719

i=0

9823

teststring="ABCD"

9824

@@ -5868,7 +5755,7 @@ else

9825

lt_cv_sys_max_cmd_len=-1;

2720

@@ -5755,6 +5721,11 @@ else

2721

lt_cv_sys_max_cmd_len=8192;

9826

2722

;;

9827

2723

9828

- cygwin* | mingw*)

9829

+ cygwin* | mingw* | cegcc*)

9830

# On Win9x/ME, this test blows up -- it succeeds, but takes

9831

# about 5 minutes as the teststring grows exponentially.

9832

# Worse, since 9x/ME are not pre-emptively multitasking,

9833

@@ -5964,11 +5851,11 @@ else

9834

9835

9836

if test -n $lt_cv_sys_max_cmd_len ; then

9837

- { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5

9838

-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }

9839

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5

9840

+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }

9841

else

9842

- { echo "$as_me:$LINENO: result: none" >&5

9843

-echo "${ECHO_T}none" >&6; }

9844

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5

9845

+$as_echo "none" >&6; }

9846

9847

max_cmd_len=$lt_cv_sys_max_cmd_len

9848

9849

@@ -5981,8 +5868,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len

9850

: ${MV="mv -f"}

9851

: ${RM="rm -f"}

9852

9853

-{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5

9854

-echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }

9855

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5

9856

+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }

2724

+ mint*)

2725

+ # On MiNT this can take a long time and run out of memory.

2726

+ lt_cv_sys_max_cmd_len=8192;

2727

+ ;;

2728

2729

amigaos*)

2730

# On AmigaOS with pdksh, this test takes hours, literally.

2731

# So we just punt and use a minimum line length of 8192.

2732

@@ -5819,8 +5790,8 @@ else

2733

# If test is not a shell built-in, we'll probably end up computing a

2734

# maximum length that is only half of the actual maximum length, but

2735

# we can't tell.

2736

- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \

2737

- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&

2738

+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \

2739

+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&

2740

test $i != 17 # 1/2 MB should be enough

2741

2742

i=`expr $i + 1`

2743

@@ -5862,8 +5833,8 @@ $as_echo_n "checking whether the shell u

9857

2744

# Try some XSI features

9858

2745

xsi_shell=no

9859

2746

( _lt_dummy="a/b/c"

9860

@@ -5991,18 +5878,18 @@ xsi_shell=no

2747

- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \

2748

- = c,a/b,, \

2749

+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \

2750

+ = c,a/b,b/c, \

9861

2751

&& eval 'test $(( 1 + 1 )) -eq 2 \

9862

2752

&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \

9863

2753

&& xsi_shell=yes

9864

-{ echo "$as_me:$LINENO: result: $xsi_shell" >&5

9865

-echo "${ECHO_T}$xsi_shell" >&6; }

9866

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5

9867

+$as_echo "$xsi_shell" >&6; }

9868

9869

9870

-{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5

9871

-echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }

9872

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5

9873

+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }

9874

lt_shell_append=no

9875

( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \

9876

>/dev/null 2>&1 \

9877

&& lt_shell_append=yes

9878

-{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5

9879

-echo "${ECHO_T}$lt_shell_append" >&6; }

9880

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5

9881

+$as_echo "$lt_shell_append" >&6; }

9882

9883

9884

if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

9885

@@ -6036,15 +5923,15 @@ esac

9886

9887

9888

9889

-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5

9890

-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }

9891

-if test "${lt_cv_ld_reload_flag+set}" = set; then

9892

- echo $ECHO_N "(cached) $ECHO_C" >&6

9893

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5

9894

+$as_echo_n "checking for $LD option to reload object files... " >&6; }

9895

+if test "${lt_cv_ld_reload_flag+set}" = set; then :

9896

+ $as_echo_n "(cached) " >&6

2754

@@ -5912,9 +5883,83 @@ esac

2755

2756

2757

2758

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5

2759

+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }

2760

+if ${lt_cv_to_host_file_cmd+:} false; then :

2761

+ $as_echo_n "(cached) " >&6

2762

+else

2763

+ case $host in

2764

+ *-*-mingw* )

2765

+ case $build in

2766

+ *-*-mingw* ) # actually msys

2767

+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32

2768

+ ;;

2769

+ *-*-cygwin* )

2770

+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32

2771

+ ;;

2772

+ * ) # otherwise, assume *nix

2773

+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32

2774

+ ;;

2775

+ esac

2776

+ ;;

2777

+ *-*-cygwin* )

2778

+ case $build in

2779

+ *-*-mingw* ) # actually msys

2780

+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin

2781

+ ;;

2782

+ *-*-cygwin* )

2783

+ lt_cv_to_host_file_cmd=func_convert_file_noop

2784

+ ;;

2785

+ * ) # otherwise, assume *nix

2786

+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin

2787

+ ;;

2788

+ esac

2789

+ ;;

2790

+ * ) # unhandled hosts (and "normal" native builds)

2791

+ lt_cv_to_host_file_cmd=func_convert_file_noop

2792

+ ;;

2793

+esac

2794

2795

+fi

2796

2797

+to_host_file_cmd=$lt_cv_to_host_file_cmd

2798

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5

2799

+$as_echo "$lt_cv_to_host_file_cmd" >&6; }

2800

2801

2802

2803

2804

2805

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5

2806

+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }

2807

+if ${lt_cv_to_tool_file_cmd+:} false; then :

2808

+ $as_echo_n "(cached) " >&6

2809

+else

2810

+ #assume ordinary cross tools, or native build.

2811

+lt_cv_to_tool_file_cmd=func_convert_file_noop

2812

+case $host in

2813

+ *-*-mingw* )

2814

+ case $build in

2815

+ *-*-mingw* ) # actually msys

2816

+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32

2817

+ ;;

2818

+ esac

2819

+ ;;

2820

+esac

2821

2822

+fi

2823

2824

+to_tool_file_cmd=$lt_cv_to_tool_file_cmd

2825

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5

2826

+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }

2827

2828

2829

2830

2831

2832

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5

2833

$as_echo_n "checking for $LD option to reload object files... " >&6; }

2834

-if test "${lt_cv_ld_reload_flag+set}" = set; then :

2835

+if ${lt_cv_ld_reload_flag+:} false; then :

2836

$as_echo_n "(cached) " >&6

9897

2837

else

9898

2838

lt_cv_ld_reload_flag='-r'

9899

9900

-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5

9901

-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }

9902

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5

9903

+$as_echo "$lt_cv_ld_reload_flag" >&6; }

9904

reload_flag=$lt_cv_ld_reload_flag

9905

case $reload_flag in

9906

"" | " "*) ;;

9907

@@ -6069,11 +5956,112 @@ esac

9908

9909

9910

9911

+if test -n "$ac_tool_prefix"; then

9912

+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.

9913

+set dummy ${ac_tool_prefix}objdump; ac_word=$2

9914

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9915

+$as_echo_n "checking for $ac_word... " >&6; }

9916

+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :

9917

+ $as_echo_n "(cached) " >&6

9918

+else

9919

+ if test -n "$OBJDUMP"; then

9920

+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.

9921

+else

9922

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

9923

+for as_dir in $PATH

9924

+do

9925

+ IFS=$as_save_IFS

9926

+ test -z "$as_dir" && as_dir=.

9927

+ for ac_exec_ext in '' $ac_executable_extensions; do

9928

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9929

+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"

9930

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9931

+ break 2

9932

+ fi

9933

+done

9934

+ done

9935

+IFS=$as_save_IFS

9936

9937

+fi

9938

+fi

9939

+OBJDUMP=$ac_cv_prog_OBJDUMP

9940

+if test -n "$OBJDUMP"; then

9941

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5

9942

+$as_echo "$OBJDUMP" >&6; }

9943

+else

9944

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9945

+$as_echo "no" >&6; }

9946

+fi

9947

9948

9949

+fi

9950

+if test -z "$ac_cv_prog_OBJDUMP"; then

9951

+ ac_ct_OBJDUMP=$OBJDUMP

9952

+ # Extract the first word of "objdump", so it can be a program name with args.

9953

+set dummy objdump; ac_word=$2

9954

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9955

+$as_echo_n "checking for $ac_word... " >&6; }

9956

+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :

9957

+ $as_echo_n "(cached) " >&6

9958

+else

9959

+ if test -n "$ac_ct_OBJDUMP"; then

9960

+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.

9961

+else

9962

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

9963

+for as_dir in $PATH

9964

+do

9965

+ IFS=$as_save_IFS

9966

+ test -z "$as_dir" && as_dir=.

9967

+ for ac_exec_ext in '' $ac_executable_extensions; do

9968

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9969

+ ac_cv_prog_ac_ct_OBJDUMP="objdump"

9970

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9971

+ break 2

9972

+ fi

9973

+done

9974

+ done

9975

+IFS=$as_save_IFS

9976

9977

+fi

9978

+fi

9979

+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP

9980

+if test -n "$ac_ct_OBJDUMP"; then

9981

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5

9982

+$as_echo "$ac_ct_OBJDUMP" >&6; }

9983

+else

9984

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9985

+$as_echo "no" >&6; }

9986

+fi

9987

9988

+ if test "x$ac_ct_OBJDUMP" = x; then

9989

+ OBJDUMP="false"

9990

+ else

9991

+ case $cross_compiling:$ac_tool_warned in

9992

+yes:)

9993

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

9994

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

9995

+ac_tool_warned=yes ;;

9996

+esac

9997

+ OBJDUMP=$ac_ct_OBJDUMP

9998

+ fi

9999

+else

10000

+ OBJDUMP="$ac_cv_prog_OBJDUMP"

10001

+fi

10002

10003

+test -z "$OBJDUMP" && OBJDUMP=objdump

10004

10005

10006

10007

10008

10009

10010

10011

10012

10013

-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5

10014

-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }

10015

-if test "${lt_cv_deplibs_check_method+set}" = set; then

10016

- echo $ECHO_N "(cached) $ECHO_C" >&6

10017

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5

10018

+$as_echo_n "checking how to recognize dependent libraries... " >&6; }

10019

+if test "${lt_cv_deplibs_check_method+set}" = set; then :

10020

+ $as_echo_n "(cached) " >&6

2839

@@ -5928,6 +5973,11 @@ case $reload_flag in

2840

esac

2841

reload_cmds='$LD$reload_flag -o $output$reload_objs'

2842

case $host_os in

2843

+ cygwin* | mingw* | pw32* | cegcc*)

2844

+ if test "$GCC" != yes; then

2845

+ reload_cmds=false

2846

+ fi

2847

+ ;;

2848

darwin*)

2849

if test "$GCC" = yes; then

2850

reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'

2851

@@ -5950,7 +6000,7 @@ if test -n "$ac_tool_prefix"; then

2852

set dummy ${ac_tool_prefix}objdump; ac_word=$2

2853

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2854

$as_echo_n "checking for $ac_word... " >&6; }

2855

-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :

2856

+if ${ac_cv_prog_OBJDUMP+:} false; then :

2857

$as_echo_n "(cached) " >&6

2858

else

2859

if test -n "$OBJDUMP"; then

2860

@@ -5990,7 +6040,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then

2861

set dummy objdump; ac_word=$2

2862

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2863

$as_echo_n "checking for $ac_word... " >&6; }

2864

-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :

2865

+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :

2866

$as_echo_n "(cached) " >&6

2867

else

2868

if test -n "$ac_ct_OBJDUMP"; then

2869

@@ -6049,7 +6099,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump

2870

2871

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5

2872

$as_echo_n "checking how to recognize dependent libraries... " >&6; }

2873

-if test "${lt_cv_deplibs_check_method+set}" = set; then :

2874

+if ${lt_cv_deplibs_check_method+:} false; then :

2875

$as_echo_n "(cached) " >&6

10021

2876

else

10022

2877

lt_cv_file_magic_cmd='$MAGIC_CMD'

10023

lt_cv_file_magic_test_file=

10024

@@ -6123,6 +6111,12 @@ mingw* | pw32*)

2878

@@ -6091,16 +6141,18 @@ mingw* | pw32*)

2879

# Base MSYS/MinGW do not provide the 'file' command needed by

2880

# func_win32_libid shell function, so use a weaker test based on 'objdump',

2881

# unless we find 'file', for example because we are cross-compiling.

2882

- if ( file / ) >/dev/null 2>&1; then

2883

+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.

2884

+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then

2885

lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'

2886

lt_cv_file_magic_cmd='func_win32_libid'

2887

else

2888

- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'

2889

+ # Keep this pattern in sync with the one in func_win32_libid.

2890

+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

2891

lt_cv_file_magic_cmd='$OBJDUMP -f'

10025

2892

10026

2893

;;

10027

2894

10028

+cegcc)

10029

+ # use the weaker test based on 'objdump'. See mingw*.

10030

+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'

10031

+ lt_cv_file_magic_cmd='$OBJDUMP -f'

2895

-cegcc)

2896

+cegcc*)

2897

# use the weaker test based on 'objdump'. See mingw*.

2898

lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'

2899

lt_cv_file_magic_cmd='$OBJDUMP -f'

2900

@@ -6130,6 +6182,10 @@ gnu*)

2901

lt_cv_deplibs_check_method=pass_all

2902

;;

2903

2904

+haiku*)

2905

+ lt_cv_deplibs_check_method=pass_all

10032

2906

+ ;;

10033

2907

10034

darwin* | rhapsody*)

10035

lt_cv_deplibs_check_method=pass_all

10036

;;

10037

@@ -6181,11 +6175,11 @@ irix5* | irix6* | nonstopux*)

10038

;;

10039

10040

# This must be Linux ELF.

10041

-linux* | k*bsd*-gnu)

10042

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

10043

lt_cv_deplibs_check_method=pass_all

10044

;;

10045

10046

-netbsd*)

10047

+netbsd* | netbsdelf*-gnu)

10048

if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then

10049

lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'

10050

else

10051

@@ -6260,8 +6254,8 @@ tpf*)

10052

esac

10053

2908

hpux10.20* | hpux11*)

2909

lt_cv_file_magic_cmd=/usr/bin/file

2910

case $host_cpu in

2911

@@ -6138,11 +6194,11 @@ hpux10.20* | hpux11*)

2912

lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so

2913

;;

2914

hppa*64*)

2915

- 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]'

2916

+ 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]'

2917

lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl

2918

;;

2919

2920

- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'

2921

+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'

2922

lt_cv_file_magic_test_file=/usr/lib/libc.sl

2923

;;

2924

esac

2925

@@ -6245,6 +6301,21 @@ esac

10054

2926

10055

-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5

10056

-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }

10057

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5

10058

+$as_echo "$lt_cv_deplibs_check_method" >&6; }

2927

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5

2928

$as_echo "$lt_cv_deplibs_check_method" >&6; }

2929

2930

+file_magic_glob=

2931

+want_nocaseglob=no

2932

+if test "$build" = "$host"; then

2933

+ case $host_os in

2934

+ mingw* | pw32*)

2935

+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then

2936

+ want_nocaseglob=yes

2937

+ else

2938

+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/[\1]\/[\1]\/g;/g"`

2939

+ fi

2940

+ ;;

2941

+ esac

2942

+fi

2943

10059

2944

file_magic_cmd=$lt_cv_file_magic_cmd

10060

2945

deplibs_check_method=$lt_cv_deplibs_check_method

10061

2946

test -z "$deplibs_check_method" && deplibs_check_method=unknown

10062

@@ -6280,10 +6274,10 @@ test -z "$deplibs_check_method" && depli

2947

@@ -6260,16 +6331,26 @@ test -z "$deplibs_check_method" && depli

2948

2949

2950

2951

2952

2953

2954

2955

2956

2957

2958

2959

2960

10063

2961

if test -n "$ac_tool_prefix"; then

10064

# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.

10065

set dummy ${ac_tool_prefix}ar; ac_word=$2

10066

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10067

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10068

-if test "${ac_cv_prog_AR+set}" = set; then

10069

- echo $ECHO_N "(cached) $ECHO_C" >&6

10070

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10071

+$as_echo_n "checking for $ac_word... " >&6; }

10072

+if test "${ac_cv_prog_AR+set}" = set; then :

2962

- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.

2963

-set dummy ${ac_tool_prefix}ar; ac_word=$2

2964

+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.

2965

+set dummy ${ac_tool_prefix}dlltool; ac_word=$2

2966

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

2967

$as_echo_n "checking for $ac_word... " >&6; }

2968

-if test "${ac_cv_prog_AR+set}" = set; then :

2969

+if ${ac_cv_prog_DLLTOOL+:} false; then :

2970

$as_echo_n "(cached) " >&6

2971

else

2972

- if test -n "$AR"; then

2973

- ac_cv_prog_AR="$AR" # Let the user override the test.

2974

+ if test -n "$DLLTOOL"; then

2975

+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.

2976

else

2977

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

2978

for as_dir in $PATH

2979

@@ -6278,7 +6359,7 @@ do

2980

test -z "$as_dir" && as_dir=.

2981

for ac_exec_ext in '' $ac_executable_extensions; do

2982

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

2983

- ac_cv_prog_AR="${ac_tool_prefix}ar"

2984

+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"

2985

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

2986

break 2

2987

2988

@@ -6288,10 +6369,10 @@ IFS=$as_save_IFS

2989

2990

2991

2992

-AR=$ac_cv_prog_AR

2993

-if test -n "$AR"; then

2994

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5

2995

-$as_echo "$AR" >&6; }

2996

+DLLTOOL=$ac_cv_prog_DLLTOOL

2997

+if test -n "$DLLTOOL"; then

2998

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5

2999

+$as_echo "$DLLTOOL" >&6; }

3000

else

3001

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3002

$as_echo "no" >&6; }

3003

@@ -6299,17 +6380,17 @@ fi

3004

3005

3006

3007

-if test -z "$ac_cv_prog_AR"; then

3008

- ac_ct_AR=$AR

3009

- # Extract the first word of "ar", so it can be a program name with args.

3010

-set dummy ar; ac_word=$2

3011

+if test -z "$ac_cv_prog_DLLTOOL"; then

3012

+ ac_ct_DLLTOOL=$DLLTOOL

3013

+ # Extract the first word of "dlltool", so it can be a program name with args.

3014

+set dummy dlltool; ac_word=$2

3015

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3016

$as_echo_n "checking for $ac_word... " >&6; }

3017

-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

3018

+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :

3019

$as_echo_n "(cached) " >&6

3020

else

3021

- if test -n "$ac_ct_AR"; then

3022

- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.

3023

+ if test -n "$ac_ct_DLLTOOL"; then

3024

+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.

3025

else

3026

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3027

for as_dir in $PATH

3028

@@ -6318,7 +6399,7 @@ do

3029

test -z "$as_dir" && as_dir=.

3030

for ac_exec_ext in '' $ac_executable_extensions; do

3031

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3032

- ac_cv_prog_ac_ct_AR="ar"

3033

+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"

3034

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3035

break 2

3036

3037

@@ -6328,17 +6409,17 @@ IFS=$as_save_IFS

3038

3039

3040

3041

-ac_ct_AR=$ac_cv_prog_ac_ct_AR

3042

-if test -n "$ac_ct_AR"; then

3043

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5

3044

-$as_echo "$ac_ct_AR" >&6; }

3045

+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL

3046

+if test -n "$ac_ct_DLLTOOL"; then

3047

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5

3048

+$as_echo "$ac_ct_DLLTOOL" >&6; }

3049

else

3050

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3051

$as_echo "no" >&6; }

3052

3053

3054

- if test "x$ac_ct_AR" = x; then

3055

- AR="false"

3056

+ if test "x$ac_ct_DLLTOOL" = x; then

3057

+ DLLTOOL="false"

3058

else

3059

case $cross_compiling:$ac_tool_warned in

3060

yes:)

3061

@@ -6346,14 +6427,16 @@ yes:)

3062

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

3063

ac_tool_warned=yes ;;

3064

esac

3065

- AR=$ac_ct_AR

3066

+ DLLTOOL=$ac_ct_DLLTOOL

3067

3068

else

3069

- AR="$ac_cv_prog_AR"

3070

+ DLLTOOL="$ac_cv_prog_DLLTOOL"

3071

3072

3073

-test -z "$AR" && AR=ar

3074

-test -z "$AR_FLAGS" && AR_FLAGS=cru

3075

+test -z "$DLLTOOL" && DLLTOOL=dlltool

3076

3077

3078

3079

3080

3081

3082

@@ -6361,20 +6444,56 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru

3083

3084

3085

3086

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5

3087

+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }

3088

+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :

10073

3089

+ $as_echo_n "(cached) " >&6

10074

else

10075

if test -n "$AR"; then

10076

ac_cv_prog_AR="$AR" # Let the user override the test.

10077

@@ -6293,25 +6287,25 @@ for as_dir in $PATH

10078

10079

IFS=$as_save_IFS

3090

+else

3091

+ lt_cv_sharedlib_from_linklib_cmd='unknown'

3092

3093

+case $host_os in

3094

+cygwin* | mingw* | pw32* | cegcc*)

3095

+ # two different shell functions defined in ltmain.sh

3096

+ # decide which to use based on capabilities of $DLLTOOL

3097

+ case `$DLLTOOL --help 2>&1` in

3098

+ *--identify-strict*)

3099

+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib

3100

+ ;;

3101

+ *)

3102

+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback

3103

+ ;;

3104

+ esac

3105

+ ;;

3106

+*)

3107

+ # fallback: assume linklib IS sharedlib

3108

+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"

3109

+ ;;

3110

+esac

3111

3112

+fi

3113

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5

3114

+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }

3115

+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd

3116

+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO

3117

3118

3119

3120

3121

3122

3123

3124

if test -n "$ac_tool_prefix"; then

3125

- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

3126

-set dummy ${ac_tool_prefix}strip; ac_word=$2

3127

+ for ac_prog in ar

3128

+ do

3129

+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

3130

+set dummy $ac_tool_prefix$ac_prog; ac_word=$2

3131

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3132

$as_echo_n "checking for $ac_word... " >&6; }

3133

-if test "${ac_cv_prog_STRIP+set}" = set; then :

3134

+if ${ac_cv_prog_AR+:} false; then :

3135

$as_echo_n "(cached) " >&6

3136

else

3137

- if test -n "$STRIP"; then

3138

- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

3139

+ if test -n "$AR"; then

3140

+ ac_cv_prog_AR="$AR" # Let the user override the test.

3141

else

3142

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3143

for as_dir in $PATH

3144

@@ -6383,7 +6502,7 @@ do

10080

3145

test -z "$as_dir" && as_dir=.

10081

- for ac_exec_ext in '' $ac_executable_extensions; do

10082

+ for ac_exec_ext in '' $ac_executable_extensions; do

3146

for ac_exec_ext in '' $ac_executable_extensions; do

10083

3147

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10084

ac_cv_prog_AR="${ac_tool_prefix}ar"

10085

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10086

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3148

- ac_cv_prog_STRIP="${ac_tool_prefix}strip"

3149

+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"

3150

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10087

3151

break 2

10088

3152

10089

done

10090

-done

10091

+ done

10092

IFS=$as_save_IFS

3153

@@ -6393,29 +6512,198 @@ IFS=$as_save_IFS

10093

3154

10094

3155

10095

3156

10096

AR=$ac_cv_prog_AR

10097

if test -n "$AR"; then

10098

- { echo "$as_me:$LINENO: result: $AR" >&5

10099

-echo "${ECHO_T}$AR" >&6; }

3157

-STRIP=$ac_cv_prog_STRIP

3158

-if test -n "$STRIP"; then

3159

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5

3160

-$as_echo "$STRIP" >&6; }

3161

+AR=$ac_cv_prog_AR

3162

+if test -n "$AR"; then

10100

3163

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5

10101

3164

+$as_echo "$AR" >&6; }

10102

3165

else

10103

- { echo "$as_me:$LINENO: result: no" >&5

10104

-echo "${ECHO_T}no" >&6; }

10105

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10106

+$as_echo "no" >&6; }

10107

10108

10109

10110

@@ -6320,10 +6314,10 @@ if test -z "$ac_cv_prog_AR"; then

10111

ac_ct_AR=$AR

10112

# Extract the first word of "ar", so it can be a program name with args.

10113

set dummy ar; ac_word=$2

10114

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10115

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10116

-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then

10117

- echo $ECHO_N "(cached) $ECHO_C" >&6

10118

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10119

+$as_echo_n "checking for $ac_word... " >&6; }

10120

+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

10121

+ $as_echo_n "(cached) " >&6

3166

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3167

$as_echo "no" >&6; }

3168

3169

3170

3171

+ test -n "$AR" && break

3172

+ done

3173

3174

-if test -z "$ac_cv_prog_STRIP"; then

3175

- ac_ct_STRIP=$STRIP

3176

- # Extract the first word of "strip", so it can be a program name with args.

3177

-set dummy strip; ac_word=$2

3178

+if test -z "$AR"; then

3179

+ ac_ct_AR=$AR

3180

+ for ac_prog in ar

3181

+do

3182

+ # Extract the first word of "$ac_prog", so it can be a program name with args.

3183

+set dummy $ac_prog; ac_word=$2

3184

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3185

$as_echo_n "checking for $ac_word... " >&6; }

3186

-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :

3187

+if ${ac_cv_prog_ac_ct_AR+:} false; then :

3188

$as_echo_n "(cached) " >&6

10122

3189

else

10123

if test -n "$ac_ct_AR"; then

10124

ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.

10125

@@ -6333,25 +6327,25 @@ for as_dir in $PATH

10126

10127

IFS=$as_save_IFS

10128

test -z "$as_dir" && as_dir=.

10129

- for ac_exec_ext in '' $ac_executable_extensions; do

3190

- if test -n "$ac_ct_STRIP"; then

3191

- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

3192

-else

3193

+ if test -n "$ac_ct_AR"; then

3194

+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.

3195

+else

3196

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3197

+for as_dir in $PATH

3198

+do

3199

+ IFS=$as_save_IFS

3200

+ test -z "$as_dir" && as_dir=.

10130

3201

+ for ac_exec_ext in '' $ac_executable_extensions; do

10131

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10132

ac_cv_prog_ac_ct_AR="ar"

10133

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

3202

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3203

+ ac_cv_prog_ac_ct_AR="$ac_prog"

10134

3204

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10135

break 2

10136

10137

done

10138

-done

3205

+ break 2

3206

+ fi

3207

+done

10139

3208

+ done

10140

IFS=$as_save_IFS

10141

10142

10143

10144

ac_ct_AR=$ac_cv_prog_ac_ct_AR

10145

if test -n "$ac_ct_AR"; then

10146

- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5

10147

-echo "${ECHO_T}$ac_ct_AR" >&6; }

3209

+IFS=$as_save_IFS

3210

3211

+fi

3212

+fi

3213

+ac_ct_AR=$ac_cv_prog_ac_ct_AR

3214

+if test -n "$ac_ct_AR"; then

10148

3215

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5

10149

3216

+$as_echo "$ac_ct_AR" >&6; }

10150

else

10151

- { echo "$as_me:$LINENO: result: no" >&5

10152

-echo "${ECHO_T}no" >&6; }

3217

+else

10153

3218

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10154

3219

+$as_echo "no" >&6; }

10155

10156

10157

if test "x$ac_ct_AR" = x; then

10158

@@ -6359,12 +6353,8 @@ fi

10159

else

10160

case $cross_compiling:$ac_tool_warned in

10161

yes:)

10162

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

10163

-whose name does not start with the host triplet. If you think this

10164

-configuration is useful to you, please write to autoconf@gnu.org." >&5

10165

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

10166

-whose name does not start with the host triplet. If you think this

10167

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

3220

+fi

3221

3222

3223

+ test -n "$ac_ct_AR" && break

3224

+done

3225

3226

+ if test "x$ac_ct_AR" = x; then

3227

+ AR="false"

3228

+ else

3229

+ case $cross_compiling:$ac_tool_warned in

3230

+yes:)

10168

3231

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

10169

3232

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

10170

ac_tool_warned=yes ;;

10171

esac

10172

AR=$ac_ct_AR

10173

@@ -6389,10 +6379,10 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru

10174

if test -n "$ac_tool_prefix"; then

10175

# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

10176

set dummy ${ac_tool_prefix}strip; ac_word=$2

10177

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10178

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10179

-if test "${ac_cv_prog_STRIP+set}" = set; then

10180

- echo $ECHO_N "(cached) $ECHO_C" >&6

3233

+ac_tool_warned=yes ;;

3234

+esac

3235

+ AR=$ac_ct_AR

3236

+ fi

3237

+fi

3238

3239

+: ${AR=ar}

3240

+: ${AR_FLAGS=cru}

3241

3242

3243

3244

3245

3246

3247

3248

3249

3250

3251

3252

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5

3253

+$as_echo_n "checking for archiver @FILE support... " >&6; }

3254

+if ${lt_cv_ar_at_file+:} false; then :

3255

+ $as_echo_n "(cached) " >&6

3256

+else

3257

+ lt_cv_ar_at_file=no

3258

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

3259

+/* end confdefs.h. */

3260

3261

+int

3262

+main ()

3263

3264

3265

+ ;

3266

+ return 0;

3267

3268

+_ACEOF

3269

+if ac_fn_cxx_try_compile "$LINENO"; then :

3270

+ echo conftest.$ac_objext > conftest.lst

3271

+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'

3272

+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5

3273

+ (eval $lt_ar_try) 2>&5

3274

+ ac_status=$?

3275

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

3276

+ test $ac_status = 0; }

3277

+ if test "$ac_status" -eq 0; then

3278

+ # Ensure the archiver fails upon bogus file names.

3279

+ rm -f conftest.$ac_objext libconftest.a

3280

+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5

3281

+ (eval $lt_ar_try) 2>&5

3282

+ ac_status=$?

3283

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

3284

+ test $ac_status = 0; }

3285

+ if test "$ac_status" -ne 0; then

3286

+ lt_cv_ar_at_file=@

3287

+ fi

3288

+ fi

3289

+ rm -f conftest.* libconftest.a

3290

3291

+fi

3292

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3293

3294

+fi

3295

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5

3296

+$as_echo "$lt_cv_ar_at_file" >&6; }

3297

3298

+if test "x$lt_cv_ar_at_file" = xno; then

3299

+ archiver_list_spec=

3300

+else

3301

+ archiver_list_spec=$lt_cv_ar_at_file

3302

+fi

3303

3304

3305

3306

3307

3308

3309

3310

+if test -n "$ac_tool_prefix"; then

3311

+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

3312

+set dummy ${ac_tool_prefix}strip; ac_word=$2

10181

3313

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10182

3314

+$as_echo_n "checking for $ac_word... " >&6; }

10183

+if test "${ac_cv_prog_STRIP+set}" = set; then :

3315

+if ${ac_cv_prog_STRIP+:} false; then :

10184

3316

+ $as_echo_n "(cached) " >&6

10185

else

10186

if test -n "$STRIP"; then

10187

ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

10188

@@ -6402,25 +6392,25 @@ for as_dir in $PATH

10189

10190

IFS=$as_save_IFS

10191

test -z "$as_dir" && as_dir=.

10192

- for ac_exec_ext in '' $ac_executable_extensions; do

3317

+else

3318

+ if test -n "$STRIP"; then

3319

+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

3320

+else

3321

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3322

+for as_dir in $PATH

3323

+do

3324

+ IFS=$as_save_IFS

3325

+ test -z "$as_dir" && as_dir=.

10193

3326

+ for ac_exec_ext in '' $ac_executable_extensions; do

10194

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10195

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

10196

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

3327

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3328

+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"

10197

3329

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10198

break 2

10199

10200

done

10201

-done

3330

+ break 2

3331

+ fi

3332

+done

10202

3333

+ done

10203

IFS=$as_save_IFS

10204

10205

10206

10207

STRIP=$ac_cv_prog_STRIP

10208

if test -n "$STRIP"; then

10209

- { echo "$as_me:$LINENO: result: $STRIP" >&5

10210

-echo "${ECHO_T}$STRIP" >&6; }

3334

+IFS=$as_save_IFS

3335

3336

+fi

3337

+fi

3338

+STRIP=$ac_cv_prog_STRIP

3339

+if test -n "$STRIP"; then

10211

3340

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5

10212

3341

+$as_echo "$STRIP" >&6; }

10213

else

10214

- { echo "$as_me:$LINENO: result: no" >&5

10215

-echo "${ECHO_T}no" >&6; }

3342

+else

10216

3343

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10217

3344

+$as_echo "no" >&6; }

10218

10219

10220

10221

@@ -6429,10 +6419,10 @@ if test -z "$ac_cv_prog_STRIP"; then

10222

ac_ct_STRIP=$STRIP

10223

# Extract the first word of "strip", so it can be a program name with args.

10224

set dummy strip; ac_word=$2

10225

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10226

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10227

-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then

10228

- echo $ECHO_N "(cached) $ECHO_C" >&6

3345

+fi

3346

3347

3348

+fi

3349

+if test -z "$ac_cv_prog_STRIP"; then

3350

+ ac_ct_STRIP=$STRIP

3351

+ # Extract the first word of "strip", so it can be a program name with args.

3352

+set dummy strip; ac_word=$2

10229

3353

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10230

3354

+$as_echo_n "checking for $ac_word... " >&6; }

10231

+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :

3355

+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :

10232

3356

+ $as_echo_n "(cached) " >&6

10233

else

10234

if test -n "$ac_ct_STRIP"; then

10235

ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

10236

@@ -6442,25 +6432,25 @@ for as_dir in $PATH

3357

+else

3358

+ if test -n "$ac_ct_STRIP"; then

3359

+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

3360

+else

3361

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3362

for as_dir in $PATH

10237

3363

10238

IFS=$as_save_IFS

10239

test -z "$as_dir" && as_dir=.

10240

- for ac_exec_ext in '' $ac_executable_extensions; do

10241

+ for ac_exec_ext in '' $ac_executable_extensions; do

10242

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10243

ac_cv_prog_ac_ct_STRIP="strip"

10244

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10245

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10246

break 2

10247

10248

done

10249

-done

10250

+ done

10251

IFS=$as_save_IFS

10252

10253

10254

10255

ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

10256

if test -n "$ac_ct_STRIP"; then

10257

- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

10258

-echo "${ECHO_T}$ac_ct_STRIP" >&6; }

10259

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5

10260

+$as_echo "$ac_ct_STRIP" >&6; }

10261

else

10262

- { echo "$as_me:$LINENO: result: no" >&5

10263

-echo "${ECHO_T}no" >&6; }

10264

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10265

+$as_echo "no" >&6; }

10266

10267

10268

if test "x$ac_ct_STRIP" = x; then

10269

@@ -6468,12 +6458,8 @@ fi

10270

else

10271

case $cross_compiling:$ac_tool_warned in

10272

yes:)

10273

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

10274

-whose name does not start with the host triplet. If you think this

10275

-configuration is useful to you, please write to autoconf@gnu.org." >&5

10276

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

10277

-whose name does not start with the host triplet. If you think this

10278

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

10279

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

10280

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

10281

ac_tool_warned=yes ;;

10282

esac

10283

STRIP=$ac_ct_STRIP

10284

@@ -6492,10 +6478,10 @@ test -z "$STRIP" && STRIP=:

10285

if test -n "$ac_tool_prefix"; then

10286

# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.

3364

@@ -6469,7 +6757,7 @@ if test -n "$ac_tool_prefix"; then

10287

3365

set dummy ${ac_tool_prefix}ranlib; ac_word=$2

10288

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10289

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10290

-if test "${ac_cv_prog_RANLIB+set}" = set; then

10291

- echo $ECHO_N "(cached) $ECHO_C" >&6

10292

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10293

+$as_echo_n "checking for $ac_word... " >&6; }

10294

+if test "${ac_cv_prog_RANLIB+set}" = set; then :

10295

+ $as_echo_n "(cached) " >&6

3366

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3367

$as_echo_n "checking for $ac_word... " >&6; }

3368

-if test "${ac_cv_prog_RANLIB+set}" = set; then :

3369

+if ${ac_cv_prog_RANLIB+:} false; then :

3370

$as_echo_n "(cached) " >&6

10296

3371

else

10297

3372

if test -n "$RANLIB"; then

10298

ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.

10299

@@ -6505,25 +6491,25 @@ for as_dir in $PATH

10300

10301

IFS=$as_save_IFS

10302

test -z "$as_dir" && as_dir=.

10303

- for ac_exec_ext in '' $ac_executable_extensions; do

10304

+ for ac_exec_ext in '' $ac_executable_extensions; do

10305

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10306

ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

10307

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10308

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10309

break 2

10310

10311

done

10312

-done

10313

+ done

10314

IFS=$as_save_IFS

10315

10316

10317

10318

RANLIB=$ac_cv_prog_RANLIB

10319

if test -n "$RANLIB"; then

10320

- { echo "$as_me:$LINENO: result: $RANLIB" >&5

10321

-echo "${ECHO_T}$RANLIB" >&6; }

10322

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5

10323

+$as_echo "$RANLIB" >&6; }

10324

else

10325

- { echo "$as_me:$LINENO: result: no" >&5

10326

-echo "${ECHO_T}no" >&6; }

10327

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10328

+$as_echo "no" >&6; }

10329

10330

10331

10332

@@ -6532,10 +6518,10 @@ if test -z "$ac_cv_prog_RANLIB"; then

10333

ac_ct_RANLIB=$RANLIB

10334

# Extract the first word of "ranlib", so it can be a program name with args.

3373

@@ -6509,7 +6797,7 @@ if test -z "$ac_cv_prog_RANLIB"; then

10335

3374

set dummy ranlib; ac_word=$2

10336

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10337

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10338

-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then

10339

- echo $ECHO_N "(cached) $ECHO_C" >&6

10340

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10341

+$as_echo_n "checking for $ac_word... " >&6; }

10342

+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :

10343

+ $as_echo_n "(cached) " >&6

3375

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3376

$as_echo_n "checking for $ac_word... " >&6; }

3377

-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :

3378

+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :

3379

$as_echo_n "(cached) " >&6

10344

3380

else

10345

3381

if test -n "$ac_ct_RANLIB"; then

10346

ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.

10347

@@ -6545,25 +6531,25 @@ for as_dir in $PATH

10348

10349

IFS=$as_save_IFS

10350

test -z "$as_dir" && as_dir=.

10351

- for ac_exec_ext in '' $ac_executable_extensions; do

10352

+ for ac_exec_ext in '' $ac_executable_extensions; do

10353

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10354

ac_cv_prog_ac_ct_RANLIB="ranlib"

10355

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10356

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10357

break 2

10358

10359

done

10360

-done

10361

+ done

10362

IFS=$as_save_IFS

10363

10364

10365

10366

ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB

10367

if test -n "$ac_ct_RANLIB"; then

10368

- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5

10369

-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }

10370

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5

10371

+$as_echo "$ac_ct_RANLIB" >&6; }

10372

else

10373

- { echo "$as_me:$LINENO: result: no" >&5

10374

-echo "${ECHO_T}no" >&6; }

10375

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10376

+$as_echo "no" >&6; }

10377

10378

10379

if test "x$ac_ct_RANLIB" = x; then

10380

@@ -6571,12 +6557,8 @@ fi

10381

else

10382

case $cross_compiling:$ac_tool_warned in

10383

yes:)

10384

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

10385

-whose name does not start with the host triplet. If you think this

10386

-configuration is useful to you, please write to autoconf@gnu.org." >&5

10387

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

10388

-whose name does not start with the host triplet. If you think this

10389

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

10390

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

10391

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

10392

ac_tool_warned=yes ;;

10393

esac

10394

RANLIB=$ac_ct_RANLIB

10395

@@ -6653,10 +6635,10 @@ compiler=$CC

10396

10397

3382

@@ -6580,6 +6868,18 @@ if test -n "$RANLIB"; then

3383

old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"

3384

3385

3386

+case $host_os in

3387

+ darwin*)

3388

+ lock_old_archive_extraction=yes ;;

3389

+ *)

3390

+ lock_old_archive_extraction=no ;;

3391

+esac

3392

3393

3394

3395

3396

3397

3398

3399

3400

3401

@@ -6626,7 +6926,7 @@ compiler=$CC

10398

3402

# Check for command to grab the raw symbol name followed by C symbol from nm.

10399

-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

10400

-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }

10401

-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then

10402

- echo $ECHO_N "(cached) $ECHO_C" >&6

10403

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5

10404

+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }

10405

+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :

10406

+ $as_echo_n "(cached) " >&6

3403

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5

3404

$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }

3405

-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :

3406

+if ${lt_cv_sys_global_symbol_pipe+:} false; then :

3407

$as_echo_n "(cached) " >&6

10407

3408

else

10408

3409

10409

# These are sane defaults that work on at least a few old systems.

10410

@@ -6673,7 +6655,7 @@ case $host_os in

10411

aix*)

10412

symcode='[BCDT]'

10413

;;

10414

-cygwin* | mingw* | pw32*)

10415

+cygwin* | mingw* | pw32* | cegcc*)

10416

symcode='[ABCDGISTW]'

10417

;;

10418

hpux*)

10419

@@ -6771,18 +6753,18 @@ void nm_test_func(void){}

10420

int main(){nm_test_var='a';nm_test_func();return(0);}

10421

_LT_EOF

10422

10423

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

10424

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

10425

(eval $ac_compile) 2>&5

10426

ac_status=$?

10427

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10428

- (exit $ac_status); }; then

10429

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

10430

+ test $ac_status = 0; }; then

3410

@@ -6687,8 +6987,8 @@ esac

3411

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

3412

3413

# Transform an extracted symbol line into symbol name and symbol address

3414

-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (void *) \&\2},/p'"

3415

-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'"

3416

+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (void *) \&\2},/p'"

3417

+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'"

3418

3419

# Handle CRLF in mingw tool chain

3420

opt_cr=

3421

@@ -6724,6 +7024,7 @@ for ac_symprfx in "" "_"; do

3422

else

3423

lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]$$symcode$symcode*$[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"

3424

3425

+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

3426

3427

# Check to see that the pipe works correctly.

3428

pipe_works=no

3429

@@ -6749,8 +7050,8 @@ _LT_EOF

3430

test $ac_status = 0; }; then

10431

3431

# Now try to grab the symbols.

10432

3432

nlist=conftest.nm

10433

- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5

10434

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5

10435

(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5

3433

- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5

3434

- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5

3435

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5

3436

+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5

10436

3437

ac_status=$?

10437

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10438

- (exit $ac_status); } && test -s "$nlist"; then

10439

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

10440

+ test $ac_status = 0; } && test -s "$nlist"; then

10441

# Try sorting and uniquifying the output.

10442

if sort "$nlist" | uniq > "$nlist"T; then

10443

mv -f "$nlist"T "$nlist"

10444

@@ -6835,11 +6817,11 @@ _LT_EOF

10445

lt_save_CFLAGS="$CFLAGS"

3438

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

3439

test $ac_status = 0; } && test -s "$nlist"; then

3440

@@ -6765,6 +7066,18 @@ _LT_EOF

3441

if $GREP ' nm_test_var$' "$nlist" >/dev/null; then

3442

if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

3443

cat <<_LT_EOF > conftest.$ac_ext

3444

+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */

3445

+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)

3446

+/* DATA imports from DLLs on WIN32 con't be const, because runtime

3447

+ relocations are performed -- see ld's documentation on pseudo-relocs. */

3448

+# define LT_DLSYM_CONST

3449

+#elif defined(__osf__)

3450

+/* This system does not cope well with relocations in const data. */

3451

+# define LT_DLSYM_CONST

3452

+#else

3453

+# define LT_DLSYM_CONST const

3454

+#endif

3455

3456

#ifdef __cplusplus

3457

extern "C" {

3458

#endif

3459

@@ -6776,7 +7089,7 @@ _LT_EOF

3460

cat <<_LT_EOF >> conftest.$ac_ext

3461

3462

/* The mapping between symbol names and symbols. */

3463

-const struct {

3464

+LT_DLSYM_CONST struct {

3465

const char *name;

3466

void *address;

3467

}

3468

@@ -6802,8 +7115,8 @@ static const void *lt_preloaded_setup()

3469

_LT_EOF

3470

# Now try linking the two files.

3471

mv conftest.$ac_objext conftstm.$ac_objext

3472

- lt_save_LIBS="$LIBS"

3473

- lt_save_CFLAGS="$CFLAGS"

3474

+ lt_globsym_save_LIBS=$LIBS

3475

+ lt_globsym_save_CFLAGS=$CFLAGS

10446

3476

LIBS="conftstm.$ac_objext"

10447

3477

CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"

10448

- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

10449

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5

10450

(eval $ac_link) 2>&5

10451

ac_status=$?

10452

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10453

- (exit $ac_status); } && test -s conftest${ac_exeext}; then

10454

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

10455

+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then

3478

if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5

3479

@@ -6813,8 +7126,8 @@ _LT_EOF

3480

test $ac_status = 0; } && test -s conftest${ac_exeext}; then

10456

3481

pipe_works=yes

10457

3482

10458

LIBS="$lt_save_LIBS"

10459

@@ -6873,11 +6855,11 @@ if test -z "$lt_cv_sys_global_symbol_pip

10460

lt_cv_sys_global_symbol_to_cdecl=

10461

10462

if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then

10463

- { echo "$as_me:$LINENO: result: failed" >&5

10464

-echo "${ECHO_T}failed" >&6; }

10465

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5

10466

+$as_echo "failed" >&6; }

10467

else

10468

- { echo "$as_me:$LINENO: result: ok" >&5

10469

-echo "${ECHO_T}ok" >&6; }

10470

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5

10471

+$as_echo "ok" >&6; }

10472

10473

10474

10475

@@ -6903,7 +6885,7 @@ fi

10476

10477

3483

- LIBS="$lt_save_LIBS"

3484

- CFLAGS="$lt_save_CFLAGS"

3485

+ LIBS=$lt_globsym_save_LIBS

3486

+ CFLAGS=$lt_globsym_save_CFLAGS

3487

else

3488

echo "cannot find nm_test_func in $nlist" >&5

3489

3490

@@ -6851,6 +7164,17 @@ else

3491

$as_echo "ok" >&6; }

3492

3493

3494

+# Response file support.

3495

+if test "$lt_cv_nm_interface" = "MS dumpbin"; then

3496

+ nm_file_list_spec='@'

3497

+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then

3498

+ nm_file_list_spec='@'

3499

+fi

3500

3501

3502

3503

3504

3505

3506

3507

3508

@@ -6873,6 +7197,44 @@ fi

3509

3510

3511

3512

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5

3513

+$as_echo_n "checking for sysroot... " >&6; }

3514

3515

+# Check whether --with-sysroot was given.

3516

+if test "${with_sysroot+set}" = set; then :

3517

+ withval=$with_sysroot;

3518

+else

3519

+ with_sysroot=no

3520

+fi

3521

3522

3523

+lt_sysroot=

3524

+case ${with_sysroot} in #(

3525

+ yes)

3526

+ if test "$GCC" = yes; then

3527

+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`

3528

+ fi

3529

+ ;; #(

3530

+ /*)

3531

+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`

3532

+ ;; #(

3533

+ no|'')

3534

+ ;; #(

3535

+ *)

3536

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5

3537

+$as_echo "${with_sysroot}" >&6; }

3538

+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5

3539

+ ;;

3540

+esac

3541

3542

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5

3543

+$as_echo "${lt_sysroot:-no}" >&6; }

3544

3545

3546

3547

3548

3549

10478

3550

# Check whether --enable-libtool-lock was given.

10479

-if test "${enable_libtool_lock+set}" = set; then

10480

+if test "${enable_libtool_lock+set}" = set; then :

3551

if test "${enable_libtool_lock+set}" = set; then :

10481

3552

enableval=$enable_libtool_lock;

10482

10483

10484

@@ -6915,11 +6897,11 @@ case $host in

10485

ia64-*-hpux*)

10486

# Find out which ABI we are using.

10487

echo 'int i;' > conftest.$ac_ext

10488

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

10489

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

10490

(eval $ac_compile) 2>&5

10491

ac_status=$?

10492

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10493

- (exit $ac_status); }; then

10494

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

10495

+ test $ac_status = 0; }; then

10496

case `/usr/bin/file conftest.$ac_objext` in

10497

*ELF-32*)

10498

HPUX_IA64_MODE="32"

10499

@@ -6933,12 +6915,12 @@ ia64-*-hpux*)

3553

@@ -6904,7 +7266,7 @@ ia64-*-hpux*)

10500

3554

;;

10501

3555

*-*-irix6*)

10502

3556

# Find out which ABI we are using.

10503

- echo '#line 6936 "configure"' > conftest.$ac_ext

10504

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

10505

+ echo '#line 6918 "configure"' > conftest.$ac_ext

10506

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

10507

(eval $ac_compile) 2>&5

10508

ac_status=$?

10509

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10510

- (exit $ac_status); }; then

10511

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

10512

+ test $ac_status = 0; }; then

10513

if test "$lt_cv_prog_gnu_ld" = yes; then

10514

case `/usr/bin/file conftest.$ac_objext` in

10515

*32-bit*)

10516

@@ -6972,11 +6954,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc

10517

s390*-*linux*|s390*-*tpf*|sparc*-*linux*)

10518

# Find out which ABI we are using.

10519

echo 'int i;' > conftest.$ac_ext

10520

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

10521

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

10522

(eval $ac_compile) 2>&5

10523

ac_status=$?

10524

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10525

- (exit $ac_status); }; then

10526

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

10527

+ test $ac_status = 0; }; then

10528

case `/usr/bin/file conftest.o` in

10529

*32-bit*)

10530

case $host in

10531

@@ -7025,10 +7007,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*

10532

# On SCO OpenServer 5, we need -belf to get full-featured binaries.

10533

SAVE_CFLAGS="$CFLAGS"

3557

- echo '#line 6907 "configure"' > conftest.$ac_ext

3558

+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext

3559

if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

3560

(eval $ac_compile) 2>&5

3561

ac_status=$?

3562

@@ -6998,7 +7360,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*

10534

3563

CFLAGS="$CFLAGS -belf"

10535

- { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5

10536

-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }

10537

-if test "${lt_cv_cc_needs_belf+set}" = set; then

10538

- echo $ECHO_N "(cached) $ECHO_C" >&6

10539

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5

10540

+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }

10541

+if test "${lt_cv_cc_needs_belf+set}" = set; then :

10542

+ $as_echo_n "(cached) " >&6

3564

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5

3565

$as_echo_n "checking whether the C compiler needs -belf... " >&6; }

3566

-if test "${lt_cv_cc_needs_belf+set}" = set; then :

3567

+if ${lt_cv_cc_needs_belf+:} false; then :

3568

$as_echo_n "(cached) " >&6

10543

3569

else

10544

3570

ac_ext=c

10545

ac_cpp='$CPP $CPPFLAGS'

10546

@@ -7036,11 +7018,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con

10547

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

10548

ac_compiler_gnu=$ac_cv_c_compiler_gnu

10549

10550

- cat >conftest.$ac_ext <<_ACEOF

10551

-/* confdefs.h. */

10552

-_ACEOF

10553

-cat confdefs.h >>conftest.$ac_ext

10554

-cat >>conftest.$ac_ext <<_ACEOF

10555

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

10556

/* end confdefs.h. */

10557

10558

int

10559

@@ -7051,34 +7029,13 @@ main ()

10560

return 0;

10561

}

10562

_ACEOF

10563

-rm -f conftest.$ac_objext conftest$ac_exeext

10564

-if { (ac_try="$ac_link"

10565

-case "(($ac_try" in

10566

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10567

- *) ac_try_echo=$ac_try;;

10568

-esac

10569

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10570

- (eval "$ac_link") 2>conftest.er1

10571

- ac_status=$?

10572

- grep -v '^ *+' conftest.er1 >conftest.err

10573

- rm -f conftest.er1

10574

- cat conftest.err >&5

10575

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10576

- (exit $ac_status); } && {

10577

- test -z "$ac_c_werror_flag" ||

10578

- test ! -s conftest.err

10579

- } && test -s conftest$ac_exeext &&

10580

- $as_test_x conftest$ac_exeext; then

10581

+if ac_fn_c_try_link "$LINENO"; then :

10582

lt_cv_cc_needs_belf=yes

10583

else

10584

- echo "$as_me: failed program was:" >&5

10585

-sed 's/^/| /' conftest.$ac_ext >&5

10586

10587

- lt_cv_cc_needs_belf=no

10588

+ lt_cv_cc_needs_belf=no

10589

10590

10591

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10592

- conftest$ac_exeext conftest.$ac_ext

10593

+rm -f core conftest.err conftest.$ac_objext \

10594

+ conftest$ac_exeext conftest.$ac_ext

10595

ac_ext=c

10596

ac_cpp='$CPP $CPPFLAGS'

10597

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

10598

@@ -7086,8 +7043,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA

10599

ac_compiler_gnu=$ac_cv_c_compiler_gnu

10600

10601

10602

-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5

10603

-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }

10604

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5

10605

+$as_echo "$lt_cv_cc_needs_belf" >&6; }

10606

if test x"$lt_cv_cc_needs_belf" != x"yes"; then

10607

# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf

10608

CFLAGS="$SAVE_CFLAGS"

10609

@@ -7096,11 +7053,11 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6

10610

sparc*-*solaris*)

10611

# Find out which ABI we are using.

10612

echo 'int i;' > conftest.$ac_ext

10613

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

10614

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

10615

(eval $ac_compile) 2>&5

10616

ac_status=$?

10617

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10618

- (exit $ac_status); }; then

10619

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

10620

+ test $ac_status = 0; }; then

10621

case `/usr/bin/file conftest.o` in

10622

*64-bit*)

10623

case $lt_cv_prog_gnu_ld in

10624

@@ -7126,10 +7083,10 @@ need_locks="$enable_libtool_lock"

10625

if test -n "$ac_tool_prefix"; then

10626

# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.

3571

@@ -7066,6 +7428,123 @@ esac

3572

3573

need_locks="$enable_libtool_lock"

3574

3575

+if test -n "$ac_tool_prefix"; then

3576

+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.

3577

+set dummy ${ac_tool_prefix}mt; ac_word=$2

3578

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3579

+$as_echo_n "checking for $ac_word... " >&6; }

3580

+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :

3581

+ $as_echo_n "(cached) " >&6

3582

+else

3583

+ if test -n "$MANIFEST_TOOL"; then

3584

+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.

3585

+else

3586

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3587

+for as_dir in $PATH

3588

+do

3589

+ IFS=$as_save_IFS

3590

+ test -z "$as_dir" && as_dir=.

3591

+ for ac_exec_ext in '' $ac_executable_extensions; do

3592

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3593

+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"

3594

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3595

+ break 2

3596

+ fi

3597

+done

3598

+ done

3599

+IFS=$as_save_IFS

3600

3601

+fi

3602

+fi

3603

+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL

3604

+if test -n "$MANIFEST_TOOL"; then

3605

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5

3606

+$as_echo "$MANIFEST_TOOL" >&6; }

3607

+else

3608

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3609

+$as_echo "no" >&6; }

3610

+fi

3611

3612

3613

+fi

3614

+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then

3615

+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL

3616

+ # Extract the first word of "mt", so it can be a program name with args.

3617

+set dummy mt; ac_word=$2

3618

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3619

+$as_echo_n "checking for $ac_word... " >&6; }

3620

+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :

3621

+ $as_echo_n "(cached) " >&6

3622

+else

3623

+ if test -n "$ac_ct_MANIFEST_TOOL"; then

3624

+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.

3625

+else

3626

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3627

+for as_dir in $PATH

3628

+do

3629

+ IFS=$as_save_IFS

3630

+ test -z "$as_dir" && as_dir=.

3631

+ for ac_exec_ext in '' $ac_executable_extensions; do

3632

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3633

+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"

3634

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3635

+ break 2

3636

+ fi

3637

+done

3638

+ done

3639

+IFS=$as_save_IFS

3640

3641

+fi

3642

+fi

3643

+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL

3644

+if test -n "$ac_ct_MANIFEST_TOOL"; then

3645

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5

3646

+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }

3647

+else

3648

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3649

+$as_echo "no" >&6; }

3650

+fi

3651

3652

+ if test "x$ac_ct_MANIFEST_TOOL" = x; then

3653

+ MANIFEST_TOOL=":"

3654

+ else

3655

+ case $cross_compiling:$ac_tool_warned in

3656

+yes:)

3657

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

3658

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

3659

+ac_tool_warned=yes ;;

3660

+esac

3661

+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL

3662

+ fi

3663

+else

3664

+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"

3665

+fi

3666

3667

+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt

3668

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5

3669

+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }

3670

+if ${lt_cv_path_mainfest_tool+:} false; then :

3671

+ $as_echo_n "(cached) " >&6

3672

+else

3673

+ lt_cv_path_mainfest_tool=no

3674

+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5

3675

+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out

3676

+ cat conftest.err >&5

3677

+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then

3678

+ lt_cv_path_mainfest_tool=yes

3679

+ fi

3680

+ rm -f conftest*

3681

+fi

3682

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5

3683

+$as_echo "$lt_cv_path_mainfest_tool" >&6; }

3684

+if test "x$lt_cv_path_mainfest_tool" != xyes; then

3685

+ MANIFEST_TOOL=:

3686

+fi

3687

3688

3689

3690

3691

3692

3693

case $host_os in

3694

rhapsody* | darwin*)

3695

@@ -7074,7 +7553,7 @@ need_locks="$enable_libtool_lock"

10627

3696

set dummy ${ac_tool_prefix}dsymutil; ac_word=$2

10628

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10629

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10630

-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then

10631

- echo $ECHO_N "(cached) $ECHO_C" >&6

10632

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10633

+$as_echo_n "checking for $ac_word... " >&6; }

10634

+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :

10635

+ $as_echo_n "(cached) " >&6

3697

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3698

$as_echo_n "checking for $ac_word... " >&6; }

3699

-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :

3700

+if ${ac_cv_prog_DSYMUTIL+:} false; then :

3701

$as_echo_n "(cached) " >&6

10636

3702

else

10637

3703

if test -n "$DSYMUTIL"; then

10638

ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.

10639

@@ -7139,25 +7096,25 @@ for as_dir in $PATH

10640

10641

IFS=$as_save_IFS

10642

test -z "$as_dir" && as_dir=.

10643

- for ac_exec_ext in '' $ac_executable_extensions; do

10644

+ for ac_exec_ext in '' $ac_executable_extensions; do

10645

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10646

ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"

10647

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10648

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10649

break 2

10650

10651

done

10652

-done

10653

+ done

10654

IFS=$as_save_IFS

10655

10656

10657

10658

DSYMUTIL=$ac_cv_prog_DSYMUTIL

10659

if test -n "$DSYMUTIL"; then

10660

- { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5

10661

-echo "${ECHO_T}$DSYMUTIL" >&6; }

10662

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5

10663

+$as_echo "$DSYMUTIL" >&6; }

10664

else

10665

- { echo "$as_me:$LINENO: result: no" >&5

10666

-echo "${ECHO_T}no" >&6; }

10667

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10668

+$as_echo "no" >&6; }

10669

10670

10671

10672

@@ -7166,10 +7123,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then

10673

ac_ct_DSYMUTIL=$DSYMUTIL

10674

# Extract the first word of "dsymutil", so it can be a program name with args.

3704

@@ -7114,7 +7593,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then

10675

3705

set dummy dsymutil; ac_word=$2

10676

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10677

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10678

-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then

10679

- echo $ECHO_N "(cached) $ECHO_C" >&6

10680

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10681

+$as_echo_n "checking for $ac_word... " >&6; }

10682

+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :

10683

+ $as_echo_n "(cached) " >&6

3706

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3707

$as_echo_n "checking for $ac_word... " >&6; }

3708

-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :

3709

+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :

3710

$as_echo_n "(cached) " >&6

10684

3711

else

10685

3712

if test -n "$ac_ct_DSYMUTIL"; then

10686

ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.

10687

@@ -7179,25 +7136,25 @@ for as_dir in $PATH

10688

10689

IFS=$as_save_IFS

10690

test -z "$as_dir" && as_dir=.

10691

- for ac_exec_ext in '' $ac_executable_extensions; do

10692

+ for ac_exec_ext in '' $ac_executable_extensions; do

10693

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10694

ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"

10695

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10696

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10697

break 2

10698

10699

done

10700

-done

10701

+ done

10702

IFS=$as_save_IFS

10703

10704

10705

10706

ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL

10707

if test -n "$ac_ct_DSYMUTIL"; then

10708

- { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5

10709

-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }

10710

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5

10711

+$as_echo "$ac_ct_DSYMUTIL" >&6; }

10712

else

10713

- { echo "$as_me:$LINENO: result: no" >&5

10714

-echo "${ECHO_T}no" >&6; }

10715

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10716

+$as_echo "no" >&6; }

10717

10718

10719

if test "x$ac_ct_DSYMUTIL" = x; then

10720

@@ -7205,12 +7162,8 @@ fi

10721

else

10722

case $cross_compiling:$ac_tool_warned in

10723

yes:)

10724

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

10725

-whose name does not start with the host triplet. If you think this

10726

-configuration is useful to you, please write to autoconf@gnu.org." >&5

10727

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

10728

-whose name does not start with the host triplet. If you think this

10729

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

10730

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

10731

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

10732

ac_tool_warned=yes ;;

10733

esac

10734

DSYMUTIL=$ac_ct_DSYMUTIL

10735

@@ -7222,10 +7175,10 @@ fi

10736

if test -n "$ac_tool_prefix"; then

10737

# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.

3713

@@ -7166,7 +7645,7 @@ fi

10738

3714

set dummy ${ac_tool_prefix}nmedit; ac_word=$2

10739

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10740

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10741

-if test "${ac_cv_prog_NMEDIT+set}" = set; then

10742

- echo $ECHO_N "(cached) $ECHO_C" >&6

10743

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10744

+$as_echo_n "checking for $ac_word... " >&6; }

10745

+if test "${ac_cv_prog_NMEDIT+set}" = set; then :

10746

+ $as_echo_n "(cached) " >&6

3715

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3716

$as_echo_n "checking for $ac_word... " >&6; }

3717

-if test "${ac_cv_prog_NMEDIT+set}" = set; then :

3718

+if ${ac_cv_prog_NMEDIT+:} false; then :

3719

$as_echo_n "(cached) " >&6

10747

3720

else

10748

3721

if test -n "$NMEDIT"; then

10749

ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.

10750

@@ -7235,25 +7188,25 @@ for as_dir in $PATH

10751

10752

IFS=$as_save_IFS

10753

test -z "$as_dir" && as_dir=.

10754

- for ac_exec_ext in '' $ac_executable_extensions; do

10755

+ for ac_exec_ext in '' $ac_executable_extensions; do

10756

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10757

ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"

10758

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10759

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10760

break 2

10761

10762

done

10763

-done

10764

+ done

10765

IFS=$as_save_IFS

10766

10767

10768

10769

NMEDIT=$ac_cv_prog_NMEDIT

10770

if test -n "$NMEDIT"; then

10771

- { echo "$as_me:$LINENO: result: $NMEDIT" >&5

10772

-echo "${ECHO_T}$NMEDIT" >&6; }

10773

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5

10774

+$as_echo "$NMEDIT" >&6; }

10775

else

10776

- { echo "$as_me:$LINENO: result: no" >&5

10777

-echo "${ECHO_T}no" >&6; }

10778

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10779

+$as_echo "no" >&6; }

10780

10781

10782

10783

@@ -7262,10 +7215,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then

10784

ac_ct_NMEDIT=$NMEDIT

10785

# Extract the first word of "nmedit", so it can be a program name with args.

3722

@@ -7206,7 +7685,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then

10786

3723

set dummy nmedit; ac_word=$2

10787

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10788

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10789

-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then

10790

- echo $ECHO_N "(cached) $ECHO_C" >&6

10791

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10792

+$as_echo_n "checking for $ac_word... " >&6; }

10793

+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :

10794

+ $as_echo_n "(cached) " >&6

3724

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3725

$as_echo_n "checking for $ac_word... " >&6; }

3726

-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :

3727

+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :

3728

$as_echo_n "(cached) " >&6

10795

3729

else

10796

3730

if test -n "$ac_ct_NMEDIT"; then

10797

ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.

10798

@@ -7275,25 +7228,25 @@ for as_dir in $PATH

10799

10800

IFS=$as_save_IFS

10801

test -z "$as_dir" && as_dir=.

10802

- for ac_exec_ext in '' $ac_executable_extensions; do

10803

+ for ac_exec_ext in '' $ac_executable_extensions; do

10804

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10805

ac_cv_prog_ac_ct_NMEDIT="nmedit"

10806

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10807

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10808

break 2

10809

10810

done

10811

-done

10812

+ done

10813

IFS=$as_save_IFS

10814

10815

10816

10817

ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT

10818

if test -n "$ac_ct_NMEDIT"; then

10819

- { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5

10820

-echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }

10821

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5

10822

+$as_echo "$ac_ct_NMEDIT" >&6; }

10823

else

10824

- { echo "$as_me:$LINENO: result: no" >&5

10825

-echo "${ECHO_T}no" >&6; }

10826

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10827

+$as_echo "no" >&6; }

10828

10829

10830

if test "x$ac_ct_NMEDIT" = x; then

10831

@@ -7301,12 +7254,8 @@ fi

10832

else

10833

case $cross_compiling:$ac_tool_warned in

10834

yes:)

10835

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

10836

-whose name does not start with the host triplet. If you think this

10837

-configuration is useful to you, please write to autoconf@gnu.org." >&5

10838

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

10839

-whose name does not start with the host triplet. If you think this

10840

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

10841

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

10842

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

10843

ac_tool_warned=yes ;;

10844

esac

10845

NMEDIT=$ac_ct_NMEDIT

10846

@@ -7318,10 +7267,10 @@ fi

10847

if test -n "$ac_tool_prefix"; then

10848

# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.

3731

@@ -7258,7 +7737,7 @@ fi

10849

3732

set dummy ${ac_tool_prefix}lipo; ac_word=$2

10850

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10851

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10852

-if test "${ac_cv_prog_LIPO+set}" = set; then

10853

- echo $ECHO_N "(cached) $ECHO_C" >&6

10854

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10855

+$as_echo_n "checking for $ac_word... " >&6; }

10856

+if test "${ac_cv_prog_LIPO+set}" = set; then :

10857

+ $as_echo_n "(cached) " >&6

3733

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3734

$as_echo_n "checking for $ac_word... " >&6; }

3735

-if test "${ac_cv_prog_LIPO+set}" = set; then :

3736

+if ${ac_cv_prog_LIPO+:} false; then :

3737

$as_echo_n "(cached) " >&6

10858

3738

else

10859

3739

if test -n "$LIPO"; then

10860

ac_cv_prog_LIPO="$LIPO" # Let the user override the test.

10861

@@ -7331,25 +7280,25 @@ for as_dir in $PATH

10862

10863

IFS=$as_save_IFS

10864

test -z "$as_dir" && as_dir=.

10865

- for ac_exec_ext in '' $ac_executable_extensions; do

10866

+ for ac_exec_ext in '' $ac_executable_extensions; do

10867

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10868

ac_cv_prog_LIPO="${ac_tool_prefix}lipo"

10869

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10870

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10871

break 2

10872

10873

done

10874

-done

10875

+ done

10876

IFS=$as_save_IFS

10877

10878

10879

10880

LIPO=$ac_cv_prog_LIPO

10881

if test -n "$LIPO"; then

10882

- { echo "$as_me:$LINENO: result: $LIPO" >&5

10883

-echo "${ECHO_T}$LIPO" >&6; }

10884

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5

10885

+$as_echo "$LIPO" >&6; }

10886

else

10887

- { echo "$as_me:$LINENO: result: no" >&5

10888

-echo "${ECHO_T}no" >&6; }

10889

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10890

+$as_echo "no" >&6; }

10891

10892

10893

10894

@@ -7358,10 +7307,10 @@ if test -z "$ac_cv_prog_LIPO"; then

10895

ac_ct_LIPO=$LIPO

10896

# Extract the first word of "lipo", so it can be a program name with args.

3740

@@ -7298,7 +7777,7 @@ if test -z "$ac_cv_prog_LIPO"; then

10897

3741

set dummy lipo; ac_word=$2

10898

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10899

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10900

-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then

10901

- echo $ECHO_N "(cached) $ECHO_C" >&6

10902

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10903

+$as_echo_n "checking for $ac_word... " >&6; }

10904

+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :

10905

+ $as_echo_n "(cached) " >&6

3742

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3743

$as_echo_n "checking for $ac_word... " >&6; }

3744

-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :

3745

+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :

3746

$as_echo_n "(cached) " >&6

10906

3747

else

10907

3748

if test -n "$ac_ct_LIPO"; then

10908

ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.

10909

@@ -7371,25 +7320,25 @@ for as_dir in $PATH

10910

10911

IFS=$as_save_IFS

10912

test -z "$as_dir" && as_dir=.

10913

- for ac_exec_ext in '' $ac_executable_extensions; do

10914

+ for ac_exec_ext in '' $ac_executable_extensions; do

10915

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10916

ac_cv_prog_ac_ct_LIPO="lipo"

10917

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10918

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10919

break 2

10920

10921

done

10922

-done

10923

+ done

10924

IFS=$as_save_IFS

10925

10926

10927

10928

ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO

10929

if test -n "$ac_ct_LIPO"; then

10930

- { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5

10931

-echo "${ECHO_T}$ac_ct_LIPO" >&6; }

10932

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5

10933

+$as_echo "$ac_ct_LIPO" >&6; }

10934

else

10935

- { echo "$as_me:$LINENO: result: no" >&5

10936

-echo "${ECHO_T}no" >&6; }

10937

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10938

+$as_echo "no" >&6; }

10939

10940

10941

if test "x$ac_ct_LIPO" = x; then

10942

@@ -7397,12 +7346,8 @@ fi

10943

else

10944

case $cross_compiling:$ac_tool_warned in

10945

yes:)

10946

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

10947

-whose name does not start with the host triplet. If you think this

10948

-configuration is useful to you, please write to autoconf@gnu.org." >&5

10949

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

10950

-whose name does not start with the host triplet. If you think this

10951

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

10952

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

10953

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

10954

ac_tool_warned=yes ;;

10955

esac

10956

LIPO=$ac_ct_LIPO

10957

@@ -7414,10 +7359,10 @@ fi

10958

if test -n "$ac_tool_prefix"; then

10959

# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.

3749

@@ -7350,7 +7829,7 @@ fi

10960

3750

set dummy ${ac_tool_prefix}otool; ac_word=$2

10961

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10962

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10963

-if test "${ac_cv_prog_OTOOL+set}" = set; then

10964

- echo $ECHO_N "(cached) $ECHO_C" >&6

10965

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10966

+$as_echo_n "checking for $ac_word... " >&6; }

10967

+if test "${ac_cv_prog_OTOOL+set}" = set; then :

10968

+ $as_echo_n "(cached) " >&6

3751

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3752

$as_echo_n "checking for $ac_word... " >&6; }

3753

-if test "${ac_cv_prog_OTOOL+set}" = set; then :

3754

+if ${ac_cv_prog_OTOOL+:} false; then :

3755

$as_echo_n "(cached) " >&6

10969

3756

else

10970

3757

if test -n "$OTOOL"; then

10971

ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.

10972

@@ -7427,25 +7372,25 @@ for as_dir in $PATH

10973

10974

IFS=$as_save_IFS

10975

test -z "$as_dir" && as_dir=.

10976

- for ac_exec_ext in '' $ac_executable_extensions; do

10977

+ for ac_exec_ext in '' $ac_executable_extensions; do

10978

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10979

ac_cv_prog_OTOOL="${ac_tool_prefix}otool"

10980

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10981

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10982

break 2

10983

10984

done

10985

-done

10986

+ done

10987

IFS=$as_save_IFS

10988

10989

10990

10991

OTOOL=$ac_cv_prog_OTOOL

10992

if test -n "$OTOOL"; then

10993

- { echo "$as_me:$LINENO: result: $OTOOL" >&5

10994

-echo "${ECHO_T}$OTOOL" >&6; }

10995

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5

10996

+$as_echo "$OTOOL" >&6; }

10997

else

10998

- { echo "$as_me:$LINENO: result: no" >&5

10999

-echo "${ECHO_T}no" >&6; }

11000

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11001

+$as_echo "no" >&6; }

11002

11003

11004

11005

@@ -7454,10 +7399,10 @@ if test -z "$ac_cv_prog_OTOOL"; then

11006

ac_ct_OTOOL=$OTOOL

11007

# Extract the first word of "otool", so it can be a program name with args.

3758

@@ -7390,7 +7869,7 @@ if test -z "$ac_cv_prog_OTOOL"; then

11008

3759

set dummy otool; ac_word=$2

11009

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11010

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11011

-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then

11012

- echo $ECHO_N "(cached) $ECHO_C" >&6

11013

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11014

+$as_echo_n "checking for $ac_word... " >&6; }

11015

+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :

11016

+ $as_echo_n "(cached) " >&6

3760

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3761

$as_echo_n "checking for $ac_word... " >&6; }

3762

-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :

3763

+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :

3764

$as_echo_n "(cached) " >&6

11017

3765

else

11018

3766

if test -n "$ac_ct_OTOOL"; then

11019

ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.

11020

@@ -7467,25 +7412,25 @@ for as_dir in $PATH

11021

11022

IFS=$as_save_IFS

11023

test -z "$as_dir" && as_dir=.

11024

- for ac_exec_ext in '' $ac_executable_extensions; do

11025

+ for ac_exec_ext in '' $ac_executable_extensions; do

11026

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11027

ac_cv_prog_ac_ct_OTOOL="otool"

11028

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11029

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11030

break 2

11031

11032

done

11033

-done

11034

+ done

11035

IFS=$as_save_IFS

11036

11037

11038

11039

ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL

11040

if test -n "$ac_ct_OTOOL"; then

11041

- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5

11042

-echo "${ECHO_T}$ac_ct_OTOOL" >&6; }

11043

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5

11044

+$as_echo "$ac_ct_OTOOL" >&6; }

11045

else

11046

- { echo "$as_me:$LINENO: result: no" >&5

11047

-echo "${ECHO_T}no" >&6; }

11048

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11049

+$as_echo "no" >&6; }

11050

11051

11052

if test "x$ac_ct_OTOOL" = x; then

11053

@@ -7493,12 +7438,8 @@ fi

11054

else

11055

case $cross_compiling:$ac_tool_warned in

11056

yes:)

11057

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

11058

-whose name does not start with the host triplet. If you think this

11059

-configuration is useful to you, please write to autoconf@gnu.org." >&5

11060

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

11061

-whose name does not start with the host triplet. If you think this

11062

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

11063

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

11064

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

11065

ac_tool_warned=yes ;;

11066

esac

11067

OTOOL=$ac_ct_OTOOL

11068

@@ -7510,10 +7451,10 @@ fi

11069

if test -n "$ac_tool_prefix"; then

11070

# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.

3767

@@ -7442,7 +7921,7 @@ fi

11071

3768

set dummy ${ac_tool_prefix}otool64; ac_word=$2

11072

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11073

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11074

-if test "${ac_cv_prog_OTOOL64+set}" = set; then

11075

- echo $ECHO_N "(cached) $ECHO_C" >&6

11076

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11077

+$as_echo_n "checking for $ac_word... " >&6; }

11078

+if test "${ac_cv_prog_OTOOL64+set}" = set; then :

11079

+ $as_echo_n "(cached) " >&6

3769

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3770

$as_echo_n "checking for $ac_word... " >&6; }

3771

-if test "${ac_cv_prog_OTOOL64+set}" = set; then :

3772

+if ${ac_cv_prog_OTOOL64+:} false; then :

3773

$as_echo_n "(cached) " >&6

11080

3774

else

11081

3775

if test -n "$OTOOL64"; then

11082

ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.

11083

@@ -7523,25 +7464,25 @@ for as_dir in $PATH

11084

11085

IFS=$as_save_IFS

11086

test -z "$as_dir" && as_dir=.

11087

- for ac_exec_ext in '' $ac_executable_extensions; do

11088

+ for ac_exec_ext in '' $ac_executable_extensions; do

11089

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11090

ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"

11091

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11092

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11093

break 2

11094

11095

done

11096

-done

11097

+ done

11098

IFS=$as_save_IFS

11099

11100

11101

11102

OTOOL64=$ac_cv_prog_OTOOL64

11103

if test -n "$OTOOL64"; then

11104

- { echo "$as_me:$LINENO: result: $OTOOL64" >&5

11105

-echo "${ECHO_T}$OTOOL64" >&6; }

11106

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5

11107

+$as_echo "$OTOOL64" >&6; }

11108

else

11109

- { echo "$as_me:$LINENO: result: no" >&5

11110

-echo "${ECHO_T}no" >&6; }

11111

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11112

+$as_echo "no" >&6; }

11113

11114

11115

11116

@@ -7550,10 +7491,10 @@ if test -z "$ac_cv_prog_OTOOL64"; then

11117

ac_ct_OTOOL64=$OTOOL64

11118

# Extract the first word of "otool64", so it can be a program name with args.

3776

@@ -7482,7 +7961,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then

11119

3777

set dummy otool64; ac_word=$2

11120

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11121

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11122

-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then

11123

- echo $ECHO_N "(cached) $ECHO_C" >&6

11124

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11125

+$as_echo_n "checking for $ac_word... " >&6; }

11126

+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :

11127

+ $as_echo_n "(cached) " >&6

3778

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3779

$as_echo_n "checking for $ac_word... " >&6; }

3780

-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :

3781

+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :

3782

$as_echo_n "(cached) " >&6

11128

3783

else

11129

3784

if test -n "$ac_ct_OTOOL64"; then

11130

ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.

11131

@@ -7563,25 +7504,25 @@ for as_dir in $PATH

11132

11133

IFS=$as_save_IFS

11134

test -z "$as_dir" && as_dir=.

11135

- for ac_exec_ext in '' $ac_executable_extensions; do

11136

+ for ac_exec_ext in '' $ac_executable_extensions; do

11137

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11138

ac_cv_prog_ac_ct_OTOOL64="otool64"

11139

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11140

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11141

break 2

11142

11143

done

11144

-done

11145

+ done

11146

IFS=$as_save_IFS

11147

11148

11149

11150

ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64

11151

if test -n "$ac_ct_OTOOL64"; then

11152

- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5

11153

-echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }

11154

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5

11155

+$as_echo "$ac_ct_OTOOL64" >&6; }

11156

else

11157

- { echo "$as_me:$LINENO: result: no" >&5

11158

-echo "${ECHO_T}no" >&6; }

11159

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11160

+$as_echo "no" >&6; }

11161

11162

11163

if test "x$ac_ct_OTOOL64" = x; then

11164

@@ -7589,12 +7530,8 @@ fi

11165

else

11166

case $cross_compiling:$ac_tool_warned in

11167

yes:)

11168

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

11169

-whose name does not start with the host triplet. If you think this

11170

-configuration is useful to you, please write to autoconf@gnu.org." >&5

11171

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

11172

-whose name does not start with the host triplet. If you think this

11173

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

11174

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

11175

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

11176

ac_tool_warned=yes ;;

11177

esac

11178

OTOOL64=$ac_ct_OTOOL64

11179

@@ -7629,10 +7566,10 @@ fi

11180

11181

11182

11183

- { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5

11184

-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }

11185

-if test "${lt_cv_apple_cc_single_mod+set}" = set; then

11186

- echo $ECHO_N "(cached) $ECHO_C" >&6

11187

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5

11188

+$as_echo_n "checking for -single_module linker flag... " >&6; }

11189

+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :

11190

+ $as_echo_n "(cached) " >&6

3785

@@ -7557,7 +8036,7 @@ fi

3786

3787

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5

3788

$as_echo_n "checking for -single_module linker flag... " >&6; }

3789

-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :

3790

+if ${lt_cv_apple_cc_single_mod+:} false; then :

3791

$as_echo_n "(cached) " >&6

11191

3792

else

11192

3793

lt_cv_apple_cc_single_mod=no

11193

if test -z "${LT_MULTI_MODULE}"; then

11194

@@ -7656,22 +7593,18 @@ else

11195

rm -f conftest.*

11196

11197

11198

-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5

11199

-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }

11200

- { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5

11201

-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }

11202

-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then

11203

- echo $ECHO_N "(cached) $ECHO_C" >&6

11204

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5

11205

+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }

11206

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5

11207

+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }

11208

+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :

11209

+ $as_echo_n "(cached) " >&6

3794

@@ -7586,7 +8065,7 @@ fi

3795

$as_echo "$lt_cv_apple_cc_single_mod" >&6; }

3796

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5

3797

$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }

3798

-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :

3799

+if ${lt_cv_ld_exported_symbols_list+:} false; then :

3800

$as_echo_n "(cached) " >&6

11210

3801

else

11211

3802

lt_cv_ld_exported_symbols_list=no

11212

save_LDFLAGS=$LDFLAGS

11213

echo "_main" > conftest.sym

11214

LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"

11215

- cat >conftest.$ac_ext <<_ACEOF

11216

-/* confdefs.h. */

11217

-_ACEOF

11218

-cat confdefs.h >>conftest.$ac_ext

11219

-cat >>conftest.$ac_ext <<_ACEOF

11220

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11221

/* end confdefs.h. */

11222

3803

@@ -7599,595 +8078,113 @@ else

11223

3804

int

11224

@@ -7682,39 +7615,18 @@ main ()

11225

return 0;

11226

}

11227

_ACEOF

11228

-rm -f conftest.$ac_objext conftest$ac_exeext

11229

-if { (ac_try="$ac_link"

3805

main ()

3806

{

3807

3808

- ;

3809

- return 0;

3810

3811

-_ACEOF

3812

-if ac_fn_c_try_link "$LINENO"; then :

3813

- lt_cv_ld_exported_symbols_list=yes

3814

-else

3815

- lt_cv_ld_exported_symbols_list=no

3816

-fi

3817

-rm -f core conftest.err conftest.$ac_objext \

3818

- conftest$ac_exeext conftest.$ac_ext

3819

- LDFLAGS="$save_LDFLAGS"

3820

3821

-fi

3822

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5

3823

-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }

3824

- case $host_os in

3825

- rhapsody* | darwin1.[012])

3826

- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

3827

- darwin1.*)

3828

- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

3829

- darwin*) # darwin 5.x on

3830

- # if running on 10.5 or later, the deployment target defaults

3831

- # to the OS version, if on x86, and 10.4, the deployment

3832

- # target defaults to 10.4. Don't you love it?

3833

- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in

3834

- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)

3835

- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

3836

- 10.[012]*)

3837

- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

3838

- 10.*)

3839

- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

3840

- esac

3841

- ;;

3842

- esac

3843

- if test "$lt_cv_apple_cc_single_mod" = "yes"; then

3844

- _lt_dar_single_mod='$single_module'

3845

- fi

3846

- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then

3847

- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'

3848

- else

3849

- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'

3850

- fi

3851

- if test "$DSYMUTIL" != ":"; then

3852

- _lt_dsymutil='~$DSYMUTIL $lib || :'

3853

- else

3854

- _lt_dsymutil=

3855

- fi

3856

- ;;

3857

- esac

3858

3859

-for ac_header in dlfcn.h

3860

-do :

3861

- ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default

3862

3863

-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :

3864

- cat >>confdefs.h <<_ACEOF

3865

-#define HAVE_DLFCN_H 1

3866

-_ACEOF

3867

3868

-fi

3869

3870

-done

3871

3872

3873

3874

-ac_ext=cpp

3875

-ac_cpp='$CXXCPP $CPPFLAGS'

3876

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

3877

-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

3878

-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

3879

-if test -z "$CXX"; then

3880

- if test -n "$CCC"; then

3881

- CXX=$CCC

3882

- else

3883

- if test -n "$ac_tool_prefix"; then

3884

- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

3885

- do

3886

- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

3887

-set dummy $ac_tool_prefix$ac_prog; ac_word=$2

3888

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3889

-$as_echo_n "checking for $ac_word... " >&6; }

3890

-if test "${ac_cv_prog_CXX+set}" = set; then :

3891

- $as_echo_n "(cached) " >&6

3892

-else

3893

- if test -n "$CXX"; then

3894

- ac_cv_prog_CXX="$CXX" # Let the user override the test.

3895

-else

3896

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3897

-for as_dir in $PATH

3898

-do

3899

- IFS=$as_save_IFS

3900

- test -z "$as_dir" && as_dir=.

3901

- for ac_exec_ext in '' $ac_executable_extensions; do

3902

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3903

- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

3904

- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3905

- break 2

3906

- fi

3907

-done

3908

- done

3909

-IFS=$as_save_IFS

3910

3911

-fi

3912

-fi

3913

-CXX=$ac_cv_prog_CXX

3914

-if test -n "$CXX"; then

3915

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5

3916

-$as_echo "$CXX" >&6; }

3917

-else

3918

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3919

-$as_echo "no" >&6; }

3920

-fi

3921

3922

3923

- test -n "$CXX" && break

3924

- done

3925

-fi

3926

-if test -z "$CXX"; then

3927

- ac_ct_CXX=$CXX

3928

- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

3929

-do

3930

- # Extract the first word of "$ac_prog", so it can be a program name with args.

3931

-set dummy $ac_prog; ac_word=$2

3932

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3933

-$as_echo_n "checking for $ac_word... " >&6; }

3934

-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :

3935

- $as_echo_n "(cached) " >&6

3936

-else

3937

- if test -n "$ac_ct_CXX"; then

3938

- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.

3939

-else

3940

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3941

-for as_dir in $PATH

3942

-do

3943

- IFS=$as_save_IFS

3944

- test -z "$as_dir" && as_dir=.

3945

- for ac_exec_ext in '' $ac_executable_extensions; do

3946

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3947

- ac_cv_prog_ac_ct_CXX="$ac_prog"

3948

- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3949

- break 2

3950

- fi

3951

-done

3952

- done

3953

-IFS=$as_save_IFS

3954

3955

-fi

3956

-fi

3957

-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX

3958

-if test -n "$ac_ct_CXX"; then

3959

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5

3960

-$as_echo "$ac_ct_CXX" >&6; }

3961

-else

3962

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3963

-$as_echo "no" >&6; }

3964

-fi

3965

3966

3967

- test -n "$ac_ct_CXX" && break

3968

-done

3969

3970

- if test "x$ac_ct_CXX" = x; then

3971

- CXX="g++"

3972

- else

3973

- case $cross_compiling:$ac_tool_warned in

3974

-yes:)

3975

-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

3976

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

3977

-ac_tool_warned=yes ;;

3978

-esac

3979

- CXX=$ac_ct_CXX

3980

- fi

3981

-fi

3982

3983

- fi

3984

-fi

3985

-# Provide some information about the compiler.

3986

-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5

3987

-set X $ac_compile

3988

-ac_compiler=$2

3989

-for ac_option in --version -v -V -qversion; do

3990

- { { ac_try="$ac_compiler $ac_option >&5"

11230

3991

-case "(($ac_try" in

11231

3992

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11232

3993

- *) ac_try_echo=$ac_try;;

11233

3994

-esac

11234

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11235

- (eval "$ac_link") 2>conftest.er1

3995

-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

3996

-$as_echo "$ac_try_echo"; } >&5

3997

- (eval "$ac_compiler $ac_option >&5") 2>conftest.err

11236

3998

- ac_status=$?

11237

- grep -v '^ *+' conftest.er1 >conftest.err

11238

- rm -f conftest.er1

11239

- cat conftest.err >&5

11240

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11241

- (exit $ac_status); } && {

11242

- test -z "$ac_c_werror_flag" ||

11243

- test ! -s conftest.err

11244

- } && test -s conftest$ac_exeext &&

11245

- $as_test_x conftest$ac_exeext; then

3999

- if test -s conftest.err; then

4000

- sed '10a\

4001

-... rest of stderr output deleted ...

4002

- 10q' conftest.err >conftest.er1

4003

- cat conftest.er1 >&5

4004

- fi

4005

- rm -f conftest.er1 conftest.err

4006

- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

4007

- test $ac_status = 0; }

4008

-done

4009

4010

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5

4011

-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }

4012

-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :

4013

- $as_echo_n "(cached) " >&6

4014

-else

4015

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4016

-/* end confdefs.h. */

4017

4018

-int

4019

-main ()

4020

4021

-#ifndef __GNUC__

4022

- choke me

4023

-#endif

4024

4025

- ;

4026

- return 0;

4027

4028

-_ACEOF

4029

-if ac_fn_cxx_try_compile "$LINENO"; then :

4030

- ac_compiler_gnu=yes

4031

-else

4032

- ac_compiler_gnu=no

4033

-fi

4034

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4035

-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

4036

4037

-fi

4038

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5

4039

-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }

4040

-if test $ac_compiler_gnu = yes; then

4041

- GXX=yes

4042

-else

4043

- GXX=

4044

-fi

4045

-ac_test_CXXFLAGS=${CXXFLAGS+set}

4046

-ac_save_CXXFLAGS=$CXXFLAGS

4047

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5

4048

-$as_echo_n "checking whether $CXX accepts -g... " >&6; }

4049

-if test "${ac_cv_prog_cxx_g+set}" = set; then :

4050

- $as_echo_n "(cached) " >&6

4051

-else

4052

- ac_save_cxx_werror_flag=$ac_cxx_werror_flag

4053

- ac_cxx_werror_flag=yes

4054

- ac_cv_prog_cxx_g=no

4055

- CXXFLAGS="-g"

4056

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4057

-/* end confdefs.h. */

4058

4059

-int

4060

-main ()

4061

4062

4063

- ;

4064

- return 0;

4065

4066

-_ACEOF

4067

-if ac_fn_cxx_try_compile "$LINENO"; then :

4068

- ac_cv_prog_cxx_g=yes

4069

-else

4070

- CXXFLAGS=""

4071

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4072

-/* end confdefs.h. */

4073

4074

-int

4075

-main ()

4076

4077

4078

- ;

4079

- return 0;

4080

4081

-_ACEOF

4082

-if ac_fn_cxx_try_compile "$LINENO"; then :

4083

4084

-else

4085

- ac_cxx_werror_flag=$ac_save_cxx_werror_flag

4086

- CXXFLAGS="-g"

4087

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4088

-/* end confdefs.h. */

4089

4090

-int

4091

-main ()

4092

4093

4094

- ;

4095

- return 0;

4096

4097

-_ACEOF

4098

-if ac_fn_cxx_try_compile "$LINENO"; then :

4099

- ac_cv_prog_cxx_g=yes

4100

-fi

4101

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4102

-fi

4103

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4104

-fi

4105

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4106

- ac_cxx_werror_flag=$ac_save_cxx_werror_flag

4107

-fi

4108

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5

4109

-$as_echo "$ac_cv_prog_cxx_g" >&6; }

4110

-if test "$ac_test_CXXFLAGS" = set; then

4111

- CXXFLAGS=$ac_save_CXXFLAGS

4112

-elif test $ac_cv_prog_cxx_g = yes; then

4113

- if test "$GXX" = yes; then

4114

- CXXFLAGS="-g -O2"

4115

- else

4116

- CXXFLAGS="-g"

4117

- fi

4118

-else

4119

- if test "$GXX" = yes; then

4120

- CXXFLAGS="-O2"

4121

- else

4122

- CXXFLAGS=

4123

- fi

4124

-fi

4125

-ac_ext=cpp

4126

-ac_cpp='$CXXCPP $CPPFLAGS'

4127

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

4128

-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

4129

-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

4130

4131

-depcc="$CXX" am_compiler_list=

4132

4133

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

4134

-$as_echo_n "checking dependency style of $depcc... " >&6; }

4135

-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :

4136

- $as_echo_n "(cached) " >&6

4137

-else

4138

- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

4139

- # We make a subdir and do the tests there. Otherwise we can end up

4140

- # making bogus files that we don't know about and never remove. For

4141

- # instance it was reported that on HP-UX the gcc test will end up

4142

- # making a dummy file named `D' -- because `-MD' means `put the output

4143

- # in D'.

4144

- mkdir conftest.dir

4145

- # Copy depcomp to subdir because otherwise we won't find it if we're

4146

- # using a relative directory.

4147

- cp "$am_depcomp" conftest.dir

4148

- cd conftest.dir

4149

- # We will build objects and dependencies in a subdirectory because

4150

- # it helps to detect inapplicable dependency modes. For instance

4151

- # both Tru64's cc and ICC support -MD to output dependencies as a

4152

- # side effect of compilation, but ICC will put the dependencies in

4153

- # the current directory while Tru64 will put them in the object

4154

- # directory.

4155

- mkdir sub

4156

4157

- am_cv_CXX_dependencies_compiler_type=none

4158

- if test "$am_compiler_list" = ""; then

4159

- am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

4160

- fi

4161

- am__universal=false

4162

- case " $depcc " in #(

4163

- *\ -arch\ *\ -arch\ *) am__universal=true ;;

4164

- esac

4165

4166

- for depmode in $am_compiler_list; do

4167

- # Setup a source with many dependencies, because some compilers

4168

- # like to wrap large dependency lists on column 80 (with \), and

4169

- # we should not choose a depcomp mode which is confused by this.

4170

- #

4171

- # We need to recreate these files for each test, as the compiler may

4172

- # overwrite some of them when testing with obscure command lines.

4173

- # This happens at least with the AIX C compiler.

4174

- : > sub/conftest.c

4175

- for i in 1 2 3 4 5 6; do

4176

- echo '#include "conftst'$i'.h"' >> sub/conftest.c

4177

- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with

4178

- # Solaris 8's {/usr,}/bin/sh.

4179

- touch sub/conftst$i.h

4180

- done

4181

- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

4182

4183

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

4184

- # mode. It turns out that the SunPro C++ compiler does not properly

4185

- # handle `-M -o', and we need to detect this. Also, some Intel

4186

- # versions had trouble with output in subdirs

4187

- am__obj=sub/conftest.${OBJEXT-o}

4188

- am__minus_obj="-o $am__obj"

4189

- case $depmode in

4190

- gcc)

4191

- # This depmode causes a compiler race in universal mode.

4192

- test "$am__universal" = false || continue

4193

- ;;

4194

- nosideeffect)

4195

- # after this tag, mechanisms are not by side-effect, so they'll

4196

- # only be used when explicitly requested

4197

- if test "x$enable_dependency_tracking" = xyes; then

4198

- continue

4199

- else

4200

- break

4201

- fi

4202

- ;;

4203

- msvisualcpp | msvcmsys)

4204

- # This compiler won't grok `-c -o', but also, the minuso test has

4205

- # not run yet. These depmodes are late enough in the game, and

4206

- # so weak that their functioning should not be impacted.

4207

- am__obj=conftest.${OBJEXT-o}

4208

- am__minus_obj=

4209

- ;;

4210

- none) break ;;

4211

- esac

4212

- if depmode=$depmode \

4213

- source=sub/conftest.c object=$am__obj \

4214

- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

4215

- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

4216

- >/dev/null 2>conftest.err &&

4217

- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

4218

- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

4219

- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

4220

- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then

4221

- # icc doesn't choke on unknown options, it will just issue warnings

4222

- # or remarks (even with -Werror). So we grep stderr for any message

4223

- # that says an option was ignored or not supported.

4224

- # When given -MP, icc 7.0 and 7.1 complain thusly:

4225

- # icc: Command line warning: ignoring option '-M'; no argument required

4226

- # The diagnosis changed in icc 8.0:

4227

- # icc: Command line remark: option '-MP' not supported

4228

- if (grep 'ignoring option' conftest.err ||

4229

- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else

4230

- am_cv_CXX_dependencies_compiler_type=$depmode

4231

- break

4232

- fi

4233

- fi

4234

- done

4235

4236

- cd ..

4237

- rm -rf conftest.dir

4238

-else

4239

- am_cv_CXX_dependencies_compiler_type=none

4240

-fi

4241

4242

-fi

4243

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5

4244

-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }

4245

-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

4246

4247

- if

4248

- test "x$enable_dependency_tracking" != xno \

4249

- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then

4250

- am__fastdepCXX_TRUE=

4251

- am__fastdepCXX_FALSE='#'

4252

-else

4253

- am__fastdepCXX_TRUE='#'

4254

- am__fastdepCXX_FALSE=

4255

-fi

4256

4257

4258

-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

4259

- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

4260

- (test "X$CXX" != "Xg++"))) ; then

4261

- ac_ext=cpp

4262

-ac_cpp='$CXXCPP $CPPFLAGS'

4263

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

4264

-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

4265

-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

4266

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5

4267

-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }

4268

-if test -z "$CXXCPP"; then

4269

- if test "${ac_cv_prog_CXXCPP+set}" = set; then :

4270

- $as_echo_n "(cached) " >&6

4271

-else

4272

- # Double quotes because CXXCPP needs to be expanded

4273

- for CXXCPP in "$CXX -E" "/lib/cpp"

4274

- do

4275

- ac_preproc_ok=false

4276

-for ac_cxx_preproc_warn_flag in '' yes

4277

-do

4278

- # Use a header file that comes with gcc, so configuring glibc

4279

- # with a fresh cross-compiler works.

4280

- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

4281

- # <limits.h> exists even on freestanding compilers.

4282

- # On the NeXT, cc -E runs the code through the compiler's parser,

4283

- # not just through cpp. "Syntax error" is here to catch this case.

4284

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4285

-/* end confdefs.h. */

4286

-#ifdef __STDC__

4287

-# include <limits.h>

4288

-#else

4289

-# include <assert.h>

4290

-#endif

4291

- Syntax error

4292

-_ACEOF

4293

-if ac_fn_cxx_try_cpp "$LINENO"; then :

4294

4295

-else

4296

- # Broken: fails on valid input.

4297

-continue

4298

-fi

4299

-rm -f conftest.err conftest.$ac_ext

4300

4301

- # OK, works on sane cases. Now check whether nonexistent headers

4302

- # can be detected and how.

4303

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4304

-/* end confdefs.h. */

4305

-#include <ac_nonexistent.h>

4306

-_ACEOF

4307

-if ac_fn_cxx_try_cpp "$LINENO"; then :

4308

- # Broken: success on invalid input.

4309

-continue

4310

-else

4311

- # Passes both tests.

4312

-ac_preproc_ok=:

4313

-break

4314

-fi

4315

-rm -f conftest.err conftest.$ac_ext

4316

4317

-done

4318

-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

4319

-rm -f conftest.err conftest.$ac_ext

4320

-if $ac_preproc_ok; then :

4321

- break

4322

-fi

4323

4324

- done

4325

- ac_cv_prog_CXXCPP=$CXXCPP

4326

4327

-fi

4328

- CXXCPP=$ac_cv_prog_CXXCPP

4329

-else

4330

- ac_cv_prog_CXXCPP=$CXXCPP

4331

-fi

4332

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5

4333

-$as_echo "$CXXCPP" >&6; }

4334

-ac_preproc_ok=false

4335

-for ac_cxx_preproc_warn_flag in '' yes

4336

-do

4337

- # Use a header file that comes with gcc, so configuring glibc

4338

- # with a fresh cross-compiler works.

4339

- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

4340

- # <limits.h> exists even on freestanding compilers.

4341

- # On the NeXT, cc -E runs the code through the compiler's parser,

4342

- # not just through cpp. "Syntax error" is here to catch this case.

4343

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4344

-/* end confdefs.h. */

4345

-#ifdef __STDC__

4346

-# include <limits.h>

4347

-#else

4348

-# include <assert.h>

4349

-#endif

4350

- Syntax error

4351

4352

+ ;

4353

+ return 0;

4354

4355

_ACEOF

4356

-if ac_fn_cxx_try_cpp "$LINENO"; then :

11246

4357

+if ac_fn_c_try_link "$LINENO"; then :

11247

lt_cv_ld_exported_symbols_list=yes

11248

else

11249

- echo "$as_me: failed program was:" >&5

11250

-sed 's/^/| /' conftest.$ac_ext >&5

11251

11252

- lt_cv_ld_exported_symbols_list=no

4358

+ lt_cv_ld_exported_symbols_list=yes

4359

+else

11253

4360

+ lt_cv_ld_exported_symbols_list=no

11254

11255

11256

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11257

- conftest$ac_exeext conftest.$ac_ext

4361

+fi

11258

4362

+rm -f core conftest.err conftest.$ac_objext \

11259

4363

+ conftest$ac_exeext conftest.$ac_ext

11260

LDFLAGS="$save_LDFLAGS"

4364

+ LDFLAGS="$save_LDFLAGS"

11261

4365

11262

11263

-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5

11264

-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }

4366

+fi

11265

4367

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5

11266

4368

+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }

11267

case $host_os in

11268

rhapsody* | darwin1.[012])

11269

_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

11270

@@ -7750,58 +7662,13 @@ echo "${ECHO_T}$lt_cv_ld_exported_symbol

11271

;;

11272

esac

4369

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5

4370

+$as_echo_n "checking for -force_load linker flag... " >&6; }

4371

+if ${lt_cv_ld_force_load+:} false; then :

4372

+ $as_echo_n "(cached) " >&6

4373

else

4374

- # Broken: fails on valid input.

4375

-continue

4376

+ lt_cv_ld_force_load=no

4377

+ cat > conftest.c << _LT_EOF

4378

+int forced_loaded() { return 2;}

4379

+_LT_EOF

4380

+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5

4381

+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5

4382

+ echo "$AR cru libconftest.a conftest.o" >&5

4383

+ $AR cru libconftest.a conftest.o 2>&5

4384

+ echo "$RANLIB libconftest.a" >&5

4385

+ $RANLIB libconftest.a 2>&5

4386

+ cat > conftest.c << _LT_EOF

4387

+int main() { return 0;}

4388

+_LT_EOF

4389

+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5

4390

+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err

4391

+ _lt_result=$?

4392

+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then

4393

+ lt_cv_ld_force_load=yes

4394

+ else

4395

+ cat conftest.err >&5

4396

+ fi

4397

+ rm -f conftest.err libconftest.a conftest conftest.c

4398

+ rm -rf conftest.dSYM

4399

4400

4401

-rm -f conftest.err conftest.$ac_ext

4402

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5

4403

+$as_echo "$lt_cv_ld_force_load" >&6; }

4404

+ case $host_os in

4405

+ rhapsody* | darwin1.[012])

4406

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

4407

+ darwin1.*)

4408

+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

4409

+ darwin*) # darwin 5.x on

4410

+ # if running on 10.5 or later, the deployment target defaults

4411

+ # to the OS version, if on x86, and 10.4, the deployment

4412

+ # target defaults to 10.4. Don't you love it?

4413

+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in

4414

+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)

4415

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

4416

+ 10.[012]*)

4417

+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

4418

+ 10.*)

4419

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

4420

+ esac

4421

+ ;;

4422

+ esac

4423

+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then

4424

+ _lt_dar_single_mod='$single_module'

4425

+ fi

4426

+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then

4427

+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'

4428

+ else

4429

+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'

4430

+ fi

4431

+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then

4432

+ _lt_dsymutil='~$DSYMUTIL $lib || :'

4433

+ else

4434

+ _lt_dsymutil=

4435

+ fi

4436

+ ;;

4437

+ esac

11273

4438

11274

11275

for ac_header in dlfcn.h

11276

-do

11277

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

11278

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5

11279

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

11280

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

11281

- echo $ECHO_N "(cached) $ECHO_C" >&6

11282

-else

11283

- cat >conftest.$ac_ext <<_ACEOF

11284

-/* confdefs.h. */

11285

-_ACEOF

11286

-cat confdefs.h >>conftest.$ac_ext

11287

-cat >>conftest.$ac_ext <<_ACEOF

4439

- # OK, works on sane cases. Now check whether nonexistent headers

4440

- # can be detected and how.

4441

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11288

4442

-/* end confdefs.h. */

11289

-$ac_includes_default

11290

11291

-#include <$ac_header>

11292

-_ACEOF

11293

-rm -f conftest.$ac_objext

11294

-if { (ac_try="$ac_compile"

11295

-case "(($ac_try" in

11296

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11297

- *) ac_try_echo=$ac_try;;

11298

-esac

11299

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11300

- (eval "$ac_compile") 2>conftest.er1

11301

- ac_status=$?

11302

- grep -v '^ *+' conftest.er1 >conftest.err

11303

- rm -f conftest.er1

11304

- cat conftest.err >&5

11305

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11306

- (exit $ac_status); } && {

11307

- test -z "$ac_c_werror_flag" ||

11308

- test ! -s conftest.err

11309

- } && test -s conftest.$ac_objext; then

11310

- eval "$as_ac_Header=yes"

11311

-else

11312

- echo "$as_me: failed program was:" >&5

11313

-sed 's/^/| /' conftest.$ac_ext >&5

11314

11315

- eval "$as_ac_Header=no"

11316

-fi

11317

11318

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

11319

-fi

11320

-ac_res=`eval echo '${'$as_ac_Header'}'`

11321

- { echo "$as_me:$LINENO: result: $ac_res" >&5

11322

-echo "${ECHO_T}$ac_res" >&6; }

11323

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

4443

-#include <ac_nonexistent.h>

4444

+for ac_header in dlfcn.h

11324

4445

+do :

11325

4446

+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default

11326

4447

11327

+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :

11328

cat >>confdefs.h <<_ACEOF

11329

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

4448

+if test "x$ac_cv_header_dlfcn_h" = xyes; then :

4449

+ cat >>confdefs.h <<_ACEOF

11330

4450

+#define HAVE_DLFCN_H 1

11331

4451

_ACEOF

11332

11333

11334

@@ -7824,10 +7691,10 @@ if test -z "$CXX"; then

11335

11336

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

11337

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

11338

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11339

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11340

-if test "${ac_cv_prog_CXX+set}" = set; then

11341

- echo $ECHO_N "(cached) $ECHO_C" >&6

11342

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11343

+$as_echo_n "checking for $ac_word... " >&6; }

11344

+if test "${ac_cv_prog_CXX+set}" = set; then :

11345

+ $as_echo_n "(cached) " >&6

11346

else

11347

if test -n "$CXX"; then

11348

ac_cv_prog_CXX="$CXX" # Let the user override the test.

11349

@@ -7837,25 +7704,25 @@ for as_dir in $PATH

11350

11351

IFS=$as_save_IFS

11352

test -z "$as_dir" && as_dir=.

11353

- for ac_exec_ext in '' $ac_executable_extensions; do

11354

+ for ac_exec_ext in '' $ac_executable_extensions; do

11355

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11356

ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

11357

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11358

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11359

break 2

11360

11361

done

11362

-done

11363

+ done

11364

IFS=$as_save_IFS

11365

11366

11367

11368

CXX=$ac_cv_prog_CXX

11369

if test -n "$CXX"; then

11370

- { echo "$as_me:$LINENO: result: $CXX" >&5

11371

-echo "${ECHO_T}$CXX" >&6; }

11372

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5

11373

+$as_echo "$CXX" >&6; }

11374

else

11375

- { echo "$as_me:$LINENO: result: no" >&5

11376

-echo "${ECHO_T}no" >&6; }

11377

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11378

+$as_echo "no" >&6; }

11379

11380

11381

11382

@@ -7868,10 +7735,10 @@ if test -z "$CXX"; then

11383

11384

# Extract the first word of "$ac_prog", so it can be a program name with args.

11385

set dummy $ac_prog; ac_word=$2

11386

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11387

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11388

-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then

11389

- echo $ECHO_N "(cached) $ECHO_C" >&6

11390

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11391

+$as_echo_n "checking for $ac_word... " >&6; }

11392

+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :

11393

+ $as_echo_n "(cached) " >&6

11394

else

11395

if test -n "$ac_ct_CXX"; then

11396

ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.

11397

@@ -7881,25 +7748,25 @@ for as_dir in $PATH

11398

11399

IFS=$as_save_IFS

11400

test -z "$as_dir" && as_dir=.

11401

- for ac_exec_ext in '' $ac_executable_extensions; do

11402

+ for ac_exec_ext in '' $ac_executable_extensions; do

11403

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11404

ac_cv_prog_ac_ct_CXX="$ac_prog"

11405

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11406

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11407

break 2

11408

11409

done

11410

-done

11411

+ done

11412

IFS=$as_save_IFS

11413

11414

11415

11416

ac_ct_CXX=$ac_cv_prog_ac_ct_CXX

11417

if test -n "$ac_ct_CXX"; then

11418

- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

11419

-echo "${ECHO_T}$ac_ct_CXX" >&6; }

11420

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5

11421

+$as_echo "$ac_ct_CXX" >&6; }

11422

else

11423

- { echo "$as_me:$LINENO: result: no" >&5

11424

-echo "${ECHO_T}no" >&6; }

11425

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11426

+$as_echo "no" >&6; }

11427

11428

11429

11430

@@ -7911,12 +7778,8 @@ done

11431

else

11432

case $cross_compiling:$ac_tool_warned in

11433

yes:)

11434

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

11435

-whose name does not start with the host triplet. If you think this

11436

-configuration is useful to you, please write to autoconf@gnu.org." >&5

11437

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

11438

-whose name does not start with the host triplet. If you think this

11439

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

11440

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

11441

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

11442

ac_tool_warned=yes ;;

11443

esac

11444

CXX=$ac_ct_CXX

11445

@@ -7926,49 +7789,36 @@ fi

11446

11447

11448

# Provide some information about the compiler.

11449

-echo "$as_me:$LINENO: checking for C++ compiler version" >&5

11450

-ac_compiler=`set X $ac_compile; echo $2`

11451

-{ (ac_try="$ac_compiler --version >&5"

11452

-case "(($ac_try" in

11453

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11454

- *) ac_try_echo=$ac_try;;

11455

-esac

11456

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11457

- (eval "$ac_compiler --version >&5") 2>&5

11458

- ac_status=$?

11459

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11460

- (exit $ac_status); }

11461

-{ (ac_try="$ac_compiler -v >&5"

11462

-case "(($ac_try" in

11463

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11464

- *) ac_try_echo=$ac_try;;

11465

-esac

11466

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11467

- (eval "$ac_compiler -v >&5") 2>&5

11468

- ac_status=$?

11469

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11470

- (exit $ac_status); }

11471

-{ (ac_try="$ac_compiler -V >&5"

11472

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5

11473

+set X $ac_compile

11474

+ac_compiler=$2

11475

+for ac_option in --version -v -V -qversion; do

11476

+ { { ac_try="$ac_compiler $ac_option >&5"

11477

case "(($ac_try" in

11478

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11479

*) ac_try_echo=$ac_try;;

11480

esac

11481

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11482

- (eval "$ac_compiler -V >&5") 2>&5

11483

- ac_status=$?

11484

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11485

- (exit $ac_status); }

11486

11487

-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

11488

-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }

11489

-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then

11490

- echo $ECHO_N "(cached) $ECHO_C" >&6

11491

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

11492

+$as_echo "$ac_try_echo"; } >&5

11493

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

11494

+ ac_status=$?

11495

+ if test -s conftest.err; then

11496

+ sed '10a\

11497

+... rest of stderr output deleted ...

11498

+ 10q' conftest.err >conftest.er1

11499

+ cat conftest.er1 >&5

11500

+ fi

11501

+ rm -f conftest.er1 conftest.err

11502

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

11503

+ test $ac_status = 0; }

11504

+done

11505

11506

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5

11507

+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }

11508

+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :

11509

+ $as_echo_n "(cached) " >&6

11510

else

11511

- cat >conftest.$ac_ext <<_ACEOF

11512

-/* confdefs.h. */

11513

-_ACEOF

11514

-cat confdefs.h >>conftest.$ac_ext

11515

-cat >>conftest.$ac_ext <<_ACEOF

11516

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11517

/* end confdefs.h. */

11518

11519

int

11520

@@ -7982,54 +7832,34 @@ main ()

11521

return 0;

11522

}

11523

_ACEOF

11524

-rm -f conftest.$ac_objext

11525

-if { (ac_try="$ac_compile"

11526

-case "(($ac_try" in

11527

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11528

- *) ac_try_echo=$ac_try;;

11529

-esac

11530

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11531

- (eval "$ac_compile") 2>conftest.er1

11532

- ac_status=$?

11533

- grep -v '^ *+' conftest.er1 >conftest.err

11534

- rm -f conftest.er1

11535

- cat conftest.err >&5

11536

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11537

- (exit $ac_status); } && {

11538

- test -z "$ac_cxx_werror_flag" ||

11539

- test ! -s conftest.err

11540

- } && test -s conftest.$ac_objext; then

11541

+if ac_fn_cxx_try_compile "$LINENO"; then :

11542

ac_compiler_gnu=yes

11543

else

11544

- echo "$as_me: failed program was:" >&5

11545

-sed 's/^/| /' conftest.$ac_ext >&5

11546

11547

- ac_compiler_gnu=no

11548

+ ac_compiler_gnu=no

11549

11550

11551

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

11552

ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

11553

11554

11555

-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

11556

-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }

11557

-GXX=`test $ac_compiler_gnu = yes && echo yes`

11558

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5

11559

+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }

11560

+if test $ac_compiler_gnu = yes; then

11561

+ GXX=yes

11562

+else

11563

+ GXX=

11564

+fi

11565

ac_test_CXXFLAGS=${CXXFLAGS+set}

11566

ac_save_CXXFLAGS=$CXXFLAGS

11567

-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

11568

-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }

11569

-if test "${ac_cv_prog_cxx_g+set}" = set; then

11570

- echo $ECHO_N "(cached) $ECHO_C" >&6

11571

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5

11572

+$as_echo_n "checking whether $CXX accepts -g... " >&6; }

11573

+if test "${ac_cv_prog_cxx_g+set}" = set; then :

11574

+ $as_echo_n "(cached) " >&6

11575

else

11576

ac_save_cxx_werror_flag=$ac_cxx_werror_flag

11577

ac_cxx_werror_flag=yes

11578

ac_cv_prog_cxx_g=no

11579

CXXFLAGS="-g"

11580

- cat >conftest.$ac_ext <<_ACEOF

11581

-/* confdefs.h. */

11582

-_ACEOF

11583

-cat confdefs.h >>conftest.$ac_ext

11584

-cat >>conftest.$ac_ext <<_ACEOF

11585

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11586

/* end confdefs.h. */

11587

11588

int

11589

@@ -8040,34 +7870,11 @@ main ()

11590

return 0;

11591

}

11592

_ACEOF

11593

-rm -f conftest.$ac_objext

11594

-if { (ac_try="$ac_compile"

11595

-case "(($ac_try" in

11596

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11597

- *) ac_try_echo=$ac_try;;

11598

-esac

11599

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11600

- (eval "$ac_compile") 2>conftest.er1

11601

- ac_status=$?

11602

- grep -v '^ *+' conftest.er1 >conftest.err

11603

- rm -f conftest.er1

11604

- cat conftest.err >&5

11605

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11606

- (exit $ac_status); } && {

11607

- test -z "$ac_cxx_werror_flag" ||

11608

- test ! -s conftest.err

11609

- } && test -s conftest.$ac_objext; then

11610

+if ac_fn_cxx_try_compile "$LINENO"; then :

11611

ac_cv_prog_cxx_g=yes

11612

else

11613

- echo "$as_me: failed program was:" >&5

11614

-sed 's/^/| /' conftest.$ac_ext >&5

11615

11616

- CXXFLAGS=""

11617

- cat >conftest.$ac_ext <<_ACEOF

11618

-/* confdefs.h. */

11619

-_ACEOF

11620

-cat confdefs.h >>conftest.$ac_ext

11621

-cat >>conftest.$ac_ext <<_ACEOF

11622

+ CXXFLAGS=""

11623

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11624

/* end confdefs.h. */

11625

11626

int

11627

@@ -8078,35 +7885,12 @@ main ()

11628

return 0;

11629

}

11630

_ACEOF

11631

-rm -f conftest.$ac_objext

11632

-if { (ac_try="$ac_compile"

11633

-case "(($ac_try" in

11634

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11635

- *) ac_try_echo=$ac_try;;

11636

-esac

11637

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11638

- (eval "$ac_compile") 2>conftest.er1

11639

- ac_status=$?

11640

- grep -v '^ *+' conftest.er1 >conftest.err

11641

- rm -f conftest.er1

11642

- cat conftest.err >&5

11643

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11644

- (exit $ac_status); } && {

11645

- test -z "$ac_cxx_werror_flag" ||

11646

- test ! -s conftest.err

11647

- } && test -s conftest.$ac_objext; then

11648

- :

11649

-else

11650

- echo "$as_me: failed program was:" >&5

11651

-sed 's/^/| /' conftest.$ac_ext >&5

11652

+if ac_fn_cxx_try_compile "$LINENO"; then :

11653

11654

- ac_cxx_werror_flag=$ac_save_cxx_werror_flag

11655

+else

11656

+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag

11657

CXXFLAGS="-g"

11658

- cat >conftest.$ac_ext <<_ACEOF

11659

-/* confdefs.h. */

11660

-_ACEOF

11661

-cat confdefs.h >>conftest.$ac_ext

11662

-cat >>conftest.$ac_ext <<_ACEOF

11663

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11664

/* end confdefs.h. */

11665

11666

int

11667

@@ -8117,42 +7901,18 @@ main ()

11668

return 0;

11669

}

11670

_ACEOF

11671

-rm -f conftest.$ac_objext

11672

-if { (ac_try="$ac_compile"

11673

-case "(($ac_try" in

11674

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11675

- *) ac_try_echo=$ac_try;;

11676

-esac

11677

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11678

- (eval "$ac_compile") 2>conftest.er1

11679

- ac_status=$?

11680

- grep -v '^ *+' conftest.er1 >conftest.err

11681

- rm -f conftest.er1

11682

- cat conftest.err >&5

11683

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11684

- (exit $ac_status); } && {

11685

- test -z "$ac_cxx_werror_flag" ||

11686

- test ! -s conftest.err

11687

- } && test -s conftest.$ac_objext; then

11688

+if ac_fn_cxx_try_compile "$LINENO"; then :

11689

ac_cv_prog_cxx_g=yes

11690

-else

11691

- echo "$as_me: failed program was:" >&5

11692

-sed 's/^/| /' conftest.$ac_ext >&5

11693

11694

11695

11696

11697

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

11698

11699

11700

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

11701

11702

11703

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

11704

ac_cxx_werror_flag=$ac_save_cxx_werror_flag

11705

11706

-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

11707

-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }

11708

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5

11709

+$as_echo "$ac_cv_prog_cxx_g" >&6; }

11710

if test "$ac_test_CXXFLAGS" = set; then

11711

CXXFLAGS=$ac_save_CXXFLAGS

11712

elif test $ac_cv_prog_cxx_g = yes; then

11713

@@ -8176,10 +7936,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

11714

11715

depcc="$CXX" am_compiler_list=

11716

11717

-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

11718

-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

11719

-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then

11720

- echo $ECHO_N "(cached) $ECHO_C" >&6

11721

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

11722

+$as_echo_n "checking dependency style of $depcc... " >&6; }

11723

+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :

11724

+ $as_echo_n "(cached) " >&6

11725

else

11726

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

11727

# We make a subdir and do the tests there. Otherwise we can end up

11728

@@ -8204,6 +7964,11 @@ else

11729

if test "$am_compiler_list" = ""; then

11730

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

11731

11732

+ am__universal=false

11733

+ case " $depcc " in #(

11734

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

11735

+ esac

11736

11737

for depmode in $am_compiler_list; do

11738

# Setup a source with many dependencies, because some compilers

11739

# like to wrap large dependency lists on column 80 (with \), and

11740

@@ -8221,7 +7986,17 @@ else

11741

done

11742

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

11743

11744

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

11745

+ # mode. It turns out that the SunPro C++ compiler does not properly

11746

+ # handle `-M -o', and we need to detect this. Also, some Intel

11747

+ # versions had trouble with output in subdirs

11748

+ am__obj=sub/conftest.${OBJEXT-o}

11749

+ am__minus_obj="-o $am__obj"

11750

case $depmode in

11751

+ gcc)

11752

+ # This depmode causes a compiler race in universal mode.

11753

+ test "$am__universal" = false || continue

11754

+ ;;

11755

nosideeffect)

11756

# after this tag, mechanisms are not by side-effect, so they'll

11757

# only be used when explicitly requested

11758

@@ -8231,19 +8006,23 @@ else

11759

break

11760

11761

;;

11762

+ msvisualcpp | msvcmsys)

11763

+ # This compiler won't grok `-c -o', but also, the minuso test has

11764

+ # not run yet. These depmodes are late enough in the game, and

11765

+ # so weak that their functioning should not be impacted.

11766

+ am__obj=conftest.${OBJEXT-o}

11767

+ am__minus_obj=

11768

+ ;;

11769

none) break ;;

11770

esac

11771

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

11772

- # mode. It turns out that the SunPro C++ compiler does not properly

11773

- # handle `-M -o', and we need to detect this.

11774

if depmode=$depmode \

11775

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

11776

+ source=sub/conftest.c object=$am__obj \

11777

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

11778

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

11779

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

11780

>/dev/null 2>conftest.err &&

11781

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

11782

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

11783

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

11784

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

11785

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

11786

# icc doesn't choke on unknown options, it will just issue warnings

11787

# or remarks (even with -Werror). So we grep stderr for any message

11788

@@ -8267,8 +8046,8 @@ else

11789

11790

11791

11792

-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5

11793

-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }

11794

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5

11795

+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }

11796

CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

11797

11798

11799

@@ -8290,11 +8069,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'

11800

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

11801

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

11802

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

11803

-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5

11804

-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }

11805

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5

11806

+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }

11807

if test -z "$CXXCPP"; then

11808

- if test "${ac_cv_prog_CXXCPP+set}" = set; then

11809

- echo $ECHO_N "(cached) $ECHO_C" >&6

11810

+ if test "${ac_cv_prog_CXXCPP+set}" = set; then :

11811

+ $as_echo_n "(cached) " >&6

11812

else

11813

# Double quotes because CXXCPP needs to be expanded

11814

for CXXCPP in "$CXX -E" "/lib/cpp"

11815

@@ -8308,11 +8087,7 @@ do

11816

# <limits.h> exists even on freestanding compilers.

11817

# On the NeXT, cc -E runs the code through the compiler's parser,

11818

# not just through cpp. "Syntax error" is here to catch this case.

11819

- cat >conftest.$ac_ext <<_ACEOF

11820

-/* confdefs.h. */

11821

-_ACEOF

11822

-cat confdefs.h >>conftest.$ac_ext

11823

-cat >>conftest.$ac_ext <<_ACEOF

11824

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11825

/* end confdefs.h. */

11826

#ifdef __STDC__

11827

# include <limits.h>

11828

@@ -8321,76 +8096,34 @@ cat >>conftest.$ac_ext <<_ACEOF

11829

#endif

11830

Syntax error

11831

_ACEOF

11832

-if { (ac_try="$ac_cpp conftest.$ac_ext"

11833

-case "(($ac_try" in

11834

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11835

- *) ac_try_echo=$ac_try;;

11836

-esac

11837

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11838

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

11839

- ac_status=$?

11840

- grep -v '^ *+' conftest.er1 >conftest.err

11841

- rm -f conftest.er1

11842

- cat conftest.err >&5

11843

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11844

- (exit $ac_status); } >/dev/null && {

11845

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

11846

- test ! -s conftest.err

11847

- }; then

11848

- :

11849

-else

11850

- echo "$as_me: failed program was:" >&5

11851

-sed 's/^/| /' conftest.$ac_ext >&5

11852

+if ac_fn_cxx_try_cpp "$LINENO"; then :

11853

11854

+else

11855

# Broken: fails on valid input.

11856

continue

11857

11858

11859

-rm -f conftest.err conftest.$ac_ext

11860

+rm -f conftest.err conftest.i conftest.$ac_ext

11861

11862

# OK, works on sane cases. Now check whether nonexistent headers

11863

# can be detected and how.

11864

- cat >conftest.$ac_ext <<_ACEOF

11865

-/* confdefs.h. */

11866

-_ACEOF

11867

-cat confdefs.h >>conftest.$ac_ext

11868

-cat >>conftest.$ac_ext <<_ACEOF

11869

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11870

/* end confdefs.h. */

11871

#include <ac_nonexistent.h>

11872

_ACEOF

11873

-if { (ac_try="$ac_cpp conftest.$ac_ext"

11874

-case "(($ac_try" in

11875

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11876

- *) ac_try_echo=$ac_try;;

11877

-esac

11878

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11879

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

11880

- ac_status=$?

11881

- grep -v '^ *+' conftest.er1 >conftest.err

11882

- rm -f conftest.er1

11883

- cat conftest.err >&5

11884

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11885

- (exit $ac_status); } >/dev/null && {

11886

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

11887

- test ! -s conftest.err

11888

- }; then

11889

+if ac_fn_cxx_try_cpp "$LINENO"; then :

11890

# Broken: success on invalid input.

11891

continue

11892

else

11893

- echo "$as_me: failed program was:" >&5

11894

-sed 's/^/| /' conftest.$ac_ext >&5

11895

11896

# Passes both tests.

11897

ac_preproc_ok=:

11898

break

11899

11900

11901

-rm -f conftest.err conftest.$ac_ext

11902

+rm -f conftest.err conftest.i conftest.$ac_ext

11903

11904

done

11905

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

11906

-rm -f conftest.err conftest.$ac_ext

11907

-if $ac_preproc_ok; then

11908

+rm -f conftest.i conftest.err conftest.$ac_ext

11909

+if $ac_preproc_ok; then :

11910

break

11911

11912

11913

@@ -8402,8 +8135,8 @@ fi

11914

else

11915

ac_cv_prog_CXXCPP=$CXXCPP

11916

11917

-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5

11918

-echo "${ECHO_T}$CXXCPP" >&6; }

11919

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5

11920

+$as_echo "$CXXCPP" >&6; }

11921

ac_preproc_ok=false

11922

for ac_cxx_preproc_warn_flag in '' yes

11923

11924

@@ -8413,11 +8146,7 @@ do

11925

# <limits.h> exists even on freestanding compilers.

11926

# On the NeXT, cc -E runs the code through the compiler's parser,

11927

# not just through cpp. "Syntax error" is here to catch this case.

11928

- cat >conftest.$ac_ext <<_ACEOF

11929

-/* confdefs.h. */

11930

-_ACEOF

11931

-cat confdefs.h >>conftest.$ac_ext

11932

-cat >>conftest.$ac_ext <<_ACEOF

11933

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11934

/* end confdefs.h. */

11935

#ifdef __STDC__

11936

# include <limits.h>

11937

@@ -8426,79 +8155,39 @@ cat >>conftest.$ac_ext <<_ACEOF

11938

#endif

11939

Syntax error

11940

_ACEOF

11941

-if { (ac_try="$ac_cpp conftest.$ac_ext"

11942

-case "(($ac_try" in

11943

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11944

- *) ac_try_echo=$ac_try;;

11945

-esac

11946

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11947

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

11948

- ac_status=$?

11949

- grep -v '^ *+' conftest.er1 >conftest.err

11950

- rm -f conftest.er1

11951

- cat conftest.err >&5

11952

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11953

- (exit $ac_status); } >/dev/null && {

11954

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

11955

- test ! -s conftest.err

11956

- }; then

11957

- :

11958

-else

11959

- echo "$as_me: failed program was:" >&5

11960

-sed 's/^/| /' conftest.$ac_ext >&5

11961

+if ac_fn_cxx_try_cpp "$LINENO"; then :

11962

11963

+else

11964

# Broken: fails on valid input.

11965

continue

11966

11967

11968

-rm -f conftest.err conftest.$ac_ext

11969

+rm -f conftest.err conftest.i conftest.$ac_ext

11970

11971

# OK, works on sane cases. Now check whether nonexistent headers

11972

# can be detected and how.

11973

- cat >conftest.$ac_ext <<_ACEOF

11974

-/* confdefs.h. */

11975

-_ACEOF

11976

-cat confdefs.h >>conftest.$ac_ext

11977

-cat >>conftest.$ac_ext <<_ACEOF

11978

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11979

/* end confdefs.h. */

11980

#include <ac_nonexistent.h>

11981

_ACEOF

11982

-if { (ac_try="$ac_cpp conftest.$ac_ext"

11983

-case "(($ac_try" in

11984

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11985

- *) ac_try_echo=$ac_try;;

11986

-esac

11987

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11988

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

11989

- ac_status=$?

11990

- grep -v '^ *+' conftest.er1 >conftest.err

11991

- rm -f conftest.er1

11992

- cat conftest.err >&5

11993

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11994

- (exit $ac_status); } >/dev/null && {

11995

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

11996

- test ! -s conftest.err

11997

- }; then

11998

+if ac_fn_cxx_try_cpp "$LINENO"; then :

11999

# Broken: success on invalid input.

12000

continue

12001

else

12002

- echo "$as_me: failed program was:" >&5

12003

-sed 's/^/| /' conftest.$ac_ext >&5

12004

12005

# Passes both tests.

12006

ac_preproc_ok=:

12007

break

12008

12009

12010

-rm -f conftest.err conftest.$ac_ext

12011

+rm -f conftest.err conftest.i conftest.$ac_ext

12012

12013

done

12014

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

12015

-rm -f conftest.err conftest.$ac_ext

12016

-if $ac_preproc_ok; then

12017

- :

12018

+rm -f conftest.i conftest.err conftest.$ac_ext

12019

+if $ac_preproc_ok; then :

12020

12021

else

4452

-if ac_fn_cxx_try_cpp "$LINENO"; then :

4453

- # Broken: success on invalid input.

4454

-continue

4455

-else

4456

- # Passes both tests.

4457

-ac_preproc_ok=:

4458

-break

4459

4460

4461

-rm -f conftest.err conftest.$ac_ext

4462

4463

done

4464

-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

4465

-rm -f conftest.err conftest.$ac_ext

4466

-if $ac_preproc_ok; then :

4467

4468

-else

4469

- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

4470

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

4471

-_lt_caught_CXX_error=yes; }

4472

-fi

4473

4474

-ac_ext=cpp

4475

-ac_cpp='$CXXCPP $CPPFLAGS'

4476

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

4477

-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

4478

-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

4479

4480

-else

12022

4481

- _lt_caught_CXX_error=yes

12023

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

12024

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

12025

+_lt_caught_CXX_error=yes; }

12026

12027

12028

ac_ext=cpp

12029

@@ -8525,7 +8214,7 @@ fi

12030

12031

12032

# Check whether --enable-shared was given.

12033

-if test "${enable_shared+set}" = set; then

12034

+if test "${enable_shared+set}" = set; then :

12035

enableval=$enable_shared; p=${PACKAGE-default}

12036

case $enableval in

12037

yes) enable_shared=yes ;;

12038

@@ -8556,7 +8245,7 @@ fi

12039

12040

12041

# Check whether --enable-static was given.

12042

-if test "${enable_static+set}" = set; then

12043

+if test "${enable_static+set}" = set; then :

12044

enableval=$enable_static; p=${PACKAGE-default}

12045

case $enableval in

12046

yes) enable_static=yes ;;

12047

@@ -8588,7 +8277,7 @@ fi

12048

12049

12050

# Check whether --with-pic was given.

12051

-if test "${with_pic+set}" = set; then

12052

+if test "${with_pic+set}" = set; then :

12053

withval=$with_pic; pic_mode="$withval"

12054

else

12055

pic_mode=default

12056

@@ -8604,7 +8293,7 @@ test -z "$pic_mode" && pic_mode=default

12057

12058

12059

# Check whether --enable-fast-install was given.

12060

-if test "${enable_fast_install+set}" = set; then

12061

+if test "${enable_fast_install+set}" = set; then :

12062

enableval=$enable_fast_install; p=${PACKAGE-default}

12063

case $enableval in

12064

yes) enable_fast_install=yes ;;

12065

@@ -8685,10 +8374,10 @@ if test -n "${ZSH_VERSION+set}" ; then

12066

setopt NO_GLOB_SUBST

12067

12068

12069

-{ echo "$as_me:$LINENO: checking for objdir" >&5

12070

-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }

12071

-if test "${lt_cv_objdir+set}" = set; then

12072

- echo $ECHO_N "(cached) $ECHO_C" >&6

12073

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5

12074

+$as_echo_n "checking for objdir... " >&6; }

12075

+if test "${lt_cv_objdir+set}" = set; then :

12076

+ $as_echo_n "(cached) " >&6

4482

-fi

4483

+func_stripname_cnf ()

4484

4485

+ case ${2} in

4486

+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;

4487

+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;

4488

+ esac

4489

+} # func_stripname_cnf

4490

4491

4492

4493

4494

@@ -8344,6 +8341,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo

4495

4496

4497

4498

4499

test -z "$LN_S" && LN_S="ln -s"

4500

4501

4502

@@ -8365,7 +8363,7 @@ fi

4503

4504

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5

4505

$as_echo_n "checking for objdir... " >&6; }

4506

-if test "${lt_cv_objdir+set}" = set; then :

4507

+if ${lt_cv_objdir+:} false; then :

4508

$as_echo_n "(cached) " >&6

12077

4509

else

12078

4510

rm -f .libs 2>/dev/null

12079

mkdir .libs 2>/dev/null

12080

@@ -8700,8 +8389,8 @@ else

12081

12082

rmdir .libs 2>/dev/null

12083

12084

-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5

12085

-echo "${ECHO_T}$lt_cv_objdir" >&6; }

12086

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5

12087

+$as_echo "$lt_cv_objdir" >&6; }

12088

objdir=$lt_cv_objdir

12089

12090

12091

@@ -8793,10 +8482,10 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file

12092

case $deplibs_check_method in

12093

file_magic*)

4511

@@ -8393,19 +8391,6 @@ _ACEOF

4512

4513

4514

4515

4516

4517

4518

4519

4520

4521

4522

4523

4524

4525

4526

4527

4528

case $host_os in

4529

aix3*)

4530

# AIX sometimes has problems with the GCC collect2 program. For some

4531

@@ -8418,23 +8403,6 @@ aix3*)

4532

;;

4533

esac

4534

4535

-# Sed substitution that helps us do robust quoting. It backslashifies

4536

-# metacharacters that are still active within double-quoted strings.

4537

-sed_quote_subst='s/$["`$\\]$/\\\1/g'

4538

4539

-# Same as above, but do not quote variable references.

4540

-double_quote_subst='s/$["`\\]$/\\\1/g'

4541

4542

-# Sed substitution to delay expansion of an escaped shell variable in a

4543

-# double_quote_subst'ed string.

4544

-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'

4545

4546

-# Sed substitution to delay expansion of an escaped single quote.

4547

-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'

4548

4549

-# Sed substitution to avoid accidental globbing in evaled expressions

4550

-no_glob_subst='s/\*/\\\*/g'

4551

4552

# Global variables:

4553

ofile=libtool

4554

can_build_shared=yes

4555

@@ -8463,7 +8431,7 @@ for cc_temp in $compiler""; do

4556

*) break;;

4557

esac

4558

done

4559

-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

4560

+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`

4561

4562

4563

# Only perform the check for file, if the check method requires it

4564

@@ -8473,7 +8441,7 @@ file_magic*)

12094

4565

if test "$file_magic_cmd" = '$MAGIC_CMD'; then

12095

- { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5

12096

-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }

12097

-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

12098

- echo $ECHO_N "(cached) $ECHO_C" >&6

12099

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5

12100

+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }

12101

+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :

12102

+ $as_echo_n "(cached) " >&6

4566

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5

4567

$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }

4568

-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :

4569

+if ${lt_cv_path_MAGIC_CMD+:} false; then :

4570

$as_echo_n "(cached) " >&6

12103

4571

else

12104

4572

case $MAGIC_CMD in

12105

[\\/*] | ?:[\\/]*)

12106

@@ -8846,11 +8535,11 @@ fi

12107

12108

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

12109

if test -n "$MAGIC_CMD"; then

12110

- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

12111

-echo "${ECHO_T}$MAGIC_CMD" >&6; }

12112

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5

12113

+$as_echo "$MAGIC_CMD" >&6; }

12114

else

12115

- { echo "$as_me:$LINENO: result: no" >&5

12116

-echo "${ECHO_T}no" >&6; }

12117

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

12118

+$as_echo "no" >&6; }

12119

12120

12121

12122

@@ -8859,10 +8548,10 @@ fi

12123

12124

if test -z "$lt_cv_path_MAGIC_CMD"; then

4573

@@ -8539,7 +8507,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then

12125

4574

if test -n "$ac_tool_prefix"; then

12126

- { echo "$as_me:$LINENO: checking for file" >&5

12127

-echo $ECHO_N "checking for file... $ECHO_C" >&6; }

12128

-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

12129

- echo $ECHO_N "(cached) $ECHO_C" >&6

12130

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5

12131

+$as_echo_n "checking for file... " >&6; }

12132

+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :

12133

+ $as_echo_n "(cached) " >&6

4575

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5

4576

$as_echo_n "checking for file... " >&6; }

4577

-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :

4578

+if ${lt_cv_path_MAGIC_CMD+:} false; then :

4579

$as_echo_n "(cached) " >&6

12134

4580

else

12135

4581

case $MAGIC_CMD in

12136

[\\/*] | ?:[\\/]*)

12137

@@ -8912,11 +8601,11 @@ fi

12138

12139

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

12140

if test -n "$MAGIC_CMD"; then

12141

- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

12142

-echo "${ECHO_T}$MAGIC_CMD" >&6; }

12143

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5

12144

+$as_echo "$MAGIC_CMD" >&6; }

12145

else

12146

- { echo "$as_me:$LINENO: result: no" >&5

12147

-echo "${ECHO_T}no" >&6; }

12148

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

12149

+$as_echo "no" >&6; }

12150

12151

12152

12153

@@ -8996,10 +8685,10 @@ lt_prog_compiler_no_builtin_flag=

4582

@@ -8672,11 +8640,16 @@ if test -n "$compiler"; then

4583

lt_prog_compiler_no_builtin_flag=

4584

12154

4585

if test "$GCC" = yes; then

12155

lt_prog_compiler_no_builtin_flag=' -fno-builtin'

4586

- lt_prog_compiler_no_builtin_flag=' -fno-builtin'

4587

+ case $cc_basename in

4588

+ nvcc*)

4589

+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;

4590

+ *)

4591

+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;

4592

+ esac

12156

4593

12157

- { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

12158

-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }

12159

-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then

12160

- echo $ECHO_N "(cached) $ECHO_C" >&6

12161

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

12162

+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }

12163

+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :

12164

+ $as_echo_n "(cached) " >&6

4594

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

4595

$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }

4596

-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :

4597

+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :

4598

$as_echo_n "(cached) " >&6

12165

4599

else

12166

4600

lt_cv_prog_compiler_rtti_exceptions=no

12167

ac_outfile=conftest.$ac_objext

12168

@@ -9014,11 +8703,11 @@ else

4601

@@ -8692,15 +8665,15 @@ else

12169

4602

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

12170

4603

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

12171

4604

-e 's:$: $lt_compiler_flag:'`

12172

- (eval echo "\"\$as_me:9017: $lt_compile\"" >&5)

12173

+ (eval echo "\"\$as_me:8706: $lt_compile\"" >&5)

4605

- (eval echo "\"\$as_me:8695: $lt_compile\"" >&5)

4606

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

12174

4607

(eval "$lt_compile" 2>conftest.err)

12175

4608

ac_status=$?

12176

4609

cat conftest.err >&5

12177

- echo "$as_me:9021: \$? = $ac_status" >&5

12178

+ echo "$as_me:8710: \$? = $ac_status" >&5

4610

- echo "$as_me:8699: \$? = $ac_status" >&5

4611

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12179

4612

if (exit $ac_status) && test -s "$ac_outfile"; then

12180

4613

# The compiler can only warn and ignore the option if not recognized

12181

4614

# So say no if there are warnings other than the usual output.

12182

@@ -9031,8 +8720,8 @@ else

12183

$RM conftest*

12184

12185

12186

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

12187

-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }

12188

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

12189

+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }

12190

12191

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

12192

lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"

12193

@@ -9051,8 +8740,8 @@ fi

4615

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

4616

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp

4617

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

4618

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

4619

lt_cv_prog_compiler_rtti_exceptions=yes

4620

@@ -8729,8 +8702,6 @@ fi

12194

4621

lt_prog_compiler_pic=

12195

4622

lt_prog_compiler_static=

12196

4623

12197

-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

12198

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

12199

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

12200

+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

4624

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

4625

-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

12201

4626

12202

4627

if test "$GCC" = yes; then

12203

4628

lt_prog_compiler_wl='-Wl,'

12204

@@ -9086,7 +8775,7 @@ echo $ECHO_N "checking for $compiler opt

12205

# PIC is the default for these OSes.

12206

;;

12207

12208

- mingw* | cygwin* | pw32* | os2*)

12209

+ mingw* | cygwin* | pw32* | os2* | cegcc*)

12210

# This hack is so that the source file can tell whether it is being

12211

# built for inclusion in a dll (and should export symbols for example).

12212

# Although the cygwin gcc ignores -fPIC, still need this for old-style

12213

@@ -9101,10 +8790,11 @@ echo $ECHO_N "checking for $compiler opt

12214

;;

12215

4629

@@ -8778,6 +8749,12 @@ $as_echo_n "checking for $compiler optio

4630

lt_prog_compiler_pic='-fno-common'

4631

;;

4632

4633

+ haiku*)

4634

+ # PIC is the default for Haiku.

4635

+ # The "-static" flag exists, but is broken.

4636

+ lt_prog_compiler_static=

4637

+ ;;

4638

12216

4639

hpux*)

12217

- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but

12218

- # not for PA HP-UX.

12219

+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit

12220

+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

12221

+ # sets the default TLS model and affects inlining.

12222

case $host_cpu in

12223

- hppa*64*|ia64*)

12224

+ hppa*64*)

12225

# +Z the default

4640

# PIC is the default for 64-bit PA HP-UX, but not for 32-bit

4641

# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

4642

@@ -8820,6 +8797,13 @@ $as_echo_n "checking for $compiler optio

4643

lt_prog_compiler_pic='-fPIC'

4644

;;

4645

esac

4646

4647

+ case $cc_basename in

4648

+ nvcc*) # Cuda Compiler Driver 2.2

4649

+ lt_prog_compiler_wl='-Xlinker '

4650

+ lt_prog_compiler_pic='-Xcompiler -fPIC'

4651

+ ;;

4652

+ esac

4653

else

4654

# PORTME Check for flag to pass linker flags through the system compiler.

4655

case $host_os in

4656

@@ -8882,7 +8866,13 @@ $as_echo_n "checking for $compiler optio

4657

lt_prog_compiler_pic='--shared'

4658

lt_prog_compiler_static='--static'

12226

4659

;;

12227

12228

@@ -9154,7 +8844,7 @@ echo $ECHO_N "checking for $compiler opt

12229

12230

;;

12231

12232

- mingw* | cygwin* | pw32* | os2*)

12233

+ mingw* | cygwin* | pw32* | os2* | cegcc*)

12234

# This hack is so that the source file can tell whether it is being

12235

# built for inclusion in a dll (and should export symbols for example).

12236

lt_prog_compiler_pic='-DDLL_EXPORT'

12237

@@ -9182,13 +8872,27 @@ echo $ECHO_N "checking for $compiler opt

12238

lt_prog_compiler_static='-non_shared'

12239

;;

12240

12241

- linux* | k*bsd*-gnu)

12242

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

12243

case $cc_basename in

12244

- icc* | ecc* | ifort*)

12245

+ # old Intel for x86_64 which still supported -KPIC.

12246

+ ecc*)

12247

lt_prog_compiler_wl='-Wl,'

12248

lt_prog_compiler_pic='-KPIC'

12249

lt_prog_compiler_static='-static'

12250

;;

12251

+ # icc used to be incompatible with GCC.

12252

+ # ICC 10 doesn't accept -KPIC any more.

12253

+ icc* | ifort*)

12254

+ lt_prog_compiler_wl='-Wl,'

12255

+ lt_prog_compiler_pic='-fPIC'

12256

+ lt_prog_compiler_static='-static'

12257

+ ;;

12258

+ # Lahey Fortran 8.1.

12259

+ lf95*)

12260

+ lt_prog_compiler_wl='-Wl,'

12261

+ lt_prog_compiler_pic='--shared'

12262

+ lt_prog_compiler_static='--static'

4660

- pgcc* | pgf77* | pgf90* | pgf95*)

4661

+ nagfor*)

4662

+ # NAG Fortran compiler

4663

+ lt_prog_compiler_wl='-Wl,-Wl,,'

4664

+ lt_prog_compiler_pic='-PIC'

4665

+ lt_prog_compiler_static='-Bstatic'

12263

4666

+ ;;

12264

pgcc* | pgf77* | pgf90* | pgf95*)

4667

+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)

12265

4668

# Portland Group compilers (*not* the Pentium gcc compiler,

12266

4669

# which looks to be a dead project)

12267

@@ -9308,8 +9012,8 @@ case $host_os in

4670

lt_prog_compiler_wl='-Wl,'

4671

@@ -8894,25 +8884,25 @@ $as_echo_n "checking for $compiler optio

4672

# All Alpha code is PIC.

4673

lt_prog_compiler_static='-non_shared'

4674

;;

4675

- xl*)

4676

- # IBM XL C 8.0/Fortran 10.1 on PPC

4677

+ xl* | bgxl* | bgf* | mpixl*)

4678

+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene

4679

lt_prog_compiler_wl='-Wl,'

4680

lt_prog_compiler_pic='-qpic'

4681

lt_prog_compiler_static='-qstaticlink'

4682

;;

4683

4684

case `$CC -V 2>&1 | sed 5q` in

4685

- *Sun\ C*)

4686

- # Sun C 5.9

4687

+ *Sun\ F* | *Sun*Fortran*)

4688

+ # Sun Fortran 8.3 passes all unrecognized flags to the linker

4689

lt_prog_compiler_pic='-KPIC'

4690

lt_prog_compiler_static='-Bstatic'

4691

- lt_prog_compiler_wl='-Wl,'

4692

+ lt_prog_compiler_wl=''

4693

;;

4694

- *Sun\ F*)

4695

- # Sun Fortran 8.3 passes all unrecognized flags to the linker

4696

+ *Sun\ C*)

4697

+ # Sun C 5.9

4698

lt_prog_compiler_pic='-KPIC'

4699

lt_prog_compiler_static='-Bstatic'

4700

- lt_prog_compiler_wl=''

4701

+ lt_prog_compiler_wl='-Wl,'

4702

;;

4703

esac

4704

;;

4705

@@ -8944,7 +8934,7 @@ $as_echo_n "checking for $compiler optio

4706

lt_prog_compiler_pic='-KPIC'

4707

lt_prog_compiler_static='-Bstatic'

4708

case $cc_basename in

4709

- f77* | f90* | f95*)

4710

+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

4711

lt_prog_compiler_wl='-Qoption ld ';;

4712

4713

lt_prog_compiler_wl='-Wl,';;

4714

@@ -9001,13 +8991,17 @@ case $host_os in

12268

4715

lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"

12269

4716

;;

12270

4717

esac

12271

-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5

12272

-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }

12273

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5

12274

+$as_echo "$lt_prog_compiler_pic" >&6; }

12275

12276

12277

12278

@@ -9320,10 +9024,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&

4718

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5

4719

-$as_echo "$lt_prog_compiler_pic" >&6; }

4720

4721

4722

4723

4724

4725

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

4726

+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

4727

+if ${lt_cv_prog_compiler_pic+:} false; then :

4728

+ $as_echo_n "(cached) " >&6

4729

+else

4730

+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic

4731

+fi

4732

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5

4733

+$as_echo "$lt_cv_prog_compiler_pic" >&6; }

4734

+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic

4735

4736

12279

4737

# Check to make sure the PIC flag actually works.

12280

4738

@@ -9015,7 +9009,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }

12281

4739

if test -n "$lt_prog_compiler_pic"; then

12282

- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

12283

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }

12284

-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then

12285

- echo $ECHO_N "(cached) $ECHO_C" >&6

12286

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

12287

+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }

12288

+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :

12289

+ $as_echo_n "(cached) " >&6

4740

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

4741

$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }

4742

-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :

4743

+if ${lt_cv_prog_compiler_pic_works+:} false; then :

4744

$as_echo_n "(cached) " >&6

12290

4745

else

12291

4746

lt_cv_prog_compiler_pic_works=no

12292

ac_outfile=conftest.$ac_objext

12293

@@ -9338,11 +9042,11 @@ else

4747

@@ -9031,15 +9025,15 @@ else

12294

4748

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

12295

4749

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

12296

4750

-e 's:$: $lt_compiler_flag:'`

12297

- (eval echo "\"\$as_me:9341: $lt_compile\"" >&5)

12298

+ (eval echo "\"\$as_me:9045: $lt_compile\"" >&5)

4751

- (eval echo "\"\$as_me:9034: $lt_compile\"" >&5)

4752

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

12299

4753

(eval "$lt_compile" 2>conftest.err)

12300

4754

ac_status=$?

12301

4755

cat conftest.err >&5

12302

- echo "$as_me:9345: \$? = $ac_status" >&5

12303

+ echo "$as_me:9049: \$? = $ac_status" >&5

4756

- echo "$as_me:9038: \$? = $ac_status" >&5

4757

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12304

4758

if (exit $ac_status) && test -s "$ac_outfile"; then

12305

4759

# The compiler can only warn and ignore the option if not recognized

12306

4760

# So say no if there are warnings other than the usual output.

12307

@@ -9355,8 +9059,8 @@ else

12308

$RM conftest*

12309

12310

12311

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5

12312

-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }

12313

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5

12314

+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }

12315

12316

if test x"$lt_cv_prog_compiler_pic_works" = xyes; then

12317

case $lt_prog_compiler_pic in

12318

@@ -9379,10 +9083,10 @@ fi

4761

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

4762

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp

4763

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

4764

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

4765

lt_cv_prog_compiler_pic_works=yes

4766

@@ -9068,13 +9062,18 @@ fi

4767

4768

4769

4770

4771

4772

4773

4774

4775

12319

4776

# Check to make sure the static flag actually works.

12320

4777

12321

4778

wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"

12322

-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

12323

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

12324

-if test "${lt_cv_prog_compiler_static_works+set}" = set; then

12325

- echo $ECHO_N "(cached) $ECHO_C" >&6

12326

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5

12327

+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

12328

+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :

12329

+ $as_echo_n "(cached) " >&6

4779

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5

4780

$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

4781

-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :

4782

+if ${lt_cv_prog_compiler_static_works+:} false; then :

4783

$as_echo_n "(cached) " >&6

12330

4784

else

12331

4785

lt_cv_prog_compiler_static_works=no

12332

save_LDFLAGS="$LDFLAGS"

12333

@@ -9407,8 +9111,8 @@ else

12334

LDFLAGS="$save_LDFLAGS"

12335

12336

12337

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5

12338

-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }

12339

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5

12340

+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }

12341

12342

if test x"$lt_cv_prog_compiler_static_works" = xyes; then

12343

12344

@@ -9422,10 +9126,10 @@ fi

12345

12346

12347

12348

- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

12349

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

12350

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then

12351

- echo $ECHO_N "(cached) $ECHO_C" >&6

12352

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

12353

+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

12354

+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

12355

+ $as_echo_n "(cached) " >&6

12356

else

12357

lt_cv_prog_compiler_c_o=no

12358

$RM -r conftest 2>/dev/null

12359

@@ -9443,11 +9147,11 @@ else

12360

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

12361

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

12362

-e 's:$: $lt_compiler_flag:'`

12363

- (eval echo "\"\$as_me:9446: $lt_compile\"" >&5)

12364

+ (eval echo "\"\$as_me:9150: $lt_compile\"" >&5)

12365

(eval "$lt_compile" 2>out/conftest.err)

12366

ac_status=$?

12367

cat out/conftest.err >&5

12368

- echo "$as_me:9450: \$? = $ac_status" >&5

12369

+ echo "$as_me:9154: \$? = $ac_status" >&5

12370

if (exit $ac_status) && test -s out/conftest2.$ac_objext

12371

then

12372

# The compiler can only warn and ignore the option if not recognized

12373

@@ -9469,18 +9173,18 @@ else

12374

$RM conftest*

12375

12376

12377

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

12378

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }

12379

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5

12380

+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }

12381

12382

12383

12384

12385

12386

12387

- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

12388

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

12389

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then

12390

- echo $ECHO_N "(cached) $ECHO_C" >&6

12391

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

12392

+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

12393

+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

12394

+ $as_echo_n "(cached) " >&6

12395

else

12396

lt_cv_prog_compiler_c_o=no

12397

$RM -r conftest 2>/dev/null

12398

@@ -9498,11 +9202,11 @@ else

12399

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

12400

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

12401

-e 's:$: $lt_compiler_flag:'`

12402

- (eval echo "\"\$as_me:9501: $lt_compile\"" >&5)

12403

+ (eval echo "\"\$as_me:9205: $lt_compile\"" >&5)

12404

(eval "$lt_compile" 2>out/conftest.err)

12405

ac_status=$?

12406

cat out/conftest.err >&5

12407

- echo "$as_me:9505: \$? = $ac_status" >&5

12408

+ echo "$as_me:9209: \$? = $ac_status" >&5

12409

if (exit $ac_status) && test -s out/conftest2.$ac_objext

12410

then

12411

# The compiler can only warn and ignore the option if not recognized

12412

@@ -9524,8 +9228,8 @@ else

12413

$RM conftest*

12414

12415

12416

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

12417

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }

12418

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5

12419

+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }

12420

12421

12422

12423

@@ -9533,19 +9237,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o"

12424

hard_links="nottested"

12425

if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then

12426

# do not overwrite the value of need_locks provided by the user

12427

- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

12428

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

12429

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5

12430

+$as_echo_n "checking if we can lock with hard links... " >&6; }

12431

hard_links=yes

12432

$RM conftest*

12433

ln conftest.a conftest.b 2>/dev/null && hard_links=no

12434

touch conftest.a

12435

ln conftest.a conftest.b 2>&5 || hard_links=no

12436

ln conftest.a conftest.b 2>/dev/null && hard_links=no

12437

- { echo "$as_me:$LINENO: result: $hard_links" >&5

12438

-echo "${ECHO_T}$hard_links" >&6; }

12439

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5

12440

+$as_echo "$hard_links" >&6; }

12441

if test "$hard_links" = no; then

12442

- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

12443

-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

12444

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

12445

+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

12446

need_locks=warn

12447

12448

else

12449

@@ -9557,8 +9261,8 @@ fi

12450

12451

12452

12453

- { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

12454

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

12455

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5

12456

+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

12457

12458

runpath_var=

12459

allow_undefined_flag=

12460

@@ -9602,7 +9306,7 @@ echo $ECHO_N "checking whether the $comp

12461

extract_expsyms_cmds=

12462

12463

case $host_os in

12464

- cygwin* | mingw* | pw32*)

12465

+ cygwin* | mingw* | pw32* | cegcc*)

12466

# FIXME: the MSVC++ port hasn't been tested in a loooong time

12467

# When not using gcc, we currently assume that we are using

12468

# Microsoft Visual C++.

12469

@@ -9617,6 +9321,9 @@ echo $ECHO_N "checking whether the $comp

4786

@@ -9087,7 +9086,7 @@ else

4787

if test -s conftest.err; then

4788

# Append any errors to the config.log.

4789

cat conftest.err 1>&5

4790

- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp

4791

+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp

4792

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

4793

if diff conftest.exp conftest.er2 >/dev/null; then

4794

lt_cv_prog_compiler_static_works=yes

4795

@@ -9117,7 +9116,7 @@ fi

4796

4797

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

4798

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

4799

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

4800

+if ${lt_cv_prog_compiler_c_o+:} false; then :

4801

$as_echo_n "(cached) " >&6

4802

else

4803

lt_cv_prog_compiler_c_o=no

4804

@@ -9136,16 +9135,16 @@ else

4805

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

4806

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

4807

-e 's:$: $lt_compiler_flag:'`

4808

- (eval echo "\"\$as_me:9139: $lt_compile\"" >&5)

4809

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

4810

(eval "$lt_compile" 2>out/conftest.err)

4811

ac_status=$?

4812

cat out/conftest.err >&5

4813

- echo "$as_me:9143: \$? = $ac_status" >&5

4814

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4815

if (exit $ac_status) && test -s out/conftest2.$ac_objext

4816

then

4817

# The compiler can only warn and ignore the option if not recognized

4818

# So say no if there are warnings

4819

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp

4820

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp

4821

$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2

4822

if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then

4823

lt_cv_prog_compiler_c_o=yes

4824

@@ -9172,7 +9171,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;

4825

4826

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

4827

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

4828

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

4829

+if ${lt_cv_prog_compiler_c_o+:} false; then :

4830

$as_echo_n "(cached) " >&6

4831

else

4832

lt_cv_prog_compiler_c_o=no

4833

@@ -9191,16 +9190,16 @@ else

4834

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

4835

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

4836

-e 's:$: $lt_compiler_flag:'`

4837

- (eval echo "\"\$as_me:9194: $lt_compile\"" >&5)

4838

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

4839

(eval "$lt_compile" 2>out/conftest.err)

4840

ac_status=$?

4841

cat out/conftest.err >&5

4842

- echo "$as_me:9198: \$? = $ac_status" >&5

4843

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4844

if (exit $ac_status) && test -s out/conftest2.$ac_objext

4845

then

4846

# The compiler can only warn and ignore the option if not recognized

4847

# So say no if there are warnings

4848

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp

4849

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp

4850

$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2

4851

if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then

4852

lt_cv_prog_compiler_c_o=yes

4853

@@ -9310,13 +9309,39 @@ $as_echo_n "checking whether the $compil

12470

4854

openbsd*)

12471

4855

with_gnu_ld=no

12472

4856

;;

12473

+ linux* | k*bsd*-gnu)

12474

+ link_all_deplibs=no

12475

+ ;;

4857

- linux* | k*bsd*-gnu)

4858

+ linux* | k*bsd*-gnu | gnu*)

4859

link_all_deplibs=no

4860

;;

12476

4861

esac

12477

4862

12478

4863

ld_shlibs=yes

12479

@@ -9638,6 +9345,7 @@ echo $ECHO_N "checking whether the $comp

12480

12481

supports_anon_versioning=no

12482

case `$LD -v 2>&1` in

12483

+ *GNU\ gold*) supports_anon_versioning=yes ;;

12484

*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11

12485

*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...

12486

*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

12487

@@ -9689,7 +9397,7 @@ _LT_EOF

4864

4865

+ # On some targets, GNU ld is compatible enough with the native linker

4866

+ # that we're better off using the native interface for both.

4867

+ lt_use_gnu_ld_interface=no

4868

if test "$with_gnu_ld" = yes; then

4869

+ case $host_os in

4870

+ aix*)

4871

+ # The AIX port of GNU ld has always aspired to compatibility

4872

+ # with the native linker. However, as the warning in the GNU ld

4873

+ # block says, versions before 2.19.5* couldn't really create working

4874

+ # shared libraries, regardless of the interface used.

4875

+ case `$LD -v 2>&1` in

4876

+ *\ $GNU\ Binutils$\ 2.19.5*) ;;

4877

+ *\ $GNU\ Binutils$\ 2.[2-9]*) ;;

4878

+ *\ $GNU\ Binutils$\ [3-9]*) ;;

4879

+ *)

4880

+ lt_use_gnu_ld_interface=yes

4881

+ ;;

4882

+ esac

4883

+ ;;

4884

+ *)

4885

+ lt_use_gnu_ld_interface=yes

4886

+ ;;

4887

+ esac

4888

+ fi

4889

4890

+ if test "$lt_use_gnu_ld_interface" = yes; then

4891

# If archive_cmds runs LD, not CC, wlarc should be empty

4892

wlarc='${wl}'

4893

4894

@@ -9350,11 +9375,12 @@ $as_echo_n "checking whether the $compil

4895

ld_shlibs=no

4896

cat <<_LT_EOF 1>&2

4897

4898

-*** Warning: the GNU linker, at least up to release 2.9.1, is reported

4899

+*** Warning: the GNU linker, at least up to release 2.19, is reported

4900

*** to be unable to reliably create shared libraries on AIX.

4901

*** Therefore, libtool is disabling shared libraries support. If you

4902

-*** really care for shared libraries, you may want to modify your PATH

4903

-*** so that a non-GNU linker is found, and then restart.

4904

+*** really care for shared libraries, you may want to install binutils

4905

+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.

4906

+*** You will then need to restart the configuration process.

4907

4908

_LT_EOF

12488

4909

12489

;;

12490

12491

- cygwin* | mingw* | pw32*)

12492

+ cygwin* | mingw* | pw32* | cegcc*)

4910

@@ -9390,10 +9416,12 @@ _LT_EOF

12493

4911

# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,

12494

4912

# as there is no search path for DLLs.

12495

4913

hardcode_libdir_flag_spec='-L$libdir'

12496

@@ -9729,7 +9437,7 @@ _LT_EOF

12497

archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

4914

+ export_dynamic_flag_spec='${wl}--export-all-symbols'

4915

allow_undefined_flag=unsupported

4916

always_export_symbols=no

4917

enable_shared_with_static_runtimes=yes

4918

4919

+ 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'

4920

+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'

4921

4922

if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

4923

archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

4924

@@ -9411,6 +9439,11 @@ _LT_EOF

4925

12498

4926

;;

12499

4927

12500

- gnu* | linux* | tpf* | k*bsd*-gnu)

12501

+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)

12502

tmp_diet=no

12503

if test "$host_os" = linux-dietlibc; then

12504

case $cc_basename in

12505

@@ -9755,6 +9463,9 @@ _LT_EOF

12506

tmp_addflag=' -i_dynamic -nofor_main' ;;

12507

ifc* | ifort*) # Intel Fortran compiler

12508

tmp_addflag=' -nofor_main' ;;

12509

+ lf95*) # Lahey Fortran 8.1

12510

+ whole_archive_flag_spec=

12511

+ tmp_sharedflag='--shared' ;;

12512

xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)

4928

+ haiku*)

4929

+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

4930

+ link_all_deplibs=yes

4931

+ ;;

4932

4933

interix[3-9]*)

4934

hardcode_direct=no

4935

hardcode_shlibpath_var=no

4936

@@ -9436,15 +9469,16 @@ _LT_EOF

4937

if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \

4938

&& test "$tmp_diet" = no

4939

then

4940

- tmp_addflag=

4941

+ tmp_addflag=' $pic_flag'

4942

tmp_sharedflag='-shared'

4943

case $cc_basename,$host_cpu in

4944

pgcc*) # Portland Group C compiler

4945

- 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'

4946

+ 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'

4947

tmp_addflag=' $pic_flag'

4948

;;

4949

- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers

4950

4951

+ pgf77* | pgf90* | pgf95* | pgfortran*)

4952

+ # Portland Group f77 and f90 compilers

4953

4954

tmp_addflag=' $pic_flag -Mnomain' ;;

4955

ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64

4956

tmp_addflag=' -i_dynamic' ;;

4957

@@ -9455,13 +9489,17 @@ _LT_EOF

4958

lf95*) # Lahey Fortran 8.1

4959

whole_archive_flag_spec=

4960

tmp_sharedflag='--shared' ;;

4961

- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)

4962

+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)

12513

4963

tmp_sharedflag='-qmkshrobj'

12514

4964

tmp_addflag= ;;

12515

@@ -9796,7 +9507,7 @@ _LT_EOF

12516

12517

;;

4965

+ nvcc*) # Cuda Compiler Driver 2.2

4966

4967

+ compiler_needs_object=yes

4968

+ ;;

4969

esac

4970

case `$CC -V 2>&1 | sed 5q` in

4971

*Sun\ C*) # Sun C 5.9

4972

- 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'

4973

+ 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'

4974

compiler_needs_object=yes

4975

tmp_sharedflag='-G' ;;

4976

*Sun\ F*) # Sun Fortran 8.3

4977

@@ -9477,17 +9515,17 @@ _LT_EOF

4978

12518

4979

12519

- netbsd*)

12520

+ netbsd* | netbsdelf*-gnu)

12521

if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

4980

case $cc_basename in

4981

- xlf*)

4982

+ xlf* | bgf* | bgxlf* | mpixlf*)

4983

# IBM XL Fortran 10.1 on PPC cannot create shared libs itself

4984

whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'

4985

hardcode_libdir_flag_spec=

4986

hardcode_libdir_flag_spec_ld='-rpath $libdir'

4987

- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'

4988

+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

4989

if test "x$supports_anon_versioning" = xyes; then

4990

archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~

4991

cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~

4992

echo "local: *; };" >> $output_objdir/$libname.ver~

4993

- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

4994

+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

4995

4996

;;

4997

esac

4998

@@ -9501,8 +9539,8 @@ _LT_EOF

12522

4999

archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

12523

5000

wlarc=

12524

@@ -9971,6 +9682,7 @@ _LT_EOF

12525

if test "$aix_use_runtimelinking" = yes; then

12526

shared_flag="$shared_flag "'${wl}-G'

12527

12528

+ link_all_deplibs=no

12529

else

12530

# not using gcc

12531

if test "$host_cpu" = ia64; then

12532

@@ -9986,6 +9698,7 @@ _LT_EOF

12533

12534

12535

12536

+ export_dynamic_flag_spec='${wl}-bexpall'

12537

# It seems that -bexpall does not export symbols beginning with

12538

# underscore (_), so it is better to generate a list of symbols to export.

12539

always_export_symbols=yes

12540

@@ -9995,11 +9708,7 @@ _LT_EOF

5001

else

5002

- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

5003

- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

5004

+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

5005

+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

5006

5007

;;

5008

5009

@@ -9520,8 +9558,8 @@ _LT_EOF

5010

5011

_LT_EOF

5012

elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then

5013

- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

5014

- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

5015

+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

5016

+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

5017

else

5018

ld_shlibs=no

5019

5020

@@ -9567,8 +9605,8 @@ _LT_EOF

5021

5022

5023

if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then

5024

- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

5025

- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

5026

+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

5027

+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

5028

else

5029

ld_shlibs=no

5030

5031

@@ -9608,8 +9646,10 @@ _LT_EOF

5032

else

5033

# If we're using GNU nm, then we don't want the "-C" option.

5034

# -C means demangle to AIX nm, but means don't demangle with GNU nm

5035

+ # Also, AIX nm treats weak defined symbols like other global

5036

+ # defined symbols, whereas GNU nm marks them as "W".

5037

if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then

5038

- 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'

5039

+ 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'

5040

else

5041

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'

5042

5043

@@ -9697,7 +9737,13 @@ _LT_EOF

12541

5044

allow_undefined_flag='-berok'

12542

5045

# Determine the default libpath from the value encoded in an

12543

5046

# empty executable.

12544

- cat >conftest.$ac_ext <<_ACEOF

12545

-/* confdefs.h. */

12546

-_ACEOF

12547

-cat confdefs.h >>conftest.$ac_ext

12548

-cat >>conftest.$ac_ext <<_ACEOF

12549

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5047

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5048

+ if test "${lt_cv_aix_libpath+set}" = set; then

5049

+ aix_libpath=$lt_cv_aix_libpath

5050

+else

5051

+ if ${lt_cv_aix_libpath_+:} false; then :

5052

+ $as_echo_n "(cached) " >&6

5053

+else

5054

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

12550

5055

/* end confdefs.h. */

12551

5056

12552

5057

int

12553

@@ -10010,24 +9719,7 @@ main ()

12554

return 0;

12555

}

5058

@@ -9710,25 +9756,32 @@ main ()

12556

5059

_ACEOF

12557

-rm -f conftest.$ac_objext conftest$ac_exeext

12558

-if { (ac_try="$ac_link"

12559

-case "(($ac_try" in

12560

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12561

- *) ac_try_echo=$ac_try;;

12562

-esac

12563

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12564

- (eval "$ac_link") 2>conftest.er1

12565

- ac_status=$?

12566

- grep -v '^ *+' conftest.er1 >conftest.err

12567

- rm -f conftest.er1

12568

- cat conftest.err >&5

12569

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12570

- (exit $ac_status); } && {

12571

- test -z "$ac_c_werror_flag" ||

12572

- test ! -s conftest.err

12573

- } && test -s conftest$ac_exeext &&

12574

- $as_test_x conftest$ac_exeext; then

12575

+if ac_fn_c_try_link "$LINENO"; then :

5060

if ac_fn_c_try_link "$LINENO"; then :

12576

5061

12577

lt_aix_libpath_sed='

12578

/Import File Strings/,/^$/ {

12579

@@ -10041,15 +9733,9 @@ aix_libpath=`dump -H conftest$ac_exeext

12580

if test -z "$aix_libpath"; then

12581

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

12582

12583

-else

12584

- echo "$as_me: failed program was:" >&5

12585

-sed 's/^/| /' conftest.$ac_ext >&5

12586

12587

12588

12589

12590

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12591

- conftest$ac_exeext conftest.$ac_ext

12592

+rm -f core conftest.err conftest.$ac_objext \

12593

+ conftest$ac_exeext conftest.$ac_ext

12594

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

5062

-lt_aix_libpath_sed='

5063

- /Import File Strings/,/^$/ {

5064

- /^0/ {

5065

- s/^0 *$.*$$/\1/

5066

- p

5067

- }

5068

- }'

5069

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

5070

-# Check for a 64-bit object if we didn't find anything.

5071

-if test -z "$aix_libpath"; then

5072

- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

5073

-fi

5074

+ lt_aix_libpath_sed='

5075

+ /Import File Strings/,/^$/ {

5076

+ /^0/ {

5077

+ s/^0 *$[^ ]*$ *$/\1/

5078

+ p

5079

+ }

5080

+ }'

5081

+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

5082

+ # Check for a 64-bit object if we didn't find anything.

5083

+ if test -z "$lt_cv_aix_libpath_"; then

5084

+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

5085

+ fi

5086

5087

rm -f core conftest.err conftest.$ac_objext \

5088

conftest$ac_exeext conftest.$ac_ext

5089

-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

5090

+ if test -z "$lt_cv_aix_libpath_"; then

5091

+ lt_cv_aix_libpath_="/usr/lib:/lib"

5092

+ fi

5093

5094

+fi

5095

5096

+ aix_libpath=$lt_cv_aix_libpath_

5097

+fi

12595

5098

12596

5099

hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"

12597

@@ -10062,11 +9748,7 @@ if test -z "$aix_libpath"; then aix_libp

5100

- 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"

5101

+ 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"

5102

else

5103

if test "$host_cpu" = ia64; then

5104

hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'

5105

@@ -9737,7 +9790,13 @@ if test -z "$aix_libpath"; then aix_libp

12598

5106

else

12599

5107

# Determine the default libpath from the value encoded in an

12600

5108

# empty executable.

12601

- cat >conftest.$ac_ext <<_ACEOF

12602

-/* confdefs.h. */

12603

-_ACEOF

12604

-cat confdefs.h >>conftest.$ac_ext

12605

-cat >>conftest.$ac_ext <<_ACEOF

12606

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5109

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5110

+ if test "${lt_cv_aix_libpath+set}" = set; then

5111

+ aix_libpath=$lt_cv_aix_libpath

5112

+else

5113

+ if ${lt_cv_aix_libpath_+:} false; then :

5114

+ $as_echo_n "(cached) " >&6

5115

+else

5116

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

12607

5117

/* end confdefs.h. */

12608

5118

12609

5119

int

12610

@@ -10077,24 +9759,7 @@ main ()

12611

return 0;

12612

}

5120

@@ -9750,30 +9809,42 @@ main ()

12613

5121

_ACEOF

12614

-rm -f conftest.$ac_objext conftest$ac_exeext

12615

-if { (ac_try="$ac_link"

12616

-case "(($ac_try" in

12617

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12618

- *) ac_try_echo=$ac_try;;

12619

-esac

12620

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12621

- (eval "$ac_link") 2>conftest.er1

12622

- ac_status=$?

12623

- grep -v '^ *+' conftest.er1 >conftest.err

12624

- rm -f conftest.er1

12625

- cat conftest.err >&5

12626

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12627

- (exit $ac_status); } && {

12628

- test -z "$ac_c_werror_flag" ||

12629

- test ! -s conftest.err

12630

- } && test -s conftest$ac_exeext &&

12631

- $as_test_x conftest$ac_exeext; then

12632

+if ac_fn_c_try_link "$LINENO"; then :

5122

if ac_fn_c_try_link "$LINENO"; then :

12633

5123

12634

lt_aix_libpath_sed='

12635

/Import File Strings/,/^$/ {

12636

@@ -10108,15 +9773,9 @@ aix_libpath=`dump -H conftest$ac_exeext

12637

if test -z "$aix_libpath"; then

12638

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

12639

12640

-else

12641

- echo "$as_me: failed program was:" >&5

12642

-sed 's/^/| /' conftest.$ac_ext >&5

12643

12644

12645

12646

12647

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12648

- conftest$ac_exeext conftest.$ac_ext

12649

+rm -f core conftest.err conftest.$ac_objext \

12650

+ conftest$ac_exeext conftest.$ac_ext

12651

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

5124

-lt_aix_libpath_sed='

5125

- /Import File Strings/,/^$/ {

5126

- /^0/ {

5127

- s/^0 *$.*$$/\1/

5128

- p

5129

- }

5130

- }'

5131

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

5132

-# Check for a 64-bit object if we didn't find anything.

5133

-if test -z "$aix_libpath"; then

5134

- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

5135

-fi

5136

+ lt_aix_libpath_sed='

5137

+ /Import File Strings/,/^$/ {

5138

+ /^0/ {

5139

+ s/^0 *$[^ ]*$ *$/\1/

5140

+ p

5141

+ }

5142

+ }'

5143

+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

5144

+ # Check for a 64-bit object if we didn't find anything.

5145

+ if test -z "$lt_cv_aix_libpath_"; then

5146

+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

5147

+ fi

5148

5149

rm -f core conftest.err conftest.$ac_objext \

5150

conftest$ac_exeext conftest.$ac_ext

5151

-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

5152

+ if test -z "$lt_cv_aix_libpath_"; then

5153

+ lt_cv_aix_libpath_="/usr/lib:/lib"

5154

+ fi

5155

5156

+fi

5157

5158

+ aix_libpath=$lt_cv_aix_libpath_

5159

+fi

12652

5160

12653

5161

hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"

12654

@@ -10152,7 +9811,7 @@ if test -z "$aix_libpath"; then aix_libp

12655

export_dynamic_flag_spec=-rdynamic

12656

;;

12657

12658

- cygwin* | mingw* | pw32*)

12659

+ cygwin* | mingw* | pw32* | cegcc*)

12660

# When not using gcc, we currently assume that we are using

5162

# Warning - without using the other run time loading flags,

5163

# -berok will link without error, but may produce a broken library.

5164

no_undefined_flag=' ${wl}-bernotok'

5165

allow_undefined_flag=' ${wl}-berok'

5166

- # Exported symbols can be pulled into shared objects from archives

5167

- whole_archive_flag_spec='$convenience'

5168

+ if test "$with_gnu_ld" = yes; then

5169

+ # We only use this code for GNU lds that support --whole-archive.

5170

+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'

5171

+ else

5172

+ # Exported symbols can be pulled into shared objects from archives

5173

+ whole_archive_flag_spec='$convenience'

5174

+ fi

5175

archive_cmds_need_lc=yes

5176

# This is similar to how AIX traditionally builds its shared libraries.

5177

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'

5178

@@ -9805,20 +9876,63 @@ if test -z "$aix_libpath"; then aix_libp

12661

5179

# Microsoft Visual C++.

12662

5180

# hardcode_libdir_flag_spec is actually meaningless, as there is

12663

@@ -10183,7 +9842,11 @@ if test -z "$aix_libpath"; then aix_libp

12664

whole_archive_flag_spec=''

5181

# no search path for DLLs.

5182

- hardcode_libdir_flag_spec=' '

5183

- allow_undefined_flag=unsupported

5184

- # Tell ltmain to make .lib files, not .a files.

5185

- libext=lib

5186

- # Tell ltmain to make .dll files, not .so files.

5187

- shrext_cmds=".dll"

5188

- # FIXME: Setting linknames here is a bad hack.

5189

- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='

5190

- # The linker will automatically build a .lib file if we build a DLL.

5191

- old_archive_from_new_cmds='true'

5192

- # FIXME: Should let the user specify the lib program.

5193

- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'

5194

- fix_srcfile_path='`cygpath -w "$srcfile"`'

5195

- enable_shared_with_static_runtimes=yes

5196

+ case $cc_basename in

5197

+ cl*)

5198

+ # Native MSVC

5199

+ hardcode_libdir_flag_spec=' '

5200

+ allow_undefined_flag=unsupported

5201

+ always_export_symbols=yes

5202

+ file_list_spec='@'

5203

+ # Tell ltmain to make .lib files, not .a files.

5204

+ libext=lib

5205

+ # Tell ltmain to make .dll files, not .so files.

5206

+ shrext_cmds=".dll"

5207

+ # FIXME: Setting linknames here is a bad hack.

5208

+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='

5209

+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

5210

+ sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;

5211

+ else

5212

+ sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;

5213

+ fi~

5214

+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~

5215

+ linknames='

5216

+ # The linker will not automatically build a static lib if we build a DLL.

5217

+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'

5218

+ enable_shared_with_static_runtimes=yes

5219

5220

+ # Don't use ranlib

5221

+ old_postinstall_cmds='chmod 644 $oldlib'

5222

+ postlink_cmds='lt_outputfile="@OUTPUT@"~

5223

+ lt_tool_outputfile="@TOOL_OUTPUT@"~

5224

+ case $lt_outputfile in

5225

+ *.exe|*.EXE) ;;

5226

+ *)

5227

+ lt_outputfile="$lt_outputfile.exe"

5228

+ lt_tool_outputfile="$lt_tool_outputfile.exe"

5229

+ ;;

5230

+ esac~

5231

+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then

5232

+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;

5233

+ $RM "$lt_outputfile.manifest";

5234

+ fi'

5235

+ ;;

5236

+ *)

5237

+ # Assume MSVC wrapper

5238

+ hardcode_libdir_flag_spec=' '

5239

+ allow_undefined_flag=unsupported

5240

+ # Tell ltmain to make .lib files, not .a files.

5241

+ libext=lib

5242

+ # Tell ltmain to make .dll files, not .so files.

5243

+ shrext_cmds=".dll"

5244

+ # FIXME: Setting linknames here is a bad hack.

5245

+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='

5246

+ # The linker will automatically build a .lib file if we build a DLL.

5247

+ old_archive_from_new_cmds='true'

5248

+ # FIXME: Should let the user specify the lib program.

5249

+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'

5250

+ enable_shared_with_static_runtimes=yes

5251

+ ;;

5252

+ esac

5253

;;

5254

5255

darwin* | rhapsody*)

5256

@@ -9828,7 +9942,11 @@ if test -z "$aix_libpath"; then aix_libp

5257

hardcode_direct=no

5258

hardcode_automatic=yes

5259

hardcode_shlibpath_var=unsupported

5260

- whole_archive_flag_spec=''

5261

+ if test "$lt_cv_ld_force_load" = "yes"; then

5262

+ 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\"`'

5263

+ else

5264

+ whole_archive_flag_spec=''

5265

+ fi

12665

5266

link_all_deplibs=yes

12666

5267

allow_undefined_flag="$_lt_dar_allow_undefined"

12667

- if test "$GCC" = "yes"; then

12668

+ case $cc_basename in

12669

+ ifort*) _lt_dar_can_shared=yes ;;

12670

+ *) _lt_dar_can_shared=$GCC ;;

12671

+ esac

12672

+ if test "$_lt_dar_can_shared" = "yes"; then

12673

output_verbose_link_cmd=echo

5268

case $cc_basename in

5269

@@ -9836,7 +9954,7 @@ if test -z "$aix_libpath"; then aix_libp

5270

*) _lt_dar_can_shared=$GCC ;;

5271

esac

5272

if test "$_lt_dar_can_shared" = "yes"; then

5273

- output_verbose_link_cmd=echo

5274

+ output_verbose_link_cmd=func_echo_all

12674

5275

archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"

12675

5276

module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

12676

@@ -10275,7 +9938,7 @@ if test -z "$aix_libpath"; then aix_libp

5277

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}"

5278

@@ -9879,7 +9997,7 @@ if test -z "$aix_libpath"; then aix_libp

5279

5280

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

5281

freebsd* | dragonfly*)

5282

- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

5283

+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

5284

hardcode_libdir_flag_spec='-R$libdir'

5285

hardcode_direct=yes

5286

hardcode_shlibpath_var=no

5287

@@ -9887,7 +10005,7 @@ if test -z "$aix_libpath"; then aix_libp

5288

5289

hpux9*)

5290

if test "$GCC" = yes; then

5291

- 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'

5292

+ 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'

5293

else

5294

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'

5295

5296

@@ -9902,8 +10020,8 @@ if test -z "$aix_libpath"; then aix_libp

5297

;;

5298

5299

hpux10*)

5300

- if test "$GCC" = yes -a "$with_gnu_ld" = no; then

5301

- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

5302

+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then

5303

+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

5304

else

5305

archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

5306

5307

@@ -9921,16 +10039,16 @@ if test -z "$aix_libpath"; then aix_libp

5308

;;

5309

5310

hpux11*)

5311

- if test "$GCC" = yes -a "$with_gnu_ld" = no; then

5312

+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then

5313

case $host_cpu in

5314

hppa*64*)

12677

5315

archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

12678

5316

;;

12679

5317

ia64*)

12680

- archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

12681

+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

12682

;;

12683

12684

archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

12685

@@ -10324,38 +9987,16 @@ if test -z "$aix_libpath"; then aix_libp

5318

- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

5319

+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

5320

;;

5321

5322

- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

5323

+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

5324

;;

5325

esac

5326

else

5327

@@ -9942,7 +10060,46 @@ if test -z "$aix_libpath"; then aix_libp

5328

archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

5329

;;

5330

5331

- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

5332

5333

+ # Older versions of the 11.00 compiler do not understand -b yet

5334

+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)

5335

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5

5336

+$as_echo_n "checking if $CC understands -b... " >&6; }

5337

+if ${lt_cv_prog_compiler__b+:} false; then :

5338

+ $as_echo_n "(cached) " >&6

5339

+else

5340

+ lt_cv_prog_compiler__b=no

5341

+ save_LDFLAGS="$LDFLAGS"

5342

+ LDFLAGS="$LDFLAGS -b"

5343

+ echo "$lt_simple_link_test_code" > conftest.$ac_ext

5344

+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

5345

+ # The linker can only warn and ignore the option if not recognized

5346

+ # So say no if there are warnings

5347

+ if test -s conftest.err; then

5348

+ # Append any errors to the config.log.

5349

+ cat conftest.err 1>&5

5350

+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp

5351

+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

5352

+ if diff conftest.exp conftest.er2 >/dev/null; then

5353

+ lt_cv_prog_compiler__b=yes

5354

+ fi

5355

+ else

5356

+ lt_cv_prog_compiler__b=yes

5357

+ fi

5358

+ fi

5359

+ $RM -r conftest*

5360

+ LDFLAGS="$save_LDFLAGS"

5361

5362

+fi

5363

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5

5364

+$as_echo "$lt_cv_prog_compiler__b" >&6; }

5365

5366

+if test x"$lt_cv_prog_compiler__b" = xyes; then

5367

+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

5368

+else

5369

+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

5370

+fi

5371

5372

;;

5373

esac

5374

5375

@@ -9970,26 +10127,39 @@ if test -z "$aix_libpath"; then aix_libp

5376

5377

irix5* | irix6* | nonstopux*)

5378

if test "$GCC" = yes; then

5379

- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

5380

+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

5381

# Try to use the -exported_symbol ld option, if it does not

5382

# work, assume that -exports_file does not work either and

12686

5383

# implicitly export all symbols.

12687

save_LDFLAGS="$LDFLAGS"

12688

LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

12689

- cat >conftest.$ac_ext <<_ACEOF

12690

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

12691

+/* end confdefs.h. */

12692

int foo(void) {}

5384

- save_LDFLAGS="$LDFLAGS"

5385

- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

5386

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5387

+ # This should be the same for all languages, so no per-tag cache variable.

5388

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5

5389

+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }

5390

+if ${lt_cv_irix_exported_symbol+:} false; then :

5391

+ $as_echo_n "(cached) " >&6

5392

+else

5393

+ save_LDFLAGS="$LDFLAGS"

5394

+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

5395

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5396

/* end confdefs.h. */

5397

-int foo(void) {}

5398

+int foo (void) { return 0; }

12693

5399

_ACEOF

12694

-rm -f conftest.$ac_objext conftest$ac_exeext

12695

-if { (ac_try="$ac_link"

12696

-case "(($ac_try" in

12697

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12698

- *) ac_try_echo=$ac_try;;

12699

-esac

12700

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12701

- (eval "$ac_link") 2>conftest.er1

12702

- ac_status=$?

12703

- grep -v '^ *+' conftest.er1 >conftest.err

12704

- rm -f conftest.er1

12705

- cat conftest.err >&5

12706

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12707

- (exit $ac_status); } && {

12708

- test -z "$ac_c_werror_flag" ||

12709

- test ! -s conftest.err

12710

- } && test -s conftest$ac_exeext &&

12711

- $as_test_x conftest$ac_exeext; then

12712

+if ac_fn_c_try_link "$LINENO"; then :

12713

archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'

12714

12715

-else

12716

- echo "$as_me: failed program was:" >&5

12717

-sed 's/^/| /' conftest.$ac_ext >&5

12718

12719

5400

if ac_fn_c_try_link "$LINENO"; then :

5401

- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'

5402

5403

+ lt_cv_irix_exported_symbol=yes

5404

+else

5405

+ lt_cv_irix_exported_symbol=no

12720

5406

12721

12722

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12723

- conftest$ac_exeext conftest.$ac_ext

12724

+rm -f core conftest.err conftest.$ac_objext \

12725

+ conftest$ac_exeext conftest.$ac_ext

12726

LDFLAGS="$save_LDFLAGS"

5407

rm -f core conftest.err conftest.$ac_objext \

5408

conftest$ac_exeext conftest.$ac_ext

5409

- LDFLAGS="$save_LDFLAGS"

5410

+ LDFLAGS="$save_LDFLAGS"

5411

+fi

5412

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5

5413

+$as_echo "$lt_cv_irix_exported_symbol" >&6; }

5414

+ if test "$lt_cv_irix_exported_symbol" = yes; then

5415

+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'

5416

+ fi

12727

5417

else

12728

archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

12729

@@ -10368,7 +10009,7 @@ rm -f core conftest.err conftest.$ac_obj

12730

link_all_deplibs=yes

5418

- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

5419

- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'

5420

+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

5421

+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'

5422

5423

archive_cmds_need_lc='no'

5424

hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

5425

@@ -10051,17 +10221,17 @@ rm -f core conftest.err conftest.$ac_obj

5426

hardcode_libdir_flag_spec='-L$libdir'

5427

hardcode_minus_L=yes

5428

allow_undefined_flag=unsupported

5429

- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'

5430

+ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'

5431

old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'

12731

5432

;;

12732

5433

12733

- netbsd*)

12734

+ netbsd* | netbsdelf*-gnu)

12735

if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

12736

archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

12737

else

12738

@@ -10611,8 +10252,8 @@ rm -f core conftest.err conftest.$ac_obj

12739

12740

12741

12742

-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5

12743

-echo "${ECHO_T}$ld_shlibs" >&6; }

12744

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5

12745

+$as_echo "$ld_shlibs" >&6; }

12746

test "$ld_shlibs" = no && can_build_shared=no

12747

12748

with_gnu_ld=$with_gnu_ld

12749

@@ -10648,16 +10289,16 @@ x|xyes)

12750

# Test whether the compiler implicitly links with -lc since on some

12751

# systems, -lgcc has to come before -lc. If gcc already passes -lc

5434

osf3*)

5435

if test "$GCC" = yes; then

5436

allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'

5437

- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

5438

+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

5439

else

5440

allow_undefined_flag=' -expect_unresolved \*'

5441

- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

5442

+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

5443

5444

archive_cmds_need_lc='no'

5445

hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

5446

@@ -10071,13 +10241,13 @@ rm -f core conftest.err conftest.$ac_obj

5447

osf4* | osf5*) # as osf3* with the addition of -msym flag

5448

if test "$GCC" = yes; then

5449

allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'

5450

- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

5451

+ archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

5452

hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

5453

else

5454

allow_undefined_flag=' -expect_unresolved \*'

5455

- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

5456

+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

5457

archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~

5458

- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'

5459

+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'

5460

5461

# Both c and cxx compiler support -rpath directly

5462

hardcode_libdir_flag_spec='-rpath $libdir'

5463

@@ -10090,9 +10260,9 @@ rm -f core conftest.err conftest.$ac_obj

5464

no_undefined_flag=' -z defs'

5465

if test "$GCC" = yes; then

5466

wlarc='${wl}'

5467

- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

5468

+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

5469

archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

5470

- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'

5471

+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'

5472

else

5473

case `$CC -V 2>&1` in

5474

*"Compilers 5.0"*)

5475

@@ -10280,44 +10450,50 @@ x|xyes)

12752

5476

# to ld, don't add -lc before -lgcc.

12753

- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

12754

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

12755

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5

12756

+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

12757

$RM conftest*

12758

echo "$lt_simple_compile_test_code" > conftest.$ac_ext

5477

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5

5478

$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

5479

- $RM conftest*

5480

- echo "$lt_simple_compile_test_code" > conftest.$ac_ext

5481

+if ${lt_cv_archive_cmds_need_lc+:} false; then :

5482

+ $as_echo_n "(cached) " >&6

5483

+else

5484

+ $RM conftest*

5485

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

12759

5486

12760

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12761

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

5487

- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

5488

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

12762

5489

(eval $ac_compile) 2>&5

12763

5490

ac_status=$?

12764

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12765

- (exit $ac_status); } 2>conftest.err; then

12766

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12767

+ test $ac_status = 0; } 2>conftest.err; then

12768

soname=conftest

12769

lib=conftest

12770

libobjs=conftest.$ac_objext

12771

@@ -10671,11 +10312,11 @@ echo $ECHO_N "checking whether -lc shoul

12772

libname=conftest

12773

lt_save_allow_undefined_flag=$allow_undefined_flag

12774

allow_undefined_flag=

12775

- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5

12776

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

5491

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

5492

test $ac_status = 0; } 2>conftest.err; then

5493

- soname=conftest

5494

- lib=conftest

5495

- libobjs=conftest.$ac_objext

5496

- deplibs=

5497

- wl=$lt_prog_compiler_wl

5498

- pic_flag=$lt_prog_compiler_pic

5499

- compiler_flags=-v

5500

- linker_flags=-v

5501

- verstring=

5502

- output_objdir=.

5503

- libname=conftest

5504

- lt_save_allow_undefined_flag=$allow_undefined_flag

5505

- allow_undefined_flag=

5506

- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

5507

+ soname=conftest

5508

+ lib=conftest

5509

+ libobjs=conftest.$ac_objext

5510

+ deplibs=

5511

+ wl=$lt_prog_compiler_wl

5512

+ pic_flag=$lt_prog_compiler_pic

5513

+ compiler_flags=-v

5514

+ linker_flags=-v

5515

+ verstring=

5516

+ output_objdir=.

5517

+ libname=conftest

5518

+ lt_save_allow_undefined_flag=$allow_undefined_flag

5519

+ allow_undefined_flag=

5520

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

12777

5521

(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5

12778

5522

ac_status=$?

12779

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12780

- (exit $ac_status); }

12781

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12782

+ test $ac_status = 0; }

12783

then

12784

archive_cmds_need_lc=no

12785

else

12786

@@ -10686,8 +10327,8 @@ echo $ECHO_N "checking whether -lc shoul

12787

cat conftest.err 1>&5

12788

12789

$RM conftest*

12790

- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5

12791

-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }

12792

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5

12793

+$as_echo "$archive_cmds_need_lc" >&6; }

5523

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

5524

test $ac_status = 0; }

5525

- then

5526

- archive_cmds_need_lc=no

5527

- else

5528

- archive_cmds_need_lc=yes

5529

- fi

5530

- allow_undefined_flag=$lt_save_allow_undefined_flag

5531

- else

5532

- cat conftest.err 1>&5

5533

- fi

5534

- $RM conftest*

5535

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5

5536

-$as_echo "$archive_cmds_need_lc" >&6; }

5537

+ then

5538

+ lt_cv_archive_cmds_need_lc=no

5539

+ else

5540

+ lt_cv_archive_cmds_need_lc=yes

5541

+ fi

5542

+ allow_undefined_flag=$lt_save_allow_undefined_flag

5543

+ else

5544

+ cat conftest.err 1>&5

5545

+ fi

5546

+ $RM conftest*

5547

5548

+fi

5549

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5

5550

+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }

5551

+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc

12794

5552

;;

12795

5553

esac

12796

5554

12797

@@ -10850,8 +10491,8 @@ esac

12798

12799

12800

12801

- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

12802

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

12803

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5

12804

+$as_echo_n "checking dynamic linker characteristics... " >&6; }

12805

12806

if test "$GCC" = yes; then

12807

case $host_os in

12808

@@ -11013,14 +10654,14 @@ bsdi[45]*)

12809

# libtool to hard-code these into programs

5555

@@ -10488,16 +10664,23 @@ if test "$GCC" = yes; then

5556

darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;

5557

*) lt_awk_arg="/^libraries:/" ;;

5558

esac

5559

- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`

5560

- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then

5561

+ case $host_os in

5562

+ mingw* | cegcc*) lt_sed_strip_eq="s,=$[A-Za-z]:$,\1,g" ;;

5563

+ *) lt_sed_strip_eq="s,=/,/,g" ;;

5564

+ esac

5565

+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`

5566

+ case $lt_search_path_spec in

5567

+ *\;*)

5568

# if the path contains ";" then we assume it to be the separator

5569

# otherwise default to the standard path separator (i.e. ":") - it is

5570

# assumed that no part of a normal pathname contains ";" but that should

5571

# okay in the real world where ";" in dirpaths is itself problematic.

5572

- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`

5573

- else

5574

- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

5575

- fi

5576

+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`

5577

+ ;;

5578

+ *)

5579

+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`

5580

+ ;;

5581

+ esac

5582

# Ok, now we have the path, separated by spaces, we can step through it

5583

# and add multilib dir if necessary.

5584

lt_tmp_lt_search_path_spec=

5585

@@ -10510,7 +10693,7 @@ if test "$GCC" = yes; then

5586

lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

5587

5588

done

5589

- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '

5590

+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '

5591

BEGIN {RS=" "; FS="/|\n";} {

5592

lt_foo="";

5593

lt_count=0;

5594

@@ -10530,7 +10713,13 @@ BEGIN {RS=" "; FS="/|\n";} {

5595

if (lt_foo != "") { lt_freq[lt_foo]++; }

5596

if (lt_freq[lt_foo] == 1) { print lt_foo; }

5597

}'`

5598

- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`

5599

+ # AWK program above erroneously prepends '/' to C:/dos/paths

5600

+ # for these hosts.

5601

+ case $host_os in

5602

+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\

5603

+ $SED 's,/$[A-Za-z]:$,\1,g'` ;;

5604

+ esac

5605

+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`

5606

else

5607

sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

5608

5609

@@ -10618,7 +10807,7 @@ amigaos*)

5610

m68k)

5611

library_names_spec='$libname.ixlibrary $libname.a'

5612

# Create ${libname}_ixlibrary.a entries in /sys/libs.

5613

- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'

5614

+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$[^/]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'

5615

;;

5616

esac

12810

5617

;;

12811

12812

-cygwin* | mingw* | pw32*)

12813

+cygwin* | mingw* | pw32* | cegcc*)

12814

version_type=windows

12815

shrext_cmds=".dll"

5618

@@ -10649,8 +10838,9 @@ cygwin* | mingw* | pw32* | cegcc*)

12816

5619

need_version=no

12817

5620

need_lib_prefix=no

12818

5621

12819

case $GCC,$host_os in

12820

- yes,cygwin* | yes,mingw* | yes,pw32*)

12821

+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

5622

- case $GCC,$host_os in

5623

- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

5624

+ case $GCC,$cc_basename in

5625

+ yes,*)

5626

+ # gcc

12822

5627

library_names_spec='$libname.dll.a'

12823

5628

# DLL is installed to $(libdir)/../bin by postinstall_cmds

12824

5629

postinstall_cmds='base_file=`basename \${file}`~

12825

@@ -11043,7 +10684,7 @@ cygwin* | mingw* | pw32*)

5630

@@ -10671,36 +10861,83 @@ cygwin* | mingw* | pw32* | cegcc*)

5631

cygwin*)

5632

# Cygwin DLLs use 'cyg' prefix rather than 'lib'

12826

5633

soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

12827

sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

5634

- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

5635

5636

+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"

12828

5637

;;

12829

- mingw*)

12830

+ mingw* | cegcc*)

5638

mingw* | cegcc*)

12831

5639

# MinGW DLLs use traditional 'lib' prefix

12832

5640

soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

12833

sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

12834

@@ -11258,7 +10899,7 @@ linux*oldld* | linux*aout* | linux*coff*

12835

;;

12836

12837

# This must be Linux ELF.

12838

-linux* | k*bsd*-gnu)

12839

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

12840

version_type=linux

12841

need_lib_prefix=no

12842

need_version=no

12843

@@ -11272,11 +10913,7 @@ linux* | k*bsd*-gnu)

12844

save_libdir=$libdir

12845

eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \

12846

LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""

12847

- cat >conftest.$ac_ext <<_ACEOF

12848

-/* confdefs.h. */

12849

-_ACEOF

12850

-cat confdefs.h >>conftest.$ac_ext

12851

-cat >>conftest.$ac_ext <<_ACEOF

12852

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

12853

/* end confdefs.h. */

12854

12855

int

12856

@@ -11287,37 +10924,13 @@ main ()

12857

return 0;

12858

}

12859

_ACEOF

12860

-rm -f conftest.$ac_objext conftest$ac_exeext

12861

-if { (ac_try="$ac_link"

12862

-case "(($ac_try" in

12863

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12864

- *) ac_try_echo=$ac_try;;

12865

-esac

12866

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12867

- (eval "$ac_link") 2>conftest.er1

12868

- ac_status=$?

12869

- grep -v '^ *+' conftest.er1 >conftest.err

12870

- rm -f conftest.er1

12871

- cat conftest.err >&5

12872

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12873

- (exit $ac_status); } && {

12874

- test -z "$ac_c_werror_flag" ||

12875

- test ! -s conftest.err

12876

- } && test -s conftest$ac_exeext &&

12877

- $as_test_x conftest$ac_exeext; then

12878

- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then

12879

+if ac_fn_c_try_link "$LINENO"; then :

12880

+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :

12881

shlibpath_overrides_runpath=yes

12882

12883

12884

-else

12885

- echo "$as_me: failed program was:" >&5

12886

-sed 's/^/| /' conftest.$ac_ext >&5

12887

12888

12889

12890

12891

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12892

- conftest$ac_exeext conftest.$ac_ext

12893

+rm -f core conftest.err conftest.$ac_objext \

12894

+ conftest$ac_exeext conftest.$ac_ext

12895

LDFLAGS=$save_LDFLAGS

12896

libdir=$save_libdir

12897

12898

@@ -11341,6 +10954,18 @@ rm -f core conftest.err conftest.$ac_obj

12899

dynamic_linker='GNU/Linux ld.so'

12900

;;

12901

12902

+netbsdelf*-gnu)

5641

- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

5642

- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then

5643

- # It is most probably a Windows format PATH printed by

5644

- # mingw gcc, but we are running on Cygwin. Gcc prints its search

5645

- # path with ; separators, and with drive letters. We can handle the

5646

- # drive letters (cygwin fileutils understands them), so leave them,

5647

- # especially as we might pass files found there to a mingw objdump,

5648

- # which wouldn't understand a cygwinified path. Ahh.

5649

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

5650

- else

5651

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

5652

- fi

5653

;;

5654

pw32*)

5655

# pw32 DLLs use 'pw' prefix rather than 'lib'

5656

library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

5657

;;

5658

esac

5659

+ dynamic_linker='Win32 ld.exe'

5660

+ ;;

5661

5662

+ *,cl*)

5663

+ # Native MSVC

5664

+ libname_spec='$name'

5665

+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

5666

+ library_names_spec='${libname}.dll.lib'

5667

5668

+ case $build_os in

5669

+ mingw*)

5670

+ sys_lib_search_path_spec=

5671

+ lt_save_ifs=$IFS

5672

+ IFS=';'

5673

+ for lt_path in $LIB

5674

+ do

5675

+ IFS=$lt_save_ifs

5676

+ # Let DOS variable expansion print the short 8.3 style file name.

5677

+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`

5678

+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"

5679

+ done

5680

+ IFS=$lt_save_ifs

5681

+ # Convert to MSYS style.

5682

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[a-zA-Z]\$:| /\\1|g' -e 's|^ ||'`

5683

+ ;;

5684

+ cygwin*)

5685

+ # Convert to unix form, then to dos form, then back to unix form

5686

+ # but this time dos style (no spaces!) so that the unix form looks

5687

+ # like /cygdrive/c/PROGRA~1:/cygdr...

5688

+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`

5689

+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`

5690

+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

5691

+ ;;

5692

+ *)

5693

+ sys_lib_search_path_spec="$LIB"

5694

+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then

5695

+ # It is most probably a Windows format PATH.

5696

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

5697

+ else

5698

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

5699

+ fi

5700

+ # FIXME: find the short name or the path components, as spaces are

5701

+ # common. (e.g. "Program Files" -> "PROGRA~1")

5702

+ ;;

5703

+ esac

5704

5705

+ # DLL is installed to $(libdir)/../bin by postinstall_cmds

5706

+ postinstall_cmds='base_file=`basename \${file}`~

5707

+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~

5708

+ dldir=$destdir/`dirname \$dlpath`~

5709

+ test -d \$dldir || mkdir -p \$dldir~

5710

+ $install_prog $dir/$dlname \$dldir/$dlname'

5711

+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~

5712

+ dlpath=$dir/\$dldll~

5713

+ $RM \$dlpath'

5714

+ shlibpath_overrides_runpath=yes

5715

+ dynamic_linker='Win32 link.exe'

5716

;;

5717

5718

5719

+ # Assume MSVC wrapper

5720

library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'

5721

+ dynamic_linker='Win32 ld.exe'

5722

;;

5723

esac

5724

- dynamic_linker='Win32 ld.exe'

5725

# FIXME: first we should search . and the directory the executable is in

5726

shlibpath_var=PATH

5727

;;

5728

@@ -10784,6 +11021,20 @@ gnu*)

5729

library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

5730

soname_spec='${libname}${release}${shared_ext}$major'

5731

shlibpath_var=LD_LIBRARY_PATH

5732

+ shlibpath_overrides_runpath=no

5733

+ hardcode_into_libs=yes

5734

+ ;;

5735

5736

+haiku*)

12903

5737

+ version_type=linux

12904

5738

+ need_lib_prefix=no

12905

5739

+ need_version=no

12906

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

5740

+ dynamic_linker="$host_os runtime_loader"

5741

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

12907

5742

+ soname_spec='${libname}${release}${shared_ext}$major'

12908

+ shlibpath_var=LD_LIBRARY_PATH

12909

+ shlibpath_overrides_runpath=no

12910

+ hardcode_into_libs=yes

12911

+ dynamic_linker='NetBSD ld.elf_so'

12912

+ ;;

12913

12914

netbsd*)

12915

version_type=sunos

12916

need_lib_prefix=no

12917

@@ -11512,7 +11137,7 @@ tpf*)

12918

version_type=linux

12919

need_lib_prefix=no

12920

need_version=no

12921

- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

12922

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

5743

+ shlibpath_var=LIBRARY_PATH

5744

+ shlibpath_overrides_runpath=yes

5745

+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

5746

hardcode_into_libs=yes

5747

;;

5748

5749

@@ -10829,8 +11080,10 @@ hpux9* | hpux10* | hpux11*)

5750

soname_spec='${libname}${release}${shared_ext}$major'

5751

;;

5752

esac

5753

- # HP-UX runs *really* slowly unless shared libraries are mode 555.

5754

+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...

5755

postinstall_cmds='chmod 555 $lib'

5756

+ # or fails outright, so override atomically:

5757

+ install_override_mode=555

5758

;;

5759

5760

interix[3-9]*)

5761

@@ -10897,12 +11150,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)

5762

finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'

12923

5763

shlibpath_var=LD_LIBRARY_PATH

12924

5764

shlibpath_overrides_runpath=no

12925

hardcode_into_libs=yes

12926

@@ -11529,8 +11154,8 @@ uts4*)

12927

dynamic_linker=no

12928

;;

12929

esac

12930

-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

12931

-echo "${ECHO_T}$dynamic_linker" >&6; }

12932

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5

12933

+$as_echo "$dynamic_linker" >&6; }

12934

test "$dynamic_linker" = no && can_build_shared=no

12935

12936

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

12937

@@ -11631,8 +11256,8 @@ fi

12938

12939

12940

12941

- { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

12942

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

12943

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5

12944

+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

5765

5766

# Some binutils ld are patched to set DT_RUNPATH

5767

- save_LDFLAGS=$LDFLAGS

5768

- save_libdir=$libdir

5769

- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \

5770

- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""

5771

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5772

+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :

5773

+ $as_echo_n "(cached) " >&6

5774

+else

5775

+ lt_cv_shlibpath_overrides_runpath=no

5776

+ save_LDFLAGS=$LDFLAGS

5777

+ save_libdir=$libdir

5778

+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \

5779

+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""

5780

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5781

/* end confdefs.h. */

5782

5783

int

5784

@@ -10915,13 +11173,17 @@ main ()

5785

_ACEOF

5786

if ac_fn_c_try_link "$LINENO"; then :

5787

if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :

5788

- shlibpath_overrides_runpath=yes

5789

+ lt_cv_shlibpath_overrides_runpath=yes

5790

5791

5792

rm -f core conftest.err conftest.$ac_objext \

5793

conftest$ac_exeext conftest.$ac_ext

5794

- LDFLAGS=$save_LDFLAGS

5795

- libdir=$save_libdir

5796

+ LDFLAGS=$save_LDFLAGS

5797

+ libdir=$save_libdir

5798

5799

+fi

5800

5801

+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath

5802

5803

# This implies no fast_install, which is unacceptable.

5804

# Some rework will be needed to allow for fast_install

5805

@@ -10930,7 +11192,7 @@ rm -f core conftest.err conftest.$ac_obj

5806

5807

# Append ld.so.conf contents to the search path

5808

if test -f /etc/ld.so.conf; then

5809

- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

5810

+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`

5811

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

5812

5813

5814

@@ -11245,6 +11507,11 @@ fi

5815

5816

5817

5818

5819

5820

5821

5822

5823

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5

5824

$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

12945

5825

hardcode_action=

12946

if test -n "$hardcode_libdir_flag_spec" ||

12947

test -n "$runpath_var" ||

12948

@@ -11656,8 +11281,8 @@ else

12949

# directories.

12950

hardcode_action=unsupported

12951

12952

-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5

12953

-echo "${ECHO_T}$hardcode_action" >&6; }

12954

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5

12955

+$as_echo "$hardcode_action" >&6; }

12956

12957

if test "$hardcode_action" = relink ||

12958

test "$inherit_rpath" = yes; then

12959

@@ -11689,7 +11314,7 @@ else

12960

lt_cv_dlopen_self=yes

12961

;;

12962

12963

- mingw* | pw32*)

12964

+ mingw* | pw32* | cegcc*)

12965

lt_cv_dlopen="LoadLibrary"

12966

lt_cv_dlopen_libs=

12967

;;

12968

@@ -11701,18 +11326,14 @@ else

12969

12970

darwin*)

5826

@@ -11317,7 +11584,7 @@ else

12971

5827

# if libdl is installed we need to link against it

12972

- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

12973

-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

12974

-if test "${ac_cv_lib_dl_dlopen+set}" = set; then

12975

- echo $ECHO_N "(cached) $ECHO_C" >&6

12976

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5

12977

+$as_echo_n "checking for dlopen in -ldl... " >&6; }

12978

+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :

12979

+ $as_echo_n "(cached) " >&6

5828

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5

5829

$as_echo_n "checking for dlopen in -ldl... " >&6; }

5830

-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :

5831

+if ${ac_cv_lib_dl_dlopen+:} false; then :

5832

$as_echo_n "(cached) " >&6

12980

5833

else

12981

5834

ac_check_lib_save_LIBS=$LIBS

12982

LIBS="-ldl $LIBS"

12983

-cat >conftest.$ac_ext <<_ACEOF

12984

-/* confdefs.h. */

12985

-_ACEOF

12986

-cat confdefs.h >>conftest.$ac_ext

12987

-cat >>conftest.$ac_ext <<_ACEOF

12988

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

12989

/* end confdefs.h. */

12990

12991

/* Override any GCC internal prototype to avoid an error.

12992

@@ -11730,39 +11351,18 @@ return dlopen ();

12993

return 0;

12994

}

12995

_ACEOF

12996

-rm -f conftest.$ac_objext conftest$ac_exeext

12997

-if { (ac_try="$ac_link"

12998

-case "(($ac_try" in

12999

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13000

- *) ac_try_echo=$ac_try;;

13001

-esac

13002

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13003

- (eval "$ac_link") 2>conftest.er1

13004

- ac_status=$?

13005

- grep -v '^ *+' conftest.er1 >conftest.err

13006

- rm -f conftest.er1

13007

- cat conftest.err >&5

13008

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13009

- (exit $ac_status); } && {

13010

- test -z "$ac_c_werror_flag" ||

13011

- test ! -s conftest.err

13012

- } && test -s conftest$ac_exeext &&

13013

- $as_test_x conftest$ac_exeext; then

13014

+if ac_fn_c_try_link "$LINENO"; then :

13015

ac_cv_lib_dl_dlopen=yes

13016

else

13017

- echo "$as_me: failed program was:" >&5

13018

-sed 's/^/| /' conftest.$ac_ext >&5

13019

13020

- ac_cv_lib_dl_dlopen=no

13021

+ ac_cv_lib_dl_dlopen=no

13022

13023

13024

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13025

- conftest$ac_exeext conftest.$ac_ext

13026

+rm -f core conftest.err conftest.$ac_objext \

13027

+ conftest$ac_exeext conftest.$ac_ext

13028

LIBS=$ac_check_lib_save_LIBS

13029

13030

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

13031

-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

13032

-if test $ac_cv_lib_dl_dlopen = yes; then

13033

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5

13034

+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

13035

+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :

5835

@@ -11351,7 +11618,7 @@ LIBS=$ac_check_lib_save_LIBS

5836

5837

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5

5838

$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

5839

-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :

5840

+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :

13036

5841

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

13037

5842

else

13038

5843

13039

@@ -11775,102 +11375,18 @@ fi

13040

;;

5844

@@ -11365,12 +11632,12 @@ fi

13041

5845

13042

5846

13043

- { echo "$as_me:$LINENO: checking for shl_load" >&5

13044

-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }

13045

-if test "${ac_cv_func_shl_load+set}" = set; then

13046

- echo $ECHO_N "(cached) $ECHO_C" >&6

13047

-else

13048

- cat >conftest.$ac_ext <<_ACEOF

13049

-/* confdefs.h. */

13050

-_ACEOF

13051

-cat confdefs.h >>conftest.$ac_ext

13052

-cat >>conftest.$ac_ext <<_ACEOF

13053

-/* end confdefs.h. */

13054

-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.

13055

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

13056

-#define shl_load innocuous_shl_load

13057

13058

-/* System header to define __stub macros and hopefully few prototypes,

13059

- which can conflict with char shl_load (); below.

13060

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

13061

- <limits.h> exists even on freestanding compilers. */

13062

13063

-#ifdef __STDC__

13064

-# include <limits.h>

13065

-#else

13066

-# include <assert.h>

13067

-#endif

13068

13069

-#undef shl_load

13070

13071

-/* Override any GCC internal prototype to avoid an error.

13072

- Use char because int might match the return type of a GCC

13073

- builtin and then its argument prototype would still apply. */

13074

-#ifdef __cplusplus

13075

-extern "C"

13076

-#endif

13077

-char shl_load ();

13078

-/* The GNU C library defines this for functions which it implements

13079

- to always fail with ENOSYS. Some functions are actually named

13080

- something starting with __ and the normal name is an alias. */

13081

-#if defined __stub_shl_load || defined __stub___shl_load

13082

-choke me

13083

-#endif

13084

13085

-int

13086

-main ()

13087

13088

-return shl_load ();

13089

- ;

13090

- return 0;

13091

13092

-_ACEOF

13093

-rm -f conftest.$ac_objext conftest$ac_exeext

13094

-if { (ac_try="$ac_link"

13095

-case "(($ac_try" in

13096

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13097

- *) ac_try_echo=$ac_try;;

13098

-esac

13099

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13100

- (eval "$ac_link") 2>conftest.er1

13101

- ac_status=$?

13102

- grep -v '^ *+' conftest.er1 >conftest.err

13103

- rm -f conftest.er1

13104

- cat conftest.err >&5

13105

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13106

- (exit $ac_status); } && {

13107

- test -z "$ac_c_werror_flag" ||

13108

- test ! -s conftest.err

13109

- } && test -s conftest$ac_exeext &&

13110

- $as_test_x conftest$ac_exeext; then

13111

- ac_cv_func_shl_load=yes

13112

-else

13113

- echo "$as_me: failed program was:" >&5

13114

-sed 's/^/| /' conftest.$ac_ext >&5

13115

13116

- ac_cv_func_shl_load=no

13117

-fi

13118

13119

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13120

- conftest$ac_exeext conftest.$ac_ext

13121

-fi

13122

-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

13123

-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }

13124

-if test $ac_cv_func_shl_load = yes; then

13125

+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"

13126

+if test "x$ac_cv_func_shl_load" = x""yes; then :

5847

ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"

5848

-if test "x$ac_cv_func_shl_load" = x""yes; then :

5849

+if test "x$ac_cv_func_shl_load" = xyes; then :

13127

5850

lt_cv_dlopen="shl_load"

13128

5851

else

13129

- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

13130

-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }

13131

-if test "${ac_cv_lib_dld_shl_load+set}" = set; then

13132

- echo $ECHO_N "(cached) $ECHO_C" >&6

13133

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5

13134

+$as_echo_n "checking for shl_load in -ldld... " >&6; }

13135

+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :

13136

+ $as_echo_n "(cached) " >&6

5852

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5

5853

$as_echo_n "checking for shl_load in -ldld... " >&6; }

5854

-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :

5855

+if ${ac_cv_lib_dld_shl_load+:} false; then :

5856

$as_echo_n "(cached) " >&6

13137

5857

else

13138

5858

ac_check_lib_save_LIBS=$LIBS

13139

LIBS="-ldld $LIBS"

13140

-cat >conftest.$ac_ext <<_ACEOF

13141

-/* confdefs.h. */

13142

-_ACEOF

13143

-cat confdefs.h >>conftest.$ac_ext

13144

-cat >>conftest.$ac_ext <<_ACEOF

13145

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13146

/* end confdefs.h. */

13147

13148

/* Override any GCC internal prototype to avoid an error.

13149

@@ -11888,137 +11404,32 @@ return shl_load ();

13150

return 0;

13151

}

13152

_ACEOF

13153

-rm -f conftest.$ac_objext conftest$ac_exeext

13154

-if { (ac_try="$ac_link"

13155

-case "(($ac_try" in

13156

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13157

- *) ac_try_echo=$ac_try;;

13158

-esac

13159

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13160

- (eval "$ac_link") 2>conftest.er1

13161

- ac_status=$?

13162

- grep -v '^ *+' conftest.er1 >conftest.err

13163

- rm -f conftest.er1

13164

- cat conftest.err >&5

13165

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13166

- (exit $ac_status); } && {

13167

- test -z "$ac_c_werror_flag" ||

13168

- test ! -s conftest.err

13169

- } && test -s conftest$ac_exeext &&

13170

- $as_test_x conftest$ac_exeext; then

13171

+if ac_fn_c_try_link "$LINENO"; then :

13172

ac_cv_lib_dld_shl_load=yes

13173

else

13174

- echo "$as_me: failed program was:" >&5

13175

-sed 's/^/| /' conftest.$ac_ext >&5

13176

13177

- ac_cv_lib_dld_shl_load=no

13178

+ ac_cv_lib_dld_shl_load=no

13179

13180

13181

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13182

- conftest$ac_exeext conftest.$ac_ext

13183

+rm -f core conftest.err conftest.$ac_objext \

13184

+ conftest$ac_exeext conftest.$ac_ext

13185

LIBS=$ac_check_lib_save_LIBS

13186

13187

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5

13188

-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }

13189

-if test $ac_cv_lib_dld_shl_load = yes; then

13190

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5

13191

+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }

13192

+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :

5859

@@ -11404,16 +11671,16 @@ LIBS=$ac_check_lib_save_LIBS

5860

5861

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5

5862

$as_echo "$ac_cv_lib_dld_shl_load" >&6; }

5863

-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :

5864

+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :

13193

5865

lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"

13194

5866

else

13195

- { echo "$as_me:$LINENO: checking for dlopen" >&5

13196

-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }

13197

-if test "${ac_cv_func_dlopen+set}" = set; then

13198

- echo $ECHO_N "(cached) $ECHO_C" >&6

13199

-else

13200

- cat >conftest.$ac_ext <<_ACEOF

13201

-/* confdefs.h. */

13202

-_ACEOF

13203

-cat confdefs.h >>conftest.$ac_ext

13204

-cat >>conftest.$ac_ext <<_ACEOF

13205

-/* end confdefs.h. */

13206

-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.

13207

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

13208

-#define dlopen innocuous_dlopen

13209

13210

-/* System header to define __stub macros and hopefully few prototypes,

13211

- which can conflict with char dlopen (); below.

13212

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

13213

- <limits.h> exists even on freestanding compilers. */

13214

13215

-#ifdef __STDC__

13216

-# include <limits.h>

13217

-#else

13218

-# include <assert.h>

13219

-#endif

13220

13221

-#undef dlopen

13222

13223

-/* Override any GCC internal prototype to avoid an error.

13224

- Use char because int might match the return type of a GCC

13225

- builtin and then its argument prototype would still apply. */

13226

-#ifdef __cplusplus

13227

-extern "C"

13228

-#endif

13229

-char dlopen ();

13230

-/* The GNU C library defines this for functions which it implements

13231

- to always fail with ENOSYS. Some functions are actually named

13232

- something starting with __ and the normal name is an alias. */

13233

-#if defined __stub_dlopen || defined __stub___dlopen

13234

-choke me

13235

-#endif

13236

13237

-int

13238

-main ()

13239

13240

-return dlopen ();

13241

- ;

13242

- return 0;

13243

13244

-_ACEOF

13245

-rm -f conftest.$ac_objext conftest$ac_exeext

13246

-if { (ac_try="$ac_link"

13247

-case "(($ac_try" in

13248

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13249

- *) ac_try_echo=$ac_try;;

13250

-esac

13251

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13252

- (eval "$ac_link") 2>conftest.er1

13253

- ac_status=$?

13254

- grep -v '^ *+' conftest.er1 >conftest.err

13255

- rm -f conftest.er1

13256

- cat conftest.err >&5

13257

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13258

- (exit $ac_status); } && {

13259

- test -z "$ac_c_werror_flag" ||

13260

- test ! -s conftest.err

13261

- } && test -s conftest$ac_exeext &&

13262

- $as_test_x conftest$ac_exeext; then

13263

- ac_cv_func_dlopen=yes

13264

-else

13265

- echo "$as_me: failed program was:" >&5

13266

-sed 's/^/| /' conftest.$ac_ext >&5

13267

13268

- ac_cv_func_dlopen=no

13269

-fi

13270

13271

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13272

- conftest$ac_exeext conftest.$ac_ext

13273

-fi

13274

-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

13275

-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }

13276

-if test $ac_cv_func_dlopen = yes; then

13277

+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"

13278

+if test "x$ac_cv_func_dlopen" = x""yes; then :

5867

ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"

5868

-if test "x$ac_cv_func_dlopen" = x""yes; then :

5869

+if test "x$ac_cv_func_dlopen" = xyes; then :

13279

5870

lt_cv_dlopen="dlopen"

13280

5871

else

13281

- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

13282

-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

13283

-if test "${ac_cv_lib_dl_dlopen+set}" = set; then

13284

- echo $ECHO_N "(cached) $ECHO_C" >&6

13285

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5

13286

+$as_echo_n "checking for dlopen in -ldl... " >&6; }

13287

+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :

13288

+ $as_echo_n "(cached) " >&6

5872

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5

5873

$as_echo_n "checking for dlopen in -ldl... " >&6; }

5874

-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :

5875

+if ${ac_cv_lib_dl_dlopen+:} false; then :

5876

$as_echo_n "(cached) " >&6

13289

5877

else

13290

5878

ac_check_lib_save_LIBS=$LIBS

13291

LIBS="-ldl $LIBS"

13292

-cat >conftest.$ac_ext <<_ACEOF

13293

-/* confdefs.h. */

13294

-_ACEOF

13295

-cat confdefs.h >>conftest.$ac_ext

13296

-cat >>conftest.$ac_ext <<_ACEOF

13297

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13298

/* end confdefs.h. */

13299

13300

/* Override any GCC internal prototype to avoid an error.

13301

@@ -12036,53 +11447,28 @@ return dlopen ();

13302

return 0;

13303

}

13304

_ACEOF

13305

-rm -f conftest.$ac_objext conftest$ac_exeext

13306

-if { (ac_try="$ac_link"

13307

-case "(($ac_try" in

13308

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13309

- *) ac_try_echo=$ac_try;;

13310

-esac

13311

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13312

- (eval "$ac_link") 2>conftest.er1

13313

- ac_status=$?

13314

- grep -v '^ *+' conftest.er1 >conftest.err

13315

- rm -f conftest.er1

13316

- cat conftest.err >&5

13317

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13318

- (exit $ac_status); } && {

13319

- test -z "$ac_c_werror_flag" ||

13320

- test ! -s conftest.err

13321

- } && test -s conftest$ac_exeext &&

13322

- $as_test_x conftest$ac_exeext; then

13323

+if ac_fn_c_try_link "$LINENO"; then :

13324

ac_cv_lib_dl_dlopen=yes

13325

else

13326

- echo "$as_me: failed program was:" >&5

13327

-sed 's/^/| /' conftest.$ac_ext >&5

13328

13329

- ac_cv_lib_dl_dlopen=no

13330

+ ac_cv_lib_dl_dlopen=no

13331

13332

13333

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13334

- conftest$ac_exeext conftest.$ac_ext

13335

+rm -f core conftest.err conftest.$ac_objext \

13336

+ conftest$ac_exeext conftest.$ac_ext

13337

LIBS=$ac_check_lib_save_LIBS

13338

13339

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

13340

-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

13341

-if test $ac_cv_lib_dl_dlopen = yes; then

13342

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5

13343

+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

13344

+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :

5879

@@ -11447,12 +11714,12 @@ LIBS=$ac_check_lib_save_LIBS

5880

5881

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5

5882

$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

5883

-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :

5884

+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :

13345

5885

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

13346

5886

else

13347

- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5

13348

-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }

13349

-if test "${ac_cv_lib_svld_dlopen+set}" = set; then

13350

- echo $ECHO_N "(cached) $ECHO_C" >&6

13351

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5

13352

+$as_echo_n "checking for dlopen in -lsvld... " >&6; }

13353

+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :

13354

+ $as_echo_n "(cached) " >&6

5887

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5

5888

$as_echo_n "checking for dlopen in -lsvld... " >&6; }

5889

-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :

5890

+if ${ac_cv_lib_svld_dlopen+:} false; then :

5891

$as_echo_n "(cached) " >&6

13355

5892

else

13356

5893

ac_check_lib_save_LIBS=$LIBS

13357

LIBS="-lsvld $LIBS"

13358

-cat >conftest.$ac_ext <<_ACEOF

13359

-/* confdefs.h. */

13360

-_ACEOF

13361

-cat confdefs.h >>conftest.$ac_ext

13362

-cat >>conftest.$ac_ext <<_ACEOF

13363

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13364

/* end confdefs.h. */

13365

13366

/* Override any GCC internal prototype to avoid an error.

13367

@@ -12100,53 +11486,28 @@ return dlopen ();

13368

return 0;

13369

}

13370

_ACEOF

13371

-rm -f conftest.$ac_objext conftest$ac_exeext

13372

-if { (ac_try="$ac_link"

13373

-case "(($ac_try" in

13374

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13375

- *) ac_try_echo=$ac_try;;

13376

-esac

13377

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13378

- (eval "$ac_link") 2>conftest.er1

13379

- ac_status=$?

13380

- grep -v '^ *+' conftest.er1 >conftest.err

13381

- rm -f conftest.er1

13382

- cat conftest.err >&5

13383

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13384

- (exit $ac_status); } && {

13385

- test -z "$ac_c_werror_flag" ||

13386

- test ! -s conftest.err

13387

- } && test -s conftest$ac_exeext &&

13388

- $as_test_x conftest$ac_exeext; then

13389

+if ac_fn_c_try_link "$LINENO"; then :

13390

ac_cv_lib_svld_dlopen=yes

13391

else

13392

- echo "$as_me: failed program was:" >&5

13393

-sed 's/^/| /' conftest.$ac_ext >&5

13394

13395

- ac_cv_lib_svld_dlopen=no

13396

+ ac_cv_lib_svld_dlopen=no

13397

13398

13399

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13400

- conftest$ac_exeext conftest.$ac_ext

13401

+rm -f core conftest.err conftest.$ac_objext \

13402

+ conftest$ac_exeext conftest.$ac_ext

13403

LIBS=$ac_check_lib_save_LIBS

13404

13405

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5

13406

-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }

13407

-if test $ac_cv_lib_svld_dlopen = yes; then

13408

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5

13409

+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }

13410

+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :

5894

@@ -11486,12 +11753,12 @@ LIBS=$ac_check_lib_save_LIBS

5895

5896

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5

5897

$as_echo "$ac_cv_lib_svld_dlopen" >&6; }

5898

-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :

5899

+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :

13411

5900

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"

13412

5901

else

13413

- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5

13414

-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }

13415

-if test "${ac_cv_lib_dld_dld_link+set}" = set; then

13416

- echo $ECHO_N "(cached) $ECHO_C" >&6

13417

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5

13418

+$as_echo_n "checking for dld_link in -ldld... " >&6; }

13419

+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :

13420

+ $as_echo_n "(cached) " >&6

5902

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5

5903

$as_echo_n "checking for dld_link in -ldld... " >&6; }

5904

-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :

5905

+if ${ac_cv_lib_dld_dld_link+:} false; then :

5906

$as_echo_n "(cached) " >&6

13421

5907

else

13422

5908

ac_check_lib_save_LIBS=$LIBS

13423

LIBS="-ldld $LIBS"

13424

-cat >conftest.$ac_ext <<_ACEOF

13425

-/* confdefs.h. */

13426

-_ACEOF

13427

-cat confdefs.h >>conftest.$ac_ext

13428

-cat >>conftest.$ac_ext <<_ACEOF

13429

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13430

/* end confdefs.h. */

13431

13432

/* Override any GCC internal prototype to avoid an error.

13433

@@ -12164,39 +11525,18 @@ return dld_link ();

13434

return 0;

13435

}

13436

_ACEOF

13437

-rm -f conftest.$ac_objext conftest$ac_exeext

13438

-if { (ac_try="$ac_link"

13439

-case "(($ac_try" in

13440

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13441

- *) ac_try_echo=$ac_try;;

13442

-esac

13443

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13444

- (eval "$ac_link") 2>conftest.er1

13445

- ac_status=$?

13446

- grep -v '^ *+' conftest.er1 >conftest.err

13447

- rm -f conftest.er1

13448

- cat conftest.err >&5

13449

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13450

- (exit $ac_status); } && {

13451

- test -z "$ac_c_werror_flag" ||

13452

- test ! -s conftest.err

13453

- } && test -s conftest$ac_exeext &&

13454

- $as_test_x conftest$ac_exeext; then

13455

+if ac_fn_c_try_link "$LINENO"; then :

13456

ac_cv_lib_dld_dld_link=yes

13457

else

13458

- echo "$as_me: failed program was:" >&5

13459

-sed 's/^/| /' conftest.$ac_ext >&5

13460

13461

- ac_cv_lib_dld_dld_link=no

13462

+ ac_cv_lib_dld_dld_link=no

13463

13464

13465

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13466

- conftest$ac_exeext conftest.$ac_ext

13467

+rm -f core conftest.err conftest.$ac_objext \

13468

+ conftest$ac_exeext conftest.$ac_ext

13469

LIBS=$ac_check_lib_save_LIBS

13470

13471

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5

13472

-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }

13473

-if test $ac_cv_lib_dld_dld_link = yes; then

13474

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5

13475

+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }

13476

+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :

5909

@@ -11525,7 +11792,7 @@ LIBS=$ac_check_lib_save_LIBS

5910

5911

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5

5912

$as_echo "$ac_cv_lib_dld_dld_link" >&6; }

5913

-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :

5914

+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :

13477

5915

lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"

13478

5916

13479

5917

13480

@@ -12235,10 +11575,10 @@ fi

13481

save_LIBS="$LIBS"

13482

LIBS="$lt_cv_dlopen_libs $LIBS"

5918

@@ -11566,7 +11833,7 @@ fi

13483

5919

13484

- { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5

13485

-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }

13486

-if test "${lt_cv_dlopen_self+set}" = set; then

13487

- echo $ECHO_N "(cached) $ECHO_C" >&6

13488

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5

13489

+$as_echo_n "checking whether a program can dlopen itself... " >&6; }

13490

+if test "${lt_cv_dlopen_self+set}" = set; then :

13491

+ $as_echo_n "(cached) " >&6

5920

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5

5921

$as_echo_n "checking whether a program can dlopen itself... " >&6; }

5922

-if test "${lt_cv_dlopen_self+set}" = set; then :

5923

+if ${lt_cv_dlopen_self+:} false; then :

5924

$as_echo_n "(cached) " >&6

13492

5925

else

13493

5926

if test "$cross_compiling" = yes; then :

13494

lt_cv_dlopen_self=cross

13495

@@ -12246,7 +11586,7 @@ else

5927

@@ -11575,7 +11842,7 @@ else

13496

5928

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

13497

5929

lt_status=$lt_dlunknown

13498

5930

cat > conftest.$ac_ext <<_LT_EOF

13499

-#line 12249 "configure"

13500

+#line 11589 "configure"

5931

-#line 11578 "configure"

5932

+#line $LINENO "configure"

13501

5933

#include "confdefs.h"

13502

5934

13503

5935

#if HAVE_DLFCN_H

13504

@@ -12287,10 +11627,6 @@ else

5936

@@ -11616,7 +11883,13 @@ else

13505

5937

# endif

13506

5938

#endif

13507

5939

13508

-#ifdef __cplusplus

13509

-extern "C" void exit (int);

13510

-#endif

13511

13512

void fnord() { int i=42;}

5940

-void fnord() { int i=42;}

5941

+/* When -fvisbility=hidden is used, assume the code has been annotated

5942

+ correspondingly for the symbols needed. */

5943

+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

5944

+int fnord () __attribute__((visibility("default")));

5945

+#endif

5946

5947

+int fnord () { return 42; }

13513

5948

int main ()

13514

5949

{

13515

@@ -12306,14 +11642,14 @@ int main ()

5950

void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

5951

@@ -11625,7 +11898,11 @@ int main ()

5952

if (self)

5953

{

5954

if (dlsym (self,"fnord")) status = $lt_dlno_uscore;

5955

- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

5956

+ else

5957

+ {

5958

+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

5959

+ else puts (dlerror ());

5960

+ }

5961

/* dlclose (self); */

5962

}

13516

5963

else

13517

puts (dlerror ());

13518

13519

- exit (status);

13520

+ return status;

13521

}

13522

_LT_EOF

13523

- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13524

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5

13525

(eval $ac_link) 2>&5

13526

ac_status=$?

13527

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13528

- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then

13529

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

13530

+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then

13531

(./conftest; exit; ) >&5 2>/dev/null

13532

lt_status=$?

13533

case x$lt_status in

13534

@@ -12330,15 +11666,15 @@ rm -fr conftest*

13535

13536

13537

13538

-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5

13539

-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }

13540

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5

13541

+$as_echo "$lt_cv_dlopen_self" >&6; }

13542

13543

if test "x$lt_cv_dlopen_self" = xyes; then

5964

@@ -11662,7 +11939,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }

13544

5965

wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"

13545

- { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5

13546

-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }

13547

-if test "${lt_cv_dlopen_self_static+set}" = set; then

13548

- echo $ECHO_N "(cached) $ECHO_C" >&6

13549

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5

13550

+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }

13551

+if test "${lt_cv_dlopen_self_static+set}" = set; then :

13552

+ $as_echo_n "(cached) " >&6

5966

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5

5967

$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }

5968

-if test "${lt_cv_dlopen_self_static+set}" = set; then :

5969

+if ${lt_cv_dlopen_self_static+:} false; then :

5970

$as_echo_n "(cached) " >&6

13553

5971

else

13554

5972

if test "$cross_compiling" = yes; then :

13555

lt_cv_dlopen_self_static=cross

13556

@@ -12346,7 +11682,7 @@ else

5973

@@ -11671,7 +11948,7 @@ else

13557

5974

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

13558

5975

lt_status=$lt_dlunknown

13559

5976

cat > conftest.$ac_ext <<_LT_EOF

13560

-#line 12349 "configure"

13561

+#line 11685 "configure"

5977

-#line 11674 "configure"

5978

+#line $LINENO "configure"

13562

5979

#include "confdefs.h"

13563

5980

13564

5981

#if HAVE_DLFCN_H

13565

@@ -12387,10 +11723,6 @@ else

5982

@@ -11712,7 +11989,13 @@ else

13566

5983

# endif

13567

5984

#endif

13568

5985

13569

-#ifdef __cplusplus

13570

-extern "C" void exit (int);

13571

-#endif

13572

13573

void fnord() { int i=42;}

5986

-void fnord() { int i=42;}

5987

+/* When -fvisbility=hidden is used, assume the code has been annotated

5988

+ correspondingly for the symbols needed. */

5989

+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

5990

+int fnord () __attribute__((visibility("default")));

5991

+#endif

5992

5993

+int fnord () { return 42; }

13574

5994

int main ()

13575

5995

{

13576

@@ -12406,14 +11738,14 @@ int main ()

5996

void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

5997

@@ -11721,7 +12004,11 @@ int main ()

5998

if (self)

5999

{

6000

if (dlsym (self,"fnord")) status = $lt_dlno_uscore;

6001

- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

6002

+ else

6003

+ {

6004

+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

6005

+ else puts (dlerror ());

6006

+ }

6007

/* dlclose (self); */

6008

}

13577

6009

else

13578

puts (dlerror ());

13579

13580

- exit (status);

13581

+ return status;

13582

}

13583

_LT_EOF

13584

- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13585

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5

13586

(eval $ac_link) 2>&5

13587

ac_status=$?

13588

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13589

- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then

13590

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

13591

+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then

13592

(./conftest; exit; ) >&5 2>/dev/null

13593

lt_status=$?

13594

case x$lt_status in

13595

@@ -12430,8 +11762,8 @@ rm -fr conftest*

13596

13597

13598

13599

-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5

13600

-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }

13601

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5

13602

+$as_echo "$lt_cv_dlopen_self_static" >&6; }

13603

13604

13605

CPPFLAGS="$save_CPPFLAGS"

13606

@@ -12469,13 +11801,13 @@ fi

13607

13608

striplib=

13609

old_striplib=

13610

-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5

13611

-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }

13612

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5

13613

+$as_echo_n "checking whether stripping libraries is possible... " >&6; }

13614

if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then

13615

test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"

13616

test -z "$striplib" && striplib="$STRIP --strip-unneeded"

13617

- { echo "$as_me:$LINENO: result: yes" >&5

13618

-echo "${ECHO_T}yes" >&6; }

13619

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

13620

+$as_echo "yes" >&6; }

13621

else

13622

# FIXME - insert some real tests, host_os isn't really good enough

13623

case $host_os in

13624

@@ -12483,16 +11815,16 @@ else

13625

if test -n "$STRIP" ; then

13626

striplib="$STRIP -x"

13627

old_striplib="$STRIP -S"

13628

- { echo "$as_me:$LINENO: result: yes" >&5

13629

-echo "${ECHO_T}yes" >&6; }

13630

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

13631

+$as_echo "yes" >&6; }

13632

else

13633

- { echo "$as_me:$LINENO: result: no" >&5

13634

-echo "${ECHO_T}no" >&6; }

13635

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

13636

+$as_echo "no" >&6; }

13637

13638

;;

13639

13640

- { echo "$as_me:$LINENO: result: no" >&5

13641

-echo "${ECHO_T}no" >&6; }

13642

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

13643

+$as_echo "no" >&6; }

13644

;;

13645

esac

13646

13647

@@ -12509,13 +11841,13 @@ fi

13648

13649

13650

# Report which library types will actually be built

13651

- { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

13652

-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }

13653

- { echo "$as_me:$LINENO: result: $can_build_shared" >&5

13654

-echo "${ECHO_T}$can_build_shared" >&6; }

13655

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5

13656

+$as_echo_n "checking if libtool supports shared libraries... " >&6; }

13657

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5

13658

+$as_echo "$can_build_shared" >&6; }

13659

13660

- { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

13661

-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }

13662

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5

13663

+$as_echo_n "checking whether to build shared libraries... " >&6; }

13664

test "$can_build_shared" = "no" && enable_shared=no

13665

13666

# On AIX, shared libraries and static libraries use the same namespace, and

13667

@@ -12535,15 +11867,15 @@ echo $ECHO_N "checking whether to build

13668

13669

;;

13670

esac

13671

- { echo "$as_me:$LINENO: result: $enable_shared" >&5

13672

-echo "${ECHO_T}$enable_shared" >&6; }

13673

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5

13674

+$as_echo "$enable_shared" >&6; }

13675

13676

- { echo "$as_me:$LINENO: checking whether to build static libraries" >&5

13677

-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }

13678

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5

13679

+$as_echo_n "checking whether to build static libraries... " >&6; }

13680

# Make sure either enable_shared or enable_static is yes.

13681

test "$enable_shared" = yes || enable_static=yes

13682

- { echo "$as_me:$LINENO: result: $enable_static" >&5

13683

-echo "${ECHO_T}$enable_static" >&6; }

13684

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5

13685

+$as_echo "$enable_static" >&6; }

13686

13687

13688

13689

@@ -12683,7 +12015,7 @@ cc_basename=`$ECHO "X$cc_temp" | $Xsed -

13690

13691

13692

# Check whether --with-gnu-ld was given.

13693

-if test "${with_gnu_ld+set}" = set; then

13694

+if test "${with_gnu_ld+set}" = set; then :

13695

withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

13696

else

13697

with_gnu_ld=no

13698

@@ -12692,8 +12024,8 @@ fi

13699

ac_prog=ld

13700

if test "$GCC" = yes; then

13701

# Check if gcc -print-prog-name=ld gives a path.

13702

- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

13703

-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

13704

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5

13705

+$as_echo_n "checking for ld used by $CC... " >&6; }

13706

case $host in

13707

*-*-mingw*)

13708

# gcc leaves a trailing carriage return which upsets mingw

13709

@@ -12722,14 +12054,14 @@ echo $ECHO_N "checking for ld used by $C

13710

;;

13711

esac

13712

elif test "$with_gnu_ld" = yes; then

13713

- { echo "$as_me:$LINENO: checking for GNU ld" >&5

13714

-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

13715

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5

13716

+$as_echo_n "checking for GNU ld... " >&6; }

13717

else

13718

- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

13719

-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

13720

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5

13721

+$as_echo_n "checking for non-GNU ld... " >&6; }

13722

13723

-if test "${lt_cv_path_LD+set}" = set; then

13724

- echo $ECHO_N "(cached) $ECHO_C" >&6

13725

+if test "${lt_cv_path_LD+set}" = set; then :

6010

@@ -11878,6 +12165,145 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

6011

6012

CC="$lt_save_CC"

6013

6014

+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

6015

+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

6016

+ (test "X$CXX" != "Xg++"))) ; then

6017

+ ac_ext=cpp

6018

+ac_cpp='$CXXCPP $CPPFLAGS'

6019

+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

6020

+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

6021

+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

6022

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5

6023

+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }

6024

+if test -z "$CXXCPP"; then

6025

+ if ${ac_cv_prog_CXXCPP+:} false; then :

13726

6026

+ $as_echo_n "(cached) " >&6

6027

+else

6028

+ # Double quotes because CXXCPP needs to be expanded

6029

+ for CXXCPP in "$CXX -E" "/lib/cpp"

6030

+ do

6031

+ ac_preproc_ok=false

6032

+for ac_cxx_preproc_warn_flag in '' yes

6033

+do

6034

+ # Use a header file that comes with gcc, so configuring glibc

6035

+ # with a fresh cross-compiler works.

6036

+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

6037

+ # <limits.h> exists even on freestanding compilers.

6038

+ # On the NeXT, cc -E runs the code through the compiler's parser,

6039

+ # not just through cpp. "Syntax error" is here to catch this case.

6040

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6041

+/* end confdefs.h. */

6042

+#ifdef __STDC__

6043

+# include <limits.h>

6044

+#else

6045

+# include <assert.h>

6046

+#endif

6047

+ Syntax error

6048

+_ACEOF

6049

+if ac_fn_cxx_try_cpp "$LINENO"; then :

6050

6051

+else

6052

+ # Broken: fails on valid input.

6053

+continue

6054

+fi

6055

+rm -f conftest.err conftest.i conftest.$ac_ext

6056

6057

+ # OK, works on sane cases. Now check whether nonexistent headers

6058

+ # can be detected and how.

6059

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6060

+/* end confdefs.h. */

6061

+#include <ac_nonexistent.h>

6062

+_ACEOF

6063

+if ac_fn_cxx_try_cpp "$LINENO"; then :

6064

+ # Broken: success on invalid input.

6065

+continue

6066

+else

6067

+ # Passes both tests.

6068

+ac_preproc_ok=:

6069

+break

6070

+fi

6071

+rm -f conftest.err conftest.i conftest.$ac_ext

6072

6073

+done

6074

+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

6075

+rm -f conftest.i conftest.err conftest.$ac_ext

6076

+if $ac_preproc_ok; then :

6077

+ break

6078

+fi

6079

6080

+ done

6081

+ ac_cv_prog_CXXCPP=$CXXCPP

6082

6083

+fi

6084

+ CXXCPP=$ac_cv_prog_CXXCPP

6085

+else

6086

+ ac_cv_prog_CXXCPP=$CXXCPP

6087

+fi

6088

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5

6089

+$as_echo "$CXXCPP" >&6; }

6090

+ac_preproc_ok=false

6091

+for ac_cxx_preproc_warn_flag in '' yes

6092

+do

6093

+ # Use a header file that comes with gcc, so configuring glibc

6094

+ # with a fresh cross-compiler works.

6095

+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

6096

+ # <limits.h> exists even on freestanding compilers.

6097

+ # On the NeXT, cc -E runs the code through the compiler's parser,

6098

+ # not just through cpp. "Syntax error" is here to catch this case.

6099

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6100

+/* end confdefs.h. */

6101

+#ifdef __STDC__

6102

+# include <limits.h>

6103

+#else

6104

+# include <assert.h>

6105

+#endif

6106

+ Syntax error

6107

+_ACEOF

6108

+if ac_fn_cxx_try_cpp "$LINENO"; then :

6109

6110

+else

6111

+ # Broken: fails on valid input.

6112

+continue

6113

+fi

6114

+rm -f conftest.err conftest.i conftest.$ac_ext

6115

6116

+ # OK, works on sane cases. Now check whether nonexistent headers

6117

+ # can be detected and how.

6118

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6119

+/* end confdefs.h. */

6120

+#include <ac_nonexistent.h>

6121

+_ACEOF

6122

+if ac_fn_cxx_try_cpp "$LINENO"; then :

6123

+ # Broken: success on invalid input.

6124

+continue

6125

+else

6126

+ # Passes both tests.

6127

+ac_preproc_ok=:

6128

+break

6129

+fi

6130

+rm -f conftest.err conftest.i conftest.$ac_ext

6131

6132

+done

6133

+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

6134

+rm -f conftest.i conftest.err conftest.$ac_ext

6135

+if $ac_preproc_ok; then :

6136

6137

+else

6138

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

6139

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

6140

+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check

6141

+See \`config.log' for more details" "$LINENO" 5; }

6142

+fi

6143

6144

+ac_ext=cpp

6145

+ac_cpp='$CXXCPP $CPPFLAGS'

6146

+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

6147

+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

6148

+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

6149

6150

+else

6151

+ _lt_caught_CXX_error=yes

6152

+fi

6153

6154

ac_ext=cpp

6155

ac_cpp='$CXXCPP $CPPFLAGS'

6156

@@ -11904,6 +12330,8 @@ module_cmds_CXX=

6157

module_expsym_cmds_CXX=

6158

link_all_deplibs_CXX=unknown

6159

old_archive_cmds_CXX=$old_archive_cmds

6160

+reload_flag_CXX=$reload_flag

6161

+reload_cmds_CXX=$reload_cmds

6162

no_undefined_flag_CXX=

6163

whole_archive_flag_spec_CXX=

6164

enable_shared_with_static_runtimes_CXX=no

6165

@@ -11959,6 +12387,7 @@ $RM -r conftest*

6166

6167

# Allow CC to be a program name with arguments.

6168

lt_save_CC=$CC

6169

+ lt_save_CFLAGS=$CFLAGS

6170

lt_save_LD=$LD

6171

lt_save_GCC=$GCC

6172

GCC=$GXX

6173

@@ -11976,6 +12405,7 @@ $RM -r conftest*

6174

6175

test -z "${LDCXX+set}" || LD=$LDCXX

6176

CC=${CXX-"c++"}

6177

+ CFLAGS=$CXXFLAGS

6178

compiler=$CC

6179

compiler_CXX=$CC

6180

for cc_temp in $compiler""; do

6181

@@ -11986,7 +12416,7 @@ $RM -r conftest*

6182

*) break;;

6183

esac

6184

done

6185

-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

6186

+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`

6187

6188

6189

if test -n "$compiler"; then

6190

@@ -12049,7 +12479,7 @@ else

6191

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5

6192

$as_echo_n "checking for non-GNU ld... " >&6; }

6193

6194

-if test "${lt_cv_path_LD+set}" = set; then :

6195

+if ${lt_cv_path_LD+:} false; then :

6196

$as_echo_n "(cached) " >&6

13727

6197

else

13728

6198

if test -z "$LD"; then

13729

lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

13730

@@ -12759,19 +12091,17 @@ fi

13731

13732

LD="$lt_cv_path_LD"

13733

if test -n "$LD"; then

13734

- { echo "$as_me:$LINENO: result: $LD" >&5

13735

-echo "${ECHO_T}$LD" >&6; }

13736

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5

13737

+$as_echo "$LD" >&6; }

13738

else

13739

- { echo "$as_me:$LINENO: result: no" >&5

13740

-echo "${ECHO_T}no" >&6; }

13741

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

13742

+$as_echo "no" >&6; }

6199

@@ -12086,10 +12516,10 @@ else

6200

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6201

$as_echo "no" >&6; }

13743

6202

13744

-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

13745

-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

13746

- { (exit 1); exit 1; }; }

13747

-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

13748

-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

13749

-if test "${lt_cv_prog_gnu_ld+set}" = set; then

13750

- echo $ECHO_N "(cached) $ECHO_C" >&6

6203

-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5

13751

6204

+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5

13752

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

13753

+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

13754

+if test "${lt_cv_prog_gnu_ld+set}" = set; then :

13755

+ $as_echo_n "(cached) " >&6

6205

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

6206

$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

6207

-if test "${lt_cv_prog_gnu_ld+set}" = set; then :

6208

+if ${lt_cv_prog_gnu_ld+:} false; then :

6209

$as_echo_n "(cached) " >&6

13756

6210

else

13757

6211

# I'd rather use --version here, but apparently some GNU lds only accept -v.

13758

case `$LD -v 2>&1 </dev/null` in

13759

@@ -12783,8 +12113,8 @@ case `$LD -v 2>&1 </dev/null` in

13760

;;

13761

esac

13762

13763

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

13764

-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

13765

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5

13766

+$as_echo "$lt_cv_prog_gnu_ld" >&6; }

13767

with_gnu_ld=$lt_cv_prog_gnu_ld

13768

13769

13770

@@ -12838,8 +12168,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld

13771

13772

13773

# PORTME: fill in a description of your system's C++ link characteristics

13774

- { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

13775

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

13776

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5

13777

+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

13778

ld_shlibs_CXX=yes

13779

case $host_os in

13780

aix3*)

13781

@@ -12928,6 +12258,7 @@ echo $ECHO_N "checking whether the $comp

13782

13783

13784

13785

+ export_dynamic_flag_spec_CXX='${wl}-bexpall'

13786

# It seems that -bexpall does not export symbols beginning with

13787

# underscore (_), so it is better to generate a list of symbols to

13788

# export.

13789

@@ -12938,11 +12269,7 @@ echo $ECHO_N "checking whether the $comp

6212

@@ -12115,8 +12545,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld

6213

# Check if GNU C++ uses GNU ld as the underlying linker, since the

6214

# archiving commands below assume that GNU ld is being used.

6215

if test "$with_gnu_ld" = yes; then

6216

- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'

6217

- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

6218

+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'

6219

+ archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

6220

6221

hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'

6222

export_dynamic_flag_spec_CXX='${wl}--export-dynamic'

6223

@@ -12148,7 +12578,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld

6224

# Commands to make compiler produce verbose output that lists

6225

# what "hidden" libraries, object files and flags are used when

6226

# linking a shared library.

6227

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

6228

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

6229

6230

else

6231

GXX=no

6232

@@ -12258,7 +12688,13 @@ $as_echo_n "checking whether the $compil

13790

6233

allow_undefined_flag_CXX='-berok'

13791

6234

# Determine the default libpath from the value encoded in an empty

13792

6235

# executable.

13793

- cat >conftest.$ac_ext <<_ACEOF

13794

-/* confdefs.h. */

13795

-_ACEOF

13796

-cat confdefs.h >>conftest.$ac_ext

13797

-cat >>conftest.$ac_ext <<_ACEOF

13798

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6236

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6237

+ if test "${lt_cv_aix_libpath+set}" = set; then

6238

+ aix_libpath=$lt_cv_aix_libpath

6239

+else

6240

+ if ${lt_cv_aix_libpath__CXX+:} false; then :

6241

+ $as_echo_n "(cached) " >&6

6242

+else

6243

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13799

6244

/* end confdefs.h. */

13800

6245

13801

6246

int

13802

@@ -12953,24 +12280,7 @@ main ()

13803

return 0;

13804

}

6247

@@ -12271,26 +12707,33 @@ main ()

13805

6248

_ACEOF

13806

-rm -f conftest.$ac_objext conftest$ac_exeext

13807

-if { (ac_try="$ac_link"

13808

-case "(($ac_try" in

13809

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13810

- *) ac_try_echo=$ac_try;;

13811

-esac

13812

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13813

- (eval "$ac_link") 2>conftest.er1

13814

- ac_status=$?

13815

- grep -v '^ *+' conftest.er1 >conftest.err

13816

- rm -f conftest.er1

13817

- cat conftest.err >&5

13818

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13819

- (exit $ac_status); } && {

13820

- test -z "$ac_cxx_werror_flag" ||

13821

- test ! -s conftest.err

13822

- } && test -s conftest$ac_exeext &&

13823

- $as_test_x conftest$ac_exeext; then

13824

+if ac_fn_cxx_try_link "$LINENO"; then :

6249

if ac_fn_cxx_try_link "$LINENO"; then :

13825

6250

13826

lt_aix_libpath_sed='

13827

/Import File Strings/,/^$/ {

13828

@@ -12984,15 +12294,9 @@ aix_libpath=`dump -H conftest$ac_exeext

13829

if test -z "$aix_libpath"; then

13830

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

13831

13832

-else

13833

- echo "$as_me: failed program was:" >&5

13834

-sed 's/^/| /' conftest.$ac_ext >&5

13835

13836

13837

13838

13839

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13840

- conftest$ac_exeext conftest.$ac_ext

13841

+rm -f core conftest.err conftest.$ac_objext \

13842

+ conftest$ac_exeext conftest.$ac_ext

13843

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

6251

-lt_aix_libpath_sed='

6252

- /Import File Strings/,/^$/ {

6253

- /^0/ {

6254

- s/^0 *$.*$$/\1/

6255

- p

6256

- }

6257

- }'

6258

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6259

-# Check for a 64-bit object if we didn't find anything.

6260

-if test -z "$aix_libpath"; then

6261

- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6262

-fi

6263

+ lt_aix_libpath_sed='

6264

+ /Import File Strings/,/^$/ {

6265

+ /^0/ {

6266

+ s/^0 *$[^ ]*$ *$/\1/

6267

+ p

6268

+ }

6269

+ }'

6270

+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6271

+ # Check for a 64-bit object if we didn't find anything.

6272

+ if test -z "$lt_cv_aix_libpath__CXX"; then

6273

+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6274

+ fi

6275

6276

rm -f core conftest.err conftest.$ac_objext \

6277

conftest$ac_exeext conftest.$ac_ext

6278

-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

6279

+ if test -z "$lt_cv_aix_libpath__CXX"; then

6280

+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"

6281

+ fi

6282

6283

+fi

6284

6285

+ aix_libpath=$lt_cv_aix_libpath__CXX

6286

+fi

13844

6287

13845

6288

hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"

13846

@@ -13006,11 +12310,7 @@ if test -z "$aix_libpath"; then aix_libp

6289

6290

- archive_expsym_cmds_CXX='$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"

6291

+ archive_expsym_cmds_CXX='$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"

6292

else

6293

if test "$host_cpu" = ia64; then

6294

hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'

6295

@@ -12299,7 +12742,13 @@ if test -z "$aix_libpath"; then aix_libp

13847

6296

else

13848

6297

# Determine the default libpath from the value encoded in an

13849

6298

# empty executable.

13850

- cat >conftest.$ac_ext <<_ACEOF

13851

-/* confdefs.h. */

13852

-_ACEOF

13853

-cat confdefs.h >>conftest.$ac_ext

13854

-cat >>conftest.$ac_ext <<_ACEOF

13855

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6299

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6300

+ if test "${lt_cv_aix_libpath+set}" = set; then

6301

+ aix_libpath=$lt_cv_aix_libpath

6302

+else

6303

+ if ${lt_cv_aix_libpath__CXX+:} false; then :

6304

+ $as_echo_n "(cached) " >&6

6305

+else

6306

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13856

6307

/* end confdefs.h. */

13857

6308

13858

6309

int

13859

@@ -13021,24 +12321,7 @@ main ()

13860

return 0;

13861

}

6310

@@ -12312,30 +12761,42 @@ main ()

13862

6311

_ACEOF

13863

-rm -f conftest.$ac_objext conftest$ac_exeext

13864

-if { (ac_try="$ac_link"

13865

-case "(($ac_try" in

13866

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13867

- *) ac_try_echo=$ac_try;;

13868

-esac

13869

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13870

- (eval "$ac_link") 2>conftest.er1

13871

- ac_status=$?

13872

- grep -v '^ *+' conftest.er1 >conftest.err

13873

- rm -f conftest.er1

13874

- cat conftest.err >&5

13875

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13876

- (exit $ac_status); } && {

13877

- test -z "$ac_cxx_werror_flag" ||

13878

- test ! -s conftest.err

13879

- } && test -s conftest$ac_exeext &&

13880

- $as_test_x conftest$ac_exeext; then

13881

+if ac_fn_cxx_try_link "$LINENO"; then :

6312

if ac_fn_cxx_try_link "$LINENO"; then :

13882

6313

13883

lt_aix_libpath_sed='

13884

/Import File Strings/,/^$/ {

13885

@@ -13052,15 +12335,9 @@ aix_libpath=`dump -H conftest$ac_exeext

13886

if test -z "$aix_libpath"; then

13887

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

13888

13889

-else

13890

- echo "$as_me: failed program was:" >&5

13891

-sed 's/^/| /' conftest.$ac_ext >&5

13892

13893

13894

13895

13896

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13897

- conftest$ac_exeext conftest.$ac_ext

13898

+rm -f core conftest.err conftest.$ac_objext \

13899

+ conftest$ac_exeext conftest.$ac_ext

13900

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

6314

-lt_aix_libpath_sed='

6315

- /Import File Strings/,/^$/ {

6316

- /^0/ {

6317

- s/^0 *$.*$$/\1/

6318

- p

6319

- }

6320

- }'

6321

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6322

-# Check for a 64-bit object if we didn't find anything.

6323

-if test -z "$aix_libpath"; then

6324

- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6325

-fi

6326

+ lt_aix_libpath_sed='

6327

+ /Import File Strings/,/^$/ {

6328

+ /^0/ {

6329

+ s/^0 *$[^ ]*$ *$/\1/

6330

+ p

6331

+ }

6332

+ }'

6333

+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6334

+ # Check for a 64-bit object if we didn't find anything.

6335

+ if test -z "$lt_cv_aix_libpath__CXX"; then

6336

+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6337

+ fi

6338

6339

rm -f core conftest.err conftest.$ac_objext \

6340

conftest$ac_exeext conftest.$ac_ext

6341

-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

6342

+ if test -z "$lt_cv_aix_libpath__CXX"; then

6343

+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"

6344

+ fi

6345

6346

+fi

6347

6348

+ aix_libpath=$lt_cv_aix_libpath__CXX

6349

+fi

13901

6350

13902

6351

hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"

13903

@@ -13098,7 +12375,7 @@ if test -z "$aix_libpath"; then aix_libp

13904

esac

6352

# Warning - without using the other run time loading flags,

6353

# -berok will link without error, but may produce a broken library.

6354

no_undefined_flag_CXX=' ${wl}-bernotok'

6355

allow_undefined_flag_CXX=' ${wl}-berok'

6356

- # Exported symbols can be pulled into shared objects from archives

6357

- whole_archive_flag_spec_CXX='$convenience'

6358

+ if test "$with_gnu_ld" = yes; then

6359

+ # We only use this code for GNU lds that support --whole-archive.

6360

+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'

6361

+ else

6362

+ # Exported symbols can be pulled into shared objects from archives

6363

+ whole_archive_flag_spec_CXX='$convenience'

6364

+ fi

6365

archive_cmds_need_lc_CXX=yes

6366

# This is similar to how AIX traditionally builds its shared

6367

# libraries.

6368

@@ -12365,28 +12826,75 @@ if test -z "$aix_libpath"; then aix_libp

13905

6369

;;

13906

6370

13907

- cygwin* | mingw* | pw32*)

13908

+ cygwin* | mingw* | pw32* | cegcc*)

13909

# _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,

13910

# as there is no search path for DLLs.

13911

hardcode_libdir_flag_spec_CXX='-L$libdir'

13912

@@ -13131,7 +12408,11 @@ if test -z "$aix_libpath"; then aix_libp

13913

whole_archive_flag_spec_CXX=''

6371

cygwin* | mingw* | pw32* | cegcc*)

6372

- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,

6373

- # as there is no search path for DLLs.

6374

- hardcode_libdir_flag_spec_CXX='-L$libdir'

6375

- allow_undefined_flag_CXX=unsupported

6376

- always_export_symbols_CXX=no

6377

- enable_shared_with_static_runtimes_CXX=yes

6378

6379

- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

6380

- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

6381

- # If the export-symbols file already is a .def file (1st line

6382

- # is EXPORTS), use it as is; otherwise, prepend...

6383

- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

6384

- cp $export_symbols $output_objdir/$soname.def;

6385

- else

6386

- echo EXPORTS > $output_objdir/$soname.def;

6387

- cat $export_symbols >> $output_objdir/$soname.def;

6388

- fi~

6389

- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

6390

- else

6391

- ld_shlibs_CXX=no

6392

- fi

6393

- ;;

6394

+ case $GXX,$cc_basename in

6395

+ ,cl* | no,cl*)

6396

+ # Native MSVC

6397

+ # hardcode_libdir_flag_spec is actually meaningless, as there is

6398

+ # no search path for DLLs.

6399

+ hardcode_libdir_flag_spec_CXX=' '

6400

+ allow_undefined_flag_CXX=unsupported

6401

+ always_export_symbols_CXX=yes

6402

+ file_list_spec_CXX='@'

6403

+ # Tell ltmain to make .lib files, not .a files.

6404

+ libext=lib

6405

+ # Tell ltmain to make .dll files, not .so files.

6406

+ shrext_cmds=".dll"

6407

+ # FIXME: Setting linknames here is a bad hack.

6408

+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='

6409

+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

6410

+ $SED -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;

6411

+ else

6412

+ $SED -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;

6413

+ fi~

6414

+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~

6415

+ linknames='

6416

+ # The linker will not automatically build a static lib if we build a DLL.

6417

+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'

6418

+ enable_shared_with_static_runtimes_CXX=yes

6419

+ # Don't use ranlib

6420

+ old_postinstall_cmds_CXX='chmod 644 $oldlib'

6421

+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~

6422

+ lt_tool_outputfile="@TOOL_OUTPUT@"~

6423

+ case $lt_outputfile in

6424

+ *.exe|*.EXE) ;;

6425

+ *)

6426

+ lt_outputfile="$lt_outputfile.exe"

6427

+ lt_tool_outputfile="$lt_tool_outputfile.exe"

6428

+ ;;

6429

+ esac~

6430

+ func_to_tool_file "$lt_outputfile"~

6431

+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then

6432

+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;

6433

+ $RM "$lt_outputfile.manifest";

6434

+ fi'

6435

+ ;;

6436

+ *)

6437

+ # g++

6438

+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,

6439

+ # as there is no search path for DLLs.

6440

+ hardcode_libdir_flag_spec_CXX='-L$libdir'

6441

+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'

6442

+ allow_undefined_flag_CXX=unsupported

6443

+ always_export_symbols_CXX=no

6444

+ enable_shared_with_static_runtimes_CXX=yes

6445

6446

+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

6447

+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

6448

+ # If the export-symbols file already is a .def file (1st line

6449

+ # is EXPORTS), use it as is; otherwise, prepend...

6450

+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

6451

+ cp $export_symbols $output_objdir/$soname.def;

6452

+ else

6453

+ echo EXPORTS > $output_objdir/$soname.def;

6454

+ cat $export_symbols >> $output_objdir/$soname.def;

6455

+ fi~

6456

+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

6457

+ else

6458

+ ld_shlibs_CXX=no

6459

+ fi

6460

+ ;;

6461

+ esac

6462

+ ;;

6463

darwin* | rhapsody*)

6464

6465

6466

@@ -12394,7 +12902,11 @@ if test -z "$aix_libpath"; then aix_libp

6467

hardcode_direct_CXX=no

6468

hardcode_automatic_CXX=yes

6469

hardcode_shlibpath_var_CXX=unsupported

6470

- whole_archive_flag_spec_CXX=''

6471

+ if test "$lt_cv_ld_force_load" = "yes"; then

6472

+ whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'

6473

+ else

6474

+ whole_archive_flag_spec_CXX=''

6475

+ fi

13914

6476

link_all_deplibs_CXX=yes

13915

6477

allow_undefined_flag_CXX="$_lt_dar_allow_undefined"

13916

- if test "$GCC" = "yes"; then

13917

+ case $cc_basename in

13918

+ ifort*) _lt_dar_can_shared=yes ;;

13919

+ *) _lt_dar_can_shared=$GCC ;;

13920

+ esac

13921

+ if test "$_lt_dar_can_shared" = "yes"; then

13922

output_verbose_link_cmd=echo

6478

case $cc_basename in

6479

@@ -12402,7 +12914,7 @@ if test -z "$aix_libpath"; then aix_libp

6480

*) _lt_dar_can_shared=$GCC ;;

6481

esac

6482

if test "$_lt_dar_can_shared" = "yes"; then

6483

- output_verbose_link_cmd=echo

6484

+ output_verbose_link_cmd=func_echo_all

13923

6485

archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"

13924

6486

module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

13925

@@ -13341,7 +12622,7 @@ if test -z "$aix_libpath"; then aix_libp

13926

inherit_rpath_CXX=yes

13927

;;

13928

13929

- linux* | k*bsd*-gnu)

13930

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

13931

case $cc_basename in

13932

KCC*)

13933

# Kuck and Associates, Inc. (KAI) C++ Compiler

13934

@@ -13800,8 +13081,8 @@ if test -z "$aix_libpath"; then aix_libp

13935

;;

13936

esac

13937

13938

- { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

13939

-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

13940

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5

13941

+$as_echo "$ld_shlibs_CXX" >&6; }

13942

test "$ld_shlibs_CXX" = no && can_build_shared=no

13943

13944

GCC_CXX="$GXX"

13945

@@ -13828,11 +13109,11 @@ private:

6487

archive_expsym_cmds_CXX="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}"

6488

@@ -12455,6 +12967,11 @@ if test -z "$aix_libpath"; then aix_libp

6489

gnu*)

6490

;;

6491

6492

+ haiku*)

6493

+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

6494

+ link_all_deplibs_CXX=yes

6495

+ ;;

6496

6497

hpux9*)

6498

hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'

6499

hardcode_libdir_separator_CXX=:

6500

@@ -12479,11 +12996,11 @@ if test -z "$aix_libpath"; then aix_libp

6501

# explicitly linking system object files so we need to strip them

6502

# from the output so that they don't get included in the library

6503

# dependencies.

6504

- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'

6505

+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'

6506

;;

6507

6508

if test "$GXX" = yes; then

6509

- archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'

6510

+ archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'

6511

else

6512

# FIXME: insert proper C++ library support

6513

ld_shlibs_CXX=no

6514

@@ -12544,7 +13061,7 @@ if test -z "$aix_libpath"; then aix_libp

6515

# explicitly linking system object files so we need to strip them

6516

# from the output so that they don't get included in the library

6517

# dependencies.

6518

- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'

6519

+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'

6520

;;

6521

6522

if test "$GXX" = yes; then

6523

@@ -12554,10 +13071,10 @@ if test -z "$aix_libpath"; then aix_libp

6524

archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

6525

;;

6526

ia64*)

6527

- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

6528

+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

6529

;;

6530

6531

- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

6532

+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

6533

;;

6534

esac

6535

6536

@@ -12587,7 +13104,7 @@ if test -z "$aix_libpath"; then aix_libp

6537

case $cc_basename in

6538

CC*)

6539

# SGI C++

6540

- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

6541

+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

6542

6543

# Archives containing C++ object files must be created using

6544

# "CC -ar", where "CC" is the IRIX C++ compiler. This is

6545

@@ -12598,9 +13115,9 @@ if test -z "$aix_libpath"; then aix_libp

6546

6547

if test "$GXX" = yes; then

6548

if test "$with_gnu_ld" = no; then

6549

- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

6550

+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

6551

else

6552

6553

6554

6555

6556

link_all_deplibs_CXX=yes

6557

@@ -12629,7 +13146,7 @@ if test -z "$aix_libpath"; then aix_libp

6558

# explicitly linking system object files so we need to strip them

6559

# from the output so that they don't get included in the library

6560

# dependencies.

6561

- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'

6562

+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'

6563

6564

hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'

6565

export_dynamic_flag_spec_CXX='${wl}--export-dynamic'

6566

@@ -12666,26 +13183,26 @@ if test -z "$aix_libpath"; then aix_libp

6567

pgCC* | pgcpp*)

6568

# Portland Group C++ compiler

6569

case `$CC -V` in

6570

- *pgCC\ [1-5]* | *pgcpp\ [1-5]*)

6571

+ *pgCC\ [1-5].* | *pgcpp\ [1-5].*)

6572

prelink_cmds_CXX='tpldir=Template.dir~

6573

rm -rf $tpldir~

6574

$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~

6575

- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'

6576

+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'

6577

old_archive_cmds_CXX='tpldir=Template.dir~

6578

rm -rf $tpldir~

6579

$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~

6580

- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~

6581

+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~

6582

$RANLIB $oldlib'

6583

archive_cmds_CXX='tpldir=Template.dir~

6584

rm -rf $tpldir~

6585

$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~

6586

- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

6587

+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

6588

archive_expsym_cmds_CXX='tpldir=Template.dir~

6589

rm -rf $tpldir~

6590

$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~

6591

- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'

6592

+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'

6593

;;

6594

- *) # Version 6 will use weak symbols

6595

+ *) # Version 6 and above use weak symbols

6596

archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

6597

archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'

6598

;;

6599

@@ -12693,7 +13210,7 @@ if test -z "$aix_libpath"; then aix_libp

6600

6601

hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'

6602

export_dynamic_flag_spec_CXX='${wl}--export-dynamic'

6603

- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'

6604

+ whole_archive_flag_spec_CXX='${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'

6605

;;

6606

cxx*)

6607

# Compaq C++

6608

@@ -12712,9 +13229,9 @@ if test -z "$aix_libpath"; then aix_libp

6609

# explicitly linking system object files so we need to strip them

6610

# from the output so that they don't get included in the library

6611

# dependencies.

6612

- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'

6613

+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld .*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'

6614

;;

6615

- xl*)

6616

+ xl* | mpixl* | bgxl*)

6617

# IBM XL 8.0 on PPC, with GNU ld

6618

hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'

6619

export_dynamic_flag_spec_CXX='${wl}--export-dynamic'

6620

@@ -12734,13 +13251,13 @@ if test -z "$aix_libpath"; then aix_libp

6621

archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

6622

archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'

6623

hardcode_libdir_flag_spec_CXX='-R$libdir'

6624

- whole_archive_flag_spec_CXX='${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'

6625

+ whole_archive_flag_spec_CXX='${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'

6626

compiler_needs_object_CXX=yes

6627

6628

# Not sure whether something based on

6629

# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1

6630

# would be better.

6631

- output_verbose_link_cmd='echo'

6632

+ output_verbose_link_cmd='func_echo_all'

6633

6634

# Archives containing C++ object files must be created using

6635

# "CC -xar", where "CC" is the Sun C++ compiler. This is

6636

@@ -12809,7 +13326,7 @@ if test -z "$aix_libpath"; then aix_libp

6637

export_dynamic_flag_spec_CXX='${wl}-E'

6638

whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'

6639

6640

- output_verbose_link_cmd=echo

6641

+ output_verbose_link_cmd=func_echo_all

6642

else

6643

ld_shlibs_CXX=no

6644

6645

@@ -12844,15 +13361,15 @@ if test -z "$aix_libpath"; then aix_libp

6646

case $host in

6647

osf3*)

6648

allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'

6649

- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

6650

+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

6651

hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'

6652

;;

6653

6654

allow_undefined_flag_CXX=' -expect_unresolved \*'

6655

- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

6656

+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

6657

archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~

6658

echo "-hidden">> $lib.exp~

6659

- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~

6660

+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~

6661

$RM $lib.exp'

6662

hardcode_libdir_flag_spec_CXX='-rpath $libdir'

6663

;;

6664

@@ -12868,17 +13385,17 @@ if test -z "$aix_libpath"; then aix_libp

6665

# explicitly linking system object files so we need to strip them

6666

# from the output so that they don't get included in the library

6667

# dependencies.

6668

- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'

6669

+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/$^.*ld.*$$ .*ld.*$$/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'

6670

;;

6671

6672

if test "$GXX" = yes && test "$with_gnu_ld" = no; then

6673

allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'

6674

case $host in

6675

osf3*)

6676

- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

6677

+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

6678

;;

6679

6680

- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

6681

+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

6682

;;

6683

esac

6684

6685

@@ -12888,7 +13405,7 @@ if test -z "$aix_libpath"; then aix_libp

6686

# Commands to make compiler produce verbose output that lists

6687

# what "hidden" libraries, object files and flags are used when

6688

# linking a shared library.

6689

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

6690

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

6691

6692

else

6693

# FIXME: insert proper C++ library support

6694

@@ -12924,7 +13441,7 @@ if test -z "$aix_libpath"; then aix_libp

6695

6696

solaris*)

6697

case $cc_basename in

6698

- CC*)

6699

+ CC* | sunCC*)

6700

# Sun C++ 4.2, 5.x and Centerline C++

6701

archive_cmds_need_lc_CXX=yes

6702

no_undefined_flag_CXX=' -zdefs'

6703

@@ -12945,7 +13462,7 @@ if test -z "$aix_libpath"; then aix_libp

6704

esac

6705

link_all_deplibs_CXX=yes

6706

6707

- output_verbose_link_cmd='echo'

6708

+ output_verbose_link_cmd='func_echo_all'

6709

6710

# Archives containing C++ object files must be created using

6711

# "CC -xar", where "CC" is the Sun C++ compiler. This is

6712

@@ -12965,14 +13482,14 @@ if test -z "$aix_libpath"; then aix_libp

6713

if test "$GXX" = yes && test "$with_gnu_ld" = no; then

6714

no_undefined_flag_CXX=' ${wl}-z ${wl}defs'

6715

if $CC --version | $GREP -v '^2\.7' > /dev/null; then

6716

- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'

6717

+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'

6718

archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

6719

- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'

6720

+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'

6721

6722

# Commands to make compiler produce verbose output that lists

6723

# what "hidden" libraries, object files and flags are used when

6724

# linking a shared library.

6725

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

6726

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

6727

else

6728

# g++ 2.7 appears to require `-G' NOT `-shared' on this

6729

# platform.

6730

@@ -12983,7 +13500,7 @@ if test -z "$aix_libpath"; then aix_libp

6731

# Commands to make compiler produce verbose output that lists

6732

# what "hidden" libraries, object files and flags are used when

6733

# linking a shared library.

6734

- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

6735

+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

6736

6737

6738

hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'

6739

@@ -13037,6 +13554,10 @@ if test -z "$aix_libpath"; then aix_libp

6740

CC*)

6741

archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

6742

archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

6743

+ old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~

6744

+ '"$old_archive_cmds_CXX"

6745

+ reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~

6746

+ '"$reload_cmds_CXX"

6747

;;

6748

6749

archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

6750

@@ -13098,6 +13619,13 @@ private:

13946

6751

};

13947

6752

_LT_EOF

13948

6753

13949

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

13950

+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

6754

6755

+_lt_libdeps_save_CFLAGS=$CFLAGS

6756

+case "$CC $CFLAGS " in #(

6757

+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;

6758

+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;

6759

+esac

6760

6761

if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

13951

6762

(eval $ac_compile) 2>&5

13952

6763

ac_status=$?

13953

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13954

- (exit $ac_status); }; then

13955

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

13956

+ test $ac_status = 0; }; then

13957

# Parse the compiler output and extract the necessary

13958

# objects, libraries and library flags.

13959

13960

@@ -14013,8 +13294,8 @@ fi

6764

@@ -13111,7 +13639,7 @@ if { { eval echo "\"\$as_me\":${as_linen

6765

pre_test_object_deps_done=no

6766

6767

for p in `eval "$output_verbose_link_cmd"`; do

6768

- case $p in

6769

+ case ${prev}${p} in

6770

6771

-L* | -R* | -l*)

6772

# Some compilers place space between "-{L,R}" and the path.

6773

@@ -13120,13 +13648,22 @@ if { { eval echo "\"\$as_me\":${as_linen

6774

test $p = "-R"; then

6775

prev=$p

6776

continue

6777

- else

6778

- prev=

6779

6780

6781

+ # Expand the sysroot to ease extracting the directories later.

6782

+ if test -z "$prev"; then

6783

+ case $p in

6784

+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;

6785

+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;

6786

+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;

6787

+ esac

6788

+ fi

6789

+ case $p in

6790

+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;

6791

+ esac

6792

if test "$pre_test_object_deps_done" = no; then

6793

- case $p in

6794

- -L* | -R*)

6795

+ case ${prev} in

6796

+ -L | -R)

6797

# Internal compiler library paths should come after those

6798

# provided the user. The postdeps already come after the

6799

# user supplied libs so there is no need to process them.

6800

@@ -13146,8 +13683,10 @@ if { { eval echo "\"\$as_me\":${as_linen

6801

postdeps_CXX="${postdeps_CXX} ${prev}${p}"

6802

6803

6804

+ prev=

6805

;;

6806

6807

+ *.lto.$objext) ;; # Ignore GCC LTO objects

6808

*.$objext)

6809

# This assumes that the test object file only shows up

6810

# once in the compiler output.

6811

@@ -13183,6 +13722,7 @@ else

6812

6813

6814

$RM -f confest.$objext

6815

+CFLAGS=$_lt_libdeps_save_CFLAGS

6816

6817

# PORTME: override above test on systems where it is broken

6818

case $host_os in

6819

@@ -13218,7 +13758,7 @@ linux*)

6820

6821

solaris*)

6822

case $cc_basename in

6823

- CC*)

6824

+ CC* | sunCC*)

6825

# The more standards-conforming stlport4 library is

6826

# incompatible with the Cstd library. Avoid specifying

6827

# it if it's in CXXFLAGS. Ignore libCrun as

6828

@@ -13283,8 +13823,6 @@ fi

13961

6829

lt_prog_compiler_pic_CXX=

13962

6830

lt_prog_compiler_static_CXX=

13963

6831

13964

-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

13965

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

13966

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

13967

+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

6832

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

6833

-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

13968

6834

13969

6835

# C++ specific cases for pic, static, wl, etc.

13970

6836

if test "$GXX" = yes; then

13971

@@ -14048,7 +13329,7 @@ echo $ECHO_N "checking for $compiler opt

13972

beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

13973

# PIC is the default for these OSes.

13974

;;

13975

- mingw* | cygwin* | os2* | pw32*)

13976

+ mingw* | cygwin* | os2* | pw32* | cegcc*)

13977

# This hack is so that the source file can tell whether it is being

13978

# built for inclusion in a dll (and should export symbols for example).

13979

# Although the cygwin gcc ignores -fPIC, still need this for old-style

13980

@@ -14074,10 +13355,11 @@ echo $ECHO_N "checking for $compiler opt

13981

13982

;;

13983

hpux*)

13984

- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but

13985

- # not for PA HP-UX.

13986

+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit

13987

+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

13988

+ # sets the default TLS model and affects inlining.

13989

case $host_cpu in

13990

- hppa*64*|ia64*)

13991

+ hppa*64*)

13992

;;

13993

13994

lt_prog_compiler_pic_CXX='-fPIC'

13995

@@ -14168,19 +13450,26 @@ echo $ECHO_N "checking for $compiler opt

13996

;;

6837

@@ -13334,6 +13872,11 @@ $as_echo_n "checking for $compiler optio

6838

# DJGPP does not support shared libraries at all

6839

lt_prog_compiler_pic_CXX=

6840

;;

6841

+ haiku*)

6842

+ # PIC is the default for Haiku.

6843

+ # The "-static" flag exists, but is broken.

6844

+ lt_prog_compiler_static_CXX=

6845

+ ;;

6846

interix[3-9]*)

6847

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

6848

# Instead, we relocate shared libraries at runtime.

6849

@@ -13383,6 +13926,11 @@ $as_echo_n "checking for $compiler optio

6850

;;

13997

6851

esac

13998

6852

;;

13999

- linux* | k*bsd*-gnu)

14000

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

6853

+ mingw* | cygwin* | os2* | pw32* | cegcc*)

6854

+ # This hack is so that the source file can tell whether it is being

6855

+ # built for inclusion in a dll (and should export symbols for example).

6856

+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'

6857

+ ;;

6858

dgux*)

14001

6859

case $cc_basename in

14002

KCC*)

14003

# KAI C++ Compiler

14004

lt_prog_compiler_wl_CXX='--backend -Wl,'

14005

lt_prog_compiler_pic_CXX='-fPIC'

6860

ec++*)

6861

@@ -13472,8 +14020,8 @@ $as_echo_n "checking for $compiler optio

6862

lt_prog_compiler_pic_CXX=

6863

lt_prog_compiler_static_CXX='-non_shared'

14006

6864

;;

14007

- icpc* | ecpc* )

14008

- # Intel C++

14009

+ ecpc* )

14010

+ # old Intel C++ for x86_64 which still supported -KPIC.

6865

- xlc* | xlC*)

6866

- # IBM XL 8.0 on PPC

6867

+ xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)

6868

+ # IBM XL 8.0, 9.0 on PPC and BlueGene

14011

6869

lt_prog_compiler_wl_CXX='-Wl,'

6870

lt_prog_compiler_pic_CXX='-qpic'

6871

lt_prog_compiler_static_CXX='-qstaticlink'

6872

@@ -13535,7 +14083,7 @@ $as_echo_n "checking for $compiler optio

6873

;;

6874

solaris*)

6875

case $cc_basename in

6876

- CC*)

6877

+ CC* | sunCC*)

6878

# Sun C++ 4.2, 5.x and Centerline C++

14012

6879

lt_prog_compiler_pic_CXX='-KPIC'

14013

lt_prog_compiler_static_CXX='-static'

14014

;;

14015

+ icpc* )

14016

+ # Intel C++, used to be incompatible with GCC.

14017

+ # ICC 10 doesn't accept -KPIC any more.

14018

+ lt_prog_compiler_wl_CXX='-Wl,'

14019

+ lt_prog_compiler_pic_CXX='-fPIC'

14020

+ lt_prog_compiler_static_CXX='-static'

14021

+ ;;

14022

pgCC* | pgcpp*)

14023

# Portland Group C++ compiler

14024

lt_prog_compiler_wl_CXX='-Wl,'

14025

@@ -14225,7 +13514,7 @@ echo $ECHO_N "checking for $compiler opt

14026

;;

14027

esac

14028

;;

14029

- netbsd*)

14030

+ netbsd* | netbsdelf*-gnu)

14031

;;

14032

*qnx* | *nto*)

14033

# QNX uses GNU C++, but need to define -shared option too, otherwise

14034

@@ -14322,8 +13611,8 @@ case $host_os in

6880

lt_prog_compiler_static_CXX='-Bstatic'

6881

@@ -13600,10 +14148,17 @@ case $host_os in

14035

6882

lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"

14036

6883

;;

14037

6884

esac

14038

-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5

14039

-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }

14040

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5

14041

+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }

14042

14043

14044

14045

@@ -14331,10 +13620,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic_CXX

6885

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5

6886

-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }

6887

6888

6889

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

6890

+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

6891

+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :

6892

+ $as_echo_n "(cached) " >&6

6893

+else

6894

+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX

6895

+fi

6896

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5

6897

+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }

6898

+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX

6899

6900

14046

6901

# Check to make sure the PIC flag actually works.

14047

6902

@@ -13611,7 +14166,7 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6

14048

6903

if test -n "$lt_prog_compiler_pic_CXX"; then

14049

- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

14050

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }

14051

-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then

14052

- echo $ECHO_N "(cached) $ECHO_C" >&6

14053

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

14054

+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }

14055

+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :

14056

+ $as_echo_n "(cached) " >&6

6904

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

6905

$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }

6906

-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :

6907

+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :

6908

$as_echo_n "(cached) " >&6

14057

6909

else

14058

6910

lt_cv_prog_compiler_pic_works_CXX=no

14059

ac_outfile=conftest.$ac_objext

14060

@@ -14349,11 +13638,11 @@ else

6911

@@ -13627,15 +14182,15 @@ else

14061

6912

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

14062

6913

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

14063

6914

-e 's:$: $lt_compiler_flag:'`

14064

- (eval echo "\"\$as_me:14352: $lt_compile\"" >&5)

14065

+ (eval echo "\"\$as_me:13641: $lt_compile\"" >&5)

6915

- (eval echo "\"\$as_me:13630: $lt_compile\"" >&5)

6916

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

14066

6917

(eval "$lt_compile" 2>conftest.err)

14067

6918

ac_status=$?

14068

6919

cat conftest.err >&5

14069

- echo "$as_me:14356: \$? = $ac_status" >&5

14070

+ echo "$as_me:13645: \$? = $ac_status" >&5

6920

- echo "$as_me:13634: \$? = $ac_status" >&5

6921

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

14071

6922

if (exit $ac_status) && test -s "$ac_outfile"; then

14072

6923

# The compiler can only warn and ignore the option if not recognized

14073

6924

# So say no if there are warnings other than the usual output.

14074

@@ -14366,8 +13655,8 @@ else

14075

$RM conftest*

14076

14077

14078

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5

14079

-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }

14080

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5

14081

+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }

14082

14083

if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then

14084

case $lt_prog_compiler_pic_CXX in

14085

@@ -14387,10 +13676,10 @@ fi

6925

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

6926

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp

6927

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

6928

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

6929

lt_cv_prog_compiler_pic_works_CXX=yes

6930

@@ -13661,13 +14216,15 @@ fi

6931

6932

6933

6934

6935

6936

14086

6937

# Check to make sure the static flag actually works.

14087

6938

14088

6939

wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"

14089

-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

14090

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

14091

-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then

14092

- echo $ECHO_N "(cached) $ECHO_C" >&6

14093

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5

14094

+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

14095

+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :

14096

+ $as_echo_n "(cached) " >&6

6940

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5

6941

$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

6942

-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :

6943

+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :

6944

$as_echo_n "(cached) " >&6

14097

6945

else

14098

6946

lt_cv_prog_compiler_static_works_CXX=no

14099

save_LDFLAGS="$LDFLAGS"

14100

@@ -14415,8 +13704,8 @@ else

14101

LDFLAGS="$save_LDFLAGS"

14102

14103

14104

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5

14105

-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }

14106

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5

14107

+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }

14108

14109

if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then

14110

14111

@@ -14427,10 +13716,10 @@ fi

14112

14113

14114

14115

- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

14116

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

14117

-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then

14118

- echo $ECHO_N "(cached) $ECHO_C" >&6

14119

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

14120

+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

14121

+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :

14122

+ $as_echo_n "(cached) " >&6

14123

else

14124

lt_cv_prog_compiler_c_o_CXX=no

14125

$RM -r conftest 2>/dev/null

14126

@@ -14448,11 +13737,11 @@ else

14127

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

14128

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

14129

-e 's:$: $lt_compiler_flag:'`

14130

- (eval echo "\"\$as_me:14451: $lt_compile\"" >&5)

14131

+ (eval echo "\"\$as_me:13740: $lt_compile\"" >&5)

14132

(eval "$lt_compile" 2>out/conftest.err)

14133

ac_status=$?

14134

cat out/conftest.err >&5

14135

- echo "$as_me:14455: \$? = $ac_status" >&5

14136

+ echo "$as_me:13744: \$? = $ac_status" >&5

14137

if (exit $ac_status) && test -s out/conftest2.$ac_objext

14138

then

14139

# The compiler can only warn and ignore the option if not recognized

14140

@@ -14474,15 +13763,15 @@ else

14141

$RM conftest*

14142

14143

14144

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

14145

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }

14146

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5

14147

+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }

14148

14149

14150

14151

- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

14152

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

14153

-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then

14154

- echo $ECHO_N "(cached) $ECHO_C" >&6

14155

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

14156

+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

14157

+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :

14158

+ $as_echo_n "(cached) " >&6

14159

else

14160

lt_cv_prog_compiler_c_o_CXX=no

14161

$RM -r conftest 2>/dev/null

14162

@@ -14500,11 +13789,11 @@ else

14163

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

14164

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

14165

-e 's:$: $lt_compiler_flag:'`

14166

- (eval echo "\"\$as_me:14503: $lt_compile\"" >&5)

14167

+ (eval echo "\"\$as_me:13792: $lt_compile\"" >&5)

14168

(eval "$lt_compile" 2>out/conftest.err)

14169

ac_status=$?

14170

cat out/conftest.err >&5

14171

- echo "$as_me:14507: \$? = $ac_status" >&5

14172

+ echo "$as_me:13796: \$? = $ac_status" >&5

14173

if (exit $ac_status) && test -s out/conftest2.$ac_objext

14174

then

14175

# The compiler can only warn and ignore the option if not recognized

14176

@@ -14526,8 +13815,8 @@ else

14177

$RM conftest*

14178

14179

14180

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

14181

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }

14182

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5

14183

+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }

14184

14185

14186

14187

@@ -14535,19 +13824,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o_

14188

hard_links="nottested"

14189

if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then

14190

# do not overwrite the value of need_locks provided by the user

14191

- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

14192

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

14193

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5

14194

+$as_echo_n "checking if we can lock with hard links... " >&6; }

14195

hard_links=yes

14196

$RM conftest*

14197

ln conftest.a conftest.b 2>/dev/null && hard_links=no

14198

touch conftest.a

14199

ln conftest.a conftest.b 2>&5 || hard_links=no

14200

ln conftest.a conftest.b 2>/dev/null && hard_links=no

14201

- { echo "$as_me:$LINENO: result: $hard_links" >&5

14202

-echo "${ECHO_T}$hard_links" >&6; }

14203

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5

14204

+$as_echo "$hard_links" >&6; }

14205

if test "$hard_links" = no; then

14206

- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

14207

-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

14208

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

14209

+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

14210

need_locks=warn

14211

14212

else

14213

@@ -14556,8 +13845,8 @@ fi

14214

14215

14216

14217

- { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

14218

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

14219

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5

14220

+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

6947

@@ -13680,7 +14237,7 @@ else

6948

if test -s conftest.err; then

6949

# Append any errors to the config.log.

6950

cat conftest.err 1>&5

6951

- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp

6952

+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp

6953

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

6954

if diff conftest.exp conftest.er2 >/dev/null; then

6955

lt_cv_prog_compiler_static_works_CXX=yes

6956

@@ -13707,7 +14264,7 @@ fi

6957

6958

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

6959

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

6960

-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :

6961

+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :

6962

$as_echo_n "(cached) " >&6

6963

else

6964

lt_cv_prog_compiler_c_o_CXX=no

6965

@@ -13726,16 +14283,16 @@ else

6966

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

6967

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

6968

-e 's:$: $lt_compiler_flag:'`

6969

- (eval echo "\"\$as_me:13729: $lt_compile\"" >&5)

6970

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

6971

(eval "$lt_compile" 2>out/conftest.err)

6972

ac_status=$?

6973

cat out/conftest.err >&5

6974

- echo "$as_me:13733: \$? = $ac_status" >&5

6975

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6976

if (exit $ac_status) && test -s out/conftest2.$ac_objext

6977

then

6978

# The compiler can only warn and ignore the option if not recognized

6979

# So say no if there are warnings

6980

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp

6981

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp

6982

$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2

6983

if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then

6984

lt_cv_prog_compiler_c_o_CXX=yes

6985

@@ -13759,7 +14316,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX"

6986

6987

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

6988

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

6989

-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :

6990

+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :

6991

$as_echo_n "(cached) " >&6

6992

else

6993

lt_cv_prog_compiler_c_o_CXX=no

6994

@@ -13778,16 +14335,16 @@ else

6995

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

6996

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

6997

-e 's:$: $lt_compiler_flag:'`

6998

- (eval echo "\"\$as_me:13781: $lt_compile\"" >&5)

6999

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

7000

(eval "$lt_compile" 2>out/conftest.err)

7001

ac_status=$?

7002

cat out/conftest.err >&5

7003

- echo "$as_me:13785: \$? = $ac_status" >&5

7004

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

7005

if (exit $ac_status) && test -s out/conftest2.$ac_objext

7006

then

7007

# The compiler can only warn and ignore the option if not recognized

7008

# So say no if there are warnings

7009

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp

7010

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp

7011

$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2

7012

if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then

7013

lt_cv_prog_compiler_c_o_CXX=yes

7014

@@ -13838,30 +14395,38 @@ fi

7015

$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

14221

7016

14222

7017

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

7018

+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

14223

7019

case $host_os in

14224

@@ -14573,17 +13862,20 @@ echo $ECHO_N "checking whether the $comp

7020

aix[4-9]*)

7021

# If we're using GNU nm, then we don't want the "-C" option.

7022

# -C means demangle to AIX nm, but means don't demangle with GNU nm

7023

+ # Also, AIX nm treats weak defined symbols like other global defined

7024

+ # symbols, whereas GNU nm marks them as "W".

7025

if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then

7026

- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'

7027

+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'

7028

else

7029

export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'

7030

7031

;;

14225

7032

pw32*)

14226

7033

export_symbols_cmds_CXX="$ltdll_cmds"

14227

;;

14228

- cygwin* | mingw*)

14229

+ cygwin* | mingw* | cegcc*)

14230

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__$[^ ]*$[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'

14231

;;

14232

+ linux* | k*bsd*-gnu)

14233

+ link_all_deplibs_CXX=no

14234

+ ;;

7034

- ;;

7035

+ ;;

7036

cygwin* | mingw* | cegcc*)

7037

- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__$[^ ]*$[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'

7038

- ;;

7039

- linux* | k*bsd*-gnu)

7040

+ case $cc_basename in

7041

+ cl*) ;;

7042

+ *)

7043

+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/;s/^.*[ ]__nm__$[^ ]*$[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'

7044

+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'

7045

+ ;;

7046

+ esac

7047

+ ;;

7048

+ linux* | k*bsd*-gnu | gnu*)

7049

link_all_deplibs_CXX=no

7050

- ;;

7051

+ ;;

14235

7052

14236

7053

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

14237

;;

7054

- ;;

7055

+ ;;

14238

7056

esac

14239

exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

14240

14241

-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

14242

-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

14243

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5

14244

+$as_echo "$ld_shlibs_CXX" >&6; }

14245

test "$ld_shlibs_CXX" = no && can_build_shared=no

14246

14247

with_gnu_ld_CXX=$with_gnu_ld

14248

@@ -14610,16 +13902,16 @@ x|xyes)

14249

# Test whether the compiler implicitly links with -lc since on some

14250

# systems, -lgcc has to come before -lc. If gcc already passes -lc

7057

- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

7058

7059

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5

7060

$as_echo "$ld_shlibs_CXX" >&6; }

7061

@@ -13893,44 +14458,50 @@ x|xyes)

14251

7062

# to ld, don't add -lc before -lgcc.

14252

- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

14253

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

14254

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5

14255

+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

14256

$RM conftest*

14257

echo "$lt_simple_compile_test_code" > conftest.$ac_ext

7063

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5

7064

$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

7065

- $RM conftest*

7066

- echo "$lt_simple_compile_test_code" > conftest.$ac_ext

7067

+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :

7068

+ $as_echo_n "(cached) " >&6

7069

+else

7070

+ $RM conftest*

7071

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

14258

7072

14259

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

14260

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

7073

- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

7074

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

14261

7075

(eval $ac_compile) 2>&5

14262

7076

ac_status=$?

14263

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14264

- (exit $ac_status); } 2>conftest.err; then

14265

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14266

+ test $ac_status = 0; } 2>conftest.err; then

14267

soname=conftest

14268

lib=conftest

14269

libobjs=conftest.$ac_objext

14270

@@ -14633,11 +13925,11 @@ echo $ECHO_N "checking whether -lc shoul

14271

libname=conftest

14272

lt_save_allow_undefined_flag=$allow_undefined_flag_CXX

14273

allow_undefined_flag_CXX=

14274

- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5

14275

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

7077

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

7078

test $ac_status = 0; } 2>conftest.err; then

7079

- soname=conftest

7080

- lib=conftest

7081

- libobjs=conftest.$ac_objext

7082

- deplibs=

7083

- wl=$lt_prog_compiler_wl_CXX

7084

- pic_flag=$lt_prog_compiler_pic_CXX

7085

- compiler_flags=-v

7086

- linker_flags=-v

7087

- verstring=

7088

- output_objdir=.

7089

- libname=conftest

7090

- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX

7091

- allow_undefined_flag_CXX=

7092

- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

7093

+ soname=conftest

7094

+ lib=conftest

7095

+ libobjs=conftest.$ac_objext

7096

+ deplibs=

7097

+ wl=$lt_prog_compiler_wl_CXX

7098

+ pic_flag=$lt_prog_compiler_pic_CXX

7099

+ compiler_flags=-v

7100

+ linker_flags=-v

7101

+ verstring=

7102

+ output_objdir=.

7103

+ libname=conftest

7104

+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX

7105

+ allow_undefined_flag_CXX=

7106

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

14276

7107

(eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5

14277

7108

ac_status=$?

14278

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14279

- (exit $ac_status); }

14280

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14281

+ test $ac_status = 0; }

14282

then

14283

archive_cmds_need_lc_CXX=no

14284

else

14285

@@ -14648,8 +13940,8 @@ echo $ECHO_N "checking whether -lc shoul

14286

cat conftest.err 1>&5

14287

14288

$RM conftest*

14289

- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5

14290

-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }

14291

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5

14292

+$as_echo "$archive_cmds_need_lc_CXX" >&6; }

7109

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

7110

test $ac_status = 0; }

7111

- then

7112

- archive_cmds_need_lc_CXX=no

7113

- else

7114

- archive_cmds_need_lc_CXX=yes

7115

- fi

7116

- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag

7117

- else

7118

- cat conftest.err 1>&5

7119

- fi

7120

- $RM conftest*

7121

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5

7122

-$as_echo "$archive_cmds_need_lc_CXX" >&6; }

7123

+ then

7124

+ lt_cv_archive_cmds_need_lc_CXX=no

7125

+ else

7126

+ lt_cv_archive_cmds_need_lc_CXX=yes

7127

+ fi

7128

+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag

7129

+ else

7130

+ cat conftest.err 1>&5

7131

+ fi

7132

+ $RM conftest*

7133

7134

+fi

7135

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5

7136

+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }

7137

+ archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX

14293

7138

;;

14294

7139

esac

14295

7140

14296

@@ -14719,8 +14011,8 @@ esac

14297

14298

14299

14300

- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

14301

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

14302

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5

14303

+$as_echo_n "checking dynamic linker characteristics... " >&6; }

14304

14305

library_names_spec=

14306

libname_spec='lib$name'

14307

@@ -14831,14 +14123,14 @@ bsdi[45]*)

14308

# libtool to hard-code these into programs

7141

@@ -14087,7 +14658,7 @@ amigaos*)

7142

m68k)

7143

library_names_spec='$libname.ixlibrary $libname.a'

7144

# Create ${libname}_ixlibrary.a entries in /sys/libs.

7145

7146

7147

;;

7148

esac

14309

7149

;;

14310

14311

-cygwin* | mingw* | pw32*)

14312

+cygwin* | mingw* | pw32* | cegcc*)

14313

version_type=windows

14314

shrext_cmds=".dll"

7150

@@ -14118,8 +14689,9 @@ cygwin* | mingw* | pw32* | cegcc*)

14315

7151

need_version=no

14316

7152

need_lib_prefix=no

14317

7153

14318

case $GCC,$host_os in

14319

- yes,cygwin* | yes,mingw* | yes,pw32*)

14320

+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

7154

- case $GCC,$host_os in

7155

- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

7156

+ case $GCC,$cc_basename in

7157

+ yes,*)

7158

+ # gcc

14321

7159

library_names_spec='$libname.dll.a'

14322

7160

# DLL is installed to $(libdir)/../bin by postinstall_cmds

14323

7161

postinstall_cmds='base_file=`basename \${file}`~

14324

@@ -14861,7 +14153,7 @@ cygwin* | mingw* | pw32*)

7162

@@ -14140,36 +14712,82 @@ cygwin* | mingw* | pw32* | cegcc*)

7163

cygwin*)

7164

# Cygwin DLLs use 'cyg' prefix rather than 'lib'

14325

7165

soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

14326

sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

7166

- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

7167

14327

7168

;;

14328

- mingw*)

14329

+ mingw* | cegcc*)

7169

mingw* | cegcc*)

14330

7170

# MinGW DLLs use traditional 'lib' prefix

14331

7171

soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

14332

sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

14333

@@ -15075,7 +14367,7 @@ linux*oldld* | linux*aout* | linux*coff*

14334

;;

14335

14336

# This must be Linux ELF.

14337

-linux* | k*bsd*-gnu)

14338

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

14339

version_type=linux

14340

need_lib_prefix=no

14341

need_version=no

14342

@@ -15089,11 +14381,7 @@ linux* | k*bsd*-gnu)

14343

save_libdir=$libdir

14344

eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \

14345

LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""

14346

- cat >conftest.$ac_ext <<_ACEOF

14347

-/* confdefs.h. */

14348

-_ACEOF

14349

-cat confdefs.h >>conftest.$ac_ext

14350

-cat >>conftest.$ac_ext <<_ACEOF

14351

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

14352

/* end confdefs.h. */

14353

14354

int

14355

@@ -15104,37 +14392,13 @@ main ()

14356

return 0;

14357

}

14358

_ACEOF

14359

-rm -f conftest.$ac_objext conftest$ac_exeext

14360

-if { (ac_try="$ac_link"

14361

-case "(($ac_try" in

14362

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14363

- *) ac_try_echo=$ac_try;;

14364

-esac

14365

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14366

- (eval "$ac_link") 2>conftest.er1

14367

- ac_status=$?

14368

- grep -v '^ *+' conftest.er1 >conftest.err

14369

- rm -f conftest.er1

14370

- cat conftest.err >&5

14371

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14372

- (exit $ac_status); } && {

14373

- test -z "$ac_cxx_werror_flag" ||

14374

- test ! -s conftest.err

14375

- } && test -s conftest$ac_exeext &&

14376

- $as_test_x conftest$ac_exeext; then

14377

- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then

14378

+if ac_fn_cxx_try_link "$LINENO"; then :

14379

+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :

14380

shlibpath_overrides_runpath=yes

14381

14382

14383

-else

14384

- echo "$as_me: failed program was:" >&5

14385

-sed 's/^/| /' conftest.$ac_ext >&5

14386

14387

14388

14389

14390

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14391

- conftest$ac_exeext conftest.$ac_ext

14392

+rm -f core conftest.err conftest.$ac_objext \

14393

+ conftest$ac_exeext conftest.$ac_ext

14394

LDFLAGS=$save_LDFLAGS

14395

libdir=$save_libdir

14396

14397

@@ -15158,6 +14422,18 @@ rm -f core conftest.err conftest.$ac_obj

14398

dynamic_linker='GNU/Linux ld.so'

14399

;;

14400

14401

+netbsdelf*-gnu)

7172

- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

7173

- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then

7174

- # It is most probably a Windows format PATH printed by

7175

- # mingw gcc, but we are running on Cygwin. Gcc prints its search

7176

- # path with ; separators, and with drive letters. We can handle the

7177

- # drive letters (cygwin fileutils understands them), so leave them,

7178

- # especially as we might pass files found there to a mingw objdump,

7179

- # which wouldn't understand a cygwinified path. Ahh.

7180

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

7181

- else

7182

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

7183

- fi

7184

;;

7185

pw32*)

7186

# pw32 DLLs use 'pw' prefix rather than 'lib'

7187

library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

7188

;;

7189

esac

7190

+ dynamic_linker='Win32 ld.exe'

7191

+ ;;

7192

7193

+ *,cl*)

7194

+ # Native MSVC

7195

+ libname_spec='$name'

7196

+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

7197

+ library_names_spec='${libname}.dll.lib'

7198

7199

+ case $build_os in

7200

+ mingw*)

7201

+ sys_lib_search_path_spec=

7202

+ lt_save_ifs=$IFS

7203

+ IFS=';'

7204

+ for lt_path in $LIB

7205

+ do

7206

+ IFS=$lt_save_ifs

7207

+ # Let DOS variable expansion print the short 8.3 style file name.

7208

+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`

7209

+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"

7210

+ done

7211

+ IFS=$lt_save_ifs

7212

+ # Convert to MSYS style.

7213

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[a-zA-Z]\$:| /\\1|g' -e 's|^ ||'`

7214

+ ;;

7215

+ cygwin*)

7216

+ # Convert to unix form, then to dos form, then back to unix form

7217

+ # but this time dos style (no spaces!) so that the unix form looks

7218

+ # like /cygdrive/c/PROGRA~1:/cygdr...

7219

+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`

7220

+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`

7221

+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

7222

+ ;;

7223

+ *)

7224

+ sys_lib_search_path_spec="$LIB"

7225

+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then

7226

+ # It is most probably a Windows format PATH.

7227

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

7228

+ else

7229

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

7230

+ fi

7231

+ # FIXME: find the short name or the path components, as spaces are

7232

+ # common. (e.g. "Program Files" -> "PROGRA~1")

7233

+ ;;

7234

+ esac

7235

7236

+ # DLL is installed to $(libdir)/../bin by postinstall_cmds

7237

+ postinstall_cmds='base_file=`basename \${file}`~

7238

+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~

7239

+ dldir=$destdir/`dirname \$dlpath`~

7240

+ test -d \$dldir || mkdir -p \$dldir~

7241

+ $install_prog $dir/$dlname \$dldir/$dlname'

7242

+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~

7243

+ dlpath=$dir/\$dldll~

7244

+ $RM \$dlpath'

7245

+ shlibpath_overrides_runpath=yes

7246

+ dynamic_linker='Win32 link.exe'

7247

;;

7248

7249

7250

+ # Assume MSVC wrapper

7251

library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'

7252

+ dynamic_linker='Win32 ld.exe'

7253

;;

7254

esac

7255

- dynamic_linker='Win32 ld.exe'

7256

# FIXME: first we should search . and the directory the executable is in

7257

shlibpath_var=PATH

7258

;;

7259

@@ -14252,6 +14870,20 @@ gnu*)

7260

library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

7261

soname_spec='${libname}${release}${shared_ext}$major'

7262

shlibpath_var=LD_LIBRARY_PATH

7263

+ shlibpath_overrides_runpath=no

7264

+ hardcode_into_libs=yes

7265

+ ;;

7266

7267

+haiku*)

14402

7268

+ version_type=linux

14403

7269

+ need_lib_prefix=no

14404

7270

+ need_version=no

14405

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

7271

+ dynamic_linker="$host_os runtime_loader"

7272

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

14406

7273

+ soname_spec='${libname}${release}${shared_ext}$major'

14407

+ shlibpath_var=LD_LIBRARY_PATH

14408

+ shlibpath_overrides_runpath=no

14409

+ hardcode_into_libs=yes

14410

+ dynamic_linker='NetBSD ld.elf_so'

14411

+ ;;

14412

14413

netbsd*)

14414

version_type=sunos

14415

need_lib_prefix=no

14416

@@ -15329,7 +14605,7 @@ tpf*)

14417

version_type=linux

14418

need_lib_prefix=no

14419

need_version=no

14420

- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

14421

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

7274

+ shlibpath_var=LIBRARY_PATH

7275

+ shlibpath_overrides_runpath=yes

7276

+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

7277

hardcode_into_libs=yes

7278

;;

7279

7280

@@ -14297,8 +14929,10 @@ hpux9* | hpux10* | hpux11*)

7281

soname_spec='${libname}${release}${shared_ext}$major'

7282

;;

7283

esac

7284

- # HP-UX runs *really* slowly unless shared libraries are mode 555.

7285

+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...

7286

postinstall_cmds='chmod 555 $lib'

7287

+ # or fails outright, so override atomically:

7288

+ install_override_mode=555

7289

;;

7290

7291

interix[3-9]*)

7292

@@ -14365,12 +14999,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)

7293

finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'

14422

7294

shlibpath_var=LD_LIBRARY_PATH

14423

7295

shlibpath_overrides_runpath=no

14424

hardcode_into_libs=yes

14425

@@ -15346,8 +14622,8 @@ uts4*)

14426

dynamic_linker=no

14427

;;

14428

esac

14429

-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

14430

-echo "${ECHO_T}$dynamic_linker" >&6; }

14431

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5

14432

+$as_echo "$dynamic_linker" >&6; }

14433

test "$dynamic_linker" = no && can_build_shared=no

14434

14435

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

14436

@@ -15397,8 +14673,8 @@ fi

14437

14438

14439

14440

- { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

14441

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

14442

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5

14443

+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

7296

7297

# Some binutils ld are patched to set DT_RUNPATH

7298

- save_LDFLAGS=$LDFLAGS

7299

- save_libdir=$libdir

7300

- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \

7301

- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""

7302

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7303

+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :

7304

+ $as_echo_n "(cached) " >&6

7305

+else

7306

+ lt_cv_shlibpath_overrides_runpath=no

7307

+ save_LDFLAGS=$LDFLAGS

7308

+ save_libdir=$libdir

7309

+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \

7310

+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""

7311

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7312

/* end confdefs.h. */

7313

7314

int

7315

@@ -14383,13 +15022,17 @@ main ()

7316

_ACEOF

7317

if ac_fn_cxx_try_link "$LINENO"; then :

7318

if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :

7319

- shlibpath_overrides_runpath=yes

7320

+ lt_cv_shlibpath_overrides_runpath=yes

7321

7322

7323

rm -f core conftest.err conftest.$ac_objext \

7324

conftest$ac_exeext conftest.$ac_ext

7325

- LDFLAGS=$save_LDFLAGS

7326

- libdir=$save_libdir

7327

+ LDFLAGS=$save_LDFLAGS

7328

+ libdir=$save_libdir

7329

7330

+fi

7331

7332

+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath

7333

7334

# This implies no fast_install, which is unacceptable.

7335

# Some rework will be needed to allow for fast_install

7336

@@ -14398,7 +15041,7 @@ rm -f core conftest.err conftest.$ac_obj

7337

7338

# Append ld.so.conf contents to the search path

7339

if test -f /etc/ld.so.conf; then

7340

7341

7342

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

7343

7344

7345

@@ -14662,6 +15305,8 @@ fi

7346

7347

7348

7349

7350

7351

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5

7352

$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

14444

7353

hardcode_action_CXX=

14445

if test -n "$hardcode_libdir_flag_spec_CXX" ||

14446

test -n "$runpath_var_CXX" ||

14447

@@ -15422,8 +14698,8 @@ else

14448

# directories.

14449

hardcode_action_CXX=unsupported

14450

14451

-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5

14452

-echo "${ECHO_T}$hardcode_action_CXX" >&6; }

14453

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5

14454

+$as_echo "$hardcode_action_CXX" >&6; }

14455

14456

if test "$hardcode_action_CXX" = relink ||

14457

test "$inherit_rpath_CXX" = yes; then

14458

@@ -15482,16 +14758,12 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

14459

14460

7354

@@ -14709,6 +15354,7 @@ fi

7355

fi # test -n "$compiler"

7356

7357

CC=$lt_save_CC

7358

+ CFLAGS=$lt_save_CFLAGS

7359

LDCXX=$LD

7360

LD=$lt_save_LD

7361

GCC=$lt_save_GCC

7362

@@ -14749,7 +15395,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

14461

7363

# Checks for header files.

14462

-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5

14463

-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }

14464

-if test "${ac_cv_header_stdc+set}" = set; then

14465

- echo $ECHO_N "(cached) $ECHO_C" >&6

14466

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5

14467

+$as_echo_n "checking for ANSI C header files... " >&6; }

14468

+if test "${ac_cv_header_stdc+set}" = set; then :

14469

+ $as_echo_n "(cached) " >&6

14470

else

14471

- cat >conftest.$ac_ext <<_ACEOF

14472

-/* confdefs.h. */

14473

-_ACEOF

14474

-cat confdefs.h >>conftest.$ac_ext

14475

-cat >>conftest.$ac_ext <<_ACEOF

14476

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

14477

/* end confdefs.h. */

14478

#include <stdlib.h>

14479

#include <stdarg.h>

14480

@@ -15506,47 +14778,23 @@ main ()

14481

return 0;

14482

}

14483

_ACEOF

14484

-rm -f conftest.$ac_objext

14485

-if { (ac_try="$ac_compile"

14486

-case "(($ac_try" in

14487

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14488

- *) ac_try_echo=$ac_try;;

14489

-esac

14490

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14491

- (eval "$ac_compile") 2>conftest.er1

14492

- ac_status=$?

14493

- grep -v '^ *+' conftest.er1 >conftest.err

14494

- rm -f conftest.er1

14495

- cat conftest.err >&5

14496

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14497

- (exit $ac_status); } && {

14498

- test -z "$ac_cxx_werror_flag" ||

14499

- test ! -s conftest.err

14500

- } && test -s conftest.$ac_objext; then

14501

+if ac_fn_cxx_try_compile "$LINENO"; then :

14502

ac_cv_header_stdc=yes

14503

else

14504

- echo "$as_me: failed program was:" >&5

14505

-sed 's/^/| /' conftest.$ac_ext >&5

14506

14507

- ac_cv_header_stdc=no

14508

+ ac_cv_header_stdc=no

14509

14510

14511

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

14512

14513

if test $ac_cv_header_stdc = yes; then

14514

# SunOS 4.x string.h does not declare mem*, contrary to ANSI.

14515

- cat >conftest.$ac_ext <<_ACEOF

14516

-/* confdefs.h. */

14517

-_ACEOF

14518

-cat confdefs.h >>conftest.$ac_ext

14519

-cat >>conftest.$ac_ext <<_ACEOF

14520

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

14521

/* end confdefs.h. */

14522

#include <string.h>

14523

14524

_ACEOF

14525

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

14526

- $EGREP "memchr" >/dev/null 2>&1; then

14527

- :

14528

+ $EGREP "memchr" >/dev/null 2>&1; then :

14529

14530

else

14531

ac_cv_header_stdc=no

14532

14533

@@ -15556,18 +14804,14 @@ fi

14534

14535

if test $ac_cv_header_stdc = yes; then

14536

# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.

14537

- cat >conftest.$ac_ext <<_ACEOF

14538

-/* confdefs.h. */

14539

-_ACEOF

14540

-cat confdefs.h >>conftest.$ac_ext

14541

-cat >>conftest.$ac_ext <<_ACEOF

14542

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

14543

/* end confdefs.h. */

14544

#include <stdlib.h>

14545

14546

_ACEOF

14547

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

14548

- $EGREP "free" >/dev/null 2>&1; then

14549

- :

14550

+ $EGREP "free" >/dev/null 2>&1; then :

14551

14552

else

14553

ac_cv_header_stdc=no

14554

14555

@@ -15577,14 +14821,10 @@ fi

14556

14557

if test $ac_cv_header_stdc = yes; then

14558

# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.

14559

- if test "$cross_compiling" = yes; then

14560

+ if test "$cross_compiling" = yes; then :

14561

14562

else

14563

- cat >conftest.$ac_ext <<_ACEOF

14564

-/* confdefs.h. */

14565

-_ACEOF

14566

-cat confdefs.h >>conftest.$ac_ext

14567

-cat >>conftest.$ac_ext <<_ACEOF

14568

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

14569

/* end confdefs.h. */

14570

#include <ctype.h>

14571

#include <stdlib.h>

14572

@@ -15611,194 +14851,32 @@ main ()

14573

return 0;

14574

}

14575

_ACEOF

14576

-rm -f conftest$ac_exeext

14577

-if { (ac_try="$ac_link"

14578

-case "(($ac_try" in

14579

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14580

- *) ac_try_echo=$ac_try;;

14581

-esac

14582

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14583

- (eval "$ac_link") 2>&5

14584

- ac_status=$?

14585

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14586

- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

14587

- { (case "(($ac_try" in

14588

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14589

- *) ac_try_echo=$ac_try;;

14590

-esac

14591

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14592

- (eval "$ac_try") 2>&5

14593

- ac_status=$?

14594

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14595

- (exit $ac_status); }; }; then

14596

- :

14597

-else

14598

- echo "$as_me: program exited with status $ac_status" >&5

14599

-echo "$as_me: failed program was:" >&5

14600

-sed 's/^/| /' conftest.$ac_ext >&5

14601

+if ac_fn_cxx_try_run "$LINENO"; then :

14602

14603

-( exit $ac_status )

14604

-ac_cv_header_stdc=no

14605

+else

14606

+ ac_cv_header_stdc=no

14607

14608

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

14609

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

14610

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

14611

14612

14613

14614

14615

14616

-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

14617

-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }

14618

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5

14619

+$as_echo "$ac_cv_header_stdc" >&6; }

14620

if test $ac_cv_header_stdc = yes; then

14621

14622

-cat >>confdefs.h <<\_ACEOF

14623

-#define STDC_HEADERS 1

14624

-_ACEOF

14625

+$as_echo "#define STDC_HEADERS 1" >>confdefs.h

14626

14627

14628

14629

14630

14631

14632

14633

14634

for ac_header in fcntl.h inttypes.h limits.h stdlib.h unistd.h

14635

-do

14636

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

14637

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

14638

- { echo "$as_me:$LINENO: checking for $ac_header" >&5

14639

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

14640

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

14641

- echo $ECHO_N "(cached) $ECHO_C" >&6

14642

-fi

14643

-ac_res=`eval echo '${'$as_ac_Header'}'`

14644

- { echo "$as_me:$LINENO: result: $ac_res" >&5

14645

-echo "${ECHO_T}$ac_res" >&6; }

14646

-else

14647

- # Is the header compilable?

14648

-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

14649

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

14650

-cat >conftest.$ac_ext <<_ACEOF

14651

-/* confdefs.h. */

14652

-_ACEOF

14653

-cat confdefs.h >>conftest.$ac_ext

14654

-cat >>conftest.$ac_ext <<_ACEOF

14655

-/* end confdefs.h. */

14656

-$ac_includes_default

14657

-#include <$ac_header>

14658

-_ACEOF

14659

-rm -f conftest.$ac_objext

14660

-if { (ac_try="$ac_compile"

14661

-case "(($ac_try" in

14662

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14663

- *) ac_try_echo=$ac_try;;

14664

-esac

14665

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14666

- (eval "$ac_compile") 2>conftest.er1

14667

- ac_status=$?

14668

- grep -v '^ *+' conftest.er1 >conftest.err

14669

- rm -f conftest.er1

14670

- cat conftest.err >&5

14671

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14672

- (exit $ac_status); } && {

14673

- test -z "$ac_cxx_werror_flag" ||

14674

- test ! -s conftest.err

14675

- } && test -s conftest.$ac_objext; then

14676

- ac_header_compiler=yes

14677

-else

14678

- echo "$as_me: failed program was:" >&5

14679

-sed 's/^/| /' conftest.$ac_ext >&5

14680

14681

- ac_header_compiler=no

14682

-fi

14683

14684

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

14685

-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

14686

-echo "${ECHO_T}$ac_header_compiler" >&6; }

14687

14688

-# Is the header present?

14689

-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

14690

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

14691

-cat >conftest.$ac_ext <<_ACEOF

14692

-/* confdefs.h. */

14693

-_ACEOF

14694

-cat confdefs.h >>conftest.$ac_ext

14695

-cat >>conftest.$ac_ext <<_ACEOF

14696

-/* end confdefs.h. */

14697

-#include <$ac_header>

14698

-_ACEOF

14699

-if { (ac_try="$ac_cpp conftest.$ac_ext"

14700

-case "(($ac_try" in

14701

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14702

- *) ac_try_echo=$ac_try;;

14703

-esac

14704

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14705

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

14706

- ac_status=$?

14707

- grep -v '^ *+' conftest.er1 >conftest.err

14708

- rm -f conftest.er1

14709

- cat conftest.err >&5

14710

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14711

- (exit $ac_status); } >/dev/null && {

14712

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

14713

- test ! -s conftest.err

14714

- }; then

14715

- ac_header_preproc=yes

14716

-else

14717

- echo "$as_me: failed program was:" >&5

14718

-sed 's/^/| /' conftest.$ac_ext >&5

14719

14720

- ac_header_preproc=no

14721

-fi

14722

14723

-rm -f conftest.err conftest.$ac_ext

14724

-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

14725

-echo "${ECHO_T}$ac_header_preproc" >&6; }

14726

14727

-# So? What about this header?

14728

-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in

14729

- yes:no: )

14730

- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

14731

-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

14732

- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

14733

-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

14734

- ac_header_preproc=yes

14735

- ;;

14736

- no:yes:* )

14737

- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

14738

-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

14739

- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5

14740

-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}

14741

- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5

14742

-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}

14743

- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5

14744

-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}

14745

- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

14746

-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

14747

- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

14748

-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

14749

- ( cat <<\_ASBOX

14750

-## ---------------------------------------- ##

14751

-## Report this to protobuf@googlegroups.com ##

14752

-## ---------------------------------------- ##

14753

-_ASBOX

14754

- ) | sed "s/^/$as_me: WARNING: /" >&2

14755

- ;;

14756

-esac

14757

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5

14758

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

14759

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

14760

- echo $ECHO_N "(cached) $ECHO_C" >&6

14761

-else

14762

- eval "$as_ac_Header=\$ac_header_preproc"

14763

-fi

14764

-ac_res=`eval echo '${'$as_ac_Header'}'`

14765

- { echo "$as_me:$LINENO: result: $ac_res" >&5

14766

-echo "${ECHO_T}$ac_res" >&6; }

14767

14768

-fi

14769

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

14770

+do :

14771

+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

14772

+ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

7364

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5

7365

$as_echo_n "checking for ANSI C header files... " >&6; }

7366

-if test "${ac_cv_header_stdc+set}" = set; then :

7367

+if ${ac_cv_header_stdc+:} false; then :

7368

$as_echo_n "(cached) " >&6

7369

else

7370

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7371

@@ -14863,8 +15509,7 @@ for ac_header in fcntl.h inttypes.h limi

7372

do :

7373

as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

7374

ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

7375

-eval as_val=\$$as_ac_Header

7376

- if test "x$as_val" = x""yes; then :

14773

7377

+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :

14774

7378

cat >>confdefs.h <<_ACEOF

14775

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

14776

+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

7379

#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

14777

7380

_ACEOF

14778

14779

14780

@@ -15807,19 +14885,15 @@ done

14781

14782

7381

@@ -14877,7 +15522,7 @@ done

14783

7382

# Checks for library functions.

14784

-{ echo "$as_me:$LINENO: checking for working memcmp" >&5

14785

-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6; }

14786

-if test "${ac_cv_func_memcmp_working+set}" = set; then

14787

- echo $ECHO_N "(cached) $ECHO_C" >&6

14788

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5

14789

+$as_echo_n "checking for working memcmp... " >&6; }

14790

+if test "${ac_cv_func_memcmp_working+set}" = set; then :

14791

+ $as_echo_n "(cached) " >&6

14792

else

14793

- if test "$cross_compiling" = yes; then

14794

+ if test "$cross_compiling" = yes; then :

14795

ac_cv_func_memcmp_working=no

14796

else

14797

- cat >conftest.$ac_ext <<_ACEOF

14798

-/* confdefs.h. */

14799

-_ACEOF

14800

-cat confdefs.h >>conftest.$ac_ext

14801

-cat >>conftest.$ac_ext <<_ACEOF

14802

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

14803

/* end confdefs.h. */

14804

$ac_includes_default

14805

int

14806

@@ -15854,42 +14928,18 @@ main ()

14807

return 0;

14808

}

14809

_ACEOF

14810

-rm -f conftest$ac_exeext

14811

-if { (ac_try="$ac_link"

14812

-case "(($ac_try" in

14813

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14814

- *) ac_try_echo=$ac_try;;

14815

-esac

14816

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14817

- (eval "$ac_link") 2>&5

14818

- ac_status=$?

14819

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14820

- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

14821

- { (case "(($ac_try" in

14822

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14823

- *) ac_try_echo=$ac_try;;

14824

-esac

14825

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14826

- (eval "$ac_try") 2>&5

14827

- ac_status=$?

14828

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14829

- (exit $ac_status); }; }; then

14830

+if ac_fn_cxx_try_run "$LINENO"; then :

14831

ac_cv_func_memcmp_working=yes

14832

else

14833

- echo "$as_me: program exited with status $ac_status" >&5

14834

-echo "$as_me: failed program was:" >&5

14835

-sed 's/^/| /' conftest.$ac_ext >&5

14836

14837

-( exit $ac_status )

14838

-ac_cv_func_memcmp_working=no

14839

+ ac_cv_func_memcmp_working=no

14840

14841

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

14842

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

14843

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

14844

14845

14846

14847

14848

-{ echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5

14849

-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6; }

14850

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5

14851

+$as_echo "$ac_cv_func_memcmp_working" >&6; }

14852

test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in

14853

*" memcmp.$ac_objext "* ) ;;

14854

*) LIBOBJS="$LIBOBJS memcmp.$ac_objext"

14855

@@ -15897,19 +14947,15 @@ test $ac_cv_func_memcmp_working = no &&

14856

esac

14857

14858

14859

-{ echo "$as_me:$LINENO: checking for working strtod" >&5

14860

-echo $ECHO_N "checking for working strtod... $ECHO_C" >&6; }

14861

-if test "${ac_cv_func_strtod+set}" = set; then

14862

- echo $ECHO_N "(cached) $ECHO_C" >&6

14863

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5

14864

+$as_echo_n "checking for working strtod... " >&6; }

14865

+if test "${ac_cv_func_strtod+set}" = set; then :

14866

+ $as_echo_n "(cached) " >&6

14867

else

14868

- if test "$cross_compiling" = yes; then

14869

+ if test "$cross_compiling" = yes; then :

14870

ac_cv_func_strtod=no

14871

else

14872

- cat >conftest.$ac_ext <<_ACEOF

14873

-/* confdefs.h. */

14874

-_ACEOF

14875

-cat confdefs.h >>conftest.$ac_ext

14876

-cat >>conftest.$ac_ext <<_ACEOF

14877

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

14878

/* end confdefs.h. */

14879

14880

$ac_includes_default

14881

@@ -15942,42 +14988,18 @@ main()

14882

}

14883

14884

_ACEOF

14885

-rm -f conftest$ac_exeext

14886

-if { (ac_try="$ac_link"

14887

-case "(($ac_try" in

14888

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14889

- *) ac_try_echo=$ac_try;;

14890

-esac

14891

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14892

- (eval "$ac_link") 2>&5

14893

- ac_status=$?

14894

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14895

- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

14896

- { (case "(($ac_try" in

14897

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14898

- *) ac_try_echo=$ac_try;;

14899

-esac

14900

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14901

- (eval "$ac_try") 2>&5

14902

- ac_status=$?

14903

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14904

- (exit $ac_status); }; }; then

14905

+if ac_fn_cxx_try_run "$LINENO"; then :

14906

ac_cv_func_strtod=yes

14907

else

14908

- echo "$as_me: program exited with status $ac_status" >&5

14909

-echo "$as_me: failed program was:" >&5

14910

-sed 's/^/| /' conftest.$ac_ext >&5

14911

14912

-( exit $ac_status )

14913

-ac_cv_func_strtod=no

14914

+ ac_cv_func_strtod=no

14915

14916

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

14917

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

14918

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

14919

14920

14921

14922

14923

-{ echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5

14924

-echo "${ECHO_T}$ac_cv_func_strtod" >&6; }

14925

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5

14926

+$as_echo "$ac_cv_func_strtod" >&6; }

14927

if test $ac_cv_func_strtod = no; then

14928

case " $LIBOBJS " in

14929

*" strtod.$ac_objext "* ) ;;

14930

@@ -15985,101 +15007,20 @@ if test $ac_cv_func_strtod = no; then

14931

;;

14932

esac

14933

14934

-{ echo "$as_me:$LINENO: checking for pow" >&5

14935

-echo $ECHO_N "checking for pow... $ECHO_C" >&6; }

14936

-if test "${ac_cv_func_pow+set}" = set; then

14937

- echo $ECHO_N "(cached) $ECHO_C" >&6

14938

-else

14939

- cat >conftest.$ac_ext <<_ACEOF

14940

-/* confdefs.h. */

14941

-_ACEOF

14942

-cat confdefs.h >>conftest.$ac_ext

14943

-cat >>conftest.$ac_ext <<_ACEOF

14944

-/* end confdefs.h. */

14945

-/* Define pow to an innocuous variant, in case <limits.h> declares pow.

14946

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

14947

-#define pow innocuous_pow

14948

14949

-/* System header to define __stub macros and hopefully few prototypes,

14950

- which can conflict with char pow (); below.

14951

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

14952

- <limits.h> exists even on freestanding compilers. */

14953

14954

-#ifdef __STDC__

14955

-# include <limits.h>

14956

-#else

14957

-# include <assert.h>

14958

-#endif

14959

14960

-#undef pow

14961

14962

-/* Override any GCC internal prototype to avoid an error.

14963

- Use char because int might match the return type of a GCC

14964

- builtin and then its argument prototype would still apply. */

14965

-#ifdef __cplusplus

14966

-extern "C"

14967

-#endif

14968

-char pow ();

14969

-/* The GNU C library defines this for functions which it implements

14970

- to always fail with ENOSYS. Some functions are actually named

14971

- something starting with __ and the normal name is an alias. */

14972

-#if defined __stub_pow || defined __stub___pow

14973

-choke me

14974

-#endif

14975

14976

-int

14977

-main ()

14978

14979

-return pow ();

14980

- ;

14981

- return 0;

14982

14983

-_ACEOF

14984

-rm -f conftest.$ac_objext conftest$ac_exeext

14985

-if { (ac_try="$ac_link"

14986

-case "(($ac_try" in

14987

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14988

- *) ac_try_echo=$ac_try;;

14989

-esac

14990

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14991

- (eval "$ac_link") 2>conftest.er1

14992

- ac_status=$?

14993

- grep -v '^ *+' conftest.er1 >conftest.err

14994

- rm -f conftest.er1

14995

- cat conftest.err >&5

14996

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14997

- (exit $ac_status); } && {

14998

- test -z "$ac_cxx_werror_flag" ||

14999

- test ! -s conftest.err

15000

- } && test -s conftest$ac_exeext &&

15001

- $as_test_x conftest$ac_exeext; then

15002

- ac_cv_func_pow=yes

15003

-else

15004

- echo "$as_me: failed program was:" >&5

15005

-sed 's/^/| /' conftest.$ac_ext >&5

15006

15007

- ac_cv_func_pow=no

15008

-fi

15009

+ac_fn_cxx_check_func "$LINENO" "pow" "ac_cv_func_pow"

15010

+if test "x$ac_cv_func_pow" = x""yes; then :

15011

15012

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15013

- conftest$ac_exeext conftest.$ac_ext

15014

15015

-{ echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5

15016

-echo "${ECHO_T}$ac_cv_func_pow" >&6; }

7383

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5

7384

$as_echo_n "checking for working memcmp... " >&6; }

7385

-if test "${ac_cv_func_memcmp_working+set}" = set; then :

7386

+if ${ac_cv_func_memcmp_working+:} false; then :

7387

$as_echo_n "(cached) " >&6

7388

else

7389

if test "$cross_compiling" = yes; then :

7390

@@ -14939,7 +15584,7 @@ esac

7391

7392

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5

7393

$as_echo_n "checking for working strtod... " >&6; }

7394

-if test "${ac_cv_func_strtod+set}" = set; then :

7395

+if ${ac_cv_func_strtod+:} false; then :

7396

$as_echo_n "(cached) " >&6

7397

else

7398

if test "$cross_compiling" = yes; then :

7399

@@ -14998,14 +15643,14 @@ if test $ac_cv_func_strtod = no; then

7400

esac

7401

7402

ac_fn_cxx_check_func "$LINENO" "pow" "ac_cv_func_pow"

7403

-if test "x$ac_cv_func_pow" = x""yes; then :

7404

+if test "x$ac_cv_func_pow" = xyes; then :

7405

7406

15017

7407

15018

7408

if test $ac_cv_func_pow = no; then

15019

- { echo "$as_me:$LINENO: checking for pow in -lm" >&5

15020

-echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6; }

15021

-if test "${ac_cv_lib_m_pow+set}" = set; then

15022

- echo $ECHO_N "(cached) $ECHO_C" >&6

15023

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5

15024

+$as_echo_n "checking for pow in -lm... " >&6; }

15025

+if test "${ac_cv_lib_m_pow+set}" = set; then :

15026

+ $as_echo_n "(cached) " >&6

7409

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5

7410

$as_echo_n "checking for pow in -lm... " >&6; }

7411

-if test "${ac_cv_lib_m_pow+set}" = set; then :

7412

+if ${ac_cv_lib_m_pow+:} false; then :

7413

$as_echo_n "(cached) " >&6

15027

7414

else

15028

7415

ac_check_lib_save_LIBS=$LIBS

15029

LIBS="-lm $LIBS"

15030

-cat >conftest.$ac_ext <<_ACEOF

15031

-/* confdefs.h. */

15032

-_ACEOF

15033

-cat confdefs.h >>conftest.$ac_ext

15034

-cat >>conftest.$ac_ext <<_ACEOF

15035

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

15036

/* end confdefs.h. */

15037

15038

/* Override any GCC internal prototype to avoid an error.

15039

@@ -16097,143 +15038,35 @@ return pow ();

15040

return 0;

15041

}

15042

_ACEOF

15043

-rm -f conftest.$ac_objext conftest$ac_exeext

15044

-if { (ac_try="$ac_link"

15045

-case "(($ac_try" in

15046

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15047

- *) ac_try_echo=$ac_try;;

15048

-esac

15049

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15050

- (eval "$ac_link") 2>conftest.er1

15051

- ac_status=$?

15052

- grep -v '^ *+' conftest.er1 >conftest.err

15053

- rm -f conftest.er1

15054

- cat conftest.err >&5

15055

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15056

- (exit $ac_status); } && {

15057

- test -z "$ac_cxx_werror_flag" ||

15058

- test ! -s conftest.err

15059

- } && test -s conftest$ac_exeext &&

15060

- $as_test_x conftest$ac_exeext; then

15061

+if ac_fn_cxx_try_link "$LINENO"; then :

15062

ac_cv_lib_m_pow=yes

15063

else

15064

- echo "$as_me: failed program was:" >&5

15065

-sed 's/^/| /' conftest.$ac_ext >&5

15066

15067

- ac_cv_lib_m_pow=no

15068

+ ac_cv_lib_m_pow=no

15069

15070

15071

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15072

- conftest$ac_exeext conftest.$ac_ext

15073

+rm -f core conftest.err conftest.$ac_objext \

15074

+ conftest$ac_exeext conftest.$ac_ext

15075

LIBS=$ac_check_lib_save_LIBS

15076

15077

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5

15078

-echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; }

15079

-if test $ac_cv_lib_m_pow = yes; then

15080

- POW_LIB=-lm

15081

-else

15082

- { echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5

15083

-echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}

15084

-fi

15085

15086

-fi

15087

15088

-fi

15089

15090

15091

15092

15093

15094

15095

15096

-for ac_func in ftruncate memset mkdir strchr strerror strtol

15097

-do

15098

-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

15099

-{ echo "$as_me:$LINENO: checking for $ac_func" >&5

15100

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

15101

-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

15102

- echo $ECHO_N "(cached) $ECHO_C" >&6

15103

-else

15104

- cat >conftest.$ac_ext <<_ACEOF

15105

-/* confdefs.h. */

15106

-_ACEOF

15107

-cat confdefs.h >>conftest.$ac_ext

15108

-cat >>conftest.$ac_ext <<_ACEOF

15109

-/* end confdefs.h. */

15110

-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

15111

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

15112

-#define $ac_func innocuous_$ac_func

15113

15114

-/* System header to define __stub macros and hopefully few prototypes,

15115

- which can conflict with char $ac_func (); below.

15116

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

15117

- <limits.h> exists even on freestanding compilers. */

15118

15119

-#ifdef __STDC__

15120

-# include <limits.h>

15121

-#else

15122

-# include <assert.h>

15123

-#endif

15124

15125

-#undef $ac_func

15126

15127

-/* Override any GCC internal prototype to avoid an error.

15128

- Use char because int might match the return type of a GCC

15129

- builtin and then its argument prototype would still apply. */

15130

-#ifdef __cplusplus

15131

-extern "C"

15132

-#endif

15133

-char $ac_func ();

15134

-/* The GNU C library defines this for functions which it implements

15135

- to always fail with ENOSYS. Some functions are actually named

15136

- something starting with __ and the normal name is an alias. */

15137

-#if defined __stub_$ac_func || defined __stub___$ac_func

15138

-choke me

15139

-#endif

15140

15141

-int

15142

-main ()

15143

15144

-return $ac_func ();

15145

- ;

15146

- return 0;

15147

15148

-_ACEOF

15149

-rm -f conftest.$ac_objext conftest$ac_exeext

15150

-if { (ac_try="$ac_link"

15151

-case "(($ac_try" in

15152

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15153

- *) ac_try_echo=$ac_try;;

15154

-esac

15155

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15156

- (eval "$ac_link") 2>conftest.er1

15157

- ac_status=$?

15158

- grep -v '^ *+' conftest.er1 >conftest.err

15159

- rm -f conftest.er1

15160

- cat conftest.err >&5

15161

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15162

- (exit $ac_status); } && {

15163

- test -z "$ac_cxx_werror_flag" ||

15164

- test ! -s conftest.err

15165

- } && test -s conftest$ac_exeext &&

15166

- $as_test_x conftest$ac_exeext; then

15167

- eval "$as_ac_var=yes"

15168

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5

15169

+$as_echo "$ac_cv_lib_m_pow" >&6; }

15170

+if test "x$ac_cv_lib_m_pow" = x""yes; then :

15171

+ POW_LIB=-lm

15172

else

15173

- echo "$as_me: failed program was:" >&5

15174

-sed 's/^/| /' conftest.$ac_ext >&5

15175

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5

15176

+$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}

15177

+fi

15178

15179

- eval "$as_ac_var=no"

15180

15181

15182

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15183

- conftest$ac_exeext conftest.$ac_ext

15184

15185

-ac_res=`eval echo '${'$as_ac_var'}'`

15186

- { echo "$as_me:$LINENO: result: $ac_res" >&5

15187

-echo "${ECHO_T}$ac_res" >&6; }

15188

-if test `eval echo '${'$as_ac_var'}'` = yes; then

15189

15190

+for ac_func in ftruncate memset mkdir strchr strerror strtol

15191

+do :

15192

+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

15193

+ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"

7416

@@ -15039,7 +15684,7 @@ LIBS=$ac_check_lib_save_LIBS

7417

7418

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5

7419

$as_echo "$ac_cv_lib_m_pow" >&6; }

7420

-if test "x$ac_cv_lib_m_pow" = x""yes; then :

7421

+if test "x$ac_cv_lib_m_pow" = xyes; then :

7422

POW_LIB=-lm

7423

else

7424

{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5

7425

@@ -15054,8 +15699,7 @@ for ac_func in ftruncate memset mkdir st

7426

do :

7427

as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

7428

ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"

7429

-eval as_val=\$$as_ac_var

7430

- if test "x$as_val" = x""yes; then :

15194

7431

+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :

15195

7432

cat >>confdefs.h <<_ACEOF

15196

-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

15197

+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

15198

_ACEOF

15199

15200

15201

@@ -16242,17 +15075,13 @@ done

15202

15203

# Check for zlib.

15204

HAVE_ZLIB=0

15205

-if test "$with_zlib" != no; then

15206

+if test "$with_zlib" != no; then :

15207

15208

- { echo "$as_me:$LINENO: checking zlib version" >&5

15209

-echo $ECHO_N "checking zlib version... $ECHO_C" >&6; }

15210

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking zlib version" >&5

15211

+$as_echo_n "checking zlib version... " >&6; }

15212

15213

# First check the zlib header version.

15214

- cat >conftest.$ac_ext <<_ACEOF

15215

-/* confdefs.h. */

15216

-_ACEOF

15217

-cat confdefs.h >>conftest.$ac_ext

15218

-cat >>conftest.$ac_ext <<_ACEOF

15219

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

15220

/* end confdefs.h. */

15221

15222

#include <zlib.h>

15223

@@ -16268,39 +15097,19 @@ main ()

15224

return 0;

15225

}

15226

_ACEOF

15227

-rm -f conftest.$ac_objext

15228

-if { (ac_try="$ac_compile"

15229

-case "(($ac_try" in

15230

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15231

- *) ac_try_echo=$ac_try;;

15232

-esac

15233

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15234

- (eval "$ac_compile") 2>conftest.er1

15235

- ac_status=$?

15236

- grep -v '^ *+' conftest.er1 >conftest.err

15237

- rm -f conftest.er1

15238

- cat conftest.err >&5

15239

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15240

- (exit $ac_status); } && {

15241

- test -z "$ac_cxx_werror_flag" ||

15242

- test ! -s conftest.err

15243

- } && test -s conftest.$ac_objext; then

15244

+if ac_fn_cxx_try_compile "$LINENO"; then :

15245

15246

- { echo "$as_me:$LINENO: result: ok (1.2.0.4 or later)" >&5

15247

-echo "${ECHO_T}ok (1.2.0.4 or later)" >&6; }

15248

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (1.2.0.4 or later)" >&5

15249

+$as_echo "ok (1.2.0.4 or later)" >&6; }

15250

7433

#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

7434

_ACEOF

7435

@@ -15096,7 +15740,7 @@ $as_echo "ok (1.2.0.4 or later)" >&6; }

15251

7436

# Also need to add -lz to the linker flags and make sure this succeeds.

15252

- { echo "$as_me:$LINENO: checking for library containing zlibVersion" >&5

15253

-echo $ECHO_N "checking for library containing zlibVersion... $ECHO_C" >&6; }

15254

-if test "${ac_cv_search_zlibVersion+set}" = set; then

15255

- echo $ECHO_N "(cached) $ECHO_C" >&6

15256

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5

15257

+$as_echo_n "checking for library containing zlibVersion... " >&6; }

15258

+if test "${ac_cv_search_zlibVersion+set}" = set; then :

15259

+ $as_echo_n "(cached) " >&6

7437

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5

7438

$as_echo_n "checking for library containing zlibVersion... " >&6; }

7439

-if test "${ac_cv_search_zlibVersion+set}" = set; then :

7440

+if ${ac_cv_search_zlibVersion+:} false; then :

7441

$as_echo_n "(cached) " >&6

15260

7442

else

15261

7443

ac_func_search_save_LIBS=$LIBS

15262

-cat >conftest.$ac_ext <<_ACEOF

15263

-/* confdefs.h. */

15264

-_ACEOF

15265

-cat confdefs.h >>conftest.$ac_ext

15266

-cat >>conftest.$ac_ext <<_ACEOF

15267

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

15268

/* end confdefs.h. */

15269

15270

/* Override any GCC internal prototype to avoid an error.

15271

@@ -16325,102 +15134,68 @@ for ac_lib in '' z; do

15272

ac_res=-l$ac_lib

15273

LIBS="-l$ac_lib $ac_func_search_save_LIBS"

15274

15275

- rm -f conftest.$ac_objext conftest$ac_exeext

15276

-if { (ac_try="$ac_link"

15277

-case "(($ac_try" in

15278

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15279

- *) ac_try_echo=$ac_try;;

15280

-esac

15281

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15282

- (eval "$ac_link") 2>conftest.er1

15283

- ac_status=$?

15284

- grep -v '^ *+' conftest.er1 >conftest.err

15285

- rm -f conftest.er1

15286

- cat conftest.err >&5

15287

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15288

- (exit $ac_status); } && {

15289

- test -z "$ac_cxx_werror_flag" ||

15290

- test ! -s conftest.err

15291

- } && test -s conftest$ac_exeext &&

15292

- $as_test_x conftest$ac_exeext; then

15293

+ if ac_fn_cxx_try_link "$LINENO"; then :

15294

ac_cv_search_zlibVersion=$ac_res

15295

-else

15296

- echo "$as_me: failed program was:" >&5

15297

-sed 's/^/| /' conftest.$ac_ext >&5

15298

15299

7444

@@ -15130,11 +15774,11 @@ for ac_lib in '' z; do

15300

7445

15301

15302

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15303

- conftest$ac_exeext

15304

- if test "${ac_cv_search_zlibVersion+set}" = set; then

15305

+rm -f core conftest.err conftest.$ac_objext \

15306

+ conftest$ac_exeext

15307

+ if test "${ac_cv_search_zlibVersion+set}" = set; then :

7446

rm -f core conftest.err conftest.$ac_objext \

7447

conftest$ac_exeext

7448

- if test "${ac_cv_search_zlibVersion+set}" = set; then :

7449

+ if ${ac_cv_search_zlibVersion+:} false; then :

15308

7450

break

15309

7451

15310

7452

done

15311

-if test "${ac_cv_search_zlibVersion+set}" = set; then

15312

- :

15313

+if test "${ac_cv_search_zlibVersion+set}" = set; then :

15314

7453

-if test "${ac_cv_search_zlibVersion+set}" = set; then :

7454

+if ${ac_cv_search_zlibVersion+:} false; then :

7455

15315

7456

else

15316

7457

ac_cv_search_zlibVersion=no

15317

15318

rm conftest.$ac_ext

15319

LIBS=$ac_func_search_save_LIBS

15320

15321

-{ echo "$as_me:$LINENO: result: $ac_cv_search_zlibVersion" >&5

15322

-echo "${ECHO_T}$ac_cv_search_zlibVersion" >&6; }

15323

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_zlibVersion" >&5

15324

+$as_echo "$ac_cv_search_zlibVersion" >&6; }

15325

ac_res=$ac_cv_search_zlibVersion

15326

-if test "$ac_res" != no; then

15327

+if test "$ac_res" != no; then :

15328

test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

15329

15330

15331

-cat >>confdefs.h <<\_ACEOF

15332

-#define HAVE_ZLIB 1

15333

-_ACEOF

15334

+$as_echo "#define HAVE_ZLIB 1" >>confdefs.h

15335

15336

HAVE_ZLIB=1

15337

15338

else

15339

15340

- if test "$with_zlib" != check; then

15341

+ if test "$with_zlib" != check; then :

15342

15343

- { { echo "$as_me:$LINENO: error: --with-zlib was given, but no working zlib library was found

15344

-See \`config.log' for more details." >&5

15345

-echo "$as_me: error: --with-zlib was given, but no working zlib library was found

15346

-See \`config.log' for more details." >&2;}

15347

- { (exit 1); exit 1; }; }

15348

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

15349

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

7458

@@ -15159,8 +15803,8 @@ else

7459

7460

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

7461

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

7462

-as_fn_error "--with-zlib was given, but no working zlib library was found

7463

-See \`config.log' for more details." "$LINENO" 5; }

15350

7464

+as_fn_error $? "--with-zlib was given, but no working zlib library was found

15351

+See \`config.log' for more details" "$LINENO" 5 ; }

15352

15353

15354

15355

15356

15357

15358

15359

else

15360

- echo "$as_me: failed program was:" >&5

15361

-sed 's/^/| /' conftest.$ac_ext >&5

15362

15363

+ if test "$with_zlib" = check; then :

15364

15365

- if test "$with_zlib" = check; then

15366

15367

- { echo "$as_me:$LINENO: result: headers missing or too old (requires 1.2.0.4)" >&5

15368

-echo "${ECHO_T}headers missing or too old (requires 1.2.0.4)" >&6; }

15369

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: headers missing or too old (requires 1.2.0.4)" >&5

15370

+$as_echo "headers missing or too old (requires 1.2.0.4)" >&6; }

15371

15372

else

15373

15374

- { { echo "$as_me:$LINENO: error: --with-zlib was given, but zlib headers were not present or were too old (requires 1.2.0.4)

15375

-See \`config.log' for more details." >&5

15376

-echo "$as_me: error: --with-zlib was given, but zlib headers were not present or were too old (requires 1.2.0.4)

15377

-See \`config.log' for more details." >&2;}

15378

- { (exit 1); exit 1; }; }

15379

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

15380

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

7465

+See \`config.log' for more details" "$LINENO" 5; }

7466

7467

7468

7469

@@ -15178,8 +15822,8 @@ else

7470

7471

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

7472

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

7473

-as_fn_error "--with-zlib was given, but zlib headers were not present or were too old (requires 1.2.0.4)

7474

-See \`config.log' for more details." "$LINENO" 5; }

15381

7475

+as_fn_error $? "--with-zlib was given, but zlib headers were not present or were too old (requires 1.2.0.4)

15382

+See \`config.log' for more details" "$LINENO" 5 ; }

15383

15384

15385

15386

15387

15388

15389

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

15390

15391

15392

15393

if test $HAVE_ZLIB = 1; then

15394

HAVE_ZLIB_TRUE=

15395

HAVE_ZLIB_FALSE='#'

15396

@@ -16430,17 +15205,16 @@ else

15397

15398

15399

15400

-if test "$with_protoc" != "no"; then

15401

+if test "$with_protoc" != "no"; then :

15402

15403

PROTOC=$with_protoc

15404

- if test "$with_protoc" == "yes"; then

15405

+ if test "$with_protoc" == "yes"; then :

15406

15407

# No argument given. Use system protoc.

15408

PROTOC=protoc

15409

15410

15411

15412

- if echo "$PROTOC" | grep -q '^[^/].*/'; then

15413

+ if echo "$PROTOC" | grep -q '^[^/].*/'; then :

15414

15415

# Does not start with a slash, but contains a slash. So, it's a relative

15416

# path (as opposed to an absolute path or an executable in $PATH).

15417

@@ -16453,9 +15227,7 @@ fi

15418

15419

15420

15421

15422

15423

15424

if test "$with_protoc" != "no"; then

15425

USE_EXTERNAL_PROTOC_TRUE=

15426

USE_EXTERNAL_PROTOC_FALSE='#'

15427

@@ -16488,13 +15260,9 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS"

15428

CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

15429

save_LIBS="$LIBS"

15430

LIBS="$PTHREAD_LIBS $LIBS"

15431

- { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5

15432

-echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; }

15433

- cat >conftest.$ac_ext <<_ACEOF

15434

-/* confdefs.h. */

15435

-_ACEOF

15436

-cat confdefs.h >>conftest.$ac_ext

15437

-cat >>conftest.$ac_ext <<_ACEOF

15438

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5

15439

+$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; }

15440

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

15441

/* end confdefs.h. */

15442

15443

/* Override any GCC internal prototype to avoid an error.

15444

@@ -16512,36 +15280,13 @@ return pthread_join ();

15445

return 0;

15446

}

15447

_ACEOF

15448

-rm -f conftest.$ac_objext conftest$ac_exeext

15449

-if { (ac_try="$ac_link"

15450

-case "(($ac_try" in

15451

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15452

- *) ac_try_echo=$ac_try;;

15453

-esac

15454

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15455

- (eval "$ac_link") 2>conftest.er1

15456

- ac_status=$?

15457

- grep -v '^ *+' conftest.er1 >conftest.err

15458

- rm -f conftest.er1

15459

- cat conftest.err >&5

15460

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15461

- (exit $ac_status); } && {

15462

- test -z "$ac_c_werror_flag" ||

15463

- test ! -s conftest.err

15464

- } && test -s conftest$ac_exeext &&

15465

- $as_test_x conftest$ac_exeext; then

15466

+if ac_fn_c_try_link "$LINENO"; then :

15467

acx_pthread_ok=yes

15468

-else

15469

- echo "$as_me: failed program was:" >&5

15470

-sed 's/^/| /' conftest.$ac_ext >&5

15471

15472

15473

15474

15475

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15476

- conftest$ac_exeext conftest.$ac_ext

15477

- { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5

15478

-echo "${ECHO_T}$acx_pthread_ok" >&6; }

15479

+rm -f core conftest.err conftest.$ac_objext \

15480

+ conftest$ac_exeext conftest.$ac_ext

15481

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5

15482

+$as_echo "$acx_pthread_ok" >&6; }

15483

if test x"$acx_pthread_ok" = xno; then

15484

PTHREAD_LIBS=""

15485

PTHREAD_CFLAGS=""

15486

@@ -16602,23 +15347,23 @@ for flag in $acx_pthread_flags; do

15487

15488

case $flag in

15489

none)

15490

- { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5

15491

-echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; }

15492

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5

15493

+$as_echo_n "checking whether pthreads work without any flags... " >&6; }

15494

;;

15495

15496

-*)

15497

- { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5

15498

-echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; }

15499

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5

15500

+$as_echo_n "checking whether pthreads work with $flag... " >&6; }

15501

PTHREAD_CFLAGS="$flag"

15502

;;

15503

15504

pthread-config)

15505

# Extract the first word of "pthread-config", so it can be a program name with args.

7476

+See \`config.log' for more details" "$LINENO" 5; }

7477

7478

7479

7480

@@ -15353,7 +15997,7 @@ $as_echo_n "checking whether pthreads wo

15506

7481

set dummy pthread-config; ac_word=$2

15507

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

15508

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

15509

-if test "${ac_cv_prog_acx_pthread_config+set}" = set; then

15510

- echo $ECHO_N "(cached) $ECHO_C" >&6

15511

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

15512

+$as_echo_n "checking for $ac_word... " >&6; }

15513

+if test "${ac_cv_prog_acx_pthread_config+set}" = set; then :

15514

+ $as_echo_n "(cached) " >&6

7482

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7483

$as_echo_n "checking for $ac_word... " >&6; }

7484

-if test "${ac_cv_prog_acx_pthread_config+set}" = set; then :

7485

+if ${ac_cv_prog_acx_pthread_config+:} false; then :

7486

$as_echo_n "(cached) " >&6

15515

7487

else

15516

7488

if test -n "$acx_pthread_config"; then

15517

ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test.

15518

@@ -16628,14 +15373,14 @@ for as_dir in $PATH

15519

15520

IFS=$as_save_IFS

15521

test -z "$as_dir" && as_dir=.

15522

- for ac_exec_ext in '' $ac_executable_extensions; do

15523

+ for ac_exec_ext in '' $ac_executable_extensions; do

15524

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

15525

ac_cv_prog_acx_pthread_config="yes"

15526

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

15527

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

15528

break 2

15529

15530

done

15531

-done

15532

+ done

15533

IFS=$as_save_IFS

15534

15535

test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no"

15536

@@ -16643,11 +15388,11 @@ fi

15537

15538

acx_pthread_config=$ac_cv_prog_acx_pthread_config

15539

if test -n "$acx_pthread_config"; then

15540

- { echo "$as_me:$LINENO: result: $acx_pthread_config" >&5

15541

-echo "${ECHO_T}$acx_pthread_config" >&6; }

15542

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5

15543

+$as_echo "$acx_pthread_config" >&6; }

15544

else

15545

- { echo "$as_me:$LINENO: result: no" >&5

15546

-echo "${ECHO_T}no" >&6; }

15547

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

15548

+$as_echo "no" >&6; }

15549

15550

15551

15552

@@ -16657,8 +15402,8 @@ fi

15553

;;

15554

15555

15556

- { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5

15557

-echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; }

15558

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5

15559

+$as_echo_n "checking for the pthreads library -l$flag... " >&6; }

15560

PTHREAD_LIBS="-l$flag"

15561

;;

15562

esac

15563

@@ -16677,11 +15422,7 @@ echo $ECHO_N "checking for the pthreads

15564

# pthread_cleanup_push because it is one of the few pthread

15565

# functions on Solaris that doesn't have a non-functional libc stub.

15566

# We try pthread_create on general principles.

15567

- cat >conftest.$ac_ext <<_ACEOF

15568

-/* confdefs.h. */

15569

-_ACEOF

15570

-cat confdefs.h >>conftest.$ac_ext

15571

-cat >>conftest.$ac_ext <<_ACEOF

15572

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

15573

/* end confdefs.h. */

15574

#include <pthread.h>

15575

int

15576

@@ -16694,40 +15435,17 @@ pthread_t th; pthread_join(th, 0);

15577

return 0;

15578

}

15579

_ACEOF

15580

-rm -f conftest.$ac_objext conftest$ac_exeext

15581

-if { (ac_try="$ac_link"

15582

-case "(($ac_try" in

15583

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15584

- *) ac_try_echo=$ac_try;;

15585

-esac

15586

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15587

- (eval "$ac_link") 2>conftest.er1

15588

- ac_status=$?

15589

- grep -v '^ *+' conftest.er1 >conftest.err

15590

- rm -f conftest.er1

15591

- cat conftest.err >&5

15592

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15593

- (exit $ac_status); } && {

15594

- test -z "$ac_c_werror_flag" ||

15595

- test ! -s conftest.err

15596

- } && test -s conftest$ac_exeext &&

15597

- $as_test_x conftest$ac_exeext; then

15598

+if ac_fn_c_try_link "$LINENO"; then :

15599

acx_pthread_ok=yes

15600

-else

15601

- echo "$as_me: failed program was:" >&5

15602

-sed 's/^/| /' conftest.$ac_ext >&5

15603

15604

15605

15606

15607

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15608

- conftest$ac_exeext conftest.$ac_ext

15609

+rm -f core conftest.err conftest.$ac_objext \

15610

+ conftest$ac_exeext conftest.$ac_ext

15611

15612

LIBS="$save_LIBS"

15613

CFLAGS="$save_CFLAGS"

15614

15615

- { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5

15616

-echo "${ECHO_T}$acx_pthread_ok" >&6; }

15617

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5

15618

+$as_echo "$acx_pthread_ok" >&6; }

15619

if test "x$acx_pthread_ok" = xyes; then

15620

break;

15621

15622

@@ -16745,15 +15463,11 @@ if test "x$acx_pthread_ok" = xyes; then

15623

CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

15624

15625

# Detect AIX lossage: JOINABLE attribute is called UNDETACHED.

15626

- { echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5

15627

-echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; }

15628

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5

15629

+$as_echo_n "checking for joinable pthread attribute... " >&6; }

15630

attr_name=unknown

15631

for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do

15632

- cat >conftest.$ac_ext <<_ACEOF

15633

-/* confdefs.h. */

15634

-_ACEOF

15635

-cat confdefs.h >>conftest.$ac_ext

15636

-cat >>conftest.$ac_ext <<_ACEOF

15637

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

15638

/* end confdefs.h. */

15639

#include <pthread.h>

15640

int

15641

@@ -16764,37 +15478,14 @@ int attr=$attr; return attr;

15642

return 0;

15643

}

15644

_ACEOF

15645

-rm -f conftest.$ac_objext conftest$ac_exeext

15646

-if { (ac_try="$ac_link"

15647

-case "(($ac_try" in

15648

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15649

- *) ac_try_echo=$ac_try;;

15650

-esac

15651

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15652

- (eval "$ac_link") 2>conftest.er1

15653

- ac_status=$?

15654

- grep -v '^ *+' conftest.er1 >conftest.err

15655

- rm -f conftest.er1

15656

- cat conftest.err >&5

15657

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15658

- (exit $ac_status); } && {

15659

- test -z "$ac_c_werror_flag" ||

15660

- test ! -s conftest.err

15661

- } && test -s conftest$ac_exeext &&

15662

- $as_test_x conftest$ac_exeext; then

15663

+if ac_fn_c_try_link "$LINENO"; then :

15664

attr_name=$attr; break

15665

-else

15666

- echo "$as_me: failed program was:" >&5

15667

-sed 's/^/| /' conftest.$ac_ext >&5

15668

15669

15670

15671

15672

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15673

- conftest$ac_exeext conftest.$ac_ext

15674

+rm -f core conftest.err conftest.$ac_objext \

15675

+ conftest$ac_exeext conftest.$ac_ext

15676

done

15677

- { echo "$as_me:$LINENO: result: $attr_name" >&5

15678

-echo "${ECHO_T}$attr_name" >&6; }

15679

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5

15680

+$as_echo "$attr_name" >&6; }

15681

if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then

15682

15683

cat >>confdefs.h <<_ACEOF

15684

@@ -16803,15 +15494,15 @@ _ACEOF

15685

15686

15687

15688

- { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5

15689

-echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }

15690

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5

15691

+$as_echo_n "checking if more special flags are required for pthreads... " >&6; }

15692

flag=no

15693

case "${host_cpu}-${host_os}" in

15694

*-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;

15695

*solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;

15696

esac

15697

- { echo "$as_me:$LINENO: result: ${flag}" >&5

15698

-echo "${ECHO_T}${flag}" >&6; }

15699

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5

15700

+$as_echo "${flag}" >&6; }

15701

if test "x$flag" != xno; then

15702

PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"

15703

15704

@@ -16824,10 +15515,10 @@ echo "${ECHO_T}${flag}" >&6; }

15705

15706

# Extract the first word of "$ac_prog", so it can be a program name with args.

7489

@@ -15508,7 +16152,7 @@ do

15707

7490

set dummy $ac_prog; ac_word=$2

15708

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

15709

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

15710

-if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then

15711

- echo $ECHO_N "(cached) $ECHO_C" >&6

15712

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

15713

+$as_echo_n "checking for $ac_word... " >&6; }

15714

+if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :

15715

+ $as_echo_n "(cached) " >&6

7491

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7492

$as_echo_n "checking for $ac_word... " >&6; }

7493

-if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :

7494

+if ${ac_cv_prog_PTHREAD_CC+:} false; then :

7495

$as_echo_n "(cached) " >&6

15716

7496

else

15717

7497

if test -n "$PTHREAD_CC"; then

15718

ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.

15719

@@ -16837,25 +15528,25 @@ for as_dir in $PATH

15720

15721

IFS=$as_save_IFS

15722

test -z "$as_dir" && as_dir=.

15723

- for ac_exec_ext in '' $ac_executable_extensions; do

15724

+ for ac_exec_ext in '' $ac_executable_extensions; do

15725

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

15726

ac_cv_prog_PTHREAD_CC="$ac_prog"

15727

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

15728

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

15729

break 2

15730

15731

done

15732

-done

15733

+ done

15734

IFS=$as_save_IFS

15735

15736

15737

15738

PTHREAD_CC=$ac_cv_prog_PTHREAD_CC

15739

if test -n "$PTHREAD_CC"; then

15740

- { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5

15741

-echo "${ECHO_T}$PTHREAD_CC" >&6; }

15742

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5

15743

+$as_echo "$PTHREAD_CC" >&6; }

15744

else

15745

- { echo "$as_me:$LINENO: result: no" >&5

15746

-echo "${ECHO_T}no" >&6; }

15747

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

15748

+$as_echo "no" >&6; }

15749

15750

15751

15752

@@ -16899,13 +15590,9 @@ test -n "$PTHREAD_CC" || PTHREAD_CC="${C

15753

# compiler. If not (and OS X's ld, for instance, does not accept -z),

15754

# then we can't do this test.

15755

if test x"$done" = xno; then

15756

- { echo "$as_me:$LINENO: checking whether to check for GCC pthread/shared inconsistencies" >&5

15757

-echo $ECHO_N "checking whether to check for GCC pthread/shared inconsistencies... $ECHO_C" >&6; }

15758

- cat >conftest.$ac_ext <<_ACEOF

15759

-/* confdefs.h. */

15760

-_ACEOF

15761

-cat confdefs.h >>conftest.$ac_ext

15762

-cat >>conftest.$ac_ext <<_ACEOF

15763

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to check for GCC pthread/shared inconsistencies" >&5

15764

+$as_echo_n "checking whether to check for GCC pthread/shared inconsistencies... " >&6; }

15765

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

15766

/* end confdefs.h. */

15767

15768

int

15769

@@ -16916,52 +15603,28 @@ main ()

15770

return 0;

15771

}

15772

_ACEOF

15773

-rm -f conftest.$ac_objext conftest$ac_exeext

15774

-if { (ac_try="$ac_link"

15775

-case "(($ac_try" in

15776

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15777

- *) ac_try_echo=$ac_try;;

15778

-esac

15779

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15780

- (eval "$ac_link") 2>conftest.er1

15781

- ac_status=$?

15782

- grep -v '^ *+' conftest.er1 >conftest.err

15783

- rm -f conftest.er1

15784

- cat conftest.err >&5

15785

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15786

- (exit $ac_status); } && {

15787

- test -z "$ac_c_werror_flag" ||

15788

- test ! -s conftest.err

15789

- } && test -s conftest$ac_exeext &&

15790

- $as_test_x conftest$ac_exeext; then

15791

- :

15792

-else

15793

- echo "$as_me: failed program was:" >&5

15794

-sed 's/^/| /' conftest.$ac_ext >&5

15795

+if ac_fn_c_try_link "$LINENO"; then :

15796

15797

- done=yes

15798

+else

15799

+ done=yes

15800

15801

15802

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15803

- conftest$ac_exeext conftest.$ac_ext

15804

+rm -f core conftest.err conftest.$ac_objext \

15805

+ conftest$ac_exeext conftest.$ac_ext

15806

15807

if test "x$done" = xyes ; then

15808

- { echo "$as_me:$LINENO: result: no" >&5

15809

-echo "${ECHO_T}no" >&6; }

15810

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

15811

+$as_echo "no" >&6; }

15812

else

15813

- { echo "$as_me:$LINENO: result: yes" >&5

15814

-echo "${ECHO_T}yes" >&6; }

15815

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

15816

+$as_echo "yes" >&6; }

7498

@@ -15611,7 +16255,8 @@ $as_echo "yes" >&6; }

15817

7499

15818

7500

15819

7501

15820

7502

- if test x"$done" = xno; then

15821

- { echo "$as_me:$LINENO: checking whether -pthread is sufficient with -shared" >&5

15822

-echo $ECHO_N "checking whether -pthread is sufficient with -shared... $ECHO_C" >&6; }

15823

- cat >conftest.$ac_ext <<_ACEOF

15824

-/* confdefs.h. */

15825

-_ACEOF

15826

-cat confdefs.h >>conftest.$ac_ext

15827

-cat >>conftest.$ac_ext <<_ACEOF

15828

7503

+ if test x"$done" = xyes; then

15829

7504

+ done="no"

15830

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -pthread is sufficient with -shared" >&5

15831

+$as_echo_n "checking whether -pthread is sufficient with -shared... " >&6; }

15832

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

15833

/* end confdefs.h. */

15834

#include <pthread.h>

15835

int

15836

@@ -16974,41 +15637,18 @@ pthread_t th; pthread_join(th, 0);

15837

return 0;

15838

}

15839

_ACEOF

15840

-rm -f conftest.$ac_objext conftest$ac_exeext

15841

-if { (ac_try="$ac_link"

15842

-case "(($ac_try" in

15843

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15844

- *) ac_try_echo=$ac_try;;

15845

-esac

15846

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15847

- (eval "$ac_link") 2>conftest.er1

15848

- ac_status=$?

15849

- grep -v '^ *+' conftest.er1 >conftest.err

15850

- rm -f conftest.er1

15851

- cat conftest.err >&5

15852

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15853

- (exit $ac_status); } && {

15854

- test -z "$ac_c_werror_flag" ||

15855

- test ! -s conftest.err

15856

- } && test -s conftest$ac_exeext &&

15857

- $as_test_x conftest$ac_exeext; then

15858

+if ac_fn_c_try_link "$LINENO"; then :

15859

done=yes

15860

-else

15861

- echo "$as_me: failed program was:" >&5

15862

-sed 's/^/| /' conftest.$ac_ext >&5

15863

15864

15865

15866

15867

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15868

- conftest$ac_exeext conftest.$ac_ext

15869

+rm -f core conftest.err conftest.$ac_objext \

15870

+ conftest$ac_exeext conftest.$ac_ext

15871

15872

if test "x$done" = xyes; then

15873

- { echo "$as_me:$LINENO: result: yes" >&5

15874

-echo "${ECHO_T}yes" >&6; }

15875

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

15876

+$as_echo "yes" >&6; }

15877

else

15878

- { echo "$as_me:$LINENO: result: no" >&5

15879

-echo "${ECHO_T}no" >&6; }

15880

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

15881

+$as_echo "no" >&6; }

15882

15883

15884

15885

@@ -17017,14 +15657,10 @@ echo "${ECHO_T}no" >&6; }

15886

# about -lpthread

15887

15888

if test x"$done" = xno; then

15889

- { echo "$as_me:$LINENO: checking whether -lpthread fixes that" >&5

15890

-echo $ECHO_N "checking whether -lpthread fixes that... $ECHO_C" >&6; }

15891

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lpthread fixes that" >&5

15892

+$as_echo_n "checking whether -lpthread fixes that... " >&6; }

15893

LIBS="-lpthread $PTHREAD_LIBS $save_LIBS"

15894

- cat >conftest.$ac_ext <<_ACEOF

15895

-/* confdefs.h. */

15896

-_ACEOF

15897

-cat confdefs.h >>conftest.$ac_ext

15898

-cat >>conftest.$ac_ext <<_ACEOF

15899

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

15900

/* end confdefs.h. */

15901

#include <pthread.h>

15902

int

15903

@@ -17037,56 +15673,29 @@ pthread_t th; pthread_join(th, 0);

15904

return 0;

15905

}

15906

_ACEOF

15907

-rm -f conftest.$ac_objext conftest$ac_exeext

15908

-if { (ac_try="$ac_link"

15909

-case "(($ac_try" in

15910

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15911

- *) ac_try_echo=$ac_try;;

15912

-esac

15913

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15914

- (eval "$ac_link") 2>conftest.er1

15915

- ac_status=$?

15916

- grep -v '^ *+' conftest.er1 >conftest.err

15917

- rm -f conftest.er1

15918

- cat conftest.err >&5

15919

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15920

- (exit $ac_status); } && {

15921

- test -z "$ac_c_werror_flag" ||

15922

- test ! -s conftest.err

15923

- } && test -s conftest$ac_exeext &&

15924

- $as_test_x conftest$ac_exeext; then

15925

+if ac_fn_c_try_link "$LINENO"; then :

15926

done=yes

15927

-else

15928

- echo "$as_me: failed program was:" >&5

15929

-sed 's/^/| /' conftest.$ac_ext >&5

15930

15931

15932

15933

15934

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15935

- conftest$ac_exeext conftest.$ac_ext

15936

+rm -f core conftest.err conftest.$ac_objext \

15937

+ conftest$ac_exeext conftest.$ac_ext

15938

15939

if test "x$done" = xyes; then

15940

- { echo "$as_me:$LINENO: result: yes" >&5

15941

-echo "${ECHO_T}yes" >&6; }

15942

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

15943

+$as_echo "yes" >&6; }

15944

PTHREAD_LIBS="-lpthread $PTHREAD_LIBS"

15945

else

15946

- { echo "$as_me:$LINENO: result: no" >&5

15947

-echo "${ECHO_T}no" >&6; }

15948

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

15949

+$as_echo "no" >&6; }

15950

15951

15952

15953

# FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc

15954

15955

if test x"$done" = xno; then

15956

- { echo "$as_me:$LINENO: checking whether -lc_r fixes that" >&5

15957

-echo $ECHO_N "checking whether -lc_r fixes that... $ECHO_C" >&6; }

15958

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc_r fixes that" >&5

15959

+$as_echo_n "checking whether -lc_r fixes that... " >&6; }

15960

LIBS="-lc_r $PTHREAD_LIBS $save_LIBS"

15961

- cat >conftest.$ac_ext <<_ACEOF

15962

-/* confdefs.h. */

15963

-_ACEOF

15964

-cat confdefs.h >>conftest.$ac_ext

15965

-cat >>conftest.$ac_ext <<_ACEOF

15966

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

15967

/* end confdefs.h. */

15968

#include <pthread.h>

15969

int

15970

@@ -17099,48 +15708,25 @@ pthread_t th; pthread_join(th, 0);

15971

return 0;

15972

}

15973

_ACEOF

15974

-rm -f conftest.$ac_objext conftest$ac_exeext

15975

-if { (ac_try="$ac_link"

15976

-case "(($ac_try" in

15977

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15978

- *) ac_try_echo=$ac_try;;

15979

-esac

15980

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15981

- (eval "$ac_link") 2>conftest.er1

15982

- ac_status=$?

15983

- grep -v '^ *+' conftest.er1 >conftest.err

15984

- rm -f conftest.er1

15985

- cat conftest.err >&5

15986

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15987

- (exit $ac_status); } && {

15988

- test -z "$ac_c_werror_flag" ||

15989

- test ! -s conftest.err

15990

- } && test -s conftest$ac_exeext &&

15991

- $as_test_x conftest$ac_exeext; then

15992

+if ac_fn_c_try_link "$LINENO"; then :

15993

done=yes

15994

-else

15995

- echo "$as_me: failed program was:" >&5

15996

-sed 's/^/| /' conftest.$ac_ext >&5

15997

15998

15999

16000

16001

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

16002

- conftest$ac_exeext conftest.$ac_ext

16003

+rm -f core conftest.err conftest.$ac_objext \

16004

+ conftest$ac_exeext conftest.$ac_ext

16005

16006

if test "x$done" = xyes; then

16007

- { echo "$as_me:$LINENO: result: yes" >&5

16008

-echo "${ECHO_T}yes" >&6; }

16009

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

16010

+$as_echo "yes" >&6; }

16011

PTHREAD_LIBS="-lc_r $PTHREAD_LIBS"

16012

else

16013

- { echo "$as_me:$LINENO: result: no" >&5

16014

-echo "${ECHO_T}no" >&6; }

16015

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

16016

+$as_echo "no" >&6; }

16017

16018

16019

if test x"$done" = xno; then

16020

# OK, we have run out of ideas

16021

- { echo "$as_me:$LINENO: WARNING: Impossible to determine how to use pthreads with shared libraries" >&5

16022

-echo "$as_me: WARNING: Impossible to determine how to use pthreads with shared libraries" >&2;}

16023

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Impossible to determine how to use pthreads with shared libraries" >&5

16024

+$as_echo "$as_me: WARNING: Impossible to determine how to use pthreads with shared libraries" >&2;}

16025

16026

# so it's not safe to assume that we may use pthreads

16027

acx_pthread_ok=no

16028

@@ -17160,9 +15746,7 @@ fi

16029

# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:

16030

if test x"$acx_pthread_ok" = xyes; then

16031

16032

-cat >>confdefs.h <<\_ACEOF

16033

-#define HAVE_PTHREAD 1

16034

-_ACEOF

16035

+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h

16036

16037

16038

else

16039

@@ -17176,8 +15760,8 @@ ac_link='$CXX -o conftest$ac_exeext $CXX

16040

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

16041

16042

16043

-{ echo "$as_me:$LINENO: checking the location of hash_map" >&5

16044

-echo $ECHO_N "checking the location of hash_map... $ECHO_C" >&6; }

16045

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the location of hash_map" >&5

16046

+$as_echo_n "checking the location of hash_map... " >&6; }

16047

16048

ac_ext=cpp

16049

ac_cpp='$CXXCPP $CPPFLAGS'

16050

@@ -17198,11 +15782,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

16051

# include a call to find() in our test to detect this broken

16052

# implementation and avoid using it. Note that ext/hash_map works

16053

# fine on this platform, so we'll end up using that.

16054

- cat >conftest.$ac_ext <<_ACEOF

16055

-/* confdefs.h. */

16056

-_ACEOF

16057

-cat confdefs.h >>conftest.$ac_ext

16058

-cat >>conftest.$ac_ext <<_ACEOF

16059

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

16060

/* end confdefs.h. */

16061

#include <$location>

16062

int

16063

@@ -17214,33 +15794,11 @@ const ${namespace}::$name<int, int> t;

16064

return 0;

16065

}

16066

_ACEOF

16067

-rm -f conftest.$ac_objext

16068

-if { (ac_try="$ac_compile"

16069

-case "(($ac_try" in

16070

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

16071

- *) ac_try_echo=$ac_try;;

16072

-esac

16073

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

16074

- (eval "$ac_compile") 2>conftest.er1

16075

- ac_status=$?

16076

- grep -v '^ *+' conftest.er1 >conftest.err

16077

- rm -f conftest.er1

16078

- cat conftest.err >&5

16079

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

16080

- (exit $ac_status); } && {

16081

- test -z "$ac_cxx_werror_flag" ||

16082

- test ! -s conftest.err

16083

- } && test -s conftest.$ac_objext; then

16084

+if ac_fn_cxx_try_compile "$LINENO"; then :

16085

ac_cv_cxx_hash_map_header="<$location>";

16086

ac_cv_cxx_hash_namespace="$namespace";

16087

ac_cv_cxx_hash_map_class="$name";

16088

-else

16089

- echo "$as_me: failed program was:" >&5

16090

-sed 's/^/| /' conftest.$ac_ext >&5

16091

16092

16093

16094

16095

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

16096

16097

done

16098

@@ -17250,14 +15808,10 @@ rm -f core conftest.err conftest.$ac_obj

16099

ac_cv_cxx_hash_set_class=`echo "$ac_cv_cxx_hash_map_class" | sed s/map/set/`;

16100

if test -n "$ac_cv_cxx_hash_map_header"; then

16101

16102

-cat >>confdefs.h <<\_ACEOF

16103

-#define HAVE_HASH_MAP 1

16104

-_ACEOF

16105

+$as_echo "#define HAVE_HASH_MAP 1" >>confdefs.h

16106

16107

16108

-cat >>confdefs.h <<\_ACEOF

16109

-#define HAVE_HASH_SET 1

16110

-_ACEOF

16111

+$as_echo "#define HAVE_HASH_SET 1" >>confdefs.h

16112

16113

16114

cat >>confdefs.h <<_ACEOF

16115

@@ -17284,13 +15838,13 @@ cat >>confdefs.h <<_ACEOF

16116

#define HASH_NAMESPACE $ac_cv_cxx_hash_namespace

16117

_ACEOF

16118

16119

- { echo "$as_me:$LINENO: result: $ac_cv_cxx_hash_map_header" >&5

16120

-echo "${ECHO_T}$ac_cv_cxx_hash_map_header" >&6; }

16121

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_hash_map_header" >&5

16122

+$as_echo "$ac_cv_cxx_hash_map_header" >&6; }

16123

else

16124

- { echo "$as_me:$LINENO: result: " >&5

16125

-echo "${ECHO_T}" >&6; }

16126

- { echo "$as_me:$LINENO: WARNING: could not find an STL hash_map" >&5

16127

-echo "$as_me: WARNING: could not find an STL hash_map" >&2;}

16128

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5

16129

+$as_echo "" >&6; }

16130

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find an STL hash_map" >&5

16131

+$as_echo "$as_me: WARNING: could not find an STL hash_map" >&2;}

16132

16133

16134

16135

@@ -17299,6 +15853,8 @@ echo "$as_me: WARNING: could not find an

16136

# too.

16137

export CFLAGS

16138

export CXXFLAGS

16139

16140

16141

subdirs="$subdirs gtest"

16142

16143

16144

@@ -17331,12 +15887,13 @@ _ACEOF

16145

case $ac_val in #(

16146

*${as_nl}*)

16147

case $ac_var in #(

16148

- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5

16149

-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;

16150

+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5

16151

+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;

16152

esac

16153

case $ac_var in #(

16154

_ | IFS | as_nl) ;; #(

16155

- *) $as_unset $ac_var ;;

16156

+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

16157

+ *) { eval $ac_var=; unset $ac_var;} ;;

16158

esac ;;

16159

esac

16160

done

16161

@@ -17344,8 +15901,8 @@ echo "$as_me: WARNING: Cache variable $a

16162

(set) 2>&1 |

16163

case $as_nl`(ac_space=' '; set) 2>&1` in #(

16164

*${as_nl}ac_space=\ *)

16165

- # `set' does not quote correctly, so add quotes (double-quote

16166

- # substitution turns \\\\ into \\, and sed turns \\ into \).

16167

+ # `set' does not quote correctly, so add quotes: double-quote

16168

+ # substitution turns \\\\ into \\, and sed turns \\ into \.

16169

sed -n \

16170

"s/'/'\\\\''/g;

16171

s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"

16172

@@ -17368,12 +15925,12 @@ echo "$as_me: WARNING: Cache variable $a

7505

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -pthread is sufficient with -shared" >&5

7506

$as_echo_n "checking whether -pthread is sufficient with -shared... " >&6; }

7507

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7508

@@ -16023,10 +16668,21 @@ $as_echo "$as_me: WARNING: cache variabl

7509

:end' >>confcache

16173

7510

if diff "$cache_file" confcache >/dev/null 2>&1; then :; else

16174

7511

if test -w "$cache_file"; then

16175

test "x$cache_file" != "x/dev/null" &&

16176

- { echo "$as_me:$LINENO: updating cache $cache_file" >&5

16177

-echo "$as_me: updating cache $cache_file" >&6;}

16178

+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5

16179

+$as_echo "$as_me: updating cache $cache_file" >&6;}

16180

cat confcache >$cache_file

7512

- test "x$cache_file" != "x/dev/null" &&

7513

+ if test "x$cache_file" != "x/dev/null"; then

7514

{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5

7515

$as_echo "$as_me: updating cache $cache_file" >&6;}

7516

- cat confcache >$cache_file

7517

+ if test ! -f "$cache_file" || test -h "$cache_file"; then

7518

+ cat confcache >"$cache_file"

7519

+ else

7520

+ case $cache_file in #(

7521

+ */* | ?:*)

7522

+ mv -f confcache "$cache_file"$$ &&

7523

+ mv -f "$cache_file"$$ "$cache_file" ;; #(

7524

+ *)

7525

+ mv -f confcache "$cache_file" ;;

7526

+ esac

7527

+ fi

7528

+ fi

16181

7529

else

16182

- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5

16183

-echo "$as_me: not updating unwritable cache $cache_file" >&6;}

16184

+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5

16185

+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}

16186

16187

16188

rm -f confcache

16189

@@ -17386,76 +15943,66 @@ DEFS=-DHAVE_CONFIG_H

7530

{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5

7531

$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}

7532

@@ -16042,6 +16698,7 @@ DEFS=-DHAVE_CONFIG_H

16190

7533

16191

7534

ac_libobjs=

16192

7535

ac_ltlibobjs=

16194

7537

for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue

16195

7538

# 1. Remove the extension, and $U if already installed.

16196

7539

ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'

16197

- ac_i=`echo "$ac_i" | sed "$ac_script"`

16198

+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`

16199

# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR

16200

# will be set to the directory where LIBOBJS objects are built.

16201

- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"

16202

- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'

16203

+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"

16204

+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'

16205

done

16206

LIBOBJS=$ac_libobjs

16207

16208

LTLIBOBJS=$ac_ltlibobjs

16209

16210

16211

+ if test -n "$EXEEXT"; then

16212

+ am__EXEEXT_TRUE=

16213

+ am__EXEEXT_FALSE='#'

16214

+else

16215

+ am__EXEEXT_TRUE='#'

16216

+ am__EXEEXT_FALSE=

16217

+fi

16218

7540

@@ -16065,35 +16722,31 @@ else

7541

7542

16219

7543

if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then

16220

- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.

16221

-Usually this means the macro was only invoked conditionally." >&5

16222

-echo "$as_me: error: conditional \"AMDEP\" was never defined.

16223

-Usually this means the macro was only invoked conditionally." >&2;}

16224

- { (exit 1); exit 1; }; }

7544

- as_fn_error "conditional \"AMDEP\" was never defined.

16225

7545

+ as_fn_error $? "conditional \"AMDEP\" was never defined.

16226

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

7546

Usually this means the macro was only invoked conditionally." "$LINENO" 5

16227

7547

16228

7548

if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then

16229

- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.

16230

-Usually this means the macro was only invoked conditionally." >&5

16231

-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.

16232

-Usually this means the macro was only invoked conditionally." >&2;}

16233

- { (exit 1); exit 1; }; }

7549

- as_fn_error "conditional \"am__fastdepCC\" was never defined.

16234

7550

+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.

16235

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

7551

Usually this means the macro was only invoked conditionally." "$LINENO" 5

16236

7552

16237

7553

if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then

16238

- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.

16239

-Usually this means the macro was only invoked conditionally." >&5

16240

-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.

16241

-Usually this means the macro was only invoked conditionally." >&2;}

16242

- { (exit 1); exit 1; }; }

7554

- as_fn_error "conditional \"am__fastdepCXX\" was never defined.

16243

7555

+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.

16244

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

7556

Usually this means the macro was only invoked conditionally." "$LINENO" 5

16245

7557

16246

7558

if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then

16247

- { { echo "$as_me:$LINENO: error: conditional \"GCC\" was never defined.

16248

-Usually this means the macro was only invoked conditionally." >&5

16249

-echo "$as_me: error: conditional \"GCC\" was never defined.

16250

-Usually this means the macro was only invoked conditionally." >&2;}

16251

- { (exit 1); exit 1; }; }

7559

- as_fn_error "conditional \"GCC\" was never defined.

7560

-Usually this means the macro was only invoked conditionally." "$LINENO" 5

7561

-fi

7562

-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then

7563

- as_fn_error "conditional \"am__fastdepCXX\" was never defined.

16252

7564

+ as_fn_error $? "conditional \"GCC\" was never defined.

16253

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

16254

16255

if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then

16256

- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.

16257

-Usually this means the macro was only invoked conditionally." >&5

16258

-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.

16259

-Usually this means the macro was only invoked conditionally." >&2;}

16260

- { (exit 1); exit 1; }; }

16261

+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.

16262

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

7565

Usually this means the macro was only invoked conditionally." "$LINENO" 5

16263

7566

16264

7567

if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then

16265

- { { echo "$as_me:$LINENO: error: conditional \"HAVE_ZLIB\" was never defined.

16266

-Usually this means the macro was only invoked conditionally." >&5

16267

-echo "$as_me: error: conditional \"HAVE_ZLIB\" was never defined.

16268

-Usually this means the macro was only invoked conditionally." >&2;}

16269

- { (exit 1); exit 1; }; }

7568

- as_fn_error "conditional \"HAVE_ZLIB\" was never defined.

16270

7569

+ as_fn_error $? "conditional \"HAVE_ZLIB\" was never defined.

16271

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

7570

Usually this means the macro was only invoked conditionally." "$LINENO" 5

16272

7571

16273

7572

if test -z "${USE_EXTERNAL_PROTOC_TRUE}" && test -z "${USE_EXTERNAL_PROTOC_FALSE}"; then

16274

- { { echo "$as_me:$LINENO: error: conditional \"USE_EXTERNAL_PROTOC\" was never defined.

16275

-Usually this means the macro was only invoked conditionally." >&5

16276

-echo "$as_me: error: conditional \"USE_EXTERNAL_PROTOC\" was never defined.

16277

-Usually this means the macro was only invoked conditionally." >&2;}

16278

- { (exit 1); exit 1; }; }

7573

- as_fn_error "conditional \"USE_EXTERNAL_PROTOC\" was never defined.

16279

7574

+ as_fn_error $? "conditional \"USE_EXTERNAL_PROTOC\" was never defined.

16280

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

7575

Usually this means the macro was only invoked conditionally." "$LINENO" 5

16281

7576

16282

7577

16283

: ${CONFIG_STATUS=./config.status}

16284

+ac_write_fail=0

7578

-: ${CONFIG_STATUS=./config.status}

7579

+: "${CONFIG_STATUS=./config.status}"

7580

ac_write_fail=0

16285

7581

ac_clean_files_save=$ac_clean_files

16286

7582

ac_clean_files="$ac_clean_files $CONFIG_STATUS"

16287

-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5

16288

-echo "$as_me: creating $CONFIG_STATUS" >&6;}

16289

-cat >$CONFIG_STATUS <<_ACEOF

16290

+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5

16291

+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}

16292

+as_write_fail=0

16293

+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1

16294

#! $SHELL

16295

# Generated by $as_me.

16296

# Run this file to recreate the current configuration.

16297

@@ -17465,59 +16012,79 @@ cat >$CONFIG_STATUS <<_ACEOF

16298

debug=false

16299

ac_cs_recheck=false

16300

ac_cs_silent=false

16301

-SHELL=\${CONFIG_SHELL-$SHELL}

16302

-_ACEOF

16303

16304

-cat >>$CONFIG_STATUS <<\_ACEOF

16305

-## --------------------- ##

16306

-## M4sh Initialization. ##

16307

-## --------------------- ##

16308

+SHELL=\${CONFIG_SHELL-$SHELL}

16309

+export SHELL

16310

+_ASEOF

16311

+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1

16312

+## -------------------- ##

16313

+## M4sh Initialization. ##

16314

+## -------------------- ##

16315

16316

# Be more Bourne compatible

16317

DUALCASE=1; export DUALCASE # for MKS sh

16318

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

16319

+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :

16320

emulate sh

16321

NULLCMD=:

16322

- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

16323

+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

16324

# is contrary to our usage. Disable this feature.

16325

alias -g '${1+"$@"}'='"$@"'

16326

setopt NO_GLOB_SUBST

16327

else

16328

- case `(set -o) 2>/dev/null` in

16329

- *posix*) set -o posix ;;

16330

+ case `(set -o) 2>/dev/null` in #(

16331

+ *posix*) :

16332

+ set -o posix ;; #(

16333

+ *) :

16334

+ ;;

16335

esac

16336

16337

16338

16339

16340

16341

16342

-# PATH needs CR

16343

-# Avoid depending upon Character Ranges.

16344

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

16345

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

16346

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

16347

-as_cr_digits='0123456789'

16348

-as_cr_alnum=$as_cr_Letters$as_cr_digits

16349

16350

-# The user is always right.

16351

-if test "${PATH_SEPARATOR+set}" != set; then

16352

- echo "#! /bin/sh" >conf$$.sh

16353

- echo "exit 0" >>conf$$.sh

16354

- chmod +x conf$$.sh

16355

- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

16356

- PATH_SEPARATOR=';'

16357

+as_nl='

16358

16359

+export as_nl

16360

+# Printing a long string crashes Solaris 7 /usr/bin/printf.

16361

+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

16362

+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

16363

+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

16364

+# Prefer a ksh shell builtin over an external printf program on Solaris,

16365

+# but without wasting forks for bash or zsh.

16366

+if test -z "$BASH_VERSION$ZSH_VERSION" \

16367

+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then

16368

+ as_echo='print -r --'

16369

+ as_echo_n='print -rn --'

16370

+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

16371

+ as_echo='printf %s\n'

16372

+ as_echo_n='printf %s'

16373

+else

16374

+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then

16375

+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'

16376

+ as_echo_n='/usr/ucb/echo -n'

16377

else

16378

- PATH_SEPARATOR=:

16379

+ as_echo_body='eval expr "X$1" : "X\$.*\$"'

16380

+ as_echo_n_body='eval

16381

+ arg=$1;

16382

+ case $arg in #(

16383

+ *"$as_nl"*)

16384

+ expr "X$arg" : "X\$.*\$$as_nl";

16385

+ arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;

16386

+ esac;

16387

+ expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"

16388

+ '

16389

+ export as_echo_n_body

16390

+ as_echo_n='sh -c $as_echo_n_body as_echo'

16391

16392

- rm -f conf$$.sh

16393

+ export as_echo_body

16394

+ as_echo='sh -c $as_echo_body as_echo'

16395

16396

16397

-# Support unset when possible.

16398

-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

16399

- as_unset=unset

16400

-else

16401

- as_unset=false

16402

+# The user is always right.

16403

+if test "${PATH_SEPARATOR+set}" != set; then

16404

+ PATH_SEPARATOR=:

16405

+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {

16406

+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||

16407

+ PATH_SEPARATOR=';'

16408

+ }

16409

16410

16411

16412

@@ -17526,20 +16093,18 @@ fi

16413

# there to prevent editors from complaining about space-tab.

16414

# (If _AS_PATH_WALK were called with IFS unset, it would disable word

16415

# splitting by setting IFS to empty value.)

16416

-as_nl='

16417

7583

@@ -16194,6 +16847,7 @@ fi

16418

7584

IFS=" "" $as_nl"

16419

7585

16420

7586

# Find who we are. Look in the path if we contain no directory separator.

16421

-case $0 in

16422

+case $0 in #((

7587

+as_myself=

7588

case $0 in #((

16423

7589

*[\\/]* ) as_myself=$0 ;;

16424

7590

*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

16425

for as_dir in $PATH

16426

16427

IFS=$as_save_IFS

16428

test -z "$as_dir" && as_dir=.

16429

- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

16430

-done

16431

+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

16432

+ done

16433

IFS=$as_save_IFS

16434

16435

;;

16436

@@ -17550,32 +16115,111 @@ if test "x$as_myself" = x; then

16437

as_myself=$0

16438

16439

if test ! -f "$as_myself"; then

16440

- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

16441

- { (exit 1); exit 1; }

16442

+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

16443

+ exit 1

16444

16445

16446

-# Work around bugs in pre-3.0 UWIN ksh.

16447

-for as_var in ENV MAIL MAILPATH

16448

-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

16449

+# Unset variables that we do not need and which cause bugs (e.g. in

16450

+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"

16451

+# suppresses any "Segmentation fault" message there. '((' could

16452

+# trigger a bug in pdksh 5.2.14.

16453

+for as_var in BASH_ENV ENV MAIL MAILPATH

16454

+do eval test x\${$as_var+set} = xset \

16455

+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :

16456

done

16457

PS1='$ '

16458

PS2='> '

16459

PS4='+ '

16460

16461

# NLS nuisances.

16462

-for as_var in \

16463

- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \

16464

- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \

16465

- LC_TELEPHONE LC_TIME

16466

-do

16467

- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

16468

- eval $as_var=C; export $as_var

16469

- else

16470

- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

16471

- fi

16472

-done

16473

+LC_ALL=C

16474

+export LC_ALL

16475

+LANGUAGE=C

16476

+export LANGUAGE

16477

16478

+# CDPATH.

16479

+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

16480

16481

7591

@@ -16239,19 +16893,19 @@ export LANGUAGE

7592

(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

7593

7594

7595

-# as_fn_error ERROR [LINENO LOG_FD]

7596

-# ---------------------------------

16482

7597

+# as_fn_error STATUS ERROR [LINENO LOG_FD]

16483

7598

+# ----------------------------------------

16484

+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

16485

+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

7599

# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

7600

# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

7601

-# script with status $?, using 1 if that was 0.

16486

7602

+# script with STATUS, using 1 if that was 0.

16487

+as_fn_error ()

16488

7603

as_fn_error ()

7604

{

7605

- as_status=$?; test $as_status -eq 0 && as_status=1

7606

- if test "$3"; then

7607

- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

7608

- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3

16489

7609

+ as_status=$1; test $as_status -eq 0 && as_status=1

16490

7610

+ if test "$4"; then

16491

7611

+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

16492

7612

+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4

16493

+ fi

7613

7614

- $as_echo "$as_me: error: $1" >&2

16494

7615

+ $as_echo "$as_me: error: $2" >&2

16495

+ as_fn_exit $as_status

16496

+} # as_fn_error

16497

16498

16499

+# as_fn_set_status STATUS

16500

+# -----------------------

16501

+# Set $? to STATUS, without forking.

16502

+as_fn_set_status ()

16503

16504

+ return $1

16505

+} # as_fn_set_status

16506

16507

+# as_fn_exit STATUS

16508

+# -----------------

16509

+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.

16510

+as_fn_exit ()

16511

16512

+ set +e

16513

+ as_fn_set_status $1

16514

+ exit $1

16515

+} # as_fn_exit

16516

16517

+# as_fn_unset VAR

16518

+# ---------------

16519

+# Portably unset VAR.

16520

+as_fn_unset ()

16521

16522

+ { eval $1=; unset $1;}

16523

16524

+as_unset=as_fn_unset

16525

+# as_fn_append VAR VALUE

16526

+# ----------------------

16527

+# Append the text in VALUE to the end of the definition contained in VAR. Take

16528

+# advantage of any shell optimizations that allow amortized linear growth over

16529

+# repeated appends, instead of the typical quadratic growth present in naive

16530

+# implementations.

16531

+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :

16532

+ eval 'as_fn_append ()

16533

+ {

16534

+ eval $1+=\$2

16535

+ }'

16536

+else

16537

+ as_fn_append ()

16538

+ {

16539

+ eval $1=\$$1\$2

16540

+ }

16541

+fi # as_fn_append

16542

16543

+# as_fn_arith ARG...

16544

+# ------------------

16545

+# Perform arithmetic evaluation on the ARGs, and store the result in the

16546

+# global $as_val. Take advantage of shells that can avoid forks. The arguments

16547

+# must be portable across $(()) and expr.

16548

+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :

16549

+ eval 'as_fn_arith ()

16550

+ {

16551

+ as_val=$(( $* ))

16552

+ }'

16553

+else

16554

+ as_fn_arith ()

16555

+ {

16556

+ as_val=`expr "$@" || test $? -eq 1`

16557

+ }

16558

+fi # as_fn_arith

16559

16560

16561

-# Required to use basename.

16562

if expr a : '$a$' >/dev/null 2>&1 &&

16563

test "X`expr 00001 : '.*$...$'`" = X001; then

16564

as_expr=expr

16565

@@ -17589,13 +16233,17 @@ else

16566

as_basename=false

16567

16568

16569

+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

16570

+ as_dirname=dirname

16571

+else

16572

+ as_dirname=false

16573

+fi

16574

16575

-# Name of the executable.

16576

as_me=`$as_basename -- "$0" ||

16577

$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

16578

X"$0" : 'X$//$$' \| \

16579

X"$0" : 'X$/$' \| . 2>/dev/null ||

16580

-echo X/"$0" |

16581

+$as_echo X/"$0" |

16582

sed '/^.*\/$[^/][^/]*$\/*$/{

16583

s//\1/

16584

16585

@@ -17610,104 +16258,103 @@ echo X/"$0" |

16586

}

16587

s/.*/./; q'`

16588

16589

-# CDPATH.

16590

-$as_unset CDPATH

16591

16592

16593

16594

- as_lineno_1=$LINENO

16595

- as_lineno_2=$LINENO

16596

- test "x$as_lineno_1" != "x$as_lineno_2" &&

16597

- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {

16598

16599

- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO

16600

- # uniformly replaced by the line number. The first 'sed' inserts a

16601

- # line-number line after each line using $LINENO; the second 'sed'

16602

- # does the real work. The second script uses 'N' to pair each

16603

- # line-number line with the line containing $LINENO, and appends

16604

- # trailing '-' during substitution so that $LINENO is not a special

16605

- # case at line end.

16606

- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

16607

- # scripts with optimization help from Paolo Bonzini. Blame Lee

16608

- # E. McMahon (1931-1989) for sed's syntax. :-)

16609

- sed -n '

16610

- p

16611

- /[$]LINENO/=

16612

- ' <$as_myself |

16613

- sed '

16614

- s/[$]LINENO.*/&-/

16615

- t lineno

16616

- b

16617

- :lineno

16618

- N

16619

- :loop

16620

- s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/

16621

- t loop

16622

- s/-\n.*//

16623

- ' >$as_me.lineno &&

16624

- chmod +x "$as_me.lineno" ||

16625

- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

16626

- { (exit 1); exit 1; }; }

16627

16628

- # Don't try to exec as it changes $[0], causing all sort of problems

16629

- # (the dirname of $[0] is not the place where we might find the

16630

- # original and so on. Autoconf is especially sensitive to this).

16631

- . "./$as_me.lineno"

16632

- # Exit status is that of the last command.

16633

- exit

16634

16635

16636

16637

-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

16638

- as_dirname=dirname

16639

-else

16640

- as_dirname=false

16641

-fi

16642

+# Avoid depending upon Character Ranges.

16643

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

16644

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

16645

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

16646

+as_cr_digits='0123456789'

16647

+as_cr_alnum=$as_cr_Letters$as_cr_digits

16648

16649

ECHO_C= ECHO_N= ECHO_T=

16650

-case `echo -n x` in

16651

+case `echo -n x` in #(((((

16652

-n*)

16653

- case `echo 'x\c'` in

16654

+ case `echo 'xy\c'` in

16655

*c*) ECHO_T=' ';; # ECHO_T is single tab character.

16656

- *) ECHO_C='\c';;

16657

+ xy) ECHO_C='\c';;

16658

+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null

16659

+ ECHO_T=' ';;

16660

esac;;

16661

16662

ECHO_N='-n';;

16663

esac

16664

16665

-if expr a : '$a$' >/dev/null 2>&1 &&

16666

- test "X`expr 00001 : '.*$...$'`" = X001; then

16667

- as_expr=expr

16668

-else

16669

- as_expr=false

16670

-fi

16671

16672

rm -f conf$$ conf$$.exe conf$$.file

16673

if test -d conf$$.dir; then

16674

rm -f conf$$.dir/conf$$.file

16675

else

16676

rm -f conf$$.dir

16677

- mkdir conf$$.dir

16678

+ mkdir conf$$.dir 2>/dev/null

16679

16680

-echo >conf$$.file

16681

-if ln -s conf$$.file conf$$ 2>/dev/null; then

16682

- as_ln_s='ln -s'

16683

- # ... but there are two gotchas:

16684

- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

16685

- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

16686

- # In both cases, we have to default to `cp -p'.

16687

- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

16688

+if (echo >conf$$.file) 2>/dev/null; then

16689

+ if ln -s conf$$.file conf$$ 2>/dev/null; then

16690

+ as_ln_s='ln -s'

16691

+ # ... but there are two gotchas:

16692

+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

16693

+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

16694

+ # In both cases, we have to default to `cp -p'.

16695

+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

16696

+ as_ln_s='cp -p'

16697

+ elif ln conf$$.file conf$$ 2>/dev/null; then

16698

+ as_ln_s=ln

16699

+ else

16700

as_ln_s='cp -p'

16701

-elif ln conf$$.file conf$$ 2>/dev/null; then

16702

- as_ln_s=ln

16703

+ fi

16704

else

16705

as_ln_s='cp -p'

16706

16707

rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

16708

rmdir conf$$.dir 2>/dev/null

16709

16710

16711

+# as_fn_mkdir_p

16712

+# -------------

16713

+# Create "$as_dir" as a directory, including parents if necessary.

16714

+as_fn_mkdir_p ()

16715

16716

16717

+ case $as_dir in #(

16718

+ -*) as_dir=./$as_dir;;

16719

+ esac

16720

+ test -d "$as_dir" || eval $as_mkdir_p || {

16721

+ as_dirs=

16722

+ while :; do

16723

+ case $as_dir in #(

16724

+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

16725

+ *) as_qdir=$as_dir;;

16726

+ esac

16727

+ as_dirs="'$as_qdir' $as_dirs"

16728

+ as_dir=`$as_dirname -- "$as_dir" ||

16729

+$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

16730

+ X"$as_dir" : 'X$//$[^/]' \| \

16731

+ X"$as_dir" : 'X$//$$' \| \

16732

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

16733

+$as_echo X"$as_dir" |

16734

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

16735

+ s//\1/

16736

+ q

16737

+ }

16738

+ /^X$\/\/$[^/].*/{

16739

+ s//\1/

16740

+ q

16741

+ }

16742

+ /^X$\/\/$$/{

16743

+ s//\1/

16744

+ q

16745

+ }

16746

+ /^X$\/$.*/{

16747

+ s//\1/

16748

+ q

16749

+ }

16750

+ s/.*/./; q'`

16751

+ test -d "$as_dir" && break

16752

+ done

16753

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

7616

as_fn_exit $as_status

7617

} # as_fn_error

7618

7619

@@ -16447,7 +17101,7 @@ $as_echo X"$as_dir" |

7620

test -d "$as_dir" && break

7621

done

7622

test -z "$as_dirs" || eval "mkdir $as_dirs"

7623

- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"

16754

7624

+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"

16755

16756

16757

+} # as_fn_mkdir_p

16758

if mkdir -p . 2>/dev/null; then

16759

- as_mkdir_p=:

16760

+ as_mkdir_p='mkdir -p "$as_dir"'

16761

else

16762

test -d ./-p && rmdir ./-p

16763

as_mkdir_p=false

16764

@@ -17724,12 +16371,12 @@ else

16765

as_test_x='

16766

eval sh -c '\''

16767

if test -d "$1"; then

16768

- test -d "$1/.";

16769

+ test -d "$1/.";

16770

else

16771

- case $1 in

16772

- -*)set "./$1";;

16773

+ case $1 in #(

16774

+ -*)set "./$1";;

16775

esac;

16776

- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

16777

+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((

16778

???[sx]*):;;*)false;;esac;fi

16779

'\'' sh

16780

16781

@@ -17744,13 +16391,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr

16782

16783

16784

exec 6>&1

16785

+## ----------------------------------- ##

16786

+## Main body of $CONFIG_STATUS script. ##

16787

+## ----------------------------------- ##

16788

+_ASEOF

16789

+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1

16790

16791

-# Save the log message, to keep $[0] and so on meaningful, and to

16792

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

16793

+# Save the log message, to keep $0 and so on meaningful, and to

16794

# report actual input values of CONFIG_FILES etc. instead of their

7625

7626

7627

} # as_fn_mkdir_p

7628

@@ -16501,7 +17155,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri

16795

7629

# values after options handling.

16796

7630

ac_log="

16797

This file was extended by Protocol Buffers $as_me 2.3.0, which was

16798

-generated by GNU Autoconf 2.61. Invocation command line was

16799

+generated by GNU Autoconf 2.67. Invocation command line was

7631

This file was extended by Protocol Buffers $as_me 2.4.0a, which was

7632

-generated by GNU Autoconf 2.65. Invocation command line was

7633

+generated by GNU Autoconf 2.68. Invocation command line was

16800

7634

16801

7635

CONFIG_FILES = $CONFIG_FILES

16802

7636

CONFIG_HEADERS = $CONFIG_HEADERS

16803

@@ -17763,7 +16416,16 @@ on `(hostname || uname -n) 2>/dev/null |

16804

16805

_ACEOF

16806

16807

-cat >>$CONFIG_STATUS <<_ACEOF

16808

+case $ac_config_files in *"

16809

+"*) set x $ac_config_files; shift; ac_config_files=$*;;

16810

+esac

16811

16812

+case $ac_config_headers in *"

16813

+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;

16814

+esac

16815

16816

16817

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

16818

# Files that config.status was made for.

16819

config_files="$ac_config_files"

16820

config_headers="$ac_config_headers"

16821

@@ -17771,22 +16433,25 @@ config_commands="$ac_config_commands"

16822

16823

_ACEOF

16824

16825

-cat >>$CONFIG_STATUS <<\_ACEOF

16826

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

16827

ac_cs_usage="\

16828

-\`$as_me' instantiates files from templates according to the

16829

-current configuration.

16830

+\`$as_me' instantiates files and other configuration actions

16831

+from templates according to the current configuration. Unless the files

16832

+and actions are specified as TAGs, all are instantiated by default.

16833

16834

-Usage: $0 [OPTIONS] [FILE]...

16835

+Usage: $0 [OPTION]... [TAG]...

16836

16837

-h, --help print this help, then exit

16838

-V, --version print version number and configuration settings, then exit

16839

- -q, --quiet do not print progress messages

16840

+ --config print configuration, then exit

16841

+ -q, --quiet, --silent

16842

+ do not print progress messages

16843

-d, --debug don't remove temporary files

16844

--recheck update $as_me by reconfiguring in the same conditions

16845

- --file=FILE[:TEMPLATE]

16846

- instantiate the configuration file FILE

16847

- --header=FILE[:TEMPLATE]

16848

- instantiate the configuration header FILE

16849

+ --file=FILE[:TEMPLATE]

16850

+ instantiate the configuration file FILE

16851

+ --header=FILE[:TEMPLATE]

16852

+ instantiate the configuration header FILE

16853

16854

Configuration files:

16855

$config_files

16856

@@ -17797,16 +16462,17 @@ $config_headers

16857

Configuration commands:

16858

$config_commands

16859

16860

-Report bugs to <bug-autoconf@gnu.org>."

16861

+Report bugs to <protobuf@googlegroups.com>."

16862

16863

_ACEOF

16864

-cat >>$CONFIG_STATUS <<_ACEOF

16865

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

16866

+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

7637

@@ -16567,10 +17221,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ

7638

ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

16867

7639

ac_cs_version="\\

16868

Protocol Buffers config.status 2.3.0

16869

-configured by $0, generated by GNU Autoconf 2.61,

16870

- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

16871

+configured by $0, generated by GNU Autoconf 2.67,

16872

+ with options \\"\$ac_cs_config\\"

7640

Protocol Buffers config.status 2.4.0a

7641

-configured by $0, generated by GNU Autoconf 2.65,

7642

+configured by $0, generated by GNU Autoconf 2.68,

7643

with options \\"\$ac_cs_config\\"

16873

7644

16874

7645

16875

7646

16876

7647

This config.status script is free software; the Free Software Foundation

16877

7648

gives unlimited permission to copy, distribute and modify it."

16878

7649

16879

@@ -17814,20 +16480,26 @@ ac_pwd='$ac_pwd'

16880

srcdir='$srcdir'

16881

INSTALL='$INSTALL'

16882

MKDIR_P='$MKDIR_P'

16883

+AWK='$AWK'

16884

+test -n "\$AWK" || AWK=awk

16885

_ACEOF

16886

16887

-cat >>$CONFIG_STATUS <<\_ACEOF

16888

-# If no file are specified by the user, then we need to provide default

16889

-# value. By we need to know if files were specified by the user.

16890

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

16891

+# The default lists apply if the user does not specify any file.

16892

ac_need_defaults=:

7650

@@ -16588,11 +17242,16 @@ ac_need_defaults=:

16893

7651

while test $# != 0

16894

7652

16895

7653

case $1 in

16907

7665

16908

7666

ac_option=$1

16909

7667

ac_optarg=$2

16910

@@ -17840,34 +16512,41 @@ do

16911

16912

ac_cs_recheck=: ;;

16913

--version | --versio | --versi | --vers | --ver | --ve | --v | -V )

16914

- echo "$ac_cs_version"; exit ;;

16915

+ $as_echo "$ac_cs_version"; exit ;;

16916

+ --config | --confi | --conf | --con | --co | --c )

16917

+ $as_echo "$ac_cs_config"; exit ;;

16918

--debug | --debu | --deb | --de | --d | -d )

16919

debug=: ;;

16920

--file | --fil | --fi | --f )

7668

@@ -16614,6 +17273,7 @@ do

16921

7669

$ac_shift

16922

- CONFIG_FILES="$CONFIG_FILES $ac_optarg"

16923

+ case $ac_optarg in

16924

+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

7670

case $ac_optarg in

7671

*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

16925

7672

+ '') as_fn_error $? "missing file argument" ;;

16926

+ esac

16927

+ as_fn_append CONFIG_FILES " '$ac_optarg'"

7673

esac

7674

as_fn_append CONFIG_FILES " '$ac_optarg'"

16928

7675

ac_need_defaults=false;;

16929

--header | --heade | --head | --hea )

16930

$ac_shift

16931

- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"

16932

+ case $ac_optarg in

16933

+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

16934

+ esac

16935

+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"

7676

@@ -16626,7 +17286,7 @@ do

16936

7677

ac_need_defaults=false;;

16937

7678

--he | --h)

16938

7679

# Conflict between --help and --header

16939

- { echo "$as_me: error: ambiguous option: $1

16940

-Try \`$0 --help' for more information." >&2

16941

- { (exit 1); exit 1; }; };;

7680

- as_fn_error "ambiguous option: \`$1'

16942

7681

+ as_fn_error $? "ambiguous option: \`$1'

16943

+Try \`$0 --help' for more information.";;

7682

Try \`$0 --help' for more information.";;

16944

7683

--help | --hel | -h )

16945

- echo "$ac_cs_usage"; exit ;;

16946

+ $as_echo "$ac_cs_usage"; exit ;;

16947

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

16948

| -silent | --silent | --silen | --sile | --sil | --si | --s)

7684

$as_echo "$ac_cs_usage"; exit ;;

7685

@@ -16635,7 +17295,7 @@ Try \`$0 --help' for more information.";

16949

7686

ac_cs_silent=: ;;

16950

7687

16951

7688

# This is an error.

16952

- -*) { echo "$as_me: error: unrecognized option: $1

16953

-Try \`$0 --help' for more information." >&2

16954

- { (exit 1); exit 1; }; } ;;

7689

- -*) as_fn_error "unrecognized option: \`$1'

16955

7690

+ -*) as_fn_error $? "unrecognized option: \`$1'

16956

+Try \`$0 --help' for more information." ;;

16957

16958

- *) ac_config_targets="$ac_config_targets $1"

16959

+ *) as_fn_append ac_config_targets " $1"

16960

ac_need_defaults=false ;;

16961

16962

esac

16963

@@ -17882,27 +16561,29 @@ if $ac_cs_silent; then

16964

16965

16966

_ACEOF

16967

-cat >>$CONFIG_STATUS <<_ACEOF

16968

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

16969

if \$ac_cs_recheck; then

16970

- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6

16971

- CONFIG_SHELL=$SHELL

16972

+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

16973

+ shift

16974

+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6

16975

+ CONFIG_SHELL='$SHELL'

16976

export CONFIG_SHELL

16977

- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

16978

+ exec "\$@"

16979

16980

16981

_ACEOF

16982

-cat >>$CONFIG_STATUS <<\_ACEOF

16983

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

16984

exec 5>>config.log

16985

{

16986

echo

16987

sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX

16988

## Running $as_me. ##

16989

_ASBOX

16990

- echo "$ac_log"

16991

+ $as_echo "$ac_log"

16992

} >&5

16993

16994

_ACEOF

16995

-cat >>$CONFIG_STATUS <<_ACEOF

16996

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

16997

16998

# INIT-COMMANDS

16999

17000

@@ -17944,6 +16625,7 @@ lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e

17001

lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'

17002

reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'

17003

reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'

17004

+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'

17005

deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'

17006

file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'

17007

AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'

17008

@@ -18102,6 +16784,7 @@ LN_S \

17009

lt_SP2NL \

17010

lt_NL2SP \

17011

reload_flag \

17012

+OBJDUMP \

7691

Try \`$0 --help' for more information." ;;

7692

7693

*) as_fn_append ac_config_targets " $1"

7694

@@ -16689,184 +17349,208 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac

7695

sed_quote_subst='$sed_quote_subst'

7696

double_quote_subst='$double_quote_subst'

7697

delay_variable_subst='$delay_variable_subst'

7698

-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'

7699

-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'

7700

-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'

7701

-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'

7702

-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'

7703

-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'

7704

-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'

7705

-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'

7706

-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'

7707

-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'

7708

-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'

7709

-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'

7710

-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'

7711

-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'

7712

-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'

7713

-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'

7714

-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'

7715

-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'

7716

-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'

7717

-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'

7718

-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'

7719

-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'

7720

-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'

7721

-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'

7722

-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'

7723

-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'

7724

-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'

7725

-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7726

-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'

7727

-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'

7728

-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'

7729

-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'

7730

-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'

7731

-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'

7732

-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'

7733

-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7734

-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7735

-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7736

-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'

7737

-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'

7738

-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'

7739

-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'

7740

-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'

7741

-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'

7742

-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'

7743

-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'

7744

-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'

7745

-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'

7746

-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'

7747

-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'

7748

-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'

7749

-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'

7750

-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'

7751

-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'

7752

-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'

7753

-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'

7754

-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'

7755

-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'

7756

-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'

7757

-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'

7758

-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'

7759

-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'

7760

-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7761

-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7762

-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'

7763

-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'

7764

-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'

7765

-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'

7766

-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'

7767

-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7768

-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7769

-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7770

-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7771

-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7772

-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7773

-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'

7774

-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'

7775

-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'

7776

-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'

7777

-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'

7778

-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'

7779

-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'

7780

-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'

7781

-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'

7782

-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'

7783

-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'

7784

-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'

7785

-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'

7786

-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'

7787

-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'

7788

-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7789

-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'

7790

-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'

7791

-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7792

-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'

7793

-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'

7794

-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'

7795

-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'

7796

-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'

7797

-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'

7798

-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'

7799

-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'

7800

-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'

7801

-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'

7802

-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'

7803

-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7804

-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7805

-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'

7806

-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'

7807

-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'

7808

-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'

7809

-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'

7810

-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'

7811

-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'

7812

-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'

7813

-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'

7814

-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'

7815

-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'

7816

-compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'

7817

-predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'

7818

-postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'

7819

-predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'

7820

-postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'

7821

-compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'

7822

-LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7823

-old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7824

-compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7825

-GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7826

-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7827

-lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7828

-lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7829

-lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7830

-lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7831

-archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7832

-enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7833

-export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7834

-whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7835

-compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7836

-old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7837

-old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7838

-archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7839

-archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7840

-module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7841

-module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7842

-with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7843

-allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7844

-no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7845

-hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7846

-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7847

-hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7848

-hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7849

-hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7850

-hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7851

-hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7852

-hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7853

-inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7854

-link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7855

-fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7856

-always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7857

-export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7858

-exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7859

-include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7860

-prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7861

-file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7862

-hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7863

-compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7864

-predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7865

-postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7866

-predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7867

-postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7868

-compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'

7869

+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'

7870

+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'

7871

+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'

7872

+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'

7873

+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'

7874

+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'

7875

+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'

7876

+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'

7877

+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'

7878

+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'

7879

+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'

7880

+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'

7881

+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'

7882

+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'

7883

+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'

7884

+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'

7885

+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'

7886

+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'

7887

+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'

7888

+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'

7889

+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'

7890

+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'

7891

+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'

7892

+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'

7893

+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'

7894

+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'

7895

+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'

7896

+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'

7897

+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'

7898

+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'

7899

+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'

7900

+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'

7901

+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'

7902

+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'

7903

+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'

7904

+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'

7905

+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'

7906

+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'

7907

+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'

7908

+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'

7909

+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'

7910

+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'

7911

+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'

7912

+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'

7913

+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'

7914

+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'

7915

+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'

7916

+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'

7917

+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'

7918

+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'

7919

+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'

7920

+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'

7921

+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'

7922

+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'

7923

+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'

7924

+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'

7925

+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'

7926

+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'

7927

+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'

7928

+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'

7929

+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'

7930

+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'

7931

+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

7932

+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'

7933

+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'

7934

+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'

7935

+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'

7936

+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'

7937

+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'

7938

+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'

7939

+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'

7940

+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'

7941

+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'

7942

+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'

7943

+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'

7944

+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'

7945

+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'

7946

+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'

7947

+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'

7948

+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'

7949

+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'

7950

+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'

7951

+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'

7952

+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'

7953

+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'

7954

+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'

7955

+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'

7956

+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'

7957

+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'

7958

+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'

7959

+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'

7960

+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'

7961

+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'

7962

+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'

7963

+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'

7964

+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'

7965

+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'

7966

+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'

7967

+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'

7968

+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'

7969

+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'

7970

+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'

7971

+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'

7972

+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'

7973

+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'

7974

+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'

7975

+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'

7976

+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'

7977

+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'

7978

+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'

7979

+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'

7980

+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'

7981

+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'

7982

+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'

7983

+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'

7984

+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'

7985

+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'

7986

+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'

7987

+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'

7988

+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'

7989

+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'

7990

+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'

7991

+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'

7992

+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'

7993

+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'

7994

+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'

7995

+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'

7996

+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'

7997

+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'

7998

+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'

7999

+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'

8000

+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'

8001

+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'

8002

+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'

8003

+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'

8004

+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'

8005

+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'

8006

+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'

8007

+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'

8008

+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'

8009

+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'

8010

+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'

8011

+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'

8012

+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'

8013

+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'

8014

+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'

8015

+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'

8016

+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'

8017

+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'

8018

+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'

8019

+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'

8020

+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'

8021

+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'

8022

+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'

8023

+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'

8024

+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'

8025

+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'

8026

+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'

8027

+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'

8028

+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'

8029

+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'

8030

+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'

8031

+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'

8032

+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'

8033

+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'

8034

+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'

8035

+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'

8036

+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'

8037

+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'

8038

+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'

8039

+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'

8040

+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'

8041

+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'

8042

+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'

8043

+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'

8044

+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'

8045

+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'

8046

+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'

8047

+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'

8048

+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'

8049

+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'

8050

+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'

8051

+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'

8052

+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'

8053

+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'

8054

8055

LTCC='$LTCC'

8056

LTCFLAGS='$LTCFLAGS'

8057

compiler='$compiler_DEFAULT'

8058

8059

+# A function that is used when there is no print builtin or printf.

8060

+func_fallback_echo ()

8061

8062

+ eval 'cat <<_LTECHO_EOF

8063

+\$1

8064

+_LTECHO_EOF'

8065

8066

8067

# Quote evaled strings.

8068

-for var in SED \

8069

+for var in SHELL \

8070

+ECHO \

8071

+SED \

8072

GREP \

8073

EGREP \

8074

FGREP \

8075

@@ -16879,8 +17563,13 @@ reload_flag \

8076

OBJDUMP \

17013

8077

deplibs_check_method \

17014

8078

file_magic_cmd \

8079

+file_magic_glob \

8080

+want_nocaseglob \

8081

+DLLTOOL \

8082

+sharedlib_from_linklib_cmd \

17015

8083

AR \

17016

@@ -18259,7 +16942,7 @@ fi

17017

17018

_ACEOF

17019

17020

-cat >>$CONFIG_STATUS <<\_ACEOF

17021

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

17022

17023

# Handling of arguments.

17024

for ac_config_target in $ac_config_targets

17025

@@ -18273,9 +16956,7 @@ do

8084

AR_FLAGS \

8085

+archiver_list_spec \

8086

STRIP \

8087

RANLIB \

8088

CC \

8089

@@ -16890,14 +17579,14 @@ lt_cv_sys_global_symbol_pipe \

8090

lt_cv_sys_global_symbol_to_cdecl \

8091

lt_cv_sys_global_symbol_to_c_name_address \

8092

lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \

8093

-SHELL \

8094

-ECHO \

8095

+nm_file_list_spec \

8096

lt_prog_compiler_no_builtin_flag \

8097

-lt_prog_compiler_wl \

8098

lt_prog_compiler_pic \

8099

+lt_prog_compiler_wl \

8100

lt_prog_compiler_static \

8101

lt_cv_prog_compiler_c_o \

8102

need_locks \

8103

+MANIFEST_TOOL \

8104

DSYMUTIL \

8105

NMEDIT \

8106

LIPO \

8107

@@ -16913,7 +17602,6 @@ no_undefined_flag \

8108

hardcode_libdir_flag_spec \

8109

hardcode_libdir_flag_spec_ld \

8110

hardcode_libdir_separator \

8111

-fix_srcfile_path \

8112

exclude_expsyms \

8113

include_expsyms \

8114

file_list_spec \

8115

@@ -16921,6 +17609,7 @@ variables_saved_for_relink \

8116

libname_spec \

8117

library_names_spec \

8118

soname_spec \

8119

+install_override_mode \

8120

finish_eval \

8121

old_striplib \

8122

striplib \

8123

@@ -16931,10 +17620,11 @@ predeps \

8124

postdeps \

8125

compiler_lib_search_path \

8126

LD_CXX \

8127

+reload_flag_CXX \

8128

compiler_CXX \

8129

lt_prog_compiler_no_builtin_flag_CXX \

8130

-lt_prog_compiler_wl_CXX \

8131

lt_prog_compiler_pic_CXX \

8132

+lt_prog_compiler_wl_CXX \

8133

lt_prog_compiler_static_CXX \

8134

lt_cv_prog_compiler_c_o_CXX \

8135

export_dynamic_flag_spec_CXX \

8136

@@ -16946,7 +17636,6 @@ no_undefined_flag_CXX \

8137

hardcode_libdir_flag_spec_CXX \

8138

hardcode_libdir_flag_spec_ld_CXX \

8139

hardcode_libdir_separator_CXX \

8140

-fix_srcfile_path_CXX \

8141

exclude_expsyms_CXX \

8142

include_expsyms_CXX \

8143

file_list_spec_CXX \

8144

@@ -16956,9 +17645,9 @@ postdep_objects_CXX \

8145

predeps_CXX \

8146

postdeps_CXX \

8147

compiler_lib_search_path_CXX; do

8148

- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in

8149

+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in

8150

*[\\\\\\\`\\"\\\$]*)

8151

- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""

8152

+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""

8153

;;

8154

8155

eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""

8156

@@ -16980,11 +17669,13 @@ module_cmds \

8157

module_expsym_cmds \

8158

export_symbols_cmds \

8159

prelink_cmds \

8160

+postlink_cmds \

8161

postinstall_cmds \

8162

postuninstall_cmds \

8163

finish_cmds \

8164

sys_lib_search_path_spec \

8165

sys_lib_dlsearch_path_spec \

8166

+reload_cmds_CXX \

8167

old_archive_cmds_CXX \

8168

old_archive_from_new_cmds_CXX \

8169

old_archive_from_expsyms_cmds_CXX \

8170

@@ -16993,10 +17684,11 @@ archive_expsym_cmds_CXX \

8171

module_cmds_CXX \

8172

module_expsym_cmds_CXX \

8173

export_symbols_cmds_CXX \

8174

-prelink_cmds_CXX; do

8175

- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in

8176

+prelink_cmds_CXX \

8177

+postlink_cmds_CXX; do

8178

+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in

8179

*[\\\\\\\`\\"\\\$]*)

8180

- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""

8181

+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""

8182

;;

8183

8184

eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""

8185

@@ -17004,12 +17696,6 @@ prelink_cmds_CXX; do

8186

esac

8187

done

8188

8189

-# Fix-up fallback echo if it was mangled by the above quoting rules.

8190

-case \$lt_ECHO in

8191

-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`

8192

- ;;

8193

-esac

8194

8195

ac_aux_dir='$ac_aux_dir'

8196

xsi_shell='$xsi_shell'

8197

lt_shell_append='$lt_shell_append'

8198

@@ -17048,7 +17734,7 @@ do

17026

8199

"protobuf.pc") CONFIG_FILES="$CONFIG_FILES protobuf.pc" ;;

17027

8200

"protobuf-lite.pc") CONFIG_FILES="$CONFIG_FILES protobuf-lite.pc" ;;

17028

8201

17029

- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

17030

-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

17031

- { (exit 1); exit 1; }; };;

17032

+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;

8202

- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

8203

+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

17033

8204

esac

17034

8205

done

17035

8206

17036

@@ -18302,7 +16983,7 @@ $debug ||

8207

@@ -17071,9 +17757,10 @@ fi

8208

# after its creation but before its name has been assigned to `$tmp'.

8209

$debug ||

8210

{

8211

- tmp=

8212

+ tmp= ac_tmp=

17037

8213

trap 'exit_status=$?

17038

{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status

8214

- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status

8215

+ : "${ac_tmp:=$tmp}"

8216

+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status

17039

8217

' 0

17040

- trap '{ (exit 1); exit 1; }' 1 2 13 15

17041

+ trap 'as_fn_exit 1' 1 2 13 15

8218

trap 'as_fn_exit 1' 1 2 13 15

17042

8219

}

17043

# Create a (secure) tmp directory for tmp files.

8220

@@ -17081,12 +17768,13 @@ $debug ||

17044

8221

17045

@@ -18313,266 +16994,285 @@ $debug ||

8222

{

8223

tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&

8224

- test -n "$tmp" && test -d "$tmp"

8225

+ test -d "$tmp"

8226

} ||

17046

8227

{

17047

8228

tmp=./conf$$-$RANDOM

17048

8229

(umask 077 && mkdir "$tmp")

17049

-} ||

17050

17051

- echo "$me: cannot create a temporary directory in ." >&2

17052

- { (exit 1); exit 1; }

17053

8230

-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5

17054

8231

+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5

17055

17056

17057

-# Set up the sed scripts for CONFIG_FILES section.

17058

17059

17060

-# No need to generate the scripts if there are no CONFIG_FILES.

17061

-# This happens for instance when ./config.status config.h

17062

+# Set up the scripts for CONFIG_FILES section.

17063

+# No need to generate them if there are no CONFIG_FILES.

17064

+# This happens for instance with `./config.status config.h'.

17065

if test -n "$CONFIG_FILES"; then

17066

17067

-_ACEOF

17068

17069

17070

17071

-ac_delim='%!_!# '

17072

-for ac_last_try in false false false false false :; do

17073

- cat >conf$$subs.sed <<_ACEOF

17074

-SHELL!$SHELL$ac_delim

17075

-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim

17076

-PACKAGE_NAME!$PACKAGE_NAME$ac_delim

17077

-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim

17078

-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim

17079

-PACKAGE_STRING!$PACKAGE_STRING$ac_delim

17080

-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim

17081

-exec_prefix!$exec_prefix$ac_delim

17082

-prefix!$prefix$ac_delim

17083

-program_transform_name!$program_transform_name$ac_delim

17084

-bindir!$bindir$ac_delim

17085

-sbindir!$sbindir$ac_delim

17086

-libexecdir!$libexecdir$ac_delim

17087

-datarootdir!$datarootdir$ac_delim

17088

-datadir!$datadir$ac_delim

17089

-sysconfdir!$sysconfdir$ac_delim

17090

-sharedstatedir!$sharedstatedir$ac_delim

17091

-localstatedir!$localstatedir$ac_delim

17092

-includedir!$includedir$ac_delim

17093

-oldincludedir!$oldincludedir$ac_delim

17094

-docdir!$docdir$ac_delim

17095

-infodir!$infodir$ac_delim

17096

-htmldir!$htmldir$ac_delim

17097

-dvidir!$dvidir$ac_delim

17098

-pdfdir!$pdfdir$ac_delim

17099

-psdir!$psdir$ac_delim

17100

-libdir!$libdir$ac_delim

17101

-localedir!$localedir$ac_delim

17102

-mandir!$mandir$ac_delim

17103

-DEFS!$DEFS$ac_delim

17104

-ECHO_C!$ECHO_C$ac_delim

17105

-ECHO_N!$ECHO_N$ac_delim

17106

-ECHO_T!$ECHO_T$ac_delim

17107

-LIBS!$LIBS$ac_delim

17108

-build_alias!$build_alias$ac_delim

17109

-host_alias!$host_alias$ac_delim

17110

-target_alias!$target_alias$ac_delim

17111

-build!$build$ac_delim

17112

-build_cpu!$build_cpu$ac_delim

17113

-build_vendor!$build_vendor$ac_delim

17114

-build_os!$build_os$ac_delim

17115

-host!$host$ac_delim

17116

-host_cpu!$host_cpu$ac_delim

17117

-host_vendor!$host_vendor$ac_delim

17118

-host_os!$host_os$ac_delim

17119

-target!$target$ac_delim

17120

-target_cpu!$target_cpu$ac_delim

17121

-target_vendor!$target_vendor$ac_delim

17122

-target_os!$target_os$ac_delim

17123

-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim

17124

-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim

17125

-INSTALL_DATA!$INSTALL_DATA$ac_delim

17126

-am__isrc!$am__isrc$ac_delim

17127

-CYGPATH_W!$CYGPATH_W$ac_delim

17128

-PACKAGE!$PACKAGE$ac_delim

17129

-VERSION!$VERSION$ac_delim

17130

-ACLOCAL!$ACLOCAL$ac_delim

17131

-AUTOCONF!$AUTOCONF$ac_delim

17132

-AUTOMAKE!$AUTOMAKE$ac_delim

17133

-AUTOHEADER!$AUTOHEADER$ac_delim

17134

-MAKEINFO!$MAKEINFO$ac_delim

17135

-install_sh!$install_sh$ac_delim

17136

-STRIP!$STRIP$ac_delim

17137

-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim

17138

-mkdir_p!$mkdir_p$ac_delim

17139

-AWK!$AWK$ac_delim

17140

-SET_MAKE!$SET_MAKE$ac_delim

17141

-am__leading_dot!$am__leading_dot$ac_delim

17142

-AMTAR!$AMTAR$ac_delim

17143

-am__tar!$am__tar$ac_delim

17144

-am__untar!$am__untar$ac_delim

17145

-CC!$CC$ac_delim

17146

-CFLAGS!$CFLAGS$ac_delim

17147

-LDFLAGS!$LDFLAGS$ac_delim

17148

-CPPFLAGS!$CPPFLAGS$ac_delim

17149

-ac_ct_CC!$ac_ct_CC$ac_delim

17150

-EXEEXT!$EXEEXT$ac_delim

17151

-OBJEXT!$OBJEXT$ac_delim

17152

-DEPDIR!$DEPDIR$ac_delim

17153

-am__include!$am__include$ac_delim

17154

-am__quote!$am__quote$ac_delim

17155

-AMDEP_TRUE!$AMDEP_TRUE$ac_delim

17156

-AMDEP_FALSE!$AMDEP_FALSE$ac_delim

17157

-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim

17158

-CCDEPMODE!$CCDEPMODE$ac_delim

17159

-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim

17160

-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim

17161

-CXX!$CXX$ac_delim

17162

-CXXFLAGS!$CXXFLAGS$ac_delim

17163

-ac_ct_CXX!$ac_ct_CXX$ac_delim

17164

-CXXDEPMODE!$CXXDEPMODE$ac_delim

17165

-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim

17166

-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim

17167

-CXXCPP!$CXXCPP$ac_delim

17168

-GREP!$GREP$ac_delim

17169

-EGREP!$EGREP$ac_delim

17170

-GCC_TRUE!$GCC_TRUE$ac_delim

17171

-_ACEOF

17172

17173

- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then

17174

- break

17175

- elif $ac_last_try; then

17176

- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

17177

-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

17178

- { (exit 1); exit 1; }; }

17179

- else

17180

- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

17181

- fi

17182

-done

17183

17184

-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

17185

-if test -n "$ac_eof"; then

17186

- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

17187

- ac_eof=`expr $ac_eof + 1`

17188

+ac_cr=`echo X | tr X '\015'`

17189

+# On cygwin, bash can eat \r inside `` if the user requested igncr.

17190

+# But we know of no other shell where ac_cr would be empty at this

17191

+# point, so we can use a bashism as a fallback.

17192

+if test "x$ac_cr" = x; then

17193

+ eval ac_cr=\$\'\\r\'

17194

+fi

17195

+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`

17196

+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then

8232

+ac_tmp=$tmp

8233

8234

# Set up the scripts for CONFIG_FILES section.

8235

# No need to generate them if there are no CONFIG_FILES.

8236

@@ -17103,12 +17791,12 @@ if test "x$ac_cr" = x; then

8237

8238

ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`

8239

if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then

8240

- ac_cs_awk_cr='\r'

17197

8241

+ ac_cs_awk_cr='\\r'

17198

+else

17199

+ ac_cs_awk_cr=$ac_cr

8242

else

8243

ac_cs_awk_cr=$ac_cr

17200

8244

17201

8245

17202

-cat >>$CONFIG_STATUS <<_ACEOF

17203

-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof

17204

-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

17205

-_ACEOF

17206

-sed '

17207

-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

17208

-s/^/s,@/; s/!/@,|#_!!_#|/

17209

-:n

17210

-t n

17211

-s/'"$ac_delim"'$/,g/; t

17212

-s/$/\\/; p

17213

-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

17214

-' >>$CONFIG_STATUS <conf$$subs.sed

17215

-rm -f conf$$subs.sed

17216

-cat >>$CONFIG_STATUS <<_ACEOF

17217

-CEOF$ac_eof

17218

+echo 'BEGIN {' >"$tmp/subs1.awk" &&

8246

-echo 'BEGIN {' >"$tmp/subs1.awk" &&

8247

+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&

17219

8248

_ACEOF

17220

8249

17221

8250

17222

17223

+ echo "cat >conf$$subs.awk <<_ACEOF" &&

17224

+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&

17225

+ echo "_ACEOF"

17226

+} >conf$$subs.sh ||

8251

@@ -17117,18 +17805,18 @@ _ACEOF

8252

echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&

8253

echo "_ACEOF"

8254

} >conf$$subs.sh ||

8255

- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

8256

-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`

17227

8257

+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5

17228

8258

+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`

17229

8259

ac_delim='%!_!# '

17230

8260

for ac_last_try in false false false false false :; do

17231

- cat >conf$$subs.sed <<_ACEOF

17232

-GCC_FALSE!$GCC_FALSE$ac_delim

17233

-PROTOBUF_OPT_FLAG!$PROTOBUF_OPT_FLAG$ac_delim

17234

-ISAINFO!$ISAINFO$ac_delim

17235

-LIBTOOL!$LIBTOOL$ac_delim

17236

-SED!$SED$ac_delim

17237

-FGREP!$FGREP$ac_delim

17238

-LD!$LD$ac_delim

17239

-DUMPBIN!$DUMPBIN$ac_delim

17240

-ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim

17241

-NM!$NM$ac_delim

17242

-LN_S!$LN_S$ac_delim

17243

-AR!$AR$ac_delim

17244

-RANLIB!$RANLIB$ac_delim

17245

-lt_ECHO!$lt_ECHO$ac_delim

17246

-DSYMUTIL!$DSYMUTIL$ac_delim

17247

-NMEDIT!$NMEDIT$ac_delim

17248

-LIPO!$LIPO$ac_delim

17249

-OTOOL!$OTOOL$ac_delim

17250

-OTOOL64!$OTOOL64$ac_delim

17251

-LIBOBJS!$LIBOBJS$ac_delim

17252

-POW_LIB!$POW_LIB$ac_delim

17253

-HAVE_ZLIB_TRUE!$HAVE_ZLIB_TRUE$ac_delim

17254

-HAVE_ZLIB_FALSE!$HAVE_ZLIB_FALSE$ac_delim

17255

-PROTOC!$PROTOC$ac_delim

17256

-USE_EXTERNAL_PROTOC_TRUE!$USE_EXTERNAL_PROTOC_TRUE$ac_delim

17257

-USE_EXTERNAL_PROTOC_FALSE!$USE_EXTERNAL_PROTOC_FALSE$ac_delim

17258

-acx_pthread_config!$acx_pthread_config$ac_delim

17259

-PTHREAD_CC!$PTHREAD_CC$ac_delim

17260

-PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim

17261

-PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim

17262

-subdirs!$subdirs$ac_delim

17263

-LTLIBOBJS!$LTLIBOBJS$ac_delim

17264

-_ACEOF

17265

+ . ./conf$$subs.sh ||

8261

. ./conf$$subs.sh ||

8262

- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

17266

8263

+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5

17267

8264

17268

- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then

17269

+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`

17270

+ if test $ac_delim_n = $ac_delim_num; then

8265

ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`

8266

if test $ac_delim_n = $ac_delim_num; then

17271

8267

break

17272

8268

elif $ac_last_try; then

17273

- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

17274

-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

17275

- { (exit 1); exit 1; }; }

8269

- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

17276

8270

+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5

17277

8271

else

17278

8272

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

17279

8273

17280

done

17281

+rm -f conf$$subs.sh

8274

@@ -17136,7 +17824,7 @@ done

8275

rm -f conf$$subs.sh

17282

8276

17283

-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

17284

-if test -n "$ac_eof"; then

17285

- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

17286

- ac_eof=`expr $ac_eof + 1`

17287

-fi

17288

17289

-cat >>$CONFIG_STATUS <<_ACEOF

17290

-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof

17291

-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end

17292

-_ACEOF

17293

-sed '

17294

-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

17295

-s/^/s,@/; s/!/@,|#_!!_#|/

17296

-:n

17297

-t n

17298

-s/'"$ac_delim"'$/,g/; t

17299

-s/$/\\/; p

17300

-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

17301

-' >>$CONFIG_STATUS <conf$$subs.sed

17302

-rm -f conf$$subs.sed

17303

-cat >>$CONFIG_STATUS <<_ACEOF

17304

-:end

17305

-s/|#_!!_#|//g

17306

-CEOF$ac_eof

17307

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

17308

+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&

8277

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

8278

-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&

8279

+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&

17309

8280

_ACEOF

17310

+sed -n '

17311

17312

+s/^/S["/; s/!.*/"]=/

17313

17314

17315

+s/^[^!]*!//

17316

+:repl

17317

+t repl

17318

+s/'"$ac_delim"'$//

17319

+t delim

17320

+:nl

17321

17322

+s/$.\{148\}$..*/\1/

17323

+t more1

17324

+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/

17325

17326

17327

+b repl

17328

+:more1

17329

+s/["\\]/\\&/g; s/^/"/; s/$/"\\/

17330

17331

17332

+s/.\{148\}//

17333

+t nl

17334

+:delim

17335

17336

+s/$.\{148\}$..*/\1/

17337

+t more2

17338

+s/["\\]/\\&/g; s/^/"/; s/$/"/

17339

17340

17341

+:more2

17342

+s/["\\]/\\&/g; s/^/"/; s/$/"\\/

17343

17344

17345

+s/.\{148\}//

17346

+t delim

17347

+' <conf$$subs.awk | sed '

17348

+/^[^""]/{

17349

+ N

17350

+ s/\n//

17351

17352

+' >>$CONFIG_STATUS || ac_write_fail=1

17353

+rm -f conf$$subs.awk

17354

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

17355

+_ACAWK

17356

+cat >>"\$tmp/subs1.awk" <<_ACAWK &&

17357

+ for (key in S) S_is_set[key] = 1

17358

+ FS = ""

17359

17360

17361

17362

+ line = $ 0

17363

+ nfields = split(line, field, "@")

17364

+ substed = 0

17365

+ len = length(field[1])

17366

+ for (i = 2; i < nfields; i++) {

17367

+ key = field[i]

17368

+ keylen = length(key)

17369

+ if (S_is_set[key]) {

17370

+ value = S[key]

17371

+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)

17372

+ len += length(value) + length(field[++i])

17373

+ substed = 1

17374

+ } else

17375

+ len += 1 + keylen

17376

+ }

8281

sed -n '

8282

8283

@@ -17184,7 +17872,7 @@ t delim

8284

rm -f conf$$subs.awk

8285

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

8286

_ACAWK

8287

-cat >>"\$tmp/subs1.awk" <<_ACAWK &&

8288

+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&

8289

for (key in S) S_is_set[key] = 1

8290

FS = ""

17377

8291

17378

+ print line

17379

17380

17381

+_ACAWK

17382

+_ACEOF

17383

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

17384

+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then

17385

+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"

17386

+else

17387

+ cat

17388

+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \

8292

@@ -17216,21 +17904,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n

8293

sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"

8294

else

8295

cat

8296

-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \

8297

- || as_fn_error "could not setup config files machinery" "$LINENO" 5

8298

+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \

17389

8299

+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5

17390

+_ACEOF

8300

_ACEOF

17391

8301

17392

8302

-# VPATH may cause trouble with some makes, so we remove $(srcdir),

17393

8303

-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and

17418

8328

s/^[^=]*=[ ]*$//

17419

8329

17420

8330

17421

17422

-cat >>$CONFIG_STATUS <<\_ACEOF

17423

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

17424

fi # test -n "$CONFIG_FILES"

17425

17426

+# Set up the scripts for CONFIG_HEADERS section.

17427

+# No need to generate them if there are no CONFIG_HEADERS.

17428

+# This happens for instance with `./config.status Makefile'.

17429

+if test -n "$CONFIG_HEADERS"; then

17430

+cat >"$tmp/defines.awk" <<\_ACAWK ||

17431

+BEGIN {

17432

+_ACEOF

17433

17434

+# Transform confdefs.h into an awk script `defines.awk', embedded as

17435

+# here-document in config.status, that substitutes the proper values into

17436

+# config.h.in to produce config.h.

17437

17438

+# Create a delimiter string that does not exist in confdefs.h, to ease

17439

+# handling of long lines.

17440

+ac_delim='%!_!# '

17441

+for ac_last_try in false false :; do

17442

+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`

17443

+ if test -z "$ac_t"; then

17444

+ break

17445

+ elif $ac_last_try; then

8331

@@ -17242,7 +17938,7 @@ fi # test -n "$CONFIG_FILES"

8332

# No need to generate them if there are no CONFIG_HEADERS.

8333

# This happens for instance with `./config.status Makefile'.

8334

if test -n "$CONFIG_HEADERS"; then

8335

-cat >"$tmp/defines.awk" <<\_ACAWK ||

8336

+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||

8337

BEGIN {

8338

_ACEOF

8339

8340

@@ -17254,11 +17950,11 @@ _ACEOF

8341

# handling of long lines.

8342

ac_delim='%!_!# '

8343

for ac_last_try in false false :; do

8344

- ac_t=`sed -n "/$ac_delim/p" confdefs.h`

8345

- if test -z "$ac_t"; then

8346

+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`

8347

+ if test -z "$ac_tt"; then

8348

break

8349

elif $ac_last_try; then

8350

- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5

17446

8351

+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5

17447

+ else

17448

+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

17449

+ fi

17450

+done

17451

17452

+# For the awk script, D is an array of macro values keyed by name,

17453

+# likewise P contains macro parameters if any. Preserve backslash

17454

+# newline sequences.

17455

17456

-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS

17457

+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*

17458

+sed -n '

17459

+s/.\{148\}/&'"$ac_delim"'/g

17460

+t rset

17461

+:rset

17462

+s/^[ ]*#[ ]*define[ ][ ]*/ /

17463

+t def

17464

17465

+:def

17466

+s/\\$//

17467

+t bsnl

17468

+s/["\\]/\\&/g

17469

+s/^ $'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/P["\1"]="\2"\

17470

+D["\1"]=" \3"/p

17471

+s/^ $'"$ac_word_re"'$[ ]*$.*$/D["\1"]=" \2"/p

17472

17473

+:bsnl

17474

+s/["\\]/\\&/g

17475

+s/^ $'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/P["\1"]="\2"\

17476

+D["\1"]=" \3\\\\\\n"\\/p

17477

+t cont

17478

+s/^ $'"$ac_word_re"'$[ ]*$.*$/D["\1"]=" \2\\\\\\n"\\/p

17479

+t cont

17480

17481

+:cont

17482

17483

+s/.\{148\}/&'"$ac_delim"'/g

17484

+t clear

17485

+:clear

17486

+s/\\$//

17487

+t bsnlc

17488

+s/["\\]/\\&/g; s/^/"/; s/$/"/p

17489

17490

+:bsnlc

17491

+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p

17492

+b cont

17493

+' <confdefs.h | sed '

17494

+s/'"$ac_delim"'/"\\\

17495

+"/g' >>$CONFIG_STATUS || ac_write_fail=1

17496

17497

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

17498

+ for (key in D) D_is_set[key] = 1

17499

+ FS = ""

17500

17501

+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {

17502

+ line = \$ 0

17503

+ split(line, arg, " ")

17504

+ if (arg[1] == "#") {

17505

+ defundef = arg[2]

17506

+ mac1 = arg[3]

17507

+ } else {

17508

+ defundef = substr(arg[1], 2)

17509

+ mac1 = arg[2]

17510

+ }

17511

+ split(mac1, mac2, "(") #)

17512

+ macro = mac2[1]

17513

+ prefix = substr(line, 1, index(line, defundef) - 1)

17514

+ if (D_is_set[macro]) {

17515

+ # Preserve the white space surrounding the "#".

17516

+ print prefix "define", macro P[macro] D[macro]

17517

+ next

17518

+ } else {

17519

+ # Replace #undef with comments. This is necessary, for example,

17520

+ # in the case of _POSIX_SOURCE, which is predefined and required

17521

+ # on some systems where configure will not decide to define it.

17522

+ if (defundef == "undef") {

17523

+ print "/*", prefix defundef, macro, "*/"

17524

+ next

17525

+ }

17526

+ }

17527

17528

+{ print }

17529

+_ACAWK

17530

+_ACEOF

17531

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

8352

else

8353

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

8354

8355

@@ -17343,7 +18039,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ

8356

_ACAWK

8357

_ACEOF

8358

cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

8359

- as_fn_error "could not setup config headers machinery" "$LINENO" 5

17532

8360

+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5

17533

+fi # test -n "$CONFIG_HEADERS"

17534

17535

17536

+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"

17537

+shift

17538

+for ac_tag

17539

17540

case $ac_tag in

17541

:[FHLC]) ac_mode=$ac_tag; continue;;

8361

fi # test -n "$CONFIG_HEADERS"

8362

8363

8364

@@ -17356,7 +18052,7 @@ do

17542

8365

esac

17543

8366

case $ac_mode$ac_tag in

17544

8367

:[FHL]*:*);;

17545

- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5

17546

-echo "$as_me: error: Invalid tag $ac_tag." >&2;}

17547

- { (exit 1); exit 1; }; };;

17548

+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;

8368

- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;

8369

+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;

17549

8370

:[FH]-) ac_tag=-:-;;

17550

8371

:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;

17551

8372

esac

17552

@@ -18600,26 +17300,34 @@ echo "$as_me: error: Invalid tag $ac_tag

8373

@@ -17375,7 +18071,7 @@ do

8374

for ac_f

8375

8376

case $ac_f in

8377

- -) ac_f="$tmp/stdin";;

8378

+ -) ac_f="$ac_tmp/stdin";;

8379

*) # Look for the file first in the build tree, then in the source tree

8380

# (if the path is not absolute). The absolute path cannot be DOS-style,

8381

# because $ac_f cannot contain `:'.

8382

@@ -17384,7 +18080,7 @@ do

17553

8383

[\\/$]*) false;;

17554

8384

*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;

17555

8385

esac ||

17556

- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5

17557

-echo "$as_me: error: cannot find input file: $ac_f" >&2;}

17558

- { (exit 1); exit 1; }; };;

17559

+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;

8386

- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;

8387

+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;

17560

8388

esac

17561

- ac_file_inputs="$ac_file_inputs $ac_f"

17562

+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac

17563

+ as_fn_append ac_file_inputs " '$ac_f'"

17564

done

17565

17566

# Let's still pretend it is `configure' which instantiates (i.e., don't

17567

# use $as_me), people would be surprised to read:

17568

# /* config.h. Generated by config.status. */

17569

- configure_input="Generated from "`IFS=:

17570

- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."

17571

+ configure_input='Generated from '`

17572

+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'

17573

+ `' by configure.'

17574

if test x"$ac_file" != x-; then

17575

configure_input="$ac_file. $configure_input"

17576

- { echo "$as_me:$LINENO: creating $ac_file" >&5

17577

-echo "$as_me: creating $ac_file" >&6;}

17578

+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5

17579

+$as_echo "$as_me: creating $ac_file" >&6;}

17580

17581

+ # Neutralize special characters interpreted by sed in replacement strings.

17582

+ case $configure_input in #(

17583

+ *\&* | *\|* | *\\* )

17584

+ ac_sed_conf_input=`$as_echo "$configure_input" |

17585

+ sed 's/[\\\\&|]/\\\\&/g'`;; #(

17586

+ *) ac_sed_conf_input=$configure_input;;

17587

+ esac

8389

case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac

8390

as_fn_append ac_file_inputs " '$ac_f'"

8391

@@ -17410,8 +18106,8 @@ $as_echo "$as_me: creating $ac_file" >&6

8392

esac

17588

8393

17589

8394

case $ac_tag in

17590

- *:-:* | *:-) cat >"$tmp/stdin";;

17591

+ *:-:* | *:-) cat >"$tmp/stdin" \

17592

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;

8395

- *:-:* | *:-) cat >"$tmp/stdin" \

8396

- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;

8397

+ *:-:* | *:-) cat >"$ac_tmp/stdin" \

8398

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;

17593

8399

esac

17594

8400

;;

17595

8401

esac

17596

@@ -18629,42 +17337,7 @@ $as_expr X"$ac_file" : 'X$.*[^/]$//*[^

17597

X"$ac_file" : 'X$//$[^/]' \| \

17598

X"$ac_file" : 'X$//$$' \| \

17599

X"$ac_file" : 'X$/$' \| . 2>/dev/null ||

17600

-echo X"$ac_file" |

17601

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

17602

- s//\1/

17603

- q

17604

- }

17605

- /^X$\/\/$[^/].*/{

17606

- s//\1/

17607

- q

17608

- }

17609

- /^X$\/\/$$/{

17610

- s//\1/

17611

- q

17612

- }

17613

- /^X$\/$.*/{

17614

- s//\1/

17615

- q

17616

- }

17617

- s/.*/./; q'`

17618

- { as_dir="$ac_dir"

17619

- case $as_dir in #(

17620

- -*) as_dir=./$as_dir;;

17621

- esac

17622

- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

17623

- as_dirs=

17624

- while :; do

17625

- case $as_dir in #(

17626

- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

17627

- *) as_qdir=$as_dir;;

17628

- esac

17629

- as_dirs="'$as_qdir' $as_dirs"

17630

- as_dir=`$as_dirname -- "$as_dir" ||

17631

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

17632

- X"$as_dir" : 'X$//$[^/]' \| \

17633

- X"$as_dir" : 'X$//$$' \| \

17634

- X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

17635

-echo X"$as_dir" |

17636

+$as_echo X"$ac_file" |

17637

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

17638

s//\1/

17639

17640

@@ -18682,20 +17355,15 @@ echo X"$as_dir" |

17641

17642

}

17643

s/.*/./; q'`

17644

- test -d "$as_dir" && break

17645

- done

17646

- test -z "$as_dirs" || eval "mkdir $as_dirs"

17647

- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

17648

-echo "$as_me: error: cannot create directory $as_dir" >&2;}

17649

- { (exit 1); exit 1; }; }; }

17650

+ as_dir="$ac_dir"; as_fn_mkdir_p

17651

ac_builddir=.

17652

17653

case "$ac_dir" in

17654

.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

17655

17656

- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

17657

+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`

17658

# A ".." for each directory in $ac_dir_suffix.

17659

- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

17660

+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`

17661

case $ac_top_builddir_sub in

17662

"") ac_top_builddir_sub=. ac_top_build_prefix= ;;

17663

*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

17664

@@ -18740,12 +17408,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_

17665

esac

17666

_ACEOF

17667

17668

-cat >>$CONFIG_STATUS <<\_ACEOF

17669

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

17670

# If the template does not know about datarootdir, expand it.

17671

# FIXME: This hack should be removed a few years after 2.60.

17672

ac_datarootdir_hack=; ac_datarootdir_seen=

17673

17674

-case `sed -n '/datarootdir/ {

17675

+ac_sed_dataroot='

17676

+/datarootdir/ {

17677

17678

17679

}

17680

@@ -18753,36 +17421,37 @@ case `sed -n '/datarootdir/ {

17681

/@docdir@/p

17682

/@infodir@/p

17683

/@localedir@/p

17684

-/@mandir@/p

17685

-' $ac_file_inputs` in

17686

+/@mandir@/p'

17687

+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in

17688

*datarootdir*) ac_datarootdir_seen=yes;;

17689

*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)

17690

- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

17691

-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

17692

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

17693

+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

17694

_ACEOF

17695

-cat >>$CONFIG_STATUS <<_ACEOF

17696

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

17697

ac_datarootdir_hack='

17698

s&@datadir@&$datadir&g

17699

s&@docdir@&$docdir&g

17700

s&@infodir@&$infodir&g

17701

s&@localedir@&$localedir&g

17702

s&@mandir@&$mandir&g

17703

- s&\\\${datarootdir}&$datarootdir&g' ;;

17704

+ s&\\\${datarootdir}&$datarootdir&g' ;;

17705

esac

17706

_ACEOF

17707

17708

# Neutralize VPATH when `$srcdir' = `.'.

17709

# Shell code in configure.ac might set extrasub.

17710

# FIXME: do we really want to maintain this feature?

17711

-cat >>$CONFIG_STATUS <<_ACEOF

17712

- sed "$ac_vpsub

17713

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

17714

+ac_sed_extra="$ac_vpsub

17715

$extrasub

17716

_ACEOF

17717

-cat >>$CONFIG_STATUS <<\_ACEOF

17718

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

17719

17720

/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

17721

-s&@configure_input@&$configure_input&;t t

17722

+s|@configure_input@|$ac_sed_conf_input|;t t

17723

s&@top_builddir@&$ac_top_builddir_sub&;t t

17724

+s&@top_build_prefix@&$ac_top_build_prefix&;t t

17725

s&@srcdir@&$ac_srcdir&;t t

17726

s&@abs_srcdir@&$ac_abs_srcdir&;t t

17727

s&@top_srcdir@&$ac_top_srcdir&;t t

17728

@@ -18793,121 +17462,50 @@ s&@abs_top_builddir@&$ac_abs_top_builddi

17729

s&@INSTALL@&$ac_INSTALL&;t t

8402

@@ -17547,23 +18243,24 @@ s&@INSTALL@&$ac_INSTALL&;t t

17730

8403

s&@MKDIR_P@&$ac_MKDIR_P&;t t

17731

8404

$ac_datarootdir_hack

17732

-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out

17733

17734

+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \

17735

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

8405

8406

-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \

8407

- || as_fn_error "could not create $ac_file" "$LINENO" 5

8408

+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \

8409

+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5

17736

8410

17737

8411

test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&

17738

{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

17739

{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

17740

- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'

8412

- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

8413

- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

8414

+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&

8415

+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \

8416

+ "$ac_tmp/out"`; test -z "$ac_out"; } &&

8417

{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'

17741

8418

-which seems to be undefined. Please make sure it is defined." >&5

17742

-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

8419

+which seems to be undefined. Please make sure it is defined" >&5

8420

$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

17743

8421

-which seems to be undefined. Please make sure it is defined." >&2;}

17744

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'

17745

+which seems to be undefined. Please make sure it is defined" >&5

17746

+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

17747

8422

+which seems to be undefined. Please make sure it is defined" >&2;}

17748

8423

17749

rm -f "$tmp/stdin"

8424

- rm -f "$tmp/stdin"

8425

+ rm -f "$ac_tmp/stdin"

17750

8426

case $ac_file in

17751

- -) cat "$tmp/out"; rm -f "$tmp/out";;

17752

- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;

17753

- esac

17754

+ -) cat "$tmp/out" && rm -f "$tmp/out";;

17755

+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;

17756

+ esac \

8427

- -) cat "$tmp/out" && rm -f "$tmp/out";;

8428

- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;

8429

+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;

8430

+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;

8431

esac \

8432

- || as_fn_error "could not create $ac_file" "$LINENO" 5

17757

8433

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

17758

8434

;;

17759

8435

:H)

17760

8436

17761

# CONFIG_HEADER

17762

17763

-_ACEOF

17764

17765

-# Transform confdefs.h into a sed script `conftest.defines', that

17766

-# substitutes the proper values into config.h.in to produce config.h.

17767

-rm -f conftest.defines conftest.tail

17768

-# First, append a space to every undef/define line, to ease matching.

17769

-echo 's/$/ /' >conftest.defines

17770

-# Then, protect against being on the right side of a sed subst, or in

17771

-# an unquoted here document, in config.status. If some macros were

17772

-# called several times there might be several #defines for the same

17773

-# symbol, which is useless. But do not sort them, since the last

17774

-# AC_DEFINE must be honored.

17775

-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*

17776

-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where

17777

-# NAME is the cpp macro being defined, VALUE is the value it is being given.

17778

-# PARAMS is the parameter list in the macro definition--in most cases, it's

17779

-# just an empty string.

17780

-ac_dA='s,^\$[ #]*\$[^ ]*\\([ ]*'

17781

-ac_dB='\\)[ (].*,\\1define\\2'

17782

-ac_dC=' '

17783

-ac_dD=' ,'

17784

17785

-uniq confdefs.h |

17786

- sed -n '

17787

- t rset

17788

- :rset

17789

- s/^[ ]*#[ ]*define[ ][ ]*//

17790

- t ok

17791

- d

17792

- :ok

17793

- s/[\\&,]/\\&/g

17794

- s/^$'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p

17795

- s/^$'"$ac_word_re"'$[ ]*$.*$/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p

17796

- ' >>conftest.defines

17797

17798

-# Remove the space that was appended to ease matching.

17799

-# Then replace #undef with comments. This is necessary, for

17800

-# example, in the case of _POSIX_SOURCE, which is predefined and required

17801

-# on some systems where configure will not decide to define it.

17802

-# (The regexp can be short, since the line contains either #define or #undef.)

17803

-echo 's/ $//

17804

-s,^[ #]*u.*,/* & */,' >>conftest.defines

17805

17806

-# Break up conftest.defines:

17807

-ac_max_sed_lines=50

17808

17809

-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"

17810

-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"

17811

-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"

17812

-# et cetera.

17813

-ac_in='$ac_file_inputs'

17814

-ac_out='"$tmp/out1"'

17815

-ac_nxt='"$tmp/out2"'

17816

17817

-while :

17818

-do

17819

- # Write a here document:

17820

- cat >>$CONFIG_STATUS <<_ACEOF

17821

- # First, check the format of the line:

17822

- cat >"\$tmp/defines.sed" <<\\CEOF

17823

-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def

17824

-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def

17825

-b

17826

-:def

17827

-_ACEOF

17828

- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS

17829

- echo 'CEOF

17830

- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS

17831

- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in

17832

- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail

17833

- grep . conftest.tail >/dev/null || break

17834

- rm -f conftest.defines

17835

- mv conftest.tail conftest.defines

17836

-done

17837

-rm -f conftest.defines conftest.tail

17838

17839

-echo "ac_result=$ac_in" >>$CONFIG_STATUS

17840

-cat >>$CONFIG_STATUS <<\_ACEOF

8437

@@ -17572,21 +18269,21 @@ which seems to be undefined. Please mak

17841

8438

if test x"$ac_file" != x-; then

17842

- echo "/* $configure_input */" >"$tmp/config.h"

17843

- cat "$ac_result" >>"$tmp/config.h"

17844

- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then

17845

- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5

17846

-echo "$as_me: $ac_file is unchanged" >&6;}

17847

+ {

17848

+ $as_echo "/* $configure_input */" \

17849

+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"

17850

+ } >"$tmp/config.h" \

8439

{

8440

$as_echo "/* $configure_input */" \

8441

- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"

8442

- } >"$tmp/config.h" \

8443

- || as_fn_error "could not create $ac_file" "$LINENO" 5

8444

- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then

8445

+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"

8446

+ } >"$ac_tmp/config.h" \

17851

8447

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

17852

+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then

17853

+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5

17854

+$as_echo "$as_me: $ac_file is unchanged" >&6;}

8448

+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then

8449

{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5

8450

$as_echo "$as_me: $ac_file is unchanged" >&6;}

17855

8451

else

17856

- rm -f $ac_file

17857

- mv "$tmp/config.h" $ac_file

17858

+ rm -f "$ac_file"

17859

+ mv "$tmp/config.h" "$ac_file" \

8452

rm -f "$ac_file"

8453

- mv "$tmp/config.h" "$ac_file" \

8454

- || as_fn_error "could not create $ac_file" "$LINENO" 5

8455

+ mv "$ac_tmp/config.h" "$ac_file" \

17860

8456

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

17861

8457

17862

8458

else

17863

- echo "/* $configure_input */"

17864

- cat "$ac_result"

17865

+ $as_echo "/* $configure_input */" \

17866

+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \

8459

$as_echo "/* $configure_input */" \

8460

- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \

8461

- || as_fn_error "could not create -" "$LINENO" 5

8462

+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \

17867

8463

+ || as_fn_error $? "could not create -" "$LINENO" 5

17868

8464

17869

- rm -f "$tmp/out12"

17870

-# Compute $ac_file's index in $config_headers.

17871

-_am_arg=$ac_file

17872

+# Compute "$ac_file"'s index in $config_headers.

17873

+_am_arg="$ac_file"

17874

_am_stamp_count=1

17875

for _am_header in $config_headers :; do

17876

case $_am_header in

17877

@@ -18922,7 +17520,7 @@ $as_expr X"$_am_arg" : 'X$.*[^/]$//*[^

17878

X"$_am_arg" : 'X$//$[^/]' \| \

17879

X"$_am_arg" : 'X$//$$' \| \

17880

X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||

17881

-echo X"$_am_arg" |

17882

+$as_echo X"$_am_arg" |

17883

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

17884

s//\1/

17885

17886

@@ -18942,30 +17540,40 @@ echo X"$_am_arg" |

17887

s/.*/./; q'`/stamp-h$_am_stamp_count

17888

;;

17889

17890

- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5

17891

-echo "$as_me: executing $ac_file commands" >&6;}

17892

+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5

17893

+$as_echo "$as_me: executing $ac_file commands" >&6;}

17894

;;

17895

esac

17896

17897

17898

case $ac_file$ac_mode in

17899

- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do

17900

- # Strip MF so we end up with the name of the file.

17901

- mf=`echo "$mf" | sed -e 's/:.*$//'`

17902

- # Check whether this is an Automake generated Makefile or not.

17903

- # We used to match only the files named `Makefile.in', but

17904

- # some people rename them; so instead we look at the file content.

17905

- # Grep'ing the first line is not enough: some people post-process

17906

- # each Makefile.in and add a new line on top of each file to say so.

17907

- # Grep'ing the whole file is not good either: AIX grep has a line

17908

- # limit of 2048, but all sed's we know have understand at least 4000.

17909

- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

17910

- dirpart=`$as_dirname -- "$mf" ||

17911

+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {

17912

+ # Autoconf 2.62 quotes --file arguments for eval, but not when files

17913

+ # are listed without --file. Let's play safe and only enable the eval

17914

+ # if we detect the quoting.

17915

+ case $CONFIG_FILES in

17916

+ *\'*) eval set x "$CONFIG_FILES" ;;

17917

+ *) set x $CONFIG_FILES ;;

17918

+ esac

17919

+ shift

17920

+ for mf

17921

+ do

17922

+ # Strip MF so we end up with the name of the file.

17923

+ mf=`echo "$mf" | sed -e 's/:.*$//'`

17924

+ # Check whether this is an Automake generated Makefile or not.

17925

+ # We used to match only the files named `Makefile.in', but

17926

+ # some people rename them; so instead we look at the file content.

17927

+ # Grep'ing the first line is not enough: some people post-process

17928

+ # each Makefile.in and add a new line on top of each file to say so.

17929

+ # Grep'ing the whole file is not good either: AIX grep has a line

17930

+ # limit of 2048, but all sed's we know have understand at least 4000.

17931

+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

17932

+ dirpart=`$as_dirname -- "$mf" ||

17933

$as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

17934

X"$mf" : 'X$//$[^/]' \| \

17935

X"$mf" : 'X$//$$' \| \

17936

X"$mf" : 'X$/$' \| . 2>/dev/null ||

17937

-echo X"$mf" |

17938

+$as_echo X"$mf" |

17939

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

17940

s//\1/

17941

17942

@@ -18983,68 +17591,33 @@ echo X"$mf" |

17943

17944

}

17945

s/.*/./; q'`

17946

- else

17947

- continue

17948

- fi

17949

- # Extract the definition of DEPDIR, am__include, and am__quote

17950

- # from the Makefile without running `make'.

17951

- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

17952

- test -z "$DEPDIR" && continue

17953

- am__include=`sed -n 's/^am__include = //p' < "$mf"`

17954

- test -z "am__include" && continue

17955

- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

17956

- # When using ansi2knr, U may be empty or an underscore; expand it

17957

- U=`sed -n 's/^U = //p' < "$mf"`

17958

- # Find all dependency output files, they are included files with

17959

- # $(DEPDIR) in their names. We invoke sed twice because it is the

17960

- # simplest approach to changing $(DEPDIR) to its actual value in the

17961

- # expansion.

17962

- for file in `sed -n "

17963

- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

17964

- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

17965

- # Make sure the directory exists.

17966

- test -f "$dirpart/$file" && continue

17967

- fdir=`$as_dirname -- "$file" ||

17968

+ else

17969

+ continue

17970

+ fi

17971

+ # Extract the definition of DEPDIR, am__include, and am__quote

17972

+ # from the Makefile without running `make'.

17973

+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

17974

+ test -z "$DEPDIR" && continue

17975

+ am__include=`sed -n 's/^am__include = //p' < "$mf"`

17976

+ test -z "am__include" && continue

17977

+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

17978

+ # When using ansi2knr, U may be empty or an underscore; expand it

17979

+ U=`sed -n 's/^U = //p' < "$mf"`

17980

+ # Find all dependency output files, they are included files with

17981

+ # $(DEPDIR) in their names. We invoke sed twice because it is the

17982

+ # simplest approach to changing $(DEPDIR) to its actual value in the

17983

+ # expansion.

17984

+ for file in `sed -n "

17985

+ s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

17986

+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

17987

+ # Make sure the directory exists.

17988

+ test -f "$dirpart/$file" && continue

17989

+ fdir=`$as_dirname -- "$file" ||

17990

$as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

17991

X"$file" : 'X$//$[^/]' \| \

17992

X"$file" : 'X$//$$' \| \

17993

X"$file" : 'X$/$' \| . 2>/dev/null ||

17994

-echo X"$file" |

17995

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

17996

- s//\1/

17997

- q

17998

- }

17999

- /^X$\/\/$[^/].*/{

18000

- s//\1/

18001

- q

18002

- }

18003

- /^X$\/\/$$/{

18004

- s//\1/

18005

- q

18006

- }

18007

- /^X$\/$.*/{

18008

- s//\1/

18009

- q

18010

- }

18011

- s/.*/./; q'`

18012

- { as_dir=$dirpart/$fdir

18013

- case $as_dir in #(

18014

- -*) as_dir=./$as_dir;;

18015

- esac

18016

- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

18017

- as_dirs=

18018

- while :; do

18019

- case $as_dir in #(

18020

- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

18021

- *) as_qdir=$as_dir;;

18022

- esac

18023

- as_dirs="'$as_qdir' $as_dirs"

18024

- as_dir=`$as_dirname -- "$as_dir" ||

18025

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

18026

- X"$as_dir" : 'X$//$[^/]' \| \

18027

- X"$as_dir" : 'X$//$$' \| \

18028

- X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

18029

-echo X"$as_dir" |

18030

+$as_echo X"$file" |

18031

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

18032

s//\1/

18033

18034

@@ -19062,16 +17635,12 @@ echo X"$as_dir" |

18035

18036

}

18037

s/.*/./; q'`

18038

- test -d "$as_dir" && break

18039

+ as_dir=$dirpart/$fdir; as_fn_mkdir_p

18040

+ # echo "creating $dirpart/$file"

18041

+ echo '# dummy' > "$dirpart/$file"

18042

done

18043

- test -z "$as_dirs" || eval "mkdir $as_dirs"

18044

- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

18045

-echo "$as_me: error: cannot create directory $as_dir" >&2;}

18046

- { (exit 1); exit 1; }; }; }

18047

- # echo "creating $dirpart/$file"

18048

- echo '# dummy' > "$dirpart/$file"

18049

done

18050

-done

18051

18052

;;

18053

"libtool":C)

18054

18055

@@ -19195,6 +17764,9 @@ NL2SP=$lt_lt_NL2SP

18056

reload_flag=$lt_reload_flag

18057

reload_cmds=$lt_reload_cmds

18058

18059

+# An object symbol dumper.

18060

+OBJDUMP=$lt_OBJDUMP

18061

8465

# Compute "$ac_file"'s index in $config_headers.

8466

_am_arg="$ac_file"

8467

@@ -17747,7 +18444,8 @@ $as_echo X"$file" |

8468

# NOTE: Changes made to this file will be lost: look at ltmain.sh.

8469

8470

8471

-# 2006, 2007, 2008 Free Software Foundation, Inc.

8472

+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,

8473

+# Inc.

8474

# Written by Gordon Matzigkeit, 1996

8475

8476

# This file is part of GNU Libtool.

8477

@@ -17795,6 +18493,12 @@ pic_mode=$pic_mode

8478

# Whether or not to optimize for fast installation.

8479

fast_install=$enable_fast_install

8480

8481

+# Shell to use when invoking shell scripts.

8482

+SHELL=$lt_SHELL

8483

8484

+# An echo program that protects backslashes.

8485

+ECHO=$lt_ECHO

8486

8487

# The host system.

8488

host_alias=$host_alias

8489

host=$host

8490

@@ -17844,9 +18548,11 @@ SP2NL=$lt_lt_SP2NL

8491

# turn newlines into spaces.

8492

NL2SP=$lt_lt_NL2SP

8493

8494

-# How to create reloadable object files.

8495

-reload_flag=$lt_reload_flag

8496

-reload_cmds=$lt_reload_cmds

8497

+# convert \$build file names to \$host format.

8498

+to_host_file_cmd=$lt_cv_to_host_file_cmd

8499

8500

+# convert \$build files to toolchain format.

8501

+to_tool_file_cmd=$lt_cv_to_tool_file_cmd

8502

8503

# An object symbol dumper.

8504

OBJDUMP=$lt_OBJDUMP

8505

@@ -17854,13 +18560,30 @@ OBJDUMP=$lt_OBJDUMP

18062

8506

# Method to check whether dependent libraries are shared objects.

18063

8507

deplibs_check_method=$lt_deplibs_check_method

18064

8508

18065

@@ -19877,11 +18449,13 @@ _LT_EOF

18066

done # for ac_tag

18067

18068

18069

-{ (exit 0); exit 0; }

18070

+as_fn_exit 0

18071

_ACEOF

18072

-chmod +x $CONFIG_STATUS

8509

-# Command to use when deplibs_check_method == "file_magic".

8510

+# Command to use when deplibs_check_method = "file_magic".

8511

file_magic_cmd=$lt_file_magic_cmd

8512

8513

+# How to find potential files when deplibs_check_method = "file_magic".

8514

+file_magic_glob=$lt_file_magic_glob

8515

8516

+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".

8517

+want_nocaseglob=$lt_want_nocaseglob

8518

8519

+# DLL creation program.

8520

+DLLTOOL=$lt_DLLTOOL

8521

8522

+# Command to associate shared and link libraries.

8523

+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd

8524

8525

# The archiver.

8526

AR=$lt_AR

8527

8528

+# Flags to create an archive.

8529

AR_FLAGS=$lt_AR_FLAGS

8530

8531

+# How to feed a file listing to the archiver.

8532

+archiver_list_spec=$lt_archiver_list_spec

8533

8534

# A symbol stripping program.

8535

STRIP=$lt_STRIP

8536

8537

@@ -17869,6 +18592,9 @@ RANLIB=$lt_RANLIB

8538

old_postinstall_cmds=$lt_old_postinstall_cmds

8539

old_postuninstall_cmds=$lt_old_postuninstall_cmds

8540

8541

+# Whether to use a lock for old archive extraction.

8542

+lock_old_archive_extraction=$lock_old_archive_extraction

8543

8544

# A C compiler.

8545

LTCC=$lt_CC

8546

8547

@@ -17887,14 +18613,14 @@ global_symbol_to_c_name_address=$lt_lt_c

8548

# Transform the output of nm in a C name address pair when lib prefix is needed.

8549

global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix

8550

8551

-# The name of the directory that contains temporary libtool files.

8552

-objdir=$objdir

8553

+# Specify filename containing input files for \$NM.

8554

+nm_file_list_spec=$lt_nm_file_list_spec

8555

8556

-# Shell to use when invoking shell scripts.

8557

-SHELL=$lt_SHELL

8558

+# The root where to search for dependent libraries,and in which our libraries should be installed.

8559

+lt_sysroot=$lt_sysroot

8560

8561

-# An echo program that does not interpret backslashes.

8562

-ECHO=$lt_ECHO

8563

+# The name of the directory that contains temporary libtool files.

8564

+objdir=$objdir

8565

8566

# Used to examine libraries when file_magic_cmd begins with "file".

8567

MAGIC_CMD=$MAGIC_CMD

8568

@@ -17902,6 +18628,9 @@ MAGIC_CMD=$MAGIC_CMD

8569

# Must we lock files when doing compilation?

8570

need_locks=$lt_need_locks

8571

8572

+# Manifest tool.

8573

+MANIFEST_TOOL=$lt_MANIFEST_TOOL

8574

8575

# Tool to manipulate archived DWARF debug symbol files on Mac OS X.

8576

DSYMUTIL=$lt_DSYMUTIL

8577

8578

@@ -17958,6 +18687,9 @@ library_names_spec=$lt_library_names_spe

8579

# The coded name of the library, if different from the real name.

8580

soname_spec=$lt_soname_spec

8581

8582

+# Permission mode override for installation of shared libraries.

8583

+install_override_mode=$lt_install_override_mode

8584

8585

# Command to use after installation of a shared archive.

8586

postinstall_cmds=$lt_postinstall_cmds

8587

8588

@@ -17997,6 +18729,10 @@ striplib=$lt_striplib

8589

# The linker used to build libraries.

8590

LD=$lt_LD

8591

8592

+# How to create reloadable object files.

8593

+reload_flag=$lt_reload_flag

8594

+reload_cmds=$lt_reload_cmds

8595

8596

# Commands used to build an old-style archive.

8597

old_archive_cmds=$lt_old_archive_cmds

8598

8599

@@ -18009,12 +18745,12 @@ with_gcc=$GCC

8600

# Compiler flag to turn off builtin functions.

8601

no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag

8602

8603

-# How to pass a linker flag through the compiler.

8604

-wl=$lt_lt_prog_compiler_wl

8605

8606

# Additional compiler flags for building library objects.

8607

pic_flag=$lt_lt_prog_compiler_pic

8608

8609

+# How to pass a linker flag through the compiler.

8610

+wl=$lt_lt_prog_compiler_wl

8611

8612

# Compiler flag to prevent dynamic linking.

8613

link_static_flag=$lt_lt_prog_compiler_static

8614

8615

@@ -18101,9 +18837,6 @@ inherit_rpath=$inherit_rpath

8616

# Whether libtool must link a program against all its dependency libraries.

8617

link_all_deplibs=$link_all_deplibs

8618

8619

-# Fix the shell variable \$srcfile for the compiler.

8620

-fix_srcfile_path=$lt_fix_srcfile_path

8621

8622

# Set to "yes" if exported symbols are required.

8623

always_export_symbols=$always_export_symbols

8624

8625

@@ -18119,6 +18852,9 @@ include_expsyms=$lt_include_expsyms

8626

# Commands necessary for linking programs (against libraries) with templates.

8627

prelink_cmds=$lt_prelink_cmds

8628

8629

+# Commands necessary for finishing linking programs.

8630

+postlink_cmds=$lt_postlink_cmds

8631

8632

# Specify filename containing input files.

8633

file_list_spec=$lt_file_list_spec

8634

8635

@@ -18165,212 +18901,169 @@ ltmain="$ac_aux_dir/ltmain.sh"

8636

# if finds mixed CR/LF and LF-only lines. Since sed operates in

8637

# text mode, it properly converts lines to CR/LF. This bash problem

8638

# is reportedly fixed, but why not run on old versions too?

8639

- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \

8640

- || (rm -f "$cfgfile"; exit 1)

8641

8642

- case $xsi_shell in

8643

- yes)

8644

- cat << \_LT_EOF >> "$cfgfile"

8645

8646

-# func_dirname file append nondir_replacement

8647

-# Compute the dirname of FILE. If nonempty, add APPEND to the result,

8648

-# otherwise set result to NONDIR_REPLACEMENT.

8649

-func_dirname ()

8650

8651

- case ${1} in

8652

- */*) func_dirname_result="${1%/*}${2}" ;;

8653

- * ) func_dirname_result="${3}" ;;

8654

- esac

8655

8656

8657

-# func_basename file

8658

-func_basename ()

8659

8660

- func_basename_result="${1##*/}"

8661

8662

8663

-# func_dirname_and_basename file append nondir_replacement

8664

-# perform func_basename and func_dirname in a single function

8665

-# call:

8666

-# dirname: Compute the dirname of FILE. If nonempty,

8667

-# add APPEND to the result, otherwise set result

8668

-# to NONDIR_REPLACEMENT.

8669

-# value returned in "$func_dirname_result"

8670

-# basename: Compute filename of FILE.

8671

-# value retuned in "$func_basename_result"

8672

-# Implementation must be kept synchronized with func_dirname

8673

-# and func_basename. For efficiency, we do not delegate to

8674

-# those functions but instead duplicate the functionality here.

8675

-func_dirname_and_basename ()

8676

8677

- case ${1} in

8678

- */*) func_dirname_result="${1%/*}${2}" ;;

8679

- * ) func_dirname_result="${3}" ;;

8680

- esac

8681

- func_basename_result="${1##*/}"

8682

8683

8684

-# func_stripname prefix suffix name

8685

-# strip PREFIX and SUFFIX off of NAME.

8686

-# PREFIX and SUFFIX must not contain globbing or regex special

8687

-# characters, hashes, percent signs, but SUFFIX may contain a leading

8688

-# dot (in which case that matches only a dot).

8689

-func_stripname ()

8690

8691

- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are

8692

- # positional parameters, so assign one to ordinary parameter first.

8693

- func_stripname_result=${3}

8694

- func_stripname_result=${func_stripname_result#"${1}"}

8695

- func_stripname_result=${func_stripname_result%"${2}"}

8696

8697

8698

-# func_opt_split

8699

-func_opt_split ()

8700

8701

- func_opt_split_opt=${1%%=*}

8702

- func_opt_split_arg=${1#*=}

8703

8704

8705

-# func_lo2o object

8706

-func_lo2o ()

8707

8708

- case ${1} in

8709

- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;

8710

- *) func_lo2o_result=${1} ;;

8711

- esac

8712

8713

8714

-# func_xform libobj-or-source

8715

-func_xform ()

8716

8717

- func_xform_result=${1%.*}.lo

8718

8719

8720

-# func_arith arithmetic-term...

8721

-func_arith ()

8722

8723

- func_arith_result=$(( $* ))

8724

8725

8726

-# func_len string

8727

-# STRING may not start with a hyphen.

8728

-func_len ()

8729

8730

- func_len_result=${#1}

8731

8732

8733

-_LT_EOF

8734

- ;;

8735

- *) # Bourne compatible functions.

8736

- cat << \_LT_EOF >> "$cfgfile"

8737

8738

-# func_dirname file append nondir_replacement

8739

-# Compute the dirname of FILE. If nonempty, add APPEND to the result,

8740

-# otherwise set result to NONDIR_REPLACEMENT.

8741

-func_dirname ()

8742

8743

- # Extract subdirectory from the argument.

8744

- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`

8745

- if test "X$func_dirname_result" = "X${1}"; then

8746

- func_dirname_result="${3}"

8747

- else

8748

- func_dirname_result="$func_dirname_result${2}"

8749

- fi

8750

8751

8752

-# func_basename file

8753

-func_basename ()

8754

8755

- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`

8756

8757

8758

8759

-# func_stripname prefix suffix name

8760

-# strip PREFIX and SUFFIX off of NAME.

8761

-# PREFIX and SUFFIX must not contain globbing or regex special

8762

-# characters, hashes, percent signs, but SUFFIX may contain a leading

8763

-# dot (in which case that matches only a dot).

8764

-# func_strip_suffix prefix name

8765

-func_stripname ()

8766

8767

- case ${2} in

8768

- .*) func_stripname_result=`$ECHO "X${3}" \

8769

- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;

8770

- *) func_stripname_result=`$ECHO "X${3}" \

8771

- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;

8772

- esac

8773

8774

8775

-# sed scripts:

8776

-my_sed_long_opt='1s/^$-[^=]*$=.*/\1/;q'

8777

-my_sed_long_arg='1s/^-[^=]*=//'

8778

8779

-# func_opt_split

8780

-func_opt_split ()

8781

8782

- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`

8783

- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`

8784

8785

8786

-# func_lo2o object

8787

-func_lo2o ()

8788

8789

- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`

8790

8791

8792

-# func_xform libobj-or-source

8793

-func_xform ()

8794

8795

- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`

8796

8797

8798

-# func_arith arithmetic-term...

8799

-func_arith ()

8800

8801

- func_arith_result=`expr "$@"`

8802

8803

8804

-# func_len string

8805

-# STRING may not start with a hyphen.

8806

-func_len ()

8807

8808

- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`

8809

8810

8811

-_LT_EOF

8812

-esac

8813

8814

-case $lt_shell_append in

8815

- yes)

8816

- cat << \_LT_EOF >> "$cfgfile"

8817

8818

-# func_append var value

8819

-# Append VALUE to the end of shell variable VAR.

8820

-func_append ()

8821

8822

- eval "$1+=\$2"

8823

8824

-_LT_EOF

8825

- ;;

8826

- *)

8827

- cat << \_LT_EOF >> "$cfgfile"

8828

8829

-# func_append var value

8830

-# Append VALUE to the end of shell variable VAR.

8831

-func_append ()

8832

8833

- eval "$1=\$$1\$2"

8834

8835

8836

-_LT_EOF

8837

- ;;

8838

- esac

8839

+ sed '$q' "$ltmain" >> "$cfgfile" \

8840

+ || (rm -f "$cfgfile"; exit 1)

8841

8842

+ if test x"$xsi_shell" = xyes; then

8843

+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\

8844

+func_dirname ()\

8845

+{\

8846

+\ case ${1} in\

8847

+\ */*) func_dirname_result="${1%/*}${2}" ;;\

8848

+\ * ) func_dirname_result="${3}" ;;\

8849

+\ esac\

8850

+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \

8851

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8852

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8853

+test 0 -eq $? || _lt_function_replace_fail=:

8854

8855

8856

+ sed -e '/^func_basename ()$/,/^} # func_basename /c\

8857

+func_basename ()\

8858

+{\

8859

+\ func_basename_result="${1##*/}"\

8860

+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \

8861

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8862

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8863

+test 0 -eq $? || _lt_function_replace_fail=:

8864

8865

8866

+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\

8867

+func_dirname_and_basename ()\

8868

+{\

8869

+\ case ${1} in\

8870

+\ */*) func_dirname_result="${1%/*}${2}" ;;\

8871

+\ * ) func_dirname_result="${3}" ;;\

8872

+\ esac\

8873

+\ func_basename_result="${1##*/}"\

8874

+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \

8875

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8876

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8877

+test 0 -eq $? || _lt_function_replace_fail=:

8878

8879

8880

+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\

8881

+func_stripname ()\

8882

+{\

8883

+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\

8884

+\ # positional parameters, so assign one to ordinary parameter first.\

8885

+\ func_stripname_result=${3}\

8886

+\ func_stripname_result=${func_stripname_result#"${1}"}\

8887

+\ func_stripname_result=${func_stripname_result%"${2}"}\

8888

+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \

8889

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8890

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8891

+test 0 -eq $? || _lt_function_replace_fail=:

8892

8893

8894

+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\

8895

+func_split_long_opt ()\

8896

+{\

8897

+\ func_split_long_opt_name=${1%%=*}\

8898

+\ func_split_long_opt_arg=${1#*=}\

8899

+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \

8900

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8901

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8902

+test 0 -eq $? || _lt_function_replace_fail=:

8903

8904

8905

+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\

8906

+func_split_short_opt ()\

8907

+{\

8908

+\ func_split_short_opt_arg=${1#??}\

8909

+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\

8910

+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \

8911

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8912

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8913

+test 0 -eq $? || _lt_function_replace_fail=:

8914

8915

8916

+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\

8917

+func_lo2o ()\

8918

+{\

8919

+\ case ${1} in\

8920

+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\

8921

+\ *) func_lo2o_result=${1} ;;\

8922

+\ esac\

8923

+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \

8924

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8925

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8926

+test 0 -eq $? || _lt_function_replace_fail=:

8927

8928

8929

+ sed -e '/^func_xform ()$/,/^} # func_xform /c\

8930

+func_xform ()\

8931

+{\

8932

+ func_xform_result=${1%.*}.lo\

8933

+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \

8934

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8935

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8936

+test 0 -eq $? || _lt_function_replace_fail=:

8937

8938

8939

+ sed -e '/^func_arith ()$/,/^} # func_arith /c\

8940

+func_arith ()\

8941

+{\

8942

+ func_arith_result=$(( $* ))\

8943

+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \

8944

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8945

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8946

+test 0 -eq $? || _lt_function_replace_fail=:

8947

8948

8949

+ sed -e '/^func_len ()$/,/^} # func_len /c\

8950

+func_len ()\

8951

+{\

8952

+ func_len_result=${#1}\

8953

+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \

8954

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8955

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8956

+test 0 -eq $? || _lt_function_replace_fail=:

8957

8958

+fi

8959

8960

+if test x"$lt_shell_append" = xyes; then

8961

+ sed -e '/^func_append ()$/,/^} # func_append /c\

8962

+func_append ()\

8963

+{\

8964

+ eval "${1}+=\\${2}"\

8965

+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \

8966

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8967

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8968

+test 0 -eq $? || _lt_function_replace_fail=:

8969

8970

8971

+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\

8972

+func_append_quoted ()\

8973

+{\

8974

+\ func_quote_for_eval "${2}"\

8975

+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\

8976

+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \

8977

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8978

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8979

+test 0 -eq $? || _lt_function_replace_fail=:

8980

8981

8982

+ # Save a `func_append' function call where possible by direct use of '+='

8983

+ sed -e 's%func_append $[a-zA-Z_]\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \

8984

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8985

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8986

+ test 0 -eq $? || _lt_function_replace_fail=:

8987

+else

8988

+ # Save a `func_append' function call even when '+=' is not available

8989

+ sed -e 's%func_append $[a-zA-Z_]\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \

8990

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

8991

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

8992

+ test 0 -eq $? || _lt_function_replace_fail=:

8993

+fi

8994

8995

+if test x"$_lt_function_replace_fail" = x":"; then

8996

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5

8997

+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}

8998

+fi

8999

9000

- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \

9001

- || (rm -f "$cfgfile"; exit 1)

9002

9003

- mv -f "$cfgfile" "$ofile" ||

9004

+ mv -f "$cfgfile" "$ofile" ||

9005

(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")

9006

chmod +x "$ofile"

9007

9008

@@ -18382,6 +19075,10 @@ _LT_EOF

9009

# The linker used to build libraries.

9010

LD=$lt_LD_CXX

9011

9012

+# How to create reloadable object files.

9013

+reload_flag=$lt_reload_flag_CXX

9014

+reload_cmds=$lt_reload_cmds_CXX

9015

9016

# Commands used to build an old-style archive.

9017

old_archive_cmds=$lt_old_archive_cmds_CXX

9018

9019

@@ -18394,12 +19091,12 @@ with_gcc=$GCC_CXX

9020

# Compiler flag to turn off builtin functions.

9021

no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX

9022

9023

-# How to pass a linker flag through the compiler.

9024

-wl=$lt_lt_prog_compiler_wl_CXX

9025

9026

# Additional compiler flags for building library objects.

9027

pic_flag=$lt_lt_prog_compiler_pic_CXX

9028

9029

+# How to pass a linker flag through the compiler.

9030

+wl=$lt_lt_prog_compiler_wl_CXX

9031

9032

# Compiler flag to prevent dynamic linking.

9033

link_static_flag=$lt_lt_prog_compiler_static_CXX

9034

9035

@@ -18486,9 +19183,6 @@ inherit_rpath=$inherit_rpath_CXX

9036

# Whether libtool must link a program against all its dependency libraries.

9037

link_all_deplibs=$link_all_deplibs_CXX

9038

9039

-# Fix the shell variable \$srcfile for the compiler.

9040

-fix_srcfile_path=$lt_fix_srcfile_path_CXX

9041

9042

# Set to "yes" if exported symbols are required.

9043

always_export_symbols=$always_export_symbols_CXX

9044

9045

@@ -18504,6 +19198,9 @@ include_expsyms=$lt_include_expsyms_CXX

9046

# Commands necessary for linking programs (against libraries) with templates.

9047

prelink_cmds=$lt_prelink_cmds_CXX

9048

9049

+# Commands necessary for finishing linking programs.

9050

+postlink_cmds=$lt_postlink_cmds_CXX

9051

9052

# Specify filename containing input files.

9053

file_list_spec=$lt_file_list_spec_CXX

9054

9055

@@ -18538,7 +19235,7 @@ _ACEOF

18073

9056

ac_clean_files=$ac_clean_files_save

18074

9057

18075

+test $ac_write_fail = 0 ||

9058

test $ac_write_fail = 0 ||

9059

- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5

18076

9060

+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5

18077

9061

18078

9062

18079

9063

# configure is writing to config.log, and then calls config.status.

18080

# config.status does its own redirection, appending to config.log.

18081

@@ -19901,7 +18475,7 @@ if test "$no_create" != yes; then

9064

@@ -18559,7 +19256,7 @@ if test "$no_create" != yes; then

18082

9065

exec 5>>config.log

18083

9066

# Use ||, not &&, to avoid exiting from the if with $? = 1, which

18084

9067

# would make configure fail if this is the last instruction.

18085

- $ac_cs_success || { (exit 1); exit 1; }

9068

- $ac_cs_success || as_fn_exit $?

18086

9069

+ $ac_cs_success || as_fn_exit 1

18087

9070

18088

9071

18089

9072

18090

@@ -19909,7 +18483,8 @@ fi

18091

18092

if test "$no_recursion" != yes; then

18093

18094

- # Remove --cache-file and --srcdir arguments so they do not pile up.

18095

+ # Remove --cache-file, --srcdir, and --disable-option-checking arguments

18096

+ # so they do not pile up.

18097

ac_sub_configure_args=

18098

ac_prev=

18099

eval "set x $ac_configure_args"

18100

@@ -19938,11 +18513,13 @@ if test "$no_recursion" != yes; then

18101

ac_prev=prefix ;;

18102

-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)

18103

;;

18104

+ --disable-option-checking)

18105

+ ;;

18106

18107

case $ac_arg in

18108

- *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

18109

+ *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

18110

esac

18111

- ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;

18112

+ as_fn_append ac_sub_configure_args " '$ac_arg'" ;;

18113

esac

18114

done

18115

18116

@@ -19950,7 +18527,7 @@ if test "$no_recursion" != yes; then

18117

# in subdir configurations.

18118

ac_arg="--prefix=$prefix"

18119

case $ac_arg in

18120

- *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

18121

+ *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

18122

esac

18123

ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"

18124

18125

@@ -19959,6 +18536,10 @@ if test "$no_recursion" != yes; then

18126

ac_sub_configure_args="--silent $ac_sub_configure_args"

18127

18128

18129

+ # Always prepend --disable-option-checking to silence warnings, since

18130

+ # different subdirs can have different --enable and --with options.

18131

+ ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"

18132

18133

ac_popdir=`pwd`

18134

for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue

18135

18136

@@ -19967,57 +18548,17 @@ if test "$no_recursion" != yes; then

18137

test -d "$srcdir/$ac_dir" || continue

18138

18139

ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"

18140

- echo "$as_me:$LINENO: $ac_msg" >&5

18141

- echo "$ac_msg" >&6

18142

- { as_dir="$ac_dir"

18143

- case $as_dir in #(

18144

- -*) as_dir=./$as_dir;;

18145

- esac

18146

- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

18147

- as_dirs=

18148

- while :; do

18149

- case $as_dir in #(

18150

- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

18151

- *) as_qdir=$as_dir;;

18152

- esac

18153

- as_dirs="'$as_qdir' $as_dirs"

18154

- as_dir=`$as_dirname -- "$as_dir" ||

18155

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

18156

- X"$as_dir" : 'X$//$[^/]' \| \

18157

- X"$as_dir" : 'X$//$$' \| \

18158

- X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

18159

-echo X"$as_dir" |

18160

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

18161

- s//\1/

18162

- q

18163

- }

18164

- /^X$\/\/$[^/].*/{

18165

- s//\1/

18166

- q

18167

- }

18168

- /^X$\/\/$$/{

18169

- s//\1/

18170

- q

18171

- }

18172

- /^X$\/$.*/{

18173

- s//\1/

18174

- q

18175

- }

18176

- s/.*/./; q'`

18177

- test -d "$as_dir" && break

18178

- done

18179

- test -z "$as_dirs" || eval "mkdir $as_dirs"

18180

- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

18181

-echo "$as_me: error: cannot create directory $as_dir" >&2;}

18182

- { (exit 1); exit 1; }; }; }

18183

+ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5

18184

+ $as_echo "$ac_msg" >&6

18185

+ as_dir="$ac_dir"; as_fn_mkdir_p

18186

ac_builddir=.

18187

18188

case "$ac_dir" in

18189

.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

18190

18191

- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

18192

+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`

18193

# A ".." for each directory in $ac_dir_suffix.

18194

- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

18195

+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`

18196

case $ac_top_builddir_sub in

18197

"") ac_top_builddir_sub=. ac_top_build_prefix= ;;

18198

*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

18199

@@ -20056,8 +18597,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_

18200

# This should be Cygnus configure.

18201

ac_sub_configure=$ac_aux_dir/configure

18202

else

18203

- { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5

18204

-echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}

18205

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5

18206

+$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}

18207

ac_sub_configure=

18208

18209

18210

@@ -20070,17 +18611,19 @@ echo "$as_me: WARNING: no configuration

18211

ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;

18212

esac

18213

18214

- { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5

18215

-echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}

18216

+ { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5

18217

+$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}

9073

@@ -18700,7 +19397,7 @@ $as_echo "$as_me: running $SHELL $ac_sub

18218

9074

# The eval makes quoting arguments work.

18219

9075

eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \

18220

9076

--cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||

18221

- { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5

18222

-echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}

18223

- { (exit 1); exit 1; }; }

9077

- as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5

18224

9078

+ as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5

18225

9079

18226

9080

18227

9081

cd "$ac_popdir"

9082

--- protobuf-2.4.0a.orig/ltmain.sh

9083

+++ protobuf-2.4.0a/ltmain.sh

9084

@@ -1,9 +1,9 @@

9085

-# Generated from ltmain.m4sh.

9086

9087

-# ltmain.sh (GNU libtool) 2.2.6b

9088

+# libtool (GNU libtool) 2.4

9089

# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

9090

9091

9092

9093

+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

9094

# This is free software; see the source for copying conditions. There is NO

9095

# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

9096

9097

@@ -32,50 +32,56 @@

9098

9099

# Provide generalized library-building support services.

9100

9101

-# --config show all configuration variables

9102

-# --debug enable verbose shell tracing

9103

-# -n, --dry-run display commands without modifying any files

9104

-# --features display basic configuration information and exit

9105

-# --mode=MODE use operation mode MODE

9106

-# --preserve-dup-deps don't remove duplicate dependency libraries

9107

-# --quiet, --silent don't print informational messages

9108

-# --tag=TAG use configuration variables from tag TAG

9109

-# -v, --verbose print informational messages (default)

9110

-# --version print version information

9111

-# -h, --help print short or long help message

9112

+# --config show all configuration variables

9113

+# --debug enable verbose shell tracing

9114

+# -n, --dry-run display commands without modifying any files

9115

+# --features display basic configuration information and exit

9116

+# --mode=MODE use operation mode MODE

9117

+# --preserve-dup-deps don't remove duplicate dependency libraries

9118

+# --quiet, --silent don't print informational messages

9119

+# --no-quiet, --no-silent

9120

+# print informational messages (default)

9121

+# --tag=TAG use configuration variables from tag TAG

9122

+# -v, --verbose print more informational messages than default

9123

+# --no-verbose don't print the extra informational messages

9124

+# --version print version information

9125

+# -h, --help, --help-all print short, long, or detailed help message

9126

9127

# MODE must be one of the following:

9128

9129

-# clean remove files from the build directory

9130

-# compile compile a source file into a libtool object

9131

-# execute automatically set library path, then run a program

9132

-# finish complete the installation of libtool libraries

9133

-# install install libraries or executables

9134

-# link create a library or an executable

9135

-# uninstall remove libraries from an installed directory

9136

+# clean remove files from the build directory

9137

+# compile compile a source file into a libtool object

9138

+# execute automatically set library path, then run a program

9139

+# finish complete the installation of libtool libraries

9140

+# install install libraries or executables

9141

+# link create a library or an executable

9142

+# uninstall remove libraries from an installed directory

9143

9144

-# MODE-ARGS vary depending on the MODE.

9145

+# MODE-ARGS vary depending on the MODE. When passed as first option,

9146

+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.

9147

# Try `$progname --help --mode=MODE' for a more detailed description of MODE.

9148

9149

# When reporting a bug, please describe a test case to reproduce it and

9150

# include the following information:

9151

9152

-# host-triplet: $host

9153

-# shell: $SHELL

9154

-# compiler: $LTCC

9155

-# compiler flags: $LTCFLAGS

9156

-# linker: $LD (gnu? $with_gnu_ld)

9157

-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1

9158

-# automake: $automake_version

9159

-# autoconf: $autoconf_version

9160

+# host-triplet: $host

9161

+# shell: $SHELL

9162

+# compiler: $LTCC

9163

+# compiler flags: $LTCFLAGS

9164

+# linker: $LD (gnu? $with_gnu_ld)

9165

+# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1

9166

+# automake: $automake_version

9167

+# autoconf: $autoconf_version

9168

9169

# Report bugs to <bug-libtool@gnu.org>.

9170

+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.

9171

+# General help using GNU software: <http://www.gnu.org/gethelp/>.

9172

9173

-PROGRAM=ltmain.sh

9174

+PROGRAM=libtool

9175

PACKAGE=libtool

9176

-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"

9177

+VERSION="2.4 Debian-2.4-2ubuntu1"

9178

TIMESTAMP=""

9179

-package_revision=1.3017

9180

+package_revision=1.3293

9181

9182

# Be Bourne compatible

9183

if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

9184

@@ -91,10 +97,15 @@ fi

9185

BIN_SH=xpg4; export BIN_SH # for Tru64

9186

DUALCASE=1; export DUALCASE # for MKS sh

9187

9188

+# A function that is used when there is no print builtin or printf.

9189

+func_fallback_echo ()

9190

9191

+ eval 'cat <<_LTECHO_EOF

9192

+$1

9193

+_LTECHO_EOF'

9194

9195

9196

# NLS nuisances: We save the old values to restore during execute mode.

9197

-# Only set LANG and LC_ALL to C if already set.

9198

-# These must not be set unconditionally because not all systems understand

9199

-# e.g. LANG=C (notably SCO).

9200

lt_user_locale=

9201

lt_safe_locale=

9202

for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES

9203

@@ -107,15 +118,24 @@ do

9204

lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"

9205

fi"

9206

done

9207

+LC_ALL=C

9208

+LANGUAGE=C

9209

+export LANGUAGE LC_ALL

9210

9211

$lt_unset CDPATH

9212

9213

9214

+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh

9215

+# is ksh but when the shell is invoked as "sh" and the current value of

9216

+# the _XPG environment variable is not equal to 1 (one), the special

9217

+# positional parameter $0, within a function call, is the name of the

9218

+# function.

9219

+progpath="$0"

9220

9221

9222

9223

: ${CP="cp -f"}

9224

-: ${ECHO="echo"}

9225

+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}

9226

: ${EGREP="/bin/grep -E"}

9227

: ${FGREP="/bin/grep -F"}

9228

: ${GREP="/bin/grep"}

9229

@@ -144,6 +164,27 @@ IFS=" $lt_nl"

9230

dirname="s,/[^/]*$,,"

9231

basename="s,^.*/,,"

9232

9233

+# func_dirname file append nondir_replacement

9234

+# Compute the dirname of FILE. If nonempty, add APPEND to the result,

9235

+# otherwise set result to NONDIR_REPLACEMENT.

9236

+func_dirname ()

9237

9238

+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`

9239

+ if test "X$func_dirname_result" = "X${1}"; then

9240

+ func_dirname_result="${3}"

9241

+ else

9242

+ func_dirname_result="$func_dirname_result${2}"

9243

+ fi

9244

+} # func_dirname may be replaced by extended shell implementation

9245

9246

9247

+# func_basename file

9248

+func_basename ()

9249

9250

+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`

9251

+} # func_basename may be replaced by extended shell implementation

9252

9253

9254

# func_dirname_and_basename file append nondir_replacement

9255

# perform func_basename and func_dirname in a single function

9256

# call:

9257

@@ -158,33 +199,183 @@ basename="s,^.*/,,"

9258

# those functions but instead duplicate the functionality here.

9259

func_dirname_and_basename ()

9260

{

9261

- # Extract subdirectory from the argument.

9262

- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`

9263

- if test "X$func_dirname_result" = "X${1}"; then

9264

- func_dirname_result="${3}"

9265

- else

9266

- func_dirname_result="$func_dirname_result${2}"

9267

- fi

9268

- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`

9269

+ # Extract subdirectory from the argument.

9270

+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`

9271

+ if test "X$func_dirname_result" = "X${1}"; then

9272

+ func_dirname_result="${3}"

9273

+ else

9274

+ func_dirname_result="$func_dirname_result${2}"

9275

+ fi

9276

+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`

9277

+} # func_dirname_and_basename may be replaced by extended shell implementation

9278

9279

9280

+# func_stripname prefix suffix name

9281

+# strip PREFIX and SUFFIX off of NAME.

9282

+# PREFIX and SUFFIX must not contain globbing or regex special

9283

+# characters, hashes, percent signs, but SUFFIX may contain a leading

9284

+# dot (in which case that matches only a dot).

9285

+# func_strip_suffix prefix name

9286

+func_stripname ()

9287

9288

+ case ${2} in

9289

+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;

9290

+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;

9291

+ esac

9292

+} # func_stripname may be replaced by extended shell implementation

9293

9294

9295

+# These SED scripts presuppose an absolute path with a trailing slash.

9296

+pathcar='s,^/$[^/]*$.*$,\1,'

9297

+pathcdr='s,^/[^/]*,,'

9298

+removedotparts=':dotsl

9299

+ s@/\./@/@g

9300

+ t dotsl

9301

+ s,/\.$,/,'

9302

+collapseslashes='s@/\{1,\}@/@g'

9303

+finalslash='s,/*$,/,'

9304

9305

+# func_normal_abspath PATH

9306

+# Remove doubled-up and trailing slashes, "." path components,

9307

+# and cancel out any ".." path components in PATH after making

9308

+# it an absolute path.

9309

+# value returned in "$func_normal_abspath_result"

9310

+func_normal_abspath ()

9311

9312

+ # Start from root dir and reassemble the path.

9313

+ func_normal_abspath_result=

9314

+ func_normal_abspath_tpath=$1

9315

+ func_normal_abspath_altnamespace=

9316

+ case $func_normal_abspath_tpath in

9317

+ "")

9318

+ # Empty path, that just means $cwd.

9319

+ func_stripname '' '/' "`pwd`"

9320

+ func_normal_abspath_result=$func_stripname_result

9321

+ return

9322

+ ;;

9323

+ # The next three entries are used to spot a run of precisely

9324

+ # two leading slashes without using negated character classes;

9325

+ # we take advantage of case's first-match behaviour.

9326

+ ///*)

9327

+ # Unusual form of absolute path, do nothing.

9328

+ ;;

9329

+ //*)

9330

+ # Not necessarily an ordinary path; POSIX reserves leading '//'

9331

+ # and for example Cygwin uses it to access remote file shares

9332

+ # over CIFS/SMB, so we conserve a leading double slash if found.

9333

+ func_normal_abspath_altnamespace=/

9334

+ ;;

9335

+ /*)

9336

+ # Absolute path, do nothing.

9337

+ ;;

9338

+ *)

9339

+ # Relative path, prepend $cwd.

9340

+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath

9341

+ ;;

9342

+ esac

9343

+ # Cancel out all the simple stuff to save iterations. We also want

9344

+ # the path to end with a slash for ease of parsing, so make sure

9345

+ # there is one (and only one) here.

9346

+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \

9347

+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`

9348

+ while :; do

9349

+ # Processed it all yet?

9350

+ if test "$func_normal_abspath_tpath" = / ; then

9351

+ # If we ascended to the root using ".." the result may be empty now.

9352

+ if test -z "$func_normal_abspath_result" ; then

9353

+ func_normal_abspath_result=/

9354

+ fi

9355

+ break

9356

+ fi

9357

+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \

9358

+ -e "$pathcar"`

9359

+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \

9360

+ -e "$pathcdr"`

9361

+ # Figure out what to do with it

9362

+ case $func_normal_abspath_tcomponent in

9363

+ "")

9364

+ # Trailing empty path component, ignore it.

9365

+ ;;

9366

+ ..)

9367

+ # Parent dir; strip last assembled component from result.

9368

+ func_dirname "$func_normal_abspath_result"

9369

+ func_normal_abspath_result=$func_dirname_result

9370

+ ;;

9371

+ *)

9372

+ # Actual path component, append it.

9373

+ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent

9374

+ ;;

9375

+ esac

9376

+ done

9377

+ # Restore leading double-slash if one was found on entry.

9378

+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result

9379

}

9380

9381

-# Generated shell functions inserted here.

9382

+# func_relative_path SRCDIR DSTDIR

9383

+# generates a relative path from SRCDIR to DSTDIR, with a trailing

9384

+# slash if non-empty, suitable for immediately appending a filename

9385

+# without needing to append a separator.

9386

+# value returned in "$func_relative_path_result"

9387

+func_relative_path ()

9388

9389

+ func_relative_path_result=

9390

+ func_normal_abspath "$1"

9391

+ func_relative_path_tlibdir=$func_normal_abspath_result

9392

+ func_normal_abspath "$2"

9393

+ func_relative_path_tbindir=$func_normal_abspath_result

9394

9395

+ # Ascend the tree starting from libdir

9396

+ while :; do

9397

+ # check if we have found a prefix of bindir

9398

+ case $func_relative_path_tbindir in

9399

+ $func_relative_path_tlibdir)

9400

+ # found an exact match

9401

+ func_relative_path_tcancelled=

9402

+ break

9403

+ ;;

9404

+ $func_relative_path_tlibdir*)

9405

+ # found a matching prefix

9406

+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"

9407

+ func_relative_path_tcancelled=$func_stripname_result

9408

+ if test -z "$func_relative_path_result"; then

9409

+ func_relative_path_result=.

9410

+ fi

9411

+ break

9412

+ ;;

9413

+ *)

9414

+ func_dirname $func_relative_path_tlibdir

9415

+ func_relative_path_tlibdir=${func_dirname_result}

9416

+ if test "x$func_relative_path_tlibdir" = x ; then

9417

+ # Have to descend all the way to the root!

9418

+ func_relative_path_result=../$func_relative_path_result

9419

+ func_relative_path_tcancelled=$func_relative_path_tbindir

9420

+ break

9421

+ fi

9422

+ func_relative_path_result=../$func_relative_path_result

9423

+ ;;

9424

+ esac

9425

+ done

9426

9427

+ # Now calculate path; take care to avoid doubling-up slashes.

9428

+ func_stripname '' '/' "$func_relative_path_result"

9429

+ func_relative_path_result=$func_stripname_result

9430

+ func_stripname '/' '/' "$func_relative_path_tcancelled"

9431

+ if test "x$func_stripname_result" != x ; then

9432

+ func_relative_path_result=${func_relative_path_result}/${func_stripname_result}

9433

+ fi

9434

9435

-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh

9436

-# is ksh but when the shell is invoked as "sh" and the current value of

9437

-# the _XPG environment variable is not equal to 1 (one), the special

9438

-# positional parameter $0, within a function call, is the name of the

9439

-# function.

9440

-progpath="$0"

9441

+ # Normalisation. If bindir is libdir, return empty string,

9442

+ # else relative path ending with a slash; either way, target

9443

+ # file name can be directly appended.

9444

+ if test ! -z "$func_relative_path_result"; then

9445

+ func_stripname './' '' "$func_relative_path_result/"

9446

+ func_relative_path_result=$func_stripname_result

9447

+ fi

9448

9449

9450

# The name of this program:

9451

-# In the unlikely event $progname began with a '-', it would play havoc with

9452

-# func_echo (imagine progname=-n), so we prepend ./ in that case:

9453

func_dirname_and_basename "$progpath"

9454

progname=$func_basename_result

9455

-case $progname in

9456

- -*) progname=./$progname ;;

9457

-esac

9458

9459

# Make sure we have an absolute path for reexecution:

9460

case $progpath in

9461

@@ -215,6 +406,15 @@ sed_quote_subst='s/$[`"$\\]$/\\\1/g'

9462

# Same as above, but do not quote variable references.

9463

double_quote_subst='s/$["`\\]$/\\\1/g'

9464

9465

+# Sed substitution that turns a string into a regex matching for the

9466

+# string literally.

9467

+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'

9468

9469

+# Sed substitution that converts a w32 file name or path

9470

+# which contains forward slashes, into one that contains

9471

+# (escaped) backslashes. A very naive implementation.

9472

+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'

9473

9474

# Re-`\' parameter expansions in output of double_quote_subst that were

9475

# `\'-ed in input to the same. If an odd number of `\' preceded a '$'

9476

# in input to double_quote_subst, that '$' was protected from expansion.

9477

@@ -243,7 +443,7 @@ opt_warning=:

9478

# name if it has been set yet.

9479

func_echo ()

9480

{

9481

- $ECHO "$progname${mode+: }$mode: $*"

9482

+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"

9483

}

9484

9485

# func_verbose arg...

9486

@@ -258,18 +458,25 @@ func_verbose ()

9487

9488

}

9489

9490

+# func_echo_all arg...

9491

+# Invoke $ECHO with all args, space-separated.

9492

+func_echo_all ()

9493

9494

+ $ECHO "$*"

9495

9496

9497

# func_error arg...

9498

# Echo program name prefixed message to standard error.

9499

func_error ()

9500

{

9501

- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2

9502

+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2

9503

}

9504

9505

# func_warning arg...

9506

# Echo program name prefixed warning message to standard error.

9507

func_warning ()

9508

{

9509

- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2

9510

+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2

9511

9512

# bash bug again:

9513

9514

@@ -326,9 +533,9 @@ func_mkdir_p ()

9515

case $my_directory_path in */*) ;; *) break ;; esac

9516

9517

# ...otherwise throw away the child directory and loop

9518

- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`

9519

+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`

9520

done

9521

- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`

9522

+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`

9523

9524

save_mkdir_p_IFS="$IFS"; IFS=':'

9525

for my_dir in $my_dir_list; do

9526

@@ -378,7 +585,7 @@ func_mktempdir ()

9527

func_fatal_error "cannot create temporary directory \`$my_tmpdir'"

9528

9529

9530

- $ECHO "X$my_tmpdir" | $Xsed

9531

+ $ECHO "$my_tmpdir"

9532

}

9533

9534

9535

@@ -392,7 +599,7 @@ func_quote_for_eval ()

9536

{

9537

case $1 in

9538

*[\\\`\"\$]*)

9539

- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;

9540

+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;

9541

9542

func_quote_for_eval_unquoted_result="$1" ;;

9543

esac

9544

@@ -419,7 +626,7 @@ func_quote_for_expand ()

9545

{

9546

case $1 in

9547

*[\\\`\"]*)

9548

- my_arg=`$ECHO "X$1" | $Xsed \

9549

+ my_arg=`$ECHO "$1" | $SED \

9550

-e "$double_quote_subst" -e "$sed_double_backslash"` ;;

9551

9552

my_arg="$1" ;;

9553

@@ -488,15 +695,39 @@ func_show_eval_locale ()

9554

9555

}

9556

9557

9558

9559

+# func_tr_sh

9560

+# Turn $1 into a string suitable for a shell variable name.

9561

+# Result is stored in $func_tr_sh_result. All characters

9562

+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,

9563

+# if $1 begins with a digit, a '_' is prepended as well.

9564

+func_tr_sh ()

9565

9566

+ case $1 in

9567

+ [0-9]* | *[!a-zA-Z0-9_]*)

9568

+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^$[0-9]$/_\1/; s/[^a-zA-Z0-9_]/_/g'`

9569

+ ;;

9570

+ * )

9571

+ func_tr_sh_result=$1

9572

+ ;;

9573

+ esac

9574

9575

9576

9577

# func_version

9578

# Echo version message to standard output and exit.

9579

func_version ()

9580

{

9581

- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {

9582

+ $opt_debug

9583

9584

+ $SED -n '/(C)/!b go

9585

+ :more

9586

+ /\./!{

9587

+ N

9588

+ s/\n# / /

9589

+ b more

9590

+ }

9591

+ :go

9592

+ /^# '$PROGRAM' (GNU /,/# warranty; / {

9593

s/^# //

9594

s/^# *$//

9595

s/$(C)$[ 0-9,-]*$ [1-9][0-9]*$/\1\2/

9596

@@ -509,22 +740,28 @@ func_version ()

9597

# Echo short help message to standard output and exit.

9598

func_usage ()

9599

{

9600

- $SED -n '/^# Usage:/,/# -h/ {

9601

+ $opt_debug

9602

9603

+ $SED -n '/^# Usage:/,/^# *.*--help/ {

9604

s/^# //

9605

s/^# *$//

9606

s/\$progname/'$progname'/

9607

9608

}' < "$progpath"

9609

- $ECHO

9610

+ echo

9611

$ECHO "run \`$progname --help | more' for full usage"

9612

exit $?

9613

}

9614

9615

-# func_help

9616

-# Echo long help message to standard output and exit.

9617

+# func_help [NOEXIT]

9618

+# Echo long help message to standard output and exit,

9619

+# unless 'noexit' is passed as argument.

9620

func_help ()

9621

{

9622

+ $opt_debug

9623

9624

$SED -n '/^# Usage:/,/# Report bugs to/ {

9625

+ :print

9626

s/^# //

9627

s/^# *$//

9628

s*\$progname*'$progname'*

9629

@@ -537,8 +774,15 @@ func_help ()

9630

s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/

9631

s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/

9632

9633

- }' < "$progpath"

9634

- exit $?

9635

+ d

9636

+ }

9637

+ /^# .* home page:/b print

9638

+ /^# General help using/b print

9639

+ ' < "$progpath"

9640

+ ret=$?

9641

+ if test -z "$1"; then

9642

+ exit $ret

9643

+ fi

9644

}

9645

9646

# func_missing_arg argname

9647

@@ -546,63 +790,106 @@ func_help ()

9648

# exit_cmd.

9649

func_missing_arg ()

9650

{

9651

- func_error "missing argument for $1"

9652

+ $opt_debug

9653

9654

+ func_error "missing argument for $1."

9655

exit_cmd=exit

9656

}

9657

9658

-exit_cmd=:

9659

9660

+# func_split_short_opt shortopt

9661

+# Set func_split_short_opt_name and func_split_short_opt_arg shell

9662

+# variables after splitting SHORTOPT after the 2nd character.

9663

+func_split_short_opt ()

9664

9665

+ my_sed_short_opt='1s/^$..$.*$/\1/;q'

9666

+ my_sed_short_rest='1s/^..$.*$$/\1/;q'

9667

9668

+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`

9669

+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`

9670

+} # func_split_short_opt may be replaced by extended shell implementation

9671

9672

9673

+# func_split_long_opt longopt

9674

+# Set func_split_long_opt_name and func_split_long_opt_arg shell

9675

+# variables after splitting LONGOPT at the `=' sign.

9676

+func_split_long_opt ()

9677

9678

+ my_sed_long_opt='1s/^$--[^=]*$=.*/\1/;q'

9679

+ my_sed_long_arg='1s/^--[^=]*=//'

9680

9681

+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`

9682

+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`

9683

+} # func_split_long_opt may be replaced by extended shell implementation

9684

9685

+exit_cmd=:

9686

9687

9688

9689

-# Check that we have a working $ECHO.

9690

-if test "X$1" = X--no-reexec; then

9691

- # Discard the --no-reexec flag, and continue.

9692

- shift

9693

-elif test "X$1" = X--fallback-echo; then

9694

- # Avoid inline document here, it may be left over

9695

- :

9696

-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then

9697

- # Yippee, $ECHO works!

9698

- :

9699

-else

9700

- # Restart under the correct shell, and then maybe $ECHO will work.

9701

- exec $SHELL "$progpath" --no-reexec ${1+"$@"}

9702

-fi

9703

9704

-if test "X$1" = X--fallback-echo; then

9705

- # used as fallback echo

9706

- shift

9707

- cat <<EOF

9708

-$*

9709

-EOF

9710

- exit $EXIT_SUCCESS

9711

-fi

9712

9713

magic="%%%MAGIC variable%%%"

9714

magic_exe="%%%MAGIC EXE variable%%%"

9715

9716

# Global variables.

9717

-# $mode is unset

9718

nonopt=

9719

-execute_dlfiles=

9720

preserve_args=

9721

lo2o="s/\\.lo\$/.${objext}/"

9722

o2lo="s/\\.${objext}\$/.lo/"

9723

extracted_archives=

9724

extracted_serial=0

9725

9726

-opt_dry_run=false

9727

-opt_duplicate_deps=false

9728

-opt_silent=false

9729

-opt_debug=:

9730

9731

# If this variable is set in any of the actions, the command in it

9732

# will be execed at the end. This prevents here-documents from being

9733

# left over by shells.

9734

exec_cmd=

9735

9736

+# func_append var value

9737

+# Append VALUE to the end of shell variable VAR.

9738

+func_append ()

9739

9740

+ eval "${1}=\$${1}\${2}"

9741

+} # func_append may be replaced by extended shell implementation

9742

9743

+# func_append_quoted var value

9744

+# Quote VALUE and append to the end of shell variable VAR, separated

9745

+# by a space.

9746

+func_append_quoted ()

9747

9748

+ func_quote_for_eval "${2}"

9749

+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"

9750

+} # func_append_quoted may be replaced by extended shell implementation

9751

9752

9753

+# func_arith arithmetic-term...

9754

+func_arith ()

9755

9756

+ func_arith_result=`expr "${@}"`

9757

+} # func_arith may be replaced by extended shell implementation

9758

9759

9760

+# func_len string

9761

+# STRING may not start with a hyphen.

9762

+func_len ()

9763

9764

+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`

9765

+} # func_len may be replaced by extended shell implementation

9766

9767

9768

+# func_lo2o object

9769

+func_lo2o ()

9770

9771

+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`

9772

+} # func_lo2o may be replaced by extended shell implementation

9773

9774

9775

+# func_xform libobj-or-source

9776

+func_xform ()

9777

9778

+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`

9779

+} # func_xform may be replaced by extended shell implementation

9780

9781

9782

# func_fatal_configuration arg...

9783

# Echo program name prefixed message to standard error, followed by

9784

# a configuration failure hint, and exit.

9785

@@ -636,16 +923,16 @@ func_config ()

9786

# Display the features supported by this script.

9787

func_features ()

9788

{

9789

- $ECHO "host: $host"

9790

+ echo "host: $host"

9791

if test "$build_libtool_libs" = yes; then

9792

- $ECHO "enable shared libraries"

9793

+ echo "enable shared libraries"

9794

else

9795

- $ECHO "disable shared libraries"

9796

+ echo "disable shared libraries"

9797

9798

if test "$build_old_libs" = yes; then

9799

- $ECHO "enable static libraries"

9800

+ echo "enable static libraries"

9801

else

9802

- $ECHO "disable static libraries"

9803

+ echo "disable static libraries"

9804

9805

9806

exit $?

9807

@@ -692,117 +979,204 @@ func_enable_tag ()

9808

esac

9809

}

9810

9811

-# Parse options once, thoroughly. This comes as soon as possible in

9812

-# the script to make things like `libtool --version' happen quickly.

9813

+# func_check_version_match

9814

+# Ensure that we are using m4 macros, and libtool script from the same

9815

+# release of libtool.

9816

+func_check_version_match ()

9817

{

9818

+ if test "$package_revision" != "$macro_revision"; then

9819

+ if test "$VERSION" != "$macro_version"; then

9820

+ if test -z "$macro_version"; then

9821

+ cat >&2 <<_LT_EOF

9822

+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the

9823

+$progname: definition of this LT_INIT comes from an older release.

9824

+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION

9825

+$progname: and run autoconf again.

9826

+_LT_EOF

9827

+ else

9828

+ cat >&2 <<_LT_EOF

9829

+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the

9830

+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.

9831

+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION

9832

+$progname: and run autoconf again.

9833

+_LT_EOF

9834

+ fi

9835

+ else

9836

+ cat >&2 <<_LT_EOF

9837

+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,

9838

+$progname: but the definition of this LT_INIT comes from revision $macro_revision.

9839

+$progname: You should recreate aclocal.m4 with macros from revision $package_revision

9840

+$progname: of $PACKAGE $VERSION and run autoconf again.

9841

+_LT_EOF

9842

+ fi

9843

9844

+ exit $EXIT_MISMATCH

9845

+ fi

9846

9847

9848

9849

+# Shorthand for --mode=foo, only valid as the first argument

9850

+case $1 in

9851

+clean|clea|cle|cl)

9852

+ shift; set dummy --mode clean ${1+"$@"}; shift

9853

+ ;;

9854

+compile|compil|compi|comp|com|co|c)

9855

+ shift; set dummy --mode compile ${1+"$@"}; shift

9856

+ ;;

9857

+execute|execut|execu|exec|exe|ex|e)

9858

+ shift; set dummy --mode execute ${1+"$@"}; shift

9859

+ ;;

9860

+finish|finis|fini|fin|fi|f)

9861

+ shift; set dummy --mode finish ${1+"$@"}; shift

9862

+ ;;

9863

+install|instal|insta|inst|ins|in|i)

9864

+ shift; set dummy --mode install ${1+"$@"}; shift

9865

+ ;;

9866

+link|lin|li|l)

9867

+ shift; set dummy --mode link ${1+"$@"}; shift

9868

+ ;;

9869

9870

+ shift; set dummy --mode uninstall ${1+"$@"}; shift

9871

+ ;;

9872

+esac

9873

9874

- # Shorthand for --mode=foo, only valid as the first argument

9875

- case $1 in

9876

- clean|clea|cle|cl)

9877

- shift; set dummy --mode clean ${1+"$@"}; shift

9878

- ;;

9879

- compile|compil|compi|comp|com|co|c)

9880

- shift; set dummy --mode compile ${1+"$@"}; shift

9881

- ;;

9882

- execute|execut|execu|exec|exe|ex|e)

9883

- shift; set dummy --mode execute ${1+"$@"}; shift

9884

- ;;

9885

- finish|finis|fini|fin|fi|f)

9886

- shift; set dummy --mode finish ${1+"$@"}; shift

9887

- ;;

9888

- install|instal|insta|inst|ins|in|i)

9889

- shift; set dummy --mode install ${1+"$@"}; shift

9890

- ;;

9891

- link|lin|li|l)

9892

- shift; set dummy --mode link ${1+"$@"}; shift

9893

- ;;

9894

9895

- shift; set dummy --mode uninstall ${1+"$@"}; shift

9896

- ;;

9897

- esac

9898

9899

- # Parse non-mode specific arguments:

9900

- while test "$#" -gt 0; do

9901

9902

+# Option defaults:

9903

+opt_debug=:

9904

+opt_dry_run=false

9905

+opt_config=false

9906

+opt_preserve_dup_deps=false

9907

+opt_features=false

9908

+opt_finish=false

9909

+opt_help=false

9910

+opt_help_all=false

9911

+opt_silent=:

9912

+opt_verbose=:

9913

+opt_silent=false

9914

+opt_verbose=false

9915

9916

9917

+# Parse options once, thoroughly. This comes as soon as possible in the

9918

+# script to make things like `--version' happen as quickly as we can.

9919

9920

+ # this just eases exit handling

9921

+ while test $# -gt 0; do

9922

opt="$1"

9923

shift

9924

9925

case $opt in

9926

- --config) func_config ;;

9927

9928

- --debug) preserve_args="$preserve_args $opt"

9929

+ --debug|-x) opt_debug='set -x'

9930

func_echo "enabling shell trace mode"

9931

- opt_debug='set -x'

9932

$opt_debug

9933

;;

9934

9935

- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break

9936

- execute_dlfiles="$execute_dlfiles $1"

9937

- shift

9938

+ --dry-run|--dryrun|-n)

9939

+ opt_dry_run=:

9940

;;

9941

9942

- --dry-run | -n) opt_dry_run=: ;;

9943

- --features) func_features ;;

9944

- --finish) mode="finish" ;;

9945

9946

- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break

9947

- case $1 in

9948

- # Valid mode arguments:

9949

- clean) ;;

9950

- compile) ;;

9951

- execute) ;;

9952

- finish) ;;

9953

- install) ;;

9954

- link) ;;

9955

- relink) ;;

9956

- uninstall) ;;

9957

9958

- # Catch anything else as an error

9959

- *) func_error "invalid argument for $opt"

9960

- exit_cmd=exit

9961

- break

9962

- ;;

9963

- esac

9964

9965

- mode="$1"

9966

+ --config)

9967

+ opt_config=:

9968

+func_config

9969

+ ;;

9970

+ --dlopen|-dlopen)

9971

+ optarg="$1"

9972

+ opt_dlopen="${opt_dlopen+$opt_dlopen

9973

+}$optarg"

9974

shift

9975

;;

9976

9977

--preserve-dup-deps)

9978

- opt_duplicate_deps=: ;;

9979

9980

- --quiet|--silent) preserve_args="$preserve_args $opt"

9981

- opt_silent=:

9982

+ opt_preserve_dup_deps=:

9983

;;

9984

9985

- --verbose| -v) preserve_args="$preserve_args $opt"

9986

+ --features)

9987

+ opt_features=:

9988

+func_features

9989

+ ;;

9990

+ --finish)

9991

+ opt_finish=:

9992

+set dummy --mode finish ${1+"$@"}; shift

9993

+ ;;

9994

+ --help)

9995

+ opt_help=:

9996

+ ;;

9997

+ --help-all)

9998

+ opt_help_all=:

9999

+opt_help=': help-all'

10000

+ ;;

10001

+ --mode)

10002

+ test $# = 0 && func_missing_arg $opt && break

10003

+ optarg="$1"

10004

+ opt_mode="$optarg"

10005

+case $optarg in

10006

+ # Valid mode arguments:

10007

10008

10009

+ # Catch anything else as an error

10010

+ *) func_error "invalid argument for $opt"

10011

+ exit_cmd=exit

10012

+ break

10013

+ ;;

10014

+esac

10015

+ shift

10016

+ ;;

10017

+ --no-silent|--no-quiet)

10018

opt_silent=false

10019

+func_append preserve_args " $opt"

10020

;;

10021

10022

- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break

10023

- preserve_args="$preserve_args $opt $1"

10024

- func_enable_tag "$1" # tagname is set here

10025

+ --no-verbose)

10026

+ opt_verbose=false

10027

+func_append preserve_args " $opt"

10028

+ ;;

10029

+ --silent|--quiet)

10030

+ opt_silent=:

10031

+func_append preserve_args " $opt"

10032

+ opt_verbose=false

10033

+ ;;

10034

+ --verbose|-v)

10035

+ opt_verbose=:

10036

+func_append preserve_args " $opt"

10037

+opt_silent=false

10038

+ ;;

10039

+ --tag)

10040

+ test $# = 0 && func_missing_arg $opt && break

10041

+ optarg="$1"

10042

+ opt_tag="$optarg"

10043

+func_append preserve_args " $opt $optarg"

10044

+func_enable_tag "$optarg"

10045

shift

10046

;;

10047

10048

+ -\?|-h) func_usage ;;

10049

+ --help) func_help ;;

10050

+ --version) func_version ;;

10051

10052

# Separate optargs to long options:

10053

- -dlopen=*|--mode=*|--tag=*)

10054

- func_opt_split "$opt"

10055

- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}

10056

+ --*=*)

10057

+ func_split_long_opt "$opt"

10058

+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}

10059

shift

10060

;;

10061

10062

- -\?|-h) func_usage ;;

10063

- --help) opt_help=: ;;

10064

- --version) func_version ;;

10065

10066

- -*) func_fatal_help "unrecognized option \`$opt'" ;;

10067

10068

- *) nonopt="$opt"

10069

- break

10070

+ # Separate non-argument short options:

10071

+ -\?*|-h*|-n*|-v*)

10072

+ func_split_short_opt "$opt"

10073

+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}

10074

+ shift

10075

;;

10076

10077

+ --) break ;;

10078

+ -*) func_fatal_help "unrecognized option \`$opt'" ;;

10079

+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;

10080

esac

18228

10081

done

18229

18230

+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then

18231

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

18232

+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}

18233

+fi

18234

18235

--- protobuf-2.3.0.orig/config.sub

18236

+++ protobuf-2.3.0/config.sub

18237

@@ -1,10 +1,10 @@

18238

#! /bin/sh

18239

# Configuration validation subroutine script.

18240

18241

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,

18242

-# Inc.

18243

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

18244

+# Free Software Foundation, Inc.

18245

18246

-timestamp='2007-06-28'

18247

+timestamp='2010-01-22'

18248

18249

# This file is (in principle) common to ALL GNU software.

18250

# The presence of a machine in this file suggests that SOME GNU software

18251

@@ -32,13 +32,16 @@ timestamp='2007-06-28'

18252

18253

18254

# Please send patches to <config-patches@gnu.org>. Submit a context

18255

-# diff and a properly formatted ChangeLog entry.

18256

+# diff and a properly formatted GNU ChangeLog entry.

18257

18258

# Configuration subroutine to validate and canonicalize a configuration type.

18259

# Supply the specified configuration type as an argument.

18260

# If it is invalid, we print an error message on stderr and exit with code 1.

18261

# Otherwise, we print the canonical config type on stdout and succeed.

18262

18263

+# You can get the latest version of this script from:

18264

+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

18265

18266

# This file is supposed to be the same for all GNU packages

18267

# and recognize all the CPU types, system types and aliases

18268

# that are meaningful with *any* GNU software.

18269

@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch

18270

version="\

18271

GNU config.sub ($timestamp)

18272

18273

18274

-Free Software Foundation, Inc.

18275

18276

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free

18277

+Software Foundation, Inc.

18278

18279

This is free software; see the source for copying conditions. There is NO

18280

warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

18281

@@ -122,6 +126,7 @@ maybe_os=`echo $1 | sed 's/^$.*$-\([^-

18282

case $maybe_os in

18283

18284

18285

+ kopensolaris*-gnu* | \

18286

storm-chaos* | os2-emx* | rtmk-nova*)

18287

os=-$maybe_os

18288

basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`

18289

@@ -148,10 +153,13 @@ case $os in

18290

-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\

18291

-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

18292

18293

- -apple | -axis | -knuth | -cray)

18294

+ -apple | -axis | -knuth | -cray | -microblaze)

18295

os=

18296

basic_machine=$1

18297

;;

18298

+ -bluegene*)

18299

+ os=-cnk

18300

+ ;;

18301

-sim | -cisco | -oki | -wec | -winbond)

18302

os=

18303

basic_machine=$1

18304

@@ -249,13 +257,16 @@ case $basic_machine in

18305

18306

| i370 | i860 | i960 | ia64 \

18307

| ip2k | iq2000 \

18308

+ | lm32 \

18309

| m32c | m32r | m32rle | m68000 | m68k | m88k \

18310

- | maxq | mb | microblaze | mcore | mep \

18311

+ | maxq | mb | microblaze | mcore | mep | metag \

18312

18313

| mips16 \

18314

| mips64 | mips64el \

18315

- | mips64vr | mips64vrel \

18316

+ | mips64octeon | mips64octeonel \

18317

| mips64orion | mips64orionel \

18318

+ | mips64r5900 | mips64r5900el \

18319

+ | mips64vr | mips64vrel \

18320

| mips64vr4100 | mips64vr4100el \

18321

| mips64vr4300 | mips64vr4300el \

18322

| mips64vr5000 | mips64vr5000el \

18323

@@ -268,6 +279,7 @@ case $basic_machine in

18324

| mipsisa64sr71k | mipsisa64sr71kel \

18325

| mipstx39 | mipstx39el \

18326

| mn10200 | mn10300 \

18327

+ | moxie \

18328

| mt \

18329

| msp430 \

18330

| nios | nios2 \

18331

@@ -276,20 +288,22 @@ case $basic_machine in

18332

| pdp10 | pdp11 | pj | pjl \

18333

18334

| pyramid \

18335

+ | rx \

18336

| score \

18337

- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

18338

+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

18339

| sh64 | sh64le \

18340

18341

| sparcv8 | sparcv9 | sparcv9b | sparcv9v \

18342

| spu | strongarm \

18343

18344

+ | ubicom32 \

18345

| v850 | v850e \

18346

| we32k \

18347

18348

- | z8k)

18349

+ | z8k | z80)

18350

basic_machine=$basic_machine-unknown

18351

;;

18352

- m6811 | m68hc11 | m6812 | m68hc12)

18353

+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)

18354

# Motorola 68HC11/12.

18355

basic_machine=$basic_machine-unknown

18356

os=-none

18357

@@ -329,14 +343,17 @@ case $basic_machine in

18358

18359

| i*86-* | i860-* | i960-* | ia64-* \

18360

| ip2k-* | iq2000-* \

18361

+ | lm32-* \

18362

| m32c-* | m32r-* | m32rle-* \

18363

| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \

18364

- | m88110-* | m88k-* | maxq-* | mcore-* \

18365

+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \

18366

18367

| mips16-* \

18368

| mips64-* | mips64el-* \

18369

- | mips64vr-* | mips64vrel-* \

18370

+ | mips64octeon-* | mips64octeonel-* \

18371

| mips64orion-* | mips64orionel-* \

18372

+ | mips64r5900-* | mips64r5900el-* \

18373

+ | mips64vr-* | mips64vrel-* \

18374

| mips64vr4100-* | mips64vr4100el-* \

18375

| mips64vr4300-* | mips64vr4300el-* \

18376

| mips64vr5000-* | mips64vr5000el-* \

18377

@@ -357,21 +374,27 @@ case $basic_machine in

18378

| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

18379

18380

| pyramid-* \

18381

- | romp-* | rs6000-* \

18382

- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

18383

+ | romp-* | rs6000-* | rx-* \

18384

+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

18385

18386

18387

| sparclite-* \

18388

18389

| tahoe-* | thumb-* \

18390

18391

+ | tile-* | tilegx-* \

18392

| tron-* \

18393

+ | ubicom32-* \

18394

| v850-* | v850e-* | vax-* \

18395

| we32k-* \

18396

| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \

18397

- | xstormy16-* | xtensa-* \

18398

+ | xstormy16-* | xtensa*-* \

18399

| ymp-* \

18400

- | z8k-*)

18401

+ | z8k-* | z80-*)

18402

+ ;;

18403

+ # Recognize the basic CPU types without company name, with glob match.

18404

+ xtensa*)

18405

+ basic_machine=$basic_machine-unknown

18406

;;

18407

# Recognize the various machine names and aliases which stand

18408

# for a CPU type and a company and sometimes even an OS.

18409

@@ -435,6 +458,10 @@ case $basic_machine in

18410

basic_machine=m68k-apollo

18411

os=-bsd

18412

;;

18413

+ aros)

18414

+ basic_machine=i386-pc

18415

+ os=-aros

18416

+ ;;

18417

aux)

18418

basic_machine=m68k-apple

18419

os=-aux

18420

@@ -443,10 +470,26 @@ case $basic_machine in

18421

basic_machine=ns32k-sequent

18422

os=-dynix

18423

;;

18424

+ blackfin)

18425

+ basic_machine=bfin-unknown

18426

+ os=-linux

18427

+ ;;

18428

+ blackfin-*)

18429

+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`

18430

+ os=-linux

18431

+ ;;

18432

+ bluegene*)

18433

+ basic_machine=powerpc-ibm

18434

+ os=-cnk

18435

+ ;;

18436

c90)

18437

basic_machine=c90-cray

18438

os=-unicos

18439

;;

18440

+ cegcc)

18441

+ basic_machine=arm-unknown

18442

+ os=-cegcc

18443

+ ;;

18444

convex-c1)

18445

basic_machine=c1-convex

18446

os=-bsd

18447

@@ -514,6 +557,10 @@ case $basic_machine in

18448

basic_machine=m88k-motorola

18449

os=-sysv3

18450

;;

18451

+ dicos)

18452

+ basic_machine=i686-pc

18453

+ os=-dicos

18454

+ ;;

18455

djgpp)

18456

basic_machine=i586-pc

18457

os=-msdosdjgpp

18458

@@ -668,6 +715,14 @@ case $basic_machine in

18459

basic_machine=m68k-isi

18460

os=-sysv

18461

;;

18462

+ m68knommu)

18463

+ basic_machine=m68k-unknown

18464

+ os=-linux

18465

+ ;;

18466

+ m68knommu-*)

18467

+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`

18468

+ os=-linux

18469

+ ;;

18470

m88k-omron*)

18471

basic_machine=m88k-omron

18472

;;

18473

@@ -679,6 +734,9 @@ case $basic_machine in

18474

basic_machine=ns32k-utek

18475

os=-sysv

18476

;;

18477

+ microblaze)

18478

+ basic_machine=microblaze-xilinx

18479

+ ;;

18480

mingw32)

18481

basic_machine=i386-pc

18482

os=-mingw32

18483

@@ -813,6 +871,14 @@ case $basic_machine in

18484

basic_machine=i860-intel

18485

os=-osf

18486

;;

18487

+ parisc)

18488

+ basic_machine=hppa-unknown

18489

+ os=-linux

18490

+ ;;

18491

+ parisc-*)

18492

+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`

18493

+ os=-linux

18494

+ ;;

18495

pbd)

18496

basic_machine=sparc-tti

18497

;;

18498

@@ -1021,6 +1087,15 @@ case $basic_machine in

18499

basic_machine=tic6x-unknown

18500

os=-coff

18501

;;

18502

+ # This must be matched before tile*.

18503

+ tilegx*)

18504

+ basic_machine=tilegx-unknown

18505

+ os=-linux-gnu

18506

+ ;;

18507

+ tile*)

18508

+ basic_machine=tile-unknown

18509

+ os=-linux-gnu

18510

+ ;;

18511

tx39)

18512

basic_machine=mipstx39-unknown

18513

;;

18514

@@ -1096,6 +1171,10 @@ case $basic_machine in

18515

basic_machine=z8k-unknown

18516

os=-sim

18517

;;

18518

+ z80-*-coff)

18519

+ basic_machine=z80-unknown

18520

+ os=-sim

18521

+ ;;

18522

none)

18523

basic_machine=none-none

18524

os=-none

18525

@@ -1134,7 +1213,7 @@ case $basic_machine in

18526

we32k)

18527

basic_machine=we32k-att

18528

;;

18529

- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)

18530

18531

basic_machine=sh-unknown

18532

;;

18533

sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)

18534

@@ -1184,6 +1263,9 @@ case $os in

18535

# First match some system type aliases

18536

# that might get confused with valid system types.

18537

# -solaris* is a basic system type, with this one exception.

18538

+ -auroraux)

18539

+ os=-auroraux

18540

+ ;;

18541

-solaris1 | -solaris1.*)

18542

os=`echo $os | sed -e 's|solaris1|sunos4|'`

18543

;;

18544

@@ -1204,10 +1286,11 @@ case $os in

18545

# Each alternative MUST END IN A *, to match a version number.

18546

# -sysv* is not here because it comes later, after sysvr4.

18547

18548

- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\

18549

18550

+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\

18551

18552

+ | -sym* | -kopensolaris* \

18553

18554

- | -aos* \

18555

+ | -aos* | -aros* \

18556

18557

18558

18559

@@ -1216,7 +1299,7 @@ case $os in

18560

18561

18562

| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

18563

- | -chorusos* | -chorusrdb* \

18564

+ | -chorusos* | -chorusrdb* | -cegcc* \

18565

18566

| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \

18567

| -uxpv* | -beos* | -mpeix* | -udk* \

18568

@@ -1226,7 +1309,7 @@ case $os in

18569

18570

18571

| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \

18572

18573

18574

# Remember, each alternative MUST END IN *, to match a version number.

18575

;;

18576

-qnx*)

18577

@@ -1356,6 +1439,11 @@ case $os in

18578

-zvmoe)

18579

os=-zvmoe

18580

;;

18581

+ -dicos*)

18582

+ os=-dicos

18583

+ ;;

18584

+ -nacl*)

18585

+ ;;

18586

-none)

18587

;;

18588

18589

@@ -1553,7 +1641,7 @@ case $basic_machine in

18590

-sunos*)

18591

vendor=sun

18592

;;

18593

- -aix*)

18594

+ -cnk*|-aix*)

18595

vendor=ibm

18596

;;

18597

-beos*)

18598

--- protobuf-2.3.0.orig/depcomp

18599

+++ protobuf-2.3.0/depcomp

18600

@@ -1,10 +1,10 @@

18601

#! /bin/sh

18602

# depcomp - compile a program generating dependencies as side-effects

18603

18604

-scriptversion=2007-03-29.01

18605

+scriptversion=2009-04-28.21; # UTC

18606

18607

18608

-# Foundation, Inc.

18609

18610

+# Software Foundation, Inc.

18611

18612

# This program is free software; you can redistribute it and/or modify

18613

# it under the terms of the GNU General Public License as published by

18614

@@ -17,9 +17,7 @@ scriptversion=2007-03-29.01

18615

# GNU General Public License for more details.

18616

18617

# You should have received a copy of the GNU General Public License

18618

-# along with this program; if not, write to the Free Software

18619

-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

18620

-# 02110-1301, USA.

18621

+# along with this program. If not, see <http://www.gnu.org/licenses/>.

18622

18623

# As a special exception to the GNU General Public License, if you

18624

# distribute this file as part of a program that contains a

18625

@@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then

18626

depmode=dashmstdout

18627

18628

18629

+cygpath_u="cygpath -u -f -"

18630

+if test "$depmode" = msvcmsys; then

18631

+ # This is just like msvisualcpp but w/o cygpath translation.

18632

+ # Just convert the backslash-escaped backslashes to single forward

18633

+ # slashes to satisfy depend.m4

18634

+ cygpath_u="sed s,\\\\\\\\,/,g"

18635

+ depmode=msvisualcpp

18636

+fi

18637

18638

case "$depmode" in

18639

gcc3)

18640

## gcc 3 implements dependency tracking that does exactly what

18641

@@ -192,14 +199,14 @@ sgi)

18642

' < "$tmpdepfile" \

18643

| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \

18644

tr '

18645

-' ' ' >> $depfile

18646

- echo >> $depfile

18647

+' ' ' >> "$depfile"

18648

+ echo >> "$depfile"

18649

18650

# The second pass generates a dummy entry for each header file.

18651

tr ' ' '

18652

' < "$tmpdepfile" \

18653

| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \

18654

- >> $depfile

18655

+ >> "$depfile"

18656

else

18657

# The sourcefile does not contain any dependencies, so just

18658

# store a dummy comment line, to avoid errors with the Makefile

18659

@@ -328,7 +335,12 @@ hp2)

18660

if test -f "$tmpdepfile"; then

18661

sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"

18662

# Add `dependent.h:' lines.

18663

- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"

18664

+ sed -ne '2,${

18665

+ s/^ *//

18666

+ s/ \\*$//

18667

+ s/$/:/

18668

+ p

18669

+ }' "$tmpdepfile" >> "$depfile"

18670

else

18671

echo "#dummy" > "$depfile"

18672

18673

@@ -404,7 +416,7 @@ dashmstdout)

18674

18675

# Remove the call to Libtool.

18676

if test "$libtool" = yes; then

18677

- while test $1 != '--mode=compile'; do

18678

+ while test "X$1" != 'X--mode=compile'; do

18679

shift

18680

done

18681

shift

18682

@@ -455,32 +467,39 @@ makedepend)

18683

"$@" || exit $?

18684

# Remove any Libtool call

18685

if test "$libtool" = yes; then

18686

- while test $1 != '--mode=compile'; do

18687

+ while test "X$1" != 'X--mode=compile'; do

18688

shift

18689

done

18690

shift

18691

18692

# X makedepend

18693

shift

18694

- cleared=no

18695

- for arg in "$@"; do

18696

+ cleared=no eat=no

18697

+ for arg

18698

+ do

18699

case $cleared in

18700

no)

18701

set ""; shift

18702

cleared=yes ;;

18703

esac

18704

+ if test $eat = yes; then

18705

+ eat=no

18706

+ continue

18707

+ fi

18708

case "$arg" in

18709

-D*|-I*)

18710

set fnord "$@" "$arg"; shift ;;

18711

# Strip any option that makedepend may not understand. Remove

18712

# the object too, otherwise makedepend will parse it as a source file.

18713

+ -arch)

18714

+ eat=yes ;;

18715

-*|$object)

10082

10083

+ # Validate options:

10084

10085

+ # save first non-option argument

10086

+ if test "$#" -gt 0; then

10087

+ nonopt="$opt"

10088

+ shift

10089

+ fi

10090

10091

+ # preserve --debug

10092

+ test "$opt_debug" = : || func_append preserve_args " --debug"

10093

10094

case $host in

10095

*cygwin* | *mingw* | *pw32* | *cegcc*)

10096

@@ -810,82 +1184,44 @@ func_enable_tag ()

10097

opt_duplicate_compiler_generated_deps=:

18716

10098

;;

18717

10099

18718

set fnord "$@" "$arg"; shift ;;

10100

- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps

10101

+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps

10102

;;

10103

esac

10104

10105

- # Having warned about all mis-specified options, bail out if

10106

- # anything was wrong.

10107

- $exit_cmd $EXIT_FAILURE

10108

10109

+ $opt_help || {

10110

+ # Sanity checks first:

10111

+ func_check_version_match

10112

10113

-# func_check_version_match

10114

-# Ensure that we are using m4 macros, and libtool script from the same

10115

-# release of libtool.

10116

-func_check_version_match ()

10117

10118

- if test "$package_revision" != "$macro_revision"; then

10119

- if test "$VERSION" != "$macro_version"; then

10120

- if test -z "$macro_version"; then

10121

- cat >&2 <<_LT_EOF

10122

-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the

10123

-$progname: definition of this LT_INIT comes from an older release.

10124

-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION

10125

-$progname: and run autoconf again.

10126

-_LT_EOF

10127

- else

10128

- cat >&2 <<_LT_EOF

10129

-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the

10130

-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.

10131

-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION

10132

-$progname: and run autoconf again.

10133

-_LT_EOF

10134

- fi

10135

- else

10136

- cat >&2 <<_LT_EOF

10137

-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,

10138

-$progname: but the definition of this LT_INIT comes from revision $macro_revision.

10139

-$progname: You should recreate aclocal.m4 with macros from revision $package_revision

10140

-$progname: of $PACKAGE $VERSION and run autoconf again.

10141

-_LT_EOF

10142

+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then

10143

+ func_fatal_configuration "not configured to build any kind of library"

10144

10145

10146

- exit $EXIT_MISMATCH

10147

- fi

10148

10149

10150

+ # Darwin sucks

10151

+ eval std_shrext=\"$shrext_cmds\"

10152

10153

-## ----------- ##

10154

-## Main. ##

10155

-## ----------- ##

10156

10157

-$opt_help || {

10158

- # Sanity checks first:

10159

- func_check_version_match

10160

10161

- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then

10162

- func_fatal_configuration "not configured to build any kind of library"

10163

- fi

10164

+ # Only execute mode is allowed to have -dlopen flags.

10165

+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then

10166

+ func_error "unrecognized option \`-dlopen'"

10167

+ $ECHO "$help" 1>&2

10168

+ exit $EXIT_FAILURE

10169

+ fi

10170

10171

- test -z "$mode" && func_fatal_error "error: you must specify a MODE."

10172

+ # Change the help message to a mode-specific one.

10173

+ generic_help="$help"

10174

+ help="Try \`$progname --help --mode=$opt_mode' for more information."

10175

+ }

10176

10177

10178

- # Darwin sucks

10179

- eval std_shrext=\"$shrext_cmds\"

10180

+ # Bail if the options were screwed

10181

+ $exit_cmd $EXIT_FAILURE

10182

10183

10184

10185

- # Only execute mode is allowed to have -dlopen flags.

10186

- if test -n "$execute_dlfiles" && test "$mode" != execute; then

10187

- func_error "unrecognized option \`-dlopen'"

10188

- $ECHO "$help" 1>&2

10189

- exit $EXIT_FAILURE

10190

- fi

10191

10192

- # Change the help message to a mode-specific one.

10193

- generic_help="$help"

10194

- help="Try \`$progname --help --mode=$mode' for more information."

10195

10196

10197

+## ----------- ##

10198

+## Main. ##

10199

+## ----------- ##

10200

10201

# func_lalib_p file

10202

# True iff FILE is a libtool `.la' library or `.lo' object file.

10203

@@ -950,12 +1286,9 @@ func_ltwrapper_executable_p ()

10204

# temporary ltwrapper_script.

10205

func_ltwrapper_scriptname ()

10206

{

10207

- func_ltwrapper_scriptname_result=""

10208

- if func_ltwrapper_executable_p "$1"; then

10209

- func_dirname_and_basename "$1" "" "."

10210

- func_stripname '' '.exe' "$func_basename_result"

10211

- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"

10212

- fi

10213

+ func_dirname_and_basename "$1" "" "."

10214

+ func_stripname '' '.exe' "$func_basename_result"

10215

+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"

10216

}

10217

10218

# func_ltwrapper_p file

10219

@@ -1001,6 +1334,37 @@ func_source ()

10220

}

10221

10222

10223

+# func_resolve_sysroot PATH

10224

+# Replace a leading = in PATH with a sysroot. Store the result into

10225

+# func_resolve_sysroot_result

10226

+func_resolve_sysroot ()

10227

10228

+ func_resolve_sysroot_result=$1

10229

+ case $func_resolve_sysroot_result in

10230

+ =*)

10231

+ func_stripname '=' '' "$func_resolve_sysroot_result"

10232

+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result

10233

+ ;;

10234

+ esac

10235

10236

10237

+# func_replace_sysroot PATH

10238

+# If PATH begins with the sysroot, replace it with = and

10239

+# store the result into func_replace_sysroot_result.

10240

+func_replace_sysroot ()

10241

10242

+ case "$lt_sysroot:$1" in

10243

+ ?*:"$lt_sysroot"*)

10244

+ func_stripname "$lt_sysroot" '' "$1"

10245

+ func_replace_sysroot_result="=$func_stripname_result"

10246

+ ;;

10247

+ *)

10248

+ # Including no sysroot.

10249

+ func_replace_sysroot_result=$1

10250

+ ;;

10251

+ esac

10252

10253

10254

# func_infer_tag arg

10255

# Infer tagged configuration to use if any are available and

10256

# if one wasn't chosen via the "--tag" command line option.

10257

@@ -1013,13 +1377,15 @@ func_infer_tag ()

10258

if test -n "$available_tags" && test -z "$tagname"; then

10259

CC_quoted=

10260

for arg in $CC; do

10261

- func_quote_for_eval "$arg"

10262

- CC_quoted="$CC_quoted $func_quote_for_eval_result"

10263

+ func_append_quoted CC_quoted "$arg"

10264

done

10265

+ CC_expanded=`func_echo_all $CC`

10266

+ CC_quoted_expanded=`func_echo_all $CC_quoted`

10267

case $@ in

10268

# Blanks in the command may have been stripped by the calling shell,

10269

# but not from the CC environment variable when configure was run.

10270

10271

+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \

10272

+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;

10273

# Blanks at the start of $base_compile will cause this to fail

10274

# if we don't check for them as well.

10275

10276

@@ -1030,11 +1396,13 @@ func_infer_tag ()

10277

CC_quoted=

10278

for arg in $CC; do

10279

# Double-quote args containing other shell metacharacters.

10280

- func_quote_for_eval "$arg"

10281

- CC_quoted="$CC_quoted $func_quote_for_eval_result"

10282

+ func_append_quoted CC_quoted "$arg"

10283

done

10284

+ CC_expanded=`func_echo_all $CC`

10285

+ CC_quoted_expanded=`func_echo_all $CC_quoted`

10286

case "$@ " in

10287

10288

+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \

10289

+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)

10290

# The compiler in the base compile command matches

10291

# the one in the tagged configuration.

10292

# Assume this is the tagged configuration we want.

10293

@@ -1097,6 +1465,486 @@ EOF

10294

}

10295

}

10296

10297

10298

+##################################################

10299

+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #

10300

+##################################################

10301

10302

+# func_convert_core_file_wine_to_w32 ARG

10303

+# Helper function used by file name conversion functions when $build is *nix,

10304

+# and $host is mingw, cygwin, or some other w32 environment. Relies on a

10305

+# correctly configured wine environment available, with the winepath program

10306

+# in $build's $PATH.

10307

10308

+# ARG is the $build file name to be converted to w32 format.

10309

+# Result is available in $func_convert_core_file_wine_to_w32_result, and will

10310

+# be empty on error (or when ARG is empty)

10311

+func_convert_core_file_wine_to_w32 ()

10312

10313

+ $opt_debug

10314

+ func_convert_core_file_wine_to_w32_result="$1"

10315

+ if test -n "$1"; then

10316

+ # Unfortunately, winepath does not exit with a non-zero error code, so we

10317

+ # are forced to check the contents of stdout. On the other hand, if the

10318

+ # command is not found, the shell will set an exit code of 127 and print

10319

+ # *an error message* to stdout. So we must check for both error code of

10320

+ # zero AND non-empty stdout, which explains the odd construction:

10321

+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`

10322

+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then

10323

+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |

10324

+ $SED -e "$lt_sed_naive_backslashify"`

10325

+ else

10326

+ func_convert_core_file_wine_to_w32_result=

10327

+ fi

10328

+ fi

10329

10330

+# end: func_convert_core_file_wine_to_w32

10331

10332

10333

+# func_convert_core_path_wine_to_w32 ARG

10334

+# Helper function used by path conversion functions when $build is *nix, and

10335

+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly

10336

+# configured wine environment available, with the winepath program in $build's

10337

+# $PATH. Assumes ARG has no leading or trailing path separator characters.

10338

10339

+# ARG is path to be converted from $build format to win32.

10340

+# Result is available in $func_convert_core_path_wine_to_w32_result.

10341

+# Unconvertible file (directory) names in ARG are skipped; if no directory names

10342

+# are convertible, then the result may be empty.

10343

+func_convert_core_path_wine_to_w32 ()

10344

10345

+ $opt_debug

10346

+ # unfortunately, winepath doesn't convert paths, only file names

10347

+ func_convert_core_path_wine_to_w32_result=""

10348

+ if test -n "$1"; then

10349

+ oldIFS=$IFS

10350

+ IFS=:

10351

+ for func_convert_core_path_wine_to_w32_f in $1; do

10352

+ IFS=$oldIFS

10353

+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"

10354

+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then

10355

+ if test -z "$func_convert_core_path_wine_to_w32_result"; then

10356

+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"

10357

+ else

10358

+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"

10359

+ fi

10360

+ fi

10361

+ done

10362

+ IFS=$oldIFS

10363

+ fi

10364

10365

+# end: func_convert_core_path_wine_to_w32

10366

10367

10368

+# func_cygpath ARGS...

10369

+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when

10370

+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)

10371

+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or

10372

+# (2), returns the Cygwin file name or path in func_cygpath_result (input

10373

+# file name or path is assumed to be in w32 format, as previously converted

10374

+# from $build's *nix or MSYS format). In case (3), returns the w32 file name

10375

+# or path in func_cygpath_result (input file name or path is assumed to be in

10376

+# Cygwin format). Returns an empty string on error.

10377

10378

+# ARGS are passed to cygpath, with the last one being the file name or path to

10379

+# be converted.

10380

10381

+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH

10382

+# environment variable; do not put it in $PATH.

10383

+func_cygpath ()

10384

10385

+ $opt_debug

10386

+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then

10387

+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`

10388

+ if test "$?" -ne 0; then

10389

+ # on failure, ensure result is empty

10390

+ func_cygpath_result=

10391

+ fi

10392

+ else

10393

+ func_cygpath_result=

10394

+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"

10395

+ fi

10396

10397

+#end: func_cygpath

10398

10399

10400

+# func_convert_core_msys_to_w32 ARG

10401

+# Convert file name or path ARG from MSYS format to w32 format. Return

10402

+# result in func_convert_core_msys_to_w32_result.

10403

+func_convert_core_msys_to_w32 ()

10404

10405

+ $opt_debug

10406

+ # awkward: cmd appends spaces to result

10407

+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |

10408

+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`

10409

10410

+#end: func_convert_core_msys_to_w32

10411

10412

10413

+# func_convert_file_check ARG1 ARG2

10414

+# Verify that ARG1 (a file name in $build format) was converted to $host

10415

+# format in ARG2. Otherwise, emit an error message, but continue (resetting

10416

+# func_to_host_file_result to ARG1).

10417

+func_convert_file_check ()

10418

10419

+ $opt_debug

10420

+ if test -z "$2" && test -n "$1" ; then

10421

+ func_error "Could not determine host file name corresponding to"

10422

+ func_error " \`$1'"

10423

+ func_error "Continuing, but uninstalled executables may not work."

10424

+ # Fallback:

10425

+ func_to_host_file_result="$1"

10426

+ fi

10427

10428

+# end func_convert_file_check

10429

10430

10431

+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH

10432

+# Verify that FROM_PATH (a path in $build format) was converted to $host

10433

+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting

10434

+# func_to_host_file_result to a simplistic fallback value (see below).

10435

+func_convert_path_check ()

10436

10437

+ $opt_debug

10438

+ if test -z "$4" && test -n "$3"; then

10439

+ func_error "Could not determine the host path corresponding to"

10440

+ func_error " \`$3'"

10441

+ func_error "Continuing, but uninstalled executables may not work."

10442

+ # Fallback. This is a deliberately simplistic "conversion" and

10443

+ # should not be "improved". See libtool.info.

10444

+ if test "x$1" != "x$2"; then

10445

+ lt_replace_pathsep_chars="s|$1|$2|g"

10446

+ func_to_host_path_result=`echo "$3" |

10447

+ $SED -e "$lt_replace_pathsep_chars"`

10448

+ else

10449

+ func_to_host_path_result="$3"

10450

+ fi

10451

+ fi

10452

10453

+# end func_convert_path_check

10454

10455

10456

+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG

10457

+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT

10458

+# and appending REPL if ORIG matches BACKPAT.

10459

+func_convert_path_front_back_pathsep ()

10460

10461

+ $opt_debug

10462

+ case $4 in

10463

+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"

10464

+ ;;

10465

+ esac

10466

+ case $4 in

10467

+ $2 ) func_append func_to_host_path_result "$3"

10468

+ ;;

10469

+ esac

10470

10471

+# end func_convert_path_front_back_pathsep

10472

10473

10474

+##################################################

10475

+# $build to $host FILE NAME CONVERSION FUNCTIONS #

10476

+##################################################

10477

+# invoked via `$to_host_file_cmd ARG'

10478

10479

+# In each case, ARG is the path to be converted from $build to $host format.

10480

+# Result will be available in $func_to_host_file_result.

10481

10482

10483

+# func_to_host_file ARG

10484

+# Converts the file name ARG from $build format to $host format. Return result

10485

+# in func_to_host_file_result.

10486

+func_to_host_file ()

10487

10488

+ $opt_debug

10489

+ $to_host_file_cmd "$1"

10490

10491

+# end func_to_host_file

10492

10493

10494

+# func_to_tool_file ARG LAZY

10495

+# converts the file name ARG from $build format to toolchain format. Return

10496

+# result in func_to_tool_file_result. If the conversion in use is listed

10497

+# in (the comma separated) LAZY, no conversion takes place.

10498

+func_to_tool_file ()

10499

10500

+ $opt_debug

10501

+ case ,$2, in

10502

+ *,"$to_tool_file_cmd",*)

10503

+ func_to_tool_file_result=$1

10504

+ ;;

10505

+ *)

10506

+ $to_tool_file_cmd "$1"

10507

+ func_to_tool_file_result=$func_to_host_file_result

10508

+ ;;

10509

+ esac

10510

10511

+# end func_to_tool_file

10512

10513

10514

+# func_convert_file_noop ARG

10515

+# Copy ARG to func_to_host_file_result.

10516

+func_convert_file_noop ()

10517

10518

+ func_to_host_file_result="$1"

10519

10520

+# end func_convert_file_noop

10521

10522

10523

+# func_convert_file_msys_to_w32 ARG

10524

+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic

10525

+# conversion to w32 is not available inside the cwrapper. Returns result in

10526

+# func_to_host_file_result.

10527

+func_convert_file_msys_to_w32 ()

10528

10529

+ $opt_debug

10530

+ func_to_host_file_result="$1"

10531

+ if test -n "$1"; then

10532

+ func_convert_core_msys_to_w32 "$1"

10533

+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"

10534

+ fi

10535

+ func_convert_file_check "$1" "$func_to_host_file_result"

10536

10537

+# end func_convert_file_msys_to_w32

10538

10539

10540

+# func_convert_file_cygwin_to_w32 ARG

10541

+# Convert file name ARG from Cygwin to w32 format. Returns result in

10542

+# func_to_host_file_result.

10543

+func_convert_file_cygwin_to_w32 ()

10544

10545

+ $opt_debug

10546

+ func_to_host_file_result="$1"

10547

+ if test -n "$1"; then

10548

+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use

10549

+ # LT_CYGPATH in this case.

10550

+ func_to_host_file_result=`cygpath -m "$1"`

10551

+ fi

10552

+ func_convert_file_check "$1" "$func_to_host_file_result"

10553

10554

+# end func_convert_file_cygwin_to_w32

10555

10556

10557

+# func_convert_file_nix_to_w32 ARG

10558

+# Convert file name ARG from *nix to w32 format. Requires a wine environment

10559

+# and a working winepath. Returns result in func_to_host_file_result.

10560

+func_convert_file_nix_to_w32 ()

10561

10562

+ $opt_debug

10563

+ func_to_host_file_result="$1"

10564

+ if test -n "$1"; then

10565

+ func_convert_core_file_wine_to_w32 "$1"

10566

+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"

10567

+ fi

10568

+ func_convert_file_check "$1" "$func_to_host_file_result"

10569

10570

+# end func_convert_file_nix_to_w32

10571

10572

10573

+# func_convert_file_msys_to_cygwin ARG

10574

+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.

10575

+# Returns result in func_to_host_file_result.

10576

+func_convert_file_msys_to_cygwin ()

10577

10578

+ $opt_debug

10579

+ func_to_host_file_result="$1"

10580

+ if test -n "$1"; then

10581

+ func_convert_core_msys_to_w32 "$1"

10582

+ func_cygpath -u "$func_convert_core_msys_to_w32_result"

10583

+ func_to_host_file_result="$func_cygpath_result"

10584

+ fi

10585

+ func_convert_file_check "$1" "$func_to_host_file_result"

10586

10587

+# end func_convert_file_msys_to_cygwin

10588

10589

10590

+# func_convert_file_nix_to_cygwin ARG

10591

+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed

10592

+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result

10593

+# in func_to_host_file_result.

10594

+func_convert_file_nix_to_cygwin ()

10595

10596

+ $opt_debug

10597

+ func_to_host_file_result="$1"

10598

+ if test -n "$1"; then

10599

+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.

10600

+ func_convert_core_file_wine_to_w32 "$1"

10601

+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"

10602

+ func_to_host_file_result="$func_cygpath_result"

10603

+ fi

10604

+ func_convert_file_check "$1" "$func_to_host_file_result"

10605

10606

+# end func_convert_file_nix_to_cygwin

10607

10608

10609

+#############################################

10610

+# $build to $host PATH CONVERSION FUNCTIONS #

10611

+#############################################

10612

+# invoked via `$to_host_path_cmd ARG'

10613

10614

+# In each case, ARG is the path to be converted from $build to $host format.

10615

+# The result will be available in $func_to_host_path_result.

10616

10617

+# Path separators are also converted from $build format to $host format. If

10618

+# ARG begins or ends with a path separator character, it is preserved (but

10619

+# converted to $host format) on output.

10620

10621

+# All path conversion functions are named using the following convention:

10622

+# file name conversion function : func_convert_file_X_to_Y ()

10623

+# path conversion function : func_convert_path_X_to_Y ()

10624

+# where, for any given $build/$host combination the 'X_to_Y' value is the

10625

+# same. If conversion functions are added for new $build/$host combinations,

10626

+# the two new functions must follow this pattern, or func_init_to_host_path_cmd

10627

+# will break.

10628

10629

10630

+# func_init_to_host_path_cmd

10631

+# Ensures that function "pointer" variable $to_host_path_cmd is set to the

10632

+# appropriate value, based on the value of $to_host_file_cmd.

10633

+to_host_path_cmd=

10634

+func_init_to_host_path_cmd ()

10635

10636

+ $opt_debug

10637

+ if test -z "$to_host_path_cmd"; then

10638

+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"

10639

+ to_host_path_cmd="func_convert_path_${func_stripname_result}"

10640

+ fi

10641

10642

10643

10644

+# func_to_host_path ARG

10645

+# Converts the path ARG from $build format to $host format. Return result

10646

+# in func_to_host_path_result.

10647

+func_to_host_path ()

10648

10649

+ $opt_debug

10650

+ func_init_to_host_path_cmd

10651

+ $to_host_path_cmd "$1"

10652

10653

+# end func_to_host_path

10654

10655

10656

+# func_convert_path_noop ARG

10657

+# Copy ARG to func_to_host_path_result.

10658

+func_convert_path_noop ()

10659

10660

+ func_to_host_path_result="$1"

10661

10662

+# end func_convert_path_noop

10663

10664

10665

+# func_convert_path_msys_to_w32 ARG

10666

+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic

10667

+# conversion to w32 is not available inside the cwrapper. Returns result in

10668

+# func_to_host_path_result.

10669

+func_convert_path_msys_to_w32 ()

10670

10671

+ $opt_debug

10672

+ func_to_host_path_result="$1"

10673

+ if test -n "$1"; then

10674

+ # Remove leading and trailing path separator characters from ARG. MSYS

10675

+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';

10676

+ # and winepath ignores them completely.

10677

+ func_stripname : : "$1"

10678

+ func_to_host_path_tmp1=$func_stripname_result

10679

+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"

10680

+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"

10681

+ func_convert_path_check : ";" \

10682

+ "$func_to_host_path_tmp1" "$func_to_host_path_result"

10683

+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"

10684

+ fi

10685

10686

+# end func_convert_path_msys_to_w32

10687

10688

10689

+# func_convert_path_cygwin_to_w32 ARG

10690

+# Convert path ARG from Cygwin to w32 format. Returns result in

10691

+# func_to_host_file_result.

10692

+func_convert_path_cygwin_to_w32 ()

10693

10694

+ $opt_debug

10695

+ func_to_host_path_result="$1"

10696

+ if test -n "$1"; then

10697

+ # See func_convert_path_msys_to_w32:

10698

+ func_stripname : : "$1"

10699

+ func_to_host_path_tmp1=$func_stripname_result

10700

+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`

10701

+ func_convert_path_check : ";" \

10702

+ "$func_to_host_path_tmp1" "$func_to_host_path_result"

10703

+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"

10704

+ fi

10705

10706

+# end func_convert_path_cygwin_to_w32

10707

10708

10709

+# func_convert_path_nix_to_w32 ARG

10710

+# Convert path ARG from *nix to w32 format. Requires a wine environment and

10711

+# a working winepath. Returns result in func_to_host_file_result.

10712

+func_convert_path_nix_to_w32 ()

10713

10714

+ $opt_debug

10715

+ func_to_host_path_result="$1"

10716

+ if test -n "$1"; then

10717

+ # See func_convert_path_msys_to_w32:

10718

+ func_stripname : : "$1"

10719

+ func_to_host_path_tmp1=$func_stripname_result

10720

+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"

10721

+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"

10722

+ func_convert_path_check : ";" \

10723

+ "$func_to_host_path_tmp1" "$func_to_host_path_result"

10724

+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"

10725

+ fi

10726

10727

+# end func_convert_path_nix_to_w32

10728

10729

10730

+# func_convert_path_msys_to_cygwin ARG

10731

+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.

10732

+# Returns result in func_to_host_file_result.

10733

+func_convert_path_msys_to_cygwin ()

10734

10735

+ $opt_debug

10736

+ func_to_host_path_result="$1"

10737

+ if test -n "$1"; then

10738

+ # See func_convert_path_msys_to_w32:

10739

+ func_stripname : : "$1"

10740

+ func_to_host_path_tmp1=$func_stripname_result

10741

+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"

10742

+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"

10743

+ func_to_host_path_result="$func_cygpath_result"

10744

+ func_convert_path_check : : \

10745

+ "$func_to_host_path_tmp1" "$func_to_host_path_result"

10746

+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"

10747

+ fi

10748

10749

+# end func_convert_path_msys_to_cygwin

10750

10751

10752

+# func_convert_path_nix_to_cygwin ARG

10753

+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a

10754

+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in

10755

+# func_to_host_file_result.

10756

+func_convert_path_nix_to_cygwin ()

10757

10758

+ $opt_debug

10759

+ func_to_host_path_result="$1"

10760

+ if test -n "$1"; then

10761

+ # Remove leading and trailing path separator characters from

10762

+ # ARG. msys behavior is inconsistent here, cygpath turns them

10763

+ # into '.;' and ';.', and winepath ignores them completely.

10764

+ func_stripname : : "$1"

10765

+ func_to_host_path_tmp1=$func_stripname_result

10766

+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"

10767

+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"

10768

+ func_to_host_path_result="$func_cygpath_result"

10769

+ func_convert_path_check : : \

10770

+ "$func_to_host_path_tmp1" "$func_to_host_path_result"

10771

+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"

10772

+ fi

10773

10774

+# end func_convert_path_nix_to_cygwin

10775

10776

10777

# func_mode_compile arg...

10778

func_mode_compile ()

10779

{

10780

@@ -1137,12 +1985,12 @@ func_mode_compile ()

10781

;;

10782

10783

-pie | -fpie | -fPIE)

10784

- pie_flag="$pie_flag $arg"

10785

+ func_append pie_flag " $arg"

10786

continue

10787

;;

10788

10789

-shared | -static | -prefer-pic | -prefer-non-pic)

10790

- later="$later $arg"

10791

+ func_append later " $arg"

10792

continue

10793

;;

10794

10795

@@ -1163,15 +2011,14 @@ func_mode_compile ()

10796

save_ifs="$IFS"; IFS=','

10797

for arg in $args; do

10798

IFS="$save_ifs"

10799

- func_quote_for_eval "$arg"

10800

- lastarg="$lastarg $func_quote_for_eval_result"

10801

+ func_append_quoted lastarg "$arg"

10802

done

10803

IFS="$save_ifs"

10804

func_stripname ' ' '' "$lastarg"

10805

lastarg=$func_stripname_result

10806

10807

# Add the arguments to base_compile.

10808

- base_compile="$base_compile $lastarg"

10809

+ func_append base_compile " $lastarg"

10810

continue

10811

;;

10812

10813

@@ -1187,8 +2034,7 @@ func_mode_compile ()

10814

esac # case $arg_mode

10815

10816

# Aesthetically quote the previous argument.

10817

- func_quote_for_eval "$lastarg"

10818

- base_compile="$base_compile $func_quote_for_eval_result"

10819

+ func_append_quoted base_compile "$lastarg"

10820

done # for arg

10821

10822

case $arg_mode in

10823

@@ -1213,7 +2059,7 @@ func_mode_compile ()

10824

*.[cCFSifmso] | \

10825

*.ada | *.adb | *.ads | *.asm | \

10826

*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \

10827

- *.[fF][09]? | *.for | *.java | *.obj | *.sx)

10828

+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)

10829

func_xform "$libobj"

10830

libobj=$func_xform_result

10831

;;

10832

@@ -1288,7 +2134,7 @@ func_mode_compile ()

10833

# Calculate the filename of the output object if compiler does

10834

# not support -o with -c

10835

if test "$compiler_c_o" = no; then

10836

- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}

10837

+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}

10838

lockfile="$output_obj.lock"

10839

else

10840

output_obj=

10841

@@ -1319,17 +2165,16 @@ compiler."

10842

$opt_dry_run || $RM $removelist

10843

exit $EXIT_FAILURE

10844

10845

- removelist="$removelist $output_obj"

10846

+ func_append removelist " $output_obj"

10847

$ECHO "$srcfile" > "$lockfile"

10848

10849

10850

$opt_dry_run || $RM $removelist

10851

- removelist="$removelist $lockfile"

10852

+ func_append removelist " $lockfile"

10853

trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15

10854

10855

- if test -n "$fix_srcfile_path"; then

10856

- eval srcfile=\"$fix_srcfile_path\"

10857

- fi

10858

+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32

10859

+ srcfile=$func_to_tool_file_result

10860

func_quote_for_eval "$srcfile"

10861

qsrcfile=$func_quote_for_eval_result

10862

10863

@@ -1349,7 +2194,7 @@ compiler."

10864

10865

if test -z "$output_obj"; then

10866

# Place PIC objects in $objdir

10867

- command="$command -o $lobj"

10868

+ func_append command " -o $lobj"

10869

10870

10871

func_show_eval_locale "$command" \

10872

@@ -1396,11 +2241,11 @@ compiler."

10873

command="$base_compile $qsrcfile $pic_flag"

10874

10875

if test "$compiler_c_o" = yes; then

10876

- command="$command -o $obj"

10877

+ func_append command " -o $obj"

10878

10879

10880

# Suppress compiler output if we already did a PIC compilation.

10881

- command="$command$suppress_output"

10882

+ func_append command "$suppress_output"

10883

func_show_eval_locale "$command" \

10884

'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'

10885

10886

@@ -1445,13 +2290,13 @@ compiler."

10887

}

10888

10889

$opt_help || {

10890

-test "$mode" = compile && func_mode_compile ${1+"$@"}

10891

+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}

10892

}

10893

10894

func_mode_help ()

10895

{

10896

# We need to display help for each of the modes.

10897

- case $mode in

10898

+ case $opt_mode in

10899

"")

10900

# Generic help is extracted from the usage comments

10901

# at the start of this file.

10902

@@ -1482,10 +2327,11 @@ This mode accepts the following addition

10903

10904

-o OUTPUT-FILE set the output file name to OUTPUT-FILE

10905

-no-suppress do not suppress compiler output for multiple passes

10906

- -prefer-pic try to building PIC objects only

10907

- -prefer-non-pic try to building non-PIC objects only

10908

+ -prefer-pic try to build PIC objects only

10909

+ -prefer-non-pic try to build non-PIC objects only

10910

-shared do not build a \`.o' file suitable for static linking

10911

-static only build a \`.o' file suitable for static linking

10912

+ -Wc,FLAG pass FLAG directly to the compiler

10913

10914

COMPILE-COMMAND is a command to be used in creating a \`standard' object file

10915

from the given SOURCEFILE.

10916

@@ -1538,7 +2384,7 @@ either the \`install' or \`cp' program.

10917

10918

The following components of INSTALL-COMMAND are treated specially:

10919

10920

- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation

10921

+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation

10922

10923

The rest of the components are interpreted as arguments to that command (only

10924

BSD-compatible install options are recognized)."

10925

@@ -1558,6 +2404,8 @@ The following components of LINK-COMMAND

10926

10927

-all-static do not do any dynamic linking at all

10928

-avoid-version do not add a version suffix if possible

10929

+ -bindir BINDIR specify path to binaries directory (for systems where

10930

+ libraries must be found in the PATH setting at runtime)

10931

-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime

10932

-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols

10933

-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)

10934

@@ -1586,6 +2434,11 @@ The following components of LINK-COMMAND

10935

-version-info CURRENT[:REVISION[:AGE]]

10936

specify library version info [each variable defaults to 0]

10937

-weak LIBNAME declare that the target provides the LIBNAME interface

10938

+ -Wc,FLAG

10939

+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler

10940

+ -Wl,FLAG

10941

+ -Xlinker FLAG pass linker-specific FLAG directly to the linker

10942

+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)

10943

10944

All other options (arguments beginning with \`-') are ignored.

10945

10946

@@ -1619,18 +2472,44 @@ Otherwise, only FILE itself is deleted u

10947

;;

10948

10949

10950

- func_fatal_help "invalid operation mode \`$mode'"

10951

+ func_fatal_help "invalid operation mode \`$opt_mode'"

10952

;;

18719

10953

esac

18720

done

18721

- obj_suffix="`echo $object | sed 's/^.*\././'`"

18722

+ obj_suffix=`echo "$object" | sed 's/^.*\././'`

18723

touch "$tmpdepfile"

18724

${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"

18725

rm -f "$depfile"

18726

@@ -500,7 +519,7 @@ cpp)

18727

18728

# Remove the call to Libtool.

18729

if test "$libtool" = yes; then

18730

- while test $1 != '--mode=compile'; do

18731

+ while test "X$1" != 'X--mode=compile'; do

18732

shift

10954

10955

- $ECHO

10956

+ echo

10957

$ECHO "Try \`$progname --help' for more information about other modes."

10958

10959

- exit $?

10960

}

10961

10962

- # Now that we've collected a possible --mode arg, show help if necessary

10963

- $opt_help && func_mode_help

10964

+# Now that we've collected a possible --mode arg, show help if necessary

10965

+if $opt_help; then

10966

+ if test "$opt_help" = :; then

10967

+ func_mode_help

10968

+ else

10969

+ {

10970

+ func_help noexit

10971

+ for opt_mode in compile link execute install finish uninstall clean; do

10972

+ func_mode_help

10973

+ done

10974

+ } | sed -n '1p; 2,$s/^Usage:/ or: /p'

10975

+ {

10976

+ func_help noexit

10977

+ for opt_mode in compile link execute install finish uninstall clean; do

10978

+ echo

10979

+ func_mode_help

10980

+ done

10981

+ } |

10982

+ sed '1d

10983

+ /^When reporting/,/^Report/{

10984

+ H

10985

+ d

10986

+ }

10987

+ $x

10988

+ /information about other modes/d

10989

+ /more detailed .*MODE/d

10990

+ s/^Usage:.*--mode=$[^ ]*$ .*/Description of \1 mode:/'

10991

+ fi

10992

+ exit $?

10993

+fi

10994

10995

10996

# func_mode_execute arg...

10997

@@ -1643,13 +2522,16 @@ func_mode_execute ()

10998

func_fatal_help "you must specify a COMMAND"

10999

11000

# Handle -dlopen flags immediately.

11001

- for file in $execute_dlfiles; do

11002

+ for file in $opt_dlopen; do

11003

test -f "$file" \

11004

|| func_fatal_help "\`$file' is not a file"

11005

11006

dir=

11007

case $file in

11008

*.la)

11009

+ func_resolve_sysroot "$file"

11010

+ file=$func_resolve_sysroot_result

11011

11012

# Check to see that this really is a libtool archive.

11013

func_lalib_unsafe_p "$file" \

11014

|| func_fatal_help "\`$lib' is not a valid libtool archive"

11015

@@ -1671,7 +2553,7 @@ func_mode_execute ()

11016

dir="$func_dirname_result"

11017

11018

if test -f "$dir/$objdir/$dlname"; then

11019

- dir="$dir/$objdir"

11020

+ func_append dir "/$objdir"

11021

else

11022

if test ! -f "$dir/$dlname"; then

11023

func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"

11024

@@ -1712,7 +2594,7 @@ func_mode_execute ()

11025

for file

11026

11027

case $file in

11028

- -*) ;;

11029

+ -* | *.la | *.lo ) ;;

11030

11031

# Do a test to see if this is really a libtool program.

11032

if func_ltwrapper_script_p "$file"; then

11033

@@ -1728,8 +2610,7 @@ func_mode_execute ()

11034

;;

11035

esac

11036

# Quote arguments (to preserve shell metacharacters).

11037

- func_quote_for_eval "$file"

11038

- args="$args $func_quote_for_eval_result"

11039

+ func_append_quoted args "$file"

18733

11040

done

18734

shift

18735

@@ -538,13 +557,27 @@ cpp)

18736

18737

msvisualcpp)

18738

# Important note: in order to support this mode, a compiler *must*

18739

- # always write the preprocessed file to stdout, regardless of -o,

18740

- # because we must use -o when running libtool.

18741

+ # always write the preprocessed file to stdout.

18742

"$@" || exit $?

18743

18744

+ # Remove the call to Libtool.

18745

+ if test "$libtool" = yes; then

18746

+ while test "X$1" != 'X--mode=compile'; do

18747

+ shift

11041

11042

if test "X$opt_dry_run" = Xfalse; then

11043

@@ -1754,29 +2635,66 @@ func_mode_execute ()

11044

# Display what would be done.

11045

if test -n "$shlibpath_var"; then

11046

eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""

11047

- $ECHO "export $shlibpath_var"

11048

+ echo "export $shlibpath_var"

11049

11050

$ECHO "$cmd$args"

11051

exit $EXIT_SUCCESS

11052

11053

}

11054

11055

-test "$mode" = execute && func_mode_execute ${1+"$@"}

11056

+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}

11057

11058

11059

+# func_mode_finish arg...

11060

+func_mode_finish ()

11061

11062

+ $opt_debug

11063

+ libs=

11064

+ libdirs=

11065

+ admincmds=

11066

11067

+ for opt in "$nonopt" ${1+"$@"}

11068

+ do

11069

+ if test -d "$opt"; then

11070

+ func_append libdirs " $opt"

11071

11072

+ elif test -f "$opt"; then

11073

+ if func_lalib_unsafe_p "$opt"; then

11074

+ func_append libs " $opt"

11075

+ else

11076

+ func_warning "\`$opt' is not a valid libtool archive"

11077

+ fi

11078

11079

+ else

11080

+ func_fatal_error "invalid argument \`$opt'"

11081

+ fi

18748

11082

+ done

11083

11084

+ if test -n "$libs"; then

11085

+ if test -n "$lt_sysroot"; then

11086

+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`

11087

+ sysroot_cmd="s/$[ ']$$sysroot_regex/\1/g;"

11088

+ else

11089

+ sysroot_cmd=

11090

+ fi

11091

11092

-# func_mode_finish arg...

11093

-func_mode_finish ()

11094

11095

- $opt_debug

11096

- libdirs="$nonopt"

11097

- admincmds=

11098

+ # Remove sysroot references

11099

+ if $opt_dry_run; then

11100

+ for lib in $libs; do

11101

+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"

11102

+ done

11103

+ else

11104

+ tmpdir=`func_mktempdir`

11105

+ for lib in $libs; do

11106

+ sed -e "${sysroot_cmd} s/$[ ']-[LR]$=/\1/g; s/$[ ']$=/\1/g" $lib \

11107

+ > $tmpdir/tmp-la

11108

+ mv -f $tmpdir/tmp-la $lib

11109

+ done

11110

+ ${RM}r "$tmpdir"

11111

+ fi

11112

+ fi

11113

11114

if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then

11115

- for dir

11116

- do

11117

- libdirs="$libdirs $dir"

11118

- done

11119

11120

for libdir in $libdirs; do

11121

if test -n "$finish_cmds"; then

11122

# Do each command in the finish commands.

11123

@@ -1786,7 +2704,7 @@ func_mode_finish ()

11124

if test -n "$finish_eval"; then

11125

# Do the single finish_eval.

11126

eval cmds=\"$finish_eval\"

11127

- $opt_dry_run || eval "$cmds" || admincmds="$admincmds

11128

+ $opt_dry_run || eval "$cmds" || func_append admincmds "

11129

$cmds"

11130

11131

done

11132

@@ -1795,53 +2713,55 @@ func_mode_finish ()

11133

# Exit here if they wanted silent mode.

11134

$opt_silent && exit $EXIT_SUCCESS

11135

11136

- $ECHO "X----------------------------------------------------------------------" | $Xsed

11137

- $ECHO "Libraries have been installed in:"

11138

- for libdir in $libdirs; do

11139

- $ECHO " $libdir"

11140

- done

11141

- $ECHO

11142

- $ECHO "If you ever happen to want to link against installed libraries"

11143

- $ECHO "in a given directory, LIBDIR, you must either use libtool, and"

11144

- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"

11145

- $ECHO "flag during linking and do at least one of the following:"

11146

- if test -n "$shlibpath_var"; then

11147

- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"

11148

- $ECHO " during execution"

11149

- fi

11150

- if test -n "$runpath_var"; then

11151

- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"

11152

- $ECHO " during linking"

11153

- fi

11154

- if test -n "$hardcode_libdir_flag_spec"; then

11155

- libdir=LIBDIR

11156

- eval flag=\"$hardcode_libdir_flag_spec\"

11157

+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then

11158

+ echo "----------------------------------------------------------------------"

11159

+ echo "Libraries have been installed in:"

11160

+ for libdir in $libdirs; do

11161

+ $ECHO " $libdir"

11162

+ done

11163

+ echo

11164

+ echo "If you ever happen to want to link against installed libraries"

11165

+ echo "in a given directory, LIBDIR, you must either use libtool, and"

11166

+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"

11167

+ echo "flag during linking and do at least one of the following:"

11168

+ if test -n "$shlibpath_var"; then

11169

+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"

11170

+ echo " during execution"

11171

+ fi

11172

+ if test -n "$runpath_var"; then

11173

+ echo " - add LIBDIR to the \`$runpath_var' environment variable"

11174

+ echo " during linking"

11175

+ fi

11176

+ if test -n "$hardcode_libdir_flag_spec"; then

11177

+ libdir=LIBDIR

11178

+ eval flag=\"$hardcode_libdir_flag_spec\"

11179

11180

- $ECHO " - use the \`$flag' linker flag"

11181

- fi

11182

- if test -n "$admincmds"; then

11183

- $ECHO " - have your system administrator run these commands:$admincmds"

11184

- fi

11185

- if test -f /etc/ld.so.conf; then

11186

- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"

11187

- fi

11188

- $ECHO

11189

+ $ECHO " - use the \`$flag' linker flag"

11190

+ fi

11191

+ if test -n "$admincmds"; then

11192

+ $ECHO " - have your system administrator run these commands:$admincmds"

11193

+ fi

11194

+ if test -f /etc/ld.so.conf; then

11195

+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"

11196

+ fi

11197

+ echo

11198

11199

- $ECHO "See any operating system documentation about shared libraries for"

11200

- case $host in

11201

- solaris2.[6789]|solaris2.1[0-9])

11202

- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"

11203

- $ECHO "pages."

11204

- ;;

11205

- *)

11206

- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."

11207

- ;;

11208

- esac

11209

- $ECHO "X----------------------------------------------------------------------" | $Xsed

11210

+ echo "See any operating system documentation about shared libraries for"

11211

+ case $host in

11212

+ solaris2.[6789]|solaris2.1[0-9])

11213

+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"

11214

+ echo "pages."

11215

+ ;;

11216

+ *)

11217

+ echo "more information, such as the ld(1) and ld.so(8) manual pages."

11218

+ ;;

11219

+ esac

11220

+ echo "----------------------------------------------------------------------"

11221

+ fi

11222

exit $EXIT_SUCCESS

11223

}

11224

11225

-test "$mode" = finish && func_mode_finish ${1+"$@"}

11226

+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}

11227

11228

11229

# func_mode_install arg...

11230

@@ -1852,7 +2772,7 @@ func_mode_install ()

11231

# install_prog (especially on Windows NT).

11232

if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||

11233

# Allow the use of GNU shtool's install command.

11234

- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then

11235

+ case $nonopt in *shtool*) :;; *) false;; esac; then

11236

# Aesthetically quote it.

11237

func_quote_for_eval "$nonopt"

11238

install_prog="$func_quote_for_eval_result "

11239

@@ -1866,7 +2786,12 @@ func_mode_install ()

11240

# The real first argument should be the name of the installation program.

11241

# Aesthetically quote it.

11242

func_quote_for_eval "$arg"

11243

- install_prog="$install_prog$func_quote_for_eval_result"

11244

+ func_append install_prog "$func_quote_for_eval_result"

11245

+ install_shared_prog=$install_prog

11246

+ case " $install_prog " in

11247

+ *[\\\ /]cp\ *) install_cp=: ;;

11248

+ *) install_cp=false ;;

11249

+ esac

11250

11251

# We need to accept at least all the BSD install flags.

11252

dest=

11253

@@ -1876,10 +2801,12 @@ func_mode_install ()

11254

install_type=

11255

isdir=no

11256

stripme=

11257

+ no_mode=:

11258

for arg

11259

11260

+ arg2=

11261

if test -n "$dest"; then

11262

- files="$files $dest"

11263

+ func_append files " $dest"

11264

dest=$arg

11265

continue

11266

11267

@@ -1887,10 +2814,9 @@ func_mode_install ()

11268

case $arg in

11269

-d) isdir=yes ;;

11270

-f)

11271

- case " $install_prog " in

11272

- *[\\\ /]cp\ *) ;;

11273

- *) prev=$arg ;;

11274

- esac

11275

+ if $install_cp; then :; else

11276

+ prev=$arg

11277

+ fi

11278

;;

11279

-g | -m | -o)

11280

prev=$arg

11281

@@ -1904,6 +2830,10 @@ func_mode_install ()

11282

11283

# If the previous option needed an argument, then skip it.

11284

if test -n "$prev"; then

11285

+ if test "x$prev" = x-m && test -n "$install_override_mode"; then

11286

+ arg2=$install_override_mode

11287

+ no_mode=false

11288

+ fi

11289

prev=

11290

else

11291

dest=$arg

11292

@@ -1914,7 +2844,11 @@ func_mode_install ()

11293

11294

# Aesthetically quote the argument.

11295

func_quote_for_eval "$arg"

11296

- install_prog="$install_prog $func_quote_for_eval_result"

11297

+ func_append install_prog " $func_quote_for_eval_result"

11298

+ if test -n "$arg2"; then

11299

+ func_quote_for_eval "$arg2"

11300

+ fi

11301

+ func_append install_shared_prog " $func_quote_for_eval_result"

11302

done

11303

11304

test -z "$install_prog" && \

11305

@@ -1923,6 +2857,13 @@ func_mode_install ()

11306

test -n "$prev" && \

11307

func_fatal_help "the \`$prev' option requires an argument"

11308

11309

+ if test -n "$install_override_mode" && $no_mode; then

11310

+ if $install_cp; then :; else

11311

+ func_quote_for_eval "$install_override_mode"

11312

+ func_append install_shared_prog " -m $func_quote_for_eval_result"

11313

+ fi

11314

+ fi

11315

11316

if test -z "$files"; then

11317

if test -z "$dest"; then

11318

func_fatal_help "no file or destination specified"

11319

@@ -1977,10 +2918,13 @@ func_mode_install ()

11320

case $file in

11321

*.$libext)

11322

# Do the static libraries later.

11323

- staticlibs="$staticlibs $file"

11324

+ func_append staticlibs " $file"

11325

;;

11326

11327

*.la)

11328

+ func_resolve_sysroot "$file"

11329

+ file=$func_resolve_sysroot_result

11330

11331

# Check to see that this really is a libtool archive.

11332

func_lalib_unsafe_p "$file" \

11333

|| func_fatal_help "\`$file' is not a valid libtool archive"

11334

@@ -1994,23 +2938,23 @@ func_mode_install ()

11335

if test "X$destdir" = "X$libdir"; then

11336

case "$current_libdirs " in

11337

*" $libdir "*) ;;

11338

- *) current_libdirs="$current_libdirs $libdir" ;;

11339

+ *) func_append current_libdirs " $libdir" ;;

11340

esac

11341

else

11342

# Note the libdir as a future libdir.

11343

case "$future_libdirs " in

11344

*" $libdir "*) ;;

11345

- *) future_libdirs="$future_libdirs $libdir" ;;

11346

+ *) func_append future_libdirs " $libdir" ;;

11347

esac

11348

11349

11350

func_dirname "$file" "/" ""

11351

dir="$func_dirname_result"

11352

- dir="$dir$objdir"

11353

+ func_append dir "$objdir"

11354

11355

if test -n "$relink_command"; then

11356

# Determine the prefix the user has applied to our future dir.

11357

- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`

11358

+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`

11359

11360

# Don't allow the user to place us outside of our expected

11361

# location b/c this prevents finding dependent libraries that

11362

@@ -2023,9 +2967,9 @@ func_mode_install ()

11363

11364

if test -n "$inst_prefix_dir"; then

11365

# Stick the inst_prefix_dir data into the link command.

11366

- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`

11367

+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`

11368

else

11369

- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`

11370

+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`

11371

11372

11373

func_warning "relinking \`$file'"

11374

@@ -2043,7 +2987,7 @@ func_mode_install ()

11375

test -n "$relink_command" && srcname="$realname"T

11376

11377

# Install the shared library and build the symlinks.

11378

- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \

11379

+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \

11380

'exit $?'

11381

tstripme="$stripme"

11382

case $host_os in

11383

@@ -2083,7 +3027,7 @@ func_mode_install ()

11384

func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'

11385

11386

# Maybe install the static library, too.

11387

- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

11388

+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"

11389

;;

11390

11391

*.lo)

11392

@@ -2183,7 +3127,7 @@ func_mode_install ()

11393

if test -f "$lib"; then

11394

func_source "$lib"

11395

11396

- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test

11397

+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test

11398

if test -n "$libdir" && test ! -f "$libfile"; then

11399

func_warning "\`$lib' has not been installed in \`$libdir'"

11400

finalize=no

11401

@@ -2202,7 +3146,7 @@ func_mode_install ()

11402

file="$func_basename_result"

11403

outputname="$tmpdir/$file"

11404

# Replace the output file specification.

11405

- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`

11406

+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`

11407

11408

$opt_silent || {

11409

func_quote_for_expand "$relink_command"

11410

@@ -2221,7 +3165,7 @@ func_mode_install ()

11411

}

11412

else

11413

# Install the binary that we compiled earlier.

11414

- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%$[^/]*$$%$objdir/\1%"`

11415

+ file=`$ECHO "$file$stripped_ext" | $SED "s%$[^/]*$$%$objdir/\1%"`

11416

11417

11418

11419

@@ -2280,7 +3224,7 @@ func_mode_install ()

11420

11421

}

11422

11423

-test "$mode" = install && func_mode_install ${1+"$@"}

11424

+test "$opt_mode" = install && func_mode_install ${1+"$@"}

11425

11426

11427

# func_generate_dlsyms outputname originator pic_p

11428

@@ -2323,6 +3267,22 @@ func_generate_dlsyms ()

11429

extern \"C\" {

11430

#endif

11431

11432

+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))

11433

+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"

11434

+#endif

11435

11436

+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */

11437

+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)

11438

+/* DATA imports from DLLs on WIN32 con't be const, because runtime

11439

+ relocations are performed -- see ld's documentation on pseudo-relocs. */

11440

+# define LT_DLSYM_CONST

11441

+#elif defined(__osf__)

11442

+/* This system does not cope well with relocations in const data. */

11443

+# define LT_DLSYM_CONST

11444

+#else

11445

+# define LT_DLSYM_CONST const

11446

+#endif

11447

11448

/* External symbol declarations for the compiler. */\

11449

11450

11451

@@ -2332,10 +3292,11 @@ extern \"C\" {

11452

$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"

11453

11454

# Add our own program objects to the symbol list.

11455

- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`

11456

+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`

11457

for progfile in $progfiles; do

11458

- func_verbose "extracting global C symbols from \`$progfile'"

11459

- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"

11460

+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32

11461

+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"

11462

+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"

11463

done

11464

11465

if test -n "$exclude_expsyms"; then

11466

@@ -2371,7 +3332,7 @@ extern \"C\" {

11467

eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'

11468

eval '$MV "$nlist"T "$nlist"'

11469

case $host in

11470

- *cygwin | *mingw* | *cegcc* )

11471

+ *cygwin* | *mingw* | *cegcc* )

11472

eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'

11473

eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'

11474

;;

11475

@@ -2384,10 +3345,52 @@ extern \"C\" {

11476

func_verbose "extracting global C symbols from \`$dlprefile'"

11477

func_basename "$dlprefile"

11478

name="$func_basename_result"

11479

- $opt_dry_run || {

11480

- eval '$ECHO ": $name " >> "$nlist"'

11481

- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"

11482

- }

11483

+ case $host in

11484

+ *cygwin* | *mingw* | *cegcc* )

11485

+ # if an import library, we need to obtain dlname

11486

+ if func_win32_import_lib_p "$dlprefile"; then

11487

+ func_tr_sh "$dlprefile"

11488

+ eval "curr_lafile=\$libfile_$func_tr_sh_result"

11489

+ dlprefile_dlbasename=""

11490

+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then

11491

+ # Use subshell, to avoid clobbering current variable values

11492

+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`

11493

+ if test -n "$dlprefile_dlname" ; then

11494

+ func_basename "$dlprefile_dlname"

11495

+ dlprefile_dlbasename="$func_basename_result"

11496

+ else

11497

+ # no lafile. user explicitly requested -dlpreopen <import library>.

11498

+ $sharedlib_from_linklib_cmd "$dlprefile"

11499

+ dlprefile_dlbasename=$sharedlib_from_linklib_result

11500

+ fi

11501

+ fi

11502

+ $opt_dry_run || {

11503

+ if test -n "$dlprefile_dlbasename" ; then

11504

+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'

11505

+ else

11506

+ func_warning "Could not compute DLL name from $name"

11507

+ eval '$ECHO ": $name " >> "$nlist"'

11508

+ fi

11509

+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32

11510

+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |

11511

+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"

11512

+ }

11513

+ else # not an import lib

11514

+ $opt_dry_run || {

11515

+ eval '$ECHO ": $name " >> "$nlist"'

11516

+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32

11517

+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"

11518

+ }

11519

+ fi

11520

+ ;;

11521

+ *)

11522

+ $opt_dry_run || {

11523

+ eval '$ECHO ": $name " >> "$nlist"'

11524

+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32

11525

+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"

11526

+ }

11527

+ ;;

11528

+ esac

11529

done

11530

11531

$opt_dry_run || {

11532

@@ -2415,36 +3418,19 @@ extern \"C\" {

11533

if test -f "$nlist"S; then

11534

eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'

11535

else

11536

- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"

11537

+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"

11538

11539

11540

- $ECHO >> "$output_objdir/$my_dlsyms" "\

11541

+ echo >> "$output_objdir/$my_dlsyms" "\

11542

11543

/* The mapping between symbol names and symbols. */

11544

typedef struct {

11545

const char *name;

11546

void *address;

11547

} lt_dlsymlist;

11548

11549

- case $host in

11550

- *cygwin* | *mingw* | *cegcc* )

11551

- $ECHO >> "$output_objdir/$my_dlsyms" "\

11552

-/* DATA imports from DLLs on WIN32 con't be const, because

11553

- runtime relocations are performed -- see ld's documentation

11554

- on pseudo-relocs. */"

11555

- lt_dlsym_const= ;;

11556

- *osf5*)

11557

- echo >> "$output_objdir/$my_dlsyms" "\

11558

-/* This system does not cope well with relocations in const data */"

11559

- lt_dlsym_const= ;;

11560

- *)

11561

- lt_dlsym_const=const ;;

11562

- esac

11563

11564

- $ECHO >> "$output_objdir/$my_dlsyms" "\

11565

-extern $lt_dlsym_const lt_dlsymlist

11566

+extern LT_DLSYM_CONST lt_dlsymlist

11567

lt_${my_prefix}_LTX_preloaded_symbols[];

11568

-$lt_dlsym_const lt_dlsymlist

11569

+LT_DLSYM_CONST lt_dlsymlist

11570

lt_${my_prefix}_LTX_preloaded_symbols[] =

11571

11572

{ \"$my_originator\", (void *) 0 },"

11573

@@ -2457,7 +3443,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[]

11574

eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"

11575

;;

11576

esac

11577

- $ECHO >> "$output_objdir/$my_dlsyms" "\

11578

+ echo >> "$output_objdir/$my_dlsyms" "\

11579

{0, (void *) 0}

11580

};

11581

11582

@@ -2500,7 +3486,7 @@ static const void *lt_preloaded_setup()

11583

for arg in $LTCFLAGS; do

11584

case $arg in

11585

-pie | -fpie | -fPIE) ;;

11586

- *) symtab_cflags="$symtab_cflags $arg" ;;

11587

+ *) func_append symtab_cflags " $arg" ;;

11588

esac

11589

done

11590

11591

@@ -2515,16 +3501,16 @@ static const void *lt_preloaded_setup()

11592

case $host in

11593

*cygwin* | *mingw* | *cegcc* )

11594

if test -f "$output_objdir/$my_outputname.def"; then

11595

- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

11596

- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

11597

+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

11598

+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

11599

else

11600

- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`

11601

- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`

11602

+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`

11603

+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`

11604

11605

;;

11606

11607

- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`

11608

- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`

11609

+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`

11610

+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`

11611

;;

11612

esac

11613

;;

11614

@@ -2538,8 +3524,8 @@ static const void *lt_preloaded_setup()

11615

# really was required.

11616

11617

# Nullify the symbol file.

11618

- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`

11619

- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`

11620

+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`

11621

+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`

11622

11623

}

11624

11625

@@ -2549,6 +3535,7 @@ static const void *lt_preloaded_setup()

11626

# Need a lot of goo to handle *both* DLLs and import libs

11627

# Has to be a shell function in order to 'eat' the argument

11628

# that is supplied when $file_magic_command is called.

11629

+# Despite the name, also deal with 64 bit binaries.

11630

func_win32_libid ()

11631

{

11632

$opt_debug

11633

@@ -2559,9 +3546,11 @@ func_win32_libid ()

11634

win32_libid_type="x86 archive import"

11635

;;

11636

*ar\ archive*) # could be an import, or static

11637

+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.

11638

if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |

11639

- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then

11640

- win32_nmres=`eval $NM -f posix -A $1 |

11641

+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then

11642

+ func_to_tool_file "$1" func_convert_file_msys_to_w32

11643

+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |

11644

$SED -n -e '

11645

1,100{

11646

/ I /{

11647

@@ -2590,6 +3579,131 @@ func_win32_libid ()

11648

$ECHO "$win32_libid_type"

11649

}

11650

11651

+# func_cygming_dll_for_implib ARG

11652

11653

+# Platform-specific function to extract the

11654

+# name of the DLL associated with the specified

11655

+# import library ARG.

11656

+# Invoked by eval'ing the libtool variable

11657

+# $sharedlib_from_linklib_cmd

11658

+# Result is available in the variable

11659

+# $sharedlib_from_linklib_result

11660

+func_cygming_dll_for_implib ()

11661

11662

+ $opt_debug

11663

+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`

11664

11665

11666

+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs

11667

11668

+# The is the core of a fallback implementation of a

11669

+# platform-specific function to extract the name of the

11670

+# DLL associated with the specified import library LIBNAME.

11671

11672

+# SECTION_NAME is either .idata$6 or .idata$7, depending

11673

+# on the platform and compiler that created the implib.

11674

11675

+# Echos the name of the DLL associated with the

11676

+# specified import library.

11677

+func_cygming_dll_for_implib_fallback_core ()

11678

11679

+ $opt_debug

11680

+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`

11681

+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |

11682

+ $SED '/^Contents of section '"$match_literal"':/{

11683

+ # Place marker at beginning of archive member dllname section

11684

+ s/.*/====MARK====/

11685

+ p

11686

+ d

11687

+ }

11688

+ # These lines can sometimes be longer than 43 characters, but

11689

+ # are always uninteresting

11690

+ /:[ ]*file format pe[i]\{,1\}-/d

11691

+ /^In archive [^:]*:/d

11692

+ # Ensure marker is printed

11693

+ /^====MARK====/p

11694

+ # Remove all lines with less than 43 characters

11695

+ /^.\{43\}/!d

11696

+ # From remaining lines, remove first 43 characters

11697

+ s/^.\{43\}//' |

11698

+ $SED -n '

11699

+ # Join marker and all lines until next marker into a single line

11700

+ /^====MARK====/ b para

11701

+ H

11702

+ $ b para

11703

+ b

11704

+ :para

11705

+ x

11706

+ s/\n//g

11707

+ # Remove the marker

11708

+ s/^====MARK====//

11709

+ # Remove trailing dots and whitespace

11710

+ s/[\. \t]*$//

11711

+ # Print

11712

+ /./p' |

11713

+ # we now have a list, one entry per line, of the stringified

11714

+ # contents of the appropriate section of all members of the

11715

+ # archive which possess that section. Heuristic: eliminate

11716

+ # all those which have a first or second character that is

11717

+ # a '.' (that is, objdump's representation of an unprintable

11718

+ # character.) This should work for all archives with less than

11719

+ # 0x302f exports -- but will fail for DLLs whose name actually

11720

+ # begins with a literal '.' or a single character followed by

11721

+ # a '.'.

11722

+ #

11723

+ # Of those that remain, print the first one.

11724

+ $SED -e '/^\./d;/^.\./d;q'

11725

11726

11727

+# func_cygming_gnu_implib_p ARG

11728

+# This predicate returns with zero status (TRUE) if

11729

+# ARG is a GNU/binutils-style import library. Returns

11730

+# with nonzero status (FALSE) otherwise.

11731

+func_cygming_gnu_implib_p ()

11732

11733

+ $opt_debug

11734

+ func_to_tool_file "$1" func_convert_file_msys_to_w32

11735

+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`

11736

+ test -n "$func_cygming_gnu_implib_tmp"

11737

11738

11739

+# func_cygming_ms_implib_p ARG

11740

+# This predicate returns with zero status (TRUE) if

11741

+# ARG is an MS-style import library. Returns

11742

+# with nonzero status (FALSE) otherwise.

11743

+func_cygming_ms_implib_p ()

11744

11745

+ $opt_debug

11746

+ func_to_tool_file "$1" func_convert_file_msys_to_w32

11747

+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`

11748

+ test -n "$func_cygming_ms_implib_tmp"

11749

11750

11751

+# func_cygming_dll_for_implib_fallback ARG

11752

+# Platform-specific function to extract the

11753

+# name of the DLL associated with the specified

11754

+# import library ARG.

11755

11756

+# This fallback implementation is for use when $DLLTOOL

11757

+# does not support the --identify-strict option.

11758

+# Invoked by eval'ing the libtool variable

11759

+# $sharedlib_from_linklib_cmd

11760

+# Result is available in the variable

11761

+# $sharedlib_from_linklib_result

11762

+func_cygming_dll_for_implib_fallback ()

11763

11764

+ $opt_debug

11765

+ if func_cygming_gnu_implib_p "$1" ; then

11766

+ # binutils import library

11767

+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`

11768

+ elif func_cygming_ms_implib_p "$1" ; then

11769

+ # ms-generated import library

11770

+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`

11771

+ else

11772

+ # unknown

11773

+ sharedlib_from_linklib_result=""

11774

+ fi

11775

11776

11777

11778

# func_extract_an_archive dir oldlib

11779

@@ -2598,7 +3712,18 @@ func_extract_an_archive ()

11780

$opt_debug

11781

f_ex_an_ar_dir="$1"; shift

11782

f_ex_an_ar_oldlib="$1"

11783

- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'

11784

+ if test "$lock_old_archive_extraction" = yes; then

11785

+ lockfile=$f_ex_an_ar_oldlib.lock

11786

+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do

11787

+ func_echo "Waiting for $lockfile to be removed"

11788

+ sleep 2

11789

+ done

11790

+ fi

11791

+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \

11792

+ 'stat=$?; rm -f "$lockfile"; exit $stat'

11793

+ if test "$lock_old_archive_extraction" = yes; then

11794

+ $opt_dry_run || rm -f "$lockfile"

11795

+ fi

11796

if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then

11797

11798

else

11799

@@ -2669,7 +3794,7 @@ func_extract_archives ()

11800

darwin_file=

11801

darwin_files=

11802

for darwin_file in $darwin_filelist; do

11803

- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`

11804

+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`

11805

$LIPO -create -output "$darwin_file" $darwin_files

11806

done # $darwin_filelist

11807

$RM -rf unfat-$$

11808

@@ -2684,25 +3809,30 @@ func_extract_archives ()

11809

func_extract_an_archive "$my_xdir" "$my_xabs"

11810

;;

11811

esac

11812

- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`

11813

+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`

11814

done

11815

11816

func_extract_archives_result="$my_oldobjs"

11817

}

11818

11819

11820

11821

-# func_emit_wrapper_part1 [arg=no]

11822

+# func_emit_wrapper [arg=no]

11823

11824

-# Emit the first part of a libtool wrapper script on stdout.

11825

-# For more information, see the description associated with

11826

-# func_emit_wrapper(), below.

11827

-func_emit_wrapper_part1 ()

11828

11829

- func_emit_wrapper_part1_arg1=no

11830

- if test -n "$1" ; then

11831

- func_emit_wrapper_part1_arg1=$1

11832

- fi

11833

+# Emit a libtool wrapper script on stdout.

11834

+# Don't directly open a file because we may want to

11835

+# incorporate the script contents within a cygwin/mingw

11836

+# wrapper executable. Must ONLY be called from within

11837

+# func_mode_link because it depends on a number of variables

11838

+# set therein.

11839

11840

+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR

11841

+# variable will take. If 'yes', then the emitted script

11842

+# will assume that the directory in which it is stored is

11843

+# the $objdir directory. This is a cygwin/mingw-specific

11844

+# behavior.

11845

+func_emit_wrapper ()

11846

11847

+ func_emit_wrapper_arg1=${1-no}

11848

11849

$ECHO "\

11850

#! $SHELL

11851

@@ -2718,7 +3848,6 @@ func_emit_wrapper_part1 ()

11852

11853

# Sed substitution that helps us do robust quoting. It backslashifies

11854

# metacharacters that are still active within double-quoted strings.

11855

-Xsed='${SED} -e 1s/^X//'

11856

sed_quote_subst='$sed_quote_subst'

11857

11858

# Be Bourne compatible

11859

@@ -2749,31 +3878,132 @@ if test \"\$libtool_install_magic\" = \"

11860

else

11861

# When we are sourced in execute mode, \$file and \$ECHO are already set.

11862

if test \"\$libtool_execute_magic\" != \"$magic\"; then

11863

- ECHO=\"$qecho\"

11864

- file=\"\$0\"

11865

- # Make sure echo works.

11866

- if test \"X\$1\" = X--no-reexec; then

11867

- # Discard the --no-reexec flag, and continue.

11868

- shift

11869

- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then

11870

- # Yippee, \$ECHO works!

11871

- :

11872

- else

11873

- # Restart under the correct shell, and then maybe \$ECHO will work.

11874

- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}

11875

- fi

11876

- fi\

11877

+ file=\"\$0\""

11878

11879

+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`

11880

+ $ECHO "\

11881

11882

+# A function that is used when there is no print builtin or printf.

11883

+func_fallback_echo ()

11884

11885

+ eval 'cat <<_LTECHO_EOF

11886

+\$1

11887

+_LTECHO_EOF'

11888

11889

+ ECHO=\"$qECHO\"

11890

+ fi

11891

11892

+# Very basic option parsing. These options are (a) specific to

11893

+# the libtool wrapper, (b) are identical between the wrapper

11894

+# /script/ and the wrapper /executable/ which is used only on

11895

+# windows platforms, and (c) all begin with the string "--lt-"

11896

+# (application programs are unlikely to have options which match

11897

+# this pattern).

11898

11899

+# There are only two supported options: --lt-debug and

11900

+# --lt-dump-script. There is, deliberately, no --lt-help.

11901

11902

+# The first argument to this parsing function should be the

11903

+# script's $0 value, followed by "$@".

11904

+lt_option_debug=

11905

+func_parse_lt_options ()

11906

11907

+ lt_script_arg0=\$0

11908

+ shift

11909

+ for lt_opt

11910

+ do

11911

+ case \"\$lt_opt\" in

11912

+ --lt-debug) lt_option_debug=1 ;;

11913

+ --lt-dump-script)

11914

+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`

11915

+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.

11916

+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`

11917

+ cat \"\$lt_dump_D/\$lt_dump_F\"

11918

+ exit 0

11919

+ ;;

11920

+ --lt-*)

11921

+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2

11922

+ exit 1

11923

+ ;;

11924

+ esac

11925

+ done

11926

11927

+ # Print the debug banner immediately:

11928

+ if test -n \"\$lt_option_debug\"; then

11929

+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2

11930

+ fi

11931

11932

11933

+# Used when --lt-debug. Prints its arguments to stdout

11934

+# (redirection is the responsibility of the caller)

11935

+func_lt_dump_args ()

11936

11937

+ lt_dump_args_N=1;

11938

+ for lt_arg

11939

+ do

11940

+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"

11941

+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`

11942

+ done

11943

11944

11945

+# Core function for launching the target application

11946

+func_exec_program_core ()

11947

11948

11949

- $ECHO "\

11950

+ case $host in

11951

+ # Backslashes separate directories on plain windows

11952

+ *-*-mingw | *-*-os2* | *-cegcc*)

11953

+ $ECHO "\

11954

+ if test -n \"\$lt_option_debug\"; then

11955

+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2

11956

+ func_lt_dump_args \${1+\"\$@\"} 1>&2

11957

+ fi

11958

+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}

11959

11960

+ ;;

11961

11962

+ *)

11963

+ $ECHO "\

11964

+ if test -n \"\$lt_option_debug\"; then

11965

+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2

11966

+ func_lt_dump_args \${1+\"\$@\"} 1>&2

11967

+ fi

11968

+ exec \"\$progdir/\$program\" \${1+\"\$@\"}

11969

11970

+ ;;

11971

+ esac

11972

+ $ECHO "\

11973

+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2

11974

+ exit 1

11975

11976

11977

+# A function to encapsulate launching the target application

11978

+# Strips options in the --lt-* namespace from \$@ and

11979

+# launches target application with the remaining arguments.

11980

+func_exec_program ()

11981

11982

+ for lt_wr_arg

11983

+ do

11984

+ case \$lt_wr_arg in

11985

+ --lt-*) ;;

11986

+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;

11987

+ esac

18749

11988

+ shift

18750

+ fi

11989

+ done

11990

+ func_exec_program_core \${1+\"\$@\"}

11991

18751

11992

18752

IFS=" "

18753

for arg

18754

18755

case "$arg" in

18756

+ -o)

18757

+ shift

18758

+ ;;

18759

+ $object)

18760

+ shift

18761

+ ;;

18762

"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")

18763

set fnord "$@"

18764

shift

18765

@@ -557,16 +590,23 @@ msvisualcpp)

18766

;;

11993

+ # Parse options

11994

+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}

11995

11996

# Find the directory that this script lives in.

11997

- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`

11998

+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`

11999

test \"x\$thisdir\" = \"x\$file\" && thisdir=.

12000

12001

# Follow symbolic links until we get to the real thisdir.

12002

- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`

12003

+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`

12004

while test -n \"\$file\"; do

12005

- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`

12006

+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`

12007

12008

# If there was a directory component, then change thisdir.

12009

if test \"x\$destdir\" != \"x\$file\"; then

12010

@@ -2783,30 +4013,13 @@ else

12011

esac

12012

12013

12014

- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`

12015

- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`

12016

+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`

12017

+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`

12018

done

12019

12020

12021

-# end: func_emit_wrapper_part1

12022

12023

-# func_emit_wrapper_part2 [arg=no]

12024

12025

-# Emit the second part of a libtool wrapper script on stdout.

12026

-# For more information, see the description associated with

12027

-# func_emit_wrapper(), below.

12028

-func_emit_wrapper_part2 ()

12029

12030

- func_emit_wrapper_part2_arg1=no

12031

- if test -n "$1" ; then

12032

- func_emit_wrapper_part2_arg1=$1

12033

- fi

12034

12035

- $ECHO "\

12036

12037

# Usually 'no', except on cygwin/mingw when embedded into

12038

# the cwrapper.

12039

- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1

12040

+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1

12041

if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then

12042

# special case for '.'

12043

if test \"\$thisdir\" = \".\"; then

12044

@@ -2814,7 +4027,7 @@ func_emit_wrapper_part2 ()

12045

12046

# remove .libs from thisdir

12047

case \"\$thisdir\" in

12048

- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;

12049

+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;

12050

$objdir ) thisdir=. ;;

18767

12051

esac

18768

done

18769

- "$@" -E |

18770

- sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"

18771

+ "$@" -E 2>/dev/null |

18772

+ sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"

18773

rm -f "$depfile"

18774

echo "$object : \\" > "$depfile"

18775

- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s:: \1 \\:p' >> "$depfile"

18776

+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s:: \1 \\:p' >> "$depfile"

18777

echo " " >> "$depfile"

18778

- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::\1\::p' >> "$depfile"

18779

+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"

18780

rm -f "$tmpdepfile"

18781

;;

18782

18783

+msvcmsys)

18784

+ # This case exists only to let depend.m4 do its work. It works by

18785

+ # looking at the text of this script. This case will never be run,

18786

+ # since it is checked for above.

18787

+ exit 1

18788

+ ;;

18789

18790

none)

18791

exec "$@"

18792

;;

18793

@@ -585,5 +625,6 @@ exit 0

18794

# eval: (add-hook 'write-file-hooks 'time-stamp)

18795

# time-stamp-start: "scriptversion="

18796

# time-stamp-format: "%:y-%02m-%02d.%02H"

18797

-# time-stamp-end: "$"

18798

+# time-stamp-time-zone: "UTC"

18799

+# time-stamp-end: "; # UTC"

18800

# End:

18801

--- protobuf-2.3.0.orig/install-sh

18802

+++ protobuf-2.3.0/install-sh

18803

@@ -1,7 +1,7 @@

18804

#!/bin/sh

18805

# install - install a program, script, or datafile

18806

18807

-scriptversion=2006-12-25.00

18808

+scriptversion=2009-04-28.21; # UTC

18809

18810

# This originates from X11R5 (mit/util/scripts/install.sh), which was

18811

# later released in X11R6 (xc/config/util/install.sh) with the

18812

@@ -515,5 +515,6 @@ done

18813

# eval: (add-hook 'write-file-hooks 'time-stamp)

18814

# time-stamp-start: "scriptversion="

18815

# time-stamp-format: "%:y-%02m-%02d.%02H"

18816

-# time-stamp-end: "$"

18817

+# time-stamp-time-zone: "UTC"

18818

+# time-stamp-end: "; # UTC"

18819

# End:

18820

--- protobuf-2.3.0.orig/missing

18821

+++ protobuf-2.3.0/missing

18822

@@ -1,10 +1,10 @@

18823

#! /bin/sh

18824

# Common stub for a few missing GNU programs while installing.

18825

18826

-scriptversion=2006-05-10.23

18827

+scriptversion=2009-04-28.21; # UTC

18828

18829

18830

-# Free Software Foundation, Inc.

18831

18832

+# 2008, 2009 Free Software Foundation, Inc.

18833

# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.

18834

18835

# This program is free software; you can redistribute it and/or modify

18836

@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23

18837

# GNU General Public License for more details.

18838

18839

# You should have received a copy of the GNU General Public License

18840

-# along with this program; if not, write to the Free Software

18841

-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

18842

-# 02110-1301, USA.

18843

+# along with this program. If not, see <http://www.gnu.org/licenses/>.

18844

18845

# As a special exception to the GNU General Public License, if you

18846

# distribute this file as part of a program that contains a

18847

@@ -89,6 +87,9 @@ Supported PROGRAM values:

18848

tar try tar, gnutar, gtar, then tar without non-portable flags

18849

yacc create \`y.tab.[ch]', if possible, from existing .[ch]

18850

18851

+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and

18852

+\`g' are ignored when checking the name.

18853

18854

Send bug reports to <bug-automake@gnu.org>."

18855

exit $?

18856

;;

18857

@@ -106,15 +107,22 @@ Send bug reports to <bug-automake@gnu.or

18858

18859

esac

18860

18861

+# normalize program name to check for.

18862

+program=`echo "$1" | sed '

18863

+ s/^gnu-//; t

18864

+ s/^gnu//; t

18865

+ s/^g//; t'`

18866

18867

# Now exit if we have it, but it failed. Also exit now if we

18868

# don't have it and --version was passed (most likely to detect

18869

-# the program).

18870

+# the program). This is about non-GNU programs, so use $1 not

18871

+# $program.

18872

case $1 in

18873

- lex|yacc)

18874

+ lex*|yacc*)

18875

# Not GNU programs, they don't have --version.

18876

;;

18877

18878

- tar)

18879

+ tar*)

18880

if test -n "$run"; then

18881

echo 1>&2 "ERROR: \`tar' requires --run"

18882

exit 1

18883

@@ -138,7 +146,7 @@ esac

18884

18885

# If it does not exist, or fails to run (possibly an outdated version),

18886

# try to emulate it.

18887

-case $1 in

18888

+case $program in

18889

aclocal*)

18890

echo 1>&2 "\

18891

WARNING: \`$1' is $msg. You should only need it if

18892

@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only

18893

touch aclocal.m4

18894

;;

18895

18896

- autoconf)

18897

+ autoconf*)

18898

echo 1>&2 "\

18899

WARNING: \`$1' is $msg. You should only need it if

18900

you modified \`${configure_ac}'. You might want to install the

18901

@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only

18902

touch configure

18903

;;

18904

18905

- autoheader)

18906

+ autoheader*)

18907

echo 1>&2 "\

18908

WARNING: \`$1' is $msg. You should only need it if

18909

you modified \`acconfig.h' or \`${configure_ac}'. You might want

18910

@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only

18911

while read f; do touch "$f"; done

18912

;;

18913

18914

- autom4te)

18915

+ autom4te*)

18916

echo 1>&2 "\

18917

WARNING: \`$1' is needed, but is $msg.

18918

You might have modified some files without having the

18919

@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.

18920

18921

;;

18922

18923

- bison|yacc)

18924

+ bison*|yacc*)

18925

echo 1>&2 "\

18926

WARNING: \`$1' $msg. You should only need it if

18927

you modified a \`.y' file. You may need the \`Bison' package

18928

@@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only ne

18929

18930

;;

18931

18932

- lex|flex)

18933

+ lex*|flex*)

18934

echo 1>&2 "\

18935

WARNING: \`$1' is $msg. You should only need it if

18936

you modified a \`.l' file. You may need the \`Flex' package

18937

@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only

18938

18939

;;

18940

18941

- help2man)

18942

+ help2man*)

18943

echo 1>&2 "\

18944

WARNING: \`$1' is $msg. You should only need it if

18945

you modified a dependency of a manual page. You may need the

18946

@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only

12052

12053

@@ -2869,6 +4082,18 @@ func_emit_wrapper_part2 ()

12054

12055

if test -f \"\$progdir/\$program\"; then"

12056

12057

+ # fixup the dll searchpath if we need to.

12058

+ #

12059

+ # Fix the DLL searchpath if we need to. Do this before prepending

12060

+ # to shlibpath, because on Windows, both are PATH and uninstalled

12061

+ # libraries must come first.

12062

+ if test -n "$dllsearchpath"; then

12063

+ $ECHO "\

12064

+ # Add the dll search path components to the executable PATH

12065

+ PATH=$dllsearchpath:\$PATH

12066

12067

+ fi

12068

12069

# Export our shlibpath_var if we have one.

12070

if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then

12071

$ECHO "\

12072

@@ -2877,253 +4102,28 @@ func_emit_wrapper_part2 ()

12073

12074

# Some systems cannot cope with colon-terminated $shlibpath_var

12075

# The second colon is a workaround for a bug in BeOS R4 sed

12076

- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`

12077

+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`

12078

12079

export $shlibpath_var

12080

12081

12082

12083

- # fixup the dll searchpath if we need to.

12084

- if test -n "$dllsearchpath"; then

12085

- $ECHO "\

12086

- # Add the dll search path components to the executable PATH

12087

- PATH=$dllsearchpath:\$PATH

12088

12089

- fi

12090

12091

$ECHO "\

12092

if test \"\$libtool_execute_magic\" != \"$magic\"; then

12093

# Run the actual program with our arguments.

12094

12095

- case $host in

12096

- # Backslashes separate directories on plain windows

12097

- *-*-mingw | *-*-os2* | *-cegcc*)

12098

- $ECHO "\

12099

- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}

12100

12101

- ;;

12102

12103

- *)

12104

- $ECHO "\

12105

- exec \"\$progdir/\$program\" \${1+\"\$@\"}

12106

12107

- ;;

12108

- esac

12109

- $ECHO "\

12110

- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2

12111

- exit 1

12112

+ func_exec_program \${1+\"\$@\"}

12113

12114

else

12115

# The program doesn't exist.

12116

\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2

12117

\$ECHO \"This script is just a wrapper for \$program.\" 1>&2

12118

- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2

12119

- exit 1

12120

- fi

12121

-fi\

12122

12123

12124

-# end: func_emit_wrapper_part2

12125

12126

12127

-# func_emit_wrapper [arg=no]

12128

12129

-# Emit a libtool wrapper script on stdout.

12130

-# Don't directly open a file because we may want to

12131

-# incorporate the script contents within a cygwin/mingw

12132

-# wrapper executable. Must ONLY be called from within

12133

-# func_mode_link because it depends on a number of variables

12134

-# set therein.

12135

12136

-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR

12137

-# variable will take. If 'yes', then the emitted script

12138

-# will assume that the directory in which it is stored is

12139

-# the $objdir directory. This is a cygwin/mingw-specific

12140

-# behavior.

12141

-func_emit_wrapper ()

12142

12143

- func_emit_wrapper_arg1=no

12144

- if test -n "$1" ; then

12145

- func_emit_wrapper_arg1=$1

12146

- fi

12147

12148

- # split this up so that func_emit_cwrapperexe_src

12149

- # can call each part independently.

12150

- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"

12151

- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"

12152

12153

12154

12155

-# func_to_host_path arg

12156

12157

-# Convert paths to host format when used with build tools.

12158

-# Intended for use with "native" mingw (where libtool itself

12159

-# is running under the msys shell), or in the following cross-

12160

-# build environments:

12161

-# $build $host

12162

-# mingw (msys) mingw [e.g. native]

12163

-# cygwin mingw

12164

-# *nix + wine mingw

12165

-# where wine is equipped with the `winepath' executable.

12166

-# In the native mingw case, the (msys) shell automatically

12167

-# converts paths for any non-msys applications it launches,

12168

-# but that facility isn't available from inside the cwrapper.

12169

-# Similar accommodations are necessary for $host mingw and

12170

-# $build cygwin. Calling this function does no harm for other

12171

-# $host/$build combinations not listed above.

12172

12173

-# ARG is the path (on $build) that should be converted to

12174

-# the proper representation for $host. The result is stored

12175

-# in $func_to_host_path_result.

12176

-func_to_host_path ()

12177

12178

- func_to_host_path_result="$1"

12179

- if test -n "$1" ; then

12180

- case $host in

12181

- *mingw* )

12182

- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'

12183

- case $build in

12184

- *mingw* ) # actually, msys

12185

- # awkward: cmd appends spaces to result

12186

- lt_sed_strip_trailing_spaces="s/[ ]*\$//"

12187

- func_to_host_path_tmp1=`( cmd //c echo "$1" |\

12188

- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`

12189

- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

12190

- $SED -e "$lt_sed_naive_backslashify"`

12191

- ;;

12192

- *cygwin* )

12193

- func_to_host_path_tmp1=`cygpath -w "$1"`

12194

- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

12195

- $SED -e "$lt_sed_naive_backslashify"`

12196

- ;;

12197

- * )

12198

- # Unfortunately, winepath does not exit with a non-zero

12199

- # error code, so we are forced to check the contents of

12200

- # stdout. On the other hand, if the command is not

12201

- # found, the shell will set an exit code of 127 and print

12202

- # *an error message* to stdout. So we must check for both

12203

- # error code of zero AND non-empty stdout, which explains

12204

- # the odd construction:

12205

- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`

12206

- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then

12207

- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

12208

- $SED -e "$lt_sed_naive_backslashify"`

12209

- else

12210

- # Allow warning below.

12211

- func_to_host_path_result=""

12212

- fi

12213

- ;;

12214

- esac

12215

- if test -z "$func_to_host_path_result" ; then

12216

- func_error "Could not determine host path corresponding to"

12217

- func_error " '$1'"

12218

- func_error "Continuing, but uninstalled executables may not work."

12219

- # Fallback:

12220

- func_to_host_path_result="$1"

12221

- fi

12222

- ;;

12223

- esac

12224

- fi

12225

12226

-# end: func_to_host_path

12227

12228

-# func_to_host_pathlist arg

12229

12230

-# Convert pathlists to host format when used with build tools.

12231

-# See func_to_host_path(), above. This function supports the

12232

-# following $build/$host combinations (but does no harm for

12233

-# combinations not listed here):

12234

-# $build $host

12235

-# mingw (msys) mingw [e.g. native]

12236

-# cygwin mingw

12237

-# *nix + wine mingw

12238

12239

-# Path separators are also converted from $build format to

12240

-# $host format. If ARG begins or ends with a path separator

12241

-# character, it is preserved (but converted to $host format)

12242

-# on output.

12243

12244

-# ARG is a pathlist (on $build) that should be converted to

12245

-# the proper representation on $host. The result is stored

12246

-# in $func_to_host_pathlist_result.

12247

-func_to_host_pathlist ()

12248

12249

- func_to_host_pathlist_result="$1"

12250

- if test -n "$1" ; then

12251

- case $host in

12252

- *mingw* )

12253

- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'

12254

- # Remove leading and trailing path separator characters from

12255

- # ARG. msys behavior is inconsistent here, cygpath turns them

12256

- # into '.;' and ';.', and winepath ignores them completely.

12257

- func_to_host_pathlist_tmp2="$1"

12258

- # Once set for this call, this variable should not be

12259

- # reassigned. It is used in tha fallback case.

12260

- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\

12261

- $SED -e 's|^:*||' -e 's|:*$||'`

12262

- case $build in

12263

- *mingw* ) # Actually, msys.

12264

- # Awkward: cmd appends spaces to result.

12265

- lt_sed_strip_trailing_spaces="s/[ ]*\$//"

12266

- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\

12267

- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`

12268

- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\

12269

- $SED -e "$lt_sed_naive_backslashify"`

12270

- ;;

12271

- *cygwin* )

12272

- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`

12273

- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\

12274

- $SED -e "$lt_sed_naive_backslashify"`

12275

- ;;

12276

- * )

12277

- # unfortunately, winepath doesn't convert pathlists

12278

- func_to_host_pathlist_result=""

12279

- func_to_host_pathlist_oldIFS=$IFS

12280

- IFS=:

12281

- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do

12282

- IFS=$func_to_host_pathlist_oldIFS

12283

- if test -n "$func_to_host_pathlist_f" ; then

12284

- func_to_host_path "$func_to_host_pathlist_f"

12285

- if test -n "$func_to_host_path_result" ; then

12286

- if test -z "$func_to_host_pathlist_result" ; then

12287

- func_to_host_pathlist_result="$func_to_host_path_result"

12288

- else

12289

- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"

12290

- fi

12291

- fi

12292

- fi

12293

- IFS=:

12294

- done

12295

- IFS=$func_to_host_pathlist_oldIFS

12296

- ;;

12297

- esac

12298

- if test -z "$func_to_host_pathlist_result" ; then

12299

- func_error "Could not determine the host path(s) corresponding to"

12300

- func_error " '$1'"

12301

- func_error "Continuing, but uninstalled executables may not work."

12302

- # Fallback. This may break if $1 contains DOS-style drive

12303

- # specifications. The fix is not to complicate the expression

12304

- # below, but for the user to provide a working wine installation

12305

- # with winepath so that path translation in the cross-to-mingw

12306

- # case works properly.

12307

- lt_replace_pathsep_nix_to_dos="s|:|;|g"

12308

- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\

12309

- $SED -e "$lt_replace_pathsep_nix_to_dos"`

12310

- fi

12311

- # Now, add the leading and trailing path separators back

12312

- case "$1" in

12313

- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"

12314

- ;;

12315

- esac

12316

- case "$1" in

12317

- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"

12318

- ;;

12319

- esac

12320

- ;;

12321

- esac

12322

+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2

12323

+ exit 1

12324

12325

+fi\

12326

12327

}

12328

-# end: func_to_host_pathlist

12329

12330

12331

# func_emit_cwrapperexe_src

12332

# emit the source code for a wrapper executable on stdout

12333

@@ -3141,31 +4141,23 @@ func_emit_cwrapperexe_src ()

12334

12335

This wrapper executable should never be moved out of the build directory.

12336

If it is, it will not operate correctly.

12337

12338

- Currently, it simply execs the wrapper *script* "$SHELL $output",

12339

- but could eventually absorb all of the scripts functionality and

12340

- exec $objdir/$outputname directly.

12341

12342

EOF

12343

cat <<"EOF"

12344

+#ifdef _MSC_VER

12345

+# define _CRT_SECURE_NO_DEPRECATE 1

12346

+#endif

12347

#include <stdio.h>

12348

#include <stdlib.h>

12349

#ifdef _MSC_VER

12350

# include <direct.h>

12351

# include <process.h>

12352

# include <io.h>

12353

-# define setmode _setmode

12354

#else

12355

# include <unistd.h>

12356

# include <stdint.h>

12357

# ifdef __CYGWIN__

12358

# include <io.h>

12359

-# define HAVE_SETENV

12360

-# ifdef __STRICT_ANSI__

12361

-char *realpath (const char *, char *);

12362

-int putenv (char *);

12363

-int setenv (const char *, const char *, int);

12364

-# endif

12365

# endif

12366

#endif

12367

#include <malloc.h>

12368

@@ -3177,6 +4169,44 @@ int setenv (const char *, const char *,

12369

#include <fcntl.h>

12370

#include <sys/stat.h>

12371

12372

+/* declarations of non-ANSI functions */

12373

+#if defined(__MINGW32__)

12374

+# ifdef __STRICT_ANSI__

12375

+int _putenv (const char *);

12376

+# endif

12377

+#elif defined(__CYGWIN__)

12378

+# ifdef __STRICT_ANSI__

12379

+char *realpath (const char *, char *);

12380

+int putenv (char *);

12381

+int setenv (const char *, const char *, int);

12382

+# endif

12383

+/* #elif defined (other platforms) ... */

12384

+#endif

12385

12386

+/* portability defines, excluding path handling macros */

12387

+#if defined(_MSC_VER)

12388

+# define setmode _setmode

12389

+# define stat _stat

12390

+# define chmod _chmod

12391

+# define getcwd _getcwd

12392

+# define putenv _putenv

12393

+# define S_IXUSR _S_IEXEC

12394

+# ifndef _INTPTR_T_DEFINED

12395

+# define _INTPTR_T_DEFINED

12396

+# define intptr_t int

12397

+# endif

12398

+#elif defined(__MINGW32__)

12399

+# define setmode _setmode

12400

+# define stat _stat

12401

+# define chmod _chmod

12402

+# define getcwd _getcwd

12403

+# define putenv _putenv

12404

+#elif defined(__CYGWIN__)

12405

+# define HAVE_SETENV

12406

+# define FOPEN_WB "wb"

12407

+/* #elif defined (other platforms) ... */

12408

+#endif

12409

12410

#if defined(PATH_MAX)

12411

# define LT_PATHMAX PATH_MAX

12412

#elif defined(MAXPATHLEN)

12413

@@ -3192,14 +4222,7 @@ int setenv (const char *, const char *,

12414

# define S_IXGRP 0

12415

#endif

12416

12417

-#ifdef _MSC_VER

12418

-# define S_IXUSR _S_IEXEC

12419

-# define stat _stat

12420

-# ifndef _INTPTR_T_DEFINED

12421

-# define intptr_t int

12422

-# endif

12423

-#endif

12424

12425

+/* path handling portability macros */

12426

#ifndef DIR_SEPARATOR

12427

# define DIR_SEPARATOR '/'

12428

# define PATH_SEPARATOR ':'

12429

@@ -3230,10 +4253,6 @@ int setenv (const char *, const char *,

12430

# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)

12431

#endif /* PATH_SEPARATOR_2 */

12432

12433

-#ifdef __CYGWIN__

12434

-# define FOPEN_WB "wb"

12435

-#endif

12436

12437

#ifndef FOPEN_WB

12438

# define FOPEN_WB "w"

12439

#endif

12440

@@ -3246,22 +4265,13 @@ int setenv (const char *, const char *,

12441

if (stale) { free ((void *) stale); stale = 0; } \

12442

} while (0)

12443

12444

-#undef LTWRAPPER_DEBUGPRINTF

12445

-#if defined DEBUGWRAPPER

12446

-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args

12447

-static void

12448

-ltwrapper_debugprintf (const char *fmt, ...)

12449

12450

- va_list args;

12451

- va_start (args, fmt);

12452

- (void) vfprintf (stderr, fmt, args);

12453

- va_end (args);

12454

12455

+#if defined(LT_DEBUGWRAPPER)

12456

+static int lt_debug = 1;

12457

#else

12458

-# define LTWRAPPER_DEBUGPRINTF(args)

12459

+static int lt_debug = 0;

12460

#endif

12461

12462

-const char *program_name = NULL;

12463

+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */

12464

12465

void *xmalloc (size_t num);

12466

char *xstrdup (const char *string);

12467

@@ -3271,41 +4281,27 @@ char *chase_symlinks (const char *pathsp

12468

int make_executable (const char *path);

12469

int check_executable (const char *path);

12470

char *strendzap (char *str, const char *pat);

12471

-void lt_fatal (const char *message, ...);

12472

+void lt_debugprintf (const char *file, int line, const char *fmt, ...);

12473

+void lt_fatal (const char *file, int line, const char *message, ...);

12474

+static const char *nonnull (const char *s);

12475

+static const char *nonempty (const char *s);

12476

void lt_setenv (const char *name, const char *value);

12477

char *lt_extend_str (const char *orig_value, const char *add, int to_end);

12478

-void lt_opt_process_env_set (const char *arg);

12479

-void lt_opt_process_env_prepend (const char *arg);

12480

-void lt_opt_process_env_append (const char *arg);

12481

-int lt_split_name_value (const char *arg, char** name, char** value);

12482

void lt_update_exe_path (const char *name, const char *value);

12483

void lt_update_lib_path (const char *name, const char *value);

12484

12485

-static const char *script_text_part1 =

12486

-EOF

12487

12488

- func_emit_wrapper_part1 yes |

12489

- $SED -e 's/$[\\"]$/\\\1/g' \

12490

- -e 's/^/ "/' -e 's/$/\\n"/'

12491

- echo ";"

12492

- cat <<EOF

12493

12494

-static const char *script_text_part2 =

12495

+char **prepare_spawn (char **argv);

12496

+void lt_dump_script (FILE *f);

12497

EOF

12498

- func_emit_wrapper_part2 yes |

12499

- $SED -e 's/$[\\"]$/\\\1/g' \

12500

- -e 's/^/ "/' -e 's/$/\\n"/'

12501

- echo ";"

12502

12503

cat <<EOF

12504

-const char * MAGIC_EXE = "$magic_exe";

12505

+volatile const char * MAGIC_EXE = "$magic_exe";

12506

const char * LIB_PATH_VARNAME = "$shlibpath_var";

12507

EOF

12508

12509

if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then

12510

- func_to_host_pathlist "$temp_rpath"

12511

+ func_to_host_path "$temp_rpath"

12512

cat <<EOF

12513

-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";

12514

+const char * LIB_PATH_VALUE = "$func_to_host_path_result";

12515

EOF

12516

else

12517

cat <<"EOF"

12518

@@ -3314,10 +4310,10 @@ EOF

12519

12520

12521

if test -n "$dllsearchpath"; then

12522

- func_to_host_pathlist "$dllsearchpath:"

12523

+ func_to_host_path "$dllsearchpath:"

12524

cat <<EOF

12525

const char * EXE_PATH_VARNAME = "PATH";

12526

-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";

12527

+const char * EXE_PATH_VALUE = "$func_to_host_path_result";

12528

EOF

12529

else

12530

cat <<"EOF"

12531

@@ -3340,24 +4336,10 @@ EOF

12532

cat <<"EOF"

12533

12534

#define LTWRAPPER_OPTION_PREFIX "--lt-"

12535

-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5

12536

12537

-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;

12538

static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;

12539

12540

static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";

12541

12542

-static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;

12543

-static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";

12544

- /* argument is putenv-style "foo=bar", value of foo is set to bar */

12545

12546

-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;

12547

-static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";

12548

- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */

12549

12550

-static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;

12551

-static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";

12552

- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */

12553

+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";

12554

12555

int

12556

main (int argc, char *argv[])

12557

@@ -3374,10 +4356,13 @@ main (int argc, char *argv[])

12558

int i;

12559

12560

program_name = (char *) xstrdup (base_name (argv[0]));

12561

- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));

12562

- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));

12563

+ newargz = XMALLOC (char *, argc + 1);

12564

12565

- /* very simple arg parsing; don't want to rely on getopt */

12566

+ /* very simple arg parsing; don't want to rely on getopt

12567

+ * also, copy all non cwrapper options to newargz, except

12568

+ * argz[0], which is handled differently

12569

+ */

12570

+ newargc=0;

12571

for (i = 1; i < argc; i++)

12572

{

12573

if (strcmp (argv[i], dumpscript_opt) == 0)

12574

@@ -3391,25 +4376,57 @@ EOF

12575

esac

12576

12577

cat <<"EOF"

12578

- printf ("%s", script_text_part1);

12579

- printf ("%s", script_text_part2);

12580

+ lt_dump_script (stdout);

12581

return 0;

12582

}

12583

+ if (strcmp (argv[i], debug_opt) == 0)

12584

+ {

12585

+ lt_debug = 1;

12586

+ continue;

12587

+ }

12588

+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)

12589

+ {

12590

+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX

12591

+ namespace, but it is not one of the ones we know about and

12592

+ have already dealt with, above (inluding dump-script), then

12593

+ report an error. Otherwise, targets might begin to believe

12594

+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX

12595

+ namespace. The first time any user complains about this, we'll

12596

+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option

12597

+ or a configure.ac-settable value.

12598

+ */

12599

+ lt_fatal (__FILE__, __LINE__,

12600

+ "unrecognized %s option: '%s'",

12601

+ ltwrapper_option_prefix, argv[i]);

12602

+ }

12603

+ /* otherwise ... */

12604

+ newargz[++newargc] = xstrdup (argv[i]);

12605

}

12606

+ newargz[++newargc] = NULL;

12607

12608

+EOF

12609

+ cat <<EOF

12610

+ /* The GNU banner must be the first non-error debug message */

12611

+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");

12612

+EOF

12613

+ cat <<"EOF"

12614

+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);

12615

+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);

12616

12617

- newargz = XMALLOC (char *, argc + 1);

12618

tmp_pathspec = find_executable (argv[0]);

12619

if (tmp_pathspec == NULL)

12620

- lt_fatal ("Couldn't find %s", argv[0]);

12621

- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",

12622

- tmp_pathspec));

12623

+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);

12624

+ lt_debugprintf (__FILE__, __LINE__,

12625

+ "(main) found exe (before symlink chase) at: %s\n",

12626

+ tmp_pathspec);

12627

12628

actual_cwrapper_path = chase_symlinks (tmp_pathspec);

12629

- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",

12630

- actual_cwrapper_path));

12631

+ lt_debugprintf (__FILE__, __LINE__,

12632

+ "(main) found exe (after symlink chase) at: %s\n",

12633

+ actual_cwrapper_path);

12634

XFREE (tmp_pathspec);

12635

12636

- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));

12637

+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));

12638

strendzap (actual_cwrapper_path, actual_cwrapper_name);

12639

12640

/* wrapper name transforms */

12641

@@ -3427,8 +4444,9 @@ EOF

12642

target_name = tmp_pathspec;

12643

tmp_pathspec = 0;

12644

12645

- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",

12646

- target_name));

12647

+ lt_debugprintf (__FILE__, __LINE__,

12648

+ "(main) libtool target name: %s\n",

12649

+ target_name);

12650

EOF

12651

12652

cat <<EOF

12653

@@ -3478,80 +4496,19 @@ EOF

12654

12655

lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */

12656

lt_setenv ("DUALCASE", "1"); /* for MSK sh */

12657

- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);

12658

+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must

12659

+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)

12660

+ because on Windows, both *_VARNAMEs are PATH but uninstalled

12661

+ libraries must come first. */

12662

lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);

12663

+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);

12664

12665

- newargc=0;

12666

- for (i = 1; i < argc; i++)

12667

- {

12668

- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)

12669

- {

12670

- if (argv[i][env_set_opt_len] == '=')

12671

- {

12672

- const char *p = argv[i] + env_set_opt_len + 1;

12673

- lt_opt_process_env_set (p);

12674

- }

12675

- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)

12676

- {

12677

- lt_opt_process_env_set (argv[++i]); /* don't copy */

12678

- }

12679

- else

12680

- lt_fatal ("%s missing required argument", env_set_opt);

12681

- continue;

12682

- }

12683

- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)

12684

- {

12685

- if (argv[i][env_prepend_opt_len] == '=')

12686

- {

12687

- const char *p = argv[i] + env_prepend_opt_len + 1;

12688

- lt_opt_process_env_prepend (p);

12689

- }

12690

- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)

12691

- {

12692

- lt_opt_process_env_prepend (argv[++i]); /* don't copy */

12693

- }

12694

- else

12695

- lt_fatal ("%s missing required argument", env_prepend_opt);

12696

- continue;

12697

- }

12698

- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)

12699

- {

12700

- if (argv[i][env_append_opt_len] == '=')

12701

- {

12702

- const char *p = argv[i] + env_append_opt_len + 1;

12703

- lt_opt_process_env_append (p);

12704

- }

12705

- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)

12706

- {

12707

- lt_opt_process_env_append (argv[++i]); /* don't copy */

12708

- }

12709

- else

12710

- lt_fatal ("%s missing required argument", env_append_opt);

12711

- continue;

12712

- }

12713

- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)

12714

- {

12715

- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX

12716

- namespace, but it is not one of the ones we know about and

12717

- have already dealt with, above (inluding dump-script), then

12718

- report an error. Otherwise, targets might begin to believe

12719

- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX

12720

- namespace. The first time any user complains about this, we'll

12721

- need to make LTWRAPPER_OPTION_PREFIX a configure-time option

12722

- or a configure.ac-settable value.

12723

- */

12724

- lt_fatal ("Unrecognized option in %s namespace: '%s'",

12725

- ltwrapper_option_prefix, argv[i]);

12726

- }

12727

- /* otherwise ... */

12728

- newargz[++newargc] = xstrdup (argv[i]);

12729

- }

12730

- newargz[++newargc] = NULL;

12731

12732

- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));

12733

+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",

12734

+ nonnull (lt_argv_zero));

12735

for (i = 0; i < newargc; i++)

12736

{

12737

- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));

12738

+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",

12739

+ i, nonnull (newargz[i]));

12740

}

12741

12742

EOF

12743

@@ -3560,11 +4517,14 @@ EOF

12744

mingw*)

12745

cat <<"EOF"

12746

/* execv doesn't actually work on mingw as expected on unix */

12747

+ newargz = prepare_spawn (newargz);

12748

rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);

12749

if (rval == -1)

12750

{

12751

/* failed to start process */

12752

- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));

12753

+ lt_debugprintf (__FILE__, __LINE__,

12754

+ "(main) failed to launch target \"%s\": %s\n",

12755

+ lt_argv_zero, nonnull (strerror (errno)));

12756

return 127;

12757

}

12758

return rval;

12759

@@ -3586,7 +4546,7 @@ xmalloc (size_t num)

12760

{

12761

void *p = (void *) malloc (num);

12762

if (!p)

12763

- lt_fatal ("Memory exhausted");

12764

+ lt_fatal (__FILE__, __LINE__, "memory exhausted");

12765

12766

return p;

12767

}

12768

@@ -3620,8 +4580,8 @@ check_executable (const char *path)

12769

{

12770

struct stat st;

12771

12772

- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",

12773

- path ? (*path ? path : "EMPTY!") : "NULL!"));

12774

+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",

12775

+ nonempty (path));

12776

if ((!path) || (!*path))

12777

return 0;

12778

12779

@@ -3638,8 +4598,8 @@ make_executable (const char *path)

12780

int rval = 0;

12781

struct stat st;

12782

12783

- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",

12784

- path ? (*path ? path : "EMPTY!") : "NULL!"));

12785

+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",

12786

+ nonempty (path));

12787

if ((!path) || (!*path))

12788

return 0;

12789

12790

@@ -3665,8 +4625,8 @@ find_executable (const char *wrapper)

12791

int tmp_len;

12792

char *concat_name;

12793

12794

- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",

12795

- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));

12796

+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",

12797

+ nonempty (wrapper));

12798

12799

if ((wrapper == NULL) || (*wrapper == '\0'))

12800

return NULL;

12801

@@ -3719,7 +4679,8 @@ find_executable (const char *wrapper)

12802

{

12803

/* empty path: current directory */

12804

if (getcwd (tmp, LT_PATHMAX) == NULL)

12805

- lt_fatal ("getcwd failed");

12806

+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",

12807

+ nonnull (strerror (errno)));

12808

tmp_len = strlen (tmp);

12809

concat_name =

12810

XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);

12811

@@ -3744,7 +4705,8 @@ find_executable (const char *wrapper)

12812

}

12813

/* Relative path | not found in path: prepend cwd */

12814

if (getcwd (tmp, LT_PATHMAX) == NULL)

12815

- lt_fatal ("getcwd failed");

12816

+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",

12817

+ nonnull (strerror (errno)));

12818

tmp_len = strlen (tmp);

12819

concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);

12820

memcpy (concat_name, tmp, tmp_len);

12821

@@ -3770,8 +4732,9 @@ chase_symlinks (const char *pathspec)

12822

int has_symlinks = 0;

12823

while (strlen (tmp_pathspec) && !has_symlinks)

12824

{

12825

- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",

12826

- tmp_pathspec));

12827

+ lt_debugprintf (__FILE__, __LINE__,

12828

+ "checking path component for symlinks: %s\n",

12829

+ tmp_pathspec);

12830

if (lstat (tmp_pathspec, &s) == 0)

12831

{

12832

if (S_ISLNK (s.st_mode) != 0)

12833

@@ -3793,8 +4756,9 @@ chase_symlinks (const char *pathspec)

12834

}

12835

else

12836

{

12837

- char *errstr = strerror (errno);

12838

- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);

12839

+ lt_fatal (__FILE__, __LINE__,

12840

+ "error accessing file \"%s\": %s",

12841

+ tmp_pathspec, nonnull (strerror (errno)));

12842

}

12843

}

12844

XFREE (tmp_pathspec);

12845

@@ -3807,7 +4771,8 @@ chase_symlinks (const char *pathspec)

12846

tmp_pathspec = realpath (pathspec, buf);

12847

if (tmp_pathspec == 0)

12848

{

12849

- lt_fatal ("Could not follow symlinks for %s", pathspec);

12850

+ lt_fatal (__FILE__, __LINE__,

12851

+ "could not follow symlinks for %s", pathspec);

12852

}

12853

return xstrdup (tmp_pathspec);

12854

#endif

12855

@@ -3833,11 +4798,25 @@ strendzap (char *str, const char *pat)

12856

return str;

12857

}

12858

12859

+void

12860

+lt_debugprintf (const char *file, int line, const char *fmt, ...)

12861

12862

+ va_list args;

12863

+ if (lt_debug)

12864

+ {

12865

+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);

12866

+ va_start (args, fmt);

12867

+ (void) vfprintf (stderr, fmt, args);

12868

+ va_end (args);

12869

+ }

12870

12871

12872

static void

12873

-lt_error_core (int exit_status, const char *mode,

12874

+lt_error_core (int exit_status, const char *file,

12875

+ int line, const char *mode,

12876

const char *message, va_list ap)

12877

{

12878

- fprintf (stderr, "%s: %s: ", program_name, mode);

12879

+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);

12880

vfprintf (stderr, message, ap);

12881

fprintf (stderr, ".\n");

12882

12883

@@ -3846,20 +4825,32 @@ lt_error_core (int exit_status, const ch

12884

}

12885

12886

void

12887

-lt_fatal (const char *message, ...)

12888

+lt_fatal (const char *file, int line, const char *message, ...)

12889

{

12890

va_list ap;

12891

va_start (ap, message);

12892

- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);

12893

+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);

12894

va_end (ap);

12895

}

12896

12897

+static const char *

12898

+nonnull (const char *s)

12899

12900

+ return s ? s : "(null)";

12901

12902

12903

+static const char *

12904

+nonempty (const char *s)

12905

12906

+ return (s && !*s) ? "(empty)" : nonnull (s);

12907

12908

12909

void

12910

lt_setenv (const char *name, const char *value)

12911

{

12912

- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",

12913

- (name ? name : "<NULL>"),

12914

- (value ? value : "<NULL>")));

12915

+ lt_debugprintf (__FILE__, __LINE__,

12916

+ "(lt_setenv) setting '%s' to '%s'\n",

12917

+ nonnull (name), nonnull (value));

12918

{

12919

#ifdef HAVE_SETENV

12920

/* always make a copy, for consistency with !HAVE_SETENV */

12921

@@ -3904,95 +4895,12 @@ lt_extend_str (const char *orig_value, c

12922

return new_value;

12923

}

12924

12925

-int

12926

-lt_split_name_value (const char *arg, char** name, char** value)

12927

12928

- const char *p;

12929

- int len;

12930

- if (!arg || !*arg)

12931

- return 1;

12932

12933

- p = strchr (arg, (int)'=');

12934

12935

- if (!p)

12936

- return 1;

12937

12938

- *value = xstrdup (++p);

12939

12940

- len = strlen (arg) - strlen (*value);

12941

- *name = XMALLOC (char, len);

12942

- strncpy (*name, arg, len-1);

12943

- (*name)[len - 1] = '\0';

12944

12945

- return 0;

12946

12947

12948

-void

12949

-lt_opt_process_env_set (const char *arg)

12950

12951

- char *name = NULL;

12952

- char *value = NULL;

12953

12954

- if (lt_split_name_value (arg, &name, &value) != 0)

12955

- {

12956

- XFREE (name);

12957

- XFREE (value);

12958

- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);

12959

- }

12960

12961

- lt_setenv (name, value);

12962

- XFREE (name);

12963

- XFREE (value);

12964

12965

12966

-void

12967

-lt_opt_process_env_prepend (const char *arg)

12968

12969

- char *name = NULL;

12970

- char *value = NULL;

12971

- char *new_value = NULL;

12972

12973

- if (lt_split_name_value (arg, &name, &value) != 0)

12974

- {

12975

- XFREE (name);

12976

- XFREE (value);

12977

- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);

12978

- }

12979

12980

- new_value = lt_extend_str (getenv (name), value, 0);

12981

- lt_setenv (name, new_value);

12982

- XFREE (new_value);

12983

- XFREE (name);

12984

- XFREE (value);

12985

12986

12987

-void

12988

-lt_opt_process_env_append (const char *arg)

12989

12990

- char *name = NULL;

12991

- char *value = NULL;

12992

- char *new_value = NULL;

12993

12994

- if (lt_split_name_value (arg, &name, &value) != 0)

12995

- {

12996

- XFREE (name);

12997

- XFREE (value);

12998

- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);

12999

- }

13000

13001

- new_value = lt_extend_str (getenv (name), value, 1);

13002

- lt_setenv (name, new_value);

13003

- XFREE (new_value);

13004

- XFREE (name);

13005

- XFREE (value);

13006

13007

13008

void

13009

lt_update_exe_path (const char *name, const char *value)

13010

{

13011

- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",

13012

- (name ? name : "<NULL>"),

13013

- (value ? value : "<NULL>")));

13014

+ lt_debugprintf (__FILE__, __LINE__,

13015

+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",

13016

+ nonnull (name), nonnull (value));

13017

13018

if (name && *name && value && *value)

13019

{

13020

@@ -4011,9 +4919,9 @@ lt_update_exe_path (const char *name, co

13021

void

13022

lt_update_lib_path (const char *name, const char *value)

13023

{

13024

- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",

13025

- (name ? name : "<NULL>"),

13026

- (value ? value : "<NULL>")));

13027

+ lt_debugprintf (__FILE__, __LINE__,

13028

+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",

13029

+ nonnull (name), nonnull (value));

13030

13031

if (name && *name && value && *value)

13032

{

13033

@@ -4023,11 +4931,152 @@ lt_update_lib_path (const char *name, co

13034

}

13035

}

13036

13037

+EOF

13038

+ case $host_os in

13039

+ mingw*)

13040

+ cat <<"EOF"

13041

13042

+/* Prepares an argument vector before calling spawn().

13043

+ Note that spawn() does not by itself call the command interpreter

13044

+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :

13045

+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);

13046

+ GetVersionEx(&v);

13047

+ v.dwPlatformId == VER_PLATFORM_WIN32_NT;

13048

+ }) ? "cmd.exe" : "command.com").

13049

+ Instead it simply concatenates the arguments, separated by ' ', and calls

13050

+ CreateProcess(). We must quote the arguments since Win32 CreateProcess()

13051

+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a

13052

+ special way:

13053

+ - Space and tab are interpreted as delimiters. They are not treated as

13054

+ delimiters if they are surrounded by double quotes: "...".

13055

+ - Unescaped double quotes are removed from the input. Their only effect is

13056

+ that within double quotes, space and tab are treated like normal

13057

+ characters.

13058

+ - Backslashes not followed by double quotes are not special.

13059

+ - But 2*n+1 backslashes followed by a double quote become

13060

+ n backslashes followed by a double quote (n >= 0):

13061

+ \" -> "

13062

+ \\\" -> \"

13063

+ \\\\\" -> \\"

13064

+ */

13065

+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"

13066

+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"

13067

+char **

13068

+prepare_spawn (char **argv)

13069

13070

+ size_t argc;

13071

+ char **new_argv;

13072

+ size_t i;

13073

13074

+ /* Count number of arguments. */

13075

+ for (argc = 0; argv[argc] != NULL; argc++)

13076

+ ;

13077

13078

+ /* Allocate new argument vector. */

13079

+ new_argv = XMALLOC (char *, argc + 1);

13080

13081

+ /* Put quoted arguments into the new argument vector. */

13082

+ for (i = 0; i < argc; i++)

13083

+ {

13084

+ const char *string = argv[i];

13085

13086

+ if (string[0] == '\0')

13087

+ new_argv[i] = xstrdup ("\"\"");

13088

+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)

13089

+ {

13090

+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);

13091

+ size_t length;

13092

+ unsigned int backslashes;

13093

+ const char *s;

13094

+ char *quoted_string;

13095

+ char *p;

13096

13097

+ length = 0;

13098

+ backslashes = 0;

13099

+ if (quote_around)

13100

+ length++;

13101

+ for (s = string; *s != '\0'; s++)

13102

+ {

13103

+ char c = *s;

13104

+ if (c == '"')

13105

+ length += backslashes + 1;

13106

+ length++;

13107

+ if (c == '\\')

13108

+ backslashes++;

13109

+ else

13110

+ backslashes = 0;

13111

+ }

13112

+ if (quote_around)

13113

+ length += backslashes + 1;

13114

13115

+ quoted_string = XMALLOC (char, length + 1);

13116

13117

+ p = quoted_string;

13118

+ backslashes = 0;

13119

+ if (quote_around)

13120

+ *p++ = '"';

13121

+ for (s = string; *s != '\0'; s++)

13122

+ {

13123

+ char c = *s;

13124

+ if (c == '"')

13125

+ {

13126

+ unsigned int j;

13127

+ for (j = backslashes + 1; j > 0; j--)

13128

+ *p++ = '\\';

13129

+ }

13130

+ *p++ = c;

13131

+ if (c == '\\')

13132

+ backslashes++;

13133

+ else

13134

+ backslashes = 0;

13135

+ }

13136

+ if (quote_around)

13137

+ {

13138

+ unsigned int j;

13139

+ for (j = backslashes; j > 0; j--)

13140

+ *p++ = '\\';

13141

+ *p++ = '"';

13142

+ }

13143

+ *p = '\0';

13144

13145

+ new_argv[i] = quoted_string;

13146

+ }

13147

+ else

13148

+ new_argv[i] = (char *) string;

13149

+ }

13150

+ new_argv[argc] = NULL;

13151

13152

+ return new_argv;

13153

13154

+EOF

13155

+ ;;

13156

+ esac

13157

13158

+ cat <<"EOF"

13159

+void lt_dump_script (FILE* f)

13160

13161

+EOF

13162

+ func_emit_wrapper yes |

13163

+ $SED -e 's/$[\\"]$/\\\1/g' \

13164

+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'

13165

13166

+ cat <<"EOF"

13167

13168

EOF

13169

}

13170

# end: func_emit_cwrapperexe_src

13171

13172

+# func_win32_import_lib_p ARG

13173

+# True if ARG is an import lib, as indicated by $file_magic_cmd

13174

+func_win32_import_lib_p ()

13175

13176

+ $opt_debug

13177

+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in

13178

+ *import*) : ;;

13179

+ *) false ;;

13180

+ esac

13181

13182

13183

# func_mode_link arg...

13184

func_mode_link ()

13185

{

13186

@@ -4072,6 +5121,7 @@ func_mode_link ()

13187

new_inherited_linker_flags=

13188

13189

avoid_version=no

13190

+ bindir=

13191

dlfiles=

13192

dlprefiles=

13193

dlself=no

13194

@@ -4164,6 +5214,11 @@ func_mode_link ()

13195

esac

13196

13197

case $prev in

13198

+ bindir)

13199

+ bindir="$arg"

13200

+ prev=

13201

+ continue

13202

+ ;;

13203

dlfiles|dlprefiles)

13204

if test "$preload" = no; then

13205

# Add the symbol object into the linking commands.

13206

@@ -4195,9 +5250,9 @@ func_mode_link ()

13207

;;

13208

13209

if test "$prev" = dlfiles; then

13210

- dlfiles="$dlfiles $arg"

13211

+ func_append dlfiles " $arg"

13212

else

13213

- dlprefiles="$dlprefiles $arg"

13214

+ func_append dlprefiles " $arg"

13215

13216

prev=

13217

continue

13218

@@ -4221,7 +5276,7 @@ func_mode_link ()

13219

*-*-darwin*)

13220

case "$deplibs " in

13221

*" $qarg.ltframework "*) ;;

13222

- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later

13223

+ *) func_append deplibs " $qarg.ltframework" # this is fixed later

13224

;;

13225

esac

13226

;;

13227

@@ -4240,7 +5295,7 @@ func_mode_link ()

13228

moreargs=

13229

for fil in `cat "$save_arg"`

13230

13231

-# moreargs="$moreargs $fil"

13232

+# func_append moreargs " $fil"

13233

arg=$fil

13234

# A libtool-controlled object.

13235

13236

@@ -4269,7 +5324,7 @@ func_mode_link ()

13237

13238

if test "$prev" = dlfiles; then

13239

if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then

13240

- dlfiles="$dlfiles $pic_object"

13241

+ func_append dlfiles " $pic_object"

13242

prev=

13243

continue

13244

else

13245

@@ -4281,7 +5336,7 @@ func_mode_link ()

13246

# CHECK ME: I think I busted this. -Ossama

13247

if test "$prev" = dlprefiles; then

13248

# Preload the old-style object.

13249

- dlprefiles="$dlprefiles $pic_object"

13250

+ func_append dlprefiles " $pic_object"

13251

prev=

13252

13253

13254

@@ -4351,12 +5406,12 @@ func_mode_link ()

13255

if test "$prev" = rpath; then

13256

case "$rpath " in

13257

*" $arg "*) ;;

13258

- *) rpath="$rpath $arg" ;;

13259

+ *) func_append rpath " $arg" ;;

13260

esac

13261

else

13262

case "$xrpath " in

13263

*" $arg "*) ;;

13264

- *) xrpath="$xrpath $arg" ;;

13265

+ *) func_append xrpath " $arg" ;;

13266

esac

13267

13268

prev=

13269

@@ -4368,28 +5423,28 @@ func_mode_link ()

13270

continue

13271

;;

13272

weak)

13273

- weak_libs="$weak_libs $arg"

13274

+ func_append weak_libs " $arg"

13275

prev=

13276

continue

13277

;;

13278

xcclinker)

13279

- linker_flags="$linker_flags $qarg"

13280

- compiler_flags="$compiler_flags $qarg"

13281

+ func_append linker_flags " $qarg"

13282

+ func_append compiler_flags " $qarg"

13283

prev=

13284

func_append compile_command " $qarg"

13285

func_append finalize_command " $qarg"

13286

continue

13287

;;

13288

xcompiler)

13289

- compiler_flags="$compiler_flags $qarg"

13290

+ func_append compiler_flags " $qarg"

13291

prev=

13292

func_append compile_command " $qarg"

13293

func_append finalize_command " $qarg"

13294

continue

13295

;;

13296

xlinker)

13297

- linker_flags="$linker_flags $qarg"

13298

- compiler_flags="$compiler_flags $wl$qarg"

13299

+ func_append linker_flags " $qarg"

13300

+ func_append compiler_flags " $wl$qarg"

13301

prev=

13302

func_append compile_command " $wl$qarg"

13303

func_append finalize_command " $wl$qarg"

13304

@@ -4425,6 +5480,11 @@ func_mode_link ()

13305

continue

13306

;;

13307

13308

+ -bindir)

13309

+ prev=bindir

13310

+ continue

13311

+ ;;

13312

13313

-dlopen)

13314

prev=dlfiles

13315

continue

13316

@@ -4475,15 +5535,16 @@ func_mode_link ()

13317

;;

13318

13319

-L*)

13320

- func_stripname '-L' '' "$arg"

13321

- dir=$func_stripname_result

13322

- if test -z "$dir"; then

13323

+ func_stripname "-L" '' "$arg"

13324

+ if test -z "$func_stripname_result"; then

13325

if test "$#" -gt 0; then

13326

func_fatal_error "require no space between \`-L' and \`$1'"

13327

else

13328

func_fatal_error "need path for \`-L' option"

13329

13330

13331

+ func_resolve_sysroot "$func_stripname_result"

13332

+ dir=$func_resolve_sysroot_result

13333

# We need an absolute path.

13334

case $dir in

13335

[\\/]* | [A-Za-z]:[\\/]*) ;;

13336

@@ -4495,24 +5556,30 @@ func_mode_link ()

13337

;;

13338

esac

13339

case "$deplibs " in

13340

- *" -L$dir "*) ;;

13341

+ *" -L$dir "* | *" $arg "*)

13342

+ # Will only happen for absolute or sysroot arguments

13343

+ ;;

13344

13345

- deplibs="$deplibs -L$dir"

13346

- lib_search_path="$lib_search_path $dir"

13347

+ # Preserve sysroot, but never include relative directories

13348

+ case $dir in

13349

+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;

13350

+ *) func_append deplibs " -L$dir" ;;

13351

+ esac

13352

+ func_append lib_search_path " $dir"

13353

;;

13354

esac

13355

case $host in

13356

*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)

13357

- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`

13358

+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`

13359

case :$dllsearchpath: in

13360

*":$dir:"*) ;;

13361

::) dllsearchpath=$dir;;

13362

- *) dllsearchpath="$dllsearchpath:$dir";;

13363

+ *) func_append dllsearchpath ":$dir";;

13364

esac

13365

case :$dllsearchpath: in

13366

*":$testbindir:"*) ;;

13367

::) dllsearchpath=$testbindir;;

13368

- *) dllsearchpath="$dllsearchpath:$testbindir";;

13369

+ *) func_append dllsearchpath ":$testbindir";;

13370

esac

13371

;;

13372

esac

13373

@@ -4522,7 +5589,7 @@ func_mode_link ()

13374

-l*)

13375

if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then

13376

case $host in

13377

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)

13378

13379

# These systems don't actually have a C or math library (as such)

13380

continue

13381

;;

13382

@@ -4536,7 +5603,7 @@ func_mode_link ()

13383

;;

13384

*-*-rhapsody* | *-*-darwin1.[012])

13385

# Rhapsody C and math libraries are in the System framework

13386

- deplibs="$deplibs System.ltframework"

13387

+ func_append deplibs " System.ltframework"

13388

continue

13389

;;

13390

*-*-sco3.2v5* | *-*-sco5v6*)

13391

@@ -4556,7 +5623,7 @@ func_mode_link ()

13392

;;

13393

esac

13394

13395

- deplibs="$deplibs $arg"

13396

+ func_append deplibs " $arg"

13397

continue

13398

;;

13399

13400

@@ -4568,8 +5635,8 @@ func_mode_link ()

13401

# Tru64 UNIX uses -model [arg] to determine the layout of C++

13402

# classes, name mangling, and exception handling.

13403

# Darwin uses the -arch flag to determine output architecture.

13404

- -model|-arch|-isysroot)

13405

- compiler_flags="$compiler_flags $arg"

13406

+ -model|-arch|-isysroot|--sysroot)

13407

+ func_append compiler_flags " $arg"

13408

func_append compile_command " $arg"

13409

func_append finalize_command " $arg"

13410

prev=xcompiler

13411

@@ -4577,12 +5644,12 @@ func_mode_link ()

13412

;;

13413

13414

13415

- compiler_flags="$compiler_flags $arg"

13416

+ func_append compiler_flags " $arg"

13417

func_append compile_command " $arg"

13418

func_append finalize_command " $arg"

13419

case "$new_inherited_linker_flags " in

13420

*" $arg "*) ;;

13421

- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;

13422

+ * ) func_append new_inherited_linker_flags " $arg" ;;

13423

esac

13424

continue

13425

;;

13426

@@ -4649,13 +5716,17 @@ func_mode_link ()

13427

# We need an absolute path.

13428

case $dir in

13429

[\\/]* | [A-Za-z]:[\\/]*) ;;

13430

+ =*)

13431

+ func_stripname '=' '' "$dir"

13432

+ dir=$lt_sysroot$func_stripname_result

13433

+ ;;

13434

13435

func_fatal_error "only absolute run-paths are allowed"

13436

;;

13437

esac

13438

case "$xrpath " in

13439

*" $dir "*) ;;

13440

- *) xrpath="$xrpath $dir" ;;

13441

+ *) func_append xrpath " $dir" ;;

13442

esac

13443

continue

13444

;;

13445

@@ -4708,8 +5779,8 @@ func_mode_link ()

13446

for flag in $args; do

13447

IFS="$save_ifs"

13448

func_quote_for_eval "$flag"

13449

- arg="$arg $wl$func_quote_for_eval_result"

13450

- compiler_flags="$compiler_flags $func_quote_for_eval_result"

13451

+ func_append arg " $func_quote_for_eval_result"

13452

+ func_append compiler_flags " $func_quote_for_eval_result"

13453

done

13454

IFS="$save_ifs"

13455

func_stripname ' ' '' "$arg"

13456

@@ -4724,9 +5795,9 @@ func_mode_link ()

13457

for flag in $args; do

13458

IFS="$save_ifs"

13459

func_quote_for_eval "$flag"

13460

- arg="$arg $wl$func_quote_for_eval_result"

13461

- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"

13462

- linker_flags="$linker_flags $func_quote_for_eval_result"

13463

+ func_append arg " $wl$func_quote_for_eval_result"

13464

+ func_append compiler_flags " $wl$func_quote_for_eval_result"

13465

+ func_append linker_flags " $func_quote_for_eval_result"

13466

done

13467

IFS="$save_ifs"

13468

func_stripname ' ' '' "$arg"

13469

@@ -4754,23 +5825,27 @@ func_mode_link ()

13470

arg="$func_quote_for_eval_result"

13471

;;

13472

13473

- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler

13474

- # -r[0-9][0-9]* specifies the processor on the SGI compiler

13475

- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler

13476

- # +DA*, +DD* enable 64-bit mode on the HP compiler

13477

- # -q* pass through compiler args for the IBM compiler

13478

- # -m*, -t[45]*, -txscale* pass through architecture-specific

13479

- # compiler args for GCC

13480

- # -F/path gives path to uninstalled frameworks, gcc on darwin

13481

- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC

13482

- # @file GCC response files

13483

+ # Flags to be passed through unchanged, with rationale:

13484

+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler

13485

+ # -r[0-9][0-9]* specify processor for the SGI compiler

13486

+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler

13487

+ # +DA*, +DD* enable 64-bit mode for the HP compiler

13488

+ # -q* compiler args for the IBM compiler

13489

+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC

13490

+ # -F/path path to uninstalled frameworks, gcc on darwin

13491

+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC

13492

+ # @file GCC response files

13493

+ # -tp=* Portland pgcc target processor selection

13494

+ # --sysroot=* for sysroot support

13495

+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization

13496

-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \

13497

- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)

13498

+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \

13499

+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)

13500

func_quote_for_eval "$arg"

13501

arg="$func_quote_for_eval_result"

13502

func_append compile_command " $arg"

13503

func_append finalize_command " $arg"

13504

- compiler_flags="$compiler_flags $arg"

13505

+ func_append compiler_flags " $arg"

13506

continue

13507

;;

13508

13509

@@ -4782,7 +5857,7 @@ func_mode_link ()

13510

13511

*.$objext)

13512

# A standard object.

13513

- objs="$objs $arg"

13514

+ func_append objs " $arg"

13515

;;

13516

13517

*.lo)

13518

@@ -4813,7 +5888,7 @@ func_mode_link ()

13519

13520

if test "$prev" = dlfiles; then

13521

if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then

13522

- dlfiles="$dlfiles $pic_object"

13523

+ func_append dlfiles " $pic_object"

13524

prev=

13525

continue

13526

else

13527

@@ -4825,7 +5900,7 @@ func_mode_link ()

13528

# CHECK ME: I think I busted this. -Ossama

13529

if test "$prev" = dlprefiles; then

13530

# Preload the old-style object.

13531

- dlprefiles="$dlprefiles $pic_object"

13532

+ func_append dlprefiles " $pic_object"

13533

prev=

13534

13535

13536

@@ -4870,24 +5945,25 @@ func_mode_link ()

13537

13538

*.$libext)

13539

# An archive.

13540

- deplibs="$deplibs $arg"

13541

- old_deplibs="$old_deplibs $arg"

13542

+ func_append deplibs " $arg"

13543

+ func_append old_deplibs " $arg"

13544

continue

13545

;;

13546

13547

*.la)

13548

# A libtool-controlled library.

13549

13550

+ func_resolve_sysroot "$arg"

13551

if test "$prev" = dlfiles; then

13552

# This library was specified with -dlopen.

13553

- dlfiles="$dlfiles $arg"

13554

+ func_append dlfiles " $func_resolve_sysroot_result"

13555

prev=

13556

elif test "$prev" = dlprefiles; then

13557

# The library was specified with -dlpreopen.

13558

- dlprefiles="$dlprefiles $arg"

13559

+ func_append dlprefiles " $func_resolve_sysroot_result"

13560

prev=

13561

else

13562

- deplibs="$deplibs $arg"

13563

+ func_append deplibs " $func_resolve_sysroot_result"

13564

13565

continue

13566

;;

13567

@@ -4925,7 +6001,7 @@ func_mode_link ()

13568

13569

if test -n "$shlibpath_var"; then

13570

# get the directories listed in $shlibpath_var

13571

- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`

13572

+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`

18947

13573

else

18948

test -z "$file" || exec >$file

18949

echo ".ab help2man is required to generate this page"

18950

- exit 1

18951

+ exit $?

13574

shlib_search_path=

18952

13575

18953

;;

18954

18955

- makeinfo)

18956

+ makeinfo*)

18957

echo 1>&2 "\

18958

WARNING: \`$1' is $msg. You should only need it if

18959

you modified a \`.texi' or \`.texinfo' file, or any other file

18960

@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only

18961

touch $file

18962

;;

18963

18964

- tar)

18965

+ tar*)

18966

shift

18967

18968

# We have already tried tar in the generic part.

18969

@@ -363,5 +371,6 @@ exit 0

18970

# eval: (add-hook 'write-file-hooks 'time-stamp)

18971

# time-stamp-start: "scriptversion="

18972

# time-stamp-format: "%:y-%02m-%02d.%02H"

18973

-# time-stamp-end: "$"

18974

+# time-stamp-time-zone: "UTC"

18975

+# time-stamp-end: "; # UTC"

18976

# End:

18977

--- protobuf-2.3.0.orig/src/Makefile.in

18978

+++ protobuf-2.3.0/src/Makefile.in

18979

@@ -1,8 +1,9 @@

18980

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

18981

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

18982

# @configure_input@

18983

18984

18985

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

18986

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

18987

+# Inc.

18988

# This Makefile.in is free software; the Free Software Foundation

18989

# gives unlimited permission to copy and/or distribute it,

18990

# with or without modifications, as long as this notice is preserved.

18991

@@ -19,8 +20,9 @@

18992

18993

VPATH = @srcdir@

18994

pkgdatadir = $(datadir)/@PACKAGE@

18995

-pkglibdir = $(libdir)/@PACKAGE@

18996

pkgincludedir = $(includedir)/@PACKAGE@

18997

+pkglibdir = $(libdir)/@PACKAGE@

18998

+pkglibexecdir = $(libexecdir)/@PACKAGE@

18999

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

19000

install_sh_DATA = $(install_sh) -c -m 644

19001

install_sh_PROGRAM = $(install_sh) -c

19002

@@ -61,15 +63,30 @@ am__configure_deps = $(am__aclocal_m4_de

19003

mkinstalldirs = $(install_sh) -d

19004

CONFIG_HEADER = $(top_builddir)/config.h

19005

CONFIG_CLEAN_FILES =

19006

+CONFIG_CLEAN_VPATH_FILES =

19007

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

19008

am__vpath_adj = case $$p in \

19009

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

19010

*) f=$$p;; \

19011

esac;

19012

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

19013

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

19014

+am__install_max = 40

19015

+am__nobase_strip_setup = \

19016

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

19017

+am__nobase_strip = \

19018

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

19019

+am__nobase_list = $(am__nobase_strip_setup); \

19020

+ for p in $$list; do echo "$$p $$p"; done | \

19021

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

19022

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

19023

+ if (++n[$$2] == $(am__install_max)) \

19024

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

19025

+ END { for (dir in files) print dir, files[dir] }'

19026

+am__base_list = \

19027

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

19028

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

19029

am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \

19030

"$(DESTDIR)$(protodir)" "$(DESTDIR)$(includedir)"

19031

-libLTLIBRARIES_INSTALL = $(INSTALL)

19032

LTLIBRARIES = $(lib_LTLIBRARIES)

19033

am__DEPENDENCIES_1 =

19034

libprotobuf_lite_la_DEPENDENCIES = $(am__DEPENDENCIES_1)

19035

@@ -111,7 +128,6 @@ libprotoc_la_OBJECTS = $(am_libprotoc_la

19036

libprotoc_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \

19037

$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \

19038

$(CXXFLAGS) $(libprotoc_la_LDFLAGS) $(LDFLAGS) -o $@

19039

-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

19040

@HAVE_ZLIB_TRUE@am__EXEEXT_1 = zcgzip$(EXEEXT) zcgunzip$(EXEEXT)

19041

PROGRAMS = $(bin_PROGRAMS)

19042

am__objects_2 = protobuf_lazy_descriptor_test-test_util.$(OBJEXT) \

19043

@@ -234,6 +250,7 @@ zcgzip_OBJECTS = $(am_zcgzip_OBJECTS)

19044

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

19045

depcomp = $(SHELL) $(top_srcdir)/depcomp

19046

am__depfiles_maybe = depfiles

19047

+am__mv = mv -f

19048

CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

19049

$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)

19050

LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

19051

@@ -266,7 +283,6 @@ DIST_SOURCES = $(libprotobuf_lite_la_SOU

19052

$(protobuf_lite_test_SOURCES) $(protobuf_test_SOURCES) \

19053

$(protoc_SOURCES) $(test_plugin_SOURCES) \

19054

$(am__zcgunzip_SOURCES_DIST) $(am__zcgzip_SOURCES_DIST)

19055

-nobase_dist_protoDATA_INSTALL = $(install_sh_DATA)

19056

DATA = $(nobase_dist_proto_DATA)

19057

am__nobase_include_HEADERS_DIST = google/protobuf/stubs/common.h \

19058

google/protobuf/stubs/once.h google/protobuf/descriptor.h \

19059

@@ -299,10 +315,11 @@ am__nobase_include_HEADERS_DIST = google

19060

google/protobuf/compiler/cpp/cpp_generator.h \

19061

google/protobuf/compiler/java/java_generator.h \

19062

google/protobuf/compiler/python/python_generator.h

19063

-nobase_includeHEADERS_INSTALL = $(install_sh_DATA)

19064

HEADERS = $(nobase_include_HEADERS)

19065

ETAGS = etags

19066

CTAGS = ctags

19067

+am__tty_colors = \

19068

+red=; grn=; lgn=; blu=; std=

19069

@HAVE_ZLIB_TRUE@am__EXEEXT_2 = \

19070

@HAVE_ZLIB_TRUE@ google/protobuf/io/gzip_stream_unittest.sh

19071

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

19072

@@ -351,6 +368,7 @@ MAKEINFO = @MAKEINFO@

13576

@@ -4934,6 +6010,8 @@ func_mode_link ()

13577

13578

func_dirname "$output" "/" ""

13579

output_objdir="$func_dirname_result$objdir"

13580

+ func_to_tool_file "$output_objdir/"

13581

+ tool_output_objdir=$func_to_tool_file_result

13582

# Create the object directory.

13583

func_mkdir_p "$output_objdir"

13584

13585

@@ -4954,12 +6032,12 @@ func_mode_link ()

13586

# Find all interdependent deplibs by searching for libraries

13587

# that are linked more than once (e.g. -la -lb -la)

13588

for deplib in $deplibs; do

13589

- if $opt_duplicate_deps ; then

13590

+ if $opt_preserve_dup_deps ; then

13591

case "$libs " in

13592

- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

13593

+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;

13594

esac

13595

13596

- libs="$libs $deplib"

13597

+ func_append libs " $deplib"

13598

done

13599

13600

if test "$linkmode" = lib; then

13601

@@ -4972,9 +6050,9 @@ func_mode_link ()

13602

if $opt_duplicate_compiler_generated_deps; then

13603

for pre_post_dep in $predeps $postdeps; do

13604

case "$pre_post_deps " in

13605

- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;

13606

+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;

13607

esac

13608

- pre_post_deps="$pre_post_deps $pre_post_dep"

13609

+ func_append pre_post_deps " $pre_post_dep"

13610

done

13611

13612

pre_post_deps=

13613

@@ -5044,17 +6122,19 @@ func_mode_link ()

13614

for lib in $dlprefiles; do

13615

# Ignore non-libtool-libs

13616

dependency_libs=

13617

+ func_resolve_sysroot "$lib"

13618

case $lib in

13619

- *.la) func_source "$lib" ;;

13620

+ *.la) func_source "$func_resolve_sysroot_result" ;;

13621

esac

13622

13623

# Collect preopened libtool deplibs, except any this library

13624

# has declared as weak libs

13625

for deplib in $dependency_libs; do

13626

- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`

13627

+ func_basename "$deplib"

13628

+ deplib_base=$func_basename_result

13629

case " $weak_libs " in

13630

*" $deplib_base "*) ;;

13631

- *) deplibs="$deplibs $deplib" ;;

13632

+ *) func_append deplibs " $deplib" ;;

13633

esac

13634

done

13635

done

13636

@@ -5075,11 +6155,11 @@ func_mode_link ()

13637

compile_deplibs="$deplib $compile_deplibs"

13638

finalize_deplibs="$deplib $finalize_deplibs"

13639

else

13640

- compiler_flags="$compiler_flags $deplib"

13641

+ func_append compiler_flags " $deplib"

13642

if test "$linkmode" = lib ; then

13643

case "$new_inherited_linker_flags " in

13644

*" $deplib "*) ;;

13645

- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;

13646

+ * ) func_append new_inherited_linker_flags " $deplib" ;;

13647

esac

13648

13649

13650

@@ -5164,7 +6244,7 @@ func_mode_link ()

13651

if test "$linkmode" = lib ; then

13652

case "$new_inherited_linker_flags " in

13653

*" $deplib "*) ;;

13654

- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;

13655

+ * ) func_append new_inherited_linker_flags " $deplib" ;;

13656

esac

13657

13658

13659

@@ -5177,7 +6257,8 @@ func_mode_link ()

13660

test "$pass" = conv && continue

13661

newdependency_libs="$deplib $newdependency_libs"

13662

func_stripname '-L' '' "$deplib"

13663

- newlib_search_path="$newlib_search_path $func_stripname_result"

13664

+ func_resolve_sysroot "$func_stripname_result"

13665

+ func_append newlib_search_path " $func_resolve_sysroot_result"

13666

;;

13667

prog)

13668

if test "$pass" = conv; then

13669

@@ -5191,7 +6272,8 @@ func_mode_link ()

13670

finalize_deplibs="$deplib $finalize_deplibs"

13671

13672

func_stripname '-L' '' "$deplib"

13673

- newlib_search_path="$newlib_search_path $func_stripname_result"

13674

+ func_resolve_sysroot "$func_stripname_result"

13675

+ func_append newlib_search_path " $func_resolve_sysroot_result"

13676

;;

13677

13678

func_warning "\`-L' is ignored for archives/objects"

13679

@@ -5202,17 +6284,21 @@ func_mode_link ()

13680

-R*)

13681

if test "$pass" = link; then

13682

func_stripname '-R' '' "$deplib"

13683

- dir=$func_stripname_result

13684

+ func_resolve_sysroot "$func_stripname_result"

13685

+ dir=$func_resolve_sysroot_result

13686

# Make sure the xrpath contains only unique directories.

13687

case "$xrpath " in

13688

*" $dir "*) ;;

13689

- *) xrpath="$xrpath $dir" ;;

13690

+ *) func_append xrpath " $dir" ;;

13691

esac

13692

13693

deplibs="$deplib $deplibs"

13694

continue

13695

;;

13696

- *.la) lib="$deplib" ;;

13697

+ *.la)

13698

+ func_resolve_sysroot "$deplib"

13699

+ lib=$func_resolve_sysroot_result

13700

+ ;;

13701

*.$libext)

13702

if test "$pass" = conv; then

13703

deplibs="$deplib $deplibs"

13704

@@ -5230,7 +6316,7 @@ func_mode_link ()

13705

match_pattern*)

13706

set dummy $deplibs_check_method; shift

13707

match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`

13708

- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \

13709

+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \

13710

| $EGREP "$match_pattern_regex" > /dev/null; then

13711

valid_a_lib=yes

13712

13713

@@ -5240,15 +6326,15 @@ func_mode_link ()

13714

;;

13715

esac

13716

if test "$valid_a_lib" != yes; then

13717

- $ECHO

13718

+ echo

13719

$ECHO "*** Warning: Trying to link with static lib archive $deplib."

13720

- $ECHO "*** I have the capability to make that library automatically link in when"

13721

- $ECHO "*** you link to this library. But I can only do this if you have a"

13722

- $ECHO "*** shared version of the library, which you do not appear to have"

13723

- $ECHO "*** because the file extensions .$libext of this argument makes me believe"

13724

- $ECHO "*** that it is just a static archive that I should not use here."

13725

+ echo "*** I have the capability to make that library automatically link in when"

13726

+ echo "*** you link to this library. But I can only do this if you have a"

13727

+ echo "*** shared version of the library, which you do not appear to have"

13728

+ echo "*** because the file extensions .$libext of this argument makes me believe"

13729

+ echo "*** that it is just a static archive that I should not use here."

13730

else

13731

- $ECHO

13732

+ echo

13733

$ECHO "*** Warning: Linking the shared library $output against the"

13734

$ECHO "*** static library $deplib is not portable!"

13735

deplibs="$deplib $deplibs"

13736

@@ -5275,11 +6361,11 @@ func_mode_link ()

13737

if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then

13738

# If there is no dlopen support or we're linking statically,

13739

# we need to preload.

13740

- newdlprefiles="$newdlprefiles $deplib"

13741

+ func_append newdlprefiles " $deplib"

13742

compile_deplibs="$deplib $compile_deplibs"

13743

finalize_deplibs="$deplib $finalize_deplibs"

13744

else

13745

- newdlfiles="$newdlfiles $deplib"

13746

+ func_append newdlfiles " $deplib"

13747

13748

13749

continue

13750

@@ -5321,20 +6407,20 @@ func_mode_link ()

13751

13752

# Convert "-framework foo" to "foo.ltframework"

13753

if test -n "$inherited_linker_flags"; then

13754

- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework $[^ $]*$/\1.ltframework/g'`

13755

+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework $[^ $]*$/\1.ltframework/g'`

13756

for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do

13757

case " $new_inherited_linker_flags " in

13758

*" $tmp_inherited_linker_flag "*) ;;

13759

- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;

13760

+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;

13761

esac

13762

done

13763

13764

- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

13765

+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

13766

if test "$linkmode,$pass" = "lib,link" ||

13767

test "$linkmode,$pass" = "prog,scan" ||

13768

{ test "$linkmode" != prog && test "$linkmode" != lib; }; then

13769

- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"

13770

- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"

13771

+ test -n "$dlopen" && func_append dlfiles " $dlopen"

13772

+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"

13773

13774

13775

if test "$pass" = conv; then

13776

@@ -5345,17 +6431,17 @@ func_mode_link ()

13777

func_fatal_error "cannot find name of link library for \`$lib'"

13778

13779

# It is a libtool convenience library, so add in its objects.

13780

- convenience="$convenience $ladir/$objdir/$old_library"

13781

- old_convenience="$old_convenience $ladir/$objdir/$old_library"

13782

+ func_append convenience " $ladir/$objdir/$old_library"

13783

+ func_append old_convenience " $ladir/$objdir/$old_library"

13784

tmp_libs=

13785

for deplib in $dependency_libs; do

13786

deplibs="$deplib $deplibs"

13787

- if $opt_duplicate_deps ; then

13788

+ if $opt_preserve_dup_deps ; then

13789

case "$tmp_libs " in

13790

- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

13791

+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;

13792

esac

13793

13794

- tmp_libs="$tmp_libs $deplib"

13795

+ func_append tmp_libs " $deplib"

13796

done

13797

elif test "$linkmode" != prog && test "$linkmode" != lib; then

13798

func_fatal_error "\`$lib' is not a convenience library"

13799

@@ -5366,9 +6452,15 @@ func_mode_link ()

13800

13801

# Get the name of the library we link against.

13802

linklib=

13803

- for l in $old_library $library_names; do

13804

- linklib="$l"

13805

- done

13806

+ if test -n "$old_library" &&

13807

+ { test "$prefer_static_libs" = yes ||

13808

+ test "$prefer_static_libs,$installed" = "built,no"; }; then

13809

+ linklib=$old_library

13810

+ else

13811

+ for l in $old_library $library_names; do

13812

+ linklib="$l"

13813

+ done

13814

+ fi

13815

if test -z "$linklib"; then

13816

func_fatal_error "cannot find name of link library for \`$lib'"

13817

13818

@@ -5385,9 +6477,9 @@ func_mode_link ()

13819

# statically, we need to preload. We also need to preload any

13820

# dependent libraries so libltdl's deplib preloader doesn't

13821

# bomb out in the load deplibs phase.

13822

- dlprefiles="$dlprefiles $lib $dependency_libs"

13823

+ func_append dlprefiles " $lib $dependency_libs"

13824

else

13825

- newdlfiles="$newdlfiles $lib"

13826

+ func_append newdlfiles " $lib"

13827

13828

continue

13829

fi # $pass = dlopen

13830

@@ -5409,14 +6501,14 @@ func_mode_link ()

13831

13832

# Find the relevant object directory and library name.

13833

if test "X$installed" = Xyes; then

13834

- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then

13835

+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then

13836

func_warning "library \`$lib' was moved."

13837

dir="$ladir"

13838

absdir="$abs_ladir"

13839

libdir="$abs_ladir"

13840

else

13841

- dir="$libdir"

13842

- absdir="$libdir"

13843

+ dir="$lt_sysroot$libdir"

13844

+ absdir="$lt_sysroot$libdir"

13845

13846

test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes

13847

else

13848

@@ -5424,12 +6516,12 @@ func_mode_link ()

13849

dir="$ladir"

13850

absdir="$abs_ladir"

13851

# Remove this search path later

13852

- notinst_path="$notinst_path $abs_ladir"

13853

+ func_append notinst_path " $abs_ladir"

13854

else

13855

dir="$ladir/$objdir"

13856

absdir="$abs_ladir/$objdir"

13857

# Remove this search path later

13858

- notinst_path="$notinst_path $abs_ladir"

13859

+ func_append notinst_path " $abs_ladir"

13860

13861

fi # $installed = yes

13862

func_stripname 'lib' '.la' "$laname"

13863

@@ -5440,20 +6532,46 @@ func_mode_link ()

13864

if test -z "$libdir" && test "$linkmode" = prog; then

13865

func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"

13866

13867

- # Prefer using a static library (so that no silly _DYNAMIC symbols

13868

- # are required to link).

13869

- if test -n "$old_library"; then

13870

- newdlprefiles="$newdlprefiles $dir/$old_library"

13871

- # Keep a list of preopened convenience libraries to check

13872

- # that they are being used correctly in the link pass.

13873

- test -z "$libdir" && \

13874

- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"

13875

- # Otherwise, use the dlname, so that lt_dlopen finds it.

13876

- elif test -n "$dlname"; then

13877

- newdlprefiles="$newdlprefiles $dir/$dlname"

13878

- else

13879

- newdlprefiles="$newdlprefiles $dir/$linklib"

13880

- fi

13881

+ case "$host" in

13882

+ # special handling for platforms with PE-DLLs.

13883

+ *cygwin* | *mingw* | *cegcc* )

13884

+ # Linker will automatically link against shared library if both

13885

+ # static and shared are present. Therefore, ensure we extract

13886

+ # symbols from the import library if a shared library is present

13887

+ # (otherwise, the dlopen module name will be incorrect). We do

13888

+ # this by putting the import library name into $newdlprefiles.

13889

+ # We recover the dlopen module name by 'saving' the la file

13890

+ # name in a special purpose variable, and (later) extracting the

13891

+ # dlname from the la file.

13892

+ if test -n "$dlname"; then

13893

+ func_tr_sh "$dir/$linklib"

13894

+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"

13895

+ func_append newdlprefiles " $dir/$linklib"

13896

+ else

13897

+ func_append newdlprefiles " $dir/$old_library"

13898

+ # Keep a list of preopened convenience libraries to check

13899

+ # that they are being used correctly in the link pass.

13900

+ test -z "$libdir" && \

13901

+ func_append dlpreconveniencelibs " $dir/$old_library"

13902

+ fi

13903

+ ;;

13904

+ * )

13905

+ # Prefer using a static library (so that no silly _DYNAMIC symbols

13906

+ # are required to link).

13907

+ if test -n "$old_library"; then

13908

+ func_append newdlprefiles " $dir/$old_library"

13909

+ # Keep a list of preopened convenience libraries to check

13910

+ # that they are being used correctly in the link pass.

13911

+ test -z "$libdir" && \

13912

+ func_append dlpreconveniencelibs " $dir/$old_library"

13913

+ # Otherwise, use the dlname, so that lt_dlopen finds it.

13914

+ elif test -n "$dlname"; then

13915

+ func_append newdlprefiles " $dir/$dlname"

13916

+ else

13917

+ func_append newdlprefiles " $dir/$linklib"

13918

+ fi

13919

+ ;;

13920

+ esac

13921

fi # $pass = dlpreopen

13922

13923

if test -z "$libdir"; then

13924

@@ -5471,7 +6589,7 @@ func_mode_link ()

13925

13926

13927

if test "$linkmode" = prog && test "$pass" != link; then

13928

- newlib_search_path="$newlib_search_path $ladir"

13929

+ func_append newlib_search_path " $ladir"

13930

deplibs="$lib $deplibs"

13931

13932

linkalldeplibs=no

13933

@@ -5484,7 +6602,8 @@ func_mode_link ()

13934

for deplib in $dependency_libs; do

13935

case $deplib in

13936

-L*) func_stripname '-L' '' "$deplib"

13937

- newlib_search_path="$newlib_search_path $func_stripname_result"

13938

+ func_resolve_sysroot "$func_stripname_result"

13939

+ func_append newlib_search_path " $func_resolve_sysroot_result"

13940

;;

13941

esac

13942

# Need to link against all dependency_libs?

13943

@@ -5495,12 +6614,12 @@ func_mode_link ()

13944

# or/and link against static libraries

13945

newdependency_libs="$deplib $newdependency_libs"

13946

13947

- if $opt_duplicate_deps ; then

13948

+ if $opt_preserve_dup_deps ; then

13949

case "$tmp_libs " in

13950

- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

13951

+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;

13952

esac

13953

13954

- tmp_libs="$tmp_libs $deplib"

13955

+ func_append tmp_libs " $deplib"

13956

done # for deplib

13957

continue

13958

fi # $linkmode = prog...

13959

@@ -5515,7 +6634,7 @@ func_mode_link ()

13960

# Make sure the rpath contains only unique directories.

13961

case "$temp_rpath:" in

13962

*"$absdir:"*) ;;

13963

- *) temp_rpath="$temp_rpath$absdir:" ;;

13964

+ *) func_append temp_rpath "$absdir:" ;;

13965

esac

13966

13967

13968

@@ -5527,7 +6646,7 @@ func_mode_link ()

13969

13970

case "$compile_rpath " in

13971

*" $absdir "*) ;;

13972

- *) compile_rpath="$compile_rpath $absdir"

13973

+ *) func_append compile_rpath " $absdir" ;;

13974

esac

13975

;;

13976

esac

13977

@@ -5536,7 +6655,7 @@ func_mode_link ()

13978

13979

case "$finalize_rpath " in

13980

*" $libdir "*) ;;

13981

- *) finalize_rpath="$finalize_rpath $libdir"

13982

+ *) func_append finalize_rpath " $libdir" ;;

13983

esac

13984

;;

13985

esac

13986

@@ -5561,12 +6680,12 @@ func_mode_link ()

13987

case $host in

13988

*cygwin* | *mingw* | *cegcc*)

13989

# No point in relinking DLLs because paths are not encoded

13990

- notinst_deplibs="$notinst_deplibs $lib"

13991

+ func_append notinst_deplibs " $lib"

13992

need_relink=no

13993

;;

13994

13995

if test "$installed" = no; then

13996

- notinst_deplibs="$notinst_deplibs $lib"

13997

+ func_append notinst_deplibs " $lib"

13998

need_relink=yes

13999

14000

;;

14001

@@ -5583,7 +6702,7 @@ func_mode_link ()

14002

14003

done

14004

if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then

14005

- $ECHO

14006

+ echo

14007

if test "$linkmode" = prog; then

14008

$ECHO "*** Warning: Linking the executable $output against the loadable module"

14009

else

14010

@@ -5601,7 +6720,7 @@ func_mode_link ()

14011

14012

case "$compile_rpath " in

14013

*" $absdir "*) ;;

14014

- *) compile_rpath="$compile_rpath $absdir"

14015

+ *) func_append compile_rpath " $absdir" ;;

14016

esac

14017

;;

14018

esac

14019

@@ -5610,7 +6729,7 @@ func_mode_link ()

14020

14021

case "$finalize_rpath " in

14022

*" $libdir "*) ;;

14023

- *) finalize_rpath="$finalize_rpath $libdir"

14024

+ *) func_append finalize_rpath " $libdir" ;;

14025

esac

14026

;;

14027

esac

14028

@@ -5664,7 +6783,7 @@ func_mode_link ()

14029

linklib=$newlib

14030

fi # test -n "$old_archive_from_expsyms_cmds"

14031

14032

- if test "$linkmode" = prog || test "$mode" != relink; then

14033

+ if test "$linkmode" = prog || test "$opt_mode" != relink; then

14034

add_shlibpath=

14035

add_dir=

14036

add=

14037

@@ -5686,9 +6805,9 @@ func_mode_link ()

14038

if test "X$dlopenmodule" != "X$lib"; then

14039

$ECHO "*** Warning: lib $linklib is a module, not a shared library"

14040

if test -z "$old_library" ; then

14041

- $ECHO

14042

- $ECHO "*** And there doesn't seem to be a static archive available"

14043

- $ECHO "*** The link will probably fail, sorry"

14044

+ echo

14045

+ echo "*** And there doesn't seem to be a static archive available"

14046

+ echo "*** The link will probably fail, sorry"

14047

else

14048

add="$dir/$old_library"

14049

14050

@@ -5720,7 +6839,7 @@ func_mode_link ()

14051

if test -n "$inst_prefix_dir"; then

14052

case $libdir in

14053

[\\/]*)

14054

- add_dir="$add_dir -L$inst_prefix_dir$libdir"

14055

+ func_append add_dir " -L$inst_prefix_dir$libdir"

14056

;;

14057

esac

14058

14059

@@ -5742,7 +6861,7 @@ func_mode_link ()

14060

if test -n "$add_shlibpath"; then

14061

case :$compile_shlibpath: in

14062

*":$add_shlibpath:"*) ;;

14063

- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;

14064

+ *) func_append compile_shlibpath "$add_shlibpath:" ;;

14065

esac

14066

14067

if test "$linkmode" = prog; then

14068

@@ -5756,13 +6875,13 @@ func_mode_link ()

14069

test "$hardcode_shlibpath_var" = yes; then

14070

case :$finalize_shlibpath: in

14071

*":$libdir:"*) ;;

14072

- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;

14073

+ *) func_append finalize_shlibpath "$libdir:" ;;

14074

esac

14075

14076

14077

14078

14079

- if test "$linkmode" = prog || test "$mode" = relink; then

14080

+ if test "$linkmode" = prog || test "$opt_mode" = relink; then

14081

add_shlibpath=

14082

add_dir=

14083

add=

14084

@@ -5776,7 +6895,7 @@ func_mode_link ()

14085

elif test "$hardcode_shlibpath_var" = yes; then

14086

case :$finalize_shlibpath: in

14087

*":$libdir:"*) ;;

14088

- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;

14089

+ *) func_append finalize_shlibpath "$libdir:" ;;

14090

esac

14091

add="-l$name"

14092

elif test "$hardcode_automatic" = yes; then

14093

@@ -5793,7 +6912,7 @@ func_mode_link ()

14094

if test -n "$inst_prefix_dir"; then

14095

case $libdir in

14096

[\\/]*)

14097

- add_dir="$add_dir -L$inst_prefix_dir$libdir"

14098

+ func_append add_dir " -L$inst_prefix_dir$libdir"

14099

;;

14100

esac

14101

14102

@@ -5828,21 +6947,21 @@ func_mode_link ()

14103

14104

# Just print a warning and add the library to dependency_libs so

14105

# that the program can be linked against the static library.

14106

- $ECHO

14107

+ echo

14108

$ECHO "*** Warning: This system can not link to static lib archive $lib."

14109

- $ECHO "*** I have the capability to make that library automatically link in when"

14110

- $ECHO "*** you link to this library. But I can only do this if you have a"

14111

- $ECHO "*** shared version of the library, which you do not appear to have."

14112

+ echo "*** I have the capability to make that library automatically link in when"

14113

+ echo "*** you link to this library. But I can only do this if you have a"

14114

+ echo "*** shared version of the library, which you do not appear to have."

14115

if test "$module" = yes; then

14116

- $ECHO "*** But as you try to build a module library, libtool will still create "

14117

- $ECHO "*** a static module, that should work as long as the dlopening application"

14118

- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."

14119

+ echo "*** But as you try to build a module library, libtool will still create "

14120

+ echo "*** a static module, that should work as long as the dlopening application"

14121

+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."

14122

if test -z "$global_symbol_pipe"; then

14123

- $ECHO

14124

- $ECHO "*** However, this would only work if libtool was able to extract symbol"

14125

- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"

14126

- $ECHO "*** not find such a program. So, this module is probably useless."

14127

- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."

14128

+ echo

14129

+ echo "*** However, this would only work if libtool was able to extract symbol"

14130

+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"

14131

+ echo "*** not find such a program. So, this module is probably useless."

14132

+ echo "*** \`nm' from GNU binutils and a full rebuild may help."

14133

14134

if test "$build_old_libs" = no; then

14135

build_libtool_libs=module

14136

@@ -5870,27 +6989,33 @@ func_mode_link ()

14137

temp_xrpath=$func_stripname_result

14138

case " $xrpath " in

14139

*" $temp_xrpath "*) ;;

14140

- *) xrpath="$xrpath $temp_xrpath";;

14141

+ *) func_append xrpath " $temp_xrpath";;

14142

esac;;

14143

- *) temp_deplibs="$temp_deplibs $libdir";;

14144

+ *) func_append temp_deplibs " $libdir";;

14145

esac

14146

done

14147

dependency_libs="$temp_deplibs"

14148

14149

14150

- newlib_search_path="$newlib_search_path $absdir"

14151

+ func_append newlib_search_path " $absdir"

14152

# Link against this library

14153

test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"

14154

# ... and its dependency_libs

14155

tmp_libs=

14156

for deplib in $dependency_libs; do

14157

newdependency_libs="$deplib $newdependency_libs"

14158

- if $opt_duplicate_deps ; then

14159

+ case $deplib in

14160

+ -L*) func_stripname '-L' '' "$deplib"

14161

+ func_resolve_sysroot "$func_stripname_result";;

14162

+ *) func_resolve_sysroot "$deplib" ;;

14163

+ esac

14164

+ if $opt_preserve_dup_deps ; then

14165

case "$tmp_libs " in

14166

- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

14167

+ *" $func_resolve_sysroot_result "*)

14168

+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;

14169

esac

14170

14171

- tmp_libs="$tmp_libs $deplib"

14172

+ func_append tmp_libs " $func_resolve_sysroot_result"

14173

done

14174

14175

if test "$link_all_deplibs" != no; then

14176

@@ -5900,8 +7025,10 @@ func_mode_link ()

14177

case $deplib in

14178

-L*) path="$deplib" ;;

14179

*.la)

14180

+ func_resolve_sysroot "$deplib"

14181

+ deplib=$func_resolve_sysroot_result

14182

func_dirname "$deplib" "" "."

14183

- dir="$func_dirname_result"

14184

+ dir=$func_dirname_result

14185

# We need an absolute path.

14186

case $dir in

14187

[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;

14188

@@ -5928,8 +7055,8 @@ func_mode_link ()

14189

if test -z "$darwin_install_name"; then

14190

darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`

14191

14192

- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"

14193

- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"

14194

+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"

14195

+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"

14196

path=

14197

14198

14199

@@ -5962,7 +7089,7 @@ func_mode_link ()

14200

compile_deplibs="$new_inherited_linker_flags $compile_deplibs"

14201

finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"

14202

else

14203

- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

14204

+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

14205

14206

14207

dependency_libs="$newdependency_libs"

14208

@@ -5979,7 +7106,7 @@ func_mode_link ()

14209

for dir in $newlib_search_path; do

14210

case "$lib_search_path " in

14211

*" $dir "*) ;;

14212

- *) lib_search_path="$lib_search_path $dir" ;;

14213

+ *) func_append lib_search_path " $dir" ;;

14214

esac

14215

done

14216

newlib_search_path=

14217

@@ -6037,10 +7164,10 @@ func_mode_link ()

14218

-L*)

14219

case " $tmp_libs " in

14220

*" $deplib "*) ;;

14221

- *) tmp_libs="$tmp_libs $deplib" ;;

14222

+ *) func_append tmp_libs " $deplib" ;;

14223

esac

14224

;;

14225

- *) tmp_libs="$tmp_libs $deplib" ;;

14226

+ *) func_append tmp_libs " $deplib" ;;

14227

esac

14228

done

14229

eval $var=\"$tmp_libs\"

14230

@@ -6056,7 +7183,7 @@ func_mode_link ()

14231

;;

14232

esac

14233

if test -n "$i" ; then

14234

- tmp_libs="$tmp_libs $i"

14235

+ func_append tmp_libs " $i"

14236

14237

done

14238

dependency_libs=$tmp_libs

14239

@@ -6097,7 +7224,7 @@ func_mode_link ()

14240

# Now set the variables for building old libraries.

14241

build_libtool_libs=no

14242

oldlibs="$output"

14243

- objs="$objs$old_deplibs"

14244

+ func_append objs "$old_deplibs"

14245

;;

14246

14247

lib)

14248

@@ -6130,10 +7257,10 @@ func_mode_link ()

14249

if test "$deplibs_check_method" != pass_all; then

14250

func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"

14251

else

14252

- $ECHO

14253

+ echo

14254

$ECHO "*** Warning: Linking the shared library $output against the non-libtool"

14255

$ECHO "*** objects $objs is not portable!"

14256

- libobjs="$libobjs $objs"

14257

+ func_append libobjs " $objs"

14258

14259

14260

14261

@@ -6198,7 +7325,7 @@ func_mode_link ()

14262

age="$number_minor"

14263

revision="$number_revision"

14264

;;

14265

- freebsd-aout|freebsd-elf|sunos)

14266

+ freebsd-aout|freebsd-elf|qnx|sunos)

14267

current="$number_major"

14268

revision="$number_minor"

14269

age="0"

14270

@@ -6334,7 +7461,7 @@ func_mode_link ()

14271

done

14272

14273

# Make executables depend on our current version.

14274

- verstring="$verstring:${current}.0"

14275

+ func_append verstring ":${current}.0"

14276

;;

14277

14278

qnx)

14279

@@ -6402,10 +7529,10 @@ func_mode_link ()

14280

14281

14282

func_generate_dlsyms "$libname" "$libname" "yes"

14283

- libobjs="$libobjs $symfileobj"

14284

+ func_append libobjs " $symfileobj"

14285

test "X$libobjs" = "X " && libobjs=

14286

14287

- if test "$mode" != relink; then

14288

+ if test "$opt_mode" != relink; then

14289

# Remove our outputs, but don't remove object files since they

14290

# may have been created when compiling PIC objects.

14291

removelist=

14292

@@ -6421,7 +7548,7 @@ func_mode_link ()

14293

continue

14294

14295

14296

- removelist="$removelist $p"

14297

+ func_append removelist " $p"

14298

;;

14299

*) ;;

14300

esac

14301

@@ -6432,27 +7559,28 @@ func_mode_link ()

14302

14303

# Now set the variables for building old libraries.

14304

if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then

14305

- oldlibs="$oldlibs $output_objdir/$libname.$libext"

14306

+ func_append oldlibs " $output_objdir/$libname.$libext"

14307

14308

# Transform .lo files to .o files.

14309

- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`

14310

+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`

14311

14312

14313

# Eliminate all temporary directories.

14314

#for path in $notinst_path; do

14315

- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`

14316

- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`

14317

- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`

14318

+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`

14319

+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`

14320

+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`

14321

#done

14322

14323

if test -n "$xrpath"; then

14324

# If the user specified any rpath flags, then add them.

14325

temp_xrpath=

14326

for libdir in $xrpath; do

14327

- temp_xrpath="$temp_xrpath -R$libdir"

14328

+ func_replace_sysroot "$libdir"

14329

+ func_append temp_xrpath " -R$func_replace_sysroot_result"

14330

case "$finalize_rpath " in

14331

*" $libdir "*) ;;

14332

- *) finalize_rpath="$finalize_rpath $libdir" ;;

14333

+ *) func_append finalize_rpath " $libdir" ;;

14334

esac

14335

done

14336

if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then

14337

@@ -6466,7 +7594,7 @@ func_mode_link ()

14338

for lib in $old_dlfiles; do

14339

case " $dlprefiles $dlfiles " in

14340

*" $lib "*) ;;

14341

- *) dlfiles="$dlfiles $lib" ;;

14342

+ *) func_append dlfiles " $lib" ;;

14343

esac

14344

done

14345

14346

@@ -6476,19 +7604,19 @@ func_mode_link ()

14347

for lib in $old_dlprefiles; do

14348

case "$dlprefiles " in

14349

*" $lib "*) ;;

14350

- *) dlprefiles="$dlprefiles $lib" ;;

14351

+ *) func_append dlprefiles " $lib" ;;

14352

esac

14353

done

14354

14355

if test "$build_libtool_libs" = yes; then

14356

if test -n "$rpath"; then

14357

case $host in

14358

14359

14360

# these systems don't actually have a c library (as such)!

14361

;;

14362

*-*-rhapsody* | *-*-darwin1.[012])

14363

# Rhapsody C library is in the System framework

14364

- deplibs="$deplibs System.ltframework"

14365

+ func_append deplibs " System.ltframework"

14366

;;

14367

*-*-netbsd*)

14368

# Don't link with libc until the a.out ld.so is fixed.

14369

@@ -6505,7 +7633,7 @@ func_mode_link ()

14370

14371

# Add libc to deplibs on all other systems if necessary.

14372

if test "$build_libtool_need_lc" = "yes"; then

14373

- deplibs="$deplibs -lc"

14374

+ func_append deplibs " -lc"

14375

14376

;;

14377

esac

14378

@@ -6554,7 +7682,7 @@ EOF

14379

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

14380

case " $predeps $postdeps " in

14381

*" $i "*)

14382

- newdeplibs="$newdeplibs $i"

14383

+ func_append newdeplibs " $i"

14384

i=""

14385

;;

14386

esac

14387

@@ -6565,21 +7693,21 @@ EOF

14388

set dummy $deplib_matches; shift

14389

deplib_match=$1

14390

if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then

14391

- newdeplibs="$newdeplibs $i"

14392

+ func_append newdeplibs " $i"

14393

else

14394

droppeddeps=yes

14395

- $ECHO

14396

+ echo

14397

$ECHO "*** Warning: dynamic linker does not accept needed library $i."

14398

- $ECHO "*** I have the capability to make that library automatically link in when"

14399

- $ECHO "*** you link to this library. But I can only do this if you have a"

14400

- $ECHO "*** shared version of the library, which I believe you do not have"

14401

- $ECHO "*** because a test_compile did reveal that the linker did not use it for"

14402

- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."

14403

+ echo "*** I have the capability to make that library automatically link in when"

14404

+ echo "*** you link to this library. But I can only do this if you have a"

14405

+ echo "*** shared version of the library, which I believe you do not have"

14406

+ echo "*** because a test_compile did reveal that the linker did not use it for"

14407

+ echo "*** its dynamic dependency list that programs get resolved with at runtime."

14408

14409

14410

;;

14411

14412

- newdeplibs="$newdeplibs $i"

14413

+ func_append newdeplibs " $i"

14414

;;

14415

esac

14416

done

14417

@@ -6597,7 +7725,7 @@ EOF

14418

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

14419

case " $predeps $postdeps " in

14420

*" $i "*)

14421

- newdeplibs="$newdeplibs $i"

14422

+ func_append newdeplibs " $i"

14423

i=""

14424

;;

14425

esac

14426

@@ -6608,29 +7736,29 @@ EOF

14427

set dummy $deplib_matches; shift

14428

deplib_match=$1

14429

if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then

14430

- newdeplibs="$newdeplibs $i"

14431

+ func_append newdeplibs " $i"

14432

else

14433

droppeddeps=yes

14434

- $ECHO

14435

+ echo

14436

$ECHO "*** Warning: dynamic linker does not accept needed library $i."

14437

- $ECHO "*** I have the capability to make that library automatically link in when"

14438

- $ECHO "*** you link to this library. But I can only do this if you have a"

14439

- $ECHO "*** shared version of the library, which you do not appear to have"

14440

- $ECHO "*** because a test_compile did reveal that the linker did not use this one"

14441

- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."

14442

+ echo "*** I have the capability to make that library automatically link in when"

14443

+ echo "*** you link to this library. But I can only do this if you have a"

14444

+ echo "*** shared version of the library, which you do not appear to have"

14445

+ echo "*** because a test_compile did reveal that the linker did not use this one"

14446

+ echo "*** as a dynamic dependency that programs can get resolved with at runtime."

14447

14448

14449

else

14450

droppeddeps=yes

14451

- $ECHO

14452

+ echo

14453

$ECHO "*** Warning! Library $i is needed by this library but I was not able to"

14454

- $ECHO "*** make it link in! You will probably need to install it or some"

14455

- $ECHO "*** library that it depends on before this library will be fully"

14456

- $ECHO "*** functional. Installing it before continuing would be even better."

14457

+ echo "*** make it link in! You will probably need to install it or some"

14458

+ echo "*** library that it depends on before this library will be fully"

14459

+ echo "*** functional. Installing it before continuing would be even better."

14460

14461

;;

14462

14463

- newdeplibs="$newdeplibs $i"

14464

+ func_append newdeplibs " $i"

14465

;;

14466

esac

14467

done

14468

@@ -6647,15 +7775,27 @@ EOF

14469

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

14470

case " $predeps $postdeps " in

14471

*" $a_deplib "*)

14472

- newdeplibs="$newdeplibs $a_deplib"

14473

+ func_append newdeplibs " $a_deplib"

14474

a_deplib=""

14475

;;

14476

esac

14477

14478

if test -n "$a_deplib" ; then

14479

libname=`eval "\\$ECHO \"$libname_spec\""`

14480

+ if test -n "$file_magic_glob"; then

14481

+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`

14482

+ else

14483

+ libnameglob=$libname

14484

+ fi

14485

+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`

14486

for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do

14487

- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`

14488

+ if test "$want_nocaseglob" = yes; then

14489

+ shopt -s nocaseglob

14490

+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`

14491

+ $nocaseglob

14492

+ else

14493

+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`

14494

+ fi

14495

for potent_lib in $potential_libs; do

14496

# Follow soft links.

14497

if ls -lLd "$potent_lib" 2>/dev/null |

14498

@@ -6672,13 +7812,13 @@ EOF

14499

potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`

14500

case $potliblink in

14501

[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;

14502

- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;

14503

+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;

14504

esac

14505

done

14506

if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |

14507

$SED -e 10q |

14508

$EGREP "$file_magic_regex" > /dev/null; then

14509

- newdeplibs="$newdeplibs $a_deplib"

14510

+ func_append newdeplibs " $a_deplib"

14511

a_deplib=""

14512

break 2

14513

14514

@@ -6687,12 +7827,12 @@ EOF

14515

14516

if test -n "$a_deplib" ; then

14517

droppeddeps=yes

14518

- $ECHO

14519

+ echo

14520

$ECHO "*** Warning: linker path does not have real file for library $a_deplib."

14521

- $ECHO "*** I have the capability to make that library automatically link in when"

14522

- $ECHO "*** you link to this library. But I can only do this if you have a"

14523

- $ECHO "*** shared version of the library, which you do not appear to have"

14524

- $ECHO "*** because I did check the linker path looking for a file starting"

14525

+ echo "*** I have the capability to make that library automatically link in when"

14526

+ echo "*** you link to this library. But I can only do this if you have a"

14527

+ echo "*** shared version of the library, which you do not appear to have"

14528

+ echo "*** because I did check the linker path looking for a file starting"

14529

if test -z "$potlib" ; then

14530

$ECHO "*** with $libname but no candidates were found. (...for file magic test)"

14531

else

14532

@@ -6703,7 +7843,7 @@ EOF

14533

;;

14534

14535

# Add a -L argument.

14536

- newdeplibs="$newdeplibs $a_deplib"

14537

+ func_append newdeplibs " $a_deplib"

14538

;;

14539

esac

14540

done # Gone through all deplibs.

14541

@@ -6719,7 +7859,7 @@ EOF

14542

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

14543

case " $predeps $postdeps " in

14544

*" $a_deplib "*)

14545

- newdeplibs="$newdeplibs $a_deplib"

14546

+ func_append newdeplibs " $a_deplib"

14547

a_deplib=""

14548

;;

14549

esac

14550

@@ -6730,9 +7870,9 @@ EOF

14551

potential_libs=`ls $i/$libname[.-]* 2>/dev/null`

14552

for potent_lib in $potential_libs; do

14553

potlib="$potent_lib" # see symlink-check above in file_magic test

14554

- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \

14555

+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \

14556

$EGREP "$match_pattern_regex" > /dev/null; then

14557

- newdeplibs="$newdeplibs $a_deplib"

14558

+ func_append newdeplibs " $a_deplib"

14559

a_deplib=""

14560

break 2

14561

14562

@@ -6741,12 +7881,12 @@ EOF

14563

14564

if test -n "$a_deplib" ; then

14565

droppeddeps=yes

14566

- $ECHO

14567

+ echo

14568

$ECHO "*** Warning: linker path does not have real file for library $a_deplib."

14569

- $ECHO "*** I have the capability to make that library automatically link in when"

14570

- $ECHO "*** you link to this library. But I can only do this if you have a"

14571

- $ECHO "*** shared version of the library, which you do not appear to have"

14572

- $ECHO "*** because I did check the linker path looking for a file starting"

14573

+ echo "*** I have the capability to make that library automatically link in when"

14574

+ echo "*** you link to this library. But I can only do this if you have a"

14575

+ echo "*** shared version of the library, which you do not appear to have"

14576

+ echo "*** because I did check the linker path looking for a file starting"

14577

if test -z "$potlib" ; then

14578

$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"

14579

else

14580

@@ -6757,32 +7897,32 @@ EOF

14581

;;

14582

14583

# Add a -L argument.

14584

- newdeplibs="$newdeplibs $a_deplib"

14585

+ func_append newdeplibs " $a_deplib"

14586

;;

14587

esac

14588

done # Gone through all deplibs.

14589

;;

14590

none | unknown | *)

14591

newdeplibs=""

14592

- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \

14593

- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`

14594

+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`

14595

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

14596

for i in $predeps $postdeps ; do

14597

# can't use Xsed below, because $i might contain '/'

14598

- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`

14599

+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`

14600

done

14601

14602

- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |

14603

- $GREP . >/dev/null; then

14604

- $ECHO

14605

+ case $tmp_deplibs in

14606

+ *[!\ \ ]*)

14607

+ echo

14608

if test "X$deplibs_check_method" = "Xnone"; then

14609

- $ECHO "*** Warning: inter-library dependencies are not supported in this platform."

14610

+ echo "*** Warning: inter-library dependencies are not supported in this platform."

14611

else

14612

- $ECHO "*** Warning: inter-library dependencies are not known to be supported."

14613

+ echo "*** Warning: inter-library dependencies are not known to be supported."

14614

14615

- $ECHO "*** All declared inter-library dependencies are being dropped."

14616

+ echo "*** All declared inter-library dependencies are being dropped."

14617

droppeddeps=yes

14618

- fi

14619

+ ;;

14620

+ esac

14621

;;

14622

esac

14623

versuffix=$versuffix_save

14624

@@ -6794,23 +7934,23 @@ EOF

14625

case $host in

14626

*-*-rhapsody* | *-*-darwin1.[012])

14627

# On Rhapsody replace the C library with the System framework

14628

- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`

14629

+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`

14630

;;

14631

esac

14632

14633

if test "$droppeddeps" = yes; then

14634

if test "$module" = yes; then

14635

- $ECHO

14636

- $ECHO "*** Warning: libtool could not satisfy all declared inter-library"

14637

+ echo

14638

+ echo "*** Warning: libtool could not satisfy all declared inter-library"

14639

$ECHO "*** dependencies of module $libname. Therefore, libtool will create"

14640

- $ECHO "*** a static module, that should work as long as the dlopening"

14641

- $ECHO "*** application is linked with the -dlopen flag."

14642

+ echo "*** a static module, that should work as long as the dlopening"

14643

+ echo "*** application is linked with the -dlopen flag."

14644

if test -z "$global_symbol_pipe"; then

14645

- $ECHO

14646

- $ECHO "*** However, this would only work if libtool was able to extract symbol"

14647

- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"

14648

- $ECHO "*** not find such a program. So, this module is probably useless."

14649

- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."

14650

+ echo

14651

+ echo "*** However, this would only work if libtool was able to extract symbol"

14652

+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"

14653

+ echo "*** not find such a program. So, this module is probably useless."

14654

+ echo "*** \`nm' from GNU binutils and a full rebuild may help."

14655

14656

if test "$build_old_libs" = no; then

14657

oldlibs="$output_objdir/$libname.$libext"

14658

@@ -6820,16 +7960,16 @@ EOF

14659

build_libtool_libs=no

14660

14661

else

14662

- $ECHO "*** The inter-library dependencies that have been dropped here will be"

14663

- $ECHO "*** automatically added whenever a program is linked with this library"

14664

- $ECHO "*** or is declared to -dlopen it."

14665

+ echo "*** The inter-library dependencies that have been dropped here will be"

14666

+ echo "*** automatically added whenever a program is linked with this library"

14667

+ echo "*** or is declared to -dlopen it."

14668

14669

if test "$allow_undefined" = no; then

14670

- $ECHO

14671

- $ECHO "*** Since this library must not contain undefined symbols,"

14672

- $ECHO "*** because either the platform does not support them or"

14673

- $ECHO "*** it was explicitly requested with -no-undefined,"

14674

- $ECHO "*** libtool will only create a static version of it."

14675

+ echo

14676

+ echo "*** Since this library must not contain undefined symbols,"

14677

+ echo "*** because either the platform does not support them or"

14678

+ echo "*** it was explicitly requested with -no-undefined,"

14679

+ echo "*** libtool will only create a static version of it."

14680

if test "$build_old_libs" = no; then

14681

oldlibs="$output_objdir/$libname.$libext"

14682

build_libtool_libs=module

14683

@@ -6846,9 +7986,9 @@ EOF

14684

# Time to change all our "foo.ltframework" stuff back to "-framework foo"

14685

case $host in

14686

*-*-darwin*)

14687

- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

14688

- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

14689

- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

14690

+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

14691

+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

14692

+ deplibs=`$ECHO " $deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

14693

;;

14694

esac

14695

14696

@@ -6861,7 +8001,7 @@ EOF

14697

14698

case " $deplibs " in

14699

*" -L$path/$objdir "*)

14700

- new_libs="$new_libs -L$path/$objdir" ;;

14701

+ func_append new_libs " -L$path/$objdir" ;;

14702

esac

14703

;;

14704

esac

14705

@@ -6871,10 +8011,10 @@ EOF

14706

-L*)

14707

case " $new_libs " in

14708

*" $deplib "*) ;;

14709

- *) new_libs="$new_libs $deplib" ;;

14710

+ *) func_append new_libs " $deplib" ;;

14711

esac

14712

;;

14713

- *) new_libs="$new_libs $deplib" ;;

14714

+ *) func_append new_libs " $deplib" ;;

14715

esac

14716

done

14717

deplibs="$new_libs"

14718

@@ -6891,10 +8031,12 @@ EOF

14719

hardcode_libdirs=

14720

dep_rpath=

14721

rpath="$finalize_rpath"

14722

- test "$mode" != relink && rpath="$compile_rpath$rpath"

14723

+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"

14724

for libdir in $rpath; do

14725

if test -n "$hardcode_libdir_flag_spec"; then

14726

if test -n "$hardcode_libdir_separator"; then

14727

+ func_replace_sysroot "$libdir"

14728

+ libdir=$func_replace_sysroot_result

14729

if test -z "$hardcode_libdirs"; then

14730

hardcode_libdirs="$libdir"

14731

else

14732

@@ -6903,18 +8045,18 @@ EOF

14733

*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)

14734

;;

14735

14736

- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"

14737

+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"

14738

;;

14739

esac

14740

14741

else

14742

eval flag=\"$hardcode_libdir_flag_spec\"

14743

- dep_rpath="$dep_rpath $flag"

14744

+ func_append dep_rpath " $flag"

14745

14746

elif test -n "$runpath_var"; then

14747

case "$perm_rpath " in

14748

*" $libdir "*) ;;

14749

- *) perm_rpath="$perm_rpath $libdir" ;;

14750

+ *) func_apped perm_rpath " $libdir" ;;

14751

esac

14752

14753

done

14754

@@ -6932,7 +8074,7 @@ EOF

14755

# We should set the runpath_var.

14756

rpath=

14757

for dir in $perm_rpath; do

14758

- rpath="$rpath$dir:"

14759

+ func_append rpath "$dir:"

14760

done

14761

eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"

14762

14763

@@ -6940,7 +8082,7 @@ EOF

14764

14765

14766

shlibpath="$finalize_shlibpath"

14767

- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"

14768

+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"

14769

if test -n "$shlibpath"; then

14770

eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"

14771

14772

@@ -6966,18 +8108,18 @@ EOF

14773

linknames=

14774

for link

14775

14776

- linknames="$linknames $link"

14777

+ func_append linknames " $link"

14778

done

14779

14780

# Use standard objects if they are pic

14781

- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`

14782

+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`

14783

test "X$libobjs" = "X " && libobjs=

14784

14785

delfiles=

14786

if test -n "$export_symbols" && test -n "$include_expsyms"; then

14787

$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"

14788

export_symbols="$output_objdir/$libname.uexp"

14789

- delfiles="$delfiles $export_symbols"

14790

+ func_append delfiles " $export_symbols"

14791

14792

14793

orig_export_symbols=

14794

@@ -7008,13 +8150,45 @@ EOF

14795

$opt_dry_run || $RM $export_symbols

14796

cmds=$export_symbols_cmds

14797

save_ifs="$IFS"; IFS='~'

14798

- for cmd in $cmds; do

14799

+ for cmd1 in $cmds; do

14800

IFS="$save_ifs"

14801

- eval cmd=\"$cmd\"

14802

- func_len " $cmd"

14803

- len=$func_len_result

14804

- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then

14805

+ # Take the normal branch if the nm_file_list_spec branch

14806

+ # doesn't work or if tool conversion is not needed.

14807

+ case $nm_file_list_spec~$to_tool_file_cmd in

14808

+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)

14809

+ try_normal_branch=yes

14810

+ eval cmd=\"$cmd1\"

14811

+ func_len " $cmd"

14812

+ len=$func_len_result

14813

+ ;;

14814

+ *)

14815

+ try_normal_branch=no

14816

+ ;;

14817

+ esac

14818

+ if test "$try_normal_branch" = yes \

14819

+ && { test "$len" -lt "$max_cmd_len" \

14820

+ || test "$max_cmd_len" -le -1; }

14821

+ then

14822

+ func_show_eval "$cmd" 'exit $?'

14823

+ skipped_export=false

14824

+ elif test -n "$nm_file_list_spec"; then

14825

+ func_basename "$output"

14826

+ output_la=$func_basename_result

14827

+ save_libobjs=$libobjs

14828

+ save_output=$output

14829

+ output=${output_objdir}/${output_la}.nm

14830

+ func_to_tool_file "$output"

14831

+ libobjs=$nm_file_list_spec$func_to_tool_file_result

14832

+ func_append delfiles " $output"

14833

+ func_verbose "creating $NM input file list: $output"

14834

+ for obj in $save_libobjs; do

14835

+ func_to_tool_file "$obj"

14836

+ $ECHO "$func_to_tool_file_result"

14837

+ done > "$output"

14838

+ eval cmd=\"$cmd1\"

14839

func_show_eval "$cmd" 'exit $?'

14840

+ output=$save_output

14841

+ libobjs=$save_libobjs

14842

skipped_export=false

14843

else

14844

# The command line is too long to execute in one step.

14845

@@ -7036,7 +8210,7 @@ EOF

14846

if test -n "$export_symbols" && test -n "$include_expsyms"; then

14847

tmp_export_symbols="$export_symbols"

14848

test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"

14849

- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'

14850

+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'

14851

14852

14853

if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then

14854

@@ -7048,7 +8222,7 @@ EOF

14855

# global variables. join(1) would be nice here, but unfortunately

14856

# isn't a blessed tool.

14857

$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter

14858

- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"

14859

+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"

14860

export_symbols=$output_objdir/$libname.def

14861

$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols

14862

14863

@@ -7058,7 +8232,7 @@ EOF

14864

case " $convenience " in

14865

*" $test_deplib "*) ;;

14866

14867

- tmp_deplibs="$tmp_deplibs $test_deplib"

14868

+ func_append tmp_deplibs " $test_deplib"

14869

;;

14870

esac

14871

done

14872

@@ -7078,21 +8252,21 @@ EOF

14873

test "X$libobjs" = "X " && libobjs=

14874

else

14875

gentop="$output_objdir/${outputname}x"

14876

- generated="$generated $gentop"

14877

+ func_append generated " $gentop"

14878

14879

func_extract_archives $gentop $convenience

14880

- libobjs="$libobjs $func_extract_archives_result"

14881

+ func_append libobjs " $func_extract_archives_result"

14882

test "X$libobjs" = "X " && libobjs=

14883

14884

14885

14886

if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then

14887

eval flag=\"$thread_safe_flag_spec\"

14888

- linker_flags="$linker_flags $flag"

14889

+ func_append linker_flags " $flag"

14890

14891

14892

# Make a backup of the uninstalled library when relinking

14893

- if test "$mode" = relink; then

14894

+ if test "$opt_mode" = relink; then

14895

$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?

14896

14897

14898

@@ -7137,7 +8311,8 @@ EOF

14899

save_libobjs=$libobjs

14900

14901

save_output=$output

14902

- output_la=`$ECHO "X$output" | $Xsed -e "$basename"`

14903

+ func_basename "$output"

14904

+ output_la=$func_basename_result

14905

14906

# Clear the reloadable object creation command queue and

14907

# initialize k to one.

14908

@@ -7150,13 +8325,16 @@ EOF

14909

if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then

14910

output=${output_objdir}/${output_la}.lnkscript

14911

func_verbose "creating GNU ld script: $output"

14912

- $ECHO 'INPUT (' > $output

14913

+ echo 'INPUT (' > $output

14914

for obj in $save_libobjs

14915

14916

- $ECHO "$obj" >> $output

14917

+ func_to_tool_file "$obj"

14918

+ $ECHO "$func_to_tool_file_result" >> $output

14919

done

14920

- $ECHO ')' >> $output

14921

- delfiles="$delfiles $output"

14922

+ echo ')' >> $output

14923

+ func_append delfiles " $output"

14924

+ func_to_tool_file "$output"

14925

+ output=$func_to_tool_file_result

14926

elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then

14927

output=${output_objdir}/${output_la}.lnk

14928

func_verbose "creating linker input file list: $output"

14929

@@ -7170,10 +8348,12 @@ EOF

14930

14931

for obj

14932

14933

- $ECHO "$obj" >> $output

14934

+ func_to_tool_file "$obj"

14935

+ $ECHO "$func_to_tool_file_result" >> $output

14936

done

14937

- delfiles="$delfiles $output"

14938

- output=$firstobj\"$file_list_spec$output\"

14939

+ func_append delfiles " $output"

14940

+ func_to_tool_file "$output"

14941

+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"

14942

else

14943

if test -n "$save_libobjs"; then

14944

func_verbose "creating reloadable object files..."

14945

@@ -7197,17 +8377,19 @@ EOF

14946

# command to the queue.

14947

if test "$k" -eq 1 ; then

14948

# The first file doesn't have a previous command to add.

14949

- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"

14950

+ reload_objs=$objlist

14951

+ eval concat_cmds=\"$reload_cmds\"

14952

else

14953

# All subsequent reloadable object files will link in

14954

# the last one created.

14955

- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"

14956

+ reload_objs="$objlist $last_robj"

14957

+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"

14958

14959

last_robj=$output_objdir/$output_la-${k}.$objext

14960

func_arith $k + 1

14961

k=$func_arith_result

14962

output=$output_objdir/$output_la-${k}.$objext

14963

- objlist=$obj

14964

+ objlist=" $obj"

14965

func_len " $last_robj"

14966

func_arith $len0 + $func_len_result

14967

len=$func_arith_result

14968

@@ -7217,11 +8399,12 @@ EOF

14969

# reloadable object file. All subsequent reloadable object

14970

# files will link in the last one created.

14971

test -z "$concat_cmds" || concat_cmds=$concat_cmds~

14972

- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"

14973

+ reload_objs="$objlist $last_robj"

14974

+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"

14975

if test -n "$last_robj"; then

14976

eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"

14977

14978

- delfiles="$delfiles $output"

14979

+ func_append delfiles " $output"

14980

14981

else

14982

output=

14983

@@ -7255,7 +8438,7 @@ EOF

14984

lt_exit=$?

14985

14986

# Restore the uninstalled library and exit

14987

- if test "$mode" = relink; then

14988

+ if test "$opt_mode" = relink; then

14989

( cd "$output_objdir" && \

14990

$RM "${realname}T" && \

14991

$MV "${realname}U" "$realname" )

14992

@@ -7276,7 +8459,7 @@ EOF

14993

if test -n "$export_symbols" && test -n "$include_expsyms"; then

14994

tmp_export_symbols="$export_symbols"

14995

test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"

14996

- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'

14997

+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'

14998

14999

15000

if test -n "$orig_export_symbols"; then

15001

@@ -7288,7 +8471,7 @@ EOF

15002

# global variables. join(1) would be nice here, but unfortunately

15003

# isn't a blessed tool.

15004

$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter

15005

- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"

15006

+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"

15007

export_symbols=$output_objdir/$libname.def

15008

$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols

15009

15010

@@ -7329,10 +8512,10 @@ EOF

15011

# Add any objects from preloaded convenience libraries

15012

if test -n "$dlprefiles"; then

15013

gentop="$output_objdir/${outputname}x"

15014

- generated="$generated $gentop"

15015

+ func_append generated " $gentop"

15016

15017

func_extract_archives $gentop $dlprefiles

15018

- libobjs="$libobjs $func_extract_archives_result"

15019

+ func_append libobjs " $func_extract_archives_result"

15020

test "X$libobjs" = "X " && libobjs=

15021

15022

15023

@@ -7348,7 +8531,7 @@ EOF

15024

lt_exit=$?

15025

15026

# Restore the uninstalled library and exit

15027

- if test "$mode" = relink; then

15028

+ if test "$opt_mode" = relink; then

15029

( cd "$output_objdir" && \

15030

$RM "${realname}T" && \

15031

$MV "${realname}U" "$realname" )

15032

@@ -7360,7 +8543,7 @@ EOF

15033

IFS="$save_ifs"

15034

15035

# Restore the uninstalled library and exit

15036

- if test "$mode" = relink; then

15037

+ if test "$opt_mode" = relink; then

15038

$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?

15039

15040

if test -n "$convenience"; then

15041

@@ -7441,18 +8624,21 @@ EOF

15042

if test -n "$convenience"; then

15043

if test -n "$whole_archive_flag_spec"; then

15044

eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"

15045

- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`

15046

+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`

15047

else

15048

gentop="$output_objdir/${obj}x"

15049

- generated="$generated $gentop"

15050

+ func_append generated " $gentop"

15051

15052

func_extract_archives $gentop $convenience

15053

reload_conv_objs="$reload_objs $func_extract_archives_result"

15054

15055

15056

15057

+ # If we're not building shared, we need to use non_pic_objs

15058

+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"

15059

15060

# Create the old-style object.

15061

- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test

15062

+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test

15063

15064

output="$obj"

15065

func_execute_cmds "$reload_cmds" 'exit $?'

15066

@@ -7512,8 +8698,8 @@ EOF

15067

case $host in

15068

*-*-rhapsody* | *-*-darwin1.[012])

15069

# On Rhapsody replace the C library is the System framework

15070

- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`

15071

- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`

15072

+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`

15073

+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`

15074

;;

15075

esac

15076

15077

@@ -7524,14 +8710,14 @@ EOF

15078

if test "$tagname" = CXX ; then

15079

case ${MACOSX_DEPLOYMENT_TARGET-10.0} in

15080

10.[0123])

15081

- compile_command="$compile_command ${wl}-bind_at_load"

15082

- finalize_command="$finalize_command ${wl}-bind_at_load"

15083

+ func_append compile_command " ${wl}-bind_at_load"

15084

+ func_append finalize_command " ${wl}-bind_at_load"

15085

;;

15086

esac

15087

15088

# Time to change all our "foo.ltframework" stuff back to "-framework foo"

15089

- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

15090

- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

15091

+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

15092

+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

15093

;;

15094

esac

15095

15096

@@ -7545,7 +8731,7 @@ EOF

15097

15098

case " $compile_deplibs " in

15099

*" -L$path/$objdir "*)

15100

- new_libs="$new_libs -L$path/$objdir" ;;

15101

+ func_append new_libs " -L$path/$objdir" ;;

15102

esac

15103

;;

15104

esac

15105

@@ -7555,17 +8741,17 @@ EOF

15106

-L*)

15107

case " $new_libs " in

15108

*" $deplib "*) ;;

15109

- *) new_libs="$new_libs $deplib" ;;

15110

+ *) func_append new_libs " $deplib" ;;

15111

esac

15112

;;

15113

- *) new_libs="$new_libs $deplib" ;;

15114

+ *) func_append new_libs " $deplib" ;;

15115

esac

15116

done

15117

compile_deplibs="$new_libs"

15118

15119

15120

- compile_command="$compile_command $compile_deplibs"

15121

- finalize_command="$finalize_command $finalize_deplibs"

15122

+ func_append compile_command " $compile_deplibs"

15123

+ func_append finalize_command " $finalize_deplibs"

15124

15125

if test -n "$rpath$xrpath"; then

15126

# If the user specified any rpath flags, then add them.

15127

@@ -7573,7 +8759,7 @@ EOF

15128

# This is the magic to use -rpath.

15129

case "$finalize_rpath " in

15130

*" $libdir "*) ;;

15131

- *) finalize_rpath="$finalize_rpath $libdir" ;;

15132

+ *) func_append finalize_rpath " $libdir" ;;

15133

esac

15134

done

15135

15136

@@ -7592,18 +8778,18 @@ EOF

15137

*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)

15138

;;

15139

15140

- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"

15141

+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"

15142

;;

15143

esac

15144

15145

else

15146

eval flag=\"$hardcode_libdir_flag_spec\"

15147

- rpath="$rpath $flag"

15148

+ func_append rpath " $flag"

15149

15150

elif test -n "$runpath_var"; then

15151

case "$perm_rpath " in

15152

*" $libdir "*) ;;

15153

- *) perm_rpath="$perm_rpath $libdir" ;;

15154

+ *) func_append perm_rpath " $libdir" ;;

15155

esac

15156

15157

case $host in

15158

@@ -7612,12 +8798,12 @@ EOF

15159

case :$dllsearchpath: in

15160

*":$libdir:"*) ;;

15161

::) dllsearchpath=$libdir;;

15162

- *) dllsearchpath="$dllsearchpath:$libdir";;

15163

+ *) func_append dllsearchpath ":$libdir";;

15164

esac

15165

case :$dllsearchpath: in

15166

*":$testbindir:"*) ;;

15167

::) dllsearchpath=$testbindir;;

15168

- *) dllsearchpath="$dllsearchpath:$testbindir";;

15169

+ *) func_append dllsearchpath ":$testbindir";;

15170

esac

15171

;;

15172

esac

15173

@@ -7643,18 +8829,18 @@ EOF

15174

*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)

15175

;;

15176

15177

- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"

15178

+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"

15179

;;

15180

esac

15181

15182

else

15183

eval flag=\"$hardcode_libdir_flag_spec\"

15184

- rpath="$rpath $flag"

15185

+ func_append rpath " $flag"

15186

15187

elif test -n "$runpath_var"; then

15188

case "$finalize_perm_rpath " in

15189

*" $libdir "*) ;;

15190

- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;

15191

+ *) func_append finalize_perm_rpath " $libdir" ;;

15192

esac

15193

15194

done

15195

@@ -7668,8 +8854,8 @@ EOF

15196

15197

if test -n "$libobjs" && test "$build_old_libs" = yes; then

15198

# Transform all the library objects into standard objects.

15199

- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`

15200

- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`

15201

+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`

15202

+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`

15203

15204

15205

func_generate_dlsyms "$outputname" "@PROGRAM@" "no"

15206

@@ -7681,15 +8867,15 @@ EOF

15207

15208

wrappers_required=yes

15209

case $host in

15210

+ *cegcc* | *mingw32ce*)

15211

+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.

15212

+ wrappers_required=no

15213

+ ;;

15214

*cygwin* | *mingw* )

15215

if test "$build_libtool_libs" != yes; then

15216

wrappers_required=no

15217

15218

;;

15219

- *cegcc)

15220

- # Disable wrappers for cegcc, we are cross compiling anyway.

15221

- wrappers_required=no

15222

- ;;

15223

15224

if test "$need_relink" = no || test "$build_libtool_libs" != yes; then

15225

wrappers_required=no

15226

@@ -7698,13 +8884,19 @@ EOF

15227

esac

15228

if test "$wrappers_required" = no; then

15229

# Replace the output file specification.

15230

- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`

15231

+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`

15232

link_command="$compile_command$compile_rpath"

15233

15234

# We have no uninstalled library dependencies, so finalize right now.

15235

exit_status=0

15236

func_show_eval "$link_command" 'exit_status=$?'

15237

15238

+ if test -n "$postlink_cmds"; then

15239

+ func_to_tool_file "$output"

15240

+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`

15241

+ func_execute_cmds "$postlink_cmds" 'exit $?'

15242

+ fi

15243

15244

# Delete the generated files.

15245

if test -f "$output_objdir/${outputname}S.${objext}"; then

15246

func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'

15247

@@ -7727,7 +8919,7 @@ EOF

15248

# We should set the runpath_var.

15249

rpath=

15250

for dir in $perm_rpath; do

15251

- rpath="$rpath$dir:"

15252

+ func_append rpath "$dir:"

15253

done

15254

compile_var="$runpath_var=\"$rpath\$$runpath_var\" "

15255

15256

@@ -7735,7 +8927,7 @@ EOF

15257

# We should set the runpath_var.

15258

rpath=

15259

for dir in $finalize_perm_rpath; do

15260

- rpath="$rpath$dir:"

15261

+ func_append rpath "$dir:"

15262

done

15263

finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "

15264

15265

@@ -7745,11 +8937,18 @@ EOF

15266

# We don't need to create a wrapper script.

15267

link_command="$compile_var$compile_command$compile_rpath"

15268

# Replace the output file specification.

15269

- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`

15270

+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`

15271

# Delete the old output file.

15272

$opt_dry_run || $RM $output

15273

# Link the executable and exit

15274

func_show_eval "$link_command" 'exit $?'

15275

15276

+ if test -n "$postlink_cmds"; then

15277

+ func_to_tool_file "$output"

15278

+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`

15279

+ func_execute_cmds "$postlink_cmds" 'exit $?'

15280

+ fi

15281

15282

exit $EXIT_SUCCESS

15283

15284

15285

@@ -7764,7 +8963,7 @@ EOF

15286

if test "$fast_install" != no; then

15287

link_command="$finalize_var$compile_command$finalize_rpath"

15288

if test "$fast_install" = yes; then

15289

- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`

15290

+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`

15291

else

15292

# fast_install is set to needless

15293

relink_command=

15294

@@ -7776,13 +8975,19 @@ EOF

15295

15296

15297

# Replace the output file specification.

15298

- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`

15299

+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`

15300

15301

# Delete the old output files.

15302

$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname

15303

15304

func_show_eval "$link_command" 'exit $?'

15305

15306

+ if test -n "$postlink_cmds"; then

15307

+ func_to_tool_file "$output_objdir/$outputname"

15308

+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`

15309

+ func_execute_cmds "$postlink_cmds" 'exit $?'

15310

+ fi

15311

15312

# Now create the wrapper script.

15313

func_verbose "creating $output"

15314

15315

@@ -7800,18 +9005,7 @@ EOF

15316

15317

done

15318

relink_command="(cd `pwd`; $relink_command)"

15319

- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`

15320

- fi

15321

15322

- # Quote $ECHO for shipping.

15323

- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then

15324

- case $progpath in

15325

- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;

15326

- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;

15327

- esac

15328

- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`

15329

- else

15330

- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`

15331

+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`

15332

15333

15334

# Only actually do things if not in dry run mode.

15335

@@ -7891,7 +9085,7 @@ EOF

15336

else

15337

oldobjs="$old_deplibs $non_pic_objects"

15338

if test "$preload" = yes && test -f "$symfileobj"; then

15339

- oldobjs="$oldobjs $symfileobj"

15340

+ func_append oldobjs " $symfileobj"

15341

15342

15343

addlibs="$old_convenience"

15344

@@ -7899,10 +9093,10 @@ EOF

15345

15346

if test -n "$addlibs"; then

15347

gentop="$output_objdir/${outputname}x"

15348

- generated="$generated $gentop"

15349

+ func_append generated " $gentop"

15350

15351

func_extract_archives $gentop $addlibs

15352

- oldobjs="$oldobjs $func_extract_archives_result"

15353

+ func_append oldobjs " $func_extract_archives_result"

15354

15355

15356

# Do each command in the archive commands.

15357

@@ -7913,10 +9107,10 @@ EOF

15358

# Add any objects from preloaded convenience libraries

15359

if test -n "$dlprefiles"; then

15360

gentop="$output_objdir/${outputname}x"

15361

- generated="$generated $gentop"

15362

+ func_append generated " $gentop"

15363

15364

func_extract_archives $gentop $dlprefiles

15365

- oldobjs="$oldobjs $func_extract_archives_result"

15366

+ func_append oldobjs " $func_extract_archives_result"

15367

15368

15369

# POSIX demands no paths to be encoded in archives. We have

15370

@@ -7932,9 +9126,9 @@ EOF

15371

done | sort | sort -uc >/dev/null 2>&1); then

15372

15373

else

15374

- $ECHO "copying selected object files to avoid basename conflicts..."

15375

+ echo "copying selected object files to avoid basename conflicts..."

15376

gentop="$output_objdir/${outputname}x"

15377

- generated="$generated $gentop"

15378

+ func_append generated " $gentop"

15379

func_mkdir_p "$gentop"

15380

save_oldobjs=$oldobjs

15381

oldobjs=

15382

@@ -7958,9 +9152,9 @@ EOF

15383

esac

15384

done

15385

func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"

15386

- oldobjs="$oldobjs $gentop/$newobj"

15387

+ func_append oldobjs " $gentop/$newobj"

15388

;;

15389

- *) oldobjs="$oldobjs $obj" ;;

15390

+ *) func_append oldobjs " $obj" ;;

15391

esac

15392

done

15393

15394

@@ -7970,6 +9164,16 @@ EOF

15395

len=$func_len_result

15396

if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then

15397

cmds=$old_archive_cmds

15398

+ elif test -n "$archiver_list_spec"; then

15399

+ func_verbose "using command file archive linking..."

15400

+ for obj in $oldobjs

15401

+ do

15402

+ func_to_tool_file "$obj"

15403

+ $ECHO "$func_to_tool_file_result"

15404

+ done > $output_objdir/$libname.libcmd

15405

+ func_to_tool_file "$output_objdir/$libname.libcmd"

15406

+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"

15407

+ cmds=$old_archive_cmds

15408

else

15409

# the command line is too long to link in one step, link in parts

15410

func_verbose "using piecewise archive linking..."

15411

@@ -8043,7 +9247,7 @@ EOF

15412

done

15413

# Quote the link command for shipping.

15414

relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"

15415

- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`

15416

+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`

15417

if test "$hardcode_automatic" = yes ; then

15418

relink_command=

15419

15420

@@ -8066,9 +9270,19 @@ EOF

15421

eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`

15422

test -z "$libdir" && \

15423

func_fatal_error "\`$deplib' is not a valid libtool archive"

15424

- newdependency_libs="$newdependency_libs $libdir/$name"

15425

+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"

15426

+ ;;

15427

+ -L*)

15428

+ func_stripname -L '' "$deplib"

15429

+ func_replace_sysroot "$func_stripname_result"

15430

+ func_append newdependency_libs " -L$func_replace_sysroot_result"

15431

;;

15432

- *) newdependency_libs="$newdependency_libs $deplib" ;;

15433

+ -R*)

15434

+ func_stripname -R '' "$deplib"

15435

+ func_replace_sysroot "$func_stripname_result"

15436

+ func_append newdependency_libs " -R$func_replace_sysroot_result"

15437

+ ;;

15438

+ *) func_append newdependency_libs " $deplib" ;;

15439

esac

15440

done

15441

dependency_libs="$newdependency_libs"

15442

@@ -8082,9 +9296,9 @@ EOF

15443

eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`

15444

test -z "$libdir" && \

15445

func_fatal_error "\`$lib' is not a valid libtool archive"

15446

- newdlfiles="$newdlfiles $libdir/$name"

15447

+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"

15448

;;

15449

- *) newdlfiles="$newdlfiles $lib" ;;

15450

+ *) func_append newdlfiles " $lib" ;;

15451

esac

15452

done

15453

dlfiles="$newdlfiles"

15454

@@ -8101,7 +9315,7 @@ EOF

15455

eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`

15456

test -z "$libdir" && \

15457

func_fatal_error "\`$lib' is not a valid libtool archive"

15458

- newdlprefiles="$newdlprefiles $libdir/$name"

15459

+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"

15460

;;

15461

esac

15462

done

15463

@@ -8113,7 +9327,7 @@ EOF

15464

[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;

15465

*) abs=`pwd`"/$lib" ;;

15466

esac

15467

- newdlfiles="$newdlfiles $abs"

15468

+ func_append newdlfiles " $abs"

15469

done

15470

dlfiles="$newdlfiles"

15471

newdlprefiles=

15472

@@ -8122,15 +9336,33 @@ EOF

15473

[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;

15474

*) abs=`pwd`"/$lib" ;;

15475

esac

15476

- newdlprefiles="$newdlprefiles $abs"

15477

+ func_append newdlprefiles " $abs"

15478

done

15479

dlprefiles="$newdlprefiles"

15480

15481

$RM $output

15482

# place dlname in correct position for cygwin

15483

+ # In fact, it would be nice if we could use this code for all target

15484

+ # systems that can't hard-code library paths into their executables

15485

+ # and that have no shared library path variable independent of PATH,

15486

+ # but it turns out we can't easily determine that from inspecting

15487

+ # libtool variables, so we have to hard-code the OSs to which it

15488

+ # applies here; at the moment, that means platforms that use the PE

15489

+ # object format with DLL files. See the long comment at the top of

15490

+ # tests/bindir.at for full details.

15491

tdlname=$dlname

15492

case $host,$output,$installed,$module,$dlname in

15493

- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;

15494

+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)

15495

+ # If a -bindir argument was supplied, place the dll there.

15496

+ if test "x$bindir" != x ;

15497

+ then

15498

+ func_relative_path "$install_libdir" "$bindir"

15499

+ tdlname=$func_relative_path_result$dlname

15500

+ else

15501

+ # Otherwise fall back on heuristic.

15502

+ tdlname=../bin/$dlname

15503

+ fi

15504

+ ;;

15505

esac

15506

$ECHO > $output "\

15507

# $outputname - a libtool library file

15508

@@ -8189,7 +9421,7 @@ relink_command=\"$relink_command\""

15509

exit $EXIT_SUCCESS

15510

}

15511

15512

-{ test "$mode" = link || test "$mode" = relink; } &&

15513

+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&

15514

func_mode_link ${1+"$@"}

15515

15516

15517

@@ -8209,9 +9441,9 @@ func_mode_uninstall ()

15518

for arg

15519

15520

case $arg in

15521

- -f) RM="$RM $arg"; rmforce=yes ;;

15522

- -*) RM="$RM $arg" ;;

15523

- *) files="$files $arg" ;;

15524

+ -f) func_append RM " $arg"; rmforce=yes ;;

15525

+ -*) func_append RM " $arg" ;;

15526

+ *) func_append files " $arg" ;;

15527

esac

15528

done

15529

15530

@@ -8220,24 +9452,23 @@ func_mode_uninstall ()

15531

15532

rmdirs=

15533

15534

- origobjdir="$objdir"

15535

for file in $files; do

15536

func_dirname "$file" "" "."

15537

dir="$func_dirname_result"

15538

if test "X$dir" = X.; then

15539

- objdir="$origobjdir"

15540

+ odir="$objdir"

15541

else

15542

- objdir="$dir/$origobjdir"

15543

+ odir="$dir/$objdir"

15544

15545

func_basename "$file"

15546

name="$func_basename_result"

15547

- test "$mode" = uninstall && objdir="$dir"

15548

+ test "$opt_mode" = uninstall && odir="$dir"

15549

15550

- # Remember objdir for removal later, being careful to avoid duplicates

15551

- if test "$mode" = clean; then

15552

+ # Remember odir for removal later, being careful to avoid duplicates

15553

+ if test "$opt_mode" = clean; then

15554

case " $rmdirs " in

15555

- *" $objdir "*) ;;

15556

- *) rmdirs="$rmdirs $objdir" ;;

15557

+ *" $odir "*) ;;

15558

+ *) func_append rmdirs " $odir" ;;

15559

esac

15560

15561

15562

@@ -8263,18 +9494,17 @@ func_mode_uninstall ()

15563

15564

# Delete the libtool libraries and symlinks.

15565

for n in $library_names; do

15566

- rmfiles="$rmfiles $objdir/$n"

15567

+ func_append rmfiles " $odir/$n"

15568

done

15569

- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"

15570

+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"

15571

15572

- case "$mode" in

15573

+ case "$opt_mode" in

15574

clean)

15575

- case " $library_names " in

15576

- # " " in the beginning catches empty $dlname

15577

+ case " $library_names " in

15578

*" $dlname "*) ;;

15579

- *) rmfiles="$rmfiles $objdir/$dlname" ;;

15580

+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;

15581

esac

15582

- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"

15583

+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"

15584

;;

15585

uninstall)

15586

if test -n "$library_names"; then

15587

@@ -8302,19 +9532,19 @@ func_mode_uninstall ()

15588

# Add PIC object to the list of files to remove.

15589

if test -n "$pic_object" &&

15590

test "$pic_object" != none; then

15591

- rmfiles="$rmfiles $dir/$pic_object"

15592

+ func_append rmfiles " $dir/$pic_object"

15593

15594

15595

# Add non-PIC object to the list of files to remove.

15596

if test -n "$non_pic_object" &&

15597

test "$non_pic_object" != none; then

15598

- rmfiles="$rmfiles $dir/$non_pic_object"

15599

+ func_append rmfiles " $dir/$non_pic_object"

15600

15601

15602

;;

15603

15604

15605

- if test "$mode" = clean ; then

15606

+ if test "$opt_mode" = clean ; then

15607

noexename=$name

15608

case $file in

15609

*.exe)

15610

@@ -8324,7 +9554,7 @@ func_mode_uninstall ()

15611

noexename=$func_stripname_result

15612

# $file with .exe has already been added to rmfiles,

15613

# add $file without .exe

15614

- rmfiles="$rmfiles $file"

15615

+ func_append rmfiles " $file"

15616

;;

15617

esac

15618

# Do a test to see if this is a libtool program.

15619

@@ -8333,7 +9563,7 @@ func_mode_uninstall ()

15620

func_ltwrapper_scriptname "$file"

15621

relink_command=

15622

func_source $func_ltwrapper_scriptname_result

15623

- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"

15624

+ func_append rmfiles " $func_ltwrapper_scriptname_result"

15625

else

15626

relink_command=

15627

func_source $dir/$noexename

15628

@@ -8341,12 +9571,12 @@ func_mode_uninstall ()

15629

15630

# note $name still contains .exe if it was in $file originally

15631

# as does the version of $file that was added into $rmfiles

15632

- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"

15633

+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"

15634

if test "$fast_install" = yes && test -n "$relink_command"; then

15635

- rmfiles="$rmfiles $objdir/lt-$name"

15636

+ func_append rmfiles " $odir/lt-$name"

15637

15638

if test "X$noexename" != "X$name" ; then

15639

- rmfiles="$rmfiles $objdir/lt-${noexename}.c"

15640

+ func_append rmfiles " $odir/lt-${noexename}.c"

15641

15642

15643

15644

@@ -8354,7 +9584,6 @@ func_mode_uninstall ()

15645

esac

15646

func_show_eval "$RM $rmfiles" 'exit_status=1'

15647

done

15648

- objdir="$origobjdir"

15649

15650

# Try to remove the ${objdir}s in the directories where we deleted files

15651

for dir in $rmdirs; do

15652

@@ -8366,16 +9595,16 @@ func_mode_uninstall ()

15653

exit $exit_status

15654

}

15655

15656

-{ test "$mode" = uninstall || test "$mode" = clean; } &&

15657

+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&

15658

func_mode_uninstall ${1+"$@"}

15659

15660

-test -z "$mode" && {

15661

+test -z "$opt_mode" && {

15662

help="$generic_help"

15663

func_fatal_help "you must specify a MODE"

15664

}

15665

15666

test -z "$exec_cmd" && \

15667

- func_fatal_help "invalid operation mode \`$mode'"

15668

+ func_fatal_help "invalid operation mode \`$opt_mode'"

15669

15670

if test -n "$exec_cmd"; then

15671

eval exec "$exec_cmd"

15672

--- protobuf-2.4.0a.orig/Makefile.in

15673

+++ protobuf-2.4.0a/Makefile.in

15674

@@ -149,6 +149,7 @@ CXXFLAGS = @CXXFLAGS@

15675

CYGPATH_W = @CYGPATH_W@

15676

DEFS = @DEFS@

15677

DEPDIR = @DEPDIR@

15678

+DLLTOOL = @DLLTOOL@

15679

DSYMUTIL = @DSYMUTIL@

15680

DUMPBIN = @DUMPBIN@

15681

ECHO_C = @ECHO_C@

15682

@@ -173,6 +174,7 @@ LIPO = @LIPO@

15683

LN_S = @LN_S@

15684

LTLIBOBJS = @LTLIBOBJS@

15685

MAKEINFO = @MAKEINFO@

15686

+MANIFEST_TOOL = @MANIFEST_TOOL@

19073

15687

MKDIR_P = @MKDIR_P@

19074

15688

NM = @NM@

19075

15689

NMEDIT = @NMEDIT@

19076

+OBJDUMP = @OBJDUMP@

19077

OBJEXT = @OBJEXT@

19078

OTOOL = @OTOOL@

19079

OTOOL64 = @OTOOL64@

19080

@@ -359,6 +377,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

19081

PACKAGE_NAME = @PACKAGE_NAME@

19082

PACKAGE_STRING = @PACKAGE_STRING@

19083

PACKAGE_TARNAME = @PACKAGE_TARNAME@

19084

+PACKAGE_URL = @PACKAGE_URL@

19085

PACKAGE_VERSION = @PACKAGE_VERSION@

19086

PATH_SEPARATOR = @PATH_SEPARATOR@

19087

POW_LIB = @POW_LIB@

19088

@@ -429,6 +448,7 @@ target_alias = @target_alias@

19089

target_cpu = @target_cpu@

19090

target_os = @target_os@

19091

target_vendor = @target_vendor@

19092

+top_build_prefix = @top_build_prefix@

19093

top_builddir = @top_builddir@

19094

top_srcdir = @top_srcdir@

19095

@HAVE_ZLIB_FALSE@GZCHECKPROGRAMS =

19096

@@ -766,14 +786,14 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi

19097

@for dep in $?; do \

19098

case '$(am__configure_deps)' in \

19099

*$$dep*) \

19100

- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

19101

- && exit 0; \

19102

+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

19103

+ && { if test -f $@; then exit 0; else break; fi; }; \

19104

exit 1;; \

19105

esac; \

19106

done; \

19107

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \

19108

- cd $(top_srcdir) && \

19109

- $(AUTOMAKE) --gnu src/Makefile

19110

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \

19111

+ $(am__cd) $(top_srcdir) && \

19112

+ $(AUTOMAKE) --gnu src/Makefile

19113

.PRECIOUS: Makefile

19114

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

19115

@case '$?' in \

19116

@@ -791,23 +811,28 @@ $(top_srcdir)/configure: $(am__configur

19117

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

19118

$(ACLOCAL_M4): $(am__aclocal_m4_deps)

19119

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

19120

+$(am__aclocal_m4_deps):

19121

install-libLTLIBRARIES: $(lib_LTLIBRARIES)

19122

@$(NORMAL_INSTALL)

19123

test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"

19124

- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \

19125

+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \

19126

+ list2=; for p in $$list; do \

19127

if test -f $$p; then \

19128

- f=$(am__strip_dir) \

19129

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \

19130

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \

19131

+ list2="$$list2 $$p"; \

19132

else :; fi; \

19133

- done

19134

+ done; \

19135

+ test -z "$$list2" || { \

19136

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \

19137

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \

19138

+ }

19139

19140

uninstall-libLTLIBRARIES:

19141

@$(NORMAL_UNINSTALL)

19142

- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \

19143

- p=$(am__strip_dir) \

19144

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \

19145

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \

19146

+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \

19147

+ for p in $$list; do \

19148

+ $(am__strip_dir) \

19149

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \

19150

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \

19151

done

19152

19153

clean-libLTLIBRARIES:

19154

@@ -827,38 +852,55 @@ libprotoc.la: $(libprotoc_la_OBJECTS) $(

19155

install-binPROGRAMS: $(bin_PROGRAMS)

19156

@$(NORMAL_INSTALL)

19157

test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

19158

- @list='$(bin_PROGRAMS)'; for p in $$list; do \

19159

- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

19160

- if test -f $$p \

19161

- || test -f $$p1 \

19162

- ; then \

19163

- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

19164

- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \

19165

- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \

19166

- else :; fi; \

19167

- done

19168

+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

19169

+ for p in $$list; do echo "$$p $$p"; done | \

19170

+ sed 's/$(EXEEXT)$$//' | \

19171

+ while read p p1; do if test -f $$p || test -f $$p1; \

19172

+ then echo "$$p"; echo "$$p"; else :; fi; \

19173

+ done | \

19174

+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \

19175

+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \

19176

+ sed 'N;N;N;s,\n, ,g' | \

19177

+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \

19178

+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

19179

+ if ($$2 == $$4) files[d] = files[d] " " $$1; \

19180

+ else { print "f", $$3 "/" $$4, $$1; } } \

19181

+ END { for (d in files) print "f", d, files[d] }' | \

19182

+ while read type dir files; do \

19183

+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

19184

+ test -z "$$files" || { \

19185

+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \

19186

+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \

19187

+ } \

19188

+ ; done

19189

19190

uninstall-binPROGRAMS:

19191

@$(NORMAL_UNINSTALL)

19192

- @list='$(bin_PROGRAMS)'; for p in $$list; do \

19193

- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \

19194

- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \

19195

- rm -f "$(DESTDIR)$(bindir)/$$f"; \

19196

- done

19197

+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

19198

+ files=`for p in $$list; do echo "$$p"; done | \

19199

+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \

19200

+ -e 's/$$/$(EXEEXT)/' `; \

19201

+ test -n "$$list" || exit 0; \

19202

+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \

19203

+ cd "$(DESTDIR)$(bindir)" && rm -f $$files

19204

19205

clean-binPROGRAMS:

19206

- @list='$(bin_PROGRAMS)'; for p in $$list; do \

19207

- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

19208

- echo " rm -f $$p $$f"; \

19209

- rm -f $$p $$f ; \

19210

- done

19211

+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \

19212

+ echo " rm -f" $$list; \

19213

+ rm -f $$list || exit $$?; \

19214

+ test -n "$(EXEEXT)" || exit 0; \

19215

+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \

19216

+ echo " rm -f" $$list; \

19217

+ rm -f $$list

19218

19219

clean-checkPROGRAMS:

19220

- @list='$(check_PROGRAMS)'; for p in $$list; do \

19221

- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

19222

- echo " rm -f $$p $$f"; \

19223

- rm -f $$p $$f ; \

19224

- done

19225

+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \

19226

+ echo " rm -f" $$list; \

19227

+ rm -f $$list || exit $$?; \

19228

+ test -n "$(EXEEXT)" || exit 0; \

19229

+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \

19230

+ echo " rm -f" $$list; \

19231

+ rm -f $$list

19232

protobuf-lazy-descriptor-test$(EXEEXT): $(protobuf_lazy_descriptor_test_OBJECTS) $(protobuf_lazy_descriptor_test_DEPENDENCIES)

19233

@rm -f protobuf-lazy-descriptor-test$(EXEEXT)

19234

$(protobuf_lazy_descriptor_test_LINK) $(protobuf_lazy_descriptor_test_OBJECTS) $(protobuf_lazy_descriptor_test_LDADD) $(LIBS)

19235

@@ -1021,1421 +1063,1421 @@ distclean-compile:

19236

19237

.cc.o:

19238

@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

19239

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

19240

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

19241

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

19242

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19243

@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<

19244

19245

.cc.obj:

19246

@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

19247

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

19248

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

19249

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

19250

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19251

@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

19252

19253

.cc.lo:

19254

@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

19255

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

19256

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

19257

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

19258

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19259

@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<

19260

19261

common.lo: google/protobuf/stubs/common.cc

19262

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT common.lo -MD -MP -MF $(DEPDIR)/common.Tpo -c -o common.lo `test -f 'google/protobuf/stubs/common.cc' || echo '$(srcdir)/'`google/protobuf/stubs/common.cc

19263

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/common.Tpo $(DEPDIR)/common.Plo

19264

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT common.lo -MD -MP -MF $(DEPDIR)/common.Tpo -c -o common.lo `test -f 'google/protobuf/stubs/common.cc' || echo '$(srcdir)/'`google/protobuf/stubs/common.cc

19265

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/common.Tpo $(DEPDIR)/common.Plo

19266

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/common.cc' object='common.lo' libtool=yes @AMDEPBACKSLASH@

19267

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19268

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o common.lo `test -f 'google/protobuf/stubs/common.cc' || echo '$(srcdir)/'`google/protobuf/stubs/common.cc

19269

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o common.lo `test -f 'google/protobuf/stubs/common.cc' || echo '$(srcdir)/'`google/protobuf/stubs/common.cc

19270

19271

once.lo: google/protobuf/stubs/once.cc

19272

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT once.lo -MD -MP -MF $(DEPDIR)/once.Tpo -c -o once.lo `test -f 'google/protobuf/stubs/once.cc' || echo '$(srcdir)/'`google/protobuf/stubs/once.cc

19273

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/once.Tpo $(DEPDIR)/once.Plo

19274

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT once.lo -MD -MP -MF $(DEPDIR)/once.Tpo -c -o once.lo `test -f 'google/protobuf/stubs/once.cc' || echo '$(srcdir)/'`google/protobuf/stubs/once.cc

19275

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/once.Tpo $(DEPDIR)/once.Plo

19276

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/once.cc' object='once.lo' libtool=yes @AMDEPBACKSLASH@

19277

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19278

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o once.lo `test -f 'google/protobuf/stubs/once.cc' || echo '$(srcdir)/'`google/protobuf/stubs/once.cc

19279

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o once.lo `test -f 'google/protobuf/stubs/once.cc' || echo '$(srcdir)/'`google/protobuf/stubs/once.cc

19280

19281

hash.lo: google/protobuf/stubs/hash.cc

19282

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hash.lo -MD -MP -MF $(DEPDIR)/hash.Tpo -c -o hash.lo `test -f 'google/protobuf/stubs/hash.cc' || echo '$(srcdir)/'`google/protobuf/stubs/hash.cc

19283

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/hash.Tpo $(DEPDIR)/hash.Plo

19284

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hash.lo -MD -MP -MF $(DEPDIR)/hash.Tpo -c -o hash.lo `test -f 'google/protobuf/stubs/hash.cc' || echo '$(srcdir)/'`google/protobuf/stubs/hash.cc

19285

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/hash.Tpo $(DEPDIR)/hash.Plo

19286

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/hash.cc' object='hash.lo' libtool=yes @AMDEPBACKSLASH@

19287

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19288

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hash.lo `test -f 'google/protobuf/stubs/hash.cc' || echo '$(srcdir)/'`google/protobuf/stubs/hash.cc

19289

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hash.lo `test -f 'google/protobuf/stubs/hash.cc' || echo '$(srcdir)/'`google/protobuf/stubs/hash.cc

19290

19291

extension_set.lo: google/protobuf/extension_set.cc

19292

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT extension_set.lo -MD -MP -MF $(DEPDIR)/extension_set.Tpo -c -o extension_set.lo `test -f 'google/protobuf/extension_set.cc' || echo '$(srcdir)/'`google/protobuf/extension_set.cc

19293

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/extension_set.Tpo $(DEPDIR)/extension_set.Plo

19294

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT extension_set.lo -MD -MP -MF $(DEPDIR)/extension_set.Tpo -c -o extension_set.lo `test -f 'google/protobuf/extension_set.cc' || echo '$(srcdir)/'`google/protobuf/extension_set.cc

19295

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/extension_set.Tpo $(DEPDIR)/extension_set.Plo

19296

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/extension_set.cc' object='extension_set.lo' libtool=yes @AMDEPBACKSLASH@

19297

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19298

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o extension_set.lo `test -f 'google/protobuf/extension_set.cc' || echo '$(srcdir)/'`google/protobuf/extension_set.cc

19299

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o extension_set.lo `test -f 'google/protobuf/extension_set.cc' || echo '$(srcdir)/'`google/protobuf/extension_set.cc

19300

19301

generated_message_util.lo: google/protobuf/generated_message_util.cc

19302

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT generated_message_util.lo -MD -MP -MF $(DEPDIR)/generated_message_util.Tpo -c -o generated_message_util.lo `test -f 'google/protobuf/generated_message_util.cc' || echo '$(srcdir)/'`google/protobuf/generated_message_util.cc

19303

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/generated_message_util.Tpo $(DEPDIR)/generated_message_util.Plo

19304

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT generated_message_util.lo -MD -MP -MF $(DEPDIR)/generated_message_util.Tpo -c -o generated_message_util.lo `test -f 'google/protobuf/generated_message_util.cc' || echo '$(srcdir)/'`google/protobuf/generated_message_util.cc

19305

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/generated_message_util.Tpo $(DEPDIR)/generated_message_util.Plo

19306

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/generated_message_util.cc' object='generated_message_util.lo' libtool=yes @AMDEPBACKSLASH@

19307

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19308

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o generated_message_util.lo `test -f 'google/protobuf/generated_message_util.cc' || echo '$(srcdir)/'`google/protobuf/generated_message_util.cc

19309

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o generated_message_util.lo `test -f 'google/protobuf/generated_message_util.cc' || echo '$(srcdir)/'`google/protobuf/generated_message_util.cc

19310

19311

message_lite.lo: google/protobuf/message_lite.cc

19312

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT message_lite.lo -MD -MP -MF $(DEPDIR)/message_lite.Tpo -c -o message_lite.lo `test -f 'google/protobuf/message_lite.cc' || echo '$(srcdir)/'`google/protobuf/message_lite.cc

19313

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/message_lite.Tpo $(DEPDIR)/message_lite.Plo

19314

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT message_lite.lo -MD -MP -MF $(DEPDIR)/message_lite.Tpo -c -o message_lite.lo `test -f 'google/protobuf/message_lite.cc' || echo '$(srcdir)/'`google/protobuf/message_lite.cc

19315

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/message_lite.Tpo $(DEPDIR)/message_lite.Plo

19316

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/message_lite.cc' object='message_lite.lo' libtool=yes @AMDEPBACKSLASH@

19317

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19318

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o message_lite.lo `test -f 'google/protobuf/message_lite.cc' || echo '$(srcdir)/'`google/protobuf/message_lite.cc

19319

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o message_lite.lo `test -f 'google/protobuf/message_lite.cc' || echo '$(srcdir)/'`google/protobuf/message_lite.cc

19320

19321

repeated_field.lo: google/protobuf/repeated_field.cc

19322

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT repeated_field.lo -MD -MP -MF $(DEPDIR)/repeated_field.Tpo -c -o repeated_field.lo `test -f 'google/protobuf/repeated_field.cc' || echo '$(srcdir)/'`google/protobuf/repeated_field.cc

19323

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/repeated_field.Tpo $(DEPDIR)/repeated_field.Plo

19324

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT repeated_field.lo -MD -MP -MF $(DEPDIR)/repeated_field.Tpo -c -o repeated_field.lo `test -f 'google/protobuf/repeated_field.cc' || echo '$(srcdir)/'`google/protobuf/repeated_field.cc

19325

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/repeated_field.Tpo $(DEPDIR)/repeated_field.Plo

19326

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/repeated_field.cc' object='repeated_field.lo' libtool=yes @AMDEPBACKSLASH@

19327

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19328

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o repeated_field.lo `test -f 'google/protobuf/repeated_field.cc' || echo '$(srcdir)/'`google/protobuf/repeated_field.cc

19329

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o repeated_field.lo `test -f 'google/protobuf/repeated_field.cc' || echo '$(srcdir)/'`google/protobuf/repeated_field.cc

19330

19331

wire_format_lite.lo: google/protobuf/wire_format_lite.cc

19332

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wire_format_lite.lo -MD -MP -MF $(DEPDIR)/wire_format_lite.Tpo -c -o wire_format_lite.lo `test -f 'google/protobuf/wire_format_lite.cc' || echo '$(srcdir)/'`google/protobuf/wire_format_lite.cc

19333

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/wire_format_lite.Tpo $(DEPDIR)/wire_format_lite.Plo

19334

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wire_format_lite.lo -MD -MP -MF $(DEPDIR)/wire_format_lite.Tpo -c -o wire_format_lite.lo `test -f 'google/protobuf/wire_format_lite.cc' || echo '$(srcdir)/'`google/protobuf/wire_format_lite.cc

19335

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/wire_format_lite.Tpo $(DEPDIR)/wire_format_lite.Plo

19336

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/wire_format_lite.cc' object='wire_format_lite.lo' libtool=yes @AMDEPBACKSLASH@

19337

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19338

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wire_format_lite.lo `test -f 'google/protobuf/wire_format_lite.cc' || echo '$(srcdir)/'`google/protobuf/wire_format_lite.cc

19339

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wire_format_lite.lo `test -f 'google/protobuf/wire_format_lite.cc' || echo '$(srcdir)/'`google/protobuf/wire_format_lite.cc

19340

19341

coded_stream.lo: google/protobuf/io/coded_stream.cc

19342

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT coded_stream.lo -MD -MP -MF $(DEPDIR)/coded_stream.Tpo -c -o coded_stream.lo `test -f 'google/protobuf/io/coded_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/coded_stream.cc

19343

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/coded_stream.Tpo $(DEPDIR)/coded_stream.Plo

19344

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT coded_stream.lo -MD -MP -MF $(DEPDIR)/coded_stream.Tpo -c -o coded_stream.lo `test -f 'google/protobuf/io/coded_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/coded_stream.cc

19345

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/coded_stream.Tpo $(DEPDIR)/coded_stream.Plo

19346

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/coded_stream.cc' object='coded_stream.lo' libtool=yes @AMDEPBACKSLASH@

19347

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19348

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o coded_stream.lo `test -f 'google/protobuf/io/coded_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/coded_stream.cc

19349

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o coded_stream.lo `test -f 'google/protobuf/io/coded_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/coded_stream.cc

19350

19351

zero_copy_stream.lo: google/protobuf/io/zero_copy_stream.cc

19352

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zero_copy_stream.lo -MD -MP -MF $(DEPDIR)/zero_copy_stream.Tpo -c -o zero_copy_stream.lo `test -f 'google/protobuf/io/zero_copy_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream.cc

19353

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/zero_copy_stream.Tpo $(DEPDIR)/zero_copy_stream.Plo

19354

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zero_copy_stream.lo -MD -MP -MF $(DEPDIR)/zero_copy_stream.Tpo -c -o zero_copy_stream.lo `test -f 'google/protobuf/io/zero_copy_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream.cc

19355

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zero_copy_stream.Tpo $(DEPDIR)/zero_copy_stream.Plo

19356

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/zero_copy_stream.cc' object='zero_copy_stream.lo' libtool=yes @AMDEPBACKSLASH@

19357

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19358

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zero_copy_stream.lo `test -f 'google/protobuf/io/zero_copy_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream.cc

19359

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zero_copy_stream.lo `test -f 'google/protobuf/io/zero_copy_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream.cc

19360

19361

zero_copy_stream_impl_lite.lo: google/protobuf/io/zero_copy_stream_impl_lite.cc

19362

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zero_copy_stream_impl_lite.lo -MD -MP -MF $(DEPDIR)/zero_copy_stream_impl_lite.Tpo -c -o zero_copy_stream_impl_lite.lo `test -f 'google/protobuf/io/zero_copy_stream_impl_lite.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream_impl_lite.cc

19363

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/zero_copy_stream_impl_lite.Tpo $(DEPDIR)/zero_copy_stream_impl_lite.Plo

19364

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zero_copy_stream_impl_lite.lo -MD -MP -MF $(DEPDIR)/zero_copy_stream_impl_lite.Tpo -c -o zero_copy_stream_impl_lite.lo `test -f 'google/protobuf/io/zero_copy_stream_impl_lite.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream_impl_lite.cc

19365

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zero_copy_stream_impl_lite.Tpo $(DEPDIR)/zero_copy_stream_impl_lite.Plo

19366

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/zero_copy_stream_impl_lite.cc' object='zero_copy_stream_impl_lite.lo' libtool=yes @AMDEPBACKSLASH@

19367

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19368

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zero_copy_stream_impl_lite.lo `test -f 'google/protobuf/io/zero_copy_stream_impl_lite.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream_impl_lite.cc

19369

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zero_copy_stream_impl_lite.lo `test -f 'google/protobuf/io/zero_copy_stream_impl_lite.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream_impl_lite.cc

19370

19371

strutil.lo: google/protobuf/stubs/strutil.cc

19372

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT strutil.lo -MD -MP -MF $(DEPDIR)/strutil.Tpo -c -o strutil.lo `test -f 'google/protobuf/stubs/strutil.cc' || echo '$(srcdir)/'`google/protobuf/stubs/strutil.cc

19373

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/strutil.Tpo $(DEPDIR)/strutil.Plo

19374

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT strutil.lo -MD -MP -MF $(DEPDIR)/strutil.Tpo -c -o strutil.lo `test -f 'google/protobuf/stubs/strutil.cc' || echo '$(srcdir)/'`google/protobuf/stubs/strutil.cc

19375

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/strutil.Tpo $(DEPDIR)/strutil.Plo

19376

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/strutil.cc' object='strutil.lo' libtool=yes @AMDEPBACKSLASH@

19377

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19378

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o strutil.lo `test -f 'google/protobuf/stubs/strutil.cc' || echo '$(srcdir)/'`google/protobuf/stubs/strutil.cc

19379

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o strutil.lo `test -f 'google/protobuf/stubs/strutil.cc' || echo '$(srcdir)/'`google/protobuf/stubs/strutil.cc

19380

19381

substitute.lo: google/protobuf/stubs/substitute.cc

19382

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT substitute.lo -MD -MP -MF $(DEPDIR)/substitute.Tpo -c -o substitute.lo `test -f 'google/protobuf/stubs/substitute.cc' || echo '$(srcdir)/'`google/protobuf/stubs/substitute.cc

19383

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/substitute.Tpo $(DEPDIR)/substitute.Plo

19384

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT substitute.lo -MD -MP -MF $(DEPDIR)/substitute.Tpo -c -o substitute.lo `test -f 'google/protobuf/stubs/substitute.cc' || echo '$(srcdir)/'`google/protobuf/stubs/substitute.cc

19385

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/substitute.Tpo $(DEPDIR)/substitute.Plo

19386

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/substitute.cc' object='substitute.lo' libtool=yes @AMDEPBACKSLASH@

19387

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19388

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o substitute.lo `test -f 'google/protobuf/stubs/substitute.cc' || echo '$(srcdir)/'`google/protobuf/stubs/substitute.cc

19389

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o substitute.lo `test -f 'google/protobuf/stubs/substitute.cc' || echo '$(srcdir)/'`google/protobuf/stubs/substitute.cc

19390

19391

structurally_valid.lo: google/protobuf/stubs/structurally_valid.cc

19392

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT structurally_valid.lo -MD -MP -MF $(DEPDIR)/structurally_valid.Tpo -c -o structurally_valid.lo `test -f 'google/protobuf/stubs/structurally_valid.cc' || echo '$(srcdir)/'`google/protobuf/stubs/structurally_valid.cc

19393

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/structurally_valid.Tpo $(DEPDIR)/structurally_valid.Plo

19394

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT structurally_valid.lo -MD -MP -MF $(DEPDIR)/structurally_valid.Tpo -c -o structurally_valid.lo `test -f 'google/protobuf/stubs/structurally_valid.cc' || echo '$(srcdir)/'`google/protobuf/stubs/structurally_valid.cc

19395

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/structurally_valid.Tpo $(DEPDIR)/structurally_valid.Plo

19396

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/structurally_valid.cc' object='structurally_valid.lo' libtool=yes @AMDEPBACKSLASH@

19397

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19398

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o structurally_valid.lo `test -f 'google/protobuf/stubs/structurally_valid.cc' || echo '$(srcdir)/'`google/protobuf/stubs/structurally_valid.cc

19399

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o structurally_valid.lo `test -f 'google/protobuf/stubs/structurally_valid.cc' || echo '$(srcdir)/'`google/protobuf/stubs/structurally_valid.cc

19400

19401

descriptor.lo: google/protobuf/descriptor.cc

19402

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT descriptor.lo -MD -MP -MF $(DEPDIR)/descriptor.Tpo -c -o descriptor.lo `test -f 'google/protobuf/descriptor.cc' || echo '$(srcdir)/'`google/protobuf/descriptor.cc

19403

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/descriptor.Tpo $(DEPDIR)/descriptor.Plo

19404

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT descriptor.lo -MD -MP -MF $(DEPDIR)/descriptor.Tpo -c -o descriptor.lo `test -f 'google/protobuf/descriptor.cc' || echo '$(srcdir)/'`google/protobuf/descriptor.cc

19405

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/descriptor.Tpo $(DEPDIR)/descriptor.Plo

19406

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/descriptor.cc' object='descriptor.lo' libtool=yes @AMDEPBACKSLASH@

19407

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19408

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o descriptor.lo `test -f 'google/protobuf/descriptor.cc' || echo '$(srcdir)/'`google/protobuf/descriptor.cc

19409

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o descriptor.lo `test -f 'google/protobuf/descriptor.cc' || echo '$(srcdir)/'`google/protobuf/descriptor.cc

19410

19411

descriptor.pb.lo: google/protobuf/descriptor.pb.cc

19412

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT descriptor.pb.lo -MD -MP -MF $(DEPDIR)/descriptor.pb.Tpo -c -o descriptor.pb.lo `test -f 'google/protobuf/descriptor.pb.cc' || echo '$(srcdir)/'`google/protobuf/descriptor.pb.cc

19413

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/descriptor.pb.Tpo $(DEPDIR)/descriptor.pb.Plo

19414

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT descriptor.pb.lo -MD -MP -MF $(DEPDIR)/descriptor.pb.Tpo -c -o descriptor.pb.lo `test -f 'google/protobuf/descriptor.pb.cc' || echo '$(srcdir)/'`google/protobuf/descriptor.pb.cc

19415

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/descriptor.pb.Tpo $(DEPDIR)/descriptor.pb.Plo

19416

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/descriptor.pb.cc' object='descriptor.pb.lo' libtool=yes @AMDEPBACKSLASH@

19417

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19418

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o descriptor.pb.lo `test -f 'google/protobuf/descriptor.pb.cc' || echo '$(srcdir)/'`google/protobuf/descriptor.pb.cc

19419

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o descriptor.pb.lo `test -f 'google/protobuf/descriptor.pb.cc' || echo '$(srcdir)/'`google/protobuf/descriptor.pb.cc

19420

19421

descriptor_database.lo: google/protobuf/descriptor_database.cc

19422

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT descriptor_database.lo -MD -MP -MF $(DEPDIR)/descriptor_database.Tpo -c -o descriptor_database.lo `test -f 'google/protobuf/descriptor_database.cc' || echo '$(srcdir)/'`google/protobuf/descriptor_database.cc

19423

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/descriptor_database.Tpo $(DEPDIR)/descriptor_database.Plo

19424

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT descriptor_database.lo -MD -MP -MF $(DEPDIR)/descriptor_database.Tpo -c -o descriptor_database.lo `test -f 'google/protobuf/descriptor_database.cc' || echo '$(srcdir)/'`google/protobuf/descriptor_database.cc

19425

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/descriptor_database.Tpo $(DEPDIR)/descriptor_database.Plo

19426

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/descriptor_database.cc' object='descriptor_database.lo' libtool=yes @AMDEPBACKSLASH@

19427

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19428

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o descriptor_database.lo `test -f 'google/protobuf/descriptor_database.cc' || echo '$(srcdir)/'`google/protobuf/descriptor_database.cc

19429

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o descriptor_database.lo `test -f 'google/protobuf/descriptor_database.cc' || echo '$(srcdir)/'`google/protobuf/descriptor_database.cc

19430

19431

dynamic_message.lo: google/protobuf/dynamic_message.cc

19432

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dynamic_message.lo -MD -MP -MF $(DEPDIR)/dynamic_message.Tpo -c -o dynamic_message.lo `test -f 'google/protobuf/dynamic_message.cc' || echo '$(srcdir)/'`google/protobuf/dynamic_message.cc

19433

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/dynamic_message.Tpo $(DEPDIR)/dynamic_message.Plo

19434

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dynamic_message.lo -MD -MP -MF $(DEPDIR)/dynamic_message.Tpo -c -o dynamic_message.lo `test -f 'google/protobuf/dynamic_message.cc' || echo '$(srcdir)/'`google/protobuf/dynamic_message.cc

19435

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/dynamic_message.Tpo $(DEPDIR)/dynamic_message.Plo

19436

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/dynamic_message.cc' object='dynamic_message.lo' libtool=yes @AMDEPBACKSLASH@

19437

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19438

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dynamic_message.lo `test -f 'google/protobuf/dynamic_message.cc' || echo '$(srcdir)/'`google/protobuf/dynamic_message.cc

19439

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o dynamic_message.lo `test -f 'google/protobuf/dynamic_message.cc' || echo '$(srcdir)/'`google/protobuf/dynamic_message.cc

19440

19441

extension_set_heavy.lo: google/protobuf/extension_set_heavy.cc

19442

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT extension_set_heavy.lo -MD -MP -MF $(DEPDIR)/extension_set_heavy.Tpo -c -o extension_set_heavy.lo `test -f 'google/protobuf/extension_set_heavy.cc' || echo '$(srcdir)/'`google/protobuf/extension_set_heavy.cc

19443

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/extension_set_heavy.Tpo $(DEPDIR)/extension_set_heavy.Plo

19444

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT extension_set_heavy.lo -MD -MP -MF $(DEPDIR)/extension_set_heavy.Tpo -c -o extension_set_heavy.lo `test -f 'google/protobuf/extension_set_heavy.cc' || echo '$(srcdir)/'`google/protobuf/extension_set_heavy.cc

19445

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/extension_set_heavy.Tpo $(DEPDIR)/extension_set_heavy.Plo

19446

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/extension_set_heavy.cc' object='extension_set_heavy.lo' libtool=yes @AMDEPBACKSLASH@

19447

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19448

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o extension_set_heavy.lo `test -f 'google/protobuf/extension_set_heavy.cc' || echo '$(srcdir)/'`google/protobuf/extension_set_heavy.cc

19449

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o extension_set_heavy.lo `test -f 'google/protobuf/extension_set_heavy.cc' || echo '$(srcdir)/'`google/protobuf/extension_set_heavy.cc

19450

19451

generated_message_reflection.lo: google/protobuf/generated_message_reflection.cc

19452

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT generated_message_reflection.lo -MD -MP -MF $(DEPDIR)/generated_message_reflection.Tpo -c -o generated_message_reflection.lo `test -f 'google/protobuf/generated_message_reflection.cc' || echo '$(srcdir)/'`google/protobuf/generated_message_reflection.cc

19453

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/generated_message_reflection.Tpo $(DEPDIR)/generated_message_reflection.Plo

19454

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT generated_message_reflection.lo -MD -MP -MF $(DEPDIR)/generated_message_reflection.Tpo -c -o generated_message_reflection.lo `test -f 'google/protobuf/generated_message_reflection.cc' || echo '$(srcdir)/'`google/protobuf/generated_message_reflection.cc

19455

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/generated_message_reflection.Tpo $(DEPDIR)/generated_message_reflection.Plo

19456

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/generated_message_reflection.cc' object='generated_message_reflection.lo' libtool=yes @AMDEPBACKSLASH@

19457

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19458

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o generated_message_reflection.lo `test -f 'google/protobuf/generated_message_reflection.cc' || echo '$(srcdir)/'`google/protobuf/generated_message_reflection.cc

19459

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o generated_message_reflection.lo `test -f 'google/protobuf/generated_message_reflection.cc' || echo '$(srcdir)/'`google/protobuf/generated_message_reflection.cc

19460

19461

message.lo: google/protobuf/message.cc

19462

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT message.lo -MD -MP -MF $(DEPDIR)/message.Tpo -c -o message.lo `test -f 'google/protobuf/message.cc' || echo '$(srcdir)/'`google/protobuf/message.cc

19463

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/message.Tpo $(DEPDIR)/message.Plo

19464

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT message.lo -MD -MP -MF $(DEPDIR)/message.Tpo -c -o message.lo `test -f 'google/protobuf/message.cc' || echo '$(srcdir)/'`google/protobuf/message.cc

19465

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/message.Tpo $(DEPDIR)/message.Plo

19466

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/message.cc' object='message.lo' libtool=yes @AMDEPBACKSLASH@

19467

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19468

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o message.lo `test -f 'google/protobuf/message.cc' || echo '$(srcdir)/'`google/protobuf/message.cc

19469

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o message.lo `test -f 'google/protobuf/message.cc' || echo '$(srcdir)/'`google/protobuf/message.cc

19470

19471

reflection_ops.lo: google/protobuf/reflection_ops.cc

19472

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT reflection_ops.lo -MD -MP -MF $(DEPDIR)/reflection_ops.Tpo -c -o reflection_ops.lo `test -f 'google/protobuf/reflection_ops.cc' || echo '$(srcdir)/'`google/protobuf/reflection_ops.cc

19473

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/reflection_ops.Tpo $(DEPDIR)/reflection_ops.Plo

19474

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT reflection_ops.lo -MD -MP -MF $(DEPDIR)/reflection_ops.Tpo -c -o reflection_ops.lo `test -f 'google/protobuf/reflection_ops.cc' || echo '$(srcdir)/'`google/protobuf/reflection_ops.cc

19475

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/reflection_ops.Tpo $(DEPDIR)/reflection_ops.Plo

19476

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/reflection_ops.cc' object='reflection_ops.lo' libtool=yes @AMDEPBACKSLASH@

19477

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19478

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o reflection_ops.lo `test -f 'google/protobuf/reflection_ops.cc' || echo '$(srcdir)/'`google/protobuf/reflection_ops.cc

19479

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o reflection_ops.lo `test -f 'google/protobuf/reflection_ops.cc' || echo '$(srcdir)/'`google/protobuf/reflection_ops.cc

19480

19481

service.lo: google/protobuf/service.cc

19482

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT service.lo -MD -MP -MF $(DEPDIR)/service.Tpo -c -o service.lo `test -f 'google/protobuf/service.cc' || echo '$(srcdir)/'`google/protobuf/service.cc

19483

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/service.Tpo $(DEPDIR)/service.Plo

19484

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT service.lo -MD -MP -MF $(DEPDIR)/service.Tpo -c -o service.lo `test -f 'google/protobuf/service.cc' || echo '$(srcdir)/'`google/protobuf/service.cc

19485

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/service.Tpo $(DEPDIR)/service.Plo

19486

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/service.cc' object='service.lo' libtool=yes @AMDEPBACKSLASH@

19487

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19488

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o service.lo `test -f 'google/protobuf/service.cc' || echo '$(srcdir)/'`google/protobuf/service.cc

19489

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o service.lo `test -f 'google/protobuf/service.cc' || echo '$(srcdir)/'`google/protobuf/service.cc

19490

19491

text_format.lo: google/protobuf/text_format.cc

19492

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_format.lo -MD -MP -MF $(DEPDIR)/text_format.Tpo -c -o text_format.lo `test -f 'google/protobuf/text_format.cc' || echo '$(srcdir)/'`google/protobuf/text_format.cc

19493

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/text_format.Tpo $(DEPDIR)/text_format.Plo

19494

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_format.lo -MD -MP -MF $(DEPDIR)/text_format.Tpo -c -o text_format.lo `test -f 'google/protobuf/text_format.cc' || echo '$(srcdir)/'`google/protobuf/text_format.cc

19495

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/text_format.Tpo $(DEPDIR)/text_format.Plo

19496

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/text_format.cc' object='text_format.lo' libtool=yes @AMDEPBACKSLASH@

19497

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19498

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_format.lo `test -f 'google/protobuf/text_format.cc' || echo '$(srcdir)/'`google/protobuf/text_format.cc

19499

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_format.lo `test -f 'google/protobuf/text_format.cc' || echo '$(srcdir)/'`google/protobuf/text_format.cc

19500

19501

unknown_field_set.lo: google/protobuf/unknown_field_set.cc

19502

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT unknown_field_set.lo -MD -MP -MF $(DEPDIR)/unknown_field_set.Tpo -c -o unknown_field_set.lo `test -f 'google/protobuf/unknown_field_set.cc' || echo '$(srcdir)/'`google/protobuf/unknown_field_set.cc

19503

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/unknown_field_set.Tpo $(DEPDIR)/unknown_field_set.Plo

19504

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT unknown_field_set.lo -MD -MP -MF $(DEPDIR)/unknown_field_set.Tpo -c -o unknown_field_set.lo `test -f 'google/protobuf/unknown_field_set.cc' || echo '$(srcdir)/'`google/protobuf/unknown_field_set.cc

19505

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/unknown_field_set.Tpo $(DEPDIR)/unknown_field_set.Plo

19506

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unknown_field_set.cc' object='unknown_field_set.lo' libtool=yes @AMDEPBACKSLASH@

19507

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19508

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o unknown_field_set.lo `test -f 'google/protobuf/unknown_field_set.cc' || echo '$(srcdir)/'`google/protobuf/unknown_field_set.cc

19509

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o unknown_field_set.lo `test -f 'google/protobuf/unknown_field_set.cc' || echo '$(srcdir)/'`google/protobuf/unknown_field_set.cc

19510

19511

wire_format.lo: google/protobuf/wire_format.cc

19512

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wire_format.lo -MD -MP -MF $(DEPDIR)/wire_format.Tpo -c -o wire_format.lo `test -f 'google/protobuf/wire_format.cc' || echo '$(srcdir)/'`google/protobuf/wire_format.cc

19513

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/wire_format.Tpo $(DEPDIR)/wire_format.Plo

19514

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT wire_format.lo -MD -MP -MF $(DEPDIR)/wire_format.Tpo -c -o wire_format.lo `test -f 'google/protobuf/wire_format.cc' || echo '$(srcdir)/'`google/protobuf/wire_format.cc

19515

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/wire_format.Tpo $(DEPDIR)/wire_format.Plo

19516

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/wire_format.cc' object='wire_format.lo' libtool=yes @AMDEPBACKSLASH@

19517

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19518

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wire_format.lo `test -f 'google/protobuf/wire_format.cc' || echo '$(srcdir)/'`google/protobuf/wire_format.cc

19519

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o wire_format.lo `test -f 'google/protobuf/wire_format.cc' || echo '$(srcdir)/'`google/protobuf/wire_format.cc

19520

19521

gzip_stream.lo: google/protobuf/io/gzip_stream.cc

19522

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gzip_stream.lo -MD -MP -MF $(DEPDIR)/gzip_stream.Tpo -c -o gzip_stream.lo `test -f 'google/protobuf/io/gzip_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/gzip_stream.cc

19523

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/gzip_stream.Tpo $(DEPDIR)/gzip_stream.Plo

19524

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gzip_stream.lo -MD -MP -MF $(DEPDIR)/gzip_stream.Tpo -c -o gzip_stream.lo `test -f 'google/protobuf/io/gzip_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/gzip_stream.cc

19525

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/gzip_stream.Tpo $(DEPDIR)/gzip_stream.Plo

19526

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/gzip_stream.cc' object='gzip_stream.lo' libtool=yes @AMDEPBACKSLASH@

19527

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19528

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gzip_stream.lo `test -f 'google/protobuf/io/gzip_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/gzip_stream.cc

19529

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gzip_stream.lo `test -f 'google/protobuf/io/gzip_stream.cc' || echo '$(srcdir)/'`google/protobuf/io/gzip_stream.cc

19530

19531

printer.lo: google/protobuf/io/printer.cc

19532

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT printer.lo -MD -MP -MF $(DEPDIR)/printer.Tpo -c -o printer.lo `test -f 'google/protobuf/io/printer.cc' || echo '$(srcdir)/'`google/protobuf/io/printer.cc

19533

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/printer.Tpo $(DEPDIR)/printer.Plo

19534

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT printer.lo -MD -MP -MF $(DEPDIR)/printer.Tpo -c -o printer.lo `test -f 'google/protobuf/io/printer.cc' || echo '$(srcdir)/'`google/protobuf/io/printer.cc

19535

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/printer.Tpo $(DEPDIR)/printer.Plo

19536

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/printer.cc' object='printer.lo' libtool=yes @AMDEPBACKSLASH@

19537

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19538

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o printer.lo `test -f 'google/protobuf/io/printer.cc' || echo '$(srcdir)/'`google/protobuf/io/printer.cc

19539

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o printer.lo `test -f 'google/protobuf/io/printer.cc' || echo '$(srcdir)/'`google/protobuf/io/printer.cc

19540

19541

tokenizer.lo: google/protobuf/io/tokenizer.cc

19542

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tokenizer.lo -MD -MP -MF $(DEPDIR)/tokenizer.Tpo -c -o tokenizer.lo `test -f 'google/protobuf/io/tokenizer.cc' || echo '$(srcdir)/'`google/protobuf/io/tokenizer.cc

19543

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/tokenizer.Tpo $(DEPDIR)/tokenizer.Plo

19544

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tokenizer.lo -MD -MP -MF $(DEPDIR)/tokenizer.Tpo -c -o tokenizer.lo `test -f 'google/protobuf/io/tokenizer.cc' || echo '$(srcdir)/'`google/protobuf/io/tokenizer.cc

19545

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/tokenizer.Tpo $(DEPDIR)/tokenizer.Plo

19546

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/tokenizer.cc' object='tokenizer.lo' libtool=yes @AMDEPBACKSLASH@

19547

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19548

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tokenizer.lo `test -f 'google/protobuf/io/tokenizer.cc' || echo '$(srcdir)/'`google/protobuf/io/tokenizer.cc

19549

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tokenizer.lo `test -f 'google/protobuf/io/tokenizer.cc' || echo '$(srcdir)/'`google/protobuf/io/tokenizer.cc

19550

19551

zero_copy_stream_impl.lo: google/protobuf/io/zero_copy_stream_impl.cc

19552

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zero_copy_stream_impl.lo -MD -MP -MF $(DEPDIR)/zero_copy_stream_impl.Tpo -c -o zero_copy_stream_impl.lo `test -f 'google/protobuf/io/zero_copy_stream_impl.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream_impl.cc

19553

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/zero_copy_stream_impl.Tpo $(DEPDIR)/zero_copy_stream_impl.Plo

19554

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zero_copy_stream_impl.lo -MD -MP -MF $(DEPDIR)/zero_copy_stream_impl.Tpo -c -o zero_copy_stream_impl.lo `test -f 'google/protobuf/io/zero_copy_stream_impl.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream_impl.cc

19555

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zero_copy_stream_impl.Tpo $(DEPDIR)/zero_copy_stream_impl.Plo

19556

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/zero_copy_stream_impl.cc' object='zero_copy_stream_impl.lo' libtool=yes @AMDEPBACKSLASH@

19557

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19558

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zero_copy_stream_impl.lo `test -f 'google/protobuf/io/zero_copy_stream_impl.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream_impl.cc

19559

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zero_copy_stream_impl.lo `test -f 'google/protobuf/io/zero_copy_stream_impl.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream_impl.cc

19560

19561

importer.lo: google/protobuf/compiler/importer.cc

19562

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer.lo -MD -MP -MF $(DEPDIR)/importer.Tpo -c -o importer.lo `test -f 'google/protobuf/compiler/importer.cc' || echo '$(srcdir)/'`google/protobuf/compiler/importer.cc

19563

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/importer.Tpo $(DEPDIR)/importer.Plo

19564

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer.lo -MD -MP -MF $(DEPDIR)/importer.Tpo -c -o importer.lo `test -f 'google/protobuf/compiler/importer.cc' || echo '$(srcdir)/'`google/protobuf/compiler/importer.cc

19565

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/importer.Tpo $(DEPDIR)/importer.Plo

19566

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/importer.cc' object='importer.lo' libtool=yes @AMDEPBACKSLASH@

19567

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19568

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer.lo `test -f 'google/protobuf/compiler/importer.cc' || echo '$(srcdir)/'`google/protobuf/compiler/importer.cc

19569

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer.lo `test -f 'google/protobuf/compiler/importer.cc' || echo '$(srcdir)/'`google/protobuf/compiler/importer.cc

19570

19571

parser.lo: google/protobuf/compiler/parser.cc

19572

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parser.lo -MD -MP -MF $(DEPDIR)/parser.Tpo -c -o parser.lo `test -f 'google/protobuf/compiler/parser.cc' || echo '$(srcdir)/'`google/protobuf/compiler/parser.cc

19573

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/parser.Tpo $(DEPDIR)/parser.Plo

19574

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parser.lo -MD -MP -MF $(DEPDIR)/parser.Tpo -c -o parser.lo `test -f 'google/protobuf/compiler/parser.cc' || echo '$(srcdir)/'`google/protobuf/compiler/parser.cc

19575

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/parser.Tpo $(DEPDIR)/parser.Plo

19576

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/parser.cc' object='parser.lo' libtool=yes @AMDEPBACKSLASH@

19577

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19578

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parser.lo `test -f 'google/protobuf/compiler/parser.cc' || echo '$(srcdir)/'`google/protobuf/compiler/parser.cc

19579

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parser.lo `test -f 'google/protobuf/compiler/parser.cc' || echo '$(srcdir)/'`google/protobuf/compiler/parser.cc

19580

19581

code_generator.lo: google/protobuf/compiler/code_generator.cc

19582

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT code_generator.lo -MD -MP -MF $(DEPDIR)/code_generator.Tpo -c -o code_generator.lo `test -f 'google/protobuf/compiler/code_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/code_generator.cc

19583

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/code_generator.Tpo $(DEPDIR)/code_generator.Plo

19584

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT code_generator.lo -MD -MP -MF $(DEPDIR)/code_generator.Tpo -c -o code_generator.lo `test -f 'google/protobuf/compiler/code_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/code_generator.cc

19585

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/code_generator.Tpo $(DEPDIR)/code_generator.Plo

19586

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/code_generator.cc' object='code_generator.lo' libtool=yes @AMDEPBACKSLASH@

19587

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19588

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o code_generator.lo `test -f 'google/protobuf/compiler/code_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/code_generator.cc

19589

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o code_generator.lo `test -f 'google/protobuf/compiler/code_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/code_generator.cc

19590

19591

command_line_interface.lo: google/protobuf/compiler/command_line_interface.cc

19592

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT command_line_interface.lo -MD -MP -MF $(DEPDIR)/command_line_interface.Tpo -c -o command_line_interface.lo `test -f 'google/protobuf/compiler/command_line_interface.cc' || echo '$(srcdir)/'`google/protobuf/compiler/command_line_interface.cc

19593

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/command_line_interface.Tpo $(DEPDIR)/command_line_interface.Plo

19594

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT command_line_interface.lo -MD -MP -MF $(DEPDIR)/command_line_interface.Tpo -c -o command_line_interface.lo `test -f 'google/protobuf/compiler/command_line_interface.cc' || echo '$(srcdir)/'`google/protobuf/compiler/command_line_interface.cc

19595

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/command_line_interface.Tpo $(DEPDIR)/command_line_interface.Plo

19596

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/command_line_interface.cc' object='command_line_interface.lo' libtool=yes @AMDEPBACKSLASH@

19597

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19598

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o command_line_interface.lo `test -f 'google/protobuf/compiler/command_line_interface.cc' || echo '$(srcdir)/'`google/protobuf/compiler/command_line_interface.cc

19599

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o command_line_interface.lo `test -f 'google/protobuf/compiler/command_line_interface.cc' || echo '$(srcdir)/'`google/protobuf/compiler/command_line_interface.cc

19600

19601

plugin.lo: google/protobuf/compiler/plugin.cc

19602

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plugin.lo -MD -MP -MF $(DEPDIR)/plugin.Tpo -c -o plugin.lo `test -f 'google/protobuf/compiler/plugin.cc' || echo '$(srcdir)/'`google/protobuf/compiler/plugin.cc

19603

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/plugin.Tpo $(DEPDIR)/plugin.Plo

19604

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plugin.lo -MD -MP -MF $(DEPDIR)/plugin.Tpo -c -o plugin.lo `test -f 'google/protobuf/compiler/plugin.cc' || echo '$(srcdir)/'`google/protobuf/compiler/plugin.cc

19605

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/plugin.Tpo $(DEPDIR)/plugin.Plo

19606

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/plugin.cc' object='plugin.lo' libtool=yes @AMDEPBACKSLASH@

19607

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19608

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plugin.lo `test -f 'google/protobuf/compiler/plugin.cc' || echo '$(srcdir)/'`google/protobuf/compiler/plugin.cc

19609

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plugin.lo `test -f 'google/protobuf/compiler/plugin.cc' || echo '$(srcdir)/'`google/protobuf/compiler/plugin.cc

19610

19611

plugin.pb.lo: google/protobuf/compiler/plugin.pb.cc

19612

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plugin.pb.lo -MD -MP -MF $(DEPDIR)/plugin.pb.Tpo -c -o plugin.pb.lo `test -f 'google/protobuf/compiler/plugin.pb.cc' || echo '$(srcdir)/'`google/protobuf/compiler/plugin.pb.cc

19613

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/plugin.pb.Tpo $(DEPDIR)/plugin.pb.Plo

19614

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plugin.pb.lo -MD -MP -MF $(DEPDIR)/plugin.pb.Tpo -c -o plugin.pb.lo `test -f 'google/protobuf/compiler/plugin.pb.cc' || echo '$(srcdir)/'`google/protobuf/compiler/plugin.pb.cc

19615

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/plugin.pb.Tpo $(DEPDIR)/plugin.pb.Plo

19616

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/plugin.pb.cc' object='plugin.pb.lo' libtool=yes @AMDEPBACKSLASH@

19617

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19618

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plugin.pb.lo `test -f 'google/protobuf/compiler/plugin.pb.cc' || echo '$(srcdir)/'`google/protobuf/compiler/plugin.pb.cc

19619

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plugin.pb.lo `test -f 'google/protobuf/compiler/plugin.pb.cc' || echo '$(srcdir)/'`google/protobuf/compiler/plugin.pb.cc

19620

19621

subprocess.lo: google/protobuf/compiler/subprocess.cc

19622

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT subprocess.lo -MD -MP -MF $(DEPDIR)/subprocess.Tpo -c -o subprocess.lo `test -f 'google/protobuf/compiler/subprocess.cc' || echo '$(srcdir)/'`google/protobuf/compiler/subprocess.cc

19623

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/subprocess.Tpo $(DEPDIR)/subprocess.Plo

19624

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT subprocess.lo -MD -MP -MF $(DEPDIR)/subprocess.Tpo -c -o subprocess.lo `test -f 'google/protobuf/compiler/subprocess.cc' || echo '$(srcdir)/'`google/protobuf/compiler/subprocess.cc

19625

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/subprocess.Tpo $(DEPDIR)/subprocess.Plo

19626

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/subprocess.cc' object='subprocess.lo' libtool=yes @AMDEPBACKSLASH@

19627

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19628

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o subprocess.lo `test -f 'google/protobuf/compiler/subprocess.cc' || echo '$(srcdir)/'`google/protobuf/compiler/subprocess.cc

19629

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o subprocess.lo `test -f 'google/protobuf/compiler/subprocess.cc' || echo '$(srcdir)/'`google/protobuf/compiler/subprocess.cc

19630

19631

zip_writer.lo: google/protobuf/compiler/zip_writer.cc

19632

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zip_writer.lo -MD -MP -MF $(DEPDIR)/zip_writer.Tpo -c -o zip_writer.lo `test -f 'google/protobuf/compiler/zip_writer.cc' || echo '$(srcdir)/'`google/protobuf/compiler/zip_writer.cc

19633

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/zip_writer.Tpo $(DEPDIR)/zip_writer.Plo

19634

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zip_writer.lo -MD -MP -MF $(DEPDIR)/zip_writer.Tpo -c -o zip_writer.lo `test -f 'google/protobuf/compiler/zip_writer.cc' || echo '$(srcdir)/'`google/protobuf/compiler/zip_writer.cc

19635

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zip_writer.Tpo $(DEPDIR)/zip_writer.Plo

19636

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/zip_writer.cc' object='zip_writer.lo' libtool=yes @AMDEPBACKSLASH@

19637

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19638

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zip_writer.lo `test -f 'google/protobuf/compiler/zip_writer.cc' || echo '$(srcdir)/'`google/protobuf/compiler/zip_writer.cc

19639

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zip_writer.lo `test -f 'google/protobuf/compiler/zip_writer.cc' || echo '$(srcdir)/'`google/protobuf/compiler/zip_writer.cc

19640

19641

cpp_enum.lo: google/protobuf/compiler/cpp/cpp_enum.cc

19642

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_enum.lo -MD -MP -MF $(DEPDIR)/cpp_enum.Tpo -c -o cpp_enum.lo `test -f 'google/protobuf/compiler/cpp/cpp_enum.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_enum.cc

19643

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_enum.Tpo $(DEPDIR)/cpp_enum.Plo

19644

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_enum.lo -MD -MP -MF $(DEPDIR)/cpp_enum.Tpo -c -o cpp_enum.lo `test -f 'google/protobuf/compiler/cpp/cpp_enum.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_enum.cc

19645

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_enum.Tpo $(DEPDIR)/cpp_enum.Plo

19646

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_enum.cc' object='cpp_enum.lo' libtool=yes @AMDEPBACKSLASH@

19647

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19648

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_enum.lo `test -f 'google/protobuf/compiler/cpp/cpp_enum.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_enum.cc

19649

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_enum.lo `test -f 'google/protobuf/compiler/cpp/cpp_enum.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_enum.cc

19650

19651

cpp_enum_field.lo: google/protobuf/compiler/cpp/cpp_enum_field.cc

19652

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_enum_field.lo -MD -MP -MF $(DEPDIR)/cpp_enum_field.Tpo -c -o cpp_enum_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_enum_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_enum_field.cc

19653

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_enum_field.Tpo $(DEPDIR)/cpp_enum_field.Plo

19654

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_enum_field.lo -MD -MP -MF $(DEPDIR)/cpp_enum_field.Tpo -c -o cpp_enum_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_enum_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_enum_field.cc

19655

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_enum_field.Tpo $(DEPDIR)/cpp_enum_field.Plo

19656

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_enum_field.cc' object='cpp_enum_field.lo' libtool=yes @AMDEPBACKSLASH@

19657

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19658

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_enum_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_enum_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_enum_field.cc

19659

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_enum_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_enum_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_enum_field.cc

19660

19661

cpp_extension.lo: google/protobuf/compiler/cpp/cpp_extension.cc

19662

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_extension.lo -MD -MP -MF $(DEPDIR)/cpp_extension.Tpo -c -o cpp_extension.lo `test -f 'google/protobuf/compiler/cpp/cpp_extension.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_extension.cc

19663

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_extension.Tpo $(DEPDIR)/cpp_extension.Plo

19664

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_extension.lo -MD -MP -MF $(DEPDIR)/cpp_extension.Tpo -c -o cpp_extension.lo `test -f 'google/protobuf/compiler/cpp/cpp_extension.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_extension.cc

19665

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_extension.Tpo $(DEPDIR)/cpp_extension.Plo

19666

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_extension.cc' object='cpp_extension.lo' libtool=yes @AMDEPBACKSLASH@

19667

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19668

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_extension.lo `test -f 'google/protobuf/compiler/cpp/cpp_extension.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_extension.cc

19669

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_extension.lo `test -f 'google/protobuf/compiler/cpp/cpp_extension.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_extension.cc

19670

19671

cpp_field.lo: google/protobuf/compiler/cpp/cpp_field.cc

19672

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_field.lo -MD -MP -MF $(DEPDIR)/cpp_field.Tpo -c -o cpp_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_field.cc

19673

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_field.Tpo $(DEPDIR)/cpp_field.Plo

19674

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_field.lo -MD -MP -MF $(DEPDIR)/cpp_field.Tpo -c -o cpp_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_field.cc

19675

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_field.Tpo $(DEPDIR)/cpp_field.Plo

19676

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_field.cc' object='cpp_field.lo' libtool=yes @AMDEPBACKSLASH@

19677

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19678

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_field.cc

19679

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_field.cc

19680

19681

cpp_file.lo: google/protobuf/compiler/cpp/cpp_file.cc

19682

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_file.lo -MD -MP -MF $(DEPDIR)/cpp_file.Tpo -c -o cpp_file.lo `test -f 'google/protobuf/compiler/cpp/cpp_file.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_file.cc

19683

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_file.Tpo $(DEPDIR)/cpp_file.Plo

19684

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_file.lo -MD -MP -MF $(DEPDIR)/cpp_file.Tpo -c -o cpp_file.lo `test -f 'google/protobuf/compiler/cpp/cpp_file.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_file.cc

19685

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_file.Tpo $(DEPDIR)/cpp_file.Plo

19686

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_file.cc' object='cpp_file.lo' libtool=yes @AMDEPBACKSLASH@

19687

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19688

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_file.lo `test -f 'google/protobuf/compiler/cpp/cpp_file.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_file.cc

19689

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_file.lo `test -f 'google/protobuf/compiler/cpp/cpp_file.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_file.cc

19690

19691

cpp_generator.lo: google/protobuf/compiler/cpp/cpp_generator.cc

19692

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_generator.lo -MD -MP -MF $(DEPDIR)/cpp_generator.Tpo -c -o cpp_generator.lo `test -f 'google/protobuf/compiler/cpp/cpp_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_generator.cc

19693

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_generator.Tpo $(DEPDIR)/cpp_generator.Plo

19694

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_generator.lo -MD -MP -MF $(DEPDIR)/cpp_generator.Tpo -c -o cpp_generator.lo `test -f 'google/protobuf/compiler/cpp/cpp_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_generator.cc

19695

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_generator.Tpo $(DEPDIR)/cpp_generator.Plo

19696

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_generator.cc' object='cpp_generator.lo' libtool=yes @AMDEPBACKSLASH@

19697

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19698

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_generator.lo `test -f 'google/protobuf/compiler/cpp/cpp_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_generator.cc

19699

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_generator.lo `test -f 'google/protobuf/compiler/cpp/cpp_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_generator.cc

19700

19701

cpp_helpers.lo: google/protobuf/compiler/cpp/cpp_helpers.cc

19702

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_helpers.lo -MD -MP -MF $(DEPDIR)/cpp_helpers.Tpo -c -o cpp_helpers.lo `test -f 'google/protobuf/compiler/cpp/cpp_helpers.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_helpers.cc

19703

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_helpers.Tpo $(DEPDIR)/cpp_helpers.Plo

19704

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_helpers.lo -MD -MP -MF $(DEPDIR)/cpp_helpers.Tpo -c -o cpp_helpers.lo `test -f 'google/protobuf/compiler/cpp/cpp_helpers.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_helpers.cc

19705

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_helpers.Tpo $(DEPDIR)/cpp_helpers.Plo

19706

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_helpers.cc' object='cpp_helpers.lo' libtool=yes @AMDEPBACKSLASH@

19707

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19708

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_helpers.lo `test -f 'google/protobuf/compiler/cpp/cpp_helpers.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_helpers.cc

19709

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_helpers.lo `test -f 'google/protobuf/compiler/cpp/cpp_helpers.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_helpers.cc

19710

19711

cpp_message.lo: google/protobuf/compiler/cpp/cpp_message.cc

19712

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_message.lo -MD -MP -MF $(DEPDIR)/cpp_message.Tpo -c -o cpp_message.lo `test -f 'google/protobuf/compiler/cpp/cpp_message.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_message.cc

19713

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_message.Tpo $(DEPDIR)/cpp_message.Plo

19714

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_message.lo -MD -MP -MF $(DEPDIR)/cpp_message.Tpo -c -o cpp_message.lo `test -f 'google/protobuf/compiler/cpp/cpp_message.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_message.cc

19715

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_message.Tpo $(DEPDIR)/cpp_message.Plo

19716

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_message.cc' object='cpp_message.lo' libtool=yes @AMDEPBACKSLASH@

19717

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19718

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_message.lo `test -f 'google/protobuf/compiler/cpp/cpp_message.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_message.cc

19719

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_message.lo `test -f 'google/protobuf/compiler/cpp/cpp_message.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_message.cc

19720

19721

cpp_message_field.lo: google/protobuf/compiler/cpp/cpp_message_field.cc

19722

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_message_field.lo -MD -MP -MF $(DEPDIR)/cpp_message_field.Tpo -c -o cpp_message_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_message_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_message_field.cc

19723

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_message_field.Tpo $(DEPDIR)/cpp_message_field.Plo

19724

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_message_field.lo -MD -MP -MF $(DEPDIR)/cpp_message_field.Tpo -c -o cpp_message_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_message_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_message_field.cc

19725

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_message_field.Tpo $(DEPDIR)/cpp_message_field.Plo

19726

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_message_field.cc' object='cpp_message_field.lo' libtool=yes @AMDEPBACKSLASH@

19727

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19728

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_message_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_message_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_message_field.cc

19729

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_message_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_message_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_message_field.cc

19730

19731

cpp_primitive_field.lo: google/protobuf/compiler/cpp/cpp_primitive_field.cc

19732

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_primitive_field.lo -MD -MP -MF $(DEPDIR)/cpp_primitive_field.Tpo -c -o cpp_primitive_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_primitive_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_primitive_field.cc

19733

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_primitive_field.Tpo $(DEPDIR)/cpp_primitive_field.Plo

19734

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_primitive_field.lo -MD -MP -MF $(DEPDIR)/cpp_primitive_field.Tpo -c -o cpp_primitive_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_primitive_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_primitive_field.cc

19735

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_primitive_field.Tpo $(DEPDIR)/cpp_primitive_field.Plo

19736

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_primitive_field.cc' object='cpp_primitive_field.lo' libtool=yes @AMDEPBACKSLASH@

19737

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19738

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_primitive_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_primitive_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_primitive_field.cc

19739

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_primitive_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_primitive_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_primitive_field.cc

19740

19741

cpp_service.lo: google/protobuf/compiler/cpp/cpp_service.cc

19742

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_service.lo -MD -MP -MF $(DEPDIR)/cpp_service.Tpo -c -o cpp_service.lo `test -f 'google/protobuf/compiler/cpp/cpp_service.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_service.cc

19743

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_service.Tpo $(DEPDIR)/cpp_service.Plo

19744

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_service.lo -MD -MP -MF $(DEPDIR)/cpp_service.Tpo -c -o cpp_service.lo `test -f 'google/protobuf/compiler/cpp/cpp_service.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_service.cc

19745

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_service.Tpo $(DEPDIR)/cpp_service.Plo

19746

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_service.cc' object='cpp_service.lo' libtool=yes @AMDEPBACKSLASH@

19747

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19748

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_service.lo `test -f 'google/protobuf/compiler/cpp/cpp_service.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_service.cc

19749

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_service.lo `test -f 'google/protobuf/compiler/cpp/cpp_service.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_service.cc

19750

19751

cpp_string_field.lo: google/protobuf/compiler/cpp/cpp_string_field.cc

19752

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_string_field.lo -MD -MP -MF $(DEPDIR)/cpp_string_field.Tpo -c -o cpp_string_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_string_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_string_field.cc

19753

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/cpp_string_field.Tpo $(DEPDIR)/cpp_string_field.Plo

19754

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cpp_string_field.lo -MD -MP -MF $(DEPDIR)/cpp_string_field.Tpo -c -o cpp_string_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_string_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_string_field.cc

19755

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/cpp_string_field.Tpo $(DEPDIR)/cpp_string_field.Plo

19756

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_string_field.cc' object='cpp_string_field.lo' libtool=yes @AMDEPBACKSLASH@

19757

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19758

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_string_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_string_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_string_field.cc

19759

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cpp_string_field.lo `test -f 'google/protobuf/compiler/cpp/cpp_string_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_string_field.cc

19760

19761

java_enum.lo: google/protobuf/compiler/java/java_enum.cc

19762

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_enum.lo -MD -MP -MF $(DEPDIR)/java_enum.Tpo -c -o java_enum.lo `test -f 'google/protobuf/compiler/java/java_enum.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_enum.cc

19763

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/java_enum.Tpo $(DEPDIR)/java_enum.Plo

19764

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_enum.lo -MD -MP -MF $(DEPDIR)/java_enum.Tpo -c -o java_enum.lo `test -f 'google/protobuf/compiler/java/java_enum.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_enum.cc

19765

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/java_enum.Tpo $(DEPDIR)/java_enum.Plo

19766

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_enum.cc' object='java_enum.lo' libtool=yes @AMDEPBACKSLASH@

19767

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19768

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_enum.lo `test -f 'google/protobuf/compiler/java/java_enum.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_enum.cc

19769

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_enum.lo `test -f 'google/protobuf/compiler/java/java_enum.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_enum.cc

19770

19771

java_enum_field.lo: google/protobuf/compiler/java/java_enum_field.cc

19772

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_enum_field.lo -MD -MP -MF $(DEPDIR)/java_enum_field.Tpo -c -o java_enum_field.lo `test -f 'google/protobuf/compiler/java/java_enum_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_enum_field.cc

19773

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/java_enum_field.Tpo $(DEPDIR)/java_enum_field.Plo

19774

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_enum_field.lo -MD -MP -MF $(DEPDIR)/java_enum_field.Tpo -c -o java_enum_field.lo `test -f 'google/protobuf/compiler/java/java_enum_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_enum_field.cc

19775

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/java_enum_field.Tpo $(DEPDIR)/java_enum_field.Plo

19776

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_enum_field.cc' object='java_enum_field.lo' libtool=yes @AMDEPBACKSLASH@

19777

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19778

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_enum_field.lo `test -f 'google/protobuf/compiler/java/java_enum_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_enum_field.cc

19779

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_enum_field.lo `test -f 'google/protobuf/compiler/java/java_enum_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_enum_field.cc

19780

19781

java_extension.lo: google/protobuf/compiler/java/java_extension.cc

19782

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_extension.lo -MD -MP -MF $(DEPDIR)/java_extension.Tpo -c -o java_extension.lo `test -f 'google/protobuf/compiler/java/java_extension.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_extension.cc

19783

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/java_extension.Tpo $(DEPDIR)/java_extension.Plo

19784

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_extension.lo -MD -MP -MF $(DEPDIR)/java_extension.Tpo -c -o java_extension.lo `test -f 'google/protobuf/compiler/java/java_extension.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_extension.cc

19785

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/java_extension.Tpo $(DEPDIR)/java_extension.Plo

19786

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_extension.cc' object='java_extension.lo' libtool=yes @AMDEPBACKSLASH@

19787

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19788

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_extension.lo `test -f 'google/protobuf/compiler/java/java_extension.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_extension.cc

19789

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_extension.lo `test -f 'google/protobuf/compiler/java/java_extension.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_extension.cc

19790

19791

java_field.lo: google/protobuf/compiler/java/java_field.cc

19792

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_field.lo -MD -MP -MF $(DEPDIR)/java_field.Tpo -c -o java_field.lo `test -f 'google/protobuf/compiler/java/java_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_field.cc

19793

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/java_field.Tpo $(DEPDIR)/java_field.Plo

19794

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_field.lo -MD -MP -MF $(DEPDIR)/java_field.Tpo -c -o java_field.lo `test -f 'google/protobuf/compiler/java/java_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_field.cc

19795

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/java_field.Tpo $(DEPDIR)/java_field.Plo

19796

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_field.cc' object='java_field.lo' libtool=yes @AMDEPBACKSLASH@

19797

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19798

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_field.lo `test -f 'google/protobuf/compiler/java/java_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_field.cc

19799

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_field.lo `test -f 'google/protobuf/compiler/java/java_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_field.cc

19800

19801

java_file.lo: google/protobuf/compiler/java/java_file.cc

19802

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_file.lo -MD -MP -MF $(DEPDIR)/java_file.Tpo -c -o java_file.lo `test -f 'google/protobuf/compiler/java/java_file.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_file.cc

19803

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/java_file.Tpo $(DEPDIR)/java_file.Plo

19804

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_file.lo -MD -MP -MF $(DEPDIR)/java_file.Tpo -c -o java_file.lo `test -f 'google/protobuf/compiler/java/java_file.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_file.cc

19805

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/java_file.Tpo $(DEPDIR)/java_file.Plo

19806

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_file.cc' object='java_file.lo' libtool=yes @AMDEPBACKSLASH@

19807

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19808

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_file.lo `test -f 'google/protobuf/compiler/java/java_file.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_file.cc

19809

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_file.lo `test -f 'google/protobuf/compiler/java/java_file.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_file.cc

19810

19811

java_generator.lo: google/protobuf/compiler/java/java_generator.cc

19812

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_generator.lo -MD -MP -MF $(DEPDIR)/java_generator.Tpo -c -o java_generator.lo `test -f 'google/protobuf/compiler/java/java_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_generator.cc

19813

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/java_generator.Tpo $(DEPDIR)/java_generator.Plo

19814

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_generator.lo -MD -MP -MF $(DEPDIR)/java_generator.Tpo -c -o java_generator.lo `test -f 'google/protobuf/compiler/java/java_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_generator.cc

19815

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/java_generator.Tpo $(DEPDIR)/java_generator.Plo

19816

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_generator.cc' object='java_generator.lo' libtool=yes @AMDEPBACKSLASH@

19817

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19818

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_generator.lo `test -f 'google/protobuf/compiler/java/java_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_generator.cc

19819

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_generator.lo `test -f 'google/protobuf/compiler/java/java_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_generator.cc

19820

19821

java_helpers.lo: google/protobuf/compiler/java/java_helpers.cc

19822

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_helpers.lo -MD -MP -MF $(DEPDIR)/java_helpers.Tpo -c -o java_helpers.lo `test -f 'google/protobuf/compiler/java/java_helpers.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_helpers.cc

19823

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/java_helpers.Tpo $(DEPDIR)/java_helpers.Plo

19824

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_helpers.lo -MD -MP -MF $(DEPDIR)/java_helpers.Tpo -c -o java_helpers.lo `test -f 'google/protobuf/compiler/java/java_helpers.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_helpers.cc

19825

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/java_helpers.Tpo $(DEPDIR)/java_helpers.Plo

19826

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_helpers.cc' object='java_helpers.lo' libtool=yes @AMDEPBACKSLASH@

19827

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19828

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_helpers.lo `test -f 'google/protobuf/compiler/java/java_helpers.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_helpers.cc

19829

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_helpers.lo `test -f 'google/protobuf/compiler/java/java_helpers.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_helpers.cc

19830

19831

java_message.lo: google/protobuf/compiler/java/java_message.cc

19832

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_message.lo -MD -MP -MF $(DEPDIR)/java_message.Tpo -c -o java_message.lo `test -f 'google/protobuf/compiler/java/java_message.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_message.cc

19833

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/java_message.Tpo $(DEPDIR)/java_message.Plo

19834

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_message.lo -MD -MP -MF $(DEPDIR)/java_message.Tpo -c -o java_message.lo `test -f 'google/protobuf/compiler/java/java_message.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_message.cc

19835

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/java_message.Tpo $(DEPDIR)/java_message.Plo

19836

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_message.cc' object='java_message.lo' libtool=yes @AMDEPBACKSLASH@

19837

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19838

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_message.lo `test -f 'google/protobuf/compiler/java/java_message.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_message.cc

19839

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_message.lo `test -f 'google/protobuf/compiler/java/java_message.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_message.cc

19840

19841

java_message_field.lo: google/protobuf/compiler/java/java_message_field.cc

19842

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_message_field.lo -MD -MP -MF $(DEPDIR)/java_message_field.Tpo -c -o java_message_field.lo `test -f 'google/protobuf/compiler/java/java_message_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_message_field.cc

19843

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/java_message_field.Tpo $(DEPDIR)/java_message_field.Plo

19844

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_message_field.lo -MD -MP -MF $(DEPDIR)/java_message_field.Tpo -c -o java_message_field.lo `test -f 'google/protobuf/compiler/java/java_message_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_message_field.cc

19845

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/java_message_field.Tpo $(DEPDIR)/java_message_field.Plo

19846

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_message_field.cc' object='java_message_field.lo' libtool=yes @AMDEPBACKSLASH@

19847

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19848

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_message_field.lo `test -f 'google/protobuf/compiler/java/java_message_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_message_field.cc

19849

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_message_field.lo `test -f 'google/protobuf/compiler/java/java_message_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_message_field.cc

19850

19851

java_primitive_field.lo: google/protobuf/compiler/java/java_primitive_field.cc

19852

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_primitive_field.lo -MD -MP -MF $(DEPDIR)/java_primitive_field.Tpo -c -o java_primitive_field.lo `test -f 'google/protobuf/compiler/java/java_primitive_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_primitive_field.cc

19853

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/java_primitive_field.Tpo $(DEPDIR)/java_primitive_field.Plo

19854

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_primitive_field.lo -MD -MP -MF $(DEPDIR)/java_primitive_field.Tpo -c -o java_primitive_field.lo `test -f 'google/protobuf/compiler/java/java_primitive_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_primitive_field.cc

19855

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/java_primitive_field.Tpo $(DEPDIR)/java_primitive_field.Plo

19856

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_primitive_field.cc' object='java_primitive_field.lo' libtool=yes @AMDEPBACKSLASH@

19857

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19858

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_primitive_field.lo `test -f 'google/protobuf/compiler/java/java_primitive_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_primitive_field.cc

19859

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_primitive_field.lo `test -f 'google/protobuf/compiler/java/java_primitive_field.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_primitive_field.cc

19860

19861

java_service.lo: google/protobuf/compiler/java/java_service.cc

19862

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_service.lo -MD -MP -MF $(DEPDIR)/java_service.Tpo -c -o java_service.lo `test -f 'google/protobuf/compiler/java/java_service.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_service.cc

19863

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/java_service.Tpo $(DEPDIR)/java_service.Plo

19864

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT java_service.lo -MD -MP -MF $(DEPDIR)/java_service.Tpo -c -o java_service.lo `test -f 'google/protobuf/compiler/java/java_service.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_service.cc

19865

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/java_service.Tpo $(DEPDIR)/java_service.Plo

19866

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_service.cc' object='java_service.lo' libtool=yes @AMDEPBACKSLASH@

19867

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19868

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_service.lo `test -f 'google/protobuf/compiler/java/java_service.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_service.cc

19869

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o java_service.lo `test -f 'google/protobuf/compiler/java/java_service.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_service.cc

19870

19871

python_generator.lo: google/protobuf/compiler/python/python_generator.cc

19872

-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT python_generator.lo -MD -MP -MF $(DEPDIR)/python_generator.Tpo -c -o python_generator.lo `test -f 'google/protobuf/compiler/python/python_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/python/python_generator.cc

19873

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/python_generator.Tpo $(DEPDIR)/python_generator.Plo

19874

+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT python_generator.lo -MD -MP -MF $(DEPDIR)/python_generator.Tpo -c -o python_generator.lo `test -f 'google/protobuf/compiler/python/python_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/python/python_generator.cc

19875

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/python_generator.Tpo $(DEPDIR)/python_generator.Plo

19876

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/python/python_generator.cc' object='python_generator.lo' libtool=yes @AMDEPBACKSLASH@

19877

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19878

-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o python_generator.lo `test -f 'google/protobuf/compiler/python/python_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/python/python_generator.cc

19879

+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o python_generator.lo `test -f 'google/protobuf/compiler/python/python_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/python/python_generator.cc

19880

19881

protobuf_lazy_descriptor_test-cpp_unittest.o: google/protobuf/compiler/cpp/cpp_unittest.cc

19882

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-cpp_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_unittest.Tpo -c -o protobuf_lazy_descriptor_test-cpp_unittest.o `test -f 'google/protobuf/compiler/cpp/cpp_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_unittest.cc

19883

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_unittest.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_unittest.Po

19884

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_unittest.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_unittest.Po

19885

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_unittest.cc' object='protobuf_lazy_descriptor_test-cpp_unittest.o' libtool=no @AMDEPBACKSLASH@

19886

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19887

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-cpp_unittest.o `test -f 'google/protobuf/compiler/cpp/cpp_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_unittest.cc

19888

19889

protobuf_lazy_descriptor_test-cpp_unittest.obj: google/protobuf/compiler/cpp/cpp_unittest.cc

19890

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-cpp_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_unittest.Tpo -c -o protobuf_lazy_descriptor_test-cpp_unittest.obj `if test -f 'google/protobuf/compiler/cpp/cpp_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_unittest.cc'; fi`

19891

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_unittest.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_unittest.Po

19892

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_unittest.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_unittest.Po

19893

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_unittest.cc' object='protobuf_lazy_descriptor_test-cpp_unittest.obj' libtool=no @AMDEPBACKSLASH@

19894

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19895

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-cpp_unittest.obj `if test -f 'google/protobuf/compiler/cpp/cpp_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_unittest.cc'; fi`

19896

19897

protobuf_lazy_descriptor_test-test_util.o: google/protobuf/test_util.cc

19898

19899

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-test_util.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-test_util.Po

19900

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-test_util.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-test_util.Po

19901

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/test_util.cc' object='protobuf_lazy_descriptor_test-test_util.o' libtool=no @AMDEPBACKSLASH@

19902

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19903

19904

19905

protobuf_lazy_descriptor_test-test_util.obj: google/protobuf/test_util.cc

19906

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-test_util.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-test_util.Tpo -c -o protobuf_lazy_descriptor_test-test_util.obj `if test -f 'google/protobuf/test_util.cc'; then $(CYGPATH_W) 'google/protobuf/test_util.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/test_util.cc'; fi`

19907

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-test_util.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-test_util.Po

19908

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-test_util.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-test_util.Po

19909

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/test_util.cc' object='protobuf_lazy_descriptor_test-test_util.obj' libtool=no @AMDEPBACKSLASH@

19910

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19911

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-test_util.obj `if test -f 'google/protobuf/test_util.cc'; then $(CYGPATH_W) 'google/protobuf/test_util.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/test_util.cc'; fi`

19912

19913

protobuf_lazy_descriptor_test-googletest.o: google/protobuf/testing/googletest.cc

19914

19915

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-googletest.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-googletest.Po

19916

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-googletest.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-googletest.Po

19917

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/googletest.cc' object='protobuf_lazy_descriptor_test-googletest.o' libtool=no @AMDEPBACKSLASH@

19918

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19919

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-googletest.o `test -f 'google/protobuf/testing/googletest.cc' || echo '$(srcdir)/'`google/protobuf/testing/googletest.cc

19920

19921

protobuf_lazy_descriptor_test-googletest.obj: google/protobuf/testing/googletest.cc

19922

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-googletest.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-googletest.Tpo -c -o protobuf_lazy_descriptor_test-googletest.obj `if test -f 'google/protobuf/testing/googletest.cc'; then $(CYGPATH_W) 'google/protobuf/testing/googletest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/googletest.cc'; fi`

19923

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-googletest.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-googletest.Po

19924

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-googletest.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-googletest.Po

19925

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/googletest.cc' object='protobuf_lazy_descriptor_test-googletest.obj' libtool=no @AMDEPBACKSLASH@

19926

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19927

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-googletest.obj `if test -f 'google/protobuf/testing/googletest.cc'; then $(CYGPATH_W) 'google/protobuf/testing/googletest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/googletest.cc'; fi`

19928

19929

protobuf_lazy_descriptor_test-file.o: google/protobuf/testing/file.cc

19930

19931

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-file.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-file.Po

19932

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-file.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-file.Po

19933

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/file.cc' object='protobuf_lazy_descriptor_test-file.o' libtool=no @AMDEPBACKSLASH@

19934

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19935

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-file.o `test -f 'google/protobuf/testing/file.cc' || echo '$(srcdir)/'`google/protobuf/testing/file.cc

19936

19937

protobuf_lazy_descriptor_test-file.obj: google/protobuf/testing/file.cc

19938

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-file.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-file.Tpo -c -o protobuf_lazy_descriptor_test-file.obj `if test -f 'google/protobuf/testing/file.cc'; then $(CYGPATH_W) 'google/protobuf/testing/file.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/file.cc'; fi`

19939

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-file.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-file.Po

19940

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-file.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-file.Po

19941

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/file.cc' object='protobuf_lazy_descriptor_test-file.obj' libtool=no @AMDEPBACKSLASH@

19942

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19943

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-file.obj `if test -f 'google/protobuf/testing/file.cc'; then $(CYGPATH_W) 'google/protobuf/testing/file.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/file.cc'; fi`

19944

19945

protobuf_lazy_descriptor_test-unittest_lite.pb.o: google/protobuf/unittest_lite.pb.cc

19946

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_lite.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_lite.pb.o `test -f 'google/protobuf/unittest_lite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_lite.pb.cc

19947

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite.pb.Po

19948

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite.pb.Po

19949

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_lite.pb.cc' object='protobuf_lazy_descriptor_test-unittest_lite.pb.o' libtool=no @AMDEPBACKSLASH@

19950

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19951

19952

19953

protobuf_lazy_descriptor_test-unittest_lite.pb.obj: google/protobuf/unittest_lite.pb.cc

19954

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_lite.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_lite.pb.obj `if test -f 'google/protobuf/unittest_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_lite.pb.cc'; fi`

19955

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite.pb.Po

19956

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite.pb.Po

19957

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_lite.pb.cc' object='protobuf_lazy_descriptor_test-unittest_lite.pb.obj' libtool=no @AMDEPBACKSLASH@

19958

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19959

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_lite.pb.obj `if test -f 'google/protobuf/unittest_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_lite.pb.cc'; fi`

19960

19961

protobuf_lazy_descriptor_test-unittest_import_lite.pb.o: google/protobuf/unittest_import_lite.pb.cc

19962

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_import_lite.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import_lite.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_import_lite.pb.o `test -f 'google/protobuf/unittest_import_lite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_import_lite.pb.cc

19963

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import_lite.pb.Po

19964

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import_lite.pb.Po

19965

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_import_lite.pb.cc' object='protobuf_lazy_descriptor_test-unittest_import_lite.pb.o' libtool=no @AMDEPBACKSLASH@

19966

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19967

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_import_lite.pb.o `test -f 'google/protobuf/unittest_import_lite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_import_lite.pb.cc

19968

19969

protobuf_lazy_descriptor_test-unittest_import_lite.pb.obj: google/protobuf/unittest_import_lite.pb.cc

19970

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_import_lite.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import_lite.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_import_lite.pb.obj `if test -f 'google/protobuf/unittest_import_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_import_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_import_lite.pb.cc'; fi`

19971

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import_lite.pb.Po

19972

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import_lite.pb.Po

19973

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_import_lite.pb.cc' object='protobuf_lazy_descriptor_test-unittest_import_lite.pb.obj' libtool=no @AMDEPBACKSLASH@

19974

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19975

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_import_lite.pb.obj `if test -f 'google/protobuf/unittest_import_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_import_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_import_lite.pb.cc'; fi`

19976

19977

protobuf_lazy_descriptor_test-unittest.pb.o: google/protobuf/unittest.pb.cc

19978

19979

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest.pb.Po

19980

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest.pb.Po

19981

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest.pb.cc' object='protobuf_lazy_descriptor_test-unittest.pb.o' libtool=no @AMDEPBACKSLASH@

19982

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19983

19984

19985

protobuf_lazy_descriptor_test-unittest.pb.obj: google/protobuf/unittest.pb.cc

19986

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest.pb.obj `if test -f 'google/protobuf/unittest.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest.pb.cc'; fi`

19987

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest.pb.Po

19988

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest.pb.Po

19989

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest.pb.cc' object='protobuf_lazy_descriptor_test-unittest.pb.obj' libtool=no @AMDEPBACKSLASH@

19990

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19991

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest.pb.obj `if test -f 'google/protobuf/unittest.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest.pb.cc'; fi`

19992

19993

protobuf_lazy_descriptor_test-unittest_empty.pb.o: google/protobuf/unittest_empty.pb.cc

19994

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_empty.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_empty.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_empty.pb.o `test -f 'google/protobuf/unittest_empty.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_empty.pb.cc

19995

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_empty.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_empty.pb.Po

19996

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_empty.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_empty.pb.Po

19997

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_empty.pb.cc' object='protobuf_lazy_descriptor_test-unittest_empty.pb.o' libtool=no @AMDEPBACKSLASH@

19998

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19999

20000

20001

protobuf_lazy_descriptor_test-unittest_empty.pb.obj: google/protobuf/unittest_empty.pb.cc

20002

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_empty.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_empty.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_empty.pb.obj `if test -f 'google/protobuf/unittest_empty.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_empty.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_empty.pb.cc'; fi`

20003

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_empty.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_empty.pb.Po

20004

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_empty.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_empty.pb.Po

20005

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_empty.pb.cc' object='protobuf_lazy_descriptor_test-unittest_empty.pb.obj' libtool=no @AMDEPBACKSLASH@

20006

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20007

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_empty.pb.obj `if test -f 'google/protobuf/unittest_empty.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_empty.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_empty.pb.cc'; fi`

20008

20009

protobuf_lazy_descriptor_test-unittest_import.pb.o: google/protobuf/unittest_import.pb.cc

20010

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_import.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_import.pb.o `test -f 'google/protobuf/unittest_import.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_import.pb.cc

20011

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import.pb.Po

20012

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import.pb.Po

20013

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_import.pb.cc' object='protobuf_lazy_descriptor_test-unittest_import.pb.o' libtool=no @AMDEPBACKSLASH@

20014

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20015

20016

20017

protobuf_lazy_descriptor_test-unittest_import.pb.obj: google/protobuf/unittest_import.pb.cc

20018

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_import.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_import.pb.obj `if test -f 'google/protobuf/unittest_import.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_import.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_import.pb.cc'; fi`

20019

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import.pb.Po

20020

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_import.pb.Po

20021

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_import.pb.cc' object='protobuf_lazy_descriptor_test-unittest_import.pb.obj' libtool=no @AMDEPBACKSLASH@

20022

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20023

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_import.pb.obj `if test -f 'google/protobuf/unittest_import.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_import.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_import.pb.cc'; fi`

20024

20025

protobuf_lazy_descriptor_test-unittest_mset.pb.o: google/protobuf/unittest_mset.pb.cc

20026

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_mset.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_mset.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_mset.pb.o `test -f 'google/protobuf/unittest_mset.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_mset.pb.cc

20027

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_mset.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_mset.pb.Po

20028

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_mset.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_mset.pb.Po

20029

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_mset.pb.cc' object='protobuf_lazy_descriptor_test-unittest_mset.pb.o' libtool=no @AMDEPBACKSLASH@

20030

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20031

20032

20033

protobuf_lazy_descriptor_test-unittest_mset.pb.obj: google/protobuf/unittest_mset.pb.cc

20034

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_mset.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_mset.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_mset.pb.obj `if test -f 'google/protobuf/unittest_mset.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_mset.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_mset.pb.cc'; fi`

20035

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_mset.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_mset.pb.Po

20036

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_mset.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_mset.pb.Po

20037

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_mset.pb.cc' object='protobuf_lazy_descriptor_test-unittest_mset.pb.obj' libtool=no @AMDEPBACKSLASH@

20038

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20039

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_mset.pb.obj `if test -f 'google/protobuf/unittest_mset.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_mset.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_mset.pb.cc'; fi`

20040

20041

protobuf_lazy_descriptor_test-unittest_optimize_for.pb.o: google/protobuf/unittest_optimize_for.pb.cc

20042

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_optimize_for.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_optimize_for.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_optimize_for.pb.o `test -f 'google/protobuf/unittest_optimize_for.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_optimize_for.pb.cc

20043

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_optimize_for.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_optimize_for.pb.Po

20044

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_optimize_for.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_optimize_for.pb.Po

20045

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_optimize_for.pb.cc' object='protobuf_lazy_descriptor_test-unittest_optimize_for.pb.o' libtool=no @AMDEPBACKSLASH@

20046

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20047

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_optimize_for.pb.o `test -f 'google/protobuf/unittest_optimize_for.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_optimize_for.pb.cc

20048

20049

protobuf_lazy_descriptor_test-unittest_optimize_for.pb.obj: google/protobuf/unittest_optimize_for.pb.cc

20050

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_optimize_for.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_optimize_for.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_optimize_for.pb.obj `if test -f 'google/protobuf/unittest_optimize_for.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_optimize_for.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_optimize_for.pb.cc'; fi`

20051

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_optimize_for.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_optimize_for.pb.Po

20052

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_optimize_for.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_optimize_for.pb.Po

20053

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_optimize_for.pb.cc' object='protobuf_lazy_descriptor_test-unittest_optimize_for.pb.obj' libtool=no @AMDEPBACKSLASH@

20054

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20055

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_optimize_for.pb.obj `if test -f 'google/protobuf/unittest_optimize_for.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_optimize_for.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_optimize_for.pb.cc'; fi`

20056

20057

protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.o: google/protobuf/unittest_embed_optimize_for.pb.cc

20058

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.o `test -f 'google/protobuf/unittest_embed_optimize_for.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_embed_optimize_for.pb.cc

20059

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.Po

20060

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.Po

20061

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_embed_optimize_for.pb.cc' object='protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.o' libtool=no @AMDEPBACKSLASH@

20062

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20063

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.o `test -f 'google/protobuf/unittest_embed_optimize_for.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_embed_optimize_for.pb.cc

20064

20065

protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.obj: google/protobuf/unittest_embed_optimize_for.pb.cc

20066

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.obj `if test -f 'google/protobuf/unittest_embed_optimize_for.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_embed_optimize_for.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_embed_optimize_for.pb.cc'; fi`

20067

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.Po

20068

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.Po

20069

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_embed_optimize_for.pb.cc' object='protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.obj' libtool=no @AMDEPBACKSLASH@

20070

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20071

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_embed_optimize_for.pb.obj `if test -f 'google/protobuf/unittest_embed_optimize_for.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_embed_optimize_for.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_embed_optimize_for.pb.cc'; fi`

20072

20073

protobuf_lazy_descriptor_test-unittest_custom_options.pb.o: google/protobuf/unittest_custom_options.pb.cc

20074

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_custom_options.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_custom_options.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_custom_options.pb.o `test -f 'google/protobuf/unittest_custom_options.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_custom_options.pb.cc

20075

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_custom_options.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_custom_options.pb.Po

20076

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_custom_options.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_custom_options.pb.Po

20077

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_custom_options.pb.cc' object='protobuf_lazy_descriptor_test-unittest_custom_options.pb.o' libtool=no @AMDEPBACKSLASH@

20078

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20079

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_custom_options.pb.o `test -f 'google/protobuf/unittest_custom_options.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_custom_options.pb.cc

20080

20081

protobuf_lazy_descriptor_test-unittest_custom_options.pb.obj: google/protobuf/unittest_custom_options.pb.cc

20082

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_custom_options.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_custom_options.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_custom_options.pb.obj `if test -f 'google/protobuf/unittest_custom_options.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_custom_options.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_custom_options.pb.cc'; fi`

20083

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_custom_options.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_custom_options.pb.Po

20084

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_custom_options.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_custom_options.pb.Po

20085

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_custom_options.pb.cc' object='protobuf_lazy_descriptor_test-unittest_custom_options.pb.obj' libtool=no @AMDEPBACKSLASH@

20086

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20087

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_custom_options.pb.obj `if test -f 'google/protobuf/unittest_custom_options.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_custom_options.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_custom_options.pb.cc'; fi`

20088

20089

protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.o: google/protobuf/unittest_lite_imports_nonlite.pb.cc

20090

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.o `test -f 'google/protobuf/unittest_lite_imports_nonlite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_lite_imports_nonlite.pb.cc

20091

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.Po

20092

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.Po

20093

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_lite_imports_nonlite.pb.cc' object='protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.o' libtool=no @AMDEPBACKSLASH@

20094

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20095

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.o `test -f 'google/protobuf/unittest_lite_imports_nonlite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_lite_imports_nonlite.pb.cc

20096

20097

protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.obj: google/protobuf/unittest_lite_imports_nonlite.pb.cc

20098

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.obj `if test -f 'google/protobuf/unittest_lite_imports_nonlite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_lite_imports_nonlite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_lite_imports_nonlite.pb.cc'; fi`

20099

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.Po

20100

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.Po

20101

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_lite_imports_nonlite.pb.cc' object='protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.obj' libtool=no @AMDEPBACKSLASH@

20102

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20103

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_lite_imports_nonlite.pb.obj `if test -f 'google/protobuf/unittest_lite_imports_nonlite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_lite_imports_nonlite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_lite_imports_nonlite.pb.cc'; fi`

20104

20105

protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.o: google/protobuf/unittest_no_generic_services.pb.cc

20106

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.o `test -f 'google/protobuf/unittest_no_generic_services.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_no_generic_services.pb.cc

20107

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.Po

20108

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.Po

20109

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_no_generic_services.pb.cc' object='protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.o' libtool=no @AMDEPBACKSLASH@

20110

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20111

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.o `test -f 'google/protobuf/unittest_no_generic_services.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_no_generic_services.pb.cc

20112

20113

protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.obj: google/protobuf/unittest_no_generic_services.pb.cc

20114

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.Tpo -c -o protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.obj `if test -f 'google/protobuf/unittest_no_generic_services.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_no_generic_services.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_no_generic_services.pb.cc'; fi`

20115

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.Po

20116

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.Po

20117

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_no_generic_services.pb.cc' object='protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.obj' libtool=no @AMDEPBACKSLASH@

20118

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20119

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-unittest_no_generic_services.pb.obj `if test -f 'google/protobuf/unittest_no_generic_services.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_no_generic_services.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_no_generic_services.pb.cc'; fi`

20120

20121

protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.o: google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc

20122

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.Tpo -c -o protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.o `test -f 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc

20123

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.Po

20124

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.Po

20125

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc' object='protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.o' libtool=no @AMDEPBACKSLASH@

20126

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20127

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.o `test -f 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc

20128

20129

protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.obj: google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc

20130

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.Tpo -c -o protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.obj `if test -f 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; fi`

20131

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.Po

20132

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.Tpo $(DEPDIR)/protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.Po

20133

20134

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20135

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_lazy_descriptor_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_lazy_descriptor_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lazy_descriptor_test-cpp_test_bad_identifiers.pb.obj `if test -f 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; fi`

20136

20137

protobuf_lite_test-lite_unittest.o: google/protobuf/lite_unittest.cc

20138

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lite_test-lite_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_lite_test-lite_unittest.Tpo -c -o protobuf_lite_test-lite_unittest.o `test -f 'google/protobuf/lite_unittest.cc' || echo '$(srcdir)/'`google/protobuf/lite_unittest.cc

20139

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lite_test-lite_unittest.Tpo $(DEPDIR)/protobuf_lite_test-lite_unittest.Po

20140

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lite_test-lite_unittest.Tpo $(DEPDIR)/protobuf_lite_test-lite_unittest.Po

20141

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/lite_unittest.cc' object='protobuf_lite_test-lite_unittest.o' libtool=no @AMDEPBACKSLASH@

20142

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20143

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lite_test-lite_unittest.o `test -f 'google/protobuf/lite_unittest.cc' || echo '$(srcdir)/'`google/protobuf/lite_unittest.cc

20144

20145

protobuf_lite_test-lite_unittest.obj: google/protobuf/lite_unittest.cc

20146

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lite_test-lite_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_lite_test-lite_unittest.Tpo -c -o protobuf_lite_test-lite_unittest.obj `if test -f 'google/protobuf/lite_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/lite_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/lite_unittest.cc'; fi`

20147

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lite_test-lite_unittest.Tpo $(DEPDIR)/protobuf_lite_test-lite_unittest.Po

20148

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lite_test-lite_unittest.Tpo $(DEPDIR)/protobuf_lite_test-lite_unittest.Po

20149

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/lite_unittest.cc' object='protobuf_lite_test-lite_unittest.obj' libtool=no @AMDEPBACKSLASH@

20150

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20151

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lite_test-lite_unittest.obj `if test -f 'google/protobuf/lite_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/lite_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/lite_unittest.cc'; fi`

20152

20153

protobuf_lite_test-test_util_lite.o: google/protobuf/test_util_lite.cc

20154

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lite_test-test_util_lite.o -MD -MP -MF $(DEPDIR)/protobuf_lite_test-test_util_lite.Tpo -c -o protobuf_lite_test-test_util_lite.o `test -f 'google/protobuf/test_util_lite.cc' || echo '$(srcdir)/'`google/protobuf/test_util_lite.cc

20155

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lite_test-test_util_lite.Tpo $(DEPDIR)/protobuf_lite_test-test_util_lite.Po

20156

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lite_test-test_util_lite.Tpo $(DEPDIR)/protobuf_lite_test-test_util_lite.Po

20157

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/test_util_lite.cc' object='protobuf_lite_test-test_util_lite.o' libtool=no @AMDEPBACKSLASH@

20158

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20159

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lite_test-test_util_lite.o `test -f 'google/protobuf/test_util_lite.cc' || echo '$(srcdir)/'`google/protobuf/test_util_lite.cc

20160

20161

protobuf_lite_test-test_util_lite.obj: google/protobuf/test_util_lite.cc

20162

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lite_test-test_util_lite.obj -MD -MP -MF $(DEPDIR)/protobuf_lite_test-test_util_lite.Tpo -c -o protobuf_lite_test-test_util_lite.obj `if test -f 'google/protobuf/test_util_lite.cc'; then $(CYGPATH_W) 'google/protobuf/test_util_lite.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/test_util_lite.cc'; fi`

20163

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lite_test-test_util_lite.Tpo $(DEPDIR)/protobuf_lite_test-test_util_lite.Po

20164

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lite_test-test_util_lite.Tpo $(DEPDIR)/protobuf_lite_test-test_util_lite.Po

20165

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/test_util_lite.cc' object='protobuf_lite_test-test_util_lite.obj' libtool=no @AMDEPBACKSLASH@

20166

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20167

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lite_test-test_util_lite.obj `if test -f 'google/protobuf/test_util_lite.cc'; then $(CYGPATH_W) 'google/protobuf/test_util_lite.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/test_util_lite.cc'; fi`

20168

20169

protobuf_lite_test-unittest_lite.pb.o: google/protobuf/unittest_lite.pb.cc

20170

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lite_test-unittest_lite.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lite_test-unittest_lite.pb.Tpo -c -o protobuf_lite_test-unittest_lite.pb.o `test -f 'google/protobuf/unittest_lite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_lite.pb.cc

20171

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lite_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_lite_test-unittest_lite.pb.Po

20172

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lite_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_lite_test-unittest_lite.pb.Po

20173

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_lite.pb.cc' object='protobuf_lite_test-unittest_lite.pb.o' libtool=no @AMDEPBACKSLASH@

20174

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20175

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lite_test-unittest_lite.pb.o `test -f 'google/protobuf/unittest_lite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_lite.pb.cc

20176

20177

protobuf_lite_test-unittest_lite.pb.obj: google/protobuf/unittest_lite.pb.cc

20178

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lite_test-unittest_lite.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lite_test-unittest_lite.pb.Tpo -c -o protobuf_lite_test-unittest_lite.pb.obj `if test -f 'google/protobuf/unittest_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_lite.pb.cc'; fi`

20179

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lite_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_lite_test-unittest_lite.pb.Po

20180

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lite_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_lite_test-unittest_lite.pb.Po

20181

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_lite.pb.cc' object='protobuf_lite_test-unittest_lite.pb.obj' libtool=no @AMDEPBACKSLASH@

20182

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20183

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lite_test-unittest_lite.pb.obj `if test -f 'google/protobuf/unittest_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_lite.pb.cc'; fi`

20184

20185

protobuf_lite_test-unittest_import_lite.pb.o: google/protobuf/unittest_import_lite.pb.cc

20186

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lite_test-unittest_import_lite.pb.o -MD -MP -MF $(DEPDIR)/protobuf_lite_test-unittest_import_lite.pb.Tpo -c -o protobuf_lite_test-unittest_import_lite.pb.o `test -f 'google/protobuf/unittest_import_lite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_import_lite.pb.cc

20187

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lite_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_lite_test-unittest_import_lite.pb.Po

20188

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lite_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_lite_test-unittest_import_lite.pb.Po

20189

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_import_lite.pb.cc' object='protobuf_lite_test-unittest_import_lite.pb.o' libtool=no @AMDEPBACKSLASH@

20190

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20191

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lite_test-unittest_import_lite.pb.o `test -f 'google/protobuf/unittest_import_lite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_import_lite.pb.cc

20192

20193

protobuf_lite_test-unittest_import_lite.pb.obj: google/protobuf/unittest_import_lite.pb.cc

20194

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_lite_test-unittest_import_lite.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_lite_test-unittest_import_lite.pb.Tpo -c -o protobuf_lite_test-unittest_import_lite.pb.obj `if test -f 'google/protobuf/unittest_import_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_import_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_import_lite.pb.cc'; fi`

20195

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_lite_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_lite_test-unittest_import_lite.pb.Po

20196

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_lite_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_lite_test-unittest_import_lite.pb.Po

20197

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_import_lite.pb.cc' object='protobuf_lite_test-unittest_import_lite.pb.obj' libtool=no @AMDEPBACKSLASH@

20198

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20199

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(protobuf_lite_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_lite_test-unittest_import_lite.pb.obj `if test -f 'google/protobuf/unittest_import_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_import_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_import_lite.pb.cc'; fi`

20200

20201

protobuf_test-common_unittest.o: google/protobuf/stubs/common_unittest.cc

20202

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-common_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-common_unittest.Tpo -c -o protobuf_test-common_unittest.o `test -f 'google/protobuf/stubs/common_unittest.cc' || echo '$(srcdir)/'`google/protobuf/stubs/common_unittest.cc

20203

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-common_unittest.Tpo $(DEPDIR)/protobuf_test-common_unittest.Po

20204

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-common_unittest.Tpo $(DEPDIR)/protobuf_test-common_unittest.Po

20205

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/common_unittest.cc' object='protobuf_test-common_unittest.o' libtool=no @AMDEPBACKSLASH@

20206

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20207

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-common_unittest.o `test -f 'google/protobuf/stubs/common_unittest.cc' || echo '$(srcdir)/'`google/protobuf/stubs/common_unittest.cc

20208

20209

protobuf_test-common_unittest.obj: google/protobuf/stubs/common_unittest.cc

20210

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-common_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-common_unittest.Tpo -c -o protobuf_test-common_unittest.obj `if test -f 'google/protobuf/stubs/common_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/stubs/common_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/stubs/common_unittest.cc'; fi`

20211

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-common_unittest.Tpo $(DEPDIR)/protobuf_test-common_unittest.Po

20212

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-common_unittest.Tpo $(DEPDIR)/protobuf_test-common_unittest.Po

20213

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/common_unittest.cc' object='protobuf_test-common_unittest.obj' libtool=no @AMDEPBACKSLASH@

20214

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20215

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-common_unittest.obj `if test -f 'google/protobuf/stubs/common_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/stubs/common_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/stubs/common_unittest.cc'; fi`

20216

20217

protobuf_test-once_unittest.o: google/protobuf/stubs/once_unittest.cc

20218

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-once_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-once_unittest.Tpo -c -o protobuf_test-once_unittest.o `test -f 'google/protobuf/stubs/once_unittest.cc' || echo '$(srcdir)/'`google/protobuf/stubs/once_unittest.cc

20219

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-once_unittest.Tpo $(DEPDIR)/protobuf_test-once_unittest.Po

20220

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-once_unittest.Tpo $(DEPDIR)/protobuf_test-once_unittest.Po

20221

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/once_unittest.cc' object='protobuf_test-once_unittest.o' libtool=no @AMDEPBACKSLASH@

20222

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20223

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-once_unittest.o `test -f 'google/protobuf/stubs/once_unittest.cc' || echo '$(srcdir)/'`google/protobuf/stubs/once_unittest.cc

20224

20225

protobuf_test-once_unittest.obj: google/protobuf/stubs/once_unittest.cc

20226

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-once_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-once_unittest.Tpo -c -o protobuf_test-once_unittest.obj `if test -f 'google/protobuf/stubs/once_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/stubs/once_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/stubs/once_unittest.cc'; fi`

20227

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-once_unittest.Tpo $(DEPDIR)/protobuf_test-once_unittest.Po

20228

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-once_unittest.Tpo $(DEPDIR)/protobuf_test-once_unittest.Po

20229

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/once_unittest.cc' object='protobuf_test-once_unittest.obj' libtool=no @AMDEPBACKSLASH@

20230

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20231

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-once_unittest.obj `if test -f 'google/protobuf/stubs/once_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/stubs/once_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/stubs/once_unittest.cc'; fi`

20232

20233

protobuf_test-strutil_unittest.o: google/protobuf/stubs/strutil_unittest.cc

20234

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-strutil_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-strutil_unittest.Tpo -c -o protobuf_test-strutil_unittest.o `test -f 'google/protobuf/stubs/strutil_unittest.cc' || echo '$(srcdir)/'`google/protobuf/stubs/strutil_unittest.cc

20235

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-strutil_unittest.Tpo $(DEPDIR)/protobuf_test-strutil_unittest.Po

20236

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-strutil_unittest.Tpo $(DEPDIR)/protobuf_test-strutil_unittest.Po

20237

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/strutil_unittest.cc' object='protobuf_test-strutil_unittest.o' libtool=no @AMDEPBACKSLASH@

20238

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20239

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-strutil_unittest.o `test -f 'google/protobuf/stubs/strutil_unittest.cc' || echo '$(srcdir)/'`google/protobuf/stubs/strutil_unittest.cc

20240

20241

protobuf_test-strutil_unittest.obj: google/protobuf/stubs/strutil_unittest.cc

20242

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-strutil_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-strutil_unittest.Tpo -c -o protobuf_test-strutil_unittest.obj `if test -f 'google/protobuf/stubs/strutil_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/stubs/strutil_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/stubs/strutil_unittest.cc'; fi`

20243

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-strutil_unittest.Tpo $(DEPDIR)/protobuf_test-strutil_unittest.Po

20244

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-strutil_unittest.Tpo $(DEPDIR)/protobuf_test-strutil_unittest.Po

20245

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/strutil_unittest.cc' object='protobuf_test-strutil_unittest.obj' libtool=no @AMDEPBACKSLASH@

20246

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20247

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-strutil_unittest.obj `if test -f 'google/protobuf/stubs/strutil_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/stubs/strutil_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/stubs/strutil_unittest.cc'; fi`

20248

20249

protobuf_test-structurally_valid_unittest.o: google/protobuf/stubs/structurally_valid_unittest.cc

20250

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-structurally_valid_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-structurally_valid_unittest.Tpo -c -o protobuf_test-structurally_valid_unittest.o `test -f 'google/protobuf/stubs/structurally_valid_unittest.cc' || echo '$(srcdir)/'`google/protobuf/stubs/structurally_valid_unittest.cc

20251

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-structurally_valid_unittest.Tpo $(DEPDIR)/protobuf_test-structurally_valid_unittest.Po

20252

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-structurally_valid_unittest.Tpo $(DEPDIR)/protobuf_test-structurally_valid_unittest.Po

20253

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/structurally_valid_unittest.cc' object='protobuf_test-structurally_valid_unittest.o' libtool=no @AMDEPBACKSLASH@

20254

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20255

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-structurally_valid_unittest.o `test -f 'google/protobuf/stubs/structurally_valid_unittest.cc' || echo '$(srcdir)/'`google/protobuf/stubs/structurally_valid_unittest.cc

20256

20257

protobuf_test-structurally_valid_unittest.obj: google/protobuf/stubs/structurally_valid_unittest.cc

20258

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-structurally_valid_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-structurally_valid_unittest.Tpo -c -o protobuf_test-structurally_valid_unittest.obj `if test -f 'google/protobuf/stubs/structurally_valid_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/stubs/structurally_valid_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/stubs/structurally_valid_unittest.cc'; fi`

20259

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-structurally_valid_unittest.Tpo $(DEPDIR)/protobuf_test-structurally_valid_unittest.Po

20260

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-structurally_valid_unittest.Tpo $(DEPDIR)/protobuf_test-structurally_valid_unittest.Po

20261

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/stubs/structurally_valid_unittest.cc' object='protobuf_test-structurally_valid_unittest.obj' libtool=no @AMDEPBACKSLASH@

20262

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20263

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-structurally_valid_unittest.obj `if test -f 'google/protobuf/stubs/structurally_valid_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/stubs/structurally_valid_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/stubs/structurally_valid_unittest.cc'; fi`

20264

20265

protobuf_test-descriptor_database_unittest.o: google/protobuf/descriptor_database_unittest.cc

20266

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-descriptor_database_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-descriptor_database_unittest.Tpo -c -o protobuf_test-descriptor_database_unittest.o `test -f 'google/protobuf/descriptor_database_unittest.cc' || echo '$(srcdir)/'`google/protobuf/descriptor_database_unittest.cc

20267

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-descriptor_database_unittest.Tpo $(DEPDIR)/protobuf_test-descriptor_database_unittest.Po

20268

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-descriptor_database_unittest.Tpo $(DEPDIR)/protobuf_test-descriptor_database_unittest.Po

20269

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/descriptor_database_unittest.cc' object='protobuf_test-descriptor_database_unittest.o' libtool=no @AMDEPBACKSLASH@

20270

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20271

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-descriptor_database_unittest.o `test -f 'google/protobuf/descriptor_database_unittest.cc' || echo '$(srcdir)/'`google/protobuf/descriptor_database_unittest.cc

20272

20273

protobuf_test-descriptor_database_unittest.obj: google/protobuf/descriptor_database_unittest.cc

20274

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-descriptor_database_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-descriptor_database_unittest.Tpo -c -o protobuf_test-descriptor_database_unittest.obj `if test -f 'google/protobuf/descriptor_database_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/descriptor_database_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/descriptor_database_unittest.cc'; fi`

20275

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-descriptor_database_unittest.Tpo $(DEPDIR)/protobuf_test-descriptor_database_unittest.Po

20276

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-descriptor_database_unittest.Tpo $(DEPDIR)/protobuf_test-descriptor_database_unittest.Po

20277

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/descriptor_database_unittest.cc' object='protobuf_test-descriptor_database_unittest.obj' libtool=no @AMDEPBACKSLASH@

20278

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20279

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-descriptor_database_unittest.obj `if test -f 'google/protobuf/descriptor_database_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/descriptor_database_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/descriptor_database_unittest.cc'; fi`

20280

20281

protobuf_test-descriptor_unittest.o: google/protobuf/descriptor_unittest.cc

20282

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-descriptor_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-descriptor_unittest.Tpo -c -o protobuf_test-descriptor_unittest.o `test -f 'google/protobuf/descriptor_unittest.cc' || echo '$(srcdir)/'`google/protobuf/descriptor_unittest.cc

20283

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-descriptor_unittest.Tpo $(DEPDIR)/protobuf_test-descriptor_unittest.Po

20284

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-descriptor_unittest.Tpo $(DEPDIR)/protobuf_test-descriptor_unittest.Po

20285

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/descriptor_unittest.cc' object='protobuf_test-descriptor_unittest.o' libtool=no @AMDEPBACKSLASH@

20286

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20287

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-descriptor_unittest.o `test -f 'google/protobuf/descriptor_unittest.cc' || echo '$(srcdir)/'`google/protobuf/descriptor_unittest.cc

20288

20289

protobuf_test-descriptor_unittest.obj: google/protobuf/descriptor_unittest.cc

20290

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-descriptor_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-descriptor_unittest.Tpo -c -o protobuf_test-descriptor_unittest.obj `if test -f 'google/protobuf/descriptor_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/descriptor_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/descriptor_unittest.cc'; fi`

20291

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-descriptor_unittest.Tpo $(DEPDIR)/protobuf_test-descriptor_unittest.Po

20292

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-descriptor_unittest.Tpo $(DEPDIR)/protobuf_test-descriptor_unittest.Po

20293

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/descriptor_unittest.cc' object='protobuf_test-descriptor_unittest.obj' libtool=no @AMDEPBACKSLASH@

20294

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20295

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-descriptor_unittest.obj `if test -f 'google/protobuf/descriptor_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/descriptor_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/descriptor_unittest.cc'; fi`

20296

20297

protobuf_test-dynamic_message_unittest.o: google/protobuf/dynamic_message_unittest.cc

20298

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-dynamic_message_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-dynamic_message_unittest.Tpo -c -o protobuf_test-dynamic_message_unittest.o `test -f 'google/protobuf/dynamic_message_unittest.cc' || echo '$(srcdir)/'`google/protobuf/dynamic_message_unittest.cc

20299

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-dynamic_message_unittest.Tpo $(DEPDIR)/protobuf_test-dynamic_message_unittest.Po

20300

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-dynamic_message_unittest.Tpo $(DEPDIR)/protobuf_test-dynamic_message_unittest.Po

20301

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/dynamic_message_unittest.cc' object='protobuf_test-dynamic_message_unittest.o' libtool=no @AMDEPBACKSLASH@

20302

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20303

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-dynamic_message_unittest.o `test -f 'google/protobuf/dynamic_message_unittest.cc' || echo '$(srcdir)/'`google/protobuf/dynamic_message_unittest.cc

20304

20305

protobuf_test-dynamic_message_unittest.obj: google/protobuf/dynamic_message_unittest.cc

20306

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-dynamic_message_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-dynamic_message_unittest.Tpo -c -o protobuf_test-dynamic_message_unittest.obj `if test -f 'google/protobuf/dynamic_message_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/dynamic_message_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/dynamic_message_unittest.cc'; fi`

20307

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-dynamic_message_unittest.Tpo $(DEPDIR)/protobuf_test-dynamic_message_unittest.Po

20308

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-dynamic_message_unittest.Tpo $(DEPDIR)/protobuf_test-dynamic_message_unittest.Po

20309

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/dynamic_message_unittest.cc' object='protobuf_test-dynamic_message_unittest.obj' libtool=no @AMDEPBACKSLASH@

20310

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20311

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-dynamic_message_unittest.obj `if test -f 'google/protobuf/dynamic_message_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/dynamic_message_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/dynamic_message_unittest.cc'; fi`

20312

20313

protobuf_test-extension_set_unittest.o: google/protobuf/extension_set_unittest.cc

20314

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-extension_set_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-extension_set_unittest.Tpo -c -o protobuf_test-extension_set_unittest.o `test -f 'google/protobuf/extension_set_unittest.cc' || echo '$(srcdir)/'`google/protobuf/extension_set_unittest.cc

20315

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-extension_set_unittest.Tpo $(DEPDIR)/protobuf_test-extension_set_unittest.Po

20316

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-extension_set_unittest.Tpo $(DEPDIR)/protobuf_test-extension_set_unittest.Po

20317

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/extension_set_unittest.cc' object='protobuf_test-extension_set_unittest.o' libtool=no @AMDEPBACKSLASH@

20318

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20319

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-extension_set_unittest.o `test -f 'google/protobuf/extension_set_unittest.cc' || echo '$(srcdir)/'`google/protobuf/extension_set_unittest.cc

20320

20321

protobuf_test-extension_set_unittest.obj: google/protobuf/extension_set_unittest.cc

20322

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-extension_set_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-extension_set_unittest.Tpo -c -o protobuf_test-extension_set_unittest.obj `if test -f 'google/protobuf/extension_set_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/extension_set_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/extension_set_unittest.cc'; fi`

20323

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-extension_set_unittest.Tpo $(DEPDIR)/protobuf_test-extension_set_unittest.Po

20324

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-extension_set_unittest.Tpo $(DEPDIR)/protobuf_test-extension_set_unittest.Po

20325

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/extension_set_unittest.cc' object='protobuf_test-extension_set_unittest.obj' libtool=no @AMDEPBACKSLASH@

20326

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20327

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-extension_set_unittest.obj `if test -f 'google/protobuf/extension_set_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/extension_set_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/extension_set_unittest.cc'; fi`

20328

20329

protobuf_test-generated_message_reflection_unittest.o: google/protobuf/generated_message_reflection_unittest.cc

20330

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-generated_message_reflection_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-generated_message_reflection_unittest.Tpo -c -o protobuf_test-generated_message_reflection_unittest.o `test -f 'google/protobuf/generated_message_reflection_unittest.cc' || echo '$(srcdir)/'`google/protobuf/generated_message_reflection_unittest.cc

20331

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-generated_message_reflection_unittest.Tpo $(DEPDIR)/protobuf_test-generated_message_reflection_unittest.Po

20332

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-generated_message_reflection_unittest.Tpo $(DEPDIR)/protobuf_test-generated_message_reflection_unittest.Po

20333

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/generated_message_reflection_unittest.cc' object='protobuf_test-generated_message_reflection_unittest.o' libtool=no @AMDEPBACKSLASH@

20334

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20335

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-generated_message_reflection_unittest.o `test -f 'google/protobuf/generated_message_reflection_unittest.cc' || echo '$(srcdir)/'`google/protobuf/generated_message_reflection_unittest.cc

20336

20337

protobuf_test-generated_message_reflection_unittest.obj: google/protobuf/generated_message_reflection_unittest.cc

20338

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-generated_message_reflection_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-generated_message_reflection_unittest.Tpo -c -o protobuf_test-generated_message_reflection_unittest.obj `if test -f 'google/protobuf/generated_message_reflection_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/generated_message_reflection_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/generated_message_reflection_unittest.cc'; fi`

20339

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-generated_message_reflection_unittest.Tpo $(DEPDIR)/protobuf_test-generated_message_reflection_unittest.Po

20340

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-generated_message_reflection_unittest.Tpo $(DEPDIR)/protobuf_test-generated_message_reflection_unittest.Po

20341

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/generated_message_reflection_unittest.cc' object='protobuf_test-generated_message_reflection_unittest.obj' libtool=no @AMDEPBACKSLASH@

20342

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20343

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-generated_message_reflection_unittest.obj `if test -f 'google/protobuf/generated_message_reflection_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/generated_message_reflection_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/generated_message_reflection_unittest.cc'; fi`

20344

20345

protobuf_test-message_unittest.o: google/protobuf/message_unittest.cc

20346

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-message_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-message_unittest.Tpo -c -o protobuf_test-message_unittest.o `test -f 'google/protobuf/message_unittest.cc' || echo '$(srcdir)/'`google/protobuf/message_unittest.cc

20347

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-message_unittest.Tpo $(DEPDIR)/protobuf_test-message_unittest.Po

20348

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-message_unittest.Tpo $(DEPDIR)/protobuf_test-message_unittest.Po

20349

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/message_unittest.cc' object='protobuf_test-message_unittest.o' libtool=no @AMDEPBACKSLASH@

20350

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20351

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-message_unittest.o `test -f 'google/protobuf/message_unittest.cc' || echo '$(srcdir)/'`google/protobuf/message_unittest.cc

20352

20353

protobuf_test-message_unittest.obj: google/protobuf/message_unittest.cc

20354

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-message_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-message_unittest.Tpo -c -o protobuf_test-message_unittest.obj `if test -f 'google/protobuf/message_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/message_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/message_unittest.cc'; fi`

20355

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-message_unittest.Tpo $(DEPDIR)/protobuf_test-message_unittest.Po

20356

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-message_unittest.Tpo $(DEPDIR)/protobuf_test-message_unittest.Po

20357

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/message_unittest.cc' object='protobuf_test-message_unittest.obj' libtool=no @AMDEPBACKSLASH@

20358

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20359

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-message_unittest.obj `if test -f 'google/protobuf/message_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/message_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/message_unittest.cc'; fi`

20360

20361

protobuf_test-reflection_ops_unittest.o: google/protobuf/reflection_ops_unittest.cc

20362

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-reflection_ops_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-reflection_ops_unittest.Tpo -c -o protobuf_test-reflection_ops_unittest.o `test -f 'google/protobuf/reflection_ops_unittest.cc' || echo '$(srcdir)/'`google/protobuf/reflection_ops_unittest.cc

20363

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-reflection_ops_unittest.Tpo $(DEPDIR)/protobuf_test-reflection_ops_unittest.Po

20364

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-reflection_ops_unittest.Tpo $(DEPDIR)/protobuf_test-reflection_ops_unittest.Po

20365

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/reflection_ops_unittest.cc' object='protobuf_test-reflection_ops_unittest.o' libtool=no @AMDEPBACKSLASH@

20366

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20367

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-reflection_ops_unittest.o `test -f 'google/protobuf/reflection_ops_unittest.cc' || echo '$(srcdir)/'`google/protobuf/reflection_ops_unittest.cc

20368

20369

protobuf_test-reflection_ops_unittest.obj: google/protobuf/reflection_ops_unittest.cc

20370

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-reflection_ops_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-reflection_ops_unittest.Tpo -c -o protobuf_test-reflection_ops_unittest.obj `if test -f 'google/protobuf/reflection_ops_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/reflection_ops_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/reflection_ops_unittest.cc'; fi`

20371

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-reflection_ops_unittest.Tpo $(DEPDIR)/protobuf_test-reflection_ops_unittest.Po

20372

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-reflection_ops_unittest.Tpo $(DEPDIR)/protobuf_test-reflection_ops_unittest.Po

20373

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/reflection_ops_unittest.cc' object='protobuf_test-reflection_ops_unittest.obj' libtool=no @AMDEPBACKSLASH@

20374

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20375

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-reflection_ops_unittest.obj `if test -f 'google/protobuf/reflection_ops_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/reflection_ops_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/reflection_ops_unittest.cc'; fi`

20376

20377

protobuf_test-repeated_field_unittest.o: google/protobuf/repeated_field_unittest.cc

20378

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-repeated_field_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-repeated_field_unittest.Tpo -c -o protobuf_test-repeated_field_unittest.o `test -f 'google/protobuf/repeated_field_unittest.cc' || echo '$(srcdir)/'`google/protobuf/repeated_field_unittest.cc

20379

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-repeated_field_unittest.Tpo $(DEPDIR)/protobuf_test-repeated_field_unittest.Po

20380

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-repeated_field_unittest.Tpo $(DEPDIR)/protobuf_test-repeated_field_unittest.Po

20381

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/repeated_field_unittest.cc' object='protobuf_test-repeated_field_unittest.o' libtool=no @AMDEPBACKSLASH@

20382

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20383

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-repeated_field_unittest.o `test -f 'google/protobuf/repeated_field_unittest.cc' || echo '$(srcdir)/'`google/protobuf/repeated_field_unittest.cc

20384

20385

protobuf_test-repeated_field_unittest.obj: google/protobuf/repeated_field_unittest.cc

20386

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-repeated_field_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-repeated_field_unittest.Tpo -c -o protobuf_test-repeated_field_unittest.obj `if test -f 'google/protobuf/repeated_field_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/repeated_field_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/repeated_field_unittest.cc'; fi`

20387

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-repeated_field_unittest.Tpo $(DEPDIR)/protobuf_test-repeated_field_unittest.Po

20388

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-repeated_field_unittest.Tpo $(DEPDIR)/protobuf_test-repeated_field_unittest.Po

20389

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/repeated_field_unittest.cc' object='protobuf_test-repeated_field_unittest.obj' libtool=no @AMDEPBACKSLASH@

20390

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20391

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-repeated_field_unittest.obj `if test -f 'google/protobuf/repeated_field_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/repeated_field_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/repeated_field_unittest.cc'; fi`

20392

20393

protobuf_test-text_format_unittest.o: google/protobuf/text_format_unittest.cc

20394

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-text_format_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-text_format_unittest.Tpo -c -o protobuf_test-text_format_unittest.o `test -f 'google/protobuf/text_format_unittest.cc' || echo '$(srcdir)/'`google/protobuf/text_format_unittest.cc

20395

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-text_format_unittest.Tpo $(DEPDIR)/protobuf_test-text_format_unittest.Po

20396

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-text_format_unittest.Tpo $(DEPDIR)/protobuf_test-text_format_unittest.Po

20397

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/text_format_unittest.cc' object='protobuf_test-text_format_unittest.o' libtool=no @AMDEPBACKSLASH@

20398

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20399

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-text_format_unittest.o `test -f 'google/protobuf/text_format_unittest.cc' || echo '$(srcdir)/'`google/protobuf/text_format_unittest.cc

20400

20401

protobuf_test-text_format_unittest.obj: google/protobuf/text_format_unittest.cc

20402

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-text_format_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-text_format_unittest.Tpo -c -o protobuf_test-text_format_unittest.obj `if test -f 'google/protobuf/text_format_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/text_format_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/text_format_unittest.cc'; fi`

20403

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-text_format_unittest.Tpo $(DEPDIR)/protobuf_test-text_format_unittest.Po

20404

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-text_format_unittest.Tpo $(DEPDIR)/protobuf_test-text_format_unittest.Po

20405

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/text_format_unittest.cc' object='protobuf_test-text_format_unittest.obj' libtool=no @AMDEPBACKSLASH@

20406

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20407

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-text_format_unittest.obj `if test -f 'google/protobuf/text_format_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/text_format_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/text_format_unittest.cc'; fi`

20408

20409

protobuf_test-unknown_field_set_unittest.o: google/protobuf/unknown_field_set_unittest.cc

20410

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unknown_field_set_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-unknown_field_set_unittest.Tpo -c -o protobuf_test-unknown_field_set_unittest.o `test -f 'google/protobuf/unknown_field_set_unittest.cc' || echo '$(srcdir)/'`google/protobuf/unknown_field_set_unittest.cc

20411

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unknown_field_set_unittest.Tpo $(DEPDIR)/protobuf_test-unknown_field_set_unittest.Po

20412

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unknown_field_set_unittest.Tpo $(DEPDIR)/protobuf_test-unknown_field_set_unittest.Po

20413

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unknown_field_set_unittest.cc' object='protobuf_test-unknown_field_set_unittest.o' libtool=no @AMDEPBACKSLASH@

20414

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20415

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unknown_field_set_unittest.o `test -f 'google/protobuf/unknown_field_set_unittest.cc' || echo '$(srcdir)/'`google/protobuf/unknown_field_set_unittest.cc

20416

20417

protobuf_test-unknown_field_set_unittest.obj: google/protobuf/unknown_field_set_unittest.cc

20418

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unknown_field_set_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unknown_field_set_unittest.Tpo -c -o protobuf_test-unknown_field_set_unittest.obj `if test -f 'google/protobuf/unknown_field_set_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/unknown_field_set_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unknown_field_set_unittest.cc'; fi`

20419

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unknown_field_set_unittest.Tpo $(DEPDIR)/protobuf_test-unknown_field_set_unittest.Po

20420

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unknown_field_set_unittest.Tpo $(DEPDIR)/protobuf_test-unknown_field_set_unittest.Po

20421

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unknown_field_set_unittest.cc' object='protobuf_test-unknown_field_set_unittest.obj' libtool=no @AMDEPBACKSLASH@

20422

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20423

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unknown_field_set_unittest.obj `if test -f 'google/protobuf/unknown_field_set_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/unknown_field_set_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unknown_field_set_unittest.cc'; fi`

20424

20425

protobuf_test-wire_format_unittest.o: google/protobuf/wire_format_unittest.cc

20426

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-wire_format_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-wire_format_unittest.Tpo -c -o protobuf_test-wire_format_unittest.o `test -f 'google/protobuf/wire_format_unittest.cc' || echo '$(srcdir)/'`google/protobuf/wire_format_unittest.cc

20427

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-wire_format_unittest.Tpo $(DEPDIR)/protobuf_test-wire_format_unittest.Po

20428

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-wire_format_unittest.Tpo $(DEPDIR)/protobuf_test-wire_format_unittest.Po

20429

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/wire_format_unittest.cc' object='protobuf_test-wire_format_unittest.o' libtool=no @AMDEPBACKSLASH@

20430

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20431

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-wire_format_unittest.o `test -f 'google/protobuf/wire_format_unittest.cc' || echo '$(srcdir)/'`google/protobuf/wire_format_unittest.cc

20432

20433

protobuf_test-wire_format_unittest.obj: google/protobuf/wire_format_unittest.cc

20434

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-wire_format_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-wire_format_unittest.Tpo -c -o protobuf_test-wire_format_unittest.obj `if test -f 'google/protobuf/wire_format_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/wire_format_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/wire_format_unittest.cc'; fi`

20435

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-wire_format_unittest.Tpo $(DEPDIR)/protobuf_test-wire_format_unittest.Po

20436

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-wire_format_unittest.Tpo $(DEPDIR)/protobuf_test-wire_format_unittest.Po

20437

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/wire_format_unittest.cc' object='protobuf_test-wire_format_unittest.obj' libtool=no @AMDEPBACKSLASH@

20438

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20439

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-wire_format_unittest.obj `if test -f 'google/protobuf/wire_format_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/wire_format_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/wire_format_unittest.cc'; fi`

20440

20441

protobuf_test-coded_stream_unittest.o: google/protobuf/io/coded_stream_unittest.cc

20442

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-coded_stream_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-coded_stream_unittest.Tpo -c -o protobuf_test-coded_stream_unittest.o `test -f 'google/protobuf/io/coded_stream_unittest.cc' || echo '$(srcdir)/'`google/protobuf/io/coded_stream_unittest.cc

20443

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-coded_stream_unittest.Tpo $(DEPDIR)/protobuf_test-coded_stream_unittest.Po

20444

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-coded_stream_unittest.Tpo $(DEPDIR)/protobuf_test-coded_stream_unittest.Po

20445

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/coded_stream_unittest.cc' object='protobuf_test-coded_stream_unittest.o' libtool=no @AMDEPBACKSLASH@

20446

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20447

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-coded_stream_unittest.o `test -f 'google/protobuf/io/coded_stream_unittest.cc' || echo '$(srcdir)/'`google/protobuf/io/coded_stream_unittest.cc

20448

20449

protobuf_test-coded_stream_unittest.obj: google/protobuf/io/coded_stream_unittest.cc

20450

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-coded_stream_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-coded_stream_unittest.Tpo -c -o protobuf_test-coded_stream_unittest.obj `if test -f 'google/protobuf/io/coded_stream_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/io/coded_stream_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/io/coded_stream_unittest.cc'; fi`

20451

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-coded_stream_unittest.Tpo $(DEPDIR)/protobuf_test-coded_stream_unittest.Po

20452

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-coded_stream_unittest.Tpo $(DEPDIR)/protobuf_test-coded_stream_unittest.Po

20453

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/coded_stream_unittest.cc' object='protobuf_test-coded_stream_unittest.obj' libtool=no @AMDEPBACKSLASH@

20454

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20455

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-coded_stream_unittest.obj `if test -f 'google/protobuf/io/coded_stream_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/io/coded_stream_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/io/coded_stream_unittest.cc'; fi`

20456

20457

protobuf_test-printer_unittest.o: google/protobuf/io/printer_unittest.cc

20458

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-printer_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-printer_unittest.Tpo -c -o protobuf_test-printer_unittest.o `test -f 'google/protobuf/io/printer_unittest.cc' || echo '$(srcdir)/'`google/protobuf/io/printer_unittest.cc

20459

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-printer_unittest.Tpo $(DEPDIR)/protobuf_test-printer_unittest.Po

20460

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-printer_unittest.Tpo $(DEPDIR)/protobuf_test-printer_unittest.Po

20461

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/printer_unittest.cc' object='protobuf_test-printer_unittest.o' libtool=no @AMDEPBACKSLASH@

20462

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20463

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-printer_unittest.o `test -f 'google/protobuf/io/printer_unittest.cc' || echo '$(srcdir)/'`google/protobuf/io/printer_unittest.cc

20464

20465

protobuf_test-printer_unittest.obj: google/protobuf/io/printer_unittest.cc

20466

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-printer_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-printer_unittest.Tpo -c -o protobuf_test-printer_unittest.obj `if test -f 'google/protobuf/io/printer_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/io/printer_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/io/printer_unittest.cc'; fi`

20467

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-printer_unittest.Tpo $(DEPDIR)/protobuf_test-printer_unittest.Po

20468

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-printer_unittest.Tpo $(DEPDIR)/protobuf_test-printer_unittest.Po

20469

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/printer_unittest.cc' object='protobuf_test-printer_unittest.obj' libtool=no @AMDEPBACKSLASH@

20470

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20471

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-printer_unittest.obj `if test -f 'google/protobuf/io/printer_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/io/printer_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/io/printer_unittest.cc'; fi`

20472

20473

protobuf_test-tokenizer_unittest.o: google/protobuf/io/tokenizer_unittest.cc

20474

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-tokenizer_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-tokenizer_unittest.Tpo -c -o protobuf_test-tokenizer_unittest.o `test -f 'google/protobuf/io/tokenizer_unittest.cc' || echo '$(srcdir)/'`google/protobuf/io/tokenizer_unittest.cc

20475

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-tokenizer_unittest.Tpo $(DEPDIR)/protobuf_test-tokenizer_unittest.Po

20476

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-tokenizer_unittest.Tpo $(DEPDIR)/protobuf_test-tokenizer_unittest.Po

20477

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/tokenizer_unittest.cc' object='protobuf_test-tokenizer_unittest.o' libtool=no @AMDEPBACKSLASH@

20478

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20479

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-tokenizer_unittest.o `test -f 'google/protobuf/io/tokenizer_unittest.cc' || echo '$(srcdir)/'`google/protobuf/io/tokenizer_unittest.cc

20480

20481

protobuf_test-tokenizer_unittest.obj: google/protobuf/io/tokenizer_unittest.cc

20482

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-tokenizer_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-tokenizer_unittest.Tpo -c -o protobuf_test-tokenizer_unittest.obj `if test -f 'google/protobuf/io/tokenizer_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/io/tokenizer_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/io/tokenizer_unittest.cc'; fi`

20483

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-tokenizer_unittest.Tpo $(DEPDIR)/protobuf_test-tokenizer_unittest.Po

20484

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-tokenizer_unittest.Tpo $(DEPDIR)/protobuf_test-tokenizer_unittest.Po

20485

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/tokenizer_unittest.cc' object='protobuf_test-tokenizer_unittest.obj' libtool=no @AMDEPBACKSLASH@

20486

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20487

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-tokenizer_unittest.obj `if test -f 'google/protobuf/io/tokenizer_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/io/tokenizer_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/io/tokenizer_unittest.cc'; fi`

20488

20489

protobuf_test-zero_copy_stream_unittest.o: google/protobuf/io/zero_copy_stream_unittest.cc

20490

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-zero_copy_stream_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-zero_copy_stream_unittest.Tpo -c -o protobuf_test-zero_copy_stream_unittest.o `test -f 'google/protobuf/io/zero_copy_stream_unittest.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream_unittest.cc

20491

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-zero_copy_stream_unittest.Tpo $(DEPDIR)/protobuf_test-zero_copy_stream_unittest.Po

20492

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-zero_copy_stream_unittest.Tpo $(DEPDIR)/protobuf_test-zero_copy_stream_unittest.Po

20493

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/zero_copy_stream_unittest.cc' object='protobuf_test-zero_copy_stream_unittest.o' libtool=no @AMDEPBACKSLASH@

20494

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20495

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-zero_copy_stream_unittest.o `test -f 'google/protobuf/io/zero_copy_stream_unittest.cc' || echo '$(srcdir)/'`google/protobuf/io/zero_copy_stream_unittest.cc

20496

20497

protobuf_test-zero_copy_stream_unittest.obj: google/protobuf/io/zero_copy_stream_unittest.cc

20498

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-zero_copy_stream_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-zero_copy_stream_unittest.Tpo -c -o protobuf_test-zero_copy_stream_unittest.obj `if test -f 'google/protobuf/io/zero_copy_stream_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/io/zero_copy_stream_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/io/zero_copy_stream_unittest.cc'; fi`

20499

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-zero_copy_stream_unittest.Tpo $(DEPDIR)/protobuf_test-zero_copy_stream_unittest.Po

20500

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-zero_copy_stream_unittest.Tpo $(DEPDIR)/protobuf_test-zero_copy_stream_unittest.Po

20501

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/io/zero_copy_stream_unittest.cc' object='protobuf_test-zero_copy_stream_unittest.obj' libtool=no @AMDEPBACKSLASH@

20502

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20503

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-zero_copy_stream_unittest.obj `if test -f 'google/protobuf/io/zero_copy_stream_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/io/zero_copy_stream_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/io/zero_copy_stream_unittest.cc'; fi`

20504

20505

protobuf_test-command_line_interface_unittest.o: google/protobuf/compiler/command_line_interface_unittest.cc

20506

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-command_line_interface_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-command_line_interface_unittest.Tpo -c -o protobuf_test-command_line_interface_unittest.o `test -f 'google/protobuf/compiler/command_line_interface_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/command_line_interface_unittest.cc

20507

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-command_line_interface_unittest.Tpo $(DEPDIR)/protobuf_test-command_line_interface_unittest.Po

20508

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-command_line_interface_unittest.Tpo $(DEPDIR)/protobuf_test-command_line_interface_unittest.Po

20509

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/command_line_interface_unittest.cc' object='protobuf_test-command_line_interface_unittest.o' libtool=no @AMDEPBACKSLASH@

20510

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20511

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-command_line_interface_unittest.o `test -f 'google/protobuf/compiler/command_line_interface_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/command_line_interface_unittest.cc

20512

20513

protobuf_test-command_line_interface_unittest.obj: google/protobuf/compiler/command_line_interface_unittest.cc

20514

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-command_line_interface_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-command_line_interface_unittest.Tpo -c -o protobuf_test-command_line_interface_unittest.obj `if test -f 'google/protobuf/compiler/command_line_interface_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/command_line_interface_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/command_line_interface_unittest.cc'; fi`

20515

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-command_line_interface_unittest.Tpo $(DEPDIR)/protobuf_test-command_line_interface_unittest.Po

20516

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-command_line_interface_unittest.Tpo $(DEPDIR)/protobuf_test-command_line_interface_unittest.Po

20517

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/command_line_interface_unittest.cc' object='protobuf_test-command_line_interface_unittest.obj' libtool=no @AMDEPBACKSLASH@

20518

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20519

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-command_line_interface_unittest.obj `if test -f 'google/protobuf/compiler/command_line_interface_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/command_line_interface_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/command_line_interface_unittest.cc'; fi`

20520

20521

protobuf_test-importer_unittest.o: google/protobuf/compiler/importer_unittest.cc

20522

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-importer_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-importer_unittest.Tpo -c -o protobuf_test-importer_unittest.o `test -f 'google/protobuf/compiler/importer_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/importer_unittest.cc

20523

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-importer_unittest.Tpo $(DEPDIR)/protobuf_test-importer_unittest.Po

20524

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-importer_unittest.Tpo $(DEPDIR)/protobuf_test-importer_unittest.Po

20525

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/importer_unittest.cc' object='protobuf_test-importer_unittest.o' libtool=no @AMDEPBACKSLASH@

20526

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20527

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-importer_unittest.o `test -f 'google/protobuf/compiler/importer_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/importer_unittest.cc

20528

20529

protobuf_test-importer_unittest.obj: google/protobuf/compiler/importer_unittest.cc

20530

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-importer_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-importer_unittest.Tpo -c -o protobuf_test-importer_unittest.obj `if test -f 'google/protobuf/compiler/importer_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/importer_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/importer_unittest.cc'; fi`

20531

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-importer_unittest.Tpo $(DEPDIR)/protobuf_test-importer_unittest.Po

20532

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-importer_unittest.Tpo $(DEPDIR)/protobuf_test-importer_unittest.Po

20533

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/importer_unittest.cc' object='protobuf_test-importer_unittest.obj' libtool=no @AMDEPBACKSLASH@

20534

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20535

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-importer_unittest.obj `if test -f 'google/protobuf/compiler/importer_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/importer_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/importer_unittest.cc'; fi`

20536

20537

protobuf_test-mock_code_generator.o: google/protobuf/compiler/mock_code_generator.cc

20538

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-mock_code_generator.o -MD -MP -MF $(DEPDIR)/protobuf_test-mock_code_generator.Tpo -c -o protobuf_test-mock_code_generator.o `test -f 'google/protobuf/compiler/mock_code_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/mock_code_generator.cc

20539

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-mock_code_generator.Tpo $(DEPDIR)/protobuf_test-mock_code_generator.Po

20540

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-mock_code_generator.Tpo $(DEPDIR)/protobuf_test-mock_code_generator.Po

20541

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/mock_code_generator.cc' object='protobuf_test-mock_code_generator.o' libtool=no @AMDEPBACKSLASH@

20542

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20543

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-mock_code_generator.o `test -f 'google/protobuf/compiler/mock_code_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/mock_code_generator.cc

20544

20545

protobuf_test-mock_code_generator.obj: google/protobuf/compiler/mock_code_generator.cc

20546

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-mock_code_generator.obj -MD -MP -MF $(DEPDIR)/protobuf_test-mock_code_generator.Tpo -c -o protobuf_test-mock_code_generator.obj `if test -f 'google/protobuf/compiler/mock_code_generator.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/mock_code_generator.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/mock_code_generator.cc'; fi`

20547

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-mock_code_generator.Tpo $(DEPDIR)/protobuf_test-mock_code_generator.Po

20548

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-mock_code_generator.Tpo $(DEPDIR)/protobuf_test-mock_code_generator.Po

20549

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/mock_code_generator.cc' object='protobuf_test-mock_code_generator.obj' libtool=no @AMDEPBACKSLASH@

20550

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20551

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-mock_code_generator.obj `if test -f 'google/protobuf/compiler/mock_code_generator.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/mock_code_generator.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/mock_code_generator.cc'; fi`

20552

20553

protobuf_test-parser_unittest.o: google/protobuf/compiler/parser_unittest.cc

20554

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-parser_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-parser_unittest.Tpo -c -o protobuf_test-parser_unittest.o `test -f 'google/protobuf/compiler/parser_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/parser_unittest.cc

20555

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-parser_unittest.Tpo $(DEPDIR)/protobuf_test-parser_unittest.Po

20556

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-parser_unittest.Tpo $(DEPDIR)/protobuf_test-parser_unittest.Po

20557

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/parser_unittest.cc' object='protobuf_test-parser_unittest.o' libtool=no @AMDEPBACKSLASH@

20558

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20559

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-parser_unittest.o `test -f 'google/protobuf/compiler/parser_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/parser_unittest.cc

20560

20561

protobuf_test-parser_unittest.obj: google/protobuf/compiler/parser_unittest.cc

20562

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-parser_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-parser_unittest.Tpo -c -o protobuf_test-parser_unittest.obj `if test -f 'google/protobuf/compiler/parser_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/parser_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/parser_unittest.cc'; fi`

20563

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-parser_unittest.Tpo $(DEPDIR)/protobuf_test-parser_unittest.Po

20564

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-parser_unittest.Tpo $(DEPDIR)/protobuf_test-parser_unittest.Po

20565

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/parser_unittest.cc' object='protobuf_test-parser_unittest.obj' libtool=no @AMDEPBACKSLASH@

20566

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20567

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-parser_unittest.obj `if test -f 'google/protobuf/compiler/parser_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/parser_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/parser_unittest.cc'; fi`

20568

20569

protobuf_test-cpp_bootstrap_unittest.o: google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

20570

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-cpp_bootstrap_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-cpp_bootstrap_unittest.Tpo -c -o protobuf_test-cpp_bootstrap_unittest.o `test -f 'google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

20571

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-cpp_bootstrap_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_bootstrap_unittest.Po

20572

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-cpp_bootstrap_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_bootstrap_unittest.Po

20573

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc' object='protobuf_test-cpp_bootstrap_unittest.o' libtool=no @AMDEPBACKSLASH@

20574

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20575

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-cpp_bootstrap_unittest.o `test -f 'google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

20576

20577

protobuf_test-cpp_bootstrap_unittest.obj: google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

20578

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-cpp_bootstrap_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-cpp_bootstrap_unittest.Tpo -c -o protobuf_test-cpp_bootstrap_unittest.obj `if test -f 'google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc'; fi`

20579

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-cpp_bootstrap_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_bootstrap_unittest.Po

20580

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-cpp_bootstrap_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_bootstrap_unittest.Po

20581

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc' object='protobuf_test-cpp_bootstrap_unittest.obj' libtool=no @AMDEPBACKSLASH@

20582

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20583

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-cpp_bootstrap_unittest.obj `if test -f 'google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc'; fi`

20584

20585

protobuf_test-cpp_unittest.o: google/protobuf/compiler/cpp/cpp_unittest.cc

20586

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-cpp_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-cpp_unittest.Tpo -c -o protobuf_test-cpp_unittest.o `test -f 'google/protobuf/compiler/cpp/cpp_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_unittest.cc

20587

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-cpp_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_unittest.Po

20588

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-cpp_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_unittest.Po

20589

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_unittest.cc' object='protobuf_test-cpp_unittest.o' libtool=no @AMDEPBACKSLASH@

20590

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20591

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-cpp_unittest.o `test -f 'google/protobuf/compiler/cpp/cpp_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_unittest.cc

20592

20593

protobuf_test-cpp_unittest.obj: google/protobuf/compiler/cpp/cpp_unittest.cc

20594

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-cpp_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-cpp_unittest.Tpo -c -o protobuf_test-cpp_unittest.obj `if test -f 'google/protobuf/compiler/cpp/cpp_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_unittest.cc'; fi`

20595

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-cpp_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_unittest.Po

20596

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-cpp_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_unittest.Po

20597

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_unittest.cc' object='protobuf_test-cpp_unittest.obj' libtool=no @AMDEPBACKSLASH@

20598

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20599

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-cpp_unittest.obj `if test -f 'google/protobuf/compiler/cpp/cpp_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_unittest.cc'; fi`

20600

20601

protobuf_test-cpp_plugin_unittest.o: google/protobuf/compiler/cpp/cpp_plugin_unittest.cc

20602

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-cpp_plugin_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-cpp_plugin_unittest.Tpo -c -o protobuf_test-cpp_plugin_unittest.o `test -f 'google/protobuf/compiler/cpp/cpp_plugin_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_plugin_unittest.cc

20603

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-cpp_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_plugin_unittest.Po

20604

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-cpp_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_plugin_unittest.Po

20605

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_plugin_unittest.cc' object='protobuf_test-cpp_plugin_unittest.o' libtool=no @AMDEPBACKSLASH@

20606

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20607

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-cpp_plugin_unittest.o `test -f 'google/protobuf/compiler/cpp/cpp_plugin_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_plugin_unittest.cc

20608

20609

protobuf_test-cpp_plugin_unittest.obj: google/protobuf/compiler/cpp/cpp_plugin_unittest.cc

20610

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-cpp_plugin_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-cpp_plugin_unittest.Tpo -c -o protobuf_test-cpp_plugin_unittest.obj `if test -f 'google/protobuf/compiler/cpp/cpp_plugin_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_plugin_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc'; fi`

20611

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-cpp_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_plugin_unittest.Po

20612

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-cpp_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-cpp_plugin_unittest.Po

20613

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_plugin_unittest.cc' object='protobuf_test-cpp_plugin_unittest.obj' libtool=no @AMDEPBACKSLASH@

20614

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20615

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-cpp_plugin_unittest.obj `if test -f 'google/protobuf/compiler/cpp/cpp_plugin_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_plugin_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_plugin_unittest.cc'; fi`

20616

20617

protobuf_test-java_plugin_unittest.o: google/protobuf/compiler/java/java_plugin_unittest.cc

20618

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-java_plugin_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-java_plugin_unittest.Tpo -c -o protobuf_test-java_plugin_unittest.o `test -f 'google/protobuf/compiler/java/java_plugin_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_plugin_unittest.cc

20619

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-java_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-java_plugin_unittest.Po

20620

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-java_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-java_plugin_unittest.Po

20621

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_plugin_unittest.cc' object='protobuf_test-java_plugin_unittest.o' libtool=no @AMDEPBACKSLASH@

20622

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20623

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-java_plugin_unittest.o `test -f 'google/protobuf/compiler/java/java_plugin_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/java/java_plugin_unittest.cc

20624

20625

protobuf_test-java_plugin_unittest.obj: google/protobuf/compiler/java/java_plugin_unittest.cc

20626

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-java_plugin_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-java_plugin_unittest.Tpo -c -o protobuf_test-java_plugin_unittest.obj `if test -f 'google/protobuf/compiler/java/java_plugin_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/java/java_plugin_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/java/java_plugin_unittest.cc'; fi`

20627

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-java_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-java_plugin_unittest.Po

20628

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-java_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-java_plugin_unittest.Po

20629

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/java/java_plugin_unittest.cc' object='protobuf_test-java_plugin_unittest.obj' libtool=no @AMDEPBACKSLASH@

20630

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20631

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-java_plugin_unittest.obj `if test -f 'google/protobuf/compiler/java/java_plugin_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/java/java_plugin_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/java/java_plugin_unittest.cc'; fi`

20632

20633

protobuf_test-python_plugin_unittest.o: google/protobuf/compiler/python/python_plugin_unittest.cc

20634

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-python_plugin_unittest.o -MD -MP -MF $(DEPDIR)/protobuf_test-python_plugin_unittest.Tpo -c -o protobuf_test-python_plugin_unittest.o `test -f 'google/protobuf/compiler/python/python_plugin_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/python/python_plugin_unittest.cc

20635

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-python_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-python_plugin_unittest.Po

20636

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-python_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-python_plugin_unittest.Po

20637

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/python/python_plugin_unittest.cc' object='protobuf_test-python_plugin_unittest.o' libtool=no @AMDEPBACKSLASH@

20638

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20639

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-python_plugin_unittest.o `test -f 'google/protobuf/compiler/python/python_plugin_unittest.cc' || echo '$(srcdir)/'`google/protobuf/compiler/python/python_plugin_unittest.cc

20640

20641

protobuf_test-python_plugin_unittest.obj: google/protobuf/compiler/python/python_plugin_unittest.cc

20642

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-python_plugin_unittest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-python_plugin_unittest.Tpo -c -o protobuf_test-python_plugin_unittest.obj `if test -f 'google/protobuf/compiler/python/python_plugin_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/python/python_plugin_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/python/python_plugin_unittest.cc'; fi`

20643

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-python_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-python_plugin_unittest.Po

20644

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-python_plugin_unittest.Tpo $(DEPDIR)/protobuf_test-python_plugin_unittest.Po

20645

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/python/python_plugin_unittest.cc' object='protobuf_test-python_plugin_unittest.obj' libtool=no @AMDEPBACKSLASH@

20646

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20647

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-python_plugin_unittest.obj `if test -f 'google/protobuf/compiler/python/python_plugin_unittest.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/python/python_plugin_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/python/python_plugin_unittest.cc'; fi`

20648

20649

protobuf_test-test_util.o: google/protobuf/test_util.cc

20650

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-test_util.o -MD -MP -MF $(DEPDIR)/protobuf_test-test_util.Tpo -c -o protobuf_test-test_util.o `test -f 'google/protobuf/test_util.cc' || echo '$(srcdir)/'`google/protobuf/test_util.cc

20651

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-test_util.Tpo $(DEPDIR)/protobuf_test-test_util.Po

20652

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-test_util.Tpo $(DEPDIR)/protobuf_test-test_util.Po

20653

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/test_util.cc' object='protobuf_test-test_util.o' libtool=no @AMDEPBACKSLASH@

20654

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20655

20656

20657

protobuf_test-test_util.obj: google/protobuf/test_util.cc

20658

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-test_util.obj -MD -MP -MF $(DEPDIR)/protobuf_test-test_util.Tpo -c -o protobuf_test-test_util.obj `if test -f 'google/protobuf/test_util.cc'; then $(CYGPATH_W) 'google/protobuf/test_util.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/test_util.cc'; fi`

20659

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-test_util.Tpo $(DEPDIR)/protobuf_test-test_util.Po

20660

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-test_util.Tpo $(DEPDIR)/protobuf_test-test_util.Po

20661

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/test_util.cc' object='protobuf_test-test_util.obj' libtool=no @AMDEPBACKSLASH@

20662

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20663

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-test_util.obj `if test -f 'google/protobuf/test_util.cc'; then $(CYGPATH_W) 'google/protobuf/test_util.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/test_util.cc'; fi`

20664

20665

protobuf_test-googletest.o: google/protobuf/testing/googletest.cc

20666

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-googletest.o -MD -MP -MF $(DEPDIR)/protobuf_test-googletest.Tpo -c -o protobuf_test-googletest.o `test -f 'google/protobuf/testing/googletest.cc' || echo '$(srcdir)/'`google/protobuf/testing/googletest.cc

20667

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-googletest.Tpo $(DEPDIR)/protobuf_test-googletest.Po

20668

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-googletest.Tpo $(DEPDIR)/protobuf_test-googletest.Po

20669

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/googletest.cc' object='protobuf_test-googletest.o' libtool=no @AMDEPBACKSLASH@

20670

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20671

20672

20673

protobuf_test-googletest.obj: google/protobuf/testing/googletest.cc

20674

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-googletest.obj -MD -MP -MF $(DEPDIR)/protobuf_test-googletest.Tpo -c -o protobuf_test-googletest.obj `if test -f 'google/protobuf/testing/googletest.cc'; then $(CYGPATH_W) 'google/protobuf/testing/googletest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/googletest.cc'; fi`

20675

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-googletest.Tpo $(DEPDIR)/protobuf_test-googletest.Po

20676

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-googletest.Tpo $(DEPDIR)/protobuf_test-googletest.Po

20677

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/googletest.cc' object='protobuf_test-googletest.obj' libtool=no @AMDEPBACKSLASH@

20678

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20679

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-googletest.obj `if test -f 'google/protobuf/testing/googletest.cc'; then $(CYGPATH_W) 'google/protobuf/testing/googletest.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/googletest.cc'; fi`

20680

20681

protobuf_test-file.o: google/protobuf/testing/file.cc

20682

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-file.o -MD -MP -MF $(DEPDIR)/protobuf_test-file.Tpo -c -o protobuf_test-file.o `test -f 'google/protobuf/testing/file.cc' || echo '$(srcdir)/'`google/protobuf/testing/file.cc

20683

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-file.Tpo $(DEPDIR)/protobuf_test-file.Po

20684

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-file.Tpo $(DEPDIR)/protobuf_test-file.Po

20685

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/file.cc' object='protobuf_test-file.o' libtool=no @AMDEPBACKSLASH@

20686

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20687

20688

20689

protobuf_test-file.obj: google/protobuf/testing/file.cc

20690

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-file.obj -MD -MP -MF $(DEPDIR)/protobuf_test-file.Tpo -c -o protobuf_test-file.obj `if test -f 'google/protobuf/testing/file.cc'; then $(CYGPATH_W) 'google/protobuf/testing/file.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/file.cc'; fi`

20691

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-file.Tpo $(DEPDIR)/protobuf_test-file.Po

20692

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-file.Tpo $(DEPDIR)/protobuf_test-file.Po

20693

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/file.cc' object='protobuf_test-file.obj' libtool=no @AMDEPBACKSLASH@

20694

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20695

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-file.obj `if test -f 'google/protobuf/testing/file.cc'; then $(CYGPATH_W) 'google/protobuf/testing/file.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/file.cc'; fi`

20696

20697

protobuf_test-unittest_lite.pb.o: google/protobuf/unittest_lite.pb.cc

20698

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_lite.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_lite.pb.Tpo -c -o protobuf_test-unittest_lite.pb.o `test -f 'google/protobuf/unittest_lite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_lite.pb.cc

20699

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_lite.pb.Po

20700

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_lite.pb.Po

20701

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_lite.pb.cc' object='protobuf_test-unittest_lite.pb.o' libtool=no @AMDEPBACKSLASH@

20702

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20703

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_lite.pb.o `test -f 'google/protobuf/unittest_lite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_lite.pb.cc

20704

20705

protobuf_test-unittest_lite.pb.obj: google/protobuf/unittest_lite.pb.cc

20706

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_lite.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_lite.pb.Tpo -c -o protobuf_test-unittest_lite.pb.obj `if test -f 'google/protobuf/unittest_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_lite.pb.cc'; fi`

20707

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_lite.pb.Po

20708

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_lite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_lite.pb.Po

20709

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_lite.pb.cc' object='protobuf_test-unittest_lite.pb.obj' libtool=no @AMDEPBACKSLASH@

20710

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20711

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_lite.pb.obj `if test -f 'google/protobuf/unittest_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_lite.pb.cc'; fi`

20712

20713

protobuf_test-unittest_import_lite.pb.o: google/protobuf/unittest_import_lite.pb.cc

20714

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_import_lite.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_import_lite.pb.Tpo -c -o protobuf_test-unittest_import_lite.pb.o `test -f 'google/protobuf/unittest_import_lite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_import_lite.pb.cc

20715

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_import_lite.pb.Po

20716

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_import_lite.pb.Po

20717

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_import_lite.pb.cc' object='protobuf_test-unittest_import_lite.pb.o' libtool=no @AMDEPBACKSLASH@

20718

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20719

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_import_lite.pb.o `test -f 'google/protobuf/unittest_import_lite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_import_lite.pb.cc

20720

20721

protobuf_test-unittest_import_lite.pb.obj: google/protobuf/unittest_import_lite.pb.cc

20722

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_import_lite.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_import_lite.pb.Tpo -c -o protobuf_test-unittest_import_lite.pb.obj `if test -f 'google/protobuf/unittest_import_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_import_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_import_lite.pb.cc'; fi`

20723

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_import_lite.pb.Po

20724

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_import_lite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_import_lite.pb.Po

20725

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_import_lite.pb.cc' object='protobuf_test-unittest_import_lite.pb.obj' libtool=no @AMDEPBACKSLASH@

20726

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20727

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_import_lite.pb.obj `if test -f 'google/protobuf/unittest_import_lite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_import_lite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_import_lite.pb.cc'; fi`

20728

20729

protobuf_test-unittest.pb.o: google/protobuf/unittest.pb.cc

20730

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-unittest.pb.Tpo -c -o protobuf_test-unittest.pb.o `test -f 'google/protobuf/unittest.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest.pb.cc

20731

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest.pb.Tpo $(DEPDIR)/protobuf_test-unittest.pb.Po

20732

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest.pb.Tpo $(DEPDIR)/protobuf_test-unittest.pb.Po

20733

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest.pb.cc' object='protobuf_test-unittest.pb.o' libtool=no @AMDEPBACKSLASH@

20734

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20735

20736

20737

protobuf_test-unittest.pb.obj: google/protobuf/unittest.pb.cc

20738

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unittest.pb.Tpo -c -o protobuf_test-unittest.pb.obj `if test -f 'google/protobuf/unittest.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest.pb.cc'; fi`

20739

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest.pb.Tpo $(DEPDIR)/protobuf_test-unittest.pb.Po

20740

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest.pb.Tpo $(DEPDIR)/protobuf_test-unittest.pb.Po

20741

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest.pb.cc' object='protobuf_test-unittest.pb.obj' libtool=no @AMDEPBACKSLASH@

20742

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20743

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest.pb.obj `if test -f 'google/protobuf/unittest.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest.pb.cc'; fi`

20744

20745

protobuf_test-unittest_empty.pb.o: google/protobuf/unittest_empty.pb.cc

20746

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_empty.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_empty.pb.Tpo -c -o protobuf_test-unittest_empty.pb.o `test -f 'google/protobuf/unittest_empty.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_empty.pb.cc

20747

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_empty.pb.Tpo $(DEPDIR)/protobuf_test-unittest_empty.pb.Po

20748

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_empty.pb.Tpo $(DEPDIR)/protobuf_test-unittest_empty.pb.Po

20749

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_empty.pb.cc' object='protobuf_test-unittest_empty.pb.o' libtool=no @AMDEPBACKSLASH@

20750

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20751

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_empty.pb.o `test -f 'google/protobuf/unittest_empty.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_empty.pb.cc

20752

20753

protobuf_test-unittest_empty.pb.obj: google/protobuf/unittest_empty.pb.cc

20754

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_empty.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_empty.pb.Tpo -c -o protobuf_test-unittest_empty.pb.obj `if test -f 'google/protobuf/unittest_empty.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_empty.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_empty.pb.cc'; fi`

20755

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_empty.pb.Tpo $(DEPDIR)/protobuf_test-unittest_empty.pb.Po

20756

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_empty.pb.Tpo $(DEPDIR)/protobuf_test-unittest_empty.pb.Po

20757

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_empty.pb.cc' object='protobuf_test-unittest_empty.pb.obj' libtool=no @AMDEPBACKSLASH@

20758

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20759

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_empty.pb.obj `if test -f 'google/protobuf/unittest_empty.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_empty.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_empty.pb.cc'; fi`

20760

20761

protobuf_test-unittest_import.pb.o: google/protobuf/unittest_import.pb.cc

20762

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_import.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_import.pb.Tpo -c -o protobuf_test-unittest_import.pb.o `test -f 'google/protobuf/unittest_import.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_import.pb.cc

20763

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_import.pb.Tpo $(DEPDIR)/protobuf_test-unittest_import.pb.Po

20764

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_import.pb.Tpo $(DEPDIR)/protobuf_test-unittest_import.pb.Po

20765

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_import.pb.cc' object='protobuf_test-unittest_import.pb.o' libtool=no @AMDEPBACKSLASH@

20766

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20767

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_import.pb.o `test -f 'google/protobuf/unittest_import.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_import.pb.cc

20768

20769

protobuf_test-unittest_import.pb.obj: google/protobuf/unittest_import.pb.cc

20770

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_import.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_import.pb.Tpo -c -o protobuf_test-unittest_import.pb.obj `if test -f 'google/protobuf/unittest_import.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_import.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_import.pb.cc'; fi`

20771

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_import.pb.Tpo $(DEPDIR)/protobuf_test-unittest_import.pb.Po

20772

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_import.pb.Tpo $(DEPDIR)/protobuf_test-unittest_import.pb.Po

20773

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_import.pb.cc' object='protobuf_test-unittest_import.pb.obj' libtool=no @AMDEPBACKSLASH@

20774

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20775

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_import.pb.obj `if test -f 'google/protobuf/unittest_import.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_import.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_import.pb.cc'; fi`

20776

20777

protobuf_test-unittest_mset.pb.o: google/protobuf/unittest_mset.pb.cc

20778

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_mset.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_mset.pb.Tpo -c -o protobuf_test-unittest_mset.pb.o `test -f 'google/protobuf/unittest_mset.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_mset.pb.cc

20779

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_mset.pb.Tpo $(DEPDIR)/protobuf_test-unittest_mset.pb.Po

20780

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_mset.pb.Tpo $(DEPDIR)/protobuf_test-unittest_mset.pb.Po

20781

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_mset.pb.cc' object='protobuf_test-unittest_mset.pb.o' libtool=no @AMDEPBACKSLASH@

20782

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20783

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_mset.pb.o `test -f 'google/protobuf/unittest_mset.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_mset.pb.cc

20784

20785

protobuf_test-unittest_mset.pb.obj: google/protobuf/unittest_mset.pb.cc

20786

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_mset.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_mset.pb.Tpo -c -o protobuf_test-unittest_mset.pb.obj `if test -f 'google/protobuf/unittest_mset.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_mset.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_mset.pb.cc'; fi`

20787

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_mset.pb.Tpo $(DEPDIR)/protobuf_test-unittest_mset.pb.Po

20788

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_mset.pb.Tpo $(DEPDIR)/protobuf_test-unittest_mset.pb.Po

20789

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_mset.pb.cc' object='protobuf_test-unittest_mset.pb.obj' libtool=no @AMDEPBACKSLASH@

20790

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20791

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_mset.pb.obj `if test -f 'google/protobuf/unittest_mset.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_mset.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_mset.pb.cc'; fi`

20792

20793

protobuf_test-unittest_optimize_for.pb.o: google/protobuf/unittest_optimize_for.pb.cc

20794

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_optimize_for.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_optimize_for.pb.Tpo -c -o protobuf_test-unittest_optimize_for.pb.o `test -f 'google/protobuf/unittest_optimize_for.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_optimize_for.pb.cc

20795

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_optimize_for.pb.Tpo $(DEPDIR)/protobuf_test-unittest_optimize_for.pb.Po

20796

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_optimize_for.pb.Tpo $(DEPDIR)/protobuf_test-unittest_optimize_for.pb.Po

20797

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_optimize_for.pb.cc' object='protobuf_test-unittest_optimize_for.pb.o' libtool=no @AMDEPBACKSLASH@

20798

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20799

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_optimize_for.pb.o `test -f 'google/protobuf/unittest_optimize_for.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_optimize_for.pb.cc

20800

20801

protobuf_test-unittest_optimize_for.pb.obj: google/protobuf/unittest_optimize_for.pb.cc

20802

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_optimize_for.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_optimize_for.pb.Tpo -c -o protobuf_test-unittest_optimize_for.pb.obj `if test -f 'google/protobuf/unittest_optimize_for.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_optimize_for.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_optimize_for.pb.cc'; fi`

20803

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_optimize_for.pb.Tpo $(DEPDIR)/protobuf_test-unittest_optimize_for.pb.Po

20804

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_optimize_for.pb.Tpo $(DEPDIR)/protobuf_test-unittest_optimize_for.pb.Po

20805

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_optimize_for.pb.cc' object='protobuf_test-unittest_optimize_for.pb.obj' libtool=no @AMDEPBACKSLASH@

20806

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20807

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_optimize_for.pb.obj `if test -f 'google/protobuf/unittest_optimize_for.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_optimize_for.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_optimize_for.pb.cc'; fi`

20808

20809

protobuf_test-unittest_embed_optimize_for.pb.o: google/protobuf/unittest_embed_optimize_for.pb.cc

20810

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_embed_optimize_for.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_embed_optimize_for.pb.Tpo -c -o protobuf_test-unittest_embed_optimize_for.pb.o `test -f 'google/protobuf/unittest_embed_optimize_for.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_embed_optimize_for.pb.cc

20811

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_embed_optimize_for.pb.Tpo $(DEPDIR)/protobuf_test-unittest_embed_optimize_for.pb.Po

20812

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_embed_optimize_for.pb.Tpo $(DEPDIR)/protobuf_test-unittest_embed_optimize_for.pb.Po

20813

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_embed_optimize_for.pb.cc' object='protobuf_test-unittest_embed_optimize_for.pb.o' libtool=no @AMDEPBACKSLASH@

20814

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20815

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_embed_optimize_for.pb.o `test -f 'google/protobuf/unittest_embed_optimize_for.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_embed_optimize_for.pb.cc

20816

20817

protobuf_test-unittest_embed_optimize_for.pb.obj: google/protobuf/unittest_embed_optimize_for.pb.cc

20818

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_embed_optimize_for.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_embed_optimize_for.pb.Tpo -c -o protobuf_test-unittest_embed_optimize_for.pb.obj `if test -f 'google/protobuf/unittest_embed_optimize_for.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_embed_optimize_for.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_embed_optimize_for.pb.cc'; fi`

20819

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_embed_optimize_for.pb.Tpo $(DEPDIR)/protobuf_test-unittest_embed_optimize_for.pb.Po

20820

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_embed_optimize_for.pb.Tpo $(DEPDIR)/protobuf_test-unittest_embed_optimize_for.pb.Po

20821

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_embed_optimize_for.pb.cc' object='protobuf_test-unittest_embed_optimize_for.pb.obj' libtool=no @AMDEPBACKSLASH@

20822

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20823

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_embed_optimize_for.pb.obj `if test -f 'google/protobuf/unittest_embed_optimize_for.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_embed_optimize_for.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_embed_optimize_for.pb.cc'; fi`

20824

20825

protobuf_test-unittest_custom_options.pb.o: google/protobuf/unittest_custom_options.pb.cc

20826

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_custom_options.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_custom_options.pb.Tpo -c -o protobuf_test-unittest_custom_options.pb.o `test -f 'google/protobuf/unittest_custom_options.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_custom_options.pb.cc

20827

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_custom_options.pb.Tpo $(DEPDIR)/protobuf_test-unittest_custom_options.pb.Po

20828

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_custom_options.pb.Tpo $(DEPDIR)/protobuf_test-unittest_custom_options.pb.Po

20829

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_custom_options.pb.cc' object='protobuf_test-unittest_custom_options.pb.o' libtool=no @AMDEPBACKSLASH@

20830

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20831

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_custom_options.pb.o `test -f 'google/protobuf/unittest_custom_options.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_custom_options.pb.cc

20832

20833

protobuf_test-unittest_custom_options.pb.obj: google/protobuf/unittest_custom_options.pb.cc

20834

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_custom_options.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_custom_options.pb.Tpo -c -o protobuf_test-unittest_custom_options.pb.obj `if test -f 'google/protobuf/unittest_custom_options.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_custom_options.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_custom_options.pb.cc'; fi`

20835

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_custom_options.pb.Tpo $(DEPDIR)/protobuf_test-unittest_custom_options.pb.Po

20836

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_custom_options.pb.Tpo $(DEPDIR)/protobuf_test-unittest_custom_options.pb.Po

20837

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_custom_options.pb.cc' object='protobuf_test-unittest_custom_options.pb.obj' libtool=no @AMDEPBACKSLASH@

20838

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20839

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_custom_options.pb.obj `if test -f 'google/protobuf/unittest_custom_options.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_custom_options.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_custom_options.pb.cc'; fi`

20840

20841

protobuf_test-unittest_lite_imports_nonlite.pb.o: google/protobuf/unittest_lite_imports_nonlite.pb.cc

20842

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_lite_imports_nonlite.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_lite_imports_nonlite.pb.Tpo -c -o protobuf_test-unittest_lite_imports_nonlite.pb.o `test -f 'google/protobuf/unittest_lite_imports_nonlite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_lite_imports_nonlite.pb.cc

20843

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_lite_imports_nonlite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_lite_imports_nonlite.pb.Po

20844

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_lite_imports_nonlite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_lite_imports_nonlite.pb.Po

20845

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_lite_imports_nonlite.pb.cc' object='protobuf_test-unittest_lite_imports_nonlite.pb.o' libtool=no @AMDEPBACKSLASH@

20846

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20847

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_lite_imports_nonlite.pb.o `test -f 'google/protobuf/unittest_lite_imports_nonlite.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_lite_imports_nonlite.pb.cc

20848

20849

protobuf_test-unittest_lite_imports_nonlite.pb.obj: google/protobuf/unittest_lite_imports_nonlite.pb.cc

20850

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_lite_imports_nonlite.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_lite_imports_nonlite.pb.Tpo -c -o protobuf_test-unittest_lite_imports_nonlite.pb.obj `if test -f 'google/protobuf/unittest_lite_imports_nonlite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_lite_imports_nonlite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_lite_imports_nonlite.pb.cc'; fi`

20851

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_lite_imports_nonlite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_lite_imports_nonlite.pb.Po

20852

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_lite_imports_nonlite.pb.Tpo $(DEPDIR)/protobuf_test-unittest_lite_imports_nonlite.pb.Po

20853

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_lite_imports_nonlite.pb.cc' object='protobuf_test-unittest_lite_imports_nonlite.pb.obj' libtool=no @AMDEPBACKSLASH@

20854

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20855

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_lite_imports_nonlite.pb.obj `if test -f 'google/protobuf/unittest_lite_imports_nonlite.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_lite_imports_nonlite.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_lite_imports_nonlite.pb.cc'; fi`

20856

20857

protobuf_test-unittest_no_generic_services.pb.o: google/protobuf/unittest_no_generic_services.pb.cc

20858

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_no_generic_services.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_no_generic_services.pb.Tpo -c -o protobuf_test-unittest_no_generic_services.pb.o `test -f 'google/protobuf/unittest_no_generic_services.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_no_generic_services.pb.cc

20859

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_no_generic_services.pb.Tpo $(DEPDIR)/protobuf_test-unittest_no_generic_services.pb.Po

20860

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_no_generic_services.pb.Tpo $(DEPDIR)/protobuf_test-unittest_no_generic_services.pb.Po

20861

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_no_generic_services.pb.cc' object='protobuf_test-unittest_no_generic_services.pb.o' libtool=no @AMDEPBACKSLASH@

20862

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20863

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_no_generic_services.pb.o `test -f 'google/protobuf/unittest_no_generic_services.pb.cc' || echo '$(srcdir)/'`google/protobuf/unittest_no_generic_services.pb.cc

20864

20865

protobuf_test-unittest_no_generic_services.pb.obj: google/protobuf/unittest_no_generic_services.pb.cc

20866

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-unittest_no_generic_services.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-unittest_no_generic_services.pb.Tpo -c -o protobuf_test-unittest_no_generic_services.pb.obj `if test -f 'google/protobuf/unittest_no_generic_services.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_no_generic_services.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_no_generic_services.pb.cc'; fi`

20867

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-unittest_no_generic_services.pb.Tpo $(DEPDIR)/protobuf_test-unittest_no_generic_services.pb.Po

20868

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-unittest_no_generic_services.pb.Tpo $(DEPDIR)/protobuf_test-unittest_no_generic_services.pb.Po

20869

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/unittest_no_generic_services.pb.cc' object='protobuf_test-unittest_no_generic_services.pb.obj' libtool=no @AMDEPBACKSLASH@

20870

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20871

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-unittest_no_generic_services.pb.obj `if test -f 'google/protobuf/unittest_no_generic_services.pb.cc'; then $(CYGPATH_W) 'google/protobuf/unittest_no_generic_services.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/unittest_no_generic_services.pb.cc'; fi`

20872

20873

protobuf_test-cpp_test_bad_identifiers.pb.o: google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc

20874

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-cpp_test_bad_identifiers.pb.o -MD -MP -MF $(DEPDIR)/protobuf_test-cpp_test_bad_identifiers.pb.Tpo -c -o protobuf_test-cpp_test_bad_identifiers.pb.o `test -f 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc

20875

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-cpp_test_bad_identifiers.pb.Tpo $(DEPDIR)/protobuf_test-cpp_test_bad_identifiers.pb.Po

20876

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-cpp_test_bad_identifiers.pb.Tpo $(DEPDIR)/protobuf_test-cpp_test_bad_identifiers.pb.Po

20877

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc' object='protobuf_test-cpp_test_bad_identifiers.pb.o' libtool=no @AMDEPBACKSLASH@

20878

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20879

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-cpp_test_bad_identifiers.pb.o `test -f 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc' || echo '$(srcdir)/'`google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc

20880

20881

protobuf_test-cpp_test_bad_identifiers.pb.obj: google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc

20882

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -MT protobuf_test-cpp_test_bad_identifiers.pb.obj -MD -MP -MF $(DEPDIR)/protobuf_test-cpp_test_bad_identifiers.pb.Tpo -c -o protobuf_test-cpp_test_bad_identifiers.pb.obj `if test -f 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; fi`

20883

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/protobuf_test-cpp_test_bad_identifiers.pb.Tpo $(DEPDIR)/protobuf_test-cpp_test_bad_identifiers.pb.Po

20884

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/protobuf_test-cpp_test_bad_identifiers.pb.Tpo $(DEPDIR)/protobuf_test-cpp_test_bad_identifiers.pb.Po

20885

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc' object='protobuf_test-cpp_test_bad_identifiers.pb.obj' libtool=no @AMDEPBACKSLASH@

20886

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20887

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(protobuf_test_CPPFLAGS) $(CPPFLAGS) $(protobuf_test_CXXFLAGS) $(CXXFLAGS) -c -o protobuf_test-cpp_test_bad_identifiers.pb.obj `if test -f 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc'; fi`

20888

20889

main.o: google/protobuf/compiler/main.cc

20890

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main.o -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.o `test -f 'google/protobuf/compiler/main.cc' || echo '$(srcdir)/'`google/protobuf/compiler/main.cc

20891

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po

20892

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po

20893

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/main.cc' object='main.o' libtool=no @AMDEPBACKSLASH@

20894

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20895

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main.o `test -f 'google/protobuf/compiler/main.cc' || echo '$(srcdir)/'`google/protobuf/compiler/main.cc

20896

20897

main.obj: google/protobuf/compiler/main.cc

20898

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT main.obj -MD -MP -MF $(DEPDIR)/main.Tpo -c -o main.obj `if test -f 'google/protobuf/compiler/main.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/main.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/main.cc'; fi`

20899

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po

20900

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/main.Tpo $(DEPDIR)/main.Po

20901

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/main.cc' object='main.obj' libtool=no @AMDEPBACKSLASH@

20902

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20903

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o main.obj `if test -f 'google/protobuf/compiler/main.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/main.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/main.cc'; fi`

20904

20905

test_plugin-mock_code_generator.o: google/protobuf/compiler/mock_code_generator.cc

20906

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_plugin-mock_code_generator.o -MD -MP -MF $(DEPDIR)/test_plugin-mock_code_generator.Tpo -c -o test_plugin-mock_code_generator.o `test -f 'google/protobuf/compiler/mock_code_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/mock_code_generator.cc

20907

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/test_plugin-mock_code_generator.Tpo $(DEPDIR)/test_plugin-mock_code_generator.Po

20908

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/test_plugin-mock_code_generator.Tpo $(DEPDIR)/test_plugin-mock_code_generator.Po

20909

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/mock_code_generator.cc' object='test_plugin-mock_code_generator.o' libtool=no @AMDEPBACKSLASH@

20910

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20911

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_plugin-mock_code_generator.o `test -f 'google/protobuf/compiler/mock_code_generator.cc' || echo '$(srcdir)/'`google/protobuf/compiler/mock_code_generator.cc

20912

20913

test_plugin-mock_code_generator.obj: google/protobuf/compiler/mock_code_generator.cc

20914

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_plugin-mock_code_generator.obj -MD -MP -MF $(DEPDIR)/test_plugin-mock_code_generator.Tpo -c -o test_plugin-mock_code_generator.obj `if test -f 'google/protobuf/compiler/mock_code_generator.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/mock_code_generator.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/mock_code_generator.cc'; fi`

20915

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/test_plugin-mock_code_generator.Tpo $(DEPDIR)/test_plugin-mock_code_generator.Po

20916

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/test_plugin-mock_code_generator.Tpo $(DEPDIR)/test_plugin-mock_code_generator.Po

20917

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/mock_code_generator.cc' object='test_plugin-mock_code_generator.obj' libtool=no @AMDEPBACKSLASH@

20918

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20919

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_plugin-mock_code_generator.obj `if test -f 'google/protobuf/compiler/mock_code_generator.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/mock_code_generator.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/mock_code_generator.cc'; fi`

20920

20921

test_plugin-file.o: google/protobuf/testing/file.cc

20922

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_plugin-file.o -MD -MP -MF $(DEPDIR)/test_plugin-file.Tpo -c -o test_plugin-file.o `test -f 'google/protobuf/testing/file.cc' || echo '$(srcdir)/'`google/protobuf/testing/file.cc

20923

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/test_plugin-file.Tpo $(DEPDIR)/test_plugin-file.Po

20924

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/test_plugin-file.Tpo $(DEPDIR)/test_plugin-file.Po

20925

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/file.cc' object='test_plugin-file.o' libtool=no @AMDEPBACKSLASH@

20926

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20927

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_plugin-file.o `test -f 'google/protobuf/testing/file.cc' || echo '$(srcdir)/'`google/protobuf/testing/file.cc

20928

20929

test_plugin-file.obj: google/protobuf/testing/file.cc

20930

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_plugin-file.obj -MD -MP -MF $(DEPDIR)/test_plugin-file.Tpo -c -o test_plugin-file.obj `if test -f 'google/protobuf/testing/file.cc'; then $(CYGPATH_W) 'google/protobuf/testing/file.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/file.cc'; fi`

20931

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/test_plugin-file.Tpo $(DEPDIR)/test_plugin-file.Po

20932

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/test_plugin-file.Tpo $(DEPDIR)/test_plugin-file.Po

20933

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/file.cc' object='test_plugin-file.obj' libtool=no @AMDEPBACKSLASH@

20934

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20935

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_plugin-file.obj `if test -f 'google/protobuf/testing/file.cc'; then $(CYGPATH_W) 'google/protobuf/testing/file.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/file.cc'; fi`

20936

20937

test_plugin-test_plugin.o: google/protobuf/compiler/test_plugin.cc

20938

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_plugin-test_plugin.o -MD -MP -MF $(DEPDIR)/test_plugin-test_plugin.Tpo -c -o test_plugin-test_plugin.o `test -f 'google/protobuf/compiler/test_plugin.cc' || echo '$(srcdir)/'`google/protobuf/compiler/test_plugin.cc

20939

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/test_plugin-test_plugin.Tpo $(DEPDIR)/test_plugin-test_plugin.Po

20940

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/test_plugin-test_plugin.Tpo $(DEPDIR)/test_plugin-test_plugin.Po

20941

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/test_plugin.cc' object='test_plugin-test_plugin.o' libtool=no @AMDEPBACKSLASH@

20942

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20943

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_plugin-test_plugin.o `test -f 'google/protobuf/compiler/test_plugin.cc' || echo '$(srcdir)/'`google/protobuf/compiler/test_plugin.cc

20944

20945

test_plugin-test_plugin.obj: google/protobuf/compiler/test_plugin.cc

20946

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_plugin-test_plugin.obj -MD -MP -MF $(DEPDIR)/test_plugin-test_plugin.Tpo -c -o test_plugin-test_plugin.obj `if test -f 'google/protobuf/compiler/test_plugin.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/test_plugin.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/test_plugin.cc'; fi`

20947

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/test_plugin-test_plugin.Tpo $(DEPDIR)/test_plugin-test_plugin.Po

20948

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/test_plugin-test_plugin.Tpo $(DEPDIR)/test_plugin-test_plugin.Po

20949

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/compiler/test_plugin.cc' object='test_plugin-test_plugin.obj' libtool=no @AMDEPBACKSLASH@

20950

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20951

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_plugin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_plugin-test_plugin.obj `if test -f 'google/protobuf/compiler/test_plugin.cc'; then $(CYGPATH_W) 'google/protobuf/compiler/test_plugin.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/compiler/test_plugin.cc'; fi`

20952

20953

zcgunzip.o: google/protobuf/testing/zcgunzip.cc

20954

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zcgunzip.o -MD -MP -MF $(DEPDIR)/zcgunzip.Tpo -c -o zcgunzip.o `test -f 'google/protobuf/testing/zcgunzip.cc' || echo '$(srcdir)/'`google/protobuf/testing/zcgunzip.cc

20955

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/zcgunzip.Tpo $(DEPDIR)/zcgunzip.Po

20956

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zcgunzip.Tpo $(DEPDIR)/zcgunzip.Po

20957

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/zcgunzip.cc' object='zcgunzip.o' libtool=no @AMDEPBACKSLASH@

20958

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20959

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zcgunzip.o `test -f 'google/protobuf/testing/zcgunzip.cc' || echo '$(srcdir)/'`google/protobuf/testing/zcgunzip.cc

20960

20961

zcgunzip.obj: google/protobuf/testing/zcgunzip.cc

20962

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zcgunzip.obj -MD -MP -MF $(DEPDIR)/zcgunzip.Tpo -c -o zcgunzip.obj `if test -f 'google/protobuf/testing/zcgunzip.cc'; then $(CYGPATH_W) 'google/protobuf/testing/zcgunzip.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/zcgunzip.cc'; fi`

20963

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/zcgunzip.Tpo $(DEPDIR)/zcgunzip.Po

20964

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zcgunzip.Tpo $(DEPDIR)/zcgunzip.Po

20965

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/zcgunzip.cc' object='zcgunzip.obj' libtool=no @AMDEPBACKSLASH@

20966

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20967

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zcgunzip.obj `if test -f 'google/protobuf/testing/zcgunzip.cc'; then $(CYGPATH_W) 'google/protobuf/testing/zcgunzip.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/zcgunzip.cc'; fi`

20968

20969

zcgzip.o: google/protobuf/testing/zcgzip.cc

20970

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zcgzip.o -MD -MP -MF $(DEPDIR)/zcgzip.Tpo -c -o zcgzip.o `test -f 'google/protobuf/testing/zcgzip.cc' || echo '$(srcdir)/'`google/protobuf/testing/zcgzip.cc

20971

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/zcgzip.Tpo $(DEPDIR)/zcgzip.Po

20972

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zcgzip.Tpo $(DEPDIR)/zcgzip.Po

20973

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/zcgzip.cc' object='zcgzip.o' libtool=no @AMDEPBACKSLASH@

20974

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20975

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zcgzip.o `test -f 'google/protobuf/testing/zcgzip.cc' || echo '$(srcdir)/'`google/protobuf/testing/zcgzip.cc

20976

20977

zcgzip.obj: google/protobuf/testing/zcgzip.cc

20978

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zcgzip.obj -MD -MP -MF $(DEPDIR)/zcgzip.Tpo -c -o zcgzip.obj `if test -f 'google/protobuf/testing/zcgzip.cc'; then $(CYGPATH_W) 'google/protobuf/testing/zcgzip.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/zcgzip.cc'; fi`

20979

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/zcgzip.Tpo $(DEPDIR)/zcgzip.Po

20980

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/zcgzip.Tpo $(DEPDIR)/zcgzip.Po

20981

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='google/protobuf/testing/zcgzip.cc' object='zcgzip.obj' libtool=no @AMDEPBACKSLASH@

20982

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20983

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zcgzip.obj `if test -f 'google/protobuf/testing/zcgzip.cc'; then $(CYGPATH_W) 'google/protobuf/testing/zcgzip.cc'; else $(CYGPATH_W) '$(srcdir)/google/protobuf/testing/zcgzip.cc'; fi`

20984

@@ -2448,55 +2490,63 @@ clean-libtool:

20985

install-nobase_dist_protoDATA: $(nobase_dist_proto_DATA)

20986

@$(NORMAL_INSTALL)

20987

test -z "$(protodir)" || $(MKDIR_P) "$(DESTDIR)$(protodir)"

20988

- @$(am__vpath_adj_setup) \

20989

- list='$(nobase_dist_proto_DATA)'; for p in $$list; do \

20990

- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

20991

- $(am__vpath_adj) \

20992

- echo " $(nobase_dist_protoDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(protodir)/$$f'"; \

20993

- $(nobase_dist_protoDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(protodir)/$$f"; \

20994

+ @list='$(nobase_dist_proto_DATA)'; test -n "$(protodir)" || list=; \

20995

+ $(am__nobase_list) | while read dir files; do \

20996

+ xfiles=; for file in $$files; do \

20997

+ if test -f "$$file"; then xfiles="$$xfiles $$file"; \

20998

+ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \

20999

+ test -z "$$xfiles" || { \

21000

+ test "x$$dir" = x. || { \

21001

+ echo "$(MKDIR_P) '$(DESTDIR)$(protodir)/$$dir'"; \

21002

+ $(MKDIR_P) "$(DESTDIR)$(protodir)/$$dir"; }; \

21003

+ echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(protodir)/$$dir'"; \

21004

+ $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(protodir)/$$dir" || exit $$?; }; \

21005

done

21006

21007

uninstall-nobase_dist_protoDATA:

21008

@$(NORMAL_UNINSTALL)

21009

- @$(am__vpath_adj_setup) \

21010

- list='$(nobase_dist_proto_DATA)'; for p in $$list; do \

21011

- $(am__vpath_adj) \

21012

- echo " rm -f '$(DESTDIR)$(protodir)/$$f'"; \

21013

- rm -f "$(DESTDIR)$(protodir)/$$f"; \

21014

- done

21015

+ @list='$(nobase_dist_proto_DATA)'; test -n "$(protodir)" || list=; \

21016

+ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \

21017

+ test -n "$$files" || exit 0; \

21018

+ echo " ( cd '$(DESTDIR)$(protodir)' && rm -f" $$files ")"; \

21019

+ cd "$(DESTDIR)$(protodir)" && rm -f $$files

21020

install-nobase_includeHEADERS: $(nobase_include_HEADERS)

21021

@$(NORMAL_INSTALL)

21022

test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"

21023

- @$(am__vpath_adj_setup) \

21024

- list='$(nobase_include_HEADERS)'; for p in $$list; do \

21025

- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

21026

- $(am__vpath_adj) \

21027

- echo " $(nobase_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \

21028

- $(nobase_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \

21029

+ @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \

21030

+ $(am__nobase_list) | while read dir files; do \

21031

+ xfiles=; for file in $$files; do \

21032

+ if test -f "$$file"; then xfiles="$$xfiles $$file"; \

21033

+ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \

21034

+ test -z "$$xfiles" || { \

21035

+ test "x$$dir" = x. || { \

21036

+ echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \

21037

+ $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \

21038

+ echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \

21039

+ $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \

21040

done

21041

21042

uninstall-nobase_includeHEADERS:

21043

@$(NORMAL_UNINSTALL)

21044

- @$(am__vpath_adj_setup) \

21045

- list='$(nobase_include_HEADERS)'; for p in $$list; do \

21046

- $(am__vpath_adj) \

21047

- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \

21048

- rm -f "$(DESTDIR)$(includedir)/$$f"; \

21049

- done

21050

+ @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \

21051

+ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \

21052

+ test -n "$$files" || exit 0; \

21053

+ echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \

21054

+ cd "$(DESTDIR)$(includedir)" && rm -f $$files

21055

21056

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

21057

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

21058

unique=`for i in $$list; do \

21059

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

21060

done | \

21061

- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

21062

+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

21063

END { if (nonempty) { for (i in files) print i; }; }'`; \

21064

mkid -fID $$unique

21065

tags: TAGS

21066

21067

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

21068

$(TAGS_FILES) $(LISP)

21069

- tags=; \

21070

+ set x; \

21071

here=`pwd`; \

21072

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

21073

unique=`for i in $$list; do \

21074

@@ -2504,37 +2554,43 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP

21075

done | \

21076

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

21077

END { if (nonempty) { for (i in files) print i; }; }'`; \

21078

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

21079

+ shift; \

21080

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

21081

test -n "$$unique" || unique=$$empty_fix; \

21082

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

21083

- $$tags $$unique; \

21084

+ if test $$# -gt 0; then \

21085

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

21086

+ "$$@" $$unique; \

21087

+ else \

21088

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

21089

+ $$unique; \

21090

+ fi; \

21091

21092

ctags: CTAGS

21093

CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

21094

$(TAGS_FILES) $(LISP)

21095

- tags=; \

21096

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

21097

unique=`for i in $$list; do \

21098

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

21099

done | \

21100

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

21101

END { if (nonempty) { for (i in files) print i; }; }'`; \

21102

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

21103

+ test -z "$(CTAGS_ARGS)$$unique" \

21104

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

21105

- $$tags $$unique

21106

+ $$unique

21107

21108

GTAGS:

21109

here=`$(am__cd) $(top_builddir) && pwd` \

21110

- && cd $(top_srcdir) \

21111

- && gtags -i $(GTAGS_ARGS) $$here

21112

+ && $(am__cd) $(top_srcdir) \

21113

+ && gtags -i $(GTAGS_ARGS) "$$here"

21114

21115

distclean-tags:

21116

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

21117

21118

check-TESTS: $(TESTS)

21119

- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \

21120

+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \

21121

srcdir=$(srcdir); export srcdir; \

21122

list=' $(TESTS) '; \

21123

+ $(am__tty_colors); \

21124

if test -n "$$list"; then \

21125

for tst in $$list; do \

21126

if test -f ./$$tst; then dir=./; \

21127

@@ -2543,49 +2599,63 @@ check-TESTS: $(TESTS)

21128

if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \

21129

all=`expr $$all + 1`; \

21130

case " $(XFAIL_TESTS) " in \

21131

- *$$ws$$tst$$ws*) \

21132

+ *[\ \ ]$$tst[\ \ ]*) \

21133

xpass=`expr $$xpass + 1`; \

21134

failed=`expr $$failed + 1`; \

21135

- echo "XPASS: $$tst"; \

21136

+ col=$$red; res=XPASS; \

21137

;; \

21138

*) \

21139

- echo "PASS: $$tst"; \

21140

+ col=$$grn; res=PASS; \

21141

;; \

21142

esac; \

21143

elif test $$? -ne 77; then \

21144

all=`expr $$all + 1`; \

21145

case " $(XFAIL_TESTS) " in \

21146

- *$$ws$$tst$$ws*) \

21147

+ *[\ \ ]$$tst[\ \ ]*) \

21148

xfail=`expr $$xfail + 1`; \

21149

- echo "XFAIL: $$tst"; \

21150

+ col=$$lgn; res=XFAIL; \

21151

;; \

21152

*) \

21153

failed=`expr $$failed + 1`; \

21154

- echo "FAIL: $$tst"; \

21155

+ col=$$red; res=FAIL; \

21156

;; \

21157

esac; \

21158

else \

21159

skip=`expr $$skip + 1`; \

21160

- echo "SKIP: $$tst"; \

21161

+ col=$$blu; res=SKIP; \

21162

fi; \

21163

+ echo "$${col}$$res$${std}: $$tst"; \

21164

done; \

21165

+ if test "$$all" -eq 1; then \

21166

+ tests="test"; \

21167

+ All=""; \

21168

+ else \

21169

+ tests="tests"; \

21170

+ All="All "; \

21171

+ fi; \

21172

if test "$$failed" -eq 0; then \

21173

if test "$$xfail" -eq 0; then \

21174

- banner="All $$all tests passed"; \

21175

+ banner="$$All$$all $$tests passed"; \

21176

else \

21177

- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \

21178

+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \

21179

+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \

21180

fi; \

21181

else \

21182

if test "$$xpass" -eq 0; then \

21183

- banner="$$failed of $$all tests failed"; \

21184

+ banner="$$failed of $$all $$tests failed"; \

21185

else \

21186

- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \

21187

+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \

21188

+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \

21189

fi; \

21190

fi; \

21191

dashes="$$banner"; \

21192

skipped=""; \

21193

if test "$$skip" -ne 0; then \

21194

- skipped="($$skip tests were not run)"; \

21195

+ if test "$$skip" -eq 1; then \

21196

+ skipped="($$skip test was not run)"; \

21197

+ else \

21198

+ skipped="($$skip tests were not run)"; \

21199

+ fi; \

21200

test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \

21201

dashes="$$skipped"; \

21202

fi; \

21203

@@ -2596,11 +2666,15 @@ check-TESTS: $(TESTS)

21204

dashes="$$report"; \

21205

fi; \

21206

dashes=`echo "$$dashes" | sed s/./=/g`; \

21207

- echo "$$dashes"; \

21208

+ if test "$$failed" -eq 0; then \

21209

+ echo "$$grn$$dashes"; \

21210

+ else \

21211

+ echo "$$red$$dashes"; \

21212

+ fi; \

21213

echo "$$banner"; \

21214

test -z "$$skipped" || echo "$$skipped"; \

21215

test -z "$$report" || echo "$$report"; \

21216

- echo "$$dashes"; \

21217

+ echo "$$dashes$$std"; \

21218

test "$$failed" -eq 0; \

21219

else :; fi

21220

21221

@@ -2620,13 +2694,17 @@ distdir: $(DISTFILES)

21222

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

21223

if test -d $$d/$$file; then \

21224

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

21225

+ if test -d "$(distdir)/$$file"; then \

21226

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

21227

+ fi; \

21228

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

21229

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

21230

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

21231

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

21232

fi; \

21233

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

21234

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

21235

else \

21236

- test -f $(distdir)/$$file \

21237

- || cp -p $$d/$$file $(distdir)/$$file \

21238

+ test -f "$(distdir)/$$file" \

21239

+ || cp -p $$d/$$file "$(distdir)/$$file" \

21240

|| exit 1; \

21241

fi; \

21242

done

21243

@@ -2664,6 +2742,7 @@ clean-generic:

21244

21245

distclean-generic:

21246

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

21247

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

21248

21249

maintainer-clean-generic:

21250

@echo "This command is intended for maintainers to use"

21251

@@ -2687,6 +2766,8 @@ dvi-am:

21252

21253

html: html-am

21254

21255

+html-am:

21256

21257

info: info-am

21258

21259

info-am:

21260

@@ -2696,18 +2777,28 @@ install-data-am: install-nobase_dist_pro

21261

21262

install-dvi: install-dvi-am

21263

21264

+install-dvi-am:

21265

21266

install-exec-am: install-binPROGRAMS install-libLTLIBRARIES

21267

21268

install-html: install-html-am

21269

21270

+install-html-am:

21271

21272

install-info: install-info-am

21273

21274

+install-info-am:

21275

21276

install-man:

21277

21278

install-pdf: install-pdf-am

21279

21280

+install-pdf-am:

21281

21282

install-ps: install-ps-am

21283

21284

+install-ps-am:

21285

21286

installcheck-am:

21287

21288

maintainer-clean: maintainer-clean-am

21289

@@ -2732,7 +2823,7 @@ uninstall-am: uninstall-binPROGRAMS unin

21290

uninstall-nobase_dist_protoDATA \

21291

uninstall-nobase_includeHEADERS

21292

21293

-.MAKE: install-am install-strip

21294

+.MAKE: all check check-am install install-am install-strip

21295

21296

.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \

21297

clean-binPROGRAMS clean-checkPROGRAMS clean-generic \

21298

@@ -2770,6 +2861,7 @@ clean-local:

21299

@USE_EXTERNAL_PROTOC_FALSE@ touch unittest_proto_middleman

21300

21301

$(protoc_outputs): unittest_proto_middleman

21302

21303

# Tell versions [3.59,3.63) of GNU make to not export all variables.

21304

# Otherwise a system limit (for SysV at least) may be exceeded.

21305

.NOEXPORT:

21306

--- protobuf-2.3.0.orig/m4/ltsugar.m4

21307

+++ protobuf-2.3.0/m4/ltsugar.m4

15690

@@ -204,6 +206,7 @@ abs_builddir = @abs_builddir@

15691

abs_srcdir = @abs_srcdir@

15692

abs_top_builddir = @abs_top_builddir@

15693

abs_top_srcdir = @abs_top_srcdir@

15694

+ac_ct_AR = @ac_ct_AR@

15695

ac_ct_CC = @ac_ct_CC@

15696

ac_ct_CXX = @ac_ct_CXX@

15697

ac_ct_DUMPBIN = @ac_ct_DUMPBIN@

15698

@@ -238,7 +241,6 @@ libdir = @libdir@

15699

libexecdir = @libexecdir@

15700

localedir = @localedir@

15701

localstatedir = @localstatedir@

15702

-lt_ECHO = @lt_ECHO@

15703

mandir = @mandir@

15704

mkdir_p = @mkdir_p@

15705

oldincludedir = @oldincludedir@

15706

--- protobuf-2.4.0a.orig/m4/ltversion.m4

15707

+++ protobuf-2.4.0a/m4/ltversion.m4

15708

@@ -7,17 +7,17 @@

15709

# unlimited permission to copy and/or distribute it, with or without

15710

# modifications, as long as this notice is preserved.

15711

15712

-# Generated from ltversion.in.

15713

+# @configure_input@

15714

15715

-# serial 3017 ltversion.m4

15716

+# serial 3293 ltversion.m4

15717

# This file is part of GNU Libtool

15718

15719

-m4_define([LT_PACKAGE_VERSION], [2.2.6b])

15720

-m4_define([LT_PACKAGE_REVISION], [1.3017])

15721

+m4_define([LT_PACKAGE_VERSION], [2.4])

15722

+m4_define([LT_PACKAGE_REVISION], [1.3293])

15723

15724

AC_DEFUN([LTVERSION_VERSION],

15725

-[macro_version='2.2.6b'

15726

-macro_revision='1.3017'

15727

+[macro_version='2.4'

15728

+macro_revision='1.3293'

15729

_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])

15730

_LT_DECL(, macro_revision, 0)

15731

])

15732

--- protobuf-2.4.0a.orig/m4/ltoptions.m4

15733

+++ protobuf-2.4.0a/m4/ltoptions.m4

15734

@@ -1,13 +1,14 @@

15735

# Helper functions for option handling. -*- Autoconf -*-

15736

15737

15738

15739

+# Inc.

15740

# Written by Gary V. Vaughan, 2004

15741

15742

# This file is free software; the Free Software Foundation gives

15743

# unlimited permission to copy and/or distribute it, with or without

15744

# modifications, as long as this notice is preserved.

15745

15746

-# serial 6 ltoptions.m4

15747

+# serial 7 ltoptions.m4

15748

15749

# This is to help aclocal find these macros, as it can't see m4_define.

15750

AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])

15751

@@ -125,7 +126,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],

15752

[enable_win32_dll=yes

15753

15754

case $host in

15755

-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)

15756

+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)

15757

AC_CHECK_TOOL(AS, as, false)

15758

AC_CHECK_TOOL(DLLTOOL, dlltool, false)

15759

AC_CHECK_TOOL(OBJDUMP, objdump, false)

15760

@@ -133,13 +134,13 @@ case $host in

15761

esac

15762

15763

test -z "$AS" && AS=as

15764

-_LT_DECL([], [AS], [0], [Assembler program])dnl

15765

+_LT_DECL([], [AS], [1], [Assembler program])dnl

15766

15767

test -z "$DLLTOOL" && DLLTOOL=dlltool

15768

-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl

15769

+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl

15770

15771

test -z "$OBJDUMP" && OBJDUMP=objdump

15772

-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl

15773

+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl

15774

])# win32-dll

15775

15776

AU_DEFUN([AC_LIBTOOL_WIN32_DLL],

15777

--- protobuf-2.4.0a.orig/m4/lt~obsolete.m4

15778

+++ protobuf-2.4.0a/m4/lt~obsolete.m4

21308

15779

@@ -1,13 +1,13 @@

21309

# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-

15780

# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-

21310

15781

21311

15782

21312

-# Written by Gary V. Vaughan, 2004

21313

21314

+# Written by Gary V. Vaughan, 2004

15783

15784

# Written by Scott James Remnant, 2004.

21315

15785

21316

15786

# This file is free software; the Free Software Foundation gives

21317

15787

# unlimited permission to copy and/or distribute it, with or without

21318

15788

# modifications, as long as this notice is preserved.

21319

15789

21320

-# serial 5 ltsugar.m4

21321

+# serial 6 ltsugar.m4

21322

21323

# This is to help aclocal find these macros, as it can't see m4_define.

21324

AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])

21325

@@ -63,14 +63,14 @@ m4_define([lt_append],

21326

# Produce a SEP delimited list of all paired combinations of elements of

21327

# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list

21328

# has the form PREFIXmINFIXSUFFIXn.

21329

+# Needed until we can rely on m4_combine added in Autoconf 2.62.

21330

m4_define([lt_combine],

21331

-[m4_if([$2], [], [],

21332

- [m4_if([$4], [], [],

21333

- [lt_join(m4_quote(m4_default([$1], [[, ]])),

21334

- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],

21335

- [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),

21336

- [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl

21337

-])

21338

+[m4_if(m4_eval([$# > 3]), [1],

21339

+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl

21340

+[[m4_foreach([_Lt_prefix], [$2],

21341

+ [m4_foreach([_Lt_suffix],

21342

+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,

21343

+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])

21344

21345

21346

# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])

21347

--- protobuf-2.3.0.orig/m4/libtool.m4

21348

+++ protobuf-2.3.0/m4/libtool.m4

21349

@@ -380,12 +380,12 @@ m4_define([lt_decl_dquote_varnames],

21350

# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])

21351

# ---------------------------------------------------

21352

m4_define([lt_decl_varnames_tagged],

21353

-[_$0(m4_quote(m4_default([$1], [[, ]])),

21354

- m4_quote(m4_if([$2], [],

21355

- m4_quote(lt_decl_tag_varnames),

21356

- m4_quote(m4_shift($@)))),

21357

- m4_split(m4_normalize(m4_quote(_LT_TAGS))))])

21358

-m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])

21359

+[m4_assert([$# <= 2])dnl

21360

+_$0(m4_quote(m4_default([$1], [[, ]])),

21361

+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),

21362

+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])

21363

+m4_define([_lt_decl_varnames_tagged],

21364

+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])

21365

21366

21367

# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])

21368

@@ -945,10 +945,10 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK

15790

-# serial 4 lt~obsolete.m4

15791

+# serial 5 lt~obsolete.m4

15792

15793

# These exist entirely to fool aclocal when bootstrapping libtool.

15794

15795

@@ -77,7 +77,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC

15796

m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])

15797

m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])

15798

m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])

15799

-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])

15800

m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])

15801

m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])

15802

m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])

15803

@@ -90,3 +89,10 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [

15804

m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])

15805

m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])

15806

m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])

15807

+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])

15808

+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])

15809

+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])

15810

+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])

15811

+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])

15812

+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])

15813

+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])

15814

--- protobuf-2.4.0a.orig/m4/libtool.m4

15815

+++ protobuf-2.4.0a/m4/libtool.m4

15816

@@ -1,7 +1,8 @@

15817

# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

15818

15819

15820

-# 2006, 2007, 2008 Free Software Foundation, Inc.

15821

+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,

15822

+# Inc.

15823

# Written by Gordon Matzigkeit, 1996

15824

15825

# This file is free software; the Free Software Foundation gives

15826

@@ -10,7 +11,8 @@

15827

15828

m4_define([_LT_COPYING], [dnl

15829

15830

-# 2006, 2007, 2008 Free Software Foundation, Inc.

15831

+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,

15832

+# Inc.

15833

# Written by Gordon Matzigkeit, 1996

15834

15835

# This file is part of GNU Libtool.

15836

@@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl

15837

# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

15838

])

15839

15840

-# serial 56 LT_INIT

15841

+# serial 57 LT_INIT

15842

15843

15844

# LT_PREREQ(VERSION)

15845

@@ -66,6 +68,7 @@ esac

15846

# ------------------

15847

AC_DEFUN([LT_INIT],

15848

[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT

15849

+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl

15850

AC_BEFORE([$0], [LT_LANG])dnl

15851

AC_BEFORE([$0], [LT_OUTPUT])dnl

15852

AC_BEFORE([$0], [LTDL_INIT])dnl

15853

@@ -82,6 +85,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl

15854

AC_REQUIRE([LTOBSOLETE_VERSION])dnl

15855

m4_require([_LT_PROG_LTMAIN])dnl

15856

15857

+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])

15858

15859

dnl Parse OPTIONS

15860

_LT_SET_OPTIONS([$0], [$1])

15861

15862

@@ -118,7 +123,7 @@ m4_defun([_LT_CC_BASENAME],

15863

*) break;;

15864

esac

15865

done

15866

-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

15867

+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`

15868

])

15869

15870

15871

@@ -138,6 +143,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],

15872

m4_defun([_LT_SETUP],

15873

[AC_REQUIRE([AC_CANONICAL_HOST])dnl

15874

AC_REQUIRE([AC_CANONICAL_BUILD])dnl

15875

+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl

15876

+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl

15877

15878

_LT_DECL([], [host_alias], [0], [The host system])dnl

15879

_LT_DECL([], [host], [0])dnl

15880

_LT_DECL([], [host_os], [0])dnl

15881

@@ -160,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable

15882

dnl

15883

m4_require([_LT_FILEUTILS_DEFAULTS])dnl

15884

m4_require([_LT_CHECK_SHELL_FEATURES])dnl

15885

+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl

15886

m4_require([_LT_CMD_RELOAD])dnl

15887

m4_require([_LT_CHECK_MAGIC_METHOD])dnl

15888

+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl

15889

m4_require([_LT_CMD_OLD_ARCHIVE])dnl

15890

m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl

15891

+m4_require([_LT_WITH_SYSROOT])dnl

15892

15893

_LT_CONFIG_LIBTOOL_INIT([

15894

# See if we are running on zsh, and set the options which allow our

15895

@@ -179,7 +190,6 @@ fi

15896

_LT_CHECK_OBJDIR

15897

15898

m4_require([_LT_TAG_COMPILER])dnl

15899

-_LT_PROG_ECHO_BACKSLASH

15900

15901

case $host_os in

15902

aix3*)

15903

@@ -193,23 +203,6 @@ aix3*)

15904

;;

15905

esac

15906

15907

-# Sed substitution that helps us do robust quoting. It backslashifies

15908

-# metacharacters that are still active within double-quoted strings.

15909

-sed_quote_subst='s/$[["`$\\]]$/\\\1/g'

15910

15911

-# Same as above, but do not quote variable references.

15912

-double_quote_subst='s/$[["`\\]]$/\\\1/g'

15913

15914

-# Sed substitution to delay expansion of an escaped shell variable in a

15915

-# double_quote_subst'ed string.

15916

-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'

15917

15918

-# Sed substitution to delay expansion of an escaped single quote.

15919

-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'

15920

15921

-# Sed substitution to avoid accidental globbing in evaled expressions

15922

-no_glob_subst='s/\*/\\\*/g'

15923

15924

# Global variables:

15925

ofile=libtool

15926

can_build_shared=yes

15927

@@ -250,6 +243,28 @@ _LT_CONFIG_COMMANDS

15928

])# _LT_SETUP

15929

15930

15931

+# _LT_PREPARE_SED_QUOTE_VARS

15932

+# --------------------------

15933

+# Define a few sed substitution that help us do robust quoting.

15934

+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],

15935

+[# Backslashify metacharacters that are still active within

15936

+# double-quoted strings.

15937

+sed_quote_subst='s/$[["`$\\]]$/\\\1/g'

15938

15939

+# Same as above, but do not quote variable references.

15940

+double_quote_subst='s/$[["`\\]]$/\\\1/g'

15941

15942

+# Sed substitution to delay expansion of an escaped shell variable in a

15943

+# double_quote_subst'ed string.

15944

+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'

15945

15946

+# Sed substitution to delay expansion of an escaped single quote.

15947

+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'

15948

15949

+# Sed substitution to avoid accidental globbing in evaled expressions

15950

+no_glob_subst='s/\*/\\\*/g'

15951

+])

15952

15953

# _LT_PROG_LTMAIN

15954

# ---------------

15955

# Note that this code is called both from `configure', and `config.status'

15956

@@ -408,7 +423,7 @@ m4_define([_lt_decl_all_varnames],

15957

# declaration there will have the same value as in `configure'. VARNAME

15958

# must have a single quote delimited value for this to work.

15959

m4_define([_LT_CONFIG_STATUS_DECLARE],

15960

-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])

15961

+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])

15962

15963

15964

# _LT_CONFIG_STATUS_DECLARATIONS

15965

@@ -418,7 +433,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],

15966

# embedded single quotes properly. In configure, this macro expands

15967

# each variable declared with _LT_DECL (and _LT_TAGDECL) into:

15968

15969

-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'

15970

+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'

15971

m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],

15972

[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),

15973

[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])

15974

@@ -517,12 +532,20 @@ LTCC='$LTCC'

15975

LTCFLAGS='$LTCFLAGS'

15976

compiler='$compiler_DEFAULT'

15977

15978

+# A function that is used when there is no print builtin or printf.

15979

+func_fallback_echo ()

15980

15981

+ eval 'cat <<_LTECHO_EOF

15982

+\$[]1

15983

+_LTECHO_EOF'

15984

15985

15986

# Quote evaled strings.

15987

for var in lt_decl_all_varnames([[ \

15988

]], lt_decl_quote_varnames); do

15989

- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in

15990

+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in

15991

*[[\\\\\\\`\\"\\\$]]*)

15992

- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""

15993

+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""

15994

;;

15995

15996

eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""

15997

@@ -533,9 +556,9 @@ done

15998

# Double-quote double-evaled strings.

15999

for var in lt_decl_all_varnames([[ \

16000

]], lt_decl_dquote_varnames); do

16001

- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in

16002

+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in

16003

*[[\\\\\\\`\\"\\\$]]*)

16004

- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""

16005

+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""

16006

;;

16007

16008

eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""

16009

@@ -543,16 +566,38 @@ for var in lt_decl_all_varnames([[ \

16010

esac

16011

done

16012

16013

-# Fix-up fallback echo if it was mangled by the above quoting rules.

16014

-case \$lt_ECHO in

16015

-*'\\\[$]0 --fallback-echo"')dnl "

16016

- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`

16017

- ;;

16018

-esac

16019

16020

_LT_OUTPUT_LIBTOOL_INIT

16021

])

16022

16023

+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])

16024

+# ------------------------------------

16025

+# Generate a child script FILE with all initialization necessary to

16026

+# reuse the environment learned by the parent script, and make the

16027

+# file executable. If COMMENT is supplied, it is inserted after the

16028

+# `#!' sequence but before initialization text begins. After this

16029

+# macro, additional text can be appended to FILE to form the body of

16030

+# the child script. The macro ends with non-zero status if the

16031

+# file could not be fully written (such as if the disk is full).

16032

+m4_ifdef([AS_INIT_GENERATED],

16033

+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],

16034

+[m4_defun([_LT_GENERATED_FILE_INIT],

16035

+[m4_require([AS_PREPARE])]dnl

16036

+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl

16037

+[lt_write_fail=0

16038

+cat >$1 <<_ASEOF || lt_write_fail=1

16039

+#! $SHELL

16040

+# Generated by $as_me.

16041

+$2

16042

+SHELL=\${CONFIG_SHELL-$SHELL}

16043

+export SHELL

16044

+_ASEOF

16045

+cat >>$1 <<\_ASEOF || lt_write_fail=1

16046

+AS_SHELL_SANITIZE

16047

+_AS_PREPARE

16048

+exec AS_MESSAGE_FD>&1

16049

+_ASEOF

16050

+test $lt_write_fail = 0 && chmod +x $1[]dnl

16051

+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT

16052

16053

# LT_OUTPUT

16054

# ---------

16055

@@ -562,20 +607,11 @@ _LT_OUTPUT_LIBTOOL_INIT

16056

AC_DEFUN([LT_OUTPUT],

16057

[: ${CONFIG_LT=./config.lt}

16058

AC_MSG_NOTICE([creating $CONFIG_LT])

16059

-cat >"$CONFIG_LT" <<_LTEOF

16060

-#! $SHELL

16061

-# Generated by $as_me.

16062

-# Run this file to recreate a libtool stub with the current configuration.

16063

16064

-lt_cl_silent=false

16065

-SHELL=\${CONFIG_SHELL-$SHELL}

16066

-_LTEOF

16067

+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],

16068

+[# Run this file to recreate a libtool stub with the current configuration.])

16069

16070

cat >>"$CONFIG_LT" <<\_LTEOF

16071

-AS_SHELL_SANITIZE

16072

-_AS_PREPARE

16073

16074

-exec AS_MESSAGE_FD>&1

16075

+lt_cl_silent=false

16076

exec AS_MESSAGE_LOG_FD>>config.log

16077

{

16078

echo

16079

@@ -601,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_

16080

m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])

16081

configured by $[0], generated by m4_PACKAGE_STRING.

16082

16083

16084

16085

This config.lt script is free software; the Free Software Foundation

16086

gives unlimited permision to copy, distribute and modify it."

16087

16088

@@ -646,15 +682,13 @@ chmod +x "$CONFIG_LT"

16089

# appending to config.log, which fails on DOS, as config.log is still kept

16090

# open by configure. Here we exec the FD to /dev/null, effectively closing

16091

# config.log, so it can be properly (re)opened and appended to by config.lt.

16092

-if test "$no_create" != yes; then

16093

- lt_cl_success=:

16094

- test "$silent" = yes &&

16095

- lt_config_lt_args="$lt_config_lt_args --quiet"

16096

- exec AS_MESSAGE_LOG_FD>/dev/null

16097

- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false

16098

- exec AS_MESSAGE_LOG_FD>>config.log

16099

- $lt_cl_success || AS_EXIT(1)

16100

-fi

16101

+lt_cl_success=:

16102

+test "$silent" = yes &&

16103

+ lt_config_lt_args="$lt_config_lt_args --quiet"

16104

+exec AS_MESSAGE_LOG_FD>/dev/null

16105

+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false

16106

+exec AS_MESSAGE_LOG_FD>>config.log

16107

+$lt_cl_success || AS_EXIT(1)

16108

])# LT_OUTPUT

16109

16110

16111

@@ -717,15 +751,12 @@ _LT_EOF

16112

# if finds mixed CR/LF and LF-only lines. Since sed operates in

16113

# text mode, it properly converts lines to CR/LF. This bash problem

16114

# is reportedly fixed, but why not run on old versions too?

16115

- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \

16116

- || (rm -f "$cfgfile"; exit 1)

16117

+ sed '$q' "$ltmain" >> "$cfgfile" \

16118

+ || (rm -f "$cfgfile"; exit 1)

16119

16120

- _LT_PROG_XSI_SHELLFNS

16121

+ _LT_PROG_REPLACE_SHELLFNS

16122

16123

- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \

16124

- || (rm -f "$cfgfile"; exit 1)

16125

16126

- mv -f "$cfgfile" "$ofile" ||

16127

+ mv -f "$cfgfile" "$ofile" ||

16128

(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")

16129

chmod +x "$ofile"

16130

16131

@@ -831,11 +862,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)

16132

AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])

16133

AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])

16134

AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])

16135

+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])

16136

dnl aclocal-1.4 backwards compatibility:

16137

dnl AC_DEFUN([AC_LIBTOOL_CXX], [])

16138

dnl AC_DEFUN([AC_LIBTOOL_F77], [])

16139

dnl AC_DEFUN([AC_LIBTOOL_FC], [])

16140

dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])

16141

+dnl AC_DEFUN([AC_LIBTOOL_RC], [])

16142

16143

16144

# _LT_TAG_COMPILER

16145

@@ -940,6 +973,31 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK

16146

[lt_cv_ld_exported_symbols_list=no])

16147

LDFLAGS="$save_LDFLAGS"

16148

])

16149

+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],

16150

+ [lt_cv_ld_force_load=no

16151

+ cat > conftest.c << _LT_EOF

16152

+int forced_loaded() { return 2;}

16153

+_LT_EOF

16154

+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD

16155

+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD

16156

+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD

16157

+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD

16158

+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD

16159

+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD

16160

+ cat > conftest.c << _LT_EOF

16161

+int main() { return 0;}

16162

+_LT_EOF

16163

+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD

16164

+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err

16165

+ _lt_result=$?

16166

+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then

16167

+ lt_cv_ld_force_load=yes

16168

+ else

16169

+ cat conftest.err >&AS_MESSAGE_LOG_FD

16170

+ fi

16171

+ rm -f conftest.err libconftest.a conftest conftest.c

16172

+ rm -rf conftest.dSYM

16173

+ ])

16174

case $host_os in

16175

rhapsody* | darwin1.[[012]])

21369

16176

_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

21370

darwin1.*)

21371

_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

21372

- darwin*) # darwin 5.x on

21373

+ darwin*) # darwin 5.x on

21374

# if running on 10.5 or later, the deployment target defaults

21375

# to the OS version, if on x86, and 10.4, the deployment

21376

- # target defaults to 10.4. Don't you love it?

21377

+ # target defaults to 10.4. Don't you love it?

21378

case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in

21379

10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)

21380

_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

21381

@@ -990,7 +990,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],

21382

_LT_TAGVAR(whole_archive_flag_spec, $1)=''

16177

@@ -967,7 +1025,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK

16178

else

16179

_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'

16180

16181

- if test "$DSYMUTIL" != ":"; then

16182

+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then

16183

_lt_dsymutil='~$DSYMUTIL $lib || :'

16184

else

16185

_lt_dsymutil=

16186

@@ -987,7 +1045,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],

16187

_LT_TAGVAR(hardcode_direct, $1)=no

16188

_LT_TAGVAR(hardcode_automatic, $1)=yes

16189

_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported

16190

- _LT_TAGVAR(whole_archive_flag_spec, $1)=''

16191

+ if test "$lt_cv_ld_force_load" = "yes"; then

16192

+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'

16193

+ else

16194

+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''

16195

+ fi

21383

16196

_LT_TAGVAR(link_all_deplibs, $1)=yes

21384

16197

_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"

21385

- if test "$GCC" = "yes"; then

21386

+ case $cc_basename in

21387

+ ifort*) _lt_dar_can_shared=yes ;;

21388

+ *) _lt_dar_can_shared=$GCC ;;

21389

+ esac

21390

+ if test "$_lt_dar_can_shared" = "yes"; then

21391

output_verbose_link_cmd=echo

16198

case $cc_basename in

16199

@@ -995,7 +1057,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],

16200

*) _lt_dar_can_shared=$GCC ;;

16201

esac

16202

if test "$_lt_dar_can_shared" = "yes"; then

16203

- output_verbose_link_cmd=echo

16204

+ output_verbose_link_cmd=func_echo_all

21392

16205

_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"

21393

16206

_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

21394

@@ -1512,7 +1516,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d

21395

lt_cv_sys_max_cmd_len=-1;

16207

_LT_TAGVAR(archive_expsym_cmds, $1)="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}"

16208

@@ -1011,203 +1073,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],

16209

16210

])

16211

16212

-# _LT_SYS_MODULE_PATH_AIX

16213

-# -----------------------

16214

+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])

16215

+# ----------------------------------

16216

# Links a minimal program and checks the executable

16217

# for the system default hardcoded library path. In most cases,

16218

# this is /usr/lib:/lib, but when the MPI compilers are used

16219

# the location of the communication and MPI libs are included too.

16220

# If we don't find anything, use the default library path according

16221

# to the aix ld manual.

16222

+# Store the results from the different compilers for each TAGNAME.

16223

+# Allow to override them for all tags through lt_cv_aix_libpath.

16224

m4_defun([_LT_SYS_MODULE_PATH_AIX],

16225

[m4_require([_LT_DECL_SED])dnl

16226

-AC_LINK_IFELSE(AC_LANG_PROGRAM,[

16227

-lt_aix_libpath_sed='

16228

- /Import File Strings/,/^$/ {

16229

- /^0/ {

16230

- s/^0 *$.*$$/\1/

16231

- p

16232

- }

16233

- }'

16234

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

16235

-# Check for a 64-bit object if we didn't find anything.

16236

-if test -z "$aix_libpath"; then

16237

- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

16238

-fi],[])

16239

-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

16240

+if test "${lt_cv_aix_libpath+set}" = set; then

16241

+ aix_libpath=$lt_cv_aix_libpath

16242

+else

16243

+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],

16244

+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[

16245

+ lt_aix_libpath_sed='[

16246

+ /Import File Strings/,/^$/ {

16247

+ /^0/ {

16248

+ s/^0 *$[^ ]*$ *$/\1/

16249

+ p

16250

+ }

16251

+ }]'

16252

+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

16253

+ # Check for a 64-bit object if we didn't find anything.

16254

+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then

16255

+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

16256

+ fi],[])

16257

+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then

16258

+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"

16259

+ fi

16260

+ ])

16261

+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])

16262

+fi

16263

])# _LT_SYS_MODULE_PATH_AIX

16264

16265

16266

# _LT_SHELL_INIT(ARG)

16267

# -------------------

16268

m4_define([_LT_SHELL_INIT],

16269

-[ifdef([AC_DIVERSION_NOTICE],

16270

- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],

16271

- [AC_DIVERT_PUSH(NOTICE)])

16272

-$1

16273

-AC_DIVERT_POP

16274

-])# _LT_SHELL_INIT

16275

+[m4_divert_text([M4SH-INIT], [$1

16276

+])])# _LT_SHELL_INIT

16277

16278

16279

16280

# _LT_PROG_ECHO_BACKSLASH

16281

# -----------------------

16282

-# Add some code to the start of the generated configure script which

16283

-# will find an echo command which doesn't interpret backslashes.

16284

+# Find how we can fake an echo command that does not interpret backslash.

16285

+# In particular, with Autoconf 2.60 or later we add some code to the start

16286

+# of the generated configure script which will find a shell with a builtin

16287

+# printf (which we can use as an echo command).

16288

m4_defun([_LT_PROG_ECHO_BACKSLASH],

16289

-[_LT_SHELL_INIT([

16290

-# Check that we are running under the correct shell.

16291

-SHELL=${CONFIG_SHELL-/bin/sh}

16292

16293

-case X$lt_ECHO in

16294

-X*--fallback-echo)

16295

- # Remove one level of quotation (which was required for Make).

16296

- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`

16297

- ;;

16298

-esac

16299

16300

-ECHO=${lt_ECHO-echo}

16301

-if test "X[$]1" = X--no-reexec; then

16302

- # Discard the --no-reexec flag, and continue.

16303

- shift

16304

-elif test "X[$]1" = X--fallback-echo; then

16305

- # Avoid inline document here, it may be left over

16306

- :

16307

-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then

16308

- # Yippee, $ECHO works!

16309

- :

16310

+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

16311

+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO

16312

+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

16313

16314

+AC_MSG_CHECKING([how to print strings])

16315

+# Test print first, because it will be a builtin if present.

16316

+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

16317

+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then

16318

+ ECHO='print -r --'

16319

+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

16320

+ ECHO='printf %s\n'

16321

else

16322

- # Restart under the correct shell.

16323

- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}

16324

-fi

16325

16326

-if test "X[$]1" = X--fallback-echo; then

16327

- # used as fallback echo

16328

- shift

16329

- cat <<_LT_EOF

16330

-[$]*

16331

-_LT_EOF

16332

- exit 0

16333

+ # Use this function as a fallback that always works.

16334

+ func_fallback_echo ()

16335

+ {

16336

+ eval 'cat <<_LTECHO_EOF

16337

+$[]1

16338

+_LTECHO_EOF'

16339

+ }

16340

+ ECHO='func_fallback_echo'

16341

16342

16343

-# The HP-UX ksh and POSIX shell print the target directory to stdout

16344

-# if CDPATH is set.

16345

-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

16346

16347

-if test -z "$lt_ECHO"; then

16348

- if test "X${echo_test_string+set}" != Xset; then

16349

- # find a string as large as possible, as long as the shell can cope with it

16350

- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do

16351

- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...

16352

- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&

16353

- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null

16354

- then

16355

- break

16356

- fi

16357

- done

16358

- fi

16359

16360

- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&

16361

- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&

16362

- test "X$echo_testing_string" = "X$echo_test_string"; then

16363

- :

16364

- else

16365

- # The Solaris, AIX, and Digital Unix default echo programs unquote

16366

- # backslashes. This makes it impossible to quote backslashes using

16367

- # echo "$something" | sed 's/\\/\\\\/g'

16368

- #

16369

- # So, first we look for a working echo in the user's PATH.

16370

16371

- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

16372

- for dir in $PATH /usr/ucb; do

16373

- IFS="$lt_save_ifs"

16374

- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&

16375

- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&

16376

- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&

16377

- test "X$echo_testing_string" = "X$echo_test_string"; then

16378

- ECHO="$dir/echo"

16379

- break

16380

- fi

16381

- done

16382

- IFS="$lt_save_ifs"

16383

16384

- if test "X$ECHO" = Xecho; then

16385

- # We didn't find a better echo, so look for alternatives.

16386

- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&

16387

- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&

16388

- test "X$echo_testing_string" = "X$echo_test_string"; then

16389

- # This shell has a builtin print -r that does the trick.

16390

- ECHO='print -r'

16391

- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&

16392

- test "X$CONFIG_SHELL" != X/bin/ksh; then

16393

- # If we have ksh, try running configure again with it.

16394

- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}

16395

- export ORIGINAL_CONFIG_SHELL

16396

- CONFIG_SHELL=/bin/ksh

16397

- export CONFIG_SHELL

16398

- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}

16399

- else

16400

- # Try using printf.

16401

- ECHO='printf %s\n'

16402

- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&

16403

- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&

16404

- test "X$echo_testing_string" = "X$echo_test_string"; then

16405

- # Cool, printf works

16406

- :

16407

- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&

16408

- test "X$echo_testing_string" = 'X\t' &&

16409

- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&

16410

- test "X$echo_testing_string" = "X$echo_test_string"; then

16411

- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL

16412

- export CONFIG_SHELL

16413

- SHELL="$CONFIG_SHELL"

16414

- export SHELL

16415

- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"

16416

- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&

16417

- test "X$echo_testing_string" = 'X\t' &&

16418

- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&

16419

- test "X$echo_testing_string" = "X$echo_test_string"; then

16420

- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"

16421

- else

16422

- # maybe with a smaller string...

16423

- prev=:

16424

16425

- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do

16426

- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null

16427

- then

16428

- break

16429

- fi

16430

- prev="$cmd"

16431

- done

16432

+# func_echo_all arg...

16433

+# Invoke $ECHO with all args, space-separated.

16434

+func_echo_all ()

16435

16436

+ $ECHO "$*"

16437

16438

16439

- if test "$prev" != 'sed 50q "[$]0"'; then

16440

- echo_test_string=`eval $prev`

16441

- export echo_test_string

16442

- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}

16443

- else

16444

- # Oops. We lost completely, so just stick with echo.

16445

- ECHO=echo

16446

- fi

16447

- fi

16448

- fi

16449

- fi

16450

- fi

16451

-fi

16452

+case "$ECHO" in

16453

+ printf*) AC_MSG_RESULT([printf]) ;;

16454

+ print*) AC_MSG_RESULT([print -r]) ;;

16455

+ *) AC_MSG_RESULT([cat]) ;;

16456

+esac

16457

16458

-# Copy echo and quote the copy suitably for passing to libtool from

16459

-# the Makefile, instead of quoting the original, which is used later.

16460

-lt_ECHO=$ECHO

16461

-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then

16462

- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"

16463

-fi

16464

+m4_ifdef([_AS_DETECT_SUGGESTED],

16465

+[_AS_DETECT_SUGGESTED([

16466

+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (

16467

+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

16468

+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO

16469

+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

16470

+ PATH=/empty FPATH=/empty; export PATH FPATH

16471

+ test "X`printf %s $ECHO`" = "X$ECHO" \

16472

+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])

16473

16474

-AC_SUBST(lt_ECHO)

16475

-])

16476

_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])

16477

-_LT_DECL([], [ECHO], [1],

16478

- [An echo program that does not interpret backslashes])

16479

+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])

16480

])# _LT_PROG_ECHO_BACKSLASH

16481

16482

16483

+# _LT_WITH_SYSROOT

16484

+# ----------------

16485

+AC_DEFUN([_LT_WITH_SYSROOT],

16486

+[AC_MSG_CHECKING([for sysroot])

16487

+AC_ARG_WITH([sysroot],

16488

+[ --with-sysroot[=DIR] Search for dependent libraries within DIR

16489

+ (or the compiler's sysroot if not specified).],

16490

+[], [with_sysroot=no])

16491

16492

+dnl lt_sysroot will always be passed unquoted. We quote it here

16493

+dnl in case the user passed a directory name.

16494

+lt_sysroot=

16495

+case ${with_sysroot} in #(

16496

+ yes)

16497

+ if test "$GCC" = yes; then

16498

+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`

16499

+ fi

16500

+ ;; #(

16501

+ /*)

16502

+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`

16503

+ ;; #(

16504

+ no|'')

16505

+ ;; #(

16506

+ *)

16507

+ AC_MSG_RESULT([${with_sysroot}])

16508

+ AC_MSG_ERROR([The sysroot must be an absolute path.])

16509

+ ;;

16510

+esac

16511

16512

+ AC_MSG_RESULT([${lt_sysroot:-no}])

16513

+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl

16514

+[dependent libraries, and in which our libraries should be installed.])])

16515

16516

# _LT_ENABLE_LOCK

16517

# ---------------

16518

m4_defun([_LT_ENABLE_LOCK],

16519

@@ -1236,7 +1237,7 @@ ia64-*-hpux*)

16520

;;

16521

*-*-irix6*)

16522

# Find out which ABI we are using.

16523

- echo '[#]line __oline__ "configure"' > conftest.$ac_ext

16524

+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext

16525

if AC_TRY_EVAL(ac_compile); then

16526

if test "$lt_cv_prog_gnu_ld" = yes; then

16527

case `/usr/bin/file conftest.$ac_objext` in

16528

@@ -1354,14 +1355,47 @@ need_locks="$enable_libtool_lock"

16529

])# _LT_ENABLE_LOCK

16530

16531

16532

+# _LT_PROG_AR

16533

+# -----------

16534

+m4_defun([_LT_PROG_AR],

16535

+[AC_CHECK_TOOLS(AR, [ar], false)

16536

+: ${AR=ar}

16537

+: ${AR_FLAGS=cru}

16538

+_LT_DECL([], [AR], [1], [The archiver])

16539

+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])

16540

16541

+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],

16542

+ [lt_cv_ar_at_file=no

16543

+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],

16544

+ [echo conftest.$ac_objext > conftest.lst

16545

+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'

16546

+ AC_TRY_EVAL([lt_ar_try])

16547

+ if test "$ac_status" -eq 0; then

16548

+ # Ensure the archiver fails upon bogus file names.

16549

+ rm -f conftest.$ac_objext libconftest.a

16550

+ AC_TRY_EVAL([lt_ar_try])

16551

+ if test "$ac_status" -ne 0; then

16552

+ lt_cv_ar_at_file=@

16553

+ fi

16554

+ fi

16555

+ rm -f conftest.* libconftest.a

16556

+ ])

16557

+ ])

16558

16559

+if test "x$lt_cv_ar_at_file" = xno; then

16560

+ archiver_list_spec=

16561

+else

16562

+ archiver_list_spec=$lt_cv_ar_at_file

16563

+fi

16564

+_LT_DECL([], [archiver_list_spec], [1],

16565

+ [How to feed a file listing to the archiver])

16566

+])# _LT_PROG_AR

16567

16568

16569

# _LT_CMD_OLD_ARCHIVE

16570

# -------------------

16571

m4_defun([_LT_CMD_OLD_ARCHIVE],

16572

-[AC_CHECK_TOOL(AR, ar, false)

16573

-test -z "$AR" && AR=ar

16574

-test -z "$AR_FLAGS" && AR_FLAGS=cru

16575

-_LT_DECL([], [AR], [1], [The archiver])

16576

-_LT_DECL([], [AR_FLAGS], [1])

16577

+[_LT_PROG_AR

16578

16579

AC_CHECK_TOOL(STRIP, strip, :)

16580

test -z "$STRIP" && STRIP=:

16581

@@ -1388,10 +1422,19 @@ if test -n "$RANLIB"; then

16582

esac

16583

old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"

16584

16585

16586

+case $host_os in

16587

+ darwin*)

16588

+ lock_old_archive_extraction=yes ;;

16589

+ *)

16590

+ lock_old_archive_extraction=no ;;

16591

+esac

16592

_LT_DECL([], [old_postinstall_cmds], [2])

16593

_LT_DECL([], [old_postuninstall_cmds], [2])

16594

_LT_TAGDECL([], [old_archive_cmds], [2],

16595

[Commands used to build an old-style archive])

16596

+_LT_DECL([], [lock_old_archive_extraction], [0],

16597

+ [Whether to use a lock for old archive extraction])

16598

])# _LT_CMD_OLD_ARCHIVE

16599

16600

16601

@@ -1416,15 +1459,15 @@ AC_CACHE_CHECK([$1], [$2],

16602

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

16603

-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \

16604

-e 's:$: $lt_compiler_flag:'`

16605

- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)

16606

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)

16607

(eval "$lt_compile" 2>conftest.err)

16608

ac_status=$?

16609

cat conftest.err >&AS_MESSAGE_LOG_FD

16610

- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD

16611

+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD

16612

if (exit $ac_status) && test -s "$ac_outfile"; then

16613

# The compiler can only warn and ignore the option if not recognized

16614

# So say no if there are warnings other than the usual output.

16615

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

16616

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp

16617

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

16618

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

16619

$2=yes

16620

@@ -1464,7 +1507,7 @@ AC_CACHE_CHECK([$1], [$2],

16621

if test -s conftest.err; then

16622

# Append any errors to the config.log.

16623

cat conftest.err 1>&AS_MESSAGE_LOG_FD

16624

- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp

16625

+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp

16626

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

16627

if diff conftest.exp conftest.er2 >/dev/null; then

16628

$2=yes

16629

@@ -1527,6 +1570,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d

16630

lt_cv_sys_max_cmd_len=8192;

21396

16631

;;

21397

16632

21398

- cygwin* | mingw*)

21399

+ cygwin* | mingw* | cegcc*)

21400

# On Win9x/ME, this test blows up -- it succeeds, but takes

21401

# about 5 minutes as the teststring grows exponentially.

21402

# Worse, since 9x/ME are not pre-emptively multitasking,

21403

@@ -1680,10 +1684,6 @@ else

16633

+ mint*)

16634

+ # On MiNT this can take a long time and run out of memory.

16635

+ lt_cv_sys_max_cmd_len=8192;

16636

+ ;;

16637

16638

amigaos*)

16639

# On AmigaOS with pdksh, this test takes hours, literally.

16640

# So we just punt and use a minimum line length of 8192.

16641

@@ -1591,8 +1639,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d

16642

# If test is not a shell built-in, we'll probably end up computing a

16643

# maximum length that is only half of the actual maximum length, but

16644

# we can't tell.

16645

- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \

16646

- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&

16647

+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \

16648

+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&

16649

test $i != 17 # 1/2 MB should be enough

16650

16651

i=`expr $i + 1`

16652

@@ -1643,7 +1691,7 @@ else

16653

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

16654

lt_status=$lt_dlunknown

16655

cat > conftest.$ac_ext <<_LT_EOF

16656

-[#line __oline__ "configure"

16657

+[#line $LINENO "configure"

16658

#include "confdefs.h"

16659

16660

#if HAVE_DLFCN_H

16661

@@ -1684,7 +1732,13 @@ else

21404

16662

# endif

21405

16663

#endif

21406

16664

21407

-#ifdef __cplusplus

21408

-extern "C" void exit (int);

21409

-#endif

21410

21411

void fnord() { int i=42;}

16665

-void fnord() { int i=42;}

16666

+/* When -fvisbility=hidden is used, assume the code has been annotated

16667

+ correspondingly for the symbols needed. */

16668

+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

16669

+int fnord () __attribute__((visibility("default")));

16670

+#endif

16671

16672

+int fnord () { return 42; }

21412

16673

int main ()

21413

16674

{

21414

@@ -1699,7 +1699,7 @@ int main ()

16675

void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

16676

@@ -1693,7 +1747,11 @@ int main ()

16677

if (self)

16678

{

16679

if (dlsym (self,"fnord")) status = $lt_dlno_uscore;

16680

- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

16681

+ else

16682

+ {

16683

+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

16684

+ else puts (dlerror ());

16685

+ }

16686

/* dlclose (self); */

16687

}

21415

16688

else

21416

puts (dlerror ());

21417

21418

- exit (status);

21419

+ return status;

21420

}]

21421

_LT_EOF

21422

if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then

21423

@@ -1738,7 +1738,7 @@ else

21424

lt_cv_dlopen_self=yes

21425

;;

21426

21427

- mingw* | pw32*)

21428

+ mingw* | pw32* | cegcc*)

21429

lt_cv_dlopen="LoadLibrary"

21430

lt_cv_dlopen_libs=

21431

;;

21432

@@ -2035,6 +2035,7 @@ m4_defun([_LT_SYS_DYNAMIC_LINKER],

21433

[AC_REQUIRE([AC_CANONICAL_HOST])dnl

21434

m4_require([_LT_DECL_EGREP])dnl

16689

@@ -1869,16 +1927,16 @@ AC_CACHE_CHECK([if $compiler supports -c

16690

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

16691

-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \

16692

-e 's:$: $lt_compiler_flag:'`

16693

- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)

16694

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)

16695

(eval "$lt_compile" 2>out/conftest.err)

16696

ac_status=$?

16697

cat out/conftest.err >&AS_MESSAGE_LOG_FD

16698

- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD

16699

+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD

16700

if (exit $ac_status) && test -s out/conftest2.$ac_objext

16701

then

16702

# The compiler can only warn and ignore the option if not recognized

16703

# So say no if there are warnings

16704

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp

16705

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp

16706

$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2

16707

if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then

16708

_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes

16709

@@ -2037,6 +2095,7 @@ m4_require([_LT_DECL_EGREP])dnl

21435

16710

m4_require([_LT_FILEUTILS_DEFAULTS])dnl

21436

+m4_require([_LT_DECL_OBJDUMP])dnl

16711

m4_require([_LT_DECL_OBJDUMP])dnl

21437

16712

m4_require([_LT_DECL_SED])dnl

16713

+m4_require([_LT_CHECK_SHELL_FEATURES])dnl

21438

16714

AC_MSG_CHECKING([dynamic linker characteristics])

21439

16715

m4_if([$1],

21440

@@ -2199,14 +2200,14 @@ bsdi[[45]]*)

21441

# libtool to hard-code these into programs

16716

[], [

16717

@@ -2045,16 +2104,23 @@ if test "$GCC" = yes; then

16718

darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;

16719

*) lt_awk_arg="/^libraries:/" ;;

16720

esac

16721

- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`

16722

- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then

16723

+ case $host_os in

16724

+ mingw* | cegcc*) lt_sed_strip_eq="s,=$[[A-Za-z]]:$,\1,g" ;;

16725

+ *) lt_sed_strip_eq="s,=/,/,g" ;;

16726

+ esac

16727

+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`

16728

+ case $lt_search_path_spec in

16729

+ *\;*)

16730

# if the path contains ";" then we assume it to be the separator

16731

# otherwise default to the standard path separator (i.e. ":") - it is

16732

# assumed that no part of a normal pathname contains ";" but that should

16733

# okay in the real world where ";" in dirpaths is itself problematic.

16734

- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`

16735

- else

16736

- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

16737

- fi

16738

+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`

16739

+ ;;

16740

+ *)

16741

+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`

16742

+ ;;

16743

+ esac

16744

# Ok, now we have the path, separated by spaces, we can step through it

16745

# and add multilib dir if necessary.

16746

lt_tmp_lt_search_path_spec=

16747

@@ -2067,7 +2133,7 @@ if test "$GCC" = yes; then

16748

lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

16749

16750

done

16751

- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '

16752

+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '

16753

BEGIN {RS=" "; FS="/|\n";} {

16754

lt_foo="";

16755

lt_count=0;

16756

@@ -2087,7 +2153,13 @@ BEGIN {RS=" "; FS="/|\n";} {

16757

if (lt_foo != "") { lt_freq[[lt_foo]]++; }

16758

if (lt_freq[[lt_foo]] == 1) { print lt_foo; }

16759

}'`

16760

- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`

16761

+ # AWK program above erroneously prepends '/' to C:/dos/paths

16762

+ # for these hosts.

16763

+ case $host_os in

16764

+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\

16765

+ $SED 's,/$[[A-Za-z]]:$,\1,g'` ;;

16766

+ esac

16767

+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`

16768

else

16769

sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

16770

fi])

16771

@@ -2175,7 +2247,7 @@ amigaos*)

16772

m68k)

16773

library_names_spec='$libname.ixlibrary $libname.a'

16774

# Create ${libname}_ixlibrary.a entries in /sys/libs.

16775

- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/$[[^/]]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'

16776

+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/$[[^/]]*$\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'

16777

;;

16778

esac

21442

16779

;;

21443

21444

-cygwin* | mingw* | pw32*)

21445

+cygwin* | mingw* | pw32* | cegcc*)

21446

version_type=windows

21447

shrext_cmds=".dll"

16780

@@ -2206,8 +2278,9 @@ cygwin* | mingw* | pw32* | cegcc*)

21448

16781

need_version=no

21449

16782

need_lib_prefix=no

21450

16783

21451

case $GCC,$host_os in

21452

- yes,cygwin* | yes,mingw* | yes,pw32*)

21453

+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

16784

- case $GCC,$host_os in

16785

- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

16786

+ case $GCC,$cc_basename in

16787

+ yes,*)

16788

+ # gcc

21454

16789

library_names_spec='$libname.dll.a'

21455

16790

# DLL is installed to $(libdir)/../bin by postinstall_cmds

21456

16791

postinstall_cmds='base_file=`basename \${file}`~

21457

@@ -2229,7 +2230,7 @@ cygwin* | mingw* | pw32*)

16792

@@ -2228,36 +2301,83 @@ cygwin* | mingw* | pw32* | cegcc*)

16793

cygwin*)

16794

# Cygwin DLLs use 'cyg' prefix rather than 'lib'

21458

16795

soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'

21459

sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

16796

- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

16797

+m4_if([$1], [],[

16798

+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])

21460

16799

;;

21461

- mingw*)

21462

+ mingw* | cegcc*)

16800

mingw* | cegcc*)

21463

16801

# MinGW DLLs use traditional 'lib' prefix

21464

16802

soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'

21465

sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

21466

@@ -2444,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*

21467

;;

21468

21469

# This must be Linux ELF.

21470

-linux* | k*bsd*-gnu)

21471

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

21472

version_type=linux

21473

need_lib_prefix=no

21474

need_version=no

21475

@@ -2484,6 +2485,18 @@ linux* | k*bsd*-gnu)

21476

dynamic_linker='GNU/Linux ld.so'

21477

;;

21478

21479

+netbsdelf*-gnu)

16803

- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

16804

- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then

16805

- # It is most probably a Windows format PATH printed by

16806

- # mingw gcc, but we are running on Cygwin. Gcc prints its search

16807

- # path with ; separators, and with drive letters. We can handle the

16808

- # drive letters (cygwin fileutils understands them), so leave them,

16809

- # especially as we might pass files found there to a mingw objdump,

16810

- # which wouldn't understand a cygwinified path. Ahh.

16811

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

16812

- else

16813

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

16814

- fi

16815

;;

16816

pw32*)

16817

# pw32 DLLs use 'pw' prefix rather than 'lib'

16818

library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'

16819

;;

16820

esac

16821

+ dynamic_linker='Win32 ld.exe'

16822

+ ;;

16823

16824

+ *,cl*)

16825

+ # Native MSVC

16826

+ libname_spec='$name'

16827

+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'

16828

+ library_names_spec='${libname}.dll.lib'

16829

16830

+ case $build_os in

16831

+ mingw*)

16832

+ sys_lib_search_path_spec=

16833

+ lt_save_ifs=$IFS

16834

+ IFS=';'

16835

+ for lt_path in $LIB

16836

+ do

16837

+ IFS=$lt_save_ifs

16838

+ # Let DOS variable expansion print the short 8.3 style file name.

16839

+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`

16840

+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"

16841

+ done

16842

+ IFS=$lt_save_ifs

16843

+ # Convert to MSYS style.

16844

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'`

16845

+ ;;

16846

+ cygwin*)

16847

+ # Convert to unix form, then to dos form, then back to unix form

16848

+ # but this time dos style (no spaces!) so that the unix form looks

16849

+ # like /cygdrive/c/PROGRA~1:/cygdr...

16850

+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`

16851

+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`

16852

+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

16853

+ ;;

16854

+ *)

16855

+ sys_lib_search_path_spec="$LIB"

16856

+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then

16857

+ # It is most probably a Windows format PATH.

16858

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

16859

+ else

16860

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

16861

+ fi

16862

+ # FIXME: find the short name or the path components, as spaces are

16863

+ # common. (e.g. "Program Files" -> "PROGRA~1")

16864

+ ;;

16865

+ esac

16866

16867

+ # DLL is installed to $(libdir)/../bin by postinstall_cmds

16868

+ postinstall_cmds='base_file=`basename \${file}`~

16869

+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~

16870

+ dldir=$destdir/`dirname \$dlpath`~

16871

+ test -d \$dldir || mkdir -p \$dldir~

16872

+ $install_prog $dir/$dlname \$dldir/$dlname'

16873

+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~

16874

+ dlpath=$dir/\$dldll~

16875

+ $RM \$dlpath'

16876

+ shlibpath_overrides_runpath=yes

16877

+ dynamic_linker='Win32 link.exe'

16878

;;

16879

16880

16881

+ # Assume MSVC wrapper

16882

library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'

16883

+ dynamic_linker='Win32 ld.exe'

16884

;;

16885

esac

16886

- dynamic_linker='Win32 ld.exe'

16887

# FIXME: first we should search . and the directory the executable is in

16888

shlibpath_var=PATH

16889

;;

16890

@@ -2341,6 +2461,20 @@ gnu*)

16891

library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

16892

soname_spec='${libname}${release}${shared_ext}$major'

16893

shlibpath_var=LD_LIBRARY_PATH

16894

+ shlibpath_overrides_runpath=no

16895

+ hardcode_into_libs=yes

16896

+ ;;

16897

16898

+haiku*)

21480

16899

+ version_type=linux

21481

16900

+ need_lib_prefix=no

21482

16901

+ need_version=no

21483

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

16902

+ dynamic_linker="$host_os runtime_loader"

16903

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

21484

16904

+ soname_spec='${libname}${release}${shared_ext}$major'

21485

+ shlibpath_var=LD_LIBRARY_PATH

21486

+ shlibpath_overrides_runpath=no

21487

+ hardcode_into_libs=yes

21488

+ dynamic_linker='NetBSD ld.elf_so'

21489

+ ;;

21490

21491

netbsd*)

21492

version_type=sunos

21493

need_lib_prefix=no

21494

@@ -2655,7 +2668,7 @@ tpf*)

21495

version_type=linux

21496

need_lib_prefix=no

21497

need_version=no

21498

- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

21499

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

16905

+ shlibpath_var=LIBRARY_PATH

16906

+ shlibpath_overrides_runpath=yes

16907

+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

16908

hardcode_into_libs=yes

16909

;;

16910

16911

@@ -2386,8 +2520,10 @@ hpux9* | hpux10* | hpux11*)

16912

soname_spec='${libname}${release}${shared_ext}$major'

16913

;;

16914

esac

16915

- # HP-UX runs *really* slowly unless shared libraries are mode 555.

16916

+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...

16917

postinstall_cmds='chmod 555 $lib'

16918

+ # or fails outright, so override atomically:

16919

+ install_override_mode=555

16920

;;

16921

16922

interix[[3-9]]*)

16923

@@ -2454,16 +2590,21 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)

16924

finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'

21500

16925

shlibpath_var=LD_LIBRARY_PATH

21501

16926

shlibpath_overrides_runpath=no

21502

hardcode_into_libs=yes

21503

@@ -2679,7 +2692,7 @@ variables_saved_for_relink="PATH $shlibp

16927

16928

# Some binutils ld are patched to set DT_RUNPATH

16929

- save_LDFLAGS=$LDFLAGS

16930

- save_libdir=$libdir

16931

- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \

16932

- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""

16933

- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],

16934

- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],

16935

- [shlibpath_overrides_runpath=yes])])

16936

- LDFLAGS=$save_LDFLAGS

16937

- libdir=$save_libdir

16938

+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],

16939

+ [lt_cv_shlibpath_overrides_runpath=no

16940

+ save_LDFLAGS=$LDFLAGS

16941

+ save_libdir=$libdir

16942

+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \

16943

+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""

16944

+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],

16945

+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],

16946

+ [lt_cv_shlibpath_overrides_runpath=yes])])

16947

+ LDFLAGS=$save_LDFLAGS

16948

+ libdir=$save_libdir

16949

+ ])

16950

+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath

16951

16952

# This implies no fast_install, which is unacceptable.

16953

# Some rework will be needed to allow for fast_install

16954

@@ -2472,7 +2613,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)

16955

16956

# Append ld.so.conf contents to the search path

16957

if test -f /etc/ld.so.conf; then

16958

- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

16959

+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`

16960

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

16961

16962

16963

@@ -2717,6 +2858,8 @@ _LT_DECL([], [library_names_spec], [1],

16964

The last name is the one that the linker finds with -lNAME]])

16965

_LT_DECL([], [soname_spec], [1],

16966

[[The coded name of the library, if different from the real name]])

16967

+_LT_DECL([], [install_override_mode], [1],

16968

+ [Permission mode override for installation of shared libraries])

16969

_LT_DECL([], [postinstall_cmds], [2],

16970

[Command to use after installation of a shared archive])

16971

_LT_DECL([], [postuninstall_cmds], [2],

16972

@@ -2829,6 +2972,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl

16973

AC_REQUIRE([AC_CANONICAL_BUILD])dnl

16974

m4_require([_LT_DECL_SED])dnl

16975

m4_require([_LT_DECL_EGREP])dnl

16976

+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl

16977

16978

AC_ARG_WITH([gnu-ld],

16979

[AS_HELP_STRING([--with-gnu-ld],

16980

@@ -2950,6 +3094,11 @@ case $reload_flag in

16981

esac

16982

reload_cmds='$LD$reload_flag -o $output$reload_objs'

16983

case $host_os in

16984

+ cygwin* | mingw* | pw32* | cegcc*)

16985

+ if test "$GCC" != yes; then

16986

+ reload_cmds=false

16987

+ fi

16988

+ ;;

16989

darwin*)

16990

if test "$GCC" = yes; then

16991

reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'

16992

@@ -2958,8 +3107,8 @@ case $host_os in

16993

16994

;;

16995

esac

16996

-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl

16997

-_LT_DECL([], [reload_cmds], [2])dnl

16998

+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl

16999

+_LT_TAGDECL([], [reload_cmds], [2])dnl

17000

])# _LT_CMD_RELOAD

17001

17002

17003

@@ -3011,16 +3160,18 @@ mingw* | pw32*)

17004

# Base MSYS/MinGW do not provide the 'file' command needed by

17005

# func_win32_libid shell function, so use a weaker test based on 'objdump',

17006

# unless we find 'file', for example because we are cross-compiling.

17007

- if ( file / ) >/dev/null 2>&1; then

17008

+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.

17009

+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then

17010

lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'

17011

lt_cv_file_magic_cmd='func_win32_libid'

17012

else

17013

- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'

17014

+ # Keep this pattern in sync with the one in func_win32_libid.

17015

+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

17016

lt_cv_file_magic_cmd='$OBJDUMP -f'

17017

17018

;;

17019

17020

-cegcc)

17021

+cegcc*)

17022

# use the weaker test based on 'objdump'. See mingw*.

17023

lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'

17024

lt_cv_file_magic_cmd='$OBJDUMP -f'

17025

@@ -3050,6 +3201,10 @@ gnu*)

17026

lt_cv_deplibs_check_method=pass_all

17027

;;

17028

17029

+haiku*)

17030

+ lt_cv_deplibs_check_method=pass_all

17031

+ ;;

17032

17033

hpux10.20* | hpux11*)

17034

lt_cv_file_magic_cmd=/usr/bin/file

17035

case $host_cpu in

17036

@@ -3058,11 +3213,11 @@ hpux10.20* | hpux11*)

17037

lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so

17038

;;

17039

hppa*64*)

17040

- [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]']

17041

+ [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]']

17042

lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl

17043

;;

17044

17045

- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'

17046

+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'

17047

lt_cv_file_magic_test_file=/usr/lib/libc.sl

17048

;;

17049

esac

17050

@@ -3162,6 +3317,21 @@ tpf*)

17051

;;

17052

esac

17053

])

17054

17055

+file_magic_glob=

17056

+want_nocaseglob=no

17057

+if test "$build" = "$host"; then

17058

+ case $host_os in

17059

+ mingw* | pw32*)

17060

+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then

17061

+ want_nocaseglob=yes

17062

+ else

17063

+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/[[\1]]\/[[\1]]\/g;/g"`

17064

+ fi

17065

+ ;;

17066

+ esac

17067

+fi

17068

17069

file_magic_cmd=$lt_cv_file_magic_cmd

17070

deplibs_check_method=$lt_cv_deplibs_check_method

17071

test -z "$deplibs_check_method" && deplibs_check_method=unknown

17072

@@ -3169,7 +3339,11 @@ test -z "$deplibs_check_method" && depli

17073

_LT_DECL([], [deplibs_check_method], [1],

17074

[Method to check whether dependent libraries are shared objects])

17075

_LT_DECL([], [file_magic_cmd], [1],

17076

- [Command to use when deplibs_check_method == "file_magic"])

17077

+ [Command to use when deplibs_check_method = "file_magic"])

17078

+_LT_DECL([], [file_magic_glob], [1],

17079

+ [How to find potential files when deplibs_check_method = "file_magic"])

17080

+_LT_DECL([], [want_nocaseglob], [1],

17081

+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])

17082

])# _LT_CHECK_MAGIC_METHOD

17083

17084

17085

@@ -3226,7 +3400,19 @@ if test "$lt_cv_path_NM" != "no"; then

17086

NM="$lt_cv_path_NM"

17087

else

17088

# Didn't find any BSD compatible name lister, look for dumpbin.

17089

- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)

17090

+ if test -n "$DUMPBIN"; then :

17091

+ # Let the user override the test.

17092

+ else

17093

+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)

17094

+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in

17095

+ *COFF*)

17096

+ DUMPBIN="$DUMPBIN -symbols"

17097

+ ;;

17098

+ *)

17099

+ DUMPBIN=:

17100

+ ;;

17101

+ esac

17102

+ fi

17103

AC_SUBST([DUMPBIN])

17104

if test "$DUMPBIN" != ":"; then

17105

NM="$DUMPBIN"

17106

@@ -3239,13 +3425,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-co

17107

AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],

17108

[lt_cv_nm_interface="BSD nm"

17109

echo "int some_variable = 0;" > conftest.$ac_ext

17110

- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)

17111

+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)

17112

(eval "$ac_compile" 2>conftest.err)

17113

cat conftest.err >&AS_MESSAGE_LOG_FD

17114

- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)

17115

+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)

17116

(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

17117

cat conftest.err >&AS_MESSAGE_LOG_FD

17118

- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)

17119

+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)

17120

cat conftest.out >&AS_MESSAGE_LOG_FD

17121

if $GREP 'External.*some_variable' conftest.out > /dev/null; then

17122

lt_cv_nm_interface="MS dumpbin"

17123

@@ -3260,6 +3446,67 @@ dnl aclocal-1.4 backwards compatibility:

17124

dnl AC_DEFUN([AM_PROG_NM], [])

17125

dnl AC_DEFUN([AC_PROG_NM], [])

17126

17127

+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB

17128

+# --------------------------------

17129

+# how to determine the name of the shared library

17130

+# associated with a specific link library.

17131

+# -- PORTME fill in with the dynamic library characteristics

17132

+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],

17133

+[m4_require([_LT_DECL_EGREP])

17134

+m4_require([_LT_DECL_OBJDUMP])

17135

+m4_require([_LT_DECL_DLLTOOL])

17136

+AC_CACHE_CHECK([how to associate runtime and link libraries],

17137

+lt_cv_sharedlib_from_linklib_cmd,

17138

+[lt_cv_sharedlib_from_linklib_cmd='unknown'

17139

17140

+case $host_os in

17141

+cygwin* | mingw* | pw32* | cegcc*)

17142

+ # two different shell functions defined in ltmain.sh

17143

+ # decide which to use based on capabilities of $DLLTOOL

17144

+ case `$DLLTOOL --help 2>&1` in

17145

+ *--identify-strict*)

17146

+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib

17147

+ ;;

17148

+ *)

17149

+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback

17150

+ ;;

17151

+ esac

17152

+ ;;

17153

+*)

17154

+ # fallback: assume linklib IS sharedlib

17155

+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"

17156

+ ;;

17157

+esac

17158

+])

17159

+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd

17160

+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO

17161

17162

+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],

17163

+ [Command to associate shared and link libraries])

17164

+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB

17165

17166

17167

+# _LT_PATH_MANIFEST_TOOL

17168

+# ----------------------

17169

+# locate the manifest tool

17170

+m4_defun([_LT_PATH_MANIFEST_TOOL],

17171

+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)

17172

+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt

17173

+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],

17174

+ [lt_cv_path_mainfest_tool=no

17175

+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD

17176

+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out

17177

+ cat conftest.err >&AS_MESSAGE_LOG_FD

17178

+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then

17179

+ lt_cv_path_mainfest_tool=yes

17180

+ fi

17181

+ rm -f conftest*])

17182

+if test "x$lt_cv_path_mainfest_tool" != xyes; then

17183

+ MANIFEST_TOOL=:

17184

+fi

17185

+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl

17186

+])# _LT_PATH_MANIFEST_TOOL

17187

17188

17189

# LT_LIB_M

17190

# --------

17191

@@ -3268,7 +3515,7 @@ AC_DEFUN([LT_LIB_M],

17192

[AC_REQUIRE([AC_CANONICAL_HOST])dnl

17193

LIBM=

17194

case $host in

17195

-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)

17196

17197

# These system don't have libm, or don't need it

17198

;;

17199

*-ncr-sysv4.3*)

17200

@@ -3296,7 +3543,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],

17201

_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=

17202

21504

17203

if test "$GCC" = yes; then

21505

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

21506

21507

21508

21509

if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then

21510

sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

21511

21512

@@ -2956,6 +2969,7 @@ _LT_DECL([], [reload_cmds], [2])dnl

21513

# -- PORTME fill in with the dynamic library characteristics

21514

m4_defun([_LT_CHECK_MAGIC_METHOD],

21515

[m4_require([_LT_DECL_EGREP])

21516

+m4_require([_LT_DECL_OBJDUMP])

21517

AC_CACHE_CHECK([how to recognize dependent libraries],

21518

lt_cv_deplibs_check_method,

21519

[lt_cv_file_magic_cmd='$MAGIC_CMD'

21520

@@ -3006,6 +3020,12 @@ mingw* | pw32*)

17204

- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'

17205

+ case $cc_basename in

17206

+ nvcc*)

17207

+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;

17208

+ *)

17209

+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;

17210

+ esac

17211

17212

_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],

17213

lt_cv_prog_compiler_rtti_exceptions,

17214

@@ -3313,6 +3565,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_

17215

m4_defun([_LT_CMD_GLOBAL_SYMBOLS],

17216

[AC_REQUIRE([AC_CANONICAL_HOST])dnl

17217

AC_REQUIRE([AC_PROG_CC])dnl

17218

+AC_REQUIRE([AC_PROG_AWK])dnl

17219

AC_REQUIRE([LT_PATH_NM])dnl

17220

AC_REQUIRE([LT_PATH_LD])dnl

17221

m4_require([_LT_DECL_SED])dnl

17222

@@ -3380,8 +3633,8 @@ esac

17223

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

17224

17225

# Transform an extracted symbol line into symbol name and symbol address

17226

-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (void *) \&\2},/p'"

17227

-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'"

17228

+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (void *) \&\2},/p'"

17229

+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'"

17230

17231

# Handle CRLF in mingw tool chain

17232

opt_cr=

17233

@@ -3417,6 +3670,7 @@ for ac_symprfx in "" "_"; do

17234

else

17235

lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"

21521

17236

21522

;;

21523

21524

+cegcc)

21525

+ # use the weaker test based on 'objdump'. See mingw*.

21526

+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'

21527

+ lt_cv_file_magic_cmd='$OBJDUMP -f'

21528

+ ;;

21529

21530

darwin* | rhapsody*)

21531

lt_cv_deplibs_check_method=pass_all

21532

;;

21533

@@ -3064,11 +3084,11 @@ irix5* | irix6* | nonstopux*)

21534

;;

21535

21536

# This must be Linux ELF.

21537

-linux* | k*bsd*-gnu)

21538

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

21539

lt_cv_deplibs_check_method=pass_all

21540

;;

21541

21542

-netbsd*)

21543

+netbsd* | netbsdelf*-gnu)

21544

if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then

21545

lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'

21546

else

21547

@@ -3317,7 +3337,7 @@ case $host_os in

21548

aix*)

21549

symcode='[[BCDT]]'

21550

;;

21551

-cygwin* | mingw* | pw32*)

21552

+cygwin* | mingw* | pw32* | cegcc*)

21553

symcode='[[ABCDGISTW]]'

21554

;;

21555

hpux*)

21556

@@ -3563,7 +3583,7 @@ m4_if([$1], [CXX], [

21557

beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

21558

# PIC is the default for these OSes.

21559

;;

21560

- mingw* | cygwin* | os2* | pw32*)

21561

+ mingw* | cygwin* | os2* | pw32* | cegcc*)

21562

# This hack is so that the source file can tell whether it is being

21563

# built for inclusion in a dll (and should export symbols for example).

21564

# Although the cygwin gcc ignores -fPIC, still need this for old-style

21565

@@ -3590,10 +3610,11 @@ m4_if([$1], [CXX], [

21566

21567

;;

21568

hpux*)

21569

- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but

21570

- # not for PA HP-UX.

21571

+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit

21572

+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

21573

+ # sets the default TLS model and affects inlining.

21574

case $host_cpu in

21575

- hppa*64*|ia64*)

21576

+ hppa*64*)

21577

;;

21578

21579

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

21580

@@ -3684,19 +3705,26 @@ m4_if([$1], [CXX], [

21581

;;

17237

+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

17238

17239

# Check to see that the pipe works correctly.

17240

pipe_works=no

17241

@@ -3438,7 +3692,7 @@ _LT_EOF

17242

if AC_TRY_EVAL(ac_compile); then

17243

# Now try to grab the symbols.

17244

nlist=conftest.nm

17245

- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then

17246

+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then

17247

# Try sorting and uniquifying the output.

17248

if sort "$nlist" | uniq > "$nlist"T; then

17249

mv -f "$nlist"T "$nlist"

17250

@@ -3450,6 +3704,18 @@ _LT_EOF

17251

if $GREP ' nm_test_var$' "$nlist" >/dev/null; then

17252

if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

17253

cat <<_LT_EOF > conftest.$ac_ext

17254

+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */

17255

+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)

17256

+/* DATA imports from DLLs on WIN32 con't be const, because runtime

17257

+ relocations are performed -- see ld's documentation on pseudo-relocs. */

17258

+# define LT@&t@_DLSYM_CONST

17259

+#elif defined(__osf__)

17260

+/* This system does not cope well with relocations in const data. */

17261

+# define LT@&t@_DLSYM_CONST

17262

+#else

17263

+# define LT@&t@_DLSYM_CONST const

17264

+#endif

17265

17266

#ifdef __cplusplus

17267

extern "C" {

17268

#endif

17269

@@ -3461,7 +3727,7 @@ _LT_EOF

17270

cat <<_LT_EOF >> conftest.$ac_ext

17271

17272

/* The mapping between symbol names and symbols. */

17273

-const struct {

17274

+LT@&t@_DLSYM_CONST struct {

17275

const char *name;

17276

void *address;

17277

}

17278

@@ -3487,15 +3753,15 @@ static const void *lt_preloaded_setup()

17279

_LT_EOF

17280

# Now try linking the two files.

17281

mv conftest.$ac_objext conftstm.$ac_objext

17282

- lt_save_LIBS="$LIBS"

17283

- lt_save_CFLAGS="$CFLAGS"

17284

+ lt_globsym_save_LIBS=$LIBS

17285

+ lt_globsym_save_CFLAGS=$CFLAGS

17286

LIBS="conftstm.$ac_objext"

17287

CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"

17288

if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then

17289

pipe_works=yes

17290

17291

- LIBS="$lt_save_LIBS"

17292

- CFLAGS="$lt_save_CFLAGS"

17293

+ LIBS=$lt_globsym_save_LIBS

17294

+ CFLAGS=$lt_globsym_save_CFLAGS

17295

else

17296

echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD

17297

17298

@@ -3528,6 +3794,13 @@ else

17299

AC_MSG_RESULT(ok)

17300

17301

17302

+# Response file support.

17303

+if test "$lt_cv_nm_interface" = "MS dumpbin"; then

17304

+ nm_file_list_spec='@'

17305

+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then

17306

+ nm_file_list_spec='@'

17307

+fi

17308

17309

_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],

17310

[Take the output of nm and produce a listing of raw symbols and C names])

17311

_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],

17312

@@ -3538,6 +3811,8 @@ _LT_DECL([global_symbol_to_c_name_addres

17313

_LT_DECL([global_symbol_to_c_name_address_lib_prefix],

17314

[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],

17315

[Transform the output of nm in a C name address pair when lib prefix is needed])

17316

+_LT_DECL([], [nm_file_list_spec], [1],

17317

+ [Specify filename containing input files for $NM])

17318

]) # _LT_CMD_GLOBAL_SYMBOLS

17319

17320

17321

@@ -3549,7 +3824,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=

17322

_LT_TAGVAR(lt_prog_compiler_pic, $1)=

17323

_LT_TAGVAR(lt_prog_compiler_static, $1)=

17324

17325

-AC_MSG_CHECKING([for $compiler option to produce PIC])

17326

m4_if([$1], [CXX], [

17327

# C++ specific cases for pic, static, wl, etc.

17328

if test "$GXX" = yes; then

17329

@@ -3600,6 +3874,11 @@ m4_if([$1], [CXX], [

17330

# DJGPP does not support shared libraries at all

17331

_LT_TAGVAR(lt_prog_compiler_pic, $1)=

17332

;;

17333

+ haiku*)

17334

+ # PIC is the default for Haiku.

17335

+ # The "-static" flag exists, but is broken.

17336

+ _LT_TAGVAR(lt_prog_compiler_static, $1)=

17337

+ ;;

17338

interix[[3-9]]*)

17339

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

17340

# Instead, we relocate shared libraries at runtime.

17341

@@ -3649,6 +3928,12 @@ m4_if([$1], [CXX], [

17342

;;

21582

17343

esac

21583

17344

;;

21584

- linux* | k*bsd*-gnu)

21585

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

17345

+ mingw* | cygwin* | os2* | pw32* | cegcc*)

17346

+ # This hack is so that the source file can tell whether it is being

17347

+ # built for inclusion in a dll (and should export symbols for example).

17348

+ m4_if([$1], [GCJ], [],

17349

+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])

17350

+ ;;

17351

dgux*)

21586

17352

case $cc_basename in

21587

KCC*)

21588

# KAI C++ Compiler

21589

_LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'

21590

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

17353

ec++*)

17354

@@ -3738,8 +4023,8 @@ m4_if([$1], [CXX], [

17355

_LT_TAGVAR(lt_prog_compiler_pic, $1)=

17356

_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

21591

17357

;;

21592

- icpc* | ecpc* )

21593

- # Intel C++

21594

+ ecpc* )

21595

+ # old Intel C++ for x86_64 which still supported -KPIC.

17358

- xlc* | xlC*)

17359

- # IBM XL 8.0 on PPC

17360

+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)

17361

+ # IBM XL 8.0, 9.0 on PPC and BlueGene

21596

17362

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

17363

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'

17364

_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'

17365

@@ -3801,7 +4086,7 @@ m4_if([$1], [CXX], [

17366

;;

17367

solaris*)

17368

case $cc_basename in

17369

- CC*)

17370

+ CC* | sunCC*)

17371

# Sun C++ 4.2, 5.x and Centerline C++

21597

17372

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

21598

_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'

21599

;;

21600

+ icpc* )

21601

+ # Intel C++, used to be incompatible with GCC.

21602

+ # ICC 10 doesn't accept -KPIC any more.

21603

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

21604

+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

21605

+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'

21606

+ ;;

21607

pgCC* | pgcpp*)

21608

# Portland Group C++ compiler

21609

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

21610

@@ -3741,7 +3769,7 @@ m4_if([$1], [CXX], [

21611

;;

21612

esac

21613

;;

21614

- netbsd*)

21615

+ netbsd* | netbsdelf*-gnu)

21616

;;

21617

*qnx* | *nto*)

21618

# QNX uses GNU C++, but need to define -shared option too, otherwise

21619

@@ -3862,7 +3890,7 @@ m4_if([$1], [CXX], [

21620

# PIC is the default for these OSes.

21621

;;

21622

21623

- mingw* | cygwin* | pw32* | os2*)

21624

+ mingw* | cygwin* | pw32* | os2* | cegcc*)

21625

# This hack is so that the source file can tell whether it is being

21626

# built for inclusion in a dll (and should export symbols for example).

21627

# Although the cygwin gcc ignores -fPIC, still need this for old-style

21628

@@ -3878,10 +3906,11 @@ m4_if([$1], [CXX], [

21629

;;

21630

17373

_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

17374

@@ -3905,6 +4190,12 @@ m4_if([$1], [CXX], [

17375

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'

17376

;;

17377

17378

+ haiku*)

17379

+ # PIC is the default for Haiku.

17380

+ # The "-static" flag exists, but is broken.

17381

+ _LT_TAGVAR(lt_prog_compiler_static, $1)=

17382

+ ;;

17383

21631

17384

hpux*)

21632

- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but

21633

- # not for PA HP-UX.

21634

+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit

21635

+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

21636

+ # sets the default TLS model and affects inlining.

21637

case $host_cpu in

21638

- hppa*64*|ia64*)

21639

+ hppa*64*)

21640

# +Z the default

17385

# PIC is the default for 64-bit PA HP-UX, but not for 32-bit

17386

# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

17387

@@ -3947,6 +4238,13 @@ m4_if([$1], [CXX], [

17388

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

17389

;;

17390

esac

17391

17392

+ case $cc_basename in

17393

+ nvcc*) # Cuda Compiler Driver 2.2

17394

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '

17395

+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'

17396

+ ;;

17397

+ esac

17398

else

17399

# PORTME Check for flag to pass linker flags through the system compiler.

17400

case $host_os in

17401

@@ -4010,7 +4308,13 @@ m4_if([$1], [CXX], [

17402

_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'

17403

_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'

21641

17404

;;

21642

21643

@@ -3931,7 +3960,7 @@ m4_if([$1], [CXX], [

21644

21645

;;

21646

21647

- mingw* | cygwin* | pw32* | os2*)

21648

+ mingw* | cygwin* | pw32* | os2* | cegcc*)

21649

# This hack is so that the source file can tell whether it is being

21650

# built for inclusion in a dll (and should export symbols for example).

21651

m4_if([$1], [GCJ], [],

21652

@@ -3960,13 +3989,27 @@ m4_if([$1], [CXX], [

21653

_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

21654

;;

21655

21656

- linux* | k*bsd*-gnu)

21657

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

21658

case $cc_basename in

21659

- icc* | ecc* | ifort*)

21660

+ # old Intel for x86_64 which still supported -KPIC.

21661

+ ecc*)

21662

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

21663

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

21664

_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'

21665

;;

21666

+ # icc used to be incompatible with GCC.

21667

+ # ICC 10 doesn't accept -KPIC any more.

21668

+ icc* | ifort*)

21669

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

21670

+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

21671

+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'

21672

+ ;;

21673

+ # Lahey Fortran 8.1.

21674

+ lf95*)

21675

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

21676

+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'

21677

+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'

17405

- pgcc* | pgf77* | pgf90* | pgf95*)

17406

+ nagfor*)

17407

+ # NAG Fortran compiler

17408

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'

17409

+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'

17410

+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

21678

17411

+ ;;

21679

pgcc* | pgf77* | pgf90* | pgf95*)

17412

+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)

21680

17413

# Portland Group compilers (*not* the Pentium gcc compiler,

21681

17414

# which looks to be a dead project)

21682

@@ -4148,9 +4191,12 @@ m4_if([$1], [CXX], [

17415

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

17416

@@ -4022,25 +4326,25 @@ m4_if([$1], [CXX], [

17417

# All Alpha code is PIC.

17418

_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

17419

;;

17420

- xl*)

17421

- # IBM XL C 8.0/Fortran 10.1 on PPC

17422

+ xl* | bgxl* | bgf* | mpixl*)

17423

+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene

17424

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

17425

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'

17426

_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'

17427

;;

17428

17429

case `$CC -V 2>&1 | sed 5q` in

17430

- *Sun\ C*)

17431

- # Sun C 5.9

17432

+ *Sun\ F* | *Sun*Fortran*)

17433

+ # Sun Fortran 8.3 passes all unrecognized flags to the linker

17434

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

17435

_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

17436

- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

17437

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''

17438

;;

17439

- *Sun\ F*)

17440

- # Sun Fortran 8.3 passes all unrecognized flags to the linker

17441

+ *Sun\ C*)

17442

+ # Sun C 5.9

17443

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

17444

_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

17445

- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''

17446

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

17447

;;

17448

esac

17449

;;

17450

@@ -4072,7 +4376,7 @@ m4_if([$1], [CXX], [

17451

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

17452

_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

17453

case $cc_basename in

17454

- f77* | f90* | f95*)

17455

+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

17456

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;

17457

17458

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;

17459

@@ -4129,9 +4433,11 @@ case $host_os in

17460

_LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"

17461

;;

17462

esac

17463

-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])

17464

-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],

17465

- [How to pass a linker flag through the compiler])

17466

17467

+AC_CACHE_CHECK([for $compiler option to produce PIC],

17468

+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],

17469

+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])

17470

+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)

17471

17472

17473

# Check to make sure the PIC flag actually works.

17474

@@ -4150,6 +4456,8 @@ fi

17475

_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],

17476

[Additional compiler flags for building library objects])

17477

17478

+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],

17479

+ [How to pass a linker flag through the compiler])

17480

17481

# Check to make sure the static flag actually works.

17482

17483

@@ -4170,6 +4478,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog

17484

m4_defun([_LT_LINKER_SHLIBS],

17485

[AC_REQUIRE([LT_PATH_LD])dnl

17486

AC_REQUIRE([LT_PATH_NM])dnl

17487

+m4_require([_LT_PATH_MANIFEST_TOOL])dnl

17488

m4_require([_LT_FILEUTILS_DEFAULTS])dnl

17489

m4_require([_LT_DECL_EGREP])dnl

17490

m4_require([_LT_DECL_SED])dnl

17491

@@ -4178,30 +4487,38 @@ m4_require([_LT_TAG_COMPILER])dnl

17492

AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])

17493

m4_if([$1], [CXX], [

17494

_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

17495

+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']

17496

case $host_os in

17497

aix[[4-9]]*)

17498

# If we're using GNU nm, then we don't want the "-C" option.

17499

# -C means demangle to AIX nm, but means don't demangle with GNU nm

17500

+ # Also, AIX nm treats weak defined symbols like other global defined

17501

+ # symbols, whereas GNU nm marks them as "W".

17502

if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then

17503

- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'

17504

+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'

17505

else

17506

_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'

17507

17508

;;

21683

17509

pw32*)

21684

17510

_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"

21685

;;

21686

- cygwin* | mingw*)

21687

+ cygwin* | mingw* | cegcc*)

21688

_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'

21689

;;

21690

+ linux* | k*bsd*-gnu)

21691

+ _LT_TAGVAR(link_all_deplibs, $1)=no

21692

+ ;;

17511

- ;;

17512

+ ;;

17513

cygwin* | mingw* | cegcc*)

17514

- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'

17515

- ;;

17516

- linux* | k*bsd*-gnu)

17517

+ case $cc_basename in

17518

+ cl*) ;;

17519

+ *)

17520

+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/;s/^.*[[ ]]__nm__$[[^ ]]*$[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'

17521

+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']

17522

+ ;;

17523

+ esac

17524

+ ;;

17525

+ linux* | k*bsd*-gnu | gnu*)

17526

_LT_TAGVAR(link_all_deplibs, $1)=no

17527

- ;;

17528

+ ;;

21693

17529

21694

17530

_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

21695

;;

21696

@@ -4200,7 +4246,7 @@ dnl Note also adjust exclude_expsyms for

21697

extract_expsyms_cmds=

21698

21699

case $host_os in

21700

- cygwin* | mingw* | pw32*)

21701

+ cygwin* | mingw* | pw32* | cegcc*)

21702

# FIXME: the MSVC++ port hasn't been tested in a loooong time

21703

# When not using gcc, we currently assume that we are using

21704

# Microsoft Visual C++.

21705

@@ -4215,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for

17531

- ;;

17532

+ ;;

17533

esac

17534

- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']

17535

], [

17536

runpath_var=

17537

_LT_TAGVAR(allow_undefined_flag, $1)=

17538

@@ -4261,13 +4578,39 @@ dnl Note also adjust exclude_expsyms for

21706

17539

openbsd*)

21707

17540

with_gnu_ld=no

21708

17541

;;

21709

+ linux* | k*bsd*-gnu)

21710

+ _LT_TAGVAR(link_all_deplibs, $1)=no

21711

+ ;;

17542

- linux* | k*bsd*-gnu)

17543

+ linux* | k*bsd*-gnu | gnu*)

17544

_LT_TAGVAR(link_all_deplibs, $1)=no

17545

;;

21712

17546

esac

21713

17547

21714

17548

_LT_TAGVAR(ld_shlibs, $1)=yes

21715

@@ -4236,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for

21716

21717

supports_anon_versioning=no

21718

case `$LD -v 2>&1` in

21719

+ *GNU\ gold*) supports_anon_versioning=yes ;;

21720

*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11

21721

*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...

21722

*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

21723

@@ -4287,7 +4337,7 @@ _LT_EOF

17549

17550

+ # On some targets, GNU ld is compatible enough with the native linker

17551

+ # that we're better off using the native interface for both.

17552

+ lt_use_gnu_ld_interface=no

17553

if test "$with_gnu_ld" = yes; then

17554

+ case $host_os in

17555

+ aix*)

17556

+ # The AIX port of GNU ld has always aspired to compatibility

17557

+ # with the native linker. However, as the warning in the GNU ld

17558

+ # block says, versions before 2.19.5* couldn't really create working

17559

+ # shared libraries, regardless of the interface used.

17560

+ case `$LD -v 2>&1` in

17561

+ *\ $GNU\ Binutils$\ 2.19.5*) ;;

17562

+ *\ $GNU\ Binutils$\ 2.[[2-9]]*) ;;

17563

+ *\ $GNU\ Binutils$\ [[3-9]]*) ;;

17564

+ *)

17565

+ lt_use_gnu_ld_interface=yes

17566

+ ;;

17567

+ esac

17568

+ ;;

17569

+ *)

17570

+ lt_use_gnu_ld_interface=yes

17571

+ ;;

17572

+ esac

17573

+ fi

17574

17575

+ if test "$lt_use_gnu_ld_interface" = yes; then

17576

# If archive_cmds runs LD, not CC, wlarc should be empty

17577

wlarc='${wl}'

17578

17579

@@ -4301,11 +4644,12 @@ dnl Note also adjust exclude_expsyms for

17580

_LT_TAGVAR(ld_shlibs, $1)=no

17581

cat <<_LT_EOF 1>&2

17582

17583

-*** Warning: the GNU linker, at least up to release 2.9.1, is reported

17584

+*** Warning: the GNU linker, at least up to release 2.19, is reported

17585

*** to be unable to reliably create shared libraries on AIX.

17586

*** Therefore, libtool is disabling shared libraries support. If you

17587

-*** really care for shared libraries, you may want to modify your PATH

17588

-*** so that a non-GNU linker is found, and then restart.

17589

+*** really care for shared libraries, you may want to install binutils

17590

+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.

17591

+*** You will then need to restart the configuration process.

17592

17593

_LT_EOF

21724

17594

21725

;;

21726

21727

- cygwin* | mingw* | pw32*)

21728

+ cygwin* | mingw* | pw32* | cegcc*)

17595

@@ -4341,10 +4685,12 @@ _LT_EOF

21729

17596

# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,

21730

17597

# as there is no search path for DLLs.

21731

17598

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'

21732

@@ -4327,7 +4377,7 @@ _LT_EOF

21733

_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

17599

+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'

17600

_LT_TAGVAR(allow_undefined_flag, $1)=unsupported

17601

_LT_TAGVAR(always_export_symbols, $1)=no

17602

_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

17603

17604

17605

+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']

17606

17607

if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

17608

_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

17609

@@ -4362,6 +4708,11 @@ _LT_EOF

17610

21734

17611

;;

21735

17612

21736

- gnu* | linux* | tpf* | k*bsd*-gnu)

21737

+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)

21738

tmp_diet=no

21739

if test "$host_os" = linux-dietlibc; then

21740

case $cc_basename in

21741

@@ -4353,6 +4403,9 @@ _LT_EOF

21742

tmp_addflag=' -i_dynamic -nofor_main' ;;

21743

ifc* | ifort*) # Intel Fortran compiler

21744

tmp_addflag=' -nofor_main' ;;

21745

+ lf95*) # Lahey Fortran 8.1

21746

+ _LT_TAGVAR(whole_archive_flag_spec, $1)=

21747

+ tmp_sharedflag='--shared' ;;

21748

xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)

17613

+ haiku*)

17614

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

17615

+ _LT_TAGVAR(link_all_deplibs, $1)=yes

17616

+ ;;

17617

17618

interix[[3-9]]*)

17619

_LT_TAGVAR(hardcode_direct, $1)=no

17620

_LT_TAGVAR(hardcode_shlibpath_var, $1)=no

17621

@@ -4387,15 +4738,16 @@ _LT_EOF

17622

if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \

17623

&& test "$tmp_diet" = no

17624

then

17625

- tmp_addflag=

17626

+ tmp_addflag=' $pic_flag'

17627

tmp_sharedflag='-shared'

17628

case $cc_basename,$host_cpu in

17629

pgcc*) # Portland Group C compiler

17630

- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'

17631

+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${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'

17632

tmp_addflag=' $pic_flag'

17633

;;

17634

- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers

17635

17636

+ pgf77* | pgf90* | pgf95* | pgfortran*)

17637

+ # Portland Group f77 and f90 compilers

17638

17639

tmp_addflag=' $pic_flag -Mnomain' ;;

17640

ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64

17641

tmp_addflag=' -i_dynamic' ;;

17642

@@ -4406,13 +4758,17 @@ _LT_EOF

17643

lf95*) # Lahey Fortran 8.1

17644

_LT_TAGVAR(whole_archive_flag_spec, $1)=

17645

tmp_sharedflag='--shared' ;;

17646

- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)

17647

+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)

21749

17648

tmp_sharedflag='-qmkshrobj'

21750

17649

tmp_addflag= ;;

21751

@@ -4394,7 +4447,7 @@ _LT_EOF

21752

21753

;;

17650

+ nvcc*) # Cuda Compiler Driver 2.2

17651

17652

+ _LT_TAGVAR(compiler_needs_object, $1)=yes

17653

+ ;;

17654

esac

17655

case `$CC -V 2>&1 | sed 5q` in

17656

*Sun\ C*) # Sun C 5.9

17657

- _LT_TAGVAR(whole_archive_flag_spec, $1)='${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'

17658

+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${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'

17659

_LT_TAGVAR(compiler_needs_object, $1)=yes

17660

tmp_sharedflag='-G' ;;

17661

*Sun\ F*) # Sun Fortran 8.3

17662

@@ -4428,17 +4784,17 @@ _LT_EOF

17663

21754

17664

21755

- netbsd*)

21756

+ netbsd* | netbsdelf*-gnu)

21757

if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

17665

case $cc_basename in

17666

- xlf*)

17667

+ xlf* | bgf* | bgxlf* | mpixlf*)

17668

# IBM XL Fortran 10.1 on PPC cannot create shared libs itself

17669

_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'

17670

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=

17671

_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'

17672

- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'

17673

+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

17674

if test "x$supports_anon_versioning" = xyes; then

17675

_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~

17676

cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~

17677

echo "local: *; };" >> $output_objdir/$libname.ver~

17678

- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

17679

+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

17680

17681

;;

17682

esac

17683

@@ -4452,8 +4808,8 @@ _LT_EOF

21758

17684

_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

21759

17685

wlarc=

21760

@@ -4569,6 +4622,7 @@ _LT_EOF

21761

if test "$aix_use_runtimelinking" = yes; then

21762

shared_flag="$shared_flag "'${wl}-G'

17686

else

17687

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

17688

- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

17689

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

17690

+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

17691

17692

;;

17693

17694

@@ -4471,8 +4827,8 @@ _LT_EOF

17695

17696

_LT_EOF

17697

elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then

17698

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

17699

- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

17700

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

17701

+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

17702

else

17703

_LT_TAGVAR(ld_shlibs, $1)=no

17704

17705

@@ -4518,8 +4874,8 @@ _LT_EOF

17706

17707

17708

if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then

17709

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

17710

- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

17711

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

17712

+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

17713

else

17714

_LT_TAGVAR(ld_shlibs, $1)=no

17715

17716

@@ -4559,8 +4915,10 @@ _LT_EOF

17717

else

17718

# If we're using GNU nm, then we don't want the "-C" option.

17719

# -C means demangle to AIX nm, but means don't demangle with GNU nm

17720

+ # Also, AIX nm treats weak defined symbols like other global

17721

+ # defined symbols, whereas GNU nm marks them as "W".

17722

if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then

17723

17724

17725

else

17726

21763

17727

21764

+ _LT_TAGVAR(link_all_deplibs, $1)=no

17728

@@ -4648,9 +5006,9 @@ _LT_EOF

17729

_LT_TAGVAR(allow_undefined_flag, $1)='-berok'

17730

# Determine the default libpath from the value encoded in an

17731

# empty executable.

17732

- _LT_SYS_MODULE_PATH_AIX

17733

+ _LT_SYS_MODULE_PATH_AIX([$1])

17734

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"

17735

- _LT_TAGVAR(archive_expsym_cmds, $1)='$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"

17736

+ _LT_TAGVAR(archive_expsym_cmds, $1)='$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"

21765

17737

else

21766

# not using gcc

21767

17738

if test "$host_cpu" = ia64; then

21768

@@ -4584,6 +4638,7 @@ _LT_EOF

21769

21770

21771

21772

+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'

21773

# It seems that -bexpall does not export symbols beginning with

21774

# underscore (_), so it is better to generate a list of symbols to export.

21775

_LT_TAGVAR(always_export_symbols, $1)=yes

21776

@@ -4638,7 +4693,7 @@ _LT_EOF

21777

_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic

21778

;;

21779

21780

- cygwin* | mingw* | pw32*)

21781

+ cygwin* | mingw* | pw32* | cegcc*)

21782

# When not using gcc, we currently assume that we are using

17739

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'

17740

@@ -4659,14 +5017,19 @@ _LT_EOF

17741

else

17742

# Determine the default libpath from the value encoded in an

17743

# empty executable.

17744

- _LT_SYS_MODULE_PATH_AIX

17745

+ _LT_SYS_MODULE_PATH_AIX([$1])

17746

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"

17747

# Warning - without using the other run time loading flags,

17748

# -berok will link without error, but may produce a broken library.

17749

_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'

17750

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'

17751

- # Exported symbols can be pulled into shared objects from archives

17752

- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'

17753

+ if test "$with_gnu_ld" = yes; then

17754

+ # We only use this code for GNU lds that support --whole-archive.

17755

+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'

17756

+ else

17757

+ # Exported symbols can be pulled into shared objects from archives

17758

+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'

17759

+ fi

17760

_LT_TAGVAR(archive_cmds_need_lc, $1)=yes

17761

# This is similar to how AIX traditionally builds its shared libraries.

17762

_LT_TAGVAR(archive_expsym_cmds, $1)="\$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'

17763

@@ -4698,20 +5061,63 @@ _LT_EOF

21783

17764

# Microsoft Visual C++.

21784

17765

# hardcode_libdir_flag_spec is actually meaningless, as there is

21785

@@ -4742,7 +4797,7 @@ _LT_EOF

17766

# no search path for DLLs.

17767

- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '

17768

- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

17769

- # Tell ltmain to make .lib files, not .a files.

17770

- libext=lib

17771

- # Tell ltmain to make .dll files, not .so files.

17772

- shrext_cmds=".dll"

17773

- # FIXME: Setting linknames here is a bad hack.

17774

- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='

17775

- # The linker will automatically build a .lib file if we build a DLL.

17776

- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'

17777

- # FIXME: Should let the user specify the lib program.

17778

- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'

17779

- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'

17780

- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

17781

+ case $cc_basename in

17782

+ cl*)

17783

+ # Native MSVC

17784

+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '

17785

+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

17786

+ _LT_TAGVAR(always_export_symbols, $1)=yes

17787

+ _LT_TAGVAR(file_list_spec, $1)='@'

17788

+ # Tell ltmain to make .lib files, not .a files.

17789

+ libext=lib

17790

+ # Tell ltmain to make .dll files, not .so files.

17791

+ shrext_cmds=".dll"

17792

+ # FIXME: Setting linknames here is a bad hack.

17793

+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='

17794

+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

17795

+ sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;

17796

+ else

17797

+ sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;

17798

+ fi~

17799

+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~

17800

+ linknames='

17801

+ # The linker will not automatically build a static lib if we build a DLL.

17802

+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'

17803

+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

17804

17805

+ # Don't use ranlib

17806

+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'

17807

+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~

17808

+ lt_tool_outputfile="@TOOL_OUTPUT@"~

17809

+ case $lt_outputfile in

17810

+ *.exe|*.EXE) ;;

17811

+ *)

17812

+ lt_outputfile="$lt_outputfile.exe"

17813

+ lt_tool_outputfile="$lt_tool_outputfile.exe"

17814

+ ;;

17815

+ esac~

17816

+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then

17817

+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;

17818

+ $RM "$lt_outputfile.manifest";

17819

+ fi'

17820

+ ;;

17821

+ *)

17822

+ # Assume MSVC wrapper

17823

+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '

17824

+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

17825

+ # Tell ltmain to make .lib files, not .a files.

17826

+ libext=lib

17827

+ # Tell ltmain to make .dll files, not .so files.

17828

+ shrext_cmds=".dll"

17829

+ # FIXME: Setting linknames here is a bad hack.

17830

+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='

17831

+ # The linker will automatically build a .lib file if we build a DLL.

17832

+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'

17833

+ # FIXME: Should let the user specify the lib program.

17834

+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'

17835

+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

17836

+ ;;

17837

+ esac

17838

;;

17839

17840

darwin* | rhapsody*)

17841

@@ -4749,7 +5155,7 @@ _LT_EOF

17842

17843

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

17844

freebsd* | dragonfly*)

17845

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

17846

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

17847

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

17848

_LT_TAGVAR(hardcode_direct, $1)=yes

17849

_LT_TAGVAR(hardcode_shlibpath_var, $1)=no

17850

@@ -4757,7 +5163,7 @@ _LT_EOF

17851

17852

hpux9*)

17853

if test "$GCC" = yes; then

17854

- _LT_TAGVAR(archive_cmds, $1)='$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'

17855

+ _LT_TAGVAR(archive_cmds, $1)='$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'

17856

else

17857

_LT_TAGVAR(archive_cmds, $1)='$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'

17858

17859

@@ -4772,8 +5178,8 @@ _LT_EOF

17860

;;

17861

17862

hpux10*)

17863

- if test "$GCC" = yes -a "$with_gnu_ld" = no; then

17864

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

17865

+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then

17866

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

17867

else

17868

_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

17869

17870

@@ -4791,16 +5197,16 @@ _LT_EOF

17871

;;

17872

17873

hpux11*)

17874

- if test "$GCC" = yes -a "$with_gnu_ld" = no; then

17875

+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then

17876

case $host_cpu in

17877

hppa*64*)

21786

17878

_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

21787

17879

;;

21788

17880

ia64*)

21789

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

21790

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

21791

;;

21792

21793

_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

21794

@@ -4806,7 +4861,7 @@ _LT_EOF

21795

_LT_TAGVAR(link_all_deplibs, $1)=yes

21796

;;

21797

21798

- netbsd*)

21799

+ netbsd* | netbsdelf*-gnu)

21800

if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

21801

_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

21802

else

21803

@@ -5527,6 +5582,7 @@ if test "$_lt_caught_CXX_error" != yes;

21804

21805

21806

21807

+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'

21808

# It seems that -bexpall does not export symbols beginning with

21809

# underscore (_), so it is better to generate a list of symbols to

21810

# export.

21811

@@ -5585,7 +5641,7 @@ if test "$_lt_caught_CXX_error" != yes;

21812

esac

21813

;;

21814

21815

- cygwin* | mingw* | pw32*)

21816

+ cygwin* | mingw* | pw32* | cegcc*)

21817

# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,

21818

# as there is no search path for DLLs.

21819

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'

21820

@@ -5805,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes;

21821

_LT_TAGVAR(inherit_rpath, $1)=yes

21822

;;

21823

21824

- linux* | k*bsd*-gnu)

21825

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

21826

case $cc_basename in

21827

KCC*)

21828

# Kuck and Associates, Inc. (KAI) C++ Compiler

21829

@@ -6970,6 +7026,18 @@ AC_SUBST([GREP])

21830

])

21831

21832

21833

+# _LT_DECL_OBJDUMP

21834

+# --------------

21835

+# If we don't have a new enough Autoconf to choose the best objdump

21836

+# available, choose the one first in the user's PATH.

21837

+m4_defun([_LT_DECL_OBJDUMP],

21838

+[AC_CHECK_TOOL(OBJDUMP, objdump, false)

21839

+test -z "$OBJDUMP" && OBJDUMP=objdump

21840

+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])

21841

+AC_SUBST([OBJDUMP])

17881

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

17882

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

17883

;;

17884

17885

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

17886

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

17887

;;

17888

esac

17889

else

17890

@@ -4812,7 +5218,14 @@ _LT_EOF

17891

_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

17892

;;

17893

17894

- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

17895

+ m4_if($1, [], [

17896

+ # Older versions of the 11.00 compiler do not understand -b yet

17897

+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)

17898

+ _LT_LINKER_OPTION([if $CC understands -b],

17899

+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],

17900

+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],

17901

+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],

17902

+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])

17903

;;

17904

esac

17905

17906

@@ -4840,19 +5253,34 @@ _LT_EOF

17907

17908

irix5* | irix6* | nonstopux*)

17909

if test "$GCC" = yes; then

17910

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

17911

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

17912

# Try to use the -exported_symbol ld option, if it does not

17913

# work, assume that -exports_file does not work either and

17914

# implicitly export all symbols.

17915

- save_LDFLAGS="$LDFLAGS"

17916

- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

17917

- AC_LINK_IFELSE(int foo(void) {},

17918

- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'

17919

- )

17920

- LDFLAGS="$save_LDFLAGS"

17921

+ # This should be the same for all languages, so no per-tag cache variable.

17922

+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],

17923

+ [lt_cv_irix_exported_symbol],

17924

+ [save_LDFLAGS="$LDFLAGS"

17925

+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

17926

+ AC_LINK_IFELSE(

17927

+ [AC_LANG_SOURCE(

17928

+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],

17929

+ [C++], [[int foo (void) { return 0; }]],

17930

+ [Fortran 77], [[

17931

+ subroutine foo

17932

+ end]],

17933

+ [Fortran], [[

17934

+ subroutine foo

17935

+ end]])])],

17936

+ [lt_cv_irix_exported_symbol=yes],

17937

+ [lt_cv_irix_exported_symbol=no])

17938

+ LDFLAGS="$save_LDFLAGS"])

17939

+ if test "$lt_cv_irix_exported_symbol" = yes; then

17940

+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'

17941

+ fi

17942

else

17943

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

17944

- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'

17945

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

17946

+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'

17947

17948

_LT_TAGVAR(archive_cmds_need_lc, $1)='no'

17949

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

17950

@@ -4914,17 +5342,17 @@ _LT_EOF

17951

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'

17952

_LT_TAGVAR(hardcode_minus_L, $1)=yes

17953

_LT_TAGVAR(allow_undefined_flag, $1)=unsupported

17954

- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'

17955

+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'

17956

_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'

17957

;;

17958

17959

osf3*)

17960

if test "$GCC" = yes; then

17961

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'

17962

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

17963

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

17964

else

17965

_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'

17966

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

17967

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

17968

17969

_LT_TAGVAR(archive_cmds_need_lc, $1)='no'

17970

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

17971

@@ -4934,13 +5362,13 @@ _LT_EOF

17972

osf4* | osf5*) # as osf3* with the addition of -msym flag

17973

if test "$GCC" = yes; then

17974

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'

17975

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

17976

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

17977

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

17978

else

17979

_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'

17980

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

17981

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

17982

_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~

17983

17984

17985

17986

# Both c and cxx compiler support -rpath directly

17987

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'

17988

@@ -4953,9 +5381,9 @@ _LT_EOF

17989

_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'

17990

if test "$GCC" = yes; then

17991

wlarc='${wl}'

17992

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

17993

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

17994

_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

17995

- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'

17996

+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'

17997

else

17998

case `$CC -V 2>&1` in

17999

*"Compilers 5.0"*)

18000

@@ -5131,36 +5559,38 @@ x|xyes)

18001

# Test whether the compiler implicitly links with -lc since on some

18002

# systems, -lgcc has to come before -lc. If gcc already passes -lc

18003

# to ld, don't add -lc before -lgcc.

18004

- AC_MSG_CHECKING([whether -lc should be explicitly linked in])

18005

- $RM conftest*

18006

- echo "$lt_simple_compile_test_code" > conftest.$ac_ext

18007

18008

- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then

18009

- soname=conftest

18010

- lib=conftest

18011

- libobjs=conftest.$ac_objext

18012

- deplibs=

18013

- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)

18014

- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)

18015

- compiler_flags=-v

18016

- linker_flags=-v

18017

- verstring=

18018

- output_objdir=.

18019

- libname=conftest

18020

- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)

18021

- _LT_TAGVAR(allow_undefined_flag, $1)=

18022

- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)

18023

- then

18024

- _LT_TAGVAR(archive_cmds_need_lc, $1)=no

18025

- else

18026

- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes

18027

- fi

18028

- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag

18029

- else

18030

- cat conftest.err 1>&5

18031

- fi

18032

- $RM conftest*

18033

- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])

18034

+ AC_CACHE_CHECK([whether -lc should be explicitly linked in],

18035

+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),

18036

+ [$RM conftest*

18037

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

18038

18039

+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then

18040

+ soname=conftest

18041

+ lib=conftest

18042

+ libobjs=conftest.$ac_objext

18043

+ deplibs=

18044

+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)

18045

+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)

18046

+ compiler_flags=-v

18047

+ linker_flags=-v

18048

+ verstring=

18049

+ output_objdir=.

18050

+ libname=conftest

18051

+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)

18052

+ _LT_TAGVAR(allow_undefined_flag, $1)=

18053

+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)

18054

+ then

18055

+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no

18056

+ else

18057

+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes

18058

+ fi

18059

+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag

18060

+ else

18061

+ cat conftest.err 1>&5

18062

+ fi

18063

+ $RM conftest*

18064

+ ])

18065

+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)

18066

;;

18067

esac

18068

18069

@@ -5225,8 +5655,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],

18070

to runtime path list])

18071

_LT_TAGDECL([], [link_all_deplibs], [0],

18072

[Whether libtool must link a program against all its dependency libraries])

18073

-_LT_TAGDECL([], [fix_srcfile_path], [1],

18074

- [Fix the shell variable $srcfile for the compiler])

18075

_LT_TAGDECL([], [always_export_symbols], [0],

18076

[Set to "yes" if exported symbols are required])

18077

_LT_TAGDECL([], [export_symbols_cmds], [2],

18078

@@ -5237,6 +5665,8 @@ _LT_TAGDECL([], [include_expsyms], [1],

18079

[Symbols that must always be exported])

18080

_LT_TAGDECL([], [prelink_cmds], [2],

18081

[Commands necessary for linking programs (against libraries) with templates])

18082

+_LT_TAGDECL([], [postlink_cmds], [2],

18083

+ [Commands necessary for finishing linking programs])

18084

_LT_TAGDECL([], [file_list_spec], [1],

18085

[Specify filename containing input files])

18086

dnl FIXME: Not yet implemented

18087

@@ -5330,37 +5760,22 @@ CC="$lt_save_CC"

18088

])# _LT_LANG_C_CONFIG

18089

18090

18091

-# _LT_PROG_CXX

18092

-# ------------

18093

-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++

18094

-# compiler, we have our own version here.

18095

-m4_defun([_LT_PROG_CXX],

18096

18097

-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])

18098

-AC_PROG_CXX

18099

-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

18100

- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

18101

- (test "X$CXX" != "Xg++"))) ; then

18102

- AC_PROG_CXXCPP

18103

-else

18104

- _lt_caught_CXX_error=yes

18105

-fi

18106

-popdef([AC_MSG_ERROR])

18107

-])# _LT_PROG_CXX

18108

18109

-dnl aclocal-1.4 backwards compatibility:

18110

-dnl AC_DEFUN([_LT_PROG_CXX], [])

18111

18112

18113

# _LT_LANG_CXX_CONFIG([TAG])

18114

# --------------------------

18115

# Ensure that the configuration variables for a C++ compiler are suitably

18116

# defined. These variables are subsequently used by _LT_CONFIG to write

18117

# the compiler configuration to `libtool'.

18118

m4_defun([_LT_LANG_CXX_CONFIG],

18119

-[AC_REQUIRE([_LT_PROG_CXX])dnl

18120

-m4_require([_LT_FILEUTILS_DEFAULTS])dnl

18121

+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl

18122

m4_require([_LT_DECL_EGREP])dnl

18123

+m4_require([_LT_PATH_MANIFEST_TOOL])dnl

18124

+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

18125

+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

18126

+ (test "X$CXX" != "Xg++"))) ; then

18127

+ AC_PROG_CXXCPP

18128

+else

18129

+ _lt_caught_CXX_error=yes

18130

+fi

18131

18132

AC_LANG_PUSH(C++)

18133

_LT_TAGVAR(archive_cmds_need_lc, $1)=no

18134

@@ -5382,6 +5797,8 @@ _LT_TAGVAR(module_cmds, $1)=

18135

_LT_TAGVAR(module_expsym_cmds, $1)=

18136

_LT_TAGVAR(link_all_deplibs, $1)=unknown

18137

_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds

18138

+_LT_TAGVAR(reload_flag, $1)=$reload_flag

18139

+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds

18140

_LT_TAGVAR(no_undefined_flag, $1)=

18141

_LT_TAGVAR(whole_archive_flag_spec, $1)=

18142

_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no

18143

@@ -5413,6 +5830,7 @@ if test "$_lt_caught_CXX_error" != yes;

18144

18145

# Allow CC to be a program name with arguments.

18146

lt_save_CC=$CC

18147

+ lt_save_CFLAGS=$CFLAGS

18148

lt_save_LD=$LD

18149

lt_save_GCC=$GCC

18150

GCC=$GXX

18151

@@ -5430,6 +5848,7 @@ if test "$_lt_caught_CXX_error" != yes;

18152

18153

test -z "${LDCXX+set}" || LD=$LDCXX

18154

CC=${CXX-"c++"}

18155

+ CFLAGS=$CXXFLAGS

18156

compiler=$CC

18157

_LT_TAGVAR(compiler, $1)=$CC

18158

_LT_CC_BASENAME([$compiler])

18159

@@ -5451,8 +5870,8 @@ if test "$_lt_caught_CXX_error" != yes;

18160

# Check if GNU C++ uses GNU ld as the underlying linker, since the

18161

# archiving commands below assume that GNU ld is being used.

18162

if test "$with_gnu_ld" = yes; then

18163

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'

18164

- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

18165

+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'

18166

+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

18167

18168

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

18169

_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'

18170

@@ -5484,7 +5903,7 @@ if test "$_lt_caught_CXX_error" != yes;

18171

# Commands to make compiler produce verbose output that lists

18172

# what "hidden" libraries, object files and flags are used when

18173

# linking a shared library.

18174

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

18175

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

18176

18177

else

18178

GXX=no

18179

@@ -5593,10 +6012,10 @@ if test "$_lt_caught_CXX_error" != yes;

18180

_LT_TAGVAR(allow_undefined_flag, $1)='-berok'

18181

# Determine the default libpath from the value encoded in an empty

18182

# executable.

18183

- _LT_SYS_MODULE_PATH_AIX

18184

+ _LT_SYS_MODULE_PATH_AIX([$1])

18185

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"

18186

18187

18188

18189

else

18190

if test "$host_cpu" = ia64; then

18191

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'

18192

@@ -5605,14 +6024,19 @@ if test "$_lt_caught_CXX_error" != yes;

18193

else

18194

# Determine the default libpath from the value encoded in an

18195

# empty executable.

18196

- _LT_SYS_MODULE_PATH_AIX

18197

+ _LT_SYS_MODULE_PATH_AIX([$1])

18198

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"

18199

# Warning - without using the other run time loading flags,

18200

# -berok will link without error, but may produce a broken library.

18201

_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'

18202

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'

18203

- # Exported symbols can be pulled into shared objects from archives

18204

- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'

18205

+ if test "$with_gnu_ld" = yes; then

18206

+ # We only use this code for GNU lds that support --whole-archive.

18207

+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'

18208

+ else

18209

+ # Exported symbols can be pulled into shared objects from archives

18210

+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'

18211

+ fi

18212

_LT_TAGVAR(archive_cmds_need_lc, $1)=yes

18213

# This is similar to how AIX traditionally builds its shared

18214

# libraries.

18215

@@ -5642,28 +6066,75 @@ if test "$_lt_caught_CXX_error" != yes;

18216

;;

18217

18218

cygwin* | mingw* | pw32* | cegcc*)

18219

- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,

18220

- # as there is no search path for DLLs.

18221

- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'

18222

- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

18223

- _LT_TAGVAR(always_export_symbols, $1)=no

18224

- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

18225

18226

- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

18227

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

18228

- # If the export-symbols file already is a .def file (1st line

18229

- # is EXPORTS), use it as is; otherwise, prepend...

18230

- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

18231

- cp $export_symbols $output_objdir/$soname.def;

18232

- else

18233

- echo EXPORTS > $output_objdir/$soname.def;

18234

- cat $export_symbols >> $output_objdir/$soname.def;

18235

- fi~

18236

18237

- else

18238

- _LT_TAGVAR(ld_shlibs, $1)=no

18239

- fi

18240

- ;;

18241

+ case $GXX,$cc_basename in

18242

+ ,cl* | no,cl*)

18243

+ # Native MSVC

18244

+ # hardcode_libdir_flag_spec is actually meaningless, as there is

18245

+ # no search path for DLLs.

18246

+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '

18247

+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

18248

+ _LT_TAGVAR(always_export_symbols, $1)=yes

18249

+ _LT_TAGVAR(file_list_spec, $1)='@'

18250

+ # Tell ltmain to make .lib files, not .a files.

18251

+ libext=lib

18252

+ # Tell ltmain to make .dll files, not .so files.

18253

+ shrext_cmds=".dll"

18254

+ # FIXME: Setting linknames here is a bad hack.

18255

+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='

18256

+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

18257

+ $SED -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;

18258

+ else

18259

+ $SED -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;

18260

+ fi~

18261

+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~

18262

+ linknames='

18263

+ # The linker will not automatically build a static lib if we build a DLL.

18264

+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'

18265

+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

18266

+ # Don't use ranlib

18267

+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'

18268

+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~

18269

+ lt_tool_outputfile="@TOOL_OUTPUT@"~

18270

+ case $lt_outputfile in

18271

+ *.exe|*.EXE) ;;

18272

+ *)

18273

+ lt_outputfile="$lt_outputfile.exe"

18274

+ lt_tool_outputfile="$lt_tool_outputfile.exe"

18275

+ ;;

18276

+ esac~

18277

+ func_to_tool_file "$lt_outputfile"~

18278

+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then

18279

+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;

18280

+ $RM "$lt_outputfile.manifest";

18281

+ fi'

18282

+ ;;

18283

+ *)

18284

+ # g++

18285

+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,

18286

+ # as there is no search path for DLLs.

18287

+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'

18288

+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'

18289

+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

18290

+ _LT_TAGVAR(always_export_symbols, $1)=no

18291

+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

18292

18293

+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

18294

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

18295

+ # If the export-symbols file already is a .def file (1st line

18296

+ # is EXPORTS), use it as is; otherwise, prepend...

18297

+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

18298

+ cp $export_symbols $output_objdir/$soname.def;

18299

+ else

18300

+ echo EXPORTS > $output_objdir/$soname.def;

18301

+ cat $export_symbols >> $output_objdir/$soname.def;

18302

+ fi~

18303

18304

+ else

18305

+ _LT_TAGVAR(ld_shlibs, $1)=no

18306

+ fi

18307

+ ;;

18308

+ esac

18309

+ ;;

18310

darwin* | rhapsody*)

18311

_LT_DARWIN_LINKER_FEATURES($1)

18312

;;

18313

@@ -5705,6 +6176,11 @@ if test "$_lt_caught_CXX_error" != yes;

18314

gnu*)

18315

;;

18316

18317

+ haiku*)

18318

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

18319

+ _LT_TAGVAR(link_all_deplibs, $1)=yes

18320

+ ;;

18321

18322

hpux9*)

18323

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'

18324

_LT_TAGVAR(hardcode_libdir_separator, $1)=:

18325

@@ -5729,11 +6205,11 @@ if test "$_lt_caught_CXX_error" != yes;

18326

# explicitly linking system object files so we need to strip them

18327

# from the output so that they don't get included in the library

18328

# dependencies.

18329

18330

18331

;;

18332

18333

if test "$GXX" = yes; then

18334

- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'

18335

+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'

18336

else

18337

# FIXME: insert proper C++ library support

18338

_LT_TAGVAR(ld_shlibs, $1)=no

18339

@@ -5794,7 +6270,7 @@ if test "$_lt_caught_CXX_error" != yes;

18340

# explicitly linking system object files so we need to strip them

18341

# from the output so that they don't get included in the library

18342

# dependencies.

18343

18344

18345

;;

18346

18347

if test "$GXX" = yes; then

18348

@@ -5804,10 +6280,10 @@ if test "$_lt_caught_CXX_error" != yes;

18349

_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

18350

;;

18351

ia64*)

18352

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

18353

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

18354

;;

18355

18356

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

18357

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

18358

;;

18359

esac

18360

18361

@@ -5837,7 +6313,7 @@ if test "$_lt_caught_CXX_error" != yes;

18362

case $cc_basename in

18363

CC*)

18364

# SGI C++

18365

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

18366

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

18367

18368

# Archives containing C++ object files must be created using

18369

# "CC -ar", where "CC" is the IRIX C++ compiler. This is

18370

@@ -5848,9 +6324,9 @@ if test "$_lt_caught_CXX_error" != yes;

18371

18372

if test "$GXX" = yes; then

18373

if test "$with_gnu_ld" = no; then

18374

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

18375

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

18376

else

18377

18378

18379

18380

18381

_LT_TAGVAR(link_all_deplibs, $1)=yes

18382

@@ -5879,7 +6355,7 @@ if test "$_lt_caught_CXX_error" != yes;

18383

# explicitly linking system object files so we need to strip them

18384

# from the output so that they don't get included in the library

18385

# dependencies.

18386

18387

18388

18389

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

18390

_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'

18391

@@ -5916,26 +6392,26 @@ if test "$_lt_caught_CXX_error" != yes;

18392

pgCC* | pgcpp*)

18393

# Portland Group C++ compiler

18394

case `$CC -V` in

18395

- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)

18396

+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)

18397

_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~

18398

rm -rf $tpldir~

18399

$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~

18400

- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'

18401

+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'

18402

_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~

18403

rm -rf $tpldir~

18404

$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~

18405

- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~

18406

+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~

18407

$RANLIB $oldlib'

18408

_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~

18409

rm -rf $tpldir~

18410

$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~

18411

- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

18412

+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

18413

_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~

18414

rm -rf $tpldir~

18415

$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~

18416

18417

18418

;;

18419

- *) # Version 6 will use weak symbols

18420

+ *) # Version 6 and above use weak symbols

18421

_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

18422

_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'

18423

;;

18424

@@ -5943,7 +6419,7 @@ if test "$_lt_caught_CXX_error" != yes;

18425

18426

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'

18427

_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'

18428

18429

18430

;;

18431

cxx*)

18432

# Compaq C++

18433

@@ -5962,9 +6438,9 @@ if test "$_lt_caught_CXX_error" != yes;

18434

# explicitly linking system object files so we need to strip them

18435

# from the output so that they don't get included in the library

18436

# dependencies.

18437

18438

18439

;;

18440

- xl*)

18441

+ xl* | mpixl* | bgxl*)

18442

# IBM XL 8.0 on PPC, with GNU ld

18443

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

18444

_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'

18445

@@ -5984,13 +6460,13 @@ if test "$_lt_caught_CXX_error" != yes;

18446

_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

18447

_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'

18448

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

18449

18450

18451

_LT_TAGVAR(compiler_needs_object, $1)=yes

18452

18453

# Not sure whether something based on

18454

# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1

18455

# would be better.

18456

- output_verbose_link_cmd='echo'

18457

+ output_verbose_link_cmd='func_echo_all'

18458

18459

# Archives containing C++ object files must be created using

18460

# "CC -xar", where "CC" is the Sun C++ compiler. This is

18461

@@ -6059,7 +6535,7 @@ if test "$_lt_caught_CXX_error" != yes;

18462

_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'

18463

_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'

18464

18465

- output_verbose_link_cmd=echo

18466

+ output_verbose_link_cmd=func_echo_all

18467

else

18468

_LT_TAGVAR(ld_shlibs, $1)=no

18469

18470

@@ -6094,15 +6570,15 @@ if test "$_lt_caught_CXX_error" != yes;

18471

case $host in

18472

osf3*)

18473

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'

18474

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

18475

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

18476

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

18477

;;

18478

18479

_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'

18480

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

18481

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

18482

_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~

18483

echo "-hidden">> $lib.exp~

18484

18485

18486

$RM $lib.exp'

18487

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'

18488

;;

18489

@@ -6118,17 +6594,17 @@ if test "$_lt_caught_CXX_error" != yes;

18490

# explicitly linking system object files so we need to strip them

18491

# from the output so that they don't get included in the library

18492

# dependencies.

18493

18494

18495

;;

18496

18497

if test "$GXX" = yes && test "$with_gnu_ld" = no; then

18498

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'

18499

case $host in

18500

osf3*)

18501

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

18502

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

18503

;;

18504

18505

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

18506

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'

18507

;;

18508

esac

18509

18510

@@ -6138,7 +6614,7 @@ if test "$_lt_caught_CXX_error" != yes;

18511

# Commands to make compiler produce verbose output that lists

18512

# what "hidden" libraries, object files and flags are used when

18513

# linking a shared library.

18514

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

18515

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

18516

18517

else

18518

# FIXME: insert proper C++ library support

18519

@@ -6174,7 +6650,7 @@ if test "$_lt_caught_CXX_error" != yes;

18520

18521

solaris*)

18522

case $cc_basename in

18523

- CC*)

18524

+ CC* | sunCC*)

18525

# Sun C++ 4.2, 5.x and Centerline C++

18526

_LT_TAGVAR(archive_cmds_need_lc,$1)=yes

18527

_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'

18528

@@ -6195,7 +6671,7 @@ if test "$_lt_caught_CXX_error" != yes;

18529

esac

18530

_LT_TAGVAR(link_all_deplibs, $1)=yes

18531

18532

- output_verbose_link_cmd='echo'

18533

+ output_verbose_link_cmd='func_echo_all'

18534

18535

# Archives containing C++ object files must be created using

18536

# "CC -xar", where "CC" is the Sun C++ compiler. This is

18537

@@ -6215,14 +6691,14 @@ if test "$_lt_caught_CXX_error" != yes;

18538

if test "$GXX" = yes && test "$with_gnu_ld" = no; then

18539

_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'

18540

if $CC --version | $GREP -v '^2\.7' > /dev/null; then

18541

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'

18542

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'

18543

_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

18544

- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'

18545

+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'

18546

18547

# Commands to make compiler produce verbose output that lists

18548

# what "hidden" libraries, object files and flags are used when

18549

# linking a shared library.

18550

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

18551

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

18552

else

18553

# g++ 2.7 appears to require `-G' NOT `-shared' on this

18554

# platform.

18555

@@ -6233,7 +6709,7 @@ if test "$_lt_caught_CXX_error" != yes;

18556

# Commands to make compiler produce verbose output that lists

18557

# what "hidden" libraries, object files and flags are used when

18558

# linking a shared library.

18559

- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

18560

+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

18561

18562

18563

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'

18564

@@ -6287,6 +6763,10 @@ if test "$_lt_caught_CXX_error" != yes;

18565

CC*)

18566

_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

18567

_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

18568

+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~

18569

+ '"$_LT_TAGVAR(old_archive_cmds, $1)"

18570

+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~

18571

+ '"$_LT_TAGVAR(reload_cmds, $1)"

18572

;;

18573

18574

_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

18575

@@ -6342,6 +6822,7 @@ if test "$_lt_caught_CXX_error" != yes;

18576

fi # test -n "$compiler"

18577

18578

CC=$lt_save_CC

18579

+ CFLAGS=$lt_save_CFLAGS

18580

LDCXX=$LD

18581

LD=$lt_save_LD

18582

GCC=$lt_save_GCC

18583

@@ -6356,6 +6837,29 @@ AC_LANG_POP

18584

])# _LT_LANG_CXX_CONFIG

18585

18586

18587

+# _LT_FUNC_STRIPNAME_CNF

18588

+# ----------------------

18589

+# func_stripname_cnf prefix suffix name

18590

+# strip PREFIX and SUFFIX off of NAME.

18591

+# PREFIX and SUFFIX must not contain globbing or regex special

18592

+# characters, hashes, percent signs, but SUFFIX may contain a leading

18593

+# dot (in which case that matches only a dot).

18594

18595

+# This function is identical to the (non-XSI) version of func_stripname,

18596

+# except this one can be used by m4 code that may be executed by configure,

18597

+# rather than the libtool script.

18598

+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl

18599

+AC_REQUIRE([_LT_DECL_SED])

18600

+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])

18601

+func_stripname_cnf ()

18602

18603

+ case ${2} in

18604

+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;

18605

+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;

18606

+ esac

18607

+} # func_stripname_cnf

18608

+])# _LT_FUNC_STRIPNAME_CNF

18609

18610

# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])

18611

# ---------------------------------

18612

# Figure out "hidden" library dependencies from verbose

18613

@@ -6364,6 +6868,7 @@ AC_LANG_POP

18614

# objects, libraries and library flags.

18615

m4_defun([_LT_SYS_HIDDEN_LIBDEPS],

18616

[m4_require([_LT_FILEUTILS_DEFAULTS])dnl

18617

+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl

18618

# Dependencies to place before and after the object being linked:

18619

_LT_TAGVAR(predep_objects, $1)=

18620

_LT_TAGVAR(postdep_objects, $1)=

18621

@@ -6414,6 +6919,13 @@ public class foo {

18622

};

18623

_LT_EOF

18624

])

18625

18626

+_lt_libdeps_save_CFLAGS=$CFLAGS

18627

+case "$CC $CFLAGS " in #(

18628

+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;

18629

+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;

18630

+esac

18631

18632

dnl Parse the compiler output and extract the necessary

18633

dnl objects, libraries and library flags.

18634

if AC_TRY_EVAL(ac_compile); then

18635

@@ -6425,7 +6937,7 @@ if AC_TRY_EVAL(ac_compile); then

18636

pre_test_object_deps_done=no

18637

18638

for p in `eval "$output_verbose_link_cmd"`; do

18639

- case $p in

18640

+ case ${prev}${p} in

18641

18642

-L* | -R* | -l*)

18643

# Some compilers place space between "-{L,R}" and the path.

18644

@@ -6434,13 +6946,22 @@ if AC_TRY_EVAL(ac_compile); then

18645

test $p = "-R"; then

18646

prev=$p

18647

continue

18648

- else

18649

- prev=

18650

18651

18652

+ # Expand the sysroot to ease extracting the directories later.

18653

+ if test -z "$prev"; then

18654

+ case $p in

18655

+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;

18656

+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;

18657

+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;

18658

+ esac

18659

+ fi

18660

+ case $p in

18661

+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;

18662

+ esac

18663

if test "$pre_test_object_deps_done" = no; then

18664

- case $p in

18665

- -L* | -R*)

18666

+ case ${prev} in

18667

+ -L | -R)

18668

# Internal compiler library paths should come after those

18669

# provided the user. The postdeps already come after the

18670

# user supplied libs so there is no need to process them.

18671

@@ -6460,8 +6981,10 @@ if AC_TRY_EVAL(ac_compile); then

18672

_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"

18673

18674

18675

+ prev=

18676

;;

18677

18678

+ *.lto.$objext) ;; # Ignore GCC LTO objects

18679

*.$objext)

18680

# This assumes that the test object file only shows up

18681

# once in the compiler output.

18682

@@ -6497,6 +7020,7 @@ else

18683

18684

18685

$RM -f confest.$objext

18686

+CFLAGS=$_lt_libdeps_save_CFLAGS

18687

18688

# PORTME: override above test on systems where it is broken

18689

m4_if([$1], [CXX],

18690

@@ -6533,7 +7057,7 @@ linux*)

18691

18692

solaris*)

18693

case $cc_basename in

18694

- CC*)

18695

+ CC* | sunCC*)

18696

# The more standards-conforming stlport4 library is

18697

# incompatible with the Cstd library. Avoid specifying

18698

# it if it's in CXXFLAGS. Ignore libCrun as

18699

@@ -6577,32 +7101,16 @@ _LT_TAGDECL([], [compiler_lib_search_pat

18700

])# _LT_SYS_HIDDEN_LIBDEPS

18701

18702

18703

-# _LT_PROG_F77

18704

-# ------------

18705

-# Since AC_PROG_F77 is broken, in that it returns the empty string

18706

-# if there is no fortran compiler, we have our own version here.

18707

-m4_defun([_LT_PROG_F77],

18708

18709

-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])

18710

-AC_PROG_F77

18711

-if test -z "$F77" || test "X$F77" = "Xno"; then

18712

- _lt_disable_F77=yes

18713

-fi

18714

-popdef([AC_MSG_ERROR])

18715

-])# _LT_PROG_F77

18716

18717

-dnl aclocal-1.4 backwards compatibility:

18718

-dnl AC_DEFUN([_LT_PROG_F77], [])

18719

18720

18721

# _LT_LANG_F77_CONFIG([TAG])

18722

# --------------------------

18723

# Ensure that the configuration variables for a Fortran 77 compiler are

18724

# suitably defined. These variables are subsequently used by _LT_CONFIG

18725

# to write the compiler configuration to `libtool'.

18726

m4_defun([_LT_LANG_F77_CONFIG],

18727

-[AC_REQUIRE([_LT_PROG_F77])dnl

18728

-AC_LANG_PUSH(Fortran 77)

18729

+[AC_LANG_PUSH(Fortran 77)

18730

+if test -z "$F77" || test "X$F77" = "Xno"; then

18731

+ _lt_disable_F77=yes

18732

+fi

18733

18734

_LT_TAGVAR(archive_cmds_need_lc, $1)=no

18735

_LT_TAGVAR(allow_undefined_flag, $1)=

18736

@@ -6621,6 +7129,8 @@ _LT_TAGVAR(module_cmds, $1)=

18737

_LT_TAGVAR(module_expsym_cmds, $1)=

18738

_LT_TAGVAR(link_all_deplibs, $1)=unknown

18739

_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds

18740

+_LT_TAGVAR(reload_flag, $1)=$reload_flag

18741

+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds

18742

_LT_TAGVAR(no_undefined_flag, $1)=

18743

_LT_TAGVAR(whole_archive_flag_spec, $1)=

18744

_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no

18745

@@ -6660,7 +7170,9 @@ if test "$_lt_disable_F77" != yes; then

18746

# Allow CC to be a program name with arguments.

18747

lt_save_CC="$CC"

18748

lt_save_GCC=$GCC

18749

+ lt_save_CFLAGS=$CFLAGS

18750

CC=${F77-"f77"}

18751

+ CFLAGS=$FFLAGS

18752

compiler=$CC

18753

_LT_TAGVAR(compiler, $1)=$CC

18754

_LT_CC_BASENAME([$compiler])

18755

@@ -6714,38 +7226,24 @@ if test "$_lt_disable_F77" != yes; then

18756

18757

GCC=$lt_save_GCC

18758

CC="$lt_save_CC"

18759

+ CFLAGS="$lt_save_CFLAGS"

18760

fi # test "$_lt_disable_F77" != yes

18761

18762

AC_LANG_POP

18763

])# _LT_LANG_F77_CONFIG

18764

18765

18766

-# _LT_PROG_FC

18767

-# -----------

18768

-# Since AC_PROG_FC is broken, in that it returns the empty string

18769

-# if there is no fortran compiler, we have our own version here.

18770

-m4_defun([_LT_PROG_FC],

18771

18772

-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])

18773

-AC_PROG_FC

18774

-if test -z "$FC" || test "X$FC" = "Xno"; then

18775

- _lt_disable_FC=yes

18776

-fi

18777

-popdef([AC_MSG_ERROR])

18778

-])# _LT_PROG_FC

18779

18780

-dnl aclocal-1.4 backwards compatibility:

18781

-dnl AC_DEFUN([_LT_PROG_FC], [])

18782

18783

18784

# _LT_LANG_FC_CONFIG([TAG])

18785

# -------------------------

18786

# Ensure that the configuration variables for a Fortran compiler are

18787

# suitably defined. These variables are subsequently used by _LT_CONFIG

18788

# to write the compiler configuration to `libtool'.

18789

m4_defun([_LT_LANG_FC_CONFIG],

18790

-[AC_REQUIRE([_LT_PROG_FC])dnl

18791

-AC_LANG_PUSH(Fortran)

18792

+[AC_LANG_PUSH(Fortran)

18793

18794

+if test -z "$FC" || test "X$FC" = "Xno"; then

18795

+ _lt_disable_FC=yes

18796

+fi

18797

18798

_LT_TAGVAR(archive_cmds_need_lc, $1)=no

18799

_LT_TAGVAR(allow_undefined_flag, $1)=

18800

@@ -6764,6 +7262,8 @@ _LT_TAGVAR(module_cmds, $1)=

18801

_LT_TAGVAR(module_expsym_cmds, $1)=

18802

_LT_TAGVAR(link_all_deplibs, $1)=unknown

18803

_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds

18804

+_LT_TAGVAR(reload_flag, $1)=$reload_flag

18805

+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds

18806

_LT_TAGVAR(no_undefined_flag, $1)=

18807

_LT_TAGVAR(whole_archive_flag_spec, $1)=

18808

_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no

18809

@@ -6803,7 +7303,9 @@ if test "$_lt_disable_FC" != yes; then

18810

# Allow CC to be a program name with arguments.

18811

lt_save_CC="$CC"

18812

lt_save_GCC=$GCC

18813

+ lt_save_CFLAGS=$CFLAGS

18814

CC=${FC-"f95"}

18815

+ CFLAGS=$FCFLAGS

18816

compiler=$CC

18817

GCC=$ac_cv_fc_compiler_gnu

18818

18819

@@ -6859,7 +7361,8 @@ if test "$_lt_disable_FC" != yes; then

18820

fi # test -n "$compiler"

18821

18822

GCC=$lt_save_GCC

18823

- CC="$lt_save_CC"

18824

+ CC=$lt_save_CC

18825

+ CFLAGS=$lt_save_CFLAGS

18826

fi # test "$_lt_disable_FC" != yes

18827

18828

AC_LANG_POP

18829

@@ -6896,10 +7399,12 @@ _LT_COMPILER_BOILERPLATE

18830

_LT_LINKER_BOILERPLATE

18831

18832

# Allow CC to be a program name with arguments.

18833

-lt_save_CC="$CC"

18834

+lt_save_CC=$CC

18835

+lt_save_CFLAGS=$CFLAGS

18836

lt_save_GCC=$GCC

18837

GCC=yes

18838

CC=${GCJ-"gcj"}

18839

+CFLAGS=$GCJFLAGS

18840

compiler=$CC

18841

_LT_TAGVAR(compiler, $1)=$CC

18842

_LT_TAGVAR(LD, $1)="$LD"

18843

@@ -6909,6 +7414,8 @@ _LT_CC_BASENAME([$compiler])

18844

_LT_TAGVAR(archive_cmds_need_lc, $1)=no

18845

18846

_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds

18847

+_LT_TAGVAR(reload_flag, $1)=$reload_flag

18848

+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds

18849

18850

## CAVEAT EMPTOR:

18851

## There is no encapsulation within the following macros, do not change

18852

@@ -6928,7 +7435,8 @@ fi

18853

AC_LANG_RESTORE

18854

18855

GCC=$lt_save_GCC

18856

-CC="$lt_save_CC"

18857

+CC=$lt_save_CC

18858

+CFLAGS=$lt_save_CFLAGS

18859

])# _LT_LANG_GCJ_CONFIG

18860

18861

18862

@@ -6963,9 +7471,11 @@ _LT_LINKER_BOILERPLATE

18863

18864

# Allow CC to be a program name with arguments.

18865

lt_save_CC="$CC"

18866

+lt_save_CFLAGS=$CFLAGS

18867

lt_save_GCC=$GCC

18868

GCC=

18869

CC=${RC-"windres"}

18870

+CFLAGS=

18871

compiler=$CC

18872

_LT_TAGVAR(compiler, $1)=$CC

18873

_LT_CC_BASENAME([$compiler])

18874

@@ -6978,7 +7488,8 @@ fi

18875

18876

GCC=$lt_save_GCC

18877

AC_LANG_RESTORE

18878

-CC="$lt_save_CC"

18879

+CC=$lt_save_CC

18880

+CFLAGS=$lt_save_CFLAGS

18881

])# _LT_LANG_RC_CONFIG

18882

18883

18884

@@ -7037,6 +7548,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object

18885

AC_SUBST([OBJDUMP])

18886

])

18887

18888

+# _LT_DECL_DLLTOOL

18889

+# ----------------

18890

+# Ensure DLLTOOL variable is set.

18891

+m4_defun([_LT_DECL_DLLTOOL],

18892

+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)

18893

+test -z "$DLLTOOL" && DLLTOOL=dlltool

18894

+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])

18895

+AC_SUBST([DLLTOOL])

21842

18896

+])

21843

21844

18897

21845

18898

# _LT_DECL_SED

21846

18899

# ------------

21847

# Check for a fully-functional sed program, that truncates

21848

--- protobuf-2.3.0.orig/m4/ltoptions.m4

21849

+++ protobuf-2.3.0/m4/ltoptions.m4

21850

@@ -125,7 +125,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],

21851

[enable_win32_dll=yes

21852

21853

case $host in

21854

-*-*-cygwin* | *-*-mingw* | *-*-pw32*)

21855

+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)

21856

AC_CHECK_TOOL(AS, as, false)

21857

AC_CHECK_TOOL(DLLTOOL, dlltool, false)

21858

AC_CHECK_TOOL(OBJDUMP, objdump, false)

21859

--- protobuf-2.3.0.orig/m4/ltversion.m4

21860

+++ protobuf-2.3.0/m4/ltversion.m4

21861

@@ -9,15 +9,15 @@

21862

21863

# Generated from ltversion.in.

21864

21865

-# serial 2976 ltversion.m4

21866

+# serial 3017 ltversion.m4

21867

# This file is part of GNU Libtool

21868

21869

-m4_define([LT_PACKAGE_VERSION], [2.2.4])

21870

-m4_define([LT_PACKAGE_REVISION], [1.2976])

21871

+m4_define([LT_PACKAGE_VERSION], [2.2.6b])

21872

+m4_define([LT_PACKAGE_REVISION], [1.3017])

21873

21874

AC_DEFUN([LTVERSION_VERSION],

21875

-[macro_version='2.2.4'

21876

-macro_revision='1.2976'

21877

+[macro_version='2.2.6b'

21878

+macro_revision='1.3017'

21879

_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])

21880

_LT_DECL(, macro_revision, 0)

18900

@@ -7130,8 +7650,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],

18901

# Try some XSI features

18902

xsi_shell=no

18903

( _lt_dummy="a/b/c"

18904

- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \

18905

- = c,a/b,, \

18906

+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \

18907

+ = c,a/b,b/c, \

18908

&& eval 'test $(( 1 + 1 )) -eq 2 \

18909

&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \

18910

&& xsi_shell=yes

18911

@@ -7170,208 +7690,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn

18912

])# _LT_CHECK_SHELL_FEATURES

18913

18914

18915

-# _LT_PROG_XSI_SHELLFNS

18916

-# ---------------------

18917

-# Bourne and XSI compatible variants of some useful shell functions.

18918

-m4_defun([_LT_PROG_XSI_SHELLFNS],

18919

-[case $xsi_shell in

18920

- yes)

18921

- cat << \_LT_EOF >> "$cfgfile"

18922

18923

-# func_dirname file append nondir_replacement

18924

-# Compute the dirname of FILE. If nonempty, add APPEND to the result,

18925

-# otherwise set result to NONDIR_REPLACEMENT.

18926

-func_dirname ()

18927

18928

- case ${1} in

18929

- */*) func_dirname_result="${1%/*}${2}" ;;

18930

- * ) func_dirname_result="${3}" ;;

18931

- esac

18932

18933

18934

-# func_basename file

18935

-func_basename ()

18936

18937

- func_basename_result="${1##*/}"

18938

18939

18940

-# func_dirname_and_basename file append nondir_replacement

18941

-# perform func_basename and func_dirname in a single function

18942

-# call:

18943

-# dirname: Compute the dirname of FILE. If nonempty,

18944

-# add APPEND to the result, otherwise set result

18945

-# to NONDIR_REPLACEMENT.

18946

-# value returned in "$func_dirname_result"

18947

-# basename: Compute filename of FILE.

18948

-# value retuned in "$func_basename_result"

18949

-# Implementation must be kept synchronized with func_dirname

18950

-# and func_basename. For efficiency, we do not delegate to

18951

-# those functions but instead duplicate the functionality here.

18952

-func_dirname_and_basename ()

18953

18954

- case ${1} in

18955

- */*) func_dirname_result="${1%/*}${2}" ;;

18956

- * ) func_dirname_result="${3}" ;;

18957

- esac

18958

- func_basename_result="${1##*/}"

18959

18960

18961

-# func_stripname prefix suffix name

18962

-# strip PREFIX and SUFFIX off of NAME.

18963

-# PREFIX and SUFFIX must not contain globbing or regex special

18964

-# characters, hashes, percent signs, but SUFFIX may contain a leading

18965

-# dot (in which case that matches only a dot).

18966

-func_stripname ()

18967

18968

- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are

18969

- # positional parameters, so assign one to ordinary parameter first.

18970

- func_stripname_result=${3}

18971

- func_stripname_result=${func_stripname_result#"${1}"}

18972

- func_stripname_result=${func_stripname_result%"${2}"}

18973

18974

18975

-# func_opt_split

18976

-func_opt_split ()

18977

18978

- func_opt_split_opt=${1%%=*}

18979

- func_opt_split_arg=${1#*=}

18980

18981

18982

-# func_lo2o object

18983

-func_lo2o ()

18984

18985

- case ${1} in

18986

- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;

18987

- *) func_lo2o_result=${1} ;;

18988

- esac

18989

18990

18991

-# func_xform libobj-or-source

18992

-func_xform ()

18993

18994

- func_xform_result=${1%.*}.lo

18995

18996

+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)

18997

+# ------------------------------------------------------

18998

+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and

18999

+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.

19000

+m4_defun([_LT_PROG_FUNCTION_REPLACE],

19001

+[dnl {

19002

+sed -e '/^$1 ()$/,/^} # $1 /c\

19003

+$1 ()\

19004

+{\

19005

+m4_bpatsubsts([$2], [$], [\\], [^$[ ]$], [\\\1])

19006

+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \

19007

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

19008

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

19009

+test 0 -eq $? || _lt_function_replace_fail=:

19010

+])

19011

19012

-# func_arith arithmetic-term...

19013

-func_arith ()

19014

19015

- func_arith_result=$(( $[*] ))

19016

19017

19018

-# func_len string

19019

-# STRING may not start with a hyphen.

19020

-func_len ()

19021

19022

- func_len_result=${#1}

19023

19024

+# _LT_PROG_REPLACE_SHELLFNS

19025

+# -------------------------

19026

+# Replace existing portable implementations of several shell functions with

19027

+# equivalent extended shell implementations where those features are available..

19028

+m4_defun([_LT_PROG_REPLACE_SHELLFNS],

19029

+[if test x"$xsi_shell" = xyes; then

19030

+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl

19031

+ case ${1} in

19032

+ */*) func_dirname_result="${1%/*}${2}" ;;

19033

+ * ) func_dirname_result="${3}" ;;

19034

+ esac])

19035

19036

+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl

19037

+ func_basename_result="${1##*/}"])

19038

19039

+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl

19040

+ case ${1} in

19041

+ */*) func_dirname_result="${1%/*}${2}" ;;

19042

+ * ) func_dirname_result="${3}" ;;

19043

+ esac

19044

+ func_basename_result="${1##*/}"])

19045

19046

-_LT_EOF

19047

- ;;

19048

- *) # Bourne compatible functions.

19049

- cat << \_LT_EOF >> "$cfgfile"

19050

+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl

19051

+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are

19052

+ # positional parameters, so assign one to ordinary parameter first.

19053

+ func_stripname_result=${3}

19054

+ func_stripname_result=${func_stripname_result#"${1}"}

19055

+ func_stripname_result=${func_stripname_result%"${2}"}])

19056

19057

-# func_dirname file append nondir_replacement

19058

-# Compute the dirname of FILE. If nonempty, add APPEND to the result,

19059

-# otherwise set result to NONDIR_REPLACEMENT.

19060

-func_dirname ()

19061

19062

- # Extract subdirectory from the argument.

19063

- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`

19064

- if test "X$func_dirname_result" = "X${1}"; then

19065

- func_dirname_result="${3}"

19066

- else

19067

- func_dirname_result="$func_dirname_result${2}"

19068

- fi

19069

19070

+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl

19071

+ func_split_long_opt_name=${1%%=*}

19072

+ func_split_long_opt_arg=${1#*=}])

19073

19074

-# func_basename file

19075

-func_basename ()

19076

19077

- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`

19078

19079

+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl

19080

+ func_split_short_opt_arg=${1#??}

19081

+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])

19082

19083

-dnl func_dirname_and_basename

19084

-dnl A portable version of this function is already defined in general.m4sh

19085

-dnl so there is no need for it here.

19086

+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl

19087

+ case ${1} in

19088

+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;

19089

+ *) func_lo2o_result=${1} ;;

19090

+ esac])

19091

19092

-# func_stripname prefix suffix name

19093

-# strip PREFIX and SUFFIX off of NAME.

19094

-# PREFIX and SUFFIX must not contain globbing or regex special

19095

-# characters, hashes, percent signs, but SUFFIX may contain a leading

19096

-# dot (in which case that matches only a dot).

19097

-# func_strip_suffix prefix name

19098

-func_stripname ()

19099

19100

- case ${2} in

19101

- .*) func_stripname_result=`$ECHO "X${3}" \

19102

- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;

19103

- *) func_stripname_result=`$ECHO "X${3}" \

19104

- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;

19105

- esac

19106

19107

+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])

19108

19109

-# sed scripts:

19110

-my_sed_long_opt='1s/^$-[[^=]]*$=.*/\1/;q'

19111

-my_sed_long_arg='1s/^-[[^=]]*=//'

19112

+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])

19113

19114

-# func_opt_split

19115

-func_opt_split ()

19116

19117

- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`

19118

- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`

19119

19120

19121

-# func_lo2o object

19122

-func_lo2o ()

19123

19124

- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`

19125

19126

+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])

19127

+fi

19128

19129

-# func_xform libobj-or-source

19130

-func_xform ()

19131

19132

- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`

19133

19134

+if test x"$lt_shell_append" = xyes; then

19135

+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])

19136

19137

-# func_arith arithmetic-term...

19138

-func_arith ()

19139

19140

- func_arith_result=`expr "$[@]"`

19141

19142

+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl

19143

+ func_quote_for_eval "${2}"

19144

+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \

19145

+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])

19146

19147

-# func_len string

19148

-# STRING may not start with a hyphen.

19149

-func_len ()

19150

19151

- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`

19152

19153

+ # Save a `func_append' function call where possible by direct use of '+='

19154

+ sed -e 's%func_append $[[a-zA-Z_]]\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \

19155

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

19156

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

19157

+ test 0 -eq $? || _lt_function_replace_fail=:

19158

+else

19159

+ # Save a `func_append' function call even when '+=' is not available

19160

+ sed -e 's%func_append $[[a-zA-Z_]]\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \

19161

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

19162

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

19163

+ test 0 -eq $? || _lt_function_replace_fail=:

19164

+fi

19165

19166

-_LT_EOF

19167

-esac

19168

+if test x"$_lt_function_replace_fail" = x":"; then

19169

+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])

19170

+fi

19171

+])

19172

19173

-case $lt_shell_append in

19174

- yes)

19175

- cat << \_LT_EOF >> "$cfgfile"

19176

19177

-# func_append var value

19178

-# Append VALUE to the end of shell variable VAR.

19179

-func_append ()

19180

19181

- eval "$[1]+=\$[2]"

19182

19183

-_LT_EOF

19184

+# _LT_PATH_CONVERSION_FUNCTIONS

19185

+# -----------------------------

19186

+# Determine which file name conversion functions should be used by

19187

+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed

19188

+# for certain cross-compile configurations and native mingw.

19189

+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],

19190

+[AC_REQUIRE([AC_CANONICAL_HOST])dnl

19191

+AC_REQUIRE([AC_CANONICAL_BUILD])dnl

19192

+AC_MSG_CHECKING([how to convert $build file names to $host format])

19193

+AC_CACHE_VAL(lt_cv_to_host_file_cmd,

19194

+[case $host in

19195

+ *-*-mingw* )

19196

+ case $build in

19197

+ *-*-mingw* ) # actually msys

19198

+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32

19199

+ ;;

19200

+ *-*-cygwin* )

19201

+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32

19202

+ ;;

19203

+ * ) # otherwise, assume *nix

19204

+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32

19205

+ ;;

19206

+ esac

19207

;;

19208

- *)

19209

- cat << \_LT_EOF >> "$cfgfile"

19210

19211

-# func_append var value

19212

-# Append VALUE to the end of shell variable VAR.

19213

-func_append ()

19214

19215

- eval "$[1]=\$$[1]\$[2]"

19216

19217

19218

-_LT_EOF

19219

+ *-*-cygwin* )

19220

+ case $build in

19221

+ *-*-mingw* ) # actually msys

19222

+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin

19223

+ ;;

19224

+ *-*-cygwin* )

19225

+ lt_cv_to_host_file_cmd=func_convert_file_noop

19226

+ ;;

19227

+ * ) # otherwise, assume *nix

19228

+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin

19229

+ ;;

19230

+ esac

19231

;;

19232

- esac

19233

+ * ) # unhandled hosts (and "normal" native builds)

19234

+ lt_cv_to_host_file_cmd=func_convert_file_noop

19235

+ ;;

19236

+esac

19237

+])

19238

+to_host_file_cmd=$lt_cv_to_host_file_cmd

19239

+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])

19240

+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],

19241

+ [0], [convert $build file names to $host format])dnl

19242

19243

+AC_MSG_CHECKING([how to convert $build file names to toolchain format])

19244

+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,

19245

+[#assume ordinary cross tools, or native build.

19246

+lt_cv_to_tool_file_cmd=func_convert_file_noop

19247

+case $host in

19248

+ *-*-mingw* )

19249

+ case $build in

19250

+ *-*-mingw* ) # actually msys

19251

+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32

19252

+ ;;

19253

+ esac

19254

+ ;;

19255

+esac

21881

19256

])

21882

--- protobuf-2.3.0.orig/gtest/Makefile.in

21883

+++ protobuf-2.3.0/gtest/Makefile.in

21884

@@ -1,8 +1,9 @@

21885

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

21886

+# Makefile.in generated by automake 1.11.1 from Makefile.am.

21887

# @configure_input@

21888

21889

21890

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

21891

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

21892

+# Inc.

21893

# This Makefile.in is free software; the Free Software Foundation

21894

# gives unlimited permission to copy and/or distribute it,

21895

# with or without modifications, as long as this notice is preserved.

21896

@@ -23,8 +24,9 @@

21897

21898

VPATH = @srcdir@

21899

pkgdatadir = $(datadir)/@PACKAGE@

21900

-pkglibdir = $(libdir)/@PACKAGE@

21901

pkgincludedir = $(includedir)/@PACKAGE@

21902

+pkglibdir = $(libdir)/@PACKAGE@

21903

+pkglibexecdir = $(libexecdir)/@PACKAGE@

21904

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

21905

install_sh_DATA = $(install_sh) -c -m 644

21906

install_sh_PROGRAM = $(install_sh) -c

21907

@@ -160,16 +162,31 @@ am__CONFIG_DISTCLEAN_FILES = config.stat

21908

mkinstalldirs = $(install_sh) -d

21909

CONFIG_HEADER = $(top_builddir)/build-aux/config.h

21910

CONFIG_CLEAN_FILES = scripts/gtest-config

21911

+CONFIG_CLEAN_VPATH_FILES =

21912

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

21913

am__vpath_adj = case $$p in \

21914

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

21915

*) f=$$p;; \

21916

esac;

21917

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

21918

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

21919

+am__install_max = 40

21920

+am__nobase_strip_setup = \

21921

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

21922

+am__nobase_strip = \

21923

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

21924

+am__nobase_list = $(am__nobase_strip_setup); \

21925

+ for p in $$list; do echo "$$p $$p"; done | \

21926

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

21927

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

21928

+ if (++n[$$2] == $(am__install_max)) \

21929

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

21930

+ END { for (dir in files) print dir, files[dir] }'

21931

+am__base_list = \

21932

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

21933

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

21934

am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \

21935

"$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgincludedir)" \

21936

"$(DESTDIR)$(pkginclude_internaldir)"

21937

-libLTLIBRARIES_INSTALL = $(INSTALL)

21938

LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)

21939

lib_libgtest_la_LIBADD =

21940

am__dirstamp = $(am__leading_dot)dirstamp

21941

@@ -491,11 +508,11 @@ test_gtest_xml_output_unittest__OBJECTS

21942

$(am_test_gtest_xml_output_unittest__OBJECTS)

21943

@HAVE_PYTHON_TRUE@test_gtest_xml_output_unittest__DEPENDENCIES = \

21944

@HAVE_PYTHON_TRUE@ lib/libgtest.la

21945

-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)

21946

SCRIPTS = $(bin_SCRIPTS)

21947

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/build-aux

21948

depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp

21949

am__depfiles_maybe = depfiles

21950

+am__mv = mv -f

21951

CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

21952

$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)

21953

LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

21954

@@ -613,20 +630,19 @@ DIST_SOURCES = $(lib_libgtest_la_SOURCES

21955

$(am__test_gtest_xml_outfile1_test__SOURCES_DIST) \

21956

$(am__test_gtest_xml_outfile2_test__SOURCES_DIST) \

21957

$(am__test_gtest_xml_output_unittest__SOURCES_DIST)

21958

-m4dataDATA_INSTALL = $(INSTALL_DATA)

21959

DATA = $(m4data_DATA)

21960

-pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)

21961

-pkginclude_internalHEADERS_INSTALL = $(INSTALL_HEADER)

21962

HEADERS = $(pkginclude_HEADERS) $(pkginclude_internal_HEADERS)

21963

ETAGS = etags

21964

CTAGS = ctags

21965

+am__tty_colors = \

21966

+red=; grn=; lgn=; blu=; std=

21967

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

21968

distdir = $(PACKAGE)-$(VERSION)

21969

top_distdir = $(distdir)

21970

am__remove_distdir = \

21971

- { test ! -d $(distdir) \

21972

- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \

21973

- && rm -fr $(distdir); }; }

21974

+ { test ! -d "$(distdir)" \

21975

+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \

21976

+ && rm -fr "$(distdir)"; }; }

21977

DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip

21978

GZIP_ENV = --best

21979

distuninstallcheck_listfiles = find . -type f -print

21980

@@ -676,6 +692,7 @@ MAKEINFO = @MAKEINFO@

19257

+to_tool_file_cmd=$lt_cv_to_tool_file_cmd

19258

+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])

19259

+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],

19260

+ [0], [convert $build files to toolchain format])dnl

19261

+])# _LT_PATH_CONVERSION_FUNCTIONS

19262

--- protobuf-2.4.0a.orig/src/Makefile.in

19263

+++ protobuf-2.4.0a/src/Makefile.in

19264

@@ -342,6 +342,7 @@ CXXFLAGS = @CXXFLAGS@

19265

CYGPATH_W = @CYGPATH_W@

19266

DEFS = @DEFS@

19267

DEPDIR = @DEPDIR@

19268

+DLLTOOL = @DLLTOOL@

19269

DSYMUTIL = @DSYMUTIL@

19270

DUMPBIN = @DUMPBIN@

19271

ECHO_C = @ECHO_C@

19272

@@ -366,6 +367,7 @@ LIPO = @LIPO@

19273

LN_S = @LN_S@

19274

LTLIBOBJS = @LTLIBOBJS@

19275

MAKEINFO = @MAKEINFO@

19276

+MANIFEST_TOOL = @MANIFEST_TOOL@

21981

19277

MKDIR_P = @MKDIR_P@

21982

19278

NM = @NM@

21983

19279

NMEDIT = @NMEDIT@

21984

+OBJDUMP = @OBJDUMP@

21985

OBJEXT = @OBJEXT@

21986

OTOOL = @OTOOL@

21987

OTOOL64 = @OTOOL64@

21988

@@ -684,6 +701,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

21989

PACKAGE_NAME = @PACKAGE_NAME@

21990

PACKAGE_STRING = @PACKAGE_STRING@

21991

PACKAGE_TARNAME = @PACKAGE_TARNAME@

21992

+PACKAGE_URL = @PACKAGE_URL@

21993

PACKAGE_VERSION = @PACKAGE_VERSION@

21994

PATH_SEPARATOR = @PATH_SEPARATOR@

21995

PTHREAD_CC = @PTHREAD_CC@

21996

@@ -747,6 +765,7 @@ sharedstatedir = @sharedstatedir@

21997

srcdir = @srcdir@

21998

sysconfdir = @sysconfdir@

21999

target_alias = @target_alias@

22000

+top_build_prefix = @top_build_prefix@

22001

top_builddir = @top_builddir@

22002

top_srcdir = @top_srcdir@

22003

22004

@@ -1035,15 +1054,15 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi

22005

@for dep in $?; do \

22006

case '$(am__configure_deps)' in \

22007

*$$dep*) \

22008

- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \

22009

- cd $(srcdir) && $(AUTOMAKE) --foreign \

22010

+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \

22011

+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \

22012

&& exit 0; \

22013

exit 1;; \

22014

esac; \

22015

done; \

22016

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \

22017

- cd $(top_srcdir) && \

22018

- $(AUTOMAKE) --foreign Makefile

22019

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \

22020

+ $(am__cd) $(top_srcdir) && \

22021

+ $(AUTOMAKE) --foreign Makefile

22022

.PRECIOUS: Makefile

22023

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

22024

@case '$?' in \

22025

@@ -1059,9 +1078,10 @@ $(top_builddir)/config.status: $(top_src

22026

$(SHELL) ./config.status --recheck

22027

22028

$(top_srcdir)/configure: $(am__configure_deps)

22029

- cd $(srcdir) && $(AUTOCONF)

22030

+ $(am__cd) $(srcdir) && $(AUTOCONF)

22031

$(ACLOCAL_M4): $(am__aclocal_m4_deps)

22032

- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

22033

+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

22034

+$(am__aclocal_m4_deps):

22035

22036

build-aux/config.h: build-aux/stamp-h1

22037

@if test ! -f $@; then \

22038

@@ -1073,7 +1093,7 @@ build-aux/stamp-h1: $(top_srcdir)/build-

22039

@rm -f build-aux/stamp-h1

22040

cd $(top_builddir) && $(SHELL) ./config.status build-aux/config.h

22041

$(top_srcdir)/build-aux/config.h.in: $(am__configure_deps)

22042

- cd $(top_srcdir) && $(AUTOHEADER)

22043

+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))

22044

rm -f build-aux/stamp-h1

22045

touch $@

22046

22047

@@ -1084,20 +1104,24 @@ scripts/gtest-config: $(top_builddir)/co

22048

install-libLTLIBRARIES: $(lib_LTLIBRARIES)

22049

@$(NORMAL_INSTALL)

22050

test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"

22051

- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \

22052

+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \

22053

+ list2=; for p in $$list; do \

22054

if test -f $$p; then \

22055

- f=$(am__strip_dir) \

22056

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \

22057

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \

22058

+ list2="$$list2 $$p"; \

22059

else :; fi; \

22060

- done

22061

+ done; \

22062

+ test -z "$$list2" || { \

22063

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \

22064

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \

22065

+ }

22066

22067

uninstall-libLTLIBRARIES:

22068

@$(NORMAL_UNINSTALL)

22069

- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \

22070

- p=$(am__strip_dir) \

22071

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \

22072

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \

22073

+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \

22074

+ for p in $$list; do \

22075

+ $(am__strip_dir) \

22076

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \

22077

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \

22078

done

22079

22080

clean-libLTLIBRARIES:

22081

@@ -1157,11 +1181,13 @@ samples/libsamples.la: $(samples_libsamp

22082

$(CXXLINK) $(samples_libsamples_la_OBJECTS) $(samples_libsamples_la_LIBADD) $(LIBS)

22083

22084

clean-checkPROGRAMS:

22085

- @list='$(check_PROGRAMS)'; for p in $$list; do \

22086

- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

22087

- echo " rm -f $$p $$f"; \

22088

- rm -f $$p $$f ; \

22089

- done

22090

+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \

22091

+ echo " rm -f" $$list; \

22092

+ rm -f $$list || exit $$?; \

22093

+ test -n "$(EXEEXT)" || exit 0; \

22094

+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \

22095

+ echo " rm -f" $$list; \

22096

+ rm -f $$list

22097

samples/sample10_unittest.$(OBJEXT): samples/$(am__dirstamp) \

22098

samples/$(DEPDIR)/$(am__dirstamp)

22099

samples/sample10_unittest$(EXEEXT): $(samples_sample10_unittest_OBJECTS) $(samples_sample10_unittest_DEPENDENCIES) samples/$(am__dirstamp)

22100

@@ -1428,22 +1454,37 @@ test/gtest_xml_output_unittest_$(EXEEXT)

22101

install-binSCRIPTS: $(bin_SCRIPTS)

22102

@$(NORMAL_INSTALL)

22103

test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

22104

- @list='$(bin_SCRIPTS)'; for p in $$list; do \

22105

+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \

22106

+ for p in $$list; do \

22107

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

22108

- if test -f $$d$$p; then \

22109

- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \

22110

- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \

22111

- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \

22112

- else :; fi; \

22113

- done

22114

+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \

22115

+ done | \

22116

+ sed -e 'p;s,.*/,,;n' \

22117

+ -e 'h;s|.*|.|' \

22118

+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \

22119

+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \

22120

+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

22121

+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \

22122

+ if (++n[d] == $(am__install_max)) { \

22123

+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \

22124

+ else { print "f", d "/" $$4, $$1 } } \

22125

+ END { for (d in files) print "f", d, files[d] }' | \

22126

+ while read type dir files; do \

22127

+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

22128

+ test -z "$$files" || { \

22129

+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \

22130

+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \

22131

+ } \

22132

+ ; done

22133

22134

uninstall-binSCRIPTS:

22135

@$(NORMAL_UNINSTALL)

22136

- @list='$(bin_SCRIPTS)'; for p in $$list; do \

22137

- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \

22138

- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \

22139

- rm -f "$(DESTDIR)$(bindir)/$$f"; \

22140

- done

22141

+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \

22142

+ files=`for p in $$list; do echo "$$p"; done | \

22143

+ sed -e 's,.*/,,;$(transform)'`; \

22144

+ test -n "$$list" || exit 0; \

22145

+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \

22146

+ cd "$(DESTDIR)$(bindir)" && rm -f $$files

22147

22148

mostlyclean-compile:

22149

-rm -f *.$(OBJEXT)

22150

@@ -1601,7 +1642,7 @@ distclean-compile:

22151

.cc.o:

22152

@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\

22153

@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\

22154

-@am__fastdepCXX_TRUE@ mv -f $$depbase.Tpo $$depbase.Po

22155

+@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po

22156

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

22157

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22158

@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<

22159

@@ -1609,7 +1650,7 @@ distclean-compile:

22160

.cc.obj:

22161

@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\

22162

@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\

22163

-@am__fastdepCXX_TRUE@ mv -f $$depbase.Tpo $$depbase.Po

22164

+@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po

22165

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

22166

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22167

@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

22168

@@ -1617,203 +1658,203 @@ distclean-compile:

22169

.cc.lo:

22170

@am__fastdepCXX_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\

22171

@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\

22172

-@am__fastdepCXX_TRUE@ mv -f $$depbase.Tpo $$depbase.Plo

22173

+@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo

22174

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

22175

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22176

@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<

22177

22178

test/test_gtest_death_test_test-gtest-death-test_test.o: test/gtest-death-test_test.cc

22179

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_death_test_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_death_test_test-gtest-death-test_test.o -MD -MP -MF test/$(DEPDIR)/test_gtest_death_test_test-gtest-death-test_test.Tpo -c -o test/test_gtest_death_test_test-gtest-death-test_test.o `test -f 'test/gtest-death-test_test.cc' || echo '$(srcdir)/'`test/gtest-death-test_test.cc

22180

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_death_test_test-gtest-death-test_test.Tpo test/$(DEPDIR)/test_gtest_death_test_test-gtest-death-test_test.Po

22181

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_death_test_test-gtest-death-test_test.Tpo test/$(DEPDIR)/test_gtest_death_test_test-gtest-death-test_test.Po

22182

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest-death-test_test.cc' object='test/test_gtest_death_test_test-gtest-death-test_test.o' libtool=no @AMDEPBACKSLASH@

22183

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22184

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_death_test_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_death_test_test-gtest-death-test_test.o `test -f 'test/gtest-death-test_test.cc' || echo '$(srcdir)/'`test/gtest-death-test_test.cc

22185

22186

test/test_gtest_death_test_test-gtest-death-test_test.obj: test/gtest-death-test_test.cc

22187

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_death_test_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_death_test_test-gtest-death-test_test.obj -MD -MP -MF test/$(DEPDIR)/test_gtest_death_test_test-gtest-death-test_test.Tpo -c -o test/test_gtest_death_test_test-gtest-death-test_test.obj `if test -f 'test/gtest-death-test_test.cc'; then $(CYGPATH_W) 'test/gtest-death-test_test.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest-death-test_test.cc'; fi`

22188

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_death_test_test-gtest-death-test_test.Tpo test/$(DEPDIR)/test_gtest_death_test_test-gtest-death-test_test.Po

22189

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_death_test_test-gtest-death-test_test.Tpo test/$(DEPDIR)/test_gtest_death_test_test-gtest-death-test_test.Po

22190

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest-death-test_test.cc' object='test/test_gtest_death_test_test-gtest-death-test_test.obj' libtool=no @AMDEPBACKSLASH@

22191

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22192

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_death_test_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_death_test_test-gtest-death-test_test.obj `if test -f 'test/gtest-death-test_test.cc'; then $(CYGPATH_W) 'test/gtest-death-test_test.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest-death-test_test.cc'; fi`

22193

22194

test/test_gtest_tuple_test-gtest-tuple_test.o: test/gtest-tuple_test.cc

22195

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_tuple_test-gtest-tuple_test.o -MD -MP -MF test/$(DEPDIR)/test_gtest_tuple_test-gtest-tuple_test.Tpo -c -o test/test_gtest_tuple_test-gtest-tuple_test.o `test -f 'test/gtest-tuple_test.cc' || echo '$(srcdir)/'`test/gtest-tuple_test.cc

22196

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_tuple_test-gtest-tuple_test.Tpo test/$(DEPDIR)/test_gtest_tuple_test-gtest-tuple_test.Po

22197

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_tuple_test-gtest-tuple_test.Tpo test/$(DEPDIR)/test_gtest_tuple_test-gtest-tuple_test.Po

22198

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest-tuple_test.cc' object='test/test_gtest_tuple_test-gtest-tuple_test.o' libtool=no @AMDEPBACKSLASH@

22199

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22200

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_tuple_test-gtest-tuple_test.o `test -f 'test/gtest-tuple_test.cc' || echo '$(srcdir)/'`test/gtest-tuple_test.cc

22201

22202

test/test_gtest_tuple_test-gtest-tuple_test.obj: test/gtest-tuple_test.cc

22203

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_tuple_test-gtest-tuple_test.obj -MD -MP -MF test/$(DEPDIR)/test_gtest_tuple_test-gtest-tuple_test.Tpo -c -o test/test_gtest_tuple_test-gtest-tuple_test.obj `if test -f 'test/gtest-tuple_test.cc'; then $(CYGPATH_W) 'test/gtest-tuple_test.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest-tuple_test.cc'; fi`

22204

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_tuple_test-gtest-tuple_test.Tpo test/$(DEPDIR)/test_gtest_tuple_test-gtest-tuple_test.Po

22205

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_tuple_test-gtest-tuple_test.Tpo test/$(DEPDIR)/test_gtest_tuple_test-gtest-tuple_test.Po

22206

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest-tuple_test.cc' object='test/test_gtest_tuple_test-gtest-tuple_test.obj' libtool=no @AMDEPBACKSLASH@

22207

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22208

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_tuple_test-gtest-tuple_test.obj `if test -f 'test/gtest-tuple_test.cc'; then $(CYGPATH_W) 'test/gtest-tuple_test.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest-tuple_test.cc'; fi`

22209

22210

src/test_gtest_tuple_test-gtest-all.o: src/gtest-all.cc

22211

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_tuple_test-gtest-all.o -MD -MP -MF src/$(DEPDIR)/test_gtest_tuple_test-gtest-all.Tpo -c -o src/test_gtest_tuple_test-gtest-all.o `test -f 'src/gtest-all.cc' || echo '$(srcdir)/'`src/gtest-all.cc

22212

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_tuple_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_tuple_test-gtest-all.Po

22213

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_tuple_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_tuple_test-gtest-all.Po

22214

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest-all.cc' object='src/test_gtest_tuple_test-gtest-all.o' libtool=no @AMDEPBACKSLASH@

22215

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22216

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_tuple_test-gtest-all.o `test -f 'src/gtest-all.cc' || echo '$(srcdir)/'`src/gtest-all.cc

22217

22218

src/test_gtest_tuple_test-gtest-all.obj: src/gtest-all.cc

22219

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_tuple_test-gtest-all.obj -MD -MP -MF src/$(DEPDIR)/test_gtest_tuple_test-gtest-all.Tpo -c -o src/test_gtest_tuple_test-gtest-all.obj `if test -f 'src/gtest-all.cc'; then $(CYGPATH_W) 'src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest-all.cc'; fi`

22220

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_tuple_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_tuple_test-gtest-all.Po

22221

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_tuple_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_tuple_test-gtest-all.Po

22222

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest-all.cc' object='src/test_gtest_tuple_test-gtest-all.obj' libtool=no @AMDEPBACKSLASH@

22223

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22224

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_tuple_test-gtest-all.obj `if test -f 'src/gtest-all.cc'; then $(CYGPATH_W) 'src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest-all.cc'; fi`

22225

22226

src/test_gtest_tuple_test-gtest_main.o: src/gtest_main.cc

22227

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_tuple_test-gtest_main.o -MD -MP -MF src/$(DEPDIR)/test_gtest_tuple_test-gtest_main.Tpo -c -o src/test_gtest_tuple_test-gtest_main.o `test -f 'src/gtest_main.cc' || echo '$(srcdir)/'`src/gtest_main.cc

22228

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_tuple_test-gtest_main.Tpo src/$(DEPDIR)/test_gtest_tuple_test-gtest_main.Po

22229

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_tuple_test-gtest_main.Tpo src/$(DEPDIR)/test_gtest_tuple_test-gtest_main.Po

22230

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest_main.cc' object='src/test_gtest_tuple_test-gtest_main.o' libtool=no @AMDEPBACKSLASH@

22231

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22232

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_tuple_test-gtest_main.o `test -f 'src/gtest_main.cc' || echo '$(srcdir)/'`src/gtest_main.cc

22233

22234

src/test_gtest_tuple_test-gtest_main.obj: src/gtest_main.cc

22235

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_tuple_test-gtest_main.obj -MD -MP -MF src/$(DEPDIR)/test_gtest_tuple_test-gtest_main.Tpo -c -o src/test_gtest_tuple_test-gtest_main.obj `if test -f 'src/gtest_main.cc'; then $(CYGPATH_W) 'src/gtest_main.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest_main.cc'; fi`

22236

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_tuple_test-gtest_main.Tpo src/$(DEPDIR)/test_gtest_tuple_test-gtest_main.Po

22237

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_tuple_test-gtest_main.Tpo src/$(DEPDIR)/test_gtest_tuple_test-gtest_main.Po

22238

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest_main.cc' object='src/test_gtest_tuple_test-gtest_main.obj' libtool=no @AMDEPBACKSLASH@

22239

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22240

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_tuple_test-gtest_main.obj `if test -f 'src/gtest_main.cc'; then $(CYGPATH_W) 'src/gtest_main.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest_main.cc'; fi`

22241

22242

test/test_gtest_no_rtti_test-gtest_unittest.o: test/gtest_unittest.cc

22243

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_no_rtti_test-gtest_unittest.o -MD -MP -MF test/$(DEPDIR)/test_gtest_no_rtti_test-gtest_unittest.Tpo -c -o test/test_gtest_no_rtti_test-gtest_unittest.o `test -f 'test/gtest_unittest.cc' || echo '$(srcdir)/'`test/gtest_unittest.cc

22244

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_no_rtti_test-gtest_unittest.Tpo test/$(DEPDIR)/test_gtest_no_rtti_test-gtest_unittest.Po

22245

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_no_rtti_test-gtest_unittest.Tpo test/$(DEPDIR)/test_gtest_no_rtti_test-gtest_unittest.Po

22246

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest_unittest.cc' object='test/test_gtest_no_rtti_test-gtest_unittest.o' libtool=no @AMDEPBACKSLASH@

22247

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22248

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_no_rtti_test-gtest_unittest.o `test -f 'test/gtest_unittest.cc' || echo '$(srcdir)/'`test/gtest_unittest.cc

22249

22250

test/test_gtest_no_rtti_test-gtest_unittest.obj: test/gtest_unittest.cc

22251

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_no_rtti_test-gtest_unittest.obj -MD -MP -MF test/$(DEPDIR)/test_gtest_no_rtti_test-gtest_unittest.Tpo -c -o test/test_gtest_no_rtti_test-gtest_unittest.obj `if test -f 'test/gtest_unittest.cc'; then $(CYGPATH_W) 'test/gtest_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest_unittest.cc'; fi`

22252

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_no_rtti_test-gtest_unittest.Tpo test/$(DEPDIR)/test_gtest_no_rtti_test-gtest_unittest.Po

22253

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_no_rtti_test-gtest_unittest.Tpo test/$(DEPDIR)/test_gtest_no_rtti_test-gtest_unittest.Po

22254

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest_unittest.cc' object='test/test_gtest_no_rtti_test-gtest_unittest.obj' libtool=no @AMDEPBACKSLASH@

22255

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22256

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_no_rtti_test-gtest_unittest.obj `if test -f 'test/gtest_unittest.cc'; then $(CYGPATH_W) 'test/gtest_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest_unittest.cc'; fi`

22257

22258

src/test_gtest_no_rtti_test-gtest-all.o: src/gtest-all.cc

22259

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_no_rtti_test-gtest-all.o -MD -MP -MF src/$(DEPDIR)/test_gtest_no_rtti_test-gtest-all.Tpo -c -o src/test_gtest_no_rtti_test-gtest-all.o `test -f 'src/gtest-all.cc' || echo '$(srcdir)/'`src/gtest-all.cc

22260

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_no_rtti_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_no_rtti_test-gtest-all.Po

22261

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_no_rtti_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_no_rtti_test-gtest-all.Po

22262

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest-all.cc' object='src/test_gtest_no_rtti_test-gtest-all.o' libtool=no @AMDEPBACKSLASH@

22263

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22264

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_no_rtti_test-gtest-all.o `test -f 'src/gtest-all.cc' || echo '$(srcdir)/'`src/gtest-all.cc

22265

22266

src/test_gtest_no_rtti_test-gtest-all.obj: src/gtest-all.cc

22267

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_no_rtti_test-gtest-all.obj -MD -MP -MF src/$(DEPDIR)/test_gtest_no_rtti_test-gtest-all.Tpo -c -o src/test_gtest_no_rtti_test-gtest-all.obj `if test -f 'src/gtest-all.cc'; then $(CYGPATH_W) 'src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest-all.cc'; fi`

22268

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_no_rtti_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_no_rtti_test-gtest-all.Po

22269

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_no_rtti_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_no_rtti_test-gtest-all.Po

22270

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest-all.cc' object='src/test_gtest_no_rtti_test-gtest-all.obj' libtool=no @AMDEPBACKSLASH@

22271

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22272

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_no_rtti_test-gtest-all.obj `if test -f 'src/gtest-all.cc'; then $(CYGPATH_W) 'src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest-all.cc'; fi`

22273

22274

src/test_gtest_no_rtti_test-gtest_main.o: src/gtest_main.cc

22275

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_no_rtti_test-gtest_main.o -MD -MP -MF src/$(DEPDIR)/test_gtest_no_rtti_test-gtest_main.Tpo -c -o src/test_gtest_no_rtti_test-gtest_main.o `test -f 'src/gtest_main.cc' || echo '$(srcdir)/'`src/gtest_main.cc

22276

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_no_rtti_test-gtest_main.Tpo src/$(DEPDIR)/test_gtest_no_rtti_test-gtest_main.Po

22277

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_no_rtti_test-gtest_main.Tpo src/$(DEPDIR)/test_gtest_no_rtti_test-gtest_main.Po

22278

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest_main.cc' object='src/test_gtest_no_rtti_test-gtest_main.o' libtool=no @AMDEPBACKSLASH@

22279

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22280

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_no_rtti_test-gtest_main.o `test -f 'src/gtest_main.cc' || echo '$(srcdir)/'`src/gtest_main.cc

22281

22282

src/test_gtest_no_rtti_test-gtest_main.obj: src/gtest_main.cc

22283

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_no_rtti_test-gtest_main.obj -MD -MP -MF src/$(DEPDIR)/test_gtest_no_rtti_test-gtest_main.Tpo -c -o src/test_gtest_no_rtti_test-gtest_main.obj `if test -f 'src/gtest_main.cc'; then $(CYGPATH_W) 'src/gtest_main.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest_main.cc'; fi`

22284

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_no_rtti_test-gtest_main.Tpo src/$(DEPDIR)/test_gtest_no_rtti_test-gtest_main.Po

22285

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_no_rtti_test-gtest_main.Tpo src/$(DEPDIR)/test_gtest_no_rtti_test-gtest_main.Po

22286

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest_main.cc' object='src/test_gtest_no_rtti_test-gtest_main.obj' libtool=no @AMDEPBACKSLASH@

22287

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22288

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_no_rtti_test_CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_no_rtti_test-gtest_main.obj `if test -f 'src/gtest_main.cc'; then $(CYGPATH_W) 'src/gtest_main.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest_main.cc'; fi`

22289

22290

test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.o: test/gtest_throw_on_failure_ex_test.cc

22291

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_ex_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.o -MD -MP -MF test/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.Tpo -c -o test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.o `test -f 'test/gtest_throw_on_failure_ex_test.cc' || echo '$(srcdir)/'`test/gtest_throw_on_failure_ex_test.cc

22292

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.Tpo test/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.Po

22293

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.Tpo test/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.Po

22294

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest_throw_on_failure_ex_test.cc' object='test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.o' libtool=no @AMDEPBACKSLASH@

22295

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22296

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_ex_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.o `test -f 'test/gtest_throw_on_failure_ex_test.cc' || echo '$(srcdir)/'`test/gtest_throw_on_failure_ex_test.cc

22297

22298

test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.obj: test/gtest_throw_on_failure_ex_test.cc

22299

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_ex_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.obj -MD -MP -MF test/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.Tpo -c -o test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.obj `if test -f 'test/gtest_throw_on_failure_ex_test.cc'; then $(CYGPATH_W) 'test/gtest_throw_on_failure_ex_test.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest_throw_on_failure_ex_test.cc'; fi`

22300

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.Tpo test/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.Po

22301

22302

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest_throw_on_failure_ex_test.cc' object='test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.obj' libtool=no @AMDEPBACKSLASH@

22303

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22304

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_ex_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_throw_on_failure_ex_test-gtest_throw_on_failure_ex_test.obj `if test -f 'test/gtest_throw_on_failure_ex_test.cc'; then $(CYGPATH_W) 'test/gtest_throw_on_failure_ex_test.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest_throw_on_failure_ex_test.cc'; fi`

22305

22306

src/test_gtest_throw_on_failure_ex_test-gtest-all.o: src/gtest-all.cc

22307

22308

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest-all.Po

22309

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest-all.Po

22310

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest-all.cc' object='src/test_gtest_throw_on_failure_ex_test-gtest-all.o' libtool=no @AMDEPBACKSLASH@

22311

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22312

22313

22314

src/test_gtest_throw_on_failure_ex_test-gtest-all.obj: src/gtest-all.cc

22315

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_ex_test_CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_throw_on_failure_ex_test-gtest-all.obj -MD -MP -MF src/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest-all.Tpo -c -o src/test_gtest_throw_on_failure_ex_test-gtest-all.obj `if test -f 'src/gtest-all.cc'; then $(CYGPATH_W) 'src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest-all.cc'; fi`

22316

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest-all.Po

22317

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_throw_on_failure_ex_test-gtest-all.Po

22318

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest-all.cc' object='src/test_gtest_throw_on_failure_ex_test-gtest-all.obj' libtool=no @AMDEPBACKSLASH@

22319

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22320

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_ex_test_CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_throw_on_failure_ex_test-gtest-all.obj `if test -f 'src/gtest-all.cc'; then $(CYGPATH_W) 'src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest-all.cc'; fi`

22321

22322

test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.o: test/gtest_throw_on_failure_test_.cc

22323

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_test__CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.o -MD -MP -MF test/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.Tpo -c -o test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.o `test -f 'test/gtest_throw_on_failure_test_.cc' || echo '$(srcdir)/'`test/gtest_throw_on_failure_test_.cc

22324

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.Tpo test/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.Po

22325

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.Tpo test/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.Po

22326

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest_throw_on_failure_test_.cc' object='test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.o' libtool=no @AMDEPBACKSLASH@

22327

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22328

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_test__CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.o `test -f 'test/gtest_throw_on_failure_test_.cc' || echo '$(srcdir)/'`test/gtest_throw_on_failure_test_.cc

22329

22330

test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.obj: test/gtest_throw_on_failure_test_.cc

22331

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_test__CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.obj -MD -MP -MF test/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.Tpo -c -o test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.obj `if test -f 'test/gtest_throw_on_failure_test_.cc'; then $(CYGPATH_W) 'test/gtest_throw_on_failure_test_.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest_throw_on_failure_test_.cc'; fi`

22332

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.Tpo test/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.Po

22333

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.Tpo test/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.Po

22334

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest_throw_on_failure_test_.cc' object='test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.obj' libtool=no @AMDEPBACKSLASH@

22335

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22336

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_test__CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_throw_on_failure_test_-gtest_throw_on_failure_test_.obj `if test -f 'test/gtest_throw_on_failure_test_.cc'; then $(CYGPATH_W) 'test/gtest_throw_on_failure_test_.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest_throw_on_failure_test_.cc'; fi`

22337

22338

src/test_gtest_throw_on_failure_test_-gtest-all.o: src/gtest-all.cc

22339

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_test__CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_throw_on_failure_test_-gtest-all.o -MD -MP -MF src/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest-all.Tpo -c -o src/test_gtest_throw_on_failure_test_-gtest-all.o `test -f 'src/gtest-all.cc' || echo '$(srcdir)/'`src/gtest-all.cc

22340

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest-all.Tpo src/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest-all.Po

22341

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest-all.Tpo src/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest-all.Po

22342

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest-all.cc' object='src/test_gtest_throw_on_failure_test_-gtest-all.o' libtool=no @AMDEPBACKSLASH@

22343

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22344

22345

22346

src/test_gtest_throw_on_failure_test_-gtest-all.obj: src/gtest-all.cc

22347

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_test__CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_throw_on_failure_test_-gtest-all.obj -MD -MP -MF src/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest-all.Tpo -c -o src/test_gtest_throw_on_failure_test_-gtest-all.obj `if test -f 'src/gtest-all.cc'; then $(CYGPATH_W) 'src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest-all.cc'; fi`

22348

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest-all.Tpo src/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest-all.Po

22349

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest-all.Tpo src/$(DEPDIR)/test_gtest_throw_on_failure_test_-gtest-all.Po

22350

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest-all.cc' object='src/test_gtest_throw_on_failure_test_-gtest-all.obj' libtool=no @AMDEPBACKSLASH@

22351

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22352

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_throw_on_failure_test__CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_throw_on_failure_test_-gtest-all.obj `if test -f 'src/gtest-all.cc'; then $(CYGPATH_W) 'src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest-all.cc'; fi`

22353

22354

test/test_gtest_use_own_tuple_test-gtest-param-test_test.o: test/gtest-param-test_test.cc

22355

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_use_own_tuple_test-gtest-param-test_test.o -MD -MP -MF test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test_test.Tpo -c -o test/test_gtest_use_own_tuple_test-gtest-param-test_test.o `test -f 'test/gtest-param-test_test.cc' || echo '$(srcdir)/'`test/gtest-param-test_test.cc

22356

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test_test.Tpo test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test_test.Po

22357

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test_test.Tpo test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test_test.Po

22358

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest-param-test_test.cc' object='test/test_gtest_use_own_tuple_test-gtest-param-test_test.o' libtool=no @AMDEPBACKSLASH@

22359

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22360

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_use_own_tuple_test-gtest-param-test_test.o `test -f 'test/gtest-param-test_test.cc' || echo '$(srcdir)/'`test/gtest-param-test_test.cc

22361

22362

test/test_gtest_use_own_tuple_test-gtest-param-test_test.obj: test/gtest-param-test_test.cc

22363

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_use_own_tuple_test-gtest-param-test_test.obj -MD -MP -MF test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test_test.Tpo -c -o test/test_gtest_use_own_tuple_test-gtest-param-test_test.obj `if test -f 'test/gtest-param-test_test.cc'; then $(CYGPATH_W) 'test/gtest-param-test_test.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest-param-test_test.cc'; fi`

22364

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test_test.Tpo test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test_test.Po

22365

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test_test.Tpo test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test_test.Po

22366

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest-param-test_test.cc' object='test/test_gtest_use_own_tuple_test-gtest-param-test_test.obj' libtool=no @AMDEPBACKSLASH@

22367

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22368

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_use_own_tuple_test-gtest-param-test_test.obj `if test -f 'test/gtest-param-test_test.cc'; then $(CYGPATH_W) 'test/gtest-param-test_test.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest-param-test_test.cc'; fi`

22369

22370

test/test_gtest_use_own_tuple_test-gtest-param-test2_test.o: test/gtest-param-test2_test.cc

22371

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_use_own_tuple_test-gtest-param-test2_test.o -MD -MP -MF test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test2_test.Tpo -c -o test/test_gtest_use_own_tuple_test-gtest-param-test2_test.o `test -f 'test/gtest-param-test2_test.cc' || echo '$(srcdir)/'`test/gtest-param-test2_test.cc

22372

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test2_test.Tpo test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test2_test.Po

22373

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test2_test.Tpo test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test2_test.Po

22374

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest-param-test2_test.cc' object='test/test_gtest_use_own_tuple_test-gtest-param-test2_test.o' libtool=no @AMDEPBACKSLASH@

22375

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22376

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_use_own_tuple_test-gtest-param-test2_test.o `test -f 'test/gtest-param-test2_test.cc' || echo '$(srcdir)/'`test/gtest-param-test2_test.cc

22377

22378

test/test_gtest_use_own_tuple_test-gtest-param-test2_test.obj: test/gtest-param-test2_test.cc

22379

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT test/test_gtest_use_own_tuple_test-gtest-param-test2_test.obj -MD -MP -MF test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test2_test.Tpo -c -o test/test_gtest_use_own_tuple_test-gtest-param-test2_test.obj `if test -f 'test/gtest-param-test2_test.cc'; then $(CYGPATH_W) 'test/gtest-param-test2_test.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest-param-test2_test.cc'; fi`

22380

-@am__fastdepCXX_TRUE@ mv -f test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test2_test.Tpo test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test2_test.Po

22381

+@am__fastdepCXX_TRUE@ $(am__mv) test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test2_test.Tpo test/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-param-test2_test.Po

22382

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='test/gtest-param-test2_test.cc' object='test/test_gtest_use_own_tuple_test-gtest-param-test2_test.obj' libtool=no @AMDEPBACKSLASH@

22383

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22384

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o test/test_gtest_use_own_tuple_test-gtest-param-test2_test.obj `if test -f 'test/gtest-param-test2_test.cc'; then $(CYGPATH_W) 'test/gtest-param-test2_test.cc'; else $(CYGPATH_W) '$(srcdir)/test/gtest-param-test2_test.cc'; fi`

22385

22386

src/test_gtest_use_own_tuple_test-gtest-all.o: src/gtest-all.cc

22387

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_use_own_tuple_test-gtest-all.o -MD -MP -MF src/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-all.Tpo -c -o src/test_gtest_use_own_tuple_test-gtest-all.o `test -f 'src/gtest-all.cc' || echo '$(srcdir)/'`src/gtest-all.cc

22388

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-all.Po

22389

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-all.Po

22390

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest-all.cc' object='src/test_gtest_use_own_tuple_test-gtest-all.o' libtool=no @AMDEPBACKSLASH@

22391

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22392

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_use_own_tuple_test-gtest-all.o `test -f 'src/gtest-all.cc' || echo '$(srcdir)/'`src/gtest-all.cc

22393

22394

src/test_gtest_use_own_tuple_test-gtest-all.obj: src/gtest-all.cc

22395

@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -MT src/test_gtest_use_own_tuple_test-gtest-all.obj -MD -MP -MF src/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-all.Tpo -c -o src/test_gtest_use_own_tuple_test-gtest-all.obj `if test -f 'src/gtest-all.cc'; then $(CYGPATH_W) 'src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest-all.cc'; fi`

22396

-@am__fastdepCXX_TRUE@ mv -f src/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-all.Po

22397

+@am__fastdepCXX_TRUE@ $(am__mv) src/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-all.Tpo src/$(DEPDIR)/test_gtest_use_own_tuple_test-gtest-all.Po

22398

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='src/gtest-all.cc' object='src/test_gtest_use_own_tuple_test-gtest-all.obj' libtool=no @AMDEPBACKSLASH@

22399

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22400

@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtest_use_own_tuple_test_CXXFLAGS) $(CXXFLAGS) -c -o src/test_gtest_use_own_tuple_test-gtest-all.obj `if test -f 'src/gtest-all.cc'; then $(CYGPATH_W) 'src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/gtest-all.cc'; fi`

22401

@@ -1829,72 +1870,81 @@ clean-libtool:

22402

-rm -rf test/.libs test/_libs

22403

22404

distclean-libtool:

22405

- -rm -f libtool

22406

+ -rm -f libtool config.lt

22407

install-m4dataDATA: $(m4data_DATA)

22408

@$(NORMAL_INSTALL)

22409

test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)"

22410

- @list='$(m4data_DATA)'; for p in $$list; do \

22411

+ @list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \

22412

+ for p in $$list; do \

22413

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

22414

- f=$(am__strip_dir) \

22415

- echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \

22416

- $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \

22417

+ echo "$$d$$p"; \

22418

+ done | $(am__base_list) | \

22419

+ while read files; do \

22420

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(m4datadir)'"; \

22421

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(m4datadir)" || exit $$?; \

22422

done

22423

22424

uninstall-m4dataDATA:

22425

@$(NORMAL_UNINSTALL)

22426

- @list='$(m4data_DATA)'; for p in $$list; do \

22427

- f=$(am__strip_dir) \

22428

- echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \

22429

- rm -f "$(DESTDIR)$(m4datadir)/$$f"; \

22430

- done

22431

+ @list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \

22432

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

22433

+ test -n "$$files" || exit 0; \

22434

+ echo " ( cd '$(DESTDIR)$(m4datadir)' && rm -f" $$files ")"; \

22435

+ cd "$(DESTDIR)$(m4datadir)" && rm -f $$files

22436

install-pkgincludeHEADERS: $(pkginclude_HEADERS)

22437

@$(NORMAL_INSTALL)

22438

test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"

22439

- @list='$(pkginclude_HEADERS)'; for p in $$list; do \

22440

+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \

22441

+ for p in $$list; do \

22442

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

22443

- f=$(am__strip_dir) \

22444

- echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \

22445

- $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \

22446

+ echo "$$d$$p"; \

22447

+ done | $(am__base_list) | \

22448

+ while read files; do \

22449

+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \

22450

+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \

22451

done

22452

22453

uninstall-pkgincludeHEADERS:

22454

@$(NORMAL_UNINSTALL)

22455

- @list='$(pkginclude_HEADERS)'; for p in $$list; do \

22456

- f=$(am__strip_dir) \

22457

- echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \

22458

- rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \

22459

- done

22460

+ @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \

22461

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

22462

+ test -n "$$files" || exit 0; \

22463

+ echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \

22464

+ cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files

22465

install-pkginclude_internalHEADERS: $(pkginclude_internal_HEADERS)

22466

@$(NORMAL_INSTALL)

22467

test -z "$(pkginclude_internaldir)" || $(MKDIR_P) "$(DESTDIR)$(pkginclude_internaldir)"

22468

- @list='$(pkginclude_internal_HEADERS)'; for p in $$list; do \

22469

+ @list='$(pkginclude_internal_HEADERS)'; test -n "$(pkginclude_internaldir)" || list=; \

22470

+ for p in $$list; do \

22471

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

22472

- f=$(am__strip_dir) \

22473

- echo " $(pkginclude_internalHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkginclude_internaldir)/$$f'"; \

22474

- $(pkginclude_internalHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkginclude_internaldir)/$$f"; \

22475

+ echo "$$d$$p"; \

22476

+ done | $(am__base_list) | \

22477

+ while read files; do \

22478

+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkginclude_internaldir)'"; \

22479

+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkginclude_internaldir)" || exit $$?; \

22480

done

22481

22482

uninstall-pkginclude_internalHEADERS:

22483

@$(NORMAL_UNINSTALL)

22484

- @list='$(pkginclude_internal_HEADERS)'; for p in $$list; do \

22485

- f=$(am__strip_dir) \

22486

- echo " rm -f '$(DESTDIR)$(pkginclude_internaldir)/$$f'"; \

22487

- rm -f "$(DESTDIR)$(pkginclude_internaldir)/$$f"; \

22488

- done

22489

+ @list='$(pkginclude_internal_HEADERS)'; test -n "$(pkginclude_internaldir)" || list=; \

22490

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

22491

+ test -n "$$files" || exit 0; \

22492

+ echo " ( cd '$(DESTDIR)$(pkginclude_internaldir)' && rm -f" $$files ")"; \

22493

+ cd "$(DESTDIR)$(pkginclude_internaldir)" && rm -f $$files

22494

22495

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

22496

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

22497

unique=`for i in $$list; do \

22498

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

22499

done | \

22500

- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

22501

+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

22502

END { if (nonempty) { for (i in files) print i; }; }'`; \

22503

mkid -fID $$unique

22504

tags: TAGS

22505

22506

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

22507

$(TAGS_FILES) $(LISP)

22508

- tags=; \

22509

+ set x; \

22510

here=`pwd`; \

22511

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

22512

unique=`for i in $$list; do \

22513

@@ -1902,37 +1952,43 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP

22514

done | \

22515

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

22516

END { if (nonempty) { for (i in files) print i; }; }'`; \

22517

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

22518

+ shift; \

22519

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

22520

test -n "$$unique" || unique=$$empty_fix; \

22521

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22522

- $$tags $$unique; \

22523

+ if test $$# -gt 0; then \

22524

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22525

+ "$$@" $$unique; \

22526

+ else \

22527

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22528

+ $$unique; \

22529

+ fi; \

22530

22531

ctags: CTAGS

22532

CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

22533

$(TAGS_FILES) $(LISP)

22534

- tags=; \

22535

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

22536

unique=`for i in $$list; do \

22537

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

22538

done | \

22539

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

22540

END { if (nonempty) { for (i in files) print i; }; }'`; \

22541

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

22542

+ test -z "$(CTAGS_ARGS)$$unique" \

22543

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

22544

- $$tags $$unique

22545

+ $$unique

22546

22547

GTAGS:

22548

here=`$(am__cd) $(top_builddir) && pwd` \

22549

- && cd $(top_srcdir) \

22550

- && gtags -i $(GTAGS_ARGS) $$here

22551

+ && $(am__cd) $(top_srcdir) \

22552

+ && gtags -i $(GTAGS_ARGS) "$$here"

22553

22554

distclean-tags:

22555

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

22556

22557

check-TESTS: $(TESTS)

22558

- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \

22559

+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \

22560

srcdir=$(srcdir); export srcdir; \

22561

list=' $(TESTS) '; \

22562

+ $(am__tty_colors); \

22563

if test -n "$$list"; then \

22564

for tst in $$list; do \

22565

if test -f ./$$tst; then dir=./; \

22566

@@ -1941,49 +1997,63 @@ check-TESTS: $(TESTS)

22567

if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \

22568

all=`expr $$all + 1`; \

22569

case " $(XFAIL_TESTS) " in \

22570

- *$$ws$$tst$$ws*) \

22571

+ *[\ \ ]$$tst[\ \ ]*) \

22572

xpass=`expr $$xpass + 1`; \

22573

failed=`expr $$failed + 1`; \

22574

- echo "XPASS: $$tst"; \

22575

+ col=$$red; res=XPASS; \

22576

;; \

22577

*) \

22578

- echo "PASS: $$tst"; \

22579

+ col=$$grn; res=PASS; \

22580

;; \

22581

esac; \

22582

elif test $$? -ne 77; then \

22583

all=`expr $$all + 1`; \

22584

case " $(XFAIL_TESTS) " in \

22585

- *$$ws$$tst$$ws*) \

22586

+ *[\ \ ]$$tst[\ \ ]*) \

22587

xfail=`expr $$xfail + 1`; \

22588

- echo "XFAIL: $$tst"; \

22589

+ col=$$lgn; res=XFAIL; \

22590

;; \

22591

*) \

22592

failed=`expr $$failed + 1`; \

22593

- echo "FAIL: $$tst"; \

22594

+ col=$$red; res=FAIL; \

22595

;; \

22596

esac; \

22597

else \

22598

skip=`expr $$skip + 1`; \

22599

- echo "SKIP: $$tst"; \

22600

+ col=$$blu; res=SKIP; \

22601

fi; \

22602

+ echo "$${col}$$res$${std}: $$tst"; \

22603

done; \

22604

+ if test "$$all" -eq 1; then \

22605

+ tests="test"; \

22606

+ All=""; \

22607

+ else \

22608

+ tests="tests"; \

22609

+ All="All "; \

22610

+ fi; \

22611

if test "$$failed" -eq 0; then \

22612

if test "$$xfail" -eq 0; then \

22613

- banner="All $$all tests passed"; \

22614

+ banner="$$All$$all $$tests passed"; \

22615

else \

22616

- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \

22617

+ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \

22618

+ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \

22619

fi; \

22620

else \

22621

if test "$$xpass" -eq 0; then \

22622

- banner="$$failed of $$all tests failed"; \

22623

+ banner="$$failed of $$all $$tests failed"; \

22624

else \

22625

- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \

22626

+ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \

22627

+ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \

22628

fi; \

22629

fi; \

22630

dashes="$$banner"; \

22631

skipped=""; \

22632

if test "$$skip" -ne 0; then \

22633

- skipped="($$skip tests were not run)"; \

22634

+ if test "$$skip" -eq 1; then \

22635

+ skipped="($$skip test was not run)"; \

22636

+ else \

22637

+ skipped="($$skip tests were not run)"; \

22638

+ fi; \

22639

test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \

22640

dashes="$$skipped"; \

22641

fi; \

22642

@@ -1994,17 +2064,21 @@ check-TESTS: $(TESTS)

22643

dashes="$$report"; \

22644

fi; \

22645

dashes=`echo "$$dashes" | sed s/./=/g`; \

22646

- echo "$$dashes"; \

22647

+ if test "$$failed" -eq 0; then \

22648

+ echo "$$grn$$dashes"; \

22649

+ else \

22650

+ echo "$$red$$dashes"; \

22651

+ fi; \

22652

echo "$$banner"; \

22653

test -z "$$skipped" || echo "$$skipped"; \

22654

test -z "$$report" || echo "$$report"; \

22655

- echo "$$dashes"; \

22656

+ echo "$$dashes$$std"; \

22657

test "$$failed" -eq 0; \

22658

else :; fi

22659

22660

distdir: $(DISTFILES)

22661

$(am__remove_distdir)

22662

- test -d $(distdir) || mkdir $(distdir)

22663

+ test -d "$(distdir)" || mkdir "$(distdir)"

22664

@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

22665

topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

22666

list='$(DISTFILES)'; \

22667

@@ -2020,21 +2094,27 @@ distdir: $(DISTFILES)

22668

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

22669

if test -d $$d/$$file; then \

22670

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

22671

+ if test -d "$(distdir)/$$file"; then \

22672

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

22673

+ fi; \

22674

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

22675

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

22676

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

22677

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

22678

fi; \

22679

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

22680

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

22681

else \

22682

- test -f $(distdir)/$$file \

22683

- || cp -p $$d/$$file $(distdir)/$$file \

22684

+ test -f "$(distdir)/$$file" \

22685

+ || cp -p $$d/$$file "$(distdir)/$$file" \

22686

|| exit 1; \

22687

fi; \

22688

done

22689

- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \

22690

+ -test -n "$(am__skip_mode_fix)" \

22691

+ || find "$(distdir)" -type d ! -perm -755 \

22692

+ -exec chmod u+rwx,go+rx {} \; -o \

22693

! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \

22694

! -type d ! -perm -400 -exec chmod a+r {} \; -o \

22695

! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \

22696

- || chmod -R a+r $(distdir)

22697

+ || chmod -R a+r "$(distdir)"

22698

dist-gzip: distdir

22699

tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz

22700

$(am__remove_distdir)

22701

@@ -2046,6 +2126,10 @@ dist-lzma: distdir

22702

tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma

22703

$(am__remove_distdir)

22704

22705

+dist-xz: distdir

22706

+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz

22707

+ $(am__remove_distdir)

22708

22709

dist-tarZ: distdir

22710

tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z

22711

$(am__remove_distdir)

22712

@@ -2071,15 +2155,17 @@ dist dist-all: distdir

22713

distcheck: dist

22714

case '$(DIST_ARCHIVES)' in \

22715

*.tar.gz*) \

22716

- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\

22717

+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\

22718

*.tar.bz2*) \

22719

- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\

22720

+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\

22721

*.tar.lzma*) \

22722

- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\

22723

+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\

22724

+ *.tar.xz*) \

22725

+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\

22726

*.tar.Z*) \

22727

uncompress -c $(distdir).tar.Z | $(am__untar) ;;\

22728

*.shar.gz*) \

22729

- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\

22730

+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\

22731

*.zip*) \

22732

unzip $(distdir).zip ;;\

22733

esac

22734

@@ -2087,9 +2173,11 @@ distcheck: dist

22735

mkdir $(distdir)/_build

22736

mkdir $(distdir)/_inst

22737

chmod a-w $(distdir)

22738

+ test -d $(distdir)/_build || exit 0; \

22739

dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \

22740

&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \

22741

- && cd $(distdir)/_build \

22742

+ && am__cwd=`pwd` \

22743

+ && $(am__cd) $(distdir)/_build \

22744

&& ../configure --srcdir=.. --prefix="$$dc_install_base" \

22745

$(DISTCHECK_CONFIGURE_FLAGS) \

22746

&& $(MAKE) $(AM_MAKEFLAGS) \

22747

@@ -2111,13 +2199,15 @@ distcheck: dist

22748

&& rm -rf "$$dc_destdir" \

22749

&& $(MAKE) $(AM_MAKEFLAGS) dist \

22750

&& rm -rf $(DIST_ARCHIVES) \

22751

- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck

22752

+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \

22753

+ && cd "$$am__cwd" \

22754

+ || exit 1

22755

$(am__remove_distdir)

22756

@(echo "$(distdir) archives ready for distribution: "; \

22757

list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \

22758

sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'

22759

distuninstallcheck:

22760

- @cd $(distuninstallcheck_dir) \

22761

+ @$(am__cd) '$(distuninstallcheck_dir)' \

22762

&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \

22763

|| { echo "ERROR: files left after uninstall:" ; \

22764

if test -n "$(DESTDIR)"; then \

22765

@@ -2164,6 +2254,7 @@ clean-generic:

22766

22767

distclean-generic:

22768

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

22769

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

22770

-rm -f lib/$(am__dirstamp)

22771

-rm -f samples/$(DEPDIR)/$(am__dirstamp)

22772

-rm -f samples/$(am__dirstamp)

22773

@@ -2193,6 +2284,8 @@ dvi-am:

22774

22775

html: html-am

22776

22777

+html-am:

22778

22779

info: info-am

22780

22781

info-am:

22782

@@ -2202,18 +2295,28 @@ install-data-am: install-m4dataDATA inst

22783

22784

install-dvi: install-dvi-am

22785

22786

+install-dvi-am:

22787

22788

install-exec-am: install-binSCRIPTS install-libLTLIBRARIES

22789

22790

install-html: install-html-am

22791

22792

+install-html-am:

22793

22794

install-info: install-info-am

22795

22796

+install-info-am:

22797

22798

install-man:

22799

22800

install-pdf: install-pdf-am

22801

22802

+install-pdf-am:

22803

22804

install-ps: install-ps-am

22805

22806

+install-ps-am:

22807

22808

installcheck-am:

22809

22810

maintainer-clean: maintainer-clean-am

22811

@@ -2240,30 +2343,31 @@ uninstall-am: uninstall-binSCRIPTS unins

22812

uninstall-m4dataDATA uninstall-pkgincludeHEADERS \

22813

uninstall-pkginclude_internalHEADERS

22814

22815

-.MAKE: install-am install-strip

22816

+.MAKE: check-am install-am install-strip

22817

22818

.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \

22819

clean clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \

22820

clean-libtool clean-noinstLTLIBRARIES ctags dist dist-all \

22821

- dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-zip \

22822

- distcheck distclean distclean-compile distclean-generic \

22823

- distclean-hdr distclean-libtool distclean-tags distcleancheck \

22824

- distdir distuninstallcheck dvi dvi-am html html-am info \

22825

- info-am install install-am install-binSCRIPTS install-data \

22826

- install-data-am install-dvi install-dvi-am install-exec \

22827

- install-exec-am install-html install-html-am install-info \

22828

- install-info-am install-libLTLIBRARIES install-m4dataDATA \

22829

- install-man install-pdf install-pdf-am \

22830

- install-pkgincludeHEADERS install-pkginclude_internalHEADERS \

22831

- install-ps install-ps-am install-strip installcheck \

22832

- installcheck-am installdirs maintainer-clean \

22833

- maintainer-clean-generic mostlyclean mostlyclean-compile \

22834

- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \

22835

- tags uninstall uninstall-am uninstall-binSCRIPTS \

22836

- uninstall-libLTLIBRARIES uninstall-m4dataDATA \

22837

- uninstall-pkgincludeHEADERS \

22838

+ dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \

22839

+ dist-zip distcheck distclean distclean-compile \

22840

+ distclean-generic distclean-hdr distclean-libtool \

22841

+ distclean-tags distcleancheck distdir distuninstallcheck dvi \

22842

+ dvi-am html html-am info info-am install install-am \

22843

+ install-binSCRIPTS install-data install-data-am install-dvi \

22844

+ install-dvi-am install-exec install-exec-am install-html \

22845

+ install-html-am install-info install-info-am \

22846

+ install-libLTLIBRARIES install-m4dataDATA install-man \

22847

+ install-pdf install-pdf-am install-pkgincludeHEADERS \

22848

+ install-pkginclude_internalHEADERS install-ps install-ps-am \

22849

+ install-strip installcheck installcheck-am installdirs \

22850

+ maintainer-clean maintainer-clean-generic mostlyclean \

22851

+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \

22852

+ pdf pdf-am ps ps-am tags uninstall uninstall-am \

22853

+ uninstall-binSCRIPTS uninstall-libLTLIBRARIES \

22854

+ uninstall-m4dataDATA uninstall-pkgincludeHEADERS \

22855

uninstall-pkginclude_internalHEADERS

22856

22857

22858

# Tell versions [3.59,3.63) of GNU make to not export all variables.

22859

# Otherwise a system limit (for SysV at least) may be exceeded.

22860

.NOEXPORT:

22861

--- protobuf-2.3.0.orig/gtest/aclocal.m4

22862

+++ protobuf-2.3.0/gtest/aclocal.m4

22863

@@ -1,7 +1,7 @@

22864

-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-

22865

+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-

22866

22867

22868

-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

22869

+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

22870

# This file is free software; the Free Software Foundation

22871

# gives unlimited permission to copy and/or distribute it,

22872

# with or without modifications, as long as this notice is preserved.

19280

@@ -397,6 +399,7 @@ abs_builddir = @abs_builddir@

19281

abs_srcdir = @abs_srcdir@

19282

abs_top_builddir = @abs_top_builddir@

19283

abs_top_srcdir = @abs_top_srcdir@

19284

+ac_ct_AR = @ac_ct_AR@

19285

ac_ct_CC = @ac_ct_CC@

19286

ac_ct_CXX = @ac_ct_CXX@

19287

ac_ct_DUMPBIN = @ac_ct_DUMPBIN@

19288

@@ -431,7 +434,6 @@ libdir = @libdir@

19289

libexecdir = @libexecdir@

19290

localedir = @localedir@

19291

localstatedir = @localstatedir@

19292

-lt_ECHO = @lt_ECHO@

19293

mandir = @mandir@

19294

mkdir_p = @mkdir_p@

19295

oldincludedir = @oldincludedir@

19296

--- protobuf-2.4.0a.orig/gtest/aclocal.m4

19297

+++ protobuf-2.4.0a/gtest/aclocal.m4

22873

19298

@@ -13,8 +13,8 @@

22874

19299

22875

19300

m4_ifndef([AC_AUTOCONF_VERSION],

22876

19301

[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

22877

-m4_if(AC_AUTOCONF_VERSION, [2.61],,

22878

-[m4_warning([this file was generated for autoconf 2.61.

22879

+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,

22880

+[m4_warning([this file was generated for autoconf 2.67.

19302

-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,

19303

-[m4_warning([this file was generated for autoconf 2.65.

19304

+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,

19305

+[m4_warning([this file was generated for autoconf 2.68.

22881

19306

You have another version of autoconf. It may work, but is not guaranteed to.

22882

19307

If you have problems, you may need to regenerate the build system entirely.

22883

19308

To do so, use the procedure documented by the package, typically `autoreconf'.])])

22884

@@ -395,12 +395,12 @@ m4_define([lt_decl_dquote_varnames],

22885

# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])

22886

# ---------------------------------------------------

22887

m4_define([lt_decl_varnames_tagged],

22888

-[_$0(m4_quote(m4_default([$1], [[, ]])),

22889

- m4_quote(m4_if([$2], [],

22890

- m4_quote(lt_decl_tag_varnames),

22891

- m4_quote(m4_shift($@)))),

22892

- m4_split(m4_normalize(m4_quote(_LT_TAGS))))])

22893

-m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])

22894

+[m4_assert([$# <= 2])dnl

22895

+_$0(m4_quote(m4_default([$1], [[, ]])),

22896

+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),

22897

+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])

22898

+m4_define([_lt_decl_varnames_tagged],

22899

+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])

22900

22901

22902

# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])

22903

@@ -960,10 +960,10 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK

19309

@@ -22,7 +22,8 @@ To do so, use the procedure documented b

19310

# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

19311

19312

19313

-# 2006, 2007, 2008 Free Software Foundation, Inc.

19314

+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,

19315

+# Inc.

19316

# Written by Gordon Matzigkeit, 1996

19317

19318

# This file is free software; the Free Software Foundation gives

19319

@@ -31,7 +32,8 @@ To do so, use the procedure documented b

19320

19321

m4_define([_LT_COPYING], [dnl

19322

19323

-# 2006, 2007, 2008 Free Software Foundation, Inc.

19324

+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,

19325

+# Inc.

19326

# Written by Gordon Matzigkeit, 1996

19327

19328

# This file is part of GNU Libtool.

19329

@@ -58,7 +60,7 @@ m4_define([_LT_COPYING], [dnl

19330

# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

19331

])

19332

19333

-# serial 56 LT_INIT

19334

+# serial 57 LT_INIT

19335

19336

19337

# LT_PREREQ(VERSION)

19338

@@ -87,6 +89,7 @@ esac

19339

# ------------------

19340

AC_DEFUN([LT_INIT],

19341

[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT

19342

+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl

19343

AC_BEFORE([$0], [LT_LANG])dnl

19344

AC_BEFORE([$0], [LT_OUTPUT])dnl

19345

AC_BEFORE([$0], [LTDL_INIT])dnl

19346

@@ -103,6 +106,8 @@ AC_REQUIRE([LTVERSION_VERSION])dnl

19347

AC_REQUIRE([LTOBSOLETE_VERSION])dnl

19348

m4_require([_LT_PROG_LTMAIN])dnl

19349

19350

+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])

19351

19352

dnl Parse OPTIONS

19353

_LT_SET_OPTIONS([$0], [$1])

19354

19355

@@ -139,7 +144,7 @@ m4_defun([_LT_CC_BASENAME],

19356

*) break;;

19357

esac

19358

done

19359

-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

19360

+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`

19361

])

19362

19363

19364

@@ -159,6 +164,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],

19365

m4_defun([_LT_SETUP],

19366

[AC_REQUIRE([AC_CANONICAL_HOST])dnl

19367

AC_REQUIRE([AC_CANONICAL_BUILD])dnl

19368

+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl

19369

+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl

19370

19371

_LT_DECL([], [host_alias], [0], [The host system])dnl

19372

_LT_DECL([], [host], [0])dnl

19373

_LT_DECL([], [host_os], [0])dnl

19374

@@ -181,10 +189,13 @@ _LT_DECL([], [exeext], [0], [Executable

19375

dnl

19376

m4_require([_LT_FILEUTILS_DEFAULTS])dnl

19377

m4_require([_LT_CHECK_SHELL_FEATURES])dnl

19378

+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl

19379

m4_require([_LT_CMD_RELOAD])dnl

19380

m4_require([_LT_CHECK_MAGIC_METHOD])dnl

19381

+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl

19382

m4_require([_LT_CMD_OLD_ARCHIVE])dnl

19383

m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl

19384

+m4_require([_LT_WITH_SYSROOT])dnl

19385

19386

_LT_CONFIG_LIBTOOL_INIT([

19387

# See if we are running on zsh, and set the options which allow our

19388

@@ -200,7 +211,6 @@ fi

19389

_LT_CHECK_OBJDIR

19390

19391

m4_require([_LT_TAG_COMPILER])dnl

19392

-_LT_PROG_ECHO_BACKSLASH

19393

19394

case $host_os in

19395

aix3*)

19396

@@ -214,23 +224,6 @@ aix3*)

19397

;;

19398

esac

19399

19400

-# Sed substitution that helps us do robust quoting. It backslashifies

19401

-# metacharacters that are still active within double-quoted strings.

19402

-sed_quote_subst='s/$[["`$\\]]$/\\\1/g'

19403

19404

-# Same as above, but do not quote variable references.

19405

-double_quote_subst='s/$[["`\\]]$/\\\1/g'

19406

19407

-# Sed substitution to delay expansion of an escaped shell variable in a

19408

-# double_quote_subst'ed string.

19409

-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'

19410

19411

-# Sed substitution to delay expansion of an escaped single quote.

19412

-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'

19413

19414

-# Sed substitution to avoid accidental globbing in evaled expressions

19415

-no_glob_subst='s/\*/\\\*/g'

19416

19417

# Global variables:

19418

ofile=libtool

19419

can_build_shared=yes

19420

@@ -271,6 +264,28 @@ _LT_CONFIG_COMMANDS

19421

])# _LT_SETUP

19422

19423

19424

+# _LT_PREPARE_SED_QUOTE_VARS

19425

+# --------------------------

19426

+# Define a few sed substitution that help us do robust quoting.

19427

+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],

19428

+[# Backslashify metacharacters that are still active within

19429

+# double-quoted strings.

19430

+sed_quote_subst='s/$[["`$\\]]$/\\\1/g'

19431

19432

+# Same as above, but do not quote variable references.

19433

+double_quote_subst='s/$[["`\\]]$/\\\1/g'

19434

19435

+# Sed substitution to delay expansion of an escaped shell variable in a

19436

+# double_quote_subst'ed string.

19437

+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'

19438

19439

+# Sed substitution to delay expansion of an escaped single quote.

19440

+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'

19441

19442

+# Sed substitution to avoid accidental globbing in evaled expressions

19443

+no_glob_subst='s/\*/\\\*/g'

19444

+])

19445

19446

# _LT_PROG_LTMAIN

19447

# ---------------

19448

# Note that this code is called both from `configure', and `config.status'

19449

@@ -423,7 +438,7 @@ m4_define([_lt_decl_all_varnames],

19450

# declaration there will have the same value as in `configure'. VARNAME

19451

# must have a single quote delimited value for this to work.

19452

m4_define([_LT_CONFIG_STATUS_DECLARE],

19453

-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])

19454

+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])

19455

19456

19457

# _LT_CONFIG_STATUS_DECLARATIONS

19458

@@ -433,7 +448,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],

19459

# embedded single quotes properly. In configure, this macro expands

19460

# each variable declared with _LT_DECL (and _LT_TAGDECL) into:

19461

19462

-# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'

19463

+# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'

19464

m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],

19465

[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),

19466

[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])

19467

@@ -532,12 +547,20 @@ LTCC='$LTCC'

19468

LTCFLAGS='$LTCFLAGS'

19469

compiler='$compiler_DEFAULT'

19470

19471

+# A function that is used when there is no print builtin or printf.

19472

+func_fallback_echo ()

19473

19474

+ eval 'cat <<_LTECHO_EOF

19475

+\$[]1

19476

+_LTECHO_EOF'

19477

19478

19479

# Quote evaled strings.

19480

for var in lt_decl_all_varnames([[ \

19481

]], lt_decl_quote_varnames); do

19482

- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in

19483

+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in

19484

*[[\\\\\\\`\\"\\\$]]*)

19485

- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""

19486

+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""

19487

;;

19488

19489

eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""

19490

@@ -548,9 +571,9 @@ done

19491

# Double-quote double-evaled strings.

19492

for var in lt_decl_all_varnames([[ \

19493

]], lt_decl_dquote_varnames); do

19494

- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in

19495

+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in

19496

*[[\\\\\\\`\\"\\\$]]*)

19497

- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""

19498

+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""

19499

;;

19500

19501

eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""

19502

@@ -558,16 +581,38 @@ for var in lt_decl_all_varnames([[ \

19503

esac

19504

done

19505

19506

-# Fix-up fallback echo if it was mangled by the above quoting rules.

19507

-case \$lt_ECHO in

19508

-*'\\\[$]0 --fallback-echo"')dnl "

19509

- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`

19510

- ;;

19511

-esac

19512

19513

_LT_OUTPUT_LIBTOOL_INIT

19514

])

19515

19516

+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])

19517

+# ------------------------------------

19518

+# Generate a child script FILE with all initialization necessary to

19519

+# reuse the environment learned by the parent script, and make the

19520

+# file executable. If COMMENT is supplied, it is inserted after the

19521

+# `#!' sequence but before initialization text begins. After this

19522

+# macro, additional text can be appended to FILE to form the body of

19523

+# the child script. The macro ends with non-zero status if the

19524

+# file could not be fully written (such as if the disk is full).

19525

+m4_ifdef([AS_INIT_GENERATED],

19526

+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],

19527

+[m4_defun([_LT_GENERATED_FILE_INIT],

19528

+[m4_require([AS_PREPARE])]dnl

19529

+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl

19530

+[lt_write_fail=0

19531

+cat >$1 <<_ASEOF || lt_write_fail=1

19532

+#! $SHELL

19533

+# Generated by $as_me.

19534

+$2

19535

+SHELL=\${CONFIG_SHELL-$SHELL}

19536

+export SHELL

19537

+_ASEOF

19538

+cat >>$1 <<\_ASEOF || lt_write_fail=1

19539

+AS_SHELL_SANITIZE

19540

+_AS_PREPARE

19541

+exec AS_MESSAGE_FD>&1

19542

+_ASEOF

19543

+test $lt_write_fail = 0 && chmod +x $1[]dnl

19544

+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT

19545

19546

# LT_OUTPUT

19547

# ---------

19548

@@ -577,20 +622,11 @@ _LT_OUTPUT_LIBTOOL_INIT

19549

AC_DEFUN([LT_OUTPUT],

19550

[: ${CONFIG_LT=./config.lt}

19551

AC_MSG_NOTICE([creating $CONFIG_LT])

19552

-cat >"$CONFIG_LT" <<_LTEOF

19553

-#! $SHELL

19554

-# Generated by $as_me.

19555

-# Run this file to recreate a libtool stub with the current configuration.

19556

19557

-lt_cl_silent=false

19558

-SHELL=\${CONFIG_SHELL-$SHELL}

19559

-_LTEOF

19560

+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],

19561

+[# Run this file to recreate a libtool stub with the current configuration.])

19562

19563

cat >>"$CONFIG_LT" <<\_LTEOF

19564

-AS_SHELL_SANITIZE

19565

-_AS_PREPARE

19566

19567

-exec AS_MESSAGE_FD>&1

19568

+lt_cl_silent=false

19569

exec AS_MESSAGE_LOG_FD>>config.log

19570

{

19571

echo

19572

@@ -616,7 +652,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_

19573

m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])

19574

configured by $[0], generated by m4_PACKAGE_STRING.

19575

19576

19577

19578

This config.lt script is free software; the Free Software Foundation

19579

gives unlimited permision to copy, distribute and modify it."

19580

19581

@@ -661,15 +697,13 @@ chmod +x "$CONFIG_LT"

19582

# appending to config.log, which fails on DOS, as config.log is still kept

19583

# open by configure. Here we exec the FD to /dev/null, effectively closing

19584

# config.log, so it can be properly (re)opened and appended to by config.lt.

19585

-if test "$no_create" != yes; then

19586

- lt_cl_success=:

19587

- test "$silent" = yes &&

19588

- lt_config_lt_args="$lt_config_lt_args --quiet"

19589

- exec AS_MESSAGE_LOG_FD>/dev/null

19590

- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false

19591

- exec AS_MESSAGE_LOG_FD>>config.log

19592

- $lt_cl_success || AS_EXIT(1)

19593

-fi

19594

+lt_cl_success=:

19595

+test "$silent" = yes &&

19596

+ lt_config_lt_args="$lt_config_lt_args --quiet"

19597

+exec AS_MESSAGE_LOG_FD>/dev/null

19598

+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false

19599

+exec AS_MESSAGE_LOG_FD>>config.log

19600

+$lt_cl_success || AS_EXIT(1)

19601

])# LT_OUTPUT

19602

19603

19604

@@ -732,15 +766,12 @@ _LT_EOF

19605

# if finds mixed CR/LF and LF-only lines. Since sed operates in

19606

# text mode, it properly converts lines to CR/LF. This bash problem

19607

# is reportedly fixed, but why not run on old versions too?

19608

- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \

19609

- || (rm -f "$cfgfile"; exit 1)

19610

+ sed '$q' "$ltmain" >> "$cfgfile" \

19611

+ || (rm -f "$cfgfile"; exit 1)

19612

19613

- _LT_PROG_XSI_SHELLFNS

19614

+ _LT_PROG_REPLACE_SHELLFNS

19615

19616

- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \

19617

- || (rm -f "$cfgfile"; exit 1)

19618

19619

- mv -f "$cfgfile" "$ofile" ||

19620

+ mv -f "$cfgfile" "$ofile" ||

19621

(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")

19622

chmod +x "$ofile"

19623

19624

@@ -846,11 +877,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)

19625

AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])

19626

AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])

19627

AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])

19628

+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])

19629

dnl aclocal-1.4 backwards compatibility:

19630

dnl AC_DEFUN([AC_LIBTOOL_CXX], [])

19631

dnl AC_DEFUN([AC_LIBTOOL_F77], [])

19632

dnl AC_DEFUN([AC_LIBTOOL_FC], [])

19633

dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])

19634

+dnl AC_DEFUN([AC_LIBTOOL_RC], [])

19635

19636

19637

# _LT_TAG_COMPILER

19638

@@ -955,6 +988,31 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK

19639

[lt_cv_ld_exported_symbols_list=no])

19640

LDFLAGS="$save_LDFLAGS"

19641

])

19642

+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],

19643

+ [lt_cv_ld_force_load=no

19644

+ cat > conftest.c << _LT_EOF

19645

+int forced_loaded() { return 2;}

19646

+_LT_EOF

19647

+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD

19648

+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD

19649

+ echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD

19650

+ $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD

19651

+ echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD

19652

+ $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD

19653

+ cat > conftest.c << _LT_EOF

19654

+int main() { return 0;}

19655

+_LT_EOF

19656

+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD

19657

+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err

19658

+ _lt_result=$?

19659

+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then

19660

+ lt_cv_ld_force_load=yes

19661

+ else

19662

+ cat conftest.err >&AS_MESSAGE_LOG_FD

19663

+ fi

19664

+ rm -f conftest.err libconftest.a conftest conftest.c

19665

+ rm -rf conftest.dSYM

19666

+ ])

19667

case $host_os in

19668

rhapsody* | darwin1.[[012]])

22904

19669

_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

22905

darwin1.*)

22906

_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

22907

- darwin*) # darwin 5.x on

22908

+ darwin*) # darwin 5.x on

22909

# if running on 10.5 or later, the deployment target defaults

22910

# to the OS version, if on x86, and 10.4, the deployment

22911

- # target defaults to 10.4. Don't you love it?

22912

+ # target defaults to 10.4. Don't you love it?

22913

case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in

22914

10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)

22915

_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

22916

@@ -1005,7 +1005,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],

22917

_LT_TAGVAR(whole_archive_flag_spec, $1)=''

19670

@@ -982,7 +1040,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECK

19671

else

19672

_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'

19673

19674

- if test "$DSYMUTIL" != ":"; then

19675

+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then

19676

_lt_dsymutil='~$DSYMUTIL $lib || :'

19677

else

19678

_lt_dsymutil=

19679

@@ -1002,7 +1060,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],

19680

_LT_TAGVAR(hardcode_direct, $1)=no

19681

_LT_TAGVAR(hardcode_automatic, $1)=yes

19682

_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported

19683

- _LT_TAGVAR(whole_archive_flag_spec, $1)=''

19684

+ if test "$lt_cv_ld_force_load" = "yes"; then

19685

19686

+ else

19687

+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''

19688

+ fi

22918

19689

_LT_TAGVAR(link_all_deplibs, $1)=yes

22919

19690

_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"

22920

- if test "$GCC" = "yes"; then

22921

+ case $cc_basename in

22922

+ ifort*) _lt_dar_can_shared=yes ;;

22923

+ *) _lt_dar_can_shared=$GCC ;;

22924

+ esac

22925

+ if test "$_lt_dar_can_shared" = "yes"; then

22926

output_verbose_link_cmd=echo

19691

case $cc_basename in

19692

@@ -1010,7 +1072,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],

19693

*) _lt_dar_can_shared=$GCC ;;

19694

esac

19695

if test "$_lt_dar_can_shared" = "yes"; then

19696

- output_verbose_link_cmd=echo

19697

+ output_verbose_link_cmd=func_echo_all

22927

19698

_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"

22928

19699

_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

22929

@@ -1527,7 +1531,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d

22930

lt_cv_sys_max_cmd_len=-1;

19700

19701

@@ -1026,203 +1088,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],

19702

19703

])

19704

19705

-# _LT_SYS_MODULE_PATH_AIX

19706

-# -----------------------

19707

+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])

19708

+# ----------------------------------

19709

# Links a minimal program and checks the executable

19710

# for the system default hardcoded library path. In most cases,

19711

# this is /usr/lib:/lib, but when the MPI compilers are used

19712

# the location of the communication and MPI libs are included too.

19713

# If we don't find anything, use the default library path according

19714

# to the aix ld manual.

19715

+# Store the results from the different compilers for each TAGNAME.

19716

+# Allow to override them for all tags through lt_cv_aix_libpath.

19717

m4_defun([_LT_SYS_MODULE_PATH_AIX],

19718

[m4_require([_LT_DECL_SED])dnl

19719

-AC_LINK_IFELSE(AC_LANG_PROGRAM,[

19720

-lt_aix_libpath_sed='

19721

- /Import File Strings/,/^$/ {

19722

- /^0/ {

19723

- s/^0 *$.*$$/\1/

19724

- p

19725

- }

19726

- }'

19727

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19728

-# Check for a 64-bit object if we didn't find anything.

19729

-if test -z "$aix_libpath"; then

19730

- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19731

-fi],[])

19732

-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

19733

+if test "${lt_cv_aix_libpath+set}" = set; then

19734

+ aix_libpath=$lt_cv_aix_libpath

19735

+else

19736

+ AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],

19737

+ [AC_LINK_IFELSE([AC_LANG_PROGRAM],[

19738

+ lt_aix_libpath_sed='[

19739

+ /Import File Strings/,/^$/ {

19740

+ /^0/ {

19741

+ s/^0 *$[^ ]*$ *$/\1/

19742

+ p

19743

+ }

19744

+ }]'

19745

+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19746

+ # Check for a 64-bit object if we didn't find anything.

19747

+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then

19748

+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

19749

+ fi],[])

19750

+ if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then

19751

+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"

19752

+ fi

19753

+ ])

19754

+ aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])

19755

+fi

19756

])# _LT_SYS_MODULE_PATH_AIX

19757

19758

19759

# _LT_SHELL_INIT(ARG)

19760

# -------------------

19761

m4_define([_LT_SHELL_INIT],

19762

-[ifdef([AC_DIVERSION_NOTICE],

19763

- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],

19764

- [AC_DIVERT_PUSH(NOTICE)])

19765

-$1

19766

-AC_DIVERT_POP

19767

-])# _LT_SHELL_INIT

19768

+[m4_divert_text([M4SH-INIT], [$1

19769

+])])# _LT_SHELL_INIT

19770

19771

19772

19773

# _LT_PROG_ECHO_BACKSLASH

19774

# -----------------------

19775

-# Add some code to the start of the generated configure script which

19776

-# will find an echo command which doesn't interpret backslashes.

19777

+# Find how we can fake an echo command that does not interpret backslash.

19778

+# In particular, with Autoconf 2.60 or later we add some code to the start

19779

+# of the generated configure script which will find a shell with a builtin

19780

+# printf (which we can use as an echo command).

19781

m4_defun([_LT_PROG_ECHO_BACKSLASH],

19782

-[_LT_SHELL_INIT([

19783

-# Check that we are running under the correct shell.

19784

-SHELL=${CONFIG_SHELL-/bin/sh}

19785

19786

-case X$lt_ECHO in

19787

-X*--fallback-echo)

19788

- # Remove one level of quotation (which was required for Make).

19789

- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`

19790

- ;;

19791

-esac

19792

19793

-ECHO=${lt_ECHO-echo}

19794

-if test "X[$]1" = X--no-reexec; then

19795

- # Discard the --no-reexec flag, and continue.

19796

- shift

19797

-elif test "X[$]1" = X--fallback-echo; then

19798

- # Avoid inline document here, it may be left over

19799

- :

19800

-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then

19801

- # Yippee, $ECHO works!

19802

- :

19803

+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

19804

+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO

19805

+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

19806

19807

+AC_MSG_CHECKING([how to print strings])

19808

+# Test print first, because it will be a builtin if present.

19809

+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

19810

+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then

19811

+ ECHO='print -r --'

19812

+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

19813

+ ECHO='printf %s\n'

19814

else

19815

- # Restart under the correct shell.

19816

- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}

19817

-fi

19818

19819

-if test "X[$]1" = X--fallback-echo; then

19820

- # used as fallback echo

19821

- shift

19822

- cat <<_LT_EOF

19823

-[$]*

19824

-_LT_EOF

19825

- exit 0

19826

+ # Use this function as a fallback that always works.

19827

+ func_fallback_echo ()

19828

+ {

19829

+ eval 'cat <<_LTECHO_EOF

19830

+$[]1

19831

+_LTECHO_EOF'

19832

+ }

19833

+ ECHO='func_fallback_echo'

19834

19835

19836

-# The HP-UX ksh and POSIX shell print the target directory to stdout

19837

-# if CDPATH is set.

19838

-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

19839

19840

-if test -z "$lt_ECHO"; then

19841

- if test "X${echo_test_string+set}" != Xset; then

19842

- # find a string as large as possible, as long as the shell can cope with it

19843

- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do

19844

- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...

19845

- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&

19846

- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null

19847

- then

19848

- break

19849

- fi

19850

- done

19851

- fi

19852

19853

- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&

19854

- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&

19855

- test "X$echo_testing_string" = "X$echo_test_string"; then

19856

- :

19857

- else

19858

- # The Solaris, AIX, and Digital Unix default echo programs unquote

19859

- # backslashes. This makes it impossible to quote backslashes using

19860

- # echo "$something" | sed 's/\\/\\\\/g'

19861

- #

19862

- # So, first we look for a working echo in the user's PATH.

19863

19864

- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

19865

- for dir in $PATH /usr/ucb; do

19866

- IFS="$lt_save_ifs"

19867

- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&

19868

- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&

19869

- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&

19870

- test "X$echo_testing_string" = "X$echo_test_string"; then

19871

- ECHO="$dir/echo"

19872

- break

19873

- fi

19874

- done

19875

- IFS="$lt_save_ifs"

19876

19877

- if test "X$ECHO" = Xecho; then

19878

- # We didn't find a better echo, so look for alternatives.

19879

- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&

19880

- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&

19881

- test "X$echo_testing_string" = "X$echo_test_string"; then

19882

- # This shell has a builtin print -r that does the trick.

19883

- ECHO='print -r'

19884

- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&

19885

- test "X$CONFIG_SHELL" != X/bin/ksh; then

19886

- # If we have ksh, try running configure again with it.

19887

- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}

19888

- export ORIGINAL_CONFIG_SHELL

19889

- CONFIG_SHELL=/bin/ksh

19890

- export CONFIG_SHELL

19891

- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}

19892

- else

19893

- # Try using printf.

19894

- ECHO='printf %s\n'

19895

- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&

19896

- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&

19897

- test "X$echo_testing_string" = "X$echo_test_string"; then

19898

- # Cool, printf works

19899

- :

19900

- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&

19901

- test "X$echo_testing_string" = 'X\t' &&

19902

- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&

19903

- test "X$echo_testing_string" = "X$echo_test_string"; then

19904

- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL

19905

- export CONFIG_SHELL

19906

- SHELL="$CONFIG_SHELL"

19907

- export SHELL

19908

- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"

19909

- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&

19910

- test "X$echo_testing_string" = 'X\t' &&

19911

- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&

19912

- test "X$echo_testing_string" = "X$echo_test_string"; then

19913

- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"

19914

- else

19915

- # maybe with a smaller string...

19916

- prev=:

19917

19918

- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do

19919

- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null

19920

- then

19921

- break

19922

- fi

19923

- prev="$cmd"

19924

- done

19925

+# func_echo_all arg...

19926

+# Invoke $ECHO with all args, space-separated.

19927

+func_echo_all ()

19928

19929

+ $ECHO "$*"

19930

19931

19932

- if test "$prev" != 'sed 50q "[$]0"'; then

19933

- echo_test_string=`eval $prev`

19934

- export echo_test_string

19935

- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}

19936

- else

19937

- # Oops. We lost completely, so just stick with echo.

19938

- ECHO=echo

19939

- fi

19940

- fi

19941

- fi

19942

- fi

19943

- fi

19944

-fi

19945

+case "$ECHO" in

19946

+ printf*) AC_MSG_RESULT([printf]) ;;

19947

+ print*) AC_MSG_RESULT([print -r]) ;;

19948

+ *) AC_MSG_RESULT([cat]) ;;

19949

+esac

19950

19951

-# Copy echo and quote the copy suitably for passing to libtool from

19952

-# the Makefile, instead of quoting the original, which is used later.

19953

-lt_ECHO=$ECHO

19954

-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then

19955

- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"

19956

-fi

19957

+m4_ifdef([_AS_DETECT_SUGGESTED],

19958

+[_AS_DETECT_SUGGESTED([

19959

+ test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (

19960

+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

19961

+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO

19962

+ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

19963

+ PATH=/empty FPATH=/empty; export PATH FPATH

19964

+ test "X`printf %s $ECHO`" = "X$ECHO" \

19965

+ || test "X`print -r -- $ECHO`" = "X$ECHO" )])])

19966

19967

-AC_SUBST(lt_ECHO)

19968

-])

19969

_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])

19970

-_LT_DECL([], [ECHO], [1],

19971

- [An echo program that does not interpret backslashes])

19972

+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])

19973

])# _LT_PROG_ECHO_BACKSLASH

19974

19975

19976

+# _LT_WITH_SYSROOT

19977

+# ----------------

19978

+AC_DEFUN([_LT_WITH_SYSROOT],

19979

+[AC_MSG_CHECKING([for sysroot])

19980

+AC_ARG_WITH([sysroot],

19981

+[ --with-sysroot[=DIR] Search for dependent libraries within DIR

19982

+ (or the compiler's sysroot if not specified).],

19983

+[], [with_sysroot=no])

19984

19985

+dnl lt_sysroot will always be passed unquoted. We quote it here

19986

+dnl in case the user passed a directory name.

19987

+lt_sysroot=

19988

+case ${with_sysroot} in #(

19989

+ yes)

19990

+ if test "$GCC" = yes; then

19991

+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`

19992

+ fi

19993

+ ;; #(

19994

+ /*)

19995

+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`

19996

+ ;; #(

19997

+ no|'')

19998

+ ;; #(

19999

+ *)

20000

+ AC_MSG_RESULT([${with_sysroot}])

20001

+ AC_MSG_ERROR([The sysroot must be an absolute path.])

20002

+ ;;

20003

+esac

20004

20005

+ AC_MSG_RESULT([${lt_sysroot:-no}])

20006

+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl

20007

+[dependent libraries, and in which our libraries should be installed.])])

20008

20009

# _LT_ENABLE_LOCK

20010

# ---------------

20011

m4_defun([_LT_ENABLE_LOCK],

20012

@@ -1251,7 +1252,7 @@ ia64-*-hpux*)

20013

;;

20014

*-*-irix6*)

20015

# Find out which ABI we are using.

20016

- echo '[#]line __oline__ "configure"' > conftest.$ac_ext

20017

+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext

20018

if AC_TRY_EVAL(ac_compile); then

20019

if test "$lt_cv_prog_gnu_ld" = yes; then

20020

case `/usr/bin/file conftest.$ac_objext` in

20021

@@ -1369,14 +1370,47 @@ need_locks="$enable_libtool_lock"

20022

])# _LT_ENABLE_LOCK

20023

20024

20025

+# _LT_PROG_AR

20026

+# -----------

20027

+m4_defun([_LT_PROG_AR],

20028

+[AC_CHECK_TOOLS(AR, [ar], false)

20029

+: ${AR=ar}

20030

+: ${AR_FLAGS=cru}

20031

+_LT_DECL([], [AR], [1], [The archiver])

20032

+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])

20033

20034

+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],

20035

+ [lt_cv_ar_at_file=no

20036

+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM],

20037

+ [echo conftest.$ac_objext > conftest.lst

20038

+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'

20039

+ AC_TRY_EVAL([lt_ar_try])

20040

+ if test "$ac_status" -eq 0; then

20041

+ # Ensure the archiver fails upon bogus file names.

20042

+ rm -f conftest.$ac_objext libconftest.a

20043

+ AC_TRY_EVAL([lt_ar_try])

20044

+ if test "$ac_status" -ne 0; then

20045

+ lt_cv_ar_at_file=@

20046

+ fi

20047

+ fi

20048

+ rm -f conftest.* libconftest.a

20049

+ ])

20050

+ ])

20051

20052

+if test "x$lt_cv_ar_at_file" = xno; then

20053

+ archiver_list_spec=

20054

+else

20055

+ archiver_list_spec=$lt_cv_ar_at_file

20056

+fi

20057

+_LT_DECL([], [archiver_list_spec], [1],

20058

+ [How to feed a file listing to the archiver])

20059

+])# _LT_PROG_AR

20060

20061

20062

# _LT_CMD_OLD_ARCHIVE

20063

# -------------------

20064

m4_defun([_LT_CMD_OLD_ARCHIVE],

20065

-[AC_CHECK_TOOL(AR, ar, false)

20066

-test -z "$AR" && AR=ar

20067

-test -z "$AR_FLAGS" && AR_FLAGS=cru

20068

-_LT_DECL([], [AR], [1], [The archiver])

20069

-_LT_DECL([], [AR_FLAGS], [1])

20070

+[_LT_PROG_AR

20071

20072

AC_CHECK_TOOL(STRIP, strip, :)

20073

test -z "$STRIP" && STRIP=:

20074

@@ -1403,10 +1437,19 @@ if test -n "$RANLIB"; then

20075

esac

20076

old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"

20077

20078

20079

+case $host_os in

20080

+ darwin*)

20081

+ lock_old_archive_extraction=yes ;;

20082

+ *)

20083

+ lock_old_archive_extraction=no ;;

20084

+esac

20085

_LT_DECL([], [old_postinstall_cmds], [2])

20086

_LT_DECL([], [old_postuninstall_cmds], [2])

20087

_LT_TAGDECL([], [old_archive_cmds], [2],

20088

[Commands used to build an old-style archive])

20089

+_LT_DECL([], [lock_old_archive_extraction], [0],

20090

+ [Whether to use a lock for old archive extraction])

20091

])# _LT_CMD_OLD_ARCHIVE

20092

20093

20094

@@ -1431,15 +1474,15 @@ AC_CACHE_CHECK([$1], [$2],

20095

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

20096

-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \

20097

-e 's:$: $lt_compiler_flag:'`

20098

- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)

20099

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)

20100

(eval "$lt_compile" 2>conftest.err)

20101

ac_status=$?

20102

cat conftest.err >&AS_MESSAGE_LOG_FD

20103

- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD

20104

+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD

20105

if (exit $ac_status) && test -s "$ac_outfile"; then

20106

# The compiler can only warn and ignore the option if not recognized

20107

# So say no if there are warnings other than the usual output.

20108

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

20109

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp

20110

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

20111

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

20112

$2=yes

20113

@@ -1479,7 +1522,7 @@ AC_CACHE_CHECK([$1], [$2],

20114

if test -s conftest.err; then

20115

# Append any errors to the config.log.

20116

cat conftest.err 1>&AS_MESSAGE_LOG_FD

20117

- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp

20118

+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp

20119

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

20120

if diff conftest.exp conftest.er2 >/dev/null; then

20121

$2=yes

20122

@@ -1542,6 +1585,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d

20123

lt_cv_sys_max_cmd_len=8192;

22931

20124

;;

22932

20125

22933

- cygwin* | mingw*)

22934

+ cygwin* | mingw* | cegcc*)

22935

# On Win9x/ME, this test blows up -- it succeeds, but takes

22936

# about 5 minutes as the teststring grows exponentially.

22937

# Worse, since 9x/ME are not pre-emptively multitasking,

22938

@@ -1695,10 +1699,6 @@ else

20126

+ mint*)

20127

+ # On MiNT this can take a long time and run out of memory.

20128

+ lt_cv_sys_max_cmd_len=8192;

20129

+ ;;

20130

20131

amigaos*)

20132

# On AmigaOS with pdksh, this test takes hours, literally.

20133

# So we just punt and use a minimum line length of 8192.

20134

@@ -1606,8 +1654,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d

20135

# If test is not a shell built-in, we'll probably end up computing a

20136

# maximum length that is only half of the actual maximum length, but

20137

# we can't tell.

20138

- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \

20139

- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&

20140

+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \

20141

+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&

20142

test $i != 17 # 1/2 MB should be enough

20143

20144

i=`expr $i + 1`

20145

@@ -1658,7 +1706,7 @@ else

20146

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

20147

lt_status=$lt_dlunknown

20148

cat > conftest.$ac_ext <<_LT_EOF

20149

-[#line __oline__ "configure"

20150

+[#line $LINENO "configure"

20151

#include "confdefs.h"

20152

20153

#if HAVE_DLFCN_H

20154

@@ -1699,7 +1747,13 @@ else

22939

20155

# endif

22940

20156

#endif

22941

20157

22942

-#ifdef __cplusplus

22943

-extern "C" void exit (int);

22944

-#endif

22945

22946

void fnord() { int i=42;}

20158

-void fnord() { int i=42;}

20159

+/* When -fvisbility=hidden is used, assume the code has been annotated

20160

+ correspondingly for the symbols needed. */

20161

+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

20162

+int fnord () __attribute__((visibility("default")));

20163

+#endif

20164

20165

+int fnord () { return 42; }

22947

20166

int main ()

22948

20167

{

22949

@@ -1714,7 +1714,7 @@ int main ()

20168

void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

20169

@@ -1708,7 +1762,11 @@ int main ()

20170

if (self)

20171

{

20172

if (dlsym (self,"fnord")) status = $lt_dlno_uscore;

20173

- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

20174

+ else

20175

+ {

20176

+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

20177

+ else puts (dlerror ());

20178

+ }

20179

/* dlclose (self); */

20180

}

22950

20181

else

22951

puts (dlerror ());

22952

22953

- exit (status);

22954

+ return status;

22955

}]

22956

_LT_EOF

22957

if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then

22958

@@ -1753,7 +1753,7 @@ else

22959

lt_cv_dlopen_self=yes

22960

;;

22961

22962

- mingw* | pw32*)

22963

+ mingw* | pw32* | cegcc*)

22964

lt_cv_dlopen="LoadLibrary"

22965

lt_cv_dlopen_libs=

22966

;;

22967

@@ -2050,6 +2050,7 @@ m4_defun([_LT_SYS_DYNAMIC_LINKER],

22968

[AC_REQUIRE([AC_CANONICAL_HOST])dnl

22969

m4_require([_LT_DECL_EGREP])dnl

20182

@@ -1884,16 +1942,16 @@ AC_CACHE_CHECK([if $compiler supports -c

20183

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

20184

-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \

20185

-e 's:$: $lt_compiler_flag:'`

20186

- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)

20187

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)

20188

(eval "$lt_compile" 2>out/conftest.err)

20189

ac_status=$?

20190

cat out/conftest.err >&AS_MESSAGE_LOG_FD

20191

- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD

20192

+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD

20193

if (exit $ac_status) && test -s out/conftest2.$ac_objext

20194

then

20195

# The compiler can only warn and ignore the option if not recognized

20196

# So say no if there are warnings

20197

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp

20198

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp

20199

$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2

20200

if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then

20201

_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes

20202

@@ -2052,6 +2110,7 @@ m4_require([_LT_DECL_EGREP])dnl

22970

20203

m4_require([_LT_FILEUTILS_DEFAULTS])dnl

22971

+m4_require([_LT_DECL_OBJDUMP])dnl

20204

m4_require([_LT_DECL_OBJDUMP])dnl

22972

20205

m4_require([_LT_DECL_SED])dnl

20206

+m4_require([_LT_CHECK_SHELL_FEATURES])dnl

22973

20207

AC_MSG_CHECKING([dynamic linker characteristics])

22974

20208

m4_if([$1],

22975

@@ -2214,14 +2215,14 @@ bsdi[[45]]*)

22976

# libtool to hard-code these into programs

20209

[], [

20210

@@ -2060,16 +2119,23 @@ if test "$GCC" = yes; then

20211

darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;

20212

*) lt_awk_arg="/^libraries:/" ;;

20213

esac

20214

- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`

20215

- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then

20216

+ case $host_os in

20217

+ mingw* | cegcc*) lt_sed_strip_eq="s,=$[[A-Za-z]]:$,\1,g" ;;

20218

+ *) lt_sed_strip_eq="s,=/,/,g" ;;

20219

+ esac

20220

+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`

20221

+ case $lt_search_path_spec in

20222

+ *\;*)

20223

# if the path contains ";" then we assume it to be the separator

20224

# otherwise default to the standard path separator (i.e. ":") - it is

20225

# assumed that no part of a normal pathname contains ";" but that should

20226

# okay in the real world where ";" in dirpaths is itself problematic.

20227

- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`

20228

- else

20229

- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

20230

- fi

20231

+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`

20232

+ ;;

20233

+ *)

20234

+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`

20235

+ ;;

20236

+ esac

20237

# Ok, now we have the path, separated by spaces, we can step through it

20238

# and add multilib dir if necessary.

20239

lt_tmp_lt_search_path_spec=

20240

@@ -2082,7 +2148,7 @@ if test "$GCC" = yes; then

20241

lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

20242

20243

done

20244

- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '

20245

+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '

20246

BEGIN {RS=" "; FS="/|\n";} {

20247

lt_foo="";

20248

lt_count=0;

20249

@@ -2102,7 +2168,13 @@ BEGIN {RS=" "; FS="/|\n";} {

20250

if (lt_foo != "") { lt_freq[[lt_foo]]++; }

20251

if (lt_freq[[lt_foo]] == 1) { print lt_foo; }

20252

}'`

20253

- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`

20254

+ # AWK program above erroneously prepends '/' to C:/dos/paths

20255

+ # for these hosts.

20256

+ case $host_os in

20257

+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\

20258

+ $SED 's,/$[[A-Za-z]]:$,\1,g'` ;;

20259

+ esac

20260

+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`

20261

else

20262

sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

20263

fi])

20264

@@ -2190,7 +2262,7 @@ amigaos*)

20265

m68k)

20266

library_names_spec='$libname.ixlibrary $libname.a'

20267

# Create ${libname}_ixlibrary.a entries in /sys/libs.

20268

20269

20270

;;

20271

esac

22977

20272

;;

22978

22979

-cygwin* | mingw* | pw32*)

22980

+cygwin* | mingw* | pw32* | cegcc*)

22981

version_type=windows

22982

shrext_cmds=".dll"

20273

@@ -2221,8 +2293,9 @@ cygwin* | mingw* | pw32* | cegcc*)

22983

20274

need_version=no

22984

20275

need_lib_prefix=no

22985

20276

22986

case $GCC,$host_os in

22987

- yes,cygwin* | yes,mingw* | yes,pw32*)

22988

+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

20277

- case $GCC,$host_os in

20278

- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

20279

+ case $GCC,$cc_basename in

20280

+ yes,*)

20281

+ # gcc

22989

20282

library_names_spec='$libname.dll.a'

22990

20283

# DLL is installed to $(libdir)/../bin by postinstall_cmds

22991

20284

postinstall_cmds='base_file=`basename \${file}`~

22992

@@ -2244,7 +2245,7 @@ cygwin* | mingw* | pw32*)

20285

@@ -2243,36 +2316,83 @@ cygwin* | mingw* | pw32* | cegcc*)

20286

cygwin*)

20287

# Cygwin DLLs use 'cyg' prefix rather than 'lib'

22993

20288

soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'

22994

sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

20289

- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

20290

+m4_if([$1], [],[

20291

+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])

22995

20292

;;

22996

- mingw*)

22997

+ mingw* | cegcc*)

20293

mingw* | cegcc*)

22998

20294

# MinGW DLLs use traditional 'lib' prefix

22999

20295

soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'

23000

sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

23001

@@ -2459,7 +2460,7 @@ linux*oldld* | linux*aout* | linux*coff*

23002

;;

23003

23004

# This must be Linux ELF.

23005

-linux* | k*bsd*-gnu)

23006

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

23007

version_type=linux

23008

need_lib_prefix=no

23009

need_version=no

23010

@@ -2499,6 +2500,18 @@ linux* | k*bsd*-gnu)

23011

dynamic_linker='GNU/Linux ld.so'

23012

;;

23013

23014

+netbsdelf*-gnu)

20296

- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

20297

- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then

20298

- # It is most probably a Windows format PATH printed by

20299

- # mingw gcc, but we are running on Cygwin. Gcc prints its search

20300

- # path with ; separators, and with drive letters. We can handle the

20301

- # drive letters (cygwin fileutils understands them), so leave them,

20302

- # especially as we might pass files found there to a mingw objdump,

20303

- # which wouldn't understand a cygwinified path. Ahh.

20304

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

20305

- else

20306

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

20307

- fi

20308

;;

20309

pw32*)

20310

# pw32 DLLs use 'pw' prefix rather than 'lib'

20311

library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'

20312

;;

20313

esac

20314

+ dynamic_linker='Win32 ld.exe'

20315

+ ;;

20316

20317

+ *,cl*)

20318

+ # Native MSVC

20319

+ libname_spec='$name'

20320

+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'

20321

+ library_names_spec='${libname}.dll.lib'

20322

20323

+ case $build_os in

20324

+ mingw*)

20325

+ sys_lib_search_path_spec=

20326

+ lt_save_ifs=$IFS

20327

+ IFS=';'

20328

+ for lt_path in $LIB

20329

+ do

20330

+ IFS=$lt_save_ifs

20331

+ # Let DOS variable expansion print the short 8.3 style file name.

20332

+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`

20333

+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"

20334

+ done

20335

+ IFS=$lt_save_ifs

20336

+ # Convert to MSYS style.

20337

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'`

20338

+ ;;

20339

+ cygwin*)

20340

+ # Convert to unix form, then to dos form, then back to unix form

20341

+ # but this time dos style (no spaces!) so that the unix form looks

20342

+ # like /cygdrive/c/PROGRA~1:/cygdr...

20343

+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`

20344

+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`

20345

+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

20346

+ ;;

20347

+ *)

20348

+ sys_lib_search_path_spec="$LIB"

20349

+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then

20350

+ # It is most probably a Windows format PATH.

20351

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

20352

+ else

20353

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

20354

+ fi

20355

+ # FIXME: find the short name or the path components, as spaces are

20356

+ # common. (e.g. "Program Files" -> "PROGRA~1")

20357

+ ;;

20358

+ esac

20359

20360

+ # DLL is installed to $(libdir)/../bin by postinstall_cmds

20361

+ postinstall_cmds='base_file=`basename \${file}`~

20362

+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~

20363

+ dldir=$destdir/`dirname \$dlpath`~

20364

+ test -d \$dldir || mkdir -p \$dldir~

20365

+ $install_prog $dir/$dlname \$dldir/$dlname'

20366

+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~

20367

+ dlpath=$dir/\$dldll~

20368

+ $RM \$dlpath'

20369

+ shlibpath_overrides_runpath=yes

20370

+ dynamic_linker='Win32 link.exe'

20371

;;

20372

20373

20374

+ # Assume MSVC wrapper

20375

library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'

20376

+ dynamic_linker='Win32 ld.exe'

20377

;;

20378

esac

20379

- dynamic_linker='Win32 ld.exe'

20380

# FIXME: first we should search . and the directory the executable is in

20381

shlibpath_var=PATH

20382

;;

20383

@@ -2356,6 +2476,20 @@ gnu*)

20384

library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

20385

soname_spec='${libname}${release}${shared_ext}$major'

20386

shlibpath_var=LD_LIBRARY_PATH

20387

+ shlibpath_overrides_runpath=no

20388

+ hardcode_into_libs=yes

20389

+ ;;

20390

20391

+haiku*)

23015

20392

+ version_type=linux

23016

20393

+ need_lib_prefix=no

23017

20394

+ need_version=no

23018

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

20395

+ dynamic_linker="$host_os runtime_loader"

20396

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

23019

20397

+ soname_spec='${libname}${release}${shared_ext}$major'

23020

+ shlibpath_var=LD_LIBRARY_PATH

23021

+ shlibpath_overrides_runpath=no

23022

+ hardcode_into_libs=yes

23023

+ dynamic_linker='NetBSD ld.elf_so'

23024

+ ;;

23025

23026

netbsd*)

23027

version_type=sunos

23028

need_lib_prefix=no

23029

@@ -2670,7 +2683,7 @@ tpf*)

23030

version_type=linux

23031

need_lib_prefix=no

23032

need_version=no

23033

- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

23034

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

20398

+ shlibpath_var=LIBRARY_PATH

20399

+ shlibpath_overrides_runpath=yes

20400

+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

20401

hardcode_into_libs=yes

20402

;;

20403

20404

@@ -2401,8 +2535,10 @@ hpux9* | hpux10* | hpux11*)

20405

soname_spec='${libname}${release}${shared_ext}$major'

20406

;;

20407

esac

20408

- # HP-UX runs *really* slowly unless shared libraries are mode 555.

20409

+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...

20410

postinstall_cmds='chmod 555 $lib'

20411

+ # or fails outright, so override atomically:

20412

+ install_override_mode=555

20413

;;

20414

20415

interix[[3-9]]*)

20416

@@ -2469,16 +2605,21 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)

20417

finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'

23035

20418

shlibpath_var=LD_LIBRARY_PATH

23036

20419

shlibpath_overrides_runpath=no

23037

hardcode_into_libs=yes

23038

@@ -2694,7 +2707,7 @@ variables_saved_for_relink="PATH $shlibp

20420

20421

# Some binutils ld are patched to set DT_RUNPATH

20422

- save_LDFLAGS=$LDFLAGS

20423

- save_libdir=$libdir

20424

- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \

20425

- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""

20426

- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],

20427

- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],

20428

- [shlibpath_overrides_runpath=yes])])

20429

- LDFLAGS=$save_LDFLAGS

20430

- libdir=$save_libdir

20431

+ AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],

20432

+ [lt_cv_shlibpath_overrides_runpath=no

20433

+ save_LDFLAGS=$LDFLAGS

20434

+ save_libdir=$libdir

20435

+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \

20436

+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""

20437

+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],

20438

+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],

20439

+ [lt_cv_shlibpath_overrides_runpath=yes])])

20440

+ LDFLAGS=$save_LDFLAGS

20441

+ libdir=$save_libdir

20442

+ ])

20443

+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath

20444

20445

# This implies no fast_install, which is unacceptable.

20446

# Some rework will be needed to allow for fast_install

20447

@@ -2487,7 +2628,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)

20448

20449

# Append ld.so.conf contents to the search path

20450

if test -f /etc/ld.so.conf; then

20451

20452

20453

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

20454

20455

20456

@@ -2732,6 +2873,8 @@ _LT_DECL([], [library_names_spec], [1],

20457

The last name is the one that the linker finds with -lNAME]])

20458

_LT_DECL([], [soname_spec], [1],

20459

[[The coded name of the library, if different from the real name]])

20460

+_LT_DECL([], [install_override_mode], [1],

20461

+ [Permission mode override for installation of shared libraries])

20462

_LT_DECL([], [postinstall_cmds], [2],

20463

[Command to use after installation of a shared archive])

20464

_LT_DECL([], [postuninstall_cmds], [2],

20465

@@ -2844,6 +2987,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl

20466

AC_REQUIRE([AC_CANONICAL_BUILD])dnl

20467

m4_require([_LT_DECL_SED])dnl

20468

m4_require([_LT_DECL_EGREP])dnl

20469

+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl

20470

20471

AC_ARG_WITH([gnu-ld],

20472

[AS_HELP_STRING([--with-gnu-ld],

20473

@@ -2965,6 +3109,11 @@ case $reload_flag in

20474

esac

20475

reload_cmds='$LD$reload_flag -o $output$reload_objs'

20476

case $host_os in

20477

+ cygwin* | mingw* | pw32* | cegcc*)

20478

+ if test "$GCC" != yes; then

20479

+ reload_cmds=false

20480

+ fi

20481

+ ;;

20482

darwin*)

20483

if test "$GCC" = yes; then

20484

reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'

20485

@@ -2973,8 +3122,8 @@ case $host_os in

20486

20487

;;

20488

esac

20489

-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl

20490

-_LT_DECL([], [reload_cmds], [2])dnl

20491

+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl

20492

+_LT_TAGDECL([], [reload_cmds], [2])dnl

20493

])# _LT_CMD_RELOAD

20494

20495

20496

@@ -3026,16 +3175,18 @@ mingw* | pw32*)

20497

# Base MSYS/MinGW do not provide the 'file' command needed by

20498

# func_win32_libid shell function, so use a weaker test based on 'objdump',

20499

# unless we find 'file', for example because we are cross-compiling.

20500

- if ( file / ) >/dev/null 2>&1; then

20501

+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.

20502

+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then

20503

lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'

20504

lt_cv_file_magic_cmd='func_win32_libid'

20505

else

20506

- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'

20507

+ # Keep this pattern in sync with the one in func_win32_libid.

20508

+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

20509

lt_cv_file_magic_cmd='$OBJDUMP -f'

20510

20511

;;

20512

20513

-cegcc)

20514

+cegcc*)

20515

# use the weaker test based on 'objdump'. See mingw*.

20516

lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'

20517

lt_cv_file_magic_cmd='$OBJDUMP -f'

20518

@@ -3065,6 +3216,10 @@ gnu*)

20519

lt_cv_deplibs_check_method=pass_all

20520

;;

20521

20522

+haiku*)

20523

+ lt_cv_deplibs_check_method=pass_all

20524

+ ;;

20525

20526

hpux10.20* | hpux11*)

20527

lt_cv_file_magic_cmd=/usr/bin/file

20528

case $host_cpu in

20529

@@ -3073,11 +3228,11 @@ hpux10.20* | hpux11*)

20530

lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so

20531

;;

20532

hppa*64*)

20533

- [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]']

20534

+ [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]']

20535

lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl

20536

;;

20537

20538

- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'

20539

+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'

20540

lt_cv_file_magic_test_file=/usr/lib/libc.sl

20541

;;

20542

esac

20543

@@ -3177,6 +3332,21 @@ tpf*)

20544

;;

20545

esac

20546

])

20547

20548

+file_magic_glob=

20549

+want_nocaseglob=no

20550

+if test "$build" = "$host"; then

20551

+ case $host_os in

20552

+ mingw* | pw32*)

20553

+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then

20554

+ want_nocaseglob=yes

20555

+ else

20556

+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/[[\1]]\/[[\1]]\/g;/g"`

20557

+ fi

20558

+ ;;

20559

+ esac

20560

+fi

20561

20562

file_magic_cmd=$lt_cv_file_magic_cmd

20563

deplibs_check_method=$lt_cv_deplibs_check_method

20564

test -z "$deplibs_check_method" && deplibs_check_method=unknown

20565

@@ -3184,7 +3354,11 @@ test -z "$deplibs_check_method" && depli

20566

_LT_DECL([], [deplibs_check_method], [1],

20567

[Method to check whether dependent libraries are shared objects])

20568

_LT_DECL([], [file_magic_cmd], [1],

20569

- [Command to use when deplibs_check_method == "file_magic"])

20570

+ [Command to use when deplibs_check_method = "file_magic"])

20571

+_LT_DECL([], [file_magic_glob], [1],

20572

+ [How to find potential files when deplibs_check_method = "file_magic"])

20573

+_LT_DECL([], [want_nocaseglob], [1],

20574

+ [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])

20575

])# _LT_CHECK_MAGIC_METHOD

20576

20577

20578

@@ -3241,7 +3415,19 @@ if test "$lt_cv_path_NM" != "no"; then

20579

NM="$lt_cv_path_NM"

20580

else

20581

# Didn't find any BSD compatible name lister, look for dumpbin.

20582

- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)

20583

+ if test -n "$DUMPBIN"; then :

20584

+ # Let the user override the test.

20585

+ else

20586

+ AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)

20587

+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in

20588

+ *COFF*)

20589

+ DUMPBIN="$DUMPBIN -symbols"

20590

+ ;;

20591

+ *)

20592

+ DUMPBIN=:

20593

+ ;;

20594

+ esac

20595

+ fi

20596

AC_SUBST([DUMPBIN])

20597

if test "$DUMPBIN" != ":"; then

20598

NM="$DUMPBIN"

20599

@@ -3254,13 +3440,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-co

20600

AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],

20601

[lt_cv_nm_interface="BSD nm"

20602

echo "int some_variable = 0;" > conftest.$ac_ext

20603

- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)

20604

+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)

20605

(eval "$ac_compile" 2>conftest.err)

20606

cat conftest.err >&AS_MESSAGE_LOG_FD

20607

- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)

20608

+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)

20609

(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

20610

cat conftest.err >&AS_MESSAGE_LOG_FD

20611

- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)

20612

+ (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)

20613

cat conftest.out >&AS_MESSAGE_LOG_FD

20614

if $GREP 'External.*some_variable' conftest.out > /dev/null; then

20615

lt_cv_nm_interface="MS dumpbin"

20616

@@ -3275,6 +3461,67 @@ dnl aclocal-1.4 backwards compatibility:

20617

dnl AC_DEFUN([AM_PROG_NM], [])

20618

dnl AC_DEFUN([AC_PROG_NM], [])

20619

20620

+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB

20621

+# --------------------------------

20622

+# how to determine the name of the shared library

20623

+# associated with a specific link library.

20624

+# -- PORTME fill in with the dynamic library characteristics

20625

+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],

20626

+[m4_require([_LT_DECL_EGREP])

20627

+m4_require([_LT_DECL_OBJDUMP])

20628

+m4_require([_LT_DECL_DLLTOOL])

20629

+AC_CACHE_CHECK([how to associate runtime and link libraries],

20630

+lt_cv_sharedlib_from_linklib_cmd,

20631

+[lt_cv_sharedlib_from_linklib_cmd='unknown'

20632

20633

+case $host_os in

20634

+cygwin* | mingw* | pw32* | cegcc*)

20635

+ # two different shell functions defined in ltmain.sh

20636

+ # decide which to use based on capabilities of $DLLTOOL

20637

+ case `$DLLTOOL --help 2>&1` in

20638

+ *--identify-strict*)

20639

+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib

20640

+ ;;

20641

+ *)

20642

+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback

20643

+ ;;

20644

+ esac

20645

+ ;;

20646

+*)

20647

+ # fallback: assume linklib IS sharedlib

20648

+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"

20649

+ ;;

20650

+esac

20651

+])

20652

+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd

20653

+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO

20654

20655

+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],

20656

+ [Command to associate shared and link libraries])

20657

+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB

20658

20659

20660

+# _LT_PATH_MANIFEST_TOOL

20661

+# ----------------------

20662

+# locate the manifest tool

20663

+m4_defun([_LT_PATH_MANIFEST_TOOL],

20664

+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)

20665

+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt

20666

+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],

20667

+ [lt_cv_path_mainfest_tool=no

20668

+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD

20669

+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out

20670

+ cat conftest.err >&AS_MESSAGE_LOG_FD

20671

+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then

20672

+ lt_cv_path_mainfest_tool=yes

20673

+ fi

20674

+ rm -f conftest*])

20675

+if test "x$lt_cv_path_mainfest_tool" != xyes; then

20676

+ MANIFEST_TOOL=:

20677

+fi

20678

+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl

20679

+])# _LT_PATH_MANIFEST_TOOL

20680

20681

20682

# LT_LIB_M

20683

# --------

20684

@@ -3283,7 +3530,7 @@ AC_DEFUN([LT_LIB_M],

20685

[AC_REQUIRE([AC_CANONICAL_HOST])dnl

20686

LIBM=

20687

case $host in

20688

-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)

20689

20690

# These system don't have libm, or don't need it

20691

;;

20692

*-ncr-sysv4.3*)

20693

@@ -3311,7 +3558,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],

20694

_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=

20695

23039

20696

if test "$GCC" = yes; then

23040

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

23041

23042

23043

23044

if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then

23045

sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

23046

23047

@@ -2971,6 +2984,7 @@ _LT_DECL([], [reload_cmds], [2])dnl

23048

# -- PORTME fill in with the dynamic library characteristics

23049

m4_defun([_LT_CHECK_MAGIC_METHOD],

23050

[m4_require([_LT_DECL_EGREP])

23051

+m4_require([_LT_DECL_OBJDUMP])

23052

AC_CACHE_CHECK([how to recognize dependent libraries],

23053

lt_cv_deplibs_check_method,

23054

[lt_cv_file_magic_cmd='$MAGIC_CMD'

23055

@@ -3021,6 +3035,12 @@ mingw* | pw32*)

20697

- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'

20698

+ case $cc_basename in

20699

+ nvcc*)

20700

+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;

20701

+ *)

20702

+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;

20703

+ esac

20704

20705

_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],

20706

lt_cv_prog_compiler_rtti_exceptions,

20707

@@ -3328,6 +3580,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_

20708

m4_defun([_LT_CMD_GLOBAL_SYMBOLS],

20709

[AC_REQUIRE([AC_CANONICAL_HOST])dnl

20710

AC_REQUIRE([AC_PROG_CC])dnl

20711

+AC_REQUIRE([AC_PROG_AWK])dnl

20712

AC_REQUIRE([LT_PATH_NM])dnl

20713

AC_REQUIRE([LT_PATH_LD])dnl

20714

m4_require([_LT_DECL_SED])dnl

20715

@@ -3395,8 +3648,8 @@ esac

20716

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

20717

20718

# Transform an extracted symbol line into symbol name and symbol address

20719

-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (void *) \&\2},/p'"

20720

20721

+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (void *) \&\2},/p'"

20722

20723

20724

# Handle CRLF in mingw tool chain

20725

opt_cr=

20726

@@ -3432,6 +3685,7 @@ for ac_symprfx in "" "_"; do

20727

else

20728

lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"

23056

20729

23057

;;

23058

23059

+cegcc)

23060

+ # use the weaker test based on 'objdump'. See mingw*.

23061

+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'

23062

+ lt_cv_file_magic_cmd='$OBJDUMP -f'

23063

+ ;;

23064

23065

darwin* | rhapsody*)

23066

lt_cv_deplibs_check_method=pass_all

23067

;;

23068

@@ -3079,11 +3099,11 @@ irix5* | irix6* | nonstopux*)

23069

;;

23070

23071

# This must be Linux ELF.

23072

-linux* | k*bsd*-gnu)

23073

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

23074

lt_cv_deplibs_check_method=pass_all

23075

;;

23076

23077

-netbsd*)

23078

+netbsd* | netbsdelf*-gnu)

23079

if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then

23080

lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'

23081

else

23082

@@ -3332,7 +3352,7 @@ case $host_os in

23083

aix*)

23084

symcode='[[BCDT]]'

23085

;;

23086

-cygwin* | mingw* | pw32*)

23087

+cygwin* | mingw* | pw32* | cegcc*)

23088

symcode='[[ABCDGISTW]]'

23089

;;

23090

hpux*)

23091

@@ -3578,7 +3598,7 @@ m4_if([$1], [CXX], [

23092

beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

23093

# PIC is the default for these OSes.

23094

;;

23095

- mingw* | cygwin* | os2* | pw32*)

23096

+ mingw* | cygwin* | os2* | pw32* | cegcc*)

23097

# This hack is so that the source file can tell whether it is being

23098

# built for inclusion in a dll (and should export symbols for example).

23099

# Although the cygwin gcc ignores -fPIC, still need this for old-style

23100

@@ -3605,10 +3625,11 @@ m4_if([$1], [CXX], [

23101

23102

;;

23103

hpux*)

23104

- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but

23105

- # not for PA HP-UX.

23106

+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit

23107

+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

23108

+ # sets the default TLS model and affects inlining.

23109

case $host_cpu in

23110

- hppa*64*|ia64*)

23111

+ hppa*64*)

23112

;;

23113

23114

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

23115

@@ -3699,19 +3720,26 @@ m4_if([$1], [CXX], [

23116

;;

20730

+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

20731

20732

# Check to see that the pipe works correctly.

20733

pipe_works=no

20734

@@ -3453,7 +3707,7 @@ _LT_EOF

20735

if AC_TRY_EVAL(ac_compile); then

20736

# Now try to grab the symbols.

20737

nlist=conftest.nm

20738

- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then

20739

+ if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then

20740

# Try sorting and uniquifying the output.

20741

if sort "$nlist" | uniq > "$nlist"T; then

20742

mv -f "$nlist"T "$nlist"

20743

@@ -3465,6 +3719,18 @@ _LT_EOF

20744

if $GREP ' nm_test_var$' "$nlist" >/dev/null; then

20745

if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

20746

cat <<_LT_EOF > conftest.$ac_ext

20747

+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */

20748

+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)

20749

+/* DATA imports from DLLs on WIN32 con't be const, because runtime

20750

+ relocations are performed -- see ld's documentation on pseudo-relocs. */

20751

+# define LT@&t@_DLSYM_CONST

20752

+#elif defined(__osf__)

20753

+/* This system does not cope well with relocations in const data. */

20754

+# define LT@&t@_DLSYM_CONST

20755

+#else

20756

+# define LT@&t@_DLSYM_CONST const

20757

+#endif

20758

20759

#ifdef __cplusplus

20760

extern "C" {

20761

#endif

20762

@@ -3476,7 +3742,7 @@ _LT_EOF

20763

cat <<_LT_EOF >> conftest.$ac_ext

20764

20765

/* The mapping between symbol names and symbols. */

20766

-const struct {

20767

+LT@&t@_DLSYM_CONST struct {

20768

const char *name;

20769

void *address;

20770

}

20771

@@ -3502,15 +3768,15 @@ static const void *lt_preloaded_setup()

20772

_LT_EOF

20773

# Now try linking the two files.

20774

mv conftest.$ac_objext conftstm.$ac_objext

20775

- lt_save_LIBS="$LIBS"

20776

- lt_save_CFLAGS="$CFLAGS"

20777

+ lt_globsym_save_LIBS=$LIBS

20778

+ lt_globsym_save_CFLAGS=$CFLAGS

20779

LIBS="conftstm.$ac_objext"

20780

CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"

20781

if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then

20782

pipe_works=yes

20783

20784

- LIBS="$lt_save_LIBS"

20785

- CFLAGS="$lt_save_CFLAGS"

20786

+ LIBS=$lt_globsym_save_LIBS

20787

+ CFLAGS=$lt_globsym_save_CFLAGS

20788

else

20789

echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD

20790

20791

@@ -3543,6 +3809,13 @@ else

20792

AC_MSG_RESULT(ok)

20793

20794

20795

+# Response file support.

20796

+if test "$lt_cv_nm_interface" = "MS dumpbin"; then

20797

+ nm_file_list_spec='@'

20798

+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then

20799

+ nm_file_list_spec='@'

20800

+fi

20801

20802

_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],

20803

[Take the output of nm and produce a listing of raw symbols and C names])

20804

_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],

20805

@@ -3553,6 +3826,8 @@ _LT_DECL([global_symbol_to_c_name_addres

20806

_LT_DECL([global_symbol_to_c_name_address_lib_prefix],

20807

[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],

20808

[Transform the output of nm in a C name address pair when lib prefix is needed])

20809

+_LT_DECL([], [nm_file_list_spec], [1],

20810

+ [Specify filename containing input files for $NM])

20811

]) # _LT_CMD_GLOBAL_SYMBOLS

20812

20813

20814

@@ -3564,7 +3839,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=

20815

_LT_TAGVAR(lt_prog_compiler_pic, $1)=

20816

_LT_TAGVAR(lt_prog_compiler_static, $1)=

20817

20818

-AC_MSG_CHECKING([for $compiler option to produce PIC])

20819

m4_if([$1], [CXX], [

20820

# C++ specific cases for pic, static, wl, etc.

20821

if test "$GXX" = yes; then

20822

@@ -3615,6 +3889,11 @@ m4_if([$1], [CXX], [

20823

# DJGPP does not support shared libraries at all

20824

_LT_TAGVAR(lt_prog_compiler_pic, $1)=

20825

;;

20826

+ haiku*)

20827

+ # PIC is the default for Haiku.

20828

+ # The "-static" flag exists, but is broken.

20829

+ _LT_TAGVAR(lt_prog_compiler_static, $1)=

20830

+ ;;

20831

interix[[3-9]]*)

20832

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

20833

# Instead, we relocate shared libraries at runtime.

20834

@@ -3664,6 +3943,12 @@ m4_if([$1], [CXX], [

20835

;;

23117

20836

esac

23118

20837

;;

23119

- linux* | k*bsd*-gnu)

23120

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

20838

+ mingw* | cygwin* | os2* | pw32* | cegcc*)

20839

+ # This hack is so that the source file can tell whether it is being

20840

+ # built for inclusion in a dll (and should export symbols for example).

20841

+ m4_if([$1], [GCJ], [],

20842

+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])

20843

+ ;;

20844

dgux*)

23121

20845

case $cc_basename in

23122

KCC*)

23123

# KAI C++ Compiler

23124

_LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'

23125

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

20846

ec++*)

20847

@@ -3753,8 +4038,8 @@ m4_if([$1], [CXX], [

20848

_LT_TAGVAR(lt_prog_compiler_pic, $1)=

20849

_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

23126

20850

;;

23127

- icpc* | ecpc* )

23128

- # Intel C++

23129

+ ecpc* )

23130

+ # old Intel C++ for x86_64 which still supported -KPIC.

20851

- xlc* | xlC*)

20852

- # IBM XL 8.0 on PPC

20853

+ xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)

20854

+ # IBM XL 8.0, 9.0 on PPC and BlueGene

23131

20855

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

20856

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'

20857

_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'

20858

@@ -3816,7 +4101,7 @@ m4_if([$1], [CXX], [

20859

;;

20860

solaris*)

20861

case $cc_basename in

20862

- CC*)

20863

+ CC* | sunCC*)

20864

# Sun C++ 4.2, 5.x and Centerline C++

23132

20865

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

23133

_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'

23134

;;

23135

+ icpc* )

23136

+ # Intel C++, used to be incompatible with GCC.

23137

+ # ICC 10 doesn't accept -KPIC any more.

23138

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

23139

+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

23140

+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'

23141

+ ;;

23142

pgCC* | pgcpp*)

23143

# Portland Group C++ compiler

23144

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

23145

@@ -3756,7 +3784,7 @@ m4_if([$1], [CXX], [

23146

;;

23147

esac

23148

;;

23149

- netbsd*)

23150

+ netbsd* | netbsdelf*-gnu)

23151

;;

23152

*qnx* | *nto*)

23153

# QNX uses GNU C++, but need to define -shared option too, otherwise

23154

@@ -3877,7 +3905,7 @@ m4_if([$1], [CXX], [

23155

# PIC is the default for these OSes.

23156

;;

23157

23158

- mingw* | cygwin* | pw32* | os2*)

23159

+ mingw* | cygwin* | pw32* | os2* | cegcc*)

23160

# This hack is so that the source file can tell whether it is being

23161

# built for inclusion in a dll (and should export symbols for example).

23162

# Although the cygwin gcc ignores -fPIC, still need this for old-style

23163

@@ -3893,10 +3921,11 @@ m4_if([$1], [CXX], [

23164

;;

23165

20866

_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

20867

@@ -3920,6 +4205,12 @@ m4_if([$1], [CXX], [

20868

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'

20869

;;

20870

20871

+ haiku*)

20872

+ # PIC is the default for Haiku.

20873

+ # The "-static" flag exists, but is broken.

20874

+ _LT_TAGVAR(lt_prog_compiler_static, $1)=

20875

+ ;;

20876

23166

20877

hpux*)

23167

- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but

23168

- # not for PA HP-UX.

23169

+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit

23170

+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

23171

+ # sets the default TLS model and affects inlining.

23172

case $host_cpu in

23173

- hppa*64*|ia64*)

23174

+ hppa*64*)

23175

# +Z the default

20878

# PIC is the default for 64-bit PA HP-UX, but not for 32-bit

20879

# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

20880

@@ -3962,6 +4253,13 @@ m4_if([$1], [CXX], [

20881

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

20882

;;

20883

esac

20884

20885

+ case $cc_basename in

20886

+ nvcc*) # Cuda Compiler Driver 2.2

20887

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '

20888

+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'

20889

+ ;;

20890

+ esac

20891

else

20892

# PORTME Check for flag to pass linker flags through the system compiler.

20893

case $host_os in

20894

@@ -4025,7 +4323,13 @@ m4_if([$1], [CXX], [

20895

_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'

20896

_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'

23176

20897

;;

23177

23178

@@ -3946,7 +3975,7 @@ m4_if([$1], [CXX], [

23179

23180

;;

23181

23182

- mingw* | cygwin* | pw32* | os2*)

23183

+ mingw* | cygwin* | pw32* | os2* | cegcc*)

23184

# This hack is so that the source file can tell whether it is being

23185

# built for inclusion in a dll (and should export symbols for example).

23186

m4_if([$1], [GCJ], [],

23187

@@ -3975,13 +4004,27 @@ m4_if([$1], [CXX], [

23188

_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

23189

;;

23190

23191

- linux* | k*bsd*-gnu)

23192

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

23193

case $cc_basename in

23194

- icc* | ecc* | ifort*)

23195

+ # old Intel for x86_64 which still supported -KPIC.

23196

+ ecc*)

23197

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

23198

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

23199

_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'

23200

;;

23201

+ # icc used to be incompatible with GCC.

23202

+ # ICC 10 doesn't accept -KPIC any more.

23203

+ icc* | ifort*)

23204

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

23205

+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'

23206

+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'

23207

+ ;;

23208

+ # Lahey Fortran 8.1.

23209

+ lf95*)

23210

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

23211

+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'

23212

+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'

20898

- pgcc* | pgf77* | pgf90* | pgf95*)

20899

+ nagfor*)

20900

+ # NAG Fortran compiler

20901

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'

20902

+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'

20903

+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

23213

20904

+ ;;

23214

pgcc* | pgf77* | pgf90* | pgf95*)

20905

+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)

23215

20906

# Portland Group compilers (*not* the Pentium gcc compiler,

23216

20907

# which looks to be a dead project)

23217

@@ -4163,9 +4206,12 @@ m4_if([$1], [CXX], [

20908

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

20909

@@ -4037,25 +4341,25 @@ m4_if([$1], [CXX], [

20910

# All Alpha code is PIC.

20911

_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

20912

;;

20913

- xl*)

20914

- # IBM XL C 8.0/Fortran 10.1 on PPC

20915

+ xl* | bgxl* | bgf* | mpixl*)

20916

+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene

20917

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

20918

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'

20919

_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'

20920

;;

20921

20922

case `$CC -V 2>&1 | sed 5q` in

20923

- *Sun\ C*)

20924

- # Sun C 5.9

20925

+ *Sun\ F* | *Sun*Fortran*)

20926

+ # Sun Fortran 8.3 passes all unrecognized flags to the linker

20927

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

20928

_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

20929

- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

20930

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''

20931

;;

20932

- *Sun\ F*)

20933

- # Sun Fortran 8.3 passes all unrecognized flags to the linker

20934

+ *Sun\ C*)

20935

+ # Sun C 5.9

20936

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

20937

_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

20938

- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''

20939

+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

20940

;;

20941

esac

20942

;;

20943

@@ -4087,7 +4391,7 @@ m4_if([$1], [CXX], [

20944

_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

20945

_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

20946

case $cc_basename in

20947

- f77* | f90* | f95*)

20948

+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

20949

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;

20950

20951

_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;

20952

@@ -4144,9 +4448,11 @@ case $host_os in

20953

_LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"

20954

;;

20955

esac

20956

-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])

20957

-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],

20958

- [How to pass a linker flag through the compiler])

20959

20960

+AC_CACHE_CHECK([for $compiler option to produce PIC],

20961

+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],

20962

+ [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])

20963

+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)

20964

20965

20966

# Check to make sure the PIC flag actually works.

20967

@@ -4165,6 +4471,8 @@ fi

20968

_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],

20969

[Additional compiler flags for building library objects])

20970

20971

+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],

20972

+ [How to pass a linker flag through the compiler])

20973

20974

# Check to make sure the static flag actually works.

20975

20976

@@ -4185,6 +4493,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog

20977

m4_defun([_LT_LINKER_SHLIBS],

20978

[AC_REQUIRE([LT_PATH_LD])dnl

20979

AC_REQUIRE([LT_PATH_NM])dnl

20980

+m4_require([_LT_PATH_MANIFEST_TOOL])dnl

20981

m4_require([_LT_FILEUTILS_DEFAULTS])dnl

20982

m4_require([_LT_DECL_EGREP])dnl

20983

m4_require([_LT_DECL_SED])dnl

20984

@@ -4193,30 +4502,38 @@ m4_require([_LT_TAG_COMPILER])dnl

20985

AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])

20986

m4_if([$1], [CXX], [

20987

_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

20988

+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']

20989

case $host_os in

20990

aix[[4-9]]*)

20991

# If we're using GNU nm, then we don't want the "-C" option.

20992

# -C means demangle to AIX nm, but means don't demangle with GNU nm

20993

+ # Also, AIX nm treats weak defined symbols like other global defined

20994

+ # symbols, whereas GNU nm marks them as "W".

20995

if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then

20996

20997

20998

else

20999

21000

21001

;;

23218

21002

pw32*)

23219

21003

_LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"

23220

;;

23221

- cygwin* | mingw*)

23222

+ cygwin* | mingw* | cegcc*)

23223

23224

;;

23225

+ linux* | k*bsd*-gnu)

23226

+ _LT_TAGVAR(link_all_deplibs, $1)=no

23227

+ ;;

21004

- ;;

21005

+ ;;

21006

cygwin* | mingw* | cegcc*)

21007

21008

- ;;

21009

- linux* | k*bsd*-gnu)

21010

+ case $cc_basename in

21011

+ cl*) ;;

21012

+ *)

21013

21014

+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']

21015

+ ;;

21016

+ esac

21017

+ ;;

21018

+ linux* | k*bsd*-gnu | gnu*)

21019

_LT_TAGVAR(link_all_deplibs, $1)=no

21020

- ;;

21021

+ ;;

23228

21022

23229

21023

_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

23230

;;

23231

@@ -4215,7 +4261,7 @@ dnl Note also adjust exclude_expsyms for

23232

extract_expsyms_cmds=

23233

23234

case $host_os in

23235

- cygwin* | mingw* | pw32*)

23236

+ cygwin* | mingw* | pw32* | cegcc*)

23237

# FIXME: the MSVC++ port hasn't been tested in a loooong time

23238

# When not using gcc, we currently assume that we are using

23239

# Microsoft Visual C++.

23240

@@ -4230,6 +4276,9 @@ dnl Note also adjust exclude_expsyms for

21024

- ;;

21025

+ ;;

21026

esac

21027

- _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']

21028

], [

21029

runpath_var=

21030

_LT_TAGVAR(allow_undefined_flag, $1)=

21031

@@ -4276,13 +4593,39 @@ dnl Note also adjust exclude_expsyms for

23241

21032

openbsd*)

23242

21033

with_gnu_ld=no

23243

21034

;;

23244

+ linux* | k*bsd*-gnu)

23245

+ _LT_TAGVAR(link_all_deplibs, $1)=no

23246

+ ;;

21035

- linux* | k*bsd*-gnu)

21036

+ linux* | k*bsd*-gnu | gnu*)

21037

_LT_TAGVAR(link_all_deplibs, $1)=no

21038

;;

23247

21039

esac

23248

21040

23249

21041

_LT_TAGVAR(ld_shlibs, $1)=yes

23250

@@ -4251,6 +4300,7 @@ dnl Note also adjust exclude_expsyms for

23251

23252

supports_anon_versioning=no

23253

case `$LD -v 2>&1` in

23254

+ *GNU\ gold*) supports_anon_versioning=yes ;;

23255

*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11

23256

*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...

23257

*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

23258

@@ -4302,7 +4352,7 @@ _LT_EOF

21042

21043

+ # On some targets, GNU ld is compatible enough with the native linker

21044

+ # that we're better off using the native interface for both.

21045

+ lt_use_gnu_ld_interface=no

21046

if test "$with_gnu_ld" = yes; then

21047

+ case $host_os in

21048

+ aix*)

21049

+ # The AIX port of GNU ld has always aspired to compatibility

21050

+ # with the native linker. However, as the warning in the GNU ld

21051

+ # block says, versions before 2.19.5* couldn't really create working

21052

+ # shared libraries, regardless of the interface used.

21053

+ case `$LD -v 2>&1` in

21054

+ *\ $GNU\ Binutils$\ 2.19.5*) ;;

21055

+ *\ $GNU\ Binutils$\ 2.[[2-9]]*) ;;

21056

+ *\ $GNU\ Binutils$\ [[3-9]]*) ;;

21057

+ *)

21058

+ lt_use_gnu_ld_interface=yes

21059

+ ;;

21060

+ esac

21061

+ ;;

21062

+ *)

21063

+ lt_use_gnu_ld_interface=yes

21064

+ ;;

21065

+ esac

21066

+ fi

21067

21068

+ if test "$lt_use_gnu_ld_interface" = yes; then

21069

# If archive_cmds runs LD, not CC, wlarc should be empty

21070

wlarc='${wl}'

21071

21072

@@ -4316,11 +4659,12 @@ dnl Note also adjust exclude_expsyms for

21073

_LT_TAGVAR(ld_shlibs, $1)=no

21074

cat <<_LT_EOF 1>&2

21075

21076

-*** Warning: the GNU linker, at least up to release 2.9.1, is reported

21077

+*** Warning: the GNU linker, at least up to release 2.19, is reported

21078

*** to be unable to reliably create shared libraries on AIX.

21079

*** Therefore, libtool is disabling shared libraries support. If you

21080

-*** really care for shared libraries, you may want to modify your PATH

21081

-*** so that a non-GNU linker is found, and then restart.

21082

+*** really care for shared libraries, you may want to install binutils

21083

+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.

21084

+*** You will then need to restart the configuration process.

21085

21086

_LT_EOF

23259

21087

23260

;;

23261

23262

- cygwin* | mingw* | pw32*)

23263

+ cygwin* | mingw* | pw32* | cegcc*)

21088

@@ -4356,10 +4700,12 @@ _LT_EOF

23264

21089

# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,

23265

21090

# as there is no search path for DLLs.

23266

21091

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'

23267

@@ -4342,7 +4392,7 @@ _LT_EOF

23268

21092

+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'

21093

_LT_TAGVAR(allow_undefined_flag, $1)=unsupported

21094

_LT_TAGVAR(always_export_symbols, $1)=no

21095

_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

21096

21097

21098

+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']

21099

21100

if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

21101

_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

21102

@@ -4377,6 +4723,11 @@ _LT_EOF

21103

23269

21104

;;

23270

21105

23271

- gnu* | linux* | tpf* | k*bsd*-gnu)

23272

+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)

23273

tmp_diet=no

23274

if test "$host_os" = linux-dietlibc; then

23275

case $cc_basename in

23276

@@ -4368,6 +4418,9 @@ _LT_EOF

23277

tmp_addflag=' -i_dynamic -nofor_main' ;;

23278

ifc* | ifort*) # Intel Fortran compiler

23279

tmp_addflag=' -nofor_main' ;;

23280

+ lf95*) # Lahey Fortran 8.1

23281

+ _LT_TAGVAR(whole_archive_flag_spec, $1)=

23282

+ tmp_sharedflag='--shared' ;;

23283

xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)

21106

+ haiku*)

21107

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

21108

+ _LT_TAGVAR(link_all_deplibs, $1)=yes

21109

+ ;;

21110

21111

interix[[3-9]]*)

21112

_LT_TAGVAR(hardcode_direct, $1)=no

21113

_LT_TAGVAR(hardcode_shlibpath_var, $1)=no

21114

@@ -4402,15 +4753,16 @@ _LT_EOF

21115

if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \

21116

&& test "$tmp_diet" = no

21117

then

21118

- tmp_addflag=

21119

+ tmp_addflag=' $pic_flag'

21120

tmp_sharedflag='-shared'

21121

case $cc_basename,$host_cpu in

21122

pgcc*) # Portland Group C compiler

21123

21124

21125

tmp_addflag=' $pic_flag'

21126

;;

21127

- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers

21128

21129

+ pgf77* | pgf90* | pgf95* | pgfortran*)

21130

+ # Portland Group f77 and f90 compilers

21131

21132

tmp_addflag=' $pic_flag -Mnomain' ;;

21133

ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64

21134

tmp_addflag=' -i_dynamic' ;;

21135

@@ -4421,13 +4773,17 @@ _LT_EOF

21136

lf95*) # Lahey Fortran 8.1

21137

_LT_TAGVAR(whole_archive_flag_spec, $1)=

21138

tmp_sharedflag='--shared' ;;

21139

- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)

21140

+ xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)

23284

21141

tmp_sharedflag='-qmkshrobj'

23285

21142

tmp_addflag= ;;

23286

@@ -4409,7 +4462,7 @@ _LT_EOF

23287

23288

;;

21143

+ nvcc*) # Cuda Compiler Driver 2.2

21144

21145

+ _LT_TAGVAR(compiler_needs_object, $1)=yes

21146

+ ;;

21147

esac

21148

case `$CC -V 2>&1 | sed 5q` in

21149

*Sun\ C*) # Sun C 5.9

21150

21151

21152

_LT_TAGVAR(compiler_needs_object, $1)=yes

21153

tmp_sharedflag='-G' ;;

21154

*Sun\ F*) # Sun Fortran 8.3

21155

@@ -4443,17 +4799,17 @@ _LT_EOF

21156

23289

21157

23290

- netbsd*)

23291

+ netbsd* | netbsdelf*-gnu)

23292

if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

21158

case $cc_basename in

21159

- xlf*)

21160

+ xlf* | bgf* | bgxlf* | mpixlf*)

21161

# IBM XL Fortran 10.1 on PPC cannot create shared libs itself

21162

_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'

21163

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=

21164

_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'

21165

- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'

21166

+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

21167

if test "x$supports_anon_versioning" = xyes; then

21168

_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~

21169

cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~

21170

echo "local: *; };" >> $output_objdir/$libname.ver~

21171

- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

21172

+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

21173

21174

;;

21175

esac

21176

@@ -4467,8 +4823,8 @@ _LT_EOF

23293

21177

_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

23294

21178

wlarc=

23295

@@ -4584,6 +4637,7 @@ _LT_EOF

23296

if test "$aix_use_runtimelinking" = yes; then

23297

shared_flag="$shared_flag "'${wl}-G'

21179

else

21180

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

21181

- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

21182

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

21183

+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

21184

21185

;;

21186

21187

@@ -4486,8 +4842,8 @@ _LT_EOF

21188

21189

_LT_EOF

21190

elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then

21191

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

21192

- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

21193

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

21194

+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

21195

else

21196

_LT_TAGVAR(ld_shlibs, $1)=no

21197

21198

@@ -4533,8 +4889,8 @@ _LT_EOF

21199

21200

21201

if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then

21202

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

21203

- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

21204

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

21205

+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

21206

else

21207

_LT_TAGVAR(ld_shlibs, $1)=no

21208

21209

@@ -4574,8 +4930,10 @@ _LT_EOF

21210

else

21211

# If we're using GNU nm, then we don't want the "-C" option.

21212

# -C means demangle to AIX nm, but means don't demangle with GNU nm

21213

+ # Also, AIX nm treats weak defined symbols like other global

21214

+ # defined symbols, whereas GNU nm marks them as "W".

21215

if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then

21216

21217

21218

else

21219

23298

21220

23299

+ _LT_TAGVAR(link_all_deplibs, $1)=no

21221

@@ -4663,9 +5021,9 @@ _LT_EOF

21222

_LT_TAGVAR(allow_undefined_flag, $1)='-berok'

21223

# Determine the default libpath from the value encoded in an

21224

# empty executable.

21225

- _LT_SYS_MODULE_PATH_AIX

21226

+ _LT_SYS_MODULE_PATH_AIX([$1])

21227

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"

21228

21229

23300

21230

else

23301

# not using gcc

23302

21231

if test "$host_cpu" = ia64; then

23303

@@ -4599,6 +4653,7 @@ _LT_EOF

23304

23305

23306

23307

+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'

23308

# It seems that -bexpall does not export symbols beginning with

23309

# underscore (_), so it is better to generate a list of symbols to export.

23310

_LT_TAGVAR(always_export_symbols, $1)=yes

23311

@@ -4653,7 +4708,7 @@ _LT_EOF

23312

_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic

23313

;;

23314

23315

- cygwin* | mingw* | pw32*)

23316

+ cygwin* | mingw* | pw32* | cegcc*)

23317

# When not using gcc, we currently assume that we are using

21232

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'

21233

@@ -4674,14 +5032,19 @@ _LT_EOF

21234

else

21235

# Determine the default libpath from the value encoded in an

21236

# empty executable.

21237

- _LT_SYS_MODULE_PATH_AIX

21238

+ _LT_SYS_MODULE_PATH_AIX([$1])

21239

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"

21240

# Warning - without using the other run time loading flags,

21241

# -berok will link without error, but may produce a broken library.

21242

_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'

21243

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'

21244

- # Exported symbols can be pulled into shared objects from archives

21245

- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'

21246

+ if test "$with_gnu_ld" = yes; then

21247

+ # We only use this code for GNU lds that support --whole-archive.

21248

+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'

21249

+ else

21250

+ # Exported symbols can be pulled into shared objects from archives

21251

+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'

21252

+ fi

21253

_LT_TAGVAR(archive_cmds_need_lc, $1)=yes

21254

# This is similar to how AIX traditionally builds its shared libraries.

21255

21256

@@ -4713,20 +5076,63 @@ _LT_EOF

23318

21257

# Microsoft Visual C++.

23319

21258

# hardcode_libdir_flag_spec is actually meaningless, as there is

23320

@@ -4757,7 +4812,7 @@ _LT_EOF

21259

# no search path for DLLs.

21260

- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '

21261

- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

21262

- # Tell ltmain to make .lib files, not .a files.

21263

- libext=lib

21264

- # Tell ltmain to make .dll files, not .so files.

21265

- shrext_cmds=".dll"

21266

- # FIXME: Setting linknames here is a bad hack.

21267

- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='

21268

- # The linker will automatically build a .lib file if we build a DLL.

21269

- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'

21270

- # FIXME: Should let the user specify the lib program.

21271

- _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'

21272

- _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'

21273

- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

21274

+ case $cc_basename in

21275

+ cl*)

21276

+ # Native MSVC

21277

+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '

21278

+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

21279

+ _LT_TAGVAR(always_export_symbols, $1)=yes

21280

+ _LT_TAGVAR(file_list_spec, $1)='@'

21281

+ # Tell ltmain to make .lib files, not .a files.

21282

+ libext=lib

21283

+ # Tell ltmain to make .dll files, not .so files.

21284

+ shrext_cmds=".dll"

21285

+ # FIXME: Setting linknames here is a bad hack.

21286

+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='

21287

+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

21288

+ sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;

21289

+ else

21290

+ sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;

21291

+ fi~

21292

+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~

21293

+ linknames='

21294

+ # The linker will not automatically build a static lib if we build a DLL.

21295

+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'

21296

+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

21297

21298

+ # Don't use ranlib

21299

+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'

21300

+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~

21301

+ lt_tool_outputfile="@TOOL_OUTPUT@"~

21302

+ case $lt_outputfile in

21303

+ *.exe|*.EXE) ;;

21304

+ *)

21305

+ lt_outputfile="$lt_outputfile.exe"

21306

+ lt_tool_outputfile="$lt_tool_outputfile.exe"

21307

+ ;;

21308

+ esac~

21309

+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then

21310

+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;

21311

+ $RM "$lt_outputfile.manifest";

21312

+ fi'

21313

+ ;;

21314

+ *)

21315

+ # Assume MSVC wrapper

21316

+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '

21317

+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

21318

+ # Tell ltmain to make .lib files, not .a files.

21319

+ libext=lib

21320

+ # Tell ltmain to make .dll files, not .so files.

21321

+ shrext_cmds=".dll"

21322

+ # FIXME: Setting linknames here is a bad hack.

21323

+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='

21324

+ # The linker will automatically build a .lib file if we build a DLL.

21325

+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'

21326

+ # FIXME: Should let the user specify the lib program.

21327

+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'

21328

+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

21329

+ ;;

21330

+ esac

21331

;;

21332

21333

darwin* | rhapsody*)

21334

@@ -4764,7 +5170,7 @@ _LT_EOF

21335

21336

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

21337

freebsd* | dragonfly*)

21338

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

21339

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

21340

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

21341

_LT_TAGVAR(hardcode_direct, $1)=yes

21342

_LT_TAGVAR(hardcode_shlibpath_var, $1)=no

21343

@@ -4772,7 +5178,7 @@ _LT_EOF

21344

21345

hpux9*)

21346

if test "$GCC" = yes; then

21347

21348

21349

else

21350

21351

21352

@@ -4787,8 +5193,8 @@ _LT_EOF

21353

;;

21354

21355

hpux10*)

21356

- if test "$GCC" = yes -a "$with_gnu_ld" = no; then

21357

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

21358

+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then

21359

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

21360

else

21361

_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

21362

21363

@@ -4806,16 +5212,16 @@ _LT_EOF

21364

;;

21365

21366

hpux11*)

21367

- if test "$GCC" = yes -a "$with_gnu_ld" = no; then

21368

+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then

21369

case $host_cpu in

21370

hppa*64*)

23321

21371

_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

23322

21372

;;

23323

21373

ia64*)

23324

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

23325

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

23326

;;

23327

23328

_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

23329

@@ -4821,7 +4876,7 @@ _LT_EOF

23330

_LT_TAGVAR(link_all_deplibs, $1)=yes

23331

;;

23332

23333

- netbsd*)

23334

+ netbsd* | netbsdelf*-gnu)

23335

if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

23336

_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

23337

else

23338

@@ -5538,6 +5593,7 @@ if test "$_lt_caught_CXX_error" != yes;

23339

23340

23341

23342

+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'

23343

# It seems that -bexpall does not export symbols beginning with

23344

# underscore (_), so it is better to generate a list of symbols to

23345

# export.

23346

@@ -5596,7 +5652,7 @@ if test "$_lt_caught_CXX_error" != yes;

23347

esac

23348

;;

23349

23350

- cygwin* | mingw* | pw32*)

23351

+ cygwin* | mingw* | pw32* | cegcc*)

23352

# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,

23353

# as there is no search path for DLLs.

23354

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'

23355

@@ -5816,7 +5872,7 @@ if test "$_lt_caught_CXX_error" != yes;

23356

_LT_TAGVAR(inherit_rpath, $1)=yes

23357

;;

23358

23359

- linux* | k*bsd*-gnu)

23360

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

23361

case $cc_basename in

23362

KCC*)

23363

# Kuck and Associates, Inc. (KAI) C++ Compiler

23364

@@ -6977,6 +7033,18 @@ AC_SUBST([GREP])

23365

])

23366

23367

23368

+# _LT_DECL_OBJDUMP

23369

+# --------------

23370

+# If we don't have a new enough Autoconf to choose the best objdump

23371

+# available, choose the one first in the user's PATH.

23372

+m4_defun([_LT_DECL_OBJDUMP],

23373

+[AC_CHECK_TOOL(OBJDUMP, objdump, false)

23374

+test -z "$OBJDUMP" && OBJDUMP=objdump

23375

+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])

23376

+AC_SUBST([OBJDUMP])

21374

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

21375

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

21376

;;

21377

21378

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

21379

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

21380

;;

21381

esac

21382

else

21383

@@ -4827,7 +5233,14 @@ _LT_EOF

21384

_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

21385

;;

21386

21387

- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

21388

+ m4_if($1, [], [

21389

+ # Older versions of the 11.00 compiler do not understand -b yet

21390

+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)

21391

+ _LT_LINKER_OPTION([if $CC understands -b],

21392

+ _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],

21393

+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],

21394

+ [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],

21395

+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])

21396

;;

21397

esac

21398

21399

@@ -4855,19 +5268,34 @@ _LT_EOF

21400

21401

irix5* | irix6* | nonstopux*)

21402

if test "$GCC" = yes; then

21403

21404

21405

# Try to use the -exported_symbol ld option, if it does not

21406

# work, assume that -exports_file does not work either and

21407

# implicitly export all symbols.

21408

- save_LDFLAGS="$LDFLAGS"

21409

- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

21410

- AC_LINK_IFELSE(int foo(void) {},

21411

21412

- )

21413

- LDFLAGS="$save_LDFLAGS"

21414

+ # This should be the same for all languages, so no per-tag cache variable.

21415

+ AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],

21416

+ [lt_cv_irix_exported_symbol],

21417

+ [save_LDFLAGS="$LDFLAGS"

21418

+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

21419

+ AC_LINK_IFELSE(

21420

+ [AC_LANG_SOURCE(

21421

+ [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],

21422

+ [C++], [[int foo (void) { return 0; }]],

21423

+ [Fortran 77], [[

21424

+ subroutine foo

21425

+ end]],

21426

+ [Fortran], [[

21427

+ subroutine foo

21428

+ end]])])],

21429

+ [lt_cv_irix_exported_symbol=yes],

21430

+ [lt_cv_irix_exported_symbol=no])

21431

+ LDFLAGS="$save_LDFLAGS"])

21432

+ if test "$lt_cv_irix_exported_symbol" = yes; then

21433

21434

+ fi

21435

else

21436

21437

21438

21439

21440

21441

_LT_TAGVAR(archive_cmds_need_lc, $1)='no'

21442

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

21443

@@ -4929,17 +5357,17 @@ _LT_EOF

21444

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'

21445

_LT_TAGVAR(hardcode_minus_L, $1)=yes

21446

_LT_TAGVAR(allow_undefined_flag, $1)=unsupported

21447

21448

21449

_LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'

21450

;;

21451

21452

osf3*)

21453

if test "$GCC" = yes; then

21454

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'

21455

21456

21457

else

21458

_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'

21459

21460

21461

21462

_LT_TAGVAR(archive_cmds_need_lc, $1)='no'

21463

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

21464

@@ -4949,13 +5377,13 @@ _LT_EOF

21465

osf4* | osf5*) # as osf3* with the addition of -msym flag

21466

if test "$GCC" = yes; then

21467

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'

21468

21469

21470

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

21471

else

21472

_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'

21473

21474

21475

_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~

21476

21477

21478

21479

# Both c and cxx compiler support -rpath directly

21480

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'

21481

@@ -4968,9 +5396,9 @@ _LT_EOF

21482

_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'

21483

if test "$GCC" = yes; then

21484

wlarc='${wl}'

21485

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

21486

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

21487

_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

21488

- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'

21489

+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'

21490

else

21491

case `$CC -V 2>&1` in

21492

*"Compilers 5.0"*)

21493

@@ -5146,36 +5574,38 @@ x|xyes)

21494

# Test whether the compiler implicitly links with -lc since on some

21495

# systems, -lgcc has to come before -lc. If gcc already passes -lc

21496

# to ld, don't add -lc before -lgcc.

21497

- AC_MSG_CHECKING([whether -lc should be explicitly linked in])

21498

- $RM conftest*

21499

- echo "$lt_simple_compile_test_code" > conftest.$ac_ext

21500

21501

- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then

21502

- soname=conftest

21503

- lib=conftest

21504

- libobjs=conftest.$ac_objext

21505

- deplibs=

21506

- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)

21507

- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)

21508

- compiler_flags=-v

21509

- linker_flags=-v

21510

- verstring=

21511

- output_objdir=.

21512

- libname=conftest

21513

- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)

21514

- _LT_TAGVAR(allow_undefined_flag, $1)=

21515

- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)

21516

- then

21517

- _LT_TAGVAR(archive_cmds_need_lc, $1)=no

21518

- else

21519

- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes

21520

- fi

21521

- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag

21522

- else

21523

- cat conftest.err 1>&5

21524

- fi

21525

- $RM conftest*

21526

- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])

21527

+ AC_CACHE_CHECK([whether -lc should be explicitly linked in],

21528

+ [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),

21529

+ [$RM conftest*

21530

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

21531

21532

+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then

21533

+ soname=conftest

21534

+ lib=conftest

21535

+ libobjs=conftest.$ac_objext

21536

+ deplibs=

21537

+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)

21538

+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)

21539

+ compiler_flags=-v

21540

+ linker_flags=-v

21541

+ verstring=

21542

+ output_objdir=.

21543

+ libname=conftest

21544

+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)

21545

+ _LT_TAGVAR(allow_undefined_flag, $1)=

21546

+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)

21547

+ then

21548

+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no

21549

+ else

21550

+ lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes

21551

+ fi

21552

+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag

21553

+ else

21554

+ cat conftest.err 1>&5

21555

+ fi

21556

+ $RM conftest*

21557

+ ])

21558

+ _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)

21559

;;

21560

esac

21561

21562

@@ -5240,8 +5670,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],

21563

to runtime path list])

21564

_LT_TAGDECL([], [link_all_deplibs], [0],

21565

[Whether libtool must link a program against all its dependency libraries])

21566

-_LT_TAGDECL([], [fix_srcfile_path], [1],

21567

- [Fix the shell variable $srcfile for the compiler])

21568

_LT_TAGDECL([], [always_export_symbols], [0],

21569

[Set to "yes" if exported symbols are required])

21570

_LT_TAGDECL([], [export_symbols_cmds], [2],

21571

@@ -5252,6 +5680,8 @@ _LT_TAGDECL([], [include_expsyms], [1],

21572

[Symbols that must always be exported])

21573

_LT_TAGDECL([], [prelink_cmds], [2],

21574

[Commands necessary for linking programs (against libraries) with templates])

21575

+_LT_TAGDECL([], [postlink_cmds], [2],

21576

+ [Commands necessary for finishing linking programs])

21577

_LT_TAGDECL([], [file_list_spec], [1],

21578

[Specify filename containing input files])

21579

dnl FIXME: Not yet implemented

21580

@@ -5341,37 +5771,22 @@ CC="$lt_save_CC"

21581

])# _LT_LANG_C_CONFIG

21582

21583

21584

-# _LT_PROG_CXX

21585

-# ------------

21586

-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++

21587

-# compiler, we have our own version here.

21588

-m4_defun([_LT_PROG_CXX],

21589

21590

-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])

21591

-AC_PROG_CXX

21592

-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

21593

- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

21594

- (test "X$CXX" != "Xg++"))) ; then

21595

- AC_PROG_CXXCPP

21596

-else

21597

- _lt_caught_CXX_error=yes

21598

-fi

21599

-popdef([AC_MSG_ERROR])

21600

-])# _LT_PROG_CXX

21601

21602

-dnl aclocal-1.4 backwards compatibility:

21603

-dnl AC_DEFUN([_LT_PROG_CXX], [])

21604

21605

21606

# _LT_LANG_CXX_CONFIG([TAG])

21607

# --------------------------

21608

# Ensure that the configuration variables for a C++ compiler are suitably

21609

# defined. These variables are subsequently used by _LT_CONFIG to write

21610

# the compiler configuration to `libtool'.

21611

m4_defun([_LT_LANG_CXX_CONFIG],

21612

-[AC_REQUIRE([_LT_PROG_CXX])dnl

21613

-m4_require([_LT_FILEUTILS_DEFAULTS])dnl

21614

+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl

21615

m4_require([_LT_DECL_EGREP])dnl

21616

+m4_require([_LT_PATH_MANIFEST_TOOL])dnl

21617

+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

21618

+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

21619

+ (test "X$CXX" != "Xg++"))) ; then

21620

+ AC_PROG_CXXCPP

21621

+else

21622

+ _lt_caught_CXX_error=yes

21623

+fi

21624

21625

AC_LANG_PUSH(C++)

21626

_LT_TAGVAR(archive_cmds_need_lc, $1)=no

21627

@@ -5393,6 +5808,8 @@ _LT_TAGVAR(module_cmds, $1)=

21628

_LT_TAGVAR(module_expsym_cmds, $1)=

21629

_LT_TAGVAR(link_all_deplibs, $1)=unknown

21630

_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds

21631

+_LT_TAGVAR(reload_flag, $1)=$reload_flag

21632

+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds

21633

_LT_TAGVAR(no_undefined_flag, $1)=

21634

_LT_TAGVAR(whole_archive_flag_spec, $1)=

21635

_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no

21636

@@ -5424,6 +5841,7 @@ if test "$_lt_caught_CXX_error" != yes;

21637

21638

# Allow CC to be a program name with arguments.

21639

lt_save_CC=$CC

21640

+ lt_save_CFLAGS=$CFLAGS

21641

lt_save_LD=$LD

21642

lt_save_GCC=$GCC

21643

GCC=$GXX

21644

@@ -5441,6 +5859,7 @@ if test "$_lt_caught_CXX_error" != yes;

21645

21646

test -z "${LDCXX+set}" || LD=$LDCXX

21647

CC=${CXX-"c++"}

21648

+ CFLAGS=$CXXFLAGS

21649

compiler=$CC

21650

_LT_TAGVAR(compiler, $1)=$CC

21651

_LT_CC_BASENAME([$compiler])

21652

@@ -5462,8 +5881,8 @@ if test "$_lt_caught_CXX_error" != yes;

21653

# Check if GNU C++ uses GNU ld as the underlying linker, since the

21654

# archiving commands below assume that GNU ld is being used.

21655

if test "$with_gnu_ld" = yes; then

21656

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'

21657

21658

+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'

21659

21660

21661

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

21662

_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'

21663

@@ -5495,7 +5914,7 @@ if test "$_lt_caught_CXX_error" != yes;

21664

# Commands to make compiler produce verbose output that lists

21665

# what "hidden" libraries, object files and flags are used when

21666

# linking a shared library.

21667

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

21668

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

21669

21670

else

21671

GXX=no

21672

@@ -5604,10 +6023,10 @@ if test "$_lt_caught_CXX_error" != yes;

21673

_LT_TAGVAR(allow_undefined_flag, $1)='-berok'

21674

# Determine the default libpath from the value encoded in an empty

21675

# executable.

21676

- _LT_SYS_MODULE_PATH_AIX

21677

+ _LT_SYS_MODULE_PATH_AIX([$1])

21678

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"

21679

21680

21681

21682

else

21683

if test "$host_cpu" = ia64; then

21684

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'

21685

@@ -5616,14 +6035,19 @@ if test "$_lt_caught_CXX_error" != yes;

21686

else

21687

# Determine the default libpath from the value encoded in an

21688

# empty executable.

21689

- _LT_SYS_MODULE_PATH_AIX

21690

+ _LT_SYS_MODULE_PATH_AIX([$1])

21691

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"

21692

# Warning - without using the other run time loading flags,

21693

# -berok will link without error, but may produce a broken library.

21694

_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'

21695

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'

21696

- # Exported symbols can be pulled into shared objects from archives

21697

- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'

21698

+ if test "$with_gnu_ld" = yes; then

21699

+ # We only use this code for GNU lds that support --whole-archive.

21700

+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'

21701

+ else

21702

+ # Exported symbols can be pulled into shared objects from archives

21703

+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'

21704

+ fi

21705

_LT_TAGVAR(archive_cmds_need_lc, $1)=yes

21706

# This is similar to how AIX traditionally builds its shared

21707

# libraries.

21708

@@ -5653,28 +6077,75 @@ if test "$_lt_caught_CXX_error" != yes;

21709

;;

21710

21711

cygwin* | mingw* | pw32* | cegcc*)

21712

- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,

21713

- # as there is no search path for DLLs.

21714

- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'

21715

- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

21716

- _LT_TAGVAR(always_export_symbols, $1)=no

21717

- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

21718

21719

- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

21720

21721

- # If the export-symbols file already is a .def file (1st line

21722

- # is EXPORTS), use it as is; otherwise, prepend...

21723

- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

21724

- cp $export_symbols $output_objdir/$soname.def;

21725

- else

21726

- echo EXPORTS > $output_objdir/$soname.def;

21727

- cat $export_symbols >> $output_objdir/$soname.def;

21728

- fi~

21729

21730

- else

21731

- _LT_TAGVAR(ld_shlibs, $1)=no

21732

- fi

21733

- ;;

21734

+ case $GXX,$cc_basename in

21735

+ ,cl* | no,cl*)

21736

+ # Native MSVC

21737

+ # hardcode_libdir_flag_spec is actually meaningless, as there is

21738

+ # no search path for DLLs.

21739

+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '

21740

+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

21741

+ _LT_TAGVAR(always_export_symbols, $1)=yes

21742

+ _LT_TAGVAR(file_list_spec, $1)='@'

21743

+ # Tell ltmain to make .lib files, not .a files.

21744

+ libext=lib

21745

+ # Tell ltmain to make .dll files, not .so files.

21746

+ shrext_cmds=".dll"

21747

+ # FIXME: Setting linknames here is a bad hack.

21748

+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='

21749

+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

21750

+ $SED -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;

21751

+ else

21752

+ $SED -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;

21753

+ fi~

21754

+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~

21755

+ linknames='

21756

+ # The linker will not automatically build a static lib if we build a DLL.

21757

+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'

21758

+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

21759

+ # Don't use ranlib

21760

+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'

21761

+ _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~

21762

+ lt_tool_outputfile="@TOOL_OUTPUT@"~

21763

+ case $lt_outputfile in

21764

+ *.exe|*.EXE) ;;

21765

+ *)

21766

+ lt_outputfile="$lt_outputfile.exe"

21767

+ lt_tool_outputfile="$lt_tool_outputfile.exe"

21768

+ ;;

21769

+ esac~

21770

+ func_to_tool_file "$lt_outputfile"~

21771

+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then

21772

+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;

21773

+ $RM "$lt_outputfile.manifest";

21774

+ fi'

21775

+ ;;

21776

+ *)

21777

+ # g++

21778

+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,

21779

+ # as there is no search path for DLLs.

21780

+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'

21781

+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'

21782

+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported

21783

+ _LT_TAGVAR(always_export_symbols, $1)=no

21784

+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

21785

21786

+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

21787

21788

+ # If the export-symbols file already is a .def file (1st line

21789

+ # is EXPORTS), use it as is; otherwise, prepend...

21790

+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

21791

+ cp $export_symbols $output_objdir/$soname.def;

21792

+ else

21793

+ echo EXPORTS > $output_objdir/$soname.def;

21794

+ cat $export_symbols >> $output_objdir/$soname.def;

21795

+ fi~

21796

21797

+ else

21798

+ _LT_TAGVAR(ld_shlibs, $1)=no

21799

+ fi

21800

+ ;;

21801

+ esac

21802

+ ;;

21803

darwin* | rhapsody*)

21804

_LT_DARWIN_LINKER_FEATURES($1)

21805

;;

21806

@@ -5716,6 +6187,11 @@ if test "$_lt_caught_CXX_error" != yes;

21807

gnu*)

21808

;;

21809

21810

+ haiku*)

21811

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

21812

+ _LT_TAGVAR(link_all_deplibs, $1)=yes

21813

+ ;;

21814

21815

hpux9*)

21816

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'

21817

_LT_TAGVAR(hardcode_libdir_separator, $1)=:

21818

@@ -5740,11 +6216,11 @@ if test "$_lt_caught_CXX_error" != yes;

21819

# explicitly linking system object files so we need to strip them

21820

# from the output so that they don't get included in the library

21821

# dependencies.

21822

21823

21824

;;

21825

21826

if test "$GXX" = yes; then

21827

21828

21829

else

21830

# FIXME: insert proper C++ library support

21831

_LT_TAGVAR(ld_shlibs, $1)=no

21832

@@ -5805,7 +6281,7 @@ if test "$_lt_caught_CXX_error" != yes;

21833

# explicitly linking system object files so we need to strip them

21834

# from the output so that they don't get included in the library

21835

# dependencies.

21836

21837

21838

;;

21839

21840

if test "$GXX" = yes; then

21841

@@ -5815,10 +6291,10 @@ if test "$_lt_caught_CXX_error" != yes;

21842

_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

21843

;;

21844

ia64*)

21845

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

21846

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

21847

;;

21848

21849

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

21850

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

21851

;;

21852

esac

21853

21854

@@ -5848,7 +6324,7 @@ if test "$_lt_caught_CXX_error" != yes;

21855

case $cc_basename in

21856

CC*)

21857

# SGI C++

21858

21859

21860

21861

# Archives containing C++ object files must be created using

21862

# "CC -ar", where "CC" is the IRIX C++ compiler. This is

21863

@@ -5859,9 +6335,9 @@ if test "$_lt_caught_CXX_error" != yes;

21864

21865

if test "$GXX" = yes; then

21866

if test "$with_gnu_ld" = no; then

21867

21868

21869

else

21870

21871

21872

21873

21874

_LT_TAGVAR(link_all_deplibs, $1)=yes

21875

@@ -5890,7 +6366,7 @@ if test "$_lt_caught_CXX_error" != yes;

21876

# explicitly linking system object files so we need to strip them

21877

# from the output so that they don't get included in the library

21878

# dependencies.

21879

21880

21881

21882

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

21883

_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'

21884

@@ -5927,26 +6403,26 @@ if test "$_lt_caught_CXX_error" != yes;

21885

pgCC* | pgcpp*)

21886

# Portland Group C++ compiler

21887

case `$CC -V` in

21888

- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)

21889

+ *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)

21890

_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~

21891

rm -rf $tpldir~

21892

$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~

21893

- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'

21894

+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'

21895

_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~

21896

rm -rf $tpldir~

21897

$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~

21898

- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~

21899

+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~

21900

$RANLIB $oldlib'

21901

_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~

21902

rm -rf $tpldir~

21903

$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~

21904

- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

21905

+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

21906

_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~

21907

rm -rf $tpldir~

21908

$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~

21909

21910

21911

;;

21912

- *) # Version 6 will use weak symbols

21913

+ *) # Version 6 and above use weak symbols

21914

_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

21915

21916

;;

21917

@@ -5954,7 +6430,7 @@ if test "$_lt_caught_CXX_error" != yes;

21918

21919

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'

21920

_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'

21921

21922

21923

;;

21924

cxx*)

21925

# Compaq C++

21926

@@ -5973,9 +6449,9 @@ if test "$_lt_caught_CXX_error" != yes;

21927

# explicitly linking system object files so we need to strip them

21928

# from the output so that they don't get included in the library

21929

# dependencies.

21930

21931

21932

;;

21933

- xl*)

21934

+ xl* | mpixl* | bgxl*)

21935

# IBM XL 8.0 on PPC, with GNU ld

21936

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

21937

_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'

21938

@@ -5995,13 +6471,13 @@ if test "$_lt_caught_CXX_error" != yes;

21939

_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

21940

_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'

21941

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

21942

21943

21944

_LT_TAGVAR(compiler_needs_object, $1)=yes

21945

21946

# Not sure whether something based on

21947

# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1

21948

# would be better.

21949

- output_verbose_link_cmd='echo'

21950

+ output_verbose_link_cmd='func_echo_all'

21951

21952

# Archives containing C++ object files must be created using

21953

# "CC -xar", where "CC" is the Sun C++ compiler. This is

21954

@@ -6070,7 +6546,7 @@ if test "$_lt_caught_CXX_error" != yes;

21955

_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'

21956

_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'

21957

21958

- output_verbose_link_cmd=echo

21959

+ output_verbose_link_cmd=func_echo_all

21960

else

21961

_LT_TAGVAR(ld_shlibs, $1)=no

21962

21963

@@ -6105,15 +6581,15 @@ if test "$_lt_caught_CXX_error" != yes;

21964

case $host in

21965

osf3*)

21966

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'

21967

21968

21969

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

21970

;;

21971

21972

_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'

21973

21974

21975

_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~

21976

echo "-hidden">> $lib.exp~

21977

21978

21979

$RM $lib.exp'

21980

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'

21981

;;

21982

@@ -6129,17 +6605,17 @@ if test "$_lt_caught_CXX_error" != yes;

21983

# explicitly linking system object files so we need to strip them

21984

# from the output so that they don't get included in the library

21985

# dependencies.

21986

21987

21988

;;

21989

21990

if test "$GXX" = yes && test "$with_gnu_ld" = no; then

21991

_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'

21992

case $host in

21993

osf3*)

21994

21995

21996

;;

21997

21998

21999

22000

;;

22001

esac

22002

22003

@@ -6149,7 +6625,7 @@ if test "$_lt_caught_CXX_error" != yes;

22004

# Commands to make compiler produce verbose output that lists

22005

# what "hidden" libraries, object files and flags are used when

22006

# linking a shared library.

22007

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

22008

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

22009

22010

else

22011

# FIXME: insert proper C++ library support

22012

@@ -6185,7 +6661,7 @@ if test "$_lt_caught_CXX_error" != yes;

22013

22014

solaris*)

22015

case $cc_basename in

22016

- CC*)

22017

+ CC* | sunCC*)

22018

# Sun C++ 4.2, 5.x and Centerline C++

22019

_LT_TAGVAR(archive_cmds_need_lc,$1)=yes

22020

_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'

22021

@@ -6206,7 +6682,7 @@ if test "$_lt_caught_CXX_error" != yes;

22022

esac

22023

_LT_TAGVAR(link_all_deplibs, $1)=yes

22024

22025

- output_verbose_link_cmd='echo'

22026

+ output_verbose_link_cmd='func_echo_all'

22027

22028

# Archives containing C++ object files must be created using

22029

# "CC -xar", where "CC" is the Sun C++ compiler. This is

22030

@@ -6226,14 +6702,14 @@ if test "$_lt_caught_CXX_error" != yes;

22031

if test "$GXX" = yes && test "$with_gnu_ld" = no; then

22032

_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'

22033

if $CC --version | $GREP -v '^2\.7' > /dev/null; then

22034

- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'

22035

+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'

22036

_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

22037

- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'

22038

+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'

22039

22040

# Commands to make compiler produce verbose output that lists

22041

# what "hidden" libraries, object files and flags are used when

22042

# linking a shared library.

22043

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

22044

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

22045

else

22046

# g++ 2.7 appears to require `-G' NOT `-shared' on this

22047

# platform.

22048

@@ -6244,7 +6720,7 @@ if test "$_lt_caught_CXX_error" != yes;

22049

# Commands to make compiler produce verbose output that lists

22050

# what "hidden" libraries, object files and flags are used when

22051

# linking a shared library.

22052

- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

22053

+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

22054

22055

22056

_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'

22057

@@ -6298,6 +6774,10 @@ if test "$_lt_caught_CXX_error" != yes;

22058

CC*)

22059

_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

22060

_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

22061

+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~

22062

+ '"$_LT_TAGVAR(old_archive_cmds, $1)"

22063

+ _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~

22064

+ '"$_LT_TAGVAR(reload_cmds, $1)"

22065

;;

22066

22067

_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

22068

@@ -6353,6 +6833,7 @@ if test "$_lt_caught_CXX_error" != yes;

22069

fi # test -n "$compiler"

22070

22071

CC=$lt_save_CC

22072

+ CFLAGS=$lt_save_CFLAGS

22073

LDCXX=$LD

22074

LD=$lt_save_LD

22075

GCC=$lt_save_GCC

22076

@@ -6367,6 +6848,29 @@ AC_LANG_POP

22077

])# _LT_LANG_CXX_CONFIG

22078

22079

22080

+# _LT_FUNC_STRIPNAME_CNF

22081

+# ----------------------

22082

+# func_stripname_cnf prefix suffix name

22083

+# strip PREFIX and SUFFIX off of NAME.

22084

+# PREFIX and SUFFIX must not contain globbing or regex special

22085

+# characters, hashes, percent signs, but SUFFIX may contain a leading

22086

+# dot (in which case that matches only a dot).

22087

22088

+# This function is identical to the (non-XSI) version of func_stripname,

22089

+# except this one can be used by m4 code that may be executed by configure,

22090

+# rather than the libtool script.

22091

+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl

22092

+AC_REQUIRE([_LT_DECL_SED])

22093

+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])

22094

+func_stripname_cnf ()

22095

22096

+ case ${2} in

22097

+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;

22098

+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;

22099

+ esac

22100

+} # func_stripname_cnf

22101

+])# _LT_FUNC_STRIPNAME_CNF

22102

22103

# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])

22104

# ---------------------------------

22105

# Figure out "hidden" library dependencies from verbose

22106

@@ -6375,6 +6879,7 @@ AC_LANG_POP

22107

# objects, libraries and library flags.

22108

m4_defun([_LT_SYS_HIDDEN_LIBDEPS],

22109

[m4_require([_LT_FILEUTILS_DEFAULTS])dnl

22110

+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl

22111

# Dependencies to place before and after the object being linked:

22112

_LT_TAGVAR(predep_objects, $1)=

22113

_LT_TAGVAR(postdep_objects, $1)=

22114

@@ -6425,6 +6930,13 @@ public class foo {

22115

};

22116

_LT_EOF

22117

])

22118

22119

+_lt_libdeps_save_CFLAGS=$CFLAGS

22120

+case "$CC $CFLAGS " in #(

22121

+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;

22122

+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;

22123

+esac

22124

22125

dnl Parse the compiler output and extract the necessary

22126

dnl objects, libraries and library flags.

22127

if AC_TRY_EVAL(ac_compile); then

22128

@@ -6436,7 +6948,7 @@ if AC_TRY_EVAL(ac_compile); then

22129

pre_test_object_deps_done=no

22130

22131

for p in `eval "$output_verbose_link_cmd"`; do

22132

- case $p in

22133

+ case ${prev}${p} in

22134

22135

-L* | -R* | -l*)

22136

# Some compilers place space between "-{L,R}" and the path.

22137

@@ -6445,13 +6957,22 @@ if AC_TRY_EVAL(ac_compile); then

22138

test $p = "-R"; then

22139

prev=$p

22140

continue

22141

- else

22142

- prev=

22143

22144

22145

+ # Expand the sysroot to ease extracting the directories later.

22146

+ if test -z "$prev"; then

22147

+ case $p in

22148

+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;

22149

+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;

22150

+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;

22151

+ esac

22152

+ fi

22153

+ case $p in

22154

+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;

22155

+ esac

22156

if test "$pre_test_object_deps_done" = no; then

22157

- case $p in

22158

- -L* | -R*)

22159

+ case ${prev} in

22160

+ -L | -R)

22161

# Internal compiler library paths should come after those

22162

# provided the user. The postdeps already come after the

22163

# user supplied libs so there is no need to process them.

22164

@@ -6471,8 +6992,10 @@ if AC_TRY_EVAL(ac_compile); then

22165

_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"

22166

22167

22168

+ prev=

22169

;;

22170

22171

+ *.lto.$objext) ;; # Ignore GCC LTO objects

22172

*.$objext)

22173

# This assumes that the test object file only shows up

22174

# once in the compiler output.

22175

@@ -6508,6 +7031,7 @@ else

22176

22177

22178

$RM -f confest.$objext

22179

+CFLAGS=$_lt_libdeps_save_CFLAGS

22180

22181

# PORTME: override above test on systems where it is broken

22182

m4_if([$1], [CXX],

22183

@@ -6544,7 +7068,7 @@ linux*)

22184

22185

solaris*)

22186

case $cc_basename in

22187

- CC*)

22188

+ CC* | sunCC*)

22189

# The more standards-conforming stlport4 library is

22190

# incompatible with the Cstd library. Avoid specifying

22191

# it if it's in CXXFLAGS. Ignore libCrun as

22192

@@ -6588,32 +7112,16 @@ _LT_TAGDECL([], [compiler_lib_search_pat

22193

])# _LT_SYS_HIDDEN_LIBDEPS

22194

22195

22196

-# _LT_PROG_F77

22197

-# ------------

22198

-# Since AC_PROG_F77 is broken, in that it returns the empty string

22199

-# if there is no fortran compiler, we have our own version here.

22200

-m4_defun([_LT_PROG_F77],

22201

22202

-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])

22203

-AC_PROG_F77

22204

-if test -z "$F77" || test "X$F77" = "Xno"; then

22205

- _lt_disable_F77=yes

22206

-fi

22207

-popdef([AC_MSG_ERROR])

22208

-])# _LT_PROG_F77

22209

22210

-dnl aclocal-1.4 backwards compatibility:

22211

-dnl AC_DEFUN([_LT_PROG_F77], [])

22212

22213

22214

# _LT_LANG_F77_CONFIG([TAG])

22215

# --------------------------

22216

# Ensure that the configuration variables for a Fortran 77 compiler are

22217

# suitably defined. These variables are subsequently used by _LT_CONFIG

22218

# to write the compiler configuration to `libtool'.

22219

m4_defun([_LT_LANG_F77_CONFIG],

22220

-[AC_REQUIRE([_LT_PROG_F77])dnl

22221

-AC_LANG_PUSH(Fortran 77)

22222

+[AC_LANG_PUSH(Fortran 77)

22223

+if test -z "$F77" || test "X$F77" = "Xno"; then

22224

+ _lt_disable_F77=yes

22225

+fi

22226

22227

_LT_TAGVAR(archive_cmds_need_lc, $1)=no

22228

_LT_TAGVAR(allow_undefined_flag, $1)=

22229

@@ -6632,6 +7140,8 @@ _LT_TAGVAR(module_cmds, $1)=

22230

_LT_TAGVAR(module_expsym_cmds, $1)=

22231

_LT_TAGVAR(link_all_deplibs, $1)=unknown

22232

_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds

22233

+_LT_TAGVAR(reload_flag, $1)=$reload_flag

22234

+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds

22235

_LT_TAGVAR(no_undefined_flag, $1)=

22236

_LT_TAGVAR(whole_archive_flag_spec, $1)=

22237

_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no

22238

@@ -6671,7 +7181,9 @@ if test "$_lt_disable_F77" != yes; then

22239

# Allow CC to be a program name with arguments.

22240

lt_save_CC="$CC"

22241

lt_save_GCC=$GCC

22242

+ lt_save_CFLAGS=$CFLAGS

22243

CC=${F77-"f77"}

22244

+ CFLAGS=$FFLAGS

22245

compiler=$CC

22246

_LT_TAGVAR(compiler, $1)=$CC

22247

_LT_CC_BASENAME([$compiler])

22248

@@ -6725,38 +7237,24 @@ if test "$_lt_disable_F77" != yes; then

22249

22250

GCC=$lt_save_GCC

22251

CC="$lt_save_CC"

22252

+ CFLAGS="$lt_save_CFLAGS"

22253

fi # test "$_lt_disable_F77" != yes

22254

22255

AC_LANG_POP

22256

])# _LT_LANG_F77_CONFIG

22257

22258

22259

-# _LT_PROG_FC

22260

-# -----------

22261

-# Since AC_PROG_FC is broken, in that it returns the empty string

22262

-# if there is no fortran compiler, we have our own version here.

22263

-m4_defun([_LT_PROG_FC],

22264

22265

-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])

22266

-AC_PROG_FC

22267

-if test -z "$FC" || test "X$FC" = "Xno"; then

22268

- _lt_disable_FC=yes

22269

-fi

22270

-popdef([AC_MSG_ERROR])

22271

-])# _LT_PROG_FC

22272

22273

-dnl aclocal-1.4 backwards compatibility:

22274

-dnl AC_DEFUN([_LT_PROG_FC], [])

22275

22276

22277

# _LT_LANG_FC_CONFIG([TAG])

22278

# -------------------------

22279

# Ensure that the configuration variables for a Fortran compiler are

22280

# suitably defined. These variables are subsequently used by _LT_CONFIG

22281

# to write the compiler configuration to `libtool'.

22282

m4_defun([_LT_LANG_FC_CONFIG],

22283

-[AC_REQUIRE([_LT_PROG_FC])dnl

22284

-AC_LANG_PUSH(Fortran)

22285

+[AC_LANG_PUSH(Fortran)

22286

22287

+if test -z "$FC" || test "X$FC" = "Xno"; then

22288

+ _lt_disable_FC=yes

22289

+fi

22290

22291

_LT_TAGVAR(archive_cmds_need_lc, $1)=no

22292

_LT_TAGVAR(allow_undefined_flag, $1)=

22293

@@ -6775,6 +7273,8 @@ _LT_TAGVAR(module_cmds, $1)=

22294

_LT_TAGVAR(module_expsym_cmds, $1)=

22295

_LT_TAGVAR(link_all_deplibs, $1)=unknown

22296

_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds

22297

+_LT_TAGVAR(reload_flag, $1)=$reload_flag

22298

+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds

22299

_LT_TAGVAR(no_undefined_flag, $1)=

22300

_LT_TAGVAR(whole_archive_flag_spec, $1)=

22301

_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no

22302

@@ -6814,7 +7314,9 @@ if test "$_lt_disable_FC" != yes; then

22303

# Allow CC to be a program name with arguments.

22304

lt_save_CC="$CC"

22305

lt_save_GCC=$GCC

22306

+ lt_save_CFLAGS=$CFLAGS

22307

CC=${FC-"f95"}

22308

+ CFLAGS=$FCFLAGS

22309

compiler=$CC

22310

GCC=$ac_cv_fc_compiler_gnu

22311

22312

@@ -6870,7 +7372,8 @@ if test "$_lt_disable_FC" != yes; then

22313

fi # test -n "$compiler"

22314

22315

GCC=$lt_save_GCC

22316

- CC="$lt_save_CC"

22317

+ CC=$lt_save_CC

22318

+ CFLAGS=$lt_save_CFLAGS

22319

fi # test "$_lt_disable_FC" != yes

22320

22321

AC_LANG_POP

22322

@@ -6907,10 +7410,12 @@ _LT_COMPILER_BOILERPLATE

22323

_LT_LINKER_BOILERPLATE

22324

22325

# Allow CC to be a program name with arguments.

22326

-lt_save_CC="$CC"

22327

+lt_save_CC=$CC

22328

+lt_save_CFLAGS=$CFLAGS

22329

lt_save_GCC=$GCC

22330

GCC=yes

22331

CC=${GCJ-"gcj"}

22332

+CFLAGS=$GCJFLAGS

22333

compiler=$CC

22334

_LT_TAGVAR(compiler, $1)=$CC

22335

_LT_TAGVAR(LD, $1)="$LD"

22336

@@ -6920,6 +7425,8 @@ _LT_CC_BASENAME([$compiler])

22337

_LT_TAGVAR(archive_cmds_need_lc, $1)=no

22338

22339

_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds

22340

+_LT_TAGVAR(reload_flag, $1)=$reload_flag

22341

+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds

22342

22343

if test -n "$compiler"; then

22344

_LT_COMPILER_NO_RTTI($1)

22345

@@ -6935,7 +7442,8 @@ fi

22346

AC_LANG_RESTORE

22347

22348

GCC=$lt_save_GCC

22349

-CC="$lt_save_CC"

22350

+CC=$lt_save_CC

22351

+CFLAGS=$lt_save_CFLAGS

22352

])# _LT_LANG_GCJ_CONFIG

22353

22354

22355

@@ -6970,9 +7478,11 @@ _LT_LINKER_BOILERPLATE

22356

22357

# Allow CC to be a program name with arguments.

22358

lt_save_CC="$CC"

22359

+lt_save_CFLAGS=$CFLAGS

22360

lt_save_GCC=$GCC

22361

GCC=

22362

CC=${RC-"windres"}

22363

+CFLAGS=

22364

compiler=$CC

22365

_LT_TAGVAR(compiler, $1)=$CC

22366

_LT_CC_BASENAME([$compiler])

22367

@@ -6985,7 +7495,8 @@ fi

22368

22369

GCC=$lt_save_GCC

22370

AC_LANG_RESTORE

22371

-CC="$lt_save_CC"

22372

+CC=$lt_save_CC

22373

+CFLAGS=$lt_save_CFLAGS

22374

])# _LT_LANG_RC_CONFIG

22375

22376

22377

@@ -7044,6 +7555,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object

22378

AC_SUBST([OBJDUMP])

22379

])

22380

22381

+# _LT_DECL_DLLTOOL

22382

+# ----------------

22383

+# Ensure DLLTOOL variable is set.

22384

+m4_defun([_LT_DECL_DLLTOOL],

22385

+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)

22386

+test -z "$DLLTOOL" && DLLTOOL=dlltool

22387

+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])

22388

+AC_SUBST([DLLTOOL])

23377

22389

+])

23378

23379

22390

23380

22391

# _LT_DECL_SED

23381

22392

# ------------

23382

# Check for a fully-functional sed program, that truncates

23383

@@ -7437,7 +7505,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],

22393

@@ -7135,8 +7655,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],

22394

# Try some XSI features

22395

xsi_shell=no

22396

( _lt_dummy="a/b/c"

22397

- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \

22398

- = c,a/b,, \

22399

+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \

22400

+ = c,a/b,b/c, \

22401

&& eval 'test $(( 1 + 1 )) -eq 2 \

22402

&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \

22403

&& xsi_shell=yes

22404

@@ -7175,222 +7695,177 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn

22405

])# _LT_CHECK_SHELL_FEATURES

22406

22407

22408

-# _LT_PROG_XSI_SHELLFNS

22409

-# ---------------------

22410

-# Bourne and XSI compatible variants of some useful shell functions.

22411

-m4_defun([_LT_PROG_XSI_SHELLFNS],

22412

-[case $xsi_shell in

22413

- yes)

22414

- cat << \_LT_EOF >> "$cfgfile"

22415

22416

-# func_dirname file append nondir_replacement

22417

-# Compute the dirname of FILE. If nonempty, add APPEND to the result,

22418

-# otherwise set result to NONDIR_REPLACEMENT.

22419

-func_dirname ()

22420

22421

- case ${1} in

22422

- */*) func_dirname_result="${1%/*}${2}" ;;

22423

- * ) func_dirname_result="${3}" ;;

22424

- esac

22425

22426

22427

-# func_basename file

22428

-func_basename ()

22429

22430

- func_basename_result="${1##*/}"

22431

22432

22433

-# func_dirname_and_basename file append nondir_replacement

22434

-# perform func_basename and func_dirname in a single function

22435

-# call:

22436

-# dirname: Compute the dirname of FILE. If nonempty,

22437

-# add APPEND to the result, otherwise set result

22438

-# to NONDIR_REPLACEMENT.

22439

-# value returned in "$func_dirname_result"

22440

-# basename: Compute filename of FILE.

22441

-# value retuned in "$func_basename_result"

22442

-# Implementation must be kept synchronized with func_dirname

22443

-# and func_basename. For efficiency, we do not delegate to

22444

-# those functions but instead duplicate the functionality here.

22445

-func_dirname_and_basename ()

22446

22447

- case ${1} in

22448

- */*) func_dirname_result="${1%/*}${2}" ;;

22449

- * ) func_dirname_result="${3}" ;;

22450

- esac

22451

- func_basename_result="${1##*/}"

22452

22453

22454

-# func_stripname prefix suffix name

22455

-# strip PREFIX and SUFFIX off of NAME.

22456

-# PREFIX and SUFFIX must not contain globbing or regex special

22457

-# characters, hashes, percent signs, but SUFFIX may contain a leading

22458

-# dot (in which case that matches only a dot).

22459

-func_stripname ()

22460

22461

- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are

22462

- # positional parameters, so assign one to ordinary parameter first.

22463

- func_stripname_result=${3}

22464

- func_stripname_result=${func_stripname_result#"${1}"}

22465

- func_stripname_result=${func_stripname_result%"${2}"}

22466

22467

22468

-# func_opt_split

22469

-func_opt_split ()

22470

22471

- func_opt_split_opt=${1%%=*}

22472

- func_opt_split_arg=${1#*=}

22473

22474

22475

-# func_lo2o object

22476

-func_lo2o ()

22477

22478

- case ${1} in

22479

- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;

22480

- *) func_lo2o_result=${1} ;;

22481

- esac

22482

22483

22484

-# func_xform libobj-or-source

22485

-func_xform ()

22486

22487

- func_xform_result=${1%.*}.lo

22488

22489

22490

-# func_arith arithmetic-term...

22491

-func_arith ()

22492

22493

- func_arith_result=$(( $[*] ))

22494

22495

+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)

22496

+# ------------------------------------------------------

22497

+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and

22498

+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.

22499

+m4_defun([_LT_PROG_FUNCTION_REPLACE],

22500

+[dnl {

22501

+sed -e '/^$1 ()$/,/^} # $1 /c\

22502

+$1 ()\

22503

+{\

22504

+m4_bpatsubsts([$2], [$], [\\], [^$[ ]$], [\\\1])

22505

+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \

22506

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

22507

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

22508

+test 0 -eq $? || _lt_function_replace_fail=:

22509

+])

22510

22511

-# func_len string

22512

-# STRING may not start with a hyphen.

22513

-func_len ()

22514

22515

- func_len_result=${#1}

22516

22517

22518

-_LT_EOF

22519

- ;;

22520

- *) # Bourne compatible functions.

22521

- cat << \_LT_EOF >> "$cfgfile"

22522

+# _LT_PROG_REPLACE_SHELLFNS

22523

+# -------------------------

22524

+# Replace existing portable implementations of several shell functions with

22525

+# equivalent extended shell implementations where those features are available..

22526

+m4_defun([_LT_PROG_REPLACE_SHELLFNS],

22527

+[if test x"$xsi_shell" = xyes; then

22528

+ _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl

22529

+ case ${1} in

22530

+ */*) func_dirname_result="${1%/*}${2}" ;;

22531

+ * ) func_dirname_result="${3}" ;;

22532

+ esac])

22533

22534

+ _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl

22535

+ func_basename_result="${1##*/}"])

22536

22537

+ _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl

22538

+ case ${1} in

22539

+ */*) func_dirname_result="${1%/*}${2}" ;;

22540

+ * ) func_dirname_result="${3}" ;;

22541

+ esac

22542

+ func_basename_result="${1##*/}"])

22543

22544

-# func_dirname file append nondir_replacement

22545

-# Compute the dirname of FILE. If nonempty, add APPEND to the result,

22546

-# otherwise set result to NONDIR_REPLACEMENT.

22547

-func_dirname ()

22548

22549

- # Extract subdirectory from the argument.

22550

- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`

22551

- if test "X$func_dirname_result" = "X${1}"; then

22552

- func_dirname_result="${3}"

22553

- else

22554

- func_dirname_result="$func_dirname_result${2}"

22555

- fi

22556

22557

+ _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl

22558

+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are

22559

+ # positional parameters, so assign one to ordinary parameter first.

22560

+ func_stripname_result=${3}

22561

+ func_stripname_result=${func_stripname_result#"${1}"}

22562

+ func_stripname_result=${func_stripname_result%"${2}"}])

22563

22564

-# func_basename file

22565

-func_basename ()

22566

22567

- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`

22568

22569

+ _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl

22570

+ func_split_long_opt_name=${1%%=*}

22571

+ func_split_long_opt_arg=${1#*=}])

22572

22573

-dnl func_dirname_and_basename

22574

-dnl A portable version of this function is already defined in general.m4sh

22575

-dnl so there is no need for it here.

22576

+ _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl

22577

+ func_split_short_opt_arg=${1#??}

22578

+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])

22579

22580

-# func_stripname prefix suffix name

22581

-# strip PREFIX and SUFFIX off of NAME.

22582

-# PREFIX and SUFFIX must not contain globbing or regex special

22583

-# characters, hashes, percent signs, but SUFFIX may contain a leading

22584

-# dot (in which case that matches only a dot).

22585

-# func_strip_suffix prefix name

22586

-func_stripname ()

22587

22588

- case ${2} in

22589

- .*) func_stripname_result=`$ECHO "X${3}" \

22590

- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;

22591

- *) func_stripname_result=`$ECHO "X${3}" \

22592

- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;

22593

- esac

22594

22595

+ _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl

22596

+ case ${1} in

22597

+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;

22598

+ *) func_lo2o_result=${1} ;;

22599

+ esac])

22600

22601

-# sed scripts:

22602

-my_sed_long_opt='1s/^$-[[^=]]*$=.*/\1/;q'

22603

-my_sed_long_arg='1s/^-[[^=]]*=//'

22604

+ _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])

22605

22606

-# func_opt_split

22607

-func_opt_split ()

22608

22609

- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`

22610

- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`

22611

22612

+ _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])

22613

22614

-# func_lo2o object

22615

-func_lo2o ()

22616

22617

- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`

22618

22619

+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])

22620

+fi

22621

22622

-# func_xform libobj-or-source

22623

-func_xform ()

22624

22625

- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`

22626

22627

+if test x"$lt_shell_append" = xyes; then

22628

+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])

22629

22630

-# func_arith arithmetic-term...

22631

-func_arith ()

22632

22633

- func_arith_result=`expr "$[@]"`

22634

22635

+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl

22636

+ func_quote_for_eval "${2}"

22637

+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \

22638

+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])

22639

22640

-# func_len string

22641

-# STRING may not start with a hyphen.

22642

-func_len ()

22643

22644

- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`

22645

22646

+ # Save a `func_append' function call where possible by direct use of '+='

22647

+ sed -e 's%func_append $[[a-zA-Z_]]\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \

22648

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

22649

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

22650

+ test 0 -eq $? || _lt_function_replace_fail=:

22651

+else

22652

+ # Save a `func_append' function call even when '+=' is not available

22653

+ sed -e 's%func_append $[[a-zA-Z_]]\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \

22654

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

22655

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

22656

+ test 0 -eq $? || _lt_function_replace_fail=:

22657

+fi

22658

22659

-_LT_EOF

22660

-esac

22661

+if test x"$_lt_function_replace_fail" = x":"; then

22662

+ AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])

22663

+fi

22664

+])

22665

22666

-case $lt_shell_append in

22667

- yes)

22668

- cat << \_LT_EOF >> "$cfgfile"

22669

22670

-# func_append var value

22671

-# Append VALUE to the end of shell variable VAR.

22672

-func_append ()

22673

22674

- eval "$[1]+=\$[2]"

22675

22676

-_LT_EOF

22677

+# _LT_PATH_CONVERSION_FUNCTIONS

22678

+# -----------------------------

22679

+# Determine which file name conversion functions should be used by

22680

+# func_to_host_file (and, implicitly, by func_to_host_path). These are needed

22681

+# for certain cross-compile configurations and native mingw.

22682

+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],

22683

+[AC_REQUIRE([AC_CANONICAL_HOST])dnl

22684

+AC_REQUIRE([AC_CANONICAL_BUILD])dnl

22685

+AC_MSG_CHECKING([how to convert $build file names to $host format])

22686

+AC_CACHE_VAL(lt_cv_to_host_file_cmd,

22687

+[case $host in

22688

+ *-*-mingw* )

22689

+ case $build in

22690

+ *-*-mingw* ) # actually msys

22691

+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32

22692

+ ;;

22693

+ *-*-cygwin* )

22694

+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32

22695

+ ;;

22696

+ * ) # otherwise, assume *nix

22697

+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32

22698

+ ;;

22699

+ esac

22700

;;

22701

- *)

22702

- cat << \_LT_EOF >> "$cfgfile"

22703

22704

-# func_append var value

22705

-# Append VALUE to the end of shell variable VAR.

22706

-func_append ()

22707

22708

- eval "$[1]=\$$[1]\$[2]"

22709

22710

22711

-_LT_EOF

22712

+ *-*-cygwin* )

22713

+ case $build in

22714

+ *-*-mingw* ) # actually msys

22715

+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin

22716

+ ;;

22717

+ *-*-cygwin* )

22718

+ lt_cv_to_host_file_cmd=func_convert_file_noop

22719

+ ;;

22720

+ * ) # otherwise, assume *nix

22721

+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin

22722

+ ;;

22723

+ esac

22724

;;

22725

- esac

22726

+ * ) # unhandled hosts (and "normal" native builds)

22727

+ lt_cv_to_host_file_cmd=func_convert_file_noop

22728

+ ;;

22729

+esac

22730

+])

22731

+to_host_file_cmd=$lt_cv_to_host_file_cmd

22732

+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])

22733

+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],

22734

+ [0], [convert $build file names to $host format])dnl

22735

22736

+AC_MSG_CHECKING([how to convert $build file names to toolchain format])

22737

+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,

22738

+[#assume ordinary cross tools, or native build.

22739

+lt_cv_to_tool_file_cmd=func_convert_file_noop

22740

+case $host in

22741

+ *-*-mingw* )

22742

+ case $build in

22743

+ *-*-mingw* ) # actually msys

22744

+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32

22745

+ ;;

22746

+ esac

22747

+ ;;

22748

+esac

22749

])

22750

+to_tool_file_cmd=$lt_cv_to_tool_file_cmd

22751

+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])

22752

+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],

22753

+ [0], [convert $build files to toolchain format])dnl

22754

+])# _LT_PATH_CONVERSION_FUNCTIONS

22755

22756

# Helper functions for option handling. -*- Autoconf -*-

22757

22758

22759

22760

+# Inc.

22761

# Written by Gary V. Vaughan, 2004

22762

22763

# This file is free software; the Free Software Foundation gives

22764

# unlimited permission to copy and/or distribute it, with or without

22765

# modifications, as long as this notice is preserved.

22766

22767

-# serial 6 ltoptions.m4

22768

+# serial 7 ltoptions.m4

22769

22770

# This is to help aclocal find these macros, as it can't see m4_define.

22771

AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])

22772

@@ -7505,7 +7980,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],

23384

22773

[enable_win32_dll=yes

23385

22774

23386

22775

case $host in

23387

-*-*-cygwin* | *-*-mingw* | *-*-pw32*)

23388

+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)

22776

-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)

22777

+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)

23389

22778

AC_CHECK_TOOL(AS, as, false)

23390

22779

AC_CHECK_TOOL(DLLTOOL, dlltool, false)

23391

22780

AC_CHECK_TOOL(OBJDUMP, objdump, false)

23392

@@ -7678,14 +7746,14 @@ LT_OPTION_DEFINE([LTDL_INIT], [convenien

23393

23394

# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-

23395

23396

23397

-# Written by Gary V. Vaughan, 2004

23398

23399

+# Written by Gary V. Vaughan, 2004

23400

23401

# This file is free software; the Free Software Foundation gives

22781

@@ -7513,13 +7988,13 @@ case $host in

22782

esac

22783

22784

test -z "$AS" && AS=as

22785

-_LT_DECL([], [AS], [0], [Assembler program])dnl

22786

+_LT_DECL([], [AS], [1], [Assembler program])dnl

22787

22788

test -z "$DLLTOOL" && DLLTOOL=dlltool

22789

-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl

22790

+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl

22791

22792

test -z "$OBJDUMP" && OBJDUMP=objdump

22793

-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl

22794

+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl

22795

])# win32-dll

22796

22797

AU_DEFUN([AC_LIBTOOL_WIN32_DLL],

22798

@@ -7877,31 +8352,31 @@ m4_define([lt_dict_filter],

23402

22799

# unlimited permission to copy and/or distribute it, with or without

23403

22800

# modifications, as long as this notice is preserved.

23404

22801

23405

-# serial 5 ltsugar.m4

23406

+# serial 6 ltsugar.m4

23407

23408

# This is to help aclocal find these macros, as it can't see m4_define.

23409

AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])

23410

@@ -7741,14 +7809,14 @@ m4_define([lt_append],

23411

# Produce a SEP delimited list of all paired combinations of elements of

23412

# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list

23413

# has the form PREFIXmINFIXSUFFIXn.

23414

+# Needed until we can rely on m4_combine added in Autoconf 2.62.

23415

m4_define([lt_combine],

23416

-[m4_if([$2], [], [],

23417

- [m4_if([$4], [], [],

23418

- [lt_join(m4_quote(m4_default([$1], [[, ]])),

23419

- lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2],

23420

- [m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]),

23421

- [_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl

23422

-])

23423

+[m4_if(m4_eval([$# > 3]), [1],

23424

+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl

23425

+[[m4_foreach([_Lt_prefix], [$2],

23426

+ [m4_foreach([_Lt_suffix],

23427

+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,

23428

+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])

23429

23430

23431

# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])

23432

@@ -7811,15 +7879,15 @@ m4_define([lt_dict_filter],

23433

23434

# Generated from ltversion.in.

23435

23436

-# serial 2976 ltversion.m4

23437

+# serial 3017 ltversion.m4

22802

-# Generated from ltversion.in.

22803

+# @configure_input@

22804

22805

-# serial 3017 ltversion.m4

22806

+# serial 3293 ltversion.m4

23438

22807

# This file is part of GNU Libtool

23439

22808

23440

-m4_define([LT_PACKAGE_VERSION], [2.2.4])

23441

-m4_define([LT_PACKAGE_REVISION], [1.2976])

23442

+m4_define([LT_PACKAGE_VERSION], [2.2.6b])

23443

+m4_define([LT_PACKAGE_REVISION], [1.3017])

22809

-m4_define([LT_PACKAGE_VERSION], [2.2.6b])

22810

-m4_define([LT_PACKAGE_REVISION], [1.3017])

22811

+m4_define([LT_PACKAGE_VERSION], [2.4])

22812

+m4_define([LT_PACKAGE_REVISION], [1.3293])

23444

22813

23445

22814

AC_DEFUN([LTVERSION_VERSION],

23446

-[macro_version='2.2.4'

23447

-macro_revision='1.2976'

23448

+[macro_version='2.2.6b'

23449

+macro_revision='1.3017'

22815

-[macro_version='2.2.6b'

22816

-macro_revision='1.3017'

22817

+[macro_version='2.4'

22818

+macro_revision='1.3293'

23450

22819

_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])

23451

22820

_LT_DECL(, macro_revision, 0)

23452

22821

])

23453

@@ -7917,7 +7985,7 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_D

22822

22823

# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-

22824

22825

22826

22827

# Written by Scott James Remnant, 2004.

22828

22829

# This file is free software; the Free Software Foundation gives

22830

# unlimited permission to copy and/or distribute it, with or without

22831

# modifications, as long as this notice is preserved.

22832

22833

-# serial 4 lt~obsolete.m4

22834

+# serial 5 lt~obsolete.m4

22835

22836

# These exist entirely to fool aclocal when bootstrapping libtool.

22837

22838

@@ -7971,7 +8446,6 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC

22839

m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])

22840

m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])

22841

m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])

22842

-m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])

22843

m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])

22844

m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])

22845

m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])

22846

@@ -7984,6 +8458,13 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [

22847

m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])

23454

22848

m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])

23455

22849

m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])

23456

23457

23458

23459

23460

# This file is free software; the Free Software Foundation

23461

# gives unlimited permission to copy and/or distribute it,

23462

@@ -7929,10 +7997,10 @@ m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEF

23463

# generated from the m4 files accompanying Automake X.Y.

23464

# (This private macro should not be called outside this file.)

23465

AC_DEFUN([AM_AUTOMAKE_VERSION],

23466

-[am__api_version='1.10'

23467

+[am__api_version='1.11'

23468

dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

23469

dnl require some minimum version. Point them to the right macro.

23470

-m4_if([$1], [1.10.1], [],

23471

+m4_if([$1], [1.11.1], [],

23472

[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

23473

])

23474

23475

@@ -7946,12 +8014,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])

23476

# AM_SET_CURRENT_AUTOMAKE_VERSION

23477

# -------------------------------

23478

# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

23479

-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

23480

+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

23481

AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

23482

-[AM_AUTOMAKE_VERSION([1.10.1])dnl

23483

+[AM_AUTOMAKE_VERSION([1.11.1])dnl

23484

m4_ifndef([AC_AUTOCONF_VERSION],

23485

[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

23486

-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])

23487

+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

23488

23489

# AM_AUX_DIR_EXPAND -*- Autoconf -*-

23490

23491

@@ -8008,14 +8076,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`

23492

23493

# AM_CONDITIONAL -*- Autoconf -*-

23494

23495

23496

23497

# Free Software Foundation, Inc.

23498

23499

# This file is free software; the Free Software Foundation

23500

# gives unlimited permission to copy and/or distribute it,

23501

# with or without modifications, as long as this notice is preserved.

23502

23503

-# serial 8

23504

+# serial 9

23505

23506

# AM_CONDITIONAL(NAME, SHELL-CONDITION)

23507

# -------------------------------------

23508

@@ -8028,6 +8096,7 @@ AC_SUBST([$1_TRUE])dnl

23509

AC_SUBST([$1_FALSE])dnl

23510

_AM_SUBST_NOTMAKE([$1_TRUE])dnl

23511

_AM_SUBST_NOTMAKE([$1_FALSE])dnl

23512

+m4_define([_AM_COND_VALUE_$1], [$2])dnl

23513

if $2; then

23514

$1_TRUE=

23515

$1_FALSE='#'

23516

@@ -8041,14 +8110,14 @@ AC_CONFIG_COMMANDS_PRE(

23517

Usually this means the macro was only invoked conditionally.]])

23518

fi])])

23519

23520

23521

23522

# Free Software Foundation, Inc.

23523

23524

# This file is free software; the Free Software Foundation

23525

# gives unlimited permission to copy and/or distribute it,

23526

# with or without modifications, as long as this notice is preserved.

23527

23528

-# serial 9

23529

+# serial 10

23530

23531

# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be

23532

# written in clear, in which case automake, when reading aclocal.m4,

23533

@@ -8105,6 +8174,16 @@ AC_CACHE_CHECK([dependency style of $dep

23534

if test "$am_compiler_list" = ""; then

23535

am_compiler_list=`sed -n ['s/^#*$[a-zA-Z0-9]*$)$/\1/p'] < ./depcomp`

23536

23537

+ am__universal=false

23538

+ m4_case([$1], [CC],

23539

+ [case " $depcc " in #(

23540

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

23541

+ esac],

23542

+ [CXX],

23543

+ [case " $depcc " in #(

23544

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

23545

+ esac])

23546

23547

for depmode in $am_compiler_list; do

23548

# Setup a source with many dependencies, because some compilers

23549

# like to wrap large dependency lists on column 80 (with \), and

23550

@@ -8122,7 +8201,17 @@ AC_CACHE_CHECK([dependency style of $dep

23551

done

23552

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

23553

23554

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

23555

+ # mode. It turns out that the SunPro C++ compiler does not properly

23556

+ # handle `-M -o', and we need to detect this. Also, some Intel

23557

+ # versions had trouble with output in subdirs

23558

+ am__obj=sub/conftest.${OBJEXT-o}

23559

+ am__minus_obj="-o $am__obj"

23560

case $depmode in

23561

+ gcc)

23562

+ # This depmode causes a compiler race in universal mode.

23563

+ test "$am__universal" = false || continue

23564

+ ;;

23565

nosideeffect)

23566

# after this tag, mechanisms are not by side-effect, so they'll

23567

# only be used when explicitly requested

23568

@@ -8132,19 +8221,23 @@ AC_CACHE_CHECK([dependency style of $dep

23569

break

23570

23571

;;

23572

+ msvisualcpp | msvcmsys)

23573

+ # This compiler won't grok `-c -o', but also, the minuso test has

23574

+ # not run yet. These depmodes are late enough in the game, and

23575

+ # so weak that their functioning should not be impacted.

23576

+ am__obj=conftest.${OBJEXT-o}

23577

+ am__minus_obj=

23578

+ ;;

23579

none) break ;;

23580

esac

23581

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

23582

- # mode. It turns out that the SunPro C++ compiler does not properly

23583

- # handle `-M -o', and we need to detect this.

23584

if depmode=$depmode \

23585

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

23586

+ source=sub/conftest.c object=$am__obj \

23587

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

23588

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

23589

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

23590

>/dev/null 2>conftest.err &&

23591

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

23592

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

23593

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

23594

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

23595

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

23596

# icc doesn't choke on unknown options, it will just issue warnings

23597

# or remarks (even with -Werror). So we grep stderr for any message

23598

@@ -8201,57 +8294,68 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl

23599

23600

# Generate code to set up dependency tracking. -*- Autoconf -*-

23601

23602

23603

23604

# Free Software Foundation, Inc.

23605

23606

# This file is free software; the Free Software Foundation

23607

# gives unlimited permission to copy and/or distribute it,

23608

# with or without modifications, as long as this notice is preserved.

23609

23610

-#serial 3

23611

+#serial 5

23612

23613

# _AM_OUTPUT_DEPENDENCY_COMMANDS

23614

# ------------------------------

23615

AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

23616

-[for mf in $CONFIG_FILES; do

23617

- # Strip MF so we end up with the name of the file.

23618

- mf=`echo "$mf" | sed -e 's/:.*$//'`

23619

- # Check whether this is an Automake generated Makefile or not.

23620

- # We used to match only the files named `Makefile.in', but

23621

- # some people rename them; so instead we look at the file content.

23622

- # Grep'ing the first line is not enough: some people post-process

23623

- # each Makefile.in and add a new line on top of each file to say so.

23624

- # Grep'ing the whole file is not good either: AIX grep has a line

23625

- # limit of 2048, but all sed's we know have understand at least 4000.

23626

- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

23627

- dirpart=`AS_DIRNAME("$mf")`

23628

- else

23629

- continue

23630

- fi

23631

- # Extract the definition of DEPDIR, am__include, and am__quote

23632

- # from the Makefile without running `make'.

23633

- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

23634

- test -z "$DEPDIR" && continue

23635

- am__include=`sed -n 's/^am__include = //p' < "$mf"`

23636

- test -z "am__include" && continue

23637

- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

23638

- # When using ansi2knr, U may be empty or an underscore; expand it

23639

- U=`sed -n 's/^U = //p' < "$mf"`

23640

- # Find all dependency output files, they are included files with

23641

- # $(DEPDIR) in their names. We invoke sed twice because it is the

23642

- # simplest approach to changing $(DEPDIR) to its actual value in the

23643

- # expansion.

23644

- for file in `sed -n "

23645

- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

23646

- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

23647

- # Make sure the directory exists.

23648

- test -f "$dirpart/$file" && continue

23649

- fdir=`AS_DIRNAME(["$file"])`

23650

- AS_MKDIR_P([$dirpart/$fdir])

23651

- # echo "creating $dirpart/$file"

23652

- echo '# dummy' > "$dirpart/$file"

23653

+[{

23654

+ # Autoconf 2.62 quotes --file arguments for eval, but not when files

23655

+ # are listed without --file. Let's play safe and only enable the eval

23656

+ # if we detect the quoting.

23657

+ case $CONFIG_FILES in

23658

+ *\'*) eval set x "$CONFIG_FILES" ;;

23659

+ *) set x $CONFIG_FILES ;;

23660

+ esac

23661

+ shift

23662

+ for mf

23663

+ do

23664

+ # Strip MF so we end up with the name of the file.

23665

+ mf=`echo "$mf" | sed -e 's/:.*$//'`

23666

+ # Check whether this is an Automake generated Makefile or not.

23667

+ # We used to match only the files named `Makefile.in', but

23668

+ # some people rename them; so instead we look at the file content.

23669

+ # Grep'ing the first line is not enough: some people post-process

23670

+ # each Makefile.in and add a new line on top of each file to say so.

23671

+ # Grep'ing the whole file is not good either: AIX grep has a line

23672

+ # limit of 2048, but all sed's we know have understand at least 4000.

23673

+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

23674

+ dirpart=`AS_DIRNAME("$mf")`

23675

+ else

23676

+ continue

23677

+ fi

23678

+ # Extract the definition of DEPDIR, am__include, and am__quote

23679

+ # from the Makefile without running `make'.

23680

+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

23681

+ test -z "$DEPDIR" && continue

23682

+ am__include=`sed -n 's/^am__include = //p' < "$mf"`

23683

+ test -z "am__include" && continue

23684

+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

23685

+ # When using ansi2knr, U may be empty or an underscore; expand it

23686

+ U=`sed -n 's/^U = //p' < "$mf"`

23687

+ # Find all dependency output files, they are included files with

23688

+ # $(DEPDIR) in their names. We invoke sed twice because it is the

23689

+ # simplest approach to changing $(DEPDIR) to its actual value in the

23690

+ # expansion.

23691

+ for file in `sed -n "

23692

+ s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

23693

+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

23694

+ # Make sure the directory exists.

23695

+ test -f "$dirpart/$file" && continue

23696

+ fdir=`AS_DIRNAME(["$file"])`

23697

+ AS_MKDIR_P([$dirpart/$fdir])

23698

+ # echo "creating $dirpart/$file"

23699

+ echo '# dummy' > "$dirpart/$file"

23700

+ done

23701

done

23702

-done

23703

23704

])# _AM_OUTPUT_DEPENDENCY_COMMANDS

23705

23706

23707

@@ -8271,13 +8375,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]

23708

# Do all the work for Automake. -*- Autoconf -*-

23709

23710

23711

-# 2005, 2006, 2008 Free Software Foundation, Inc.

23712

+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.

23713

23714

# This file is free software; the Free Software Foundation

23715

# gives unlimited permission to copy and/or distribute it,

23716

# with or without modifications, as long as this notice is preserved.

23717

23718

-# serial 13

23719

+# serial 16

23720

23721

# This macro actually does too much. Some checks are only needed if

23722

# your package does certain things. But this isn't really a big deal.

23723

@@ -8294,7 +8398,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]

23724

# arguments mandatory, and then we can depend on a new Autoconf

23725

# release and drop the old call support.

23726

AC_DEFUN([AM_INIT_AUTOMAKE],

23727

-[AC_PREREQ([2.60])dnl

23728

+[AC_PREREQ([2.62])dnl

23729

dnl Autoconf wants to disallow AM_ names. We explicitly allow

23730

dnl the ones we care about.

23731

m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl

23732

@@ -8345,8 +8449,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)

23733

AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})

23734

AM_MISSING_PROG(AUTOHEADER, autoheader)

23735

AM_MISSING_PROG(MAKEINFO, makeinfo)

23736

-AM_PROG_INSTALL_SH

23737

-AM_PROG_INSTALL_STRIP

23738

+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl

23739

+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl

23740

AC_REQUIRE([AM_PROG_MKDIR_P])dnl

23741

# We need awk for the "check" target. The system "awk" is bad on

23742

# some platforms.

23743

@@ -8354,23 +8458,36 @@ AC_REQUIRE([AC_PROG_AWK])dnl

23744

AC_REQUIRE([AC_PROG_MAKE_SET])dnl

23745

AC_REQUIRE([AM_SET_LEADING_DOT])dnl

23746

_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],

23747

- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],

23748

- [_AM_PROG_TAR([v7])])])

23749

+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],

23750

+ [_AM_PROG_TAR([v7])])])

23751

_AM_IF_OPTION([no-dependencies],,

23752

[AC_PROVIDE_IFELSE([AC_PROG_CC],

23753

- [_AM_DEPENDENCIES(CC)],

23754

- [define([AC_PROG_CC],

23755

- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl

23756

+ [_AM_DEPENDENCIES(CC)],

23757

+ [define([AC_PROG_CC],

23758

+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl

23759

AC_PROVIDE_IFELSE([AC_PROG_CXX],

23760

- [_AM_DEPENDENCIES(CXX)],

23761

- [define([AC_PROG_CXX],

23762

- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

23763

+ [_AM_DEPENDENCIES(CXX)],

23764

+ [define([AC_PROG_CXX],

23765

+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

23766

AC_PROVIDE_IFELSE([AC_PROG_OBJC],

23767

- [_AM_DEPENDENCIES(OBJC)],

23768

- [define([AC_PROG_OBJC],

23769

- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

23770

-])

23771

-])

23772

+ [_AM_DEPENDENCIES(OBJC)],

23773

+ [define([AC_PROG_OBJC],

23774

+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

23775

+])

23776

+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl

23777

+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the

23778

+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro

23779

+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.

23780

+AC_CONFIG_COMMANDS_PRE(dnl

23781

+[m4_provide_if([_AM_COMPILER_EXEEXT],

23782

+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl

23783

+])

23784

23785

+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not

23786

+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further

23787

+dnl mangled by Autoconf and run in a shell conditional statement.

23788

+m4_define([_AC_COMPILER_EXEEXT],

23789

+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])

23790

23791

23792

# When config.status generates a header, we must update the stamp-h file.

23793

@@ -8394,7 +8511,7 @@ for _am_header in $config_headers :; do

23794

done

23795

echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

23796

23797

23798

23799

23800

# This file is free software; the Free Software Foundation

23801

# gives unlimited permission to copy and/or distribute it,

23802

@@ -8405,7 +8522,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNA

23803

# Define $install_sh.

23804

AC_DEFUN([AM_PROG_INSTALL_SH],

23805

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

23806

-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}

23807

+if test x"${install_sh}" != xset; then

23808

+ case $am_aux_dir in

23809

+ *\ * | *\ *)

23810

+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

23811

+ *)

23812

+ install_sh="\${SHELL} $am_aux_dir/install-sh"

23813

+ esac

23814

+fi

23815

AC_SUBST(install_sh)])

23816

23817

23818

@@ -8431,13 +8555,13 @@ AC_SUBST([am__leading_dot])])

23819

23820

# Check to see how 'make' treats includes. -*- Autoconf -*-

23821

23822

23823

23824

23825

# This file is free software; the Free Software Foundation

23826

# gives unlimited permission to copy and/or distribute it,

23827

# with or without modifications, as long as this notice is preserved.

23828

23829

-# serial 3

23830

+# serial 4

23831

23832

# AM_MAKE_INCLUDE()

23833

# -----------------

23834

@@ -8446,7 +8570,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],

23835

[am_make=${MAKE-make}

23836

cat > confinc << 'END'

23837

am__doit:

23838

- @echo done

23839

+ @echo this is the am__doit target

23840

.PHONY: am__doit

23841

END

23842

# If we don't find an include directive, just comment out the code.

23843

@@ -8456,24 +8580,24 @@ am__quote=

23844

_am_result=none

23845

# First try GNU make style include.

23846

echo "include confinc" > confmf

23847

-# We grep out `Entering directory' and `Leaving directory'

23848

-# messages which can occur if `w' ends up in MAKEFLAGS.

23849

-# In particular we don't look at `^make:' because GNU make might

23850

-# be invoked under some other name (usually "gmake"), in which

23851

-# case it prints its new name instead of `make'.

23852

-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then

23853

- am__include=include

23854

- am__quote=

23855

- _am_result=GNU

23856

-fi

23857

+# Ignore all kinds of additional output from `make'.

23858

+case `$am_make -s -f confmf 2> /dev/null` in #(

23859

+*the\ am__doit\ target*)

23860

+ am__include=include

23861

+ am__quote=

23862

+ _am_result=GNU

23863

+ ;;

23864

+esac

23865

# Now try BSD make style include.

23866

if test "$am__include" = "#"; then

23867

echo '.include "confinc"' > confmf

23868

- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then

23869

- am__include=.include

23870

- am__quote="\""

23871

- _am_result=BSD

23872

- fi

23873

+ case `$am_make -s -f confmf 2> /dev/null` in #(

23874

+ *the\ am__doit\ target*)

23875

+ am__include=.include

23876

+ am__quote="\""

23877

+ _am_result=BSD

23878

+ ;;

23879

+ esac

23880

23881

AC_SUBST([am__include])

23882

AC_SUBST([am__quote])

23883

@@ -8483,14 +8607,14 @@ rm -f confinc confmf

23884

23885

# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-

23886

23887

23888

23889

# Free Software Foundation, Inc.

23890

23891

# This file is free software; the Free Software Foundation

23892

# gives unlimited permission to copy and/or distribute it,

23893

# with or without modifications, as long as this notice is preserved.

23894

23895

-# serial 5

23896

+# serial 6

23897

23898

# AM_MISSING_PROG(NAME, PROGRAM)

23899

# ------------------------------

23900

@@ -8507,7 +8631,14 @@ AC_SUBST($1)])

23901

AC_DEFUN([AM_MISSING_HAS_RUN],

23902

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

23903

AC_REQUIRE_AUX_FILE([missing])dnl

23904

-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"

23905

+if test x"${MISSING+set}" != xset; then

23906

+ case $am_aux_dir in

23907

+ *\ * | *\ *)

23908

+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;

23909

+ *)

23910

+ MISSING="\${SHELL} $am_aux_dir/missing" ;;

23911

+ esac

23912

+fi

23913

# Use eval to expand $SHELL

23914

if eval "$MISSING --run true"; then

23915

am_missing_run="$MISSING --run "

23916

@@ -8545,13 +8676,13 @@ esac

23917

23918

# Helper functions for option handling. -*- Autoconf -*-

23919

23920

23921

23922

23923

# This file is free software; the Free Software Foundation

23924

# gives unlimited permission to copy and/or distribute it,

23925

# with or without modifications, as long as this notice is preserved.

23926

23927

-# serial 3

23928

+# serial 4

23929

23930

# _AM_MANGLE_OPTION(NAME)

23931

# -----------------------

23932

@@ -8568,7 +8699,7 @@ AC_DEFUN([_AM_SET_OPTION],

23933

# ----------------------------------

23934

# OPTIONS is a space-separated list of Automake options.

23935

AC_DEFUN([_AM_SET_OPTIONS],

23936

-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

23937

+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

23938

23939

# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])

23940

# -------------------------------------------

23941

@@ -8576,7 +8707,7 @@ AC_DEFUN([_AM_SET_OPTIONS],

23942

AC_DEFUN([_AM_IF_OPTION],

23943

[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

23944

23945

23946

23947

# Free Software Foundation, Inc.

23948

23949

# This file is free software; the Free Software Foundation

23950

@@ -8607,13 +8738,11 @@ AC_DEFUN([_AM_IF_OPTION],

23951

# numbers and dots only.

23952

AC_DEFUN([AM_PATH_PYTHON],

23953

[

23954

- dnl Find a Python interpreter. Python versions prior to 1.5 are not

23955

- dnl supported because the default installation locations changed from

23956

- dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages

23957

- dnl in 1.5.

23958

+ dnl Find a Python interpreter. Python versions prior to 2.0 are not

23959

+ dnl supported. (2.0 was released on October 16, 2000).

22850

+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])

22851

+m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])

22852

+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])

22853

+m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])

22854

+m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])

22855

+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])

22856

+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])

22857

22858

22859

22860

@@ -8741,7 +9222,7 @@ AC_DEFUN([AM_PATH_PYTHON],

22861

dnl Find a Python interpreter. Python versions prior to 2.0 are not

22862

dnl supported. (2.0 was released on October 16, 2000).

23960

22863

m4_define_default([_AM_PYTHON_INTERPRETER_LIST],

23961

- [python python2 python2.5 python2.4 python2.3 python2.2 dnl

23962

-python2.1 python2.0 python1.6 python1.5])

22864

- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl

23963

22865

+ [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl

23964

+python2.1 python2.0])

22866

python2.1 python2.0])

23965

22867

23966

22868

m4_if([$1],[],[

23967

dnl No version check is needed.

23968

@@ -8660,7 +8789,7 @@ python2.1 python2.0 python1.6 python1.5]

23969

dnl library.

23970

23971

AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],

23972

- [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])

23973

+ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])

23974

AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])

23975

23976

dnl Use the values of $prefix and $exec_prefix for the corresponding

23977

@@ -8675,7 +8804,7 @@ python2.1 python2.0 python1.6 python1.5]

23978

dnl to know which OS platform Python thinks this is.

23979

23980

AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],

23981

- [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])

23982

+ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])

23983

AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])

23984

23985

23986

@@ -8690,8 +8819,29 @@ python2.1 python2.0 python1.6 python1.5]

23987

dnl doesn't work.

23988

AC_CACHE_CHECK([for $am_display_PYTHON script directory],

23989

[am_cv_python_pythondir],

23990

- [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||

23991

- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])

23992

+ [if test "x$prefix" = xNONE

23993

+ then

23994

+ am_py_prefix=$ac_default_prefix

23995

+ else

23996

+ am_py_prefix=$prefix

23997

+ fi

23998

+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||

23999

+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`

24000

+ case $am_cv_python_pythondir in

24001

+ $am_py_prefix*)

24002

+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`

24003

+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`

24004

+ ;;

24005

+ *)

24006

+ case $am_py_prefix in

24007

+ /usr|/System*) ;;

24008

+ *)

24009

+ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages

24010

+ ;;

24011

+ esac

24012

+ ;;

24013

+ esac

24014

+ ])

24015

AC_SUBST([pythondir], [$am_cv_python_pythondir])

24016

24017

dnl pkgpythondir -- $PACKAGE directory under pythondir. Was

24018

@@ -8707,8 +8857,29 @@ python2.1 python2.0 python1.6 python1.5]

24019

dnl doesn't work.

24020

AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],

24021

[am_cv_python_pyexecdir],

24022

- [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||

24023

- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])

24024

+ [if test "x$exec_prefix" = xNONE

24025

+ then

24026

+ am_py_exec_prefix=$am_py_prefix

24027

+ else

24028

+ am_py_exec_prefix=$exec_prefix

24029

+ fi

24030

+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||

24031

+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`

24032

+ case $am_cv_python_pyexecdir in

24033

+ $am_py_exec_prefix*)

24034

+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`

24035

+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`

24036

+ ;;

24037

+ *)

24038

+ case $am_py_exec_prefix in

24039

+ /usr|/System*) ;;

24040

+ *)

24041

+ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages

24042

+ ;;

24043

+ esac

24044

+ ;;

24045

+ esac

24046

+ ])

24047

AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])

24048

24049

dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)

24050

@@ -8728,15 +8899,16 @@ python2.1 python2.0 python1.6 python1.5]

24051

# Run ACTION-IF-FALSE otherwise.

24052

# This test uses sys.hexversion instead of the string equivalent (first

24053

# word of sys.version), in order to cope with versions such as 2.2c1.

24054

-# hexversion has been introduced in Python 1.5.2; it's probably not

24055

-# worth to support older versions (1.5.1 was released on October 31, 1998).

24056

+# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).

24057

AC_DEFUN([AM_PYTHON_CHECK_VERSION],

24058

- [prog="import sys, string

24059

+ [prog="import sys

24060

# split strings by '.' and convert to numeric. Append some zeros

24061

# because we need at least 4 digits for the hex conversion.

24062

-minver = map(int, string.split('$2', '.')) + [[0, 0, 0]]

24063

+# map returns an iterator in Python 3.0 and a list in 2.x

24064

+minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]

24065

minverhex = 0

24066

-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]

24067

+# xrange is not present in Python 3.0 and range returns an iterator

24068

+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]

24069

sys.exit(sys.hexversion < minverhex)"

24070

AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])

24071

24072

@@ -8759,14 +8931,14 @@ AC_DEFUN([AM_RUN_LOG],

24073

24074

# Check to make sure that the build environment is sane. -*- Autoconf -*-

24075

24076

24077

24078

# Free Software Foundation, Inc.

24079

24080

# This file is free software; the Free Software Foundation

24081

# gives unlimited permission to copy and/or distribute it,

24082

# with or without modifications, as long as this notice is preserved.

24083

24084

-# serial 4

24085

+# serial 5

24086

24087

# AM_SANITY_CHECK

24088

# ---------------

24089

@@ -8775,16 +8947,29 @@ AC_DEFUN([AM_SANITY_CHECK],

24090

# Just in case

24091

sleep 1

24092

echo timestamp > conftest.file

24093

+# Reject unsafe characters in $srcdir or the absolute working directory

24094

+# name. Accept space and tab only in the latter.

24095

+am_lf='

24096

24097

+case `pwd` in

24098

+ *[[\\\"\#\$\&\'\`$am_lf]]*)

24099

+ AC_MSG_ERROR([unsafe absolute working directory name]);;

24100

+esac

24101

+case $srcdir in

24102

+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)

24103

+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;

24104

+esac

24105

24106

# Do `set' in a subshell so we don't clobber the current shell's

24107

# arguments. Must try -L first in case configure is actually a

24108

# symlink; some systems play weird games with the mod time of symlinks

24109

# (eg FreeBSD returns the mod time of the symlink's containing

24110

# directory).

24111

if (

24112

- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`

24113

+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

24114

if test "$[*]" = "X"; then

24115

# -L didn't work.

24116

- set X `ls -t $srcdir/configure conftest.file`

24117

+ set X `ls -t "$srcdir/configure" conftest.file`

24118

24119

rm -f conftest.file

24120

if test "$[*]" != "X $srcdir/configure conftest.file" \

24121

@@ -8837,18 +9022,25 @@ fi

24122

INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

24123

AC_SUBST([INSTALL_STRIP_PROGRAM])])

24124

24125

24126

24127

24128

# This file is free software; the Free Software Foundation

24129

# gives unlimited permission to copy and/or distribute it,

24130

# with or without modifications, as long as this notice is preserved.

24131

24132

+# serial 2

24133

24134

# _AM_SUBST_NOTMAKE(VARIABLE)

24135

# ---------------------------

24136

# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.

24137

# This macro is traced by Automake.

24138

AC_DEFUN([_AM_SUBST_NOTMAKE])

24139

24140

+# AM_SUBST_NOTMAKE(VARIABLE)

24141

+# ---------------------------

24142

+# Public sister of _AM_SUBST_NOTMAKE.

24143

+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

24144

24145

# Check how to create a tarball. -*- Autoconf -*-

24146

24147

24148

--- protobuf-2.3.0.orig/gtest/configure

24149

+++ protobuf-2.3.0/gtest/configure

24150

@@ -1,62 +1,85 @@

22869

--- protobuf-2.4.0a.orig/gtest/configure

22870

+++ protobuf-2.4.0a/gtest/configure

22871

@@ -1,13 +1,13 @@

24151

22872

#! /bin/sh

24152

22873

# Guess values for system-dependent variables and create Makefiles.

24153

-# Generated by GNU Autoconf 2.61 for Google C++ Testing Framework 1.4.0.

24154

+# Generated by GNU Autoconf 2.67 for Google C++ Testing Framework 1.4.0.

22874

-# Generated by GNU Autoconf 2.65 for Google C++ Testing Framework 1.4.0.

22875

+# Generated by GNU Autoconf 2.68 for Google C++ Testing Framework 1.4.0.

24155

22876

24156

22877

# Report bugs to <googletestframework@googlegroups.com>.

24157

22878

24158

22879

24159

22880

24160

-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

22881

-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

22882

-# Inc.

24161

22883

+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software

24162

22884

+# Foundation, Inc.

24163

24164

22885

22886

24165

22887

# This configure script is free software; the Free Software Foundation

24166

# gives unlimited permission to copy, distribute and modify it.

24167

-## --------------------- ##

24168

-## M4sh Initialization. ##

24169

-## --------------------- ##

24170

+## -------------------- ##

24171

+## M4sh Initialization. ##

24172

+## -------------------- ##

24173

24174

# Be more Bourne compatible

24175

DUALCASE=1; export DUALCASE # for MKS sh

24176

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

24177

+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :

24178

emulate sh

24179

NULLCMD=:

24180

- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

24181

+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

24182

# is contrary to our usage. Disable this feature.

24183

alias -g '${1+"$@"}'='"$@"'

24184

setopt NO_GLOB_SUBST

24185

else

24186

- case `(set -o) 2>/dev/null` in

24187

- *posix*) set -o posix ;;

24188

+ case `(set -o) 2>/dev/null` in #(

24189

+ *posix*) :

24190

+ set -o posix ;; #(

24191

+ *) :

24192

+ ;;

24193

esac

24194

24195

24196

24197

24198

24199

24200

-# PATH needs CR

24201

-# Avoid depending upon Character Ranges.

24202

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

24203

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

24204

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

24205

-as_cr_digits='0123456789'

24206

-as_cr_alnum=$as_cr_Letters$as_cr_digits

24207

24208

-# The user is always right.

24209

-if test "${PATH_SEPARATOR+set}" != set; then

24210

- echo "#! /bin/sh" >conf$$.sh

24211

- echo "exit 0" >>conf$$.sh

24212

- chmod +x conf$$.sh

24213

- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

24214

- PATH_SEPARATOR=';'

24215

+as_nl='

24216

24217

+export as_nl

24218

+# Printing a long string crashes Solaris 7 /usr/bin/printf.

24219

+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

24220

+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

24221

+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

24222

+# Prefer a ksh shell builtin over an external printf program on Solaris,

24223

+# but without wasting forks for bash or zsh.

24224

+if test -z "$BASH_VERSION$ZSH_VERSION" \

24225

+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then

24226

+ as_echo='print -r --'

24227

+ as_echo_n='print -rn --'

24228

+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

24229

+ as_echo='printf %s\n'

24230

+ as_echo_n='printf %s'

24231

+else

24232

+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then

24233

+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'

24234

+ as_echo_n='/usr/ucb/echo -n'

24235

else

24236

- PATH_SEPARATOR=:

24237

+ as_echo_body='eval expr "X$1" : "X\$.*\$"'

24238

+ as_echo_n_body='eval

24239

+ arg=$1;

24240

+ case $arg in #(

24241

+ *"$as_nl"*)

24242

+ expr "X$arg" : "X\$.*\$$as_nl";

24243

+ arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;

24244

+ esac;

24245

+ expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"

24246

+ '

24247

+ export as_echo_n_body

24248

+ as_echo_n='sh -c $as_echo_n_body as_echo'

24249

24250

- rm -f conf$$.sh

24251

+ export as_echo_body

24252

+ as_echo='sh -c $as_echo_body as_echo'

24253

24254

24255

-# Support unset when possible.

24256

-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

24257

- as_unset=unset

24258

-else

24259

- as_unset=false

24260

+# The user is always right.

24261

+if test "${PATH_SEPARATOR+set}" != set; then

24262

+ PATH_SEPARATOR=:

24263

+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {

24264

+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||

24265

+ PATH_SEPARATOR=';'

24266

+ }

24267

24268

24269

24270

@@ -65,20 +88,18 @@ fi

24271

# there to prevent editors from complaining about space-tab.

24272

# (If _AS_PATH_WALK were called with IFS unset, it would disable word

24273

# splitting by setting IFS to empty value.)

24274

-as_nl='

24275

22888

@@ -91,6 +91,7 @@ fi

24276

22889

IFS=" "" $as_nl"

24277

22890

24278

22891

# Find who we are. Look in the path if we contain no directory separator.

24279

-case $0 in

24280

+case $0 in #((

22892

+as_myself=

22893

case $0 in #((

24281

22894

*[\\/]* ) as_myself=$0 ;;

24282

22895

*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

24283

for as_dir in $PATH

24284

24285

IFS=$as_save_IFS

24286

test -z "$as_dir" && as_dir=.

24287

- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

24288

-done

24289

+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

24290

+ done

24291

IFS=$as_save_IFS

24292

24293

;;

24294

@@ -89,354 +110,322 @@ if test "x$as_myself" = x; then

24295

as_myself=$0

24296

24297

if test ! -f "$as_myself"; then

24298

- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

24299

- { (exit 1); exit 1; }

24300

+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

24301

+ exit 1

24302

24303

24304

-# Work around bugs in pre-3.0 UWIN ksh.

24305

-for as_var in ENV MAIL MAILPATH

24306

-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

24307

+# Unset variables that we do not need and which cause bugs (e.g. in

24308

+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"

24309

+# suppresses any "Segmentation fault" message there. '((' could

24310

+# trigger a bug in pdksh 5.2.14.

24311

+for as_var in BASH_ENV ENV MAIL MAILPATH

24312

+do eval test x\${$as_var+set} = xset \

24313

+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :

24314

done

24315

PS1='$ '

24316

PS2='> '

24317

PS4='+ '

24318

24319

# NLS nuisances.

24320

-for as_var in \

24321

- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \

24322

- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \

24323

- LC_TELEPHONE LC_TIME

24324

-do

24325

- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

24326

- eval $as_var=C; export $as_var

24327

- else

24328

- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

24329

- fi

24330

-done

24331

24332

-# Required to use basename.

24333

-if expr a : '$a$' >/dev/null 2>&1 &&

24334

- test "X`expr 00001 : '.*$...$'`" = X001; then

24335

- as_expr=expr

24336

-else

24337

- as_expr=false

24338

-fi

24339

24340

-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then

24341

- as_basename=basename

24342

-else

24343

- as_basename=false

24344

-fi

24345

24346

24347

-# Name of the executable.

24348

-as_me=`$as_basename -- "$0" ||

24349

-$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

24350

- X"$0" : 'X$//$$' \| \

24351

- X"$0" : 'X$/$' \| . 2>/dev/null ||

24352

-echo X/"$0" |

24353

- sed '/^.*\/$[^/][^/]*$\/*$/{

24354

- s//\1/

24355

- q

24356

- }

24357

- /^X\/$\/\/$$/{

24358

- s//\1/

24359

- q

24360

- }

24361

- /^X\/$\/$.*/{

24362

- s//\1/

24363

- q

24364

- }

24365

- s/.*/./; q'`

24366

+LC_ALL=C

24367

+export LC_ALL

24368

+LANGUAGE=C

24369

+export LANGUAGE

24370

24371

# CDPATH.

24372

-$as_unset CDPATH

24373

24374

+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

24375

24376

if test "x$CONFIG_SHELL" = x; then

24377

- if (eval ":") 2>/dev/null; then

24378

- as_have_required=yes

24379

+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :

24380

+ emulate sh

24381

+ NULLCMD=:

24382

+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which

24383

+ # is contrary to our usage. Disable this feature.

24384

+ alias -g '\${1+\"\$@\"}'='\"\$@\"'

24385

+ setopt NO_GLOB_SUBST

24386

else

24387

- as_have_required=no

24388

+ case \`(set -o) 2>/dev/null\` in #(

24389

+ *posix*) :

24390

+ set -o posix ;; #(

24391

+ *) :

24392

+ ;;

24393

+esac

24394

24395

24396

- if test $as_have_required = yes && (eval ":

24397

-(as_func_return () {

24398

- (exit \$1)

24399

24400

-as_func_success () {

24401

- as_func_return 0

24402

24403

-as_func_failure () {

24404

- as_func_return 1

24405

24406

-as_func_ret_success () {

24407

- return 0

24408

24409

-as_func_ret_failure () {

24410

- return 1

24411

24412

24413

+ as_required="as_fn_return () { (exit \$1); }

24414

+as_fn_success () { as_fn_return 0; }

24415

+as_fn_failure () { as_fn_return 1; }

24416

+as_fn_ret_success () { return 0; }

24417

+as_fn_ret_failure () { return 1; }

24418

24419

exitcode=0

24420

-if as_func_success; then

24421

- :

24422

-else

24423

- exitcode=1

24424

- echo as_func_success failed.

24425

-fi

24426

24427

-if as_func_failure; then

24428

- exitcode=1

24429

- echo as_func_failure succeeded.

24430

-fi

24431

24432

-if as_func_ret_success; then

24433

- :

24434

-else

24435

- exitcode=1

24436

- echo as_func_ret_success failed.

24437

-fi

24438

24439

-if as_func_ret_failure; then

24440

- exitcode=1

24441

- echo as_func_ret_failure succeeded.

24442

-fi

24443

24444

-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then

24445

- :

24446

+as_fn_success || { exitcode=1; echo as_fn_success failed.; }

24447

+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }

24448

+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }

24449

+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }

24450

+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :

24451

24452

+else

24453

+ exitcode=1; echo positional parameters were not saved.

24454

+fi

24455

+test x\$exitcode = x0 || exit 1"

24456

+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO

24457

+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO

24458

+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&

24459

+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1

24460

+test \$(( 1 + 1 )) = 2 || exit 1"

24461

+ if (eval "$as_required") 2>/dev/null; then :

24462

+ as_have_required=yes

24463

else

24464

- exitcode=1

24465

- echo positional parameters were not saved.

24466

+ as_have_required=no

24467

24468

+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :

24469

24470

-test \$exitcode = 0) || { (exit 1); exit 1; }

24471

24472

24473

- as_lineno_1=\$LINENO

24474

- as_lineno_2=\$LINENO

24475

- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&

24476

- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }

24477

-") 2> /dev/null; then

24478

- :

24479

else

24480

- as_candidate_shells=

24481

- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

24482

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

24483

+as_found=false

24484

for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH

24485

24486

IFS=$as_save_IFS

24487

test -z "$as_dir" && as_dir=.

24488

- case $as_dir in

24489

+ as_found=:

24490

+ case $as_dir in #(

24491

/*)

24492

for as_base in sh bash ksh sh5; do

24493

- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"

24494

+ # Try only shells that exist, to save several forks.

24495

+ as_shell=$as_dir/$as_base

24496

+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&

24497

+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :

24498

+ CONFIG_SHELL=$as_shell as_have_required=yes

24499

+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :

24500

+ break 2

24501

+fi

24502

+fi

24503

done;;

24504

esac

24505

+ as_found=false

24506

done

24507

+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&

24508

+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :

24509

+ CONFIG_SHELL=$SHELL as_have_required=yes

24510

+fi; }

24511

IFS=$as_save_IFS

24512

24513

24514

- for as_shell in $as_candidate_shells $SHELL; do

24515

- # Try only shells that exist, to save several forks.

24516

- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&

24517

- { ("$as_shell") 2> /dev/null <<\_ASEOF

24518

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

24519

- emulate sh

24520

- NULLCMD=:

24521

- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

24522

- # is contrary to our usage. Disable this feature.

24523

- alias -g '${1+"$@"}'='"$@"'

24524

- setopt NO_GLOB_SUBST

24525

-else

24526

- case `(set -o) 2>/dev/null` in

24527

- *posix*) set -o posix ;;

24528

-esac

24529

24530

+ if test "x$CONFIG_SHELL" != x; then :

24531

+ # We cannot yet assume a decent shell, so we have to provide a

24532

+ # neutralization value for shells without unset; and this also

24533

+ # works around shells that cannot unset nonexistent variables.

24534

+ BASH_ENV=/dev/null

24535

+ ENV=/dev/null

24536

+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

24537

+ export CONFIG_SHELL

24538

+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}

24539

+fi

24540

24541

+ if test x$as_have_required = xno; then :

24542

+ $as_echo "$0: This script requires a shell more modern than all"

24543

+ $as_echo "$0: the shells that I found on your system."

24544

+ if test x${ZSH_VERSION+set} = xset ; then

24545

+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"

24546

+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."

24547

+ else

24548

+ $as_echo "$0: Please tell bug-autoconf@gnu.org and

24549

+$0: googletestframework@googlegroups.com about your system,

24550

+$0: including any error possibly output before this

24551

+$0: message. Then install a modern shell, or manually run

24552

+$0: the script under such a shell if you do have one."

24553

+ fi

24554

+ exit 1

24555

24556

24557

24558

24559

-_ASEOF

24560

-}; then

24561

- CONFIG_SHELL=$as_shell

24562

- as_have_required=yes

24563

- if { "$as_shell" 2> /dev/null <<\_ASEOF

24564

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

24565

- emulate sh

24566

- NULLCMD=:

24567

- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

24568

- # is contrary to our usage. Disable this feature.

24569

- alias -g '${1+"$@"}'='"$@"'

24570

- setopt NO_GLOB_SUBST

24571

-else

24572

- case `(set -o) 2>/dev/null` in

24573

- *posix*) set -o posix ;;

24574

-esac

24575

24576

24577

+fi

24578

+SHELL=${CONFIG_SHELL-/bin/sh}

24579

+export SHELL

24580

+# Unset more variables known to interfere with behavior of common tools.

24581

+CLICOLOR_FORCE= GREP_OPTIONS=

24582

+unset CLICOLOR_FORCE GREP_OPTIONS

24583

24584

24585

24586

-(as_func_return () {

24587

- (exit $1)

24588

24589

-as_func_success () {

24590

- as_func_return 0

24591

24592

-as_func_failure () {

24593

- as_func_return 1

24594

24595

-as_func_ret_success () {

24596

- return 0

24597

24598

-as_func_ret_failure () {

24599

- return 1

24600

+## --------------------- ##

24601

+## M4sh Shell Functions. ##

24602

+## --------------------- ##

24603

+# as_fn_unset VAR

24604

+# ---------------

24605

+# Portably unset VAR.

24606

+as_fn_unset ()

24607

24608

+ { eval $1=; unset $1;}

24609

}

24610

+as_unset=as_fn_unset

24611

24612

-exitcode=0

24613

-if as_func_success; then

24614

- :

24615

-else

24616

- exitcode=1

24617

- echo as_func_success failed.

24618

-fi

24619

+# as_fn_set_status STATUS

24620

+# -----------------------

24621

+# Set $? to STATUS, without forking.

24622

+as_fn_set_status ()

24623

24624

+ return $1

24625

+} # as_fn_set_status

24626

24627

-if as_func_failure; then

24628

- exitcode=1

24629

- echo as_func_failure succeeded.

24630

-fi

24631

+# as_fn_exit STATUS

24632

+# -----------------

24633

+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.

24634

+as_fn_exit ()

24635

24636

+ set +e

24637

+ as_fn_set_status $1

24638

+ exit $1

24639

+} # as_fn_exit

24640

24641

+# as_fn_mkdir_p

24642

+# -------------

24643

+# Create "$as_dir" as a directory, including parents if necessary.

24644

+as_fn_mkdir_p ()

24645

24646

24647

-if as_func_ret_success; then

24648

- :

24649

-else

24650

- exitcode=1

24651

- echo as_func_ret_success failed.

24652

-fi

24653

+ case $as_dir in #(

24654

+ -*) as_dir=./$as_dir;;

24655

+ esac

24656

+ test -d "$as_dir" || eval $as_mkdir_p || {

24657

+ as_dirs=

24658

+ while :; do

24659

+ case $as_dir in #(

24660

+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

24661

+ *) as_qdir=$as_dir;;

24662

+ esac

24663

+ as_dirs="'$as_qdir' $as_dirs"

24664

+ as_dir=`$as_dirname -- "$as_dir" ||

24665

+$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

24666

+ X"$as_dir" : 'X$//$[^/]' \| \

24667

+ X"$as_dir" : 'X$//$$' \| \

24668

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

24669

+$as_echo X"$as_dir" |

24670

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

24671

+ s//\1/

24672

+ q

24673

+ }

24674

+ /^X$\/\/$[^/].*/{

24675

+ s//\1/

24676

+ q

24677

+ }

24678

+ /^X$\/\/$$/{

24679

+ s//\1/

24680

+ q

24681

+ }

24682

+ /^X$\/$.*/{

24683

+ s//\1/

24684

+ q

24685

+ }

24686

+ s/.*/./; q'`

24687

+ test -d "$as_dir" && break

24688

+ done

24689

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

22896

@@ -173,6 +174,14 @@ test x\$exitcode = x0 || exit 1"

22897

as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO

22898

eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&

22899

test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1

22900

22901

+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (

22902

22903

+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO

22904

+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO

22905

+ PATH=/empty FPATH=/empty; export PATH FPATH

22906

+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\

22907

+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1

22908

test \$(( 1 + 1 )) = 2 || exit 1"

22909

if (eval "$as_required") 2>/dev/null; then :

22910

as_have_required=yes

22911

@@ -216,11 +225,18 @@ IFS=$as_save_IFS

22912

# We cannot yet assume a decent shell, so we have to provide a

22913

# neutralization value for shells without unset; and this also

22914

# works around shells that cannot unset nonexistent variables.

22915

+ # Preserve -v and -x to the replacement shell.

22916

BASH_ENV=/dev/null

22917

ENV=/dev/null

22918

(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

22919

export CONFIG_SHELL

22920

- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}

22921

+ case $- in # ((((

22922

+ *v*x* | *x*v* ) as_opts=-vx ;;

22923

+ *v* ) as_opts=-v ;;

22924

+ *x* ) as_opts=-x ;;

22925

+ * ) as_opts= ;;

22926

+ esac

22927

+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}

22928

22929

22930

if test x$as_have_required = xno; then :

22931

@@ -319,7 +335,7 @@ $as_echo X"$as_dir" |

22932

test -d "$as_dir" && break

22933

done

22934

test -z "$as_dirs" || eval "mkdir $as_dirs"

22935

- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"

24690

22936

+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"

24691

22937

24692

-if as_func_ret_failure; then

24693

- exitcode=1

24694

- echo as_func_ret_failure succeeded.

24695

-fi

24696

24697

-if ( set x; as_func_ret_success y && test x = "$1" ); then

24698

- :

24699

+} # as_fn_mkdir_p

24700

+# as_fn_append VAR VALUE

24701

+# ----------------------

24702

+# Append the text in VALUE to the end of the definition contained in VAR. Take

24703

+# advantage of any shell optimizations that allow amortized linear growth over

24704

+# repeated appends, instead of the typical quadratic growth present in naive

24705

+# implementations.

24706

+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :

24707

+ eval 'as_fn_append ()

24708

+ {

24709

+ eval $1+=\$2

24710

+ }'

24711

else

24712

- exitcode=1

24713

- echo positional parameters were not saved.

24714

-fi

24715

24716

-test $exitcode = 0) || { (exit 1); exit 1; }

24717

24718

24719

- as_lineno_1=$LINENO

24720

- as_lineno_2=$LINENO

24721

- test "x$as_lineno_1" != "x$as_lineno_2" &&

24722

- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }

24723

24724

-_ASEOF

24725

-}; then

24726

- break

24727

-fi

24728

24729

-fi

24730

24731

- done

24732

24733

- if test "x$CONFIG_SHELL" != x; then

24734

- for as_var in BASH_ENV ENV

24735

- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

24736

- done

24737

- export CONFIG_SHELL

24738

- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}

24739

-fi

24740

24741

24742

- if test $as_have_required = no; then

24743

- echo This script requires a shell more modern than all the

24744

- echo shells that I found on your system. Please install a

24745

- echo modern shell, or manually run the script under such a

24746

- echo shell if you do have one.

24747

- { (exit 1); exit 1; }

24748

-fi

24749

24750

24751

-fi

24752

24753

-fi

24754

+ as_fn_append ()

24755

+ {

24756

+ eval $1=\$$1\$2

24757

+ }

24758

+fi # as_fn_append

24759

24760

+# as_fn_arith ARG...

24761

+# ------------------

24762

+# Perform arithmetic evaluation on the ARGs, and store the result in the

24763

+# global $as_val. Take advantage of shells that can avoid forks. The arguments

24764

+# must be portable across $(()) and expr.

24765

+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :

24766

+ eval 'as_fn_arith ()

24767

+ {

24768

+ as_val=$(( $* ))

24769

+ }'

24770

+else

24771

+ as_fn_arith ()

24772

+ {

24773

+ as_val=`expr "$@" || test $? -eq 1`

24774

+ }

24775

+fi # as_fn_arith

24776

24777

24778

-(eval "as_func_return () {

24779

- (exit \$1)

24780

24781

-as_func_success () {

24782

- as_func_return 0

24783

24784

-as_func_failure () {

24785

- as_func_return 1

24786

24787

-as_func_ret_success () {

24788

- return 0

24789

24790

-as_func_ret_failure () {

24791

- return 1

24792

22938

22939

} # as_fn_mkdir_p

22940

@@ -359,19 +375,19 @@ else

22941

fi # as_fn_arith

22942

22943

22944

-# as_fn_error ERROR [LINENO LOG_FD]

22945

-# ---------------------------------

24793

22946

+# as_fn_error STATUS ERROR [LINENO LOG_FD]

24794

22947

+# ----------------------------------------

24795

+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

24796

+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

22948

# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

22949

# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

22950

-# script with status $?, using 1 if that was 0.

24797

22951

+# script with STATUS, using 1 if that was 0.

24798

+as_fn_error ()

24799

22952

as_fn_error ()

22953

{

22954

- as_status=$?; test $as_status -eq 0 && as_status=1

22955

- if test "$3"; then

22956

- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

22957

- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3

24800

22958

+ as_status=$1; test $as_status -eq 0 && as_status=1

24801

22959

+ if test "$4"; then

24802

22960

+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

24803

22961

+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4

24804

+ fi

22962

22963

- $as_echo "$as_me: error: $1" >&2

24805

22964

+ $as_echo "$as_me: error: $2" >&2

24806

+ as_fn_exit $as_status

24807

+} # as_fn_error

24808

24809

-exitcode=0

24810

-if as_func_success; then

24811

- :

24812

+if expr a : '$a$' >/dev/null 2>&1 &&

24813

+ test "X`expr 00001 : '.*$...$'`" = X001; then

24814

+ as_expr=expr

24815

else

24816

- exitcode=1

24817

- echo as_func_success failed.

24818

-fi

24819

24820

-if as_func_failure; then

24821

- exitcode=1

24822

- echo as_func_failure succeeded.

24823

+ as_expr=false

24824

24825

24826

-if as_func_ret_success; then

24827

- :

24828

+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then

24829

+ as_basename=basename

24830

else

24831

- exitcode=1

24832

- echo as_func_ret_success failed.

24833

-fi

24834

24835

-if as_func_ret_failure; then

24836

- exitcode=1

24837

- echo as_func_ret_failure succeeded.

24838

+ as_basename=false

24839

24840

24841

-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then

24842

- :

24843

+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

24844

+ as_dirname=dirname

24845

else

24846

- exitcode=1

24847

- echo positional parameters were not saved.

24848

+ as_dirname=false

24849

24850

24851

-test \$exitcode = 0") || {

24852

- echo No shell found that supports shell functions.

24853

- echo Please tell autoconf@gnu.org about your system,

24854

- echo including any error possibly output before this

24855

- echo message

24856

24857

+as_me=`$as_basename -- "$0" ||

24858

+$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

24859

+ X"$0" : 'X$//$$' \| \

24860

+ X"$0" : 'X$/$' \| . 2>/dev/null ||

24861

+$as_echo X/"$0" |

24862

+ sed '/^.*\/$[^/][^/]*$\/*$/{

24863

+ s//\1/

24864

+ q

24865

+ }

24866

+ /^X\/$\/\/$$/{

24867

+ s//\1/

24868

+ q

24869

+ }

24870

+ /^X\/$\/$.*/{

24871

+ s//\1/

24872

+ q

24873

+ }

24874

+ s/.*/./; q'`

24875

24876

+# Avoid depending upon Character Ranges.

24877

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

24878

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

24879

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

24880

+as_cr_digits='0123456789'

24881

+as_cr_alnum=$as_cr_Letters$as_cr_digits

24882

24883

24884

- as_lineno_1=$LINENO

24885

- as_lineno_2=$LINENO

24886

- test "x$as_lineno_1" != "x$as_lineno_2" &&

24887

- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {

24888

24889

- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO

24890

- # uniformly replaced by the line number. The first 'sed' inserts a

24891

- # line-number line after each line using $LINENO; the second 'sed'

24892

- # does the real work. The second script uses 'N' to pair each

24893

- # line-number line with the line containing $LINENO, and appends

24894

- # trailing '-' during substitution so that $LINENO is not a special

24895

- # case at line end.

24896

- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

24897

- # scripts with optimization help from Paolo Bonzini. Blame Lee

24898

- # E. McMahon (1931-1989) for sed's syntax. :-)

24899

+ as_lineno_1=$LINENO as_lineno_1a=$LINENO

24900

+ as_lineno_2=$LINENO as_lineno_2a=$LINENO

24901

+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&

24902

+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {

24903

+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)

24904

sed -n '

24905

24906

/[$]LINENO/=

24907

@@ -453,8 +442,7 @@ test \$exitcode = 0") || {

24908

s/-\n.*//

24909

' >$as_me.lineno &&

24910

chmod +x "$as_me.lineno" ||

24911

- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

24912

- { (exit 1); exit 1; }; }

24913

+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }

24914

24915

# Don't try to exec as it changes $[0], causing all sort of problems

24916

# (the dirname of $[0] is not the place where we might find the

24917

@@ -464,49 +452,40 @@ test \$exitcode = 0") || {

24918

exit

24919

}

24920

24921

24922

-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

24923

- as_dirname=dirname

24924

-else

24925

- as_dirname=false

24926

-fi

24927

24928

ECHO_C= ECHO_N= ECHO_T=

24929

-case `echo -n x` in

24930

+case `echo -n x` in #(((((

24931

-n*)

24932

- case `echo 'x\c'` in

24933

+ case `echo 'xy\c'` in

24934

*c*) ECHO_T=' ';; # ECHO_T is single tab character.

24935

- *) ECHO_C='\c';;

24936

+ xy) ECHO_C='\c';;

24937

+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null

24938

+ ECHO_T=' ';;

24939

esac;;

24940

24941

ECHO_N='-n';;

24942

esac

24943

24944

-if expr a : '$a$' >/dev/null 2>&1 &&

24945

- test "X`expr 00001 : '.*$...$'`" = X001; then

24946

- as_expr=expr

24947

-else

24948

- as_expr=false

24949

-fi

24950

24951

rm -f conf$$ conf$$.exe conf$$.file

24952

if test -d conf$$.dir; then

24953

rm -f conf$$.dir/conf$$.file

24954

else

24955

rm -f conf$$.dir

24956

- mkdir conf$$.dir

24957

+ mkdir conf$$.dir 2>/dev/null

24958

24959

-echo >conf$$.file

24960

-if ln -s conf$$.file conf$$ 2>/dev/null; then

24961

- as_ln_s='ln -s'

24962

- # ... but there are two gotchas:

24963

- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

24964

- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

24965

- # In both cases, we have to default to `cp -p'.

24966

- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

24967

+if (echo >conf$$.file) 2>/dev/null; then

24968

+ if ln -s conf$$.file conf$$ 2>/dev/null; then

24969

+ as_ln_s='ln -s'

24970

+ # ... but there are two gotchas:

24971

+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

24972

+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

24973

+ # In both cases, we have to default to `cp -p'.

24974

+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

24975

+ as_ln_s='cp -p'

24976

+ elif ln conf$$.file conf$$ 2>/dev/null; then

24977

+ as_ln_s=ln

24978

+ else

24979

as_ln_s='cp -p'

24980

-elif ln conf$$.file conf$$ 2>/dev/null; then

24981

- as_ln_s=ln

24982

+ fi

24983

else

24984

as_ln_s='cp -p'

24985

24986

@@ -514,7 +493,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$

24987

rmdir conf$$.dir 2>/dev/null

24988

24989

if mkdir -p . 2>/dev/null; then

24990

- as_mkdir_p=:

24991

+ as_mkdir_p='mkdir -p "$as_dir"'

24992

else

24993

test -d ./-p && rmdir ./-p

24994

as_mkdir_p=false

24995

@@ -531,12 +510,12 @@ else

24996

as_test_x='

24997

eval sh -c '\''

24998

if test -d "$1"; then

24999

- test -d "$1/.";

25000

+ test -d "$1/.";

25001

else

25002

- case $1 in

25003

- -*)set "./$1";;

25004

+ case $1 in #(

25005

+ -*)set "./$1";;

25006

esac;

25007

- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

25008

+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((

25009

???[sx]*):;;*)false;;esac;fi

25010

'\'' sh

25011

25012

@@ -551,7 +530,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr

25013

25014

25015

25016

25017

# Check that we are running under the correct shell.

22965

as_fn_exit $as_status

22966

} # as_fn_error

22967

22968

@@ -528,161 +544,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P

22969

# Sed expression to map a string onto a valid variable name.

22970

as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

22971

22972

22973

22974

-# Check that we are running under the correct shell.

25018

22975

SHELL=${CONFIG_SHELL-/bin/sh}

25019

22976

25020

@@ -700,10 +678,11 @@ fi

25021

25022

25023

25024

-exec 7<&0 </dev/null 6>&1

25025

+test -n "$DJDIR" || exec 7<&0 </dev/null

25026

+exec 6>&1

22977

-case X$lt_ECHO in

22978

-X*--fallback-echo)

22979

- # Remove one level of quotation (which was required for Make).

22980

- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`

22981

- ;;

22982

-esac

22983

22984

-ECHO=${lt_ECHO-echo}

22985

-if test "X$1" = X--no-reexec; then

22986

- # Discard the --no-reexec flag, and continue.

22987

- shift

22988

-elif test "X$1" = X--fallback-echo; then

22989

- # Avoid inline document here, it may be left over

22990

- :

22991

-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then

22992

- # Yippee, $ECHO works!

22993

- :

22994

-else

22995

- # Restart under the correct shell.

22996

- exec $SHELL "$0" --no-reexec ${1+"$@"}

22997

-fi

22998

22999

-if test "X$1" = X--fallback-echo; then

23000

- # used as fallback echo

23001

- shift

23002

- cat <<_LT_EOF

23003

-$*

23004

-_LT_EOF

23005

- exit 0

23006

-fi

23007

23008

-# The HP-UX ksh and POSIX shell print the target directory to stdout

23009

-# if CDPATH is set.

23010

-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

23011

23012

-if test -z "$lt_ECHO"; then

23013

- if test "X${echo_test_string+set}" != Xset; then

23014

- # find a string as large as possible, as long as the shell can cope with it

23015

- for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do

23016

- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...

23017

- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&

23018

- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null

23019

- then

23020

- break

23021

- fi

23022

- done

23023

- fi

23024

23025

- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&

23026

- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&

23027

- test "X$echo_testing_string" = "X$echo_test_string"; then

23028

- :

23029

- else

23030

- # The Solaris, AIX, and Digital Unix default echo programs unquote

23031

- # backslashes. This makes it impossible to quote backslashes using

23032

- # echo "$something" | sed 's/\\/\\\\/g'

23033

- #

23034

- # So, first we look for a working echo in the user's PATH.

23035

23036

- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

23037

- for dir in $PATH /usr/ucb; do

23038

- IFS="$lt_save_ifs"

23039

- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&

23040

- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&

23041

- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&

23042

- test "X$echo_testing_string" = "X$echo_test_string"; then

23043

- ECHO="$dir/echo"

23044

- break

23045

- fi

23046

- done

23047

- IFS="$lt_save_ifs"

23048

23049

- if test "X$ECHO" = Xecho; then

23050

- # We didn't find a better echo, so look for alternatives.

23051

- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&

23052

- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&

23053

- test "X$echo_testing_string" = "X$echo_test_string"; then

23054

- # This shell has a builtin print -r that does the trick.

23055

- ECHO='print -r'

23056

- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&

23057

- test "X$CONFIG_SHELL" != X/bin/ksh; then

23058

- # If we have ksh, try running configure again with it.

23059

- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}

23060

- export ORIGINAL_CONFIG_SHELL

23061

- CONFIG_SHELL=/bin/ksh

23062

- export CONFIG_SHELL

23063

- exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}

23064

- else

23065

- # Try using printf.

23066

- ECHO='printf %s\n'

23067

- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&

23068

- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&

23069

- test "X$echo_testing_string" = "X$echo_test_string"; then

23070

- # Cool, printf works

23071

- :

23072

- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&

23073

- test "X$echo_testing_string" = 'X\t' &&

23074

- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&

23075

- test "X$echo_testing_string" = "X$echo_test_string"; then

23076

- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL

23077

- export CONFIG_SHELL

23078

- SHELL="$CONFIG_SHELL"

23079

- export SHELL

23080

- ECHO="$CONFIG_SHELL $0 --fallback-echo"

23081

- elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&

23082

- test "X$echo_testing_string" = 'X\t' &&

23083

- echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&

23084

- test "X$echo_testing_string" = "X$echo_test_string"; then

23085

- ECHO="$CONFIG_SHELL $0 --fallback-echo"

23086

- else

23087

- # maybe with a smaller string...

23088

- prev=:

23089

23090

- for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do

23091

- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null

23092

- then

23093

- break

23094

- fi

23095

- prev="$cmd"

23096

- done

23097

23098

- if test "$prev" != 'sed 50q "$0"'; then

23099

- echo_test_string=`eval $prev`

23100

- export echo_test_string

23101

- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}

23102

- else

23103

- # Oops. We lost completely, so just stick with echo.

23104

- ECHO=echo

23105

- fi

23106

- fi

23107

- fi

23108

- fi

23109

- fi

23110

-fi

23111

23112

-# Copy echo and quote the copy suitably for passing to libtool from

23113

-# the Makefile, instead of quoting the original, which is used later.

23114

-lt_ECHO=$ECHO

23115

-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then

23116

- lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"

23117

-fi

23118

23119

23120

23121

23122

test -n "$DJDIR" || exec 7<&0 </dev/null

23123

exec 6>&1

25027

23124

25028

23125

# Name of the host.

25029

23126

-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,

25031

23128

# so uname gets run too.

25032

23129

ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`

25033

23130

25034

@@ -718,7 +697,6 @@ cross_compiling=no

25035

subdirs=

25036

MFLAGS=

25037

MAKEFLAGS=

25038

-SHELL=${CONFIG_SHELL-/bin/sh}

25039

25040

# Identity of this package.

25041

PACKAGE_NAME='Google C++ Testing Framework'

25042

@@ -726,6 +704,7 @@ PACKAGE_TARNAME='gtest'

25043

PACKAGE_VERSION='1.4.0'

25044

PACKAGE_STRING='Google C++ Testing Framework 1.4.0'

25045

PACKAGE_BUGREPORT='googletestframework@googlegroups.com'

25046

+PACKAGE_URL=''

25047

25048

ac_unique_file="./COPYING"

25049

# Factoring default headers for most tests.

25050

@@ -764,125 +743,140 @@ ac_includes_default="\

25051

# include <unistd.h>

25052

#endif"

25053

25054

-ac_subst_vars='SHELL

25055

-PATH_SEPARATOR

25056

-PACKAGE_NAME

25057

-PACKAGE_TARNAME

25058

-PACKAGE_VERSION

25059

-PACKAGE_STRING

25060

-PACKAGE_BUGREPORT

25061

-exec_prefix

25062

-prefix

25063

-program_transform_name

25064

-bindir

25065

-sbindir

25066

-libexecdir

25067

-datarootdir

25068

-datadir

25069

-sysconfdir

25070

-sharedstatedir

25071

-localstatedir

25072

-includedir

25073

-oldincludedir

25074

-docdir

25075

-infodir

25076

-htmldir

25077

-dvidir

25078

-pdfdir

25079

-psdir

25080

-libdir

25081

-localedir

25082

-mandir

25083

-DEFS

25084

-ECHO_C

25085

-ECHO_N

25086

-ECHO_T

25087

-LIBS

25088

-build_alias

25089

-host_alias

25090

-target_alias

25091

-INSTALL_PROGRAM

25092

-INSTALL_SCRIPT

25093

-INSTALL_DATA

25094

-am__isrc

25095

-CYGPATH_W

25096

-PACKAGE

25097

-VERSION

25098

-ACLOCAL

25099

-AUTOCONF

25100

-AUTOMAKE

25101

-AUTOHEADER

25102

-MAKEINFO

25103

-install_sh

25104

-STRIP

25105

-INSTALL_STRIP_PROGRAM

25106

-mkdir_p

25107

-AWK

25108

-SET_MAKE

25109

-am__leading_dot

25110

-AMTAR

25111

-am__tar

25112

-am__untar

25113

-CC

25114

-CFLAGS

25115

-LDFLAGS

25116

-CPPFLAGS

25117

-ac_ct_CC

25118

-EXEEXT

25119

-OBJEXT

25120

-DEPDIR

25121

-am__include

25122

-am__quote

25123

-AMDEP_TRUE

25124

-AMDEP_FALSE

25125

-AMDEPBACKSLASH

25126

-CCDEPMODE

25127

-am__fastdepCC_TRUE

25128

-am__fastdepCC_FALSE

25129

-CXX

25130

-CXXFLAGS

25131

-ac_ct_CXX

25132

-CXXDEPMODE

25133

-am__fastdepCXX_TRUE

25134

-am__fastdepCXX_FALSE

25135

-LIBTOOL

25136

-build

25137

-build_cpu

25138

-build_vendor

25139

-build_os

25140

-host

25141

-host_cpu

25142

-host_vendor

25143

-host_os

25144

-SED

25145

-GREP

25146

-EGREP

25147

-FGREP

25148

-LD

25149

-DUMPBIN

25150

-ac_ct_DUMPBIN

25151

-NM

25152

-LN_S

25153

-AR

25154

-RANLIB

23131

@@ -761,9 +630,11 @@ OTOOL

23132

LIPO

23133

NMEDIT

23134

DSYMUTIL

25155

23135

-lt_ECHO

25156

-DSYMUTIL

25157

-NMEDIT

25158

-LIPO

25159

-OTOOL

25160

-OTOOL64

25161

-CPP

25162

-CXXCPP

25163

-PYTHON

25164

-HAVE_PYTHON_TRUE

25165

-HAVE_PYTHON_FALSE

25166

-acx_pthread_config

25167

-PTHREAD_CC

25168

-PTHREAD_LIBS

25169

-PTHREAD_CFLAGS

25170

+ac_subst_vars='am__EXEEXT_FALSE

25171

+am__EXEEXT_TRUE

25172

+LTLIBOBJS

25173

LIBOBJS

25174

-LTLIBOBJS'

25175

+PTHREAD_CFLAGS

25176

+PTHREAD_LIBS

25177

+PTHREAD_CC

25178

+acx_pthread_config

25179

+HAVE_PYTHON_FALSE

25180

+HAVE_PYTHON_TRUE

25181

+PYTHON

25182

+CXXCPP

25183

+CPP

25184

+OTOOL64

25185

+OTOOL

25186

+LIPO

25187

+NMEDIT

25188

+DSYMUTIL

25189

+lt_ECHO

25190

+RANLIB

25191

+AR

25192

+OBJDUMP

25193

+LN_S

25194

+NM

25195

+ac_ct_DUMPBIN

25196

+DUMPBIN

25197

+LD

25198

+FGREP

25199

+EGREP

25200

+GREP

25201

+SED

25202

+host_os

25203

+host_vendor

25204

+host_cpu

25205

+host

25206

+build_os

25207

+build_vendor

25208

+build_cpu

25209

+build

25210

+LIBTOOL

25211

+am__fastdepCXX_FALSE

25212

+am__fastdepCXX_TRUE

25213

+CXXDEPMODE

25214

+ac_ct_CXX

25215

+CXXFLAGS

25216

+CXX

25217

+am__fastdepCC_FALSE

25218

+am__fastdepCC_TRUE

25219

+CCDEPMODE

25220

+AMDEPBACKSLASH

25221

+AMDEP_FALSE

25222

+AMDEP_TRUE

25223

+am__quote

25224

+am__include

25225

+DEPDIR

25226

+OBJEXT

25227

+EXEEXT

25228

+ac_ct_CC

25229

+CPPFLAGS

25230

+LDFLAGS

25231

+CFLAGS

25232

+CC

25233

+am__untar

25234

+am__tar

25235

+AMTAR

25236

+am__leading_dot

25237

+SET_MAKE

25238

+AWK

25239

+mkdir_p

25240

+MKDIR_P

25241

+INSTALL_STRIP_PROGRAM

25242

+STRIP

25243

+install_sh

25244

+MAKEINFO

25245

+AUTOHEADER

25246

+AUTOMAKE

25247

+AUTOCONF

25248

+ACLOCAL

25249

+VERSION

25250

+PACKAGE

25251

+CYGPATH_W

25252

+am__isrc

25253

+INSTALL_DATA

25254

+INSTALL_SCRIPT

25255

+INSTALL_PROGRAM

25256

+target_alias

25257

+host_alias

25258

+build_alias

25259

+LIBS

25260

+ECHO_T

25261

+ECHO_N

25262

+ECHO_C

25263

+DEFS

25264

+mandir

25265

+localedir

25266

+libdir

25267

+psdir

25268

+pdfdir

25269

+dvidir

25270

+htmldir

25271

+infodir

25272

+docdir

25273

+oldincludedir

25274

+includedir

25275

+localstatedir

25276

+sharedstatedir

25277

+sysconfdir

25278

+datadir

25279

+datarootdir

25280

+libexecdir

25281

+sbindir

25282

+bindir

25283

+program_transform_name

25284

+prefix

25285

+exec_prefix

25286

+PACKAGE_URL

25287

+PACKAGE_BUGREPORT

25288

+PACKAGE_STRING

25289

+PACKAGE_VERSION

25290

+PACKAGE_TARNAME

25291

+PACKAGE_NAME

25292

+PATH_SEPARATOR

25293

+SHELL'

25294

ac_subst_files=''

25295

+ac_user_opts='

25296

+enable_option_checking

25297

+enable_dependency_tracking

25298

+enable_shared

25299

+enable_static

25300

+with_pic

25301

+enable_fast_install

25302

+with_gnu_ld

25303

+enable_libtool_lock

25304

23136

+MANIFEST_TOOL

23137

RANLIB

23138

+ac_ct_AR

23139

23140

+DLLTOOL

23141

OBJDUMP

23142

LN_S

23143

23144

@@ -875,6 +746,7 @@ enable_static

23145

with_pic

23146

enable_fast_install

23147

with_gnu_ld

23148

+with_sysroot

23149

enable_libtool_lock

23150

25305

23151

ac_precious_vars='build_alias

25306

host_alias

25307

target_alias

25308

@@ -901,6 +895,8 @@ CXXCPP'

25309

# Initialize some variables set by options.

25310

ac_init_help=

25311

ac_init_version=false

25312

+ac_unrecognized_opts=

25313

+ac_unrecognized_sep=

25314

# The variables have the same names as the options, with

25315

# dashes changed to underlines.

25316

cache_file=/dev/null

25317

@@ -956,8 +952,9 @@ do

23152

@@ -952,8 +824,9 @@ do

25318

23153

25319

23154

25320

23155

case $ac_option in

25326

23161

esac

25327

23162

25328

23163

# Accept the important Cygnus configure options, so we can diagnose typos.

25329

@@ -999,13 +996,20 @@ do

25330

datarootdir=$ac_optarg ;;

25331

25332

-disable-* | --disable-*)

25333

- ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'`

25334

+ ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`

25335

# Reject names that are not valid shell variable names.

25336

- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&

25337

- { echo "$as_me: error: invalid feature name: $ac_feature" >&2

25338

- { (exit 1); exit 1; }; }

25339

- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`

25340

- eval enable_$ac_feature=no ;;

25341

+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

25342

+ as_fn_error $? "invalid feature name: $ac_useropt"

25343

+ ac_useropt_orig=$ac_useropt

25344

+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

25345

+ case $ac_user_opts in

25346

+ *"

25347

+"enable_$ac_useropt"

25348

+"*) ;;

25349

+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"

25350

+ ac_unrecognized_sep=', ';;

25351

+ esac

25352

+ eval enable_$ac_useropt=no ;;

25353

25354

-docdir | --docdir | --docdi | --doc | --do)

25355

ac_prev=docdir ;;

25356

@@ -1018,13 +1022,20 @@ do

25357

dvidir=$ac_optarg ;;

25358

25359

-enable-* | --enable-*)

25360

- ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`

25361

+ ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`

25362

# Reject names that are not valid shell variable names.

25363

- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&

25364

- { echo "$as_me: error: invalid feature name: $ac_feature" >&2

25365

- { (exit 1); exit 1; }; }

25366

- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`

25367

- eval enable_$ac_feature=\$ac_optarg ;;

25368

+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

25369

+ as_fn_error $? "invalid feature name: $ac_useropt"

25370

+ ac_useropt_orig=$ac_useropt

25371

+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

25372

+ case $ac_user_opts in

25373

+ *"

25374

+"enable_$ac_useropt"

25375

+"*) ;;

25376

+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"

25377

+ ac_unrecognized_sep=', ';;

25378

+ esac

25379

+ eval enable_$ac_useropt=\$ac_optarg ;;

25380

25381

-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \

25382

25383

@@ -1215,22 +1226,36 @@ do

25384

ac_init_version=: ;;

25385

25386

-with-* | --with-*)

25387

- ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'`

25388

+ ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`

25389

# Reject names that are not valid shell variable names.

25390

- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&

25391

- { echo "$as_me: error: invalid package name: $ac_package" >&2

25392

- { (exit 1); exit 1; }; }

25393

- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`

25394

- eval with_$ac_package=\$ac_optarg ;;

25395

+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

25396

+ as_fn_error $? "invalid package name: $ac_useropt"

25397

+ ac_useropt_orig=$ac_useropt

25398

+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

25399

+ case $ac_user_opts in

25400

+ *"

25401

+"with_$ac_useropt"

25402

+"*) ;;

25403

+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"

25404

+ ac_unrecognized_sep=', ';;

25405

+ esac

25406

+ eval with_$ac_useropt=\$ac_optarg ;;

25407

25408

-without-* | --without-*)

25409

- ac_package=`expr "x$ac_option" : 'x-*without-$.*$'`

25410

+ ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`

25411

# Reject names that are not valid shell variable names.

25412

- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&

25413

- { echo "$as_me: error: invalid package name: $ac_package" >&2

25414

- { (exit 1); exit 1; }; }

25415

- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`

25416

- eval with_$ac_package=no ;;

25417

+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

25418

+ as_fn_error $? "invalid package name: $ac_useropt"

25419

+ ac_useropt_orig=$ac_useropt

25420

+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

25421

+ case $ac_user_opts in

25422

+ *"

25423

+"with_$ac_useropt"

25424

+"*) ;;

25425

+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"

25426

+ ac_unrecognized_sep=', ';;

25427

+ esac

25428

+ eval with_$ac_useropt=no ;;

25429

25430

--x)

25431

# Obsolete; use --with-x.

25432

@@ -1250,25 +1275,25 @@ do

23164

@@ -998,7 +871,7 @@ do

23165

ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`

23166

# Reject names that are not valid shell variable names.

23167

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

23168

- as_fn_error "invalid feature name: $ac_useropt"

23169

+ as_fn_error $? "invalid feature name: $ac_useropt"

23170

ac_useropt_orig=$ac_useropt

23171

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

23172

case $ac_user_opts in

23173

@@ -1024,7 +897,7 @@ do

23174

ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`

23175

# Reject names that are not valid shell variable names.

23176

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

23177

- as_fn_error "invalid feature name: $ac_useropt"

23178

+ as_fn_error $? "invalid feature name: $ac_useropt"

23179

ac_useropt_orig=$ac_useropt

23180

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

23181

case $ac_user_opts in

23182

@@ -1228,7 +1101,7 @@ do

23183

ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`

23184

# Reject names that are not valid shell variable names.

23185

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

23186

- as_fn_error "invalid package name: $ac_useropt"

23187

+ as_fn_error $? "invalid package name: $ac_useropt"

23188

ac_useropt_orig=$ac_useropt

23189

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

23190

case $ac_user_opts in

23191

@@ -1244,7 +1117,7 @@ do

23192

ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`

23193

# Reject names that are not valid shell variable names.

23194

expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&

23195

- as_fn_error "invalid package name: $ac_useropt"

23196

+ as_fn_error $? "invalid package name: $ac_useropt"

23197

ac_useropt_orig=$ac_useropt

23198

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

23199

case $ac_user_opts in

23200

@@ -1274,8 +1147,8 @@ do

25433

23201

25434

23202

x_libraries=$ac_optarg ;;

25435

23203

25436

- -*) { echo "$as_me: error: unrecognized option: $ac_option

25437

-Try \`$0 --help' for more information." >&2

25438

- { (exit 1); exit 1; }; }

23204

- -*) as_fn_error "unrecognized option: \`$ac_option'

23205

-Try \`$0 --help' for more information."

25439

23206

+ -*) as_fn_error $? "unrecognized option: \`$ac_option'

25440

23207

+Try \`$0 --help' for more information"

25441

23208

;;

25442

23209

25443

23210

*=*)

25444

ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`

23211

@@ -1283,7 +1156,7 @@ Try \`$0 --help' for more information."

25445

23212

# Reject names that are not valid shell variable names.

25446

- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&

25447

- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2

25448

- { (exit 1); exit 1; }; }

25449

+ case $ac_envvar in #(

25450

+ '' | [0-9]* | *[!_$as_cr_alnum]* )

23213

case $ac_envvar in #(

23214

'' | [0-9]* | *[!_$as_cr_alnum]* )

23215

- as_fn_error "invalid variable name: \`$ac_envvar'" ;;

25451

23216

+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;

25452

+ esac

23217

esac

25453

23218

eval $ac_envvar=\$ac_optarg

25454

23219

export $ac_envvar ;;

25455

25456

25457

# FIXME: should be removed in autoconf 3.0.

25458

- echo "$as_me: WARNING: you should use --build, --host, --target" >&2

25459

+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2

23220

@@ -1293,7 +1166,7 @@ Try \`$0 --help' for more information."

23221

$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2

25460

23222

expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&

25461

- echo "$as_me: WARNING: invalid host type: $ac_option" >&2

25462

+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2

25463

: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}

23223

$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2

23224

- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}

23225

+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"

25464

23226

;;

25465

23227

25466

@@ -1277,23 +1302,36 @@ done

23228

esac

23229

@@ -1301,13 +1174,13 @@ done

25467

23230

25468

23231

if test -n "$ac_prev"; then

25469

23232

ac_option=--`echo $ac_prev | sed 's/_/-/g'`

25470

- { echo "$as_me: error: missing argument to $ac_option" >&2

25471

- { (exit 1); exit 1; }; }

23233

- as_fn_error "missing argument to $ac_option"

25472

23234

+ as_fn_error $? "missing argument to $ac_option"

25473

+fi

25474

25475

+if test -n "$ac_unrecognized_opts"; then

25476

+ case $enable_option_checking in

25477

+ no) ;;

23235

23236

23237

if test -n "$ac_unrecognized_opts"; then

23238

case $enable_option_checking in

23239

no) ;;

23240

- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;

25478

23241

+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;

25479

+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;

25480

+ esac

23242

*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;

23243

esac

25481

23244

25482

25483

-# Be sure to have absolute directory names.

25484

+# Check all directory arguments for consistency.

25485

for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \

25486

datadir sysconfdir sharedstatedir localstatedir includedir \

25487

oldincludedir docdir infodir htmldir dvidir pdfdir psdir \

25488

libdir localedir mandir

25489

25490

eval ac_val=\$$ac_var

25491

+ # Remove trailing slashes.

25492

+ case $ac_val in

25493

+ */ )

25494

+ ac_val=`expr "X$ac_val" : 'X$.*[^/]$' \| "X$ac_val" : 'X$.*$'`

25495

+ eval $ac_var=\$ac_val;;

25496

+ esac

25497

+ # Be sure to have absolute directory names.

25498

case $ac_val in

23245

@@ -1330,7 +1203,7 @@ do

25499

23246

[\\/$]* | ?:[\\/]* ) continue;;

25500

23247

NONE | '' ) case $ac_var in *prefix ) continue;; esac;;

25501

23248

esac

25502

- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2

25503

- { (exit 1); exit 1; }; }

23249

- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"

25504

23250

+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"

25505

23251

done

25506

23252

25507

23253

# There might be people who depend on the old broken behavior: `$host'

25508

@@ -1307,8 +1345,8 @@ target=$target_alias

23254

@@ -1344,8 +1217,8 @@ target=$target_alias

25509

23255

if test "x$host_alias" != x; then

25510

23256

if test "x$build_alias" = x; then

25511

23257

cross_compiling=maybe

25512

- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.

23258

- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.

25513

23259

- If a cross compiler is detected then cross compile mode will be used." >&2

25514

23260

+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.

25515

23261

+ If a cross compiler is detected then cross compile mode will be used" >&2

25516

23262

elif test "x$build_alias" != "x$host_alias"; then

25517

23263

cross_compiling=yes

25518

23264

25519

@@ -1323,23 +1361,21 @@ test "$silent" = yes && exec 6>/dev/null

23265

@@ -1360,9 +1233,9 @@ test "$silent" = yes && exec 6>/dev/null

25520

23266

ac_pwd=`pwd` && test -n "$ac_pwd" &&

25521

23267

ac_ls_di=`ls -di .` &&

25522

23268

ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||

25523

- { echo "$as_me: error: Working directory cannot be determined" >&2

25524

- { (exit 1); exit 1; }; }

23269

- as_fn_error "working directory cannot be determined"

25525

23270

+ as_fn_error $? "working directory cannot be determined"

25526

23271

test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||

25527

- { echo "$as_me: error: pwd does not report name of working directory" >&2

25528

- { (exit 1); exit 1; }; }

23272

- as_fn_error "pwd does not report name of working directory"

25529

23273

+ as_fn_error $? "pwd does not report name of working directory"

25530

23274

25531

23275

25532

23276

# Find the source files, if location was not specified.

25533

if test -z "$srcdir"; then

25534

ac_srcdir_defaulted=yes

25535

# Try the directory containing this script, then the parent directory.

25536

- ac_confdir=`$as_dirname -- "$0" ||

25537

-$as_expr X"$0" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

25538

- X"$0" : 'X$//$[^/]' \| \

25539

- X"$0" : 'X$//$$' \| \

25540

- X"$0" : 'X$/$' \| . 2>/dev/null ||

25541

-echo X"$0" |

25542

+ ac_confdir=`$as_dirname -- "$as_myself" ||

25543

+$as_expr X"$as_myself" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

25544

+ X"$as_myself" : 'X$//$[^/]' \| \

25545

+ X"$as_myself" : 'X$//$$' \| \

25546

+ X"$as_myself" : 'X$/$' \| . 2>/dev/null ||

25547

+$as_echo X"$as_myself" |

25548

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

25549

s//\1/

25550

25551

@@ -1366,13 +1402,11 @@ else

23277

@@ -1401,11 +1274,11 @@ else

25552

23278

25553

23279

if test ! -r "$srcdir/$ac_unique_file"; then

25554

23280

test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."

25555

- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2

25556

- { (exit 1); exit 1; }; }

23281

- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"

25557

23282

+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"

25558

23283

25559

23284

ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"

25560

23285

ac_abs_confdir=`(

25561

- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2

25562

- { (exit 1); exit 1; }; }

23286

- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"

25563

23287

+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"

25564

23288

pwd)`

25565

23289

# When building in place, set srcdir=.

25566

23290

if test "$ac_abs_confdir" = "$ac_pwd"; then

25567

@@ -1412,7 +1446,7 @@ Configuration:

23291

@@ -1445,7 +1318,7 @@ Configuration:

25568

23292

--help=short display options specific to this package

25569

23293

--help=recursive display the short help of all the included packages

25570

23294

-V, --version display version information and exit

25573

23297

--cache-file=FILE cache test results in FILE [disabled]

25574

23298

-C, --config-cache alias for \`--cache-file=config.cache'

25575

23299

-n, --no-create do not create output files

25576

@@ -1420,9 +1454,9 @@ Configuration:

25577

25578

Installation directories:

25579

--prefix=PREFIX install architecture-independent files in PREFIX

25580

- [$ac_default_prefix]

25581

+ [$ac_default_prefix]

25582

--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX

25583

- [PREFIX]

25584

+ [PREFIX]

25585

25586

By default, \`make install' will install all the files in

25587

\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify

25588

@@ -1432,25 +1466,25 @@ for instance \`--prefix=\$HOME'.

25589

For better control, use the options below.

25590

25591

Fine tuning of the installation directories:

25592

- --bindir=DIR user executables [EPREFIX/bin]

25593

- --sbindir=DIR system admin executables [EPREFIX/sbin]

25594

- --libexecdir=DIR program executables [EPREFIX/libexec]

25595

- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]

25596

- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]

25597

- --localstatedir=DIR modifiable single-machine data [PREFIX/var]

25598

- --libdir=DIR object code libraries [EPREFIX/lib]

25599

- --includedir=DIR C header files [PREFIX/include]

25600

- --oldincludedir=DIR C header files for non-gcc [/usr/include]

25601

- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]

25602

- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]

25603

- --infodir=DIR info documentation [DATAROOTDIR/info]

25604

- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]

25605

- --mandir=DIR man documentation [DATAROOTDIR/man]

25606

- --docdir=DIR documentation root [DATAROOTDIR/doc/gtest]

25607

- --htmldir=DIR html documentation [DOCDIR]

25608

- --dvidir=DIR dvi documentation [DOCDIR]

25609

- --pdfdir=DIR pdf documentation [DOCDIR]

25610

- --psdir=DIR ps documentation [DOCDIR]

25611

+ --bindir=DIR user executables [EPREFIX/bin]

25612

+ --sbindir=DIR system admin executables [EPREFIX/sbin]

25613

+ --libexecdir=DIR program executables [EPREFIX/libexec]

25614

+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]

25615

+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]

25616

+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]

25617

+ --libdir=DIR object code libraries [EPREFIX/lib]

25618

+ --includedir=DIR C header files [PREFIX/include]

25619

+ --oldincludedir=DIR C header files for non-gcc [/usr/include]

25620

+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]

25621

+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]

25622

+ --infodir=DIR info documentation [DATAROOTDIR/info]

25623

+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]

25624

+ --mandir=DIR man documentation [DATAROOTDIR/man]

25625

+ --docdir=DIR documentation root [DATAROOTDIR/doc/gtest]

25626

+ --htmldir=DIR html documentation [DOCDIR]

25627

+ --dvidir=DIR dvi documentation [DOCDIR]

25628

+ --pdfdir=DIR pdf documentation [DOCDIR]

25629

+ --psdir=DIR ps documentation [DOCDIR]

25630

_ACEOF

25631

25632

cat <<\_ACEOF

25633

@@ -1473,6 +1507,7 @@ if test -n "$ac_init_help"; then

25634

cat <<\_ACEOF

25635

25636

Optional Features:

25637

+ --disable-option-checking ignore unrecognized --enable/--with options

25638

--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)

25639

--enable-FEATURE[=ARG] include FEATURE [ARG=yes]

25640

--disable-dependency-tracking speeds up one-time build

25641

@@ -1496,7 +1531,7 @@ Some influential environment variables:

25642

LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a

25643

nonstandard directory <lib dir>

25644

LIBS libraries to pass to the linker, e.g. -l<library>

25645

- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if

25646

+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if

25647

you have headers in a nonstandard directory <include dir>

25648

CXX C++ compiler command

25649

CXXFLAGS C++ compiler flags

25650

@@ -1514,15 +1549,17 @@ fi

25651

if test "$ac_init_help" = "recursive"; then

25652

# If there are subdirs, report their specific --help.

25653

for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue

25654

- test -d "$ac_dir" || continue

25655

+ test -d "$ac_dir" ||

25656

+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||

25657

+ continue

25658

ac_builddir=.

25659

25660

case "$ac_dir" in

25661

.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

25662

25663

- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

25664

+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`

25665

# A ".." for each directory in $ac_dir_suffix.

25666

- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

25667

+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`

25668

case $ac_top_builddir_sub in

25669

"") ac_top_builddir_sub=. ac_top_build_prefix= ;;

25670

*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

25671

@@ -1558,7 +1595,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_

25672

echo &&

25673

$SHELL "$ac_srcdir/configure" --help=recursive

25674

else

25675

- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2

25676

+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2

25677

fi || ac_status=$?

25678

cd "$ac_pwd" || { ac_status=$?; break; }

25679

done

25680

@@ -1568,21 +1605,406 @@ test -n "$ac_init_help" && exit $ac_stat

23300

@@ -1523,6 +1396,8 @@ Optional Packages:

23301

--with-pic try to use only PIC/non-PIC objects [default=use

23302

both]

23303

--with-gnu-ld assume the C compiler uses GNU ld [default=no]

23304

+ --with-sysroot=DIR Search for dependent libraries within DIR

23305

+ (or the compiler's sysroot if not specified).

23306

23307

Some influential environment variables:

23308

CC C compiler command

23309

@@ -1604,9 +1479,9 @@ test -n "$ac_init_help" && exit $ac_stat

25681

23310

if $ac_init_version; then

25682

23311

cat <<\_ACEOF

25683

23312

Google C++ Testing Framework configure 1.4.0

25684

-generated by GNU Autoconf 2.61

25685

+generated by GNU Autoconf 2.67

23313

-generated by GNU Autoconf 2.65

23314

+generated by GNU Autoconf 2.68

25686

23315

25687

25688

-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

23316

25689

23317

25690

23318

This configure script is free software; the Free Software Foundation

25691

23319

gives unlimited permission to copy, distribute and modify it.

25692

23320

_ACEOF

25693

exit

25694

25695

25696

+## ------------------------ ##

25697

+## Autoconf initialization. ##

25698

+## ------------------------ ##

25699

25700

+# ac_fn_c_try_compile LINENO

25701

+# --------------------------

25702

+# Try to compile conftest.$ac_ext, and return whether this succeeded.

25703

+ac_fn_c_try_compile ()

25704

25705

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

25706

+ rm -f conftest.$ac_objext

25707

+ if { { ac_try="$ac_compile"

25708

+case "(($ac_try" in

25709

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

25710

+ *) ac_try_echo=$ac_try;;

25711

+esac

25712

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

25713

+$as_echo "$ac_try_echo"; } >&5

25714

+ (eval "$ac_compile") 2>conftest.err

25715

+ ac_status=$?

25716

+ if test -s conftest.err; then

25717

+ grep -v '^ *+' conftest.err >conftest.er1

25718

+ cat conftest.er1 >&5

25719

+ mv -f conftest.er1 conftest.err

25720

+ fi

25721

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

25722

+ test $ac_status = 0; } && {

25723

+ test -z "$ac_c_werror_flag" ||

25724

+ test ! -s conftest.err

25725

+ } && test -s conftest.$ac_objext; then :

25726

+ ac_retval=0

25727

+else

25728

+ $as_echo "$as_me: failed program was:" >&5

25729

+sed 's/^/| /' conftest.$ac_ext >&5

25730

25731

+ ac_retval=1

25732

+fi

25733

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

25734

+ as_fn_set_status $ac_retval

25735

25736

+} # ac_fn_c_try_compile

25737

25738

+# ac_fn_cxx_try_compile LINENO

25739

+# ----------------------------

25740

+# Try to compile conftest.$ac_ext, and return whether this succeeded.

25741

+ac_fn_cxx_try_compile ()

25742

25743

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

25744

+ rm -f conftest.$ac_objext

25745

+ if { { ac_try="$ac_compile"

25746

+case "(($ac_try" in

25747

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

25748

+ *) ac_try_echo=$ac_try;;

25749

+esac

25750

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

25751

+$as_echo "$ac_try_echo"; } >&5

25752

+ (eval "$ac_compile") 2>conftest.err

25753

+ ac_status=$?

25754

+ if test -s conftest.err; then

25755

+ grep -v '^ *+' conftest.err >conftest.er1

25756

+ cat conftest.er1 >&5

25757

+ mv -f conftest.er1 conftest.err

25758

+ fi

25759

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

25760

+ test $ac_status = 0; } && {

25761

+ test -z "$ac_cxx_werror_flag" ||

25762

+ test ! -s conftest.err

25763

+ } && test -s conftest.$ac_objext; then :

25764

+ ac_retval=0

25765

+else

25766

+ $as_echo "$as_me: failed program was:" >&5

25767

+sed 's/^/| /' conftest.$ac_ext >&5

25768

25769

+ ac_retval=1

25770

+fi

25771

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

25772

+ as_fn_set_status $ac_retval

25773

25774

+} # ac_fn_cxx_try_compile

25775

25776

+# ac_fn_c_try_link LINENO

25777

+# -----------------------

25778

+# Try to link conftest.$ac_ext, and return whether this succeeded.

25779

+ac_fn_c_try_link ()

25780

25781

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

25782

+ rm -f conftest.$ac_objext conftest$ac_exeext

25783

+ if { { ac_try="$ac_link"

25784

+case "(($ac_try" in

25785

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

25786

+ *) ac_try_echo=$ac_try;;

25787

+esac

25788

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

25789

+$as_echo "$ac_try_echo"; } >&5

25790

+ (eval "$ac_link") 2>conftest.err

25791

+ ac_status=$?

25792

+ if test -s conftest.err; then

25793

+ grep -v '^ *+' conftest.err >conftest.er1

25794

+ cat conftest.er1 >&5

25795

+ mv -f conftest.er1 conftest.err

25796

+ fi

25797

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

25798

+ test $ac_status = 0; } && {

25799

+ test -z "$ac_c_werror_flag" ||

25800

+ test ! -s conftest.err

25801

+ } && test -s conftest$ac_exeext && {

25802

+ test "$cross_compiling" = yes ||

25803

+ $as_test_x conftest$ac_exeext

25804

+ }; then :

25805

+ ac_retval=0

25806

+else

25807

+ $as_echo "$as_me: failed program was:" >&5

25808

+sed 's/^/| /' conftest.$ac_ext >&5

25809

25810

+ ac_retval=1

25811

+fi

25812

+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information

25813

+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would

25814

+ # interfere with the next link command; also delete a directory that is

25815

+ # left behind by Apple's compiler. We do this before executing the actions.

25816

+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo

25817

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

25818

+ as_fn_set_status $ac_retval

25819

25820

+} # ac_fn_c_try_link

25821

25822

+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES

25823

+# -------------------------------------------------------

25824

+# Tests whether HEADER exists and can be compiled using the include files in

25825

+# INCLUDES, setting the cache variable VAR accordingly.

25826

+ac_fn_c_check_header_compile ()

25827

25828

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

25829

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

25830

+$as_echo_n "checking for $2... " >&6; }

25831

+if eval "test \"\${$3+set}\"" = set; then :

25832

+ $as_echo_n "(cached) " >&6

25833

+else

25834

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

25835

+/* end confdefs.h. */

25836

+$4

25837

+#include <$2>

25838

+_ACEOF

25839

+if ac_fn_c_try_compile "$LINENO"; then :

25840

+ eval "$3=yes"

25841

+else

25842

+ eval "$3=no"

25843

+fi

25844

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

25845

+fi

25846

+eval ac_res=\$$3

25847

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

25848

+$as_echo "$ac_res" >&6; }

25849

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

25850

25851

+} # ac_fn_c_check_header_compile

25852

25853

+# ac_fn_c_try_cpp LINENO

25854

+# ----------------------

25855

+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.

25856

+ac_fn_c_try_cpp ()

25857

25858

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

25859

+ if { { ac_try="$ac_cpp conftest.$ac_ext"

25860

+case "(($ac_try" in

25861

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

25862

+ *) ac_try_echo=$ac_try;;

25863

+esac

25864

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

25865

+$as_echo "$ac_try_echo"; } >&5

25866

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err

25867

+ ac_status=$?

25868

+ if test -s conftest.err; then

25869

+ grep -v '^ *+' conftest.err >conftest.er1

25870

+ cat conftest.er1 >&5

25871

+ mv -f conftest.er1 conftest.err

25872

+ fi

25873

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

25874

+ test $ac_status = 0; } > conftest.i && {

25875

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

25876

+ test ! -s conftest.err

25877

+ }; then :

25878

+ ac_retval=0

25879

+else

25880

+ $as_echo "$as_me: failed program was:" >&5

25881

+sed 's/^/| /' conftest.$ac_ext >&5

25882

25883

+ ac_retval=1

25884

+fi

25885

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

25886

+ as_fn_set_status $ac_retval

25887

25888

+} # ac_fn_c_try_cpp

25889

25890

+# ac_fn_c_try_run LINENO

25891

+# ----------------------

25892

+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes

25893

+# that executables *can* be run.

25894

+ac_fn_c_try_run ()

25895

25896

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

25897

+ if { { ac_try="$ac_link"

25898

+case "(($ac_try" in

25899

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

25900

+ *) ac_try_echo=$ac_try;;

25901

+esac

25902

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

25903

+$as_echo "$ac_try_echo"; } >&5

25904

+ (eval "$ac_link") 2>&5

25905

+ ac_status=$?

25906

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

25907

+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'

25908

+ { { case "(($ac_try" in

25909

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

25910

+ *) ac_try_echo=$ac_try;;

25911

+esac

25912

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

25913

+$as_echo "$ac_try_echo"; } >&5

25914

+ (eval "$ac_try") 2>&5

25915

+ ac_status=$?

25916

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

25917

+ test $ac_status = 0; }; }; then :

25918

+ ac_retval=0

25919

+else

25920

+ $as_echo "$as_me: program exited with status $ac_status" >&5

25921

+ $as_echo "$as_me: failed program was:" >&5

25922

+sed 's/^/| /' conftest.$ac_ext >&5

25923

25924

+ ac_retval=$ac_status

25925

+fi

25926

+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo

25927

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

25928

+ as_fn_set_status $ac_retval

25929

25930

+} # ac_fn_c_try_run

25931

25932

+# ac_fn_c_check_func LINENO FUNC VAR

25933

+# ----------------------------------

25934

+# Tests whether FUNC exists, setting the cache variable VAR accordingly

25935

+ac_fn_c_check_func ()

25936

25937

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

25938

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

25939

+$as_echo_n "checking for $2... " >&6; }

25940

+if eval "test \"\${$3+set}\"" = set; then :

25941

+ $as_echo_n "(cached) " >&6

25942

+else

25943

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

25944

+/* end confdefs.h. */

25945

+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.

25946

+ For example, HP-UX 11i <limits.h> declares gettimeofday. */

25947

+#define $2 innocuous_$2

25948

25949

+/* System header to define __stub macros and hopefully few prototypes,

25950

+ which can conflict with char $2 (); below.

25951

+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

25952

+ <limits.h> exists even on freestanding compilers. */

25953

25954

+#ifdef __STDC__

25955

+# include <limits.h>

25956

+#else

25957

+# include <assert.h>

25958

+#endif

25959

25960

+#undef $2

25961

25962

+/* Override any GCC internal prototype to avoid an error.

25963

+ Use char because int might match the return type of a GCC

25964

+ builtin and then its argument prototype would still apply. */

25965

+#ifdef __cplusplus

25966

+extern "C"

25967

+#endif

25968

+char $2 ();

25969

+/* The GNU C library defines this for functions which it implements

25970

+ to always fail with ENOSYS. Some functions are actually named

25971

+ something starting with __ and the normal name is an alias. */

25972

+#if defined __stub_$2 || defined __stub___$2

25973

+choke me

25974

+#endif

25975

25976

+int

25977

+main ()

25978

25979

+return $2 ();

25980

+ ;

25981

+ return 0;

25982

25983

+_ACEOF

25984

+if ac_fn_c_try_link "$LINENO"; then :

25985

+ eval "$3=yes"

25986

+else

25987

+ eval "$3=no"

25988

+fi

25989

+rm -f core conftest.err conftest.$ac_objext \

25990

+ conftest$ac_exeext conftest.$ac_ext

25991

+fi

25992

+eval ac_res=\$$3

25993

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

25994

+$as_echo "$ac_res" >&6; }

25995

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

25996

25997

+} # ac_fn_c_check_func

25998

25999

+# ac_fn_cxx_try_cpp LINENO

26000

+# ------------------------

26001

+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.

26002

+ac_fn_cxx_try_cpp ()

26003

26004

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

26005

+ if { { ac_try="$ac_cpp conftest.$ac_ext"

26006

+case "(($ac_try" in

26007

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

26008

+ *) ac_try_echo=$ac_try;;

26009

+esac

26010

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

26011

+$as_echo "$ac_try_echo"; } >&5

26012

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err

26013

+ ac_status=$?

26014

+ if test -s conftest.err; then

26015

+ grep -v '^ *+' conftest.err >conftest.er1

26016

+ cat conftest.er1 >&5

26017

+ mv -f conftest.er1 conftest.err

26018

+ fi

26019

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

26020

+ test $ac_status = 0; } > conftest.i && {

26021

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

26022

+ test ! -s conftest.err

26023

+ }; then :

26024

+ ac_retval=0

26025

+else

26026

+ $as_echo "$as_me: failed program was:" >&5

26027

+sed 's/^/| /' conftest.$ac_ext >&5

26028

26029

+ ac_retval=1

26030

+fi

26031

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

26032

+ as_fn_set_status $ac_retval

26033

26034

+} # ac_fn_cxx_try_cpp

26035

26036

+# ac_fn_cxx_try_link LINENO

26037

+# -------------------------

26038

+# Try to link conftest.$ac_ext, and return whether this succeeded.

26039

+ac_fn_cxx_try_link ()

26040

26041

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

26042

+ rm -f conftest.$ac_objext conftest$ac_exeext

26043

+ if { { ac_try="$ac_link"

26044

+case "(($ac_try" in

26045

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

26046

+ *) ac_try_echo=$ac_try;;

26047

+esac

26048

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

26049

+$as_echo "$ac_try_echo"; } >&5

26050

+ (eval "$ac_link") 2>conftest.err

26051

+ ac_status=$?

26052

+ if test -s conftest.err; then

26053

+ grep -v '^ *+' conftest.err >conftest.er1

26054

+ cat conftest.er1 >&5

26055

+ mv -f conftest.er1 conftest.err

26056

+ fi

26057

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

26058

+ test $ac_status = 0; } && {

26059

+ test -z "$ac_cxx_werror_flag" ||

26060

+ test ! -s conftest.err

26061

+ } && test -s conftest$ac_exeext && {

26062

+ test "$cross_compiling" = yes ||

26063

+ $as_test_x conftest$ac_exeext

26064

+ }; then :

26065

+ ac_retval=0

26066

+else

26067

+ $as_echo "$as_me: failed program was:" >&5

26068

+sed 's/^/| /' conftest.$ac_ext >&5

26069

26070

+ ac_retval=1

26071

+fi

26072

+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information

26073

+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would

26074

+ # interfere with the next link command; also delete a directory that is

26075

+ # left behind by Apple's compiler. We do this before executing the actions.

26076

+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo

26077

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

26078

+ as_fn_set_status $ac_retval

26079

26080

+} # ac_fn_cxx_try_link

26081

cat >config.log <<_ACEOF

26082

This file contains any messages produced by compilers while

23321

@@ -1650,7 +1525,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

23322

23323

ac_retval=1

23324

23325

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

23326

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

23327

as_fn_set_status $ac_retval

23328

23329

} # ac_fn_c_try_compile

23330

@@ -1688,7 +1563,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

23331

23332

ac_retval=1

23333

23334

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

23335

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

23336

as_fn_set_status $ac_retval

23337

23338

} # ac_fn_cxx_try_compile

23339

@@ -1734,7 +1609,7 @@ fi

23340

# interfere with the next link command; also delete a directory that is

23341

# left behind by Apple's compiler. We do this before executing the actions.

23342

rm -rf conftest.dSYM conftest_ipa8_conftest.oo

23343

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

23344

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

23345

as_fn_set_status $ac_retval

23346

23347

} # ac_fn_c_try_link

23348

@@ -1748,7 +1623,7 @@ ac_fn_c_check_header_compile ()

23349

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

23350

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

23351

$as_echo_n "checking for $2... " >&6; }

23352

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

23353

+if eval \${$3+:} false; then :

23354

$as_echo_n "(cached) " >&6

23355

else

23356

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

23357

@@ -1766,7 +1641,7 @@ fi

23358

eval ac_res=\$$3

23359

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

23360

$as_echo "$ac_res" >&6; }

23361

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

23362

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

23363

23364

} # ac_fn_c_check_header_compile

23365

23366

@@ -1791,7 +1666,7 @@ $as_echo "$ac_try_echo"; } >&5

23367

mv -f conftest.er1 conftest.err

23368

23369

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

23370

- test $ac_status = 0; } >/dev/null && {

23371

+ test $ac_status = 0; } > conftest.i && {

23372

test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

23373

test ! -s conftest.err

23374

}; then :

23375

@@ -1802,7 +1677,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

23376

23377

ac_retval=1

23378

23379

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

23380

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

23381

as_fn_set_status $ac_retval

23382

23383

} # ac_fn_c_try_cpp

23384

@@ -1844,7 +1719,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

23385

ac_retval=$ac_status

23386

23387

rm -rf conftest.dSYM conftest_ipa8_conftest.oo

23388

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

23389

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

23390

as_fn_set_status $ac_retval

23391

23392

} # ac_fn_c_try_run

23393

@@ -1857,7 +1732,7 @@ ac_fn_c_check_func ()

23394

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

23395

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

23396

$as_echo_n "checking for $2... " >&6; }

23397

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

23398

+if eval \${$3+:} false; then :

23399

$as_echo_n "(cached) " >&6

23400

else

23401

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

23402

@@ -1912,7 +1787,7 @@ fi

23403

eval ac_res=\$$3

23404

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

23405

$as_echo "$ac_res" >&6; }

23406

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

23407

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

23408

23409

} # ac_fn_c_check_func

23410

23411

@@ -1937,7 +1812,7 @@ $as_echo "$ac_try_echo"; } >&5

23412

mv -f conftest.er1 conftest.err

23413

23414

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

23415

- test $ac_status = 0; } >/dev/null && {

23416

+ test $ac_status = 0; } > conftest.i && {

23417

test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

23418

test ! -s conftest.err

23419

}; then :

23420

@@ -1948,7 +1823,7 @@ sed 's/^/| /' conftest.$ac_ext >&5

23421

23422

ac_retval=1

23423

23424

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

23425

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

23426

as_fn_set_status $ac_retval

23427

23428

} # ac_fn_cxx_try_cpp

23429

@@ -1994,7 +1869,7 @@ fi

23430

# interfere with the next link command; also delete a directory that is

23431

# left behind by Apple's compiler. We do this before executing the actions.

23432

rm -rf conftest.dSYM conftest_ipa8_conftest.oo

23433

- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

23434

+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno

23435

as_fn_set_status $ac_retval

23436

23437

} # ac_fn_cxx_try_link

23438

@@ -2003,7 +1878,7 @@ This file contains any messages produced

26083

23439

running configure, to aid debugging if configure makes a mistake.

26084

23440

26085

23441

It was created by Google C++ Testing Framework $as_me 1.4.0, which was

26086

-generated by GNU Autoconf 2.61. Invocation command line was

26087

+generated by GNU Autoconf 2.67. Invocation command line was

23442

-generated by GNU Autoconf 2.65. Invocation command line was

23443

+generated by GNU Autoconf 2.68. Invocation command line was

26088

23444

26089

23445

$ $0 $@

26090

23446

26091

@@ -1618,8 +2040,8 @@ for as_dir in $PATH

26092

26093

IFS=$as_save_IFS

26094

test -z "$as_dir" && as_dir=.

26095

- echo "PATH: $as_dir"

26096

-done

26097

+ $as_echo "PATH: $as_dir"

26098

+ done

26099

IFS=$as_save_IFS

26100

26101

} >&5

26102

@@ -1653,12 +2075,12 @@ do

26103

26104

continue ;;

26105

*\'*)

26106

- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

26107

+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

26108

esac

26109

case $ac_pass in

26110

- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;

26111

+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;

26112

26113

- ac_configure_args1="$ac_configure_args1 '$ac_arg'"

26114

+ as_fn_append ac_configure_args1 " '$ac_arg'"

26115

if test $ac_must_keep_next = true; then

26116

ac_must_keep_next=false # Got value, back to normal.

26117

else

26118

@@ -1674,13 +2096,13 @@ do

26119

-* ) ac_must_keep_next=true ;;

26120

esac

26121

26122

- ac_configure_args="$ac_configure_args '$ac_arg'"

26123

+ as_fn_append ac_configure_args " '$ac_arg'"

26124

;;

26125

esac

26126

done

26127

done

26128

-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }

26129

-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }

26130

+{ ac_configure_args0=; unset ac_configure_args0;}

26131

+{ ac_configure_args1=; unset ac_configure_args1;}

26132

26133

# When interrupted or exit'd, cleanup temporary files, and complete

26134

# config.log. We remove comments because anyway the quotes in there

26135

@@ -1692,11 +2114,9 @@ trap 'exit_status=$?

23447

@@ -2113,11 +1988,9 @@ trap 'exit_status=$?

26136

23448

{

26137

23449

echo

26138

23450

26146

23458

echo

26147

23459

# The following way of writing the cache mishandles newlines in values,

26148

23460

(

26149

@@ -1705,12 +2125,13 @@ _ASBOX

26150

case $ac_val in #(

26151

*${as_nl}*)

26152

case $ac_var in #(

26153

- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5

26154

-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;

26155

+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5

26156

+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;

26157

esac

26158

case $ac_var in #(

26159

_ | IFS | as_nl) ;; #(

26160

- *) $as_unset $ac_var ;;

26161

+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

26162

+ *) { eval $ac_var=; unset $ac_var;} ;;

26163

esac ;;

26164

esac

26165

done

26166

@@ -1729,128 +2150,136 @@ echo "$as_me: WARNING: Cache variable $a

23461

@@ -2151,11 +2024,9 @@ $as_echo "$as_me: WARNING: cache variabl

26167

23462

)

26168

23463

echo

26169

23464

26177

23472

echo

26178

23473

for ac_var in $ac_subst_vars

26179

23474

26180

eval ac_val=\$$ac_var

26181

case $ac_val in

26182

- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

26183

+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

26184

esac

26185

- echo "$ac_var='\''$ac_val'\''"

26186

+ $as_echo "$ac_var='\''$ac_val'\''"

26187

done | sort

23475

@@ -2168,11 +2039,9 @@ _ASBOX

26188

23476

echo

26189

23477

26190

23478

if test -n "$ac_subst_files"; then

26198

23486

echo

26199

23487

for ac_var in $ac_subst_files

26200

23488

26201

eval ac_val=\$$ac_var

26202

case $ac_val in

26203

- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

26204

+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

26205

esac

26206

- echo "$ac_var='\''$ac_val'\''"

26207

+ $as_echo "$ac_var='\''$ac_val'\''"

26208

done | sort

26209

echo

23489

@@ -2186,11 +2055,9 @@ _ASBOX

26210

23490

26211

23491

26212

23492

if test -s confdefs.h; then

26220

23500

echo

26221

23501

cat confdefs.h

26222

23502

echo

26223

26224

test "$ac_signal" != 0 &&

26225

- echo "$as_me: caught signal $ac_signal"

26226

- echo "$as_me: exit $exit_status"

26227

+ $as_echo "$as_me: caught signal $ac_signal"

26228

+ $as_echo "$as_me: exit $exit_status"

26229

} >&5

26230

rm -f core *.core core.conftest.* &&

26231

rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&

26232

exit $exit_status

26233

' 0

26234

for ac_signal in 1 2 13 15; do

26235

- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal

26236

+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal

26237

done

26238

ac_signal=0

26239

26240

# confdefs.h avoids OS command line length limits that DEFS can exceed.

26241

rm -f -r conftest* confdefs.h

26242

26243

+$as_echo "/* confdefs.h */" > confdefs.h

26244

26245

# Predefined preprocessor variables.

26246

26247

cat >>confdefs.h <<_ACEOF

26248

#define PACKAGE_NAME "$PACKAGE_NAME"

26249

_ACEOF

26250

26251

26252

cat >>confdefs.h <<_ACEOF

26253

#define PACKAGE_TARNAME "$PACKAGE_TARNAME"

26254

_ACEOF

26255

26256

26257

cat >>confdefs.h <<_ACEOF

26258

#define PACKAGE_VERSION "$PACKAGE_VERSION"

26259

_ACEOF

26260

26261

26262

cat >>confdefs.h <<_ACEOF

26263

#define PACKAGE_STRING "$PACKAGE_STRING"

26264

_ACEOF

26265

26266

26267

cat >>confdefs.h <<_ACEOF

26268

#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"

26269

_ACEOF

26270

26271

+cat >>confdefs.h <<_ACEOF

26272

+#define PACKAGE_URL "$PACKAGE_URL"

26273

+_ACEOF

26274

26275

26276

# Let the site file select an alternate cache file if it wants to.

26277

-# Prefer explicitly selected file to automatically selected ones.

26278

+# Prefer an explicitly selected file to automatically selected ones.

26279

+ac_site_file1=NONE

26280

+ac_site_file2=NONE

23503

@@ -2245,7 +2112,12 @@ _ACEOF

23504

ac_site_file1=NONE

23505

ac_site_file2=NONE

26281

23506

if test -n "$CONFIG_SITE"; then

26282

- set x "$CONFIG_SITE"

23507

- ac_site_file1=$CONFIG_SITE

26283

23508

+ # We do not want a PATH search for config.site.

26284

23509

+ case $CONFIG_SITE in #((

26285

23510

+ -*) ac_site_file1=./$CONFIG_SITE;;

26287

23512

+ *) ac_site_file1=./$CONFIG_SITE;;

26288

23513

+ esac

26289

23514

elif test "x$prefix" != xNONE; then

26290

- set x "$prefix/share/config.site" "$prefix/etc/config.site"

26291

+ ac_site_file1=$prefix/share/config.site

26292

+ ac_site_file2=$prefix/etc/config.site

26293

else

26294

- set x "$ac_default_prefix/share/config.site" \

26295

- "$ac_default_prefix/etc/config.site"

26296

+ ac_site_file1=$ac_default_prefix/share/config.site

26297

+ ac_site_file2=$ac_default_prefix/etc/config.site

26298

26299

-shift

26300

-for ac_site_file

26301

+for ac_site_file in "$ac_site_file1" "$ac_site_file2"

26302

26303

- if test -r "$ac_site_file"; then

26304

- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5

26305

-echo "$as_me: loading site script $ac_site_file" >&6;}

26306

+ test "x$ac_site_file" = xNONE && continue

26307

+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then

26308

+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5

26309

+$as_echo "$as_me: loading site script $ac_site_file" >&6;}

23515

ac_site_file1=$prefix/share/config.site

23516

ac_site_file2=$prefix/etc/config.site

23517

@@ -2260,7 +2132,11 @@ do

23518

{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5

23519

$as_echo "$as_me: loading site script $ac_site_file" >&6;}

26310

23520

sed 's/^/| /' "$ac_site_file" >&5

26311

23521

- . "$ac_site_file"

26312

23522

+ . "$ac_site_file" \

26313

23523

+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

26314

23524

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

26315

23525

+as_fn_error $? "failed to load site script $ac_site_file

26316

+See \`config.log' for more details" "$LINENO" 5 ; }

26317

26318

done

26319

26320

if test -r "$cache_file"; then

26321

- # Some versions of bash will fail to source /dev/null (special

26322

- # files actually), so we avoid doing that.

26323

- if test -f "$cache_file"; then

26324

- { echo "$as_me:$LINENO: loading cache $cache_file" >&5

26325

-echo "$as_me: loading cache $cache_file" >&6;}

26326

+ # Some versions of bash will fail to source /dev/null (special files

26327

+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.

26328

+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then

26329

+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5

26330

+$as_echo "$as_me: loading cache $cache_file" >&6;}

26331

case $cache_file in

26332

[\\/]* | ?:[\\/]* ) . "$cache_file";;

26333

*) . "./$cache_file";;

26334

esac

26335

26336

else

26337

- { echo "$as_me:$LINENO: creating cache $cache_file" >&5

26338

-echo "$as_me: creating cache $cache_file" >&6;}

26339

+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5

26340

+$as_echo "$as_me: creating cache $cache_file" >&6;}

26341

>$cache_file

26342

26343

26344

@@ -1864,68 +2293,56 @@ for ac_var in $ac_precious_vars; do

26345

eval ac_new_val=\$ac_env_${ac_var}_value

26346

case $ac_old_set,$ac_new_set in

26347

set,)

26348

- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

26349

-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}

26350

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

26351

+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}

26352

ac_cache_corrupted=: ;;

26353

,set)

26354

- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5

26355

-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}

26356

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5

26357

+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}

26358

ac_cache_corrupted=: ;;

26359

,);;

26360

26361

if test "x$ac_old_val" != "x$ac_new_val"; then

26362

- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5

26363

-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

26364

- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5

26365

-echo "$as_me: former value: $ac_old_val" >&2;}

26366

- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5

26367

-echo "$as_me: current value: $ac_new_val" >&2;}

26368

- ac_cache_corrupted=:

26369

+ # differences in whitespace do not lead to failure.

26370

+ ac_old_val_w=`echo x $ac_old_val`

26371

+ ac_new_val_w=`echo x $ac_new_val`

26372

+ if test "$ac_old_val_w" != "$ac_new_val_w"; then

26373

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5

26374

+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

26375

+ ac_cache_corrupted=:

26376

+ else

26377

+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5

26378

+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}

26379

+ eval $ac_var=\$ac_old_val

26380

+ fi

26381

+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5

26382

+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}

26383

+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5

26384

+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}

26385

fi;;

26386

esac

26387

# Pass precious variables to config.status.

26388

if test "$ac_new_set" = set; then

26389

case $ac_new_val in

26390

- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;

26391

+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;

26392

*) ac_arg=$ac_var=$ac_new_val ;;

26393

esac

26394

case " $ac_configure_args " in

26395

*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.

26396

- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;

26397

+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;

26398

esac

26399

26400

done

26401

if $ac_cache_corrupted; then

26402

- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5

26403

-echo "$as_me: error: changes in the environment can compromise the build" >&2;}

26404

- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5

26405

-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}

26406

- { (exit 1); exit 1; }; }

26407

-fi

26408

26409

26410

26411

26412

26413

26414

26415

26416

26417

26418

26419

26420

26421

26422

26423

26424

26425

26426

26427

26428

26429

26430

26431

26432

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

26433

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

26434

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5

26435

+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}

23526

+See \`config.log' for more details" "$LINENO" 5; }

23527

23528

done

23529

23530

@@ -2336,7 +2212,7 @@ if $ac_cache_corrupted; then

23531

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

23532

{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5

23533

$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}

23534

- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5

26436

23535

+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5

26437

+fi

26438

+## -------------------- ##

26439

+## Main body of script. ##

26440

+## -------------------- ##

23536

23537

## -------------------- ##

23538

## Main body of script. ##

23539

@@ -2355,16 +2231,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

26441

23540

26442

ac_ext=c

26443

ac_cpp='$CPP $CPPFLAGS'

26444

@@ -1955,9 +2372,7 @@ for ac_dir in build-aux "$srcdir"/build-

26445

23541

ac_aux_dir=

23542

for ac_dir in build-aux "$srcdir"/build-aux; do

23543

- for ac_t in install-sh install.sh shtool; do

23544

- if test -f "$ac_dir/$ac_t"; then

23545

- ac_aux_dir=$ac_dir

23546

- ac_install_sh="$ac_aux_dir/$ac_t -c"

23547

- break 2

23548

- fi

23549

- done

23550

+ if test -f "$ac_dir/install-sh"; then

23551

+ ac_aux_dir=$ac_dir

23552

+ ac_install_sh="$ac_aux_dir/install-sh -c"

23553

+ break

23554

+ elif test -f "$ac_dir/install.sh"; then

23555

+ ac_aux_dir=$ac_dir

23556

+ ac_install_sh="$ac_aux_dir/install.sh -c"

23557

+ break

23558

+ elif test -f "$ac_dir/shtool"; then

23559

+ ac_aux_dir=$ac_dir

23560

+ ac_install_sh="$ac_aux_dir/shtool install -c"

23561

+ break

23562

+ fi

26446

23563

done

26447

23564

if test -z "$ac_aux_dir"; then

26448

- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build-aux \"$srcdir\"/build-aux" >&5

26449

-echo "$as_me: error: cannot find install-sh or install.sh in build-aux \"$srcdir\"/build-aux" >&2;}

26450

- { (exit 1); exit 1; }; }

23565

- as_fn_error "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5

26451

23566

+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5

26452

23567

26453

23568

26454

23569

# These three variables are undocumented and unsupported,

26455

@@ -1979,7 +2394,7 @@ ac_config_files="$ac_config_files script

26456

# Initialize Automake with various options. We require at least v1.9, prevent

26457

# pedantic complaints about package files, and enable various distribution

26458

# targets.

26459

-am__api_version='1.10'

26460

+am__api_version='1.11'

26461

26462

# Find a good install program. We prefer a C program (faster),

26463

# so one script is as good as another. But avoid the broken or

26464

@@ -1994,22 +2409,23 @@ am__api_version='1.10'

26465

# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"

26466

# OS/2's system install, which has a completely different semantic

26467

# ./install, which can be erroneously created by make from ./install.sh.

26468

-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5

26469

-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }

26470

+# Reject install programs that cannot install multiple files.

26471

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5

26472

+$as_echo_n "checking for a BSD-compatible install... " >&6; }

23570

@@ -2405,7 +2287,7 @@ am__api_version='1.11'

23571

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5

23572

$as_echo_n "checking for a BSD-compatible install... " >&6; }

26473

23573

if test -z "$INSTALL"; then

26474

-if test "${ac_cv_path_install+set}" = set; then

26475

- echo $ECHO_N "(cached) $ECHO_C" >&6

26476

+if test "${ac_cv_path_install+set}" = set; then :

26477

+ $as_echo_n "(cached) " >&6

23574

-if test "${ac_cv_path_install+set}" = set; then :

23575

+if ${ac_cv_path_install+:} false; then :

23576

$as_echo_n "(cached) " >&6

26478

23577

else

26479

23578

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

26480

for as_dir in $PATH

26481

26482

IFS=$as_save_IFS

26483

test -z "$as_dir" && as_dir=.

26484

- # Account for people who put trailing slashes in PATH elements.

26485

-case $as_dir/ in

26486

- ./ | .// | /cC/* | \

26487

+ # Account for people who put trailing slashes in PATH elements.

26488

+case $as_dir/ in #((

26489

+ ./ | .// | /[cC]/* | \

26490

/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \

26491

- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \

26492

+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \

26493

/usr/ucb/* ) ;;

26494

26495

# OSF1 and SCO ODT 3.0 have their own names for install.

26496

@@ -2027,17 +2443,29 @@ case $as_dir/ in

26497

# program-specific install script used by HP pwplus--don't use.

26498

26499

else

26500

- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"

26501

- break 3

26502

+ rm -rf conftest.one conftest.two conftest.dir

26503

+ echo one > conftest.one

26504

+ echo two > conftest.two

26505

+ mkdir conftest.dir

26506

+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&

26507

+ test -s conftest.one && test -s conftest.two &&

26508

+ test -s conftest.dir/conftest.one &&

26509

+ test -s conftest.dir/conftest.two

26510

+ then

26511

+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"

26512

+ break 3

26513

+ fi

26514

26515

26516

done

26517

done

26518

;;

26519

esac

26520

-done

26521

26522

+ done

26523

IFS=$as_save_IFS

26524

26525

+rm -rf conftest.one conftest.two conftest.dir

26526

26527

26528

if test "${ac_cv_path_install+set}" = set; then

26529

@@ -2050,8 +2478,8 @@ fi

26530

INSTALL=$ac_install_sh

26531

26532

26533

-{ echo "$as_me:$LINENO: result: $INSTALL" >&5

26534

-echo "${ECHO_T}$INSTALL" >&6; }

26535

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5

26536

+$as_echo "$INSTALL" >&6; }

26537

26538

# Use test -z because SunOS4 sh mishandles braces in ${var-val}.

26539

# It thinks the first close brace ends the variable substitution.

26540

@@ -2061,21 +2489,34 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR

26541

26542

test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

26543

26544

-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5

26545

-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }

26546

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5

26547

+$as_echo_n "checking whether build environment is sane... " >&6; }

26548

# Just in case

26549

sleep 1

26550

echo timestamp > conftest.file

26551

+# Reject unsafe characters in $srcdir or the absolute working directory

26552

+# name. Accept space and tab only in the latter.

26553

+am_lf='

26554

26555

+case `pwd` in

26556

+ *[\\\"\#\$\&\'\`$am_lf]*)

26557

+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;

26558

+esac

26559

+case $srcdir in

26560

+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)

26561

+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;

26562

+esac

26563

23579

@@ -2492,11 +2374,11 @@ am_lf='

23580

23581

case `pwd` in

23582

*[\\\"\#\$\&\'\`$am_lf]*)

23583

- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;

23584

+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;

23585

esac

23586

case $srcdir in

23587

*[\\\"\#\$\&\'\`$am_lf\ \ ]*)

23588

- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;

23589

+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;

23590

esac

23591

26564

23592

# Do `set' in a subshell so we don't clobber the current shell's

26565

# arguments. Must try -L first in case configure is actually a

26566

# symlink; some systems play weird games with the mod time of symlinks

26567

# (eg FreeBSD returns the mod time of the symlink's containing

26568

# directory).

26569

if (

26570

- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`

26571

+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

26572

if test "$*" = "X"; then

26573

# -L didn't work.

26574

- set X `ls -t $srcdir/configure conftest.file`

26575

+ set X `ls -t "$srcdir/configure" conftest.file`

26576

26577

rm -f conftest.file

26578

if test "$*" != "X $srcdir/configure conftest.file" \

26579

@@ -2085,11 +2526,8 @@ if (

23593

@@ -2518,7 +2400,7 @@ if (

26580

23594

# if, for instance, CONFIG_SHELL is bash and it inherits a

26581

23595

# broken ls alias from the environment. This has actually

26582

23596

# happened. Such a system could not be considered "sane".

26583

- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken

26584

-alias in your environment" >&5

26585

-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken

26586

-alias in your environment" >&2;}

26587

- { (exit 1); exit 1; }; }

23597

- as_fn_error "ls -t appears to fail. Make sure there is not a broken

26588

23598

+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken

26589

+alias in your environment" "$LINENO" 5

23599

alias in your environment" "$LINENO" 5

26590

23600

26591

23601

26592

test "$2" = conftest.file

26593

@@ -2098,52 +2536,162 @@ then

23602

@@ -2528,7 +2410,7 @@ then

26594

23603

# Ok.

26595

23604

26596

23605

else

26597

- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!

26598

-Check your system clock" >&5

26599

-echo "$as_me: error: newly created file is older than distributed files!

26600

-Check your system clock" >&2;}

26601

- { (exit 1); exit 1; }; }

23606

- as_fn_error "newly created file is older than distributed files!

26602

23607

+ as_fn_error $? "newly created file is older than distributed files!

26603

+Check your system clock" "$LINENO" 5

26604

26605

-{ echo "$as_me:$LINENO: result: yes" >&5

26606

-echo "${ECHO_T}yes" >&6; }

26607

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

26608

+$as_echo "yes" >&6; }

26609

test "$program_prefix" != NONE &&

26610

program_transform_name="s&^&$program_prefix&;$program_transform_name"

26611

# Use a double $ so make ignores it.

26612

test "$program_suffix" != NONE &&

26613

program_transform_name="s&\$&$program_suffix&;$program_transform_name"

26614

-# Double any \ or $. echo might interpret backslashes.

26615

+# Double any \ or $.

26616

# By default was `s,x,x', remove it if useless.

26617

-cat <<\_ACEOF >conftest.sed

26618

-s/[\\$]/&&/g;s/;s,x,x,$//

26619

-_ACEOF

26620

-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`

26621

-rm -f conftest.sed

26622

+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'

26623

+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`

26624

26625

# expand $ac_aux_dir to an absolute path

26626

am_aux_dir=`cd $ac_aux_dir && pwd`

26627

26628

-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"

26629

+if test x"${MISSING+set}" != xset; then

26630

+ case $am_aux_dir in

26631

+ *\ * | *\ *)

26632

+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;

26633

+ *)

26634

+ MISSING="\${SHELL} $am_aux_dir/missing" ;;

26635

+ esac

26636

+fi

26637

# Use eval to expand $SHELL

26638

if eval "$MISSING --run true"; then

26639

am_missing_run="$MISSING --run "

26640

else

26641

am_missing_run=

26642

- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5

26643

-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

26644

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5

26645

+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

26646

+fi

26647

26648

+if test x"${install_sh}" != xset; then

26649

+ case $am_aux_dir in

26650

+ *\ * | *\ *)

26651

+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

26652

+ *)

26653

+ install_sh="\${SHELL} $am_aux_dir/install-sh"

26654

+ esac

26655

+fi

26656

26657

+# Installed binaries are usually stripped using `strip' when the user

26658

+# run `make install-strip'. However `strip' might not be the right

26659

+# tool to use in cross-compilation environments, therefore Automake

26660

+# will honor the `STRIP' environment variable to overrule this program.

26661

+if test "$cross_compiling" != no; then

26662

+ if test -n "$ac_tool_prefix"; then

26663

+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

26664

+set dummy ${ac_tool_prefix}strip; ac_word=$2

26665

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

26666

+$as_echo_n "checking for $ac_word... " >&6; }

26667

+if test "${ac_cv_prog_STRIP+set}" = set; then :

26668

+ $as_echo_n "(cached) " >&6

26669

+else

26670

+ if test -n "$STRIP"; then

26671

+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

26672

+else

26673

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

26674

+for as_dir in $PATH

26675

+do

26676

+ IFS=$as_save_IFS

26677

+ test -z "$as_dir" && as_dir=.

26678

+ for ac_exec_ext in '' $ac_executable_extensions; do

26679

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

26680

+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"

26681

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

26682

+ break 2

26683

+ fi

26684

+done

26685

+ done

26686

+IFS=$as_save_IFS

26687

26688

+fi

26689

+fi

26690

+STRIP=$ac_cv_prog_STRIP

26691

+if test -n "$STRIP"; then

26692

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5

26693

+$as_echo "$STRIP" >&6; }

26694

+else

26695

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

26696

+$as_echo "no" >&6; }

26697

+fi

26698

26699

26700

+fi

26701

+if test -z "$ac_cv_prog_STRIP"; then

26702

+ ac_ct_STRIP=$STRIP

26703

+ # Extract the first word of "strip", so it can be a program name with args.

26704

+set dummy strip; ac_word=$2

26705

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

26706

+$as_echo_n "checking for $ac_word... " >&6; }

26707

+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :

26708

+ $as_echo_n "(cached) " >&6

26709

+else

26710

+ if test -n "$ac_ct_STRIP"; then

26711

+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

26712

+else

26713

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

26714

+for as_dir in $PATH

26715

+do

26716

+ IFS=$as_save_IFS

26717

+ test -z "$as_dir" && as_dir=.

26718

+ for ac_exec_ext in '' $ac_executable_extensions; do

26719

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

26720

+ ac_cv_prog_ac_ct_STRIP="strip"

26721

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

26722

+ break 2

26723

+ fi

26724

+done

26725

+ done

26726

+IFS=$as_save_IFS

26727

26728

+fi

26729

+fi

26730

+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

26731

+if test -n "$ac_ct_STRIP"; then

26732

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5

26733

+$as_echo "$ac_ct_STRIP" >&6; }

26734

+else

26735

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

26736

+$as_echo "no" >&6; }

26737

+fi

26738

26739

+ if test "x$ac_ct_STRIP" = x; then

26740

+ STRIP=":"

26741

+ else

26742

+ case $cross_compiling:$ac_tool_warned in

26743

+yes:)

26744

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

26745

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

26746

+ac_tool_warned=yes ;;

26747

+esac

26748

+ STRIP=$ac_ct_STRIP

26749

+ fi

26750

+else

26751

+ STRIP="$ac_cv_prog_STRIP"

26752

+fi

26753

26754

26755

+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

26756

26757

-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5

26758

-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }

26759

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5

26760

+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }

23608

Check your system clock" "$LINENO" 5

23609

23610

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

23611

@@ -2582,7 +2464,7 @@ if test "$cross_compiling" != no; then

23612

set dummy ${ac_tool_prefix}strip; ac_word=$2

23613

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

23614

$as_echo_n "checking for $ac_word... " >&6; }

23615

-if test "${ac_cv_prog_STRIP+set}" = set; then :

23616

+if ${ac_cv_prog_STRIP+:} false; then :

23617

$as_echo_n "(cached) " >&6

23618

else

23619

if test -n "$STRIP"; then

23620

@@ -2622,7 +2504,7 @@ if test -z "$ac_cv_prog_STRIP"; then

23621

set dummy strip; ac_word=$2

23622

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

23623

$as_echo_n "checking for $ac_word... " >&6; }

23624

-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :

23625

+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :

23626

$as_echo_n "(cached) " >&6

23627

else

23628

if test -n "$ac_ct_STRIP"; then

23629

@@ -2675,7 +2557,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c

23630

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5

23631

$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }

26761

23632

if test -z "$MKDIR_P"; then

26762

- if test "${ac_cv_path_mkdir+set}" = set; then

26763

- echo $ECHO_N "(cached) $ECHO_C" >&6

26764

+ if test "${ac_cv_path_mkdir+set}" = set; then :

26765

+ $as_echo_n "(cached) " >&6

23633

- if test "${ac_cv_path_mkdir+set}" = set; then :

23634

+ if ${ac_cv_path_mkdir+:} false; then :

23635

$as_echo_n "(cached) " >&6

26766

23636

else

26767

23637

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

26768

for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin

26769

26770

IFS=$as_save_IFS

26771

test -z "$as_dir" && as_dir=.

26772

- for ac_prog in mkdir gmkdir; do

26773

+ for ac_prog in mkdir gmkdir; do

26774

for ac_exec_ext in '' $ac_executable_extensions; do

26775

{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue

26776

case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(

26777

@@ -2155,11 +2703,12 @@ do

26778

esac

26779

done

26780

done

26781

-done

26782

+ done

26783

IFS=$as_save_IFS

26784

26785

26786

26787

+ test -d ./--version && rmdir ./--version

26788

if test "${ac_cv_path_mkdir+set}" = set; then

26789

MKDIR_P="$ac_cv_path_mkdir -p"

26790

else

26791

@@ -2167,12 +2716,11 @@ fi

26792

# value for MKDIR_P within a source directory, because that will

26793

# break other packages using the cache if that directory is

26794

# removed, or if the value is a relative name.

26795

- test -d ./--version && rmdir ./--version

26796

MKDIR_P="$ac_install_sh -d"

26797

26798

26799

-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5

26800

-echo "${ECHO_T}$MKDIR_P" >&6; }

26801

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5

26802

+$as_echo "$MKDIR_P" >&6; }

26803

26804

mkdir_p="$MKDIR_P"

26805

case $mkdir_p in

26806

@@ -2184,10 +2732,10 @@ for ac_prog in gawk mawk nawk awk

26807

26808

# Extract the first word of "$ac_prog", so it can be a program name with args.

23638

@@ -2726,7 +2608,7 @@ do

26809

23639

set dummy $ac_prog; ac_word=$2

26810

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

26811

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

26812

-if test "${ac_cv_prog_AWK+set}" = set; then

26813

- echo $ECHO_N "(cached) $ECHO_C" >&6

26814

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

26815

+$as_echo_n "checking for $ac_word... " >&6; }

26816

+if test "${ac_cv_prog_AWK+set}" = set; then :

26817

+ $as_echo_n "(cached) " >&6

23640

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

23641

$as_echo_n "checking for $ac_word... " >&6; }

23642

-if test "${ac_cv_prog_AWK+set}" = set; then :

23643

+if ${ac_cv_prog_AWK+:} false; then :

23644

$as_echo_n "(cached) " >&6

26818

23645

else

26819

23646

if test -n "$AWK"; then

26820

ac_cv_prog_AWK="$AWK" # Let the user override the test.

26821

@@ -2197,43 +2745,44 @@ for as_dir in $PATH

26822

26823

IFS=$as_save_IFS

26824

test -z "$as_dir" && as_dir=.

26825

- for ac_exec_ext in '' $ac_executable_extensions; do

26826

+ for ac_exec_ext in '' $ac_executable_extensions; do

26827

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

26828

ac_cv_prog_AWK="$ac_prog"

26829

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

26830

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

26831

break 2

26832

26833

done

26834

-done

26835

+ done

26836

IFS=$as_save_IFS

26837

26838

26839

26840

AWK=$ac_cv_prog_AWK

26841

if test -n "$AWK"; then

26842

- { echo "$as_me:$LINENO: result: $AWK" >&5

26843

-echo "${ECHO_T}$AWK" >&6; }

26844

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5

26845

+$as_echo "$AWK" >&6; }

26846

else

26847

- { echo "$as_me:$LINENO: result: no" >&5

26848

-echo "${ECHO_T}no" >&6; }

26849

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

26850

+$as_echo "no" >&6; }

26851

26852

26853

26854

test -n "$AWK" && break

26855

done

26856

26857

-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5

26858

-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }

26859

-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

26860

-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then

26861

- echo $ECHO_N "(cached) $ECHO_C" >&6

26862

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5

26863

+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }

26864

+set x ${MAKE-make}

26865

+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

26866

+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :

26867

+ $as_echo_n "(cached) " >&6

23647

@@ -2766,7 +2648,7 @@ done

23648

$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }

23649

set x ${MAKE-make}

23650

ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

23651

-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :

23652

+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :

23653

$as_echo_n "(cached) " >&6

26868

23654

else

26869

23655

cat >conftest.make <<\_ACEOF

26870

SHELL = /bin/sh

23656

@@ -2774,7 +2656,7 @@ SHELL = /bin/sh

26871

23657

all:

26872

23658

@echo '@@@%%%=$(MAKE)=@@@%%%'

26873

23659

_ACEOF

26876

23662

case `${MAKE-make} -f conftest.make 2>/dev/null` in

26877

23663

*@@@%%%=?*=@@@%%%*)

26878

23664

eval ac_cv_prog_make_${ac_make}_set=yes;;

26879

@@ -2243,12 +2792,12 @@ esac

26880

rm -f conftest.make

26881

26882

if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then

26883

- { echo "$as_me:$LINENO: result: yes" >&5

26884

-echo "${ECHO_T}yes" >&6; }

26885

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

26886

+$as_echo "yes" >&6; }

26887

SET_MAKE=

26888

else

26889

- { echo "$as_me:$LINENO: result: no" >&5

26890

-echo "${ECHO_T}no" >&6; }

26891

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

26892

+$as_echo "no" >&6; }

26893

SET_MAKE="MAKE=${MAKE-make}"

26894

26895

26896

@@ -2267,9 +2816,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"

23665

@@ -2808,7 +2690,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"

26897

23666

am__isrc=' -I$(srcdir)'

26898

23667

# test to see if srcdir already configured

26899

23668

if test -f $srcdir/config.status; then

26900

- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5

26901

-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}

26902

- { (exit 1); exit 1; }; }

23669

- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5

26903

23670

+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5

26904

23671

26905

23672

26906

23673

26907

@@ -2283,142 +2830,36 @@ if test -z "$CYGPATH_W"; then

26908

26909

26910

26911

-# Define the identity of the package.

26912

- PACKAGE='gtest'

26913

- VERSION='1.4.0'

26914

26915

26916

-cat >>confdefs.h <<_ACEOF

26917

-#define PACKAGE "$PACKAGE"

26918

-_ACEOF

26919

26920

26921

-cat >>confdefs.h <<_ACEOF

26922

-#define VERSION "$VERSION"

26923

-_ACEOF

26924

26925

-# Some tools Automake needs.

26926

26927

-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}

26928

26929

26930

-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}

26931

26932

26933

-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}

26934

26935

26936

-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}

26937

26938

26939

-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}

26940

26941

-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}

26942

26943

-# Installed binaries are usually stripped using `strip' when the user

26944

-# run `make install-strip'. However `strip' might not be the right

26945

-# tool to use in cross-compilation environments, therefore Automake

26946

-# will honor the `STRIP' environment variable to overrule this program.

26947

-if test "$cross_compiling" != no; then

26948

- if test -n "$ac_tool_prefix"; then

26949

- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

26950

-set dummy ${ac_tool_prefix}strip; ac_word=$2

26951

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

26952

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

26953

-if test "${ac_cv_prog_STRIP+set}" = set; then

26954

- echo $ECHO_N "(cached) $ECHO_C" >&6

26955

-else

26956

- if test -n "$STRIP"; then

26957

- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

26958

-else

26959

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

26960

-for as_dir in $PATH

26961

-do

26962

- IFS=$as_save_IFS

26963

- test -z "$as_dir" && as_dir=.

26964

- for ac_exec_ext in '' $ac_executable_extensions; do

26965

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

26966

- ac_cv_prog_STRIP="${ac_tool_prefix}strip"

26967

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

26968

- break 2

26969

- fi

26970

-done

26971

-done

26972

-IFS=$as_save_IFS

26973

26974

-fi

26975

-fi

26976

-STRIP=$ac_cv_prog_STRIP

26977

-if test -n "$STRIP"; then

26978

- { echo "$as_me:$LINENO: result: $STRIP" >&5

26979

-echo "${ECHO_T}$STRIP" >&6; }

26980

-else

26981

- { echo "$as_me:$LINENO: result: no" >&5

26982

-echo "${ECHO_T}no" >&6; }

26983

-fi

26984

26985

26986

-fi

26987

-if test -z "$ac_cv_prog_STRIP"; then

26988

- ac_ct_STRIP=$STRIP

26989

- # Extract the first word of "strip", so it can be a program name with args.

26990

-set dummy strip; ac_word=$2

26991

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

26992

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

26993

-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then

26994

- echo $ECHO_N "(cached) $ECHO_C" >&6

26995

-else

26996

- if test -n "$ac_ct_STRIP"; then

26997

- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

26998

-else

26999

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

27000

-for as_dir in $PATH

27001

-do

27002

- IFS=$as_save_IFS

27003

- test -z "$as_dir" && as_dir=.

27004

- for ac_exec_ext in '' $ac_executable_extensions; do

27005

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

27006

- ac_cv_prog_ac_ct_STRIP="strip"

27007

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

27008

- break 2

27009

- fi

27010

-done

27011

-done

27012

-IFS=$as_save_IFS

27013

27014

-fi

27015

-fi

27016

-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

27017

-if test -n "$ac_ct_STRIP"; then

27018

- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

27019

-echo "${ECHO_T}$ac_ct_STRIP" >&6; }

27020

-else

27021

- { echo "$as_me:$LINENO: result: no" >&5

27022

-echo "${ECHO_T}no" >&6; }

27023

-fi

27024

27025

- if test "x$ac_ct_STRIP" = x; then

27026

- STRIP=":"

27027

- else

27028

- case $cross_compiling:$ac_tool_warned in

27029

-yes:)

27030

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

27031

-whose name does not start with the host triplet. If you think this

27032

-configuration is useful to you, please write to autoconf@gnu.org." >&5

27033

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

27034

-whose name does not start with the host triplet. If you think this

27035

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

27036

-ac_tool_warned=yes ;;

27037

-esac

27038

- STRIP=$ac_ct_STRIP

27039

- fi

27040

-else

27041

- STRIP="$ac_cv_prog_STRIP"

27042

-fi

27043

27044

-fi

27045

-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

27046

27047

+# Define the identity of the package.

27048

+ PACKAGE='gtest'

27049

+ VERSION='1.4.0'

27050

27051

27052

+cat >>confdefs.h <<_ACEOF

27053

+#define PACKAGE "$PACKAGE"

27054

+_ACEOF

27055

27056

27057

+cat >>confdefs.h <<_ACEOF

27058

+#define VERSION "$VERSION"

27059

+_ACEOF

27060

27061

+# Some tools Automake needs.

27062

27063

+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}

27064

27065

27066

+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}

27067

27068

27069

+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}

27070

27071

27072

+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}

27073

27074

27075

+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}

27076

27077

# We need awk for the "check" target. The system "awk" is bad on

27078

# some platforms.

27079

# Always define AMTAR for backward compatibility.

27080

@@ -2441,10 +2882,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

27081

if test -n "$ac_tool_prefix"; then

27082

# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

23674

@@ -2876,7 +2758,7 @@ if test -n "$ac_tool_prefix"; then

27083

23675

set dummy ${ac_tool_prefix}gcc; ac_word=$2

27084

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

27085

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

27086

-if test "${ac_cv_prog_CC+set}" = set; then

27087

- echo $ECHO_N "(cached) $ECHO_C" >&6

27088

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

27089

+$as_echo_n "checking for $ac_word... " >&6; }

27090

+if test "${ac_cv_prog_CC+set}" = set; then :

27091

+ $as_echo_n "(cached) " >&6

23676

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

23677

$as_echo_n "checking for $ac_word... " >&6; }

23678

-if test "${ac_cv_prog_CC+set}" = set; then :

23679

+if ${ac_cv_prog_CC+:} false; then :

23680

$as_echo_n "(cached) " >&6

27092

23681

else

27093

23682

if test -n "$CC"; then

27094

ac_cv_prog_CC="$CC" # Let the user override the test.

27095

@@ -2454,25 +2895,25 @@ for as_dir in $PATH

27096

27097

IFS=$as_save_IFS

27098

test -z "$as_dir" && as_dir=.

27099

- for ac_exec_ext in '' $ac_executable_extensions; do

27100

+ for ac_exec_ext in '' $ac_executable_extensions; do

27101

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

27102

ac_cv_prog_CC="${ac_tool_prefix}gcc"

27103

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

27104

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

27105

break 2

27106

27107

done

27108

-done

27109

+ done

27110

IFS=$as_save_IFS

27111

27112

27113

27114

CC=$ac_cv_prog_CC

27115

if test -n "$CC"; then

27116

- { echo "$as_me:$LINENO: result: $CC" >&5

27117

-echo "${ECHO_T}$CC" >&6; }

27118

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

27119

+$as_echo "$CC" >&6; }

27120

else

27121

- { echo "$as_me:$LINENO: result: no" >&5

27122

-echo "${ECHO_T}no" >&6; }

27123

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

27124

+$as_echo "no" >&6; }

27125

27126

27127

27128

@@ -2481,10 +2922,10 @@ if test -z "$ac_cv_prog_CC"; then

27129

ac_ct_CC=$CC

27130

# Extract the first word of "gcc", so it can be a program name with args.

23683

@@ -2916,7 +2798,7 @@ if test -z "$ac_cv_prog_CC"; then

27131

23684

set dummy gcc; ac_word=$2

27132

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

27133

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

27134

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

27135

- echo $ECHO_N "(cached) $ECHO_C" >&6

27136

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

27137

+$as_echo_n "checking for $ac_word... " >&6; }

27138

+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

27139

+ $as_echo_n "(cached) " >&6

23685

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

23686

$as_echo_n "checking for $ac_word... " >&6; }

23687

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

23688

+if ${ac_cv_prog_ac_ct_CC+:} false; then :

23689

$as_echo_n "(cached) " >&6

27140

23690

else

27141

23691

if test -n "$ac_ct_CC"; then

27142

ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

27143

@@ -2494,25 +2935,25 @@ for as_dir in $PATH

27144

27145

IFS=$as_save_IFS

27146

test -z "$as_dir" && as_dir=.

27147

- for ac_exec_ext in '' $ac_executable_extensions; do

27148

+ for ac_exec_ext in '' $ac_executable_extensions; do

27149

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

27150

ac_cv_prog_ac_ct_CC="gcc"

27151

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

27152

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

27153

break 2

27154

27155

done

27156

-done

27157

+ done

27158

IFS=$as_save_IFS

27159

27160

27161

27162

ac_ct_CC=$ac_cv_prog_ac_ct_CC

27163

if test -n "$ac_ct_CC"; then

27164

- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

27165

-echo "${ECHO_T}$ac_ct_CC" >&6; }

27166

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

27167

+$as_echo "$ac_ct_CC" >&6; }

27168

else

27169

- { echo "$as_me:$LINENO: result: no" >&5

27170

-echo "${ECHO_T}no" >&6; }

27171

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

27172

+$as_echo "no" >&6; }

27173

27174

27175

if test "x$ac_ct_CC" = x; then

27176

@@ -2520,12 +2961,8 @@ fi

27177

else

27178

case $cross_compiling:$ac_tool_warned in

27179

yes:)

27180

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

27181

-whose name does not start with the host triplet. If you think this

27182

-configuration is useful to you, please write to autoconf@gnu.org." >&5

27183

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

27184

-whose name does not start with the host triplet. If you think this

27185

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

27186

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

27187

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

27188

ac_tool_warned=yes ;;

27189

esac

27190

CC=$ac_ct_CC

27191

@@ -2538,10 +2975,10 @@ if test -z "$CC"; then

27192

if test -n "$ac_tool_prefix"; then

27193

# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

23692

@@ -2969,7 +2851,7 @@ if test -z "$CC"; then

27194

23693

set dummy ${ac_tool_prefix}cc; ac_word=$2

27195

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

27196

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

27197

-if test "${ac_cv_prog_CC+set}" = set; then

27198

- echo $ECHO_N "(cached) $ECHO_C" >&6

27199

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

27200

+$as_echo_n "checking for $ac_word... " >&6; }

27201

+if test "${ac_cv_prog_CC+set}" = set; then :

27202

+ $as_echo_n "(cached) " >&6

23694

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

23695

$as_echo_n "checking for $ac_word... " >&6; }

23696

-if test "${ac_cv_prog_CC+set}" = set; then :

23697

+if ${ac_cv_prog_CC+:} false; then :

23698

$as_echo_n "(cached) " >&6

27203

23699

else

27204

23700

if test -n "$CC"; then

27205

ac_cv_prog_CC="$CC" # Let the user override the test.

27206

@@ -2551,25 +2988,25 @@ for as_dir in $PATH

27207

27208

IFS=$as_save_IFS

27209

test -z "$as_dir" && as_dir=.

27210

- for ac_exec_ext in '' $ac_executable_extensions; do

27211

+ for ac_exec_ext in '' $ac_executable_extensions; do

27212

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

27213

ac_cv_prog_CC="${ac_tool_prefix}cc"

27214

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

27215

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

27216

break 2

27217

27218

done

27219

-done

27220

+ done

27221

IFS=$as_save_IFS

27222

27223

27224

27225

CC=$ac_cv_prog_CC

27226

if test -n "$CC"; then

27227

- { echo "$as_me:$LINENO: result: $CC" >&5

27228

-echo "${ECHO_T}$CC" >&6; }

27229

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

27230

+$as_echo "$CC" >&6; }

27231

else

27232

- { echo "$as_me:$LINENO: result: no" >&5

27233

-echo "${ECHO_T}no" >&6; }

27234

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

27235

+$as_echo "no" >&6; }

27236

27237

27238

27239

@@ -2578,10 +3015,10 @@ fi

27240

if test -z "$CC"; then

27241

# Extract the first word of "cc", so it can be a program name with args.

23701

@@ -3009,7 +2891,7 @@ if test -z "$CC"; then

27242

23702

set dummy cc; ac_word=$2

27243

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

27244

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

27245

-if test "${ac_cv_prog_CC+set}" = set; then

27246

- echo $ECHO_N "(cached) $ECHO_C" >&6

27247

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

27248

+$as_echo_n "checking for $ac_word... " >&6; }

27249

+if test "${ac_cv_prog_CC+set}" = set; then :

27250

+ $as_echo_n "(cached) " >&6

23703

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

23704

$as_echo_n "checking for $ac_word... " >&6; }

23705

-if test "${ac_cv_prog_CC+set}" = set; then :

23706

+if ${ac_cv_prog_CC+:} false; then :

23707

$as_echo_n "(cached) " >&6

27251

23708

else

27252

23709

if test -n "$CC"; then

27253

ac_cv_prog_CC="$CC" # Let the user override the test.

27254

@@ -2592,18 +3029,18 @@ for as_dir in $PATH

27255

27256

IFS=$as_save_IFS

27257

test -z "$as_dir" && as_dir=.

27258

- for ac_exec_ext in '' $ac_executable_extensions; do

27259

+ for ac_exec_ext in '' $ac_executable_extensions; do

27260

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

27261

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

27262

ac_prog_rejected=yes

27263

continue

27264

27265

ac_cv_prog_CC="cc"

27266

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

27267

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

27268

break 2

27269

27270

done

27271

-done

27272

+ done

27273

IFS=$as_save_IFS

27274

27275

if test $ac_prog_rejected = yes; then

27276

@@ -2622,11 +3059,11 @@ fi

27277

27278

CC=$ac_cv_prog_CC

27279

if test -n "$CC"; then

27280

- { echo "$as_me:$LINENO: result: $CC" >&5

27281

-echo "${ECHO_T}$CC" >&6; }

27282

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

27283

+$as_echo "$CC" >&6; }

27284

else

27285

- { echo "$as_me:$LINENO: result: no" >&5

27286

-echo "${ECHO_T}no" >&6; }

27287

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

27288

+$as_echo "no" >&6; }

27289

27290

27291

27292

@@ -2637,10 +3074,10 @@ if test -z "$CC"; then

27293

27294

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

23710

@@ -3068,7 +2950,7 @@ if test -z "$CC"; then

27295

23711

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

27296

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

27297

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

27298

-if test "${ac_cv_prog_CC+set}" = set; then

27299

- echo $ECHO_N "(cached) $ECHO_C" >&6

27300

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

27301

+$as_echo_n "checking for $ac_word... " >&6; }

27302

+if test "${ac_cv_prog_CC+set}" = set; then :

27303

+ $as_echo_n "(cached) " >&6

23712

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

23713

$as_echo_n "checking for $ac_word... " >&6; }

23714

-if test "${ac_cv_prog_CC+set}" = set; then :

23715

+if ${ac_cv_prog_CC+:} false; then :

23716

$as_echo_n "(cached) " >&6

27304

23717

else

27305

23718

if test -n "$CC"; then

27306

ac_cv_prog_CC="$CC" # Let the user override the test.

27307

@@ -2650,25 +3087,25 @@ for as_dir in $PATH

27308

27309

IFS=$as_save_IFS

27310

test -z "$as_dir" && as_dir=.

27311

- for ac_exec_ext in '' $ac_executable_extensions; do

27312

+ for ac_exec_ext in '' $ac_executable_extensions; do

27313

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

27314

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

27315

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

27316

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

27317

break 2

27318

27319

done

27320

-done

27321

+ done

27322

IFS=$as_save_IFS

27323

27324

27325

27326

CC=$ac_cv_prog_CC

27327

if test -n "$CC"; then

27328

- { echo "$as_me:$LINENO: result: $CC" >&5

27329

-echo "${ECHO_T}$CC" >&6; }

27330

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

27331

+$as_echo "$CC" >&6; }

27332

else

27333

- { echo "$as_me:$LINENO: result: no" >&5

27334

-echo "${ECHO_T}no" >&6; }

27335

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

27336

+$as_echo "no" >&6; }

27337

27338

27339

27340

@@ -2681,10 +3118,10 @@ if test -z "$CC"; then

27341

27342

# Extract the first word of "$ac_prog", so it can be a program name with args.

23719

@@ -3112,7 +2994,7 @@ do

27343

23720

set dummy $ac_prog; ac_word=$2

27344

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

27345

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

27346

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

27347

- echo $ECHO_N "(cached) $ECHO_C" >&6

27348

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

27349

+$as_echo_n "checking for $ac_word... " >&6; }

27350

+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

27351

+ $as_echo_n "(cached) " >&6

23721

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

23722

$as_echo_n "checking for $ac_word... " >&6; }

23723

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

23724

+if ${ac_cv_prog_ac_ct_CC+:} false; then :

23725

$as_echo_n "(cached) " >&6

27352

23726

else

27353

23727

if test -n "$ac_ct_CC"; then

27354

ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

27355

@@ -2694,25 +3131,25 @@ for as_dir in $PATH

27356

27357

IFS=$as_save_IFS

27358

test -z "$as_dir" && as_dir=.

27359

- for ac_exec_ext in '' $ac_executable_extensions; do

27360

+ for ac_exec_ext in '' $ac_executable_extensions; do

27361

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

27362

ac_cv_prog_ac_ct_CC="$ac_prog"

27363

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

27364

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

27365

break 2

27366

27367

done

27368

-done

27369

+ done

27370

IFS=$as_save_IFS

27371

27372

27373

27374

ac_ct_CC=$ac_cv_prog_ac_ct_CC

27375

if test -n "$ac_ct_CC"; then

27376

- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

27377

-echo "${ECHO_T}$ac_ct_CC" >&6; }

27378

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

27379

+$as_echo "$ac_ct_CC" >&6; }

27380

else

27381

- { echo "$as_me:$LINENO: result: no" >&5

27382

-echo "${ECHO_T}no" >&6; }

27383

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

27384

+$as_echo "no" >&6; }

27385

27386

27387

27388

@@ -2724,12 +3161,8 @@ done

27389

else

27390

case $cross_compiling:$ac_tool_warned in

27391

yes:)

27392

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

27393

-whose name does not start with the host triplet. If you think this

27394

-configuration is useful to you, please write to autoconf@gnu.org." >&5

27395

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

27396

-whose name does not start with the host triplet. If you think this

27397

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

27398

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

27399

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

27400

ac_tool_warned=yes ;;

27401

esac

27402

CC=$ac_ct_CC

27403

@@ -2739,51 +3172,37 @@ fi

27404

27405

27406

27407

-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH

27408

-See \`config.log' for more details." >&5

27409

-echo "$as_me: error: no acceptable C compiler found in \$PATH

27410

-See \`config.log' for more details." >&2;}

27411

- { (exit 1); exit 1; }; }

27412

+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

27413

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

23728

@@ -3166,8 +3048,8 @@ fi

23729

23730

test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

23731

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

23732

-as_fn_error "no acceptable C compiler found in \$PATH

23733

-See \`config.log' for more details." "$LINENO" 5; }

27414

23734

+as_fn_error $? "no acceptable C compiler found in \$PATH

27415

+See \`config.log' for more details" "$LINENO" 5 ; }

23735

+See \`config.log' for more details" "$LINENO" 5; }

27416

23736

27417

23737

# Provide some information about the compiler.

27418

-echo "$as_me:$LINENO: checking for C compiler version" >&5

27419

-ac_compiler=`set X $ac_compile; echo $2`

27420

-{ (ac_try="$ac_compiler --version >&5"

27421

-case "(($ac_try" in

27422

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27423

- *) ac_try_echo=$ac_try;;

27424

-esac

27425

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

27426

- (eval "$ac_compiler --version >&5") 2>&5

27427

- ac_status=$?

27428

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

27429

- (exit $ac_status); }

27430

-{ (ac_try="$ac_compiler -v >&5"

27431

-case "(($ac_try" in

27432

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27433

- *) ac_try_echo=$ac_try;;

27434

-esac

27435

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

27436

- (eval "$ac_compiler -v >&5") 2>&5

27437

- ac_status=$?

27438

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

27439

- (exit $ac_status); }

27440

-{ (ac_try="$ac_compiler -V >&5"

27441

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

27442

+set X $ac_compile

27443

+ac_compiler=$2

27444

+for ac_option in --version -v -V -qversion; do

27445

+ { { ac_try="$ac_compiler $ac_option >&5"

27446

case "(($ac_try" in

27447

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27448

*) ac_try_echo=$ac_try;;

27449

esac

27450

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

27451

- (eval "$ac_compiler -V >&5") 2>&5

27452

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

27453

+$as_echo "$ac_try_echo"; } >&5

27454

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

27455

ac_status=$?

27456

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

27457

- (exit $ac_status); }

27458

+ if test -s conftest.err; then

27459

+ sed '10a\

27460

+... rest of stderr output deleted ...

27461

+ 10q' conftest.err >conftest.er1

27462

+ cat conftest.er1 >&5

27463

+ fi

27464

+ rm -f conftest.er1 conftest.err

27465

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

27466

+ test $ac_status = 0; }

27467

+done

27468

27469

-cat >conftest.$ac_ext <<_ACEOF

27470

-/* confdefs.h. */

27471

-_ACEOF

27472

-cat confdefs.h >>conftest.$ac_ext

27473

-cat >>conftest.$ac_ext <<_ACEOF

27474

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27475

/* end confdefs.h. */

27476

27477

int

27478

@@ -2795,42 +3214,38 @@ main ()

27479

}

27480

_ACEOF

27481

ac_clean_files_save=$ac_clean_files

27482

-ac_clean_files="$ac_clean_files a.out a.exe b.out"

27483

+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"

27484

# Try to create an executable without -o first, disregard a.out.

27485

# It will help us diagnose broken compilers, and finding out an intuition

27486

# of exeext.

27487

-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

27488

-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }

27489

-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

27490

27491

-# List of possible output files, starting from the most likely.

27492

-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)

27493

-# only as a last resort. b.out is created by i960 compilers.

27494

-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'

27495

27496

-# The IRIX 6 linker writes into existing files which may not be

27497

-# executable, retaining their permissions. Remove them first so a

27498

-# subsequent execution test works.

27499

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5

27500

+$as_echo_n "checking whether the C compiler works... " >&6; }

27501

+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

27502

27503

+# The possible output files:

27504

+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"

27505

27506

ac_rmfiles=

27507

for ac_file in $ac_files

27508

27509

case $ac_file in

27510

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

27511

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;

27512

* ) ac_rmfiles="$ac_rmfiles $ac_file";;

27513

esac

27514

done

27515

rm -f $ac_rmfiles

27516

27517

-if { (ac_try="$ac_link_default"

27518

+if { { ac_try="$ac_link_default"

27519

case "(($ac_try" in

27520

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27521

*) ac_try_echo=$ac_try;;

27522

esac

27523

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

27524

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

27525

+$as_echo "$ac_try_echo"; } >&5

27526

(eval "$ac_link_default") 2>&5

27527

ac_status=$?

27528

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

27529

- (exit $ac_status); }; then

27530

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

27531

+ test $ac_status = 0; }; then :

27532

# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.

27533

# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'

27534

# in a Makefile. We should not override ac_cv_exeext if it was cached,

27535

@@ -2840,14 +3255,14 @@ for ac_file in $ac_files ''

27536

27537

test -f "$ac_file" || continue

27538

case $ac_file in

27539

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )

27540

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )

27541

;;

27542

[ab].out )

27543

# We found the default executable, but exeext='' is most

27544

# certainly right.

27545

break;;

27546

*.* )

27547

- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;

27548

+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;

27549

then :; else

27550

ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

27551

27552

@@ -2866,78 +3281,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeex

27553

else

27554

ac_file=''

27555

27556

27557

-{ echo "$as_me:$LINENO: result: $ac_file" >&5

27558

-echo "${ECHO_T}$ac_file" >&6; }

27559

-if test -z "$ac_file"; then

27560

- echo "$as_me: failed program was:" >&5

27561

+if test -z "$ac_file"; then :

27562

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

27563

+$as_echo "no" >&6; }

27564

+$as_echo "$as_me: failed program was:" >&5

27565

sed 's/^/| /' conftest.$ac_ext >&5

27566

27567

-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables

27568

-See \`config.log' for more details." >&5

27569

-echo "$as_me: error: C compiler cannot create executables

27570

-See \`config.log' for more details." >&2;}

27571

- { (exit 77); exit 77; }; }

27572

-fi

27573

27574

+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

27575

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

23738

$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

23739

@@ -3281,9 +3163,8 @@ sed 's/^/| /' conftest.$ac_ext >&5

23740

23741

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

23742

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

23743

-{ as_fn_set_status 77

23744

-as_fn_error "C compiler cannot create executables

23745

-See \`config.log' for more details." "$LINENO" 5; }; }

27576

23746

+as_fn_error 77 "C compiler cannot create executables

27577

+See \`config.log' for more details" "$LINENO" 5 ; }

27578

+else

27579

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

27580

+$as_echo "yes" >&6; }

27581

+fi

27582

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5

27583

+$as_echo_n "checking for C compiler default output file name... " >&6; }

27584

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5

27585

+$as_echo "$ac_file" >&6; }

27586

ac_exeext=$ac_cv_exeext

27587

27588

-# Check that the compiler produces executables we can run. If not, either

27589

-# the compiler is broken, or we cross compile.

27590

-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5

27591

-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }

27592

-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0

27593

-# If not cross compiling, check that we can run a simple program.

27594

-if test "$cross_compiling" != yes; then

27595

- if { ac_try='./$ac_file'

27596

- { (case "(($ac_try" in

27597

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27598

- *) ac_try_echo=$ac_try;;

27599

-esac

27600

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

27601

- (eval "$ac_try") 2>&5

27602

- ac_status=$?

27603

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

27604

- (exit $ac_status); }; }; then

27605

- cross_compiling=no

27606

- else

27607

- if test "$cross_compiling" = maybe; then

27608

- cross_compiling=yes

27609

- else

27610

- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.

27611

-If you meant to cross compile, use \`--host'.

27612

-See \`config.log' for more details." >&5

27613

-echo "$as_me: error: cannot run C compiled programs.

27614

-If you meant to cross compile, use \`--host'.

27615

-See \`config.log' for more details." >&2;}

27616

- { (exit 1); exit 1; }; }

27617

- fi

27618

- fi

27619

-fi

27620

-{ echo "$as_me:$LINENO: result: yes" >&5

27621

-echo "${ECHO_T}yes" >&6; }

27622

27623

-rm -f a.out a.exe conftest$ac_cv_exeext b.out

27624

+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out

27625

ac_clean_files=$ac_clean_files_save

27626

-# Check that the compiler produces executables we can run. If not, either

27627

-# the compiler is broken, or we cross compile.

27628

-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

27629

-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }

27630

-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5

27631

-echo "${ECHO_T}$cross_compiling" >&6; }

27632

27633

-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5

27634

-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }

27635

-if { (ac_try="$ac_link"

27636

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5

27637

+$as_echo_n "checking for suffix of executables... " >&6; }

27638

+if { { ac_try="$ac_link"

27639

case "(($ac_try" in

27640

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27641

*) ac_try_echo=$ac_try;;

27642

esac

27643

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

27644

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

27645

+$as_echo "$ac_try_echo"; } >&5

27646

(eval "$ac_link") 2>&5

27647

ac_status=$?

27648

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

27649

- (exit $ac_status); }; then

27650

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

27651

+ test $ac_status = 0; }; then :

27652

# If both `conftest.exe' and `conftest' are `present' (well, observable)

27653

# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will

27654

# work properly (i.e., refer to `conftest.exe'), while it won't with

27655

@@ -2945,37 +3323,90 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec

27656

for ac_file in conftest.exe conftest conftest.*; do

27657

test -f "$ac_file" || continue

27658

case $ac_file in

27659

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

27660

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;

27661

*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

27662

break;;

27663

* ) break;;

27664

esac

27665

done

27666

else

27667

- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link

27668

-See \`config.log' for more details." >&5

27669

-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link

27670

-See \`config.log' for more details." >&2;}

27671

- { (exit 1); exit 1; }; }

27672

-fi

27673

27674

-rm -f conftest$ac_cv_exeext

27675

-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5

27676

-echo "${ECHO_T}$ac_cv_exeext" >&6; }

27677

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

27678

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

23747

+See \`config.log' for more details" "$LINENO" 5; }

23748

else

23749

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

23750

$as_echo "yes" >&6; }

23751

@@ -3325,8 +3206,8 @@ done

23752

else

23753

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

23754

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

23755

-as_fn_error "cannot compute suffix of executables: cannot compile and link

23756

-See \`config.log' for more details." "$LINENO" 5; }

27679

23757

+as_fn_error $? "cannot compute suffix of executables: cannot compile and link

27680

+See \`config.log' for more details" "$LINENO" 5 ; }

27681

+fi

27682

+rm -f conftest conftest$ac_cv_exeext

27683

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5

27684

+$as_echo "$ac_cv_exeext" >&6; }

27685

27686

rm -f conftest.$ac_ext

27687

EXEEXT=$ac_cv_exeext

27688

ac_exeext=$EXEEXT

27689

-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5

27690

-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }

27691

-if test "${ac_cv_objext+set}" = set; then

27692

- echo $ECHO_N "(cached) $ECHO_C" >&6

27693

-else

27694

- cat >conftest.$ac_ext <<_ACEOF

27695

-/* confdefs.h. */

27696

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27697

+/* end confdefs.h. */

27698

+#include <stdio.h>

27699

+int

27700

+main ()

27701

27702

+FILE *f = fopen ("conftest.out", "w");

27703

+ return ferror (f) || fclose (f) != 0;

27704

27705

+ ;

27706

+ return 0;

27707

27708

_ACEOF

27709

-cat confdefs.h >>conftest.$ac_ext

27710

-cat >>conftest.$ac_ext <<_ACEOF

27711

+ac_clean_files="$ac_clean_files conftest.out"

27712

+# Check that the compiler produces executables we can run. If not, either

27713

+# the compiler is broken, or we cross compile.

27714

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5

27715

+$as_echo_n "checking whether we are cross compiling... " >&6; }

27716

+if test "$cross_compiling" != yes; then

27717

+ { { ac_try="$ac_link"

27718

+case "(($ac_try" in

27719

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27720

+ *) ac_try_echo=$ac_try;;

27721

+esac

27722

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

27723

+$as_echo "$ac_try_echo"; } >&5

27724

+ (eval "$ac_link") 2>&5

27725

+ ac_status=$?

27726

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

27727

+ test $ac_status = 0; }

27728

+ if { ac_try='./conftest$ac_cv_exeext'

27729

+ { { case "(($ac_try" in

27730

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27731

+ *) ac_try_echo=$ac_try;;

27732

+esac

27733

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

27734

+$as_echo "$ac_try_echo"; } >&5

27735

+ (eval "$ac_try") 2>&5

27736

+ ac_status=$?

27737

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

27738

+ test $ac_status = 0; }; }; then

27739

+ cross_compiling=no

27740

+ else

27741

+ if test "$cross_compiling" = maybe; then

27742

+ cross_compiling=yes

27743

+ else

27744

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

27745

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

23758

+See \`config.log' for more details" "$LINENO" 5; }

23759

23760

rm -f conftest conftest$ac_cv_exeext

23761

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5

23762

@@ -3383,9 +3264,9 @@ $as_echo "$ac_try_echo"; } >&5

23763

else

23764

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

23765

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

23766

-as_fn_error "cannot run C compiled programs.

27746

23767

+as_fn_error $? "cannot run C compiled programs.

27747

+If you meant to cross compile, use \`--host'.

27748

+See \`config.log' for more details" "$LINENO" 5 ; }

27749

+ fi

27750

+ fi

27751

+fi

27752

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5

27753

+$as_echo "$cross_compiling" >&6; }

27754

27755

+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out

27756

+ac_clean_files=$ac_clean_files_save

27757

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5

27758

+$as_echo_n "checking for suffix of object files... " >&6; }

27759

+if test "${ac_cv_objext+set}" = set; then :

27760

+ $as_echo_n "(cached) " >&6

27761

+else

27762

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27763

/* end confdefs.h. */

27764

27765

int

27766

@@ -2987,51 +3418,46 @@ main ()

27767

}

27768

_ACEOF

27769

rm -f conftest.o conftest.obj

27770

-if { (ac_try="$ac_compile"

27771

+if { { ac_try="$ac_compile"

27772

case "(($ac_try" in

27773

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27774

*) ac_try_echo=$ac_try;;

27775

esac

27776

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

27777

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

27778

+$as_echo "$ac_try_echo"; } >&5

27779

(eval "$ac_compile") 2>&5

27780

ac_status=$?

27781

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

27782

- (exit $ac_status); }; then

27783

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

27784

+ test $ac_status = 0; }; then :

27785

for ac_file in conftest.o conftest.obj conftest.*; do

27786

test -f "$ac_file" || continue;

27787

case $ac_file in

27788

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;

27789

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;

27790

*) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`

27791

break;;

27792

esac

27793

done

23768

If you meant to cross compile, use \`--host'.

23769

-See \`config.log' for more details." "$LINENO" 5; }

23770

+See \`config.log' for more details" "$LINENO" 5; }

23771

23772

23773

23774

@@ -3396,7 +3277,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex

23775

ac_clean_files=$ac_clean_files_save

23776

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5

23777

$as_echo_n "checking for suffix of object files... " >&6; }

23778

-if test "${ac_cv_objext+set}" = set; then :

23779

+if ${ac_cv_objext+:} false; then :

23780

$as_echo_n "(cached) " >&6

27794

23781

else

27795

- echo "$as_me: failed program was:" >&5

27796

+ $as_echo "$as_me: failed program was:" >&5

27797

sed 's/^/| /' conftest.$ac_ext >&5

23782

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

23783

@@ -3436,8 +3317,8 @@ sed 's/^/| /' conftest.$ac_ext >&5

27798

23784

27799

-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile

27800

-See \`config.log' for more details." >&5

27801

-echo "$as_me: error: cannot compute suffix of object files: cannot compile

27802

-See \`config.log' for more details." >&2;}

27803

- { (exit 1); exit 1; }; }

27804

+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

27805

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

23785

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

23786

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

23787

-as_fn_error "cannot compute suffix of object files: cannot compile

23788

-See \`config.log' for more details." "$LINENO" 5; }

27806

23789

+as_fn_error $? "cannot compute suffix of object files: cannot compile

27807

+See \`config.log' for more details" "$LINENO" 5 ; }

23790

+See \`config.log' for more details" "$LINENO" 5; }

27808

23791

27809

27810

23792

rm -f conftest.$ac_cv_objext conftest.$ac_ext

27811

23793

27812

-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5

27813

-echo "${ECHO_T}$ac_cv_objext" >&6; }

27814

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5

27815

+$as_echo "$ac_cv_objext" >&6; }

27816

OBJEXT=$ac_cv_objext

23794

@@ -3447,7 +3328,7 @@ OBJEXT=$ac_cv_objext

27817

23795

ac_objext=$OBJEXT

27818

-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

27819

-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }

27820

-if test "${ac_cv_c_compiler_gnu+set}" = set; then

27821

- echo $ECHO_N "(cached) $ECHO_C" >&6

27822

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5

27823

+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }

27824

+if test "${ac_cv_c_compiler_gnu+set}" = set; then :

27825

+ $as_echo_n "(cached) " >&6

27826

else

27827

- cat >conftest.$ac_ext <<_ACEOF

27828

-/* confdefs.h. */

27829

-_ACEOF

27830

-cat confdefs.h >>conftest.$ac_ext

27831

-cat >>conftest.$ac_ext <<_ACEOF

27832

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27833

/* end confdefs.h. */

27834

27835

int

27836

@@ -3045,54 +3471,34 @@ main ()

27837

return 0;

27838

}

27839

_ACEOF

27840

-rm -f conftest.$ac_objext

27841

-if { (ac_try="$ac_compile"

27842

-case "(($ac_try" in

27843

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27844

- *) ac_try_echo=$ac_try;;

27845

-esac

27846

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

27847

- (eval "$ac_compile") 2>conftest.er1

27848

- ac_status=$?

27849

- grep -v '^ *+' conftest.er1 >conftest.err

27850

- rm -f conftest.er1

27851

- cat conftest.err >&5

27852

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

27853

- (exit $ac_status); } && {

27854

- test -z "$ac_c_werror_flag" ||

27855

- test ! -s conftest.err

27856

- } && test -s conftest.$ac_objext; then

27857

+if ac_fn_c_try_compile "$LINENO"; then :

27858

ac_compiler_gnu=yes

27859

else

27860

- echo "$as_me: failed program was:" >&5

27861

-sed 's/^/| /' conftest.$ac_ext >&5

27862

27863

- ac_compiler_gnu=no

27864

+ ac_compiler_gnu=no

27865

27866

27867

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

27868

ac_cv_c_compiler_gnu=$ac_compiler_gnu

27869

27870

27871

-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

27872

-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }

27873

-GCC=`test $ac_compiler_gnu = yes && echo yes`

27874

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5

27875

+$as_echo "$ac_cv_c_compiler_gnu" >&6; }

27876

+if test $ac_compiler_gnu = yes; then

27877

+ GCC=yes

27878

+else

27879

+ GCC=

27880

+fi

27881

ac_test_CFLAGS=${CFLAGS+set}

23796

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5

23797

$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }

23798

-if test "${ac_cv_c_compiler_gnu+set}" = set; then :

23799

+if ${ac_cv_c_compiler_gnu+:} false; then :

23800

$as_echo_n "(cached) " >&6

23801

else

23802

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

23803

@@ -3484,7 +3365,7 @@ ac_test_CFLAGS=${CFLAGS+set}

27882

23804

ac_save_CFLAGS=$CFLAGS

27883

-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

27884

-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }

27885

-if test "${ac_cv_prog_cc_g+set}" = set; then

27886

- echo $ECHO_N "(cached) $ECHO_C" >&6

27887

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5

27888

+$as_echo_n "checking whether $CC accepts -g... " >&6; }

27889

+if test "${ac_cv_prog_cc_g+set}" = set; then :

27890

+ $as_echo_n "(cached) " >&6

23805

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5

23806

$as_echo_n "checking whether $CC accepts -g... " >&6; }

23807

-if test "${ac_cv_prog_cc_g+set}" = set; then :

23808

+if ${ac_cv_prog_cc_g+:} false; then :

23809

$as_echo_n "(cached) " >&6

27891

23810

else

27892

23811

ac_save_c_werror_flag=$ac_c_werror_flag

27893

ac_c_werror_flag=yes

27894

ac_cv_prog_cc_g=no

27895

CFLAGS="-g"

27896

- cat >conftest.$ac_ext <<_ACEOF

27897

-/* confdefs.h. */

27898

-_ACEOF

27899

-cat confdefs.h >>conftest.$ac_ext

27900

-cat >>conftest.$ac_ext <<_ACEOF

27901

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27902

/* end confdefs.h. */

27903

27904

int

27905

@@ -3103,34 +3509,11 @@ main ()

27906

return 0;

27907

}

27908

_ACEOF

27909

-rm -f conftest.$ac_objext

27910

-if { (ac_try="$ac_compile"

27911

-case "(($ac_try" in

27912

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27913

- *) ac_try_echo=$ac_try;;

27914

-esac

27915

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

27916

- (eval "$ac_compile") 2>conftest.er1

27917

- ac_status=$?

27918

- grep -v '^ *+' conftest.er1 >conftest.err

27919

- rm -f conftest.er1

27920

- cat conftest.err >&5

27921

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

27922

- (exit $ac_status); } && {

27923

- test -z "$ac_c_werror_flag" ||

27924

- test ! -s conftest.err

27925

- } && test -s conftest.$ac_objext; then

27926

+if ac_fn_c_try_compile "$LINENO"; then :

27927

ac_cv_prog_cc_g=yes

27928

else

27929

- echo "$as_me: failed program was:" >&5

27930

-sed 's/^/| /' conftest.$ac_ext >&5

27931

27932

- CFLAGS=""

27933

- cat >conftest.$ac_ext <<_ACEOF

27934

-/* confdefs.h. */

27935

-_ACEOF

27936

-cat confdefs.h >>conftest.$ac_ext

27937

-cat >>conftest.$ac_ext <<_ACEOF

27938

+ CFLAGS=""

27939

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27940

/* end confdefs.h. */

27941

27942

int

27943

@@ -3141,35 +3524,12 @@ main ()

27944

return 0;

27945

}

27946

_ACEOF

27947

-rm -f conftest.$ac_objext

27948

-if { (ac_try="$ac_compile"

27949

-case "(($ac_try" in

27950

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27951

- *) ac_try_echo=$ac_try;;

27952

-esac

27953

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

27954

- (eval "$ac_compile") 2>conftest.er1

27955

- ac_status=$?

27956

- grep -v '^ *+' conftest.er1 >conftest.err

27957

- rm -f conftest.er1

27958

- cat conftest.err >&5

27959

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

27960

- (exit $ac_status); } && {

27961

- test -z "$ac_c_werror_flag" ||

27962

- test ! -s conftest.err

27963

- } && test -s conftest.$ac_objext; then

27964

- :

27965

-else

27966

- echo "$as_me: failed program was:" >&5

27967

-sed 's/^/| /' conftest.$ac_ext >&5

27968

+if ac_fn_c_try_compile "$LINENO"; then :

27969

27970

- ac_c_werror_flag=$ac_save_c_werror_flag

27971

+else

27972

+ ac_c_werror_flag=$ac_save_c_werror_flag

27973

CFLAGS="-g"

27974

- cat >conftest.$ac_ext <<_ACEOF

27975

-/* confdefs.h. */

27976

-_ACEOF

27977

-cat confdefs.h >>conftest.$ac_ext

27978

-cat >>conftest.$ac_ext <<_ACEOF

27979

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27980

/* end confdefs.h. */

27981

27982

int

27983

@@ -3180,42 +3540,18 @@ main ()

27984

return 0;

27985

}

27986

_ACEOF

27987

-rm -f conftest.$ac_objext

27988

-if { (ac_try="$ac_compile"

27989

-case "(($ac_try" in

27990

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

27991

- *) ac_try_echo=$ac_try;;

27992

-esac

27993

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

27994

- (eval "$ac_compile") 2>conftest.er1

27995

- ac_status=$?

27996

- grep -v '^ *+' conftest.er1 >conftest.err

27997

- rm -f conftest.er1

27998

- cat conftest.err >&5

27999

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

28000

- (exit $ac_status); } && {

28001

- test -z "$ac_c_werror_flag" ||

28002

- test ! -s conftest.err

28003

- } && test -s conftest.$ac_objext; then

28004

+if ac_fn_c_try_compile "$LINENO"; then :

28005

ac_cv_prog_cc_g=yes

28006

-else

28007

- echo "$as_me: failed program was:" >&5

28008

-sed 's/^/| /' conftest.$ac_ext >&5

28009

28010

28011

28012

28013

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

28014

28015

28016

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

28017

28018

28019

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

28020

ac_c_werror_flag=$ac_save_c_werror_flag

28021

28022

-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

28023

-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }

28024

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5

28025

+$as_echo "$ac_cv_prog_cc_g" >&6; }

28026

if test "$ac_test_CFLAGS" = set; then

28027

CFLAGS=$ac_save_CFLAGS

28028

elif test $ac_cv_prog_cc_g = yes; then

28029

@@ -3231,18 +3567,14 @@ else

28030

CFLAGS=

28031

28032

28033

-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

28034

-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }

28035

-if test "${ac_cv_prog_cc_c89+set}" = set; then

28036

- echo $ECHO_N "(cached) $ECHO_C" >&6

28037

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5

28038

+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }

28039

+if test "${ac_cv_prog_cc_c89+set}" = set; then :

28040

+ $as_echo_n "(cached) " >&6

23812

@@ -3562,7 +3443,7 @@ else

23813

23814

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5

23815

$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }

23816

-if test "${ac_cv_prog_cc_c89+set}" = set; then :

23817

+if ${ac_cv_prog_cc_c89+:} false; then :

23818

$as_echo_n "(cached) " >&6

28041

23819

else

28042

23820

ac_cv_prog_cc_c89=no

28043

ac_save_CC=$CC

28044

-cat >conftest.$ac_ext <<_ACEOF

28045

-/* confdefs.h. */

28046

-_ACEOF

28047

-cat confdefs.h >>conftest.$ac_ext

28048

-cat >>conftest.$ac_ext <<_ACEOF

28049

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

28050

/* end confdefs.h. */

28051

#include <stdarg.h>

28052

#include <stdio.h>

28053

@@ -3299,31 +3631,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang

28054

-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

28055

28056

CC="$ac_save_CC $ac_arg"

28057

- rm -f conftest.$ac_objext

28058

-if { (ac_try="$ac_compile"

28059

-case "(($ac_try" in

28060

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

28061

- *) ac_try_echo=$ac_try;;

28062

-esac

28063

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

28064

- (eval "$ac_compile") 2>conftest.er1

28065

- ac_status=$?

28066

- grep -v '^ *+' conftest.er1 >conftest.err

28067

- rm -f conftest.er1

28068

- cat conftest.err >&5

28069

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

28070

- (exit $ac_status); } && {

28071

- test -z "$ac_c_werror_flag" ||

28072

- test ! -s conftest.err

28073

- } && test -s conftest.$ac_objext; then

28074

+ if ac_fn_c_try_compile "$LINENO"; then :

28075

ac_cv_prog_cc_c89=$ac_arg

28076

-else

28077

- echo "$as_me: failed program was:" >&5

28078

-sed 's/^/| /' conftest.$ac_ext >&5

28079

28080

28081

28082

28083

rm -f core conftest.err conftest.$ac_objext

28084

test "x$ac_cv_prog_cc_c89" != "xno" && break

28085

done

28086

@@ -3334,17 +3644,19 @@ fi

28087

# AC_CACHE_VAL

28088

case "x$ac_cv_prog_cc_c89" in

28089

28090

- { echo "$as_me:$LINENO: result: none needed" >&5

28091

-echo "${ECHO_T}none needed" >&6; } ;;

28092

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5

28093

+$as_echo "none needed" >&6; } ;;

28094

xno)

28095

- { echo "$as_me:$LINENO: result: unsupported" >&5

28096

-echo "${ECHO_T}unsupported" >&6; } ;;

28097

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5

28098

+$as_echo "unsupported" >&6; } ;;

28099

28100

CC="$CC $ac_cv_prog_cc_c89"

28101

- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

28102

-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;

28103

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5

28104

+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;

28105

esac

28106

+if test "x$ac_cv_prog_cc_c89" != xno; then :

28107

28108

+fi

28109

28110

ac_ext=c

28111

ac_cpp='$CPP $CPPFLAGS'

28112

@@ -3359,44 +3671,44 @@ ac_config_commands="$ac_config_commands

28113

am_make=${MAKE-make}

28114

cat > confinc << 'END'

28115

am__doit:

28116

- @echo done

28117

+ @echo this is the am__doit target

28118

.PHONY: am__doit

28119

END

28120

# If we don't find an include directive, just comment out the code.

28121

-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5

28122

-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }

28123

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5

28124

+$as_echo_n "checking for style of include used by $am_make... " >&6; }

28125

am__include="#"

28126

am__quote=

28127

_am_result=none

28128

# First try GNU make style include.

28129

echo "include confinc" > confmf

28130

-# We grep out `Entering directory' and `Leaving directory'

28131

-# messages which can occur if `w' ends up in MAKEFLAGS.

28132

-# In particular we don't look at `^make:' because GNU make might

28133

-# be invoked under some other name (usually "gmake"), in which

28134

-# case it prints its new name instead of `make'.

28135

-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then

28136

- am__include=include

28137

- am__quote=

28138

- _am_result=GNU

28139

-fi

28140

+# Ignore all kinds of additional output from `make'.

28141

+case `$am_make -s -f confmf 2> /dev/null` in #(

28142

+*the\ am__doit\ target*)

28143

+ am__include=include

28144

+ am__quote=

28145

+ _am_result=GNU

28146

+ ;;

28147

+esac

28148

# Now try BSD make style include.

28149

if test "$am__include" = "#"; then

28150

echo '.include "confinc"' > confmf

28151

- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then

28152

- am__include=.include

28153

- am__quote="\""

28154

- _am_result=BSD

28155

- fi

28156

+ case `$am_make -s -f confmf 2> /dev/null` in #(

28157

+ *the\ am__doit\ target*)

28158

+ am__include=.include

28159

+ am__quote="\""

28160

+ _am_result=BSD

28161

+ ;;

28162

+ esac

28163

28164

28165

28166

-{ echo "$as_me:$LINENO: result: $_am_result" >&5

28167

-echo "${ECHO_T}$_am_result" >&6; }

28168

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5

28169

+$as_echo "$_am_result" >&6; }

28170

rm -f confinc confmf

28171

28172

# Check whether --enable-dependency-tracking was given.

28173

-if test "${enable_dependency_tracking+set}" = set; then

28174

+if test "${enable_dependency_tracking+set}" = set; then :

28175

enableval=$enable_dependency_tracking;

28176

28177

28178

@@ -3416,10 +3728,10 @@ fi

28179

28180

depcc="$CC" am_compiler_list=

28181

28182

-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

28183

-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

28184

-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then

28185

- echo $ECHO_N "(cached) $ECHO_C" >&6

28186

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

28187

+$as_echo_n "checking dependency style of $depcc... " >&6; }

28188

+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :

28189

+ $as_echo_n "(cached) " >&6

23821

@@ -3723,7 +3604,7 @@ depcc="$CC" am_compiler_list=

23822

23823

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

23824

$as_echo_n "checking dependency style of $depcc... " >&6; }

23825

-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :

23826

+if ${am_cv_CC_dependencies_compiler_type+:} false; then :

23827

$as_echo_n "(cached) " >&6

28190

23828

else

28191

23829

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

28192

# We make a subdir and do the tests there. Otherwise we can end up

28193

@@ -3444,6 +3756,11 @@ else

28194

if test "$am_compiler_list" = ""; then

28195

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

28196

28197

+ am__universal=false

28198

+ case " $depcc " in #(

28199

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

28200

+ esac

28201

28202

for depmode in $am_compiler_list; do

28203

# Setup a source with many dependencies, because some compilers

28204

# like to wrap large dependency lists on column 80 (with \), and

28205

@@ -3461,7 +3778,17 @@ else

28206

done

28207

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

28208

28209

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

28210

+ # mode. It turns out that the SunPro C++ compiler does not properly

28211

+ # handle `-M -o', and we need to detect this. Also, some Intel

28212

+ # versions had trouble with output in subdirs

28213

+ am__obj=sub/conftest.${OBJEXT-o}

28214

+ am__minus_obj="-o $am__obj"

28215

case $depmode in

28216

+ gcc)

28217

+ # This depmode causes a compiler race in universal mode.

28218

+ test "$am__universal" = false || continue

28219

+ ;;

28220

nosideeffect)

28221

# after this tag, mechanisms are not by side-effect, so they'll

28222

# only be used when explicitly requested

28223

@@ -3471,19 +3798,23 @@ else

28224

break

28225

28226

;;

28227

+ msvisualcpp | msvcmsys)

28228

+ # This compiler won't grok `-c -o', but also, the minuso test has

28229

+ # not run yet. These depmodes are late enough in the game, and

28230

+ # so weak that their functioning should not be impacted.

28231

+ am__obj=conftest.${OBJEXT-o}

28232

+ am__minus_obj=

28233

+ ;;

28234

none) break ;;

28235

esac

28236

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

28237

- # mode. It turns out that the SunPro C++ compiler does not properly

28238

- # handle `-M -o', and we need to detect this.

28239

if depmode=$depmode \

28240

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

28241

+ source=sub/conftest.c object=$am__obj \

28242

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

28243

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

28244

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

28245

>/dev/null 2>conftest.err &&

28246

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

28247

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

28248

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

28249

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

28250

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

28251

# icc doesn't choke on unknown options, it will just issue warnings

28252

# or remarks (even with -Werror). So we grep stderr for any message

28253

@@ -3507,8 +3838,8 @@ else

28254

28255

28256

28257

-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

28258

-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }

28259

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5

28260

+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }

28261

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

28262

28263

28264

@@ -3536,10 +3867,10 @@ if test -z "$CXX"; then

28265

28266

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

23830

@@ -3862,7 +3743,7 @@ if test -z "$CXX"; then

28267

23831

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

28268

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

28269

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

28270

-if test "${ac_cv_prog_CXX+set}" = set; then

28271

- echo $ECHO_N "(cached) $ECHO_C" >&6

28272

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

28273

+$as_echo_n "checking for $ac_word... " >&6; }

28274

+if test "${ac_cv_prog_CXX+set}" = set; then :

28275

+ $as_echo_n "(cached) " >&6

23832

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

23833

$as_echo_n "checking for $ac_word... " >&6; }

23834

-if test "${ac_cv_prog_CXX+set}" = set; then :

23835

+if ${ac_cv_prog_CXX+:} false; then :

23836

$as_echo_n "(cached) " >&6

28276

23837

else

28277

23838

if test -n "$CXX"; then

28278

ac_cv_prog_CXX="$CXX" # Let the user override the test.

28279

@@ -3549,25 +3880,25 @@ for as_dir in $PATH

28280

28281

IFS=$as_save_IFS

28282

test -z "$as_dir" && as_dir=.

28283

- for ac_exec_ext in '' $ac_executable_extensions; do

28284

+ for ac_exec_ext in '' $ac_executable_extensions; do

28285

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

28286

ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

28287

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

28288

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

28289

break 2

28290

28291

done

28292

-done

28293

+ done

28294

IFS=$as_save_IFS

28295

28296

28297

28298

CXX=$ac_cv_prog_CXX

28299

if test -n "$CXX"; then

28300

- { echo "$as_me:$LINENO: result: $CXX" >&5

28301

-echo "${ECHO_T}$CXX" >&6; }

28302

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5

28303

+$as_echo "$CXX" >&6; }

28304

else

28305

- { echo "$as_me:$LINENO: result: no" >&5

28306

-echo "${ECHO_T}no" >&6; }

28307

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

28308

+$as_echo "no" >&6; }

28309

28310

28311

28312

@@ -3580,10 +3911,10 @@ if test -z "$CXX"; then

28313

28314

# Extract the first word of "$ac_prog", so it can be a program name with args.

23839

@@ -3906,7 +3787,7 @@ do

28315

23840

set dummy $ac_prog; ac_word=$2

28316

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

28317

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

28318

-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then

28319

- echo $ECHO_N "(cached) $ECHO_C" >&6

28320

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

28321

+$as_echo_n "checking for $ac_word... " >&6; }

28322

+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :

28323

+ $as_echo_n "(cached) " >&6

23841

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

23842

$as_echo_n "checking for $ac_word... " >&6; }

23843

-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :

23844

+if ${ac_cv_prog_ac_ct_CXX+:} false; then :

23845

$as_echo_n "(cached) " >&6

28324

23846

else

28325

23847

if test -n "$ac_ct_CXX"; then

28326

ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.

28327

@@ -3593,25 +3924,25 @@ for as_dir in $PATH

28328

28329

IFS=$as_save_IFS

28330

test -z "$as_dir" && as_dir=.

28331

- for ac_exec_ext in '' $ac_executable_extensions; do

28332

+ for ac_exec_ext in '' $ac_executable_extensions; do

28333

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

28334

ac_cv_prog_ac_ct_CXX="$ac_prog"

28335

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

28336

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

28337

break 2

28338

28339

done

28340

-done

28341

+ done

28342

IFS=$as_save_IFS

28343

28344

28345

28346

ac_ct_CXX=$ac_cv_prog_ac_ct_CXX

28347

if test -n "$ac_ct_CXX"; then

28348

- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

28349

-echo "${ECHO_T}$ac_ct_CXX" >&6; }

28350

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5

28351

+$as_echo "$ac_ct_CXX" >&6; }

28352

else

28353

- { echo "$as_me:$LINENO: result: no" >&5

28354

-echo "${ECHO_T}no" >&6; }

28355

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

28356

+$as_echo "no" >&6; }

28357

28358

28359

28360

@@ -3623,12 +3954,8 @@ done

28361

else

28362

case $cross_compiling:$ac_tool_warned in

28363

yes:)

28364

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

28365

-whose name does not start with the host triplet. If you think this

28366

-configuration is useful to you, please write to autoconf@gnu.org." >&5

28367

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

28368

-whose name does not start with the host triplet. If you think this

28369

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

28370

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

28371

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

28372

ac_tool_warned=yes ;;

28373

esac

28374

CXX=$ac_ct_CXX

28375

@@ -3638,49 +3965,36 @@ fi

28376

28377

28378

# Provide some information about the compiler.

28379

-echo "$as_me:$LINENO: checking for C++ compiler version" >&5

28380

-ac_compiler=`set X $ac_compile; echo $2`

28381

-{ (ac_try="$ac_compiler --version >&5"

28382

-case "(($ac_try" in

28383

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

28384

- *) ac_try_echo=$ac_try;;

28385

-esac

28386

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

28387

- (eval "$ac_compiler --version >&5") 2>&5

28388

- ac_status=$?

28389

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

28390

- (exit $ac_status); }

28391

-{ (ac_try="$ac_compiler -v >&5"

28392

-case "(($ac_try" in

28393

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

28394

- *) ac_try_echo=$ac_try;;

28395

-esac

28396

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

28397

- (eval "$ac_compiler -v >&5") 2>&5

28398

- ac_status=$?

28399

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

28400

- (exit $ac_status); }

28401

-{ (ac_try="$ac_compiler -V >&5"

28402

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5

28403

+set X $ac_compile

28404

+ac_compiler=$2

28405

+for ac_option in --version -v -V -qversion; do

28406

+ { { ac_try="$ac_compiler $ac_option >&5"

28407

case "(($ac_try" in

28408

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

28409

*) ac_try_echo=$ac_try;;

28410

esac

28411

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

28412

- (eval "$ac_compiler -V >&5") 2>&5

28413

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

28414

+$as_echo "$ac_try_echo"; } >&5

28415

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

28416

ac_status=$?

28417

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

28418

- (exit $ac_status); }

28419

28420

-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

28421

-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }

28422

-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then

28423

- echo $ECHO_N "(cached) $ECHO_C" >&6

28424

+ if test -s conftest.err; then

28425

+ sed '10a\

28426

+... rest of stderr output deleted ...

28427

+ 10q' conftest.err >conftest.er1

28428

+ cat conftest.er1 >&5

28429

+ fi

28430

+ rm -f conftest.er1 conftest.err

28431

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

28432

+ test $ac_status = 0; }

28433

+done

28434

28435

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5

28436

+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }

28437

+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :

28438

+ $as_echo_n "(cached) " >&6

28439

else

28440

- cat >conftest.$ac_ext <<_ACEOF

28441

-/* confdefs.h. */

28442

-_ACEOF

28443

-cat confdefs.h >>conftest.$ac_ext

28444

-cat >>conftest.$ac_ext <<_ACEOF

28445

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

28446

/* end confdefs.h. */

28447

28448

int

28449

@@ -3694,92 +4008,49 @@ main ()

28450

return 0;

28451

}

28452

_ACEOF

28453

-rm -f conftest.$ac_objext

28454

-if { (ac_try="$ac_compile"

28455

-case "(($ac_try" in

28456

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

28457

- *) ac_try_echo=$ac_try;;

28458

-esac

28459

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

28460

- (eval "$ac_compile") 2>conftest.er1

28461

- ac_status=$?

28462

- grep -v '^ *+' conftest.er1 >conftest.err

28463

- rm -f conftest.er1

28464

- cat conftest.err >&5

28465

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

28466

- (exit $ac_status); } && {

28467

- test -z "$ac_cxx_werror_flag" ||

28468

- test ! -s conftest.err

28469

- } && test -s conftest.$ac_objext; then

28470

+if ac_fn_cxx_try_compile "$LINENO"; then :

28471

ac_compiler_gnu=yes

28472

else

28473

- echo "$as_me: failed program was:" >&5

28474

-sed 's/^/| /' conftest.$ac_ext >&5

28475

28476

- ac_compiler_gnu=no

28477

+ ac_compiler_gnu=no

28478

28479

28480

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

28481

ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

28482

28483

28484

-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

28485

-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }

28486

-GXX=`test $ac_compiler_gnu = yes && echo yes`

28487

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5

28488

+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }

28489

+if test $ac_compiler_gnu = yes; then

28490

+ GXX=yes

28491

+else

28492

+ GXX=

28493

+fi

28494

ac_test_CXXFLAGS=${CXXFLAGS+set}

23848

@@ -3984,7 +3865,7 @@ done

23849

23850

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5

23851

$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }

23852

-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :

23853

+if ${ac_cv_cxx_compiler_gnu+:} false; then :

23854

$as_echo_n "(cached) " >&6

23855

else

23856

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

23857

@@ -4021,7 +3902,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}

28495

23858

ac_save_CXXFLAGS=$CXXFLAGS

28496

-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

28497

-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }

28498

-if test "${ac_cv_prog_cxx_g+set}" = set; then

28499

- echo $ECHO_N "(cached) $ECHO_C" >&6

28500

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5

28501

+$as_echo_n "checking whether $CXX accepts -g... " >&6; }

28502

+if test "${ac_cv_prog_cxx_g+set}" = set; then :

28503

+ $as_echo_n "(cached) " >&6

23859

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5

23860

$as_echo_n "checking whether $CXX accepts -g... " >&6; }

23861

-if test "${ac_cv_prog_cxx_g+set}" = set; then :

23862

+if ${ac_cv_prog_cxx_g+:} false; then :

23863

$as_echo_n "(cached) " >&6

28504

23864

else

28505

23865

ac_save_cxx_werror_flag=$ac_cxx_werror_flag

28506

ac_cxx_werror_flag=yes

28507

ac_cv_prog_cxx_g=no

28508

CXXFLAGS="-g"

28509

- cat >conftest.$ac_ext <<_ACEOF

28510

-/* confdefs.h. */

28511

-_ACEOF

28512

-cat confdefs.h >>conftest.$ac_ext

28513

-cat >>conftest.$ac_ext <<_ACEOF

28514

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

28515

/* end confdefs.h. */

28516

28517

int

28518

main ()

28519

28520

28521

- ;

28522

- return 0;

28523

28524

-_ACEOF

28525

-rm -f conftest.$ac_objext

28526

-if { (ac_try="$ac_compile"

28527

-case "(($ac_try" in

28528

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

28529

- *) ac_try_echo=$ac_try;;

28530

-esac

28531

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

28532

- (eval "$ac_compile") 2>conftest.er1

28533

- ac_status=$?

28534

- grep -v '^ *+' conftest.er1 >conftest.err

28535

- rm -f conftest.er1

28536

- cat conftest.err >&5

28537

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

28538

- (exit $ac_status); } && {

28539

- test -z "$ac_cxx_werror_flag" ||

28540

- test ! -s conftest.err

28541

- } && test -s conftest.$ac_objext; then

28542

- ac_cv_prog_cxx_g=yes

28543

-else

28544

- echo "$as_me: failed program was:" >&5

28545

-sed 's/^/| /' conftest.$ac_ext >&5

28546

28547

28548

- CXXFLAGS=""

28549

- cat >conftest.$ac_ext <<_ACEOF

28550

-/* confdefs.h. */

28551

+ ;

28552

+ return 0;

28553

28554

_ACEOF

28555

-cat confdefs.h >>conftest.$ac_ext

28556

-cat >>conftest.$ac_ext <<_ACEOF

28557

+if ac_fn_cxx_try_compile "$LINENO"; then :

28558

+ ac_cv_prog_cxx_g=yes

28559

+else

28560

+ CXXFLAGS=""

28561

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

28562

/* end confdefs.h. */

28563

28564

int

28565

@@ -3790,35 +4061,12 @@ main ()

28566

return 0;

28567

}

28568

_ACEOF

28569

-rm -f conftest.$ac_objext

28570

-if { (ac_try="$ac_compile"

28571

-case "(($ac_try" in

28572

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

28573

- *) ac_try_echo=$ac_try;;

28574

-esac

28575

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

28576

- (eval "$ac_compile") 2>conftest.er1

28577

- ac_status=$?

28578

- grep -v '^ *+' conftest.er1 >conftest.err

28579

- rm -f conftest.er1

28580

- cat conftest.err >&5

28581

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

28582

- (exit $ac_status); } && {

28583

- test -z "$ac_cxx_werror_flag" ||

28584

- test ! -s conftest.err

28585

- } && test -s conftest.$ac_objext; then

28586

- :

28587

-else

28588

- echo "$as_me: failed program was:" >&5

28589

-sed 's/^/| /' conftest.$ac_ext >&5

28590

+if ac_fn_cxx_try_compile "$LINENO"; then :

28591

28592

- ac_cxx_werror_flag=$ac_save_cxx_werror_flag

28593

+else

28594

+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag

28595

CXXFLAGS="-g"

28596

- cat >conftest.$ac_ext <<_ACEOF

28597

-/* confdefs.h. */

28598

-_ACEOF

28599

-cat confdefs.h >>conftest.$ac_ext

28600

-cat >>conftest.$ac_ext <<_ACEOF

28601

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

28602

/* end confdefs.h. */

28603

28604

int

28605

@@ -3829,42 +4077,18 @@ main ()

28606

return 0;

28607

}

28608

_ACEOF

28609

-rm -f conftest.$ac_objext

28610

-if { (ac_try="$ac_compile"

28611

-case "(($ac_try" in

28612

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

28613

- *) ac_try_echo=$ac_try;;

28614

-esac

28615

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

28616

- (eval "$ac_compile") 2>conftest.er1

28617

- ac_status=$?

28618

- grep -v '^ *+' conftest.er1 >conftest.err

28619

- rm -f conftest.er1

28620

- cat conftest.err >&5

28621

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

28622

- (exit $ac_status); } && {

28623

- test -z "$ac_cxx_werror_flag" ||

28624

- test ! -s conftest.err

28625

- } && test -s conftest.$ac_objext; then

28626

+if ac_fn_cxx_try_compile "$LINENO"; then :

28627

ac_cv_prog_cxx_g=yes

28628

-else

28629

- echo "$as_me: failed program was:" >&5

28630

-sed 's/^/| /' conftest.$ac_ext >&5

28631

28632

28633

28634

28635

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

28636

28637

28638

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

28639

28640

28641

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

28642

ac_cxx_werror_flag=$ac_save_cxx_werror_flag

28643

28644

-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

28645

-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }

28646

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5

28647

+$as_echo "$ac_cv_prog_cxx_g" >&6; }

28648

if test "$ac_test_CXXFLAGS" = set; then

28649

CXXFLAGS=$ac_save_CXXFLAGS

28650

elif test $ac_cv_prog_cxx_g = yes; then

28651

@@ -3888,10 +4112,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

28652

28653

depcc="$CXX" am_compiler_list=

28654

28655

-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

28656

-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

28657

-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then

28658

- echo $ECHO_N "(cached) $ECHO_C" >&6

28659

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

28660

+$as_echo_n "checking dependency style of $depcc... " >&6; }

28661

+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :

28662

+ $as_echo_n "(cached) " >&6

23866

@@ -4107,7 +3988,7 @@ depcc="$CXX" am_compiler_list=

23867

23868

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

23869

$as_echo_n "checking dependency style of $depcc... " >&6; }

23870

-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :

23871

+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :

23872

$as_echo_n "(cached) " >&6

28663

23873

else

28664

23874

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

28665

# We make a subdir and do the tests there. Otherwise we can end up

28666

@@ -3916,6 +4140,11 @@ else

28667

if test "$am_compiler_list" = ""; then

28668

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

28669

28670

+ am__universal=false

28671

+ case " $depcc " in #(

28672

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

28673

+ esac

28674

28675

for depmode in $am_compiler_list; do

28676

# Setup a source with many dependencies, because some compilers

28677

# like to wrap large dependency lists on column 80 (with \), and

28678

@@ -3933,7 +4162,17 @@ else

28679

done

28680

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

28681

28682

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

28683

+ # mode. It turns out that the SunPro C++ compiler does not properly

28684

+ # handle `-M -o', and we need to detect this. Also, some Intel

28685

+ # versions had trouble with output in subdirs

28686

+ am__obj=sub/conftest.${OBJEXT-o}

28687

+ am__minus_obj="-o $am__obj"

28688

case $depmode in

28689

+ gcc)

28690

+ # This depmode causes a compiler race in universal mode.

28691

+ test "$am__universal" = false || continue

28692

+ ;;

28693

nosideeffect)

28694

# after this tag, mechanisms are not by side-effect, so they'll

28695

# only be used when explicitly requested

28696

@@ -3943,19 +4182,23 @@ else

28697

break

28698

28699

;;

28700

+ msvisualcpp | msvcmsys)

28701

+ # This compiler won't grok `-c -o', but also, the minuso test has

28702

+ # not run yet. These depmodes are late enough in the game, and

28703

+ # so weak that their functioning should not be impacted.

28704

+ am__obj=conftest.${OBJEXT-o}

28705

+ am__minus_obj=

28706

+ ;;

28707

none) break ;;

28708

esac

28709

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

28710

- # mode. It turns out that the SunPro C++ compiler does not properly

28711

- # handle `-M -o', and we need to detect this.

28712

if depmode=$depmode \

28713

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

28714

+ source=sub/conftest.c object=$am__obj \

28715

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

28716

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

28717

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

28718

>/dev/null 2>conftest.err &&

28719

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

28720

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

28721

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

28722

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

28723

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

28724

# icc doesn't choke on unknown options, it will just issue warnings

28725

# or remarks (even with -Werror). So we grep stderr for any message

28726

@@ -3979,8 +4222,8 @@ else

28727

28728

28729

28730

-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5

28731

-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }

28732

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5

28733

+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }

28734

CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

28735

28736

28737

@@ -4002,14 +4245,14 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

28738

28739

case `pwd` in

28740

*\ * | *\ *)

28741

- { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5

28742

-echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;

28743

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5

28744

+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;

28745

esac

28746

28747

28748

28749

-macro_version='2.2.4'

28750

-macro_revision='1.2976'

28751

+macro_version='2.2.6b'

28752

+macro_revision='1.3017'

28753

28754

28755

28756

@@ -4027,35 +4270,27 @@ ltmain="$ac_aux_dir/ltmain.sh"

23875

@@ -4244,8 +4125,8 @@ esac

23876

23877

23878

23879

-macro_version='2.2.6b'

23880

-macro_revision='1.3017'

23881

+macro_version='2.4'

23882

+macro_revision='1.3293'

23883

23884

23885

23886

@@ -4263,27 +4144,27 @@ ltmain="$ac_aux_dir/ltmain.sh"

28757

23887

28758

23888

# Make sure we can run config.sub.

28759

23889

$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||

28760

- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5

28761

-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}

28762

- { (exit 1); exit 1; }; }

28763

28764

-{ echo "$as_me:$LINENO: checking build system type" >&5

28765

-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }

28766

-if test "${ac_cv_build+set}" = set; then

28767

- echo $ECHO_N "(cached) $ECHO_C" >&6

23890

- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5

28768

23891

+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5

28769

28770

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5

28771

+$as_echo_n "checking build system type... " >&6; }

28772

+if test "${ac_cv_build+set}" = set; then :

28773

+ $as_echo_n "(cached) " >&6

23892

23893

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5

23894

$as_echo_n "checking build system type... " >&6; }

23895

-if test "${ac_cv_build+set}" = set; then :

23896

+if ${ac_cv_build+:} false; then :

23897

$as_echo_n "(cached) " >&6

28774

23898

else

28775

23899

ac_build_alias=$build_alias

28776

23900

test "x$ac_build_alias" = x &&

28777

23901

ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`

28778

23902

test "x$ac_build_alias" = x &&

28779

- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5

28780

-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}

28781

- { (exit 1); exit 1; }; }

23903

- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5

28782

23904

+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5

28783

23905

ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||

28784

- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5

28785

-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}

28786

- { (exit 1); exit 1; }; }

23906

- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5

28787

23907

+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5

28788

23908

28789

23909

28790

-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5

28791

-echo "${ECHO_T}$ac_cv_build" >&6; }

28792

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5

28793

+$as_echo "$ac_cv_build" >&6; }

23910

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5

23911

$as_echo "$ac_cv_build" >&6; }

28794

23912

case $ac_cv_build in

28795

23913

*-*-*) ;;

28796

-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5

28797

-echo "$as_me: error: invalid value of canonical build" >&2;}

28798

- { (exit 1); exit 1; }; };;

28799

+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;

23914

-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;

23915

+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;

28800

23916

esac

28801

23917

build=$ac_cv_build

28802

23918

ac_save_IFS=$IFS; IFS='-'

28803

@@ -4071,28 +4306,24 @@ IFS=$ac_save_IFS

28804

case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac

28805

28806

28807

-{ echo "$as_me:$LINENO: checking host system type" >&5

28808

-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }

28809

-if test "${ac_cv_host+set}" = set; then

28810

- echo $ECHO_N "(cached) $ECHO_C" >&6

28811

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5

28812

+$as_echo_n "checking host system type... " >&6; }

28813

+if test "${ac_cv_host+set}" = set; then :

28814

+ $as_echo_n "(cached) " >&6

23919

@@ -4301,14 +4182,14 @@ case $build_os in *\ *) build_os=`echo "

23920

23921

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5

23922

$as_echo_n "checking host system type... " >&6; }

23923

-if test "${ac_cv_host+set}" = set; then :

23924

+if ${ac_cv_host+:} false; then :

23925

$as_echo_n "(cached) " >&6

28815

23926

else

28816

23927

if test "x$host_alias" = x; then

28817

23928

ac_cv_host=$ac_cv_build

28818

23929

else

28819

23930

ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||

28820

- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5

28821

-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}

28822

- { (exit 1); exit 1; }; }

23931

- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5

28823

23932

+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5

28824

23933

28825

23934

28826

23935

28827

-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5

28828

-echo "${ECHO_T}$ac_cv_host" >&6; }

28829

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5

28830

+$as_echo "$ac_cv_host" >&6; }

23936

@@ -4316,7 +4197,7 @@ fi

23937

$as_echo "$ac_cv_host" >&6; }

28831

23938

case $ac_cv_host in

28832

23939

*-*-*) ;;

28833

-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5

28834

-echo "$as_me: error: invalid value of canonical host" >&2;}

28835

- { (exit 1); exit 1; }; };;

28836

+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;

23940

-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;

23941

+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;

28837

23942

esac

28838

23943

host=$ac_cv_host

28839

23944

ac_save_IFS=$IFS; IFS='-'

28840

@@ -4108,51 +4339,46 @@ IFS=$ac_save_IFS

23945

@@ -4332,9 +4213,78 @@ IFS=$ac_save_IFS

28841

23946

case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac

28842

23947

28843

23948

28844

-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5

28845

-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }

28846

-if test "${ac_cv_path_SED+set}" = set; then

28847

- echo $ECHO_N "(cached) $ECHO_C" >&6

28848

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5

28849

+$as_echo_n "checking for a sed that does not truncate output... " >&6; }

28850

+if test "${ac_cv_path_SED+set}" = set; then :

28851

+ $as_echo_n "(cached) " >&6

23949

+# Backslashify metacharacters that are still active within

23950

+# double-quoted strings.

23951

+sed_quote_subst='s/$["`$\\]$/\\\1/g'

23952

23953

+# Same as above, but do not quote variable references.

23954

+double_quote_subst='s/$["`\\]$/\\\1/g'

23955

23956

+# Sed substitution to delay expansion of an escaped shell variable in a

23957

+# double_quote_subst'ed string.

23958

+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'

23959

23960

+# Sed substitution to delay expansion of an escaped single quote.

23961

+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'

23962

23963

+# Sed substitution to avoid accidental globbing in evaled expressions

23964

+no_glob_subst='s/\*/\\\*/g'

23965

23966

+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

23967

+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO

23968

+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO

23969

23970

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5

23971

+$as_echo_n "checking how to print strings... " >&6; }

23972

+# Test print first, because it will be a builtin if present.

23973

+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \

23974

+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then

23975

+ ECHO='print -r --'

23976

+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then

23977

+ ECHO='printf %s\n'

23978

+else

23979

+ # Use this function as a fallback that always works.

23980

+ func_fallback_echo ()

23981

+ {

23982

+ eval 'cat <<_LTECHO_EOF

23983

+$1

23984

+_LTECHO_EOF'

23985

+ }

23986

+ ECHO='func_fallback_echo'

23987

+fi

23988

23989

+# func_echo_all arg...

23990

+# Invoke $ECHO with all args, space-separated.

23991

+func_echo_all ()

23992

23993

+ $ECHO ""

23994

23995

23996

+case "$ECHO" in

23997

+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5

23998

+$as_echo "printf" >&6; } ;;

23999

+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5

24000

+$as_echo "print -r" >&6; } ;;

24001

+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5

24002

+$as_echo "cat" >&6; } ;;

24003

+esac

24004

24005

24006

24007

24008

24009

24010

24011

24012

24013

24014

24015

24016

24017

24018

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5

24019

$as_echo_n "checking for a sed that does not truncate output... " >&6; }

24020

-if test "${ac_cv_path_SED+set}" = set; then :

24021

+if ${ac_cv_path_SED+:} false; then :

24022

$as_echo_n "(cached) " >&6

28852

24023

else

28853

24024

ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/

28854

for ac_i in 1 2 3 4 5 6 7; do

28855

ac_script="$ac_script$as_nl$ac_script"

28856

done

28857

- echo "$ac_script" | sed 99q >conftest.sed

28858

- $as_unset ac_script || ac_script=

28859

- # Extract the first word of "sed gsed" to use in msg output

28860

-if test -z "$SED"; then

28861

-set dummy sed gsed; ac_prog_name=$2

28862

-if test "${ac_cv_path_SED+set}" = set; then

28863

- echo $ECHO_N "(cached) $ECHO_C" >&6

28864

-else

28865

+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed

28866

+ { ac_script=; unset ac_script;}

28867

+ if test -z "$SED"; then

28868

ac_path_SED_found=false

28869

-# Loop through the user's path and test for each of PROGNAME-LIST

28870

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

28871

+ # Loop through the user's path and test for each of PROGNAME-LIST

28872

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

28873

for as_dir in $PATH

28874

28875

IFS=$as_save_IFS

28876

test -z "$as_dir" && as_dir=.

28877

- for ac_prog in sed gsed; do

28878

- for ac_exec_ext in '' $ac_executable_extensions; do

28879

- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"

28880

- { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue

28881

- # Check for GNU ac_path_SED and select it if it is found.

28882

+ for ac_prog in sed gsed; do

28883

+ for ac_exec_ext in '' $ac_executable_extensions; do

28884

+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"

28885

+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue

28886

+# Check for GNU ac_path_SED and select it if it is found.

28887

# Check for GNU $ac_path_SED

28888

case `"$ac_path_SED" --version 2>&1` in

28889

*GNU*)

28890

ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;

28891

28892

ac_count=0

28893

- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

28894

+ $as_echo_n 0123456789 >"conftest.in"

28895

while :

28896

28897

cat "conftest.in" "conftest.in" >"conftest.tmp"

28898

mv "conftest.tmp" "conftest.in"

28899

cp "conftest.in" "conftest.nl"

28900

- echo '' >> "conftest.nl"

28901

+ $as_echo '' >> "conftest.nl"

28902

"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break

28903

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

28904

- ac_count=`expr $ac_count + 1`

28905

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

28906

if test $ac_count -gt ${ac_path_SED_max-0}; then

28907

# Best one so far, save it but keep looking for a better one

28908

ac_cv_path_SED="$ac_path_SED"

28909

@@ -4164,31 +4390,21 @@ case `"$ac_path_SED" --version 2>&1` in

28910

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

28911

esac

28912

28913

28914

- $ac_path_SED_found && break 3

28915

+ $ac_path_SED_found && break 3

28916

+ done

28917

+ done

24025

@@ -4389,7 +4339,7 @@ esac

28918

24026

done

28919

-done

28920

28921

-done

28922

24027

IFS=$as_save_IFS

28923

28924

28925

-fi

28926

28927

-SED="$ac_cv_path_SED"

28928

-if test -z "$SED"; then

28929

- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5

28930

-echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}

28931

- { (exit 1); exit 1; }; }

28932

-fi

28933

28934

+ if test -z "$ac_cv_path_SED"; then

24028

if test -z "$ac_cv_path_SED"; then

24029

- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5

28935

24030

+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5

28936

+ fi

24031

28937

24032

else

28938

24033

ac_cv_path_SED=$SED

28939

28940

28941

28942

-{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5

28943

-echo "${ECHO_T}$ac_cv_path_SED" >&6; }

28944

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5

28945

+$as_echo "$ac_cv_path_SED" >&6; }

28946

SED="$ac_cv_path_SED"

28947

rm -f conftest.sed

28948

28949

@@ -4205,45 +4421,40 @@ Xsed="$SED -e 1s/^X//"

28950

28951

28952

28953

-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5

28954

-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }

28955

-if test "${ac_cv_path_GREP+set}" = set; then

28956

- echo $ECHO_N "(cached) $ECHO_C" >&6

28957

-else

28958

- # Extract the first word of "grep ggrep" to use in msg output

28959

-if test -z "$GREP"; then

28960

-set dummy grep ggrep; ac_prog_name=$2

28961

-if test "${ac_cv_path_GREP+set}" = set; then

28962

- echo $ECHO_N "(cached) $ECHO_C" >&6

28963

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5

28964

+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }

28965

+if test "${ac_cv_path_GREP+set}" = set; then :

28966

+ $as_echo_n "(cached) " >&6

24034

@@ -4416,7 +4366,7 @@ Xsed="$SED -e 1s/^X//"

24035

24036

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5

24037

$as_echo_n "checking for grep that handles long lines and -e... " >&6; }

24038

-if test "${ac_cv_path_GREP+set}" = set; then :

24039

+if ${ac_cv_path_GREP+:} false; then :

24040

$as_echo_n "(cached) " >&6

28967

24041

else

28968

+ if test -z "$GREP"; then

28969

ac_path_GREP_found=false

28970

-# Loop through the user's path and test for each of PROGNAME-LIST

28971

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

28972

+ # Loop through the user's path and test for each of PROGNAME-LIST

28973

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

28974

for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

28975

28976

IFS=$as_save_IFS

28977

test -z "$as_dir" && as_dir=.

28978

- for ac_prog in grep ggrep; do

28979

- for ac_exec_ext in '' $ac_executable_extensions; do

28980

- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

28981

- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

28982

- # Check for GNU ac_path_GREP and select it if it is found.

28983

+ for ac_prog in grep ggrep; do

28984

+ for ac_exec_ext in '' $ac_executable_extensions; do

28985

+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

28986

+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

28987

+# Check for GNU ac_path_GREP and select it if it is found.

28988

# Check for GNU $ac_path_GREP

28989

case `"$ac_path_GREP" --version 2>&1` in

28990

*GNU*)

28991

ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;

28992

28993

ac_count=0

28994

- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

28995

+ $as_echo_n 0123456789 >"conftest.in"

28996

while :

28997

28998

cat "conftest.in" "conftest.in" >"conftest.tmp"

28999

mv "conftest.tmp" "conftest.in"

29000

cp "conftest.in" "conftest.nl"

29001

- echo 'GREP' >> "conftest.nl"

29002

+ $as_echo 'GREP' >> "conftest.nl"

29003

"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break

29004

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

29005

- ac_count=`expr $ac_count + 1`

29006

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

29007

if test $ac_count -gt ${ac_path_GREP_max-0}; then

29008

# Best one so far, save it but keep looking for a better one

29009

ac_cv_path_GREP="$ac_path_GREP"

29010

@@ -4255,77 +4466,61 @@ case `"$ac_path_GREP" --version 2>&1` in

29011

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

29012

esac

29013

29014

29015

- $ac_path_GREP_found && break 3

29016

+ $ac_path_GREP_found && break 3

29017

+ done

29018

+ done

24042

if test -z "$GREP"; then

24043

@@ -4465,7 +4415,7 @@ esac

29019

24044

done

29020

-done

29021

29022

-done

29023

24045

IFS=$as_save_IFS

29024

29025

29026

-fi

29027

29028

-GREP="$ac_cv_path_GREP"

29029

-if test -z "$GREP"; then

29030

- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

29031

-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

29032

- { (exit 1); exit 1; }; }

29033

-fi

29034

29035

+ if test -z "$ac_cv_path_GREP"; then

24046

if test -z "$ac_cv_path_GREP"; then

24047

- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

29036

24048

+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

29037

+ fi

24049

29038

24050

else

29039

24051

ac_cv_path_GREP=$GREP

29040

29041

29042

29043

29044

-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5

29045

-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }

29046

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5

29047

+$as_echo "$ac_cv_path_GREP" >&6; }

29048

GREP="$ac_cv_path_GREP"

29049

29050

29051

-{ echo "$as_me:$LINENO: checking for egrep" >&5

29052

-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }

29053

-if test "${ac_cv_path_EGREP+set}" = set; then

29054

- echo $ECHO_N "(cached) $ECHO_C" >&6

29055

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5

29056

+$as_echo_n "checking for egrep... " >&6; }

29057

+if test "${ac_cv_path_EGREP+set}" = set; then :

29058

+ $as_echo_n "(cached) " >&6

24052

@@ -4479,7 +4429,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }

24053

24054

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5

24055

$as_echo_n "checking for egrep... " >&6; }

24056

-if test "${ac_cv_path_EGREP+set}" = set; then :

24057

+if ${ac_cv_path_EGREP+:} false; then :

24058

$as_echo_n "(cached) " >&6

29059

24059

else

29060

24060

if echo a | $GREP -E '(a|b)' >/dev/null 2>&1

29061

then ac_cv_path_EGREP="$GREP -E"

29062

else

29063

- # Extract the first word of "egrep" to use in msg output

29064

-if test -z "$EGREP"; then

29065

-set dummy egrep; ac_prog_name=$2

29066

-if test "${ac_cv_path_EGREP+set}" = set; then

29067

- echo $ECHO_N "(cached) $ECHO_C" >&6

29068

-else

29069

+ if test -z "$EGREP"; then

29070

ac_path_EGREP_found=false

29071

-# Loop through the user's path and test for each of PROGNAME-LIST

29072

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

29073

+ # Loop through the user's path and test for each of PROGNAME-LIST

29074

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

29075

for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

29076

29077

IFS=$as_save_IFS

29078

test -z "$as_dir" && as_dir=.

29079

- for ac_prog in egrep; do

29080

- for ac_exec_ext in '' $ac_executable_extensions; do

29081

- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

29082

- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

29083

- # Check for GNU ac_path_EGREP and select it if it is found.

29084

+ for ac_prog in egrep; do

29085

+ for ac_exec_ext in '' $ac_executable_extensions; do

29086

+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

29087

+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

29088

+# Check for GNU ac_path_EGREP and select it if it is found.

29089

# Check for GNU $ac_path_EGREP

29090

case `"$ac_path_EGREP" --version 2>&1` in

29091

*GNU*)

29092

ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;

29093

29094

ac_count=0

29095

- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

29096

+ $as_echo_n 0123456789 >"conftest.in"

29097

while :

29098

29099

cat "conftest.in" "conftest.in" >"conftest.tmp"

29100

mv "conftest.tmp" "conftest.in"

29101

cp "conftest.in" "conftest.nl"

29102

- echo 'EGREP' >> "conftest.nl"

29103

+ $as_echo 'EGREP' >> "conftest.nl"

29104

"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break

29105

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

29106

- ac_count=`expr $ac_count + 1`

29107

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

29108

if test $ac_count -gt ${ac_path_EGREP_max-0}; then

29109

# Best one so far, save it but keep looking for a better one

29110

ac_cv_path_EGREP="$ac_path_EGREP"

29111

@@ -4337,78 +4532,62 @@ case `"$ac_path_EGREP" --version 2>&1` i

29112

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

29113

esac

29114

29115

29116

- $ac_path_EGREP_found && break 3

29117

+ $ac_path_EGREP_found && break 3

29118

+ done

29119

+ done

24061

@@ -4531,7 +4481,7 @@ esac

29120

24062

done

29121

-done

29122

29123

-done

29124

24063

IFS=$as_save_IFS

29125

29126

29127

-fi

29128

29129

-EGREP="$ac_cv_path_EGREP"

29130

-if test -z "$EGREP"; then

29131

- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

29132

-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

29133

- { (exit 1); exit 1; }; }

29134

-fi

29135

29136

+ if test -z "$ac_cv_path_EGREP"; then

24064

if test -z "$ac_cv_path_EGREP"; then

24065

- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

29137

24066

+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

29138

+ fi

24067

29139

24068

else

29140

24069

ac_cv_path_EGREP=$EGREP

29141

29142

29143

29144

29145

29146

-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5

29147

-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }

29148

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5

29149

+$as_echo "$ac_cv_path_EGREP" >&6; }

29150

EGREP="$ac_cv_path_EGREP"

29151

29152

29153

-{ echo "$as_me:$LINENO: checking for fgrep" >&5

29154

-echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }

29155

-if test "${ac_cv_path_FGREP+set}" = set; then

29156

- echo $ECHO_N "(cached) $ECHO_C" >&6

29157

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5

29158

+$as_echo_n "checking for fgrep... " >&6; }

29159

+if test "${ac_cv_path_FGREP+set}" = set; then :

29160

+ $as_echo_n "(cached) " >&6

24070

@@ -4546,7 +4496,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }

24071

24072

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5

24073

$as_echo_n "checking for fgrep... " >&6; }

24074

-if test "${ac_cv_path_FGREP+set}" = set; then :

24075

+if ${ac_cv_path_FGREP+:} false; then :

24076

$as_echo_n "(cached) " >&6

29161

24077

else

29162

24078

if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1

29163

then ac_cv_path_FGREP="$GREP -F"

29164

else

29165

- # Extract the first word of "fgrep" to use in msg output

29166

-if test -z "$FGREP"; then

29167

-set dummy fgrep; ac_prog_name=$2

29168

-if test "${ac_cv_path_FGREP+set}" = set; then

29169

- echo $ECHO_N "(cached) $ECHO_C" >&6

29170

-else

29171

+ if test -z "$FGREP"; then

29172

ac_path_FGREP_found=false

29173

-# Loop through the user's path and test for each of PROGNAME-LIST

29174

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

29175

+ # Loop through the user's path and test for each of PROGNAME-LIST

29176

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

29177

for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

29178

29179

IFS=$as_save_IFS

29180

test -z "$as_dir" && as_dir=.

29181

- for ac_prog in fgrep; do

29182

- for ac_exec_ext in '' $ac_executable_extensions; do

29183

- ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"

29184

- { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue

29185

- # Check for GNU ac_path_FGREP and select it if it is found.

29186

+ for ac_prog in fgrep; do

29187

+ for ac_exec_ext in '' $ac_executable_extensions; do

29188

+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"

29189

+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue

29190

+# Check for GNU ac_path_FGREP and select it if it is found.

29191

# Check for GNU $ac_path_FGREP

29192

case `"$ac_path_FGREP" --version 2>&1` in

29193

*GNU*)

29194

ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;

29195

29196

ac_count=0

29197

- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

29198

+ $as_echo_n 0123456789 >"conftest.in"

29199

while :

29200

29201

cat "conftest.in" "conftest.in" >"conftest.tmp"

29202

mv "conftest.tmp" "conftest.in"

29203

cp "conftest.in" "conftest.nl"

29204

- echo 'FGREP' >> "conftest.nl"

29205

+ $as_echo 'FGREP' >> "conftest.nl"

29206

"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break

29207

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

29208

- ac_count=`expr $ac_count + 1`

29209

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

29210

if test $ac_count -gt ${ac_path_FGREP_max-0}; then

29211

# Best one so far, save it but keep looking for a better one

29212

ac_cv_path_FGREP="$ac_path_FGREP"

29213

@@ -4420,33 +4599,22 @@ case `"$ac_path_FGREP" --version 2>&1` i

29214

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

29215

esac

29216

29217

29218

- $ac_path_FGREP_found && break 3

29219

+ $ac_path_FGREP_found && break 3

29220

+ done

29221

+ done

24079

@@ -4598,7 +4548,7 @@ esac

29222

24080

done

29223

-done

29224

29225

-done

29226

24081

IFS=$as_save_IFS

29227

29228

29229

-fi

29230

29231

-FGREP="$ac_cv_path_FGREP"

29232

-if test -z "$FGREP"; then

29233

- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

29234

-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

29235

- { (exit 1); exit 1; }; }

29236

-fi

29237

29238

+ if test -z "$ac_cv_path_FGREP"; then

24082

if test -z "$ac_cv_path_FGREP"; then

24083

- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

29239

24084

+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

29240

+ fi

24085

29241

24086

else

29242

24087

ac_cv_path_FGREP=$FGREP

29243

29244

29245

29246

29247

29248

-{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5

29249

-echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }

29250

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5

29251

+$as_echo "$ac_cv_path_FGREP" >&6; }

29252

FGREP="$ac_cv_path_FGREP"

29253

29254

29255

@@ -4471,7 +4639,7 @@ test -z "$GREP" && GREP=grep

29256

29257

29258

# Check whether --with-gnu-ld was given.

29259

-if test "${with_gnu_ld+set}" = set; then

29260

+if test "${with_gnu_ld+set}" = set; then :

29261

withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

29262

else

29263

with_gnu_ld=no

29264

@@ -4480,8 +4648,8 @@ fi

29265

ac_prog=ld

29266

if test "$GCC" = yes; then

29267

# Check if gcc -print-prog-name=ld gives a path.

29268

- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

29269

-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

29270

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5

29271

+$as_echo_n "checking for ld used by $CC... " >&6; }

29272

case $host in

29273

*-*-mingw*)

29274

# gcc leaves a trailing carriage return which upsets mingw

29275

@@ -4510,14 +4678,14 @@ echo $ECHO_N "checking for ld used by $C

29276

;;

29277

esac

29278

elif test "$with_gnu_ld" = yes; then

29279

- { echo "$as_me:$LINENO: checking for GNU ld" >&5

29280

-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

29281

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5

29282

+$as_echo_n "checking for GNU ld... " >&6; }

29283

else

29284

- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

29285

-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

29286

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5

29287

+$as_echo_n "checking for non-GNU ld... " >&6; }

29288

29289

-if test "${lt_cv_path_LD+set}" = set; then

29290

- echo $ECHO_N "(cached) $ECHO_C" >&6

29291

+if test "${lt_cv_path_LD+set}" = set; then :

29292

+ $as_echo_n "(cached) " >&6

24088

@@ -4677,7 +4627,7 @@ else

24089

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5

24090

$as_echo_n "checking for non-GNU ld... " >&6; }

24091

24092

-if test "${lt_cv_path_LD+set}" = set; then :

24093

+if ${lt_cv_path_LD+:} false; then :

24094

$as_echo_n "(cached) " >&6

29293

24095

else

29294

24096

if test -z "$LD"; then

29295

lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

29296

@@ -4547,19 +4715,17 @@ fi

29297

29298

LD="$lt_cv_path_LD"

29299

if test -n "$LD"; then

29300

- { echo "$as_me:$LINENO: result: $LD" >&5

29301

-echo "${ECHO_T}$LD" >&6; }

29302

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5

29303

+$as_echo "$LD" >&6; }

29304

else

29305

- { echo "$as_me:$LINENO: result: no" >&5

29306

-echo "${ECHO_T}no" >&6; }

29307

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

29308

+$as_echo "no" >&6; }

24097

@@ -4714,10 +4664,10 @@ else

24098

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

24099

$as_echo "no" >&6; }

29309

24100

29310

-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

29311

-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

29312

- { (exit 1); exit 1; }; }

29313

-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

29314

-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

29315

-if test "${lt_cv_prog_gnu_ld+set}" = set; then

29316

- echo $ECHO_N "(cached) $ECHO_C" >&6

24101

-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5

29317

24102

+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5

29318

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

29319

+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

29320

+if test "${lt_cv_prog_gnu_ld+set}" = set; then :

29321

+ $as_echo_n "(cached) " >&6

24103

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

24104

$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

24105

-if test "${lt_cv_prog_gnu_ld+set}" = set; then :

24106

+if ${lt_cv_prog_gnu_ld+:} false; then :

24107

$as_echo_n "(cached) " >&6

29322

24108

else

29323

24109

# I'd rather use --version here, but apparently some GNU lds only accept -v.

29324

case `$LD -v 2>&1 </dev/null` in

29325

@@ -4571,8 +4737,8 @@ case `$LD -v 2>&1 </dev/null` in

29326

;;

29327

esac

29328

29329

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

29330

-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

29331

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5

29332

+$as_echo "$lt_cv_prog_gnu_ld" >&6; }

29333

with_gnu_ld=$lt_cv_prog_gnu_ld

29334

29335

29336

@@ -4583,10 +4749,10 @@ with_gnu_ld=$lt_cv_prog_gnu_ld

29337

29338

29339

29340

-{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5

29341

-echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }

29342

-if test "${lt_cv_path_NM+set}" = set; then

29343

- echo $ECHO_N "(cached) $ECHO_C" >&6

29344

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5

29345

+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }

29346

+if test "${lt_cv_path_NM+set}" = set; then :

29347

+ $as_echo_n "(cached) " >&6

24110

@@ -4744,7 +4694,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld

24111

24112

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5

24113

$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }

24114

-if test "${lt_cv_path_NM+set}" = set; then :

24115

+if ${lt_cv_path_NM+:} false; then :

24116

$as_echo_n "(cached) " >&6

29348

24117

else

29349

24118

if test -n "$NM"; then

29350

# Let the user override the test.

29351

@@ -4632,8 +4798,8 @@ else

29352

: ${lt_cv_path_NM=no}

29353

29354

29355

-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5

29356

-echo "${ECHO_T}$lt_cv_path_NM" >&6; }

29357

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5

29358

+$as_echo "$lt_cv_path_NM" >&6; }

29359

if test "$lt_cv_path_NM" != "no"; then

24119

@@ -4797,14 +4747,17 @@ if test "$lt_cv_path_NM" != "no"; then

29360

24120

NM="$lt_cv_path_NM"

29361

24121

else

29362

@@ -4643,10 +4809,10 @@ else

24122

# Didn't find any BSD compatible name lister, look for dumpbin.

24123

- if test -n "$ac_tool_prefix"; then

24124

- for ac_prog in "dumpbin -symbols" "link -dump -symbols"

24125

+ if test -n "$DUMPBIN"; then :

24126

+ # Let the user override the test.

24127

+ else

24128

+ if test -n "$ac_tool_prefix"; then

24129

+ for ac_prog in dumpbin "link -dump"

29363

24130

29364

24131

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

29365

24132

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

29366

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

29367

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

29368

-if test "${ac_cv_prog_DUMPBIN+set}" = set; then

29369

- echo $ECHO_N "(cached) $ECHO_C" >&6

29370

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

29371

+$as_echo_n "checking for $ac_word... " >&6; }

29372

+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :

29373

+ $as_echo_n "(cached) " >&6

24133

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

24134

$as_echo_n "checking for $ac_word... " >&6; }

24135

-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :

24136

+if ${ac_cv_prog_DUMPBIN+:} false; then :

24137

$as_echo_n "(cached) " >&6

29374

24138

else

29375

24139

if test -n "$DUMPBIN"; then

29376

ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.

29377

@@ -4656,25 +4822,25 @@ for as_dir in $PATH

29378

29379

IFS=$as_save_IFS

29380

test -z "$as_dir" && as_dir=.

29381

- for ac_exec_ext in '' $ac_executable_extensions; do

29382

+ for ac_exec_ext in '' $ac_executable_extensions; do

29383

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

29384

ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"

29385

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

29386

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

29387

break 2

29388

29389

done

29390

-done

29391

+ done

29392

IFS=$as_save_IFS

29393

29394

29395

29396

DUMPBIN=$ac_cv_prog_DUMPBIN

29397

if test -n "$DUMPBIN"; then

29398

- { echo "$as_me:$LINENO: result: $DUMPBIN" >&5

29399

-echo "${ECHO_T}$DUMPBIN" >&6; }

29400

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5

29401

+$as_echo "$DUMPBIN" >&6; }

29402

else

29403

- { echo "$as_me:$LINENO: result: no" >&5

29404

-echo "${ECHO_T}no" >&6; }

29405

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

29406

+$as_echo "no" >&6; }

29407

29408

29409

29410

@@ -4687,10 +4853,10 @@ if test -z "$DUMPBIN"; then

24140

@@ -4842,13 +4795,13 @@ fi

24141

24142

if test -z "$DUMPBIN"; then

24143

ac_ct_DUMPBIN=$DUMPBIN

24144

- for ac_prog in "dumpbin -symbols" "link -dump -symbols"

24145

+ for ac_prog in dumpbin "link -dump"

29411

24146

29412

24147

# Extract the first word of "$ac_prog", so it can be a program name with args.

29413

24148

set dummy $ac_prog; ac_word=$2

29414

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

29415

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

29416

-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then

29417

- echo $ECHO_N "(cached) $ECHO_C" >&6

29418

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

29419

+$as_echo_n "checking for $ac_word... " >&6; }

29420

+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :

29421

+ $as_echo_n "(cached) " >&6

24149

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

24150

$as_echo_n "checking for $ac_word... " >&6; }

24151

-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :

24152

+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :

24153

$as_echo_n "(cached) " >&6

29422

24154

else

29423

24155

if test -n "$ac_ct_DUMPBIN"; then

29424

ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.

29425

@@ -4700,25 +4866,25 @@ for as_dir in $PATH

29426

29427

IFS=$as_save_IFS

29428

test -z "$as_dir" && as_dir=.

29429

- for ac_exec_ext in '' $ac_executable_extensions; do

29430

+ for ac_exec_ext in '' $ac_executable_extensions; do

29431

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

29432

ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"

29433

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

29434

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

29435

break 2

24156

@@ -4897,6 +4850,15 @@ esac

29436

24157

29437

done

29438

-done

29439

+ done

29440

IFS=$as_save_IFS

29441

29442

29443

29444

ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN

29445

if test -n "$ac_ct_DUMPBIN"; then

29446

- { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5

29447

-echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }

29448

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5

29449

+$as_echo "$ac_ct_DUMPBIN" >&6; }

29450

else

29451

- { echo "$as_me:$LINENO: result: no" >&5

29452

-echo "${ECHO_T}no" >&6; }

29453

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

29454

+$as_echo "no" >&6; }

29455

29456

29457

29458

@@ -4730,12 +4896,8 @@ done

29459

else

29460

case $cross_compiling:$ac_tool_warned in

29461

yes:)

29462

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

29463

-whose name does not start with the host triplet. If you think this

29464

-configuration is useful to you, please write to autoconf@gnu.org." >&5

29465

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

29466

-whose name does not start with the host triplet. If you think this

29467

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

29468

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

29469

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

29470

ac_tool_warned=yes ;;

29471

esac

29472

DUMPBIN=$ac_ct_DUMPBIN

29473

@@ -4754,45 +4916,45 @@ test -z "$NM" && NM=nm

29474

29475

29476

29477

-{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5

29478

-echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }

29479

-if test "${lt_cv_nm_interface+set}" = set; then

29480

- echo $ECHO_N "(cached) $ECHO_C" >&6

29481

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5

29482

+$as_echo_n "checking the name lister ($NM) interface... " >&6; }

29483

+if test "${lt_cv_nm_interface+set}" = set; then :

29484

+ $as_echo_n "(cached) " >&6

24158

24159

24160

+ case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in

24161

+ *COFF*)

24162

+ DUMPBIN="$DUMPBIN -symbols"

24163

+ ;;

24164

+ *)

24165

+ DUMPBIN=:

24166

+ ;;

24167

+ esac

24168

+ fi

24169

24170

if test "$DUMPBIN" != ":"; then

24171

NM="$DUMPBIN"

24172

@@ -4911,18 +4873,18 @@ test -z "$NM" && NM=nm

24173

24174

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5

24175

$as_echo_n "checking the name lister ($NM) interface... " >&6; }

24176

-if test "${lt_cv_nm_interface+set}" = set; then :

24177

+if ${lt_cv_nm_interface+:} false; then :

24178

$as_echo_n "(cached) " >&6

29485

24179

else

29486

24180

lt_cv_nm_interface="BSD nm"

29487

24181

echo "int some_variable = 0;" > conftest.$ac_ext

29488

- (eval echo "\"\$as_me:4764: $ac_compile\"" >&5)

29489

+ (eval echo "\"\$as_me:4926: $ac_compile\"" >&5)

24182

- (eval echo "\"\$as_me:4919: $ac_compile\"" >&5)

24183

+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)

29490

24184

(eval "$ac_compile" 2>conftest.err)

29491

24185

cat conftest.err >&5

29492

- (eval echo "\"\$as_me:4767: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

29493

+ (eval echo "\"\$as_me:4929: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

24186

- (eval echo "\"\$as_me:4922: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

24187

+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

29494

24188

(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

29495

24189

cat conftest.err >&5

29496

- (eval echo "\"\$as_me:4770: output\"" >&5)

29497

+ (eval echo "\"\$as_me:4932: output\"" >&5)

24190

- (eval echo "\"\$as_me:4925: output\"" >&5)

24191

+ (eval echo "\"\$as_me:$LINENO: output\"" >&5)

29498

24192

cat conftest.out >&5

29499

24193

if $GREP 'External.*some_variable' conftest.out > /dev/null; then

29500

24194

lt_cv_nm_interface="MS dumpbin"

29501

29502

rm -f conftest*

29503

29504

-{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5

29505

-echo "${ECHO_T}$lt_cv_nm_interface" >&6; }

29506

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5

29507

+$as_echo "$lt_cv_nm_interface" >&6; }

29508

29509

-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5

29510

-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }

29511

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5

29512

+$as_echo_n "checking whether ln -s works... " >&6; }

29513

LN_S=$as_ln_s

29514

if test "$LN_S" = "ln -s"; then

29515

- { echo "$as_me:$LINENO: result: yes" >&5

29516

-echo "${ECHO_T}yes" >&6; }

29517

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

29518

+$as_echo "yes" >&6; }

29519

else

29520

- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5

29521

-echo "${ECHO_T}no, using $LN_S" >&6; }

29522

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5

29523

+$as_echo "no, using $LN_S" >&6; }

29524

29525

24195

@@ -4946,7 +4908,7 @@ fi

29526

24196

# find the maximum length of command line arguments

29527

-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5

29528

-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }

29529

-if test "${lt_cv_sys_max_cmd_len+set}" = set; then

29530

- echo $ECHO_N "(cached) $ECHO_C" >&6

29531

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5

29532

+$as_echo_n "checking the maximum length of command line arguments... " >&6; }

29533

+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :

29534

+ $as_echo_n "(cached) " >&6

24197

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5

24198

$as_echo_n "checking the maximum length of command line arguments... " >&6; }

24199

-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :

24200

+if ${lt_cv_sys_max_cmd_len+:} false; then :

24201

$as_echo_n "(cached) " >&6

29535

24202

else

29536

24203

i=0

29537

teststring="ABCD"

29538

@@ -4813,7 +4975,7 @@ else

29539

lt_cv_sys_max_cmd_len=-1;

24204

@@ -4979,6 +4941,11 @@ else

24205

lt_cv_sys_max_cmd_len=8192;

29540

24206

;;

29541

24207

29542

- cygwin* | mingw*)

29543

+ cygwin* | mingw* | cegcc*)

29544

# On Win9x/ME, this test blows up -- it succeeds, but takes

29545

# about 5 minutes as the teststring grows exponentially.

29546

# Worse, since 9x/ME are not pre-emptively multitasking,

29547

@@ -4909,11 +5071,11 @@ else

29548

29549

29550

if test -n $lt_cv_sys_max_cmd_len ; then

29551

- { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5

29552

-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }

29553

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5

29554

+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }

29555

else

29556

- { echo "$as_me:$LINENO: result: none" >&5

29557

-echo "${ECHO_T}none" >&6; }

29558

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5

29559

+$as_echo "none" >&6; }

29560

29561

max_cmd_len=$lt_cv_sys_max_cmd_len

29562

29563

@@ -4926,8 +5088,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len

29564

: ${MV="mv -f"}

29565

: ${RM="rm -f"}

29566

29567

-{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5

29568

-echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }

29569

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5

29570

+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }

24208

+ mint*)

24209

+ # On MiNT this can take a long time and run out of memory.

24210

+ lt_cv_sys_max_cmd_len=8192;

24211

+ ;;

24212

24213

amigaos*)

24214

# On AmigaOS with pdksh, this test takes hours, literally.

24215

# So we just punt and use a minimum line length of 8192.

24216

@@ -5043,8 +5010,8 @@ else

24217

# If test is not a shell built-in, we'll probably end up computing a

24218

# maximum length that is only half of the actual maximum length, but

24219

# we can't tell.

24220

- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \

24221

- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&

24222

+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \

24223

+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&

24224

test $i != 17 # 1/2 MB should be enough

24225

24226

i=`expr $i + 1`

24227

@@ -5086,8 +5053,8 @@ $as_echo_n "checking whether the shell u

29571

24228

# Try some XSI features

29572

24229

xsi_shell=no

29573

24230

( _lt_dummy="a/b/c"

29574

@@ -4936,18 +5098,18 @@ xsi_shell=no

24231

- test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \

24232

- = c,a/b,, \

24233

+ test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \

24234

+ = c,a/b,b/c, \

29575

24235

&& eval 'test $(( 1 + 1 )) -eq 2 \

29576

24236

&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \

29577

24237

&& xsi_shell=yes

29578

-{ echo "$as_me:$LINENO: result: $xsi_shell" >&5

29579

-echo "${ECHO_T}$xsi_shell" >&6; }

29580

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5

29581

+$as_echo "$xsi_shell" >&6; }

29582

29583

29584

-{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5

29585

-echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }

29586

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5

29587

+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }

29588

lt_shell_append=no

29589

( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \

29590

>/dev/null 2>&1 \

29591

&& lt_shell_append=yes

29592

-{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5

29593

-echo "${ECHO_T}$lt_shell_append" >&6; }

29594

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5

29595

+$as_echo "$lt_shell_append" >&6; }

29596

29597

29598

if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

29599

@@ -4981,15 +5143,15 @@ esac

29600

29601

29602

29603

-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5

29604

-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }

29605

-if test "${lt_cv_ld_reload_flag+set}" = set; then

29606

- echo $ECHO_N "(cached) $ECHO_C" >&6

29607

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5

29608

+$as_echo_n "checking for $LD option to reload object files... " >&6; }

29609

+if test "${lt_cv_ld_reload_flag+set}" = set; then :

29610

+ $as_echo_n "(cached) " >&6

24238

@@ -5136,9 +5103,83 @@ esac

24239

24240

24241

24242

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5

24243

+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }

24244

+if ${lt_cv_to_host_file_cmd+:} false; then :

24245

+ $as_echo_n "(cached) " >&6

24246

+else

24247

+ case $host in

24248

+ *-*-mingw* )

24249

+ case $build in

24250

+ *-*-mingw* ) # actually msys

24251

+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32

24252

+ ;;

24253

+ *-*-cygwin* )

24254

+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32

24255

+ ;;

24256

+ * ) # otherwise, assume *nix

24257

+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32

24258

+ ;;

24259

+ esac

24260

+ ;;

24261

+ *-*-cygwin* )

24262

+ case $build in

24263

+ *-*-mingw* ) # actually msys

24264

+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin

24265

+ ;;

24266

+ *-*-cygwin* )

24267

+ lt_cv_to_host_file_cmd=func_convert_file_noop

24268

+ ;;

24269

+ * ) # otherwise, assume *nix

24270

+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin

24271

+ ;;

24272

+ esac

24273

+ ;;

24274

+ * ) # unhandled hosts (and "normal" native builds)

24275

+ lt_cv_to_host_file_cmd=func_convert_file_noop

24276

+ ;;

24277

+esac

24278

24279

+fi

24280

24281

+to_host_file_cmd=$lt_cv_to_host_file_cmd

24282

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5

24283

+$as_echo "$lt_cv_to_host_file_cmd" >&6; }

24284

24285

24286

24287

24288

24289

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5

24290

+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }

24291

+if ${lt_cv_to_tool_file_cmd+:} false; then :

24292

+ $as_echo_n "(cached) " >&6

24293

+else

24294

+ #assume ordinary cross tools, or native build.

24295

+lt_cv_to_tool_file_cmd=func_convert_file_noop

24296

+case $host in

24297

+ *-*-mingw* )

24298

+ case $build in

24299

+ *-*-mingw* ) # actually msys

24300

+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32

24301

+ ;;

24302

+ esac

24303

+ ;;

24304

+esac

24305

24306

+fi

24307

24308

+to_tool_file_cmd=$lt_cv_to_tool_file_cmd

24309

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5

24310

+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }

24311

24312

24313

24314

24315

24316

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5

24317

$as_echo_n "checking for $LD option to reload object files... " >&6; }

24318

-if test "${lt_cv_ld_reload_flag+set}" = set; then :

24319

+if ${lt_cv_ld_reload_flag+:} false; then :

24320

$as_echo_n "(cached) " >&6

29611

24321

else

29612

24322

lt_cv_ld_reload_flag='-r'

29613

29614

-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5

29615

-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }

29616

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5

29617

+$as_echo "$lt_cv_ld_reload_flag" >&6; }

29618

reload_flag=$lt_cv_ld_reload_flag

29619

case $reload_flag in

29620

"" | " "*) ;;

29621

@@ -5014,11 +5176,112 @@ esac

29622

29623

29624

29625

+if test -n "$ac_tool_prefix"; then

29626

+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.

29627

+set dummy ${ac_tool_prefix}objdump; ac_word=$2

29628

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

29629

+$as_echo_n "checking for $ac_word... " >&6; }

29630

+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :

29631

+ $as_echo_n "(cached) " >&6

29632

+else

29633

+ if test -n "$OBJDUMP"; then

29634

+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.

29635

+else

29636

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

29637

+for as_dir in $PATH

29638

+do

29639

+ IFS=$as_save_IFS

29640

+ test -z "$as_dir" && as_dir=.

29641

+ for ac_exec_ext in '' $ac_executable_extensions; do

29642

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

29643

+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"

29644

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

29645

+ break 2

29646

+ fi

29647

+done

29648

+ done

29649

+IFS=$as_save_IFS

29650

29651

+fi

29652

+fi

29653

+OBJDUMP=$ac_cv_prog_OBJDUMP

29654

+if test -n "$OBJDUMP"; then

29655

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5

29656

+$as_echo "$OBJDUMP" >&6; }

29657

+else

29658

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

29659

+$as_echo "no" >&6; }

29660

+fi

29661

29662

29663

+fi

29664

+if test -z "$ac_cv_prog_OBJDUMP"; then

29665

+ ac_ct_OBJDUMP=$OBJDUMP

29666

+ # Extract the first word of "objdump", so it can be a program name with args.

29667

+set dummy objdump; ac_word=$2

29668

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

29669

+$as_echo_n "checking for $ac_word... " >&6; }

29670

+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :

29671

+ $as_echo_n "(cached) " >&6

29672

+else

29673

+ if test -n "$ac_ct_OBJDUMP"; then

29674

+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.

29675

+else

29676

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

29677

+for as_dir in $PATH

29678

+do

29679

+ IFS=$as_save_IFS

29680

+ test -z "$as_dir" && as_dir=.

29681

+ for ac_exec_ext in '' $ac_executable_extensions; do

29682

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

29683

+ ac_cv_prog_ac_ct_OBJDUMP="objdump"

29684

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

29685

+ break 2

29686

+ fi

29687

+done

29688

+ done

29689

+IFS=$as_save_IFS

29690

29691

+fi

29692

+fi

29693

+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP

29694

+if test -n "$ac_ct_OBJDUMP"; then

29695

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5

29696

+$as_echo "$ac_ct_OBJDUMP" >&6; }

29697

+else

29698

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

29699

+$as_echo "no" >&6; }

29700

+fi

29701

29702

+ if test "x$ac_ct_OBJDUMP" = x; then

29703

+ OBJDUMP="false"

29704

+ else

29705

+ case $cross_compiling:$ac_tool_warned in

29706

+yes:)

29707

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

29708

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

29709

+ac_tool_warned=yes ;;

29710

+esac

29711

+ OBJDUMP=$ac_ct_OBJDUMP

29712

+ fi

29713

+else

29714

+ OBJDUMP="$ac_cv_prog_OBJDUMP"

29715

+fi

29716

29717

+test -z "$OBJDUMP" && OBJDUMP=objdump

29718

29719

29720

29721

29722

29723

29724

29725

29726

29727

-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5

29728

-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }

29729

-if test "${lt_cv_deplibs_check_method+set}" = set; then

29730

- echo $ECHO_N "(cached) $ECHO_C" >&6

29731

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5

29732

+$as_echo_n "checking how to recognize dependent libraries... " >&6; }

29733

+if test "${lt_cv_deplibs_check_method+set}" = set; then :

29734

+ $as_echo_n "(cached) " >&6

24323

@@ -5152,6 +5193,11 @@ case $reload_flag in

24324

esac

24325

reload_cmds='$LD$reload_flag -o $output$reload_objs'

24326

case $host_os in

24327

+ cygwin* | mingw* | pw32* | cegcc*)

24328

+ if test "$GCC" != yes; then

24329

+ reload_cmds=false

24330

+ fi

24331

+ ;;

24332

darwin*)

24333

if test "$GCC" = yes; then

24334

reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'

24335

@@ -5174,7 +5220,7 @@ if test -n "$ac_tool_prefix"; then

24336

set dummy ${ac_tool_prefix}objdump; ac_word=$2

24337

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

24338

$as_echo_n "checking for $ac_word... " >&6; }

24339

-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :

24340

+if ${ac_cv_prog_OBJDUMP+:} false; then :

24341

$as_echo_n "(cached) " >&6

24342

else

24343

if test -n "$OBJDUMP"; then

24344

@@ -5214,7 +5260,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then

24345

set dummy objdump; ac_word=$2

24346

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

24347

$as_echo_n "checking for $ac_word... " >&6; }

24348

-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :

24349

+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :

24350

$as_echo_n "(cached) " >&6

24351

else

24352

if test -n "$ac_ct_OBJDUMP"; then

24353

@@ -5273,7 +5319,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump

24354

24355

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5

24356

$as_echo_n "checking how to recognize dependent libraries... " >&6; }

24357

-if test "${lt_cv_deplibs_check_method+set}" = set; then :

24358

+if ${lt_cv_deplibs_check_method+:} false; then :

24359

$as_echo_n "(cached) " >&6

29735

24360

else

29736

24361

lt_cv_file_magic_cmd='$MAGIC_CMD'

29737

lt_cv_file_magic_test_file=

29738

@@ -5068,6 +5331,12 @@ mingw* | pw32*)

24362

@@ -5315,16 +5361,18 @@ mingw* | pw32*)

24363

# Base MSYS/MinGW do not provide the 'file' command needed by

24364

# func_win32_libid shell function, so use a weaker test based on 'objdump',

24365

# unless we find 'file', for example because we are cross-compiling.

24366

- if ( file / ) >/dev/null 2>&1; then

24367

+ # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.

24368

+ if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then

24369

lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'

24370

lt_cv_file_magic_cmd='func_win32_libid'

24371

else

24372

- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'

24373

+ # Keep this pattern in sync with the one in func_win32_libid.

24374

+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'

24375

lt_cv_file_magic_cmd='$OBJDUMP -f'

29739

24376

29740

24377

;;

29741

24378

29742

+cegcc)

29743

+ # use the weaker test based on 'objdump'. See mingw*.

29744

+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'

29745

+ lt_cv_file_magic_cmd='$OBJDUMP -f'

24379

-cegcc)

24380

+cegcc*)

24381

# use the weaker test based on 'objdump'. See mingw*.

24382

lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'

24383

lt_cv_file_magic_cmd='$OBJDUMP -f'

24384

@@ -5354,6 +5402,10 @@ gnu*)

24385

lt_cv_deplibs_check_method=pass_all

24386

;;

24387

24388

+haiku*)

24389

+ lt_cv_deplibs_check_method=pass_all

29746

24390

+ ;;

29747

24391

29748

darwin* | rhapsody*)

29749

lt_cv_deplibs_check_method=pass_all

29750

;;

29751

@@ -5126,11 +5395,11 @@ irix5* | irix6* | nonstopux*)

29752

;;

29753

29754

# This must be Linux ELF.

29755

-linux* | k*bsd*-gnu)

29756

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

29757

lt_cv_deplibs_check_method=pass_all

29758

;;

29759

29760

-netbsd*)

29761

+netbsd* | netbsdelf*-gnu)

29762

if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then

29763

lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'

29764

else

29765

@@ -5205,8 +5474,8 @@ tpf*)

29766

esac

29767

24392

hpux10.20* | hpux11*)

24393

lt_cv_file_magic_cmd=/usr/bin/file

24394

case $host_cpu in

24395

@@ -5362,11 +5414,11 @@ hpux10.20* | hpux11*)

24396

lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so

24397

;;

24398

hppa*64*)

24399

- 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]'

24400

+ 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]'

24401

lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl

24402

;;

24403

24404

- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'

24405

+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'

24406

lt_cv_file_magic_test_file=/usr/lib/libc.sl

24407

;;

24408

esac

24409

@@ -5469,6 +5521,21 @@ esac

29768

24410

29769

-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5

29770

-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }

29771

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5

29772

+$as_echo "$lt_cv_deplibs_check_method" >&6; }

24411

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5

24412

$as_echo "$lt_cv_deplibs_check_method" >&6; }

24413

24414

+file_magic_glob=

24415

+want_nocaseglob=no

24416

+if test "$build" = "$host"; then

24417

+ case $host_os in

24418

+ mingw* | pw32*)

24419

+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then

24420

+ want_nocaseglob=yes

24421

+ else

24422

+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/$..$/s\/[\1]\/[\1]\/g;/g"`

24423

+ fi

24424

+ ;;

24425

+ esac

24426

+fi

24427

29773

24428

file_magic_cmd=$lt_cv_file_magic_cmd

29774

24429

deplibs_check_method=$lt_cv_deplibs_check_method

29775

24430

test -z "$deplibs_check_method" && deplibs_check_method=unknown

29776

@@ -5225,10 +5494,10 @@ test -z "$deplibs_check_method" && depli

24431

@@ -5484,16 +5551,26 @@ test -z "$deplibs_check_method" && depli

24432

24433

24434

24435

24436

24437

24438

24439

24440

24441

24442

24443

24444

29777

24445

if test -n "$ac_tool_prefix"; then

29778

# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.

29779

set dummy ${ac_tool_prefix}ar; ac_word=$2

29780

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

29781

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

29782

-if test "${ac_cv_prog_AR+set}" = set; then

29783

- echo $ECHO_N "(cached) $ECHO_C" >&6

29784

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

29785

+$as_echo_n "checking for $ac_word... " >&6; }

29786

+if test "${ac_cv_prog_AR+set}" = set; then :

24446

- # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.

24447

-set dummy ${ac_tool_prefix}ar; ac_word=$2

24448

+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.

24449

+set dummy ${ac_tool_prefix}dlltool; ac_word=$2

24450

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

24451

$as_echo_n "checking for $ac_word... " >&6; }

24452

-if test "${ac_cv_prog_AR+set}" = set; then :

24453

+if ${ac_cv_prog_DLLTOOL+:} false; then :

24454

$as_echo_n "(cached) " >&6

24455

else

24456

- if test -n "$AR"; then

24457

- ac_cv_prog_AR="$AR" # Let the user override the test.

24458

+ if test -n "$DLLTOOL"; then

24459

+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.

24460

else

24461

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

24462

for as_dir in $PATH

24463

@@ -5502,7 +5579,7 @@ do

24464

test -z "$as_dir" && as_dir=.

24465

for ac_exec_ext in '' $ac_executable_extensions; do

24466

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

24467

- ac_cv_prog_AR="${ac_tool_prefix}ar"

24468

+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"

24469

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

24470

break 2

24471

24472

@@ -5512,10 +5589,10 @@ IFS=$as_save_IFS

24473

24474

24475

24476

-AR=$ac_cv_prog_AR

24477

-if test -n "$AR"; then

24478

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5

24479

-$as_echo "$AR" >&6; }

24480

+DLLTOOL=$ac_cv_prog_DLLTOOL

24481

+if test -n "$DLLTOOL"; then

24482

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5

24483

+$as_echo "$DLLTOOL" >&6; }

24484

else

24485

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

24486

$as_echo "no" >&6; }

24487

@@ -5523,17 +5600,17 @@ fi

24488

24489

24490

24491

-if test -z "$ac_cv_prog_AR"; then

24492

- ac_ct_AR=$AR

24493

- # Extract the first word of "ar", so it can be a program name with args.

24494

-set dummy ar; ac_word=$2

24495

+if test -z "$ac_cv_prog_DLLTOOL"; then

24496

+ ac_ct_DLLTOOL=$DLLTOOL

24497

+ # Extract the first word of "dlltool", so it can be a program name with args.

24498

+set dummy dlltool; ac_word=$2

24499

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

24500

$as_echo_n "checking for $ac_word... " >&6; }

24501

-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

24502

+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :

24503

$as_echo_n "(cached) " >&6

24504

else

24505

- if test -n "$ac_ct_AR"; then

24506

- ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.

24507

+ if test -n "$ac_ct_DLLTOOL"; then

24508

+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.

24509

else

24510

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

24511

for as_dir in $PATH

24512

@@ -5542,7 +5619,7 @@ do

24513

test -z "$as_dir" && as_dir=.

24514

for ac_exec_ext in '' $ac_executable_extensions; do

24515

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

24516

- ac_cv_prog_ac_ct_AR="ar"

24517

+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"

24518

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

24519

break 2

24520

24521

@@ -5552,17 +5629,17 @@ IFS=$as_save_IFS

24522

24523

24524

24525

-ac_ct_AR=$ac_cv_prog_ac_ct_AR

24526

-if test -n "$ac_ct_AR"; then

24527

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5

24528

-$as_echo "$ac_ct_AR" >&6; }

24529

+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL

24530

+if test -n "$ac_ct_DLLTOOL"; then

24531

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5

24532

+$as_echo "$ac_ct_DLLTOOL" >&6; }

24533

else

24534

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

24535

$as_echo "no" >&6; }

24536

24537

24538

- if test "x$ac_ct_AR" = x; then

24539

- AR="false"

24540

+ if test "x$ac_ct_DLLTOOL" = x; then

24541

+ DLLTOOL="false"

24542

else

24543

case $cross_compiling:$ac_tool_warned in

24544

yes:)

24545

@@ -5570,17 +5647,54 @@ yes:)

24546

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

24547

ac_tool_warned=yes ;;

24548

esac

24549

- AR=$ac_ct_AR

24550

+ DLLTOOL=$ac_ct_DLLTOOL

24551

24552

else

24553

- AR="$ac_cv_prog_AR"

24554

+ DLLTOOL="$ac_cv_prog_DLLTOOL"

24555

24556

24557

-test -z "$AR" && AR=ar

24558

-test -z "$AR_FLAGS" && AR_FLAGS=cru

24559

+test -z "$DLLTOOL" && DLLTOOL=dlltool

24560

24561

24562

24563

24564

24565

24566

24567

24568

24569

24570

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5

24571

+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }

24572

+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :

29787

24573

+ $as_echo_n "(cached) " >&6

29788

else

29789

if test -n "$AR"; then

29790

ac_cv_prog_AR="$AR" # Let the user override the test.

29791

@@ -5238,25 +5507,25 @@ for as_dir in $PATH

29792

29793

IFS=$as_save_IFS

24574

+else

24575

+ lt_cv_sharedlib_from_linklib_cmd='unknown'

24576

24577

+case $host_os in

24578

+cygwin* | mingw* | pw32* | cegcc*)

24579

+ # two different shell functions defined in ltmain.sh

24580

+ # decide which to use based on capabilities of $DLLTOOL

24581

+ case `$DLLTOOL --help 2>&1` in

24582

+ *--identify-strict*)

24583

+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib

24584

+ ;;

24585

+ *)

24586

+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback

24587

+ ;;

24588

+ esac

24589

+ ;;

24590

+*)

24591

+ # fallback: assume linklib IS sharedlib

24592

+ lt_cv_sharedlib_from_linklib_cmd="$ECHO"

24593

+ ;;

24594

+esac

24595

24596

+fi

24597

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5

24598

+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }

24599

+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd

24600

+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO

24601

24602

24603

24604

@@ -5590,15 +5704,17 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru

24605

24606

24607

if test -n "$ac_tool_prefix"; then

24608

- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

24609

-set dummy ${ac_tool_prefix}strip; ac_word=$2

24610

+ for ac_prog in ar

24611

+ do

24612

+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

24613

+set dummy $ac_tool_prefix$ac_prog; ac_word=$2

24614

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

24615

$as_echo_n "checking for $ac_word... " >&6; }

24616

-if test "${ac_cv_prog_STRIP+set}" = set; then :

24617

+if ${ac_cv_prog_AR+:} false; then :

24618

$as_echo_n "(cached) " >&6

24619

else

24620

- if test -n "$STRIP"; then

24621

- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

24622

+ if test -n "$AR"; then

24623

+ ac_cv_prog_AR="$AR" # Let the user override the test.

24624

else

24625

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

24626

for as_dir in $PATH

24627

@@ -5607,7 +5723,7 @@ do

29794

24628

test -z "$as_dir" && as_dir=.

29795

- for ac_exec_ext in '' $ac_executable_extensions; do

29796

+ for ac_exec_ext in '' $ac_executable_extensions; do

24629

for ac_exec_ext in '' $ac_executable_extensions; do

29797

24630

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

29798

ac_cv_prog_AR="${ac_tool_prefix}ar"

29799

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

29800

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

24631

- ac_cv_prog_STRIP="${ac_tool_prefix}strip"

24632

+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"

24633

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

29801

24634

break 2

29802

24635

29803

done

29804

-done

29805

+ done

29806

IFS=$as_save_IFS

24636

@@ -5617,28 +5733,32 @@ IFS=$as_save_IFS

29807

24637

29808

24638

29809

24639

29810

AR=$ac_cv_prog_AR

29811

if test -n "$AR"; then

29812

- { echo "$as_me:$LINENO: result: $AR" >&5

29813

-echo "${ECHO_T}$AR" >&6; }

24640

-STRIP=$ac_cv_prog_STRIP

24641

-if test -n "$STRIP"; then

24642

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5

24643

-$as_echo "$STRIP" >&6; }

24644

+AR=$ac_cv_prog_AR

24645

+if test -n "$AR"; then

29814

24646

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5

29815

24647

+$as_echo "$AR" >&6; }

29816

24648

else

29817

- { echo "$as_me:$LINENO: result: no" >&5

29818

-echo "${ECHO_T}no" >&6; }

29819

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

29820

+$as_echo "no" >&6; }

29821

29822

29823

29824

@@ -5265,10 +5534,10 @@ if test -z "$ac_cv_prog_AR"; then

29825

ac_ct_AR=$AR

29826

# Extract the first word of "ar", so it can be a program name with args.

29827

set dummy ar; ac_word=$2

29828

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

29829

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

29830

-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then

29831

- echo $ECHO_N "(cached) $ECHO_C" >&6

29832

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

29833

+$as_echo_n "checking for $ac_word... " >&6; }

29834

+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

29835

+ $as_echo_n "(cached) " >&6

29836

else

29837

if test -n "$ac_ct_AR"; then

29838

ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.

29839

@@ -5278,25 +5547,25 @@ for as_dir in $PATH

29840

29841

IFS=$as_save_IFS

24649

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

24650

$as_echo "no" >&6; }

24651

24652

24653

24654

+ test -n "$AR" && break

24655

+ done

24656

24657

-if test -z "$ac_cv_prog_STRIP"; then

24658

- ac_ct_STRIP=$STRIP

24659

- # Extract the first word of "strip", so it can be a program name with args.

24660

-set dummy strip; ac_word=$2

24661

+if test -z "$AR"; then

24662

+ ac_ct_AR=$AR

24663

+ for ac_prog in ar

24664

+do

24665

+ # Extract the first word of "$ac_prog", so it can be a program name with args.

24666

+set dummy $ac_prog; ac_word=$2

24667

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

24668

$as_echo_n "checking for $ac_word... " >&6; }

24669

-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :

24670

+if ${ac_cv_prog_ac_ct_AR+:} false; then :

24671

$as_echo_n "(cached) " >&6

24672

else

24673

- if test -n "$ac_ct_STRIP"; then

24674

- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

24675

+ if test -n "$ac_ct_AR"; then

24676

+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.

24677

else

24678

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

24679

for as_dir in $PATH

24680

@@ -5647,7 +5767,7 @@ do

29842

24681

test -z "$as_dir" && as_dir=.

29843

- for ac_exec_ext in '' $ac_executable_extensions; do

29844

+ for ac_exec_ext in '' $ac_executable_extensions; do

24682

for ac_exec_ext in '' $ac_executable_extensions; do

29845

24683

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

29846

ac_cv_prog_ac_ct_AR="ar"

29847

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

29848

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

24684

- ac_cv_prog_ac_ct_STRIP="strip"

24685

+ ac_cv_prog_ac_ct_AR="$ac_prog"

24686

$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

29849

24687

break 2

29850

24688

29851

done

29852

-done

29853

+ done

29854

IFS=$as_save_IFS

24689

@@ -5657,8 +5777,173 @@ IFS=$as_save_IFS

29855

24690

29856

24691

29857

24692

29858

ac_ct_AR=$ac_cv_prog_ac_ct_AR

29859

if test -n "$ac_ct_AR"; then

29860

- { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5

29861

-echo "${ECHO_T}$ac_ct_AR" >&6; }

24693

-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

24694

-if test -n "$ac_ct_STRIP"; then

24695

+ac_ct_AR=$ac_cv_prog_ac_ct_AR

24696

+if test -n "$ac_ct_AR"; then

29862

24697

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5

29863

24698

+$as_echo "$ac_ct_AR" >&6; }

29864

else

29865

- { echo "$as_me:$LINENO: result: no" >&5

29866

-echo "${ECHO_T}no" >&6; }

24699

+else

29867

24700

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

29868

24701

+$as_echo "no" >&6; }

29869

29870

29871

if test "x$ac_ct_AR" = x; then

29872

@@ -5304,12 +5573,8 @@ fi

29873

else

29874

case $cross_compiling:$ac_tool_warned in

29875

yes:)

29876

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

29877

-whose name does not start with the host triplet. If you think this

29878

-configuration is useful to you, please write to autoconf@gnu.org." >&5

29879

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

29880

-whose name does not start with the host triplet. If you think this

29881

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

24702

+fi

24703

24704

24705

+ test -n "$ac_ct_AR" && break

24706

+done

24707

24708

+ if test "x$ac_ct_AR" = x; then

24709

+ AR="false"

24710

+ else

24711

+ case $cross_compiling:$ac_tool_warned in

24712

+yes:)

29882

24713

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

29883

24714

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

29884

ac_tool_warned=yes ;;

29885

esac

29886

AR=$ac_ct_AR

29887

@@ -5334,10 +5599,10 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru

29888

if test -n "$ac_tool_prefix"; then

29889

# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

29890

set dummy ${ac_tool_prefix}strip; ac_word=$2

29891

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

29892

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

29893

-if test "${ac_cv_prog_STRIP+set}" = set; then

29894

- echo $ECHO_N "(cached) $ECHO_C" >&6

24715

+ac_tool_warned=yes ;;

24716

+esac

24717

+ AR=$ac_ct_AR

24718

+ fi

24719

+fi

24720

24721

+: ${AR=ar}

24722

+: ${AR_FLAGS=cru}

24723

24724

24725

24726

24727

24728

24729

24730

24731

24732

24733

24734

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5

24735

+$as_echo_n "checking for archiver @FILE support... " >&6; }

24736

+if ${lt_cv_ar_at_file+:} false; then :

24737

+ $as_echo_n "(cached) " >&6

24738

+else

24739

+ lt_cv_ar_at_file=no

24740

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

24741

+/* end confdefs.h. */

24742

24743

+int

24744

+main ()

24745

24746

24747

+ ;

24748

+ return 0;

24749

24750

+_ACEOF

24751

+if ac_fn_cxx_try_compile "$LINENO"; then :

24752

+ echo conftest.$ac_objext > conftest.lst

24753

+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'

24754

+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5

24755

+ (eval $lt_ar_try) 2>&5

24756

+ ac_status=$?

24757

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

24758

+ test $ac_status = 0; }

24759

+ if test "$ac_status" -eq 0; then

24760

+ # Ensure the archiver fails upon bogus file names.

24761

+ rm -f conftest.$ac_objext libconftest.a

24762

+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5

24763

+ (eval $lt_ar_try) 2>&5

24764

+ ac_status=$?

24765

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

24766

+ test $ac_status = 0; }

24767

+ if test "$ac_status" -ne 0; then

24768

+ lt_cv_ar_at_file=@

24769

+ fi

24770

+ fi

24771

+ rm -f conftest.* libconftest.a

24772

24773

+fi

24774

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

24775

24776

+fi

24777

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5

24778

+$as_echo "$lt_cv_ar_at_file" >&6; }

24779

24780

+if test "x$lt_cv_ar_at_file" = xno; then

24781

+ archiver_list_spec=

24782

+else

24783

+ archiver_list_spec=$lt_cv_ar_at_file

24784

+fi

24785

24786

24787

24788

24789

24790

24791

24792

+if test -n "$ac_tool_prefix"; then

24793

+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

24794

+set dummy ${ac_tool_prefix}strip; ac_word=$2

29895

24795

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

29896

24796

+$as_echo_n "checking for $ac_word... " >&6; }

29897

+if test "${ac_cv_prog_STRIP+set}" = set; then :

24797

+if ${ac_cv_prog_STRIP+:} false; then :

29898

24798

+ $as_echo_n "(cached) " >&6

29899

else

29900

if test -n "$STRIP"; then

29901

ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

29902

@@ -5347,25 +5612,25 @@ for as_dir in $PATH

29903

29904

IFS=$as_save_IFS

29905

test -z "$as_dir" && as_dir=.

29906

- for ac_exec_ext in '' $ac_executable_extensions; do

24799

+else

24800

+ if test -n "$STRIP"; then

24801

+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

24802

+else

24803

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

24804

+for as_dir in $PATH

24805

+do

24806

+ IFS=$as_save_IFS

24807

+ test -z "$as_dir" && as_dir=.

29907

24808

+ for ac_exec_ext in '' $ac_executable_extensions; do

29908

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

29909

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

29910

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

24809

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

24810

+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"

29911

24811

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

29912

break 2

29913

29914

done

29915

-done

24812

+ break 2

24813

+ fi

24814

+done

29916

24815

+ done

29917

IFS=$as_save_IFS

29918

29919

29920

29921

STRIP=$ac_cv_prog_STRIP

29922

if test -n "$STRIP"; then

29923

- { echo "$as_me:$LINENO: result: $STRIP" >&5

29924

-echo "${ECHO_T}$STRIP" >&6; }

24816

+IFS=$as_save_IFS

24817

24818

+fi

24819

+fi

24820

+STRIP=$ac_cv_prog_STRIP

24821

+if test -n "$STRIP"; then

29925

24822

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5

29926

24823

+$as_echo "$STRIP" >&6; }

29927

else

29928

- { echo "$as_me:$LINENO: result: no" >&5

29929

-echo "${ECHO_T}no" >&6; }

24824

+else

29930

24825

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

29931

24826

+$as_echo "no" >&6; }

29932

29933

29934

29935

@@ -5374,10 +5639,10 @@ if test -z "$ac_cv_prog_STRIP"; then

29936

ac_ct_STRIP=$STRIP

29937

# Extract the first word of "strip", so it can be a program name with args.

29938

set dummy strip; ac_word=$2

29939

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

29940

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

29941

-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then

29942

- echo $ECHO_N "(cached) $ECHO_C" >&6

24827

+fi

24828

24829

24830

+fi

24831

+if test -z "$ac_cv_prog_STRIP"; then

24832

+ ac_ct_STRIP=$STRIP

24833

+ # Extract the first word of "strip", so it can be a program name with args.

24834

+set dummy strip; ac_word=$2

29943

24835

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

29944

24836

+$as_echo_n "checking for $ac_word... " >&6; }

29945

+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :

24837

+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :

29946

24838

+ $as_echo_n "(cached) " >&6

29947

else

29948

if test -n "$ac_ct_STRIP"; then

29949

ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

29950

@@ -5387,25 +5652,25 @@ for as_dir in $PATH

29951

29952

IFS=$as_save_IFS

29953

test -z "$as_dir" && as_dir=.

29954

- for ac_exec_ext in '' $ac_executable_extensions; do

24839

+else

24840

+ if test -n "$ac_ct_STRIP"; then

24841

+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

24842

+else

24843

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

24844

+for as_dir in $PATH

24845

+do

24846

+ IFS=$as_save_IFS

24847

+ test -z "$as_dir" && as_dir=.

29955

24848

+ for ac_exec_ext in '' $ac_executable_extensions; do

29956

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

29957

ac_cv_prog_ac_ct_STRIP="strip"

29958

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

24849

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

24850

+ ac_cv_prog_ac_ct_STRIP="strip"

29959

24851

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

29960

break 2

29961

29962

done

29963

-done

24852

+ break 2

24853

+ fi

24854

+done

29964

24855

+ done

29965

IFS=$as_save_IFS

29966

29967

29968

29969

ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

29970

if test -n "$ac_ct_STRIP"; then

29971

- { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

29972

-echo "${ECHO_T}$ac_ct_STRIP" >&6; }

29973

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5

29974

+$as_echo "$ac_ct_STRIP" >&6; }

24856

+IFS=$as_save_IFS

24857

24858

+fi

24859

+fi

24860

+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

24861

+if test -n "$ac_ct_STRIP"; then

24862

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5

24863

$as_echo "$ac_ct_STRIP" >&6; }

29975

24864

else

29976

- { echo "$as_me:$LINENO: result: no" >&5

29977

-echo "${ECHO_T}no" >&6; }

29978

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

29979

+$as_echo "no" >&6; }

29980

29981

29982

if test "x$ac_ct_STRIP" = x; then

29983

@@ -5413,12 +5678,8 @@ fi

29984

else

29985

case $cross_compiling:$ac_tool_warned in

29986

yes:)

29987

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

29988

-whose name does not start with the host triplet. If you think this

29989

-configuration is useful to you, please write to autoconf@gnu.org." >&5

29990

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

29991

-whose name does not start with the host triplet. If you think this

29992

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

29993

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

29994

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

29995

ac_tool_warned=yes ;;

29996

esac

29997

STRIP=$ac_ct_STRIP

29998

@@ -5437,10 +5698,10 @@ test -z "$STRIP" && STRIP=:

29999

if test -n "$ac_tool_prefix"; then

30000

# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.

24865

@@ -5693,7 +5978,7 @@ if test -n "$ac_tool_prefix"; then

30001

24866

set dummy ${ac_tool_prefix}ranlib; ac_word=$2

30002

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30003

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30004

-if test "${ac_cv_prog_RANLIB+set}" = set; then

30005

- echo $ECHO_N "(cached) $ECHO_C" >&6

30006

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30007

+$as_echo_n "checking for $ac_word... " >&6; }

30008

+if test "${ac_cv_prog_RANLIB+set}" = set; then :

30009

+ $as_echo_n "(cached) " >&6

24867

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

24868

$as_echo_n "checking for $ac_word... " >&6; }

24869

-if test "${ac_cv_prog_RANLIB+set}" = set; then :

24870

+if ${ac_cv_prog_RANLIB+:} false; then :

24871

$as_echo_n "(cached) " >&6

30010

24872

else

30011

24873

if test -n "$RANLIB"; then

30012

ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.

30013

@@ -5450,25 +5711,25 @@ for as_dir in $PATH

30014

30015

IFS=$as_save_IFS

30016

test -z "$as_dir" && as_dir=.

30017

- for ac_exec_ext in '' $ac_executable_extensions; do

30018

+ for ac_exec_ext in '' $ac_executable_extensions; do

30019

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30020

ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

30021

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30022

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30023

break 2

30024

30025

done

30026

-done

30027

+ done

30028

IFS=$as_save_IFS

30029

30030

30031

30032

RANLIB=$ac_cv_prog_RANLIB

30033

if test -n "$RANLIB"; then

30034

- { echo "$as_me:$LINENO: result: $RANLIB" >&5

30035

-echo "${ECHO_T}$RANLIB" >&6; }

30036

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5

30037

+$as_echo "$RANLIB" >&6; }

30038

else

30039

- { echo "$as_me:$LINENO: result: no" >&5

30040

-echo "${ECHO_T}no" >&6; }

30041

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30042

+$as_echo "no" >&6; }

30043

30044

30045

30046

@@ -5477,10 +5738,10 @@ if test -z "$ac_cv_prog_RANLIB"; then

30047

ac_ct_RANLIB=$RANLIB

30048

# Extract the first word of "ranlib", so it can be a program name with args.

24874

@@ -5733,7 +6018,7 @@ if test -z "$ac_cv_prog_RANLIB"; then

30049

24875

set dummy ranlib; ac_word=$2

30050

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30051

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30052

-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then

30053

- echo $ECHO_N "(cached) $ECHO_C" >&6

30054

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30055

+$as_echo_n "checking for $ac_word... " >&6; }

30056

+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :

30057

+ $as_echo_n "(cached) " >&6

24876

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

24877

$as_echo_n "checking for $ac_word... " >&6; }

24878

-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :

24879

+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :

24880

$as_echo_n "(cached) " >&6

30058

24881

else

30059

24882

if test -n "$ac_ct_RANLIB"; then

30060

ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.

30061

@@ -5490,25 +5751,25 @@ for as_dir in $PATH

30062

30063

IFS=$as_save_IFS

30064

test -z "$as_dir" && as_dir=.

30065

- for ac_exec_ext in '' $ac_executable_extensions; do

30066

+ for ac_exec_ext in '' $ac_executable_extensions; do

30067

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30068

ac_cv_prog_ac_ct_RANLIB="ranlib"

30069

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30070

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30071

break 2

30072

30073

done

30074

-done

30075

+ done

30076

IFS=$as_save_IFS

30077

30078

30079

30080

ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB

30081

if test -n "$ac_ct_RANLIB"; then

30082

- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5

30083

-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }

30084

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5

30085

+$as_echo "$ac_ct_RANLIB" >&6; }

30086

else

30087

- { echo "$as_me:$LINENO: result: no" >&5

30088

-echo "${ECHO_T}no" >&6; }

30089

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30090

+$as_echo "no" >&6; }

30091

30092

30093

if test "x$ac_ct_RANLIB" = x; then

30094

@@ -5516,12 +5777,8 @@ fi

30095

else

30096

case $cross_compiling:$ac_tool_warned in

30097

yes:)

30098

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

30099

-whose name does not start with the host triplet. If you think this

30100

-configuration is useful to you, please write to autoconf@gnu.org." >&5

30101

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

30102

-whose name does not start with the host triplet. If you think this

30103

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

30104

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

30105

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

30106

ac_tool_warned=yes ;;

30107

esac

30108

RANLIB=$ac_ct_RANLIB

30109

@@ -5598,10 +5855,10 @@ compiler=$CC

30110

30111

24883

@@ -5804,6 +6089,18 @@ if test -n "$RANLIB"; then

24884

old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"

24885

24886

24887

+case $host_os in

24888

+ darwin*)

24889

+ lock_old_archive_extraction=yes ;;

24890

+ *)

24891

+ lock_old_archive_extraction=no ;;

24892

+esac

24893

24894

24895

24896

24897

24898

24899

24900

24901

24902

@@ -5850,7 +6147,7 @@ compiler=$CC

30112

24903

# Check for command to grab the raw symbol name followed by C symbol from nm.

30113

-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

30114

-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }

30115

-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then

30116

- echo $ECHO_N "(cached) $ECHO_C" >&6

30117

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5

30118

+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }

30119

+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :

30120

+ $as_echo_n "(cached) " >&6

24904

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5

24905

$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }

24906

-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :

24907

+if ${lt_cv_sys_global_symbol_pipe+:} false; then :

24908

$as_echo_n "(cached) " >&6

30121

24909

else

30122

24910

30123

# These are sane defaults that work on at least a few old systems.

30124

@@ -5618,7 +5875,7 @@ case $host_os in

30125

aix*)

30126

symcode='[BCDT]'

30127

;;

30128

-cygwin* | mingw* | pw32*)

30129

+cygwin* | mingw* | pw32* | cegcc*)

30130

symcode='[ABCDGISTW]'

30131

;;

30132

hpux*)

30133

@@ -5716,18 +5973,18 @@ void nm_test_func(void){}

30134

int main(){nm_test_var='a';nm_test_func();return(0);}

30135

_LT_EOF

30136

30137

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

30138

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

30139

(eval $ac_compile) 2>&5

30140

ac_status=$?

30141

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

30142

- (exit $ac_status); }; then

30143

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

30144

+ test $ac_status = 0; }; then

24911

@@ -5911,8 +6208,8 @@ esac

24912

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

24913

24914

# Transform an extracted symbol line into symbol name and symbol address

24915

-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (void *) \&\2},/p'"

24916

24917

+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (void *) \&\2},/p'"

24918

24919

24920

# Handle CRLF in mingw tool chain

24921

opt_cr=

24922

@@ -5948,6 +6245,7 @@ for ac_symprfx in "" "_"; do

24923

else

24924

lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]$$symcode$symcode*$[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"

24925

24926

+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"

24927

24928

# Check to see that the pipe works correctly.

24929

pipe_works=no

24930

@@ -5973,8 +6271,8 @@ _LT_EOF

24931

test $ac_status = 0; }; then

30145

24932

# Now try to grab the symbols.

30146

24933

nlist=conftest.nm

30147

- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5

30148

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5

30149

(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5

24934

- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5

24935

- (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5

24936

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5

24937

+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5

30150

24938

ac_status=$?

30151

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

30152

- (exit $ac_status); } && test -s "$nlist"; then

30153

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

30154

+ test $ac_status = 0; } && test -s "$nlist"; then

30155

# Try sorting and uniquifying the output.

30156

if sort "$nlist" | uniq > "$nlist"T; then

30157

mv -f "$nlist"T "$nlist"

30158

@@ -5780,11 +6037,11 @@ _LT_EOF

30159

lt_save_CFLAGS="$CFLAGS"

24939

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

24940

test $ac_status = 0; } && test -s "$nlist"; then

24941

@@ -5989,6 +6287,18 @@ _LT_EOF

24942

if $GREP ' nm_test_var$' "$nlist" >/dev/null; then

24943

if $GREP ' nm_test_func$' "$nlist" >/dev/null; then

24944

cat <<_LT_EOF > conftest.$ac_ext

24945

+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */

24946

+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)

24947

+/* DATA imports from DLLs on WIN32 con't be const, because runtime

24948

+ relocations are performed -- see ld's documentation on pseudo-relocs. */

24949

+# define LT_DLSYM_CONST

24950

+#elif defined(__osf__)

24951

+/* This system does not cope well with relocations in const data. */

24952

+# define LT_DLSYM_CONST

24953

+#else

24954

+# define LT_DLSYM_CONST const

24955

+#endif

24956

24957

#ifdef __cplusplus

24958

extern "C" {

24959

#endif

24960

@@ -6000,7 +6310,7 @@ _LT_EOF

24961

cat <<_LT_EOF >> conftest.$ac_ext

24962

24963

/* The mapping between symbol names and symbols. */

24964

-const struct {

24965

+LT_DLSYM_CONST struct {

24966

const char *name;

24967

void *address;

24968

}

24969

@@ -6026,8 +6336,8 @@ static const void *lt_preloaded_setup()

24970

_LT_EOF

24971

# Now try linking the two files.

24972

mv conftest.$ac_objext conftstm.$ac_objext

24973

- lt_save_LIBS="$LIBS"

24974

- lt_save_CFLAGS="$CFLAGS"

24975

+ lt_globsym_save_LIBS=$LIBS

24976

+ lt_globsym_save_CFLAGS=$CFLAGS

30160

24977

LIBS="conftstm.$ac_objext"

30161

24978

CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"

30162

- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

30163

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5

30164

(eval $ac_link) 2>&5

30165

ac_status=$?

30166

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

30167

- (exit $ac_status); } && test -s conftest${ac_exeext}; then

30168

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

30169

+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then

24979

if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5

24980

@@ -6037,8 +6347,8 @@ _LT_EOF

24981

test $ac_status = 0; } && test -s conftest${ac_exeext}; then

30170

24982

pipe_works=yes

30171

24983

30172

LIBS="$lt_save_LIBS"

30173

@@ -5818,11 +6075,11 @@ if test -z "$lt_cv_sys_global_symbol_pip

30174

lt_cv_sys_global_symbol_to_cdecl=

30175

30176

if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then

30177

- { echo "$as_me:$LINENO: result: failed" >&5

30178

-echo "${ECHO_T}failed" >&6; }

30179

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5

30180

+$as_echo "failed" >&6; }

30181

else

30182

- { echo "$as_me:$LINENO: result: ok" >&5

30183

-echo "${ECHO_T}ok" >&6; }

30184

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5

30185

+$as_echo "ok" >&6; }

30186

30187

30188

30189

@@ -5848,7 +6105,7 @@ fi

30190

30191

24984

- LIBS="$lt_save_LIBS"

24985

- CFLAGS="$lt_save_CFLAGS"

24986

+ LIBS=$lt_globsym_save_LIBS

24987

+ CFLAGS=$lt_globsym_save_CFLAGS

24988

else

24989

echo "cannot find nm_test_func in $nlist" >&5

24990

24991

@@ -6075,6 +6385,17 @@ else

24992

$as_echo "ok" >&6; }

24993

24994

24995

+# Response file support.

24996

+if test "$lt_cv_nm_interface" = "MS dumpbin"; then

24997

+ nm_file_list_spec='@'

24998

+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then

24999

+ nm_file_list_spec='@'

25000

+fi

25001

25002

25003

25004

25005

25006

25007

25008

25009

@@ -6097,6 +6418,44 @@ fi

25010

25011

25012

25013

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5

25014

+$as_echo_n "checking for sysroot... " >&6; }

25015

25016

+# Check whether --with-sysroot was given.

25017

+if test "${with_sysroot+set}" = set; then :

25018

+ withval=$with_sysroot;

25019

+else

25020

+ with_sysroot=no

25021

+fi

25022

25023

25024

+lt_sysroot=

25025

+case ${with_sysroot} in #(

25026

+ yes)

25027

+ if test "$GCC" = yes; then

25028

+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`

25029

+ fi

25030

+ ;; #(

25031

+ /*)

25032

+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`

25033

+ ;; #(

25034

+ no|'')

25035

+ ;; #(

25036

+ *)

25037

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5

25038

+$as_echo "${with_sysroot}" >&6; }

25039

+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5

25040

+ ;;

25041

+esac

25042

25043

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5

25044

+$as_echo "${lt_sysroot:-no}" >&6; }

25045

25046

25047

25048

25049

25050

30192

25051

# Check whether --enable-libtool-lock was given.

30193

-if test "${enable_libtool_lock+set}" = set; then

30194

+if test "${enable_libtool_lock+set}" = set; then :

25052

if test "${enable_libtool_lock+set}" = set; then :

30195

25053

enableval=$enable_libtool_lock;

30196

30197

30198

@@ -5860,11 +6117,11 @@ case $host in

30199

ia64-*-hpux*)

30200

# Find out which ABI we are using.

30201

echo 'int i;' > conftest.$ac_ext

30202

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

30203

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

30204

(eval $ac_compile) 2>&5

30205

ac_status=$?

30206

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

30207

- (exit $ac_status); }; then

30208

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

30209

+ test $ac_status = 0; }; then

30210

case `/usr/bin/file conftest.$ac_objext` in

30211

*ELF-32*)

30212

HPUX_IA64_MODE="32"

30213

@@ -5878,12 +6135,12 @@ ia64-*-hpux*)

25054

@@ -6128,7 +6487,7 @@ ia64-*-hpux*)

30214

25055

;;

30215

25056

*-*-irix6*)

30216

25057

# Find out which ABI we are using.

30217

- echo '#line 5881 "configure"' > conftest.$ac_ext

30218

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

30219

+ echo '#line 6138 "configure"' > conftest.$ac_ext

30220

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

30221

(eval $ac_compile) 2>&5

30222

ac_status=$?

30223

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

30224

- (exit $ac_status); }; then

30225

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

30226

+ test $ac_status = 0; }; then

30227

if test "$lt_cv_prog_gnu_ld" = yes; then

30228

case `/usr/bin/file conftest.$ac_objext` in

30229

*32-bit*)

30230

@@ -5917,11 +6174,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc

30231

s390*-*linux*|s390*-*tpf*|sparc*-*linux*)

30232

# Find out which ABI we are using.

30233

echo 'int i;' > conftest.$ac_ext

30234

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

30235

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

30236

(eval $ac_compile) 2>&5

30237

ac_status=$?

30238

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

30239

- (exit $ac_status); }; then

30240

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

30241

+ test $ac_status = 0; }; then

30242

case `/usr/bin/file conftest.o` in

30243

*32-bit*)

30244

case $host in

30245

@@ -5970,10 +6227,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*

30246

# On SCO OpenServer 5, we need -belf to get full-featured binaries.

30247

SAVE_CFLAGS="$CFLAGS"

25058

- echo '#line 6131 "configure"' > conftest.$ac_ext

25059

+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext

25060

if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

25061

(eval $ac_compile) 2>&5

25062

ac_status=$?

25063

@@ -6222,7 +6581,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*

30248

25064

CFLAGS="$CFLAGS -belf"

30249

- { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5

30250

-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }

30251

-if test "${lt_cv_cc_needs_belf+set}" = set; then

30252

- echo $ECHO_N "(cached) $ECHO_C" >&6

30253

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5

30254

+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }

30255

+if test "${lt_cv_cc_needs_belf+set}" = set; then :

30256

+ $as_echo_n "(cached) " >&6

25065

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5

25066

$as_echo_n "checking whether the C compiler needs -belf... " >&6; }

25067

-if test "${lt_cv_cc_needs_belf+set}" = set; then :

25068

+if ${lt_cv_cc_needs_belf+:} false; then :

25069

$as_echo_n "(cached) " >&6

30257

25070

else

30258

25071

ac_ext=c

30259

ac_cpp='$CPP $CPPFLAGS'

30260

@@ -5981,11 +6238,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con

30261

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

30262

ac_compiler_gnu=$ac_cv_c_compiler_gnu

30263

30264

- cat >conftest.$ac_ext <<_ACEOF

30265

-/* confdefs.h. */

30266

-_ACEOF

30267

-cat confdefs.h >>conftest.$ac_ext

30268

-cat >>conftest.$ac_ext <<_ACEOF

30269

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

30270

/* end confdefs.h. */

30271

30272

int

30273

@@ -5996,34 +6249,13 @@ main ()

30274

return 0;

30275

}

30276

_ACEOF

30277

-rm -f conftest.$ac_objext conftest$ac_exeext

30278

-if { (ac_try="$ac_link"

30279

-case "(($ac_try" in

30280

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

30281

- *) ac_try_echo=$ac_try;;

30282

-esac

30283

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

30284

- (eval "$ac_link") 2>conftest.er1

30285

- ac_status=$?

30286

- grep -v '^ *+' conftest.er1 >conftest.err

30287

- rm -f conftest.er1

30288

- cat conftest.err >&5

30289

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

30290

- (exit $ac_status); } && {

30291

- test -z "$ac_c_werror_flag" ||

30292

- test ! -s conftest.err

30293

- } && test -s conftest$ac_exeext &&

30294

- $as_test_x conftest$ac_exeext; then

30295

+if ac_fn_c_try_link "$LINENO"; then :

30296

lt_cv_cc_needs_belf=yes

30297

else

30298

- echo "$as_me: failed program was:" >&5

30299

-sed 's/^/| /' conftest.$ac_ext >&5

30300

30301

- lt_cv_cc_needs_belf=no

30302

+ lt_cv_cc_needs_belf=no

30303

30304

30305

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

30306

- conftest$ac_exeext conftest.$ac_ext

30307

+rm -f core conftest.err conftest.$ac_objext \

30308

+ conftest$ac_exeext conftest.$ac_ext

30309

ac_ext=c

30310

ac_cpp='$CPP $CPPFLAGS'

30311

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

30312

@@ -6031,8 +6263,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA

30313

ac_compiler_gnu=$ac_cv_c_compiler_gnu

30314

30315

30316

-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5

30317

-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }

30318

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5

30319

+$as_echo "$lt_cv_cc_needs_belf" >&6; }

30320

if test x"$lt_cv_cc_needs_belf" != x"yes"; then

30321

# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf

30322

CFLAGS="$SAVE_CFLAGS"

30323

@@ -6041,11 +6273,11 @@ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6

30324

sparc*-*solaris*)

30325

# Find out which ABI we are using.

30326

echo 'int i;' > conftest.$ac_ext

30327

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

30328

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

30329

(eval $ac_compile) 2>&5

30330

ac_status=$?

30331

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

30332

- (exit $ac_status); }; then

30333

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

30334

+ test $ac_status = 0; }; then

30335

case `/usr/bin/file conftest.o` in

30336

*64-bit*)

30337

case $lt_cv_prog_gnu_ld in

30338

@@ -6071,10 +6303,10 @@ need_locks="$enable_libtool_lock"

30339

if test -n "$ac_tool_prefix"; then

30340

# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.

25072

@@ -6290,6 +6649,123 @@ esac

25073

25074

need_locks="$enable_libtool_lock"

25075

25076

+if test -n "$ac_tool_prefix"; then

25077

+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.

25078

+set dummy ${ac_tool_prefix}mt; ac_word=$2

25079

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25080

+$as_echo_n "checking for $ac_word... " >&6; }

25081

+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :

25082

+ $as_echo_n "(cached) " >&6

25083

+else

25084

+ if test -n "$MANIFEST_TOOL"; then

25085

+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.

25086

+else

25087

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

25088

+for as_dir in $PATH

25089

+do

25090

+ IFS=$as_save_IFS

25091

+ test -z "$as_dir" && as_dir=.

25092

+ for ac_exec_ext in '' $ac_executable_extensions; do

25093

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

25094

+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"

25095

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

25096

+ break 2

25097

+ fi

25098

+done

25099

+ done

25100

+IFS=$as_save_IFS

25101

25102

+fi

25103

+fi

25104

+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL

25105

+if test -n "$MANIFEST_TOOL"; then

25106

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5

25107

+$as_echo "$MANIFEST_TOOL" >&6; }

25108

+else

25109

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

25110

+$as_echo "no" >&6; }

25111

+fi

25112

25113

25114

+fi

25115

+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then

25116

+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL

25117

+ # Extract the first word of "mt", so it can be a program name with args.

25118

+set dummy mt; ac_word=$2

25119

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25120

+$as_echo_n "checking for $ac_word... " >&6; }

25121

+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :

25122

+ $as_echo_n "(cached) " >&6

25123

+else

25124

+ if test -n "$ac_ct_MANIFEST_TOOL"; then

25125

+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.

25126

+else

25127

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

25128

+for as_dir in $PATH

25129

+do

25130

+ IFS=$as_save_IFS

25131

+ test -z "$as_dir" && as_dir=.

25132

+ for ac_exec_ext in '' $ac_executable_extensions; do

25133

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

25134

+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"

25135

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

25136

+ break 2

25137

+ fi

25138

+done

25139

+ done

25140

+IFS=$as_save_IFS

25141

25142

+fi

25143

+fi

25144

+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL

25145

+if test -n "$ac_ct_MANIFEST_TOOL"; then

25146

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5

25147

+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }

25148

+else

25149

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

25150

+$as_echo "no" >&6; }

25151

+fi

25152

25153

+ if test "x$ac_ct_MANIFEST_TOOL" = x; then

25154

+ MANIFEST_TOOL=":"

25155

+ else

25156

+ case $cross_compiling:$ac_tool_warned in

25157

+yes:)

25158

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

25159

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

25160

+ac_tool_warned=yes ;;

25161

+esac

25162

+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL

25163

+ fi

25164

+else

25165

+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"

25166

+fi

25167

25168

+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt

25169

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5

25170

+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }

25171

+if ${lt_cv_path_mainfest_tool+:} false; then :

25172

+ $as_echo_n "(cached) " >&6

25173

+else

25174

+ lt_cv_path_mainfest_tool=no

25175

+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5

25176

+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out

25177

+ cat conftest.err >&5

25178

+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then

25179

+ lt_cv_path_mainfest_tool=yes

25180

+ fi

25181

+ rm -f conftest*

25182

+fi

25183

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5

25184

+$as_echo "$lt_cv_path_mainfest_tool" >&6; }

25185

+if test "x$lt_cv_path_mainfest_tool" != xyes; then

25186

+ MANIFEST_TOOL=:

25187

+fi

25188

25189

25190

25191

25192

25193

25194

case $host_os in

25195

rhapsody* | darwin*)

25196

@@ -6298,7 +6774,7 @@ need_locks="$enable_libtool_lock"

30341

25197

set dummy ${ac_tool_prefix}dsymutil; ac_word=$2

30342

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30343

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30344

-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then

30345

- echo $ECHO_N "(cached) $ECHO_C" >&6

30346

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30347

+$as_echo_n "checking for $ac_word... " >&6; }

30348

+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :

30349

+ $as_echo_n "(cached) " >&6

25198

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25199

$as_echo_n "checking for $ac_word... " >&6; }

25200

-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :

25201

+if ${ac_cv_prog_DSYMUTIL+:} false; then :

25202

$as_echo_n "(cached) " >&6

30350

25203

else

30351

25204

if test -n "$DSYMUTIL"; then

30352

ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.

30353

@@ -6084,25 +6316,25 @@ for as_dir in $PATH

30354

30355

IFS=$as_save_IFS

30356

test -z "$as_dir" && as_dir=.

30357

- for ac_exec_ext in '' $ac_executable_extensions; do

30358

+ for ac_exec_ext in '' $ac_executable_extensions; do

30359

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30360

ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"

30361

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30362

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30363

break 2

30364

30365

done

30366

-done

30367

+ done

30368

IFS=$as_save_IFS

30369

30370

30371

30372

DSYMUTIL=$ac_cv_prog_DSYMUTIL

30373

if test -n "$DSYMUTIL"; then

30374

- { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5

30375

-echo "${ECHO_T}$DSYMUTIL" >&6; }

30376

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5

30377

+$as_echo "$DSYMUTIL" >&6; }

30378

else

30379

- { echo "$as_me:$LINENO: result: no" >&5

30380

-echo "${ECHO_T}no" >&6; }

30381

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30382

+$as_echo "no" >&6; }

30383

30384

30385

30386

@@ -6111,10 +6343,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then

30387

ac_ct_DSYMUTIL=$DSYMUTIL

30388

# Extract the first word of "dsymutil", so it can be a program name with args.

25205

@@ -6338,7 +6814,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then

30389

25206

set dummy dsymutil; ac_word=$2

30390

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30391

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30392

-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then

30393

- echo $ECHO_N "(cached) $ECHO_C" >&6

30394

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30395

+$as_echo_n "checking for $ac_word... " >&6; }

30396

+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :

30397

+ $as_echo_n "(cached) " >&6

25207

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25208

$as_echo_n "checking for $ac_word... " >&6; }

25209

-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :

25210

+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :

25211

$as_echo_n "(cached) " >&6

30398

25212

else

30399

25213

if test -n "$ac_ct_DSYMUTIL"; then

30400

ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.

30401

@@ -6124,25 +6356,25 @@ for as_dir in $PATH

30402

30403

IFS=$as_save_IFS

30404

test -z "$as_dir" && as_dir=.

30405

- for ac_exec_ext in '' $ac_executable_extensions; do

30406

+ for ac_exec_ext in '' $ac_executable_extensions; do

30407

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30408

ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"

30409

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30410

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30411

break 2

30412

30413

done

30414

-done

30415

+ done

30416

IFS=$as_save_IFS

30417

30418

30419

30420

ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL

30421

if test -n "$ac_ct_DSYMUTIL"; then

30422

- { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5

30423

-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }

30424

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5

30425

+$as_echo "$ac_ct_DSYMUTIL" >&6; }

30426

else

30427

- { echo "$as_me:$LINENO: result: no" >&5

30428

-echo "${ECHO_T}no" >&6; }

30429

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30430

+$as_echo "no" >&6; }

30431

30432

30433

if test "x$ac_ct_DSYMUTIL" = x; then

30434

@@ -6150,12 +6382,8 @@ fi

30435

else

30436

case $cross_compiling:$ac_tool_warned in

30437

yes:)

30438

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

30439

-whose name does not start with the host triplet. If you think this

30440

-configuration is useful to you, please write to autoconf@gnu.org." >&5

30441

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

30442

-whose name does not start with the host triplet. If you think this

30443

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

30444

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

30445

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

30446

ac_tool_warned=yes ;;

30447

esac

30448

DSYMUTIL=$ac_ct_DSYMUTIL

30449

@@ -6167,10 +6395,10 @@ fi

30450

if test -n "$ac_tool_prefix"; then

30451

# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.

25214

@@ -6390,7 +6866,7 @@ fi

30452

25215

set dummy ${ac_tool_prefix}nmedit; ac_word=$2

30453

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30454

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30455

-if test "${ac_cv_prog_NMEDIT+set}" = set; then

30456

- echo $ECHO_N "(cached) $ECHO_C" >&6

30457

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30458

+$as_echo_n "checking for $ac_word... " >&6; }

30459

+if test "${ac_cv_prog_NMEDIT+set}" = set; then :

30460

+ $as_echo_n "(cached) " >&6

25216

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25217

$as_echo_n "checking for $ac_word... " >&6; }

25218

-if test "${ac_cv_prog_NMEDIT+set}" = set; then :

25219

+if ${ac_cv_prog_NMEDIT+:} false; then :

25220

$as_echo_n "(cached) " >&6

30461

25221

else

30462

25222

if test -n "$NMEDIT"; then

30463

ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.

30464

@@ -6180,25 +6408,25 @@ for as_dir in $PATH

30465

30466

IFS=$as_save_IFS

30467

test -z "$as_dir" && as_dir=.

30468

- for ac_exec_ext in '' $ac_executable_extensions; do

30469

+ for ac_exec_ext in '' $ac_executable_extensions; do

30470

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30471

ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"

30472

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30473

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30474

break 2

30475

30476

done

30477

-done

30478

+ done

30479

IFS=$as_save_IFS

30480

30481

30482

30483

NMEDIT=$ac_cv_prog_NMEDIT

30484

if test -n "$NMEDIT"; then

30485

- { echo "$as_me:$LINENO: result: $NMEDIT" >&5

30486

-echo "${ECHO_T}$NMEDIT" >&6; }

30487

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5

30488

+$as_echo "$NMEDIT" >&6; }

30489

else

30490

- { echo "$as_me:$LINENO: result: no" >&5

30491

-echo "${ECHO_T}no" >&6; }

30492

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30493

+$as_echo "no" >&6; }

30494

30495

30496

30497

@@ -6207,10 +6435,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then

30498

ac_ct_NMEDIT=$NMEDIT

30499

# Extract the first word of "nmedit", so it can be a program name with args.

25223

@@ -6430,7 +6906,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then

30500

25224

set dummy nmedit; ac_word=$2

30501

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30502

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30503

-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then

30504

- echo $ECHO_N "(cached) $ECHO_C" >&6

30505

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30506

+$as_echo_n "checking for $ac_word... " >&6; }

30507

+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :

30508

+ $as_echo_n "(cached) " >&6

25225

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25226

$as_echo_n "checking for $ac_word... " >&6; }

25227

-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :

25228

+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :

25229

$as_echo_n "(cached) " >&6

30509

25230

else

30510

25231

if test -n "$ac_ct_NMEDIT"; then

30511

ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.

30512

@@ -6220,25 +6448,25 @@ for as_dir in $PATH

30513

30514

IFS=$as_save_IFS

30515

test -z "$as_dir" && as_dir=.

30516

- for ac_exec_ext in '' $ac_executable_extensions; do

30517

+ for ac_exec_ext in '' $ac_executable_extensions; do

30518

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30519

ac_cv_prog_ac_ct_NMEDIT="nmedit"

30520

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30521

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30522

break 2

30523

30524

done

30525

-done

30526

+ done

30527

IFS=$as_save_IFS

30528

30529

30530

30531

ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT

30532

if test -n "$ac_ct_NMEDIT"; then

30533

- { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5

30534

-echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }

30535

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5

30536

+$as_echo "$ac_ct_NMEDIT" >&6; }

30537

else

30538

- { echo "$as_me:$LINENO: result: no" >&5

30539

-echo "${ECHO_T}no" >&6; }

30540

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30541

+$as_echo "no" >&6; }

30542

30543

30544

if test "x$ac_ct_NMEDIT" = x; then

30545

@@ -6246,12 +6474,8 @@ fi

30546

else

30547

case $cross_compiling:$ac_tool_warned in

30548

yes:)

30549

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

30550

-whose name does not start with the host triplet. If you think this

30551

-configuration is useful to you, please write to autoconf@gnu.org." >&5

30552

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

30553

-whose name does not start with the host triplet. If you think this

30554

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

30555

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

30556

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

30557

ac_tool_warned=yes ;;

30558

esac

30559

NMEDIT=$ac_ct_NMEDIT

30560

@@ -6263,10 +6487,10 @@ fi

30561

if test -n "$ac_tool_prefix"; then

30562

# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.

25232

@@ -6482,7 +6958,7 @@ fi

30563

25233

set dummy ${ac_tool_prefix}lipo; ac_word=$2

30564

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30565

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30566

-if test "${ac_cv_prog_LIPO+set}" = set; then

30567

- echo $ECHO_N "(cached) $ECHO_C" >&6

30568

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30569

+$as_echo_n "checking for $ac_word... " >&6; }

30570

+if test "${ac_cv_prog_LIPO+set}" = set; then :

30571

+ $as_echo_n "(cached) " >&6

25234

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25235

$as_echo_n "checking for $ac_word... " >&6; }

25236

-if test "${ac_cv_prog_LIPO+set}" = set; then :

25237

+if ${ac_cv_prog_LIPO+:} false; then :

25238

$as_echo_n "(cached) " >&6

30572

25239

else

30573

25240

if test -n "$LIPO"; then

30574

ac_cv_prog_LIPO="$LIPO" # Let the user override the test.

30575

@@ -6276,25 +6500,25 @@ for as_dir in $PATH

30576

30577

IFS=$as_save_IFS

30578

test -z "$as_dir" && as_dir=.

30579

- for ac_exec_ext in '' $ac_executable_extensions; do

30580

+ for ac_exec_ext in '' $ac_executable_extensions; do

30581

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30582

ac_cv_prog_LIPO="${ac_tool_prefix}lipo"

30583

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30584

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30585

break 2

30586

30587

done

30588

-done

30589

+ done

30590

IFS=$as_save_IFS

30591

30592

30593

30594

LIPO=$ac_cv_prog_LIPO

30595

if test -n "$LIPO"; then

30596

- { echo "$as_me:$LINENO: result: $LIPO" >&5

30597

-echo "${ECHO_T}$LIPO" >&6; }

30598

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5

30599

+$as_echo "$LIPO" >&6; }

30600

else

30601

- { echo "$as_me:$LINENO: result: no" >&5

30602

-echo "${ECHO_T}no" >&6; }

30603

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30604

+$as_echo "no" >&6; }

30605

30606

30607

30608

@@ -6303,10 +6527,10 @@ if test -z "$ac_cv_prog_LIPO"; then

30609

ac_ct_LIPO=$LIPO

30610

# Extract the first word of "lipo", so it can be a program name with args.

25241

@@ -6522,7 +6998,7 @@ if test -z "$ac_cv_prog_LIPO"; then

30611

25242

set dummy lipo; ac_word=$2

30612

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30613

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30614

-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then

30615

- echo $ECHO_N "(cached) $ECHO_C" >&6

30616

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30617

+$as_echo_n "checking for $ac_word... " >&6; }

30618

+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :

30619

+ $as_echo_n "(cached) " >&6

25243

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25244

$as_echo_n "checking for $ac_word... " >&6; }

25245

-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :

25246

+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :

25247

$as_echo_n "(cached) " >&6

30620

25248

else

30621

25249

if test -n "$ac_ct_LIPO"; then

30622

ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.

30623

@@ -6316,25 +6540,25 @@ for as_dir in $PATH

30624

30625

IFS=$as_save_IFS

30626

test -z "$as_dir" && as_dir=.

30627

- for ac_exec_ext in '' $ac_executable_extensions; do

30628

+ for ac_exec_ext in '' $ac_executable_extensions; do

30629

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30630

ac_cv_prog_ac_ct_LIPO="lipo"

30631

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30632

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30633

break 2

30634

30635

done

30636

-done

30637

+ done

30638

IFS=$as_save_IFS

30639

30640

30641

30642

ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO

30643

if test -n "$ac_ct_LIPO"; then

30644

- { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5

30645

-echo "${ECHO_T}$ac_ct_LIPO" >&6; }

30646

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5

30647

+$as_echo "$ac_ct_LIPO" >&6; }

30648

else

30649

- { echo "$as_me:$LINENO: result: no" >&5

30650

-echo "${ECHO_T}no" >&6; }

30651

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30652

+$as_echo "no" >&6; }

30653

30654

30655

if test "x$ac_ct_LIPO" = x; then

30656

@@ -6342,12 +6566,8 @@ fi

30657

else

30658

case $cross_compiling:$ac_tool_warned in

30659

yes:)

30660

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

30661

-whose name does not start with the host triplet. If you think this

30662

-configuration is useful to you, please write to autoconf@gnu.org." >&5

30663

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

30664

-whose name does not start with the host triplet. If you think this

30665

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

30666

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

30667

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

30668

ac_tool_warned=yes ;;

30669

esac

30670

LIPO=$ac_ct_LIPO

30671

@@ -6359,10 +6579,10 @@ fi

30672

if test -n "$ac_tool_prefix"; then

30673

# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.

25250

@@ -6574,7 +7050,7 @@ fi

30674

25251

set dummy ${ac_tool_prefix}otool; ac_word=$2

30675

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30676

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30677

-if test "${ac_cv_prog_OTOOL+set}" = set; then

30678

- echo $ECHO_N "(cached) $ECHO_C" >&6

30679

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30680

+$as_echo_n "checking for $ac_word... " >&6; }

30681

+if test "${ac_cv_prog_OTOOL+set}" = set; then :

30682

+ $as_echo_n "(cached) " >&6

25252

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25253

$as_echo_n "checking for $ac_word... " >&6; }

25254

-if test "${ac_cv_prog_OTOOL+set}" = set; then :

25255

+if ${ac_cv_prog_OTOOL+:} false; then :

25256

$as_echo_n "(cached) " >&6

30683

25257

else

30684

25258

if test -n "$OTOOL"; then

30685

ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.

30686

@@ -6372,25 +6592,25 @@ for as_dir in $PATH

30687

30688

IFS=$as_save_IFS

30689

test -z "$as_dir" && as_dir=.

30690

- for ac_exec_ext in '' $ac_executable_extensions; do

30691

+ for ac_exec_ext in '' $ac_executable_extensions; do

30692

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30693

ac_cv_prog_OTOOL="${ac_tool_prefix}otool"

30694

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30695

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30696

break 2

30697

30698

done

30699

-done

30700

+ done

30701

IFS=$as_save_IFS

30702

30703

30704

30705

OTOOL=$ac_cv_prog_OTOOL

30706

if test -n "$OTOOL"; then

30707

- { echo "$as_me:$LINENO: result: $OTOOL" >&5

30708

-echo "${ECHO_T}$OTOOL" >&6; }

30709

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5

30710

+$as_echo "$OTOOL" >&6; }

30711

else

30712

- { echo "$as_me:$LINENO: result: no" >&5

30713

-echo "${ECHO_T}no" >&6; }

30714

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30715

+$as_echo "no" >&6; }

30716

30717

30718

30719

@@ -6399,10 +6619,10 @@ if test -z "$ac_cv_prog_OTOOL"; then

30720

ac_ct_OTOOL=$OTOOL

30721

# Extract the first word of "otool", so it can be a program name with args.

25259

@@ -6614,7 +7090,7 @@ if test -z "$ac_cv_prog_OTOOL"; then

30722

25260

set dummy otool; ac_word=$2

30723

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30724

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30725

-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then

30726

- echo $ECHO_N "(cached) $ECHO_C" >&6

30727

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30728

+$as_echo_n "checking for $ac_word... " >&6; }

30729

+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :

30730

+ $as_echo_n "(cached) " >&6

25261

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25262

$as_echo_n "checking for $ac_word... " >&6; }

25263

-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :

25264

+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :

25265

$as_echo_n "(cached) " >&6

30731

25266

else

30732

25267

if test -n "$ac_ct_OTOOL"; then

30733

ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.

30734

@@ -6412,25 +6632,25 @@ for as_dir in $PATH

30735

30736

IFS=$as_save_IFS

30737

test -z "$as_dir" && as_dir=.

30738

- for ac_exec_ext in '' $ac_executable_extensions; do

30739

+ for ac_exec_ext in '' $ac_executable_extensions; do

30740

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30741

ac_cv_prog_ac_ct_OTOOL="otool"

30742

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30743

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30744

break 2

30745

30746

done

30747

-done

30748

+ done

30749

IFS=$as_save_IFS

30750

30751

30752

30753

ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL

30754

if test -n "$ac_ct_OTOOL"; then

30755

- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5

30756

-echo "${ECHO_T}$ac_ct_OTOOL" >&6; }

30757

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5

30758

+$as_echo "$ac_ct_OTOOL" >&6; }

30759

else

30760

- { echo "$as_me:$LINENO: result: no" >&5

30761

-echo "${ECHO_T}no" >&6; }

30762

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30763

+$as_echo "no" >&6; }

30764

30765

30766

if test "x$ac_ct_OTOOL" = x; then

30767

@@ -6438,12 +6658,8 @@ fi

30768

else

30769

case $cross_compiling:$ac_tool_warned in

30770

yes:)

30771

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

30772

-whose name does not start with the host triplet. If you think this

30773

-configuration is useful to you, please write to autoconf@gnu.org." >&5

30774

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

30775

-whose name does not start with the host triplet. If you think this

30776

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

30777

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

30778

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

30779

ac_tool_warned=yes ;;

30780

esac

30781

OTOOL=$ac_ct_OTOOL

30782

@@ -6455,10 +6671,10 @@ fi

30783

if test -n "$ac_tool_prefix"; then

30784

# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.

25268

@@ -6666,7 +7142,7 @@ fi

30785

25269

set dummy ${ac_tool_prefix}otool64; ac_word=$2

30786

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30787

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30788

-if test "${ac_cv_prog_OTOOL64+set}" = set; then

30789

- echo $ECHO_N "(cached) $ECHO_C" >&6

30790

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30791

+$as_echo_n "checking for $ac_word... " >&6; }

30792

+if test "${ac_cv_prog_OTOOL64+set}" = set; then :

30793

+ $as_echo_n "(cached) " >&6

25270

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25271

$as_echo_n "checking for $ac_word... " >&6; }

25272

-if test "${ac_cv_prog_OTOOL64+set}" = set; then :

25273

+if ${ac_cv_prog_OTOOL64+:} false; then :

25274

$as_echo_n "(cached) " >&6

30794

25275

else

30795

25276

if test -n "$OTOOL64"; then

30796

ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.

30797

@@ -6468,25 +6684,25 @@ for as_dir in $PATH

30798

30799

IFS=$as_save_IFS

30800

test -z "$as_dir" && as_dir=.

30801

- for ac_exec_ext in '' $ac_executable_extensions; do

30802

+ for ac_exec_ext in '' $ac_executable_extensions; do

30803

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30804

ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"

30805

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30806

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30807

break 2

30808

30809

done

30810

-done

30811

+ done

30812

IFS=$as_save_IFS

30813

30814

30815

30816

OTOOL64=$ac_cv_prog_OTOOL64

30817

if test -n "$OTOOL64"; then

30818

- { echo "$as_me:$LINENO: result: $OTOOL64" >&5

30819

-echo "${ECHO_T}$OTOOL64" >&6; }

30820

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5

30821

+$as_echo "$OTOOL64" >&6; }

30822

else

30823

- { echo "$as_me:$LINENO: result: no" >&5

30824

-echo "${ECHO_T}no" >&6; }

30825

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30826

+$as_echo "no" >&6; }

30827

30828

30829

30830

@@ -6495,10 +6711,10 @@ if test -z "$ac_cv_prog_OTOOL64"; then

30831

ac_ct_OTOOL64=$OTOOL64

30832

# Extract the first word of "otool64", so it can be a program name with args.

25277

@@ -6706,7 +7182,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then

30833

25278

set dummy otool64; ac_word=$2

30834

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

30835

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

30836

-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then

30837

- echo $ECHO_N "(cached) $ECHO_C" >&6

30838

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

30839

+$as_echo_n "checking for $ac_word... " >&6; }

30840

+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :

30841

+ $as_echo_n "(cached) " >&6

25279

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25280

$as_echo_n "checking for $ac_word... " >&6; }

25281

-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :

25282

+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :

25283

$as_echo_n "(cached) " >&6

30842

25284

else

30843

25285

if test -n "$ac_ct_OTOOL64"; then

30844

ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.

30845

@@ -6508,25 +6724,25 @@ for as_dir in $PATH

30846

30847

IFS=$as_save_IFS

30848

test -z "$as_dir" && as_dir=.

30849

- for ac_exec_ext in '' $ac_executable_extensions; do

30850

+ for ac_exec_ext in '' $ac_executable_extensions; do

30851

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

30852

ac_cv_prog_ac_ct_OTOOL64="otool64"

30853

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

30854

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

30855

break 2

30856

30857

done

30858

-done

30859

+ done

30860

IFS=$as_save_IFS

30861

30862

30863

30864

ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64

30865

if test -n "$ac_ct_OTOOL64"; then

30866

- { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5

30867

-echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }

30868

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5

30869

+$as_echo "$ac_ct_OTOOL64" >&6; }

30870

else

30871

- { echo "$as_me:$LINENO: result: no" >&5

30872

-echo "${ECHO_T}no" >&6; }

30873

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

30874

+$as_echo "no" >&6; }

30875

30876

30877

if test "x$ac_ct_OTOOL64" = x; then

30878

@@ -6534,12 +6750,8 @@ fi

30879

else

30880

case $cross_compiling:$ac_tool_warned in

30881

yes:)

30882

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

30883

-whose name does not start with the host triplet. If you think this

30884

-configuration is useful to you, please write to autoconf@gnu.org." >&5

30885

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

30886

-whose name does not start with the host triplet. If you think this

30887

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

30888

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

30889

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

30890

ac_tool_warned=yes ;;

30891

esac

30892

OTOOL64=$ac_ct_OTOOL64

30893

@@ -6574,10 +6786,10 @@ fi

30894

30895

30896

30897

- { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5

30898

-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }

30899

-if test "${lt_cv_apple_cc_single_mod+set}" = set; then

30900

- echo $ECHO_N "(cached) $ECHO_C" >&6

30901

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5

30902

+$as_echo_n "checking for -single_module linker flag... " >&6; }

30903

+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :

30904

+ $as_echo_n "(cached) " >&6

25286

@@ -6781,7 +7257,7 @@ fi

25287

25288

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5

25289

$as_echo_n "checking for -single_module linker flag... " >&6; }

25290

-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :

25291

+if ${lt_cv_apple_cc_single_mod+:} false; then :

25292

$as_echo_n "(cached) " >&6

30905

25293

else

30906

25294

lt_cv_apple_cc_single_mod=no

30907

if test -z "${LT_MULTI_MODULE}"; then

30908

@@ -6601,22 +6813,18 @@ else

30909

rm -f conftest.*

30910

30911

30912

-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5

30913

-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }

30914

- { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5

30915

-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }

30916

-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then

30917

- echo $ECHO_N "(cached) $ECHO_C" >&6

30918

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5

30919

+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }

30920

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5

30921

+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }

30922

+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :

30923

+ $as_echo_n "(cached) " >&6

25295

@@ -6810,7 +7286,7 @@ fi

25296

$as_echo "$lt_cv_apple_cc_single_mod" >&6; }

25297

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5

25298

$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }

25299

-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :

25300

+if ${lt_cv_ld_exported_symbols_list+:} false; then :

25301

$as_echo_n "(cached) " >&6

30924

25302

else

30925

25303

lt_cv_ld_exported_symbols_list=no

30926

save_LDFLAGS=$LDFLAGS

30927

echo "_main" > conftest.sym

30928

LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"

30929

- cat >conftest.$ac_ext <<_ACEOF

30930

-/* confdefs.h. */

30931

-_ACEOF

30932

-cat confdefs.h >>conftest.$ac_ext

30933

-cat >>conftest.$ac_ext <<_ACEOF

30934

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

30935

/* end confdefs.h. */

30936

30937

int

30938

@@ -6627,39 +6835,18 @@ main ()

30939

return 0;

30940

}

30941

_ACEOF

30942

-rm -f conftest.$ac_objext conftest$ac_exeext

30943

-if { (ac_try="$ac_link"

30944

-case "(($ac_try" in

30945

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

30946

- *) ac_try_echo=$ac_try;;

30947

-esac

30948

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

30949

- (eval "$ac_link") 2>conftest.er1

30950

- ac_status=$?

30951

- grep -v '^ *+' conftest.er1 >conftest.err

30952

- rm -f conftest.er1

30953

- cat conftest.err >&5

30954

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

30955

- (exit $ac_status); } && {

30956

- test -z "$ac_c_werror_flag" ||

30957

- test ! -s conftest.err

30958

- } && test -s conftest$ac_exeext &&

30959

- $as_test_x conftest$ac_exeext; then

30960

+if ac_fn_c_try_link "$LINENO"; then :

30961

lt_cv_ld_exported_symbols_list=yes

30962

else

30963

- echo "$as_me: failed program was:" >&5

30964

-sed 's/^/| /' conftest.$ac_ext >&5

30965

30966

- lt_cv_ld_exported_symbols_list=no

30967

+ lt_cv_ld_exported_symbols_list=no

30968

30969

30970

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

30971

- conftest$ac_exeext conftest.$ac_ext

30972

+rm -f core conftest.err conftest.$ac_objext \

30973

+ conftest$ac_exeext conftest.$ac_ext

30974

LDFLAGS="$save_LDFLAGS"

30975

30976

30977

-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5

30978

-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }

30979

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5

30980

+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }

30981

case $host_os in

30982

rhapsody* | darwin1.[012])

30983

_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

30984

@@ -6700,15 +6887,15 @@ ac_cpp='$CPP $CPPFLAGS'

30985

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

30986

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

30987

ac_compiler_gnu=$ac_cv_c_compiler_gnu

30988

-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5

30989

-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }

30990

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5

30991

+$as_echo_n "checking how to run the C preprocessor... " >&6; }

30992

# On Suns, sometimes $CPP names a directory.

30993

if test -n "$CPP" && test -d "$CPP"; then

25304

@@ -6840,10 +7316,42 @@ rm -f core conftest.err conftest.$ac_obj

25305

25306

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5

25307

$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }

25308

- case $host_os in

25309

- rhapsody* | darwin1.[012])

25310

- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

25311

- darwin1.*)

25312

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5

25313

+$as_echo_n "checking for -force_load linker flag... " >&6; }

25314

+if ${lt_cv_ld_force_load+:} false; then :

25315

+ $as_echo_n "(cached) " >&6

25316

+else

25317

+ lt_cv_ld_force_load=no

25318

+ cat > conftest.c << _LT_EOF

25319

+int forced_loaded() { return 2;}

25320

+_LT_EOF

25321

+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5

25322

+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5

25323

+ echo "$AR cru libconftest.a conftest.o" >&5

25324

+ $AR cru libconftest.a conftest.o 2>&5

25325

+ echo "$RANLIB libconftest.a" >&5

25326

+ $RANLIB libconftest.a 2>&5

25327

+ cat > conftest.c << _LT_EOF

25328

+int main() { return 0;}

25329

+_LT_EOF

25330

+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5

25331

+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err

25332

+ _lt_result=$?

25333

+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then

25334

+ lt_cv_ld_force_load=yes

25335

+ else

25336

+ cat conftest.err >&5

25337

+ fi

25338

+ rm -f conftest.err libconftest.a conftest conftest.c

25339

+ rm -rf conftest.dSYM

25340

25341

+fi

25342

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5

25343

+$as_echo "$lt_cv_ld_force_load" >&6; }

25344

+ case $host_os in

25345

+ rhapsody* | darwin1.[012])

25346

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

25347

+ darwin1.*)

25348

_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

25349

darwin*) # darwin 5.x on

25350

# if running on 10.5 or later, the deployment target defaults

25351

@@ -6867,7 +7375,7 @@ $as_echo "$lt_cv_ld_exported_symbols_lis

25352

else

25353

_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'

25354

25355

- if test "$DSYMUTIL" != ":"; then

25356

+ if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then

25357

_lt_dsymutil='~$DSYMUTIL $lib || :'

25358

else

25359

_lt_dsymutil=

25360

@@ -6887,7 +7395,7 @@ if test -n "$CPP" && test -d "$CPP"; the

30994

25361

CPP=

30995

25362

30996

25363

if test -z "$CPP"; then

30997

- if test "${ac_cv_prog_CPP+set}" = set; then

30998

- echo $ECHO_N "(cached) $ECHO_C" >&6

30999

+ if test "${ac_cv_prog_CPP+set}" = set; then :

31000

+ $as_echo_n "(cached) " >&6

25364

- if test "${ac_cv_prog_CPP+set}" = set; then :

25365

+ if ${ac_cv_prog_CPP+:} false; then :

25366

$as_echo_n "(cached) " >&6

31001

25367

else

31002

25368

# Double quotes because CPP needs to be expanded

31003

for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"

31004

@@ -6722,11 +6909,7 @@ do

31005

# <limits.h> exists even on freestanding compilers.

31006

# On the NeXT, cc -E runs the code through the compiler's parser,

31007

# not just through cpp. "Syntax error" is here to catch this case.

31008

- cat >conftest.$ac_ext <<_ACEOF

31009

-/* confdefs.h. */

31010

-_ACEOF

31011

-cat confdefs.h >>conftest.$ac_ext

31012

-cat >>conftest.$ac_ext <<_ACEOF

31013

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31014

/* end confdefs.h. */

31015

#ifdef __STDC__

31016

# include <limits.h>

31017

@@ -6735,76 +6918,34 @@ cat >>conftest.$ac_ext <<_ACEOF

31018

#endif

31019

Syntax error

31020

_ACEOF

31021

-if { (ac_try="$ac_cpp conftest.$ac_ext"

31022

-case "(($ac_try" in

31023

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31024

- *) ac_try_echo=$ac_try;;

31025

-esac

31026

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31027

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

31028

- ac_status=$?

31029

- grep -v '^ *+' conftest.er1 >conftest.err

31030

- rm -f conftest.er1

31031

- cat conftest.err >&5

31032

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31033

- (exit $ac_status); } >/dev/null && {

31034

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

31035

- test ! -s conftest.err

31036

- }; then

31037

- :

31038

-else

31039

- echo "$as_me: failed program was:" >&5

31040

-sed 's/^/| /' conftest.$ac_ext >&5

31041

+if ac_fn_c_try_cpp "$LINENO"; then :

31042

31043

+else

25369

@@ -6917,7 +7425,7 @@ else

31044

25370

# Broken: fails on valid input.

31045

25371

continue

31046

25372

31047

31048

25373

-rm -f conftest.err conftest.$ac_ext

31049

25374

+rm -f conftest.err conftest.i conftest.$ac_ext

31050

25375

31051

25376

# OK, works on sane cases. Now check whether nonexistent headers

31052

25377

# can be detected and how.

31053

- cat >conftest.$ac_ext <<_ACEOF

31054

-/* confdefs.h. */

31055

-_ACEOF

31056

-cat confdefs.h >>conftest.$ac_ext

31057

-cat >>conftest.$ac_ext <<_ACEOF

31058

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31059

/* end confdefs.h. */

31060

-#include <ac_nonexistent.h>

31061

-_ACEOF

31062

-if { (ac_try="$ac_cpp conftest.$ac_ext"

31063

-case "(($ac_try" in

31064

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31065

- *) ac_try_echo=$ac_try;;

31066

-esac

31067

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31068

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

31069

- ac_status=$?

31070

- grep -v '^ *+' conftest.er1 >conftest.err

31071

- rm -f conftest.er1

31072

- cat conftest.err >&5

31073

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31074

- (exit $ac_status); } >/dev/null && {

31075

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

31076

- test ! -s conftest.err

31077

- }; then

31078

+#include <ac_nonexistent.h>

31079

+_ACEOF

31080

+if ac_fn_c_try_cpp "$LINENO"; then :

31081

# Broken: success on invalid input.

31082

continue

31083

else

31084

- echo "$as_me: failed program was:" >&5

31085

-sed 's/^/| /' conftest.$ac_ext >&5

31086

31087

# Passes both tests.

25378

@@ -6933,11 +7441,11 @@ else

31088

25379

ac_preproc_ok=:

31089

25380

break

31090

25381

31091

31092

25382

-rm -f conftest.err conftest.$ac_ext

31093

25383

+rm -f conftest.err conftest.i conftest.$ac_ext

31094

25384

31095

25385

done

31096

25386

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

31097

25387

-rm -f conftest.err conftest.$ac_ext

31098

-if $ac_preproc_ok; then

31099

25388

+rm -f conftest.i conftest.err conftest.$ac_ext

31100

+if $ac_preproc_ok; then :

25389

if $ac_preproc_ok; then :

31101

25390

break

31102

25391

31103

31104

@@ -6816,8 +6957,8 @@ fi

31105

else

31106

ac_cv_prog_CPP=$CPP

31107

31108

-{ echo "$as_me:$LINENO: result: $CPP" >&5

31109

-echo "${ECHO_T}$CPP" >&6; }

31110

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5

31111

+$as_echo "$CPP" >&6; }

31112

ac_preproc_ok=false

31113

for ac_c_preproc_warn_flag in '' yes

31114

31115

@@ -6827,11 +6968,7 @@ do

31116

# <limits.h> exists even on freestanding compilers.

31117

# On the NeXT, cc -E runs the code through the compiler's parser,

31118

# not just through cpp. "Syntax error" is here to catch this case.

31119

- cat >conftest.$ac_ext <<_ACEOF

31120

-/* confdefs.h. */

31121

-_ACEOF

31122

-cat confdefs.h >>conftest.$ac_ext

31123

-cat >>conftest.$ac_ext <<_ACEOF

31124

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31125

/* end confdefs.h. */

31126

#ifdef __STDC__

31127

# include <limits.h>

31128

@@ -6840,83 +6977,40 @@ cat >>conftest.$ac_ext <<_ACEOF

31129

#endif

31130

Syntax error

31131

_ACEOF

31132

-if { (ac_try="$ac_cpp conftest.$ac_ext"

31133

-case "(($ac_try" in

31134

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31135

- *) ac_try_echo=$ac_try;;

31136

-esac

31137

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31138

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

31139

- ac_status=$?

31140

- grep -v '^ *+' conftest.er1 >conftest.err

31141

- rm -f conftest.er1

31142

- cat conftest.err >&5

31143

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31144

- (exit $ac_status); } >/dev/null && {

31145

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

31146

- test ! -s conftest.err

31147

- }; then

31148

- :

31149

-else

31150

- echo "$as_me: failed program was:" >&5

31151

-sed 's/^/| /' conftest.$ac_ext >&5

31152

+if ac_fn_c_try_cpp "$LINENO"; then :

31153

31154

+else

25392

@@ -6976,7 +7484,7 @@ else

31155

25393

# Broken: fails on valid input.

31156

25394

continue

31157

25395

31158

31159

25396

-rm -f conftest.err conftest.$ac_ext

31160

25397

+rm -f conftest.err conftest.i conftest.$ac_ext

31161

25398

31162

25399

# OK, works on sane cases. Now check whether nonexistent headers

31163

25400

# can be detected and how.

31164

- cat >conftest.$ac_ext <<_ACEOF

31165

-/* confdefs.h. */

31166

-_ACEOF

31167

-cat confdefs.h >>conftest.$ac_ext

31168

-cat >>conftest.$ac_ext <<_ACEOF

31169

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31170

/* end confdefs.h. */

31171

#include <ac_nonexistent.h>

31172

_ACEOF

31173

-if { (ac_try="$ac_cpp conftest.$ac_ext"

31174

-case "(($ac_try" in

31175

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31176

- *) ac_try_echo=$ac_try;;

31177

-esac

31178

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31179

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

31180

- ac_status=$?

31181

- grep -v '^ *+' conftest.er1 >conftest.err

31182

- rm -f conftest.er1

31183

- cat conftest.err >&5

31184

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31185

- (exit $ac_status); } >/dev/null && {

31186

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

31187

- test ! -s conftest.err

31188

- }; then

31189

+if ac_fn_c_try_cpp "$LINENO"; then :

31190

# Broken: success on invalid input.

31191

continue

31192

else

31193

- echo "$as_me: failed program was:" >&5

31194

-sed 's/^/| /' conftest.$ac_ext >&5

31195

31196

# Passes both tests.

25401

@@ -6992,18 +7500,18 @@ else

31197

25402

ac_preproc_ok=:

31198

25403

break

31199

25404

31200

31201

25405

-rm -f conftest.err conftest.$ac_ext

31202

25406

+rm -f conftest.err conftest.i conftest.$ac_ext

31203

25407

31204

25408

done

31205

25409

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

31206

25410

-rm -f conftest.err conftest.$ac_ext

31207

-if $ac_preproc_ok; then

31208

- :

31209

25411

+rm -f conftest.i conftest.err conftest.$ac_ext

31210

+if $ac_preproc_ok; then :

31211

25412

if $ac_preproc_ok; then :

25413

31212

25414

else

31213

- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check

31214

-See \`config.log' for more details." >&5

31215

-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check

31216

-See \`config.log' for more details." >&2;}

31217

- { (exit 1); exit 1; }; }

31218

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

31219

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

25415

{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

25416

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

25417

-as_fn_error "C preprocessor \"$CPP\" fails sanity check

25418

-See \`config.log' for more details." "$LINENO" 5; }

31220

25419

+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check

31221

+See \`config.log' for more details" "$LINENO" 5 ; }

25420

+See \`config.log' for more details" "$LINENO" 5; }

31222

25421

31223

25422

31224

25423

ac_ext=c

31225

@@ -6926,16 +7020,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLA

31226

ac_compiler_gnu=$ac_cv_c_compiler_gnu

31227

31228

31229

-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5

31230

-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }

31231

-if test "${ac_cv_header_stdc+set}" = set; then

31232

- echo $ECHO_N "(cached) $ECHO_C" >&6

31233

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5

31234

+$as_echo_n "checking for ANSI C header files... " >&6; }

31235

+if test "${ac_cv_header_stdc+set}" = set; then :

31236

+ $as_echo_n "(cached) " >&6

31237

else

31238

- cat >conftest.$ac_ext <<_ACEOF

31239

-/* confdefs.h. */

31240

-_ACEOF

31241

-cat confdefs.h >>conftest.$ac_ext

31242

-cat >>conftest.$ac_ext <<_ACEOF

31243

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31244

/* end confdefs.h. */

31245

#include <stdlib.h>

31246

#include <stdarg.h>

31247

@@ -6950,47 +7040,23 @@ main ()

31248

return 0;

31249

}

31250

_ACEOF

31251

-rm -f conftest.$ac_objext

31252

-if { (ac_try="$ac_compile"

31253

-case "(($ac_try" in

31254

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31255

- *) ac_try_echo=$ac_try;;

31256

-esac

31257

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31258

- (eval "$ac_compile") 2>conftest.er1

31259

- ac_status=$?

31260

- grep -v '^ *+' conftest.er1 >conftest.err

31261

- rm -f conftest.er1

31262

- cat conftest.err >&5

31263

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31264

- (exit $ac_status); } && {

31265

- test -z "$ac_c_werror_flag" ||

31266

- test ! -s conftest.err

31267

- } && test -s conftest.$ac_objext; then

31268

+if ac_fn_c_try_compile "$LINENO"; then :

31269

ac_cv_header_stdc=yes

31270

else

31271

- echo "$as_me: failed program was:" >&5

31272

-sed 's/^/| /' conftest.$ac_ext >&5

31273

31274

- ac_cv_header_stdc=no

31275

+ ac_cv_header_stdc=no

31276

31277

31278

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

31279

31280

if test $ac_cv_header_stdc = yes; then

31281

# SunOS 4.x string.h does not declare mem*, contrary to ANSI.

31282

- cat >conftest.$ac_ext <<_ACEOF

31283

-/* confdefs.h. */

31284

-_ACEOF

31285

-cat confdefs.h >>conftest.$ac_ext

31286

-cat >>conftest.$ac_ext <<_ACEOF

31287

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31288

/* end confdefs.h. */

31289

#include <string.h>

31290

31291

_ACEOF

31292

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

31293

- $EGREP "memchr" >/dev/null 2>&1; then

31294

- :

31295

+ $EGREP "memchr" >/dev/null 2>&1; then :

31296

31297

else

31298

ac_cv_header_stdc=no

31299

31300

@@ -7000,18 +7066,14 @@ fi

31301

31302

if test $ac_cv_header_stdc = yes; then

31303

# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.

31304

- cat >conftest.$ac_ext <<_ACEOF

31305

-/* confdefs.h. */

31306

-_ACEOF

31307

-cat confdefs.h >>conftest.$ac_ext

31308

-cat >>conftest.$ac_ext <<_ACEOF

31309

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31310

/* end confdefs.h. */

31311

#include <stdlib.h>

31312

31313

_ACEOF

31314

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

31315

- $EGREP "free" >/dev/null 2>&1; then

31316

- :

31317

+ $EGREP "free" >/dev/null 2>&1; then :

31318

31319

else

31320

ac_cv_header_stdc=no

31321

31322

@@ -7021,14 +7083,10 @@ fi

31323

31324

if test $ac_cv_header_stdc = yes; then

31325

# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.

31326

- if test "$cross_compiling" = yes; then

31327

+ if test "$cross_compiling" = yes; then :

31328

31329

else

31330

- cat >conftest.$ac_ext <<_ACEOF

31331

-/* confdefs.h. */

31332

-_ACEOF

31333

-cat confdefs.h >>conftest.$ac_ext

31334

-cat >>conftest.$ac_ext <<_ACEOF

31335

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31336

/* end confdefs.h. */

31337

#include <ctype.h>

31338

#include <stdlib.h>

31339

@@ -7055,113 +7113,35 @@ main ()

31340

return 0;

31341

}

31342

_ACEOF

31343

-rm -f conftest$ac_exeext

31344

-if { (ac_try="$ac_link"

31345

-case "(($ac_try" in

31346

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31347

- *) ac_try_echo=$ac_try;;

31348

-esac

31349

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31350

- (eval "$ac_link") 2>&5

31351

- ac_status=$?

31352

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31353

- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

31354

- { (case "(($ac_try" in

31355

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31356

- *) ac_try_echo=$ac_try;;

31357

-esac

31358

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31359

- (eval "$ac_try") 2>&5

31360

- ac_status=$?

31361

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31362

- (exit $ac_status); }; }; then

31363

- :

31364

-else

31365

- echo "$as_me: program exited with status $ac_status" >&5

31366

-echo "$as_me: failed program was:" >&5

31367

-sed 's/^/| /' conftest.$ac_ext >&5

31368

+if ac_fn_c_try_run "$LINENO"; then :

31369

31370

-( exit $ac_status )

31371

-ac_cv_header_stdc=no

31372

+else

31373

+ ac_cv_header_stdc=no

31374

31375

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

31376

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

31377

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

31378

31379

31380

31381

31382

31383

-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

31384

-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }

25424

@@ -7015,7 +7523,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

25425

25426

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5

25427

$as_echo_n "checking for ANSI C header files... " >&6; }

25428

-if test "${ac_cv_header_stdc+set}" = set; then :

25429

+if ${ac_cv_header_stdc+:} false; then :

25430

$as_echo_n "(cached) " >&6

25431

else

25432

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

25433

@@ -7116,570 +7624,54 @@ rm -f core *.core core.conftest.* gmon.o

25434

25435

25436

25437

-fi

25438

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5

25439

-$as_echo "$ac_cv_header_stdc" >&6; }

25440

-if test $ac_cv_header_stdc = yes; then

25441

25442

-$as_echo "#define STDC_HEADERS 1" >>confdefs.h

25443

25444

-fi

25445

25446

-# On IRIX 5.3, sys/types and inttypes.h are conflicting.

25447

-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

25448

- inttypes.h stdint.h unistd.h

25449

-do :

25450

- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

25451

-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default

25452

25453

-eval as_val=\$$as_ac_Header

25454

- if test "x$as_val" = x""yes; then :

25455

- cat >>confdefs.h <<_ACEOF

25456

-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

25457

-_ACEOF

25458

25459

-fi

25460

25461

-done

25462

25463

25464

-for ac_header in dlfcn.h

25465

-do :

25466

- ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default

25467

25468

-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :

25469

- cat >>confdefs.h <<_ACEOF

25470

-#define HAVE_DLFCN_H 1

25471

-_ACEOF

25472

25473

-fi

25474

25475

-done

25476

25477

25478

25479

-ac_ext=cpp

25480

-ac_cpp='$CXXCPP $CPPFLAGS'

25481

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

25482

-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

25483

-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

25484

-if test -z "$CXX"; then

25485

- if test -n "$CCC"; then

25486

- CXX=$CCC

25487

- else

25488

- if test -n "$ac_tool_prefix"; then

25489

- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

25490

- do

25491

- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

25492

-set dummy $ac_tool_prefix$ac_prog; ac_word=$2

25493

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25494

-$as_echo_n "checking for $ac_word... " >&6; }

25495

-if test "${ac_cv_prog_CXX+set}" = set; then :

25496

- $as_echo_n "(cached) " >&6

25497

-else

25498

- if test -n "$CXX"; then

25499

- ac_cv_prog_CXX="$CXX" # Let the user override the test.

25500

-else

25501

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

25502

-for as_dir in $PATH

25503

-do

25504

- IFS=$as_save_IFS

25505

- test -z "$as_dir" && as_dir=.

25506

- for ac_exec_ext in '' $ac_executable_extensions; do

25507

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

25508

- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

25509

- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

25510

- break 2

25511

- fi

25512

-done

25513

- done

25514

-IFS=$as_save_IFS

25515

25516

-fi

25517

-fi

25518

-CXX=$ac_cv_prog_CXX

25519

-if test -n "$CXX"; then

25520

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5

25521

-$as_echo "$CXX" >&6; }

25522

-else

25523

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

25524

-$as_echo "no" >&6; }

25525

-fi

25526

25527

25528

- test -n "$CXX" && break

25529

- done

25530

-fi

25531

-if test -z "$CXX"; then

25532

- ac_ct_CXX=$CXX

25533

- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

25534

-do

25535

- # Extract the first word of "$ac_prog", so it can be a program name with args.

25536

-set dummy $ac_prog; ac_word=$2

25537

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

25538

-$as_echo_n "checking for $ac_word... " >&6; }

25539

-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :

25540

- $as_echo_n "(cached) " >&6

25541

-else

25542

- if test -n "$ac_ct_CXX"; then

25543

- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.

25544

-else

25545

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

25546

-for as_dir in $PATH

25547

-do

25548

- IFS=$as_save_IFS

25549

- test -z "$as_dir" && as_dir=.

25550

- for ac_exec_ext in '' $ac_executable_extensions; do

25551

- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

25552

- ac_cv_prog_ac_ct_CXX="$ac_prog"

25553

- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

25554

- break 2

25555

- fi

25556

-done

25557

- done

25558

-IFS=$as_save_IFS

25559

25560

-fi

25561

-fi

25562

-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX

25563

-if test -n "$ac_ct_CXX"; then

25564

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5

25565

-$as_echo "$ac_ct_CXX" >&6; }

25566

-else

25567

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

25568

-$as_echo "no" >&6; }

25569

-fi

25570

25571

25572

- test -n "$ac_ct_CXX" && break

25573

-done

25574

25575

- if test "x$ac_ct_CXX" = x; then

25576

- CXX="g++"

25577

- else

25578

- case $cross_compiling:$ac_tool_warned in

25579

-yes:)

25580

-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

25581

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

25582

-ac_tool_warned=yes ;;

25583

-esac

25584

- CXX=$ac_ct_CXX

25585

- fi

25586

-fi

25587

25588

- fi

25589

-fi

25590

-# Provide some information about the compiler.

25591

-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5

25592

-set X $ac_compile

25593

-ac_compiler=$2

25594

-for ac_option in --version -v -V -qversion; do

25595

- { { ac_try="$ac_compiler $ac_option >&5"

25596

-case "(($ac_try" in

25597

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

25598

- *) ac_try_echo=$ac_try;;

25599

-esac

25600

-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

25601

-$as_echo "$ac_try_echo"; } >&5

25602

- (eval "$ac_compiler $ac_option >&5") 2>conftest.err

25603

- ac_status=$?

25604

- if test -s conftest.err; then

25605

- sed '10a\

25606

-... rest of stderr output deleted ...

25607

- 10q' conftest.err >conftest.er1

25608

- cat conftest.er1 >&5

25609

- fi

25610

- rm -f conftest.er1 conftest.err

25611

- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

25612

- test $ac_status = 0; }

25613

-done

25614

25615

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5

25616

-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }

25617

-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :

25618

- $as_echo_n "(cached) " >&6

25619

-else

25620

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

25621

-/* end confdefs.h. */

25622

25623

-int

25624

-main ()

25625

25626

-#ifndef __GNUC__

25627

- choke me

25628

-#endif

25629

25630

- ;

25631

- return 0;

25632

25633

-_ACEOF

25634

-if ac_fn_cxx_try_compile "$LINENO"; then :

25635

- ac_compiler_gnu=yes

25636

-else

25637

- ac_compiler_gnu=no

25638

-fi

25639

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

25640

-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

25641

25642

-fi

25643

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5

25644

-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }

25645

-if test $ac_compiler_gnu = yes; then

25646

- GXX=yes

25647

-else

25648

- GXX=

25649

-fi

25650

-ac_test_CXXFLAGS=${CXXFLAGS+set}

25651

-ac_save_CXXFLAGS=$CXXFLAGS

25652

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5

25653

-$as_echo_n "checking whether $CXX accepts -g... " >&6; }

25654

-if test "${ac_cv_prog_cxx_g+set}" = set; then :

25655

- $as_echo_n "(cached) " >&6

25656

-else

25657

- ac_save_cxx_werror_flag=$ac_cxx_werror_flag

25658

- ac_cxx_werror_flag=yes

25659

- ac_cv_prog_cxx_g=no

25660

- CXXFLAGS="-g"

25661

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

25662

-/* end confdefs.h. */

25663

25664

-int

25665

-main ()

25666

25667

25668

- ;

25669

- return 0;

25670

25671

-_ACEOF

25672

-if ac_fn_cxx_try_compile "$LINENO"; then :

25673

- ac_cv_prog_cxx_g=yes

25674

-else

25675

- CXXFLAGS=""

25676

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

25677

-/* end confdefs.h. */

25678

25679

-int

25680

-main ()

25681

25682

25683

- ;

25684

- return 0;

25685

25686

-_ACEOF

25687

-if ac_fn_cxx_try_compile "$LINENO"; then :

25688

25689

-else

25690

- ac_cxx_werror_flag=$ac_save_cxx_werror_flag

25691

- CXXFLAGS="-g"

25692

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

25693

-/* end confdefs.h. */

25694

25695

-int

25696

-main ()

25697

25698

25699

- ;

25700

- return 0;

25701

25702

-_ACEOF

25703

-if ac_fn_cxx_try_compile "$LINENO"; then :

25704

- ac_cv_prog_cxx_g=yes

25705

-fi

25706

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

25707

-fi

25708

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

25709

-fi

25710

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

25711

- ac_cxx_werror_flag=$ac_save_cxx_werror_flag

25712

-fi

25713

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5

25714

-$as_echo "$ac_cv_prog_cxx_g" >&6; }

25715

-if test "$ac_test_CXXFLAGS" = set; then

25716

- CXXFLAGS=$ac_save_CXXFLAGS

25717

-elif test $ac_cv_prog_cxx_g = yes; then

25718

- if test "$GXX" = yes; then

25719

- CXXFLAGS="-g -O2"

25720

- else

25721

- CXXFLAGS="-g"

25722

- fi

25723

-else

25724

- if test "$GXX" = yes; then

25725

- CXXFLAGS="-O2"

25726

- else

25727

- CXXFLAGS=

25728

- fi

25729

-fi

25730

-ac_ext=cpp

25731

-ac_cpp='$CXXCPP $CPPFLAGS'

25732

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

25733

-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

25734

-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

25735

25736

-depcc="$CXX" am_compiler_list=

25737

25738

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

25739

-$as_echo_n "checking dependency style of $depcc... " >&6; }

25740

-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :

25741

- $as_echo_n "(cached) " >&6

25742

-else

25743

- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

25744

- # We make a subdir and do the tests there. Otherwise we can end up

25745

- # making bogus files that we don't know about and never remove. For

25746

- # instance it was reported that on HP-UX the gcc test will end up

25747

- # making a dummy file named `D' -- because `-MD' means `put the output

25748

- # in D'.

25749

- mkdir conftest.dir

25750

- # Copy depcomp to subdir because otherwise we won't find it if we're

25751

- # using a relative directory.

25752

- cp "$am_depcomp" conftest.dir

25753

- cd conftest.dir

25754

- # We will build objects and dependencies in a subdirectory because

25755

- # it helps to detect inapplicable dependency modes. For instance

25756

- # both Tru64's cc and ICC support -MD to output dependencies as a

25757

- # side effect of compilation, but ICC will put the dependencies in

25758

- # the current directory while Tru64 will put them in the object

25759

- # directory.

25760

- mkdir sub

25761

25762

- am_cv_CXX_dependencies_compiler_type=none

25763

- if test "$am_compiler_list" = ""; then

25764

- am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

25765

- fi

25766

- am__universal=false

25767

- case " $depcc " in #(

25768

- *\ -arch\ *\ -arch\ *) am__universal=true ;;

25769

- esac

25770

25771

- for depmode in $am_compiler_list; do

25772

- # Setup a source with many dependencies, because some compilers

25773

- # like to wrap large dependency lists on column 80 (with \), and

25774

- # we should not choose a depcomp mode which is confused by this.

25775

- #

25776

- # We need to recreate these files for each test, as the compiler may

25777

- # overwrite some of them when testing with obscure command lines.

25778

- # This happens at least with the AIX C compiler.

25779

- : > sub/conftest.c

25780

- for i in 1 2 3 4 5 6; do

25781

- echo '#include "conftst'$i'.h"' >> sub/conftest.c

25782

- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with

25783

- # Solaris 8's {/usr,}/bin/sh.

25784

- touch sub/conftst$i.h

25785

- done

25786

- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

25787

25788

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

25789

- # mode. It turns out that the SunPro C++ compiler does not properly

25790

- # handle `-M -o', and we need to detect this. Also, some Intel

25791

- # versions had trouble with output in subdirs

25792

- am__obj=sub/conftest.${OBJEXT-o}

25793

- am__minus_obj="-o $am__obj"

25794

- case $depmode in

25795

- gcc)

25796

- # This depmode causes a compiler race in universal mode.

25797

- test "$am__universal" = false || continue

25798

- ;;

25799

- nosideeffect)

25800

- # after this tag, mechanisms are not by side-effect, so they'll

25801

- # only be used when explicitly requested

25802

- if test "x$enable_dependency_tracking" = xyes; then

25803

- continue

25804

- else

25805

- break

25806

- fi

25807

- ;;

25808

- msvisualcpp | msvcmsys)

25809

- # This compiler won't grok `-c -o', but also, the minuso test has

25810

- # not run yet. These depmodes are late enough in the game, and

25811

- # so weak that their functioning should not be impacted.

25812

- am__obj=conftest.${OBJEXT-o}

25813

- am__minus_obj=

25814

- ;;

25815

- none) break ;;

25816

- esac

25817

- if depmode=$depmode \

25818

- source=sub/conftest.c object=$am__obj \

25819

- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

25820

- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

25821

- >/dev/null 2>conftest.err &&

25822

- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

25823

- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

25824

- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

25825

- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then

25826

- # icc doesn't choke on unknown options, it will just issue warnings

25827

- # or remarks (even with -Werror). So we grep stderr for any message

25828

- # that says an option was ignored or not supported.

25829

- # When given -MP, icc 7.0 and 7.1 complain thusly:

25830

- # icc: Command line warning: ignoring option '-M'; no argument required

25831

- # The diagnosis changed in icc 8.0:

25832

- # icc: Command line remark: option '-MP' not supported

25833

- if (grep 'ignoring option' conftest.err ||

25834

- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else

25835

- am_cv_CXX_dependencies_compiler_type=$depmode

25836

- break

25837

- fi

25838

- fi

25839

- done

25840

25841

- cd ..

25842

- rm -rf conftest.dir

25843

-else

25844

- am_cv_CXX_dependencies_compiler_type=none

25845

-fi

25846

25847

-fi

25848

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5

25849

-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }

25850

-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

25851

25852

- if

25853

- test "x$enable_dependency_tracking" != xno \

25854

- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then

25855

- am__fastdepCXX_TRUE=

25856

- am__fastdepCXX_FALSE='#'

25857

-else

25858

- am__fastdepCXX_TRUE='#'

25859

- am__fastdepCXX_FALSE=

25860

-fi

25861

25862

25863

-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

25864

- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

25865

- (test "X$CXX" != "Xg++"))) ; then

25866

- ac_ext=cpp

25867

-ac_cpp='$CXXCPP $CPPFLAGS'

25868

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

25869

-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

25870

-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

25871

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5

25872

-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }

25873

-if test -z "$CXXCPP"; then

25874

- if test "${ac_cv_prog_CXXCPP+set}" = set; then :

25875

- $as_echo_n "(cached) " >&6

25876

-else

25877

- # Double quotes because CXXCPP needs to be expanded

25878

- for CXXCPP in "$CXX -E" "/lib/cpp"

25879

- do

25880

- ac_preproc_ok=false

25881

-for ac_cxx_preproc_warn_flag in '' yes

25882

-do

25883

- # Use a header file that comes with gcc, so configuring glibc

25884

- # with a fresh cross-compiler works.

25885

- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

25886

- # <limits.h> exists even on freestanding compilers.

25887

- # On the NeXT, cc -E runs the code through the compiler's parser,

25888

- # not just through cpp. "Syntax error" is here to catch this case.

25889

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

25890

-/* end confdefs.h. */

25891

-#ifdef __STDC__

25892

-# include <limits.h>

25893

-#else

25894

-# include <assert.h>

25895

-#endif

25896

- Syntax error

25897

-_ACEOF

25898

-if ac_fn_cxx_try_cpp "$LINENO"; then :

25899

25900

-else

25901

- # Broken: fails on valid input.

25902

-continue

25903

-fi

25904

-rm -f conftest.err conftest.$ac_ext

25905

25906

- # OK, works on sane cases. Now check whether nonexistent headers

25907

- # can be detected and how.

25908

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

25909

-/* end confdefs.h. */

25910

-#include <ac_nonexistent.h>

25911

-_ACEOF

25912

-if ac_fn_cxx_try_cpp "$LINENO"; then :

25913

- # Broken: success on invalid input.

25914

-continue

25915

-else

25916

- # Passes both tests.

25917

-ac_preproc_ok=:

25918

-break

25919

-fi

25920

-rm -f conftest.err conftest.$ac_ext

25921

25922

-done

25923

-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

25924

-rm -f conftest.err conftest.$ac_ext

25925

-if $ac_preproc_ok; then :

25926

- break

25927

-fi

25928

+fi

31385

25929

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5

31386

25930

+$as_echo "$ac_cv_header_stdc" >&6; }

31387

if test $ac_cv_header_stdc = yes; then

25931

+if test $ac_cv_header_stdc = yes; then

31388

25932

31389

-cat >>confdefs.h <<\_ACEOF

31390

-#define STDC_HEADERS 1

31391

-_ACEOF

25933

- done

25934

- ac_cv_prog_CXXCPP=$CXXCPP

31392

25935

+$as_echo "#define STDC_HEADERS 1" >>confdefs.h

31393

25936

31394

25937

31395

31396

# On IRIX 5.3, sys/types and inttypes.h are conflicting.

31397

31398

31399

31400

31401

31402

31403

31404

31405

31406

for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

31407

inttypes.h stdint.h unistd.h

25938

- CXXCPP=$ac_cv_prog_CXXCPP

25939

-else

25940

- ac_cv_prog_CXXCPP=$CXXCPP

25941

-fi

25942

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5

25943

-$as_echo "$CXXCPP" >&6; }

25944

-ac_preproc_ok=false

25945

-for ac_cxx_preproc_warn_flag in '' yes

31408

25946

-do

31409

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

31410

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5

31411

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

31412

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

31413

- echo $ECHO_N "(cached) $ECHO_C" >&6

31414

-else

31415

- cat >conftest.$ac_ext <<_ACEOF

31416

-/* confdefs.h. */

31417

-_ACEOF

31418

-cat confdefs.h >>conftest.$ac_ext

31419

-cat >>conftest.$ac_ext <<_ACEOF

25947

- # Use a header file that comes with gcc, so configuring glibc

25948

- # with a fresh cross-compiler works.

25949

- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

25950

- # <limits.h> exists even on freestanding compilers.

25951

- # On the NeXT, cc -E runs the code through the compiler's parser,

25952

- # not just through cpp. "Syntax error" is here to catch this case.

25953

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31420

25954

-/* end confdefs.h. */

31421

-$ac_includes_default

31422

31423

-#include <$ac_header>

31424

-_ACEOF

31425

-rm -f conftest.$ac_objext

31426

-if { (ac_try="$ac_compile"

31427

-case "(($ac_try" in

31428

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31429

- *) ac_try_echo=$ac_try;;

31430

-esac

31431

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31432

- (eval "$ac_compile") 2>conftest.er1

31433

- ac_status=$?

31434

- grep -v '^ *+' conftest.er1 >conftest.err

31435

- rm -f conftest.er1

31436

- cat conftest.err >&5

31437

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31438

- (exit $ac_status); } && {

31439

- test -z "$ac_c_werror_flag" ||

31440

- test ! -s conftest.err

31441

- } && test -s conftest.$ac_objext; then

31442

- eval "$as_ac_Header=yes"

31443

-else

31444

- echo "$as_me: failed program was:" >&5

31445

-sed 's/^/| /' conftest.$ac_ext >&5

31446

31447

- eval "$as_ac_Header=no"

31448

-fi

31449

31450

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

31451

-fi

31452

-ac_res=`eval echo '${'$as_ac_Header'}'`

31453

- { echo "$as_me:$LINENO: result: $ac_res" >&5

31454

-echo "${ECHO_T}$ac_res" >&6; }

31455

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

25955

-#ifdef __STDC__

25956

-# include <limits.h>

25957

-#else

25958

-# include <assert.h>

25959

-#endif

25960

- Syntax error

25961

25962

+# On IRIX 5.3, sys/types and inttypes.h are conflicting.

25963

+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

25964

+ inttypes.h stdint.h unistd.h

31456

25965

+do :

31457

25966

+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

31458

25967

+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default

31459

25968

31460

25969

+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :

31461

cat >>confdefs.h <<_ACEOF

31462

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

25970

+ cat >>confdefs.h <<_ACEOF

31463

25971

+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

31464

25972

_ACEOF

25973

-if ac_fn_cxx_try_cpp "$LINENO"; then :

31465

25974

25975

-else

25976

- # Broken: fails on valid input.

25977

-continue

31466

25978

31467

@@ -7169,58 +7149,13 @@ fi

31468

done

31469

31470

31471

31472

for ac_header in dlfcn.h

31473

-do

31474

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

31475

-{ echo "$as_me:$LINENO: checking for $ac_header" >&5

31476

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

31477

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

31478

- echo $ECHO_N "(cached) $ECHO_C" >&6

31479

-else

31480

- cat >conftest.$ac_ext <<_ACEOF

31481

-/* confdefs.h. */

31482

-_ACEOF

31483

-cat confdefs.h >>conftest.$ac_ext

31484

-cat >>conftest.$ac_ext <<_ACEOF

25979

-rm -f conftest.err conftest.$ac_ext

25980

25981

- # OK, works on sane cases. Now check whether nonexistent headers

25982

- # can be detected and how.

25983

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31485

25984

-/* end confdefs.h. */

31486

-$ac_includes_default

31487

31488

-#include <$ac_header>

31489

-_ACEOF

31490

-rm -f conftest.$ac_objext

31491

-if { (ac_try="$ac_compile"

31492

-case "(($ac_try" in

31493

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31494

- *) ac_try_echo=$ac_try;;

31495

-esac

31496

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31497

- (eval "$ac_compile") 2>conftest.er1

31498

- ac_status=$?

31499

- grep -v '^ *+' conftest.er1 >conftest.err

31500

- rm -f conftest.er1

31501

- cat conftest.err >&5

31502

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31503

- (exit $ac_status); } && {

31504

- test -z "$ac_c_werror_flag" ||

31505

- test ! -s conftest.err

31506

- } && test -s conftest.$ac_objext; then

31507

- eval "$as_ac_Header=yes"

31508

-else

31509

- echo "$as_me: failed program was:" >&5

31510

-sed 's/^/| /' conftest.$ac_ext >&5

31511

31512

- eval "$as_ac_Header=no"

31513

-fi

31514

31515

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

31516

-fi

31517

-ac_res=`eval echo '${'$as_ac_Header'}'`

31518

- { echo "$as_me:$LINENO: result: $ac_res" >&5

31519

-echo "${ECHO_T}$ac_res" >&6; }

31520

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

25985

-#include <ac_nonexistent.h>

25986

+done

25987

25988

25989

+for ac_header in dlfcn.h

31521

25990

+do :

31522

25991

+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default

31523

25992

31524

+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :

31525

cat >>confdefs.h <<_ACEOF

31526

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

25993

+if test "x$ac_cv_header_dlfcn_h" = xyes; then :

25994

+ cat >>confdefs.h <<_ACEOF

31527

25995

+#define HAVE_DLFCN_H 1

31528

25996

_ACEOF

31529

31530

31531

@@ -7243,10 +7178,10 @@ if test -z "$CXX"; then

31532

31533

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

31534

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

31535

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

31536

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

31537

-if test "${ac_cv_prog_CXX+set}" = set; then

31538

- echo $ECHO_N "(cached) $ECHO_C" >&6

31539

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

31540

+$as_echo_n "checking for $ac_word... " >&6; }

31541

+if test "${ac_cv_prog_CXX+set}" = set; then :

31542

+ $as_echo_n "(cached) " >&6

31543

else

31544

if test -n "$CXX"; then

31545

ac_cv_prog_CXX="$CXX" # Let the user override the test.

31546

@@ -7256,25 +7191,25 @@ for as_dir in $PATH

31547

31548

IFS=$as_save_IFS

31549

test -z "$as_dir" && as_dir=.

31550

- for ac_exec_ext in '' $ac_executable_extensions; do

31551

+ for ac_exec_ext in '' $ac_executable_extensions; do

31552

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

31553

ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

31554

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

31555

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

31556

break 2

31557

31558

done

31559

-done

31560

+ done

31561

IFS=$as_save_IFS

31562

31563

31564

31565

CXX=$ac_cv_prog_CXX

31566

if test -n "$CXX"; then

31567

- { echo "$as_me:$LINENO: result: $CXX" >&5

31568

-echo "${ECHO_T}$CXX" >&6; }

31569

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5

31570

+$as_echo "$CXX" >&6; }

31571

else

31572

- { echo "$as_me:$LINENO: result: no" >&5

31573

-echo "${ECHO_T}no" >&6; }

31574

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

31575

+$as_echo "no" >&6; }

31576

31577

31578

31579

@@ -7287,10 +7222,10 @@ if test -z "$CXX"; then

31580

31581

# Extract the first word of "$ac_prog", so it can be a program name with args.

31582

set dummy $ac_prog; ac_word=$2

31583

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

31584

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

31585

-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then

31586

- echo $ECHO_N "(cached) $ECHO_C" >&6

31587

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

31588

+$as_echo_n "checking for $ac_word... " >&6; }

31589

+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :

31590

+ $as_echo_n "(cached) " >&6

31591

else

31592

if test -n "$ac_ct_CXX"; then

31593

ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.

31594

@@ -7300,25 +7235,25 @@ for as_dir in $PATH

31595

31596

IFS=$as_save_IFS

31597

test -z "$as_dir" && as_dir=.

31598

- for ac_exec_ext in '' $ac_executable_extensions; do

31599

+ for ac_exec_ext in '' $ac_executable_extensions; do

31600

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

31601

ac_cv_prog_ac_ct_CXX="$ac_prog"

31602

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

31603

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

31604

break 2

31605

31606

done

31607

-done

31608

+ done

31609

IFS=$as_save_IFS

31610

31611

31612

31613

ac_ct_CXX=$ac_cv_prog_ac_ct_CXX

31614

if test -n "$ac_ct_CXX"; then

31615

- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

31616

-echo "${ECHO_T}$ac_ct_CXX" >&6; }

31617

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5

31618

+$as_echo "$ac_ct_CXX" >&6; }

31619

else

31620

- { echo "$as_me:$LINENO: result: no" >&5

31621

-echo "${ECHO_T}no" >&6; }

31622

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

31623

+$as_echo "no" >&6; }

31624

31625

31626

31627

@@ -7330,12 +7265,8 @@ done

31628

else

31629

case $cross_compiling:$ac_tool_warned in

31630

yes:)

31631

-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

31632

-whose name does not start with the host triplet. If you think this

31633

-configuration is useful to you, please write to autoconf@gnu.org." >&5

31634

-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

31635

-whose name does not start with the host triplet. If you think this

31636

-configuration is useful to you, please write to autoconf@gnu.org." >&2;}

31637

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

31638

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

31639

ac_tool_warned=yes ;;

31640

esac

31641

CXX=$ac_ct_CXX

31642

@@ -7345,49 +7276,36 @@ fi

31643

31644

31645

# Provide some information about the compiler.

31646

-echo "$as_me:$LINENO: checking for C++ compiler version" >&5

31647

-ac_compiler=`set X $ac_compile; echo $2`

31648

-{ (ac_try="$ac_compiler --version >&5"

31649

-case "(($ac_try" in

31650

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31651

- *) ac_try_echo=$ac_try;;

31652

-esac

31653

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31654

- (eval "$ac_compiler --version >&5") 2>&5

31655

- ac_status=$?

31656

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31657

- (exit $ac_status); }

31658

-{ (ac_try="$ac_compiler -v >&5"

31659

-case "(($ac_try" in

31660

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31661

- *) ac_try_echo=$ac_try;;

31662

-esac

31663

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31664

- (eval "$ac_compiler -v >&5") 2>&5

31665

- ac_status=$?

31666

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31667

- (exit $ac_status); }

31668

-{ (ac_try="$ac_compiler -V >&5"

31669

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5

31670

+set X $ac_compile

31671

+ac_compiler=$2

31672

+for ac_option in --version -v -V -qversion; do

31673

+ { { ac_try="$ac_compiler $ac_option >&5"

31674

case "(($ac_try" in

31675

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31676

*) ac_try_echo=$ac_try;;

31677

esac

31678

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31679

- (eval "$ac_compiler -V >&5") 2>&5

31680

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

31681

+$as_echo "$ac_try_echo"; } >&5

31682

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

31683

ac_status=$?

31684

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31685

- (exit $ac_status); }

31686

31687

-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

31688

-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }

31689

-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then

31690

- echo $ECHO_N "(cached) $ECHO_C" >&6

31691

+ if test -s conftest.err; then

31692

+ sed '10a\

31693

+... rest of stderr output deleted ...

31694

+ 10q' conftest.err >conftest.er1

31695

+ cat conftest.er1 >&5

31696

+ fi

31697

+ rm -f conftest.er1 conftest.err

31698

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

31699

+ test $ac_status = 0; }

31700

+done

31701

31702

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5

31703

+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }

31704

+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :

31705

+ $as_echo_n "(cached) " >&6

31706

else

31707

- cat >conftest.$ac_ext <<_ACEOF

31708

-/* confdefs.h. */

31709

-_ACEOF

31710

-cat confdefs.h >>conftest.$ac_ext

31711

-cat >>conftest.$ac_ext <<_ACEOF

31712

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31713

/* end confdefs.h. */

31714

31715

int

31716

@@ -7401,54 +7319,34 @@ main ()

31717

return 0;

31718

}

31719

_ACEOF

31720

-rm -f conftest.$ac_objext

31721

-if { (ac_try="$ac_compile"

31722

-case "(($ac_try" in

31723

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31724

- *) ac_try_echo=$ac_try;;

31725

-esac

31726

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31727

- (eval "$ac_compile") 2>conftest.er1

31728

- ac_status=$?

31729

- grep -v '^ *+' conftest.er1 >conftest.err

31730

- rm -f conftest.er1

31731

- cat conftest.err >&5

31732

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31733

- (exit $ac_status); } && {

31734

- test -z "$ac_cxx_werror_flag" ||

31735

- test ! -s conftest.err

31736

- } && test -s conftest.$ac_objext; then

31737

+if ac_fn_cxx_try_compile "$LINENO"; then :

31738

ac_compiler_gnu=yes

31739

else

31740

- echo "$as_me: failed program was:" >&5

31741

-sed 's/^/| /' conftest.$ac_ext >&5

31742

31743

- ac_compiler_gnu=no

31744

+ ac_compiler_gnu=no

31745

31746

31747

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

31748

ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

31749

31750

31751

-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

31752

-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }

31753

-GXX=`test $ac_compiler_gnu = yes && echo yes`

31754

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5

31755

+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }

31756

+if test $ac_compiler_gnu = yes; then

31757

+ GXX=yes

31758

+else

31759

+ GXX=

31760

+fi

31761

ac_test_CXXFLAGS=${CXXFLAGS+set}

31762

ac_save_CXXFLAGS=$CXXFLAGS

31763

-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

31764

-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }

31765

-if test "${ac_cv_prog_cxx_g+set}" = set; then

31766

- echo $ECHO_N "(cached) $ECHO_C" >&6

31767

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5

31768

+$as_echo_n "checking whether $CXX accepts -g... " >&6; }

31769

+if test "${ac_cv_prog_cxx_g+set}" = set; then :

31770

+ $as_echo_n "(cached) " >&6

31771

else

31772

ac_save_cxx_werror_flag=$ac_cxx_werror_flag

31773

ac_cxx_werror_flag=yes

31774

ac_cv_prog_cxx_g=no

31775

CXXFLAGS="-g"

31776

- cat >conftest.$ac_ext <<_ACEOF

31777

-/* confdefs.h. */

31778

-_ACEOF

31779

-cat confdefs.h >>conftest.$ac_ext

31780

-cat >>conftest.$ac_ext <<_ACEOF

31781

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31782

/* end confdefs.h. */

31783

31784

int

31785

@@ -7459,34 +7357,11 @@ main ()

31786

return 0;

31787

}

31788

_ACEOF

31789

-rm -f conftest.$ac_objext

31790

-if { (ac_try="$ac_compile"

31791

-case "(($ac_try" in

31792

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31793

- *) ac_try_echo=$ac_try;;

31794

-esac

31795

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31796

- (eval "$ac_compile") 2>conftest.er1

31797

- ac_status=$?

31798

- grep -v '^ *+' conftest.er1 >conftest.err

31799

- rm -f conftest.er1

31800

- cat conftest.err >&5

31801

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31802

- (exit $ac_status); } && {

31803

- test -z "$ac_cxx_werror_flag" ||

31804

- test ! -s conftest.err

31805

- } && test -s conftest.$ac_objext; then

31806

+if ac_fn_cxx_try_compile "$LINENO"; then :

31807

ac_cv_prog_cxx_g=yes

31808

else

31809

- echo "$as_me: failed program was:" >&5

31810

-sed 's/^/| /' conftest.$ac_ext >&5

31811

31812

- CXXFLAGS=""

31813

- cat >conftest.$ac_ext <<_ACEOF

31814

-/* confdefs.h. */

31815

-_ACEOF

31816

-cat confdefs.h >>conftest.$ac_ext

31817

-cat >>conftest.$ac_ext <<_ACEOF

31818

+ CXXFLAGS=""

31819

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31820

/* end confdefs.h. */

31821

31822

int

31823

@@ -7497,35 +7372,12 @@ main ()

31824

return 0;

31825

}

31826

_ACEOF

31827

-rm -f conftest.$ac_objext

31828

-if { (ac_try="$ac_compile"

31829

-case "(($ac_try" in

31830

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31831

- *) ac_try_echo=$ac_try;;

31832

-esac

31833

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31834

- (eval "$ac_compile") 2>conftest.er1

31835

- ac_status=$?

31836

- grep -v '^ *+' conftest.er1 >conftest.err

31837

- rm -f conftest.er1

31838

- cat conftest.err >&5

31839

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31840

- (exit $ac_status); } && {

31841

- test -z "$ac_cxx_werror_flag" ||

31842

- test ! -s conftest.err

31843

- } && test -s conftest.$ac_objext; then

31844

- :

31845

-else

31846

- echo "$as_me: failed program was:" >&5

31847

-sed 's/^/| /' conftest.$ac_ext >&5

31848

+if ac_fn_cxx_try_compile "$LINENO"; then :

31849

31850

- ac_cxx_werror_flag=$ac_save_cxx_werror_flag

31851

+else

31852

+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag

31853

CXXFLAGS="-g"

31854

- cat >conftest.$ac_ext <<_ACEOF

31855

-/* confdefs.h. */

31856

-_ACEOF

31857

-cat confdefs.h >>conftest.$ac_ext

31858

-cat >>conftest.$ac_ext <<_ACEOF

31859

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

31860

/* end confdefs.h. */

31861

31862

int

31863

@@ -7536,42 +7388,18 @@ main ()

31864

return 0;

31865

}

31866

_ACEOF

31867

-rm -f conftest.$ac_objext

31868

-if { (ac_try="$ac_compile"

31869

-case "(($ac_try" in

31870

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

31871

- *) ac_try_echo=$ac_try;;

31872

-esac

31873

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

31874

- (eval "$ac_compile") 2>conftest.er1

31875

- ac_status=$?

31876

- grep -v '^ *+' conftest.er1 >conftest.err

31877

- rm -f conftest.er1

31878

- cat conftest.err >&5

31879

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

31880

- (exit $ac_status); } && {

31881

- test -z "$ac_cxx_werror_flag" ||

31882

- test ! -s conftest.err

31883

- } && test -s conftest.$ac_objext; then

31884

+if ac_fn_cxx_try_compile "$LINENO"; then :

31885

ac_cv_prog_cxx_g=yes

31886

-else

31887

- echo "$as_me: failed program was:" >&5

31888

-sed 's/^/| /' conftest.$ac_ext >&5

31889

31890

31891

31892

31893

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

31894

31895

31896

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

31897

31898

31899

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

31900

ac_cxx_werror_flag=$ac_save_cxx_werror_flag

31901

31902

-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

31903

-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }

31904

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5

31905

+$as_echo "$ac_cv_prog_cxx_g" >&6; }

31906

if test "$ac_test_CXXFLAGS" = set; then

31907

CXXFLAGS=$ac_save_CXXFLAGS

31908

elif test $ac_cv_prog_cxx_g = yes; then

31909

@@ -7595,10 +7423,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

31910

31911

depcc="$CXX" am_compiler_list=

31912

31913

-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

31914

-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

31915

-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then

31916

- echo $ECHO_N "(cached) $ECHO_C" >&6

31917

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

31918

+$as_echo_n "checking dependency style of $depcc... " >&6; }

31919

+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :

31920

+ $as_echo_n "(cached) " >&6

31921

else

31922

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

31923

# We make a subdir and do the tests there. Otherwise we can end up

31924

@@ -7623,6 +7451,11 @@ else

31925

if test "$am_compiler_list" = ""; then

31926

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

31927

31928

+ am__universal=false

31929

+ case " $depcc " in #(

31930

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

31931

+ esac

31932

31933

for depmode in $am_compiler_list; do

31934

# Setup a source with many dependencies, because some compilers

31935

# like to wrap large dependency lists on column 80 (with \), and

31936

@@ -7640,7 +7473,17 @@ else

31937

done

31938

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

31939

31940

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

31941

+ # mode. It turns out that the SunPro C++ compiler does not properly

31942

+ # handle `-M -o', and we need to detect this. Also, some Intel

31943

+ # versions had trouble with output in subdirs

31944

+ am__obj=sub/conftest.${OBJEXT-o}

31945

+ am__minus_obj="-o $am__obj"

31946

case $depmode in

31947

+ gcc)

31948

+ # This depmode causes a compiler race in universal mode.

31949

+ test "$am__universal" = false || continue

31950

+ ;;

31951

nosideeffect)

31952

# after this tag, mechanisms are not by side-effect, so they'll

31953

# only be used when explicitly requested

31954

@@ -7650,19 +7493,23 @@ else

31955

break

31956

31957

;;

31958

+ msvisualcpp | msvcmsys)

31959

+ # This compiler won't grok `-c -o', but also, the minuso test has

31960

+ # not run yet. These depmodes are late enough in the game, and

31961

+ # so weak that their functioning should not be impacted.

31962

+ am__obj=conftest.${OBJEXT-o}

31963

+ am__minus_obj=

31964

+ ;;

31965

none) break ;;

31966

esac

31967

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

31968

- # mode. It turns out that the SunPro C++ compiler does not properly

31969

- # handle `-M -o', and we need to detect this.

31970

if depmode=$depmode \

31971

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

31972

+ source=sub/conftest.c object=$am__obj \

31973

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

31974

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

31975

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

31976

>/dev/null 2>conftest.err &&

31977

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

31978

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

31979

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

31980

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

31981

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

31982

# icc doesn't choke on unknown options, it will just issue warnings

31983

# or remarks (even with -Werror). So we grep stderr for any message

31984

@@ -7686,8 +7533,8 @@ else

31985

31986

31987

31988

-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5

31989

-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }

31990

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5

31991

+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }

31992

CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

31993

31994

31995

@@ -7709,11 +7556,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'

31996

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

31997

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

31998

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

31999

-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5

32000

-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }

32001

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5

32002

+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }

32003

if test -z "$CXXCPP"; then

32004

- if test "${ac_cv_prog_CXXCPP+set}" = set; then

32005

- echo $ECHO_N "(cached) $ECHO_C" >&6

32006

+ if test "${ac_cv_prog_CXXCPP+set}" = set; then :

32007

+ $as_echo_n "(cached) " >&6

32008

else

32009

# Double quotes because CXXCPP needs to be expanded

32010

for CXXCPP in "$CXX -E" "/lib/cpp"

32011

@@ -7727,11 +7574,7 @@ do

32012

# <limits.h> exists even on freestanding compilers.

32013

# On the NeXT, cc -E runs the code through the compiler's parser,

32014

# not just through cpp. "Syntax error" is here to catch this case.

32015

- cat >conftest.$ac_ext <<_ACEOF

32016

-/* confdefs.h. */

32017

-_ACEOF

32018

-cat confdefs.h >>conftest.$ac_ext

32019

-cat >>conftest.$ac_ext <<_ACEOF

32020

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

32021

/* end confdefs.h. */

32022

#ifdef __STDC__

32023

# include <limits.h>

32024

@@ -7740,76 +7583,34 @@ cat >>conftest.$ac_ext <<_ACEOF

32025

#endif

32026

Syntax error

32027

_ACEOF

32028

-if { (ac_try="$ac_cpp conftest.$ac_ext"

32029

-case "(($ac_try" in

32030

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

32031

- *) ac_try_echo=$ac_try;;

32032

-esac

32033

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

32034

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

32035

- ac_status=$?

32036

- grep -v '^ *+' conftest.er1 >conftest.err

32037

- rm -f conftest.er1

32038

- cat conftest.err >&5

32039

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

32040

- (exit $ac_status); } >/dev/null && {

32041

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

32042

- test ! -s conftest.err

32043

- }; then

32044

- :

32045

-else

32046

- echo "$as_me: failed program was:" >&5

32047

-sed 's/^/| /' conftest.$ac_ext >&5

32048

+if ac_fn_cxx_try_cpp "$LINENO"; then :

32049

32050

+else

32051

# Broken: fails on valid input.

32052

continue

32053

32054

32055

-rm -f conftest.err conftest.$ac_ext

32056

+rm -f conftest.err conftest.i conftest.$ac_ext

32057

32058

# OK, works on sane cases. Now check whether nonexistent headers

32059

# can be detected and how.

32060

- cat >conftest.$ac_ext <<_ACEOF

32061

-/* confdefs.h. */

32062

-_ACEOF

32063

-cat confdefs.h >>conftest.$ac_ext

32064

-cat >>conftest.$ac_ext <<_ACEOF

32065

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

32066

/* end confdefs.h. */

32067

#include <ac_nonexistent.h>

32068

_ACEOF

32069

-if { (ac_try="$ac_cpp conftest.$ac_ext"

32070

-case "(($ac_try" in

32071

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

32072

- *) ac_try_echo=$ac_try;;

32073

-esac

32074

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

32075

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

32076

- ac_status=$?

32077

- grep -v '^ *+' conftest.er1 >conftest.err

32078

- rm -f conftest.er1

32079

- cat conftest.err >&5

32080

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

32081

- (exit $ac_status); } >/dev/null && {

32082

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

32083

- test ! -s conftest.err

32084

- }; then

32085

+if ac_fn_cxx_try_cpp "$LINENO"; then :

32086

# Broken: success on invalid input.

32087

continue

32088

else

32089

- echo "$as_me: failed program was:" >&5

32090

-sed 's/^/| /' conftest.$ac_ext >&5

32091

32092

# Passes both tests.

32093

ac_preproc_ok=:

32094

break

32095

32096

32097

-rm -f conftest.err conftest.$ac_ext

32098

+rm -f conftest.err conftest.i conftest.$ac_ext

32099

32100

done

32101

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

32102

-rm -f conftest.err conftest.$ac_ext

32103

-if $ac_preproc_ok; then

32104

+rm -f conftest.i conftest.err conftest.$ac_ext

32105

+if $ac_preproc_ok; then :

32106

break

32107

32108

32109

@@ -7821,8 +7622,8 @@ fi

32110

else

32111

ac_cv_prog_CXXCPP=$CXXCPP

32112

32113

-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5

32114

-echo "${ECHO_T}$CXXCPP" >&6; }

32115

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5

32116

+$as_echo "$CXXCPP" >&6; }

32117

ac_preproc_ok=false

32118

for ac_cxx_preproc_warn_flag in '' yes

32119

32120

@@ -7832,11 +7633,7 @@ do

32121

# <limits.h> exists even on freestanding compilers.

32122

# On the NeXT, cc -E runs the code through the compiler's parser,

32123

# not just through cpp. "Syntax error" is here to catch this case.

32124

- cat >conftest.$ac_ext <<_ACEOF

32125

-/* confdefs.h. */

32126

-_ACEOF

32127

-cat confdefs.h >>conftest.$ac_ext

32128

-cat >>conftest.$ac_ext <<_ACEOF

32129

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

32130

/* end confdefs.h. */

32131

#ifdef __STDC__

32132

# include <limits.h>

32133

@@ -7845,79 +7642,39 @@ cat >>conftest.$ac_ext <<_ACEOF

32134

#endif

32135

Syntax error

32136

_ACEOF

32137

-if { (ac_try="$ac_cpp conftest.$ac_ext"

32138

-case "(($ac_try" in

32139

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

32140

- *) ac_try_echo=$ac_try;;

32141

-esac

32142

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

32143

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

32144

- ac_status=$?

32145

- grep -v '^ *+' conftest.er1 >conftest.err

32146

- rm -f conftest.er1

32147

- cat conftest.err >&5

32148

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

32149

- (exit $ac_status); } >/dev/null && {

32150

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

32151

- test ! -s conftest.err

32152

- }; then

32153

- :

32154

-else

32155

- echo "$as_me: failed program was:" >&5

32156

-sed 's/^/| /' conftest.$ac_ext >&5

32157

+if ac_fn_cxx_try_cpp "$LINENO"; then :

32158

32159

+else

32160

# Broken: fails on valid input.

32161

continue

32162

32163

+rm -f conftest.err conftest.i conftest.$ac_ext

32164

32165

-rm -f conftest.err conftest.$ac_ext

32166

32167

- # OK, works on sane cases. Now check whether nonexistent headers

32168

- # can be detected and how.

32169

- cat >conftest.$ac_ext <<_ACEOF

32170

-/* confdefs.h. */

32171

-_ACEOF

32172

-cat confdefs.h >>conftest.$ac_ext

32173

-cat >>conftest.$ac_ext <<_ACEOF

32174

-/* end confdefs.h. */

32175

-#include <ac_nonexistent.h>

32176

-_ACEOF

32177

-if { (ac_try="$ac_cpp conftest.$ac_ext"

32178

-case "(($ac_try" in

32179

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

32180

- *) ac_try_echo=$ac_try;;

32181

-esac

32182

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

32183

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

32184

- ac_status=$?

32185

- grep -v '^ *+' conftest.er1 >conftest.err

32186

- rm -f conftest.er1

32187

- cat conftest.err >&5

32188

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

32189

- (exit $ac_status); } >/dev/null && {

32190

- test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

32191

- test ! -s conftest.err

32192

- }; then

32193

+ # OK, works on sane cases. Now check whether nonexistent headers

32194

+ # can be detected and how.

32195

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

32196

+/* end confdefs.h. */

32197

+#include <ac_nonexistent.h>

32198

+_ACEOF

32199

+if ac_fn_cxx_try_cpp "$LINENO"; then :

32200

# Broken: success on invalid input.

32201

continue

32202

else

32203

- echo "$as_me: failed program was:" >&5

32204

-sed 's/^/| /' conftest.$ac_ext >&5

32205

32206

# Passes both tests.

32207

ac_preproc_ok=:

32208

break

32209

32210

32211

-rm -f conftest.err conftest.$ac_ext

32212

+rm -f conftest.err conftest.i conftest.$ac_ext

32213

32214

done

32215

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

32216

-rm -f conftest.err conftest.$ac_ext

32217

-if $ac_preproc_ok; then

32218

- :

32219

+rm -f conftest.i conftest.err conftest.$ac_ext

32220

+if $ac_preproc_ok; then :

32221

32222

else

25997

-if ac_fn_cxx_try_cpp "$LINENO"; then :

25998

- # Broken: success on invalid input.

25999

-continue

26000

-else

26001

- # Passes both tests.

26002

-ac_preproc_ok=:

26003

-break

26004

26005

26006

-rm -f conftest.err conftest.$ac_ext

26007

26008

done

26009

-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

26010

-rm -f conftest.err conftest.$ac_ext

26011

-if $ac_preproc_ok; then :

26012

26013

-else

26014

- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

26015

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

26016

-_lt_caught_CXX_error=yes; }

26017

-fi

26018

26019

-ac_ext=cpp

26020

-ac_cpp='$CXXCPP $CPPFLAGS'

26021

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

26022

-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

26023

-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

26024

26025

-else

32223

26026

- _lt_caught_CXX_error=yes

32224

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

32225

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

32226

+_lt_caught_CXX_error=yes; }

32227

32228

32229

ac_ext=cpp

32230

@@ -7945,7 +7702,7 @@ fi

32231

32232

32233

# Check whether --enable-shared was given.

32234

-if test "${enable_shared+set}" = set; then

32235

+if test "${enable_shared+set}" = set; then :

32236

enableval=$enable_shared; p=${PACKAGE-default}

32237

case $enableval in

32238

yes) enable_shared=yes ;;

32239

@@ -7976,7 +7733,7 @@ fi

32240

32241

32242

# Check whether --enable-static was given.

32243

-if test "${enable_static+set}" = set; then

32244

+if test "${enable_static+set}" = set; then :

32245

enableval=$enable_static; p=${PACKAGE-default}

32246

case $enableval in

32247

yes) enable_static=yes ;;

32248

@@ -8008,7 +7765,7 @@ fi

32249

32250

32251

# Check whether --with-pic was given.

32252

-if test "${with_pic+set}" = set; then

32253

+if test "${with_pic+set}" = set; then :

32254

withval=$with_pic; pic_mode="$withval"

32255

else

32256

pic_mode=default

32257

@@ -8024,7 +7781,7 @@ test -z "$pic_mode" && pic_mode=default

32258

32259

32260

# Check whether --enable-fast-install was given.

32261

-if test "${enable_fast_install+set}" = set; then

32262

+if test "${enable_fast_install+set}" = set; then :

32263

enableval=$enable_fast_install; p=${PACKAGE-default}

32264

case $enableval in

32265

yes) enable_fast_install=yes ;;

32266

@@ -8105,10 +7862,10 @@ if test -n "${ZSH_VERSION+set}" ; then

32267

setopt NO_GLOB_SUBST

32268

32269

32270

-{ echo "$as_me:$LINENO: checking for objdir" >&5

32271

-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }

32272

-if test "${lt_cv_objdir+set}" = set; then

32273

- echo $ECHO_N "(cached) $ECHO_C" >&6

32274

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5

32275

+$as_echo_n "checking for objdir... " >&6; }

32276

+if test "${lt_cv_objdir+set}" = set; then :

32277

+ $as_echo_n "(cached) " >&6

26027

-fi

26028

+func_stripname_cnf ()

26029

26030

+ case ${2} in

26031

+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;

26032

+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;

26033

+ esac

26034

+} # func_stripname_cnf

26035

26036

26037

26038

@@ -7837,6 +7829,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo

26039

26040

26041

26042

26043

test -z "$LN_S" && LN_S="ln -s"

26044

26045

26046

@@ -7858,7 +7851,7 @@ fi

26047

26048

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5

26049

$as_echo_n "checking for objdir... " >&6; }

26050

-if test "${lt_cv_objdir+set}" = set; then :

26051

+if ${lt_cv_objdir+:} false; then :

26052

$as_echo_n "(cached) " >&6

32278

26053

else

32279

26054

rm -f .libs 2>/dev/null

32280

mkdir .libs 2>/dev/null

32281

@@ -8120,8 +7877,8 @@ else

32282

32283

rmdir .libs 2>/dev/null

32284

32285

-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5

32286

-echo "${ECHO_T}$lt_cv_objdir" >&6; }

32287

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5

32288

+$as_echo "$lt_cv_objdir" >&6; }

32289

objdir=$lt_cv_objdir

32290

32291

32292

@@ -8213,10 +7970,10 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file

32293

case $deplibs_check_method in

32294

file_magic*)

26055

@@ -7886,19 +7879,6 @@ _ACEOF

26056

26057

26058

26059

26060

26061

26062

26063

26064

26065

26066

26067

26068

26069

26070

26071

26072

case $host_os in

26073

aix3*)

26074

# AIX sometimes has problems with the GCC collect2 program. For some

26075

@@ -7911,23 +7891,6 @@ aix3*)

26076

;;

26077

esac

26078

26079

-# Sed substitution that helps us do robust quoting. It backslashifies

26080

-# metacharacters that are still active within double-quoted strings.

26081

-sed_quote_subst='s/$["`$\\]$/\\\1/g'

26082

26083

-# Same as above, but do not quote variable references.

26084

-double_quote_subst='s/$["`\\]$/\\\1/g'

26085

26086

-# Sed substitution to delay expansion of an escaped shell variable in a

26087

-# double_quote_subst'ed string.

26088

-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'

26089

26090

-# Sed substitution to delay expansion of an escaped single quote.

26091

-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'

26092

26093

-# Sed substitution to avoid accidental globbing in evaled expressions

26094

-no_glob_subst='s/\*/\\\*/g'

26095

26096

# Global variables:

26097

ofile=libtool

26098

can_build_shared=yes

26099

@@ -7956,7 +7919,7 @@ for cc_temp in $compiler""; do

26100

*) break;;

26101

esac

26102

done

26103

-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

26104

+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`

26105

26106

26107

# Only perform the check for file, if the check method requires it

26108

@@ -7966,7 +7929,7 @@ file_magic*)

32295

26109

if test "$file_magic_cmd" = '$MAGIC_CMD'; then

32296

- { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5

32297

-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }

32298

-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

32299

- echo $ECHO_N "(cached) $ECHO_C" >&6

32300

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5

32301

+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }

32302

+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :

32303

+ $as_echo_n "(cached) " >&6

26110

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5

26111

$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }

26112

-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :

26113

+if ${lt_cv_path_MAGIC_CMD+:} false; then :

26114

$as_echo_n "(cached) " >&6

32304

26115

else

32305

26116

case $MAGIC_CMD in

32306

[\\/*] | ?:[\\/]*)

32307

@@ -8266,11 +8023,11 @@ fi

32308

32309

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

32310

if test -n "$MAGIC_CMD"; then

32311

- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

32312

-echo "${ECHO_T}$MAGIC_CMD" >&6; }

32313

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5

32314

+$as_echo "$MAGIC_CMD" >&6; }

32315

else

32316

- { echo "$as_me:$LINENO: result: no" >&5

32317

-echo "${ECHO_T}no" >&6; }

32318

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

32319

+$as_echo "no" >&6; }

32320

32321

32322

32323

@@ -8279,10 +8036,10 @@ fi

32324

32325

if test -z "$lt_cv_path_MAGIC_CMD"; then

26117

@@ -8032,7 +7995,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then

32326

26118

if test -n "$ac_tool_prefix"; then

32327

- { echo "$as_me:$LINENO: checking for file" >&5

32328

-echo $ECHO_N "checking for file... $ECHO_C" >&6; }

32329

-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

32330

- echo $ECHO_N "(cached) $ECHO_C" >&6

32331

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5

32332

+$as_echo_n "checking for file... " >&6; }

32333

+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :

32334

+ $as_echo_n "(cached) " >&6

26119

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5

26120

$as_echo_n "checking for file... " >&6; }

26121

-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :

26122

+if ${lt_cv_path_MAGIC_CMD+:} false; then :

26123

$as_echo_n "(cached) " >&6

32335

26124

else

32336

26125

case $MAGIC_CMD in

32337

[\\/*] | ?:[\\/]*)

32338

@@ -8332,11 +8089,11 @@ fi

32339

32340

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

32341

if test -n "$MAGIC_CMD"; then

32342

- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

32343

-echo "${ECHO_T}$MAGIC_CMD" >&6; }

32344

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5

32345

+$as_echo "$MAGIC_CMD" >&6; }

32346

else

32347

- { echo "$as_me:$LINENO: result: no" >&5

32348

-echo "${ECHO_T}no" >&6; }

32349

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

32350

+$as_echo "no" >&6; }

32351

32352

32353

32354

@@ -8412,10 +8169,10 @@ lt_prog_compiler_no_builtin_flag=

26126

@@ -8161,11 +8124,16 @@ if test -n "$compiler"; then

26127

lt_prog_compiler_no_builtin_flag=

26128

32355

26129

if test "$GCC" = yes; then

32356

lt_prog_compiler_no_builtin_flag=' -fno-builtin'

26130

- lt_prog_compiler_no_builtin_flag=' -fno-builtin'

26131

+ case $cc_basename in

26132

+ nvcc*)

26133

+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;

26134

+ *)

26135

+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;

26136

+ esac

32357

26137

32358

- { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

32359

-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }

32360

-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then

32361

- echo $ECHO_N "(cached) $ECHO_C" >&6

32362

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

32363

+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }

32364

+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :

32365

+ $as_echo_n "(cached) " >&6

26138

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

26139

$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }

26140

-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :

26141

+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :

26142

$as_echo_n "(cached) " >&6

32366

26143

else

32367

26144

lt_cv_prog_compiler_rtti_exceptions=no

32368

ac_outfile=conftest.$ac_objext

32369

@@ -8430,11 +8187,11 @@ else

26145

@@ -8181,15 +8149,15 @@ else

32370

26146

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

32371

26147

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

32372

26148

-e 's:$: $lt_compiler_flag:'`

32373

- (eval echo "\"\$as_me:8433: $lt_compile\"" >&5)

32374

+ (eval echo "\"\$as_me:8190: $lt_compile\"" >&5)

26149

- (eval echo "\"\$as_me:8184: $lt_compile\"" >&5)

26150

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

32375

26151

(eval "$lt_compile" 2>conftest.err)

32376

26152

ac_status=$?

32377

26153

cat conftest.err >&5

32378

- echo "$as_me:8437: \$? = $ac_status" >&5

32379

+ echo "$as_me:8194: \$? = $ac_status" >&5

26154

- echo "$as_me:8188: \$? = $ac_status" >&5

26155

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

32380

26156

if (exit $ac_status) && test -s "$ac_outfile"; then

32381

26157

# The compiler can only warn and ignore the option if not recognized

32382

26158

# So say no if there are warnings other than the usual output.

32383

@@ -8447,8 +8204,8 @@ else

32384

$RM conftest*

32385

32386

32387

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

32388

-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }

32389

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

32390

+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }

32391

32392

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

32393

lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"

32394

@@ -8467,8 +8224,8 @@ fi

26159

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

26160

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp

26161

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

26162

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

26163

lt_cv_prog_compiler_rtti_exceptions=yes

26164

@@ -8218,8 +8186,6 @@ fi

32395

26165

lt_prog_compiler_pic=

32396

26166

lt_prog_compiler_static=

32397

26167

32398

-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

32399

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

32400

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

32401

+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

26168

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

26169

-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

32402

26170

32403

26171

if test "$GCC" = yes; then

32404

26172

lt_prog_compiler_wl='-Wl,'

32405

@@ -8502,7 +8259,7 @@ echo $ECHO_N "checking for $compiler opt

32406

# PIC is the default for these OSes.

32407

;;

32408

32409

- mingw* | cygwin* | pw32* | os2*)

32410

+ mingw* | cygwin* | pw32* | os2* | cegcc*)

32411

# This hack is so that the source file can tell whether it is being

32412

# built for inclusion in a dll (and should export symbols for example).

32413

# Although the cygwin gcc ignores -fPIC, still need this for old-style

32414

@@ -8517,10 +8274,11 @@ echo $ECHO_N "checking for $compiler opt

32415

;;

32416

26173

@@ -8267,6 +8233,12 @@ $as_echo_n "checking for $compiler optio

26174

lt_prog_compiler_pic='-fno-common'

26175

;;

26176

26177

+ haiku*)

26178

+ # PIC is the default for Haiku.

26179

+ # The "-static" flag exists, but is broken.

26180

+ lt_prog_compiler_static=

26181

+ ;;

26182

32417

26183

hpux*)

32418

- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but

32419

- # not for PA HP-UX.

32420

+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit

32421

+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

32422

+ # sets the default TLS model and affects inlining.

32423

case $host_cpu in

32424

- hppa*64*|ia64*)

32425

+ hppa*64*)

32426

# +Z the default

26184

# PIC is the default for 64-bit PA HP-UX, but not for 32-bit

26185

# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

26186

@@ -8309,6 +8281,13 @@ $as_echo_n "checking for $compiler optio

26187

lt_prog_compiler_pic='-fPIC'

26188

;;

26189

esac

26190

26191

+ case $cc_basename in

26192

+ nvcc*) # Cuda Compiler Driver 2.2

26193

+ lt_prog_compiler_wl='-Xlinker '

26194

+ lt_prog_compiler_pic='-Xcompiler -fPIC'

26195

+ ;;

26196

+ esac

26197

else

26198

# PORTME Check for flag to pass linker flags through the system compiler.

26199

case $host_os in

26200

@@ -8371,7 +8350,13 @@ $as_echo_n "checking for $compiler optio

26201

lt_prog_compiler_pic='--shared'

26202

lt_prog_compiler_static='--static'

32427

26203

;;

32428

32429

@@ -8570,7 +8328,7 @@ echo $ECHO_N "checking for $compiler opt

32430

32431

;;

32432

32433

- mingw* | cygwin* | pw32* | os2*)

32434

+ mingw* | cygwin* | pw32* | os2* | cegcc*)

32435

# This hack is so that the source file can tell whether it is being

32436

# built for inclusion in a dll (and should export symbols for example).

32437

lt_prog_compiler_pic='-DDLL_EXPORT'

32438

@@ -8598,13 +8356,27 @@ echo $ECHO_N "checking for $compiler opt

32439

lt_prog_compiler_static='-non_shared'

32440

;;

32441

32442

- linux* | k*bsd*-gnu)

32443

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

32444

case $cc_basename in

32445

- icc* | ecc* | ifort*)

32446

+ # old Intel for x86_64 which still supported -KPIC.

32447

+ ecc*)

32448

lt_prog_compiler_wl='-Wl,'

32449

lt_prog_compiler_pic='-KPIC'

32450

lt_prog_compiler_static='-static'

32451

;;

32452

+ # icc used to be incompatible with GCC.

32453

+ # ICC 10 doesn't accept -KPIC any more.

32454

+ icc* | ifort*)

32455

+ lt_prog_compiler_wl='-Wl,'

32456

+ lt_prog_compiler_pic='-fPIC'

32457

+ lt_prog_compiler_static='-static'

32458

+ ;;

32459

+ # Lahey Fortran 8.1.

32460

+ lf95*)

32461

+ lt_prog_compiler_wl='-Wl,'

32462

+ lt_prog_compiler_pic='--shared'

32463

+ lt_prog_compiler_static='--static'

26204

- pgcc* | pgf77* | pgf90* | pgf95*)

26205

+ nagfor*)

26206

+ # NAG Fortran compiler

26207

+ lt_prog_compiler_wl='-Wl,-Wl,,'

26208

+ lt_prog_compiler_pic='-PIC'

26209

+ lt_prog_compiler_static='-Bstatic'

32464

26210

+ ;;

32465

pgcc* | pgf77* | pgf90* | pgf95*)

26211

+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)

32466

26212

# Portland Group compilers (*not* the Pentium gcc compiler,

32467

26213

# which looks to be a dead project)

32468

@@ -8724,8 +8496,8 @@ case $host_os in

26214

lt_prog_compiler_wl='-Wl,'

26215

@@ -8383,25 +8368,25 @@ $as_echo_n "checking for $compiler optio

26216

# All Alpha code is PIC.

26217

lt_prog_compiler_static='-non_shared'

26218

;;

26219

- xl*)

26220

- # IBM XL C 8.0/Fortran 10.1 on PPC

26221

+ xl* | bgxl* | bgf* | mpixl*)

26222

+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene

26223

lt_prog_compiler_wl='-Wl,'

26224

lt_prog_compiler_pic='-qpic'

26225

lt_prog_compiler_static='-qstaticlink'

26226

;;

26227

26228

case `$CC -V 2>&1 | sed 5q` in

26229

- *Sun\ C*)

26230

- # Sun C 5.9

26231

+ *Sun\ F* | *Sun*Fortran*)

26232

+ # Sun Fortran 8.3 passes all unrecognized flags to the linker

26233

lt_prog_compiler_pic='-KPIC'

26234

lt_prog_compiler_static='-Bstatic'

26235

- lt_prog_compiler_wl='-Wl,'

26236

+ lt_prog_compiler_wl=''

26237

;;

26238

- *Sun\ F*)

26239

- # Sun Fortran 8.3 passes all unrecognized flags to the linker

26240

+ *Sun\ C*)

26241

+ # Sun C 5.9

26242

lt_prog_compiler_pic='-KPIC'

26243

lt_prog_compiler_static='-Bstatic'

26244

- lt_prog_compiler_wl=''

26245

+ lt_prog_compiler_wl='-Wl,'

26246

;;

26247

esac

26248

;;

26249

@@ -8433,7 +8418,7 @@ $as_echo_n "checking for $compiler optio

26250

lt_prog_compiler_pic='-KPIC'

26251

lt_prog_compiler_static='-Bstatic'

26252

case $cc_basename in

26253

- f77* | f90* | f95*)

26254

+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)

26255

lt_prog_compiler_wl='-Qoption ld ';;

26256

26257

lt_prog_compiler_wl='-Wl,';;

26258

@@ -8490,13 +8475,17 @@ case $host_os in

32469

26259

lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"

32470

26260

;;

32471

26261

esac

32472

-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5

32473

-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }

32474

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5

32475

+$as_echo "$lt_prog_compiler_pic" >&6; }

32476

32477

32478

32479

@@ -8736,10 +8508,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&

26262

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5

26263

-$as_echo "$lt_prog_compiler_pic" >&6; }

26264

26265

26266

26267

26268

26269

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

26270

+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

26271

+if ${lt_cv_prog_compiler_pic+:} false; then :

26272

+ $as_echo_n "(cached) " >&6

26273

+else

26274

+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic

26275

+fi

26276

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5

26277

+$as_echo "$lt_cv_prog_compiler_pic" >&6; }

26278

+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic

26279

26280

32480

26281

# Check to make sure the PIC flag actually works.

32481

26282

@@ -8504,7 +8493,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }

32482

26283

if test -n "$lt_prog_compiler_pic"; then

32483

- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

32484

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }

32485

-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then

32486

- echo $ECHO_N "(cached) $ECHO_C" >&6

32487

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

32488

+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }

32489

+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :

32490

+ $as_echo_n "(cached) " >&6

26284

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

26285

$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }

26286

-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :

26287

+if ${lt_cv_prog_compiler_pic_works+:} false; then :

26288

$as_echo_n "(cached) " >&6

32491

26289

else

32492

26290

lt_cv_prog_compiler_pic_works=no

32493

ac_outfile=conftest.$ac_objext

32494

@@ -8754,11 +8526,11 @@ else

26291

@@ -8520,15 +8509,15 @@ else

32495

26292

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

32496

26293

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

32497

26294

-e 's:$: $lt_compiler_flag:'`

32498

- (eval echo "\"\$as_me:8757: $lt_compile\"" >&5)

32499

+ (eval echo "\"\$as_me:8529: $lt_compile\"" >&5)

26295

- (eval echo "\"\$as_me:8523: $lt_compile\"" >&5)

26296

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

32500

26297

(eval "$lt_compile" 2>conftest.err)

32501

26298

ac_status=$?

32502

26299

cat conftest.err >&5

32503

- echo "$as_me:8761: \$? = $ac_status" >&5

32504

+ echo "$as_me:8533: \$? = $ac_status" >&5

26300

- echo "$as_me:8527: \$? = $ac_status" >&5

26301

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

32505

26302

if (exit $ac_status) && test -s "$ac_outfile"; then

32506

26303

# The compiler can only warn and ignore the option if not recognized

32507

26304

# So say no if there are warnings other than the usual output.

32508

@@ -8771,8 +8543,8 @@ else

32509

$RM conftest*

32510

32511

32512

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5

32513

-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }

32514

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5

32515

+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }

32516

32517

if test x"$lt_cv_prog_compiler_pic_works" = xyes; then

32518

case $lt_prog_compiler_pic in

32519

@@ -8795,10 +8567,10 @@ fi

26305

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

26306

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp

26307

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

26308

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

26309

lt_cv_prog_compiler_pic_works=yes

26310

@@ -8557,13 +8546,18 @@ fi

26311

26312

26313

26314

26315

26316

26317

26318

26319

32520

26320

# Check to make sure the static flag actually works.

32521

26321

32522

26322

wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"

32523

-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

32524

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

32525

-if test "${lt_cv_prog_compiler_static_works+set}" = set; then

32526

- echo $ECHO_N "(cached) $ECHO_C" >&6

32527

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5

32528

+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

32529

+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :

32530

+ $as_echo_n "(cached) " >&6

26323

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5

26324

$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

26325

-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :

26326

+if ${lt_cv_prog_compiler_static_works+:} false; then :

26327

$as_echo_n "(cached) " >&6

32531

26328

else

32532

26329

lt_cv_prog_compiler_static_works=no

32533

save_LDFLAGS="$LDFLAGS"

32534

@@ -8823,8 +8595,8 @@ else

32535

LDFLAGS="$save_LDFLAGS"

32536

32537

32538

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5

32539

-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }

32540

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5

32541

+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }

32542

32543

if test x"$lt_cv_prog_compiler_static_works" = xyes; then

32544

32545

@@ -8838,10 +8610,10 @@ fi

32546

32547

32548

32549

- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

32550

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

32551

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then

32552

- echo $ECHO_N "(cached) $ECHO_C" >&6

32553

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

32554

+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

32555

+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

32556

+ $as_echo_n "(cached) " >&6

32557

else

32558

lt_cv_prog_compiler_c_o=no

32559

$RM -r conftest 2>/dev/null

32560

@@ -8859,11 +8631,11 @@ else

32561

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

32562

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

32563

-e 's:$: $lt_compiler_flag:'`

32564

- (eval echo "\"\$as_me:8862: $lt_compile\"" >&5)

32565

+ (eval echo "\"\$as_me:8634: $lt_compile\"" >&5)

32566

(eval "$lt_compile" 2>out/conftest.err)

32567

ac_status=$?

32568

cat out/conftest.err >&5

32569

- echo "$as_me:8866: \$? = $ac_status" >&5

32570

+ echo "$as_me:8638: \$? = $ac_status" >&5

32571

if (exit $ac_status) && test -s out/conftest2.$ac_objext

32572

then

32573

# The compiler can only warn and ignore the option if not recognized

32574

@@ -8885,18 +8657,18 @@ else

32575

$RM conftest*

32576

32577

32578

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

32579

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }

32580

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5

32581

+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }

32582

32583

32584

32585

32586

32587

32588

- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

32589

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

32590

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then

32591

- echo $ECHO_N "(cached) $ECHO_C" >&6

32592

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

32593

+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

32594

+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

32595

+ $as_echo_n "(cached) " >&6

32596

else

32597

lt_cv_prog_compiler_c_o=no

32598

$RM -r conftest 2>/dev/null

32599

@@ -8914,11 +8686,11 @@ else

32600

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

32601

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

32602

-e 's:$: $lt_compiler_flag:'`

32603

- (eval echo "\"\$as_me:8917: $lt_compile\"" >&5)

32604

+ (eval echo "\"\$as_me:8689: $lt_compile\"" >&5)

32605

(eval "$lt_compile" 2>out/conftest.err)

32606

ac_status=$?

32607

cat out/conftest.err >&5

32608

- echo "$as_me:8921: \$? = $ac_status" >&5

32609

+ echo "$as_me:8693: \$? = $ac_status" >&5

32610

if (exit $ac_status) && test -s out/conftest2.$ac_objext

32611

then

32612

# The compiler can only warn and ignore the option if not recognized

32613

@@ -8940,8 +8712,8 @@ else

32614

$RM conftest*

32615

32616

32617

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

32618

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }

32619

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5

32620

+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }

32621

32622

32623

32624

@@ -8949,19 +8721,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o"

32625

hard_links="nottested"

32626

if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then

32627

# do not overwrite the value of need_locks provided by the user

32628

- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

32629

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

32630

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5

32631

+$as_echo_n "checking if we can lock with hard links... " >&6; }

32632

hard_links=yes

32633

$RM conftest*

32634

ln conftest.a conftest.b 2>/dev/null && hard_links=no

32635

touch conftest.a

32636

ln conftest.a conftest.b 2>&5 || hard_links=no

32637

ln conftest.a conftest.b 2>/dev/null && hard_links=no

32638

- { echo "$as_me:$LINENO: result: $hard_links" >&5

32639

-echo "${ECHO_T}$hard_links" >&6; }

32640

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5

32641

+$as_echo "$hard_links" >&6; }

32642

if test "$hard_links" = no; then

32643

- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

32644

-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

32645

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

32646

+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

32647

need_locks=warn

32648

32649

else

32650

@@ -8973,8 +8745,8 @@ fi

32651

32652

32653

32654

- { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

32655

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

32656

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5

32657

+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

32658

32659

runpath_var=

32660

allow_undefined_flag=

32661

@@ -9018,7 +8790,7 @@ echo $ECHO_N "checking whether the $comp

32662

extract_expsyms_cmds=

32663

32664

case $host_os in

32665

- cygwin* | mingw* | pw32*)

32666

+ cygwin* | mingw* | pw32* | cegcc*)

32667

# FIXME: the MSVC++ port hasn't been tested in a loooong time

32668

# When not using gcc, we currently assume that we are using

32669

# Microsoft Visual C++.

32670

@@ -9033,6 +8805,9 @@ echo $ECHO_N "checking whether the $comp

26330

@@ -8576,7 +8570,7 @@ else

26331

if test -s conftest.err; then

26332

# Append any errors to the config.log.

26333

cat conftest.err 1>&5

26334

- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp

26335

+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp

26336

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

26337

if diff conftest.exp conftest.er2 >/dev/null; then

26338

lt_cv_prog_compiler_static_works=yes

26339

@@ -8606,7 +8600,7 @@ fi

26340

26341

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

26342

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

26343

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

26344

+if ${lt_cv_prog_compiler_c_o+:} false; then :

26345

$as_echo_n "(cached) " >&6

26346

else

26347

lt_cv_prog_compiler_c_o=no

26348

@@ -8625,16 +8619,16 @@ else

26349

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

26350

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

26351

-e 's:$: $lt_compiler_flag:'`

26352

- (eval echo "\"\$as_me:8628: $lt_compile\"" >&5)

26353

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

26354

(eval "$lt_compile" 2>out/conftest.err)

26355

ac_status=$?

26356

cat out/conftest.err >&5

26357

- echo "$as_me:8632: \$? = $ac_status" >&5

26358

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

26359

if (exit $ac_status) && test -s out/conftest2.$ac_objext

26360

then

26361

# The compiler can only warn and ignore the option if not recognized

26362

# So say no if there are warnings

26363

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp

26364

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp

26365

$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2

26366

if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then

26367

lt_cv_prog_compiler_c_o=yes

26368

@@ -8661,7 +8655,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;

26369

26370

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

26371

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

26372

-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

26373

+if ${lt_cv_prog_compiler_c_o+:} false; then :

26374

$as_echo_n "(cached) " >&6

26375

else

26376

lt_cv_prog_compiler_c_o=no

26377

@@ -8680,16 +8674,16 @@ else

26378

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

26379

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

26380

-e 's:$: $lt_compiler_flag:'`

26381

- (eval echo "\"\$as_me:8683: $lt_compile\"" >&5)

26382

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

26383

(eval "$lt_compile" 2>out/conftest.err)

26384

ac_status=$?

26385

cat out/conftest.err >&5

26386

- echo "$as_me:8687: \$? = $ac_status" >&5

26387

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

26388

if (exit $ac_status) && test -s out/conftest2.$ac_objext

26389

then

26390

# The compiler can only warn and ignore the option if not recognized

26391

# So say no if there are warnings

26392

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp

26393

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp

26394

$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2

26395

if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then

26396

lt_cv_prog_compiler_c_o=yes

26397

@@ -8799,13 +8793,39 @@ $as_echo_n "checking whether the $compil

32671

26398

openbsd*)

32672

26399

with_gnu_ld=no

32673

26400

;;

32674

+ linux* | k*bsd*-gnu)

32675

+ link_all_deplibs=no

32676

+ ;;

26401

- linux* | k*bsd*-gnu)

26402

+ linux* | k*bsd*-gnu | gnu*)

26403

link_all_deplibs=no

26404

;;

32677

26405

esac

32678

26406

32679

26407

ld_shlibs=yes

32680

@@ -9054,6 +8829,7 @@ echo $ECHO_N "checking whether the $comp

32681

32682

supports_anon_versioning=no

32683

case `$LD -v 2>&1` in

32684

+ *GNU\ gold*) supports_anon_versioning=yes ;;

32685

*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11

32686

*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...

32687

*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

32688

@@ -9105,7 +8881,7 @@ _LT_EOF

26408

26409

+ # On some targets, GNU ld is compatible enough with the native linker

26410

+ # that we're better off using the native interface for both.

26411

+ lt_use_gnu_ld_interface=no

26412

if test "$with_gnu_ld" = yes; then

26413

+ case $host_os in

26414

+ aix*)

26415

+ # The AIX port of GNU ld has always aspired to compatibility

26416

+ # with the native linker. However, as the warning in the GNU ld

26417

+ # block says, versions before 2.19.5* couldn't really create working

26418

+ # shared libraries, regardless of the interface used.

26419

+ case `$LD -v 2>&1` in

26420

+ *\ $GNU\ Binutils$\ 2.19.5*) ;;

26421

+ *\ $GNU\ Binutils$\ 2.[2-9]*) ;;

26422

+ *\ $GNU\ Binutils$\ [3-9]*) ;;

26423

+ *)

26424

+ lt_use_gnu_ld_interface=yes

26425

+ ;;

26426

+ esac

26427

+ ;;

26428

+ *)

26429

+ lt_use_gnu_ld_interface=yes

26430

+ ;;

26431

+ esac

26432

+ fi

26433

26434

+ if test "$lt_use_gnu_ld_interface" = yes; then

26435

# If archive_cmds runs LD, not CC, wlarc should be empty

26436

wlarc='${wl}'

26437

26438

@@ -8839,11 +8859,12 @@ $as_echo_n "checking whether the $compil

26439

ld_shlibs=no

26440

cat <<_LT_EOF 1>&2

26441

26442

-*** Warning: the GNU linker, at least up to release 2.9.1, is reported

26443

+*** Warning: the GNU linker, at least up to release 2.19, is reported

26444

*** to be unable to reliably create shared libraries on AIX.

26445

*** Therefore, libtool is disabling shared libraries support. If you

26446

-*** really care for shared libraries, you may want to modify your PATH

26447

-*** so that a non-GNU linker is found, and then restart.

26448

+*** really care for shared libraries, you may want to install binutils

26449

+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.

26450

+*** You will then need to restart the configuration process.

26451

26452

_LT_EOF

32689

26453

32690

;;

32691

32692

- cygwin* | mingw* | pw32*)

32693

+ cygwin* | mingw* | pw32* | cegcc*)

26454

@@ -8879,10 +8900,12 @@ _LT_EOF

32694

26455

# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,

32695

26456

# as there is no search path for DLLs.

32696

26457

hardcode_libdir_flag_spec='-L$libdir'

32697

@@ -9145,7 +8921,7 @@ _LT_EOF

32698

26458

+ export_dynamic_flag_spec='${wl}--export-all-symbols'

26459

allow_undefined_flag=unsupported

26460

always_export_symbols=no

26461

enable_shared_with_static_runtimes=yes

26462

26463

26464

+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'

26465

26466

if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

26467

archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

26468

@@ -8900,6 +8923,11 @@ _LT_EOF

26469

32699

26470

;;

32700

26471

32701

- gnu* | linux* | tpf* | k*bsd*-gnu)

32702

+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)

32703

tmp_diet=no

32704

if test "$host_os" = linux-dietlibc; then

32705

case $cc_basename in

32706

@@ -9171,6 +8947,9 @@ _LT_EOF

32707

tmp_addflag=' -i_dynamic -nofor_main' ;;

32708

ifc* | ifort*) # Intel Fortran compiler

32709

tmp_addflag=' -nofor_main' ;;

32710

+ lf95*) # Lahey Fortran 8.1

32711

+ whole_archive_flag_spec=

32712

+ tmp_sharedflag='--shared' ;;

32713

xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)

26472

+ haiku*)

26473

+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

26474

+ link_all_deplibs=yes

26475

+ ;;

26476

26477

interix[3-9]*)

26478

hardcode_direct=no

26479

hardcode_shlibpath_var=no

26480

@@ -8925,15 +8953,16 @@ _LT_EOF

26481

if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \

26482

&& test "$tmp_diet" = no

26483

then

26484

- tmp_addflag=

26485

+ tmp_addflag=' $pic_flag'

26486

tmp_sharedflag='-shared'

26487

case $cc_basename,$host_cpu in

26488

pgcc*) # Portland Group C compiler

26489

26490

26491

tmp_addflag=' $pic_flag'

26492

;;

26493

- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers

26494

26495

+ pgf77* | pgf90* | pgf95* | pgfortran*)

26496

+ # Portland Group f77 and f90 compilers

26497

26498

tmp_addflag=' $pic_flag -Mnomain' ;;

26499

ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64

26500

tmp_addflag=' -i_dynamic' ;;

26501

@@ -8944,13 +8973,17 @@ _LT_EOF

26502

lf95*) # Lahey Fortran 8.1

26503

whole_archive_flag_spec=

26504

tmp_sharedflag='--shared' ;;

26505

- xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)

26506

+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)

32714

26507

tmp_sharedflag='-qmkshrobj'

32715

26508

tmp_addflag= ;;

32716

@@ -9212,7 +8991,7 @@ _LT_EOF

32717

32718

;;

26509

+ nvcc*) # Cuda Compiler Driver 2.2

26510

26511

+ compiler_needs_object=yes

26512

+ ;;

26513

esac

26514

case `$CC -V 2>&1 | sed 5q` in

26515

*Sun\ C*) # Sun C 5.9

26516

26517

26518

compiler_needs_object=yes

26519

tmp_sharedflag='-G' ;;

26520

*Sun\ F*) # Sun Fortran 8.3

26521

@@ -8966,17 +8999,17 @@ _LT_EOF

26522

32719

26523

32720

- netbsd*)

32721

+ netbsd* | netbsdelf*-gnu)

32722

if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

26524

case $cc_basename in

26525

- xlf*)

26526

+ xlf* | bgf* | bgxlf* | mpixlf*)

26527

# IBM XL Fortran 10.1 on PPC cannot create shared libs itself

26528

whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'

26529

hardcode_libdir_flag_spec=

26530

hardcode_libdir_flag_spec_ld='-rpath $libdir'

26531

- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'

26532

+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'

26533

if test "x$supports_anon_versioning" = xyes; then

26534

archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~

26535

cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~

26536

echo "local: *; };" >> $output_objdir/$libname.ver~

26537

- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

26538

+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'

26539

26540

;;

26541

esac

26542

@@ -8990,8 +9023,8 @@ _LT_EOF

32723

26543

archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

32724

26544

wlarc=

32725

@@ -9387,6 +9166,7 @@ _LT_EOF

32726

if test "$aix_use_runtimelinking" = yes; then

32727

shared_flag="$shared_flag "'${wl}-G'

32728

32729

+ link_all_deplibs=no

32730

else

32731

# not using gcc

32732

if test "$host_cpu" = ia64; then

32733

@@ -9402,6 +9182,7 @@ _LT_EOF

32734

32735

32736

32737

+ export_dynamic_flag_spec='${wl}-bexpall'

32738

# It seems that -bexpall does not export symbols beginning with

32739

# underscore (_), so it is better to generate a list of symbols to export.

32740

always_export_symbols=yes

32741

@@ -9411,11 +9192,7 @@ _LT_EOF

26545

else

26546

- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

26547

- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

26548

+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

26549

+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

26550

26551

;;

26552

26553

@@ -9009,8 +9042,8 @@ _LT_EOF

26554

26555

_LT_EOF

26556

elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then

26557

- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

26558

- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

26559

+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

26560

+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

26561

else

26562

ld_shlibs=no

26563

26564

@@ -9056,8 +9089,8 @@ _LT_EOF

26565

26566

26567

if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then

26568

- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

26569

- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

26570

+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

26571

+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

26572

else

26573

ld_shlibs=no

26574

26575

@@ -9097,8 +9130,10 @@ _LT_EOF

26576

else

26577

# If we're using GNU nm, then we don't want the "-C" option.

26578

# -C means demangle to AIX nm, but means don't demangle with GNU nm

26579

+ # Also, AIX nm treats weak defined symbols like other global

26580

+ # defined symbols, whereas GNU nm marks them as "W".

26581

if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then

26582

- 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'

26583

26584

else

26585

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'

26586

26587

@@ -9186,7 +9221,13 @@ _LT_EOF

32742

26588

allow_undefined_flag='-berok'

32743

26589

# Determine the default libpath from the value encoded in an

32744

26590

# empty executable.

32745

- cat >conftest.$ac_ext <<_ACEOF

32746

-/* confdefs.h. */

32747

-_ACEOF

32748

-cat confdefs.h >>conftest.$ac_ext

32749

-cat >>conftest.$ac_ext <<_ACEOF

32750

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

26591

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

26592

+ if test "${lt_cv_aix_libpath+set}" = set; then

26593

+ aix_libpath=$lt_cv_aix_libpath

26594

+else

26595

+ if ${lt_cv_aix_libpath_+:} false; then :

26596

+ $as_echo_n "(cached) " >&6

26597

+else

26598

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

32751

26599

/* end confdefs.h. */

32752

26600

32753

26601

int

32754

@@ -9426,24 +9203,7 @@ main ()

32755

return 0;

32756

}

26602

@@ -9199,25 +9240,32 @@ main ()

32757

26603

_ACEOF

32758

-rm -f conftest.$ac_objext conftest$ac_exeext

32759

-if { (ac_try="$ac_link"

32760

-case "(($ac_try" in

32761

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

32762

- *) ac_try_echo=$ac_try;;

32763

-esac

32764

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

32765

- (eval "$ac_link") 2>conftest.er1

32766

- ac_status=$?

32767

- grep -v '^ *+' conftest.er1 >conftest.err

32768

- rm -f conftest.er1

32769

- cat conftest.err >&5

32770

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

32771

- (exit $ac_status); } && {

32772

- test -z "$ac_c_werror_flag" ||

32773

- test ! -s conftest.err

32774

- } && test -s conftest$ac_exeext &&

32775

- $as_test_x conftest$ac_exeext; then

32776

+if ac_fn_c_try_link "$LINENO"; then :

26604

if ac_fn_c_try_link "$LINENO"; then :

32777

26605

32778

lt_aix_libpath_sed='

32779

/Import File Strings/,/^$/ {

32780

@@ -9457,15 +9217,9 @@ aix_libpath=`dump -H conftest$ac_exeext

32781

if test -z "$aix_libpath"; then

32782

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

32783

32784

-else

32785

- echo "$as_me: failed program was:" >&5

32786

-sed 's/^/| /' conftest.$ac_ext >&5

32787

32788

32789

32790

32791

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

32792

- conftest$ac_exeext conftest.$ac_ext

32793

+rm -f core conftest.err conftest.$ac_objext \

32794

+ conftest$ac_exeext conftest.$ac_ext

32795

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

26606

-lt_aix_libpath_sed='

26607

- /Import File Strings/,/^$/ {

26608

- /^0/ {

26609

- s/^0 *$.*$$/\1/

26610

- p

26611

- }

26612

- }'

26613

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

26614

-# Check for a 64-bit object if we didn't find anything.

26615

-if test -z "$aix_libpath"; then

26616

- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

26617

-fi

26618

+ lt_aix_libpath_sed='

26619

+ /Import File Strings/,/^$/ {

26620

+ /^0/ {

26621

+ s/^0 *$[^ ]*$ *$/\1/

26622

+ p

26623

+ }

26624

+ }'

26625

+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

26626

+ # Check for a 64-bit object if we didn't find anything.

26627

+ if test -z "$lt_cv_aix_libpath_"; then

26628

+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

26629

+ fi

26630

26631

rm -f core conftest.err conftest.$ac_objext \

26632

conftest$ac_exeext conftest.$ac_ext

26633

-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

26634

+ if test -z "$lt_cv_aix_libpath_"; then

26635

+ lt_cv_aix_libpath_="/usr/lib:/lib"

26636

+ fi

26637

26638

+fi

26639

26640

+ aix_libpath=$lt_cv_aix_libpath_

26641

+fi

32796

26642

32797

26643

hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"

32798

@@ -9478,11 +9232,7 @@ if test -z "$aix_libpath"; then aix_libp

26644

26645

26646

else

26647

if test "$host_cpu" = ia64; then

26648

hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'

26649

@@ -9226,7 +9274,13 @@ if test -z "$aix_libpath"; then aix_libp

32799

26650

else

32800

26651

# Determine the default libpath from the value encoded in an

32801

26652

# empty executable.

32802

- cat >conftest.$ac_ext <<_ACEOF

32803

-/* confdefs.h. */

32804

-_ACEOF

32805

-cat confdefs.h >>conftest.$ac_ext

32806

-cat >>conftest.$ac_ext <<_ACEOF

32807

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

26653

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

26654

+ if test "${lt_cv_aix_libpath+set}" = set; then

26655

+ aix_libpath=$lt_cv_aix_libpath

26656

+else

26657

+ if ${lt_cv_aix_libpath_+:} false; then :

26658

+ $as_echo_n "(cached) " >&6

26659

+else

26660

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

32808

26661

/* end confdefs.h. */

32809

26662

32810

26663

int

32811

@@ -9493,24 +9243,7 @@ main ()

32812

return 0;

32813

}

26664

@@ -9239,30 +9293,42 @@ main ()

32814

26665

_ACEOF

32815

-rm -f conftest.$ac_objext conftest$ac_exeext

32816

-if { (ac_try="$ac_link"

32817

-case "(($ac_try" in

32818

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

32819

- *) ac_try_echo=$ac_try;;

32820

-esac

32821

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

32822

- (eval "$ac_link") 2>conftest.er1

32823

- ac_status=$?

32824

- grep -v '^ *+' conftest.er1 >conftest.err

32825

- rm -f conftest.er1

32826

- cat conftest.err >&5

32827

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

32828

- (exit $ac_status); } && {

32829

- test -z "$ac_c_werror_flag" ||

32830

- test ! -s conftest.err

32831

- } && test -s conftest$ac_exeext &&

32832

- $as_test_x conftest$ac_exeext; then

32833

+if ac_fn_c_try_link "$LINENO"; then :

26666

if ac_fn_c_try_link "$LINENO"; then :

32834

26667

32835

lt_aix_libpath_sed='

32836

/Import File Strings/,/^$/ {

32837

@@ -9524,15 +9257,9 @@ aix_libpath=`dump -H conftest$ac_exeext

32838

if test -z "$aix_libpath"; then

32839

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

32840

32841

-else

32842

- echo "$as_me: failed program was:" >&5

32843

-sed 's/^/| /' conftest.$ac_ext >&5

32844

32845

32846

32847

32848

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

32849

- conftest$ac_exeext conftest.$ac_ext

32850

+rm -f core conftest.err conftest.$ac_objext \

32851

+ conftest$ac_exeext conftest.$ac_ext

32852

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

26668

-lt_aix_libpath_sed='

26669

- /Import File Strings/,/^$/ {

26670

- /^0/ {

26671

- s/^0 *$.*$$/\1/

26672

- p

26673

- }

26674

- }'

26675

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

26676

-# Check for a 64-bit object if we didn't find anything.

26677

-if test -z "$aix_libpath"; then

26678

- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

26679

-fi

26680

+ lt_aix_libpath_sed='

26681

+ /Import File Strings/,/^$/ {

26682

+ /^0/ {

26683

+ s/^0 *$[^ ]*$ *$/\1/

26684

+ p

26685

+ }

26686

+ }'

26687

+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

26688

+ # Check for a 64-bit object if we didn't find anything.

26689

+ if test -z "$lt_cv_aix_libpath_"; then

26690

+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

26691

+ fi

26692

26693

rm -f core conftest.err conftest.$ac_objext \

26694

conftest$ac_exeext conftest.$ac_ext

26695

-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

26696

+ if test -z "$lt_cv_aix_libpath_"; then

26697

+ lt_cv_aix_libpath_="/usr/lib:/lib"

26698

+ fi

26699

26700

+fi

26701

26702

+ aix_libpath=$lt_cv_aix_libpath_

26703

+fi

32853

26704

32854

26705

hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"

32855

@@ -9568,7 +9295,7 @@ if test -z "$aix_libpath"; then aix_libp

32856

export_dynamic_flag_spec=-rdynamic

32857

;;

32858

32859

- cygwin* | mingw* | pw32*)

32860

+ cygwin* | mingw* | pw32* | cegcc*)

32861

# When not using gcc, we currently assume that we are using

26706

# Warning - without using the other run time loading flags,

26707

# -berok will link without error, but may produce a broken library.

26708

no_undefined_flag=' ${wl}-bernotok'

26709

allow_undefined_flag=' ${wl}-berok'

26710

- # Exported symbols can be pulled into shared objects from archives

26711

- whole_archive_flag_spec='$convenience'

26712

+ if test "$with_gnu_ld" = yes; then

26713

+ # We only use this code for GNU lds that support --whole-archive.

26714

+ whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'

26715

+ else

26716

+ # Exported symbols can be pulled into shared objects from archives

26717

+ whole_archive_flag_spec='$convenience'

26718

+ fi

26719

archive_cmds_need_lc=yes

26720

# This is similar to how AIX traditionally builds its shared libraries.

26721

26722

@@ -9294,20 +9360,63 @@ if test -z "$aix_libpath"; then aix_libp

32862

26723

# Microsoft Visual C++.

32863

26724

# hardcode_libdir_flag_spec is actually meaningless, as there is

32864

@@ -9599,7 +9326,11 @@ if test -z "$aix_libpath"; then aix_libp

32865

whole_archive_flag_spec=''

26725

# no search path for DLLs.

26726

- hardcode_libdir_flag_spec=' '

26727

- allow_undefined_flag=unsupported

26728

- # Tell ltmain to make .lib files, not .a files.

26729

- libext=lib

26730

- # Tell ltmain to make .dll files, not .so files.

26731

- shrext_cmds=".dll"

26732

- # FIXME: Setting linknames here is a bad hack.

26733

- archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='

26734

- # The linker will automatically build a .lib file if we build a DLL.

26735

- old_archive_from_new_cmds='true'

26736

- # FIXME: Should let the user specify the lib program.

26737

- old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'

26738

- fix_srcfile_path='`cygpath -w "$srcfile"`'

26739

- enable_shared_with_static_runtimes=yes

26740

+ case $cc_basename in

26741

+ cl*)

26742

+ # Native MSVC

26743

+ hardcode_libdir_flag_spec=' '

26744

+ allow_undefined_flag=unsupported

26745

+ always_export_symbols=yes

26746

+ file_list_spec='@'

26747

+ # Tell ltmain to make .lib files, not .a files.

26748

+ libext=lib

26749

+ # Tell ltmain to make .dll files, not .so files.

26750

+ shrext_cmds=".dll"

26751

+ # FIXME: Setting linknames here is a bad hack.

26752

+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='

26753

+ archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

26754

+ sed -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;

26755

+ else

26756

+ sed -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;

26757

+ fi~

26758

+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~

26759

+ linknames='

26760

+ # The linker will not automatically build a static lib if we build a DLL.

26761

+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'

26762

+ enable_shared_with_static_runtimes=yes

26763

26764

+ # Don't use ranlib

26765

+ old_postinstall_cmds='chmod 644 $oldlib'

26766

+ postlink_cmds='lt_outputfile="@OUTPUT@"~

26767

+ lt_tool_outputfile="@TOOL_OUTPUT@"~

26768

+ case $lt_outputfile in

26769

+ *.exe|*.EXE) ;;

26770

+ *)

26771

+ lt_outputfile="$lt_outputfile.exe"

26772

+ lt_tool_outputfile="$lt_tool_outputfile.exe"

26773

+ ;;

26774

+ esac~

26775

+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then

26776

+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;

26777

+ $RM "$lt_outputfile.manifest";

26778

+ fi'

26779

+ ;;

26780

+ *)

26781

+ # Assume MSVC wrapper

26782

+ hardcode_libdir_flag_spec=' '

26783

+ allow_undefined_flag=unsupported

26784

+ # Tell ltmain to make .lib files, not .a files.

26785

+ libext=lib

26786

+ # Tell ltmain to make .dll files, not .so files.

26787

+ shrext_cmds=".dll"

26788

+ # FIXME: Setting linknames here is a bad hack.

26789

+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='

26790

+ # The linker will automatically build a .lib file if we build a DLL.

26791

+ old_archive_from_new_cmds='true'

26792

+ # FIXME: Should let the user specify the lib program.

26793

+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'

26794

+ enable_shared_with_static_runtimes=yes

26795

+ ;;

26796

+ esac

26797

;;

26798

26799

darwin* | rhapsody*)

26800

@@ -9317,7 +9426,11 @@ if test -z "$aix_libpath"; then aix_libp

26801

hardcode_direct=no

26802

hardcode_automatic=yes

26803

hardcode_shlibpath_var=unsupported

26804

- whole_archive_flag_spec=''

26805

+ if test "$lt_cv_ld_force_load" = "yes"; then

26806

+ 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\"`'

26807

+ else

26808

+ whole_archive_flag_spec=''

26809

+ fi

32866

26810

link_all_deplibs=yes

32867

26811

allow_undefined_flag="$_lt_dar_allow_undefined"

32868

- if test "$GCC" = "yes"; then

32869

+ case $cc_basename in

32870

+ ifort*) _lt_dar_can_shared=yes ;;

32871

+ *) _lt_dar_can_shared=$GCC ;;

32872

+ esac

32873

+ if test "$_lt_dar_can_shared" = "yes"; then

32874

output_verbose_link_cmd=echo

26812

case $cc_basename in

26813

@@ -9325,7 +9438,7 @@ if test -z "$aix_libpath"; then aix_libp

26814

*) _lt_dar_can_shared=$GCC ;;

26815

esac

26816

if test "$_lt_dar_can_shared" = "yes"; then

26817

- output_verbose_link_cmd=echo

26818

+ output_verbose_link_cmd=func_echo_all

32875

26819

archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"

32876

26820

module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

32877

@@ -9691,7 +9422,7 @@ if test -z "$aix_libpath"; then aix_libp

26821

26822

@@ -9368,7 +9481,7 @@ if test -z "$aix_libpath"; then aix_libp

26823

26824

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

26825

freebsd* | dragonfly*)

26826

- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

26827

+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

26828

hardcode_libdir_flag_spec='-R$libdir'

26829

hardcode_direct=yes

26830

hardcode_shlibpath_var=no

26831

@@ -9376,7 +9489,7 @@ if test -z "$aix_libpath"; then aix_libp

26832

26833

hpux9*)

26834

if test "$GCC" = yes; then

26835

26836

26837

else

26838

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'

26839

26840

@@ -9391,8 +9504,8 @@ if test -z "$aix_libpath"; then aix_libp

26841

;;

26842

26843

hpux10*)

26844

- if test "$GCC" = yes -a "$with_gnu_ld" = no; then

26845

- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

26846

+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then

26847

+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

26848

else

26849

archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

26850

26851

@@ -9410,16 +9523,16 @@ if test -z "$aix_libpath"; then aix_libp

26852

;;

26853

26854

hpux11*)

26855

- if test "$GCC" = yes -a "$with_gnu_ld" = no; then

26856

+ if test "$GCC" = yes && test "$with_gnu_ld" = no; then

26857

case $host_cpu in

26858

hppa*64*)

32878

26859

archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

32879

26860

;;

32880

26861

ia64*)

32881

- archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

32882

+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

32883

;;

32884

32885

archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

32886

@@ -9740,38 +9471,16 @@ if test -z "$aix_libpath"; then aix_libp

26862

- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

26863

+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

26864

;;

26865

26866

- archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

26867

+ archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

26868

;;

26869

esac

26870

else

26871

@@ -9431,7 +9544,46 @@ if test -z "$aix_libpath"; then aix_libp

26872

archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'

26873

;;

26874

26875

- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

26876

26877

+ # Older versions of the 11.00 compiler do not understand -b yet

26878

+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)

26879

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5

26880

+$as_echo_n "checking if $CC understands -b... " >&6; }

26881

+if ${lt_cv_prog_compiler__b+:} false; then :

26882

+ $as_echo_n "(cached) " >&6

26883

+else

26884

+ lt_cv_prog_compiler__b=no

26885

+ save_LDFLAGS="$LDFLAGS"

26886

+ LDFLAGS="$LDFLAGS -b"

26887

+ echo "$lt_simple_link_test_code" > conftest.$ac_ext

26888

+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

26889

+ # The linker can only warn and ignore the option if not recognized

26890

+ # So say no if there are warnings

26891

+ if test -s conftest.err; then

26892

+ # Append any errors to the config.log.

26893

+ cat conftest.err 1>&5

26894

+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp

26895

+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

26896

+ if diff conftest.exp conftest.er2 >/dev/null; then

26897

+ lt_cv_prog_compiler__b=yes

26898

+ fi

26899

+ else

26900

+ lt_cv_prog_compiler__b=yes

26901

+ fi

26902

+ fi

26903

+ $RM -r conftest*

26904

+ LDFLAGS="$save_LDFLAGS"

26905

26906

+fi

26907

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5

26908

+$as_echo "$lt_cv_prog_compiler__b" >&6; }

26909

26910

+if test x"$lt_cv_prog_compiler__b" = xyes; then

26911

+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'

26912

+else

26913

+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'

26914

+fi

26915

26916

;;

26917

esac

26918

26919

@@ -9459,26 +9611,39 @@ if test -z "$aix_libpath"; then aix_libp

26920

26921

irix5* | irix6* | nonstopux*)

26922

if test "$GCC" = yes; then

26923

26924

26925

# Try to use the -exported_symbol ld option, if it does not

26926

# work, assume that -exports_file does not work either and

32887

26927

# implicitly export all symbols.

32888

save_LDFLAGS="$LDFLAGS"

32889

LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

32890

- cat >conftest.$ac_ext <<_ACEOF

32891

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

32892

+/* end confdefs.h. */

32893

int foo(void) {}

26928

- save_LDFLAGS="$LDFLAGS"

26929

- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

26930

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

26931

+ # This should be the same for all languages, so no per-tag cache variable.

26932

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5

26933

+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }

26934

+if ${lt_cv_irix_exported_symbol+:} false; then :

26935

+ $as_echo_n "(cached) " >&6

26936

+else

26937

+ save_LDFLAGS="$LDFLAGS"

26938

+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

26939

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

26940

/* end confdefs.h. */

26941

-int foo(void) {}

26942

+int foo (void) { return 0; }

32894

26943

_ACEOF

32895

-rm -f conftest.$ac_objext conftest$ac_exeext

32896

-if { (ac_try="$ac_link"

32897

-case "(($ac_try" in

32898

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

32899

- *) ac_try_echo=$ac_try;;

32900

-esac

32901

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

32902

- (eval "$ac_link") 2>conftest.er1

32903

- ac_status=$?

32904

- grep -v '^ *+' conftest.er1 >conftest.err

32905

- rm -f conftest.er1

32906

- cat conftest.err >&5

32907

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

32908

- (exit $ac_status); } && {

32909

- test -z "$ac_c_werror_flag" ||

32910

- test ! -s conftest.err

32911

- } && test -s conftest$ac_exeext &&

32912

- $as_test_x conftest$ac_exeext; then

32913

+if ac_fn_c_try_link "$LINENO"; then :

32914

32915

32916

-else

32917

- echo "$as_me: failed program was:" >&5

32918

-sed 's/^/| /' conftest.$ac_ext >&5

32919

32920

26944

if ac_fn_c_try_link "$LINENO"; then :

26945

26946

26947

+ lt_cv_irix_exported_symbol=yes

26948

+else

26949

+ lt_cv_irix_exported_symbol=no

32921

26950

32922

32923

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

32924

- conftest$ac_exeext conftest.$ac_ext

32925

+rm -f core conftest.err conftest.$ac_objext \

32926

+ conftest$ac_exeext conftest.$ac_ext

32927

LDFLAGS="$save_LDFLAGS"

26951

rm -f core conftest.err conftest.$ac_objext \

26952

conftest$ac_exeext conftest.$ac_ext

26953

- LDFLAGS="$save_LDFLAGS"

26954

+ LDFLAGS="$save_LDFLAGS"

26955

+fi

26956

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5

26957

+$as_echo "$lt_cv_irix_exported_symbol" >&6; }

26958

+ if test "$lt_cv_irix_exported_symbol" = yes; then

26959

26960

+ fi

32928

26961

else

32929

archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

32930

@@ -9784,7 +9493,7 @@ rm -f core conftest.err conftest.$ac_obj

32931

link_all_deplibs=yes

26962

26963

26964

+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'

26965

26966

26967

archive_cmds_need_lc='no'

26968

hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

26969

@@ -9540,17 +9705,17 @@ rm -f core conftest.err conftest.$ac_obj

26970

hardcode_libdir_flag_spec='-L$libdir'

26971

hardcode_minus_L=yes

26972

allow_undefined_flag=unsupported

26973

26974

26975

old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'

32932

26976

;;

32933

26977

32934

- netbsd*)

32935

+ netbsd* | netbsdelf*-gnu)

32936

if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

32937

archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

32938

else

32939

@@ -10027,8 +9736,8 @@ rm -f core conftest.err conftest.$ac_obj

32940

32941

32942

32943

-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5

32944

-echo "${ECHO_T}$ld_shlibs" >&6; }

32945

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5

32946

+$as_echo "$ld_shlibs" >&6; }

32947

test "$ld_shlibs" = no && can_build_shared=no

32948

32949

with_gnu_ld=$with_gnu_ld

32950

@@ -10064,16 +9773,16 @@ x|xyes)

32951

# Test whether the compiler implicitly links with -lc since on some

32952

# systems, -lgcc has to come before -lc. If gcc already passes -lc

26978

osf3*)

26979

if test "$GCC" = yes; then

26980

allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'

26981

26982

26983

else

26984

allow_undefined_flag=' -expect_unresolved \*'

26985

26986

26987

26988

archive_cmds_need_lc='no'

26989

hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

26990

@@ -9560,13 +9725,13 @@ rm -f core conftest.err conftest.$ac_obj

26991

osf4* | osf5*) # as osf3* with the addition of -msym flag

26992

if test "$GCC" = yes; then

26993

allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'

26994

26995

26996

hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'

26997

else

26998

allow_undefined_flag=' -expect_unresolved \*'

26999

27000

27001

archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~

27002

27003

27004

27005

# Both c and cxx compiler support -rpath directly

27006

hardcode_libdir_flag_spec='-rpath $libdir'

27007

@@ -9579,9 +9744,9 @@ rm -f core conftest.err conftest.$ac_obj

27008

no_undefined_flag=' -z defs'

27009

if test "$GCC" = yes; then

27010

wlarc='${wl}'

27011

- archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

27012

+ archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'

27013

archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

27014

- $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'

27015

+ $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'

27016

else

27017

case `$CC -V 2>&1` in

27018

*"Compilers 5.0"*)

27019

@@ -9769,44 +9934,50 @@ x|xyes)

32953

27020

# to ld, don't add -lc before -lgcc.

32954

- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

32955

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

32956

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5

32957

+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

32958

$RM conftest*

32959

echo "$lt_simple_compile_test_code" > conftest.$ac_ext

27021

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5

27022

$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

27023

- $RM conftest*

27024

- echo "$lt_simple_compile_test_code" > conftest.$ac_ext

27025

+if ${lt_cv_archive_cmds_need_lc+:} false; then :

27026

+ $as_echo_n "(cached) " >&6

27027

+else

27028

+ $RM conftest*

27029

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

32960

27030

32961

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

32962

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

27031

- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

27032

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

32963

27033

(eval $ac_compile) 2>&5

32964

27034

ac_status=$?

32965

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

32966

- (exit $ac_status); } 2>conftest.err; then

32967

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

32968

+ test $ac_status = 0; } 2>conftest.err; then

32969

soname=conftest

32970

lib=conftest

32971

libobjs=conftest.$ac_objext

32972

@@ -10087,11 +9796,11 @@ echo $ECHO_N "checking whether -lc shoul

32973

libname=conftest

32974

lt_save_allow_undefined_flag=$allow_undefined_flag

32975

allow_undefined_flag=

32976

- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5

32977

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

27035

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

27036

test $ac_status = 0; } 2>conftest.err; then

27037

- soname=conftest

27038

- lib=conftest

27039

- libobjs=conftest.$ac_objext

27040

- deplibs=

27041

- wl=$lt_prog_compiler_wl

27042

- pic_flag=$lt_prog_compiler_pic

27043

- compiler_flags=-v

27044

- linker_flags=-v

27045

- verstring=

27046

- output_objdir=.

27047

- libname=conftest

27048

- lt_save_allow_undefined_flag=$allow_undefined_flag

27049

- allow_undefined_flag=

27050

- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

27051

+ soname=conftest

27052

+ lib=conftest

27053

+ libobjs=conftest.$ac_objext

27054

+ deplibs=

27055

+ wl=$lt_prog_compiler_wl

27056

+ pic_flag=$lt_prog_compiler_pic

27057

+ compiler_flags=-v

27058

+ linker_flags=-v

27059

+ verstring=

27060

+ output_objdir=.

27061

+ libname=conftest

27062

+ lt_save_allow_undefined_flag=$allow_undefined_flag

27063

+ allow_undefined_flag=

27064

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

32978

27065

(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5

32979

27066

ac_status=$?

32980

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

32981

- (exit $ac_status); }

32982

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

32983

+ test $ac_status = 0; }

32984

then

32985

archive_cmds_need_lc=no

32986

else

32987

@@ -10102,8 +9811,8 @@ echo $ECHO_N "checking whether -lc shoul

32988

cat conftest.err 1>&5

32989

32990

$RM conftest*

32991

- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5

32992

-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }

32993

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5

32994

+$as_echo "$archive_cmds_need_lc" >&6; }

27067

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

27068

test $ac_status = 0; }

27069

- then

27070

- archive_cmds_need_lc=no

27071

- else

27072

- archive_cmds_need_lc=yes

27073

- fi

27074

- allow_undefined_flag=$lt_save_allow_undefined_flag

27075

- else

27076

- cat conftest.err 1>&5

27077

- fi

27078

- $RM conftest*

27079

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5

27080

-$as_echo "$archive_cmds_need_lc" >&6; }

27081

+ then

27082

+ lt_cv_archive_cmds_need_lc=no

27083

+ else

27084

+ lt_cv_archive_cmds_need_lc=yes

27085

+ fi

27086

+ allow_undefined_flag=$lt_save_allow_undefined_flag

27087

+ else

27088

+ cat conftest.err 1>&5

27089

+ fi

27090

+ $RM conftest*

27091

27092

+fi

27093

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5

27094

+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }

27095

+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc

32995

27096

;;

32996

27097

esac

32997

27098

32998

@@ -10266,8 +9975,8 @@ esac

32999

33000

33001

33002

- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

33003

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

33004

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5

33005

+$as_echo_n "checking dynamic linker characteristics... " >&6; }

33006

33007

if test "$GCC" = yes; then

33008

case $host_os in

33009

@@ -10429,14 +10138,14 @@ bsdi[45]*)

33010

# libtool to hard-code these into programs

27099

@@ -9977,16 +10148,23 @@ if test "$GCC" = yes; then

27100

darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;

27101

*) lt_awk_arg="/^libraries:/" ;;

27102

esac

27103

- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`

27104

- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then

27105

+ case $host_os in

27106

+ mingw* | cegcc*) lt_sed_strip_eq="s,=$[A-Za-z]:$,\1,g" ;;

27107

+ *) lt_sed_strip_eq="s,=/,/,g" ;;

27108

+ esac

27109

+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`

27110

+ case $lt_search_path_spec in

27111

+ *\;*)

27112

# if the path contains ";" then we assume it to be the separator

27113

# otherwise default to the standard path separator (i.e. ":") - it is

27114

# assumed that no part of a normal pathname contains ";" but that should

27115

# okay in the real world where ";" in dirpaths is itself problematic.

27116

- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`

27117

- else

27118

- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

27119

- fi

27120

+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`

27121

+ ;;

27122

+ *)

27123

+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`

27124

+ ;;

27125

+ esac

27126

# Ok, now we have the path, separated by spaces, we can step through it

27127

# and add multilib dir if necessary.

27128

lt_tmp_lt_search_path_spec=

27129

@@ -9999,7 +10177,7 @@ if test "$GCC" = yes; then

27130

lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

27131

27132

done

27133

- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '

27134

+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '

27135

BEGIN {RS=" "; FS="/|\n";} {

27136

lt_foo="";

27137

lt_count=0;

27138

@@ -10019,7 +10197,13 @@ BEGIN {RS=" "; FS="/|\n";} {

27139

if (lt_foo != "") { lt_freq[lt_foo]++; }

27140

if (lt_freq[lt_foo] == 1) { print lt_foo; }

27141

}'`

27142

- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`

27143

+ # AWK program above erroneously prepends '/' to C:/dos/paths

27144

+ # for these hosts.

27145

+ case $host_os in

27146

+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\

27147

+ $SED 's,/$[A-Za-z]:$,\1,g'` ;;

27148

+ esac

27149

+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`

27150

else

27151

sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

27152

27153

@@ -10107,7 +10291,7 @@ amigaos*)

27154

m68k)

27155

library_names_spec='$libname.ixlibrary $libname.a'

27156

# Create ${libname}_ixlibrary.a entries in /sys/libs.

27157

27158

27159

;;

27160

esac

33011

27161

;;

33012

33013

-cygwin* | mingw* | pw32*)

33014

+cygwin* | mingw* | pw32* | cegcc*)

33015

version_type=windows

33016

shrext_cmds=".dll"

27162

@@ -10138,8 +10322,9 @@ cygwin* | mingw* | pw32* | cegcc*)

33017

27163

need_version=no

33018

27164

need_lib_prefix=no

33019

27165

33020

case $GCC,$host_os in

33021

- yes,cygwin* | yes,mingw* | yes,pw32*)

33022

+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

27166

- case $GCC,$host_os in

27167

- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

27168

+ case $GCC,$cc_basename in

27169

+ yes,*)

27170

+ # gcc

33023

27171

library_names_spec='$libname.dll.a'

33024

27172

# DLL is installed to $(libdir)/../bin by postinstall_cmds

33025

27173

postinstall_cmds='base_file=`basename \${file}`~

33026

@@ -10459,7 +10168,7 @@ cygwin* | mingw* | pw32*)

27174

@@ -10160,36 +10345,83 @@ cygwin* | mingw* | pw32* | cegcc*)

27175

cygwin*)

27176

# Cygwin DLLs use 'cyg' prefix rather than 'lib'

33027

27177

soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

33028

sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

27178

- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

27179

27180

+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"

33029

27181

;;

33030

- mingw*)

33031

+ mingw* | cegcc*)

27182

mingw* | cegcc*)

33032

27183

# MinGW DLLs use traditional 'lib' prefix

33033

27184

soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

33034

sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

33035

@@ -10674,7 +10383,7 @@ linux*oldld* | linux*aout* | linux*coff*

33036

;;

33037

33038

# This must be Linux ELF.

33039

-linux* | k*bsd*-gnu)

33040

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

33041

version_type=linux

33042

need_lib_prefix=no

33043

need_version=no

33044

@@ -10688,11 +10397,7 @@ linux* | k*bsd*-gnu)

33045

save_libdir=$libdir

33046

eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \

33047

LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""

33048

- cat >conftest.$ac_ext <<_ACEOF

33049

-/* confdefs.h. */

33050

-_ACEOF

33051

-cat confdefs.h >>conftest.$ac_ext

33052

-cat >>conftest.$ac_ext <<_ACEOF

33053

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

33054

/* end confdefs.h. */

33055

33056

int

33057

@@ -10703,37 +10408,13 @@ main ()

33058

return 0;

33059

}

33060

_ACEOF

33061

-rm -f conftest.$ac_objext conftest$ac_exeext

33062

-if { (ac_try="$ac_link"

33063

-case "(($ac_try" in

33064

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

33065

- *) ac_try_echo=$ac_try;;

33066

-esac

33067

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

33068

- (eval "$ac_link") 2>conftest.er1

33069

- ac_status=$?

33070

- grep -v '^ *+' conftest.er1 >conftest.err

33071

- rm -f conftest.er1

33072

- cat conftest.err >&5

33073

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

33074

- (exit $ac_status); } && {

33075

- test -z "$ac_c_werror_flag" ||

33076

- test ! -s conftest.err

33077

- } && test -s conftest$ac_exeext &&

33078

- $as_test_x conftest$ac_exeext; then

33079

- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then

33080

+if ac_fn_c_try_link "$LINENO"; then :

33081

+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :

33082

shlibpath_overrides_runpath=yes

33083

33084

33085

-else

33086

- echo "$as_me: failed program was:" >&5

33087

-sed 's/^/| /' conftest.$ac_ext >&5

33088

33089

33090

33091

33092

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

33093

- conftest$ac_exeext conftest.$ac_ext

33094

+rm -f core conftest.err conftest.$ac_objext \

33095

+ conftest$ac_exeext conftest.$ac_ext

33096

LDFLAGS=$save_LDFLAGS

33097

libdir=$save_libdir

33098

33099

@@ -10757,6 +10438,18 @@ rm -f core conftest.err conftest.$ac_obj

33100

dynamic_linker='GNU/Linux ld.so'

33101

;;

33102

33103

+netbsdelf*-gnu)

27185

- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

27186

- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then

27187

- # It is most probably a Windows format PATH printed by

27188

- # mingw gcc, but we are running on Cygwin. Gcc prints its search

27189

- # path with ; separators, and with drive letters. We can handle the

27190

- # drive letters (cygwin fileutils understands them), so leave them,

27191

- # especially as we might pass files found there to a mingw objdump,

27192

- # which wouldn't understand a cygwinified path. Ahh.

27193

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

27194

- else

27195

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

27196

- fi

27197

;;

27198

pw32*)

27199

# pw32 DLLs use 'pw' prefix rather than 'lib'

27200

library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

27201

;;

27202

esac

27203

+ dynamic_linker='Win32 ld.exe'

27204

+ ;;

27205

27206

+ *,cl*)

27207

+ # Native MSVC

27208

+ libname_spec='$name'

27209

+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

27210

+ library_names_spec='${libname}.dll.lib'

27211

27212

+ case $build_os in

27213

+ mingw*)

27214

+ sys_lib_search_path_spec=

27215

+ lt_save_ifs=$IFS

27216

+ IFS=';'

27217

+ for lt_path in $LIB

27218

+ do

27219

+ IFS=$lt_save_ifs

27220

+ # Let DOS variable expansion print the short 8.3 style file name.

27221

+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`

27222

+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"

27223

+ done

27224

+ IFS=$lt_save_ifs

27225

+ # Convert to MSYS style.

27226

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[a-zA-Z]\$:| /\\1|g' -e 's|^ ||'`

27227

+ ;;

27228

+ cygwin*)

27229

+ # Convert to unix form, then to dos form, then back to unix form

27230

+ # but this time dos style (no spaces!) so that the unix form looks

27231

+ # like /cygdrive/c/PROGRA~1:/cygdr...

27232

+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`

27233

+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`

27234

+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

27235

+ ;;

27236

+ *)

27237

+ sys_lib_search_path_spec="$LIB"

27238

+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then

27239

+ # It is most probably a Windows format PATH.

27240

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

27241

+ else

27242

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

27243

+ fi

27244

+ # FIXME: find the short name or the path components, as spaces are

27245

+ # common. (e.g. "Program Files" -> "PROGRA~1")

27246

+ ;;

27247

+ esac

27248

27249

+ # DLL is installed to $(libdir)/../bin by postinstall_cmds

27250

+ postinstall_cmds='base_file=`basename \${file}`~

27251

+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~

27252

+ dldir=$destdir/`dirname \$dlpath`~

27253

+ test -d \$dldir || mkdir -p \$dldir~

27254

+ $install_prog $dir/$dlname \$dldir/$dlname'

27255

+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~

27256

+ dlpath=$dir/\$dldll~

27257

+ $RM \$dlpath'

27258

+ shlibpath_overrides_runpath=yes

27259

+ dynamic_linker='Win32 link.exe'

27260

;;

27261

27262

27263

+ # Assume MSVC wrapper

27264

library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'

27265

+ dynamic_linker='Win32 ld.exe'

27266

;;

27267

esac

27268

- dynamic_linker='Win32 ld.exe'

27269

# FIXME: first we should search . and the directory the executable is in

27270

shlibpath_var=PATH

27271

;;

27272

@@ -10273,6 +10505,20 @@ gnu*)

27273

library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

27274

soname_spec='${libname}${release}${shared_ext}$major'

27275

shlibpath_var=LD_LIBRARY_PATH

27276

+ shlibpath_overrides_runpath=no

27277

+ hardcode_into_libs=yes

27278

+ ;;

27279

27280

+haiku*)

33104

27281

+ version_type=linux

33105

27282

+ need_lib_prefix=no

33106

27283

+ need_version=no

33107

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

27284

+ dynamic_linker="$host_os runtime_loader"

27285

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

33108

27286

+ soname_spec='${libname}${release}${shared_ext}$major'

33109

+ shlibpath_var=LD_LIBRARY_PATH

33110

+ shlibpath_overrides_runpath=no

33111

+ hardcode_into_libs=yes

33112

+ dynamic_linker='NetBSD ld.elf_so'

33113

+ ;;

33114

33115

netbsd*)

33116

version_type=sunos

33117

need_lib_prefix=no

33118

@@ -10928,7 +10621,7 @@ tpf*)

33119

version_type=linux

33120

need_lib_prefix=no

33121

need_version=no

33122

- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

33123

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

27287

+ shlibpath_var=LIBRARY_PATH

27288

+ shlibpath_overrides_runpath=yes

27289

+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

27290

hardcode_into_libs=yes

27291

;;

27292

27293

@@ -10318,8 +10564,10 @@ hpux9* | hpux10* | hpux11*)

27294

soname_spec='${libname}${release}${shared_ext}$major'

27295

;;

27296

esac

27297

- # HP-UX runs *really* slowly unless shared libraries are mode 555.

27298

+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...

27299

postinstall_cmds='chmod 555 $lib'

27300

+ # or fails outright, so override atomically:

27301

+ install_override_mode=555

27302

;;

27303

27304

interix[3-9]*)

27305

@@ -10386,12 +10634,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)

27306

finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'

33124

27307

shlibpath_var=LD_LIBRARY_PATH

33125

27308

shlibpath_overrides_runpath=no

33126

hardcode_into_libs=yes

33127

@@ -10945,8 +10638,8 @@ uts4*)

33128

dynamic_linker=no

33129

;;

33130

esac

33131

-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

33132

-echo "${ECHO_T}$dynamic_linker" >&6; }

33133

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5

33134

+$as_echo "$dynamic_linker" >&6; }

33135

test "$dynamic_linker" = no && can_build_shared=no

33136

33137

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

33138

@@ -11047,8 +10740,8 @@ fi

33139

33140

33141

33142

- { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

33143

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

33144

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5

33145

+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

27309

27310

# Some binutils ld are patched to set DT_RUNPATH

27311

- save_LDFLAGS=$LDFLAGS

27312

- save_libdir=$libdir

27313

- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \

27314

- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""

27315

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27316

+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :

27317

+ $as_echo_n "(cached) " >&6

27318

+else

27319

+ lt_cv_shlibpath_overrides_runpath=no

27320

+ save_LDFLAGS=$LDFLAGS

27321

+ save_libdir=$libdir

27322

+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \

27323

+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""

27324

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27325

/* end confdefs.h. */

27326

27327

int

27328

@@ -10404,13 +10657,17 @@ main ()

27329

_ACEOF

27330

if ac_fn_c_try_link "$LINENO"; then :

27331

if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :

27332

- shlibpath_overrides_runpath=yes

27333

+ lt_cv_shlibpath_overrides_runpath=yes

27334

27335

27336

rm -f core conftest.err conftest.$ac_objext \

27337

conftest$ac_exeext conftest.$ac_ext

27338

- LDFLAGS=$save_LDFLAGS

27339

- libdir=$save_libdir

27340

+ LDFLAGS=$save_LDFLAGS

27341

+ libdir=$save_libdir

27342

27343

+fi

27344

27345

+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath

27346

27347

# This implies no fast_install, which is unacceptable.

27348

# Some rework will be needed to allow for fast_install

27349

@@ -10419,7 +10676,7 @@ rm -f core conftest.err conftest.$ac_obj

27350

27351

# Append ld.so.conf contents to the search path

27352

if test -f /etc/ld.so.conf; then

27353

27354

27355

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

27356

27357

27358

@@ -10734,6 +10991,11 @@ fi

27359

27360

27361

27362

27363

27364

27365

27366

27367

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5

27368

$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

33146

27369

hardcode_action=

33147

if test -n "$hardcode_libdir_flag_spec" ||

33148

test -n "$runpath_var" ||

33149

@@ -11072,8 +10765,8 @@ else

33150

# directories.

33151

hardcode_action=unsupported

33152

33153

-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5

33154

-echo "${ECHO_T}$hardcode_action" >&6; }

33155

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5

33156

+$as_echo "$hardcode_action" >&6; }

33157

33158

if test "$hardcode_action" = relink ||

33159

test "$inherit_rpath" = yes; then

33160

@@ -11105,7 +10798,7 @@ else

33161

lt_cv_dlopen_self=yes

33162

;;

33163

33164

- mingw* | pw32*)

33165

+ mingw* | pw32* | cegcc*)

33166

lt_cv_dlopen="LoadLibrary"

33167

lt_cv_dlopen_libs=

33168

;;

33169

@@ -11117,18 +10810,14 @@ else

33170

33171

darwin*)

27370

@@ -10806,7 +11068,7 @@ else

33172

27371

# if libdl is installed we need to link against it

33173

- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

33174

-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

33175

-if test "${ac_cv_lib_dl_dlopen+set}" = set; then

33176

- echo $ECHO_N "(cached) $ECHO_C" >&6

33177

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5

33178

+$as_echo_n "checking for dlopen in -ldl... " >&6; }

33179

+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :

33180

+ $as_echo_n "(cached) " >&6

27372

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5

27373

$as_echo_n "checking for dlopen in -ldl... " >&6; }

27374

-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :

27375

+if ${ac_cv_lib_dl_dlopen+:} false; then :

27376

$as_echo_n "(cached) " >&6

33181

27377

else

33182

27378

ac_check_lib_save_LIBS=$LIBS

33183

LIBS="-ldl $LIBS"

33184

-cat >conftest.$ac_ext <<_ACEOF

33185

-/* confdefs.h. */

33186

-_ACEOF

33187

-cat confdefs.h >>conftest.$ac_ext

33188

-cat >>conftest.$ac_ext <<_ACEOF

33189

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

33190

/* end confdefs.h. */

33191

33192

/* Override any GCC internal prototype to avoid an error.

33193

@@ -11146,39 +10835,18 @@ return dlopen ();

33194

return 0;

33195

}

33196

_ACEOF

33197

-rm -f conftest.$ac_objext conftest$ac_exeext

33198

-if { (ac_try="$ac_link"

33199

-case "(($ac_try" in

33200

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

33201

- *) ac_try_echo=$ac_try;;

33202

-esac

33203

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

33204

- (eval "$ac_link") 2>conftest.er1

33205

- ac_status=$?

33206

- grep -v '^ *+' conftest.er1 >conftest.err

33207

- rm -f conftest.er1

33208

- cat conftest.err >&5

33209

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

33210

- (exit $ac_status); } && {

33211

- test -z "$ac_c_werror_flag" ||

33212

- test ! -s conftest.err

33213

- } && test -s conftest$ac_exeext &&

33214

- $as_test_x conftest$ac_exeext; then

33215

+if ac_fn_c_try_link "$LINENO"; then :

33216

ac_cv_lib_dl_dlopen=yes

33217

else

33218

- echo "$as_me: failed program was:" >&5

33219

-sed 's/^/| /' conftest.$ac_ext >&5

33220

33221

- ac_cv_lib_dl_dlopen=no

33222

+ ac_cv_lib_dl_dlopen=no

33223

33224

33225

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

33226

- conftest$ac_exeext conftest.$ac_ext

33227

+rm -f core conftest.err conftest.$ac_objext \

33228

+ conftest$ac_exeext conftest.$ac_ext

33229

LIBS=$ac_check_lib_save_LIBS

33230

33231

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

33232

-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

33233

-if test $ac_cv_lib_dl_dlopen = yes; then

33234

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5

33235

+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

33236

+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :

27379

@@ -10840,7 +11102,7 @@ LIBS=$ac_check_lib_save_LIBS

27380

27381

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5

27382

$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

27383

-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :

27384

+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :

33237

27385

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

33238

27386

else

33239

27387

33240

@@ -11191,102 +10859,18 @@ fi

33241

;;

27388

@@ -10854,12 +11116,12 @@ fi

33242

27389

33243

27390

33244

- { echo "$as_me:$LINENO: checking for shl_load" >&5

33245

-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }

33246

-if test "${ac_cv_func_shl_load+set}" = set; then

33247

- echo $ECHO_N "(cached) $ECHO_C" >&6

33248

-else

33249

- cat >conftest.$ac_ext <<_ACEOF

33250

-/* confdefs.h. */

33251

-_ACEOF

33252

-cat confdefs.h >>conftest.$ac_ext

33253

-cat >>conftest.$ac_ext <<_ACEOF

33254

-/* end confdefs.h. */

33255

-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.

33256

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

33257

-#define shl_load innocuous_shl_load

33258

33259

-/* System header to define __stub macros and hopefully few prototypes,

33260

- which can conflict with char shl_load (); below.

33261

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

33262

- <limits.h> exists even on freestanding compilers. */

33263

33264

-#ifdef __STDC__

33265

-# include <limits.h>

33266

-#else

33267

-# include <assert.h>

33268

-#endif

33269

33270

-#undef shl_load

33271

33272

-/* Override any GCC internal prototype to avoid an error.

33273

- Use char because int might match the return type of a GCC

33274

- builtin and then its argument prototype would still apply. */

33275

-#ifdef __cplusplus

33276

-extern "C"

33277

-#endif

33278

-char shl_load ();

33279

-/* The GNU C library defines this for functions which it implements

33280

- to always fail with ENOSYS. Some functions are actually named

33281

- something starting with __ and the normal name is an alias. */

33282

-#if defined __stub_shl_load || defined __stub___shl_load

33283

-choke me

33284

-#endif

33285

33286

-int

33287

-main ()

33288

33289

-return shl_load ();

33290

- ;

33291

- return 0;

33292

33293

-_ACEOF

33294

-rm -f conftest.$ac_objext conftest$ac_exeext

33295

-if { (ac_try="$ac_link"

33296

-case "(($ac_try" in

33297

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

33298

- *) ac_try_echo=$ac_try;;

33299

-esac

33300

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

33301

- (eval "$ac_link") 2>conftest.er1

33302

- ac_status=$?

33303

- grep -v '^ *+' conftest.er1 >conftest.err

33304

- rm -f conftest.er1

33305

- cat conftest.err >&5

33306

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

33307

- (exit $ac_status); } && {

33308

- test -z "$ac_c_werror_flag" ||

33309

- test ! -s conftest.err

33310

- } && test -s conftest$ac_exeext &&

33311

- $as_test_x conftest$ac_exeext; then

33312

- ac_cv_func_shl_load=yes

33313

-else

33314

- echo "$as_me: failed program was:" >&5

33315

-sed 's/^/| /' conftest.$ac_ext >&5

33316

33317

- ac_cv_func_shl_load=no

33318

-fi

33319

33320

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

33321

- conftest$ac_exeext conftest.$ac_ext

33322

-fi

33323

-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

33324

-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }

33325

-if test $ac_cv_func_shl_load = yes; then

33326

+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"

33327

+if test "x$ac_cv_func_shl_load" = x""yes; then :

27391

ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"

27392

-if test "x$ac_cv_func_shl_load" = x""yes; then :

27393

+if test "x$ac_cv_func_shl_load" = xyes; then :

33328

27394

lt_cv_dlopen="shl_load"

33329

27395

else

33330

- { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

33331

-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }

33332

-if test "${ac_cv_lib_dld_shl_load+set}" = set; then

33333

- echo $ECHO_N "(cached) $ECHO_C" >&6

33334

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5

33335

+$as_echo_n "checking for shl_load in -ldld... " >&6; }

33336

+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :

33337

+ $as_echo_n "(cached) " >&6

27396

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5

27397

$as_echo_n "checking for shl_load in -ldld... " >&6; }

27398

-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :

27399

+if ${ac_cv_lib_dld_shl_load+:} false; then :

27400

$as_echo_n "(cached) " >&6

33338

27401

else

33339

27402

ac_check_lib_save_LIBS=$LIBS

33340

LIBS="-ldld $LIBS"

33341

-cat >conftest.$ac_ext <<_ACEOF

33342

-/* confdefs.h. */

33343

-_ACEOF

33344

-cat confdefs.h >>conftest.$ac_ext

33345

-cat >>conftest.$ac_ext <<_ACEOF

33346

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

33347

/* end confdefs.h. */

33348

33349

/* Override any GCC internal prototype to avoid an error.

33350

@@ -11304,137 +10888,32 @@ return shl_load ();

33351

return 0;

33352

}

33353

_ACEOF

33354

-rm -f conftest.$ac_objext conftest$ac_exeext

33355

-if { (ac_try="$ac_link"

33356

-case "(($ac_try" in

33357

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

33358

- *) ac_try_echo=$ac_try;;

33359

-esac

33360

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

33361

- (eval "$ac_link") 2>conftest.er1

33362

- ac_status=$?

33363

- grep -v '^ *+' conftest.er1 >conftest.err

33364

- rm -f conftest.er1

33365

- cat conftest.err >&5

33366

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

33367

- (exit $ac_status); } && {

33368

- test -z "$ac_c_werror_flag" ||

33369

- test ! -s conftest.err

33370

- } && test -s conftest$ac_exeext &&

33371

- $as_test_x conftest$ac_exeext; then

33372

+if ac_fn_c_try_link "$LINENO"; then :

33373

ac_cv_lib_dld_shl_load=yes

33374

else

33375

- echo "$as_me: failed program was:" >&5

33376

-sed 's/^/| /' conftest.$ac_ext >&5

33377

33378

- ac_cv_lib_dld_shl_load=no

33379

+ ac_cv_lib_dld_shl_load=no

33380

33381

33382

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

33383

- conftest$ac_exeext conftest.$ac_ext

33384

+rm -f core conftest.err conftest.$ac_objext \

33385

+ conftest$ac_exeext conftest.$ac_ext

33386

LIBS=$ac_check_lib_save_LIBS

33387

33388

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5

33389

-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }

33390

-if test $ac_cv_lib_dld_shl_load = yes; then

33391

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5

33392

+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }

33393

+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :

27403

@@ -10893,16 +11155,16 @@ LIBS=$ac_check_lib_save_LIBS

27404

27405

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5

27406

$as_echo "$ac_cv_lib_dld_shl_load" >&6; }

27407

-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :

27408

+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :

33394

27409

lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"

33395

27410

else

33396

- { echo "$as_me:$LINENO: checking for dlopen" >&5

33397

-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }

33398

-if test "${ac_cv_func_dlopen+set}" = set; then

33399

- echo $ECHO_N "(cached) $ECHO_C" >&6

33400

-else

33401

- cat >conftest.$ac_ext <<_ACEOF

33402

-/* confdefs.h. */

33403

-_ACEOF

33404

-cat confdefs.h >>conftest.$ac_ext

33405

-cat >>conftest.$ac_ext <<_ACEOF

33406

-/* end confdefs.h. */

33407

-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.

33408

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

33409

-#define dlopen innocuous_dlopen

33410

33411

-/* System header to define __stub macros and hopefully few prototypes,

33412

- which can conflict with char dlopen (); below.

33413

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

33414

- <limits.h> exists even on freestanding compilers. */

33415

33416

-#ifdef __STDC__

33417

-# include <limits.h>

33418

-#else

33419

-# include <assert.h>

33420

-#endif

33421

33422

-#undef dlopen

33423

33424

-/* Override any GCC internal prototype to avoid an error.

33425

- Use char because int might match the return type of a GCC

33426

- builtin and then its argument prototype would still apply. */

33427

-#ifdef __cplusplus

33428

-extern "C"

33429

-#endif

33430

-char dlopen ();

33431

-/* The GNU C library defines this for functions which it implements

33432

- to always fail with ENOSYS. Some functions are actually named

33433

- something starting with __ and the normal name is an alias. */

33434

-#if defined __stub_dlopen || defined __stub___dlopen

33435

-choke me

33436

-#endif

33437

33438

-int

33439

-main ()

33440

33441

-return dlopen ();

33442

- ;

33443

- return 0;

33444

33445

-_ACEOF

33446

-rm -f conftest.$ac_objext conftest$ac_exeext

33447

-if { (ac_try="$ac_link"

33448

-case "(($ac_try" in

33449

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

33450

- *) ac_try_echo=$ac_try;;

33451

-esac

33452

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

33453

- (eval "$ac_link") 2>conftest.er1

33454

- ac_status=$?

33455

- grep -v '^ *+' conftest.er1 >conftest.err

33456

- rm -f conftest.er1

33457

- cat conftest.err >&5

33458

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

33459

- (exit $ac_status); } && {

33460

- test -z "$ac_c_werror_flag" ||

33461

- test ! -s conftest.err

33462

- } && test -s conftest$ac_exeext &&

33463

- $as_test_x conftest$ac_exeext; then

33464

- ac_cv_func_dlopen=yes

33465

-else

33466

- echo "$as_me: failed program was:" >&5

33467

-sed 's/^/| /' conftest.$ac_ext >&5

33468

33469

- ac_cv_func_dlopen=no

33470

-fi

33471

33472

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

33473

- conftest$ac_exeext conftest.$ac_ext

33474

-fi

33475

-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

33476

-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }

33477

-if test $ac_cv_func_dlopen = yes; then

33478

+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"

33479

+if test "x$ac_cv_func_dlopen" = x""yes; then :

27411

ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"

27412

-if test "x$ac_cv_func_dlopen" = x""yes; then :

27413

+if test "x$ac_cv_func_dlopen" = xyes; then :

33480

27414

lt_cv_dlopen="dlopen"

33481

27415

else

33482

- { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

33483

-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

33484

-if test "${ac_cv_lib_dl_dlopen+set}" = set; then

33485

- echo $ECHO_N "(cached) $ECHO_C" >&6

33486

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5

33487

+$as_echo_n "checking for dlopen in -ldl... " >&6; }

33488

+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :

33489

+ $as_echo_n "(cached) " >&6

27416

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5

27417

$as_echo_n "checking for dlopen in -ldl... " >&6; }

27418

-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :

27419

+if ${ac_cv_lib_dl_dlopen+:} false; then :

27420

$as_echo_n "(cached) " >&6

33490

27421

else

33491

27422

ac_check_lib_save_LIBS=$LIBS

33492

LIBS="-ldl $LIBS"

33493

-cat >conftest.$ac_ext <<_ACEOF

33494

-/* confdefs.h. */

33495

-_ACEOF

33496

-cat confdefs.h >>conftest.$ac_ext

33497

-cat >>conftest.$ac_ext <<_ACEOF

33498

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

33499

/* end confdefs.h. */

33500

33501

/* Override any GCC internal prototype to avoid an error.

33502

@@ -11452,53 +10931,28 @@ return dlopen ();

33503

return 0;

33504

}

33505

_ACEOF

33506

-rm -f conftest.$ac_objext conftest$ac_exeext

33507

-if { (ac_try="$ac_link"

33508

-case "(($ac_try" in

33509

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

33510

- *) ac_try_echo=$ac_try;;

33511

-esac

33512

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

33513

- (eval "$ac_link") 2>conftest.er1

33514

- ac_status=$?

33515

- grep -v '^ *+' conftest.er1 >conftest.err

33516

- rm -f conftest.er1

33517

- cat conftest.err >&5

33518

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

33519

- (exit $ac_status); } && {

33520

- test -z "$ac_c_werror_flag" ||

33521

- test ! -s conftest.err

33522

- } && test -s conftest$ac_exeext &&

33523

- $as_test_x conftest$ac_exeext; then

33524

+if ac_fn_c_try_link "$LINENO"; then :

33525

ac_cv_lib_dl_dlopen=yes

33526

else

33527

- echo "$as_me: failed program was:" >&5

33528

-sed 's/^/| /' conftest.$ac_ext >&5

33529

33530

- ac_cv_lib_dl_dlopen=no

33531

+ ac_cv_lib_dl_dlopen=no

33532

33533

33534

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

33535

- conftest$ac_exeext conftest.$ac_ext

33536

+rm -f core conftest.err conftest.$ac_objext \

33537

+ conftest$ac_exeext conftest.$ac_ext

33538

LIBS=$ac_check_lib_save_LIBS

33539

33540

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

33541

-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

33542

-if test $ac_cv_lib_dl_dlopen = yes; then

33543

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5

33544

+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

33545

+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :

27423

@@ -10936,12 +11198,12 @@ LIBS=$ac_check_lib_save_LIBS

27424

27425

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5

27426

$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

27427

-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :

27428

+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :

33546

27429

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

33547

27430

else

33548

- { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5

33549

-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }

33550

-if test "${ac_cv_lib_svld_dlopen+set}" = set; then

33551

- echo $ECHO_N "(cached) $ECHO_C" >&6

33552

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5

33553

+$as_echo_n "checking for dlopen in -lsvld... " >&6; }

33554

+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :

33555

+ $as_echo_n "(cached) " >&6

27431

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5

27432

$as_echo_n "checking for dlopen in -lsvld... " >&6; }

27433

-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :

27434

+if ${ac_cv_lib_svld_dlopen+:} false; then :

27435

$as_echo_n "(cached) " >&6

33556

27436

else

33557

27437

ac_check_lib_save_LIBS=$LIBS

33558

LIBS="-lsvld $LIBS"

33559

-cat >conftest.$ac_ext <<_ACEOF

33560

-/* confdefs.h. */

33561

-_ACEOF

33562

-cat confdefs.h >>conftest.$ac_ext

33563

-cat >>conftest.$ac_ext <<_ACEOF

33564

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

33565

/* end confdefs.h. */

33566

33567

/* Override any GCC internal prototype to avoid an error.

33568

@@ -11516,53 +10970,28 @@ return dlopen ();

33569

return 0;

33570

}

33571

_ACEOF

33572

-rm -f conftest.$ac_objext conftest$ac_exeext

33573

-if { (ac_try="$ac_link"

33574

-case "(($ac_try" in

33575

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

33576

- *) ac_try_echo=$ac_try;;

33577

-esac

33578

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

33579

- (eval "$ac_link") 2>conftest.er1

33580

- ac_status=$?

33581

- grep -v '^ *+' conftest.er1 >conftest.err

33582

- rm -f conftest.er1

33583

- cat conftest.err >&5

33584

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

33585

- (exit $ac_status); } && {

33586

- test -z "$ac_c_werror_flag" ||

33587

- test ! -s conftest.err

33588

- } && test -s conftest$ac_exeext &&

33589

- $as_test_x conftest$ac_exeext; then

33590

+if ac_fn_c_try_link "$LINENO"; then :

33591

ac_cv_lib_svld_dlopen=yes

33592

else

33593

- echo "$as_me: failed program was:" >&5

33594

-sed 's/^/| /' conftest.$ac_ext >&5

33595

33596

- ac_cv_lib_svld_dlopen=no

33597

+ ac_cv_lib_svld_dlopen=no

33598

33599

33600

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

33601

- conftest$ac_exeext conftest.$ac_ext

33602

+rm -f core conftest.err conftest.$ac_objext \

33603

+ conftest$ac_exeext conftest.$ac_ext

33604

LIBS=$ac_check_lib_save_LIBS

33605

33606

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5

33607

-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }

33608

-if test $ac_cv_lib_svld_dlopen = yes; then

33609

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5

33610

+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }

33611

+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :

27438

@@ -10975,12 +11237,12 @@ LIBS=$ac_check_lib_save_LIBS

27439

27440

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5

27441

$as_echo "$ac_cv_lib_svld_dlopen" >&6; }

27442

-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :

27443

+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :

33612

27444

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"

33613

27445

else

33614

- { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5

33615

-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }

33616

-if test "${ac_cv_lib_dld_dld_link+set}" = set; then

33617

- echo $ECHO_N "(cached) $ECHO_C" >&6

33618

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5

33619

+$as_echo_n "checking for dld_link in -ldld... " >&6; }

33620

+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :

33621

+ $as_echo_n "(cached) " >&6

27446

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5

27447

$as_echo_n "checking for dld_link in -ldld... " >&6; }

27448

-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :

27449

+if ${ac_cv_lib_dld_dld_link+:} false; then :

27450

$as_echo_n "(cached) " >&6

33622

27451

else

33623

27452

ac_check_lib_save_LIBS=$LIBS

33624

LIBS="-ldld $LIBS"

33625

-cat >conftest.$ac_ext <<_ACEOF

33626

-/* confdefs.h. */

33627

-_ACEOF

33628

-cat confdefs.h >>conftest.$ac_ext

33629

-cat >>conftest.$ac_ext <<_ACEOF

33630

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

33631

/* end confdefs.h. */

33632

33633

/* Override any GCC internal prototype to avoid an error.

33634

@@ -11574,45 +11003,24 @@ extern "C"

33635

char dld_link ();

33636

int

33637

main ()

33638

33639

-return dld_link ();

33640

- ;

33641

- return 0;

33642

33643

-_ACEOF

33644

-rm -f conftest.$ac_objext conftest$ac_exeext

33645

-if { (ac_try="$ac_link"

33646

-case "(($ac_try" in

33647

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

33648

- *) ac_try_echo=$ac_try;;

33649

-esac

33650

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

33651

- (eval "$ac_link") 2>conftest.er1

33652

- ac_status=$?

33653

- grep -v '^ *+' conftest.er1 >conftest.err

33654

- rm -f conftest.er1

33655

- cat conftest.err >&5

33656

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

33657

- (exit $ac_status); } && {

33658

- test -z "$ac_c_werror_flag" ||

33659

- test ! -s conftest.err

33660

- } && test -s conftest$ac_exeext &&

33661

- $as_test_x conftest$ac_exeext; then

33662

33663

+return dld_link ();

33664

+ ;

33665

+ return 0;

33666

33667

+_ACEOF

33668

+if ac_fn_c_try_link "$LINENO"; then :

33669

ac_cv_lib_dld_dld_link=yes

33670

else

33671

- echo "$as_me: failed program was:" >&5

33672

-sed 's/^/| /' conftest.$ac_ext >&5

33673

33674

- ac_cv_lib_dld_dld_link=no

33675

+ ac_cv_lib_dld_dld_link=no

33676

33677

33678

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

33679

- conftest$ac_exeext conftest.$ac_ext

33680

+rm -f core conftest.err conftest.$ac_objext \

33681

+ conftest$ac_exeext conftest.$ac_ext

33682

LIBS=$ac_check_lib_save_LIBS

33683

33684

-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5

33685

-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }

33686

-if test $ac_cv_lib_dld_dld_link = yes; then

33687

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5

33688

+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }

33689

+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :

27453

@@ -11014,7 +11276,7 @@ LIBS=$ac_check_lib_save_LIBS

27454

27455

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5

27456

$as_echo "$ac_cv_lib_dld_dld_link" >&6; }

27457

-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :

27458

+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :

33690

27459

lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"

33691

27460

33692

27461

33693

@@ -11651,10 +11059,10 @@ fi

33694

save_LIBS="$LIBS"

33695

LIBS="$lt_cv_dlopen_libs $LIBS"

27462

@@ -11055,7 +11317,7 @@ fi

33696

27463

33697

- { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5

33698

-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }

33699

-if test "${lt_cv_dlopen_self+set}" = set; then

33700

- echo $ECHO_N "(cached) $ECHO_C" >&6

33701

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5

33702

+$as_echo_n "checking whether a program can dlopen itself... " >&6; }

33703

+if test "${lt_cv_dlopen_self+set}" = set; then :

33704

+ $as_echo_n "(cached) " >&6

27464

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5

27465

$as_echo_n "checking whether a program can dlopen itself... " >&6; }

27466

-if test "${lt_cv_dlopen_self+set}" = set; then :

27467

+if ${lt_cv_dlopen_self+:} false; then :

27468

$as_echo_n "(cached) " >&6

33705

27469

else

33706

27470

if test "$cross_compiling" = yes; then :

33707

lt_cv_dlopen_self=cross

33708

@@ -11662,7 +11070,7 @@ else

27471

@@ -11064,7 +11326,7 @@ else

33709

27472

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

33710

27473

lt_status=$lt_dlunknown

33711

27474

cat > conftest.$ac_ext <<_LT_EOF

33712

-#line 11665 "configure"

33713

+#line 11073 "configure"

27475

-#line 11067 "configure"

27476

+#line $LINENO "configure"

33714

27477

#include "confdefs.h"

33715

27478

33716

27479

#if HAVE_DLFCN_H

33717

@@ -11703,10 +11111,6 @@ else

27480

@@ -11105,7 +11367,13 @@ else

33718

27481

# endif

33719

27482

#endif

33720

27483

33721

-#ifdef __cplusplus

33722

-extern "C" void exit (int);

33723

-#endif

33724

33725

void fnord() { int i=42;}

27484

-void fnord() { int i=42;}

27485

+/* When -fvisbility=hidden is used, assume the code has been annotated

27486

+ correspondingly for the symbols needed. */

27487

+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

27488

+int fnord () __attribute__((visibility("default")));

27489

+#endif

27490

27491

+int fnord () { return 42; }

33726

27492

int main ()

33727

27493

{

33728

@@ -11722,14 +11126,14 @@ int main ()

27494

void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

27495

@@ -11114,7 +11382,11 @@ int main ()

27496

if (self)

27497

{

27498

if (dlsym (self,"fnord")) status = $lt_dlno_uscore;

27499

- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

27500

+ else

27501

+ {

27502

+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

27503

+ else puts (dlerror ());

27504

+ }

27505

/* dlclose (self); */

27506

}

33729

27507

else

33730

puts (dlerror ());

33731

33732

- exit (status);

33733

+ return status;

33734

}

33735

_LT_EOF

33736

- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

33737

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5

33738

(eval $ac_link) 2>&5

33739

ac_status=$?

33740

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

33741

- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then

33742

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

33743

+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then

33744

(./conftest; exit; ) >&5 2>/dev/null

33745

lt_status=$?

33746

case x$lt_status in

33747

@@ -11746,15 +11150,15 @@ rm -fr conftest*

33748

33749

33750

33751

-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5

33752

-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }

33753

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5

33754

+$as_echo "$lt_cv_dlopen_self" >&6; }

33755

33756

if test "x$lt_cv_dlopen_self" = xyes; then

27508

@@ -11151,7 +11423,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }

33757

27509

wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"

33758

- { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5

33759

-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }

33760

-if test "${lt_cv_dlopen_self_static+set}" = set; then

33761

- echo $ECHO_N "(cached) $ECHO_C" >&6

33762

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5

33763

+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }

33764

+if test "${lt_cv_dlopen_self_static+set}" = set; then :

33765

+ $as_echo_n "(cached) " >&6

27510

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5

27511

$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }

27512

-if test "${lt_cv_dlopen_self_static+set}" = set; then :

27513

+if ${lt_cv_dlopen_self_static+:} false; then :

27514

$as_echo_n "(cached) " >&6

33766

27515

else

33767

27516

if test "$cross_compiling" = yes; then :

33768

lt_cv_dlopen_self_static=cross

33769

@@ -11762,7 +11166,7 @@ else

27517

@@ -11160,7 +11432,7 @@ else

33770

27518

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

33771

27519

lt_status=$lt_dlunknown

33772

27520

cat > conftest.$ac_ext <<_LT_EOF

33773

-#line 11765 "configure"

33774

+#line 11169 "configure"

27521

-#line 11163 "configure"

27522

+#line $LINENO "configure"

33775

27523

#include "confdefs.h"

33776

27524

33777

27525

#if HAVE_DLFCN_H

33778

@@ -11803,10 +11207,6 @@ else

27526

@@ -11201,7 +11473,13 @@ else

33779

27527

# endif

33780

27528

#endif

33781

27529

33782

-#ifdef __cplusplus

33783

-extern "C" void exit (int);

33784

-#endif

33785

33786

void fnord() { int i=42;}

27530

-void fnord() { int i=42;}

27531

+/* When -fvisbility=hidden is used, assume the code has been annotated

27532

+ correspondingly for the symbols needed. */

27533

+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))

27534

+int fnord () __attribute__((visibility("default")));

27535

+#endif

27536

27537

+int fnord () { return 42; }

33787

27538

int main ()

33788

27539

{

33789

@@ -11822,14 +11222,14 @@ int main ()

27540

void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);

27541

@@ -11210,7 +11488,11 @@ int main ()

27542

if (self)

27543

{

27544

if (dlsym (self,"fnord")) status = $lt_dlno_uscore;

27545

- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

27546

+ else

27547

+ {

27548

+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;

27549

+ else puts (dlerror ());

27550

+ }

27551

/* dlclose (self); */

27552

}

33790

27553

else

33791

puts (dlerror ());

33792

33793

- exit (status);

33794

+ return status;

33795

}

33796

_LT_EOF

33797

- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

33798

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5

33799

(eval $ac_link) 2>&5

33800

ac_status=$?

33801

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

33802

- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then

33803

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

33804

+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then

33805

(./conftest; exit; ) >&5 2>/dev/null

33806

lt_status=$?

33807

case x$lt_status in

33808

@@ -11846,8 +11246,8 @@ rm -fr conftest*

33809

33810

33811

33812

-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5

33813

-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }

33814

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5

33815

+$as_echo "$lt_cv_dlopen_self_static" >&6; }

33816

33817

33818

CPPFLAGS="$save_CPPFLAGS"

33819

@@ -11885,13 +11285,13 @@ fi

33820

33821

striplib=

33822

old_striplib=

33823

-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5

33824

-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }

33825

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5

33826

+$as_echo_n "checking whether stripping libraries is possible... " >&6; }

33827

if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then

33828

test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"

33829

test -z "$striplib" && striplib="$STRIP --strip-unneeded"

33830

- { echo "$as_me:$LINENO: result: yes" >&5

33831

-echo "${ECHO_T}yes" >&6; }

33832

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

33833

+$as_echo "yes" >&6; }

33834

else

33835

# FIXME - insert some real tests, host_os isn't really good enough

33836

case $host_os in

33837

@@ -11899,16 +11299,16 @@ else

33838

if test -n "$STRIP" ; then

33839

striplib="$STRIP -x"

33840

old_striplib="$STRIP -S"

33841

- { echo "$as_me:$LINENO: result: yes" >&5

33842

-echo "${ECHO_T}yes" >&6; }

33843

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

33844

+$as_echo "yes" >&6; }

33845

else

33846

- { echo "$as_me:$LINENO: result: no" >&5

33847

-echo "${ECHO_T}no" >&6; }

33848

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

33849

+$as_echo "no" >&6; }

33850

33851

;;

33852

33853

- { echo "$as_me:$LINENO: result: no" >&5

33854

-echo "${ECHO_T}no" >&6; }

33855

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

33856

+$as_echo "no" >&6; }

33857

;;

33858

esac

33859

33860

@@ -11925,13 +11325,13 @@ fi

33861

33862

33863

# Report which library types will actually be built

33864

- { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

33865

-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }

33866

- { echo "$as_me:$LINENO: result: $can_build_shared" >&5

33867

-echo "${ECHO_T}$can_build_shared" >&6; }

33868

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5

33869

+$as_echo_n "checking if libtool supports shared libraries... " >&6; }

33870

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5

33871

+$as_echo "$can_build_shared" >&6; }

33872

33873

- { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

33874

-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }

33875

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5

33876

+$as_echo_n "checking whether to build shared libraries... " >&6; }

33877

test "$can_build_shared" = "no" && enable_shared=no

33878

33879

# On AIX, shared libraries and static libraries use the same namespace, and

33880

@@ -11951,15 +11351,15 @@ echo $ECHO_N "checking whether to build

33881

33882

;;

33883

esac

33884

- { echo "$as_me:$LINENO: result: $enable_shared" >&5

33885

-echo "${ECHO_T}$enable_shared" >&6; }

33886

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5

33887

+$as_echo "$enable_shared" >&6; }

33888

33889

- { echo "$as_me:$LINENO: checking whether to build static libraries" >&5

33890

-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }

33891

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5

33892

+$as_echo_n "checking whether to build static libraries... " >&6; }

33893

# Make sure either enable_shared or enable_static is yes.

33894

test "$enable_shared" = yes || enable_static=yes

33895

- { echo "$as_me:$LINENO: result: $enable_static" >&5

33896

-echo "${ECHO_T}$enable_static" >&6; }

33897

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5

33898

+$as_echo "$enable_static" >&6; }

33899

33900

33901

33902

@@ -12099,7 +11499,7 @@ cc_basename=`$ECHO "X$cc_temp" | $Xsed -

33903

33904

33905

# Check whether --with-gnu-ld was given.

33906

-if test "${with_gnu_ld+set}" = set; then

33907

+if test "${with_gnu_ld+set}" = set; then :

33908

withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

33909

else

33910

with_gnu_ld=no

33911

@@ -12108,8 +11508,8 @@ fi

33912

ac_prog=ld

33913

if test "$GCC" = yes; then

33914

# Check if gcc -print-prog-name=ld gives a path.

33915

- { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

33916

-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

33917

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5

33918

+$as_echo_n "checking for ld used by $CC... " >&6; }

33919

case $host in

33920

*-*-mingw*)

33921

# gcc leaves a trailing carriage return which upsets mingw

33922

@@ -12138,14 +11538,14 @@ echo $ECHO_N "checking for ld used by $C

33923

;;

33924

esac

33925

elif test "$with_gnu_ld" = yes; then

33926

- { echo "$as_me:$LINENO: checking for GNU ld" >&5

33927

-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

33928

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5

33929

+$as_echo_n "checking for GNU ld... " >&6; }

33930

else

33931

- { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

33932

-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

33933

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5

33934

+$as_echo_n "checking for non-GNU ld... " >&6; }

33935

33936

-if test "${lt_cv_path_LD+set}" = set; then

33937

- echo $ECHO_N "(cached) $ECHO_C" >&6

33938

+if test "${lt_cv_path_LD+set}" = set; then :

27554

@@ -11367,6 +11649,145 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

27555

27556

CC="$lt_save_CC"

27557

27558

+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

27559

+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

27560

+ (test "X$CXX" != "Xg++"))) ; then

27561

+ ac_ext=cpp

27562

+ac_cpp='$CXXCPP $CPPFLAGS'

27563

+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

27564

+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

27565

+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

27566

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5

27567

+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }

27568

+if test -z "$CXXCPP"; then

27569

+ if ${ac_cv_prog_CXXCPP+:} false; then :

33939

27570

+ $as_echo_n "(cached) " >&6

27571

+else

27572

+ # Double quotes because CXXCPP needs to be expanded

27573

+ for CXXCPP in "$CXX -E" "/lib/cpp"

27574

+ do

27575

+ ac_preproc_ok=false

27576

+for ac_cxx_preproc_warn_flag in '' yes

27577

+do

27578

+ # Use a header file that comes with gcc, so configuring glibc

27579

+ # with a fresh cross-compiler works.

27580

+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

27581

+ # <limits.h> exists even on freestanding compilers.

27582

+ # On the NeXT, cc -E runs the code through the compiler's parser,

27583

+ # not just through cpp. "Syntax error" is here to catch this case.

27584

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27585

+/* end confdefs.h. */

27586

+#ifdef __STDC__

27587

+# include <limits.h>

27588

+#else

27589

+# include <assert.h>

27590

+#endif

27591

+ Syntax error

27592

+_ACEOF

27593

+if ac_fn_cxx_try_cpp "$LINENO"; then :

27594

27595

+else

27596

+ # Broken: fails on valid input.

27597

+continue

27598

+fi

27599

+rm -f conftest.err conftest.i conftest.$ac_ext

27600

27601

+ # OK, works on sane cases. Now check whether nonexistent headers

27602

+ # can be detected and how.

27603

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27604

+/* end confdefs.h. */

27605

+#include <ac_nonexistent.h>

27606

+_ACEOF

27607

+if ac_fn_cxx_try_cpp "$LINENO"; then :

27608

+ # Broken: success on invalid input.

27609

+continue

27610

+else

27611

+ # Passes both tests.

27612

+ac_preproc_ok=:

27613

+break

27614

+fi

27615

+rm -f conftest.err conftest.i conftest.$ac_ext

27616

27617

+done

27618

+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

27619

+rm -f conftest.i conftest.err conftest.$ac_ext

27620

+if $ac_preproc_ok; then :

27621

+ break

27622

+fi

27623

27624

+ done

27625

+ ac_cv_prog_CXXCPP=$CXXCPP

27626

27627

+fi

27628

+ CXXCPP=$ac_cv_prog_CXXCPP

27629

+else

27630

+ ac_cv_prog_CXXCPP=$CXXCPP

27631

+fi

27632

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5

27633

+$as_echo "$CXXCPP" >&6; }

27634

+ac_preproc_ok=false

27635

+for ac_cxx_preproc_warn_flag in '' yes

27636

+do

27637

+ # Use a header file that comes with gcc, so configuring glibc

27638

+ # with a fresh cross-compiler works.

27639

+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

27640

+ # <limits.h> exists even on freestanding compilers.

27641

+ # On the NeXT, cc -E runs the code through the compiler's parser,

27642

+ # not just through cpp. "Syntax error" is here to catch this case.

27643

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27644

+/* end confdefs.h. */

27645

+#ifdef __STDC__

27646

+# include <limits.h>

27647

+#else

27648

+# include <assert.h>

27649

+#endif

27650

+ Syntax error

27651

+_ACEOF

27652

+if ac_fn_cxx_try_cpp "$LINENO"; then :

27653

27654

+else

27655

+ # Broken: fails on valid input.

27656

+continue

27657

+fi

27658

+rm -f conftest.err conftest.i conftest.$ac_ext

27659

27660

+ # OK, works on sane cases. Now check whether nonexistent headers

27661

+ # can be detected and how.

27662

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27663

+/* end confdefs.h. */

27664

+#include <ac_nonexistent.h>

27665

+_ACEOF

27666

+if ac_fn_cxx_try_cpp "$LINENO"; then :

27667

+ # Broken: success on invalid input.

27668

+continue

27669

+else

27670

+ # Passes both tests.

27671

+ac_preproc_ok=:

27672

+break

27673

+fi

27674

+rm -f conftest.err conftest.i conftest.$ac_ext

27675

27676

+done

27677

+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

27678

+rm -f conftest.i conftest.err conftest.$ac_ext

27679

+if $ac_preproc_ok; then :

27680

27681

+else

27682

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

27683

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

27684

+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check

27685

+See \`config.log' for more details" "$LINENO" 5; }

27686

+fi

27687

27688

+ac_ext=cpp

27689

+ac_cpp='$CXXCPP $CPPFLAGS'

27690

+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

27691

+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

27692

+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

27693

27694

+else

27695

+ _lt_caught_CXX_error=yes

27696

+fi

27697

27698

ac_ext=cpp

27699

ac_cpp='$CXXCPP $CPPFLAGS'

27700

@@ -11393,6 +11814,8 @@ module_cmds_CXX=

27701

module_expsym_cmds_CXX=

27702

link_all_deplibs_CXX=unknown

27703

old_archive_cmds_CXX=$old_archive_cmds

27704

+reload_flag_CXX=$reload_flag

27705

+reload_cmds_CXX=$reload_cmds

27706

no_undefined_flag_CXX=

27707

whole_archive_flag_spec_CXX=

27708

enable_shared_with_static_runtimes_CXX=no

27709

@@ -11448,6 +11871,7 @@ $RM -r conftest*

27710

27711

# Allow CC to be a program name with arguments.

27712

lt_save_CC=$CC

27713

+ lt_save_CFLAGS=$CFLAGS

27714

lt_save_LD=$LD

27715

lt_save_GCC=$GCC

27716

GCC=$GXX

27717

@@ -11465,6 +11889,7 @@ $RM -r conftest*

27718

27719

test -z "${LDCXX+set}" || LD=$LDCXX

27720

CC=${CXX-"c++"}

27721

+ CFLAGS=$CXXFLAGS

27722

compiler=$CC

27723

compiler_CXX=$CC

27724

for cc_temp in $compiler""; do

27725

@@ -11475,7 +11900,7 @@ $RM -r conftest*

27726

*) break;;

27727

esac

27728

done

27729

-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

27730

+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`

27731

27732

27733

if test -n "$compiler"; then

27734

@@ -11538,7 +11963,7 @@ else

27735

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5

27736

$as_echo_n "checking for non-GNU ld... " >&6; }

27737

27738

-if test "${lt_cv_path_LD+set}" = set; then :

27739

+if ${lt_cv_path_LD+:} false; then :

27740

$as_echo_n "(cached) " >&6

33940

27741

else

33941

27742

if test -z "$LD"; then

33942

lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

33943

@@ -12175,19 +11575,17 @@ fi

33944

33945

LD="$lt_cv_path_LD"

33946

if test -n "$LD"; then

33947

- { echo "$as_me:$LINENO: result: $LD" >&5

33948

-echo "${ECHO_T}$LD" >&6; }

33949

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5

33950

+$as_echo "$LD" >&6; }

33951

else

33952

- { echo "$as_me:$LINENO: result: no" >&5

33953

-echo "${ECHO_T}no" >&6; }

33954

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

33955

+$as_echo "no" >&6; }

27743

@@ -11575,10 +12000,10 @@ else

27744

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

27745

$as_echo "no" >&6; }

33956

27746

33957

-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

33958

-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

33959

- { (exit 1); exit 1; }; }

33960

-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

33961

-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

33962

-if test "${lt_cv_prog_gnu_ld+set}" = set; then

33963

- echo $ECHO_N "(cached) $ECHO_C" >&6

27747

-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5

33964

27748

+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5

33965

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

33966

+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

33967

+if test "${lt_cv_prog_gnu_ld+set}" = set; then :

33968

+ $as_echo_n "(cached) " >&6

27749

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

27750

$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

27751

-if test "${lt_cv_prog_gnu_ld+set}" = set; then :

27752

+if ${lt_cv_prog_gnu_ld+:} false; then :

27753

$as_echo_n "(cached) " >&6

33969

27754

else

33970

27755

# I'd rather use --version here, but apparently some GNU lds only accept -v.

33971

case `$LD -v 2>&1 </dev/null` in

33972

@@ -12199,8 +11597,8 @@ case `$LD -v 2>&1 </dev/null` in

33973

;;

33974

esac

33975

33976

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

33977

-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

33978

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5

33979

+$as_echo "$lt_cv_prog_gnu_ld" >&6; }

33980

with_gnu_ld=$lt_cv_prog_gnu_ld

33981

33982

33983

@@ -12254,8 +11652,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld

33984

33985

33986

# PORTME: fill in a description of your system's C++ link characteristics

33987

- { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

33988

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

33989

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5

33990

+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

33991

ld_shlibs_CXX=yes

33992

case $host_os in

33993

aix3*)

33994

@@ -12344,6 +11742,7 @@ echo $ECHO_N "checking whether the $comp

33995

33996

33997

33998

+ export_dynamic_flag_spec_CXX='${wl}-bexpall'

33999

# It seems that -bexpall does not export symbols beginning with

34000

# underscore (_), so it is better to generate a list of symbols to

34001

# export.

34002

@@ -12354,11 +11753,7 @@ echo $ECHO_N "checking whether the $comp

27756

@@ -11604,8 +12029,8 @@ with_gnu_ld=$lt_cv_prog_gnu_ld

27757

# Check if GNU C++ uses GNU ld as the underlying linker, since the

27758

# archiving commands below assume that GNU ld is being used.

27759

if test "$with_gnu_ld" = yes; then

27760

- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'

27761

- archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'

27762

+ archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'

27763

27764

27765

hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'

27766

export_dynamic_flag_spec_CXX='${wl}--export-dynamic'

27767

@@ -11637,7 +12062,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld

27768

# Commands to make compiler produce verbose output that lists

27769

# what "hidden" libraries, object files and flags are used when

27770

# linking a shared library.

27771

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

27772

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

27773

27774

else

27775

GXX=no

27776

@@ -11747,7 +12172,13 @@ $as_echo_n "checking whether the $compil

34003

27777

allow_undefined_flag_CXX='-berok'

34004

27778

# Determine the default libpath from the value encoded in an empty

34005

27779

# executable.

34006

- cat >conftest.$ac_ext <<_ACEOF

34007

-/* confdefs.h. */

34008

-_ACEOF

34009

-cat confdefs.h >>conftest.$ac_ext

34010

-cat >>conftest.$ac_ext <<_ACEOF

34011

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27780

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27781

+ if test "${lt_cv_aix_libpath+set}" = set; then

27782

+ aix_libpath=$lt_cv_aix_libpath

27783

+else

27784

+ if ${lt_cv_aix_libpath__CXX+:} false; then :

27785

+ $as_echo_n "(cached) " >&6

27786

+else

27787

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

34012

27788

/* end confdefs.h. */

34013

27789

34014

27790

int

34015

@@ -12369,24 +11764,7 @@ main ()

34016

return 0;

34017

}

27791

@@ -11760,26 +12191,33 @@ main ()

34018

27792

_ACEOF

34019

-rm -f conftest.$ac_objext conftest$ac_exeext

34020

-if { (ac_try="$ac_link"

34021

-case "(($ac_try" in

34022

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

34023

- *) ac_try_echo=$ac_try;;

34024

-esac

34025

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

34026

- (eval "$ac_link") 2>conftest.er1

34027

- ac_status=$?

34028

- grep -v '^ *+' conftest.er1 >conftest.err

34029

- rm -f conftest.er1

34030

- cat conftest.err >&5

34031

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

34032

- (exit $ac_status); } && {

34033

- test -z "$ac_cxx_werror_flag" ||

34034

- test ! -s conftest.err

34035

- } && test -s conftest$ac_exeext &&

34036

- $as_test_x conftest$ac_exeext; then

34037

+if ac_fn_cxx_try_link "$LINENO"; then :

27793

if ac_fn_cxx_try_link "$LINENO"; then :

34038

27794

34039

lt_aix_libpath_sed='

34040

/Import File Strings/,/^$/ {

34041

@@ -12400,15 +11778,9 @@ aix_libpath=`dump -H conftest$ac_exeext

34042

if test -z "$aix_libpath"; then

34043

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

34044

34045

-else

34046

- echo "$as_me: failed program was:" >&5

34047

-sed 's/^/| /' conftest.$ac_ext >&5

34048

34049

34050

34051

34052

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

34053

- conftest$ac_exeext conftest.$ac_ext

34054

+rm -f core conftest.err conftest.$ac_objext \

34055

+ conftest$ac_exeext conftest.$ac_ext

34056

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

27795

-lt_aix_libpath_sed='

27796

- /Import File Strings/,/^$/ {

27797

- /^0/ {

27798

- s/^0 *$.*$$/\1/

27799

- p

27800

- }

27801

- }'

27802

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

27803

-# Check for a 64-bit object if we didn't find anything.

27804

-if test -z "$aix_libpath"; then

27805

- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

27806

-fi

27807

+ lt_aix_libpath_sed='

27808

+ /Import File Strings/,/^$/ {

27809

+ /^0/ {

27810

+ s/^0 *$[^ ]*$ *$/\1/

27811

+ p

27812

+ }

27813

+ }'

27814

+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

27815

+ # Check for a 64-bit object if we didn't find anything.

27816

+ if test -z "$lt_cv_aix_libpath__CXX"; then

27817

+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

27818

+ fi

27819

27820

rm -f core conftest.err conftest.$ac_objext \

27821

conftest$ac_exeext conftest.$ac_ext

27822

-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

27823

+ if test -z "$lt_cv_aix_libpath__CXX"; then

27824

+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"

27825

+ fi

27826

27827

+fi

27828

27829

+ aix_libpath=$lt_cv_aix_libpath__CXX

27830

+fi

34057

27831

34058

27832

hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"

34059

@@ -12422,11 +11794,7 @@ if test -z "$aix_libpath"; then aix_libp

27833

27834

27835

27836

else

27837

if test "$host_cpu" = ia64; then

27838

hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'

27839

@@ -11788,7 +12226,13 @@ if test -z "$aix_libpath"; then aix_libp

34060

27840

else

34061

27841

# Determine the default libpath from the value encoded in an

34062

27842

# empty executable.

34063

- cat >conftest.$ac_ext <<_ACEOF

34064

-/* confdefs.h. */

34065

-_ACEOF

34066

-cat confdefs.h >>conftest.$ac_ext

34067

-cat >>conftest.$ac_ext <<_ACEOF

34068

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27843

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

27844

+ if test "${lt_cv_aix_libpath+set}" = set; then

27845

+ aix_libpath=$lt_cv_aix_libpath

27846

+else

27847

+ if ${lt_cv_aix_libpath__CXX+:} false; then :

27848

+ $as_echo_n "(cached) " >&6

27849

+else

27850

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

34069

27851

/* end confdefs.h. */

34070

27852

34071

27853

int

34072

@@ -12437,24 +11805,7 @@ main ()

34073

return 0;

34074

}

27854

@@ -11801,30 +12245,42 @@ main ()

34075

27855

_ACEOF

34076

-rm -f conftest.$ac_objext conftest$ac_exeext

34077

-if { (ac_try="$ac_link"

34078

-case "(($ac_try" in

34079

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

34080

- *) ac_try_echo=$ac_try;;

34081

-esac

34082

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

34083

- (eval "$ac_link") 2>conftest.er1

34084

- ac_status=$?

34085

- grep -v '^ *+' conftest.er1 >conftest.err

34086

- rm -f conftest.er1

34087

- cat conftest.err >&5

34088

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

34089

- (exit $ac_status); } && {

34090

- test -z "$ac_cxx_werror_flag" ||

34091

- test ! -s conftest.err

34092

- } && test -s conftest$ac_exeext &&

34093

- $as_test_x conftest$ac_exeext; then

34094

+if ac_fn_cxx_try_link "$LINENO"; then :

27856

if ac_fn_cxx_try_link "$LINENO"; then :

34095

27857

34096

lt_aix_libpath_sed='

34097

/Import File Strings/,/^$/ {

34098

@@ -12468,15 +11819,9 @@ aix_libpath=`dump -H conftest$ac_exeext

34099

if test -z "$aix_libpath"; then

34100

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

34101

34102

-else

34103

- echo "$as_me: failed program was:" >&5

34104

-sed 's/^/| /' conftest.$ac_ext >&5

34105

34106

34107

34108

34109

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

34110

- conftest$ac_exeext conftest.$ac_ext

34111

+rm -f core conftest.err conftest.$ac_objext \

34112

+ conftest$ac_exeext conftest.$ac_ext

34113

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

27858

-lt_aix_libpath_sed='

27859

- /Import File Strings/,/^$/ {

27860

- /^0/ {

27861

- s/^0 *$.*$$/\1/

27862

- p

27863

- }

27864

- }'

27865

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

27866

-# Check for a 64-bit object if we didn't find anything.

27867

-if test -z "$aix_libpath"; then

27868

- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

27869

-fi

27870

+ lt_aix_libpath_sed='

27871

+ /Import File Strings/,/^$/ {

27872

+ /^0/ {

27873

+ s/^0 *$[^ ]*$ *$/\1/

27874

+ p

27875

+ }

27876

+ }'

27877

+ lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

27878

+ # Check for a 64-bit object if we didn't find anything.

27879

+ if test -z "$lt_cv_aix_libpath__CXX"; then

27880

+ lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

27881

+ fi

27882

27883

rm -f core conftest.err conftest.$ac_objext \

27884

conftest$ac_exeext conftest.$ac_ext

27885

-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

27886

+ if test -z "$lt_cv_aix_libpath__CXX"; then

27887

+ lt_cv_aix_libpath__CXX="/usr/lib:/lib"

27888

+ fi

27889

27890

+fi

27891

27892

+ aix_libpath=$lt_cv_aix_libpath__CXX

27893

+fi

34114

27894

34115

27895

hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"

34116

@@ -12514,7 +11859,7 @@ if test -z "$aix_libpath"; then aix_libp

34117

esac

27896

# Warning - without using the other run time loading flags,

27897

# -berok will link without error, but may produce a broken library.

27898

no_undefined_flag_CXX=' ${wl}-bernotok'

27899

allow_undefined_flag_CXX=' ${wl}-berok'

27900

- # Exported symbols can be pulled into shared objects from archives

27901

- whole_archive_flag_spec_CXX='$convenience'

27902

+ if test "$with_gnu_ld" = yes; then

27903

+ # We only use this code for GNU lds that support --whole-archive.

27904

+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'

27905

+ else

27906

+ # Exported symbols can be pulled into shared objects from archives

27907

+ whole_archive_flag_spec_CXX='$convenience'

27908

+ fi

27909

archive_cmds_need_lc_CXX=yes

27910

# This is similar to how AIX traditionally builds its shared

27911

# libraries.

27912

@@ -11854,28 +12310,75 @@ if test -z "$aix_libpath"; then aix_libp

34118

27913

;;

34119

27914

34120

- cygwin* | mingw* | pw32*)

34121

+ cygwin* | mingw* | pw32* | cegcc*)

34122

# _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,

34123

# as there is no search path for DLLs.

34124

hardcode_libdir_flag_spec_CXX='-L$libdir'

34125

@@ -12547,7 +11892,11 @@ if test -z "$aix_libpath"; then aix_libp

34126

whole_archive_flag_spec_CXX=''

27915

cygwin* | mingw* | pw32* | cegcc*)

27916

- # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,

27917

- # as there is no search path for DLLs.

27918

- hardcode_libdir_flag_spec_CXX='-L$libdir'

27919

- allow_undefined_flag_CXX=unsupported

27920

- always_export_symbols_CXX=no

27921

- enable_shared_with_static_runtimes_CXX=yes

27922

27923

- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

27924

27925

- # If the export-symbols file already is a .def file (1st line

27926

- # is EXPORTS), use it as is; otherwise, prepend...

27927

- archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

27928

- cp $export_symbols $output_objdir/$soname.def;

27929

- else

27930

- echo EXPORTS > $output_objdir/$soname.def;

27931

- cat $export_symbols >> $output_objdir/$soname.def;

27932

- fi~

27933

27934

- else

27935

- ld_shlibs_CXX=no

27936

- fi

27937

- ;;

27938

+ case $GXX,$cc_basename in

27939

+ ,cl* | no,cl*)

27940

+ # Native MSVC

27941

+ # hardcode_libdir_flag_spec is actually meaningless, as there is

27942

+ # no search path for DLLs.

27943

+ hardcode_libdir_flag_spec_CXX=' '

27944

+ allow_undefined_flag_CXX=unsupported

27945

+ always_export_symbols_CXX=yes

27946

+ file_list_spec_CXX='@'

27947

+ # Tell ltmain to make .lib files, not .a files.

27948

+ libext=lib

27949

+ # Tell ltmain to make .dll files, not .so files.

27950

+ shrext_cmds=".dll"

27951

+ # FIXME: Setting linknames here is a bad hack.

27952

+ archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='

27953

+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

27954

+ $SED -n -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;

27955

+ else

27956

+ $SED -e 's/\\\\\\$.*\\\\\\$/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;

27957

+ fi~

27958

+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~

27959

+ linknames='

27960

+ # The linker will not automatically build a static lib if we build a DLL.

27961

+ # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'

27962

+ enable_shared_with_static_runtimes_CXX=yes

27963

+ # Don't use ranlib

27964

+ old_postinstall_cmds_CXX='chmod 644 $oldlib'

27965

+ postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~

27966

+ lt_tool_outputfile="@TOOL_OUTPUT@"~

27967

+ case $lt_outputfile in

27968

+ *.exe|*.EXE) ;;

27969

+ *)

27970

+ lt_outputfile="$lt_outputfile.exe"

27971

+ lt_tool_outputfile="$lt_tool_outputfile.exe"

27972

+ ;;

27973

+ esac~

27974

+ func_to_tool_file "$lt_outputfile"~

27975

+ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then

27976

+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;

27977

+ $RM "$lt_outputfile.manifest";

27978

+ fi'

27979

+ ;;

27980

+ *)

27981

+ # g++

27982

+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,

27983

+ # as there is no search path for DLLs.

27984

+ hardcode_libdir_flag_spec_CXX='-L$libdir'

27985

+ export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'

27986

+ allow_undefined_flag_CXX=unsupported

27987

+ always_export_symbols_CXX=no

27988

+ enable_shared_with_static_runtimes_CXX=yes

27989

27990

+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then

27991

27992

+ # If the export-symbols file already is a .def file (1st line

27993

+ # is EXPORTS), use it as is; otherwise, prepend...

27994

+ archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then

27995

+ cp $export_symbols $output_objdir/$soname.def;

27996

+ else

27997

+ echo EXPORTS > $output_objdir/$soname.def;

27998

+ cat $export_symbols >> $output_objdir/$soname.def;

27999

+ fi~

28000

28001

+ else

28002

+ ld_shlibs_CXX=no

28003

+ fi

28004

+ ;;

28005

+ esac

28006

+ ;;

28007

darwin* | rhapsody*)

28008

28009

28010

@@ -11883,7 +12386,11 @@ if test -z "$aix_libpath"; then aix_libp

28011

hardcode_direct_CXX=no

28012

hardcode_automatic_CXX=yes

28013

hardcode_shlibpath_var_CXX=unsupported

28014

- whole_archive_flag_spec_CXX=''

28015

+ if test "$lt_cv_ld_force_load" = "yes"; then

28016

+ whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'

28017

+ else

28018

+ whole_archive_flag_spec_CXX=''

28019

+ fi

34127

28020

link_all_deplibs_CXX=yes

34128

28021

allow_undefined_flag_CXX="$_lt_dar_allow_undefined"

34129

- if test "$GCC" = "yes"; then

34130

+ case $cc_basename in

34131

+ ifort*) _lt_dar_can_shared=yes ;;

34132

+ *) _lt_dar_can_shared=$GCC ;;

34133

+ esac

34134

+ if test "$_lt_dar_can_shared" = "yes"; then

34135

output_verbose_link_cmd=echo

28022

case $cc_basename in

28023

@@ -11891,7 +12398,7 @@ if test -z "$aix_libpath"; then aix_libp

28024

*) _lt_dar_can_shared=$GCC ;;

28025

esac

28026

if test "$_lt_dar_can_shared" = "yes"; then

28027

- output_verbose_link_cmd=echo

28028

+ output_verbose_link_cmd=func_echo_all

34136

28029

archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"

34137

28030

module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

34138

@@ -12757,7 +12106,7 @@ if test -z "$aix_libpath"; then aix_libp

34139

inherit_rpath_CXX=yes

34140

;;

34141

34142

- linux* | k*bsd*-gnu)

34143

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

34144

case $cc_basename in

34145

KCC*)

34146

# Kuck and Associates, Inc. (KAI) C++ Compiler

34147

@@ -13216,8 +12565,8 @@ if test -z "$aix_libpath"; then aix_libp

34148

;;

34149

esac

34150

34151

- { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

34152

-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

34153

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5

34154

+$as_echo "$ld_shlibs_CXX" >&6; }

34155

test "$ld_shlibs_CXX" = no && can_build_shared=no

34156

34157

GCC_CXX="$GXX"

34158

@@ -13244,11 +12593,11 @@ private:

28031

28032

@@ -11944,6 +12451,11 @@ if test -z "$aix_libpath"; then aix_libp

28033

gnu*)

28034

;;

28035

28036

+ haiku*)

28037

+ archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

28038

+ link_all_deplibs_CXX=yes

28039

+ ;;

28040

28041

hpux9*)

28042

hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'

28043

hardcode_libdir_separator_CXX=:

28044

@@ -11968,11 +12480,11 @@ if test -z "$aix_libpath"; then aix_libp

28045

# explicitly linking system object files so we need to strip them

28046

# from the output so that they don't get included in the library

28047

# dependencies.

28048

28049

28050

;;

28051

28052

if test "$GXX" = yes; then

28053

28054

28055

else

28056

# FIXME: insert proper C++ library support

28057

ld_shlibs_CXX=no

28058

@@ -12033,7 +12545,7 @@ if test -z "$aix_libpath"; then aix_libp

28059

# explicitly linking system object files so we need to strip them

28060

# from the output so that they don't get included in the library

28061

# dependencies.

28062

28063

28064

;;

28065

28066

if test "$GXX" = yes; then

28067

@@ -12043,10 +12555,10 @@ if test -z "$aix_libpath"; then aix_libp

28068

archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

28069

;;

28070

ia64*)

28071

- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

28072

+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

28073

;;

28074

28075

- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

28076

+ archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

28077

;;

28078

esac

28079

28080

@@ -12076,7 +12588,7 @@ if test -z "$aix_libpath"; then aix_libp

28081

case $cc_basename in

28082

CC*)

28083

# SGI C++

28084

28085

28086

28087

# Archives containing C++ object files must be created using

28088

# "CC -ar", where "CC" is the IRIX C++ compiler. This is

28089

@@ -12087,9 +12599,9 @@ if test -z "$aix_libpath"; then aix_libp

28090

28091

if test "$GXX" = yes; then

28092

if test "$with_gnu_ld" = no; then

28093

28094

28095

else

28096

28097

28098

28099

28100

link_all_deplibs_CXX=yes

28101

@@ -12118,7 +12630,7 @@ if test -z "$aix_libpath"; then aix_libp

28102

# explicitly linking system object files so we need to strip them

28103

# from the output so that they don't get included in the library

28104

# dependencies.

28105

28106

28107

28108

hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'

28109

export_dynamic_flag_spec_CXX='${wl}--export-dynamic'

28110

@@ -12155,26 +12667,26 @@ if test -z "$aix_libpath"; then aix_libp

28111

pgCC* | pgcpp*)

28112

# Portland Group C++ compiler

28113

case `$CC -V` in

28114

- *pgCC\ [1-5]* | *pgcpp\ [1-5]*)

28115

+ *pgCC\ [1-5].* | *pgcpp\ [1-5].*)

28116

prelink_cmds_CXX='tpldir=Template.dir~

28117

rm -rf $tpldir~

28118

$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~

28119

- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'

28120

+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'

28121

old_archive_cmds_CXX='tpldir=Template.dir~

28122

rm -rf $tpldir~

28123

$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~

28124

- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~

28125

+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~

28126

$RANLIB $oldlib'

28127

archive_cmds_CXX='tpldir=Template.dir~

28128

rm -rf $tpldir~

28129

$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~

28130

- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

28131

+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

28132

archive_expsym_cmds_CXX='tpldir=Template.dir~

28133

rm -rf $tpldir~

28134

$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~

28135

28136

28137

;;

28138

- *) # Version 6 will use weak symbols

28139

+ *) # Version 6 and above use weak symbols

28140

archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

28141

archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'

28142

;;

28143

@@ -12182,7 +12694,7 @@ if test -z "$aix_libpath"; then aix_libp

28144

28145

hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'

28146

export_dynamic_flag_spec_CXX='${wl}--export-dynamic'

28147

28148

28149

;;

28150

cxx*)

28151

# Compaq C++

28152

@@ -12201,9 +12713,9 @@ if test -z "$aix_libpath"; then aix_libp

28153

# explicitly linking system object files so we need to strip them

28154

# from the output so that they don't get included in the library

28155

# dependencies.

28156

28157

28158

;;

28159

- xl*)

28160

+ xl* | mpixl* | bgxl*)

28161

# IBM XL 8.0 on PPC, with GNU ld

28162

hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'

28163

export_dynamic_flag_spec_CXX='${wl}--export-dynamic'

28164

@@ -12223,13 +12735,13 @@ if test -z "$aix_libpath"; then aix_libp

28165

archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

28166

archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'

28167

hardcode_libdir_flag_spec_CXX='-R$libdir'

28168

28169

28170

compiler_needs_object_CXX=yes

28171

28172

# Not sure whether something based on

28173

# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1

28174

# would be better.

28175

- output_verbose_link_cmd='echo'

28176

+ output_verbose_link_cmd='func_echo_all'

28177

28178

# Archives containing C++ object files must be created using

28179

# "CC -xar", where "CC" is the Sun C++ compiler. This is

28180

@@ -12298,7 +12810,7 @@ if test -z "$aix_libpath"; then aix_libp

28181

export_dynamic_flag_spec_CXX='${wl}-E'

28182

whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'

28183

28184

- output_verbose_link_cmd=echo

28185

+ output_verbose_link_cmd=func_echo_all

28186

else

28187

ld_shlibs_CXX=no

28188

28189

@@ -12333,15 +12845,15 @@ if test -z "$aix_libpath"; then aix_libp

28190

case $host in

28191

osf3*)

28192

allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'

28193

28194

28195

hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'

28196

;;

28197

28198

allow_undefined_flag_CXX=' -expect_unresolved \*'

28199

28200

28201

archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~

28202

echo "-hidden">> $lib.exp~

28203

28204

28205

$RM $lib.exp'

28206

hardcode_libdir_flag_spec_CXX='-rpath $libdir'

28207

;;

28208

@@ -12357,17 +12869,17 @@ if test -z "$aix_libpath"; then aix_libp

28209

# explicitly linking system object files so we need to strip them

28210

# from the output so that they don't get included in the library

28211

# dependencies.

28212

28213

28214

;;

28215

28216

if test "$GXX" = yes && test "$with_gnu_ld" = no; then

28217

allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'

28218

case $host in

28219

osf3*)

28220

28221

28222

;;

28223

28224

28225

28226

;;

28227

esac

28228

28229

@@ -12377,7 +12889,7 @@ if test -z "$aix_libpath"; then aix_libp

28230

# Commands to make compiler produce verbose output that lists

28231

# what "hidden" libraries, object files and flags are used when

28232

# linking a shared library.

28233

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

28234

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

28235

28236

else

28237

# FIXME: insert proper C++ library support

28238

@@ -12413,7 +12925,7 @@ if test -z "$aix_libpath"; then aix_libp

28239

28240

solaris*)

28241

case $cc_basename in

28242

- CC*)

28243

+ CC* | sunCC*)

28244

# Sun C++ 4.2, 5.x and Centerline C++

28245

archive_cmds_need_lc_CXX=yes

28246

no_undefined_flag_CXX=' -zdefs'

28247

@@ -12434,7 +12946,7 @@ if test -z "$aix_libpath"; then aix_libp

28248

esac

28249

link_all_deplibs_CXX=yes

28250

28251

- output_verbose_link_cmd='echo'

28252

+ output_verbose_link_cmd='func_echo_all'

28253

28254

# Archives containing C++ object files must be created using

28255

# "CC -xar", where "CC" is the Sun C++ compiler. This is

28256

@@ -12454,14 +12966,14 @@ if test -z "$aix_libpath"; then aix_libp

28257

if test "$GXX" = yes && test "$with_gnu_ld" = no; then

28258

no_undefined_flag_CXX=' ${wl}-z ${wl}defs'

28259

if $CC --version | $GREP -v '^2\.7' > /dev/null; then

28260

- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'

28261

+ archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'

28262

archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~

28263

- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'

28264

+ $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'

28265

28266

# Commands to make compiler produce verbose output that lists

28267

# what "hidden" libraries, object files and flags are used when

28268

# linking a shared library.

28269

- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

28270

+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

28271

else

28272

# g++ 2.7 appears to require `-G' NOT `-shared' on this

28273

# platform.

28274

@@ -12472,7 +12984,7 @@ if test -z "$aix_libpath"; then aix_libp

28275

# Commands to make compiler produce verbose output that lists

28276

# what "hidden" libraries, object files and flags are used when

28277

# linking a shared library.

28278

- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'

28279

+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'

28280

28281

28282

hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'

28283

@@ -12526,6 +13038,10 @@ if test -z "$aix_libpath"; then aix_libp

28284

CC*)

28285

archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

28286

archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

28287

+ old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~

28288

+ '"$old_archive_cmds_CXX"

28289

+ reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~

28290

+ '"$reload_cmds_CXX"

28291

;;

28292

28293

archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'

28294

@@ -12587,6 +13103,13 @@ private:

34159

28295

};

34160

28296

_LT_EOF

34161

28297

34162

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

34163

+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

28298

28299

+_lt_libdeps_save_CFLAGS=$CFLAGS

28300

+case "$CC $CFLAGS " in #(

28301

+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;

28302

+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;

28303

+esac

28304

28305

if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

34164

28306

(eval $ac_compile) 2>&5

34165

28307

ac_status=$?

34166

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

34167

- (exit $ac_status); }; then

34168

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

34169

+ test $ac_status = 0; }; then

34170

# Parse the compiler output and extract the necessary

34171

# objects, libraries and library flags.

34172

34173

@@ -13429,8 +12778,8 @@ fi

28308

@@ -12600,7 +13123,7 @@ if { { eval echo "\"\$as_me\":${as_linen

28309

pre_test_object_deps_done=no

28310

28311

for p in `eval "$output_verbose_link_cmd"`; do

28312

- case $p in

28313

+ case ${prev}${p} in

28314

28315

-L* | -R* | -l*)

28316

# Some compilers place space between "-{L,R}" and the path.

28317

@@ -12609,13 +13132,22 @@ if { { eval echo "\"\$as_me\":${as_linen

28318

test $p = "-R"; then

28319

prev=$p

28320

continue

28321

- else

28322

- prev=

28323

28324

28325

+ # Expand the sysroot to ease extracting the directories later.

28326

+ if test -z "$prev"; then

28327

+ case $p in

28328

+ -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;

28329

+ -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;

28330

+ -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;

28331

+ esac

28332

+ fi

28333

+ case $p in

28334

+ =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;

28335

+ esac

28336

if test "$pre_test_object_deps_done" = no; then

28337

- case $p in

28338

- -L* | -R*)

28339

+ case ${prev} in

28340

+ -L | -R)

28341

# Internal compiler library paths should come after those

28342

# provided the user. The postdeps already come after the

28343

# user supplied libs so there is no need to process them.

28344

@@ -12635,8 +13167,10 @@ if { { eval echo "\"\$as_me\":${as_linen

28345

postdeps_CXX="${postdeps_CXX} ${prev}${p}"

28346

28347

28348

+ prev=

28349

;;

28350

28351

+ *.lto.$objext) ;; # Ignore GCC LTO objects

28352

*.$objext)

28353

# This assumes that the test object file only shows up

28354

# once in the compiler output.

28355

@@ -12672,6 +13206,7 @@ else

28356

28357

28358

$RM -f confest.$objext

28359

+CFLAGS=$_lt_libdeps_save_CFLAGS

28360

28361

# PORTME: override above test on systems where it is broken

28362

case $host_os in

28363

@@ -12707,7 +13242,7 @@ linux*)

28364

28365

solaris*)

28366

case $cc_basename in

28367

- CC*)

28368

+ CC* | sunCC*)

28369

# The more standards-conforming stlport4 library is

28370

# incompatible with the Cstd library. Avoid specifying

28371

# it if it's in CXXFLAGS. Ignore libCrun as

28372

@@ -12772,8 +13307,6 @@ fi

34174

28373

lt_prog_compiler_pic_CXX=

34175

28374

lt_prog_compiler_static_CXX=

34176

28375

34177

-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

34178

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

34179

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

34180

+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

28376

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

28377

-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

34181

28378

34182

28379

# C++ specific cases for pic, static, wl, etc.

34183

28380

if test "$GXX" = yes; then

34184

@@ -13464,7 +12813,7 @@ echo $ECHO_N "checking for $compiler opt

34185

beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

34186

# PIC is the default for these OSes.

34187

;;

34188

- mingw* | cygwin* | os2* | pw32*)

34189

+ mingw* | cygwin* | os2* | pw32* | cegcc*)

34190

# This hack is so that the source file can tell whether it is being

34191

# built for inclusion in a dll (and should export symbols for example).

34192

# Although the cygwin gcc ignores -fPIC, still need this for old-style

34193

@@ -13490,10 +12839,11 @@ echo $ECHO_N "checking for $compiler opt

34194

34195

;;

34196

hpux*)

34197

- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but

34198

- # not for PA HP-UX.

34199

+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit

34200

+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag

34201

+ # sets the default TLS model and affects inlining.

34202

case $host_cpu in

34203

- hppa*64*|ia64*)

34204

+ hppa*64*)

34205

;;

34206

34207

lt_prog_compiler_pic_CXX='-fPIC'

34208

@@ -13584,19 +12934,26 @@ echo $ECHO_N "checking for $compiler opt

34209

;;

28381

@@ -12823,6 +13356,11 @@ $as_echo_n "checking for $compiler optio

28382

# DJGPP does not support shared libraries at all

28383

lt_prog_compiler_pic_CXX=

28384

;;

28385

+ haiku*)

28386

+ # PIC is the default for Haiku.

28387

+ # The "-static" flag exists, but is broken.

28388

+ lt_prog_compiler_static_CXX=

28389

+ ;;

28390

interix[3-9]*)

28391

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

28392

# Instead, we relocate shared libraries at runtime.

28393

@@ -12872,6 +13410,11 @@ $as_echo_n "checking for $compiler optio

28394

;;

34210

28395

esac

34211

28396

;;

34212

- linux* | k*bsd*-gnu)

34213

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

28397

+ mingw* | cygwin* | os2* | pw32* | cegcc*)

28398

+ # This hack is so that the source file can tell whether it is being

28399

+ # built for inclusion in a dll (and should export symbols for example).

28400

+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'

28401

+ ;;

28402

dgux*)

34214

28403

case $cc_basename in

34215

KCC*)

34216

# KAI C++ Compiler

34217

lt_prog_compiler_wl_CXX='--backend -Wl,'

34218

lt_prog_compiler_pic_CXX='-fPIC'

28404

ec++*)

28405

@@ -12961,8 +13504,8 @@ $as_echo_n "checking for $compiler optio

28406

lt_prog_compiler_pic_CXX=

28407

lt_prog_compiler_static_CXX='-non_shared'

34219

28408

;;

34220

- icpc* | ecpc* )

34221

- # Intel C++

34222

+ ecpc* )

34223

+ # old Intel C++ for x86_64 which still supported -KPIC.

28409

- xlc* | xlC*)

28410

- # IBM XL 8.0 on PPC

28411

+ xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)

28412

+ # IBM XL 8.0, 9.0 on PPC and BlueGene

34224

28413

lt_prog_compiler_wl_CXX='-Wl,'

28414

lt_prog_compiler_pic_CXX='-qpic'

28415

lt_prog_compiler_static_CXX='-qstaticlink'

28416

@@ -13024,7 +13567,7 @@ $as_echo_n "checking for $compiler optio

28417

;;

28418

solaris*)

28419

case $cc_basename in

28420

- CC*)

28421

+ CC* | sunCC*)

28422

# Sun C++ 4.2, 5.x and Centerline C++

34225

28423

lt_prog_compiler_pic_CXX='-KPIC'

34226

lt_prog_compiler_static_CXX='-static'

34227

;;

34228

+ icpc* )

34229

+ # Intel C++, used to be incompatible with GCC.

34230

+ # ICC 10 doesn't accept -KPIC any more.

34231

+ lt_prog_compiler_wl_CXX='-Wl,'

34232

+ lt_prog_compiler_pic_CXX='-fPIC'

34233

+ lt_prog_compiler_static_CXX='-static'

34234

+ ;;

34235

pgCC* | pgcpp*)

34236

# Portland Group C++ compiler

34237

lt_prog_compiler_wl_CXX='-Wl,'

34238

@@ -13641,7 +12998,7 @@ echo $ECHO_N "checking for $compiler opt

34239

;;

34240

esac

34241

;;

34242

- netbsd*)

34243

+ netbsd* | netbsdelf*-gnu)

34244

;;

34245

*qnx* | *nto*)

34246

# QNX uses GNU C++, but need to define -shared option too, otherwise

34247

@@ -13738,8 +13095,8 @@ case $host_os in

28424

lt_prog_compiler_static_CXX='-Bstatic'

28425

@@ -13089,10 +13632,17 @@ case $host_os in

34248

28426

lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"

34249

28427

;;

34250

28428

esac

34251

-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5

34252

-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }

34253

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5

34254

+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }

34255

34256

34257

34258

@@ -13747,10 +13104,10 @@ echo "${ECHO_T}$lt_prog_compiler_pic_CXX

28429

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5

28430

-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }

28431

28432

28433

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

28434

+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

28435

+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :

28436

+ $as_echo_n "(cached) " >&6

28437

+else

28438

+ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX

28439

+fi

28440

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5

28441

+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }

28442

+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX

28443

28444

34259

28445

# Check to make sure the PIC flag actually works.

34260

28446

@@ -13100,7 +13650,7 @@ $as_echo "$lt_prog_compiler_pic_CXX" >&6

34261

28447

if test -n "$lt_prog_compiler_pic_CXX"; then

34262

- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

34263

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }

34264

-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then

34265

- echo $ECHO_N "(cached) $ECHO_C" >&6

34266

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

34267

+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }

34268

+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :

34269

+ $as_echo_n "(cached) " >&6

28448

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

28449

$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }

28450

-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :

28451

+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :

28452

$as_echo_n "(cached) " >&6

34270

28453

else

34271

28454

lt_cv_prog_compiler_pic_works_CXX=no

34272

ac_outfile=conftest.$ac_objext

34273

@@ -13765,11 +13122,11 @@ else

28455

@@ -13116,15 +13666,15 @@ else

34274

28456

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

34275

28457

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

34276

28458

-e 's:$: $lt_compiler_flag:'`

34277

- (eval echo "\"\$as_me:13768: $lt_compile\"" >&5)

34278

+ (eval echo "\"\$as_me:13125: $lt_compile\"" >&5)

28459

- (eval echo "\"\$as_me:13119: $lt_compile\"" >&5)

28460

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

34279

28461

(eval "$lt_compile" 2>conftest.err)

34280

28462

ac_status=$?

34281

28463

cat conftest.err >&5

34282

- echo "$as_me:13772: \$? = $ac_status" >&5

34283

+ echo "$as_me:13129: \$? = $ac_status" >&5

28464

- echo "$as_me:13123: \$? = $ac_status" >&5

28465

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

34284

28466

if (exit $ac_status) && test -s "$ac_outfile"; then

34285

28467

# The compiler can only warn and ignore the option if not recognized

34286

28468

# So say no if there are warnings other than the usual output.

34287

@@ -13782,8 +13139,8 @@ else

34288

$RM conftest*

34289

34290

34291

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5

34292

-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }

34293

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5

34294

+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }

34295

34296

if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then

34297

case $lt_prog_compiler_pic_CXX in

34298

@@ -13803,10 +13160,10 @@ fi

28469

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

28470

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp

28471

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

28472

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

28473

lt_cv_prog_compiler_pic_works_CXX=yes

28474

@@ -13150,13 +13700,15 @@ fi

28475

28476

28477

28478

28479

28480

34299

28481

# Check to make sure the static flag actually works.

34300

28482

34301

28483

wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"

34302

-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

34303

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

34304

-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then

34305

- echo $ECHO_N "(cached) $ECHO_C" >&6

34306

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5

34307

+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

34308

+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :

34309

+ $as_echo_n "(cached) " >&6

28484

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5

28485

$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

28486

-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :

28487

+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :

28488

$as_echo_n "(cached) " >&6

34310

28489

else

34311

28490

lt_cv_prog_compiler_static_works_CXX=no

34312

save_LDFLAGS="$LDFLAGS"

34313

@@ -13831,8 +13188,8 @@ else

34314

LDFLAGS="$save_LDFLAGS"

34315

34316

34317

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5

34318

-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }

34319

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5

34320

+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }

34321

34322

if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then

34323

34324

@@ -13843,10 +13200,10 @@ fi

34325

34326

34327

34328

- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

34329

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

34330

-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then

34331

- echo $ECHO_N "(cached) $ECHO_C" >&6

34332

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

34333

+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

34334

+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :

34335

+ $as_echo_n "(cached) " >&6

34336

else

34337

lt_cv_prog_compiler_c_o_CXX=no

34338

$RM -r conftest 2>/dev/null

34339

@@ -13864,11 +13221,11 @@ else

34340

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

34341

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

34342

-e 's:$: $lt_compiler_flag:'`

34343

- (eval echo "\"\$as_me:13867: $lt_compile\"" >&5)

34344

+ (eval echo "\"\$as_me:13224: $lt_compile\"" >&5)

34345

(eval "$lt_compile" 2>out/conftest.err)

34346

ac_status=$?

34347

cat out/conftest.err >&5

34348

- echo "$as_me:13871: \$? = $ac_status" >&5

34349

+ echo "$as_me:13228: \$? = $ac_status" >&5

34350

if (exit $ac_status) && test -s out/conftest2.$ac_objext

34351

then

34352

# The compiler can only warn and ignore the option if not recognized

34353

@@ -13890,15 +13247,15 @@ else

34354

$RM conftest*

34355

34356

34357

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

34358

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }

34359

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5

34360

+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }

34361

34362

34363

34364

- { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

34365

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

34366

-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then

34367

- echo $ECHO_N "(cached) $ECHO_C" >&6

34368

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

34369

+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

34370

+if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :

34371

+ $as_echo_n "(cached) " >&6

34372

else

34373

lt_cv_prog_compiler_c_o_CXX=no

34374

$RM -r conftest 2>/dev/null

34375

@@ -13916,11 +13273,11 @@ else

34376

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

34377

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

34378

-e 's:$: $lt_compiler_flag:'`

34379

- (eval echo "\"\$as_me:13919: $lt_compile\"" >&5)

34380

+ (eval echo "\"\$as_me:13276: $lt_compile\"" >&5)

34381

(eval "$lt_compile" 2>out/conftest.err)

34382

ac_status=$?

34383

cat out/conftest.err >&5

34384

- echo "$as_me:13923: \$? = $ac_status" >&5

34385

+ echo "$as_me:13280: \$? = $ac_status" >&5

34386

if (exit $ac_status) && test -s out/conftest2.$ac_objext

34387

then

34388

# The compiler can only warn and ignore the option if not recognized

34389

@@ -13942,8 +13299,8 @@ else

34390

$RM conftest*

34391

34392

34393

-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

34394

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }

34395

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5

34396

+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }

34397

34398

34399

34400

@@ -13951,19 +13308,19 @@ echo "${ECHO_T}$lt_cv_prog_compiler_c_o_

34401

hard_links="nottested"

34402

if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then

34403

# do not overwrite the value of need_locks provided by the user

34404

- { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

34405

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

34406

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5

34407

+$as_echo_n "checking if we can lock with hard links... " >&6; }

34408

hard_links=yes

34409

$RM conftest*

34410

ln conftest.a conftest.b 2>/dev/null && hard_links=no

34411

touch conftest.a

34412

ln conftest.a conftest.b 2>&5 || hard_links=no

34413

ln conftest.a conftest.b 2>/dev/null && hard_links=no

34414

- { echo "$as_me:$LINENO: result: $hard_links" >&5

34415

-echo "${ECHO_T}$hard_links" >&6; }

34416

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5

34417

+$as_echo "$hard_links" >&6; }

34418

if test "$hard_links" = no; then

34419

- { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

34420

-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

34421

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

34422

+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

34423

need_locks=warn

34424

34425

else

34426

@@ -13972,8 +13329,8 @@ fi

34427

34428

34429

34430

- { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

34431

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

34432

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5

34433

+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

28491

@@ -13169,7 +13721,7 @@ else

28492

if test -s conftest.err; then

28493

# Append any errors to the config.log.

28494

cat conftest.err 1>&5

28495

- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp

28496

+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp

28497

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

28498

if diff conftest.exp conftest.er2 >/dev/null; then

28499

lt_cv_prog_compiler_static_works_CXX=yes

28500

@@ -13196,7 +13748,7 @@ fi

28501

28502

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

28503

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

28504

-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :

28505

+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :

28506

$as_echo_n "(cached) " >&6

28507

else

28508

lt_cv_prog_compiler_c_o_CXX=no

28509

@@ -13215,16 +13767,16 @@ else

28510

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

28511

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

28512

-e 's:$: $lt_compiler_flag:'`

28513

- (eval echo "\"\$as_me:13218: $lt_compile\"" >&5)

28514

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

28515

(eval "$lt_compile" 2>out/conftest.err)

28516

ac_status=$?

28517

cat out/conftest.err >&5

28518

- echo "$as_me:13222: \$? = $ac_status" >&5

28519

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

28520

if (exit $ac_status) && test -s out/conftest2.$ac_objext

28521

then

28522

# The compiler can only warn and ignore the option if not recognized

28523

# So say no if there are warnings

28524

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp

28525

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp

28526

$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2

28527

if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then

28528

lt_cv_prog_compiler_c_o_CXX=yes

28529

@@ -13248,7 +13800,7 @@ $as_echo "$lt_cv_prog_compiler_c_o_CXX"

28530

28531

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

28532

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

28533

-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :

28534

+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :

28535

$as_echo_n "(cached) " >&6

28536

else

28537

lt_cv_prog_compiler_c_o_CXX=no

28538

@@ -13267,16 +13819,16 @@ else

28539

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

28540

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

28541

-e 's:$: $lt_compiler_flag:'`

28542

- (eval echo "\"\$as_me:13270: $lt_compile\"" >&5)

28543

+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)

28544

(eval "$lt_compile" 2>out/conftest.err)

28545

ac_status=$?

28546

cat out/conftest.err >&5

28547

- echo "$as_me:13274: \$? = $ac_status" >&5

28548

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

28549

if (exit $ac_status) && test -s out/conftest2.$ac_objext

28550

then

28551

# The compiler can only warn and ignore the option if not recognized

28552

# So say no if there are warnings

28553

- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp

28554

+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp

28555

$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2

28556

if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then

28557

lt_cv_prog_compiler_c_o_CXX=yes

28558

@@ -13327,30 +13879,38 @@ fi

28559

$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

34434

28560

34435

28561

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

28562

+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

34436

28563

case $host_os in

34437

@@ -13989,17 +13346,20 @@ echo $ECHO_N "checking whether the $comp

28564

aix[4-9]*)

28565

# If we're using GNU nm, then we don't want the "-C" option.

28566

# -C means demangle to AIX nm, but means don't demangle with GNU nm

28567

+ # Also, AIX nm treats weak defined symbols like other global defined

28568

+ # symbols, whereas GNU nm marks them as "W".

28569

if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then

28570

28571

28572

else

28573

28574

28575

;;

34438

28576

pw32*)

34439

28577

export_symbols_cmds_CXX="$ltdll_cmds"

34440

;;

34441

- cygwin* | mingw*)

34442

+ cygwin* | mingw* | cegcc*)

34443

34444

;;

34445

+ linux* | k*bsd*-gnu)

34446

+ link_all_deplibs_CXX=no

34447

+ ;;

28578

- ;;

28579

+ ;;

28580

cygwin* | mingw* | cegcc*)

28581

28582

- ;;

28583

- linux* | k*bsd*-gnu)

28584

+ case $cc_basename in

28585

+ cl*) ;;

28586

+ *)

28587

28588

+ exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'

28589

+ ;;

28590

+ esac

28591

+ ;;

28592

+ linux* | k*bsd*-gnu | gnu*)

28593

link_all_deplibs_CXX=no

28594

- ;;

28595

+ ;;

34448

28596

34449

28597

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

34450

;;

28598

- ;;

28599

+ ;;

34451

28600

esac

34452

exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

34453

34454

-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

34455

-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

34456

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5

34457

+$as_echo "$ld_shlibs_CXX" >&6; }

34458

test "$ld_shlibs_CXX" = no && can_build_shared=no

34459

34460

with_gnu_ld_CXX=$with_gnu_ld

34461

@@ -14026,16 +13386,16 @@ x|xyes)

34462

# Test whether the compiler implicitly links with -lc since on some

34463

# systems, -lgcc has to come before -lc. If gcc already passes -lc

28601

- exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

28602

28603

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5

28604

$as_echo "$ld_shlibs_CXX" >&6; }

28605

@@ -13382,44 +13942,50 @@ x|xyes)

34464

28606

# to ld, don't add -lc before -lgcc.

34465

- { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

34466

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

34467

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5

34468

+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

34469

$RM conftest*

34470

echo "$lt_simple_compile_test_code" > conftest.$ac_ext

28607

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5

28608

$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

28609

- $RM conftest*

28610

- echo "$lt_simple_compile_test_code" > conftest.$ac_ext

28611

+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :

28612

+ $as_echo_n "(cached) " >&6

28613

+else

28614

+ $RM conftest*

28615

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

34471

28616

34472

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

34473

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

28617

- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

28618

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

34474

28619

(eval $ac_compile) 2>&5

34475

28620

ac_status=$?

34476

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

34477

- (exit $ac_status); } 2>conftest.err; then

34478

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

34479

+ test $ac_status = 0; } 2>conftest.err; then

34480

soname=conftest

34481

lib=conftest

34482

libobjs=conftest.$ac_objext

34483

@@ -14049,11 +13409,11 @@ echo $ECHO_N "checking whether -lc shoul

34484

libname=conftest

34485

lt_save_allow_undefined_flag=$allow_undefined_flag_CXX

34486

allow_undefined_flag_CXX=

34487

- if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5

34488

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

28621

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

28622

test $ac_status = 0; } 2>conftest.err; then

28623

- soname=conftest

28624

- lib=conftest

28625

- libobjs=conftest.$ac_objext

28626

- deplibs=

28627

- wl=$lt_prog_compiler_wl_CXX

28628

- pic_flag=$lt_prog_compiler_pic_CXX

28629

- compiler_flags=-v

28630

- linker_flags=-v

28631

- verstring=

28632

- output_objdir=.

28633

- libname=conftest

28634

- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX

28635

- allow_undefined_flag_CXX=

28636

- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

28637

+ soname=conftest

28638

+ lib=conftest

28639

+ libobjs=conftest.$ac_objext

28640

+ deplibs=

28641

+ wl=$lt_prog_compiler_wl_CXX

28642

+ pic_flag=$lt_prog_compiler_pic_CXX

28643

+ compiler_flags=-v

28644

+ linker_flags=-v

28645

+ verstring=

28646

+ output_objdir=.

28647

+ libname=conftest

28648

+ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX

28649

+ allow_undefined_flag_CXX=

28650

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

34489

28651

(eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5

34490

28652

ac_status=$?

34491

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

34492

- (exit $ac_status); }

34493

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

34494

+ test $ac_status = 0; }

34495

then

34496

archive_cmds_need_lc_CXX=no

34497

else

34498

@@ -14064,8 +13424,8 @@ echo $ECHO_N "checking whether -lc shoul

34499

cat conftest.err 1>&5

34500

34501

$RM conftest*

34502

- { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5

34503

-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }

34504

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5

34505

+$as_echo "$archive_cmds_need_lc_CXX" >&6; }

28653

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

28654

test $ac_status = 0; }

28655

- then

28656

- archive_cmds_need_lc_CXX=no

28657

- else

28658

- archive_cmds_need_lc_CXX=yes

28659

- fi

28660

- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag

28661

- else

28662

- cat conftest.err 1>&5

28663

- fi

28664

- $RM conftest*

28665

- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5

28666

-$as_echo "$archive_cmds_need_lc_CXX" >&6; }

28667

+ then

28668

+ lt_cv_archive_cmds_need_lc_CXX=no

28669

+ else

28670

+ lt_cv_archive_cmds_need_lc_CXX=yes

28671

+ fi

28672

+ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag

28673

+ else

28674

+ cat conftest.err 1>&5

28675

+ fi

28676

+ $RM conftest*

28677

28678

+fi

28679

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5

28680

+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }

28681

+ archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX

34506

28682

;;

34507

28683

esac

34508

28684

34509

@@ -14135,8 +13495,8 @@ esac

34510

34511

34512

34513

- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

34514

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

34515

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5

34516

+$as_echo_n "checking dynamic linker characteristics... " >&6; }

34517

34518

library_names_spec=

34519

libname_spec='lib$name'

34520

@@ -14247,14 +13607,14 @@ bsdi[45]*)

34521

# libtool to hard-code these into programs

28685

@@ -13576,7 +14142,7 @@ amigaos*)

28686

m68k)

28687

library_names_spec='$libname.ixlibrary $libname.a'

28688

# Create ${libname}_ixlibrary.a entries in /sys/libs.

28689

28690

28691

;;

28692

esac

34522

28693

;;

34523

34524

-cygwin* | mingw* | pw32*)

34525

+cygwin* | mingw* | pw32* | cegcc*)

34526

version_type=windows

34527

shrext_cmds=".dll"

28694

@@ -13607,8 +14173,9 @@ cygwin* | mingw* | pw32* | cegcc*)

34528

28695

need_version=no

34529

28696

need_lib_prefix=no

34530

28697

34531

case $GCC,$host_os in

34532

- yes,cygwin* | yes,mingw* | yes,pw32*)

34533

+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

28698

- case $GCC,$host_os in

28699

- yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)

28700

+ case $GCC,$cc_basename in

28701

+ yes,*)

28702

+ # gcc

34534

28703

library_names_spec='$libname.dll.a'

34535

28704

# DLL is installed to $(libdir)/../bin by postinstall_cmds

34536

28705

postinstall_cmds='base_file=`basename \${file}`~

34537

@@ -14277,7 +13637,7 @@ cygwin* | mingw* | pw32*)

28706

@@ -13629,36 +14196,82 @@ cygwin* | mingw* | pw32* | cegcc*)

28707

cygwin*)

28708

# Cygwin DLLs use 'cyg' prefix rather than 'lib'

34538

28709

soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

34539

sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

28710

- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"

28711

34540

28712

;;

34541

- mingw*)

34542

+ mingw* | cegcc*)

28713

mingw* | cegcc*)

34543

28714

# MinGW DLLs use traditional 'lib' prefix

34544

28715

soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

34545

sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

34546

@@ -14491,7 +13851,7 @@ linux*oldld* | linux*aout* | linux*coff*

34547

;;

34548

34549

# This must be Linux ELF.

34550

-linux* | k*bsd*-gnu)

34551

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

34552

version_type=linux

34553

need_lib_prefix=no

34554

need_version=no

34555

@@ -14505,11 +13865,7 @@ linux* | k*bsd*-gnu)

34556

save_libdir=$libdir

34557

eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \

34558

LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""

34559

- cat >conftest.$ac_ext <<_ACEOF

34560

-/* confdefs.h. */

34561

-_ACEOF

34562

-cat confdefs.h >>conftest.$ac_ext

34563

-cat >>conftest.$ac_ext <<_ACEOF

34564

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

34565

/* end confdefs.h. */

34566

34567

int

34568

@@ -14520,37 +13876,13 @@ main ()

34569

return 0;

34570

}

34571

_ACEOF

34572

-rm -f conftest.$ac_objext conftest$ac_exeext

34573

-if { (ac_try="$ac_link"

34574

-case "(($ac_try" in

34575

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

34576

- *) ac_try_echo=$ac_try;;

34577

-esac

34578

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

34579

- (eval "$ac_link") 2>conftest.er1

34580

- ac_status=$?

34581

- grep -v '^ *+' conftest.er1 >conftest.err

34582

- rm -f conftest.er1

34583

- cat conftest.err >&5

34584

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

34585

- (exit $ac_status); } && {

34586

- test -z "$ac_cxx_werror_flag" ||

34587

- test ! -s conftest.err

34588

- } && test -s conftest$ac_exeext &&

34589

- $as_test_x conftest$ac_exeext; then

34590

- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then

34591

+if ac_fn_cxx_try_link "$LINENO"; then :

34592

+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :

34593

shlibpath_overrides_runpath=yes

34594

34595

34596

-else

34597

- echo "$as_me: failed program was:" >&5

34598

-sed 's/^/| /' conftest.$ac_ext >&5

34599

34600

34601

34602

34603

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

34604

- conftest$ac_exeext conftest.$ac_ext

34605

+rm -f core conftest.err conftest.$ac_objext \

34606

+ conftest$ac_exeext conftest.$ac_ext

34607

LDFLAGS=$save_LDFLAGS

34608

libdir=$save_libdir

34609

34610

@@ -14574,6 +13906,18 @@ rm -f core conftest.err conftest.$ac_obj

34611

dynamic_linker='GNU/Linux ld.so'

34612

;;

34613

34614

+netbsdelf*-gnu)

28716

- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

28717

- if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then

28718

- # It is most probably a Windows format PATH printed by

28719

- # mingw gcc, but we are running on Cygwin. Gcc prints its search

28720

- # path with ; separators, and with drive letters. We can handle the

28721

- # drive letters (cygwin fileutils understands them), so leave them,

28722

- # especially as we might pass files found there to a mingw objdump,

28723

- # which wouldn't understand a cygwinified path. Ahh.

28724

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

28725

- else

28726

- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

28727

- fi

28728

;;

28729

pw32*)

28730

# pw32 DLLs use 'pw' prefix rather than 'lib'

28731

library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

28732

;;

28733

esac

28734

+ dynamic_linker='Win32 ld.exe'

28735

+ ;;

28736

28737

+ *,cl*)

28738

+ # Native MSVC

28739

+ libname_spec='$name'

28740

+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'

28741

+ library_names_spec='${libname}.dll.lib'

28742

28743

+ case $build_os in

28744

+ mingw*)

28745

+ sys_lib_search_path_spec=

28746

+ lt_save_ifs=$IFS

28747

+ IFS=';'

28748

+ for lt_path in $LIB

28749

+ do

28750

+ IFS=$lt_save_ifs

28751

+ # Let DOS variable expansion print the short 8.3 style file name.

28752

+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`

28753

+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"

28754

+ done

28755

+ IFS=$lt_save_ifs

28756

+ # Convert to MSYS style.

28757

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[a-zA-Z]\$:| /\\1|g' -e 's|^ ||'`

28758

+ ;;

28759

+ cygwin*)

28760

+ # Convert to unix form, then to dos form, then back to unix form

28761

+ # but this time dos style (no spaces!) so that the unix form looks

28762

+ # like /cygdrive/c/PROGRA~1:/cygdr...

28763

+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`

28764

+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`

28765

+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

28766

+ ;;

28767

+ *)

28768

+ sys_lib_search_path_spec="$LIB"

28769

+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then

28770

+ # It is most probably a Windows format PATH.

28771

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

28772

+ else

28773

+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

28774

+ fi

28775

+ # FIXME: find the short name or the path components, as spaces are

28776

+ # common. (e.g. "Program Files" -> "PROGRA~1")

28777

+ ;;

28778

+ esac

28779

28780

+ # DLL is installed to $(libdir)/../bin by postinstall_cmds

28781

+ postinstall_cmds='base_file=`basename \${file}`~

28782

+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~

28783

+ dldir=$destdir/`dirname \$dlpath`~

28784

+ test -d \$dldir || mkdir -p \$dldir~

28785

+ $install_prog $dir/$dlname \$dldir/$dlname'

28786

+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~

28787

+ dlpath=$dir/\$dldll~

28788

+ $RM \$dlpath'

28789

+ shlibpath_overrides_runpath=yes

28790

+ dynamic_linker='Win32 link.exe'

28791

;;

28792

28793

28794

+ # Assume MSVC wrapper

28795

library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'

28796

+ dynamic_linker='Win32 ld.exe'

28797

;;

28798

esac

28799

- dynamic_linker='Win32 ld.exe'

28800

# FIXME: first we should search . and the directory the executable is in

28801

shlibpath_var=PATH

28802

;;

28803

@@ -13741,6 +14354,20 @@ gnu*)

28804

library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

28805

soname_spec='${libname}${release}${shared_ext}$major'

28806

shlibpath_var=LD_LIBRARY_PATH

28807

+ shlibpath_overrides_runpath=no

28808

+ hardcode_into_libs=yes

28809

+ ;;

28810

28811

+haiku*)

34615

28812

+ version_type=linux

34616

28813

+ need_lib_prefix=no

34617

28814

+ need_version=no

34618

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

28815

+ dynamic_linker="$host_os runtime_loader"

28816

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'

34619

28817

+ soname_spec='${libname}${release}${shared_ext}$major'

34620

+ shlibpath_var=LD_LIBRARY_PATH

34621

+ shlibpath_overrides_runpath=no

34622

+ hardcode_into_libs=yes

34623

+ dynamic_linker='NetBSD ld.elf_so'

34624

+ ;;

34625

34626

netbsd*)

34627

version_type=sunos

34628

need_lib_prefix=no

34629

@@ -14745,7 +14089,7 @@ tpf*)

34630

version_type=linux

34631

need_lib_prefix=no

34632

need_version=no

34633

- library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

34634

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'

28818

+ shlibpath_var=LIBRARY_PATH

28819

+ shlibpath_overrides_runpath=yes

28820

+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'

28821

hardcode_into_libs=yes

28822

;;

28823

28824

@@ -13786,8 +14413,10 @@ hpux9* | hpux10* | hpux11*)

28825

soname_spec='${libname}${release}${shared_ext}$major'

28826

;;

28827

esac

28828

- # HP-UX runs *really* slowly unless shared libraries are mode 555.

28829

+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...

28830

postinstall_cmds='chmod 555 $lib'

28831

+ # or fails outright, so override atomically:

28832

+ install_override_mode=555

28833

;;

28834

28835

interix[3-9]*)

28836

@@ -13854,12 +14483,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)

28837

finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'

34635

28838

shlibpath_var=LD_LIBRARY_PATH

34636

28839

shlibpath_overrides_runpath=no

34637

hardcode_into_libs=yes

34638

@@ -14762,8 +14106,8 @@ uts4*)

34639

dynamic_linker=no

34640

;;

34641

esac

34642

-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

34643

-echo "${ECHO_T}$dynamic_linker" >&6; }

34644

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5

34645

+$as_echo "$dynamic_linker" >&6; }

34646

test "$dynamic_linker" = no && can_build_shared=no

34647

34648

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

34649

@@ -14813,8 +14157,8 @@ fi

34650

34651

34652

34653

- { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

34654

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

34655

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5

34656

+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

28840

28841

# Some binutils ld are patched to set DT_RUNPATH

28842

- save_LDFLAGS=$LDFLAGS

28843

- save_libdir=$libdir

28844

- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \

28845

- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""

28846

- cat confdefs.h - <<_ACEOF >conftest.$ac_ext

28847

+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :

28848

+ $as_echo_n "(cached) " >&6

28849

+else

28850

+ lt_cv_shlibpath_overrides_runpath=no

28851

+ save_LDFLAGS=$LDFLAGS

28852

+ save_libdir=$libdir

28853

+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \

28854

+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""

28855

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

28856

/* end confdefs.h. */

28857

28858

int

28859

@@ -13872,13 +14506,17 @@ main ()

28860

_ACEOF

28861

if ac_fn_cxx_try_link "$LINENO"; then :

28862

if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :

28863

- shlibpath_overrides_runpath=yes

28864

+ lt_cv_shlibpath_overrides_runpath=yes

28865

28866

28867

rm -f core conftest.err conftest.$ac_objext \

28868

conftest$ac_exeext conftest.$ac_ext

28869

- LDFLAGS=$save_LDFLAGS

28870

- libdir=$save_libdir

28871

+ LDFLAGS=$save_LDFLAGS

28872

+ libdir=$save_libdir

28873

28874

+fi

28875

28876

+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath

28877

28878

# This implies no fast_install, which is unacceptable.

28879

# Some rework will be needed to allow for fast_install

28880

@@ -13887,7 +14525,7 @@ rm -f core conftest.err conftest.$ac_obj

28881

28882

# Append ld.so.conf contents to the search path

28883

if test -f /etc/ld.so.conf; then

28884

28885

28886

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

28887

28888

28889

@@ -14151,6 +14789,8 @@ fi

28890

28891

28892

28893

28894

28895

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5

28896

$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

34657

28897

hardcode_action_CXX=

34658

if test -n "$hardcode_libdir_flag_spec_CXX" ||

34659

test -n "$runpath_var_CXX" ||

34660

@@ -14838,8 +14182,8 @@ else

34661

# directories.

34662

hardcode_action_CXX=unsupported

34663

34664

-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5

34665

-echo "${ECHO_T}$hardcode_action_CXX" >&6; }

34666

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5

34667

+$as_echo "$hardcode_action_CXX" >&6; }

28898

@@ -14198,6 +14838,7 @@ fi

28899

fi # test -n "$compiler"

34668

28900

34669

if test "$hardcode_action_CXX" = relink ||

34670

test "$inherit_rpath_CXX" = yes; then

34671

@@ -14905,10 +14249,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

34672

PYTHON= # We *do not* allow the user to specify a python interpreter

34673

# Extract the first word of "python", so it can be a program name with args.

28901

CC=$lt_save_CC

28902

+ CFLAGS=$lt_save_CFLAGS

28903

LDCXX=$LD

28904

LD=$lt_save_LD

28905

GCC=$lt_save_GCC

28906

@@ -14245,7 +14886,7 @@ PYTHON= # We *do not* allow the user to

34674

28907

set dummy python; ac_word=$2

34675

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

34676

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

34677

-if test "${ac_cv_path_PYTHON+set}" = set; then

34678

- echo $ECHO_N "(cached) $ECHO_C" >&6

34679

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

34680

+$as_echo_n "checking for $ac_word... " >&6; }

34681

+if test "${ac_cv_path_PYTHON+set}" = set; then :

34682

+ $as_echo_n "(cached) " >&6

28908

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

28909

$as_echo_n "checking for $ac_word... " >&6; }

28910

-if test "${ac_cv_path_PYTHON+set}" = set; then :

28911

+if ${ac_cv_path_PYTHON+:} false; then :

28912

$as_echo_n "(cached) " >&6

34683

28913

else

34684

28914

case $PYTHON in

34685

[\\/]* | ?:[\\/]*)

34686

@@ -14920,14 +14264,14 @@ for as_dir in $PATH

34687

34688

IFS=$as_save_IFS

34689

test -z "$as_dir" && as_dir=.

34690

- for ac_exec_ext in '' $ac_executable_extensions; do

34691

+ for ac_exec_ext in '' $ac_executable_extensions; do

34692

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

34693

ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"

34694

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

34695

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

34696

break 2

34697

34698

done

34699

-done

34700

+ done

34701

IFS=$as_save_IFS

34702

34703

test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON=":"

34704

@@ -14936,34 +14280,34 @@ esac

34705

34706

PYTHON=$ac_cv_path_PYTHON

34707

if test -n "$PYTHON"; then

34708

- { echo "$as_me:$LINENO: result: $PYTHON" >&5

34709

-echo "${ECHO_T}$PYTHON" >&6; }

34710

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5

34711

+$as_echo "$PYTHON" >&6; }

34712

else

34713

- { echo "$as_me:$LINENO: result: no" >&5

34714

-echo "${ECHO_T}no" >&6; }

34715

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

34716

+$as_echo "no" >&6; }

34717

34718

34719

34720

-if test "$PYTHON" != ":"; then

34721

- prog="import sys, string

34722

+if test "$PYTHON" != ":"; then :

34723

+ prog="import sys

34724

# split strings by '.' and convert to numeric. Append some zeros

34725

# because we need at least 4 digits for the hex conversion.

34726

-minver = map(int, string.split('2.3', '.')) + [0, 0, 0]

34727

+# map returns an iterator in Python 3.0 and a list in 2.x

34728

+minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0]

34729

minverhex = 0

34730

-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]

34731

+# xrange is not present in Python 3.0 and range returns an iterator

34732

+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]

34733

sys.exit(sys.hexversion < minverhex)"

34734

if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5

34735

($PYTHON -c "$prog") >&5 2>&5

34736

ac_status=$?

34737

echo "$as_me:$LINENO: \$? = $ac_status" >&5

34738

- (exit $ac_status); }; then

34739

+ (exit $ac_status); }; then :

34740

34741

else

34742

PYTHON=":"

34743

34744

34745

34746

34747

if test "$PYTHON" != ":"; then

34748

HAVE_PYTHON_TRUE=

34749

HAVE_PYTHON_FALSE='#'

34750

@@ -14997,13 +14341,9 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS"

34751

CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

34752

save_LIBS="$LIBS"

34753

LIBS="$PTHREAD_LIBS $LIBS"

34754

- { echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5

34755

-echo $ECHO_N "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... $ECHO_C" >&6; }

34756

- cat >conftest.$ac_ext <<_ACEOF

34757

-/* confdefs.h. */

34758

-_ACEOF

34759

-cat confdefs.h >>conftest.$ac_ext

34760

-cat >>conftest.$ac_ext <<_ACEOF

34761

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5

34762

+$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; }

34763

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

34764

/* end confdefs.h. */

34765

34766

/* Override any GCC internal prototype to avoid an error.

34767

@@ -15021,36 +14361,13 @@ return pthread_join ();

34768

return 0;

34769

}

34770

_ACEOF

34771

-rm -f conftest.$ac_objext conftest$ac_exeext

34772

-if { (ac_try="$ac_link"

34773

-case "(($ac_try" in

34774

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

34775

- *) ac_try_echo=$ac_try;;

34776

-esac

34777

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

34778

- (eval "$ac_link") 2>conftest.er1

34779

- ac_status=$?

34780

- grep -v '^ *+' conftest.er1 >conftest.err

34781

- rm -f conftest.er1

34782

- cat conftest.err >&5

34783

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

34784

- (exit $ac_status); } && {

34785

- test -z "$ac_c_werror_flag" ||

34786

- test ! -s conftest.err

34787

- } && test -s conftest$ac_exeext &&

34788

- $as_test_x conftest$ac_exeext; then

34789

+if ac_fn_c_try_link "$LINENO"; then :

34790

acx_pthread_ok=yes

34791

-else

34792

- echo "$as_me: failed program was:" >&5

34793

-sed 's/^/| /' conftest.$ac_ext >&5

34794

34795

34796

34797

34798

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

34799

- conftest$ac_exeext conftest.$ac_ext

34800

- { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5

34801

-echo "${ECHO_T}$acx_pthread_ok" >&6; }

34802

+rm -f core conftest.err conftest.$ac_objext \

34803

+ conftest$ac_exeext conftest.$ac_ext

34804

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5

34805

+$as_echo "$acx_pthread_ok" >&6; }

34806

if test x"$acx_pthread_ok" = xno; then

34807

PTHREAD_LIBS=""

34808

PTHREAD_CFLAGS=""

34809

@@ -15111,23 +14428,23 @@ for flag in $acx_pthread_flags; do

34810

34811

case $flag in

34812

none)

34813

- { echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5

34814

-echo $ECHO_N "checking whether pthreads work without any flags... $ECHO_C" >&6; }

34815

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5

34816

+$as_echo_n "checking whether pthreads work without any flags... " >&6; }

34817

;;

34818

34819

-*)

34820

- { echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5

34821

-echo $ECHO_N "checking whether pthreads work with $flag... $ECHO_C" >&6; }

34822

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5

34823

+$as_echo_n "checking whether pthreads work with $flag... " >&6; }

34824

PTHREAD_CFLAGS="$flag"

34825

;;

34826

34827

pthread-config)

34828

# Extract the first word of "pthread-config", so it can be a program name with args.

28915

@@ -14437,7 +15078,7 @@ $as_echo_n "checking whether pthreads wo

34829

28916

set dummy pthread-config; ac_word=$2

34830

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

34831

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

34832

-if test "${ac_cv_prog_acx_pthread_config+set}" = set; then

34833

- echo $ECHO_N "(cached) $ECHO_C" >&6

34834

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

34835

+$as_echo_n "checking for $ac_word... " >&6; }

34836

+if test "${ac_cv_prog_acx_pthread_config+set}" = set; then :

34837

+ $as_echo_n "(cached) " >&6

28917

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

28918

$as_echo_n "checking for $ac_word... " >&6; }

28919

-if test "${ac_cv_prog_acx_pthread_config+set}" = set; then :

28920

+if ${ac_cv_prog_acx_pthread_config+:} false; then :

28921

$as_echo_n "(cached) " >&6

34838

28922

else

34839

28923

if test -n "$acx_pthread_config"; then

34840

ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test.

34841

@@ -15137,14 +14454,14 @@ for as_dir in $PATH

34842

34843

IFS=$as_save_IFS

34844

test -z "$as_dir" && as_dir=.

34845

- for ac_exec_ext in '' $ac_executable_extensions; do

34846

+ for ac_exec_ext in '' $ac_executable_extensions; do

34847

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

34848

ac_cv_prog_acx_pthread_config="yes"

34849

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

34850

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

34851

break 2

34852

34853

done

34854

-done

34855

+ done

34856

IFS=$as_save_IFS

34857

34858

test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no"

34859

@@ -15152,11 +14469,11 @@ fi

34860

34861

acx_pthread_config=$ac_cv_prog_acx_pthread_config

34862

if test -n "$acx_pthread_config"; then

34863

- { echo "$as_me:$LINENO: result: $acx_pthread_config" >&5

34864

-echo "${ECHO_T}$acx_pthread_config" >&6; }

34865

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5

34866

+$as_echo "$acx_pthread_config" >&6; }

34867

else

34868

- { echo "$as_me:$LINENO: result: no" >&5

34869

-echo "${ECHO_T}no" >&6; }

34870

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

34871

+$as_echo "no" >&6; }

34872

34873

34874

34875

@@ -15166,8 +14483,8 @@ fi

34876

;;

34877

34878

34879

- { echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5

34880

-echo $ECHO_N "checking for the pthreads library -l$flag... $ECHO_C" >&6; }

34881

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5

34882

+$as_echo_n "checking for the pthreads library -l$flag... " >&6; }

34883

PTHREAD_LIBS="-l$flag"

34884

;;

34885

esac

34886

@@ -15186,11 +14503,7 @@ echo $ECHO_N "checking for the pthreads

34887

# pthread_cleanup_push because it is one of the few pthread

34888

# functions on Solaris that doesn't have a non-functional libc stub.

34889

# We try pthread_create on general principles.

34890

- cat >conftest.$ac_ext <<_ACEOF

34891

-/* confdefs.h. */

34892

-_ACEOF

34893

-cat confdefs.h >>conftest.$ac_ext

34894

-cat >>conftest.$ac_ext <<_ACEOF

34895

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

34896

/* end confdefs.h. */

34897

#include <pthread.h>

34898

int

34899

@@ -15203,40 +14516,17 @@ pthread_t th; pthread_join(th, 0);

34900

return 0;

34901

}

34902

_ACEOF

34903

-rm -f conftest.$ac_objext conftest$ac_exeext

34904

-if { (ac_try="$ac_link"

34905

-case "(($ac_try" in

34906

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

34907

- *) ac_try_echo=$ac_try;;

34908

-esac

34909

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

34910

- (eval "$ac_link") 2>conftest.er1

34911

- ac_status=$?

34912

- grep -v '^ *+' conftest.er1 >conftest.err

34913

- rm -f conftest.er1

34914

- cat conftest.err >&5

34915

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

34916

- (exit $ac_status); } && {

34917

- test -z "$ac_c_werror_flag" ||

34918

- test ! -s conftest.err

34919

- } && test -s conftest$ac_exeext &&

34920

- $as_test_x conftest$ac_exeext; then

34921

+if ac_fn_c_try_link "$LINENO"; then :

34922

acx_pthread_ok=yes

34923

-else

34924

- echo "$as_me: failed program was:" >&5

34925

-sed 's/^/| /' conftest.$ac_ext >&5

34926

34927

34928

34929

34930

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

34931

- conftest$ac_exeext conftest.$ac_ext

34932

+rm -f core conftest.err conftest.$ac_objext \

34933

+ conftest$ac_exeext conftest.$ac_ext

34934

34935

LIBS="$save_LIBS"

34936

CFLAGS="$save_CFLAGS"

34937

34938

- { echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5

34939

-echo "${ECHO_T}$acx_pthread_ok" >&6; }

34940

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5

34941

+$as_echo "$acx_pthread_ok" >&6; }

34942

if test "x$acx_pthread_ok" = xyes; then

34943

break;

34944

34945

@@ -15254,15 +14544,11 @@ if test "x$acx_pthread_ok" = xyes; then

34946

CFLAGS="$CFLAGS $PTHREAD_CFLAGS"

34947

34948

# Detect AIX lossage: JOINABLE attribute is called UNDETACHED.

34949

- { echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5

34950

-echo $ECHO_N "checking for joinable pthread attribute... $ECHO_C" >&6; }

34951

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5

34952

+$as_echo_n "checking for joinable pthread attribute... " >&6; }

34953

attr_name=unknown

34954

for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do

34955

- cat >conftest.$ac_ext <<_ACEOF

34956

-/* confdefs.h. */

34957

-_ACEOF

34958

-cat confdefs.h >>conftest.$ac_ext

34959

-cat >>conftest.$ac_ext <<_ACEOF

34960

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

34961

/* end confdefs.h. */

34962

#include <pthread.h>

34963

int

34964

@@ -15273,37 +14559,14 @@ int attr=$attr; return attr;

34965

return 0;

34966

}

34967

_ACEOF

34968

-rm -f conftest.$ac_objext conftest$ac_exeext

34969

-if { (ac_try="$ac_link"

34970

-case "(($ac_try" in

34971

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

34972

- *) ac_try_echo=$ac_try;;

34973

-esac

34974

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

34975

- (eval "$ac_link") 2>conftest.er1

34976

- ac_status=$?

34977

- grep -v '^ *+' conftest.er1 >conftest.err

34978

- rm -f conftest.er1

34979

- cat conftest.err >&5

34980

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

34981

- (exit $ac_status); } && {

34982

- test -z "$ac_c_werror_flag" ||

34983

- test ! -s conftest.err

34984

- } && test -s conftest$ac_exeext &&

34985

- $as_test_x conftest$ac_exeext; then

34986

+if ac_fn_c_try_link "$LINENO"; then :

34987

attr_name=$attr; break

34988

-else

34989

- echo "$as_me: failed program was:" >&5

34990

-sed 's/^/| /' conftest.$ac_ext >&5

34991

34992

34993

34994

34995

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

34996

- conftest$ac_exeext conftest.$ac_ext

34997

+rm -f core conftest.err conftest.$ac_objext \

34998

+ conftest$ac_exeext conftest.$ac_ext

34999

done

35000

- { echo "$as_me:$LINENO: result: $attr_name" >&5

35001

-echo "${ECHO_T}$attr_name" >&6; }

35002

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5

35003

+$as_echo "$attr_name" >&6; }

35004

if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then

35005

35006

cat >>confdefs.h <<_ACEOF

35007

@@ -15312,15 +14575,15 @@ _ACEOF

35008

35009

35010

35011

- { echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5

35012

-echo $ECHO_N "checking if more special flags are required for pthreads... $ECHO_C" >&6; }

35013

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5

35014

+$as_echo_n "checking if more special flags are required for pthreads... " >&6; }

35015

flag=no

35016

case "${host_cpu}-${host_os}" in

35017

*-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;

35018

*solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;

35019

esac

35020

- { echo "$as_me:$LINENO: result: ${flag}" >&5

35021

-echo "${ECHO_T}${flag}" >&6; }

35022

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5

35023

+$as_echo "${flag}" >&6; }

35024

if test "x$flag" != xno; then

35025

PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"

35026

35027

@@ -15333,10 +14596,10 @@ echo "${ECHO_T}${flag}" >&6; }

35028

35029

# Extract the first word of "$ac_prog", so it can be a program name with args.

28924

@@ -14592,7 +15233,7 @@ do

35030

28925

set dummy $ac_prog; ac_word=$2

35031

-{ echo "$as_me:$LINENO: checking for $ac_word" >&5

35032

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

35033

-if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then

35034

- echo $ECHO_N "(cached) $ECHO_C" >&6

35035

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

35036

+$as_echo_n "checking for $ac_word... " >&6; }

35037

+if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :

35038

+ $as_echo_n "(cached) " >&6

28926

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

28927

$as_echo_n "checking for $ac_word... " >&6; }

28928

-if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :

28929

+if ${ac_cv_prog_PTHREAD_CC+:} false; then :

28930

$as_echo_n "(cached) " >&6

35039

28931

else

35040

28932

if test -n "$PTHREAD_CC"; then

35041

ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.

35042

@@ -15346,25 +14609,25 @@ for as_dir in $PATH

35043

35044

IFS=$as_save_IFS

35045

test -z "$as_dir" && as_dir=.

35046

- for ac_exec_ext in '' $ac_executable_extensions; do

35047

+ for ac_exec_ext in '' $ac_executable_extensions; do

35048

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

35049

ac_cv_prog_PTHREAD_CC="$ac_prog"

35050

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

35051

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

35052

break 2

35053

35054

done

35055

-done

35056

+ done

35057

IFS=$as_save_IFS

35058

35059

35060

35061

PTHREAD_CC=$ac_cv_prog_PTHREAD_CC

35062

if test -n "$PTHREAD_CC"; then

35063

- { echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5

35064

-echo "${ECHO_T}$PTHREAD_CC" >&6; }

35065

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5

35066

+$as_echo "$PTHREAD_CC" >&6; }

35067

else

35068

- { echo "$as_me:$LINENO: result: no" >&5

35069

-echo "${ECHO_T}no" >&6; }

35070

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

35071

+$as_echo "no" >&6; }

35072

35073

35074

35075

@@ -15408,13 +14671,9 @@ test -n "$PTHREAD_CC" || PTHREAD_CC="${C

35076

# compiler. If not (and OS X's ld, for instance, does not accept -z),

35077

# then we can't do this test.

35078

if test x"$done" = xno; then

35079

- { echo "$as_me:$LINENO: checking whether to check for GCC pthread/shared inconsistencies" >&5

35080

-echo $ECHO_N "checking whether to check for GCC pthread/shared inconsistencies... $ECHO_C" >&6; }

35081

- cat >conftest.$ac_ext <<_ACEOF

35082

-/* confdefs.h. */

35083

-_ACEOF

35084

-cat confdefs.h >>conftest.$ac_ext

35085

-cat >>conftest.$ac_ext <<_ACEOF

35086

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to check for GCC pthread/shared inconsistencies" >&5

35087

+$as_echo_n "checking whether to check for GCC pthread/shared inconsistencies... " >&6; }

35088

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

35089

/* end confdefs.h. */

35090

35091

int

35092

@@ -15425,52 +14684,28 @@ main ()

35093

return 0;

35094

}

35095

_ACEOF

35096

-rm -f conftest.$ac_objext conftest$ac_exeext

35097

-if { (ac_try="$ac_link"

35098

-case "(($ac_try" in

35099

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

35100

- *) ac_try_echo=$ac_try;;

35101

-esac

35102

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

35103

- (eval "$ac_link") 2>conftest.er1

35104

- ac_status=$?

35105

- grep -v '^ *+' conftest.er1 >conftest.err

35106

- rm -f conftest.er1

35107

- cat conftest.err >&5

35108

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

35109

- (exit $ac_status); } && {

35110

- test -z "$ac_c_werror_flag" ||

35111

- test ! -s conftest.err

35112

- } && test -s conftest$ac_exeext &&

35113

- $as_test_x conftest$ac_exeext; then

35114

- :

35115

-else

35116

- echo "$as_me: failed program was:" >&5

35117

-sed 's/^/| /' conftest.$ac_ext >&5

35118

+if ac_fn_c_try_link "$LINENO"; then :

35119

35120

- done=yes

35121

+else

35122

+ done=yes

35123

35124

35125

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

35126

- conftest$ac_exeext conftest.$ac_ext

35127

+rm -f core conftest.err conftest.$ac_objext \

35128

+ conftest$ac_exeext conftest.$ac_ext

35129

35130

if test "x$done" = xyes ; then

35131

- { echo "$as_me:$LINENO: result: no" >&5

35132

-echo "${ECHO_T}no" >&6; }

35133

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

35134

+$as_echo "no" >&6; }

35135

else

35136

- { echo "$as_me:$LINENO: result: yes" >&5

35137

-echo "${ECHO_T}yes" >&6; }

35138

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

35139

+$as_echo "yes" >&6; }

28933

@@ -14695,7 +15336,8 @@ $as_echo "yes" >&6; }

35140

28934

35141

28935

35142

28936

35143

28937

- if test x"$done" = xno; then

35144

- { echo "$as_me:$LINENO: checking whether -pthread is sufficient with -shared" >&5

35145

-echo $ECHO_N "checking whether -pthread is sufficient with -shared... $ECHO_C" >&6; }

35146

- cat >conftest.$ac_ext <<_ACEOF

35147

-/* confdefs.h. */

35148

-_ACEOF

35149

-cat confdefs.h >>conftest.$ac_ext

35150

-cat >>conftest.$ac_ext <<_ACEOF

35151

28938

+ if test x"$done" = xyes; then

35152

28939

+ done="no"

35153

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -pthread is sufficient with -shared" >&5

35154

+$as_echo_n "checking whether -pthread is sufficient with -shared... " >&6; }

35155

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

35156

/* end confdefs.h. */

35157

#include <pthread.h>

35158

int

35159

@@ -15483,41 +14718,18 @@ pthread_t th; pthread_join(th, 0);

35160

return 0;

35161

}

35162

_ACEOF

35163

-rm -f conftest.$ac_objext conftest$ac_exeext

35164

-if { (ac_try="$ac_link"

35165

-case "(($ac_try" in

35166

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

35167

- *) ac_try_echo=$ac_try;;

35168

-esac

35169

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

35170

- (eval "$ac_link") 2>conftest.er1

35171

- ac_status=$?

35172

- grep -v '^ *+' conftest.er1 >conftest.err

35173

- rm -f conftest.er1

35174

- cat conftest.err >&5

35175

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

35176

- (exit $ac_status); } && {

35177

- test -z "$ac_c_werror_flag" ||

35178

- test ! -s conftest.err

35179

- } && test -s conftest$ac_exeext &&

35180

- $as_test_x conftest$ac_exeext; then

35181

+if ac_fn_c_try_link "$LINENO"; then :

35182

done=yes

35183

-else

35184

- echo "$as_me: failed program was:" >&5

35185

-sed 's/^/| /' conftest.$ac_ext >&5

35186

35187

35188

35189

35190

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

35191

- conftest$ac_exeext conftest.$ac_ext

35192

+rm -f core conftest.err conftest.$ac_objext \

35193

+ conftest$ac_exeext conftest.$ac_ext

35194

35195

if test "x$done" = xyes; then

35196

- { echo "$as_me:$LINENO: result: yes" >&5

35197

-echo "${ECHO_T}yes" >&6; }

35198

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

35199

+$as_echo "yes" >&6; }

35200

else

35201

- { echo "$as_me:$LINENO: result: no" >&5

35202

-echo "${ECHO_T}no" >&6; }

35203

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

35204

+$as_echo "no" >&6; }

35205

35206

35207

35208

@@ -15526,14 +14738,10 @@ echo "${ECHO_T}no" >&6; }

35209

# about -lpthread

35210

35211

if test x"$done" = xno; then

35212

- { echo "$as_me:$LINENO: checking whether -lpthread fixes that" >&5

35213

-echo $ECHO_N "checking whether -lpthread fixes that... $ECHO_C" >&6; }

35214

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lpthread fixes that" >&5

35215

+$as_echo_n "checking whether -lpthread fixes that... " >&6; }

35216

LIBS="-lpthread $PTHREAD_LIBS $save_LIBS"

35217

- cat >conftest.$ac_ext <<_ACEOF

35218

-/* confdefs.h. */

35219

-_ACEOF

35220

-cat confdefs.h >>conftest.$ac_ext

35221

-cat >>conftest.$ac_ext <<_ACEOF

35222

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

35223

/* end confdefs.h. */

35224

#include <pthread.h>

35225

int

35226

@@ -15546,56 +14754,29 @@ pthread_t th; pthread_join(th, 0);

35227

return 0;

35228

}

35229

_ACEOF

35230

-rm -f conftest.$ac_objext conftest$ac_exeext

35231

-if { (ac_try="$ac_link"

35232

-case "(($ac_try" in

35233

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

35234

- *) ac_try_echo=$ac_try;;

35235

-esac

35236

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

35237

- (eval "$ac_link") 2>conftest.er1

35238

- ac_status=$?

35239

- grep -v '^ *+' conftest.er1 >conftest.err

35240

- rm -f conftest.er1

35241

- cat conftest.err >&5

35242

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

35243

- (exit $ac_status); } && {

35244

- test -z "$ac_c_werror_flag" ||

35245

- test ! -s conftest.err

35246

- } && test -s conftest$ac_exeext &&

35247

- $as_test_x conftest$ac_exeext; then

35248

+if ac_fn_c_try_link "$LINENO"; then :

35249

done=yes

35250

-else

35251

- echo "$as_me: failed program was:" >&5

35252

-sed 's/^/| /' conftest.$ac_ext >&5

35253

35254

35255

35256

35257

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

35258

- conftest$ac_exeext conftest.$ac_ext

35259

+rm -f core conftest.err conftest.$ac_objext \

35260

+ conftest$ac_exeext conftest.$ac_ext

35261

35262

if test "x$done" = xyes; then

35263

- { echo "$as_me:$LINENO: result: yes" >&5

35264

-echo "${ECHO_T}yes" >&6; }

35265

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

35266

+$as_echo "yes" >&6; }

35267

PTHREAD_LIBS="-lpthread $PTHREAD_LIBS"

35268

else

35269

- { echo "$as_me:$LINENO: result: no" >&5

35270

-echo "${ECHO_T}no" >&6; }

35271

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

35272

+$as_echo "no" >&6; }

35273

35274

35275

35276

# FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc

35277

35278

if test x"$done" = xno; then

35279

- { echo "$as_me:$LINENO: checking whether -lc_r fixes that" >&5

35280

-echo $ECHO_N "checking whether -lc_r fixes that... $ECHO_C" >&6; }

35281

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc_r fixes that" >&5

35282

+$as_echo_n "checking whether -lc_r fixes that... " >&6; }

35283

LIBS="-lc_r $PTHREAD_LIBS $save_LIBS"

35284

- cat >conftest.$ac_ext <<_ACEOF

35285

-/* confdefs.h. */

35286

-_ACEOF

35287

-cat confdefs.h >>conftest.$ac_ext

35288

-cat >>conftest.$ac_ext <<_ACEOF

35289

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

35290

/* end confdefs.h. */

35291

#include <pthread.h>

35292

int

35293

@@ -15608,48 +14789,25 @@ pthread_t th; pthread_join(th, 0);

35294

return 0;

35295

}

35296

_ACEOF

35297

-rm -f conftest.$ac_objext conftest$ac_exeext

35298

-if { (ac_try="$ac_link"

35299

-case "(($ac_try" in

35300

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

35301

- *) ac_try_echo=$ac_try;;

35302

-esac

35303

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

35304

- (eval "$ac_link") 2>conftest.er1

35305

- ac_status=$?

35306

- grep -v '^ *+' conftest.er1 >conftest.err

35307

- rm -f conftest.er1

35308

- cat conftest.err >&5

35309

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

35310

- (exit $ac_status); } && {

35311

- test -z "$ac_c_werror_flag" ||

35312

- test ! -s conftest.err

35313

- } && test -s conftest$ac_exeext &&

35314

- $as_test_x conftest$ac_exeext; then

35315

+if ac_fn_c_try_link "$LINENO"; then :

35316

done=yes

35317

-else

35318

- echo "$as_me: failed program was:" >&5

35319

-sed 's/^/| /' conftest.$ac_ext >&5

35320

35321

35322

35323

35324

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

35325

- conftest$ac_exeext conftest.$ac_ext

35326

+rm -f core conftest.err conftest.$ac_objext \

35327

+ conftest$ac_exeext conftest.$ac_ext

35328

35329

if test "x$done" = xyes; then

35330

- { echo "$as_me:$LINENO: result: yes" >&5

35331

-echo "${ECHO_T}yes" >&6; }

35332

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

35333

+$as_echo "yes" >&6; }

35334

PTHREAD_LIBS="-lc_r $PTHREAD_LIBS"

35335

else

35336

- { echo "$as_me:$LINENO: result: no" >&5

35337

-echo "${ECHO_T}no" >&6; }

35338

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

35339

+$as_echo "no" >&6; }

35340

35341

35342

if test x"$done" = xno; then

35343

# OK, we have run out of ideas

35344

- { echo "$as_me:$LINENO: WARNING: Impossible to determine how to use pthreads with shared libraries" >&5

35345

-echo "$as_me: WARNING: Impossible to determine how to use pthreads with shared libraries" >&2;}

35346

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Impossible to determine how to use pthreads with shared libraries" >&5

35347

+$as_echo "$as_me: WARNING: Impossible to determine how to use pthreads with shared libraries" >&2;}

35348

35349

# so it's not safe to assume that we may use pthreads

35350

acx_pthread_ok=no

35351

@@ -15669,9 +14827,7 @@ fi

35352

# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:

35353

if test x"$acx_pthread_ok" = xyes; then

35354

35355

-cat >>confdefs.h <<\_ACEOF

35356

-#define HAVE_PTHREAD 1

35357

-_ACEOF

35358

+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h

35359

35360

35361

else

35362

@@ -15719,12 +14875,13 @@ _ACEOF

35363

case $ac_val in #(

35364

*${as_nl}*)

35365

case $ac_var in #(

35366

- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5

35367

-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;

35368

+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5

35369

+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;

35370

esac

35371

case $ac_var in #(

35372

_ | IFS | as_nl) ;; #(

35373

- *) $as_unset $ac_var ;;

35374

+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

35375

+ *) { eval $ac_var=; unset $ac_var;} ;;

35376

esac ;;

35377

esac

35378

done

35379

@@ -15732,8 +14889,8 @@ echo "$as_me: WARNING: Cache variable $a

35380

(set) 2>&1 |

35381

case $as_nl`(ac_space=' '; set) 2>&1` in #(

35382

*${as_nl}ac_space=\ *)

35383

- # `set' does not quote correctly, so add quotes (double-quote

35384

- # substitution turns \\\\ into \\, and sed turns \\ into \).

35385

+ # `set' does not quote correctly, so add quotes: double-quote

35386

+ # substitution turns \\\\ into \\, and sed turns \\ into \.

35387

sed -n \

35388

"s/'/'\\\\''/g;

35389

s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"

35390

@@ -15756,12 +14913,12 @@ echo "$as_me: WARNING: Cache variable $a

28940

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -pthread is sufficient with -shared" >&5

28941

$as_echo_n "checking whether -pthread is sufficient with -shared... " >&6; }

28942

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

28943

@@ -14905,10 +15547,21 @@ $as_echo "$as_me: WARNING: cache variabl

28944

:end' >>confcache

35391

28945

if diff "$cache_file" confcache >/dev/null 2>&1; then :; else

35392

28946

if test -w "$cache_file"; then

35393

test "x$cache_file" != "x/dev/null" &&

35394

- { echo "$as_me:$LINENO: updating cache $cache_file" >&5

35395

-echo "$as_me: updating cache $cache_file" >&6;}

35396

+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5

35397

+$as_echo "$as_me: updating cache $cache_file" >&6;}

35398

cat confcache >$cache_file

28947

- test "x$cache_file" != "x/dev/null" &&

28948

+ if test "x$cache_file" != "x/dev/null"; then

28949

{ $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5

28950

$as_echo "$as_me: updating cache $cache_file" >&6;}

28951

- cat confcache >$cache_file

28952

+ if test ! -f "$cache_file" || test -h "$cache_file"; then

28953

+ cat confcache >"$cache_file"

28954

+ else

28955

+ case $cache_file in #(

28956

+ */* | ?:*)

28957

+ mv -f confcache "$cache_file"$$ &&

28958

+ mv -f "$cache_file"$$ "$cache_file" ;; #(

28959

+ *)

28960

+ mv -f confcache "$cache_file" ;;

28961

+ esac

28962

+ fi

28963

+ fi

35399

28964

else

35400

- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5

35401

-echo "$as_me: not updating unwritable cache $cache_file" >&6;}

35402

+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5

35403

+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}

35404

35405

35406

rm -f confcache

35407

@@ -15774,62 +14931,58 @@ DEFS=-DHAVE_CONFIG_H

28965

{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5

28966

$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}

28967

@@ -14924,6 +15577,7 @@ DEFS=-DHAVE_CONFIG_H

35408

28968

35409

28969

ac_libobjs=

35410

28970

ac_ltlibobjs=

35412

28972

for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue

35413

28973

# 1. Remove the extension, and $U if already installed.

35414

28974

ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'

35415

- ac_i=`echo "$ac_i" | sed "$ac_script"`

35416

+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`

35417

# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR

35418

# will be set to the directory where LIBOBJS objects are built.

35419

- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"

35420

- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'

35421

+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"

35422

+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'

35423

done

35424

LIBOBJS=$ac_libobjs

35425

35426

LTLIBOBJS=$ac_ltlibobjs

35427

35428

35429

+ if test -n "$EXEEXT"; then

35430

+ am__EXEEXT_TRUE=

35431

+ am__EXEEXT_FALSE='#'

35432

+else

35433

+ am__EXEEXT_TRUE='#'

35434

+ am__EXEEXT_FALSE=

35435

+fi

35436

28975

@@ -14947,27 +15601,23 @@ else

28976

28977

35437

28978

if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then

35438

- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.

35439

-Usually this means the macro was only invoked conditionally." >&5

35440

-echo "$as_me: error: conditional \"AMDEP\" was never defined.

35441

-Usually this means the macro was only invoked conditionally." >&2;}

35442

- { (exit 1); exit 1; }; }

28979

- as_fn_error "conditional \"AMDEP\" was never defined.

35443

28980

+ as_fn_error $? "conditional \"AMDEP\" was never defined.

35444

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

28981

Usually this means the macro was only invoked conditionally." "$LINENO" 5

35445

28982

35446

28983

if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then

35447

- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.

35448

-Usually this means the macro was only invoked conditionally." >&5

35449

-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.

35450

-Usually this means the macro was only invoked conditionally." >&2;}

35451

- { (exit 1); exit 1; }; }

28984

- as_fn_error "conditional \"am__fastdepCC\" was never defined.

28985

-Usually this means the macro was only invoked conditionally." "$LINENO" 5

28986

-fi

28987

-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then

28988

- as_fn_error "conditional \"am__fastdepCXX\" was never defined.

35452

28989

+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.

35453

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

35454

35455

if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then

35456

- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.

35457

-Usually this means the macro was only invoked conditionally." >&5

35458

-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.

35459

-Usually this means the macro was only invoked conditionally." >&2;}

35460

- { (exit 1); exit 1; }; }

35461

+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.

35462

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

35463

35464

if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then

35465

- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.

35466

-Usually this means the macro was only invoked conditionally." >&5

35467

-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.

35468

-Usually this means the macro was only invoked conditionally." >&2;}

35469

- { (exit 1); exit 1; }; }

35470

+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.

35471

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

28990

Usually this means the macro was only invoked conditionally." "$LINENO" 5

28991

28992

if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then

28993

- as_fn_error "conditional \"am__fastdepCXX\" was never defined.

28994

+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.

28995

Usually this means the macro was only invoked conditionally." "$LINENO" 5

35472

28996

35473

28997

if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then

35474

- { { echo "$as_me:$LINENO: error: conditional \"HAVE_PYTHON\" was never defined.

35475

-Usually this means the macro was only invoked conditionally." >&5

35476

-echo "$as_me: error: conditional \"HAVE_PYTHON\" was never defined.

35477

-Usually this means the macro was only invoked conditionally." >&2;}

35478

- { (exit 1); exit 1; }; }

28998

- as_fn_error "conditional \"HAVE_PYTHON\" was never defined.

35479

28999

+ as_fn_error $? "conditional \"HAVE_PYTHON\" was never defined.

35480

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

29000

Usually this means the macro was only invoked conditionally." "$LINENO" 5

35481

29001

35482

29002

35483

: ${CONFIG_STATUS=./config.status}

35484

+ac_write_fail=0

29003

-: ${CONFIG_STATUS=./config.status}

29004

+: "${CONFIG_STATUS=./config.status}"

29005

ac_write_fail=0

35485

29006

ac_clean_files_save=$ac_clean_files

35486

29007

ac_clean_files="$ac_clean_files $CONFIG_STATUS"

35487

-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5

35488

-echo "$as_me: creating $CONFIG_STATUS" >&6;}

35489

-cat >$CONFIG_STATUS <<_ACEOF

35490

+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5

35491

+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}

35492

+as_write_fail=0

35493

+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1

35494

#! $SHELL

35495

# Generated by $as_me.

35496

# Run this file to recreate the current configuration.

35497

@@ -15839,59 +14992,79 @@ cat >$CONFIG_STATUS <<_ACEOF

35498

debug=false

35499

ac_cs_recheck=false

35500

ac_cs_silent=false

35501

-SHELL=\${CONFIG_SHELL-$SHELL}

35502

-_ACEOF

35503

35504

-cat >>$CONFIG_STATUS <<\_ACEOF

35505

-## --------------------- ##

35506

-## M4sh Initialization. ##

35507

-## --------------------- ##

35508

+SHELL=\${CONFIG_SHELL-$SHELL}

35509

+export SHELL

35510

+_ASEOF

35511

+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1

35512

+## -------------------- ##

35513

+## M4sh Initialization. ##

35514

+## -------------------- ##

35515

35516

# Be more Bourne compatible

35517

DUALCASE=1; export DUALCASE # for MKS sh

35518

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

35519

+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :

35520

emulate sh

35521

NULLCMD=:

35522

- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

35523

+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

35524

# is contrary to our usage. Disable this feature.

35525

alias -g '${1+"$@"}'='"$@"'

35526

setopt NO_GLOB_SUBST

35527

else

35528

- case `(set -o) 2>/dev/null` in

35529

- *posix*) set -o posix ;;

35530

+ case `(set -o) 2>/dev/null` in #(

35531

+ *posix*) :

35532

+ set -o posix ;; #(

35533

+ *) :

35534

+ ;;

35535

esac

35536

35537

35538

35539

35540

35541

35542

-# PATH needs CR

35543

-# Avoid depending upon Character Ranges.

35544

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

35545

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

35546

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

35547

-as_cr_digits='0123456789'

35548

-as_cr_alnum=$as_cr_Letters$as_cr_digits

35549

35550

-# The user is always right.

35551

-if test "${PATH_SEPARATOR+set}" != set; then

35552

- echo "#! /bin/sh" >conf$$.sh

35553

- echo "exit 0" >>conf$$.sh

35554

- chmod +x conf$$.sh

35555

- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

35556

- PATH_SEPARATOR=';'

35557

+as_nl='

35558

35559

+export as_nl

35560

+# Printing a long string crashes Solaris 7 /usr/bin/printf.

35561

+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

35562

+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

35563

+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

35564

+# Prefer a ksh shell builtin over an external printf program on Solaris,

35565

+# but without wasting forks for bash or zsh.

35566

+if test -z "$BASH_VERSION$ZSH_VERSION" \

35567

+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then

35568

+ as_echo='print -r --'

35569

+ as_echo_n='print -rn --'

35570

+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

35571

+ as_echo='printf %s\n'

35572

+ as_echo_n='printf %s'

35573

+else

35574

+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then

35575

+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'

35576

+ as_echo_n='/usr/ucb/echo -n'

35577

else

35578

- PATH_SEPARATOR=:

35579

+ as_echo_body='eval expr "X$1" : "X\$.*\$"'

35580

+ as_echo_n_body='eval

35581

+ arg=$1;

35582

+ case $arg in #(

35583

+ *"$as_nl"*)

35584

+ expr "X$arg" : "X\$.*\$$as_nl";

35585

+ arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;

35586

+ esac;

35587

+ expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"

35588

+ '

35589

+ export as_echo_n_body

35590

+ as_echo_n='sh -c $as_echo_n_body as_echo'

35591

35592

- rm -f conf$$.sh

35593

+ export as_echo_body

35594

+ as_echo='sh -c $as_echo_body as_echo'

35595

35596

35597

-# Support unset when possible.

35598

-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

35599

- as_unset=unset

35600

-else

35601

- as_unset=false

35602

+# The user is always right.

35603

+if test "${PATH_SEPARATOR+set}" != set; then

35604

+ PATH_SEPARATOR=:

35605

+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {

35606

+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||

35607

+ PATH_SEPARATOR=';'

35608

+ }

35609

35610

35611

35612

@@ -15900,20 +15073,18 @@ fi

35613

# there to prevent editors from complaining about space-tab.

35614

# (If _AS_PATH_WALK were called with IFS unset, it would disable word

35615

# splitting by setting IFS to empty value.)

35616

-as_nl='

35617

29008

@@ -15068,6 +15718,7 @@ fi

35618

29009

IFS=" "" $as_nl"

35619

29010

35620

29011

# Find who we are. Look in the path if we contain no directory separator.

35621

-case $0 in

35622

+case $0 in #((

29012

+as_myself=

29013

case $0 in #((

35623

29014

*[\\/]* ) as_myself=$0 ;;

35624

29015

*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

35625

for as_dir in $PATH

35626

35627

IFS=$as_save_IFS

35628

test -z "$as_dir" && as_dir=.

35629

- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

35630

-done

35631

+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

35632

+ done

35633

IFS=$as_save_IFS

35634

35635

;;

35636

@@ -15924,32 +15095,111 @@ if test "x$as_myself" = x; then

35637

as_myself=$0

35638

35639

if test ! -f "$as_myself"; then

35640

- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

35641

- { (exit 1); exit 1; }

35642

+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

35643

+ exit 1

35644

35645

35646

-# Work around bugs in pre-3.0 UWIN ksh.

35647

-for as_var in ENV MAIL MAILPATH

35648

-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

35649

+# Unset variables that we do not need and which cause bugs (e.g. in

35650

+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"

35651

+# suppresses any "Segmentation fault" message there. '((' could

35652

+# trigger a bug in pdksh 5.2.14.

35653

+for as_var in BASH_ENV ENV MAIL MAILPATH

35654

+do eval test x\${$as_var+set} = xset \

35655

+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :

35656

done

35657

PS1='$ '

35658

PS2='> '

35659

PS4='+ '

35660

35661

# NLS nuisances.

35662

-for as_var in \

35663

- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \

35664

- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \

35665

- LC_TELEPHONE LC_TIME

35666

-do

35667

- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

35668

- eval $as_var=C; export $as_var

35669

- else

35670

- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

35671

- fi

35672

-done

35673

+LC_ALL=C

35674

+export LC_ALL

35675

+LANGUAGE=C

35676

+export LANGUAGE

35677

35678

+# CDPATH.

35679

+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

35680

35681

29016

@@ -15113,19 +15764,19 @@ export LANGUAGE

29017

(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

29018

29019

29020

-# as_fn_error ERROR [LINENO LOG_FD]

29021

-# ---------------------------------

35682

29022

+# as_fn_error STATUS ERROR [LINENO LOG_FD]

35683

29023

+# ----------------------------------------

35684

+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

35685

+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

29024

# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

29025

# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

29026

-# script with status $?, using 1 if that was 0.

35686

29027

+# script with STATUS, using 1 if that was 0.

35687

+as_fn_error ()

35688

29028

as_fn_error ()

29029

{

29030

- as_status=$?; test $as_status -eq 0 && as_status=1

29031

- if test "$3"; then

29032

- as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

29033

- $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3

35689

29034

+ as_status=$1; test $as_status -eq 0 && as_status=1

35690

29035

+ if test "$4"; then

35691

29036

+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

35692

29037

+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4

35693

+ fi

29038

29039

- $as_echo "$as_me: error: $1" >&2

35694

29040

+ $as_echo "$as_me: error: $2" >&2

35695

+ as_fn_exit $as_status

35696

+} # as_fn_error

35697

35698

35699

+# as_fn_set_status STATUS

35700

+# -----------------------

35701

+# Set $? to STATUS, without forking.

35702

+as_fn_set_status ()

35703

35704

+ return $1

35705

+} # as_fn_set_status

35706

35707

+# as_fn_exit STATUS

35708

+# -----------------

35709

+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.

35710

+as_fn_exit ()

35711

35712

+ set +e

35713

+ as_fn_set_status $1

35714

+ exit $1

35715

+} # as_fn_exit

35716

35717

+# as_fn_unset VAR

35718

+# ---------------

35719

+# Portably unset VAR.

35720

+as_fn_unset ()

35721

35722

+ { eval $1=; unset $1;}

35723

35724

+as_unset=as_fn_unset

35725

+# as_fn_append VAR VALUE

35726

+# ----------------------

35727

+# Append the text in VALUE to the end of the definition contained in VAR. Take

35728

+# advantage of any shell optimizations that allow amortized linear growth over

35729

+# repeated appends, instead of the typical quadratic growth present in naive

35730

+# implementations.

35731

+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :

35732

+ eval 'as_fn_append ()

35733

+ {

35734

+ eval $1+=\$2

35735

+ }'

35736

+else

35737

+ as_fn_append ()

35738

+ {

35739

+ eval $1=\$$1\$2

35740

+ }

35741

+fi # as_fn_append

35742

35743

+# as_fn_arith ARG...

35744

+# ------------------

35745

+# Perform arithmetic evaluation on the ARGs, and store the result in the

35746

+# global $as_val. Take advantage of shells that can avoid forks. The arguments

35747

+# must be portable across $(()) and expr.

35748

+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :

35749

+ eval 'as_fn_arith ()

35750

+ {

35751

+ as_val=$(( $* ))

35752

+ }'

35753

+else

35754

+ as_fn_arith ()

35755

+ {

35756

+ as_val=`expr "$@" || test $? -eq 1`

35757

+ }

35758

+fi # as_fn_arith

35759

35760

35761

-# Required to use basename.

35762

if expr a : '$a$' >/dev/null 2>&1 &&

35763

test "X`expr 00001 : '.*$...$'`" = X001; then

35764

as_expr=expr

35765

@@ -15963,13 +15213,17 @@ else

35766

as_basename=false

35767

35768

35769

35770

-# Name of the executable.

35771

+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

35772

+ as_dirname=dirname

35773

+else

35774

+ as_dirname=false

35775

+fi

35776

35777

as_me=`$as_basename -- "$0" ||

35778

$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

35779

X"$0" : 'X$//$$' \| \

35780

X"$0" : 'X$/$' \| . 2>/dev/null ||

35781

-echo X/"$0" |

35782

+$as_echo X/"$0" |

35783

sed '/^.*\/$[^/][^/]*$\/*$/{

35784

s//\1/

35785

35786

@@ -15984,104 +15238,103 @@ echo X/"$0" |

35787

}

35788

s/.*/./; q'`

35789

35790

-# CDPATH.

35791

-$as_unset CDPATH

35792

35793

35794

35795

- as_lineno_1=$LINENO

35796

- as_lineno_2=$LINENO

35797

- test "x$as_lineno_1" != "x$as_lineno_2" &&

35798

- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {

35799

35800

- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO

35801

- # uniformly replaced by the line number. The first 'sed' inserts a

35802

- # line-number line after each line using $LINENO; the second 'sed'

35803

- # does the real work. The second script uses 'N' to pair each

35804

- # line-number line with the line containing $LINENO, and appends

35805

- # trailing '-' during substitution so that $LINENO is not a special

35806

- # case at line end.

35807

- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

35808

- # scripts with optimization help from Paolo Bonzini. Blame Lee

35809

- # E. McMahon (1931-1989) for sed's syntax. :-)

35810

- sed -n '

35811

- p

35812

- /[$]LINENO/=

35813

- ' <$as_myself |

35814

- sed '

35815

- s/[$]LINENO.*/&-/

35816

- t lineno

35817

- b

35818

- :lineno

35819

- N

35820

- :loop

35821

- s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/

35822

- t loop

35823

- s/-\n.*//

35824

- ' >$as_me.lineno &&

35825

- chmod +x "$as_me.lineno" ||

35826

- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

35827

- { (exit 1); exit 1; }; }

35828

35829

- # Don't try to exec as it changes $[0], causing all sort of problems

35830

- # (the dirname of $[0] is not the place where we might find the

35831

- # original and so on. Autoconf is especially sensitive to this).

35832

- . "./$as_me.lineno"

35833

- # Exit status is that of the last command.

35834

- exit

35835

35836

35837

35838

-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

35839

- as_dirname=dirname

35840

-else

35841

- as_dirname=false

35842

-fi

35843

+# Avoid depending upon Character Ranges.

35844

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

35845

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

35846

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

35847

+as_cr_digits='0123456789'

35848

+as_cr_alnum=$as_cr_Letters$as_cr_digits

35849

35850

ECHO_C= ECHO_N= ECHO_T=

35851

-case `echo -n x` in

35852

+case `echo -n x` in #(((((

35853

-n*)

35854

- case `echo 'x\c'` in

35855

+ case `echo 'xy\c'` in

35856

*c*) ECHO_T=' ';; # ECHO_T is single tab character.

35857

- *) ECHO_C='\c';;

35858

+ xy) ECHO_C='\c';;

35859

+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null

35860

+ ECHO_T=' ';;

35861

esac;;

35862

35863

ECHO_N='-n';;

35864

esac

35865

35866

-if expr a : '$a$' >/dev/null 2>&1 &&

35867

- test "X`expr 00001 : '.*$...$'`" = X001; then

35868

- as_expr=expr

35869

-else

35870

- as_expr=false

35871

-fi

35872

35873

rm -f conf$$ conf$$.exe conf$$.file

35874

if test -d conf$$.dir; then

35875

rm -f conf$$.dir/conf$$.file

35876

else

35877

rm -f conf$$.dir

35878

- mkdir conf$$.dir

35879

+ mkdir conf$$.dir 2>/dev/null

35880

35881

-echo >conf$$.file

35882

-if ln -s conf$$.file conf$$ 2>/dev/null; then

35883

- as_ln_s='ln -s'

35884

- # ... but there are two gotchas:

35885

- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

35886

- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

35887

- # In both cases, we have to default to `cp -p'.

35888

- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

35889

+if (echo >conf$$.file) 2>/dev/null; then

35890

+ if ln -s conf$$.file conf$$ 2>/dev/null; then

35891

+ as_ln_s='ln -s'

35892

+ # ... but there are two gotchas:

35893

+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

35894

+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

35895

+ # In both cases, we have to default to `cp -p'.

35896

+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

35897

+ as_ln_s='cp -p'

35898

+ elif ln conf$$.file conf$$ 2>/dev/null; then

35899

+ as_ln_s=ln

35900

+ else

35901

as_ln_s='cp -p'

35902

-elif ln conf$$.file conf$$ 2>/dev/null; then

35903

- as_ln_s=ln

35904

+ fi

35905

else

35906

as_ln_s='cp -p'

35907

35908

rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

35909

rmdir conf$$.dir 2>/dev/null

35910

35911

35912

+# as_fn_mkdir_p

35913

+# -------------

35914

+# Create "$as_dir" as a directory, including parents if necessary.

35915

+as_fn_mkdir_p ()

35916

35917

35918

+ case $as_dir in #(

35919

+ -*) as_dir=./$as_dir;;

35920

+ esac

35921

+ test -d "$as_dir" || eval $as_mkdir_p || {

35922

+ as_dirs=

35923

+ while :; do

35924

+ case $as_dir in #(

35925

+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

35926

+ *) as_qdir=$as_dir;;

35927

+ esac

35928

+ as_dirs="'$as_qdir' $as_dirs"

35929

+ as_dir=`$as_dirname -- "$as_dir" ||

35930

+$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

35931

+ X"$as_dir" : 'X$//$[^/]' \| \

35932

+ X"$as_dir" : 'X$//$$' \| \

35933

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

35934

+$as_echo X"$as_dir" |

35935

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

35936

+ s//\1/

35937

+ q

35938

+ }

35939

+ /^X$\/\/$[^/].*/{

35940

+ s//\1/

35941

+ q

35942

+ }

35943

+ /^X$\/\/$$/{

35944

+ s//\1/

35945

+ q

35946

+ }

35947

+ /^X$\/$.*/{

35948

+ s//\1/

35949

+ q

35950

+ }

35951

+ s/.*/./; q'`

35952

+ test -d "$as_dir" && break

35953

+ done

35954

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

29041

as_fn_exit $as_status

29042

} # as_fn_error

29043

29044

@@ -15321,7 +15972,7 @@ $as_echo X"$as_dir" |

29045

test -d "$as_dir" && break

29046

done

29047

test -z "$as_dirs" || eval "mkdir $as_dirs"

29048

- } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"

35955

29049

+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"

35956

35957

35958

+} # as_fn_mkdir_p

35959

if mkdir -p . 2>/dev/null; then

35960

- as_mkdir_p=:

35961

+ as_mkdir_p='mkdir -p "$as_dir"'

35962

else

35963

test -d ./-p && rmdir ./-p

35964

as_mkdir_p=false

35965

@@ -16098,12 +15351,12 @@ else

35966

as_test_x='

35967

eval sh -c '\''

35968

if test -d "$1"; then

35969

- test -d "$1/.";

35970

+ test -d "$1/.";

35971

else

35972

- case $1 in

35973

- -*)set "./$1";;

35974

+ case $1 in #(

35975

+ -*)set "./$1";;

35976

esac;

35977

- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

35978

+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((

35979

???[sx]*):;;*)false;;esac;fi

35980

'\'' sh

35981

35982

@@ -16118,13 +15371,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr

35983

35984

35985

exec 6>&1

35986

+## ----------------------------------- ##

35987

+## Main body of $CONFIG_STATUS script. ##

35988

+## ----------------------------------- ##

35989

+_ASEOF

35990

+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1

35991

35992

-# Save the log message, to keep $[0] and so on meaningful, and to

35993

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

35994

+# Save the log message, to keep $0 and so on meaningful, and to

35995

# report actual input values of CONFIG_FILES etc. instead of their

29050

29051

29052

} # as_fn_mkdir_p

29053

@@ -15375,7 +16026,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri

35996

29054

# values after options handling.

35997

29055

ac_log="

35998

29056

This file was extended by Google C++ Testing Framework $as_me 1.4.0, which was

35999

-generated by GNU Autoconf 2.61. Invocation command line was

36000

+generated by GNU Autoconf 2.67. Invocation command line was

29057

-generated by GNU Autoconf 2.65. Invocation command line was

29058

+generated by GNU Autoconf 2.68. Invocation command line was

36001

29059

36002

29060

CONFIG_FILES = $CONFIG_FILES

36003

29061

CONFIG_HEADERS = $CONFIG_HEADERS

36004

@@ -16137,7 +15396,16 @@ on `(hostname || uname -n) 2>/dev/null |

36005

36006

_ACEOF

36007

36008

-cat >>$CONFIG_STATUS <<_ACEOF

36009

+case $ac_config_files in *"

36010

+"*) set x $ac_config_files; shift; ac_config_files=$*;;

36011

+esac

36012

36013

+case $ac_config_headers in *"

36014

+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;

36015

+esac

36016

36017

36018

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

36019

# Files that config.status was made for.

36020

config_files="$ac_config_files"

36021

config_headers="$ac_config_headers"

36022

@@ -16145,22 +15413,25 @@ config_commands="$ac_config_commands"

36023

36024

_ACEOF

36025

36026

-cat >>$CONFIG_STATUS <<\_ACEOF

36027

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

36028

ac_cs_usage="\

36029

-\`$as_me' instantiates files from templates according to the

36030

-current configuration.

36031

+\`$as_me' instantiates files and other configuration actions

36032

+from templates according to the current configuration. Unless the files

36033

+and actions are specified as TAGs, all are instantiated by default.

36034

36035

-Usage: $0 [OPTIONS] [FILE]...

36036

+Usage: $0 [OPTION]... [TAG]...

36037

36038

-h, --help print this help, then exit

36039

-V, --version print version number and configuration settings, then exit

36040

- -q, --quiet do not print progress messages

36041

+ --config print configuration, then exit

36042

+ -q, --quiet, --silent

36043

+ do not print progress messages

36044

-d, --debug don't remove temporary files

36045

--recheck update $as_me by reconfiguring in the same conditions

36046

- --file=FILE[:TEMPLATE]

36047

- instantiate the configuration file FILE

36048

- --header=FILE[:TEMPLATE]

36049

- instantiate the configuration header FILE

36050

+ --file=FILE[:TEMPLATE]

36051

+ instantiate the configuration file FILE

36052

+ --header=FILE[:TEMPLATE]

36053

+ instantiate the configuration header FILE

36054

36055

Configuration files:

36056

$config_files

36057

@@ -16171,16 +15442,17 @@ $config_headers

36058

Configuration commands:

36059

$config_commands

36060

36061

-Report bugs to <bug-autoconf@gnu.org>."

36062

+Report bugs to <googletestframework@googlegroups.com>."

36063

36064

_ACEOF

36065

-cat >>$CONFIG_STATUS <<_ACEOF

36066

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

36067

+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

29062

@@ -15441,10 +16092,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ

29063

ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

36068

29064

ac_cs_version="\\

36069

29065

Google C++ Testing Framework config.status 1.4.0

36070

-configured by $0, generated by GNU Autoconf 2.61,

36071

- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

36072

+configured by $0, generated by GNU Autoconf 2.67,

36073

+ with options \\"\$ac_cs_config\\"

29066

-configured by $0, generated by GNU Autoconf 2.65,

29067

+configured by $0, generated by GNU Autoconf 2.68,

29068

with options \\"\$ac_cs_config\\"

36074

29069

36075

29070

36076

29071

36077

29072

This config.status script is free software; the Free Software Foundation

36078

29073

gives unlimited permission to copy, distribute and modify it."

36079

29074

36080

@@ -16188,20 +15460,26 @@ ac_pwd='$ac_pwd'

36081

srcdir='$srcdir'

36082

INSTALL='$INSTALL'

36083

MKDIR_P='$MKDIR_P'

36084

+AWK='$AWK'

36085

+test -n "\$AWK" || AWK=awk

36086

_ACEOF

36087

36088

-cat >>$CONFIG_STATUS <<\_ACEOF

36089

-# If no file are specified by the user, then we need to provide default

36090

-# value. By we need to know if files were specified by the user.

36091

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

36092

+# The default lists apply if the user does not specify any file.

36093

ac_need_defaults=:

29075

@@ -15462,11 +16113,16 @@ ac_need_defaults=:

36094

29076

while test $# != 0

36095

29077

36096

29078

case $1 in

36108

29090

36109

29091

ac_option=$1

36110

29092

ac_optarg=$2

36111

@@ -16214,34 +15492,41 @@ do

36112

36113

ac_cs_recheck=: ;;

36114

--version | --versio | --versi | --vers | --ver | --ve | --v | -V )

36115

- echo "$ac_cs_version"; exit ;;

36116

+ $as_echo "$ac_cs_version"; exit ;;

36117

+ --config | --confi | --conf | --con | --co | --c )

36118

+ $as_echo "$ac_cs_config"; exit ;;

36119

--debug | --debu | --deb | --de | --d | -d )

36120

debug=: ;;

36121

--file | --fil | --fi | --f )

29093

@@ -15488,6 +16144,7 @@ do

36122

29094

$ac_shift

36123

- CONFIG_FILES="$CONFIG_FILES $ac_optarg"

36124

+ case $ac_optarg in

36125

+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

29095

case $ac_optarg in

29096

*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

36126

29097

+ '') as_fn_error $? "missing file argument" ;;

36127

+ esac

36128

+ as_fn_append CONFIG_FILES " '$ac_optarg'"

29098

esac

29099

as_fn_append CONFIG_FILES " '$ac_optarg'"

36129

29100

ac_need_defaults=false;;

36130

--header | --heade | --head | --hea )

36131

$ac_shift

36132

- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"

36133

+ case $ac_optarg in

36134

+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

36135

+ esac

36136

+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"

29101

@@ -15500,7 +16157,7 @@ do

36137

29102

ac_need_defaults=false;;

36138

29103

--he | --h)

36139

29104

# Conflict between --help and --header

36140

- { echo "$as_me: error: ambiguous option: $1

36141

-Try \`$0 --help' for more information." >&2

36142

- { (exit 1); exit 1; }; };;

29105

- as_fn_error "ambiguous option: \`$1'

36143

29106

+ as_fn_error $? "ambiguous option: \`$1'

36144

+Try \`$0 --help' for more information.";;

29107

Try \`$0 --help' for more information.";;

36145

29108

--help | --hel | -h )

36146

- echo "$ac_cs_usage"; exit ;;

36147

+ $as_echo "$ac_cs_usage"; exit ;;

36148

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

36149

| -silent | --silent | --silen | --sile | --sil | --si | --s)

29109

$as_echo "$ac_cs_usage"; exit ;;

29110

@@ -15509,7 +16166,7 @@ Try \`$0 --help' for more information.";

36150

29111

ac_cs_silent=: ;;

36151

29112

36152

29113

# This is an error.

36153

- -*) { echo "$as_me: error: unrecognized option: $1

36154

-Try \`$0 --help' for more information." >&2

36155

- { (exit 1); exit 1; }; } ;;

29114

- -*) as_fn_error "unrecognized option: \`$1'

36156

29115

+ -*) as_fn_error $? "unrecognized option: \`$1'

36157

+Try \`$0 --help' for more information." ;;

36158

36159

- *) ac_config_targets="$ac_config_targets $1"

36160

+ *) as_fn_append ac_config_targets " $1"

36161

ac_need_defaults=false ;;

36162

36163

esac

36164

@@ -16256,27 +15541,29 @@ if $ac_cs_silent; then

36165

36166

36167

_ACEOF

36168

-cat >>$CONFIG_STATUS <<_ACEOF

36169

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

36170

if \$ac_cs_recheck; then

36171

- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6

36172

- CONFIG_SHELL=$SHELL

36173

+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

36174

+ shift

36175

+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6

36176

+ CONFIG_SHELL='$SHELL'

36177

export CONFIG_SHELL

36178

- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

36179

+ exec "\$@"

36180

36181

36182

_ACEOF

36183

-cat >>$CONFIG_STATUS <<\_ACEOF

36184

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

36185

exec 5>>config.log

36186

{

36187

echo

36188

sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX

36189

## Running $as_me. ##

36190

_ASBOX

36191

- echo "$ac_log"

36192

+ $as_echo "$ac_log"

36193

} >&5

36194

36195

_ACEOF

36196

-cat >>$CONFIG_STATUS <<_ACEOF

36197

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

36198

36199

# INIT-COMMANDS

36200

36201

@@ -16318,6 +15605,7 @@ lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e

36202

lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'

36203

reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'

36204

reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'

36205

+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'

36206

deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'

36207

file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'

36208

AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'

36209

@@ -16476,6 +15764,7 @@ LN_S \

36210

lt_SP2NL \

36211

lt_NL2SP \

36212

reload_flag \

36213

+OBJDUMP \

29116

Try \`$0 --help' for more information." ;;

29117

29118

*) as_fn_append ac_config_targets " $1"

29119

@@ -15563,184 +16220,208 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac

29120

sed_quote_subst='$sed_quote_subst'

29121

double_quote_subst='$double_quote_subst'

29122

delay_variable_subst='$delay_variable_subst'

29123

-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'

29124

-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'

29125

-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'

29126

-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'

29127

-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'

29128

-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'

29129

-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'

29130

-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'

29131

-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'

29132

-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'

29133

-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'

29134

-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'

29135

-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'

29136

-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'

29137

-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'

29138

-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'

29139

-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'

29140

-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'

29141

-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'

29142

-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'

29143

-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'

29144

-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'

29145

-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'

29146

-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'

29147

-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'

29148

-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'

29149

-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'

29150

-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29151

-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'

29152

-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'

29153

-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'

29154

-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'

29155

-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'

29156

-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'

29157

-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'

29158

-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29159

-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29160

-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29161

-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'

29162

-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'

29163

-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'

29164

-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'

29165

-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'

29166

-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'

29167

-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'

29168

-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'

29169

-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'

29170

-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'

29171

-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'

29172

-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'

29173

-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'

29174

-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'

29175

-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'

29176

-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'

29177

-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'

29178

-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'

29179

-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'

29180

-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'

29181

-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'

29182

-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'

29183

-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'

29184

-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'

29185

-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29186

-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29187

-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'

29188

-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'

29189

-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'

29190

-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'

29191

-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'

29192

-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29193

-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29194

-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29195

-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29196

-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29197

-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29198

-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'

29199

-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'

29200

-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'

29201

-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'

29202

-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'

29203

-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'

29204

-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'

29205

-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'

29206

-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'

29207

-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'

29208

-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'

29209

-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'

29210

-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'

29211

-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'

29212

-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'

29213

-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29214

-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'

29215

-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'

29216

-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29217

-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'

29218

-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'

29219

-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'

29220

-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'

29221

-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'

29222

-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'

29223

-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'

29224

-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'

29225

-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'

29226

-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'

29227

-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'

29228

-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29229

-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29230

-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'

29231

-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'

29232

-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'

29233

-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'

29234

-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'

29235

-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'

29236

-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'

29237

-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'

29238

-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'

29239

-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'

29240

-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'

29241

-compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'

29242

-predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'

29243

-postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'

29244

-predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'

29245

-postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'

29246

-compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'

29247

-LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29248

-old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29249

-compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29250

-GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29251

-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29252

-lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29253

-lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29254

-lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29255

-lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29256

-archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29257

-enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29258

-export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29259

-whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29260

-compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29261

-old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29262

-old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29263

-archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29264

-archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29265

-module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29266

-module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29267

-with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29268

-allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29269

-no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29270

-hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29271

-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29272

-hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29273

-hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29274

-hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29275

-hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29276

-hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29277

-hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29278

-inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29279

-link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29280

-fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29281

-always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29282

-export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29283

-exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29284

-include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29285

-prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29286

-file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29287

-hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29288

-compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29289

-predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29290

-postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29291

-predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29292

-postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29293

-compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'

29294

+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'

29295

+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'

29296

+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'

29297

+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'

29298

+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'

29299

+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'

29300

+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'

29301

+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'

29302

+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'

29303

+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'

29304

+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'

29305

+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'

29306

+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'

29307

+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'

29308

+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'

29309

+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'

29310

+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'

29311

+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'

29312

+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'

29313

+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'

29314

+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'

29315

+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'

29316

+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'

29317

+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'

29318

+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'

29319

+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'

29320

+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'

29321

+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'

29322

+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'

29323

+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'

29324

+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'

29325

+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'

29326

+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'

29327

+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'

29328

+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'

29329

+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'

29330

+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'

29331

+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'

29332

+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'

29333

+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'

29334

+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'

29335

+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'

29336

+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'

29337

+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'

29338

+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'

29339

+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'

29340

+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'

29341

+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'

29342

+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'

29343

+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'

29344

+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'

29345

+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'

29346

+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'

29347

+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'

29348

+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'

29349

+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'

29350

+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'

29351

+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'

29352

+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'

29353

+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'

29354

+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'

29355

+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'

29356

+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'

29357

+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'

29358

+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'

29359

+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'

29360

+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'

29361

+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'

29362

+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'

29363

+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'

29364

+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'

29365

+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'

29366

+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'

29367

+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'

29368

+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'

29369

+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'

29370

+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'

29371

+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'

29372

+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'

29373

+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'

29374

+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'

29375

+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'

29376

+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'

29377

+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'

29378

+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'

29379

+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'

29380

+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'

29381

+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'

29382

+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'

29383

+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'

29384

+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'

29385

+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'

29386

+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'

29387

+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'

29388

+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'

29389

+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'

29390

+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'

29391

+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'

29392

+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'

29393

+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'

29394

+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'

29395

+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'

29396

+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'

29397

+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'

29398

+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'

29399

+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'

29400

+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'

29401

+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'

29402

+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'

29403

+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'

29404

+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'

29405

+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'

29406

+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'

29407

+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'

29408

+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'

29409

+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'

29410

+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'

29411

+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'

29412

+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'

29413

+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'

29414

+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'

29415

+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'

29416

+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'

29417

+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'

29418

+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'

29419

+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'

29420

+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'

29421

+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'

29422

+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'

29423

+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'

29424

+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'

29425

+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'

29426

+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'

29427

+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'

29428

+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'

29429

+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'

29430

+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'

29431

+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'

29432

+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'

29433

+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'

29434

+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'

29435

+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'

29436

+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'

29437

+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'

29438

+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'

29439

+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'

29440

+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'

29441

+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'

29442

+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'

29443

+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'

29444

+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'

29445

+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'

29446

+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'

29447

+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'

29448

+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'

29449

+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'

29450

+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'

29451

+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'

29452

+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'

29453

+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'

29454

+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'

29455

+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'

29456

+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'

29457

+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'

29458

+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'

29459

+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'

29460

+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'

29461

+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'

29462

+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'

29463

+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'

29464

+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'

29465

+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'

29466

+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'

29467

+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'

29468

+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'

29469

+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'

29470

+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'

29471

+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'

29472

+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'

29473

+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'

29474

+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'

29475

+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'

29476

+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'

29477

+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'

29478

+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'

29479

29480

LTCC='$LTCC'

29481

LTCFLAGS='$LTCFLAGS'

29482

compiler='$compiler_DEFAULT'

29483

29484

+# A function that is used when there is no print builtin or printf.

29485

+func_fallback_echo ()

29486

29487

+ eval 'cat <<_LTECHO_EOF

29488

+\$1

29489

+_LTECHO_EOF'

29490

29491

29492

# Quote evaled strings.

29493

-for var in SED \

29494

+for var in SHELL \

29495

+ECHO \

29496

+SED \

29497

GREP \

29498

EGREP \

29499

FGREP \

29500

@@ -15753,8 +16434,13 @@ reload_flag \

29501

OBJDUMP \

36214

29502

deplibs_check_method \

36215

29503

file_magic_cmd \

29504

+file_magic_glob \

29505

+want_nocaseglob \

29506

+DLLTOOL \

29507

+sharedlib_from_linklib_cmd \

36216

29508

AR \

36217

@@ -16633,7 +15922,7 @@ fi

36218

36219

_ACEOF

36220

36221

-cat >>$CONFIG_STATUS <<\_ACEOF

36222

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

36223

36224

# Handling of arguments.

36225

for ac_config_target in $ac_config_targets

36226

@@ -16645,9 +15934,7 @@ do

29509

AR_FLAGS \

29510

+archiver_list_spec \

29511

STRIP \

29512

RANLIB \

29513

CC \

29514

@@ -15764,14 +16450,14 @@ lt_cv_sys_global_symbol_pipe \

29515

lt_cv_sys_global_symbol_to_cdecl \

29516

lt_cv_sys_global_symbol_to_c_name_address \

29517

lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \

29518

-SHELL \

29519

-ECHO \

29520

+nm_file_list_spec \

29521

lt_prog_compiler_no_builtin_flag \

29522

-lt_prog_compiler_wl \

29523

lt_prog_compiler_pic \

29524

+lt_prog_compiler_wl \

29525

lt_prog_compiler_static \

29526

lt_cv_prog_compiler_c_o \

29527

need_locks \

29528

+MANIFEST_TOOL \

29529

DSYMUTIL \

29530

NMEDIT \

29531

LIPO \

29532

@@ -15787,7 +16473,6 @@ no_undefined_flag \

29533

hardcode_libdir_flag_spec \

29534

hardcode_libdir_flag_spec_ld \

29535

hardcode_libdir_separator \

29536

-fix_srcfile_path \

29537

exclude_expsyms \

29538

include_expsyms \

29539

file_list_spec \

29540

@@ -15795,6 +16480,7 @@ variables_saved_for_relink \

29541

libname_spec \

29542

library_names_spec \

29543

soname_spec \

29544

+install_override_mode \

29545

finish_eval \

29546

old_striplib \

29547

striplib \

29548

@@ -15805,10 +16491,11 @@ predeps \

29549

postdeps \

29550

compiler_lib_search_path \

29551

LD_CXX \

29552

+reload_flag_CXX \

29553

compiler_CXX \

29554

lt_prog_compiler_no_builtin_flag_CXX \

29555

-lt_prog_compiler_wl_CXX \

29556

lt_prog_compiler_pic_CXX \

29557

+lt_prog_compiler_wl_CXX \

29558

lt_prog_compiler_static_CXX \

29559

lt_cv_prog_compiler_c_o_CXX \

29560

export_dynamic_flag_spec_CXX \

29561

@@ -15820,7 +16507,6 @@ no_undefined_flag_CXX \

29562

hardcode_libdir_flag_spec_CXX \

29563

hardcode_libdir_flag_spec_ld_CXX \

29564

hardcode_libdir_separator_CXX \

29565

-fix_srcfile_path_CXX \

29566

exclude_expsyms_CXX \

29567

include_expsyms_CXX \

29568

file_list_spec_CXX \

29569

@@ -15830,9 +16516,9 @@ postdep_objects_CXX \

29570

predeps_CXX \

29571

postdeps_CXX \

29572

compiler_lib_search_path_CXX; do

29573

- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in

29574

+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in

29575

*[\\\\\\\`\\"\\\$]*)

29576

- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""

29577

+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""

29578

;;

29579

29580

eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""

29581

@@ -15854,11 +16540,13 @@ module_cmds \

29582

module_expsym_cmds \

29583

export_symbols_cmds \

29584

prelink_cmds \

29585

+postlink_cmds \

29586

postinstall_cmds \

29587

postuninstall_cmds \

29588

finish_cmds \

29589

sys_lib_search_path_spec \

29590

sys_lib_dlsearch_path_spec \

29591

+reload_cmds_CXX \

29592

old_archive_cmds_CXX \

29593

old_archive_from_new_cmds_CXX \

29594

old_archive_from_expsyms_cmds_CXX \

29595

@@ -15867,10 +16555,11 @@ archive_expsym_cmds_CXX \

29596

module_cmds_CXX \

29597

module_expsym_cmds_CXX \

29598

export_symbols_cmds_CXX \

29599

-prelink_cmds_CXX; do

29600

- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in

29601

+prelink_cmds_CXX \

29602

+postlink_cmds_CXX; do

29603

+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in

29604

*[\\\\\\\`\\"\\\$]*)

29605

- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""

29606

+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""

29607

;;

29608

29609

eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""

29610

@@ -15878,12 +16567,6 @@ prelink_cmds_CXX; do

29611

esac

29612

done

29613

29614

-# Fix-up fallback echo if it was mangled by the above quoting rules.

29615

-case \$lt_ECHO in

29616

-*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`

29617

- ;;

29618

-esac

29619

29620

ac_aux_dir='$ac_aux_dir'

29621

xsi_shell='$xsi_shell'

29622

lt_shell_append='$lt_shell_append'

29623

@@ -15920,7 +16603,7 @@ do

36227

29624

"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;

36228

29625

"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;

36229

29626

36230

- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

36231

-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

36232

- { (exit 1); exit 1; }; };;

36233

+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;

29627

- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

29628

+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

36234

29629

esac

36235

29630

done

36236

29631

36237

@@ -16674,7 +15961,7 @@ $debug ||

29632

@@ -15943,9 +16626,10 @@ fi

29633

# after its creation but before its name has been assigned to `$tmp'.

29634

$debug ||

29635

{

29636

- tmp=

29637

+ tmp= ac_tmp=

36238

29638

trap 'exit_status=$?

36239

{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status

29639

- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status

29640

+ : "${ac_tmp:=$tmp}"

29641

+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status

36240

29642

' 0

36241

- trap '{ (exit 1); exit 1; }' 1 2 13 15

36242

+ trap 'as_fn_exit 1' 1 2 13 15

29643

trap 'as_fn_exit 1' 1 2 13 15

36243

29644

}

36244

# Create a (secure) tmp directory for tmp files.

29645

@@ -15953,12 +16637,13 @@ $debug ||

36245

29646

36246

@@ -16685,255 +15972,285 @@ $debug ||

29647

{

29648

tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&

29649

- test -n "$tmp" && test -d "$tmp"

29650

+ test -d "$tmp"

29651

} ||

36247

29652

{

36248

29653

tmp=./conf$$-$RANDOM

36249

29654

(umask 077 && mkdir "$tmp")

36250

-} ||

36251

36252

- echo "$me: cannot create a temporary directory in ." >&2

36253

- { (exit 1); exit 1; }

36254

36255

36256

36257

-# Set up the sed scripts for CONFIG_FILES section.

36258

29655

-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5

36259

29656

+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5

36260

36261

-# No need to generate the scripts if there are no CONFIG_FILES.

36262

-# This happens for instance when ./config.status config.h

36263

+# Set up the scripts for CONFIG_FILES section.

36264

+# No need to generate them if there are no CONFIG_FILES.

36265

+# This happens for instance with `./config.status config.h'.

36266

if test -n "$CONFIG_FILES"; then

36267

36268

-_ACEOF

36269

36270

36271

36272

-ac_delim='%!_!# '

36273

-for ac_last_try in false false false false false :; do

36274

- cat >conf$$subs.sed <<_ACEOF

36275

-SHELL!$SHELL$ac_delim

36276

-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim

36277

-PACKAGE_NAME!$PACKAGE_NAME$ac_delim

36278

-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim

36279

-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim

36280

-PACKAGE_STRING!$PACKAGE_STRING$ac_delim

36281

-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim

36282

-exec_prefix!$exec_prefix$ac_delim

36283

-prefix!$prefix$ac_delim

36284

-program_transform_name!$program_transform_name$ac_delim

36285

-bindir!$bindir$ac_delim

36286

-sbindir!$sbindir$ac_delim

36287

-libexecdir!$libexecdir$ac_delim

36288

-datarootdir!$datarootdir$ac_delim

36289

-datadir!$datadir$ac_delim

36290

-sysconfdir!$sysconfdir$ac_delim

36291

-sharedstatedir!$sharedstatedir$ac_delim

36292

-localstatedir!$localstatedir$ac_delim

36293

-includedir!$includedir$ac_delim

36294

-oldincludedir!$oldincludedir$ac_delim

36295

-docdir!$docdir$ac_delim

36296

-infodir!$infodir$ac_delim

36297

-htmldir!$htmldir$ac_delim

36298

-dvidir!$dvidir$ac_delim

36299

-pdfdir!$pdfdir$ac_delim

36300

-psdir!$psdir$ac_delim

36301

-libdir!$libdir$ac_delim

36302

-localedir!$localedir$ac_delim

36303

-mandir!$mandir$ac_delim

36304

-DEFS!$DEFS$ac_delim

36305

-ECHO_C!$ECHO_C$ac_delim

36306

-ECHO_N!$ECHO_N$ac_delim

36307

-ECHO_T!$ECHO_T$ac_delim

36308

-LIBS!$LIBS$ac_delim

36309

-build_alias!$build_alias$ac_delim

36310

-host_alias!$host_alias$ac_delim

36311

-target_alias!$target_alias$ac_delim

36312

-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim

36313

-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim

36314

-INSTALL_DATA!$INSTALL_DATA$ac_delim

36315

-am__isrc!$am__isrc$ac_delim

36316

-CYGPATH_W!$CYGPATH_W$ac_delim

36317

-PACKAGE!$PACKAGE$ac_delim

36318

-VERSION!$VERSION$ac_delim

36319

-ACLOCAL!$ACLOCAL$ac_delim

36320

-AUTOCONF!$AUTOCONF$ac_delim

36321

-AUTOMAKE!$AUTOMAKE$ac_delim

36322

-AUTOHEADER!$AUTOHEADER$ac_delim

36323

-MAKEINFO!$MAKEINFO$ac_delim

36324

-install_sh!$install_sh$ac_delim

36325

-STRIP!$STRIP$ac_delim

36326

-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim

36327

-mkdir_p!$mkdir_p$ac_delim

36328

-AWK!$AWK$ac_delim

36329

-SET_MAKE!$SET_MAKE$ac_delim

36330

-am__leading_dot!$am__leading_dot$ac_delim

36331

-AMTAR!$AMTAR$ac_delim

36332

-am__tar!$am__tar$ac_delim

36333

-am__untar!$am__untar$ac_delim

36334

-CC!$CC$ac_delim

36335

-CFLAGS!$CFLAGS$ac_delim

36336

-LDFLAGS!$LDFLAGS$ac_delim

36337

-CPPFLAGS!$CPPFLAGS$ac_delim

36338

-ac_ct_CC!$ac_ct_CC$ac_delim

36339

-EXEEXT!$EXEEXT$ac_delim

36340

-OBJEXT!$OBJEXT$ac_delim

36341

-DEPDIR!$DEPDIR$ac_delim

36342

-am__include!$am__include$ac_delim

36343

-am__quote!$am__quote$ac_delim

36344

-AMDEP_TRUE!$AMDEP_TRUE$ac_delim

36345

-AMDEP_FALSE!$AMDEP_FALSE$ac_delim

36346

-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim

36347

-CCDEPMODE!$CCDEPMODE$ac_delim

36348

-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim

36349

-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim

36350

-CXX!$CXX$ac_delim

36351

-CXXFLAGS!$CXXFLAGS$ac_delim

36352

-ac_ct_CXX!$ac_ct_CXX$ac_delim

36353

-CXXDEPMODE!$CXXDEPMODE$ac_delim

36354

-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim

36355

-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim

36356

-LIBTOOL!$LIBTOOL$ac_delim

36357

-build!$build$ac_delim

36358

-build_cpu!$build_cpu$ac_delim

36359

-build_vendor!$build_vendor$ac_delim

36360

-build_os!$build_os$ac_delim

36361

-host!$host$ac_delim

36362

-host_cpu!$host_cpu$ac_delim

36363

-host_vendor!$host_vendor$ac_delim

36364

-host_os!$host_os$ac_delim

36365

-SED!$SED$ac_delim

36366

-GREP!$GREP$ac_delim

36367

-EGREP!$EGREP$ac_delim

36368

-FGREP!$FGREP$ac_delim

36369

-LD!$LD$ac_delim

36370

-DUMPBIN!$DUMPBIN$ac_delim

36371

-ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim

36372

-_ACEOF

36373

36374

- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then

36375

- break

36376

- elif $ac_last_try; then

36377

- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

36378

-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

36379

- { (exit 1); exit 1; }; }

36380

- else

36381

- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

36382

- fi

36383

-done

36384

36385

-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

36386

-if test -n "$ac_eof"; then

36387

- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

36388

- ac_eof=`expr $ac_eof + 1`

36389

+ac_cr=`echo X | tr X '\015'`

36390

+# On cygwin, bash can eat \r inside `` if the user requested igncr.

36391

+# But we know of no other shell where ac_cr would be empty at this

36392

+# point, so we can use a bashism as a fallback.

36393

+if test "x$ac_cr" = x; then

36394

+ eval ac_cr=\$\'\\r\'

36395

+fi

36396

+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`

36397

+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then

29657

+ac_tmp=$tmp

29658

29659

# Set up the scripts for CONFIG_FILES section.

29660

# No need to generate them if there are no CONFIG_FILES.

29661

@@ -15975,12 +16660,12 @@ if test "x$ac_cr" = x; then

29662

29663

ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`

29664

if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then

29665

- ac_cs_awk_cr='\r'

36398

29666

+ ac_cs_awk_cr='\\r'

36399

+else

36400

+ ac_cs_awk_cr=$ac_cr

29667

else

29668

ac_cs_awk_cr=$ac_cr

36401

29669

36402

29670

36403

-cat >>$CONFIG_STATUS <<_ACEOF

36404

-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof

36405

-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

36406

-_ACEOF

36407

-sed '

36408

-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

36409

-s/^/s,@/; s/!/@,|#_!!_#|/

36410

-:n

36411

-t n

36412

-s/'"$ac_delim"'$/,g/; t

36413

-s/$/\\/; p

36414

-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

36415

-' >>$CONFIG_STATUS <conf$$subs.sed

36416

-rm -f conf$$subs.sed

36417

-cat >>$CONFIG_STATUS <<_ACEOF

36418

-CEOF$ac_eof

36419

+echo 'BEGIN {' >"$tmp/subs1.awk" &&

29671

-echo 'BEGIN {' >"$tmp/subs1.awk" &&

29672

+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&

36420

29673

_ACEOF

36421

29674

36422

29675

36423

36424

+ echo "cat >conf$$subs.awk <<_ACEOF" &&

36425

+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&

36426

+ echo "_ACEOF"

36427

+} >conf$$subs.sh ||

29676

@@ -15989,18 +16674,18 @@ _ACEOF

29677

echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&

29678

echo "_ACEOF"

29679

} >conf$$subs.sh ||

29680

- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

29681

-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`

36428

29682

+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5

36429

29683

+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`

36430

29684

ac_delim='%!_!# '

36431

29685

for ac_last_try in false false false false false :; do

36432

- cat >conf$$subs.sed <<_ACEOF

36433

-NM!$NM$ac_delim

36434

-LN_S!$LN_S$ac_delim

36435

-AR!$AR$ac_delim

36436

-RANLIB!$RANLIB$ac_delim

36437

-lt_ECHO!$lt_ECHO$ac_delim

36438

-DSYMUTIL!$DSYMUTIL$ac_delim

36439

-NMEDIT!$NMEDIT$ac_delim

36440

-LIPO!$LIPO$ac_delim

36441

-OTOOL!$OTOOL$ac_delim

36442

-OTOOL64!$OTOOL64$ac_delim

36443

-CPP!$CPP$ac_delim

36444

-CXXCPP!$CXXCPP$ac_delim

36445

-PYTHON!$PYTHON$ac_delim

36446

-HAVE_PYTHON_TRUE!$HAVE_PYTHON_TRUE$ac_delim

36447

-HAVE_PYTHON_FALSE!$HAVE_PYTHON_FALSE$ac_delim

36448

-acx_pthread_config!$acx_pthread_config$ac_delim

36449

-PTHREAD_CC!$PTHREAD_CC$ac_delim

36450

-PTHREAD_LIBS!$PTHREAD_LIBS$ac_delim

36451

-PTHREAD_CFLAGS!$PTHREAD_CFLAGS$ac_delim

36452

-LIBOBJS!$LIBOBJS$ac_delim

36453

-LTLIBOBJS!$LTLIBOBJS$ac_delim

36454

-_ACEOF

36455

+ . ./conf$$subs.sh ||

29686

. ./conf$$subs.sh ||

29687

- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

36456

29688

+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5

36457

29689

36458

- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then

36459

+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`

36460

+ if test $ac_delim_n = $ac_delim_num; then

29690

ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`

29691

if test $ac_delim_n = $ac_delim_num; then

36461

29692

break

36462

29693

elif $ac_last_try; then

36463

- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

36464

-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

36465

- { (exit 1); exit 1; }; }

29694

- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

36466

29695

+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5

36467

29696

else

36468

29697

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

36469

29698

36470

done

36471

+rm -f conf$$subs.sh

29699

@@ -16008,7 +16693,7 @@ done

29700

rm -f conf$$subs.sh

36472

29701

36473

-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

36474

-if test -n "$ac_eof"; then

36475

- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

36476

- ac_eof=`expr $ac_eof + 1`

36477

-fi

36478

36479

-cat >>$CONFIG_STATUS <<_ACEOF

36480

-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof

36481

-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end

36482

-_ACEOF

36483

-sed '

36484

-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

36485

-s/^/s,@/; s/!/@,|#_!!_#|/

36486

-:n

36487

-t n

36488

-s/'"$ac_delim"'$/,g/; t

36489

-s/$/\\/; p

36490

-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

36491

-' >>$CONFIG_STATUS <conf$$subs.sed

36492

-rm -f conf$$subs.sed

36493

-cat >>$CONFIG_STATUS <<_ACEOF

36494

-:end

36495

-s/|#_!!_#|//g

36496

-CEOF$ac_eof

36497

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

36498

+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&

29702

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

29703

-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&

29704

+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&

36499

29705

_ACEOF

36500

+sed -n '

36501

36502

+s/^/S["/; s/!.*/"]=/

36503

36504

36505

+s/^[^!]*!//

36506

+:repl

36507

+t repl

36508

+s/'"$ac_delim"'$//

36509

+t delim

36510

+:nl

36511

36512

+s/$.\{148\}$..*/\1/

36513

+t more1

36514

+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/

36515

36516

36517

+b repl

36518

+:more1

36519

+s/["\\]/\\&/g; s/^/"/; s/$/"\\/

36520

36521

36522

+s/.\{148\}//

36523

+t nl

36524

+:delim

36525

36526

+s/$.\{148\}$..*/\1/

36527

+t more2

36528

+s/["\\]/\\&/g; s/^/"/; s/$/"/

36529

36530

36531

+:more2

36532

+s/["\\]/\\&/g; s/^/"/; s/$/"\\/

36533

36534

36535

+s/.\{148\}//

36536

+t delim

36537

+' <conf$$subs.awk | sed '

36538

+/^[^""]/{

36539

+ N

36540

+ s/\n//

36541

36542

+' >>$CONFIG_STATUS || ac_write_fail=1

36543

+rm -f conf$$subs.awk

36544

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

36545

+_ACAWK

36546

+cat >>"\$tmp/subs1.awk" <<_ACAWK &&

36547

+ for (key in S) S_is_set[key] = 1

36548

+ FS = ""

36549

36550

36551

36552

+ line = $ 0

36553

+ nfields = split(line, field, "@")

36554

+ substed = 0

36555

+ len = length(field[1])

36556

+ for (i = 2; i < nfields; i++) {

36557

+ key = field[i]

36558

+ keylen = length(key)

36559

+ if (S_is_set[key]) {

36560

+ value = S[key]

36561

+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)

36562

+ len += length(value) + length(field[++i])

36563

+ substed = 1

36564

+ } else

36565

+ len += 1 + keylen

36566

+ }

36567

36568

+ print line

36569

29706

sed -n '

29707

29708

@@ -16056,7 +16741,7 @@ t delim

29709

rm -f conf$$subs.awk

29710

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

29711

_ACAWK

29712

-cat >>"\$tmp/subs1.awk" <<_ACAWK &&

29713

+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&

29714

for (key in S) S_is_set[key] = 1

29715

FS = ""

36570

29716

36571

+_ACAWK

36572

+_ACEOF

36573

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

36574

+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then

36575

+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"

36576

+else

36577

+ cat

36578

+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \

29717

@@ -16088,21 +16773,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n

29718

sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"

29719

else

29720

cat

29721

-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \

29722

- || as_fn_error "could not setup config files machinery" "$LINENO" 5

29723

+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \

36579

29724

+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5

36580

+_ACEOF

29725

_ACEOF

36581

29726

36582

29727

-# VPATH may cause trouble with some makes, so we remove $(srcdir),

36583

29728

-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and

36608

29753

s/^[^=]*=[ ]*$//

36609

29754

36610

29755

36611

36612

-cat >>$CONFIG_STATUS <<\_ACEOF

36613

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

36614

fi # test -n "$CONFIG_FILES"

36615

36616

+# Set up the scripts for CONFIG_HEADERS section.

36617

+# No need to generate them if there are no CONFIG_HEADERS.

36618

+# This happens for instance with `./config.status Makefile'.

36619

+if test -n "$CONFIG_HEADERS"; then

36620

+cat >"$tmp/defines.awk" <<\_ACAWK ||

36621

+BEGIN {

36622

+_ACEOF

36623

36624

+# Transform confdefs.h into an awk script `defines.awk', embedded as

36625

+# here-document in config.status, that substitutes the proper values into

36626

+# config.h.in to produce config.h.

36627

36628

+# Create a delimiter string that does not exist in confdefs.h, to ease

36629

+# handling of long lines.

36630

+ac_delim='%!_!# '

36631

+for ac_last_try in false false :; do

36632

+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`

36633

+ if test -z "$ac_t"; then

36634

+ break

36635

+ elif $ac_last_try; then

29756

@@ -16114,7 +16807,7 @@ fi # test -n "$CONFIG_FILES"

29757

# No need to generate them if there are no CONFIG_HEADERS.

29758

# This happens for instance with `./config.status Makefile'.

29759

if test -n "$CONFIG_HEADERS"; then

29760

-cat >"$tmp/defines.awk" <<\_ACAWK ||

29761

+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||

29762

BEGIN {

29763

_ACEOF

29764

29765

@@ -16126,11 +16819,11 @@ _ACEOF

29766

# handling of long lines.

29767

ac_delim='%!_!# '

29768

for ac_last_try in false false :; do

29769

- ac_t=`sed -n "/$ac_delim/p" confdefs.h`

29770

- if test -z "$ac_t"; then

29771

+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`

29772

+ if test -z "$ac_tt"; then

29773

break

29774

elif $ac_last_try; then

29775

- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5

36636

29776

+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5

36637

+ else

36638

+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

36639

+ fi

36640

+done

36641

36642

+# For the awk script, D is an array of macro values keyed by name,

36643

+# likewise P contains macro parameters if any. Preserve backslash

36644

+# newline sequences.

36645

36646

+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*

36647

+sed -n '

36648

+s/.\{148\}/&'"$ac_delim"'/g

36649

+t rset

36650

+:rset

36651

+s/^[ ]*#[ ]*define[ ][ ]*/ /

36652

+t def

36653

36654

+:def

36655

+s/\\$//

36656

+t bsnl

36657

+s/["\\]/\\&/g

36658

+s/^ $'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/P["\1"]="\2"\

36659

+D["\1"]=" \3"/p

36660

+s/^ $'"$ac_word_re"'$[ ]*$.*$/D["\1"]=" \2"/p

36661

36662

+:bsnl

36663

+s/["\\]/\\&/g

36664

+s/^ $'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/P["\1"]="\2"\

36665

+D["\1"]=" \3\\\\\\n"\\/p

36666

+t cont

36667

+s/^ $'"$ac_word_re"'$[ ]*$.*$/D["\1"]=" \2\\\\\\n"\\/p

36668

+t cont

36669

36670

+:cont

36671

36672

+s/.\{148\}/&'"$ac_delim"'/g

36673

+t clear

36674

+:clear

36675

+s/\\$//

36676

+t bsnlc

36677

+s/["\\]/\\&/g; s/^/"/; s/$/"/p

36678

36679

+:bsnlc

36680

+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p

36681

+b cont

36682

+' <confdefs.h | sed '

36683

+s/'"$ac_delim"'/"\\\

36684

+"/g' >>$CONFIG_STATUS || ac_write_fail=1

36685

36686

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

36687

+ for (key in D) D_is_set[key] = 1

36688

+ FS = ""

36689

36690

+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {

36691

+ line = \$ 0

36692

+ split(line, arg, " ")

36693

+ if (arg[1] == "#") {

36694

+ defundef = arg[2]

36695

+ mac1 = arg[3]

36696

+ } else {

36697

+ defundef = substr(arg[1], 2)

36698

+ mac1 = arg[2]

36699

+ }

36700

+ split(mac1, mac2, "(") #)

36701

+ macro = mac2[1]

36702

+ prefix = substr(line, 1, index(line, defundef) - 1)

36703

+ if (D_is_set[macro]) {

36704

+ # Preserve the white space surrounding the "#".

36705

+ print prefix "define", macro P[macro] D[macro]

36706

+ next

36707

+ } else {

36708

+ # Replace #undef with comments. This is necessary, for example,

36709

+ # in the case of _POSIX_SOURCE, which is predefined and required

36710

+ # on some systems where configure will not decide to define it.

36711

+ if (defundef == "undef") {

36712

+ print "/*", prefix defundef, macro, "*/"

36713

+ next

36714

+ }

36715

+ }

36716

36717

+{ print }

36718

+_ACAWK

36719

+_ACEOF

36720

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

29777

else

29778

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

29779

29780

@@ -16215,7 +16908,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ

29781

_ACAWK

29782

_ACEOF

29783

cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

29784

- as_fn_error "could not setup config headers machinery" "$LINENO" 5

36721

29785

+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5

36722

+fi # test -n "$CONFIG_HEADERS"

36723

36724

36725

-for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS

36726

+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"

36727

+shift

36728

+for ac_tag

36729

36730

case $ac_tag in

36731

:[FHLC]) ac_mode=$ac_tag; continue;;

29786

fi # test -n "$CONFIG_HEADERS"

29787

29788

29789

@@ -16228,7 +16921,7 @@ do

36732

29790

esac

36733

29791

case $ac_mode$ac_tag in

36734

29792

:[FHL]*:*);;

36735

- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5

36736

-echo "$as_me: error: Invalid tag $ac_tag." >&2;}

36737

- { (exit 1); exit 1; }; };;

36738

+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;

29793

- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;

29794

+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;

36739

29795

:[FH]-) ac_tag=-:-;;

36740

29796

:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;

36741

29797

esac

36742

@@ -16961,26 +16278,34 @@ echo "$as_me: error: Invalid tag $ac_tag

29798

@@ -16247,7 +16940,7 @@ do

29799

for ac_f

29800

29801

case $ac_f in

29802

- -) ac_f="$tmp/stdin";;

29803

+ -) ac_f="$ac_tmp/stdin";;

29804

*) # Look for the file first in the build tree, then in the source tree

29805

# (if the path is not absolute). The absolute path cannot be DOS-style,

29806

# because $ac_f cannot contain `:'.

29807

@@ -16256,7 +16949,7 @@ do

36743

29808

[\\/$]*) false;;

36744

29809

*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;

36745

29810

esac ||

36746

- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5

36747

-echo "$as_me: error: cannot find input file: $ac_f" >&2;}

36748

- { (exit 1); exit 1; }; };;

36749

+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;

29811

- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;

29812

+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;

36750

29813

esac

36751

- ac_file_inputs="$ac_file_inputs $ac_f"

36752

+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac

36753

+ as_fn_append ac_file_inputs " '$ac_f'"

36754

done

36755

36756

# Let's still pretend it is `configure' which instantiates (i.e., don't

36757

# use $as_me), people would be surprised to read:

36758

# /* config.h. Generated by config.status. */

36759

- configure_input="Generated from "`IFS=:

36760

- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."

36761

+ configure_input='Generated from '`

36762

+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'

36763

+ `' by configure.'

36764

if test x"$ac_file" != x-; then

36765

configure_input="$ac_file. $configure_input"

36766

- { echo "$as_me:$LINENO: creating $ac_file" >&5

36767

-echo "$as_me: creating $ac_file" >&6;}

36768

+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5

36769

+$as_echo "$as_me: creating $ac_file" >&6;}

36770

36771

+ # Neutralize special characters interpreted by sed in replacement strings.

36772

+ case $configure_input in #(

36773

+ *\&* | *\|* | *\\* )

36774

+ ac_sed_conf_input=`$as_echo "$configure_input" |

36775

+ sed 's/[\\\\&|]/\\\\&/g'`;; #(

36776

+ *) ac_sed_conf_input=$configure_input;;

36777

+ esac

29814

case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac

29815

as_fn_append ac_file_inputs " '$ac_f'"

29816

@@ -16282,8 +16975,8 @@ $as_echo "$as_me: creating $ac_file" >&6

29817

esac

36778

29818

36779

29819

case $ac_tag in

36780

- *:-:* | *:-) cat >"$tmp/stdin";;

36781

+ *:-:* | *:-) cat >"$tmp/stdin" \

36782

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;

29820

- *:-:* | *:-) cat >"$tmp/stdin" \

29821

- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;

29822

+ *:-:* | *:-) cat >"$ac_tmp/stdin" \

29823

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;

36783

29824

esac

36784

29825

;;

36785

29826

esac

36786

@@ -16990,7 +16315,7 @@ $as_expr X"$ac_file" : 'X$.*[^/]$//*[^

36787

X"$ac_file" : 'X$//$[^/]' \| \

36788

X"$ac_file" : 'X$//$$' \| \

36789

X"$ac_file" : 'X$/$' \| . 2>/dev/null ||

36790

-echo X"$ac_file" |

36791

+$as_echo X"$ac_file" |

36792

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

36793

s//\1/

36794

36795

@@ -17008,55 +16333,15 @@ echo X"$ac_file" |

36796

36797

}

36798

s/.*/./; q'`

36799

- { as_dir="$ac_dir"

36800

- case $as_dir in #(

36801

- -*) as_dir=./$as_dir;;

36802

- esac

36803

- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

36804

- as_dirs=

36805

- while :; do

36806

- case $as_dir in #(

36807

- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

36808

- *) as_qdir=$as_dir;;

36809

- esac

36810

- as_dirs="'$as_qdir' $as_dirs"

36811

- as_dir=`$as_dirname -- "$as_dir" ||

36812

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

36813

- X"$as_dir" : 'X$//$[^/]' \| \

36814

- X"$as_dir" : 'X$//$$' \| \

36815

- X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

36816

-echo X"$as_dir" |

36817

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

36818

- s//\1/

36819

- q

36820

- }

36821

- /^X$\/\/$[^/].*/{

36822

- s//\1/

36823

- q

36824

- }

36825

- /^X$\/\/$$/{

36826

- s//\1/

36827

- q

36828

- }

36829

- /^X$\/$.*/{

36830

- s//\1/

36831

- q

36832

- }

36833

- s/.*/./; q'`

36834

- test -d "$as_dir" && break

36835

- done

36836

- test -z "$as_dirs" || eval "mkdir $as_dirs"

36837

- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

36838

-echo "$as_me: error: cannot create directory $as_dir" >&2;}

36839

- { (exit 1); exit 1; }; }; }

36840

+ as_dir="$ac_dir"; as_fn_mkdir_p

36841

ac_builddir=.

36842

36843

case "$ac_dir" in

36844

.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

36845

36846

- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

36847

+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`

36848

# A ".." for each directory in $ac_dir_suffix.

36849

- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

36850

+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`

36851

case $ac_top_builddir_sub in

36852

"") ac_top_builddir_sub=. ac_top_build_prefix= ;;

36853

*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

36854

@@ -17101,12 +16386,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_

36855

esac

36856

_ACEOF

36857

36858

-cat >>$CONFIG_STATUS <<\_ACEOF

36859

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

36860

# If the template does not know about datarootdir, expand it.

36861

# FIXME: This hack should be removed a few years after 2.60.

36862

ac_datarootdir_hack=; ac_datarootdir_seen=

36863

36864

-case `sed -n '/datarootdir/ {

36865

+ac_sed_dataroot='

36866

+/datarootdir/ {

36867

36868

36869

}

36870

@@ -17114,36 +16399,37 @@ case `sed -n '/datarootdir/ {

36871

/@docdir@/p

36872

/@infodir@/p

36873

/@localedir@/p

36874

-/@mandir@/p

36875

-' $ac_file_inputs` in

36876

+/@mandir@/p'

36877

+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in

36878

*datarootdir*) ac_datarootdir_seen=yes;;

36879

*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)

36880

- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

36881

-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

36882

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

36883

+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

36884

_ACEOF

36885

-cat >>$CONFIG_STATUS <<_ACEOF

36886

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

36887

ac_datarootdir_hack='

36888

s&@datadir@&$datadir&g

36889

s&@docdir@&$docdir&g

36890

s&@infodir@&$infodir&g

36891

s&@localedir@&$localedir&g

36892

s&@mandir@&$mandir&g

36893

- s&\\\${datarootdir}&$datarootdir&g' ;;

36894

+ s&\\\${datarootdir}&$datarootdir&g' ;;

36895

esac

36896

_ACEOF

36897

36898

# Neutralize VPATH when `$srcdir' = `.'.

36899

# Shell code in configure.ac might set extrasub.

36900

# FIXME: do we really want to maintain this feature?

36901

-cat >>$CONFIG_STATUS <<_ACEOF

36902

- sed "$ac_vpsub

36903

+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

36904

+ac_sed_extra="$ac_vpsub

36905

$extrasub

36906

_ACEOF

36907

-cat >>$CONFIG_STATUS <<\_ACEOF

36908

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

36909

36910

/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

36911

-s&@configure_input@&$configure_input&;t t

36912

+s|@configure_input@|$ac_sed_conf_input|;t t

36913

s&@top_builddir@&$ac_top_builddir_sub&;t t

36914

+s&@top_build_prefix@&$ac_top_build_prefix&;t t

36915

s&@srcdir@&$ac_srcdir&;t t

36916

s&@abs_srcdir@&$ac_abs_srcdir&;t t

36917

s&@top_srcdir@&$ac_top_srcdir&;t t

36918

@@ -17154,121 +16440,50 @@ s&@abs_top_builddir@&$ac_abs_top_builddi

36919

s&@INSTALL@&$ac_INSTALL&;t t

29827

@@ -16419,23 +17112,24 @@ s&@INSTALL@&$ac_INSTALL&;t t

36920

29828

s&@MKDIR_P@&$ac_MKDIR_P&;t t

36921

29829

$ac_datarootdir_hack

36922

-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out

36923

36924

+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \

36925

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

29830

29831

-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \

29832

- || as_fn_error "could not create $ac_file" "$LINENO" 5

29833

+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \

29834

+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5

36926

29835

36927

29836

test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&

36928

{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

36929

{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

36930

- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'

29837

- { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

29838

- { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

29839

+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&

29840

+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \

29841

+ "$ac_tmp/out"`; test -z "$ac_out"; } &&

29842

{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'

36931

29843

-which seems to be undefined. Please make sure it is defined." >&5

36932

-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

29844

+which seems to be undefined. Please make sure it is defined" >&5

29845

$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

36933

29846

-which seems to be undefined. Please make sure it is defined." >&2;}

36934

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'

36935

+which seems to be undefined. Please make sure it is defined" >&5

36936

+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

36937

29847

+which seems to be undefined. Please make sure it is defined" >&2;}

36938

29848

36939

rm -f "$tmp/stdin"

29849

- rm -f "$tmp/stdin"

29850

+ rm -f "$ac_tmp/stdin"

36940

29851

case $ac_file in

36941

- -) cat "$tmp/out"; rm -f "$tmp/out";;

36942

- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;

36943

- esac

36944

+ -) cat "$tmp/out" && rm -f "$tmp/out";;

36945

+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;

36946

+ esac \

29852

- -) cat "$tmp/out" && rm -f "$tmp/out";;

29853

- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;

29854

+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;

29855

+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;

29856

esac \

29857

- || as_fn_error "could not create $ac_file" "$LINENO" 5

36947

29858

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

36948

29859

;;

36949

29860

:H)

36950

29861

36951

# CONFIG_HEADER

36952

36953

-_ACEOF

36954

36955

-# Transform confdefs.h into a sed script `conftest.defines', that

36956

-# substitutes the proper values into config.h.in to produce config.h.

36957

-rm -f conftest.defines conftest.tail

36958

-# First, append a space to every undef/define line, to ease matching.

36959

-echo 's/$/ /' >conftest.defines

36960

-# Then, protect against being on the right side of a sed subst, or in

36961

-# an unquoted here document, in config.status. If some macros were

36962

-# called several times there might be several #defines for the same

36963

-# symbol, which is useless. But do not sort them, since the last

36964

-# AC_DEFINE must be honored.

36965

-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*

36966

-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where

36967

-# NAME is the cpp macro being defined, VALUE is the value it is being given.

36968

-# PARAMS is the parameter list in the macro definition--in most cases, it's

36969

-# just an empty string.

36970

-ac_dA='s,^\$[ #]*\$[^ ]*\\([ ]*'

36971

-ac_dB='\\)[ (].*,\\1define\\2'

36972

-ac_dC=' '

36973

-ac_dD=' ,'

36974

36975

-uniq confdefs.h |

36976

- sed -n '

36977

- t rset

36978

- :rset

36979

- s/^[ ]*#[ ]*define[ ][ ]*//

36980

- t ok

36981

- d

36982

- :ok

36983

- s/[\\&,]/\\&/g

36984

- s/^$'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p

36985

- s/^$'"$ac_word_re"'$[ ]*$.*$/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p

36986

- ' >>conftest.defines

36987

36988

-# Remove the space that was appended to ease matching.

36989

-# Then replace #undef with comments. This is necessary, for

36990

-# example, in the case of _POSIX_SOURCE, which is predefined and required

36991

-# on some systems where configure will not decide to define it.

36992

-# (The regexp can be short, since the line contains either #define or #undef.)

36993

-echo 's/ $//

36994

-s,^[ #]*u.*,/* & */,' >>conftest.defines

36995

36996

-# Break up conftest.defines:

36997

-ac_max_sed_lines=50

36998

36999

-# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"

37000

-# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"

37001

-# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"

37002

-# et cetera.

37003

-ac_in='$ac_file_inputs'

37004

-ac_out='"$tmp/out1"'

37005

-ac_nxt='"$tmp/out2"'

37006

37007

-while :

37008

-do

37009

- # Write a here document:

37010

- cat >>$CONFIG_STATUS <<_ACEOF

37011

- # First, check the format of the line:

37012

- cat >"\$tmp/defines.sed" <<\\CEOF

37013

-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def

37014

-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def

37015

-b

37016

-:def

37017

-_ACEOF

37018

- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS

37019

- echo 'CEOF

37020

- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS

37021

- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in

37022

- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail

37023

- grep . conftest.tail >/dev/null || break

37024

- rm -f conftest.defines

37025

- mv conftest.tail conftest.defines

37026

-done

37027

-rm -f conftest.defines conftest.tail

37028

37029

-echo "ac_result=$ac_in" >>$CONFIG_STATUS

37030

-cat >>$CONFIG_STATUS <<\_ACEOF

29862

@@ -16444,21 +17138,21 @@ which seems to be undefined. Please mak

37031

29863

if test x"$ac_file" != x-; then

37032

- echo "/* $configure_input */" >"$tmp/config.h"

37033

- cat "$ac_result" >>"$tmp/config.h"

37034

- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then

37035

- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5

37036

-echo "$as_me: $ac_file is unchanged" >&6;}

37037

+ {

37038

+ $as_echo "/* $configure_input */" \

37039

+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"

37040

+ } >"$tmp/config.h" \

29864

{

29865

$as_echo "/* $configure_input */" \

29866

- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"

29867

- } >"$tmp/config.h" \

29868

- || as_fn_error "could not create $ac_file" "$LINENO" 5

29869

- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then

29870

+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"

29871

+ } >"$ac_tmp/config.h" \

37041

29872

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

37042

+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then

37043

+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5

37044

+$as_echo "$as_me: $ac_file is unchanged" >&6;}

29873

+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then

29874

{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5

29875

$as_echo "$as_me: $ac_file is unchanged" >&6;}

37045

29876

else

37046

- rm -f $ac_file

37047

- mv "$tmp/config.h" $ac_file

37048

+ rm -f "$ac_file"

37049

+ mv "$tmp/config.h" "$ac_file" \

29877

rm -f "$ac_file"

29878

- mv "$tmp/config.h" "$ac_file" \

29879

- || as_fn_error "could not create $ac_file" "$LINENO" 5

29880

+ mv "$ac_tmp/config.h" "$ac_file" \

37050

29881

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

37051

29882

37052

29883

else

37053

- echo "/* $configure_input */"

37054

- cat "$ac_result"

37055

+ $as_echo "/* $configure_input */" \

37056

+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \

29884

$as_echo "/* $configure_input */" \

29885

- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \

29886

- || as_fn_error "could not create -" "$LINENO" 5

29887

+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \

37057

29888

+ || as_fn_error $? "could not create -" "$LINENO" 5

37058

29889

37059

- rm -f "$tmp/out12"

37060

-# Compute $ac_file's index in $config_headers.

37061

-_am_arg=$ac_file

37062

+# Compute "$ac_file"'s index in $config_headers.

37063

+_am_arg="$ac_file"

37064

_am_stamp_count=1

37065

for _am_header in $config_headers :; do

37066

case $_am_header in

37067

@@ -17283,7 +16498,7 @@ $as_expr X"$_am_arg" : 'X$.*[^/]$//*[^

37068

X"$_am_arg" : 'X$//$[^/]' \| \

37069

X"$_am_arg" : 'X$//$$' \| \

37070

X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||

37071

-echo X"$_am_arg" |

37072

+$as_echo X"$_am_arg" |

37073

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

37074

s//\1/

37075

37076

@@ -17303,31 +16518,41 @@ echo X"$_am_arg" |

37077

s/.*/./; q'`/stamp-h$_am_stamp_count

37078

;;

37079

37080

- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5

37081

-echo "$as_me: executing $ac_file commands" >&6;}

37082

+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5

37083

+$as_echo "$as_me: executing $ac_file commands" >&6;}

37084

;;

37085

esac

37086

37087

37088

case $ac_file$ac_mode in

37089

"scripts/gtest-config":F) chmod +x scripts/gtest-config ;;

37090

- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do

37091

- # Strip MF so we end up with the name of the file.

37092

- mf=`echo "$mf" | sed -e 's/:.*$//'`

37093

- # Check whether this is an Automake generated Makefile or not.

37094

- # We used to match only the files named `Makefile.in', but

37095

- # some people rename them; so instead we look at the file content.

37096

- # Grep'ing the first line is not enough: some people post-process

37097

- # each Makefile.in and add a new line on top of each file to say so.

37098

- # Grep'ing the whole file is not good either: AIX grep has a line

37099

- # limit of 2048, but all sed's we know have understand at least 4000.

37100

- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

37101

- dirpart=`$as_dirname -- "$mf" ||

37102

+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {

37103

+ # Autoconf 2.62 quotes --file arguments for eval, but not when files

37104

+ # are listed without --file. Let's play safe and only enable the eval

37105

+ # if we detect the quoting.

37106

+ case $CONFIG_FILES in

37107

+ *\'*) eval set x "$CONFIG_FILES" ;;

37108

+ *) set x $CONFIG_FILES ;;

37109

+ esac

37110

+ shift

37111

+ for mf

37112

+ do

37113

+ # Strip MF so we end up with the name of the file.

37114

+ mf=`echo "$mf" | sed -e 's/:.*$//'`

37115

+ # Check whether this is an Automake generated Makefile or not.

37116

+ # We used to match only the files named `Makefile.in', but

37117

+ # some people rename them; so instead we look at the file content.

37118

+ # Grep'ing the first line is not enough: some people post-process

37119

+ # each Makefile.in and add a new line on top of each file to say so.

37120

+ # Grep'ing the whole file is not good either: AIX grep has a line

37121

+ # limit of 2048, but all sed's we know have understand at least 4000.

37122

+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

37123

+ dirpart=`$as_dirname -- "$mf" ||

37124

$as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

37125

X"$mf" : 'X$//$[^/]' \| \

37126

X"$mf" : 'X$//$$' \| \

37127

X"$mf" : 'X$/$' \| . 2>/dev/null ||

37128

-echo X"$mf" |

37129

+$as_echo X"$mf" |

37130

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

37131

s//\1/

37132

37133

@@ -17345,68 +16570,33 @@ echo X"$mf" |

37134

37135

}

37136

s/.*/./; q'`

37137

- else

37138

- continue

37139

- fi

37140

- # Extract the definition of DEPDIR, am__include, and am__quote

37141

- # from the Makefile without running `make'.

37142

- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

37143

- test -z "$DEPDIR" && continue

37144

- am__include=`sed -n 's/^am__include = //p' < "$mf"`

37145

- test -z "am__include" && continue

37146

- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

37147

- # When using ansi2knr, U may be empty or an underscore; expand it

37148

- U=`sed -n 's/^U = //p' < "$mf"`

37149

- # Find all dependency output files, they are included files with

37150

- # $(DEPDIR) in their names. We invoke sed twice because it is the

37151

- # simplest approach to changing $(DEPDIR) to its actual value in the

37152

- # expansion.

37153

- for file in `sed -n "

37154

- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

37155

- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

37156

- # Make sure the directory exists.

37157

- test -f "$dirpart/$file" && continue

37158

- fdir=`$as_dirname -- "$file" ||

37159

+ else

37160

+ continue

37161

+ fi

37162

+ # Extract the definition of DEPDIR, am__include, and am__quote

37163

+ # from the Makefile without running `make'.

37164

+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

37165

+ test -z "$DEPDIR" && continue

37166

+ am__include=`sed -n 's/^am__include = //p' < "$mf"`

37167

+ test -z "am__include" && continue

37168

+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

37169

+ # When using ansi2knr, U may be empty or an underscore; expand it

37170

+ U=`sed -n 's/^U = //p' < "$mf"`

37171

+ # Find all dependency output files, they are included files with

37172

+ # $(DEPDIR) in their names. We invoke sed twice because it is the

37173

+ # simplest approach to changing $(DEPDIR) to its actual value in the

37174

+ # expansion.

37175

+ for file in `sed -n "

37176

+ s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

37177

+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

37178

+ # Make sure the directory exists.

37179

+ test -f "$dirpart/$file" && continue

37180

+ fdir=`$as_dirname -- "$file" ||

37181

$as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

37182

X"$file" : 'X$//$[^/]' \| \

37183

X"$file" : 'X$//$$' \| \

37184

X"$file" : 'X$/$' \| . 2>/dev/null ||

37185

-echo X"$file" |

37186

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

37187

- s//\1/

37188

- q

37189

- }

37190

- /^X$\/\/$[^/].*/{

37191

- s//\1/

37192

- q

37193

- }

37194

- /^X$\/\/$$/{

37195

- s//\1/

37196

- q

37197

- }

37198

- /^X$\/$.*/{

37199

- s//\1/

37200

- q

37201

- }

37202

- s/.*/./; q'`

37203

- { as_dir=$dirpart/$fdir

37204

- case $as_dir in #(

37205

- -*) as_dir=./$as_dir;;

37206

- esac

37207

- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

37208

- as_dirs=

37209

- while :; do

37210

- case $as_dir in #(

37211

- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

37212

- *) as_qdir=$as_dir;;

37213

- esac

37214

- as_dirs="'$as_qdir' $as_dirs"

37215

- as_dir=`$as_dirname -- "$as_dir" ||

37216

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

37217

- X"$as_dir" : 'X$//$[^/]' \| \

37218

- X"$as_dir" : 'X$//$$' \| \

37219

- X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

37220

-echo X"$as_dir" |

37221

+$as_echo X"$file" |

37222

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

37223

s//\1/

37224

37225

@@ -17424,16 +16614,12 @@ echo X"$as_dir" |

37226

37227

}

37228

s/.*/./; q'`

37229

- test -d "$as_dir" && break

37230

+ as_dir=$dirpart/$fdir; as_fn_mkdir_p

37231

+ # echo "creating $dirpart/$file"

37232

+ echo '# dummy' > "$dirpart/$file"

37233

done

37234

- test -z "$as_dirs" || eval "mkdir $as_dirs"

37235

- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

37236

-echo "$as_me: error: cannot create directory $as_dir" >&2;}

37237

- { (exit 1); exit 1; }; }; }

37238

- # echo "creating $dirpart/$file"

37239

- echo '# dummy' > "$dirpart/$file"

37240

done

37241

-done

37242

37243

;;

37244

"libtool":C)

37245

37246

@@ -17557,6 +16743,9 @@ NL2SP=$lt_lt_NL2SP

37247

reload_flag=$lt_reload_flag

37248

reload_cmds=$lt_reload_cmds

37249

37250

+# An object symbol dumper.

37251

+OBJDUMP=$lt_OBJDUMP

37252

29890

# Compute "$ac_file"'s index in $config_headers.

29891

_am_arg="$ac_file"

29892

@@ -16620,7 +17314,8 @@ $as_echo X"$file" |

29893

# NOTE: Changes made to this file will be lost: look at ltmain.sh.

29894

29895

29896

-# 2006, 2007, 2008 Free Software Foundation, Inc.

29897

+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,

29898

+# Inc.

29899

# Written by Gordon Matzigkeit, 1996

29900

29901

# This file is part of GNU Libtool.

29902

@@ -16668,6 +17363,12 @@ pic_mode=$pic_mode

29903

# Whether or not to optimize for fast installation.

29904

fast_install=$enable_fast_install

29905

29906

+# Shell to use when invoking shell scripts.

29907

+SHELL=$lt_SHELL

29908

29909

+# An echo program that protects backslashes.

29910

+ECHO=$lt_ECHO

29911

29912

# The host system.

29913

host_alias=$host_alias

29914

host=$host

29915

@@ -16717,9 +17418,11 @@ SP2NL=$lt_lt_SP2NL

29916

# turn newlines into spaces.

29917

NL2SP=$lt_lt_NL2SP

29918

29919

-# How to create reloadable object files.

29920

-reload_flag=$lt_reload_flag

29921

-reload_cmds=$lt_reload_cmds

29922

+# convert \$build file names to \$host format.

29923

+to_host_file_cmd=$lt_cv_to_host_file_cmd

29924

29925

+# convert \$build files to toolchain format.

29926

+to_tool_file_cmd=$lt_cv_to_tool_file_cmd

29927

29928

# An object symbol dumper.

29929

OBJDUMP=$lt_OBJDUMP

29930

@@ -16727,13 +17430,30 @@ OBJDUMP=$lt_OBJDUMP

37253

29931

# Method to check whether dependent libraries are shared objects.

37254

29932

deplibs_check_method=$lt_deplibs_check_method

37255

29933

37256

@@ -18239,11 +17428,13 @@ _LT_EOF

37257

done # for ac_tag

37258

37259

37260

-{ (exit 0); exit 0; }

37261

+as_fn_exit 0

37262

_ACEOF

37263

-chmod +x $CONFIG_STATUS

29934

-# Command to use when deplibs_check_method == "file_magic".

29935

+# Command to use when deplibs_check_method = "file_magic".

29936

file_magic_cmd=$lt_file_magic_cmd

29937

29938

+# How to find potential files when deplibs_check_method = "file_magic".

29939

+file_magic_glob=$lt_file_magic_glob

29940

29941

+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".

29942

+want_nocaseglob=$lt_want_nocaseglob

29943

29944

+# DLL creation program.

29945

+DLLTOOL=$lt_DLLTOOL

29946

29947

+# Command to associate shared and link libraries.

29948

+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd

29949

29950

# The archiver.

29951

AR=$lt_AR

29952

29953

+# Flags to create an archive.

29954

AR_FLAGS=$lt_AR_FLAGS

29955

29956

+# How to feed a file listing to the archiver.

29957

+archiver_list_spec=$lt_archiver_list_spec

29958

29959

# A symbol stripping program.

29960

STRIP=$lt_STRIP

29961

29962

@@ -16742,6 +17462,9 @@ RANLIB=$lt_RANLIB

29963

old_postinstall_cmds=$lt_old_postinstall_cmds

29964

old_postuninstall_cmds=$lt_old_postuninstall_cmds

29965

29966

+# Whether to use a lock for old archive extraction.

29967

+lock_old_archive_extraction=$lock_old_archive_extraction

29968

29969

# A C compiler.

29970

LTCC=$lt_CC

29971

29972

@@ -16760,14 +17483,14 @@ global_symbol_to_c_name_address=$lt_lt_c

29973

# Transform the output of nm in a C name address pair when lib prefix is needed.

29974

global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix

29975

29976

-# The name of the directory that contains temporary libtool files.

29977

-objdir=$objdir

29978

+# Specify filename containing input files for \$NM.

29979

+nm_file_list_spec=$lt_nm_file_list_spec

29980

29981

-# Shell to use when invoking shell scripts.

29982

-SHELL=$lt_SHELL

29983

+# The root where to search for dependent libraries,and in which our libraries should be installed.

29984

+lt_sysroot=$lt_sysroot

29985

29986

-# An echo program that does not interpret backslashes.

29987

-ECHO=$lt_ECHO

29988

+# The name of the directory that contains temporary libtool files.

29989

+objdir=$objdir

29990

29991

# Used to examine libraries when file_magic_cmd begins with "file".

29992

MAGIC_CMD=$MAGIC_CMD

29993

@@ -16775,6 +17498,9 @@ MAGIC_CMD=$MAGIC_CMD

29994

# Must we lock files when doing compilation?

29995

need_locks=$lt_need_locks

29996

29997

+# Manifest tool.

29998

+MANIFEST_TOOL=$lt_MANIFEST_TOOL

29999

30000

# Tool to manipulate archived DWARF debug symbol files on Mac OS X.

30001

DSYMUTIL=$lt_DSYMUTIL

30002

30003

@@ -16831,6 +17557,9 @@ library_names_spec=$lt_library_names_spe

30004

# The coded name of the library, if different from the real name.

30005

soname_spec=$lt_soname_spec

30006

30007

+# Permission mode override for installation of shared libraries.

30008

+install_override_mode=$lt_install_override_mode

30009

30010

# Command to use after installation of a shared archive.

30011

postinstall_cmds=$lt_postinstall_cmds

30012

30013

@@ -16870,6 +17599,10 @@ striplib=$lt_striplib

30014

# The linker used to build libraries.

30015

LD=$lt_LD

30016

30017

+# How to create reloadable object files.

30018

+reload_flag=$lt_reload_flag

30019

+reload_cmds=$lt_reload_cmds

30020

30021

# Commands used to build an old-style archive.

30022

old_archive_cmds=$lt_old_archive_cmds

30023

30024

@@ -16882,12 +17615,12 @@ with_gcc=$GCC

30025

# Compiler flag to turn off builtin functions.

30026

no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag

30027

30028

-# How to pass a linker flag through the compiler.

30029

-wl=$lt_lt_prog_compiler_wl

30030

30031

# Additional compiler flags for building library objects.

30032

pic_flag=$lt_lt_prog_compiler_pic

30033

30034

+# How to pass a linker flag through the compiler.

30035

+wl=$lt_lt_prog_compiler_wl

30036

30037

# Compiler flag to prevent dynamic linking.

30038

link_static_flag=$lt_lt_prog_compiler_static

30039

30040

@@ -16974,9 +17707,6 @@ inherit_rpath=$inherit_rpath

30041

# Whether libtool must link a program against all its dependency libraries.

30042

link_all_deplibs=$link_all_deplibs

30043

30044

-# Fix the shell variable \$srcfile for the compiler.

30045

-fix_srcfile_path=$lt_fix_srcfile_path

30046

30047

# Set to "yes" if exported symbols are required.

30048

always_export_symbols=$always_export_symbols

30049

30050

@@ -16992,6 +17722,9 @@ include_expsyms=$lt_include_expsyms

30051

# Commands necessary for linking programs (against libraries) with templates.

30052

prelink_cmds=$lt_prelink_cmds

30053

30054

+# Commands necessary for finishing linking programs.

30055

+postlink_cmds=$lt_postlink_cmds

30056

30057

# Specify filename containing input files.

30058

file_list_spec=$lt_file_list_spec

30059

30060

@@ -17038,212 +17771,169 @@ ltmain="$ac_aux_dir/ltmain.sh"

30061

# if finds mixed CR/LF and LF-only lines. Since sed operates in

30062

# text mode, it properly converts lines to CR/LF. This bash problem

30063

# is reportedly fixed, but why not run on old versions too?

30064

- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \

30065

- || (rm -f "$cfgfile"; exit 1)

30066

30067

- case $xsi_shell in

30068

- yes)

30069

- cat << \_LT_EOF >> "$cfgfile"

30070

30071

-# func_dirname file append nondir_replacement

30072

-# Compute the dirname of FILE. If nonempty, add APPEND to the result,

30073

-# otherwise set result to NONDIR_REPLACEMENT.

30074

-func_dirname ()

30075

30076

- case ${1} in

30077

- */*) func_dirname_result="${1%/*}${2}" ;;

30078

- * ) func_dirname_result="${3}" ;;

30079

- esac

30080

30081

30082

-# func_basename file

30083

-func_basename ()

30084

30085

- func_basename_result="${1##*/}"

30086

30087

30088

-# func_dirname_and_basename file append nondir_replacement

30089

-# perform func_basename and func_dirname in a single function

30090

-# call:

30091

-# dirname: Compute the dirname of FILE. If nonempty,

30092

-# add APPEND to the result, otherwise set result

30093

-# to NONDIR_REPLACEMENT.

30094

-# value returned in "$func_dirname_result"

30095

-# basename: Compute filename of FILE.

30096

-# value retuned in "$func_basename_result"

30097

-# Implementation must be kept synchronized with func_dirname

30098

-# and func_basename. For efficiency, we do not delegate to

30099

-# those functions but instead duplicate the functionality here.

30100

-func_dirname_and_basename ()

30101

30102

- case ${1} in

30103

- */*) func_dirname_result="${1%/*}${2}" ;;

30104

- * ) func_dirname_result="${3}" ;;

30105

- esac

30106

- func_basename_result="${1##*/}"

30107

30108

30109

-# func_stripname prefix suffix name

30110

-# strip PREFIX and SUFFIX off of NAME.

30111

-# PREFIX and SUFFIX must not contain globbing or regex special

30112

-# characters, hashes, percent signs, but SUFFIX may contain a leading

30113

-# dot (in which case that matches only a dot).

30114

-func_stripname ()

30115

30116

- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are

30117

- # positional parameters, so assign one to ordinary parameter first.

30118

- func_stripname_result=${3}

30119

- func_stripname_result=${func_stripname_result#"${1}"}

30120

- func_stripname_result=${func_stripname_result%"${2}"}

30121

30122

30123

-# func_opt_split

30124

-func_opt_split ()

30125

30126

- func_opt_split_opt=${1%%=*}

30127

- func_opt_split_arg=${1#*=}

30128

30129

30130

-# func_lo2o object

30131

-func_lo2o ()

30132

30133

- case ${1} in

30134

- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;

30135

- *) func_lo2o_result=${1} ;;

30136

- esac

30137

30138

30139

-# func_xform libobj-or-source

30140

-func_xform ()

30141

30142

- func_xform_result=${1%.*}.lo

30143

30144

30145

-# func_arith arithmetic-term...

30146

-func_arith ()

30147

30148

- func_arith_result=$(( $* ))

30149

30150

30151

-# func_len string

30152

-# STRING may not start with a hyphen.

30153

-func_len ()

30154

30155

- func_len_result=${#1}

30156

30157

30158

-_LT_EOF

30159

- ;;

30160

- *) # Bourne compatible functions.

30161

- cat << \_LT_EOF >> "$cfgfile"

30162

30163

-# func_dirname file append nondir_replacement

30164

-# Compute the dirname of FILE. If nonempty, add APPEND to the result,

30165

-# otherwise set result to NONDIR_REPLACEMENT.

30166

-func_dirname ()

30167

30168

- # Extract subdirectory from the argument.

30169

- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`

30170

- if test "X$func_dirname_result" = "X${1}"; then

30171

- func_dirname_result="${3}"

30172

- else

30173

- func_dirname_result="$func_dirname_result${2}"

30174

- fi

30175

30176

30177

-# func_basename file

30178

-func_basename ()

30179

30180

- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`

30181

30182

30183

30184

-# func_stripname prefix suffix name

30185

-# strip PREFIX and SUFFIX off of NAME.

30186

-# PREFIX and SUFFIX must not contain globbing or regex special

30187

-# characters, hashes, percent signs, but SUFFIX may contain a leading

30188

-# dot (in which case that matches only a dot).

30189

-# func_strip_suffix prefix name

30190

-func_stripname ()

30191

30192

- case ${2} in

30193

- .*) func_stripname_result=`$ECHO "X${3}" \

30194

- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;

30195

- *) func_stripname_result=`$ECHO "X${3}" \

30196

- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;

30197

- esac

30198

30199

30200

-# sed scripts:

30201

-my_sed_long_opt='1s/^$-[^=]*$=.*/\1/;q'

30202

-my_sed_long_arg='1s/^-[^=]*=//'

30203

30204

-# func_opt_split

30205

-func_opt_split ()

30206

30207

- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`

30208

- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`

30209

30210

30211

-# func_lo2o object

30212

-func_lo2o ()

30213

30214

- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`

30215

30216

30217

-# func_xform libobj-or-source

30218

-func_xform ()

30219

30220

- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`

30221

30222

30223

-# func_arith arithmetic-term...

30224

-func_arith ()

30225

30226

- func_arith_result=`expr "$@"`

30227

30228

30229

-# func_len string

30230

-# STRING may not start with a hyphen.

30231

-func_len ()

30232

30233

- func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`

30234

30235

30236

-_LT_EOF

30237

-esac

30238

30239

-case $lt_shell_append in

30240

- yes)

30241

- cat << \_LT_EOF >> "$cfgfile"

30242

30243

-# func_append var value

30244

-# Append VALUE to the end of shell variable VAR.

30245

-func_append ()

30246

30247

- eval "$1+=\$2"

30248

30249

-_LT_EOF

30250

- ;;

30251

- *)

30252

- cat << \_LT_EOF >> "$cfgfile"

30253

30254

-# func_append var value

30255

-# Append VALUE to the end of shell variable VAR.

30256

-func_append ()

30257

30258

- eval "$1=\$$1\$2"

30259

30260

30261

-_LT_EOF

30262

- ;;

30263

- esac

30264

+ sed '$q' "$ltmain" >> "$cfgfile" \

30265

+ || (rm -f "$cfgfile"; exit 1)

30266

30267

+ if test x"$xsi_shell" = xyes; then

30268

+ sed -e '/^func_dirname ()$/,/^} # func_dirname /c\

30269

+func_dirname ()\

30270

+{\

30271

+\ case ${1} in\

30272

+\ */*) func_dirname_result="${1%/*}${2}" ;;\

30273

+\ * ) func_dirname_result="${3}" ;;\

30274

+\ esac\

30275

+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \

30276

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30277

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30278

+test 0 -eq $? || _lt_function_replace_fail=:

30279

30280

30281

+ sed -e '/^func_basename ()$/,/^} # func_basename /c\

30282

+func_basename ()\

30283

+{\

30284

+\ func_basename_result="${1##*/}"\

30285

+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \

30286

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30287

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30288

+test 0 -eq $? || _lt_function_replace_fail=:

30289

30290

30291

+ sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\

30292

+func_dirname_and_basename ()\

30293

+{\

30294

+\ case ${1} in\

30295

+\ */*) func_dirname_result="${1%/*}${2}" ;;\

30296

+\ * ) func_dirname_result="${3}" ;;\

30297

+\ esac\

30298

+\ func_basename_result="${1##*/}"\

30299

+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \

30300

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30301

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30302

+test 0 -eq $? || _lt_function_replace_fail=:

30303

30304

30305

+ sed -e '/^func_stripname ()$/,/^} # func_stripname /c\

30306

+func_stripname ()\

30307

+{\

30308

+\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\

30309

+\ # positional parameters, so assign one to ordinary parameter first.\

30310

+\ func_stripname_result=${3}\

30311

+\ func_stripname_result=${func_stripname_result#"${1}"}\

30312

+\ func_stripname_result=${func_stripname_result%"${2}"}\

30313

+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \

30314

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30315

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30316

+test 0 -eq $? || _lt_function_replace_fail=:

30317

30318

30319

+ sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\

30320

+func_split_long_opt ()\

30321

+{\

30322

+\ func_split_long_opt_name=${1%%=*}\

30323

+\ func_split_long_opt_arg=${1#*=}\

30324

+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \

30325

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30326

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30327

+test 0 -eq $? || _lt_function_replace_fail=:

30328

30329

30330

+ sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\

30331

+func_split_short_opt ()\

30332

+{\

30333

+\ func_split_short_opt_arg=${1#??}\

30334

+\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\

30335

+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \

30336

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30337

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30338

+test 0 -eq $? || _lt_function_replace_fail=:

30339

30340

30341

+ sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\

30342

+func_lo2o ()\

30343

+{\

30344

+\ case ${1} in\

30345

+\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\

30346

+\ *) func_lo2o_result=${1} ;;\

30347

+\ esac\

30348

+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \

30349

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30350

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30351

+test 0 -eq $? || _lt_function_replace_fail=:

30352

30353

30354

+ sed -e '/^func_xform ()$/,/^} # func_xform /c\

30355

+func_xform ()\

30356

+{\

30357

+ func_xform_result=${1%.*}.lo\

30358

+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \

30359

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30360

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30361

+test 0 -eq $? || _lt_function_replace_fail=:

30362

30363

30364

+ sed -e '/^func_arith ()$/,/^} # func_arith /c\

30365

+func_arith ()\

30366

+{\

30367

+ func_arith_result=$(( $* ))\

30368

+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \

30369

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30370

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30371

+test 0 -eq $? || _lt_function_replace_fail=:

30372

30373

30374

+ sed -e '/^func_len ()$/,/^} # func_len /c\

30375

+func_len ()\

30376

+{\

30377

+ func_len_result=${#1}\

30378

+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \

30379

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30380

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30381

+test 0 -eq $? || _lt_function_replace_fail=:

30382

30383

+fi

30384

30385

+if test x"$lt_shell_append" = xyes; then

30386

+ sed -e '/^func_append ()$/,/^} # func_append /c\

30387

+func_append ()\

30388

+{\

30389

+ eval "${1}+=\\${2}"\

30390

+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \

30391

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30392

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30393

+test 0 -eq $? || _lt_function_replace_fail=:

30394

30395

30396

+ sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\

30397

+func_append_quoted ()\

30398

+{\

30399

+\ func_quote_for_eval "${2}"\

30400

+\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\

30401

+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \

30402

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30403

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30404

+test 0 -eq $? || _lt_function_replace_fail=:

30405

30406

30407

+ # Save a `func_append' function call where possible by direct use of '+='

30408

+ sed -e 's%func_append $[a-zA-Z_]\{1,\}$ "%\1+="%g' $cfgfile > $cfgfile.tmp \

30409

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30410

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30411

+ test 0 -eq $? || _lt_function_replace_fail=:

30412

+else

30413

+ # Save a `func_append' function call even when '+=' is not available

30414

+ sed -e 's%func_append $[a-zA-Z_]\{1,\}$ "%\1="$\1%g' $cfgfile > $cfgfile.tmp \

30415

+ && mv -f "$cfgfile.tmp" "$cfgfile" \

30416

+ || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")

30417

+ test 0 -eq $? || _lt_function_replace_fail=:

30418

+fi

30419

30420

+if test x"$_lt_function_replace_fail" = x":"; then

30421

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5

30422

+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}

30423

+fi

30424

30425

- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \

30426

- || (rm -f "$cfgfile"; exit 1)

30427

30428

- mv -f "$cfgfile" "$ofile" ||

30429

+ mv -f "$cfgfile" "$ofile" ||

30430

(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")

30431

chmod +x "$ofile"

30432

30433

@@ -17255,6 +17945,10 @@ _LT_EOF

30434

# The linker used to build libraries.

30435

LD=$lt_LD_CXX

30436

30437

+# How to create reloadable object files.

30438

+reload_flag=$lt_reload_flag_CXX

30439

+reload_cmds=$lt_reload_cmds_CXX

30440

30441

# Commands used to build an old-style archive.

30442

old_archive_cmds=$lt_old_archive_cmds_CXX

30443

30444

@@ -17267,12 +17961,12 @@ with_gcc=$GCC_CXX

30445

# Compiler flag to turn off builtin functions.

30446

no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX

30447

30448

-# How to pass a linker flag through the compiler.

30449

-wl=$lt_lt_prog_compiler_wl_CXX

30450

30451

# Additional compiler flags for building library objects.

30452

pic_flag=$lt_lt_prog_compiler_pic_CXX

30453

30454

+# How to pass a linker flag through the compiler.

30455

+wl=$lt_lt_prog_compiler_wl_CXX

30456

30457

# Compiler flag to prevent dynamic linking.

30458

link_static_flag=$lt_lt_prog_compiler_static_CXX

30459

30460

@@ -17359,9 +18053,6 @@ inherit_rpath=$inherit_rpath_CXX

30461

# Whether libtool must link a program against all its dependency libraries.

30462

link_all_deplibs=$link_all_deplibs_CXX

30463

30464

-# Fix the shell variable \$srcfile for the compiler.

30465

-fix_srcfile_path=$lt_fix_srcfile_path_CXX

30466

30467

# Set to "yes" if exported symbols are required.

30468

always_export_symbols=$always_export_symbols_CXX

30469

30470

@@ -17377,6 +18068,9 @@ include_expsyms=$lt_include_expsyms_CXX

30471

# Commands necessary for linking programs (against libraries) with templates.

30472

prelink_cmds=$lt_prelink_cmds_CXX

30473

30474

+# Commands necessary for finishing linking programs.

30475

+postlink_cmds=$lt_postlink_cmds_CXX

30476

30477

# Specify filename containing input files.

30478

file_list_spec=$lt_file_list_spec_CXX

30479

30480

@@ -17411,7 +18105,7 @@ _ACEOF

37264

30481

ac_clean_files=$ac_clean_files_save

37265

30482

37266

+test $ac_write_fail = 0 ||

30483

test $ac_write_fail = 0 ||

30484

- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5

37267

30485

+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5

37268

30486

37269

30487

37270

30488

# configure is writing to config.log, and then calls config.status.

37271

# config.status does its own redirection, appending to config.log.

37272

@@ -18263,6 +17454,10 @@ if test "$no_create" != yes; then

30489

@@ -17432,7 +18126,7 @@ if test "$no_create" != yes; then

37273

30490

exec 5>>config.log

37274

30491

# Use ||, not &&, to avoid exiting from the if with $? = 1, which

37275

30492

# would make configure fail if this is the last instruction.

37276

- $ac_cs_success || { (exit 1); exit 1; }

30493

- $ac_cs_success || as_fn_exit $?

37277

30494

+ $ac_cs_success || as_fn_exit 1

37278

+fi

37279

+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then

37280

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

37281

+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}

37282

30495

37283

37284

--- protobuf-2.3.0.orig/gtest/build-aux/config.guess

37285

+++ protobuf-2.3.0/gtest/build-aux/config.guess

30496

if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then

30497

{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

30498

--- protobuf-2.4.0a.orig/gtest/Makefile.in

30499

+++ protobuf-2.4.0a/gtest/Makefile.in

30500

@@ -666,6 +666,7 @@ CXXFLAGS = @CXXFLAGS@

30501

CYGPATH_W = @CYGPATH_W@

30502

DEFS = @DEFS@

30503

DEPDIR = @DEPDIR@

30504

+DLLTOOL = @DLLTOOL@

30505

DSYMUTIL = @DSYMUTIL@

30506

DUMPBIN = @DUMPBIN@

30507

ECHO_C = @ECHO_C@

30508

@@ -689,6 +690,7 @@ LIPO = @LIPO@

30509

LN_S = @LN_S@

30510

LTLIBOBJS = @LTLIBOBJS@

30511

MAKEINFO = @MAKEINFO@

30512

+MANIFEST_TOOL = @MANIFEST_TOOL@

30513

MKDIR_P = @MKDIR_P@

30514

NM = @NM@

30515

NMEDIT = @NMEDIT@

30516

@@ -718,6 +720,7 @@ abs_builddir = @abs_builddir@

30517

abs_srcdir = @abs_srcdir@

30518

abs_top_builddir = @abs_top_builddir@

30519

abs_top_srcdir = @abs_top_srcdir@

30520

+ac_ct_AR = @ac_ct_AR@

30521

ac_ct_CC = @ac_ct_CC@

30522

ac_ct_CXX = @ac_ct_CXX@

30523

ac_ct_DUMPBIN = @ac_ct_DUMPBIN@

30524

@@ -752,7 +755,6 @@ libdir = @libdir@

30525

libexecdir = @libexecdir@

30526

localedir = @localedir@

30527

localstatedir = @localstatedir@

30528

-lt_ECHO = @lt_ECHO@

30529

mandir = @mandir@

30530

mkdir_p = @mkdir_p@

30531

oldincludedir = @oldincludedir@

30532

--- protobuf-2.4.0a.orig/gtest/build-aux/config.sub

30533

+++ protobuf-2.4.0a/gtest/build-aux/config.sub

30534

@@ -1,10 +1,10 @@

30535

#! /bin/sh

30536

# Configuration validation subroutine script.

30537

30538

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

30539

-# Free Software Foundation, Inc.

30540

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,

30541

+# 2011 Free Software Foundation, Inc.

30542

30543

-timestamp='2009-06-11'

30544

+timestamp='2011-03-23'

30545

30546

# This file is (in principle) common to ALL GNU software.

30547

# The presence of a machine in this file suggests that SOME GNU software

30548

@@ -32,13 +32,16 @@ timestamp='2009-06-11'

30549

30550

30551

# Please send patches to <config-patches@gnu.org>. Submit a context

30552

-# diff and a properly formatted ChangeLog entry.

30553

+# diff and a properly formatted GNU ChangeLog entry.

30554

30555

# Configuration subroutine to validate and canonicalize a configuration type.

30556

# Supply the specified configuration type as an argument.

30557

# If it is invalid, we print an error message on stderr and exit with code 1.

30558

# Otherwise, we print the canonical config type on stdout and succeed.

30559

30560

+# You can get the latest version of this script from:

30561

+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

30562

30563

# This file is supposed to be the same for all GNU packages

30564

# and recognize all the CPU types, system types and aliases

30565

# that are meaningful with *any* GNU software.

30566

@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch

30567

version="\

30568

GNU config.sub ($timestamp)

30569

30570

30571

-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

30572

30573

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free

30574

+Software Foundation, Inc.

30575

30576

This is free software; see the source for copying conditions. There is NO

30577

warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

30578

@@ -120,8 +124,9 @@ esac

30579

# Here we must recognize all the valid KERNEL-OS combinations.

30580

maybe_os=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\2/'`

30581

case $maybe_os in

30582

30583

30584

30585

+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \

30586

+ knetbsd*-gnu* | netbsd*-gnu* | \

30587

kopensolaris*-gnu* | \

30588

storm-chaos* | os2-emx* | rtmk-nova*)

30589

os=-$maybe_os

30590

@@ -149,12 +154,12 @@ case $os in

30591

-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\

30592

-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

30593

30594

- -apple | -axis | -knuth | -cray)

30595

+ -apple | -axis | -knuth | -cray | -microblaze)

30596

os=

30597

basic_machine=$1

30598

;;

30599

- -bluegene*)

30600

- os=-cnk

30601

+ -bluegene*)

30602

+ os=-cnk

30603

;;

30604

-sim | -cisco | -oki | -wec | -winbond)

30605

os=

30606

@@ -170,10 +175,10 @@ case $os in

30607

os=-chorusos

30608

basic_machine=$1

30609

;;

30610

- -chorusrdb)

30611

- os=-chorusrdb

30612

+ -chorusrdb)

30613

+ os=-chorusrdb

30614

basic_machine=$1

30615

- ;;

30616

+ ;;

30617

-hiux*)

30618

os=-hiuxwe2

30619

;;

30620

@@ -278,26 +283,39 @@ case $basic_machine in

30621

| moxie \

30622

| mt \

30623

| msp430 \

30624

+ | nds32 | nds32le | nds32be \

30625

| nios | nios2 \

30626

| ns16k | ns32k \

30627

+ | open8 \

30628

| or32 \

30629

| pdp10 | pdp11 | pj | pjl \

30630

30631

+ | powerpc | powerpc64 | powerpc64le | powerpcle \

30632

| pyramid \

30633

+ | rx \

30634

| score \

30635

30636

| sh64 | sh64le \

30637

30638

| sparcv8 | sparcv9 | sparcv9b | sparcv9v \

30639

- | spu | strongarm \

30640

30641

+ | spu \

30642

30643

+ | ubicom32 \

30644

| v850 | v850e \

30645

| we32k \

30646

- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \

30647

+ | x86 | xc16x | xstormy16 | xtensa \

30648

| z8k | z80)

30649

basic_machine=$basic_machine-unknown

30650

;;

30651

- m6811 | m68hc11 | m6812 | m68hc12)

30652

+ c54x)

30653

+ basic_machine=tic54x-unknown

30654

+ ;;

30655

+ c55x)

30656

+ basic_machine=tic55x-unknown

30657

+ ;;

30658

+ c6x)

30659

+ basic_machine=tic6x-unknown

30660

+ ;;

30661

+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)

30662

# Motorola 68HC11/12.

30663

basic_machine=$basic_machine-unknown

30664

os=-none

30665

@@ -308,6 +326,18 @@ case $basic_machine in

30666

basic_machine=mt-unknown

30667

;;

30668

30669

+ strongarm | thumb | xscale)

30670

+ basic_machine=arm-unknown

30671

+ ;;

30672

30673

+ xscaleeb)

30674

+ basic_machine=armeb-unknown

30675

+ ;;

30676

30677

+ xscaleel)

30678

+ basic_machine=armel-unknown

30679

+ ;;

30680

30681

# We use `pc' rather than `unknown'

30682

# because (1) that's what they normally are, and

30683

# (2) the word "unknown" tends to confuse beginning users.

30684

@@ -328,7 +358,7 @@ case $basic_machine in

30685

30686

| avr-* | avr32-* \

30687

| bfin-* | bs2000-* \

30688

- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \

30689

+ | c[123]* | c30-* | [cjt]90-* | c4x-* \

30690

| clipper-* | craynv-* | cydra-* \

30691

| d10v-* | d30v-* | dlx-* \

30692

| elxsi-* \

30693

@@ -340,7 +370,7 @@ case $basic_machine in

30694

| lm32-* \

30695

| m32c-* | m32r-* | m32rle-* \

30696

| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \

30697

- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \

30698

+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \

30699

30700

| mips16-* \

30701

| mips64-* | mips64el-* \

30702

@@ -362,24 +392,28 @@ case $basic_machine in

30703

| mmix-* \

30704

| mt-* \

30705

| msp430-* \

30706

+ | nds32-* | nds32le-* | nds32be-* \

30707

| nios-* | nios2-* \

30708

| none-* | np1-* | ns16k-* | ns32k-* \

30709

+ | open8-* \

30710

| orion-* \

30711

| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

30712

30713

+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \

30714

| pyramid-* \

30715

- | romp-* | rs6000-* \

30716

+ | romp-* | rs6000-* | rx-* \

30717

| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

30718

30719

30720

| sparclite-* \

30721

30722

- | tahoe-* | thumb-* \

30723

30724

+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \

30725

+ | tahoe-* \

30726

+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \

30727

+ | tile-* | tilegx-* \

30728

| tron-* \

30729

+ | ubicom32-* \

30730

| v850-* | v850e-* | vax-* \

30731

| we32k-* \

30732

- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \

30733

+ | x86-* | x86_64-* | xc16x-* | xps100-* \

30734

| xstormy16-* | xtensa*-* \

30735

| ymp-* \

30736

| z8k-* | z80-*)

30737

@@ -404,7 +438,7 @@ case $basic_machine in

30738

basic_machine=a29k-amd

30739

os=-udi

30740

;;

30741

- abacus)

30742

+ abacus)

30743

basic_machine=abacus-unknown

30744

;;

30745

adobe68k)

30746

@@ -474,11 +508,20 @@ case $basic_machine in

30747

basic_machine=powerpc-ibm

30748

os=-cnk

30749

;;

30750

+ c54x-*)

30751

+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`

30752

+ ;;

30753

+ c55x-*)

30754

+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`

30755

+ ;;

30756

+ c6x-*)

30757

+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`

30758

+ ;;

30759

c90)

30760

basic_machine=c90-cray

30761

os=-unicos

30762

;;

30763

- cegcc)

30764

+ cegcc)

30765

basic_machine=arm-unknown

30766

os=-cegcc

30767

;;

30768

@@ -510,7 +553,7 @@ case $basic_machine in

30769

basic_machine=craynv-cray

30770

os=-unicosmp

30771

;;

30772

- cr16)

30773

+ cr16 | cr16-*)

30774

basic_machine=cr16-unknown

30775

os=-elf

30776

;;

30777

@@ -726,6 +769,9 @@ case $basic_machine in

30778

basic_machine=ns32k-utek

30779

os=-sysv

30780

;;

30781

+ microblaze)

30782

+ basic_machine=microblaze-xilinx

30783

+ ;;

30784

mingw32)

30785

basic_machine=i386-pc

30786

os=-mingw32

30787

@@ -830,6 +876,12 @@ case $basic_machine in

30788

np1)

30789

basic_machine=np1-gould

30790

;;

30791

+ neo-tandem)

30792

+ basic_machine=neo-tandem

30793

+ ;;

30794

+ nse-tandem)

30795

+ basic_machine=nse-tandem

30796

+ ;;

30797

nsr-tandem)

30798

basic_machine=nsr-tandem

30799

;;

30800

@@ -912,9 +964,10 @@ case $basic_machine in

30801

;;

30802

power) basic_machine=power-ibm

30803

;;

30804

- ppc) basic_machine=powerpc-unknown

30805

+ ppc | ppcbe) basic_machine=powerpc-unknown

30806

;;

30807

- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`

30808

+ ppc-* | ppcbe-*)

30809

+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`

30810

;;

30811

ppcle | powerpclittle | ppc-le | powerpc-little)

30812

basic_machine=powerpcle-unknown

30813

@@ -1008,6 +1061,9 @@ case $basic_machine in

30814

basic_machine=i860-stratus

30815

os=-sysv4

30816

;;

30817

+ strongarm-* | thumb-*)

30818

+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`

30819

+ ;;

30820

sun2)

30821

basic_machine=m68000-sun

30822

;;

30823

@@ -1064,17 +1120,10 @@ case $basic_machine in

30824

basic_machine=t90-cray

30825

os=-unicos

30826

;;

30827

- tic54x | c54x*)

30828

- basic_machine=tic54x-unknown

30829

- os=-coff

30830

- ;;

30831

- tic55x | c55x*)

30832

- basic_machine=tic55x-unknown

30833

- os=-coff

30834

- ;;

30835

- tic6x | c6x*)

30836

- basic_machine=tic6x-unknown

30837

- os=-coff

30838

+ # This must be matched before tile*.

30839

+ tilegx*)

30840

+ basic_machine=tilegx-unknown

30841

+ os=-linux-gnu

30842

;;

30843

tile*)

30844

basic_machine=tile-unknown

30845

@@ -1147,6 +1196,9 @@ case $basic_machine in

30846

xps | xps100)

30847

basic_machine=xps100-honeywell

30848

;;

30849

+ xscale-* | xscalee[bl]-*)

30850

+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`

30851

+ ;;

30852

ymp)

30853

basic_machine=ymp-cray

30854

os=-unicos

30855

@@ -1244,9 +1296,12 @@ esac

30856

if [ x"$os" != x"" ]

30857

then

30858

case $os in

30859

- # First match some system type aliases

30860

- # that might get confused with valid system types.

30861

+ # First match some system type aliases

30862

+ # that might get confused with valid system types.

30863

# -solaris* is a basic system type, with this one exception.

30864

+ -auroraux)

30865

+ os=-auroraux

30866

+ ;;

30867

-solaris1 | -solaris1.*)

30868

os=`echo $os | sed -e 's|solaris1|sunos4|'`

30869

;;

30870

@@ -1268,8 +1323,8 @@ case $os in

30871

# -sysv* is not here because it comes later, after sysvr4.

30872

30873

| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\

30874

30875

- | -kopensolaris* \

30876

30877

+ | -sym* | -kopensolaris* \

30878

30879

| -aos* | -aros* \

30880

30881

@@ -1282,7 +1337,8 @@ case $os in

30882

| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

30883

| -chorusos* | -chorusrdb* | -cegcc* \

30884

30885

- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \

30886

+ | -mingw32* | -linux-gnu* | -linux-android* \

30887

+ | -linux-newlib* | -linux-uclibc* \

30888

| -uxpv* | -beos* | -mpeix* | -udk* \

30889

30890

30891

@@ -1290,7 +1346,7 @@ case $os in

30892

30893

30894

| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \

30895

30896

30897

# Remember, each alternative MUST END IN *, to match a version number.

30898

;;

30899

-qnx*)

30900

@@ -1329,7 +1385,7 @@ case $os in

30901

-opened*)

30902

os=-openedition

30903

;;

30904

- -os400*)

30905

+ -os400*)

30906

os=-os400

30907

;;

30908

-wince*)

30909

@@ -1378,7 +1434,7 @@ case $os in

30910

-sinix*)

30911

os=-sysv4

30912

;;

30913

- -tpf*)

30914

+ -tpf*)

30915

os=-tpf

30916

;;

30917

-triton*)

30918

@@ -1423,6 +1479,8 @@ case $os in

30919

-dicos*)

30920

os=-dicos

30921

;;

30922

+ -nacl*)

30923

+ ;;

30924

-none)

30925

;;

30926

30927

@@ -1445,10 +1503,10 @@ else

30928

# system, and we'll never get to this point.

30929

30930

case $basic_machine in

30931

- score-*)

30932

+ score-*)

30933

os=-elf

30934

;;

30935

- spu-*)

30936

+ spu-*)

30937

os=-elf

30938

;;

30939

*-acorn)

30940

@@ -1460,8 +1518,17 @@ case $basic_machine in

30941

arm*-semi)

30942

os=-aout

30943

;;

30944

- c4x-* | tic4x-*)

30945

- os=-coff

30946

+ c4x-* | tic4x-*)

30947

+ os=-coff

30948

+ ;;

30949

+ tic54x-*)

30950

+ os=-coff

30951

+ ;;

30952

+ tic55x-*)

30953

+ os=-coff

30954

+ ;;

30955

+ tic6x-*)

30956

+ os=-coff

30957

;;

30958

# This must come before the *-dec entry.

30959

pdp10-*)

30960

@@ -1488,7 +1555,7 @@ case $basic_machine in

30961

m68*-cisco)

30962

os=-aout

30963

;;

30964

- mep-*)

30965

+ mep-*)

30966

os=-elf

30967

;;

30968

mips*-cisco)

30969

@@ -1515,7 +1582,7 @@ case $basic_machine in

30970

*-ibm)

30971

os=-aix

30972

;;

30973

- *-knuth)

30974

+ *-knuth)

30975

os=-mmixware

30976

;;

30977

*-wec)

30978

--- protobuf-2.4.0a.orig/gtest/build-aux/config.guess

30979

+++ protobuf-2.4.0a/gtest/build-aux/config.guess

37286

30980

@@ -1,10 +1,10 @@

37287

30981

#! /bin/sh

37288

30982

# Attempt to guess a canonical system name.

37289

30983

37290

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,

37291

-# Inc.

37292

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

37293

+# Free Software Foundation, Inc.

30984

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

30985

-# Free Software Foundation, Inc.

30986

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,

30987

+# 2011 Free Software Foundation, Inc.

37294

30988

37295

-timestamp='2007-07-22'

37296

+timestamp='2009-12-30'

30989

-timestamp='2009-06-10'

30990

+timestamp='2011-05-11'

37297

30991

37298

30992

# This file is free software; you can redistribute it and/or modify it

37299

30993

# under the terms of the GNU General Public License as published by

37300

@@ -27,16 +27,16 @@ timestamp='2007-07-22'

30994

@@ -27,16 +27,16 @@ timestamp='2009-06-10'

37301

30995

# the same distribution terms that you use for the rest of that program.

37302

30996

37303

30997

37323

31017

GNU config.guess ($timestamp)

37324

31018

37325

31019

Originally written by Per Bothner.

37326

37327

-Free Software Foundation, Inc.

31020

31021

-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

37328

31022

37329

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free

31023

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free

37330

31024

+Software Foundation, Inc.

37331

31025

37332

31026

This is free software; see the source for copying conditions. There is NO

37333

31027

warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

37334

@@ -170,7 +171,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

37335

arm*|i386|m68k|ns32k|sh3*|sparc|vax)

37336

eval $set_cc_for_build

37337

if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \

37338

- | grep __ELF__ >/dev/null

37339

+ | grep -q __ELF__

37340

then

37341

# Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).

37342

# Return netbsd for either. FIX?

37343

@@ -324,14 +325,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

37344

case `/usr/bin/uname -p` in

37345

sparc) echo sparc-icl-nx7; exit ;;

37346

esac ;;

37347

+ s390x:SunOS:*:*)

37348

+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

37349

+ exit ;;

37350

sun4H:SunOS:5.*:*)

37351

echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

37352

exit ;;

31028

@@ -180,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

31029

31030

;;

31031

31032

- os=netbsd

31033

+ os=netbsd

31034

;;

31035

esac

31036

# The OS release

31037

@@ -223,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

31038

UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`

31039

;;

31040

*5.*)

31041

- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`

31042

+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`

31043

;;

31044

esac

31045

# According to Compaq, /usr/sbin/psrinfo has been available on

31046

@@ -269,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

31047

# A Xn.n version is an unreleased experimental baselevel.

31048

# 1.2 uses "1.2" for uname -r.

31049

echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

31050

- exit ;;

31051

+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.

31052

+ exitcode=$?

31053

+ trap '' 0

31054

+ exit $exitcode ;;

31055

Alpha\ *:Windows_NT*:*)

31056

# How do we know it's Interix rather than the generic POSIX subsystem?

31057

# Should we change UNAME_MACHINE based on the output of uname instead

31058

@@ -295,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

31059

echo s390-ibm-zvmoe

31060

exit ;;

31061

*:OS400:*:*)

31062

- echo powerpc-ibm-os400

31063

+ echo powerpc-ibm-os400

31064

exit ;;

31065

arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)

31066

echo arm-acorn-riscix${UNAME_RELEASE}

31067

@@ -333,6 +337,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

37353

31068

sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)

37354

31069

echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

37355

31070

exit ;;

37357

31072

+ echo i386-pc-auroraux${UNAME_RELEASE}

37358

31073

+ exit ;;

37359

31074

i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)

37360

- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

37361

+ eval $set_cc_for_build

37362

+ SUN_ARCH="i386"

37363

+ # If there is a compiler, see if it is configured for 64-bit objects.

37364

+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.

37365

+ # This test works for both compilers.

37366

+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then

37367

+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \

37368

+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \

37369

+ grep IS_64BIT_ARCH >/dev/null

37370

+ then

37371

+ SUN_ARCH="x86_64"

37372

+ fi

37373

+ fi

37374

+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

37375

exit ;;

37376

sun4*:SunOS:6*:*)

37377

# According to config.sub, this is the proper way to canonicalize

37378

@@ -532,7 +552,7 @@ EOF

31075

eval $set_cc_for_build

31076

SUN_ARCH="i386"

31077

@@ -391,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$

31078

# MiNT. But MiNT is downward compatible to TOS, so this should

31079

# be no problem.

31080

atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)

31081

- echo m68k-atari-mint${UNAME_RELEASE}

31082

+ echo m68k-atari-mint${UNAME_RELEASE}

31083

exit ;;

31084

atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)

31085

echo m68k-atari-mint${UNAME_RELEASE}

31086

- exit ;;

31087

+ exit ;;

31088

*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)

31089

- echo m68k-atari-mint${UNAME_RELEASE}

31090

+ echo m68k-atari-mint${UNAME_RELEASE}

31091

exit ;;

31092

milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)

31093

- echo m68k-milan-mint${UNAME_RELEASE}

31094

- exit ;;

31095

+ echo m68k-milan-mint${UNAME_RELEASE}

31096

+ exit ;;

31097

hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)

31098

- echo m68k-hades-mint${UNAME_RELEASE}

31099

- exit ;;

31100

+ echo m68k-hades-mint${UNAME_RELEASE}

31101

+ exit ;;

31102

*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)

31103

- echo m68k-unknown-mint${UNAME_RELEASE}

31104

- exit ;;

31105

+ echo m68k-unknown-mint${UNAME_RELEASE}

31106

+ exit ;;

31107

m68k:machten:*:*)

31108

echo m68k-apple-machten${UNAME_RELEASE}

31109

exit ;;

31110

@@ -477,8 +484,8 @@ EOF

31111

echo m88k-motorola-sysv3

31112

exit ;;

31113

AViiON:dgux:*:*)

31114

- # DG/UX returns AViiON for all architectures

31115

- UNAME_PROCESSOR=`/usr/bin/uname -p`

31116

+ # DG/UX returns AViiON for all architectures

31117

+ UNAME_PROCESSOR=`/usr/bin/uname -p`

31118

if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]

31119

then

31120

if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \

31121

@@ -491,7 +498,7 @@ EOF

31122

else

31123

echo i586-dg-dgux${UNAME_RELEASE}

31124

31125

- exit ;;

31126

+ exit ;;

31127

M88*:DolphinOS:*:*) # DolphinOS (SVR3)

31128

echo m88k-dolphin-sysv3

31129

exit ;;

31130

@@ -548,7 +555,7 @@ EOF

37379

31131

echo rs6000-ibm-aix3.2

37380

31132

37381

31133

exit ;;

37382

- *:AIX:*:[45])

37383

+ *:AIX:*:[456])

31134

- *:AIX:*:[456])

31135

+ *:AIX:*:[4567])

37384

31136

IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`

37385

31137

if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then

37386

31138

IBM_ARCH=rs6000

37387

@@ -640,7 +660,7 @@ EOF

37388

# => hppa64-hp-hpux11.23

31139

@@ -591,52 +598,52 @@ EOF

31140

9000/[678][0-9][0-9])

31141

if [ -x /usr/bin/getconf ]; then

31142

sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`

31143

- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`

31144

- case "${sc_cpu_version}" in

31145

- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0

31146

- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1

31147

- 532) # CPU_PA_RISC2_0

31148

- case "${sc_kernel_bits}" in

31149

- 32) HP_ARCH="hppa2.0n" ;;

31150

- 64) HP_ARCH="hppa2.0w" ;;

31151

+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`

31152

+ case "${sc_cpu_version}" in

31153

+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0

31154

+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1

31155

+ 532) # CPU_PA_RISC2_0

31156

+ case "${sc_kernel_bits}" in

31157

+ 32) HP_ARCH="hppa2.0n" ;;

31158

+ 64) HP_ARCH="hppa2.0w" ;;

31159

'') HP_ARCH="hppa2.0" ;; # HP-UX 10.20

31160

- esac ;;

31161

- esac

31162

+ esac ;;

31163

+ esac

31164

31165

if [ "${HP_ARCH}" = "" ]; then

31166

eval $set_cc_for_build

31167

- sed 's/^ //' << EOF >$dummy.c

31168

+ sed 's/^ //' << EOF >$dummy.c

31169

31170

+ #define _HPUX_SOURCE

31171

+ #include <stdlib.h>

31172

+ #include <unistd.h>

37389

31173

37390

if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |

37391

- grep __LP64__ >/dev/null

37392

+ grep -q __LP64__

37393

then

37394

HP_ARCH="hppa2.0w"

37395

else

37396

@@ -791,18 +811,24 @@ EOF

31174

- #define _HPUX_SOURCE

31175

- #include <stdlib.h>

31176

- #include <unistd.h>

31177

31178

- int main ()

31179

- {

31180

- #if defined(_SC_KERNEL_BITS)

31181

- long bits = sysconf(_SC_KERNEL_BITS);

31182

- #endif

31183

- long cpu = sysconf (_SC_CPU_VERSION);

31184

31185

- switch (cpu)

31186

- {

31187

- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

31188

- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;

31189

- case CPU_PA_RISC2_0:

31190

- #if defined(_SC_KERNEL_BITS)

31191

- switch (bits)

31192

- {

31193

- case 64: puts ("hppa2.0w"); break;

31194

- case 32: puts ("hppa2.0n"); break;

31195

- default: puts ("hppa2.0"); break;

31196

- } break;

31197

- #else /* !defined(_SC_KERNEL_BITS) */

31198

- puts ("hppa2.0"); break;

31199

- #endif

31200

- default: puts ("hppa1.0"); break;

31201

- }

31202

- exit (0);

31203

- }

31204

+ int main ()

31205

+ {

31206

+ #if defined(_SC_KERNEL_BITS)

31207

+ long bits = sysconf(_SC_KERNEL_BITS);

31208

+ #endif

31209

+ long cpu = sysconf (_SC_CPU_VERSION);

31210

31211

+ switch (cpu)

31212

+ {

31213

+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;

31214

+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;

31215

+ case CPU_PA_RISC2_0:

31216

+ #if defined(_SC_KERNEL_BITS)

31217

+ switch (bits)

31218

+ {

31219

+ case 64: puts ("hppa2.0w"); break;

31220

+ case 32: puts ("hppa2.0n"); break;

31221

+ default: puts ("hppa2.0"); break;

31222

+ } break;

31223

+ #else /* !defined(_SC_KERNEL_BITS) */

31224

+ puts ("hppa2.0"); break;

31225

+ #endif

31226

+ default: puts ("hppa1.0"); break;

31227

+ }

31228

+ exit (0);

31229

+ }

31230

EOF

31231

(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`

31232

test -z "$HP_ARCH" && HP_ARCH=hppa

31233

@@ -727,22 +734,22 @@ EOF

31234

exit ;;

31235

C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)

31236

echo c1-convex-bsd

31237

- exit ;;

31238

+ exit ;;

31239

C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)

31240

if getsysinfo -f scalar_acc

31241

then echo c32-convex-bsd

31242

else echo c2-convex-bsd

31243

31244

- exit ;;

31245

+ exit ;;

31246

C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)

31247

echo c34-convex-bsd

31248

- exit ;;

31249

+ exit ;;

31250

C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)

31251

echo c38-convex-bsd

31252

- exit ;;

31253

+ exit ;;

31254

C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)

31255

echo c4-convex-bsd

31256

- exit ;;

31257

+ exit ;;

31258

CRAY*Y-MP:*:*:*)

31259

echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'

31260

exit ;;

31261

@@ -766,14 +773,14 @@ EOF

31262

exit ;;

31263

F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)

31264

FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`

31265

- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

31266

- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`

31267

- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

31268

- exit ;;

31269

+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

31270

+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`

31271

+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

31272

+ exit ;;

31273

5000:UNIX_System_V:4.*:*)

31274

- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

31275

- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`

31276

- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

31277

+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`

31278

+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`

31279

+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"

31280

exit ;;

31281

i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)

31282

echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}

31283

@@ -801,18 +808,18 @@ EOF

31284

echo ${UNAME_MACHINE}-pc-mingw32

31285

exit ;;

31286

i*:windows32*:*)

31287

- # uname -m includes "-pc" on this system.

31288

- echo ${UNAME_MACHINE}-mingw32

31289

+ # uname -m includes "-pc" on this system.

31290

+ echo ${UNAME_MACHINE}-mingw32

31291

exit ;;

37397

31292

i*:PW*:*)

37398

31293

echo ${UNAME_MACHINE}-pc-pw32

37399

31294

exit ;;

37400

31295

- *:Interix*:[3456]*)

31296

- case ${UNAME_MACHINE} in

37401

31297

+ *:Interix*:*)

37402

case ${UNAME_MACHINE} in

31298

+ case ${UNAME_MACHINE} in

37403

31299

x86)

37404

31300

echo i586-pc-interix${UNAME_RELEASE}

37405

31301

exit ;;

37406

- EM64T | authenticamd)

31302

- EM64T | authenticamd | genuineintel)

37407

31303

+ authenticamd | genuineintel | EM64T)

37408

31304

echo x86_64-unknown-interix${UNAME_RELEASE}

37409

31305

exit ;;

37410

+ IA64)

37411

+ echo ia64-unknown-interix${UNAME_RELEASE}

37412

+ exit ;;

37413

esac ;;

37414

[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)

37415

echo i${UNAME_MACHINE}-pc-mks

37416

exit ;;

37417

+ 8664:Windows_NT:*)

37418

+ echo x86_64-pc-mks

37419

+ exit ;;

37420

i*:Windows_NT*:* | Pentium*:Windows_NT*:*)

37421

# How do we know it's Interix rather than the generic POSIX subsystem?

37422

# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we

37423

@@ -832,8 +858,29 @@ EOF

31306

IA64)

31307

@@ -854,6 +861,20 @@ EOF

37424

31308

i*86:Minix:*:*)

37425

31309

echo ${UNAME_MACHINE}-pc-minix

37426

31310

exit ;;

37433

31317

+ EV6) UNAME_MACHINE=alphaev6 ;;

37434

31318

+ EV67) UNAME_MACHINE=alphaev67 ;;

37435

31319

+ EV68*) UNAME_MACHINE=alphaev68 ;;

37436

+ esac

31320

+ esac

37437

31321

+ objdump --private-headers /bin/sh | grep -q ld.so.1

37438

31322

+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi

37439

31323

+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}

37440

31324

+ exit ;;

37441

31325

arm*:Linux:*:*)

37442

- echo ${UNAME_MACHINE}-unknown-linux-gnu

37443

+ eval $set_cc_for_build

37444

+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \

37445

+ | grep -q __ARM_EABI__

37446

+ then

37447

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

37448

+ else

37449

+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi

37450

+ fi

31326

eval $set_cc_for_build

31327

if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \

31328

@@ -861,7 +882,13 @@ EOF

31329

then

31330

echo ${UNAME_MACHINE}-unknown-linux-gnu

31331

else

31332

- echo ${UNAME_MACHINE}-unknown-linux-gnueabi

31333

+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \

31334

+ | grep -q __ARM_PCS_VFP

31335

+ then

31336

+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi

31337

+ else

31338

+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf

31339

+ fi

31340

37451

31341

exit ;;

37452

31342

avr32*:Linux:*:*)

37453

echo ${UNAME_MACHINE}-unknown-linux-gnu

37454

@@ -847,6 +894,17 @@ EOF

31343

@@ -874,7 +901,18 @@ EOF

31344

echo crisv32-axis-linux-gnu

31345

exit ;;

37455

31346

frv:Linux:*:*)

37456

echo frv-unknown-linux-gnu

37457

exit ;;

31347

- echo frv-unknown-linux-gnu

31348

+ echo frv-unknown-linux-gnu

31349

+ exit ;;

37458

31350

+ i*86:Linux:*:*)

37459

31351

+ LIBC=gnu

37460

31352

+ eval $set_cc_for_build

37465

31357

+EOF

37466

31358

+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`

37467

31359

+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"

37468

+ exit ;;

31360

exit ;;

37469

31361

ia64:Linux:*:*)

37470

31362

echo ${UNAME_MACHINE}-unknown-linux-gnu

37471

exit ;;

37472

@@ -856,74 +914,33 @@ EOF

37473

m68*:Linux:*:*)

37474

echo ${UNAME_MACHINE}-unknown-linux-gnu

37475

exit ;;

37476

- mips:Linux:*:*)

37477

+ mips:Linux:*:* | mips64:Linux:*:*)

37478

eval $set_cc_for_build

37479

sed 's/^ //' << EOF >$dummy.c

37480

#undef CPU

37481

- #undef mips

37482

- #undef mipsel

37483

+ #undef ${UNAME_MACHINE}

37484

+ #undef ${UNAME_MACHINE}el

37485

#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)

37486

- CPU=mipsel

37487

+ CPU=${UNAME_MACHINE}el

37488

#else

37489

#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)

37490

- CPU=mips

37491

+ CPU=${UNAME_MACHINE}

37492

#else

37493

CPU=

31363

@@ -901,39 +939,18 @@ EOF

37494

31364

#endif

37495

31365

#endif

37496

31366

EOF

37499

31369

- s: ::g

37500

31370

- p

37501

31371

- }'`"

37502

- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }

37503

- ;;

37504

- mips64:Linux:*:*)

37505

- eval $set_cc_for_build

37506

- sed 's/^ //' << EOF >$dummy.c

37507

- #undef CPU

37508

- #undef mips64

37509

- #undef mips64el

37510

- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)

37511

- CPU=mips64el

37512

- #else

37513

- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)

37514

- CPU=mips64

37515

- #else

37516

- CPU=

37517

- #endif

37518

- #endif

37519

-EOF

37520

- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '

37521

- /^CPU/{

37522

- s: ::g

37523

- p

37524

- }'`"

37525

31372

+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`

37526

31373

test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }

37527

31374

;;

37533

31380

- exit ;;

37534

31381

- ppc64:Linux:*:*)

37535

31382

- echo powerpc64-unknown-linux-gnu

37536

+ padre:Linux:*:*)

37537

+ echo sparc-unknown-linux-gnu

37538

exit ;;

31383

- exit ;;

37539

31384

- alpha:Linux:*:*)

37540

31385

- case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in

37541

31386

- EV5) UNAME_MACHINE=alphaev5 ;;

37546

31391

- EV67) UNAME_MACHINE=alphaev67 ;;

37547

31392

- EV68*) UNAME_MACHINE=alphaev68 ;;

37548

31393

- esac

37549

- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null

31394

- objdump --private-headers /bin/sh | grep -q ld.so.1

37550

31395

- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi

37551

31396

- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}

31397

- exit ;;

31398

padre:Linux:*:*)

31399

echo sparc-unknown-linux-gnu

31400

exit ;;

37552

31401

+ parisc64:Linux:*:* | hppa64:Linux:*:*)

37553

31402

+ echo hppa64-unknown-linux-gnu

37554

exit ;;

31403

+ exit ;;

37555

31404

parisc:Linux:*:* | hppa:Linux:*:*)

37556

31405

# Look for CPU level

37557

@@ -933,8 +950,11 @@ EOF

31406

case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in

31407

@@ -942,14 +959,17 @@ EOF

37558

31408

*) echo hppa-unknown-linux-gnu ;;

37559

31409

esac

37560

31410

exit ;;

37568

31418

exit ;;

37569

31419

s390:Linux:*:* | s390x:Linux:*:*)

37570

31420

echo ${UNAME_MACHINE}-ibm-linux

37571

@@ -954,72 +974,9 @@ EOF

37572

x86_64:Linux:*:*)

31421

exit ;;

31422

sh64*:Linux:*:*)

31423

- echo ${UNAME_MACHINE}-unknown-linux-gnu

31424

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

31425

exit ;;

31426

sh*:Linux:*:*)

31427

echo ${UNAME_MACHINE}-unknown-linux-gnu

31428

@@ -957,6 +977,9 @@ EOF

31429

sparc:Linux:*:* | sparc64:Linux:*:*)

31430

echo ${UNAME_MACHINE}-unknown-linux-gnu

31431

exit ;;

31432

+ tile*:Linux:*:*)

31433

+ echo ${UNAME_MACHINE}-tilera-linux-gnu

31434

+ exit ;;

31435

vax:Linux:*:*)

31436

echo ${UNAME_MACHINE}-dec-linux-gnu

31437

exit ;;

31438

@@ -964,60 +987,8 @@ EOF

37573

31439

echo x86_64-unknown-linux-gnu

37574

31440

exit ;;

37575

- xtensa:Linux:*:*)

37576

- echo xtensa-unknown-linux-gnu

37577

+ xtensa*:Linux:*:*)

37578

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

31441

xtensa*:Linux:*:*)

31442

- echo ${UNAME_MACHINE}-unknown-linux-gnu

31443

+ echo ${UNAME_MACHINE}-unknown-linux-gnu

37579

31444

exit ;;

37580

31445

- i*86:Linux:*:*)

37581

31446

- # The BFD linker knows what the default object file format is, so

37592

31457

- elf32-i386)

37593

31458

- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"

37594

31459

- ;;

37595

- a.out-i386-linux)

37596

- echo "${UNAME_MACHINE}-pc-linux-gnuaout"

37597

- exit ;;

37598

- coff-i386)

37599

- echo "${UNAME_MACHINE}-pc-linux-gnucoff"

37600

- exit ;;

37601

- "")

37602

- # Either a pre-BFD a.out linker (linux-gnuoldld) or

37603

- # one that does not give us useful --help.

37604

- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"

37605

- exit ;;

37606

31460

- esac

37607

31461

- # Determine whether the default compiler is a.out or elf

37608

31462

- eval $set_cc_for_build

37643

31497

i*86:DYNIX/ptx:4*:*)

37644

31498

# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.

37645

31499

# earlier versions are messed up and put the nodename in both

37646

@@ -1048,7 +1005,7 @@ EOF

37647

i*86:syllable:*:*)

37648

echo ${UNAME_MACHINE}-pc-syllable

37649

exit ;;

37650

- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)

37651

+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)

37652

echo i386-unknown-lynxos${UNAME_RELEASE}

37653

exit ;;

37654

i*86:*DOS:*:*)

37655

@@ -1092,8 +1049,11 @@ EOF

31500

@@ -1025,11 +996,11 @@ EOF

31501

echo i386-sequent-sysv4

31502

exit ;;

31503

i*86:UNIX_SV:4.2MP:2.*)

31504

- # Unixware is an offshoot of SVR4, but it has its own version

31505

- # number series starting with 2...

31506

- # I am not positive that other SVR4 systems won't match this,

31507

+ # Unixware is an offshoot of SVR4, but it has its own version

31508

+ # number series starting with 2...

31509

+ # I am not positive that other SVR4 systems won't match this,

31510

# I just have to hope. -- rms.

31511

- # Use sysv4.2uw... so that sysv4* matches it.

31512

+ # Use sysv4.2uw... so that sysv4* matches it.

31513

echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}

31514

exit ;;

31515

i*86:OS/2:*:*)

31516

@@ -1061,7 +1032,7 @@ EOF

31517

31518

exit ;;

31519

i*86:*:5:[678]*)

31520

- # UnixWare 7.x, OpenUNIX and OpenServer 6.

31521

+ # UnixWare 7.x, OpenUNIX and OpenServer 6.

31522

case `/bin/uname -X | grep "^Machine"` in

31523

*486*) UNAME_MACHINE=i486 ;;

31524

*Pentium) UNAME_MACHINE=i586 ;;

31525

@@ -1089,13 +1060,13 @@ EOF

31526

exit ;;

37656

31527

pc:*:*:*)

37657

31528

# Left here for compatibility:

37658

# uname -m prints for DJGPP always 'pc', but it prints nothing about

37659

- # the processor, so we play safe by assuming i386.

37660

- echo i386-pc-msdosdjgpp

37661

+ # the processor, so we play safe by assuming i586.

37662

+ # Note: whatever this is, it MUST be the same as what config.sub

37663

+ # prints for the "djgpp" host, or else GDB configury will decide that

37664

+ # this is a cross-build.

37665

+ echo i586-pc-msdosdjgpp

37666

exit ;;

31529

- # uname -m prints for DJGPP always 'pc', but it prints nothing about

31530

- # the processor, so we play safe by assuming i586.

31531

+ # uname -m prints for DJGPP always 'pc', but it prints nothing about

31532

+ # the processor, so we play safe by assuming i586.

31533

# Note: whatever this is, it MUST be the same as what config.sub

31534

# prints for the "djgpp" host, or else GDB configury will decide that

31535

# this is a cross-build.

31536

echo i586-pc-msdosdjgpp

31537

- exit ;;

31538

+ exit ;;

37667

31539

Intel:Mach:3*:*)

37668

31540

echo i386-pc-mach3

37669

@@ -1131,6 +1091,16 @@ EOF

31541

exit ;;

31542

@@ -1130,8 +1101,8 @@ EOF

31543

/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \

31544

&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;

37670

31545

3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)

37671

/bin/uname -p 2>/dev/null | grep 86 >/dev/null \

37672

&& { echo i486-ncr-sysv4; exit; } ;;

37673

+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)

37674

+ OS_REL='.3'

37675

+ test -r /etc/.relid \

37676

+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`

31546

- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \

31547

- && { echo i486-ncr-sysv4; exit; } ;;

37677

31548

+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \

37678

+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }

37679

+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \

37680

+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }

37681

+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \

37682

+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;

37683

m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)

37684

echo m68k-unknown-lynxos${UNAME_RELEASE}

37685

exit ;;

37686

@@ -1143,7 +1113,7 @@ EOF

37687

rs6000:LynxOS:2.*:*)

37688

echo rs6000-unknown-lynxos${UNAME_RELEASE}

37689

exit ;;

37690

- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)

37691

+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)

37692

echo powerpc-unknown-lynxos${UNAME_RELEASE}

37693

exit ;;

37694

SM[BE]S:UNIX_SV:*:*)

37695

@@ -1206,6 +1176,9 @@ EOF

37696

BePC:BeOS:*:*) # BeOS running on Intel PC compatible.

37697

echo i586-pc-beos

37698

exit ;;

37699

+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.

37700

+ echo i586-pc-haiku

37701

+ exit ;;

37702

SX-4:SUPER-UX:*:*)

37703

echo sx4-nec-superux${UNAME_RELEASE}

37704

exit ;;

37705

@@ -1233,6 +1206,16 @@ EOF

31549

+ && { echo i486-ncr-sysv4; exit; } ;;

31550

NCR*:*:4.2:* | MPRAS*:*:4.2:*)

31551

OS_REL='.3'

31552

test -r /etc/.relid \

31553

@@ -1174,10 +1145,10 @@ EOF

31554

echo ns32k-sni-sysv

31555

31556

exit ;;

31557

- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort

31558

- # says <Richard.M.Bartel@ccMail.Census.GOV>

31559

- echo i586-unisys-sysv4

31560

- exit ;;

31561

+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort

31562

+ # says <Richard.M.Bartel@ccMail.Census.GOV>

31563

+ echo i586-unisys-sysv4

31564

+ exit ;;

31565

*:UNIX_System_V:4*:FTX*)

31566

# From Gerald Hewes <hewes@openmarket.com>.

31567

# How about differentiating between stratus architectures? -djm

31568

@@ -1203,11 +1174,11 @@ EOF

31569

exit ;;

31570

R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)

31571

if [ -d /usr/nec ]; then

31572

- echo mips-nec-sysv${UNAME_RELEASE}

31573

+ echo mips-nec-sysv${UNAME_RELEASE}

31574

else

31575

- echo mips-unknown-sysv${UNAME_RELEASE}

31576

+ echo mips-unknown-sysv${UNAME_RELEASE}

31577

31578

- exit ;;

31579

+ exit ;;

31580

BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.

31581

echo powerpc-be-beos

31582

exit ;;

31583

@@ -1247,6 +1218,16 @@ EOF

37706

31584

*:Darwin:*:*)

37707

31585

UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown

37708

31586

case $UNAME_PROCESSOR in

37719

31597

unknown) UNAME_PROCESSOR=powerpc ;;

37720

31598

esac

37721

31599

echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}

37722

@@ -1314,6 +1297,9 @@ EOF

37723

i*86:rdos:*:*)

37724

echo ${UNAME_MACHINE}-pc-rdos

31600

@@ -1262,6 +1243,9 @@ EOF

31601

*:QNX:*:4*)

31602

echo i386-pc-qnx

37725

31603

exit ;;

37726

+ i*86:AROS:*:*)

37727

+ echo ${UNAME_MACHINE}-pc-aros

31604

+ NEO-?:NONSTOP_KERNEL:*:*)

31605

+ echo neo-tandem-nsk${UNAME_RELEASE}

37728

31606

+ exit ;;

37729

esac

37730

37731

#echo '(No uname command or uname output not recognized.)' 1>&2

37732

@@ -1474,9 +1460,9 @@ This script, last modified $timestamp, h

37733

the operating system you are using. It is advised that you

37734

download the most up to date version of the config scripts from

37735

37736

- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess

37737

+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD

37738

and

37739

- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub

37740

+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

37741

37742

If the version you run ($0) is already up to date, please

37743

send the following data and any information you think might be

37744

--- protobuf-2.3.0.orig/gtest/build-aux/ltmain.sh

37745

+++ protobuf-2.3.0/gtest/build-aux/ltmain.sh

37746

@@ -1,6 +1,6 @@

37747

# Generated from ltmain.m4sh.

37748

37749

-# ltmain.sh (GNU libtool) 2.2.4

37750

+# ltmain.sh (GNU libtool) 2.2.6b

31607

NSE-?:NONSTOP_KERNEL:*:*)

31608

echo nse-tandem-nsk${UNAME_RELEASE}

31609

exit ;;

31610

@@ -1307,13 +1291,13 @@ EOF

31611

echo pdp10-unknown-its

31612

exit ;;

31613

SEI:*:*:SEIUX)

31614

- echo mips-sei-seiux${UNAME_RELEASE}

31615

+ echo mips-sei-seiux${UNAME_RELEASE}

31616

exit ;;

31617

*:DragonFly:*:*)

31618

echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`

31619

exit ;;

31620

*:*VMS:*:*)

31621

- UNAME_MACHINE=`(uname -p) 2>/dev/null`

31622

+ UNAME_MACHINE=`(uname -p) 2>/dev/null`

31623

case "${UNAME_MACHINE}" in

31624

A*) echo alpha-dec-vms ; exit ;;

31625

I*) echo ia64-dec-vms ; exit ;;

31626

@@ -1353,11 +1337,11 @@ main ()

31627

#include <sys/param.h>

31628

printf ("m68k-sony-newsos%s\n",

31629

#ifdef NEWSOS4

31630

- "4"

31631

+ "4"

31632

#else

31633

- ""

31634

+ ""

31635

#endif

31636

- ); exit (0);

31637

+ ); exit (0);

31638

#endif

31639

#endif

31640

31641

--- protobuf-2.4.0a.orig/gtest/build-aux/ltmain.sh

31642

+++ protobuf-2.4.0a/gtest/build-aux/ltmain.sh

31643

@@ -1,9 +1,9 @@

31644

-# Generated from ltmain.m4sh.

31645

31646

-# ltmain.sh (GNU libtool) 2.2.6b

31647

+# libtool (GNU libtool) 2.4

37751

31648

# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

37752

31649

37753

37754

@@ -65,7 +65,7 @@

37755

# compiler: $LTCC

37756

# compiler flags: $LTCFLAGS

37757

# linker: $LD (gnu? $with_gnu_ld)

37758

-# $progname: (GNU libtool) 2.2.4

37759

+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1

37760

# automake: $automake_version

37761

# autoconf: $autoconf_version

37762

37763

@@ -73,9 +73,9 @@

37764

37765

PROGRAM=ltmain.sh

31650

31651

31652

+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

31653

# This is free software; see the source for copying conditions. There is NO

31654

# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

31655

31656

@@ -32,50 +32,56 @@

31657

31658

# Provide generalized library-building support services.

31659

31660

-# --config show all configuration variables

31661

-# --debug enable verbose shell tracing

31662

-# -n, --dry-run display commands without modifying any files

31663

-# --features display basic configuration information and exit

31664

-# --mode=MODE use operation mode MODE

31665

-# --preserve-dup-deps don't remove duplicate dependency libraries

31666

-# --quiet, --silent don't print informational messages

31667

-# --tag=TAG use configuration variables from tag TAG

31668

-# -v, --verbose print informational messages (default)

31669

-# --version print version information

31670

-# -h, --help print short or long help message

31671

+# --config show all configuration variables

31672

+# --debug enable verbose shell tracing

31673

+# -n, --dry-run display commands without modifying any files

31674

+# --features display basic configuration information and exit

31675

+# --mode=MODE use operation mode MODE

31676

+# --preserve-dup-deps don't remove duplicate dependency libraries

31677

+# --quiet, --silent don't print informational messages

31678

+# --no-quiet, --no-silent

31679

+# print informational messages (default)

31680

+# --tag=TAG use configuration variables from tag TAG

31681

+# -v, --verbose print more informational messages than default

31682

+# --no-verbose don't print the extra informational messages

31683

+# --version print version information

31684

+# -h, --help, --help-all print short, long, or detailed help message

31685

31686

# MODE must be one of the following:

31687

31688

-# clean remove files from the build directory

31689

-# compile compile a source file into a libtool object

31690

-# execute automatically set library path, then run a program

31691

-# finish complete the installation of libtool libraries

31692

-# install install libraries or executables

31693

-# link create a library or an executable

31694

-# uninstall remove libraries from an installed directory

31695

+# clean remove files from the build directory

31696

+# compile compile a source file into a libtool object

31697

+# execute automatically set library path, then run a program

31698

+# finish complete the installation of libtool libraries

31699

+# install install libraries or executables

31700

+# link create a library or an executable

31701

+# uninstall remove libraries from an installed directory

31702

31703

-# MODE-ARGS vary depending on the MODE.

31704

+# MODE-ARGS vary depending on the MODE. When passed as first option,

31705

+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.

31706

# Try `$progname --help --mode=MODE' for a more detailed description of MODE.

31707

31708

# When reporting a bug, please describe a test case to reproduce it and

31709

# include the following information:

31710

31711

-# host-triplet: $host

31712

-# shell: $SHELL

31713

-# compiler: $LTCC

31714

-# compiler flags: $LTCFLAGS

31715

-# linker: $LD (gnu? $with_gnu_ld)

31716

-# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1

31717

-# automake: $automake_version

31718

-# autoconf: $autoconf_version

31719

+# host-triplet: $host

31720

+# shell: $SHELL

31721

+# compiler: $LTCC

31722

+# compiler flags: $LTCFLAGS

31723

+# linker: $LD (gnu? $with_gnu_ld)

31724

+# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1

31725

+# automake: $automake_version

31726

+# autoconf: $autoconf_version

31727

31728

# Report bugs to <bug-libtool@gnu.org>.

31729

+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.

31730

+# General help using GNU software: <http://www.gnu.org/gethelp/>.

31731

31732

-PROGRAM=ltmain.sh

31733

+PROGRAM=libtool

37766

31734

PACKAGE=libtool

37767

-VERSION=2.2.4

37768

+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"

31735

-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"

31736

+VERSION="2.4 Debian-2.4-2ubuntu1"

37769

31737

TIMESTAMP=""

37770

-package_revision=1.2976

37771

+package_revision=1.3017

31738

-package_revision=1.3017

31739

+package_revision=1.3293

37772

31740

37773

31741

# Be Bourne compatible

37774

31742

if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

37775

@@ -116,15 +116,15 @@ $lt_unset CDPATH

31743

@@ -91,10 +97,15 @@ fi

31744

BIN_SH=xpg4; export BIN_SH # for Tru64

31745

DUALCASE=1; export DUALCASE # for MKS sh

31746

31747

+# A function that is used when there is no print builtin or printf.

31748

+func_fallback_echo ()

31749

31750

+ eval 'cat <<_LTECHO_EOF

31751

+$1

31752

+_LTECHO_EOF'

31753

31754

31755

# NLS nuisances: We save the old values to restore during execute mode.

31756

-# Only set LANG and LC_ALL to C if already set.

31757

-# These must not be set unconditionally because not all systems understand

31758

-# e.g. LANG=C (notably SCO).

31759

lt_user_locale=

31760

lt_safe_locale=

31761

for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES

31762

@@ -107,15 +118,24 @@ do

31763

lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"

31764

fi"

31765

done

31766

+LC_ALL=C

31767

+LANGUAGE=C

31768

+export LANGUAGE LC_ALL

31769

31770

$lt_unset CDPATH

31771

31772

31773

+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh

31774

+# is ksh but when the shell is invoked as "sh" and the current value of

31775

+# the _XPG environment variable is not equal to 1 (one), the special

31776

+# positional parameter $0, within a function call, is the name of the

31777

+# function.

31778

+progpath="$0"

31779

31780

37776

31781

37777

31782

: ${CP="cp -f"}

37778

: ${ECHO="echo"}

37779

-: ${EGREP="/usr/bin/grep -E"}

37780

-: ${FGREP="/usr/bin/grep -F"}

37781

-: ${GREP="/usr/bin/grep"}

37782

+: ${EGREP="/bin/grep -E"}

37783

+: ${FGREP="/bin/grep -F"}

37784

+: ${GREP="/bin/grep"}

37785

: ${LN_S="ln -s"}

37786

: ${MAKE="make"}

37787

: ${MKDIR="mkdir"}

37788

: ${MV="mv -f"}

37789

: ${RM="rm -f"}

37790

-: ${SED="/opt/local/bin/gsed"}

37791

+: ${SED="/bin/sed"}

37792

: ${SHELL="${CONFIG_SHELL-/bin/sh}"}

37793

: ${Xsed="$SED -e 1s/^X//"}

37794

37795

@@ -805,7 +805,7 @@ func_enable_tag ()

37796

31783

-: ${ECHO="echo"}

31784

+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}

31785

: ${EGREP="/bin/grep -E"}

31786

: ${FGREP="/bin/grep -F"}

31787

: ${GREP="/bin/grep"}

31788

@@ -144,6 +164,27 @@ IFS=" $lt_nl"

31789

dirname="s,/[^/]*$,,"

31790

basename="s,^.*/,,"

31791

31792

+# func_dirname file append nondir_replacement

31793

+# Compute the dirname of FILE. If nonempty, add APPEND to the result,

31794

+# otherwise set result to NONDIR_REPLACEMENT.

31795

+func_dirname ()

31796

31797

+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`

31798

+ if test "X$func_dirname_result" = "X${1}"; then

31799

+ func_dirname_result="${3}"

31800

+ else

31801

+ func_dirname_result="$func_dirname_result${2}"

31802

+ fi

31803

+} # func_dirname may be replaced by extended shell implementation

31804

31805

31806

+# func_basename file

31807

+func_basename ()

31808

31809

+ func_basename_result=`$ECHO "${1}" | $SED "$basename"`

31810

+} # func_basename may be replaced by extended shell implementation

31811

31812

31813

# func_dirname_and_basename file append nondir_replacement

31814

# perform func_basename and func_dirname in a single function

31815

# call:

31816

@@ -158,33 +199,183 @@ basename="s,^.*/,,"

31817

# those functions but instead duplicate the functionality here.

31818

func_dirname_and_basename ()

31819

{

31820

- # Extract subdirectory from the argument.

31821

- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`

31822

- if test "X$func_dirname_result" = "X${1}"; then

31823

- func_dirname_result="${3}"

31824

- else

31825

- func_dirname_result="$func_dirname_result${2}"

31826

- fi

31827

- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`

31828

+ # Extract subdirectory from the argument.

31829

+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`

31830

+ if test "X$func_dirname_result" = "X${1}"; then

31831

+ func_dirname_result="${3}"

31832

+ else

31833

+ func_dirname_result="$func_dirname_result${2}"

31834

+ fi

31835

+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`

31836

+} # func_dirname_and_basename may be replaced by extended shell implementation

31837

31838

31839

+# func_stripname prefix suffix name

31840

+# strip PREFIX and SUFFIX off of NAME.

31841

+# PREFIX and SUFFIX must not contain globbing or regex special

31842

+# characters, hashes, percent signs, but SUFFIX may contain a leading

31843

+# dot (in which case that matches only a dot).

31844

+# func_strip_suffix prefix name

31845

+func_stripname ()

31846

31847

+ case ${2} in

31848

+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;

31849

+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;

31850

+ esac

31851

+} # func_stripname may be replaced by extended shell implementation

31852

31853

31854

+# These SED scripts presuppose an absolute path with a trailing slash.

31855

+pathcar='s,^/$[^/]*$.*$,\1,'

31856

+pathcdr='s,^/[^/]*,,'

31857

+removedotparts=':dotsl

31858

+ s@/\./@/@g

31859

+ t dotsl

31860

+ s,/\.$,/,'

31861

+collapseslashes='s@/\{1,\}@/@g'

31862

+finalslash='s,/*$,/,'

31863

31864

+# func_normal_abspath PATH

31865

+# Remove doubled-up and trailing slashes, "." path components,

31866

+# and cancel out any ".." path components in PATH after making

31867

+# it an absolute path.

31868

+# value returned in "$func_normal_abspath_result"

31869

+func_normal_abspath ()

31870

31871

+ # Start from root dir and reassemble the path.

31872

+ func_normal_abspath_result=

31873

+ func_normal_abspath_tpath=$1

31874

+ func_normal_abspath_altnamespace=

31875

+ case $func_normal_abspath_tpath in

31876

+ "")

31877

+ # Empty path, that just means $cwd.

31878

+ func_stripname '' '/' "`pwd`"

31879

+ func_normal_abspath_result=$func_stripname_result

31880

+ return

31881

+ ;;

31882

+ # The next three entries are used to spot a run of precisely

31883

+ # two leading slashes without using negated character classes;

31884

+ # we take advantage of case's first-match behaviour.

31885

+ ///*)

31886

+ # Unusual form of absolute path, do nothing.

31887

+ ;;

31888

+ //*)

31889

+ # Not necessarily an ordinary path; POSIX reserves leading '//'

31890

+ # and for example Cygwin uses it to access remote file shares

31891

+ # over CIFS/SMB, so we conserve a leading double slash if found.

31892

+ func_normal_abspath_altnamespace=/

31893

+ ;;

31894

+ /*)

31895

+ # Absolute path, do nothing.

31896

+ ;;

31897

+ *)

31898

+ # Relative path, prepend $cwd.

31899

+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath

31900

+ ;;

31901

+ esac

31902

+ # Cancel out all the simple stuff to save iterations. We also want

31903

+ # the path to end with a slash for ease of parsing, so make sure

31904

+ # there is one (and only one) here.

31905

+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \

31906

+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`

31907

+ while :; do

31908

+ # Processed it all yet?

31909

+ if test "$func_normal_abspath_tpath" = / ; then

31910

+ # If we ascended to the root using ".." the result may be empty now.

31911

+ if test -z "$func_normal_abspath_result" ; then

31912

+ func_normal_abspath_result=/

31913

+ fi

31914

+ break

31915

+ fi

31916

+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \

31917

+ -e "$pathcar"`

31918

+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \

31919

+ -e "$pathcdr"`

31920

+ # Figure out what to do with it

31921

+ case $func_normal_abspath_tcomponent in

31922

+ "")

31923

+ # Trailing empty path component, ignore it.

31924

+ ;;

31925

+ ..)

31926

+ # Parent dir; strip last assembled component from result.

31927

+ func_dirname "$func_normal_abspath_result"

31928

+ func_normal_abspath_result=$func_dirname_result

31929

+ ;;

31930

+ *)

31931

+ # Actual path component, append it.

31932

+ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent

31933

+ ;;

31934

+ esac

31935

+ done

31936

+ # Restore leading double-slash if one was found on entry.

31937

+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result

31938

}

31939

31940

-# Generated shell functions inserted here.

31941

+# func_relative_path SRCDIR DSTDIR

31942

+# generates a relative path from SRCDIR to DSTDIR, with a trailing

31943

+# slash if non-empty, suitable for immediately appending a filename

31944

+# without needing to append a separator.

31945

+# value returned in "$func_relative_path_result"

31946

+func_relative_path ()

31947

31948

+ func_relative_path_result=

31949

+ func_normal_abspath "$1"

31950

+ func_relative_path_tlibdir=$func_normal_abspath_result

31951

+ func_normal_abspath "$2"

31952

+ func_relative_path_tbindir=$func_normal_abspath_result

31953

31954

+ # Ascend the tree starting from libdir

31955

+ while :; do

31956

+ # check if we have found a prefix of bindir

31957

+ case $func_relative_path_tbindir in

31958

+ $func_relative_path_tlibdir)

31959

+ # found an exact match

31960

+ func_relative_path_tcancelled=

31961

+ break

31962

+ ;;

31963

+ $func_relative_path_tlibdir*)

31964

+ # found a matching prefix

31965

+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"

31966

+ func_relative_path_tcancelled=$func_stripname_result

31967

+ if test -z "$func_relative_path_result"; then

31968

+ func_relative_path_result=.

31969

+ fi

31970

+ break

31971

+ ;;

31972

+ *)

31973

+ func_dirname $func_relative_path_tlibdir

31974

+ func_relative_path_tlibdir=${func_dirname_result}

31975

+ if test "x$func_relative_path_tlibdir" = x ; then

31976

+ # Have to descend all the way to the root!

31977

+ func_relative_path_result=../$func_relative_path_result

31978

+ func_relative_path_tcancelled=$func_relative_path_tbindir

31979

+ break

31980

+ fi

31981

+ func_relative_path_result=../$func_relative_path_result

31982

+ ;;

31983

+ esac

31984

+ done

31985

31986

+ # Now calculate path; take care to avoid doubling-up slashes.

31987

+ func_stripname '' '/' "$func_relative_path_result"

31988

+ func_relative_path_result=$func_stripname_result

31989

+ func_stripname '/' '/' "$func_relative_path_tcancelled"

31990

+ if test "x$func_stripname_result" != x ; then

31991

+ func_relative_path_result=${func_relative_path_result}/${func_stripname_result}

31992

+ fi

31993

31994

-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh

31995

-# is ksh but when the shell is invoked as "sh" and the current value of

31996

-# the _XPG environment variable is not equal to 1 (one), the special

31997

-# positional parameter $0, within a function call, is the name of the

31998

-# function.

31999

-progpath="$0"

32000

+ # Normalisation. If bindir is libdir, return empty string,

32001

+ # else relative path ending with a slash; either way, target

32002

+ # file name can be directly appended.

32003

+ if test ! -z "$func_relative_path_result"; then

32004

+ func_stripname './' '' "$func_relative_path_result/"

32005

+ func_relative_path_result=$func_stripname_result

32006

+ fi

32007

32008

32009

# The name of this program:

32010

-# In the unlikely event $progname began with a '-', it would play havoc with

32011

-# func_echo (imagine progname=-n), so we prepend ./ in that case:

32012

func_dirname_and_basename "$progpath"

32013

progname=$func_basename_result

32014

-case $progname in

32015

- -*) progname=./$progname ;;

32016

-esac

32017

32018

# Make sure we have an absolute path for reexecution:

32019

case $progpath in

32020

@@ -215,6 +406,15 @@ sed_quote_subst='s/$[`"$\\]$/\\\1/g'

32021

# Same as above, but do not quote variable references.

32022

double_quote_subst='s/$["`\\]$/\\\1/g'

32023

32024

+# Sed substitution that turns a string into a regex matching for the

32025

+# string literally.

32026

+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'

32027

32028

+# Sed substitution that converts a w32 file name or path

32029

+# which contains forward slashes, into one that contains

32030

+# (escaped) backslashes. A very naive implementation.

32031

+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'

32032

32033

# Re-`\' parameter expansions in output of double_quote_subst that were

32034

# `\'-ed in input to the same. If an odd number of `\' preceded a '$'

32035

# in input to double_quote_subst, that '$' was protected from expansion.

32036

@@ -243,7 +443,7 @@ opt_warning=:

32037

# name if it has been set yet.

32038

func_echo ()

32039

{

32040

- $ECHO "$progname${mode+: }$mode: $*"

32041

+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*"

32042

}

32043

32044

# func_verbose arg...

32045

@@ -258,18 +458,25 @@ func_verbose ()

32046

32047

}

32048

32049

+# func_echo_all arg...

32050

+# Invoke $ECHO with all args, space-separated.

32051

+func_echo_all ()

32052

32053

+ $ECHO "$*"

32054

32055

32056

# func_error arg...

32057

# Echo program name prefixed message to standard error.

32058

func_error ()

32059

{

32060

- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2

32061

+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2

32062

}

32063

32064

# func_warning arg...

32065

# Echo program name prefixed warning message to standard error.

32066

func_warning ()

32067

{

32068

- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2

32069

+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2

32070

32071

# bash bug again:

32072

32073

@@ -326,9 +533,9 @@ func_mkdir_p ()

32074

case $my_directory_path in */*) ;; *) break ;; esac

32075

32076

# ...otherwise throw away the child directory and loop

32077

- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`

32078

+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`

32079

done

32080

- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`

32081

+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`

32082

32083

save_mkdir_p_IFS="$IFS"; IFS=':'

32084

for my_dir in $my_dir_list; do

32085

@@ -378,7 +585,7 @@ func_mktempdir ()

32086

func_fatal_error "cannot create temporary directory \`$my_tmpdir'"

32087

32088

32089

- $ECHO "X$my_tmpdir" | $Xsed

32090

+ $ECHO "$my_tmpdir"

32091

}

32092

32093

32094

@@ -392,7 +599,7 @@ func_quote_for_eval ()

32095

{

32096

case $1 in

32097

*[\\\`\"\$]*)

32098

- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;

32099

+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;

32100

32101

func_quote_for_eval_unquoted_result="$1" ;;

32102

esac

32103

@@ -419,7 +626,7 @@ func_quote_for_expand ()

32104

{

32105

case $1 in

32106

*[\\\`\"]*)

32107

- my_arg=`$ECHO "X$1" | $Xsed \

32108

+ my_arg=`$ECHO "$1" | $SED \

32109

-e "$double_quote_subst" -e "$sed_double_backslash"` ;;

32110

32111

my_arg="$1" ;;

32112

@@ -488,15 +695,39 @@ func_show_eval_locale ()

32113

32114

}

32115

32116

32117

32118

+# func_tr_sh

32119

+# Turn $1 into a string suitable for a shell variable name.

32120

+# Result is stored in $func_tr_sh_result. All characters

32121

+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,

32122

+# if $1 begins with a digit, a '_' is prepended as well.

32123

+func_tr_sh ()

32124

32125

+ case $1 in

32126

+ [0-9]* | *[!a-zA-Z0-9_]*)

32127

+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^$[0-9]$/_\1/; s/[^a-zA-Z0-9_]/_/g'`

32128

+ ;;

32129

+ * )

32130

+ func_tr_sh_result=$1

32131

+ ;;

32132

+ esac

32133

32134

32135

32136

# func_version

32137

# Echo version message to standard output and exit.

32138

func_version ()

32139

{

32140

- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {

32141

+ $opt_debug

32142

32143

+ $SED -n '/(C)/!b go

32144

+ :more

32145

+ /\./!{

32146

+ N

32147

+ s/\n# / /

32148

+ b more

32149

+ }

32150

+ :go

32151

+ /^# '$PROGRAM' (GNU /,/# warranty; / {

32152

s/^# //

32153

s/^# *$//

32154

s/$(C)$[ 0-9,-]*$ [1-9][0-9]*$/\1\2/

32155

@@ -509,22 +740,28 @@ func_version ()

32156

# Echo short help message to standard output and exit.

32157

func_usage ()

32158

{

32159

- $SED -n '/^# Usage:/,/# -h/ {

32160

+ $opt_debug

32161

32162

+ $SED -n '/^# Usage:/,/^# *.*--help/ {

32163

s/^# //

32164

s/^# *$//

32165

s/\$progname/'$progname'/

32166

32167

}' < "$progpath"

32168

- $ECHO

32169

+ echo

32170

$ECHO "run \`$progname --help | more' for full usage"

32171

exit $?

32172

}

32173

32174

-# func_help

32175

-# Echo long help message to standard output and exit.

32176

+# func_help [NOEXIT]

32177

+# Echo long help message to standard output and exit,

32178

+# unless 'noexit' is passed as argument.

32179

func_help ()

32180

{

32181

+ $opt_debug

32182

32183

$SED -n '/^# Usage:/,/# Report bugs to/ {

32184

+ :print

32185

s/^# //

32186

s/^# *$//

32187

s*\$progname*'$progname'*

32188

@@ -537,8 +774,15 @@ func_help ()

32189

s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/

32190

s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/

32191

32192

- }' < "$progpath"

32193

- exit $?

32194

+ d

32195

+ }

32196

+ /^# .* home page:/b print

32197

+ /^# General help using/b print

32198

+ ' < "$progpath"

32199

+ ret=$?

32200

+ if test -z "$1"; then

32201

+ exit $ret

32202

+ fi

32203

}

32204

32205

# func_missing_arg argname

32206

@@ -546,63 +790,106 @@ func_help ()

32207

# exit_cmd.

32208

func_missing_arg ()

32209

{

32210

- func_error "missing argument for $1"

32211

+ $opt_debug

32212

32213

+ func_error "missing argument for $1."

32214

exit_cmd=exit

32215

}

32216

32217

-exit_cmd=:

32218

32219

+# func_split_short_opt shortopt

32220

+# Set func_split_short_opt_name and func_split_short_opt_arg shell

32221

+# variables after splitting SHORTOPT after the 2nd character.

32222

+func_split_short_opt ()

32223

32224

+ my_sed_short_opt='1s/^$..$.*$/\1/;q'

32225

+ my_sed_short_rest='1s/^..$.*$$/\1/;q'

32226

32227

+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`

32228

+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`

32229

+} # func_split_short_opt may be replaced by extended shell implementation

32230

32231

32232

+# func_split_long_opt longopt

32233

+# Set func_split_long_opt_name and func_split_long_opt_arg shell

32234

+# variables after splitting LONGOPT at the `=' sign.

32235

+func_split_long_opt ()

32236

32237

+ my_sed_long_opt='1s/^$--[^=]*$=.*/\1/;q'

32238

+ my_sed_long_arg='1s/^--[^=]*=//'

32239

32240

+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`

32241

+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`

32242

+} # func_split_long_opt may be replaced by extended shell implementation

32243

32244

+exit_cmd=:

32245

32246

32247

32248

-# Check that we have a working $ECHO.

32249

-if test "X$1" = X--no-reexec; then

32250

- # Discard the --no-reexec flag, and continue.

32251

- shift

32252

-elif test "X$1" = X--fallback-echo; then

32253

- # Avoid inline document here, it may be left over

32254

- :

32255

-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then

32256

- # Yippee, $ECHO works!

32257

- :

32258

-else

32259

- # Restart under the correct shell, and then maybe $ECHO will work.

32260

- exec $SHELL "$progpath" --no-reexec ${1+"$@"}

32261

-fi

32262

32263

-if test "X$1" = X--fallback-echo; then

32264

- # used as fallback echo

32265

- shift

32266

- cat <<EOF

32267

-$*

32268

-EOF

32269

- exit $EXIT_SUCCESS

32270

-fi

32271

32272

magic="%%%MAGIC variable%%%"

32273

magic_exe="%%%MAGIC EXE variable%%%"

32274

32275

# Global variables.

32276

-# $mode is unset

32277

nonopt=

32278

-execute_dlfiles=

32279

preserve_args=

32280

lo2o="s/\\.lo\$/.${objext}/"

32281

o2lo="s/\\.${objext}\$/.lo/"

32282

extracted_archives=

32283

extracted_serial=0

32284

32285

-opt_dry_run=false

32286

-opt_duplicate_deps=false

32287

-opt_silent=false

32288

-opt_debug=:

32289

32290

# If this variable is set in any of the actions, the command in it

32291

# will be execed at the end. This prevents here-documents from being

32292

# left over by shells.

32293

exec_cmd=

32294

32295

+# func_append var value

32296

+# Append VALUE to the end of shell variable VAR.

32297

+func_append ()

32298

32299

+ eval "${1}=\$${1}\${2}"

32300

+} # func_append may be replaced by extended shell implementation

32301

32302

+# func_append_quoted var value

32303

+# Quote VALUE and append to the end of shell variable VAR, separated

32304

+# by a space.

32305

+func_append_quoted ()

32306

32307

+ func_quote_for_eval "${2}"

32308

+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result"

32309

+} # func_append_quoted may be replaced by extended shell implementation

32310

32311

32312

+# func_arith arithmetic-term...

32313

+func_arith ()

32314

32315

+ func_arith_result=`expr "${@}"`

32316

+} # func_arith may be replaced by extended shell implementation

32317

32318

32319

+# func_len string

32320

+# STRING may not start with a hyphen.

32321

+func_len ()

32322

32323

+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`

32324

+} # func_len may be replaced by extended shell implementation

32325

32326

32327

+# func_lo2o object

32328

+func_lo2o ()

32329

32330

+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`

32331

+} # func_lo2o may be replaced by extended shell implementation

32332

32333

32334

+# func_xform libobj-or-source

32335

+func_xform ()

32336

32337

+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`

32338

+} # func_xform may be replaced by extended shell implementation

32339

32340

32341

# func_fatal_configuration arg...

32342

# Echo program name prefixed message to standard error, followed by

32343

# a configuration failure hint, and exit.

32344

@@ -636,16 +923,16 @@ func_config ()

32345

# Display the features supported by this script.

32346

func_features ()

32347

{

32348

- $ECHO "host: $host"

32349

+ echo "host: $host"

32350

if test "$build_libtool_libs" = yes; then

32351

- $ECHO "enable shared libraries"

32352

+ echo "enable shared libraries"

32353

else

32354

- $ECHO "disable shared libraries"

32355

+ echo "disable shared libraries"

32356

32357

if test "$build_old_libs" = yes; then

32358

- $ECHO "enable static libraries"

32359

+ echo "enable static libraries"

32360

else

32361

- $ECHO "disable static libraries"

32362

+ echo "disable static libraries"

32363

32364

32365

exit $?

32366

@@ -692,117 +979,204 @@ func_enable_tag ()

32367

esac

32368

}

32369

32370

-# Parse options once, thoroughly. This comes as soon as possible in

32371

-# the script to make things like `libtool --version' happen quickly.

32372

+# func_check_version_match

32373

+# Ensure that we are using m4 macros, and libtool script from the same

32374

+# release of libtool.

32375

+func_check_version_match ()

32376

{

32377

+ if test "$package_revision" != "$macro_revision"; then

32378

+ if test "$VERSION" != "$macro_version"; then

32379

+ if test -z "$macro_version"; then

32380

+ cat >&2 <<_LT_EOF

32381

+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the

32382

+$progname: definition of this LT_INIT comes from an older release.

32383

+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION

32384

+$progname: and run autoconf again.

32385

+_LT_EOF

32386

+ else

32387

+ cat >&2 <<_LT_EOF

32388

+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the

32389

+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.

32390

+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION

32391

+$progname: and run autoconf again.

32392

+_LT_EOF

32393

+ fi

32394

+ else

32395

+ cat >&2 <<_LT_EOF

32396

+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,

32397

+$progname: but the definition of this LT_INIT comes from revision $macro_revision.

32398

+$progname: You should recreate aclocal.m4 with macros from revision $package_revision

32399

+$progname: of $PACKAGE $VERSION and run autoconf again.

32400

+_LT_EOF

32401

+ fi

32402

32403

+ exit $EXIT_MISMATCH

32404

+ fi

32405

32406

32407

32408

+# Shorthand for --mode=foo, only valid as the first argument

32409

+case $1 in

32410

+clean|clea|cle|cl)

32411

+ shift; set dummy --mode clean ${1+"$@"}; shift

32412

+ ;;

32413

+compile|compil|compi|comp|com|co|c)

32414

+ shift; set dummy --mode compile ${1+"$@"}; shift

32415

+ ;;

32416

+execute|execut|execu|exec|exe|ex|e)

32417

+ shift; set dummy --mode execute ${1+"$@"}; shift

32418

+ ;;

32419

+finish|finis|fini|fin|fi|f)

32420

+ shift; set dummy --mode finish ${1+"$@"}; shift

32421

+ ;;

32422

+install|instal|insta|inst|ins|in|i)

32423

+ shift; set dummy --mode install ${1+"$@"}; shift

32424

+ ;;

32425

+link|lin|li|l)

32426

+ shift; set dummy --mode link ${1+"$@"}; shift

32427

+ ;;

32428

32429

+ shift; set dummy --mode uninstall ${1+"$@"}; shift

32430

+ ;;

32431

+esac

32432

32433

- # Shorthand for --mode=foo, only valid as the first argument

32434

- case $1 in

32435

- clean|clea|cle|cl)

32436

- shift; set dummy --mode clean ${1+"$@"}; shift

32437

- ;;

32438

- compile|compil|compi|comp|com|co|c)

32439

- shift; set dummy --mode compile ${1+"$@"}; shift

32440

- ;;

32441

- execute|execut|execu|exec|exe|ex|e)

32442

- shift; set dummy --mode execute ${1+"$@"}; shift

32443

- ;;

32444

- finish|finis|fini|fin|fi|f)

32445

- shift; set dummy --mode finish ${1+"$@"}; shift

32446

- ;;

32447

- install|instal|insta|inst|ins|in|i)

32448

- shift; set dummy --mode install ${1+"$@"}; shift

32449

- ;;

32450

- link|lin|li|l)

32451

- shift; set dummy --mode link ${1+"$@"}; shift

32452

- ;;

32453

32454

- shift; set dummy --mode uninstall ${1+"$@"}; shift

32455

- ;;

32456

- esac

32457

32458

- # Parse non-mode specific arguments:

32459

- while test "$#" -gt 0; do

32460

32461

+# Option defaults:

32462

+opt_debug=:

32463

+opt_dry_run=false

32464

+opt_config=false

32465

+opt_preserve_dup_deps=false

32466

+opt_features=false

32467

+opt_finish=false

32468

+opt_help=false

32469

+opt_help_all=false

32470

+opt_silent=:

32471

+opt_verbose=:

32472

+opt_silent=false

32473

+opt_verbose=false

32474

32475

32476

+# Parse options once, thoroughly. This comes as soon as possible in the

32477

+# script to make things like `--version' happen as quickly as we can.

32478

32479

+ # this just eases exit handling

32480

+ while test $# -gt 0; do

32481

opt="$1"

32482

shift

32483

32484

case $opt in

32485

- --config) func_config ;;

32486

32487

- --debug) preserve_args="$preserve_args $opt"

32488

+ --debug|-x) opt_debug='set -x'

32489

func_echo "enabling shell trace mode"

32490

- opt_debug='set -x'

32491

$opt_debug

32492

;;

32493

32494

- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break

32495

- execute_dlfiles="$execute_dlfiles $1"

32496

- shift

32497

+ --dry-run|--dryrun|-n)

32498

+ opt_dry_run=:

32499

;;

32500

32501

- --dry-run | -n) opt_dry_run=: ;;

32502

- --features) func_features ;;

32503

- --finish) mode="finish" ;;

32504

32505

- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break

32506

- case $1 in

32507

- # Valid mode arguments:

32508

- clean) ;;

32509

- compile) ;;

32510

- execute) ;;

32511

- finish) ;;

32512

- install) ;;

32513

- link) ;;

32514

- relink) ;;

32515

- uninstall) ;;

32516

32517

- # Catch anything else as an error

32518

- *) func_error "invalid argument for $opt"

32519

- exit_cmd=exit

32520

- break

32521

- ;;

32522

- esac

32523

32524

- mode="$1"

32525

+ --config)

32526

+ opt_config=:

32527

+func_config

32528

+ ;;

32529

+ --dlopen|-dlopen)

32530

+ optarg="$1"

32531

+ opt_dlopen="${opt_dlopen+$opt_dlopen

32532

+}$optarg"

32533

shift

32534

;;

32535

32536

--preserve-dup-deps)

32537

- opt_duplicate_deps=: ;;

32538

32539

- --quiet|--silent) preserve_args="$preserve_args $opt"

32540

- opt_silent=:

32541

+ opt_preserve_dup_deps=:

32542

;;

32543

32544

- --verbose| -v) preserve_args="$preserve_args $opt"

32545

+ --features)

32546

+ opt_features=:

32547

+func_features

32548

+ ;;

32549

+ --finish)

32550

+ opt_finish=:

32551

+set dummy --mode finish ${1+"$@"}; shift

32552

+ ;;

32553

+ --help)

32554

+ opt_help=:

32555

+ ;;

32556

+ --help-all)

32557

+ opt_help_all=:

32558

+opt_help=': help-all'

32559

+ ;;

32560

+ --mode)

32561

+ test $# = 0 && func_missing_arg $opt && break

32562

+ optarg="$1"

32563

+ opt_mode="$optarg"

32564

+case $optarg in

32565

+ # Valid mode arguments:

32566

32567

32568

+ # Catch anything else as an error

32569

+ *) func_error "invalid argument for $opt"

32570

+ exit_cmd=exit

32571

+ break

32572

+ ;;

32573

+esac

32574

+ shift

32575

+ ;;

32576

+ --no-silent|--no-quiet)

32577

opt_silent=false

32578

+func_append preserve_args " $opt"

32579

;;

32580

32581

- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break

32582

- preserve_args="$preserve_args $opt $1"

32583

- func_enable_tag "$1" # tagname is set here

32584

+ --no-verbose)

32585

+ opt_verbose=false

32586

+func_append preserve_args " $opt"

32587

+ ;;

32588

+ --silent|--quiet)

32589

+ opt_silent=:

32590

+func_append preserve_args " $opt"

32591

+ opt_verbose=false

32592

+ ;;

32593

+ --verbose|-v)

32594

+ opt_verbose=:

32595

+func_append preserve_args " $opt"

32596

+opt_silent=false

32597

+ ;;

32598

+ --tag)

32599

+ test $# = 0 && func_missing_arg $opt && break

32600

+ optarg="$1"

32601

+ opt_tag="$optarg"

32602

+func_append preserve_args " $opt $optarg"

32603

+func_enable_tag "$optarg"

32604

shift

32605

;;

32606

32607

+ -\?|-h) func_usage ;;

32608

+ --help) func_help ;;

32609

+ --version) func_version ;;

32610

32611

# Separate optargs to long options:

32612

- -dlopen=*|--mode=*|--tag=*)

32613

- func_opt_split "$opt"

32614

- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}

32615

+ --*=*)

32616

+ func_split_long_opt "$opt"

32617

+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}

32618

shift

32619

;;

32620

32621

- -\?|-h) func_usage ;;

32622

- --help) opt_help=: ;;

32623

- --version) func_version ;;

32624

32625

- -*) func_fatal_help "unrecognized option \`$opt'" ;;

32626

32627

- *) nonopt="$opt"

32628

- break

32629

+ # Separate non-argument short options:

32630

+ -\?*|-h*|-n*|-v*)

32631

+ func_split_short_opt "$opt"

32632

+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}

32633

+ shift

32634

;;

32635

32636

+ --) break ;;

32637

+ -*) func_fatal_help "unrecognized option \`$opt'" ;;

32638

+ *) set dummy "$opt" ${1+"$@"}; shift; break ;;

32639

esac

32640

done

32641

32642

+ # Validate options:

32643

32644

+ # save first non-option argument

32645

+ if test "$#" -gt 0; then

32646

+ nonopt="$opt"

32647

+ shift

32648

+ fi

32649

32650

+ # preserve --debug

32651

+ test "$opt_debug" = : || func_append preserve_args " --debug"

37797

32652

37798

32653

case $host in

37799

- *cygwin* | *mingw* | *pw32*)

37800

+ *cygwin* | *mingw* | *pw32* | *cegcc*)

37801

# don't eliminate duplications in $postdeps and $predeps

32654

*cygwin* | *mingw* | *pw32* | *cegcc*)

32655

@@ -810,82 +1184,44 @@ func_enable_tag ()

37802

32656

opt_duplicate_compiler_generated_deps=:

37803

32657

;;

37804

@@ -893,8 +893,9 @@ $opt_help || {

37805

# determined imposters.

37806

func_lalib_p ()

37807

{

37808

- $SED -e 4q "$1" 2>/dev/null \

37809

- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1

37810

+ test -f "$1" &&

37811

+ $SED -e 4q "$1" 2>/dev/null \

37812

+ | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1

37813

}

37814

37815

# func_lalib_unsafe_p file

37816

@@ -907,7 +908,7 @@ func_lalib_p ()

37817

func_lalib_unsafe_p ()

37818

{

37819

lalib_p=no

37820

- if test -r "$1" && exec 5<&0 <"$1"; then

37821

+ if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then

37822

for lalib_p_l in 1 2 3 4

37823

37824

read lalib_p_line

37825

@@ -1275,7 +1276,7 @@ func_mode_compile ()

37826

37827

# On Cygwin there's no "real" PIC flag so we must build both object types

37828

case $host_os in

37829

- cygwin* | mingw* | pw32* | os2*)

37830

+ cygwin* | mingw* | pw32* | os2* | cegcc*)

37831

pic_mode=default

37832

;;

32658

32659

- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps

32660

+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps

32661

;;

32662

esac

32663

32664

- # Having warned about all mis-specified options, bail out if

32665

- # anything was wrong.

32666

- $exit_cmd $EXIT_FAILURE

32667

32668

+ $opt_help || {

32669

+ # Sanity checks first:

32670

+ func_check_version_match

32671

32672

-# func_check_version_match

32673

-# Ensure that we are using m4 macros, and libtool script from the same

32674

-# release of libtool.

32675

-func_check_version_match ()

32676

32677

- if test "$package_revision" != "$macro_revision"; then

32678

- if test "$VERSION" != "$macro_version"; then

32679

- if test -z "$macro_version"; then

32680

- cat >&2 <<_LT_EOF

32681

-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the

32682

-$progname: definition of this LT_INIT comes from an older release.

32683

-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION

32684

-$progname: and run autoconf again.

32685

-_LT_EOF

32686

- else

32687

- cat >&2 <<_LT_EOF

32688

-$progname: Version mismatch error. This is $PACKAGE $VERSION, but the

32689

-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.

32690

-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION

32691

-$progname: and run autoconf again.

32692

-_LT_EOF

32693

- fi

32694

- else

32695

- cat >&2 <<_LT_EOF

32696

-$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,

32697

-$progname: but the definition of this LT_INIT comes from revision $macro_revision.

32698

-$progname: You should recreate aclocal.m4 with macros from revision $package_revision

32699

-$progname: of $PACKAGE $VERSION and run autoconf again.

32700

-_LT_EOF

32701

+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then

32702

+ func_fatal_configuration "not configured to build any kind of library"

32703

32704

32705

- exit $EXIT_MISMATCH

32706

- fi

32707

32708

32709

+ # Darwin sucks

32710

+ eval std_shrext=\"$shrext_cmds\"

32711

32712

-## ----------- ##

32713

-## Main. ##

32714

-## ----------- ##

32715

32716

-$opt_help || {

32717

- # Sanity checks first:

32718

- func_check_version_match

32719

32720

- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then

32721

- func_fatal_configuration "not configured to build any kind of library"

32722

- fi

32723

+ # Only execute mode is allowed to have -dlopen flags.

32724

+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then

32725

+ func_error "unrecognized option \`-dlopen'"

32726

+ $ECHO "$help" 1>&2

32727

+ exit $EXIT_FAILURE

32728

+ fi

32729

32730

- test -z "$mode" && func_fatal_error "error: you must specify a MODE."

32731

+ # Change the help message to a mode-specific one.

32732

+ generic_help="$help"

32733

+ help="Try \`$progname --help --mode=$opt_mode' for more information."

32734

+ }

32735

32736

32737

- # Darwin sucks

32738

- eval std_shrext=\"$shrext_cmds\"

32739

+ # Bail if the options were screwed

32740

+ $exit_cmd $EXIT_FAILURE

32741

32742

32743

32744

- # Only execute mode is allowed to have -dlopen flags.

32745

- if test -n "$execute_dlfiles" && test "$mode" != execute; then

32746

- func_error "unrecognized option \`-dlopen'"

32747

- $ECHO "$help" 1>&2

32748

- exit $EXIT_FAILURE

32749

- fi

32750

32751

- # Change the help message to a mode-specific one.

32752

- generic_help="$help"

32753

- help="Try \`$progname --help --mode=$mode' for more information."

32754

32755

32756

+## ----------- ##

32757

+## Main. ##

32758

+## ----------- ##

32759

32760

# func_lalib_p file

32761

# True iff FILE is a libtool `.la' library or `.lo' object file.

32762

@@ -950,12 +1286,9 @@ func_ltwrapper_executable_p ()

32763

# temporary ltwrapper_script.

32764

func_ltwrapper_scriptname ()

32765

{

32766

- func_ltwrapper_scriptname_result=""

32767

- if func_ltwrapper_executable_p "$1"; then

32768

- func_dirname_and_basename "$1" "" "."

32769

- func_stripname '' '.exe' "$func_basename_result"

32770

- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"

32771

- fi

32772

+ func_dirname_and_basename "$1" "" "."

32773

+ func_stripname '' '.exe' "$func_basename_result"

32774

+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"

32775

}

32776

32777

# func_ltwrapper_p file

32778

@@ -1001,6 +1334,37 @@ func_source ()

32779

}

32780

32781

32782

+# func_resolve_sysroot PATH

32783

+# Replace a leading = in PATH with a sysroot. Store the result into

32784

+# func_resolve_sysroot_result

32785

+func_resolve_sysroot ()

32786

32787

+ func_resolve_sysroot_result=$1

32788

+ case $func_resolve_sysroot_result in

32789

+ =*)

32790

+ func_stripname '=' '' "$func_resolve_sysroot_result"

32791

+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result

32792

+ ;;

32793

+ esac

32794

32795

32796

+# func_replace_sysroot PATH

32797

+# If PATH begins with the sysroot, replace it with = and

32798

+# store the result into func_replace_sysroot_result.

32799

+func_replace_sysroot ()

32800

32801

+ case "$lt_sysroot:$1" in

32802

+ ?*:"$lt_sysroot"*)

32803

+ func_stripname "$lt_sysroot" '' "$1"

32804

+ func_replace_sysroot_result="=$func_stripname_result"

32805

+ ;;

32806

+ *)

32807

+ # Including no sysroot.

32808

+ func_replace_sysroot_result=$1

32809

+ ;;

32810

+ esac

32811

32812

32813

# func_infer_tag arg

32814

# Infer tagged configuration to use if any are available and

32815

# if one wasn't chosen via the "--tag" command line option.

32816

@@ -1013,13 +1377,15 @@ func_infer_tag ()

32817

if test -n "$available_tags" && test -z "$tagname"; then

32818

CC_quoted=

32819

for arg in $CC; do

32820

- func_quote_for_eval "$arg"

32821

- CC_quoted="$CC_quoted $func_quote_for_eval_result"

32822

+ func_append_quoted CC_quoted "$arg"

32823

done

32824

+ CC_expanded=`func_echo_all $CC`

32825

+ CC_quoted_expanded=`func_echo_all $CC_quoted`

32826

case $@ in

32827

# Blanks in the command may have been stripped by the calling shell,

32828

# but not from the CC environment variable when configure was run.

32829

32830

+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \

32831

+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;

32832

# Blanks at the start of $base_compile will cause this to fail

32833

# if we don't check for them as well.

32834

32835

@@ -1030,11 +1396,13 @@ func_infer_tag ()

32836

CC_quoted=

32837

for arg in $CC; do

32838

# Double-quote args containing other shell metacharacters.

32839

- func_quote_for_eval "$arg"

32840

- CC_quoted="$CC_quoted $func_quote_for_eval_result"

32841

+ func_append_quoted CC_quoted "$arg"

32842

done

32843

+ CC_expanded=`func_echo_all $CC`

32844

+ CC_quoted_expanded=`func_echo_all $CC_quoted`

32845

case "$@ " in

32846

32847

+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \

32848

+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)

32849

# The compiler in the base compile command matches

32850

# the one in the tagged configuration.

32851

# Assume this is the tagged configuration we want.

32852

@@ -1097,6 +1465,486 @@ EOF

32853

}

32854

}

32855

32856

32857

+##################################################

32858

+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #

32859

+##################################################

32860

32861

+# func_convert_core_file_wine_to_w32 ARG

32862

+# Helper function used by file name conversion functions when $build is *nix,

32863

+# and $host is mingw, cygwin, or some other w32 environment. Relies on a

32864

+# correctly configured wine environment available, with the winepath program

32865

+# in $build's $PATH.

32866

32867

+# ARG is the $build file name to be converted to w32 format.

32868

+# Result is available in $func_convert_core_file_wine_to_w32_result, and will

32869

+# be empty on error (or when ARG is empty)

32870

+func_convert_core_file_wine_to_w32 ()

32871

32872

+ $opt_debug

32873

+ func_convert_core_file_wine_to_w32_result="$1"

32874

+ if test -n "$1"; then

32875

+ # Unfortunately, winepath does not exit with a non-zero error code, so we

32876

+ # are forced to check the contents of stdout. On the other hand, if the

32877

+ # command is not found, the shell will set an exit code of 127 and print

32878

+ # *an error message* to stdout. So we must check for both error code of

32879

+ # zero AND non-empty stdout, which explains the odd construction:

32880

+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`

32881

+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then

32882

+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |

32883

+ $SED -e "$lt_sed_naive_backslashify"`

32884

+ else

32885

+ func_convert_core_file_wine_to_w32_result=

32886

+ fi

32887

+ fi

32888

32889

+# end: func_convert_core_file_wine_to_w32

32890

32891

32892

+# func_convert_core_path_wine_to_w32 ARG

32893

+# Helper function used by path conversion functions when $build is *nix, and

32894

+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly

32895

+# configured wine environment available, with the winepath program in $build's

32896

+# $PATH. Assumes ARG has no leading or trailing path separator characters.

32897

32898

+# ARG is path to be converted from $build format to win32.

32899

+# Result is available in $func_convert_core_path_wine_to_w32_result.

32900

+# Unconvertible file (directory) names in ARG are skipped; if no directory names

32901

+# are convertible, then the result may be empty.

32902

+func_convert_core_path_wine_to_w32 ()

32903

32904

+ $opt_debug

32905

+ # unfortunately, winepath doesn't convert paths, only file names

32906

+ func_convert_core_path_wine_to_w32_result=""

32907

+ if test -n "$1"; then

32908

+ oldIFS=$IFS

32909

+ IFS=:

32910

+ for func_convert_core_path_wine_to_w32_f in $1; do

32911

+ IFS=$oldIFS

32912

+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"

32913

+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then

32914

+ if test -z "$func_convert_core_path_wine_to_w32_result"; then

32915

+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"

32916

+ else

32917

+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"

32918

+ fi

32919

+ fi

32920

+ done

32921

+ IFS=$oldIFS

32922

+ fi

32923

32924

+# end: func_convert_core_path_wine_to_w32

32925

32926

32927

+# func_cygpath ARGS...

32928

+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when

32929

+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)

32930

+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or

32931

+# (2), returns the Cygwin file name or path in func_cygpath_result (input

32932

+# file name or path is assumed to be in w32 format, as previously converted

32933

+# from $build's *nix or MSYS format). In case (3), returns the w32 file name

32934

+# or path in func_cygpath_result (input file name or path is assumed to be in

32935

+# Cygwin format). Returns an empty string on error.

32936

32937

+# ARGS are passed to cygpath, with the last one being the file name or path to

32938

+# be converted.

32939

32940

+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH

32941

+# environment variable; do not put it in $PATH.

32942

+func_cygpath ()

32943

32944

+ $opt_debug

32945

+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then

32946

+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`

32947

+ if test "$?" -ne 0; then

32948

+ # on failure, ensure result is empty

32949

+ func_cygpath_result=

32950

+ fi

32951

+ else

32952

+ func_cygpath_result=

32953

+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"

32954

+ fi

32955

32956

+#end: func_cygpath

32957

32958

32959

+# func_convert_core_msys_to_w32 ARG

32960

+# Convert file name or path ARG from MSYS format to w32 format. Return

32961

+# result in func_convert_core_msys_to_w32_result.

32962

+func_convert_core_msys_to_w32 ()

32963

32964

+ $opt_debug

32965

+ # awkward: cmd appends spaces to result

32966

+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |

32967

+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`

32968

32969

+#end: func_convert_core_msys_to_w32

32970

32971

32972

+# func_convert_file_check ARG1 ARG2

32973

+# Verify that ARG1 (a file name in $build format) was converted to $host

32974

+# format in ARG2. Otherwise, emit an error message, but continue (resetting

32975

+# func_to_host_file_result to ARG1).

32976

+func_convert_file_check ()

32977

32978

+ $opt_debug

32979

+ if test -z "$2" && test -n "$1" ; then

32980

+ func_error "Could not determine host file name corresponding to"

32981

+ func_error " \`$1'"

32982

+ func_error "Continuing, but uninstalled executables may not work."

32983

+ # Fallback:

32984

+ func_to_host_file_result="$1"

32985

+ fi

32986

32987

+# end func_convert_file_check

32988

32989

32990

+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH

32991

+# Verify that FROM_PATH (a path in $build format) was converted to $host

32992

+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting

32993

+# func_to_host_file_result to a simplistic fallback value (see below).

32994

+func_convert_path_check ()

32995

32996

+ $opt_debug

32997

+ if test -z "$4" && test -n "$3"; then

32998

+ func_error "Could not determine the host path corresponding to"

32999

+ func_error " \`$3'"

33000

+ func_error "Continuing, but uninstalled executables may not work."

33001

+ # Fallback. This is a deliberately simplistic "conversion" and

33002

+ # should not be "improved". See libtool.info.

33003

+ if test "x$1" != "x$2"; then

33004

+ lt_replace_pathsep_chars="s|$1|$2|g"

33005

+ func_to_host_path_result=`echo "$3" |

33006

+ $SED -e "$lt_replace_pathsep_chars"`

33007

+ else

33008

+ func_to_host_path_result="$3"

33009

+ fi

33010

+ fi

33011

33012

+# end func_convert_path_check

33013

33014

33015

+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG

33016

+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT

33017

+# and appending REPL if ORIG matches BACKPAT.

33018

+func_convert_path_front_back_pathsep ()

33019

33020

+ $opt_debug

33021

+ case $4 in

33022

+ $1 ) func_to_host_path_result="$3$func_to_host_path_result"

33023

+ ;;

33024

+ esac

33025

+ case $4 in

33026

+ $2 ) func_append func_to_host_path_result "$3"

33027

+ ;;

33028

+ esac

33029

33030

+# end func_convert_path_front_back_pathsep

33031

33032

33033

+##################################################

33034

+# $build to $host FILE NAME CONVERSION FUNCTIONS #

33035

+##################################################

33036

+# invoked via `$to_host_file_cmd ARG'

33037

33038

+# In each case, ARG is the path to be converted from $build to $host format.

33039

+# Result will be available in $func_to_host_file_result.

33040

33041

33042

+# func_to_host_file ARG

33043

+# Converts the file name ARG from $build format to $host format. Return result

33044

+# in func_to_host_file_result.

33045

+func_to_host_file ()

33046

33047

+ $opt_debug

33048

+ $to_host_file_cmd "$1"

33049

33050

+# end func_to_host_file

33051

33052

33053

+# func_to_tool_file ARG LAZY

33054

+# converts the file name ARG from $build format to toolchain format. Return

33055

+# result in func_to_tool_file_result. If the conversion in use is listed

33056

+# in (the comma separated) LAZY, no conversion takes place.

33057

+func_to_tool_file ()

33058

33059

+ $opt_debug

33060

+ case ,$2, in

33061

+ *,"$to_tool_file_cmd",*)

33062

+ func_to_tool_file_result=$1

33063

+ ;;

33064

+ *)

33065

+ $to_tool_file_cmd "$1"

33066

+ func_to_tool_file_result=$func_to_host_file_result

33067

+ ;;

33068

+ esac

33069

33070

+# end func_to_tool_file

33071

33072

33073

+# func_convert_file_noop ARG

33074

+# Copy ARG to func_to_host_file_result.

33075

+func_convert_file_noop ()

33076

33077

+ func_to_host_file_result="$1"

33078

33079

+# end func_convert_file_noop

33080

33081

33082

+# func_convert_file_msys_to_w32 ARG

33083

+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic

33084

+# conversion to w32 is not available inside the cwrapper. Returns result in

33085

+# func_to_host_file_result.

33086

+func_convert_file_msys_to_w32 ()

33087

33088

+ $opt_debug

33089

+ func_to_host_file_result="$1"

33090

+ if test -n "$1"; then

33091

+ func_convert_core_msys_to_w32 "$1"

33092

+ func_to_host_file_result="$func_convert_core_msys_to_w32_result"

33093

+ fi

33094

+ func_convert_file_check "$1" "$func_to_host_file_result"

33095

33096

+# end func_convert_file_msys_to_w32

33097

33098

33099

+# func_convert_file_cygwin_to_w32 ARG

33100

+# Convert file name ARG from Cygwin to w32 format. Returns result in

33101

+# func_to_host_file_result.

33102

+func_convert_file_cygwin_to_w32 ()

33103

33104

+ $opt_debug

33105

+ func_to_host_file_result="$1"

33106

+ if test -n "$1"; then

33107

+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use

33108

+ # LT_CYGPATH in this case.

33109

+ func_to_host_file_result=`cygpath -m "$1"`

33110

+ fi

33111

+ func_convert_file_check "$1" "$func_to_host_file_result"

33112

33113

+# end func_convert_file_cygwin_to_w32

33114

33115

33116

+# func_convert_file_nix_to_w32 ARG

33117

+# Convert file name ARG from *nix to w32 format. Requires a wine environment

33118

+# and a working winepath. Returns result in func_to_host_file_result.

33119

+func_convert_file_nix_to_w32 ()

33120

33121

+ $opt_debug

33122

+ func_to_host_file_result="$1"

33123

+ if test -n "$1"; then

33124

+ func_convert_core_file_wine_to_w32 "$1"

33125

+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"

33126

+ fi

33127

+ func_convert_file_check "$1" "$func_to_host_file_result"

33128

33129

+# end func_convert_file_nix_to_w32

33130

33131

33132

+# func_convert_file_msys_to_cygwin ARG

33133

+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.

33134

+# Returns result in func_to_host_file_result.

33135

+func_convert_file_msys_to_cygwin ()

33136

33137

+ $opt_debug

33138

+ func_to_host_file_result="$1"

33139

+ if test -n "$1"; then

33140

+ func_convert_core_msys_to_w32 "$1"

33141

+ func_cygpath -u "$func_convert_core_msys_to_w32_result"

33142

+ func_to_host_file_result="$func_cygpath_result"

33143

+ fi

33144

+ func_convert_file_check "$1" "$func_to_host_file_result"

33145

33146

+# end func_convert_file_msys_to_cygwin

33147

33148

33149

+# func_convert_file_nix_to_cygwin ARG

33150

+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed

33151

+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result

33152

+# in func_to_host_file_result.

33153

+func_convert_file_nix_to_cygwin ()

33154

33155

+ $opt_debug

33156

+ func_to_host_file_result="$1"

33157

+ if test -n "$1"; then

33158

+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.

33159

+ func_convert_core_file_wine_to_w32 "$1"

33160

+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result"

33161

+ func_to_host_file_result="$func_cygpath_result"

33162

+ fi

33163

+ func_convert_file_check "$1" "$func_to_host_file_result"

33164

33165

+# end func_convert_file_nix_to_cygwin

33166

33167

33168

+#############################################

33169

+# $build to $host PATH CONVERSION FUNCTIONS #

33170

+#############################################

33171

+# invoked via `$to_host_path_cmd ARG'

33172

33173

+# In each case, ARG is the path to be converted from $build to $host format.

33174

+# The result will be available in $func_to_host_path_result.

33175

33176

+# Path separators are also converted from $build format to $host format. If

33177

+# ARG begins or ends with a path separator character, it is preserved (but

33178

+# converted to $host format) on output.

33179

33180

+# All path conversion functions are named using the following convention:

33181

+# file name conversion function : func_convert_file_X_to_Y ()

33182

+# path conversion function : func_convert_path_X_to_Y ()

33183

+# where, for any given $build/$host combination the 'X_to_Y' value is the

33184

+# same. If conversion functions are added for new $build/$host combinations,

33185

+# the two new functions must follow this pattern, or func_init_to_host_path_cmd

33186

+# will break.

33187

33188

33189

+# func_init_to_host_path_cmd

33190

+# Ensures that function "pointer" variable $to_host_path_cmd is set to the

33191

+# appropriate value, based on the value of $to_host_file_cmd.

33192

+to_host_path_cmd=

33193

+func_init_to_host_path_cmd ()

33194

33195

+ $opt_debug

33196

+ if test -z "$to_host_path_cmd"; then

33197

+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd"

33198

+ to_host_path_cmd="func_convert_path_${func_stripname_result}"

33199

+ fi

33200

33201

33202

33203

+# func_to_host_path ARG

33204

+# Converts the path ARG from $build format to $host format. Return result

33205

+# in func_to_host_path_result.

33206

+func_to_host_path ()

33207

33208

+ $opt_debug

33209

+ func_init_to_host_path_cmd

33210

+ $to_host_path_cmd "$1"

33211

33212

+# end func_to_host_path

33213

33214

33215

+# func_convert_path_noop ARG

33216

+# Copy ARG to func_to_host_path_result.

33217

+func_convert_path_noop ()

33218

33219

+ func_to_host_path_result="$1"

33220

33221

+# end func_convert_path_noop

33222

33223

33224

+# func_convert_path_msys_to_w32 ARG

33225

+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic

33226

+# conversion to w32 is not available inside the cwrapper. Returns result in

33227

+# func_to_host_path_result.

33228

+func_convert_path_msys_to_w32 ()

33229

33230

+ $opt_debug

33231

+ func_to_host_path_result="$1"

33232

+ if test -n "$1"; then

33233

+ # Remove leading and trailing path separator characters from ARG. MSYS

33234

+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.';

33235

+ # and winepath ignores them completely.

33236

+ func_stripname : : "$1"

33237

+ func_to_host_path_tmp1=$func_stripname_result

33238

+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"

33239

+ func_to_host_path_result="$func_convert_core_msys_to_w32_result"

33240

+ func_convert_path_check : ";" \

33241

+ "$func_to_host_path_tmp1" "$func_to_host_path_result"

33242

+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"

33243

+ fi

33244

33245

+# end func_convert_path_msys_to_w32

33246

33247

33248

+# func_convert_path_cygwin_to_w32 ARG

33249

+# Convert path ARG from Cygwin to w32 format. Returns result in

33250

+# func_to_host_file_result.

33251

+func_convert_path_cygwin_to_w32 ()

33252

33253

+ $opt_debug

33254

+ func_to_host_path_result="$1"

33255

+ if test -n "$1"; then

33256

+ # See func_convert_path_msys_to_w32:

33257

+ func_stripname : : "$1"

33258

+ func_to_host_path_tmp1=$func_stripname_result

33259

+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`

33260

+ func_convert_path_check : ";" \

33261

+ "$func_to_host_path_tmp1" "$func_to_host_path_result"

33262

+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"

33263

+ fi

33264

33265

+# end func_convert_path_cygwin_to_w32

33266

33267

33268

+# func_convert_path_nix_to_w32 ARG

33269

+# Convert path ARG from *nix to w32 format. Requires a wine environment and

33270

+# a working winepath. Returns result in func_to_host_file_result.

33271

+func_convert_path_nix_to_w32 ()

33272

33273

+ $opt_debug

33274

+ func_to_host_path_result="$1"

33275

+ if test -n "$1"; then

33276

+ # See func_convert_path_msys_to_w32:

33277

+ func_stripname : : "$1"

33278

+ func_to_host_path_tmp1=$func_stripname_result

33279

+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"

33280

+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"

33281

+ func_convert_path_check : ";" \

33282

+ "$func_to_host_path_tmp1" "$func_to_host_path_result"

33283

+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"

33284

+ fi

33285

33286

+# end func_convert_path_nix_to_w32

33287

33288

33289

+# func_convert_path_msys_to_cygwin ARG

33290

+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.

33291

+# Returns result in func_to_host_file_result.

33292

+func_convert_path_msys_to_cygwin ()

33293

33294

+ $opt_debug

33295

+ func_to_host_path_result="$1"

33296

+ if test -n "$1"; then

33297

+ # See func_convert_path_msys_to_w32:

33298

+ func_stripname : : "$1"

33299

+ func_to_host_path_tmp1=$func_stripname_result

33300

+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"

33301

+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result"

33302

+ func_to_host_path_result="$func_cygpath_result"

33303

+ func_convert_path_check : : \

33304

+ "$func_to_host_path_tmp1" "$func_to_host_path_result"

33305

+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"

33306

+ fi

33307

33308

+# end func_convert_path_msys_to_cygwin

33309

33310

33311

+# func_convert_path_nix_to_cygwin ARG

33312

+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a

33313

+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in

33314

+# func_to_host_file_result.

33315

+func_convert_path_nix_to_cygwin ()

33316

33317

+ $opt_debug

33318

+ func_to_host_path_result="$1"

33319

+ if test -n "$1"; then

33320

+ # Remove leading and trailing path separator characters from

33321

+ # ARG. msys behavior is inconsistent here, cygpath turns them

33322

+ # into '.;' and ';.', and winepath ignores them completely.

33323

+ func_stripname : : "$1"

33324

+ func_to_host_path_tmp1=$func_stripname_result

33325

+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"

33326

+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"

33327

+ func_to_host_path_result="$func_cygpath_result"

33328

+ func_convert_path_check : : \

33329

+ "$func_to_host_path_tmp1" "$func_to_host_path_result"

33330

+ func_convert_path_front_back_pathsep ":*" "*:" : "$1"

33331

+ fi

33332

33333

+# end func_convert_path_nix_to_cygwin

33334

33335

33336

# func_mode_compile arg...

33337

func_mode_compile ()

33338

{

33339

@@ -1137,12 +1985,12 @@ func_mode_compile ()

33340

;;

33341

33342

-pie | -fpie | -fPIE)

33343

- pie_flag="$pie_flag $arg"

33344

+ func_append pie_flag " $arg"

33345

continue

33346

;;

33347

33348

-shared | -static | -prefer-pic | -prefer-non-pic)

33349

- later="$later $arg"

33350

+ func_append later " $arg"

33351

continue

33352

;;

33353

33354

@@ -1163,15 +2011,14 @@ func_mode_compile ()

33355

save_ifs="$IFS"; IFS=','

33356

for arg in $args; do

33357

IFS="$save_ifs"

33358

- func_quote_for_eval "$arg"

33359

- lastarg="$lastarg $func_quote_for_eval_result"

33360

+ func_append_quoted lastarg "$arg"

33361

done

33362

IFS="$save_ifs"

33363

func_stripname ' ' '' "$lastarg"

33364

lastarg=$func_stripname_result

33365

33366

# Add the arguments to base_compile.

33367

- base_compile="$base_compile $lastarg"

33368

+ func_append base_compile " $lastarg"

33369

continue

33370

;;

33371

33372

@@ -1187,8 +2034,7 @@ func_mode_compile ()

33373

esac # case $arg_mode

33374

33375

# Aesthetically quote the previous argument.

33376

- func_quote_for_eval "$lastarg"

33377

- base_compile="$base_compile $func_quote_for_eval_result"

33378

+ func_append_quoted base_compile "$lastarg"

33379

done # for arg

33380

33381

case $arg_mode in

33382

@@ -1213,7 +2059,7 @@ func_mode_compile ()

33383

*.[cCFSifmso] | \

33384

*.ada | *.adb | *.ads | *.asm | \

33385

*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \

33386

- *.[fF][09]? | *.for | *.java | *.obj | *.sx)

33387

+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)

33388

func_xform "$libobj"

33389

libobj=$func_xform_result

33390

;;

33391

@@ -1288,7 +2134,7 @@ func_mode_compile ()

33392

# Calculate the filename of the output object if compiler does

33393

# not support -o with -c

33394

if test "$compiler_c_o" = no; then

33395

- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}

33396

+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}

33397

lockfile="$output_obj.lock"

33398

else

33399

output_obj=

33400

@@ -1319,17 +2165,16 @@ compiler."

33401

$opt_dry_run || $RM $removelist

33402

exit $EXIT_FAILURE

33403

33404

- removelist="$removelist $output_obj"

33405

+ func_append removelist " $output_obj"

33406

$ECHO "$srcfile" > "$lockfile"

33407

33408

33409

$opt_dry_run || $RM $removelist

33410

- removelist="$removelist $lockfile"

33411

+ func_append removelist " $lockfile"

33412

trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15

33413

33414

- if test -n "$fix_srcfile_path"; then

33415

- eval srcfile=\"$fix_srcfile_path\"

33416

- fi

33417

+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32

33418

+ srcfile=$func_to_tool_file_result

33419

func_quote_for_eval "$srcfile"

33420

qsrcfile=$func_quote_for_eval_result

33421

33422

@@ -1349,7 +2194,7 @@ compiler."

33423

33424

if test -z "$output_obj"; then

33425

# Place PIC objects in $objdir

33426

- command="$command -o $lobj"

33427

+ func_append command " -o $lobj"

33428

33429

33430

func_show_eval_locale "$command" \

33431

@@ -1396,11 +2241,11 @@ compiler."

33432

command="$base_compile $qsrcfile $pic_flag"

33433

33434

if test "$compiler_c_o" = yes; then

33435

- command="$command -o $obj"

33436

+ func_append command " -o $obj"

33437

33438

33439

# Suppress compiler output if we already did a PIC compilation.

33440

- command="$command$suppress_output"

33441

+ func_append command "$suppress_output"

33442

func_show_eval_locale "$command" \

33443

'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'

33444

33445

@@ -1445,13 +2290,13 @@ compiler."

33446

}

33447

33448

$opt_help || {

33449

-test "$mode" = compile && func_mode_compile ${1+"$@"}

33450

+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"}

33451

}

33452

33453

func_mode_help ()

33454

{

33455

# We need to display help for each of the modes.

33456

- case $mode in

33457

+ case $opt_mode in

33458

"")

33459

# Generic help is extracted from the usage comments

33460

# at the start of this file.

33461

@@ -1482,10 +2327,11 @@ This mode accepts the following addition

33462

33463

-o OUTPUT-FILE set the output file name to OUTPUT-FILE

33464

-no-suppress do not suppress compiler output for multiple passes

33465

- -prefer-pic try to building PIC objects only

33466

- -prefer-non-pic try to building non-PIC objects only

33467

+ -prefer-pic try to build PIC objects only

33468

+ -prefer-non-pic try to build non-PIC objects only

33469

-shared do not build a \`.o' file suitable for static linking

33470

-static only build a \`.o' file suitable for static linking

33471

+ -Wc,FLAG pass FLAG directly to the compiler

33472

33473

COMPILE-COMMAND is a command to be used in creating a \`standard' object file

33474

from the given SOURCEFILE.

33475

@@ -1538,7 +2384,7 @@ either the \`install' or \`cp' program.

33476

33477

The following components of INSTALL-COMMAND are treated specially:

33478

33479

- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation

33480

+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation

33481

33482

The rest of the components are interpreted as arguments to that command (only

33483

BSD-compatible install options are recognized)."

33484

@@ -1558,6 +2404,8 @@ The following components of LINK-COMMAND

33485

33486

-all-static do not do any dynamic linking at all

33487

-avoid-version do not add a version suffix if possible

33488

+ -bindir BINDIR specify path to binaries directory (for systems where

33489

+ libraries must be found in the PATH setting at runtime)

33490

-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime

33491

-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols

33492

-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)

33493

@@ -1586,6 +2434,11 @@ The following components of LINK-COMMAND

33494

-version-info CURRENT[:REVISION[:AGE]]

33495

specify library version info [each variable defaults to 0]

33496

-weak LIBNAME declare that the target provides the LIBNAME interface

33497

+ -Wc,FLAG

33498

+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler

33499

+ -Wl,FLAG

33500

+ -Xlinker FLAG pass linker-specific FLAG directly to the linker

33501

+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)

33502

33503

All other options (arguments beginning with \`-') are ignored.

33504

33505

@@ -1619,18 +2472,44 @@ Otherwise, only FILE itself is deleted u

33506

;;

33507

33508

33509

- func_fatal_help "invalid operation mode \`$mode'"

33510

+ func_fatal_help "invalid operation mode \`$opt_mode'"

33511

;;

37833

33512

esac

37834

@@ -2046,7 +2047,7 @@ func_mode_install ()

33513

33514

- $ECHO

33515

+ echo

33516

$ECHO "Try \`$progname --help' for more information about other modes."

33517

33518

- exit $?

33519

}

33520

33521

- # Now that we've collected a possible --mode arg, show help if necessary

33522

- $opt_help && func_mode_help

33523

+# Now that we've collected a possible --mode arg, show help if necessary

33524

+if $opt_help; then

33525

+ if test "$opt_help" = :; then

33526

+ func_mode_help

33527

+ else

33528

+ {

33529

+ func_help noexit

33530

+ for opt_mode in compile link execute install finish uninstall clean; do

33531

+ func_mode_help

33532

+ done

33533

+ } | sed -n '1p; 2,$s/^Usage:/ or: /p'

33534

+ {

33535

+ func_help noexit

33536

+ for opt_mode in compile link execute install finish uninstall clean; do

33537

+ echo

33538

+ func_mode_help

33539

+ done

33540

+ } |

33541

+ sed '1d

33542

+ /^When reporting/,/^Report/{

33543

+ H

33544

+ d

33545

+ }

33546

+ $x

33547

+ /information about other modes/d

33548

+ /more detailed .*MODE/d

33549

+ s/^Usage:.*--mode=$[^ ]*$ .*/Description of \1 mode:/'

33550

+ fi

33551

+ exit $?

33552

+fi

33553

33554

33555

# func_mode_execute arg...

33556

@@ -1643,13 +2522,16 @@ func_mode_execute ()

33557

func_fatal_help "you must specify a COMMAND"

33558

33559

# Handle -dlopen flags immediately.

33560

- for file in $execute_dlfiles; do

33561

+ for file in $opt_dlopen; do

33562

test -f "$file" \

33563

|| func_fatal_help "\`$file' is not a file"

33564

33565

dir=

33566

case $file in

33567

*.la)

33568

+ func_resolve_sysroot "$file"

33569

+ file=$func_resolve_sysroot_result

33570

33571

# Check to see that this really is a libtool archive.

33572

func_lalib_unsafe_p "$file" \

33573

|| func_fatal_help "\`$lib' is not a valid libtool archive"

33574

@@ -1671,7 +2553,7 @@ func_mode_execute ()

33575

dir="$func_dirname_result"

33576

33577

if test -f "$dir/$objdir/$dlname"; then

33578

- dir="$dir/$objdir"

33579

+ func_append dir "/$objdir"

33580

else

33581

if test ! -f "$dir/$dlname"; then

33582

func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"

33583

@@ -1712,7 +2594,7 @@ func_mode_execute ()

33584

for file

33585

33586

case $file in

33587

- -*) ;;

33588

+ -* | *.la | *.lo ) ;;

33589

33590

# Do a test to see if this is really a libtool program.

33591

if func_ltwrapper_script_p "$file"; then

33592

@@ -1728,8 +2610,7 @@ func_mode_execute ()

33593

;;

33594

esac

33595

# Quote arguments (to preserve shell metacharacters).

33596

- func_quote_for_eval "$file"

33597

- args="$args $func_quote_for_eval_result"

33598

+ func_append_quoted args "$file"

33599

done

33600

33601

if test "X$opt_dry_run" = Xfalse; then

33602

@@ -1754,29 +2635,66 @@ func_mode_execute ()

33603

# Display what would be done.

33604

if test -n "$shlibpath_var"; then

33605

eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""

33606

- $ECHO "export $shlibpath_var"

33607

+ echo "export $shlibpath_var"

33608

33609

$ECHO "$cmd$args"

33610

exit $EXIT_SUCCESS

33611

33612

}

33613

33614

-test "$mode" = execute && func_mode_execute ${1+"$@"}

33615

+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}

33616

33617

33618

+# func_mode_finish arg...

33619

+func_mode_finish ()

33620

33621

+ $opt_debug

33622

+ libs=

33623

+ libdirs=

33624

+ admincmds=

33625

33626

+ for opt in "$nonopt" ${1+"$@"}

33627

+ do

33628

+ if test -d "$opt"; then

33629

+ func_append libdirs " $opt"

33630

33631

+ elif test -f "$opt"; then

33632

+ if func_lalib_unsafe_p "$opt"; then

33633

+ func_append libs " $opt"

33634

+ else

33635

+ func_warning "\`$opt' is not a valid libtool archive"

33636

+ fi

33637

33638

+ else

33639

+ func_fatal_error "invalid argument \`$opt'"

33640

+ fi

33641

+ done

33642

33643

+ if test -n "$libs"; then

33644

+ if test -n "$lt_sysroot"; then

33645

+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`

33646

+ sysroot_cmd="s/$[ ']$$sysroot_regex/\1/g;"

33647

+ else

33648

+ sysroot_cmd=

33649

+ fi

33650

33651

-# func_mode_finish arg...

33652

-func_mode_finish ()

33653

33654

- $opt_debug

33655

- libdirs="$nonopt"

33656

- admincmds=

33657

+ # Remove sysroot references

33658

+ if $opt_dry_run; then

33659

+ for lib in $libs; do

33660

+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib"

33661

+ done

33662

+ else

33663

+ tmpdir=`func_mktempdir`

33664

+ for lib in $libs; do

33665

+ sed -e "${sysroot_cmd} s/$[ ']-[LR]$=/\1/g; s/$[ ']$=/\1/g" $lib \

33666

+ > $tmpdir/tmp-la

33667

+ mv -f $tmpdir/tmp-la $lib

33668

+ done

33669

+ ${RM}r "$tmpdir"

33670

+ fi

33671

+ fi

33672

33673

if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then

33674

- for dir

33675

- do

33676

- libdirs="$libdirs $dir"

33677

- done

33678

33679

for libdir in $libdirs; do

33680

if test -n "$finish_cmds"; then

33681

# Do each command in the finish commands.

33682

@@ -1786,7 +2704,7 @@ func_mode_finish ()

33683

if test -n "$finish_eval"; then

33684

# Do the single finish_eval.

33685

eval cmds=\"$finish_eval\"

33686

- $opt_dry_run || eval "$cmds" || admincmds="$admincmds

33687

+ $opt_dry_run || eval "$cmds" || func_append admincmds "

33688

$cmds"

33689

33690

done

33691

@@ -1795,53 +2713,55 @@ func_mode_finish ()

33692

# Exit here if they wanted silent mode.

33693

$opt_silent && exit $EXIT_SUCCESS

33694

33695

- $ECHO "X----------------------------------------------------------------------" | $Xsed

33696

- $ECHO "Libraries have been installed in:"

33697

- for libdir in $libdirs; do

33698

- $ECHO " $libdir"

33699

- done

33700

- $ECHO

33701

- $ECHO "If you ever happen to want to link against installed libraries"

33702

- $ECHO "in a given directory, LIBDIR, you must either use libtool, and"

33703

- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"

33704

- $ECHO "flag during linking and do at least one of the following:"

33705

- if test -n "$shlibpath_var"; then

33706

- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"

33707

- $ECHO " during execution"

33708

- fi

33709

- if test -n "$runpath_var"; then

33710

- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"

33711

- $ECHO " during linking"

33712

- fi

33713

- if test -n "$hardcode_libdir_flag_spec"; then

33714

- libdir=LIBDIR

33715

- eval flag=\"$hardcode_libdir_flag_spec\"

33716

+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then

33717

+ echo "----------------------------------------------------------------------"

33718

+ echo "Libraries have been installed in:"

33719

+ for libdir in $libdirs; do

33720

+ $ECHO " $libdir"

33721

+ done

33722

+ echo

33723

+ echo "If you ever happen to want to link against installed libraries"

33724

+ echo "in a given directory, LIBDIR, you must either use libtool, and"

33725

+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'"

33726

+ echo "flag during linking and do at least one of the following:"

33727

+ if test -n "$shlibpath_var"; then

33728

+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable"

33729

+ echo " during execution"

33730

+ fi

33731

+ if test -n "$runpath_var"; then

33732

+ echo " - add LIBDIR to the \`$runpath_var' environment variable"

33733

+ echo " during linking"

33734

+ fi

33735

+ if test -n "$hardcode_libdir_flag_spec"; then

33736

+ libdir=LIBDIR

33737

+ eval flag=\"$hardcode_libdir_flag_spec\"

33738

33739

- $ECHO " - use the \`$flag' linker flag"

33740

- fi

33741

- if test -n "$admincmds"; then

33742

- $ECHO " - have your system administrator run these commands:$admincmds"

33743

- fi

33744

- if test -f /etc/ld.so.conf; then

33745

- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"

33746

- fi

33747

- $ECHO

33748

+ $ECHO " - use the \`$flag' linker flag"

33749

+ fi

33750

+ if test -n "$admincmds"; then

33751

+ $ECHO " - have your system administrator run these commands:$admincmds"

33752

+ fi

33753

+ if test -f /etc/ld.so.conf; then

33754

+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"

33755

+ fi

33756

+ echo

33757

33758

- $ECHO "See any operating system documentation about shared libraries for"

33759

- case $host in

33760

- solaris2.[6789]|solaris2.1[0-9])

33761

- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"

33762

- $ECHO "pages."

33763

- ;;

33764

- *)

33765

- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."

33766

- ;;

33767

- esac

33768

- $ECHO "X----------------------------------------------------------------------" | $Xsed

33769

+ echo "See any operating system documentation about shared libraries for"

33770

+ case $host in

33771

+ solaris2.[6789]|solaris2.1[0-9])

33772

+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"

33773

+ echo "pages."

33774

+ ;;

33775

+ *)

33776

+ echo "more information, such as the ld(1) and ld.so(8) manual pages."

33777

+ ;;

33778

+ esac

33779

+ echo "----------------------------------------------------------------------"

33780

+ fi

33781

exit $EXIT_SUCCESS

33782

}

33783

33784

-test "$mode" = finish && func_mode_finish ${1+"$@"}

33785

+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}

33786

33787

33788

# func_mode_install arg...

33789

@@ -1852,7 +2772,7 @@ func_mode_install ()

33790

# install_prog (especially on Windows NT).

33791

if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||

33792

# Allow the use of GNU shtool's install command.

33793

- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then

33794

+ case $nonopt in *shtool*) :;; *) false;; esac; then

33795

# Aesthetically quote it.

33796

func_quote_for_eval "$nonopt"

33797

install_prog="$func_quote_for_eval_result "

33798

@@ -1866,7 +2786,12 @@ func_mode_install ()

33799

# The real first argument should be the name of the installation program.

33800

# Aesthetically quote it.

33801

func_quote_for_eval "$arg"

33802

- install_prog="$install_prog$func_quote_for_eval_result"

33803

+ func_append install_prog "$func_quote_for_eval_result"

33804

+ install_shared_prog=$install_prog

33805

+ case " $install_prog " in

33806

+ *[\\\ /]cp\ *) install_cp=: ;;

33807

+ *) install_cp=false ;;

33808

+ esac

33809

33810

# We need to accept at least all the BSD install flags.

33811

dest=

33812

@@ -1876,10 +2801,12 @@ func_mode_install ()

33813

install_type=

33814

isdir=no

33815

stripme=

33816

+ no_mode=:

33817

for arg

33818

33819

+ arg2=

33820

if test -n "$dest"; then

33821

- files="$files $dest"

33822

+ func_append files " $dest"

33823

dest=$arg

33824

continue

33825

33826

@@ -1887,10 +2814,9 @@ func_mode_install ()

33827

case $arg in

33828

-d) isdir=yes ;;

33829

-f)

33830

- case " $install_prog " in

33831

- *[\\\ /]cp\ *) ;;

33832

- *) prev=$arg ;;

33833

- esac

33834

+ if $install_cp; then :; else

33835

+ prev=$arg

33836

+ fi

33837

;;

33838

-g | -m | -o)

33839

prev=$arg

33840

@@ -1904,6 +2830,10 @@ func_mode_install ()

33841

33842

# If the previous option needed an argument, then skip it.

33843

if test -n "$prev"; then

33844

+ if test "x$prev" = x-m && test -n "$install_override_mode"; then

33845

+ arg2=$install_override_mode

33846

+ no_mode=false

33847

+ fi

33848

prev=

33849

else

33850

dest=$arg

33851

@@ -1914,7 +2844,11 @@ func_mode_install ()

33852

33853

# Aesthetically quote the argument.

33854

func_quote_for_eval "$arg"

33855

- install_prog="$install_prog $func_quote_for_eval_result"

33856

+ func_append install_prog " $func_quote_for_eval_result"

33857

+ if test -n "$arg2"; then

33858

+ func_quote_for_eval "$arg2"

33859

+ fi

33860

+ func_append install_shared_prog " $func_quote_for_eval_result"

33861

done

33862

33863

test -z "$install_prog" && \

33864

@@ -1923,6 +2857,13 @@ func_mode_install ()

33865

test -n "$prev" && \

33866

func_fatal_help "the \`$prev' option requires an argument"

33867

33868

+ if test -n "$install_override_mode" && $no_mode; then

33869

+ if $install_cp; then :; else

33870

+ func_quote_for_eval "$install_override_mode"

33871

+ func_append install_shared_prog " -m $func_quote_for_eval_result"

33872

+ fi

33873

+ fi

33874

33875

if test -z "$files"; then

33876

if test -z "$dest"; then

33877

func_fatal_help "no file or destination specified"

33878

@@ -1977,10 +2918,13 @@ func_mode_install ()

33879

case $file in

33880

*.$libext)

33881

# Do the static libraries later.

33882

- staticlibs="$staticlibs $file"

33883

+ func_append staticlibs " $file"

33884

;;

33885

33886

*.la)

33887

+ func_resolve_sysroot "$file"

33888

+ file=$func_resolve_sysroot_result

33889

33890

# Check to see that this really is a libtool archive.

33891

func_lalib_unsafe_p "$file" \

33892

|| func_fatal_help "\`$file' is not a valid libtool archive"

33893

@@ -1994,23 +2938,23 @@ func_mode_install ()

33894

if test "X$destdir" = "X$libdir"; then

33895

case "$current_libdirs " in

33896

*" $libdir "*) ;;

33897

- *) current_libdirs="$current_libdirs $libdir" ;;

33898

+ *) func_append current_libdirs " $libdir" ;;

33899

esac

33900

else

33901

# Note the libdir as a future libdir.

33902

case "$future_libdirs " in

33903

*" $libdir "*) ;;

33904

- *) future_libdirs="$future_libdirs $libdir" ;;

33905

+ *) func_append future_libdirs " $libdir" ;;

33906

esac

33907

33908

33909

func_dirname "$file" "/" ""

33910

dir="$func_dirname_result"

33911

- dir="$dir$objdir"

33912

+ func_append dir "$objdir"

33913

33914

if test -n "$relink_command"; then

33915

# Determine the prefix the user has applied to our future dir.

33916

- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`

33917

+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`

33918

33919

# Don't allow the user to place us outside of our expected

33920

# location b/c this prevents finding dependent libraries that

33921

@@ -2023,9 +2967,9 @@ func_mode_install ()

33922

33923

if test -n "$inst_prefix_dir"; then

33924

# Stick the inst_prefix_dir data into the link command.

33925

- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`

33926

+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`

33927

else

33928

- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`

33929

+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`

33930

33931

33932

func_warning "relinking \`$file'"

33933

@@ -2043,7 +2987,7 @@ func_mode_install ()

33934

test -n "$relink_command" && srcname="$realname"T

33935

33936

# Install the shared library and build the symlinks.

33937

- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \

33938

+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \

37835

33939

'exit $?'

37836

33940

tstripme="$stripme"

37837

33941

case $host_os in

37838

- cygwin* | mingw* | pw32*)

37839

+ cygwin* | mingw* | pw32* | cegcc*)

37840

case $realname in

37841

*.dll.a)

37842

tstripme=""

37843

@@ -2152,7 +2153,7 @@ func_mode_install ()

37844

37845

# Do a test to see if this is really a libtool program.

37846

case $host in

37847

- *cygwin*|*mingw*)

37848

+ *cygwin* | *mingw*)

37849

if func_ltwrapper_executable_p "$file"; then

37850

func_ltwrapper_scriptname "$file"

37851

wrapper=$func_ltwrapper_scriptname_result

37852

@@ -2358,7 +2359,7 @@ extern \"C\" {

37853

$RM $export_symbols

37854

eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* $.*$$/\1/p' "'< "$nlist" > "$export_symbols"'

37855

case $host in

37856

- *cygwin* | *mingw* )

37857

+ *cygwin* | *mingw* | *cegcc* )

37858

eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'

37859

eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'

37860

;;

37861

@@ -2370,7 +2371,7 @@ extern \"C\" {

33942

@@ -2083,7 +3027,7 @@ func_mode_install ()

33943

func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'

33944

33945

# Maybe install the static library, too.

33946

- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

33947

+ test -n "$old_library" && func_append staticlibs " $dir/$old_library"

33948

;;

33949

33950

*.lo)

33951

@@ -2183,7 +3127,7 @@ func_mode_install ()

33952

if test -f "$lib"; then

33953

func_source "$lib"

33954

33955

- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test

33956

+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test

33957

if test -n "$libdir" && test ! -f "$libfile"; then

33958

func_warning "\`$lib' has not been installed in \`$libdir'"

33959

finalize=no

33960

@@ -2202,7 +3146,7 @@ func_mode_install ()

33961

file="$func_basename_result"

33962

outputname="$tmpdir/$file"

33963

# Replace the output file specification.

33964

- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`

33965

+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`

33966

33967

$opt_silent || {

33968

func_quote_for_expand "$relink_command"

33969

@@ -2221,7 +3165,7 @@ func_mode_install ()

33970

}

33971

else

33972

# Install the binary that we compiled earlier.

33973

- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%$[^/]*$$%$objdir/\1%"`

33974

+ file=`$ECHO "$file$stripped_ext" | $SED "s%$[^/]*$$%$objdir/\1%"`

33975

33976

33977

33978

@@ -2280,7 +3224,7 @@ func_mode_install ()

33979

33980

}

33981

33982

-test "$mode" = install && func_mode_install ${1+"$@"}

33983

+test "$opt_mode" = install && func_mode_install ${1+"$@"}

33984

33985

33986

# func_generate_dlsyms outputname originator pic_p

33987

@@ -2323,6 +3267,22 @@ func_generate_dlsyms ()

33988

extern \"C\" {

33989

#endif

33990

33991

+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))

33992

+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"

33993

+#endif

33994

33995

+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */

33996

+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)

33997

+/* DATA imports from DLLs on WIN32 con't be const, because runtime

33998

+ relocations are performed -- see ld's documentation on pseudo-relocs. */

33999

+# define LT_DLSYM_CONST

34000

+#elif defined(__osf__)

34001

+/* This system does not cope well with relocations in const data. */

34002

+# define LT_DLSYM_CONST

34003

+#else

34004

+# define LT_DLSYM_CONST const

34005

+#endif

34006

34007

/* External symbol declarations for the compiler. */\

34008

34009

34010

@@ -2332,10 +3292,11 @@ extern \"C\" {

34011

$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"

34012

34013

# Add our own program objects to the symbol list.

34014

- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`

34015

+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`

34016

for progfile in $progfiles; do

34017

- func_verbose "extracting global C symbols from \`$progfile'"

34018

- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"

34019

+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32

34020

+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"

34021

+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"

34022

done

34023

34024

if test -n "$exclude_expsyms"; then

34025

@@ -2371,7 +3332,7 @@ extern \"C\" {

37862

34026

eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'

37863

34027

eval '$MV "$nlist"T "$nlist"'

37864

34028

case $host in

37865

- *cygwin | *mingw* )

37866

+ *cygwin | *mingw* | *cegcc* )

34029

- *cygwin | *mingw* | *cegcc* )

34030

+ *cygwin* | *mingw* | *cegcc* )

37867

34031

eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'

37868

34032

eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'

37869

34033

;;

37870

@@ -2426,7 +2427,7 @@ typedef struct {

34034

@@ -2384,10 +3345,52 @@ extern \"C\" {

34035

func_verbose "extracting global C symbols from \`$dlprefile'"

34036

func_basename "$dlprefile"

34037

name="$func_basename_result"

34038

- $opt_dry_run || {

34039

- eval '$ECHO ": $name " >> "$nlist"'

34040

- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"

34041

- }

34042

+ case $host in

34043

+ *cygwin* | *mingw* | *cegcc* )

34044

+ # if an import library, we need to obtain dlname

34045

+ if func_win32_import_lib_p "$dlprefile"; then

34046

+ func_tr_sh "$dlprefile"

34047

+ eval "curr_lafile=\$libfile_$func_tr_sh_result"

34048

+ dlprefile_dlbasename=""

34049

+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then

34050

+ # Use subshell, to avoid clobbering current variable values

34051

+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`

34052

+ if test -n "$dlprefile_dlname" ; then

34053

+ func_basename "$dlprefile_dlname"

34054

+ dlprefile_dlbasename="$func_basename_result"

34055

+ else

34056

+ # no lafile. user explicitly requested -dlpreopen <import library>.

34057

+ $sharedlib_from_linklib_cmd "$dlprefile"

34058

+ dlprefile_dlbasename=$sharedlib_from_linklib_result

34059

+ fi

34060

+ fi

34061

+ $opt_dry_run || {

34062

+ if test -n "$dlprefile_dlbasename" ; then

34063

+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'

34064

+ else

34065

+ func_warning "Could not compute DLL name from $name"

34066

+ eval '$ECHO ": $name " >> "$nlist"'

34067

+ fi

34068

+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32

34069

+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |

34070

+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"

34071

+ }

34072

+ else # not an import lib

34073

+ $opt_dry_run || {

34074

+ eval '$ECHO ": $name " >> "$nlist"'

34075

+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32

34076

+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"

34077

+ }

34078

+ fi

34079

+ ;;

34080

+ *)

34081

+ $opt_dry_run || {

34082

+ eval '$ECHO ": $name " >> "$nlist"'

34083

+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32

34084

+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"

34085

+ }

34086

+ ;;

34087

+ esac

34088

done

34089

34090

$opt_dry_run || {

34091

@@ -2415,36 +3418,19 @@ extern \"C\" {

34092

if test -f "$nlist"S; then

34093

eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'

34094

else

34095

- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"

34096

+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms"

34097

34098

34099

- $ECHO >> "$output_objdir/$my_dlsyms" "\

34100

+ echo >> "$output_objdir/$my_dlsyms" "\

34101

34102

/* The mapping between symbol names and symbols. */

34103

typedef struct {

34104

const char *name;

34105

void *address;

37871

34106

} lt_dlsymlist;

37872

37873

case $host in

37874

- *cygwin* | *mingw* )

37875

+ *cygwin* | *mingw* | *cegcc* )

37876

$ECHO >> "$output_objdir/$my_dlsyms" "\

37877

/* DATA imports from DLLs on WIN32 con't be const, because

37878

runtime relocations are performed -- see ld's documentation

37879

@@ -2512,7 +2513,7 @@ static const void *lt_preloaded_setup()

37880

# Transform the symbol file into the correct name.

37881

symfileobj="$output_objdir/${my_outputname}S.$objext"

34107

34108

- case $host in

34109

- *cygwin* | *mingw* | *cegcc* )

34110

- $ECHO >> "$output_objdir/$my_dlsyms" "\

34111

-/* DATA imports from DLLs on WIN32 con't be const, because

34112

- runtime relocations are performed -- see ld's documentation

34113

- on pseudo-relocs. */"

34114

- lt_dlsym_const= ;;

34115

- *osf5*)

34116

- echo >> "$output_objdir/$my_dlsyms" "\

34117

-/* This system does not cope well with relocations in const data */"

34118

- lt_dlsym_const= ;;

34119

- *)

34120

- lt_dlsym_const=const ;;

34121

- esac

34122

34123

- $ECHO >> "$output_objdir/$my_dlsyms" "\

34124

-extern $lt_dlsym_const lt_dlsymlist

34125

+extern LT_DLSYM_CONST lt_dlsymlist

34126

lt_${my_prefix}_LTX_preloaded_symbols[];

34127

-$lt_dlsym_const lt_dlsymlist

34128

+LT_DLSYM_CONST lt_dlsymlist

34129

lt_${my_prefix}_LTX_preloaded_symbols[] =

34130

34131

{ \"$my_originator\", (void *) 0 },"

34132

@@ -2457,7 +3443,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[]

34133

eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"

34134

;;

34135

esac

34136

- $ECHO >> "$output_objdir/$my_dlsyms" "\

34137

+ echo >> "$output_objdir/$my_dlsyms" "\

34138

{0, (void *) 0}

34139

};

34140

34141

@@ -2500,7 +3486,7 @@ static const void *lt_preloaded_setup()

34142

for arg in $LTCFLAGS; do

34143

case $arg in

34144

-pie | -fpie | -fPIE) ;;

34145

- *) symtab_cflags="$symtab_cflags $arg" ;;

34146

+ *) func_append symtab_cflags " $arg" ;;

34147

esac

34148

done

34149

34150

@@ -2515,16 +3501,16 @@ static const void *lt_preloaded_setup()

37882

34151

case $host in

37883

- *cygwin* | *mingw* )

37884

+ *cygwin* | *mingw* | *cegcc* )

34152

*cygwin* | *mingw* | *cegcc* )

37885

34153

if test -f "$output_objdir/$my_outputname.def"; then

37886

compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

37887

finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

37888

@@ -2691,25 +2692,16 @@ func_extract_archives ()

37889

37890

37891

37892

-# func_emit_wrapper arg

37893

+# func_emit_wrapper_part1 [arg=no]

37894

37895

-# emit a libtool wrapper script on stdout

37896

-# don't directly open a file because we may want to

37897

-# incorporate the script contents within a cygwin/mingw

37898

-# wrapper executable. Must ONLY be called from within

37899

-# func_mode_link because it depends on a number of variable

37900

-# set therein.

37901

37902

-# arg is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR

37903

-# variable will take. If 'yes', then the emitted script

37904

-# will assume that the directory in which it is stored is

37905

-# the '.lib' directory. This is a cygwin/mingw-specific

37906

-# behavior.

37907

-func_emit_wrapper ()

37908

+# Emit the first part of a libtool wrapper script on stdout.

37909

+# For more information, see the description associated with

37910

+# func_emit_wrapper(), below.

37911

+func_emit_wrapper_part1 ()

34154

- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

34155

- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

34156

+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

34157

+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`

34158

else

34159

- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`

34160

- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`

34161

+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`

34162

+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`

34163

34164

;;

34165

34166

- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`

34167

- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`

34168

+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`

34169

+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`

34170

;;

34171

esac

34172

;;

34173

@@ -2538,8 +3524,8 @@ static const void *lt_preloaded_setup()

34174

# really was required.

34175

34176

# Nullify the symbol file.

34177

- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`

34178

- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`

34179

+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`

34180

+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`

34181

34182

}

34183

34184

@@ -2549,6 +3535,7 @@ static const void *lt_preloaded_setup()

34185

# Need a lot of goo to handle *both* DLLs and import libs

34186

# Has to be a shell function in order to 'eat' the argument

34187

# that is supplied when $file_magic_command is called.

34188

+# Despite the name, also deal with 64 bit binaries.

34189

func_win32_libid ()

37912

34190

{

37913

- func_emit_wrapper_arg1=no

37914

+ func_emit_wrapper_part1_arg1=no

37915

if test -n "$1" ; then

37916

- func_emit_wrapper_arg1=$1

37917

+ func_emit_wrapper_part1_arg1=$1

37918

37919

37920

$ECHO "\

37921

@@ -2794,10 +2786,27 @@ else

37922

file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`

37923

file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`

37924

done

37925

37926

37927

+# end: func_emit_wrapper_part1

37928

37929

+# func_emit_wrapper_part2 [arg=no]

37930

37931

+# Emit the second part of a libtool wrapper script on stdout.

37932

+# For more information, see the description associated with

37933

+# func_emit_wrapper(), below.

37934

+func_emit_wrapper_part2 ()

37935

37936

+ func_emit_wrapper_part2_arg1=no

37937

+ if test -n "$1" ; then

37938

+ func_emit_wrapper_part2_arg1=$1

37939

+ fi

37940

37941

+ $ECHO "\

37942

37943

# Usually 'no', except on cygwin/mingw when embedded into

37944

# the cwrapper.

37945

- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1

37946

+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1

37947

if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then

37948

# special case for '.'

37949

if test \"\$thisdir\" = \".\"; then

37950

@@ -2888,7 +2897,7 @@ else

37951

37952

case $host in

37953

# Backslashes separate directories on plain windows

37954

- *-*-mingw | *-*-os2*)

37955

+ *-*-mingw | *-*-os2* | *-cegcc*)

37956

$ECHO "\

37957

exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}

37958

37959

@@ -2914,7 +2923,207 @@ else

37960

fi\

37961

37962

}

37963

-# end: func_emit_wrapper

37964

+# end: func_emit_wrapper_part2

37965

37966

34191

$opt_debug

34192

@@ -2559,9 +3546,11 @@ func_win32_libid ()

34193

win32_libid_type="x86 archive import"

34194

;;

34195

*ar\ archive*) # could be an import, or static

34196

+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.

34197

if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |

34198

- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then

34199

- win32_nmres=`eval $NM -f posix -A $1 |

34200

+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then

34201

+ func_to_tool_file "$1" func_convert_file_msys_to_w32

34202

+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |

34203

$SED -n -e '

34204

1,100{

34205

/ I /{

34206

@@ -2590,6 +3579,131 @@ func_win32_libid ()

34207

$ECHO "$win32_libid_type"

34208

}

34209

34210

+# func_cygming_dll_for_implib ARG

34211

34212

+# Platform-specific function to extract the

34213

+# name of the DLL associated with the specified

34214

+# import library ARG.

34215

+# Invoked by eval'ing the libtool variable

34216

+# $sharedlib_from_linklib_cmd

34217

+# Result is available in the variable

34218

+# $sharedlib_from_linklib_result

34219

+func_cygming_dll_for_implib ()

34220

34221

+ $opt_debug

34222

+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`

34223

34224

34225

+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs

34226

34227

+# The is the core of a fallback implementation of a

34228

+# platform-specific function to extract the name of the

34229

+# DLL associated with the specified import library LIBNAME.

34230

34231

+# SECTION_NAME is either .idata$6 or .idata$7, depending

34232

+# on the platform and compiler that created the implib.

34233

34234

+# Echos the name of the DLL associated with the

34235

+# specified import library.

34236

+func_cygming_dll_for_implib_fallback_core ()

34237

34238

+ $opt_debug

34239

+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`

34240

+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null |

34241

+ $SED '/^Contents of section '"$match_literal"':/{

34242

+ # Place marker at beginning of archive member dllname section

34243

+ s/.*/====MARK====/

34244

+ p

34245

+ d

34246

+ }

34247

+ # These lines can sometimes be longer than 43 characters, but

34248

+ # are always uninteresting

34249

+ /:[ ]*file format pe[i]\{,1\}-/d

34250

+ /^In archive [^:]*:/d

34251

+ # Ensure marker is printed

34252

+ /^====MARK====/p

34253

+ # Remove all lines with less than 43 characters

34254

+ /^.\{43\}/!d

34255

+ # From remaining lines, remove first 43 characters

34256

+ s/^.\{43\}//' |

34257

+ $SED -n '

34258

+ # Join marker and all lines until next marker into a single line

34259

+ /^====MARK====/ b para

34260

+ H

34261

+ $ b para

34262

+ b

34263

+ :para

34264

+ x

34265

+ s/\n//g

34266

+ # Remove the marker

34267

+ s/^====MARK====//

34268

+ # Remove trailing dots and whitespace

34269

+ s/[\. \t]*$//

34270

+ # Print

34271

+ /./p' |

34272

+ # we now have a list, one entry per line, of the stringified

34273

+ # contents of the appropriate section of all members of the

34274

+ # archive which possess that section. Heuristic: eliminate

34275

+ # all those which have a first or second character that is

34276

+ # a '.' (that is, objdump's representation of an unprintable

34277

+ # character.) This should work for all archives with less than

34278

+ # 0x302f exports -- but will fail for DLLs whose name actually

34279

+ # begins with a literal '.' or a single character followed by

34280

+ # a '.'.

34281

+ #

34282

+ # Of those that remain, print the first one.

34283

+ $SED -e '/^\./d;/^.\./d;q'

34284

34285

34286

+# func_cygming_gnu_implib_p ARG

34287

+# This predicate returns with zero status (TRUE) if

34288

+# ARG is a GNU/binutils-style import library. Returns

34289

+# with nonzero status (FALSE) otherwise.

34290

+func_cygming_gnu_implib_p ()

34291

34292

+ $opt_debug

34293

+ func_to_tool_file "$1" func_convert_file_msys_to_w32

34294

+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`

34295

+ test -n "$func_cygming_gnu_implib_tmp"

34296

34297

34298

+# func_cygming_ms_implib_p ARG

34299

+# This predicate returns with zero status (TRUE) if

34300

+# ARG is an MS-style import library. Returns

34301

+# with nonzero status (FALSE) otherwise.

34302

+func_cygming_ms_implib_p ()

34303

34304

+ $opt_debug

34305

+ func_to_tool_file "$1" func_convert_file_msys_to_w32

34306

+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`

34307

+ test -n "$func_cygming_ms_implib_tmp"

34308

34309

34310

+# func_cygming_dll_for_implib_fallback ARG

34311

+# Platform-specific function to extract the

34312

+# name of the DLL associated with the specified

34313

+# import library ARG.

34314

34315

+# This fallback implementation is for use when $DLLTOOL

34316

+# does not support the --identify-strict option.

34317

+# Invoked by eval'ing the libtool variable

34318

+# $sharedlib_from_linklib_cmd

34319

+# Result is available in the variable

34320

+# $sharedlib_from_linklib_result

34321

+func_cygming_dll_for_implib_fallback ()

34322

34323

+ $opt_debug

34324

+ if func_cygming_gnu_implib_p "$1" ; then

34325

+ # binutils import library

34326

+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`

34327

+ elif func_cygming_ms_implib_p "$1" ; then

34328

+ # ms-generated import library

34329

+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`

34330

+ else

34331

+ # unknown

34332

+ sharedlib_from_linklib_result=""

34333

+ fi

34334

34335

34336

34337

# func_extract_an_archive dir oldlib

34338

@@ -2598,7 +3712,18 @@ func_extract_an_archive ()

34339

$opt_debug

34340

f_ex_an_ar_dir="$1"; shift

34341

f_ex_an_ar_oldlib="$1"

34342

- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'

34343

+ if test "$lock_old_archive_extraction" = yes; then

34344

+ lockfile=$f_ex_an_ar_oldlib.lock

34345

+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do

34346

+ func_echo "Waiting for $lockfile to be removed"

34347

+ sleep 2

34348

+ done

34349

+ fi

34350

+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \

34351

+ 'stat=$?; rm -f "$lockfile"; exit $stat'

34352

+ if test "$lock_old_archive_extraction" = yes; then

34353

+ $opt_dry_run || rm -f "$lockfile"

34354

+ fi

34355

if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then

34356

34357

else

34358

@@ -2669,7 +3794,7 @@ func_extract_archives ()

34359

darwin_file=

34360

darwin_files=

34361

for darwin_file in $darwin_filelist; do

34362

- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`

34363

+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`

34364

$LIPO -create -output "$darwin_file" $darwin_files

34365

done # $darwin_filelist

34366

$RM -rf unfat-$$

34367

@@ -2684,25 +3809,30 @@ func_extract_archives ()

34368

func_extract_an_archive "$my_xdir" "$my_xabs"

34369

;;

34370

esac

34371

- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`

34372

+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`

34373

done

34374

34375

func_extract_archives_result="$my_oldobjs"

34376

}

34377

34378

34379

34380

-# func_emit_wrapper_part1 [arg=no]

37967

34381

+# func_emit_wrapper [arg=no]

37968

34382

34383

-# Emit the first part of a libtool wrapper script on stdout.

34384

-# For more information, see the description associated with

34385

-# func_emit_wrapper(), below.

34386

-func_emit_wrapper_part1 ()

34387

34388

- func_emit_wrapper_part1_arg1=no

34389

- if test -n "$1" ; then

34390

- func_emit_wrapper_part1_arg1=$1

34391

- fi

37969

34392

+# Emit a libtool wrapper script on stdout.

37970

34393

+# Don't directly open a file because we may want to

37971

34394

+# incorporate the script contents within a cygwin/mingw

37980

34403

+# behavior.

37981

34404

+func_emit_wrapper ()

37982

34405

37983

+ func_emit_wrapper_arg1=no

37984

+ if test -n "$1" ; then

37985

+ func_emit_wrapper_arg1=$1

34406

+ func_emit_wrapper_arg1=${1-no}

34407

34408

$ECHO "\

34409

#! $SHELL

34410

@@ -2718,7 +3848,6 @@ func_emit_wrapper_part1 ()

34411

34412

# Sed substitution that helps us do robust quoting. It backslashifies

34413

# metacharacters that are still active within double-quoted strings.

34414

-Xsed='${SED} -e 1s/^X//'

34415

sed_quote_subst='$sed_quote_subst'

34416

34417

# Be Bourne compatible

34418

@@ -2749,31 +3878,132 @@ if test \"\$libtool_install_magic\" = \"

34419

else

34420

# When we are sourced in execute mode, \$file and \$ECHO are already set.

34421

if test \"\$libtool_execute_magic\" != \"$magic\"; then

34422

- ECHO=\"$qecho\"

34423

- file=\"\$0\"

34424

- # Make sure echo works.

34425

- if test \"X\$1\" = X--no-reexec; then

34426

- # Discard the --no-reexec flag, and continue.

34427

- shift

34428

- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then

34429

- # Yippee, \$ECHO works!

34430

- :

34431

- else

34432

- # Restart under the correct shell, and then maybe \$ECHO will work.

34433

- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}

34434

- fi

34435

- fi\

34436

+ file=\"\$0\""

34437

34438

+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`

34439

+ $ECHO "\

34440

34441

+# A function that is used when there is no print builtin or printf.

34442

+func_fallback_echo ()

34443

34444

+ eval 'cat <<_LTECHO_EOF

34445

+\$1

34446

+_LTECHO_EOF'

34447

34448

+ ECHO=\"$qECHO\"

34449

+ fi

34450

34451

+# Very basic option parsing. These options are (a) specific to

34452

+# the libtool wrapper, (b) are identical between the wrapper

34453

+# /script/ and the wrapper /executable/ which is used only on

34454

+# windows platforms, and (c) all begin with the string "--lt-"

34455

+# (application programs are unlikely to have options which match

34456

+# this pattern).

34457

34458

+# There are only two supported options: --lt-debug and

34459

+# --lt-dump-script. There is, deliberately, no --lt-help.

34460

34461

+# The first argument to this parsing function should be the

34462

+# script's $0 value, followed by "$@".

34463

+lt_option_debug=

34464

+func_parse_lt_options ()

34465

34466

+ lt_script_arg0=\$0

34467

+ shift

34468

+ for lt_opt

34469

+ do

34470

+ case \"\$lt_opt\" in

34471

+ --lt-debug) lt_option_debug=1 ;;

34472

+ --lt-dump-script)

34473

+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`

34474

+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.

34475

+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`

34476

+ cat \"\$lt_dump_D/\$lt_dump_F\"

34477

+ exit 0

34478

+ ;;

34479

+ --lt-*)

34480

+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2

34481

+ exit 1

34482

+ ;;

34483

+ esac

34484

+ done

34485

34486

+ # Print the debug banner immediately:

34487

+ if test -n \"\$lt_option_debug\"; then

34488

+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2

34489

+ fi

34490

34491

34492

+# Used when --lt-debug. Prints its arguments to stdout

34493

+# (redirection is the responsibility of the caller)

34494

+func_lt_dump_args ()

34495

34496

+ lt_dump_args_N=1;

34497

+ for lt_arg

34498

+ do

34499

+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"

34500

+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`

34501

+ done

34502

34503

34504

+# Core function for launching the target application

34505

+func_exec_program_core ()

34506

34507

34508

- $ECHO "\

34509

+ case $host in

34510

+ # Backslashes separate directories on plain windows

34511

+ *-*-mingw | *-*-os2* | *-cegcc*)

34512

+ $ECHO "\

34513

+ if test -n \"\$lt_option_debug\"; then

34514

+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2

34515

+ func_lt_dump_args \${1+\"\$@\"} 1>&2

34516

+ fi

34517

+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}

34518

34519

+ ;;

34520

34521

+ *)

34522

+ $ECHO "\

34523

+ if test -n \"\$lt_option_debug\"; then

34524

+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2

34525

+ func_lt_dump_args \${1+\"\$@\"} 1>&2

34526

+ fi

34527

+ exec \"\$progdir/\$program\" \${1+\"\$@\"}

34528

34529

+ ;;

34530

+ esac

34531

+ $ECHO "\

34532

+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2

34533

+ exit 1

34534

34535

34536

+# A function to encapsulate launching the target application

34537

+# Strips options in the --lt-* namespace from \$@ and

34538

+# launches target application with the remaining arguments.

34539

+func_exec_program ()

34540

34541

+ for lt_wr_arg

34542

+ do

34543

+ case \$lt_wr_arg in

34544

+ --lt-*) ;;

34545

+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;

34546

+ esac

34547

+ shift

34548

+ done

34549

+ func_exec_program_core \${1+\"\$@\"}

34550

34551

34552

+ # Parse options

34553

+ func_parse_lt_options \"\$0\" \${1+\"\$@\"}

34554

34555

# Find the directory that this script lives in.

34556

- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`

34557

+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`

34558

test \"x\$thisdir\" = \"x\$file\" && thisdir=.

34559

34560

# Follow symbolic links until we get to the real thisdir.

34561

- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`

34562

+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`

34563

while test -n \"\$file\"; do

34564

- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`

34565

+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`

34566

34567

# If there was a directory component, then change thisdir.

34568

if test \"x\$destdir\" != \"x\$file\"; then

34569

@@ -2783,30 +4013,13 @@ else

34570

esac

34571

34572

34573

- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`

34574

- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`

34575

+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`

34576

+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`

34577

done

34578

34579

34580

-# end: func_emit_wrapper_part1

34581

34582

-# func_emit_wrapper_part2 [arg=no]

34583

34584

-# Emit the second part of a libtool wrapper script on stdout.

34585

-# For more information, see the description associated with

34586

-# func_emit_wrapper(), below.

34587

-func_emit_wrapper_part2 ()

34588

34589

- func_emit_wrapper_part2_arg1=no

34590

- if test -n "$1" ; then

34591

- func_emit_wrapper_part2_arg1=$1

34592

- fi

34593

34594

- $ECHO "\

34595

34596

# Usually 'no', except on cygwin/mingw when embedded into

34597

# the cwrapper.

34598

- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1

34599

+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1

34600

if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then

34601

# special case for '.'

34602

if test \"\$thisdir\" = \".\"; then

34603

@@ -2814,7 +4027,7 @@ func_emit_wrapper_part2 ()

34604

34605

# remove .libs from thisdir

34606

case \"\$thisdir\" in

34607

- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;

34608

+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;

34609

$objdir ) thisdir=. ;;

34610

esac

34611

34612

@@ -2869,6 +4082,18 @@ func_emit_wrapper_part2 ()

34613

34614

if test -f \"\$progdir/\$program\"; then"

34615

34616

+ # fixup the dll searchpath if we need to.

34617

+ #

34618

+ # Fix the DLL searchpath if we need to. Do this before prepending

34619

+ # to shlibpath, because on Windows, both are PATH and uninstalled

34620

+ # libraries must come first.

34621

+ if test -n "$dllsearchpath"; then

34622

+ $ECHO "\

34623

+ # Add the dll search path components to the executable PATH

34624

+ PATH=$dllsearchpath:\$PATH

34625

37986

34626

+ fi

37987

34627

37988

+ # split this up so that func_emit_cwrapperexe_src

37989

+ # can call each part independently.

37990

+ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"

37991

+ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"

37992

37993

37994

37995

+# func_to_host_path arg

37996

37997

+# Convert paths to host format when used with build tools.

37998

+# Intended for use with "native" mingw (where libtool itself

37999

+# is running under the msys shell), or in the following cross-

38000

+# build environments:

38001

+# $build $host

38002

+# mingw (msys) mingw [e.g. native]

38003

+# cygwin mingw

38004

+# *nix + wine mingw

38005

+# where wine is equipped with the `winepath' executable.

38006

+# In the native mingw case, the (msys) shell automatically

38007

+# converts paths for any non-msys applications it launches,

38008

+# but that facility isn't available from inside the cwrapper.

38009

+# Similar accommodations are necessary for $host mingw and

38010

+# $build cygwin. Calling this function does no harm for other

38011

+# $host/$build combinations not listed above.

38012

38013

+# ARG is the path (on $build) that should be converted to

38014

+# the proper representation for $host. The result is stored

38015

+# in $func_to_host_path_result.

38016

+func_to_host_path ()

38017

38018

+ func_to_host_path_result="$1"

38019

+ if test -n "$1" ; then

38020

+ case $host in

38021

+ *mingw* )

38022

+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'

38023

+ case $build in

38024

+ *mingw* ) # actually, msys

38025

+ # awkward: cmd appends spaces to result

38026

+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"

38027

+ func_to_host_path_tmp1=`( cmd //c echo "$1" |\

38028

+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`

38029

+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

38030

+ $SED -e "$lt_sed_naive_backslashify"`

38031

+ ;;

38032

+ *cygwin* )

38033

+ func_to_host_path_tmp1=`cygpath -w "$1"`

38034

+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

38035

+ $SED -e "$lt_sed_naive_backslashify"`

38036

+ ;;

38037

+ * )

38038

+ # Unfortunately, winepath does not exit with a non-zero

38039

+ # error code, so we are forced to check the contents of

38040

+ # stdout. On the other hand, if the command is not

38041

+ # found, the shell will set an exit code of 127 and print

38042

+ # *an error message* to stdout. So we must check for both

38043

+ # error code of zero AND non-empty stdout, which explains

38044

+ # the odd construction:

38045

+ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`

38046

+ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then

38047

+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

38048

+ $SED -e "$lt_sed_naive_backslashify"`

38049

+ else

38050

+ # Allow warning below.

38051

+ func_to_host_path_result=""

38052

+ fi

38053

+ ;;

38054

+ esac

38055

+ if test -z "$func_to_host_path_result" ; then

38056

+ func_error "Could not determine host path corresponding to"

38057

+ func_error " '$1'"

38058

+ func_error "Continuing, but uninstalled executables may not work."

38059

+ # Fallback:

38060

+ func_to_host_path_result="$1"

38061

+ fi

38062

+ ;;

38063

+ esac

38064

+ fi

38065

38066

+# end: func_to_host_path

38067

38068

+# func_to_host_pathlist arg

38069

38070

+# Convert pathlists to host format when used with build tools.

38071

+# See func_to_host_path(), above. This function supports the

38072

+# following $build/$host combinations (but does no harm for

38073

+# combinations not listed here):

38074

+# $build $host

38075

+# mingw (msys) mingw [e.g. native]

38076

+# cygwin mingw

38077

+# *nix + wine mingw

38078

38079

+# Path separators are also converted from $build format to

38080

+# $host format. If ARG begins or ends with a path separator

38081

+# character, it is preserved (but converted to $host format)

38082

+# on output.

38083

38084

+# ARG is a pathlist (on $build) that should be converted to

38085

+# the proper representation on $host. The result is stored

38086

+# in $func_to_host_pathlist_result.

38087

+func_to_host_pathlist ()

38088

38089

+ func_to_host_pathlist_result="$1"

38090

+ if test -n "$1" ; then

38091

+ case $host in

38092

+ *mingw* )

38093

+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'

38094

+ # Remove leading and trailing path separator characters from

38095

+ # ARG. msys behavior is inconsistent here, cygpath turns them

38096

+ # into '.;' and ';.', and winepath ignores them completely.

38097

+ func_to_host_pathlist_tmp2="$1"

38098

+ # Once set for this call, this variable should not be

38099

+ # reassigned. It is used in tha fallback case.

38100

+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\

38101

+ $SED -e 's|^:*||' -e 's|:*$||'`

38102

+ case $build in

38103

+ *mingw* ) # Actually, msys.

38104

+ # Awkward: cmd appends spaces to result.

38105

+ lt_sed_strip_trailing_spaces="s/[ ]*\$//"

38106

+ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\

38107

+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`

38108

+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\

38109

+ $SED -e "$lt_sed_naive_backslashify"`

38110

+ ;;

38111

+ *cygwin* )

38112

+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`

38113

+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\

38114

+ $SED -e "$lt_sed_naive_backslashify"`

38115

+ ;;

38116

+ * )

38117

+ # unfortunately, winepath doesn't convert pathlists

38118

+ func_to_host_pathlist_result=""

38119

+ func_to_host_pathlist_oldIFS=$IFS

38120

+ IFS=:

38121

+ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do

38122

+ IFS=$func_to_host_pathlist_oldIFS

38123

+ if test -n "$func_to_host_pathlist_f" ; then

38124

+ func_to_host_path "$func_to_host_pathlist_f"

38125

+ if test -n "$func_to_host_path_result" ; then

38126

+ if test -z "$func_to_host_pathlist_result" ; then

38127

+ func_to_host_pathlist_result="$func_to_host_path_result"

38128

+ else

38129

+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"

38130

+ fi

38131

+ fi

38132

+ fi

38133

+ IFS=:

38134

+ done

38135

+ IFS=$func_to_host_pathlist_oldIFS

38136

+ ;;

38137

+ esac

38138

+ if test -z "$func_to_host_pathlist_result" ; then

38139

+ func_error "Could not determine the host path(s) corresponding to"

38140

+ func_error " '$1'"

38141

+ func_error "Continuing, but uninstalled executables may not work."

38142

+ # Fallback. This may break if $1 contains DOS-style drive

38143

+ # specifications. The fix is not to complicate the expression

38144

+ # below, but for the user to provide a working wine installation

38145

+ # with winepath so that path translation in the cross-to-mingw

38146

+ # case works properly.

38147

+ lt_replace_pathsep_nix_to_dos="s|:|;|g"

38148

+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\

38149

+ $SED -e "$lt_replace_pathsep_nix_to_dos"`

38150

+ fi

38151

+ # Now, add the leading and trailing path separators back

38152

+ case "$1" in

38153

+ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"

38154

+ ;;

38155

+ esac

38156

+ case "$1" in

38157

+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"

38158

+ ;;

38159

+ esac

38160

+ ;;

38161

+ esac

38162

+ fi

38163

38164

+# end: func_to_host_pathlist

34628

# Export our shlibpath_var if we have one.

34629

if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then

34630

$ECHO "\

34631

@@ -2877,253 +4102,28 @@ func_emit_wrapper_part2 ()

34632

34633

# Some systems cannot cope with colon-terminated $shlibpath_var

34634

# The second colon is a workaround for a bug in BeOS R4 sed

34635

- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`

34636

+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`

34637

34638

export $shlibpath_var

34639

34640

34641

34642

- # fixup the dll searchpath if we need to.

34643

- if test -n "$dllsearchpath"; then

34644

- $ECHO "\

34645

- # Add the dll search path components to the executable PATH

34646

- PATH=$dllsearchpath:\$PATH

34647

34648

- fi

34649

34650

$ECHO "\

34651

if test \"\$libtool_execute_magic\" != \"$magic\"; then

34652

# Run the actual program with our arguments.

34653

34654

- case $host in

34655

- # Backslashes separate directories on plain windows

34656

- *-*-mingw | *-*-os2* | *-cegcc*)

34657

- $ECHO "\

34658

- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}

34659

34660

- ;;

34661

34662

- *)

34663

- $ECHO "\

34664

- exec \"\$progdir/\$program\" \${1+\"\$@\"}

34665

34666

- ;;

34667

- esac

34668

- $ECHO "\

34669

- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2

34670

- exit 1

34671

+ func_exec_program \${1+\"\$@\"}

34672

34673

else

34674

# The program doesn't exist.

34675

\$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2

34676

\$ECHO \"This script is just a wrapper for \$program.\" 1>&2

34677

- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2

34678

- exit 1

34679

- fi

34680

-fi\

34681

34682

34683

-# end: func_emit_wrapper_part2

34684

34685

34686

-# func_emit_wrapper [arg=no]

34687

34688

-# Emit a libtool wrapper script on stdout.

34689

-# Don't directly open a file because we may want to

34690

-# incorporate the script contents within a cygwin/mingw

34691

-# wrapper executable. Must ONLY be called from within

34692

-# func_mode_link because it depends on a number of variables

34693

-# set therein.

34694

34695

-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR

34696

-# variable will take. If 'yes', then the emitted script

34697

-# will assume that the directory in which it is stored is

34698

-# the $objdir directory. This is a cygwin/mingw-specific

34699

-# behavior.

34700

-func_emit_wrapper ()

34701

34702

- func_emit_wrapper_arg1=no

34703

- if test -n "$1" ; then

34704

- func_emit_wrapper_arg1=$1

34705

- fi

34706

34707

- # split this up so that func_emit_cwrapperexe_src

34708

- # can call each part independently.

34709

- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"

34710

- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"

34711

34712

34713

34714

-# func_to_host_path arg

34715

34716

-# Convert paths to host format when used with build tools.

34717

-# Intended for use with "native" mingw (where libtool itself

34718

-# is running under the msys shell), or in the following cross-

34719

-# build environments:

34720

-# $build $host

34721

-# mingw (msys) mingw [e.g. native]

34722

-# cygwin mingw

34723

-# *nix + wine mingw

34724

-# where wine is equipped with the `winepath' executable.

34725

-# In the native mingw case, the (msys) shell automatically

34726

-# converts paths for any non-msys applications it launches,

34727

-# but that facility isn't available from inside the cwrapper.

34728

-# Similar accommodations are necessary for $host mingw and

34729

-# $build cygwin. Calling this function does no harm for other

34730

-# $host/$build combinations not listed above.

34731

34732

-# ARG is the path (on $build) that should be converted to

34733

-# the proper representation for $host. The result is stored

34734

-# in $func_to_host_path_result.

34735

-func_to_host_path ()

34736

34737

- func_to_host_path_result="$1"

34738

- if test -n "$1" ; then

34739

- case $host in

34740

- *mingw* )

34741

- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'

34742

- case $build in

34743

- *mingw* ) # actually, msys

34744

- # awkward: cmd appends spaces to result

34745

- lt_sed_strip_trailing_spaces="s/[ ]*\$//"

34746

- func_to_host_path_tmp1=`( cmd //c echo "$1" |\

34747

- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`

34748

- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

34749

- $SED -e "$lt_sed_naive_backslashify"`

34750

- ;;

34751

- *cygwin* )

34752

- func_to_host_path_tmp1=`cygpath -w "$1"`

34753

- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

34754

- $SED -e "$lt_sed_naive_backslashify"`

34755

- ;;

34756

- * )

34757

- # Unfortunately, winepath does not exit with a non-zero

34758

- # error code, so we are forced to check the contents of

34759

- # stdout. On the other hand, if the command is not

34760

- # found, the shell will set an exit code of 127 and print

34761

- # *an error message* to stdout. So we must check for both

34762

- # error code of zero AND non-empty stdout, which explains

34763

- # the odd construction:

34764

- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`

34765

- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then

34766

- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\

34767

- $SED -e "$lt_sed_naive_backslashify"`

34768

- else

34769

- # Allow warning below.

34770

- func_to_host_path_result=""

34771

- fi

34772

- ;;

34773

- esac

34774

- if test -z "$func_to_host_path_result" ; then

34775

- func_error "Could not determine host path corresponding to"

34776

- func_error " '$1'"

34777

- func_error "Continuing, but uninstalled executables may not work."

34778

- # Fallback:

34779

- func_to_host_path_result="$1"

34780

- fi

34781

- ;;

34782

- esac

34783

- fi

34784

34785

-# end: func_to_host_path

34786

34787

-# func_to_host_pathlist arg

34788

34789

-# Convert pathlists to host format when used with build tools.

34790

-# See func_to_host_path(), above. This function supports the

34791

-# following $build/$host combinations (but does no harm for

34792

-# combinations not listed here):

34793

-# $build $host

34794

-# mingw (msys) mingw [e.g. native]

34795

-# cygwin mingw

34796

-# *nix + wine mingw

34797

34798

-# Path separators are also converted from $build format to

34799

-# $host format. If ARG begins or ends with a path separator

34800

-# character, it is preserved (but converted to $host format)

34801

-# on output.

34802

34803

-# ARG is a pathlist (on $build) that should be converted to

34804

-# the proper representation on $host. The result is stored

34805

-# in $func_to_host_pathlist_result.

34806

-func_to_host_pathlist ()

34807

34808

- func_to_host_pathlist_result="$1"

34809

- if test -n "$1" ; then

34810

- case $host in

34811

- *mingw* )

34812

- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'

34813

- # Remove leading and trailing path separator characters from

34814

- # ARG. msys behavior is inconsistent here, cygpath turns them

34815

- # into '.;' and ';.', and winepath ignores them completely.

34816

- func_to_host_pathlist_tmp2="$1"

34817

- # Once set for this call, this variable should not be

34818

- # reassigned. It is used in tha fallback case.

34819

- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\

34820

- $SED -e 's|^:*||' -e 's|:*$||'`

34821

- case $build in

34822

- *mingw* ) # Actually, msys.

34823

- # Awkward: cmd appends spaces to result.

34824

- lt_sed_strip_trailing_spaces="s/[ ]*\$//"

34825

- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\

34826

- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`

34827

- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\

34828

- $SED -e "$lt_sed_naive_backslashify"`

34829

- ;;

34830

- *cygwin* )

34831

- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`

34832

- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\

34833

- $SED -e "$lt_sed_naive_backslashify"`

34834

- ;;

34835

- * )

34836

- # unfortunately, winepath doesn't convert pathlists

34837

- func_to_host_pathlist_result=""

34838

- func_to_host_pathlist_oldIFS=$IFS

34839

- IFS=:

34840

- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do

34841

- IFS=$func_to_host_pathlist_oldIFS

34842

- if test -n "$func_to_host_pathlist_f" ; then

34843

- func_to_host_path "$func_to_host_pathlist_f"

34844

- if test -n "$func_to_host_path_result" ; then

34845

- if test -z "$func_to_host_pathlist_result" ; then

34846

- func_to_host_pathlist_result="$func_to_host_path_result"

34847

- else

34848

- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"

34849

- fi

34850

- fi

34851

- fi

34852

- IFS=:

34853

- done

34854

- IFS=$func_to_host_pathlist_oldIFS

34855

- ;;

34856

- esac

34857

- if test -z "$func_to_host_pathlist_result" ; then

34858

- func_error "Could not determine the host path(s) corresponding to"

34859

- func_error " '$1'"

34860

- func_error "Continuing, but uninstalled executables may not work."

34861

- # Fallback. This may break if $1 contains DOS-style drive

34862

- # specifications. The fix is not to complicate the expression

34863

- # below, but for the user to provide a working wine installation

34864

- # with winepath so that path translation in the cross-to-mingw

34865

- # case works properly.

34866

- lt_replace_pathsep_nix_to_dos="s|:|;|g"

34867

- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\

34868

- $SED -e "$lt_replace_pathsep_nix_to_dos"`

34869

- fi

34870

- # Now, add the leading and trailing path separators back

34871

- case "$1" in

34872

- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"

34873

- ;;

34874

- esac

34875

- case "$1" in

34876

- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"

34877

- ;;

34878

- esac

34879

- ;;

34880

- esac

34881

+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2

34882

+ exit 1

34883

34884

+fi\

34885

34886

}

34887

-# end: func_to_host_pathlist

34888

38165

34889

38166

34890

# func_emit_cwrapperexe_src

38167

34891

# emit the source code for a wrapper executable on stdout

38168

@@ -2951,6 +3160,12 @@ EOF

34892

@@ -3141,31 +4141,23 @@ func_emit_cwrapperexe_src ()

34893

34894

This wrapper executable should never be moved out of the build directory.

34895

If it is, it will not operate correctly.

34896

34897

- Currently, it simply execs the wrapper *script* "$SHELL $output",

34898

- but could eventually absorb all of the scripts functionality and

34899

- exec $objdir/$outputname directly.

34900

34901

EOF

34902

cat <<"EOF"

34903

+#ifdef _MSC_VER

34904

+# define _CRT_SECURE_NO_DEPRECATE 1

34905

+#endif

34906

#include <stdio.h>

34907

#include <stdlib.h>

34908

#ifdef _MSC_VER

34909

# include <direct.h>

34910

# include <process.h>

34911

# include <io.h>

34912

-# define setmode _setmode

34913

#else

34914

# include <unistd.h>

38169

34915

# include <stdint.h>

38170

34916

# ifdef __CYGWIN__

38171

34917

# include <io.h>

38172

+# define HAVE_SETENV

38173

+# ifdef __STRICT_ANSI__

34918

-# define HAVE_SETENV

34919

-# ifdef __STRICT_ANSI__

34920

-char *realpath (const char *, char *);

34921

-int putenv (char *);

34922

-int setenv (const char *, const char *, int);

34923

-# endif

34924

# endif

34925

#endif

34926

#include <malloc.h>

34927

@@ -3177,6 +4169,44 @@ int setenv (const char *, const char *,

34928

#include <fcntl.h>

34929

#include <sys/stat.h>

34930

34931

+/* declarations of non-ANSI functions */

34932

+#if defined(__MINGW32__)

34933

+# ifdef __STRICT_ANSI__

34934

+int _putenv (const char *);

34935

+# endif

34936

+#elif defined(__CYGWIN__)

34937

+# ifdef __STRICT_ANSI__

38174

34938

+char *realpath (const char *, char *);

38175

34939

+int putenv (char *);

38176

34940

+int setenv (const char *, const char *, int);

38177

+# endif

38178

# endif

38179

#endif

38180

#include <malloc.h>

38181

@@ -3057,29 +3272,105 @@ int make_executable (const char *path);

34941

+# endif

34942

+/* #elif defined (other platforms) ... */

34943

+#endif

34944

34945

+/* portability defines, excluding path handling macros */

34946

+#if defined(_MSC_VER)

34947

+# define setmode _setmode

34948

+# define stat _stat

34949

+# define chmod _chmod

34950

+# define getcwd _getcwd

34951

+# define putenv _putenv

34952

+# define S_IXUSR _S_IEXEC

34953

+# ifndef _INTPTR_T_DEFINED

34954

+# define _INTPTR_T_DEFINED

34955

+# define intptr_t int

34956

+# endif

34957

+#elif defined(__MINGW32__)

34958

+# define setmode _setmode

34959

+# define stat _stat

34960

+# define chmod _chmod

34961

+# define getcwd _getcwd

34962

+# define putenv _putenv

34963

+#elif defined(__CYGWIN__)

34964

+# define HAVE_SETENV

34965

+# define FOPEN_WB "wb"

34966

+/* #elif defined (other platforms) ... */

34967

+#endif

34968

34969

#if defined(PATH_MAX)

34970

# define LT_PATHMAX PATH_MAX

34971

#elif defined(MAXPATHLEN)

34972

@@ -3192,14 +4222,7 @@ int setenv (const char *, const char *,

34973

# define S_IXGRP 0

34974

#endif

34975

34976

-#ifdef _MSC_VER

34977

-# define S_IXUSR _S_IEXEC

34978

-# define stat _stat

34979

-# ifndef _INTPTR_T_DEFINED

34980

-# define intptr_t int

34981

-# endif

34982

-#endif

34983

34984

+/* path handling portability macros */

34985

#ifndef DIR_SEPARATOR

34986

# define DIR_SEPARATOR '/'

34987

# define PATH_SEPARATOR ':'

34988

@@ -3230,10 +4253,6 @@ int setenv (const char *, const char *,

34989

# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)

34990

#endif /* PATH_SEPARATOR_2 */

34991

34992

-#ifdef __CYGWIN__

34993

-# define FOPEN_WB "wb"

34994

-#endif

34995

34996

#ifndef FOPEN_WB

34997

# define FOPEN_WB "w"

34998

#endif

34999

@@ -3246,22 +4265,13 @@ int setenv (const char *, const char *,

35000

if (stale) { free ((void *) stale); stale = 0; } \

35001

} while (0)

35002

35003

-#undef LTWRAPPER_DEBUGPRINTF

35004

-#if defined DEBUGWRAPPER

35005

-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args

35006

-static void

35007

-ltwrapper_debugprintf (const char *fmt, ...)

35008

35009

- va_list args;

35010

- va_start (args, fmt);

35011

- (void) vfprintf (stderr, fmt, args);

35012

- va_end (args);

35013

35014

+#if defined(LT_DEBUGWRAPPER)

35015

+static int lt_debug = 1;

35016

#else

35017

-# define LTWRAPPER_DEBUGPRINTF(args)

35018

+static int lt_debug = 0;

35019

#endif

35020

35021

-const char *program_name = NULL;

35022

+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */

35023

35024

void *xmalloc (size_t num);

35025

char *xstrdup (const char *string);

35026

@@ -3271,41 +4281,27 @@ char *chase_symlinks (const char *pathsp

35027

int make_executable (const char *path);

38182

35028

int check_executable (const char *path);

38183

35029

char *strendzap (char *str, const char *pat);

38184

void lt_fatal (const char *message, ...);

38185

+void lt_setenv (const char *name, const char *value);

38186

+char *lt_extend_str (const char *orig_value, const char *add, int to_end);

38187

+void lt_opt_process_env_set (const char *arg);

38188

+void lt_opt_process_env_prepend (const char *arg);

38189

+void lt_opt_process_env_append (const char *arg);

38190

+int lt_split_name_value (const char *arg, char** name, char** value);

38191

+void lt_update_exe_path (const char *name, const char *value);

38192

+void lt_update_lib_path (const char *name, const char *value);

38193

38194

-static const char *script_text =

38195

+static const char *script_text_part1 =

35030

-void lt_fatal (const char *message, ...);

35031

+void lt_debugprintf (const char *file, int line, const char *fmt, ...);

35032

+void lt_fatal (const char *file, int line, const char *message, ...);

35033

+static const char *nonnull (const char *s);

35034

+static const char *nonempty (const char *s);

35035

void lt_setenv (const char *name, const char *value);

35036

char *lt_extend_str (const char *orig_value, const char *add, int to_end);

35037

-void lt_opt_process_env_set (const char *arg);

35038

-void lt_opt_process_env_prepend (const char *arg);

35039

-void lt_opt_process_env_append (const char *arg);

35040

-int lt_split_name_value (const char *arg, char** name, char** value);

35041

void lt_update_exe_path (const char *name, const char *value);

35042

void lt_update_lib_path (const char *name, const char *value);

35043

35044

-static const char *script_text_part1 =

35045

-EOF

35046

35047

- func_emit_wrapper_part1 yes |

35048

- $SED -e 's/$[\\"]$/\\\1/g' \

35049

- -e 's/^/ "/' -e 's/$/\\n"/'

35050

- echo ";"

35051

- cat <<EOF

35052

35053

-static const char *script_text_part2 =

35054

+char **prepare_spawn (char **argv);

35055

+void lt_dump_script (FILE *f);

38196

35056

EOF

38197

38198

- func_emit_wrapper yes |

38199

+ func_emit_wrapper_part1 yes |

38200

+ $SED -e 's/$[\\"]$/\\\1/g' \

38201

+ -e 's/^/ "/' -e 's/$/\\n"/'

38202

+ echo ";"

38203

+ cat <<EOF

38204

38205

+static const char *script_text_part2 =

38206

+EOF

38207

+ func_emit_wrapper_part2 yes |

38208

$SED -e 's/$[\\"]$/\\\1/g' \

38209

-e 's/^/ "/' -e 's/$/\\n"/'

38210

echo ";"

35057

- func_emit_wrapper_part2 yes |

35058

- $SED -e 's/$[\\"]$/\\\1/g' \

35059

- -e 's/^/ "/' -e 's/$/\\n"/'

35060

- echo ";"

38211

35061

38212

35062

cat <<EOF

38213

const char * MAGIC_EXE = "$magic_exe";

38214

+const char * LIB_PATH_VARNAME = "$shlibpath_var";

38215

+EOF

38216

38217

+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then

38218

+ func_to_host_pathlist "$temp_rpath"

38219

+ cat <<EOF

38220

+const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";

38221

+EOF

38222

+ else

38223

+ cat <<"EOF"

38224

+const char * LIB_PATH_VALUE = "";

38225

+EOF

38226

+ fi

38227

38228

+ if test -n "$dllsearchpath"; then

38229

+ func_to_host_pathlist "$dllsearchpath:"

38230

+ cat <<EOF

38231

+const char * EXE_PATH_VARNAME = "PATH";

38232

+const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";

38233

+EOF

38234

+ else

38235

+ cat <<"EOF"

38236

+const char * EXE_PATH_VARNAME = "";

38237

+const char * EXE_PATH_VALUE = "";

38238

+EOF

38239

+ fi

38240

38241

+ if test "$fast_install" = yes; then

38242

+ cat <<EOF

38243

+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */

38244

+EOF

38245

+ else

38246

+ cat <<EOF

38247

+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */

38248

+EOF

38249

+ fi

38250

38251

38252

+ cat <<"EOF"

38253

38254

+#define LTWRAPPER_OPTION_PREFIX "--lt-"

38255

+#define LTWRAPPER_OPTION_PREFIX_LENGTH 5

38256

38257

+static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;

38258

+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;

38259

38260

+static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";

38261

38262

+static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;

38263

+static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";

38264

+ /* argument is putenv-style "foo=bar", value of foo is set to bar */

38265

38266

+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;

38267

+static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";

38268

+ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */

38269

38270

+static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;

38271

+static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";

38272

+ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */

35063

-const char * MAGIC_EXE = "$magic_exe";

35064

+volatile const char * MAGIC_EXE = "$magic_exe";

35065

const char * LIB_PATH_VARNAME = "$shlibpath_var";

35066

EOF

35067

35068

if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then

35069

- func_to_host_pathlist "$temp_rpath"

35070

+ func_to_host_path "$temp_rpath"

35071

cat <<EOF

35072

-const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";

35073

+const char * LIB_PATH_VALUE = "$func_to_host_path_result";

35074

EOF

35075

else

35076

cat <<"EOF"

35077

@@ -3314,10 +4310,10 @@ EOF

35078

35079

35080

if test -n "$dllsearchpath"; then

35081

- func_to_host_pathlist "$dllsearchpath:"

35082

+ func_to_host_path "$dllsearchpath:"

35083

cat <<EOF

35084

const char * EXE_PATH_VARNAME = "PATH";

35085

-const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";

35086

+const char * EXE_PATH_VALUE = "$func_to_host_path_result";

35087

EOF

35088

else

35089

cat <<"EOF"

35090

@@ -3340,24 +4336,10 @@ EOF

35091

cat <<"EOF"

35092

35093

#define LTWRAPPER_OPTION_PREFIX "--lt-"

35094

-#define LTWRAPPER_OPTION_PREFIX_LENGTH 5

35095

35096

-static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;

35097

static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;

35098

35099

static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";

35100

35101

-static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;

35102

-static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";

35103

- /* argument is putenv-style "foo=bar", value of foo is set to bar */

35104

35105

-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;

35106

-static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";

35107

- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */

35108

35109

-static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;

35110

-static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";

35111

- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */

35112

+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";

38273

35113

38274

35114

int

38275

35115

main (int argc, char *argv[])

38276

{

38277

char **newargz;

38278

+ int newargc;

38279

char *tmp_pathspec;

38280

char *actual_cwrapper_path;

38281

- char *shwrapper_name;

38282

+ char *actual_cwrapper_name;

38283

+ char *target_name;

38284

+ char *lt_argv_zero;

38285

intptr_t rval = 127;

38286

- FILE *shwrapper;

38287

38288

- const char *dumpscript_opt = "--lt-dump-script";

35116

@@ -3374,10 +4356,13 @@ main (int argc, char *argv[])

38289

35117

int i;

38290

35118

38291

35119

program_name = (char *) xstrdup (base_name (argv[0]));

38292

@@ -3099,38 +3390,14 @@ EOF

38293

;;

38294

esac

38295

38296

- cat <<EOF

38297

- printf ("%s", script_text);

38298

+ cat <<"EOF"

38299

+ printf ("%s", script_text_part1);

38300

+ printf ("%s", script_text_part2);

38301

return 0;

38302

}

38303

}

38304

38305

- newargz = XMALLOC (char *, argc + 2);

38306

-EOF

38307

38308

- if test -n "$TARGETSHELL" ; then

38309

- # no path translation at all

38310

- lt_newargv0=$TARGETSHELL

38311

- else

38312

- case "$host" in

38313

- *mingw* )

38314

- # awkward: cmd appends spaces to result

38315

- lt_sed_strip_trailing_spaces="s/[ ]*\$//"

38316

- lt_newargv0=`( cmd //c echo $SHELL | $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo $SHELL`

38317

- case $lt_newargv0 in

38318

- *.exe | *.EXE) ;;

38319

- *) lt_newargv0=$lt_newargv0.exe ;;

38320

- esac

38321

- ;;

38322

- * ) lt_newargv0=$SHELL ;;

38323

- esac

38324

- fi

38325

38326

- cat <<EOF

38327

- newargz[0] = (char *) xstrdup ("$lt_newargv0");

38328

-EOF

38329

38330

- cat <<"EOF"

35120

- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));

35121

- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));

38331

35122

+ newargz = XMALLOC (char *, argc + 1);

38332

tmp_pathspec = find_executable (argv[0]);

38333

if (tmp_pathspec == NULL)

38334

lt_fatal ("Couldn't find %s", argv[0]);

38335

@@ -3142,39 +3409,60 @@ EOF

38336

actual_cwrapper_path));

38337

XFREE (tmp_pathspec);

38338

38339

- shwrapper_name = (char *) xstrdup (base_name (actual_cwrapper_path));

38340

- strendzap (actual_cwrapper_path, shwrapper_name);

38341

+ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));

38342

+ strendzap (actual_cwrapper_path, actual_cwrapper_name);

38343

38344

- /* shwrapper_name transforms */

38345

- strendzap (shwrapper_name, ".exe");

38346

- tmp_pathspec = XMALLOC (char, (strlen (shwrapper_name) +

38347

- strlen ("_ltshwrapperTMP") + 1));

38348

- strcpy (tmp_pathspec, shwrapper_name);

38349

- strcat (tmp_pathspec, "_ltshwrapperTMP");

38350

- XFREE (shwrapper_name);

38351

- shwrapper_name = tmp_pathspec;

38352

+ /* wrapper name transforms */

38353

+ strendzap (actual_cwrapper_name, ".exe");

38354

+ tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);

38355

+ XFREE (actual_cwrapper_name);

38356

+ actual_cwrapper_name = tmp_pathspec;

38357

tmp_pathspec = 0;

38358

- LTWRAPPER_DEBUGPRINTF (("(main) libtool shell wrapper name: %s\n",

38359

- shwrapper_name));

38360

38361

+ /* target_name transforms -- use actual target program name; might have lt- prefix */

38362

+ target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));

38363

+ strendzap (target_name, ".exe");

38364

+ tmp_pathspec = lt_extend_str (target_name, ".exe", 1);

38365

+ XFREE (target_name);

38366

+ target_name = tmp_pathspec;

38367

+ tmp_pathspec = 0;

38368

38369

+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",

38370

+ target_name));

38371

EOF

38372

38373

cat <<EOF

38374

- newargz[1] =

38375

+ newargz[0] =

38376

XMALLOC (char, (strlen (actual_cwrapper_path) +

38377

- strlen ("$objdir") + 1 + strlen (shwrapper_name) + 1));

38378

- strcpy (newargz[1], actual_cwrapper_path);

38379

- strcat (newargz[1], "$objdir");

38380

- strcat (newargz[1], "/");

38381

- strcat (newargz[1], shwrapper_name);

38382

+ strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));

38383

+ strcpy (newargz[0], actual_cwrapper_path);

38384

+ strcat (newargz[0], "$objdir");

38385

+ strcat (newargz[0], "/");

38386

EOF

38387

38388

+ cat <<"EOF"

38389

+ /* stop here, and copy so we don't have to do this twice */

38390

+ tmp_pathspec = xstrdup (newargz[0]);

38391

38392

+ /* do NOT want the lt- prefix here, so use actual_cwrapper_name */

38393

+ strcat (newargz[0], actual_cwrapper_name);

38394

38395

+ /* DO want the lt- prefix here if it exists, so use target_name */

38396

+ lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);

38397

+ XFREE (tmp_pathspec);

38398

+ tmp_pathspec = NULL;

38399

+EOF

38400

38401

case $host_os in

38402

mingw*)

38403

cat <<"EOF"

38404

{

38405

char* p;

38406

- while ((p = strchr (newargz[1], '\\')) != NULL)

38407

+ while ((p = strchr (newargz[0], '\\')) != NULL)

38408

+ {

38409

+ *p = '/';

38410

+ }

38411

+ while ((p = strchr (lt_argv_zero, '\\')) != NULL)

38412

{

38413

*p = '/';

38414

}

38415

@@ -3184,55 +3472,114 @@ EOF

38416

esac

38417

38418

cat <<"EOF"

38419

- XFREE (shwrapper_name);

38420

+ XFREE (target_name);

38421

XFREE (actual_cwrapper_path);

38422

+ XFREE (actual_cwrapper_name);

38423

38424

- /* always write in binary mode */

38425

- if ((shwrapper = fopen (newargz[1], FOPEN_WB)) == 0)

38426

- {

38427

- lt_fatal ("Could not open %s for writing", newargz[1]);

38428

- }

38429

- fprintf (shwrapper, "%s", script_text);

38430

- fclose (shwrapper);

38431

38432

- make_executable (newargz[1]);

38433

+ lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */

38434

+ lt_setenv ("DUALCASE", "1"); /* for MSK sh */

38435

+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);

38436

+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);

38437

35123

35124

- /* very simple arg parsing; don't want to rely on getopt */

35125

+ /* very simple arg parsing; don't want to rely on getopt

35126

+ * also, copy all non cwrapper options to newargz, except

35127

+ * argz[0], which is handled differently

35128

+ */

38438

35129

+ newargc=0;

38439

35130

for (i = 1; i < argc; i++)

38440

- newargz[i + 1] = xstrdup (argv[i]);

38441

- newargz[argc + 1] = NULL;

38442

+ {

38443

+ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)

38444

+ {

38445

+ if (argv[i][env_set_opt_len] == '=')

38446

+ {

38447

+ const char *p = argv[i] + env_set_opt_len + 1;

38448

+ lt_opt_process_env_set (p);

38449

+ }

38450

+ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)

38451

+ {

38452

+ lt_opt_process_env_set (argv[++i]); /* don't copy */

38453

+ }

38454

+ else

38455

+ lt_fatal ("%s missing required argument", env_set_opt);

38456

+ continue;

38457

+ }

38458

+ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)

38459

+ {

38460

+ if (argv[i][env_prepend_opt_len] == '=')

38461

+ {

38462

+ const char *p = argv[i] + env_prepend_opt_len + 1;

38463

+ lt_opt_process_env_prepend (p);

38464

+ }

38465

+ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)

38466

+ {

38467

+ lt_opt_process_env_prepend (argv[++i]); /* don't copy */

38468

+ }

38469

+ else

38470

+ lt_fatal ("%s missing required argument", env_prepend_opt);

38471

+ continue;

38472

+ }

38473

+ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)

38474

+ {

38475

+ if (argv[i][env_append_opt_len] == '=')

38476

+ {

38477

+ const char *p = argv[i] + env_append_opt_len + 1;

38478

+ lt_opt_process_env_append (p);

38479

+ }

38480

+ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)

38481

+ {

38482

+ lt_opt_process_env_append (argv[++i]); /* don't copy */

38483

+ }

38484

+ else

38485

+ lt_fatal ("%s missing required argument", env_append_opt);

38486

+ continue;

38487

+ }

38488

+ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)

35131

{

35132

if (strcmp (argv[i], dumpscript_opt) == 0)

35133

@@ -3391,25 +4376,57 @@ EOF

35134

esac

35135

35136

cat <<"EOF"

35137

- printf ("%s", script_text_part1);

35138

- printf ("%s", script_text_part2);

35139

+ lt_dump_script (stdout);

35140

return 0;

35141

}

35142

+ if (strcmp (argv[i], debug_opt) == 0)

35143

+ {

35144

+ lt_debug = 1;

35145

+ continue;

35146

+ }

35147

+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0)

38489

35148

+ {

38490

35149

+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX

38491

35150

+ namespace, but it is not one of the ones we know about and

38496

35155

+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option

38497

35156

+ or a configure.ac-settable value.

38498

35157

+ */

38499

+ lt_fatal ("Unrecognized option in %s namespace: '%s'",

35158

+ lt_fatal (__FILE__, __LINE__,

35159

+ "unrecognized %s option: '%s'",

38500

35160

+ ltwrapper_option_prefix, argv[i]);

38501

35161

+ }

38502

35162

+ /* otherwise ... */

38503

35163

+ newargz[++newargc] = xstrdup (argv[i]);

38504

+ }

35164

}

38505

35165

+ newargz[++newargc] = NULL;

38506

38507

- for (i = 0; i < argc + 1; i++)

38508

+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));

38509

+ for (i = 0; i < newargc; i++)

35166

35167

+EOF

35168

+ cat <<EOF

35169

+ /* The GNU banner must be the first non-error debug message */

35170

+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");

35171

+EOF

35172

+ cat <<"EOF"

35173

+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);

35174

+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);

35175

35176

- newargz = XMALLOC (char *, argc + 1);

35177

tmp_pathspec = find_executable (argv[0]);

35178

if (tmp_pathspec == NULL)

35179

- lt_fatal ("Couldn't find %s", argv[0]);

35180

- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",

35181

- tmp_pathspec));

35182

+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);

35183

+ lt_debugprintf (__FILE__, __LINE__,

35184

+ "(main) found exe (before symlink chase) at: %s\n",

35185

+ tmp_pathspec);

35186

35187

actual_cwrapper_path = chase_symlinks (tmp_pathspec);

35188

- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",

35189

- actual_cwrapper_path));

35190

+ lt_debugprintf (__FILE__, __LINE__,

35191

+ "(main) found exe (after symlink chase) at: %s\n",

35192

+ actual_cwrapper_path);

35193

XFREE (tmp_pathspec);

35194

35195

- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));

35196

+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));

35197

strendzap (actual_cwrapper_path, actual_cwrapper_name);

35198

35199

/* wrapper name transforms */

35200

@@ -3427,8 +4444,9 @@ EOF

35201

target_name = tmp_pathspec;

35202

tmp_pathspec = 0;

35203

35204

- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",

35205

- target_name));

35206

+ lt_debugprintf (__FILE__, __LINE__,

35207

+ "(main) libtool target name: %s\n",

35208

+ target_name);

35209

EOF

35210

35211

cat <<EOF

35212

@@ -3478,80 +4496,19 @@ EOF

35213

35214

lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */

35215

lt_setenv ("DUALCASE", "1"); /* for MSK sh */

35216

- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);

35217

+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must

35218

+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)

35219

+ because on Windows, both *_VARNAMEs are PATH but uninstalled

35220

+ libraries must come first. */

35221

lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);

35222

+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);

35223

35224

- newargc=0;

35225

- for (i = 1; i < argc; i++)

35226

- {

35227

- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)

35228

- {

35229

- if (argv[i][env_set_opt_len] == '=')

35230

- {

35231

- const char *p = argv[i] + env_set_opt_len + 1;

35232

- lt_opt_process_env_set (p);

35233

- }

35234

- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)

35235

- {

35236

- lt_opt_process_env_set (argv[++i]); /* don't copy */

35237

- }

35238

- else

35239

- lt_fatal ("%s missing required argument", env_set_opt);

35240

- continue;

35241

- }

35242

- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)

35243

- {

35244

- if (argv[i][env_prepend_opt_len] == '=')

35245

- {

35246

- const char *p = argv[i] + env_prepend_opt_len + 1;

35247

- lt_opt_process_env_prepend (p);

35248

- }

35249

- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)

35250

- {

35251

- lt_opt_process_env_prepend (argv[++i]); /* don't copy */

35252

- }

35253

- else

35254

- lt_fatal ("%s missing required argument", env_prepend_opt);

35255

- continue;

35256

- }

35257

- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)

35258

- {

35259

- if (argv[i][env_append_opt_len] == '=')

35260

- {

35261

- const char *p = argv[i] + env_append_opt_len + 1;

35262

- lt_opt_process_env_append (p);

35263

- }

35264

- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)

35265

- {

35266

- lt_opt_process_env_append (argv[++i]); /* don't copy */

35267

- }

35268

- else

35269

- lt_fatal ("%s missing required argument", env_append_opt);

35270

- continue;

35271

- }

35272

- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)

35273

- {

35274

- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX

35275

- namespace, but it is not one of the ones we know about and

35276

- have already dealt with, above (inluding dump-script), then

35277

- report an error. Otherwise, targets might begin to believe

35278

- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX

35279

- namespace. The first time any user complains about this, we'll

35280

- need to make LTWRAPPER_OPTION_PREFIX a configure-time option

35281

- or a configure.ac-settable value.

35282

- */

35283

- lt_fatal ("Unrecognized option in %s namespace: '%s'",

35284

- ltwrapper_option_prefix, argv[i]);

35285

- }

35286

- /* otherwise ... */

35287

- newargz[++newargc] = xstrdup (argv[i]);

35288

- }

35289

- newargz[++newargc] = NULL;

35290

35291

- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));

35292

+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",

35293

+ nonnull (lt_argv_zero));

35294

for (i = 0; i < newargc; i++)

38510

35295

{

38511

- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, newargz[i]));

38512

+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));

35296

- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));

35297

+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",

35298

+ i, nonnull (newargz[i]));

38513

35299

}

38514

35300

38515

35301

EOF

38516

38517

case $host_os in

35302

@@ -3560,11 +4517,14 @@ EOF

38518

35303

mingw*)

38519

- cat <<EOF

38520

+ cat <<"EOF"

35304

cat <<"EOF"

38521

35305

/* execv doesn't actually work on mingw as expected on unix */

38522

- rval = _spawnv (_P_WAIT, "$lt_newargv0", (const char * const *) newargz);

38523

+ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);

35306

+ newargz = prepare_spawn (newargz);

35307

rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);

38524

35308

if (rval == -1)

38525

35309

{

38526

35310

/* failed to start process */

38527

- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"$lt_newargv0\": errno = %d\n", errno));

38528

+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));

35311

- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));

35312

+ lt_debugprintf (__FILE__, __LINE__,

35313

+ "(main) failed to launch target \"%s\": %s\n",

35314

+ lt_argv_zero, nonnull (strerror (errno)));

38529

35315

return 127;

38530

35316

}

38531

35317

return rval;

38532

38533

EOF

38534

;;

38535

38536

- cat <<EOF

38537

- execv ("$lt_newargv0", newargz);

38538

+ cat <<"EOF"

38539

+ execv (lt_argv_zero, newargz);

38540

return rval; /* =127, but avoids unused variable warning */

38541

38542

EOF

38543

;;

38544

esac

38545

38546

cat <<"EOF"

35318

@@ -3586,7 +4546,7 @@ xmalloc (size_t num)

35319

{

35320

void *p = (void *) malloc (num);

35321

if (!p)

35322

- lt_fatal ("Memory exhausted");

35323

+ lt_fatal (__FILE__, __LINE__, "memory exhausted");

35324

35325

return p;

35326

}

35327

@@ -3620,8 +4580,8 @@ check_executable (const char *path)

35328

{

35329

struct stat st;

35330

35331

- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",

35332

- path ? (*path ? path : "EMPTY!") : "NULL!"));

35333

+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",

35334

+ nonempty (path));

35335

if ((!path) || (!*path))

35336

return 0;

35337

35338

@@ -3638,8 +4598,8 @@ make_executable (const char *path)

35339

int rval = 0;

35340

struct stat st;

35341

35342

- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",

35343

- path ? (*path ? path : "EMPTY!") : "NULL!"));

35344

+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",

35345

+ nonempty (path));

35346

if ((!path) || (!*path))

35347

return 0;

35348

35349

@@ -3665,8 +4625,8 @@ find_executable (const char *wrapper)

35350

int tmp_len;

35351

char *concat_name;

35352

35353

- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",

35354

- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));

35355

+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",

35356

+ nonempty (wrapper));

35357

35358

if ((wrapper == NULL) || (*wrapper == '\0'))

35359

return NULL;

35360

@@ -3719,7 +4679,8 @@ find_executable (const char *wrapper)

35361

{

35362

/* empty path: current directory */

35363

if (getcwd (tmp, LT_PATHMAX) == NULL)

35364

- lt_fatal ("getcwd failed");

35365

+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",

35366

+ nonnull (strerror (errno)));

35367

tmp_len = strlen (tmp);

35368

concat_name =

35369

XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);

35370

@@ -3744,7 +4705,8 @@ find_executable (const char *wrapper)

35371

}

35372

/* Relative path | not found in path: prepend cwd */

35373

if (getcwd (tmp, LT_PATHMAX) == NULL)

35374

- lt_fatal ("getcwd failed");

35375

+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",

35376

+ nonnull (strerror (errno)));

35377

tmp_len = strlen (tmp);

35378

concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);

35379

memcpy (concat_name, tmp, tmp_len);

35380

@@ -3770,8 +4732,9 @@ chase_symlinks (const char *pathspec)

35381

int has_symlinks = 0;

35382

while (strlen (tmp_pathspec) && !has_symlinks)

35383

{

35384

- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",

35385

- tmp_pathspec));

35386

+ lt_debugprintf (__FILE__, __LINE__,

35387

+ "checking path component for symlinks: %s\n",

35388

+ tmp_pathspec);

35389

if (lstat (tmp_pathspec, &s) == 0)

35390

{

35391

if (S_ISLNK (s.st_mode) != 0)

35392

@@ -3793,8 +4756,9 @@ chase_symlinks (const char *pathspec)

35393

}

35394

else

35395

{

35396

- char *errstr = strerror (errno);

35397

- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);

35398

+ lt_fatal (__FILE__, __LINE__,

35399

+ "error accessing file \"%s\": %s",

35400

+ tmp_pathspec, nonnull (strerror (errno)));

35401

}

35402

}

35403

XFREE (tmp_pathspec);

35404

@@ -3807,7 +4771,8 @@ chase_symlinks (const char *pathspec)

35405

tmp_pathspec = realpath (pathspec, buf);

35406

if (tmp_pathspec == 0)

35407

{

35408

- lt_fatal ("Could not follow symlinks for %s", pathspec);

35409

+ lt_fatal (__FILE__, __LINE__,

35410

+ "could not follow symlinks for %s", pathspec);

35411

}

35412

return xstrdup (tmp_pathspec);

35413

#endif

35414

@@ -3833,11 +4798,25 @@ strendzap (char *str, const char *pat)

35415

return str;

35416

}

35417

35418

+void

35419

+lt_debugprintf (const char *file, int line, const char *fmt, ...)

35420

35421

+ va_list args;

35422

+ if (lt_debug)

35423

+ {

35424

+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);

35425

+ va_start (args, fmt);

35426

+ (void) vfprintf (stderr, fmt, args);

35427

+ va_end (args);

35428

+ }

38547

35429

38548

38549

void *

38550

xmalloc (size_t num)

38551

@@ -3506,6 +3853,177 @@ lt_fatal (const char *message, ...)

38552

lt_error_core (EXIT_FAILURE, "FATAL", message, ap);

35430

35431

static void

35432

-lt_error_core (int exit_status, const char *mode,

35433

+lt_error_core (int exit_status, const char *file,

35434

+ int line, const char *mode,

35435

const char *message, va_list ap)

35436

{

35437

- fprintf (stderr, "%s: %s: ", program_name, mode);

35438

+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);

35439

vfprintf (stderr, message, ap);

35440

fprintf (stderr, ".\n");

35441

35442

@@ -3846,20 +4825,32 @@ lt_error_core (int exit_status, const ch

35443

}

35444

35445

void

35446

-lt_fatal (const char *message, ...)

35447

+lt_fatal (const char *file, int line, const char *message, ...)

35448

{

35449

va_list ap;

35450

va_start (ap, message);

35451

- lt_error_core (EXIT_FAILURE, "FATAL", message, ap);

35452

+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);

38553

35453

va_end (ap);

38554

35454

}

38555

38556

+void

38557

+lt_setenv (const char *name, const char *value)

38558

38559

+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",

38560

+ (name ? name : "<NULL>"),

38561

+ (value ? value : "<NULL>")));

38562

+ {

38563

+#ifdef HAVE_SETENV

38564

+ /* always make a copy, for consistency with !HAVE_SETENV */

38565

+ char *str = xstrdup (value);

38566

+ setenv (name, str, 1);

38567

+#else

38568

+ int len = strlen (name) + 1 + strlen (value) + 1;

38569

+ char *str = XMALLOC (char, len);

38570

+ sprintf (str, "%s=%s", name, value);

38571

+ if (putenv (str) != EXIT_SUCCESS)

38572

+ {

38573

+ XFREE (str);

38574

+ }

38575

+#endif

38576

+ }

38577

38578

38579

+char *

38580

+lt_extend_str (const char *orig_value, const char *add, int to_end)

38581

38582

+ char *new_value;

38583

+ if (orig_value && *orig_value)

35455

35456

+static const char *

35457

+nonnull (const char *s)

35458

35459

+ return s ? s : "(null)";

35460

35461

35462

+static const char *

35463

+nonempty (const char *s)

35464

35465

+ return (s && !*s) ? "(empty)" : nonnull (s);

35466

35467

35468

void

35469

lt_setenv (const char *name, const char *value)

35470

{

35471

- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",

35472

- (name ? name : "<NULL>"),

35473

- (value ? value : "<NULL>")));

35474

+ lt_debugprintf (__FILE__, __LINE__,

35475

+ "(lt_setenv) setting '%s' to '%s'\n",

35476

+ nonnull (name), nonnull (value));

35477

{

35478

#ifdef HAVE_SETENV

35479

/* always make a copy, for consistency with !HAVE_SETENV */

35480

@@ -3904,95 +4895,12 @@ lt_extend_str (const char *orig_value, c

35481

return new_value;

35482

}

35483

35484

-int

35485

-lt_split_name_value (const char *arg, char** name, char** value)

35486

35487

- const char *p;

35488

- int len;

35489

- if (!arg || !*arg)

35490

- return 1;

35491

35492

- p = strchr (arg, (int)'=');

35493

35494

- if (!p)

35495

- return 1;

35496

35497

- *value = xstrdup (++p);

35498

35499

- len = strlen (arg) - strlen (*value);

35500

- *name = XMALLOC (char, len);

35501

- strncpy (*name, arg, len-1);

35502

- (*name)[len - 1] = '\0';

35503

35504

- return 0;

35505

35506

35507

-void

35508

-lt_opt_process_env_set (const char *arg)

35509

35510

- char *name = NULL;

35511

- char *value = NULL;

35512

35513

- if (lt_split_name_value (arg, &name, &value) != 0)

35514

- {

35515

- XFREE (name);

35516

- XFREE (value);

35517

- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);

35518

- }

35519

35520

- lt_setenv (name, value);

35521

- XFREE (name);

35522

- XFREE (value);

35523

35524

35525

-void

35526

-lt_opt_process_env_prepend (const char *arg)

35527

35528

- char *name = NULL;

35529

- char *value = NULL;

35530

- char *new_value = NULL;

35531

35532

- if (lt_split_name_value (arg, &name, &value) != 0)

35533

- {

35534

- XFREE (name);

35535

- XFREE (value);

35536

- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);

35537

- }

35538

35539

- new_value = lt_extend_str (getenv (name), value, 0);

35540

- lt_setenv (name, new_value);

35541

- XFREE (new_value);

35542

- XFREE (name);

35543

- XFREE (value);

35544

35545

35546

-void

35547

-lt_opt_process_env_append (const char *arg)

35548

35549

- char *name = NULL;

35550

- char *value = NULL;

35551

- char *new_value = NULL;

35552

35553

- if (lt_split_name_value (arg, &name, &value) != 0)

35554

- {

35555

- XFREE (name);

35556

- XFREE (value);

35557

- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);

35558

- }

35559

35560

- new_value = lt_extend_str (getenv (name), value, 1);

35561

- lt_setenv (name, new_value);

35562

- XFREE (new_value);

35563

- XFREE (name);

35564

- XFREE (value);

35565

35566

35567

void

35568

lt_update_exe_path (const char *name, const char *value)

35569

{

35570

- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",

35571

- (name ? name : "<NULL>"),

35572

- (value ? value : "<NULL>")));

35573

+ lt_debugprintf (__FILE__, __LINE__,

35574

+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",

35575

+ nonnull (name), nonnull (value));

35576

35577

if (name && *name && value && *value)

35578

{

35579

@@ -4011,9 +4919,9 @@ lt_update_exe_path (const char *name, co

35580

void

35581

lt_update_lib_path (const char *name, const char *value)

35582

{

35583

- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",

35584

- (name ? name : "<NULL>"),

35585

- (value ? value : "<NULL>")));

35586

+ lt_debugprintf (__FILE__, __LINE__,

35587

+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",

35588

+ nonnull (name), nonnull (value));

35589

35590

if (name && *name && value && *value)

35591

{

35592

@@ -4023,11 +4931,152 @@ lt_update_lib_path (const char *name, co

35593

}

35594

}

35595

35596

+EOF

35597

+ case $host_os in

35598

+ mingw*)

35599

+ cat <<"EOF"

35600

35601

+/* Prepares an argument vector before calling spawn().

35602

+ Note that spawn() does not by itself call the command interpreter

35603

+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :

35604

+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);

35605

+ GetVersionEx(&v);

35606

+ v.dwPlatformId == VER_PLATFORM_WIN32_NT;

35607

+ }) ? "cmd.exe" : "command.com").

35608

+ Instead it simply concatenates the arguments, separated by ' ', and calls

35609

+ CreateProcess(). We must quote the arguments since Win32 CreateProcess()

35610

+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a

35611

+ special way:

35612

+ - Space and tab are interpreted as delimiters. They are not treated as

35613

+ delimiters if they are surrounded by double quotes: "...".

35614

+ - Unescaped double quotes are removed from the input. Their only effect is

35615

+ that within double quotes, space and tab are treated like normal

35616

+ characters.

35617

+ - Backslashes not followed by double quotes are not special.

35618

+ - But 2*n+1 backslashes followed by a double quote become

35619

+ n backslashes followed by a double quote (n >= 0):

35620

+ \" -> "

35621

+ \\\" -> \"

35622

+ \\\\\" -> \\"

35623

+ */

35624

+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"

35625

+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"

35626

+char **

35627

+prepare_spawn (char **argv)

35628

35629

+ size_t argc;

35630

+ char **new_argv;

35631

+ size_t i;

35632

35633

+ /* Count number of arguments. */

35634

+ for (argc = 0; argv[argc] != NULL; argc++)

35635

+ ;

35636

35637

+ /* Allocate new argument vector. */

35638

+ new_argv = XMALLOC (char *, argc + 1);

35639

35640

+ /* Put quoted arguments into the new argument vector. */

35641

+ for (i = 0; i < argc; i++)

38584

35642

+ {

38585

+ int orig_value_len = strlen (orig_value);

38586

+ int add_len = strlen (add);

38587

+ new_value = XMALLOC (char, add_len + orig_value_len + 1);

38588

+ if (to_end)

38589

+ {

38590

+ strcpy (new_value, orig_value);

38591

+ strcpy (new_value + orig_value_len, add);

38592

+ }

35643

+ const char *string = argv[i];

35644

35645

+ if (string[0] == '\0')

35646

+ new_argv[i] = xstrdup ("\"\"");

35647

+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)

35648

+ {

35649

+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);

35650

+ size_t length;

35651

+ unsigned int backslashes;

35652

+ const char *s;

35653

+ char *quoted_string;

35654

+ char *p;

35655

35656

+ length = 0;

35657

+ backslashes = 0;

35658

+ if (quote_around)

35659

+ length++;

35660

+ for (s = string; *s != '\0'; s++)

35661

+ {

35662

+ char c = *s;

35663

+ if (c == '"')

35664

+ length += backslashes + 1;

35665

+ length++;

35666

+ if (c == '\\')

35667

+ backslashes++;

35668

+ else

35669

+ backslashes = 0;

35670

+ }

35671

+ if (quote_around)

35672

+ length += backslashes + 1;

35673

35674

+ quoted_string = XMALLOC (char, length + 1);

35675

35676

+ p = quoted_string;

35677

+ backslashes = 0;

35678

+ if (quote_around)

35679

+ *p++ = '"';

35680

+ for (s = string; *s != '\0'; s++)

35681

+ {

35682

+ char c = *s;

35683

+ if (c == '"')

35684

+ {

35685

+ unsigned int j;

35686

+ for (j = backslashes + 1; j > 0; j--)

35687

+ *p++ = '\\';

35688

+ }

35689

+ *p++ = c;

35690

+ if (c == '\\')

35691

+ backslashes++;

35692

+ else

35693

+ backslashes = 0;

35694

+ }

35695

+ if (quote_around)

35696

+ {

35697

+ unsigned int j;

35698

+ for (j = backslashes; j > 0; j--)

35699

+ *p++ = '\\';

35700

+ *p++ = '"';

35701

+ }

35702

+ *p = '\0';

35703

35704

+ new_argv[i] = quoted_string;

35705

+ }

38593

35706

+ else

38594

+ {

38595

+ strcpy (new_value, add);

38596

+ strcpy (new_value + add_len, orig_value);

38597

+ }

38598

+ }

38599

+ else

38600

+ {

38601

+ new_value = xstrdup (add);

38602

+ }

38603

+ return new_value;

38604

38605

38606

+int

38607

+lt_split_name_value (const char *arg, char** name, char** value)

38608

38609

+ const char *p;

38610

+ int len;

38611

+ if (!arg || !*arg)

38612

+ return 1;

38613

38614

+ p = strchr (arg, (int)'=');

38615

38616

+ if (!p)

38617

+ return 1;

38618

38619

+ *value = xstrdup (++p);

38620

38621

+ len = strlen (arg) - strlen (*value);

38622

+ *name = XMALLOC (char, len);

38623

+ strncpy (*name, arg, len-1);

38624

+ (*name)[len - 1] = '\0';

38625

38626

+ return 0;

38627

38628

38629

+void

38630

+lt_opt_process_env_set (const char *arg)

38631

38632

+ char *name = NULL;

38633

+ char *value = NULL;

38634

38635

+ if (lt_split_name_value (arg, &name, &value) != 0)

38636

+ {

38637

+ XFREE (name);

38638

+ XFREE (value);

38639

+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);

38640

+ }

38641

38642

+ lt_setenv (name, value);

38643

+ XFREE (name);

38644

+ XFREE (value);

38645

38646

38647

+void

38648

+lt_opt_process_env_prepend (const char *arg)

38649

38650

+ char *name = NULL;

38651

+ char *value = NULL;

38652

+ char *new_value = NULL;

38653

38654

+ if (lt_split_name_value (arg, &name, &value) != 0)

38655

+ {

38656

+ XFREE (name);

38657

+ XFREE (value);

38658

+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);

38659

+ }

38660

38661

+ new_value = lt_extend_str (getenv (name), value, 0);

38662

+ lt_setenv (name, new_value);

38663

+ XFREE (new_value);

38664

+ XFREE (name);

38665

+ XFREE (value);

38666

38667

38668

+void

38669

+lt_opt_process_env_append (const char *arg)

38670

38671

+ char *name = NULL;

38672

+ char *value = NULL;

38673

+ char *new_value = NULL;

38674

38675

+ if (lt_split_name_value (arg, &name, &value) != 0)

38676

+ {

38677

+ XFREE (name);

38678

+ XFREE (value);

38679

+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);

38680

+ }

38681

38682

+ new_value = lt_extend_str (getenv (name), value, 1);

38683

+ lt_setenv (name, new_value);

38684

+ XFREE (new_value);

38685

+ XFREE (name);

38686

+ XFREE (value);

38687

38688

38689

+void

38690

+lt_update_exe_path (const char *name, const char *value)

38691

38692

+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",

38693

+ (name ? name : "<NULL>"),

38694

+ (value ? value : "<NULL>")));

38695

38696

+ if (name && *name && value && *value)

38697

+ {

38698

+ char *new_value = lt_extend_str (getenv (name), value, 0);

38699

+ /* some systems can't cope with a ':'-terminated path #' */

38700

+ int len = strlen (new_value);

38701

+ while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))

38702

+ {

38703

+ new_value[len-1] = '\0';

38704

+ }

38705

+ lt_setenv (name, new_value);

38706

+ XFREE (new_value);

38707

+ }

38708

38709

38710

+void

38711

+lt_update_lib_path (const char *name, const char *value)

38712

38713

+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",

38714

+ (name ? name : "<NULL>"),

38715

+ (value ? value : "<NULL>")));

38716

38717

+ if (name && *name && value && *value)

38718

+ {

38719

+ char *new_value = lt_extend_str (getenv (name), value, 0);

38720

+ lt_setenv (name, new_value);

38721

+ XFREE (new_value);

38722

+ }

38723

38724

38725

35707

+ new_argv[i] = (char *) string;

35708

+ }

35709

+ new_argv[argc] = NULL;

35710

35711

+ return new_argv;

35712

35713

+EOF

35714

+ ;;

35715

+ esac

35716

35717

+ cat <<"EOF"

35718

+void lt_dump_script (FILE* f)

35719

35720

+EOF

35721

+ func_emit_wrapper yes |

35722

+ $SED -e 's/$[\\"]$/\\\1/g' \

35723

+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'

35724

35725

+ cat <<"EOF"

35726

38726

35727

EOF

38727

35728

}

38728

35729

# end: func_emit_cwrapperexe_src

38729

@@ -3515,7 +4033,7 @@ func_mode_link ()

35730

35731

+# func_win32_import_lib_p ARG

35732

+# True if ARG is an import lib, as indicated by $file_magic_cmd

35733

+func_win32_import_lib_p ()

35734

35735

+ $opt_debug

35736

+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in

35737

+ *import*) : ;;

35738

+ *) false ;;

35739

+ esac

35740

35741

35742

# func_mode_link arg...

35743

func_mode_link ()

38730

35744

{

38731

$opt_debug

38732

case $host in

38733

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)

38734

+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)

38735

# It is impossible to link a dll without this setting, and

38736

# we shouldn't force the makefile maintainer to figure out

38737

# which system we are compiling for in order to pass an extra

38738

@@ -3959,6 +4477,13 @@ func_mode_link ()

35745

@@ -4072,6 +5121,7 @@ func_mode_link ()

35746

new_inherited_linker_flags=

35747

35748

avoid_version=no

35749

+ bindir=

35750

dlfiles=

35751

dlprefiles=

35752

dlself=no

35753

@@ -4164,6 +5214,11 @@ func_mode_link ()

35754

esac

35755

35756

case $prev in

35757

+ bindir)

35758

+ bindir="$arg"

35759

+ prev=

35760

+ continue

35761

+ ;;

35762

dlfiles|dlprefiles)

35763

if test "$preload" = no; then

35764

# Add the symbol object into the linking commands.

35765

@@ -4195,9 +5250,9 @@ func_mode_link ()

35766

;;

35767

35768

if test "$prev" = dlfiles; then

35769

- dlfiles="$dlfiles $arg"

35770

+ func_append dlfiles " $arg"

35771

else

35772

- dlprefiles="$dlprefiles $arg"

35773

+ func_append dlprefiles " $arg"

35774

35775

prev=

35776

continue

35777

@@ -4221,7 +5276,7 @@ func_mode_link ()

35778

*-*-darwin*)

35779

case "$deplibs " in

35780

*" $qarg.ltframework "*) ;;

35781

- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later

35782

+ *) func_append deplibs " $qarg.ltframework" # this is fixed later

35783

;;

35784

esac

35785

;;

35786

@@ -4240,7 +5295,7 @@ func_mode_link ()

35787

moreargs=

35788

for fil in `cat "$save_arg"`

35789

35790

-# moreargs="$moreargs $fil"

35791

+# func_append moreargs " $fil"

35792

arg=$fil

35793

# A libtool-controlled object.

35794

35795

@@ -4269,7 +5324,7 @@ func_mode_link ()

35796

35797

if test "$prev" = dlfiles; then

35798

if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then

35799

- dlfiles="$dlfiles $pic_object"

35800

+ func_append dlfiles " $pic_object"

35801

prev=

35802

continue

35803

else

35804

@@ -4281,7 +5336,7 @@ func_mode_link ()

35805

# CHECK ME: I think I busted this. -Ossama

35806

if test "$prev" = dlprefiles; then

35807

# Preload the old-style object.

35808

- dlprefiles="$dlprefiles $pic_object"

35809

+ func_append dlprefiles " $pic_object"

35810

prev=

35811

35812

35813

@@ -4351,12 +5406,12 @@ func_mode_link ()

35814

if test "$prev" = rpath; then

35815

case "$rpath " in

35816

*" $arg "*) ;;

35817

- *) rpath="$rpath $arg" ;;

35818

+ *) func_append rpath " $arg" ;;

35819

esac

35820

else

35821

case "$xrpath " in

35822

*" $arg "*) ;;

35823

- *) xrpath="$xrpath $arg" ;;

35824

+ *) func_append xrpath " $arg" ;;

35825

esac

35826

35827

prev=

35828

@@ -4368,28 +5423,28 @@ func_mode_link ()

35829

continue

35830

;;

35831

weak)

35832

- weak_libs="$weak_libs $arg"

35833

+ func_append weak_libs " $arg"

35834

prev=

35835

continue

35836

;;

35837

xcclinker)

35838

- linker_flags="$linker_flags $qarg"

35839

- compiler_flags="$compiler_flags $qarg"

35840

+ func_append linker_flags " $qarg"

35841

+ func_append compiler_flags " $qarg"

35842

prev=

35843

func_append compile_command " $qarg"

35844

func_append finalize_command " $qarg"

35845

continue

35846

;;

35847

xcompiler)

35848

- compiler_flags="$compiler_flags $qarg"

35849

+ func_append compiler_flags " $qarg"

35850

prev=

35851

func_append compile_command " $qarg"

35852

func_append finalize_command " $qarg"

35853

continue

35854

;;

35855

xlinker)

35856

- linker_flags="$linker_flags $qarg"

35857

- compiler_flags="$compiler_flags $wl$qarg"

35858

+ func_append linker_flags " $qarg"

35859

+ func_append compiler_flags " $wl$qarg"

35860

prev=

35861

func_append compile_command " $wl$qarg"

35862

func_append finalize_command " $wl$qarg"

35863

@@ -4425,6 +5480,11 @@ func_mode_link ()

35864

continue

35865

;;

35866

35867

+ -bindir)

35868

+ prev=bindir

35869

+ continue

35870

+ ;;

35871

35872

-dlopen)

35873

prev=dlfiles

35874

continue

35875

@@ -4475,15 +5535,16 @@ func_mode_link ()

35876

;;

35877

38739

35878

-L*)

38740

func_stripname '-L' '' "$arg"

38741

dir=$func_stripname_result

38742

+ if test -z "$dir"; then

38743

+ if test "$#" -gt 0; then

38744

+ func_fatal_error "require no space between \`-L' and \`$1'"

38745

+ else

38746

+ func_fatal_error "need path for \`-L' option"

38747

+ fi

38748

+ fi

35879

- func_stripname '-L' '' "$arg"

35880

- dir=$func_stripname_result

35881

- if test -z "$dir"; then

35882

+ func_stripname "-L" '' "$arg"

35883

+ if test -z "$func_stripname_result"; then

35884

if test "$#" -gt 0; then

35885

func_fatal_error "require no space between \`-L' and \`$1'"

35886

else

35887

func_fatal_error "need path for \`-L' option"

35888

35889

35890

+ func_resolve_sysroot "$func_stripname_result"

35891

+ dir=$func_resolve_sysroot_result

38749

35892

# We need an absolute path.

38750

35893

case $dir in

38751

35894

[\\/]* | [A-Za-z]:[\\/]*) ;;

38752

@@ -3977,14 +4502,16 @@ func_mode_link ()

35895

@@ -4495,24 +5556,30 @@ func_mode_link ()

35896

;;

35897

esac

35898

case "$deplibs " in

35899

- *" -L$dir "*) ;;

35900

+ *" -L$dir "* | *" $arg "*)

35901

+ # Will only happen for absolute or sysroot arguments

35902

+ ;;

35903

35904

- deplibs="$deplibs -L$dir"

35905

- lib_search_path="$lib_search_path $dir"

35906

+ # Preserve sysroot, but never include relative directories

35907

+ case $dir in

35908

+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;

35909

+ *) func_append deplibs " -L$dir" ;;

35910

+ esac

35911

+ func_append lib_search_path " $dir"

38753

35912

;;

38754

35913

esac

38755

35914

case $host in

38756

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)

38757

+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)

38758

testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`

35915

*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)

35916

- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`

35917

+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`

38759

35918

case :$dllsearchpath: in

38760

35919

*":$dir:"*) ;;

38761

+ ::) dllsearchpath=$dir;;

38762

*) dllsearchpath="$dllsearchpath:$dir";;

35920

::) dllsearchpath=$dir;;

35921

- *) dllsearchpath="$dllsearchpath:$dir";;

35922

+ *) func_append dllsearchpath ":$dir";;

38763

35923

esac

38764

35924

case :$dllsearchpath: in

38765

35925

*":$testbindir:"*) ;;

38766

+ ::) dllsearchpath=$testbindir;;

38767

*) dllsearchpath="$dllsearchpath:$testbindir";;

35926

::) dllsearchpath=$testbindir;;

35927

- *) dllsearchpath="$dllsearchpath:$testbindir";;

35928

+ *) func_append dllsearchpath ":$testbindir";;

38768

35929

esac

38769

35930

;;

38770

@@ -3995,7 +4522,7 @@ func_mode_link ()

35931

esac

35932

@@ -4522,7 +5589,7 @@ func_mode_link ()

38771

35933

-l*)

38772

35934

if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then

38773

35935

case $host in

38774

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)

38775

+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)

35936

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)

35937

38776

35938

# These systems don't actually have a C or math library (as such)

38777

35939

continue

38778

35940

;;

38779

@@ -4072,7 +4599,7 @@ func_mode_link ()

38780

38781

-no-install)

38782

case $host in

38783

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)

38784

38785

# The PATH hackery in wrapper scripts is required on Windows

38786

# and Darwin in order for the loader to find any dlls it needs.

38787

func_warning "\`-no-install' is ignored for $host"

38788

@@ -4506,7 +5033,10 @@ func_mode_link ()

38789

case $pass in

38790

dlopen) libs="$dlfiles" ;;

38791

dlpreopen) libs="$dlprefiles" ;;

38792

- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;

38793

+ link)

38794

+ libs="$deplibs %DEPLIBS%"

38795

+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"

38796

+ ;;

38797

esac

38798

38799

if test "$linkmode,$pass" = "lib,dlpreopen"; then

38800

@@ -4817,19 +5347,19 @@ func_mode_link ()

35941

@@ -4536,7 +5603,7 @@ func_mode_link ()

35942

;;

35943

*-*-rhapsody* | *-*-darwin1.[012])

35944

# Rhapsody C and math libraries are in the System framework

35945

- deplibs="$deplibs System.ltframework"

35946

+ func_append deplibs " System.ltframework"

35947

continue

35948

;;

35949

*-*-sco3.2v5* | *-*-sco5v6*)

35950

@@ -4556,7 +5623,7 @@ func_mode_link ()

35951

;;

35952

esac

35953

35954

- deplibs="$deplibs $arg"

35955

+ func_append deplibs " $arg"

35956

continue

35957

;;

35958

35959

@@ -4568,8 +5635,8 @@ func_mode_link ()

35960

# Tru64 UNIX uses -model [arg] to determine the layout of C++

35961

# classes, name mangling, and exception handling.

35962

# Darwin uses the -arch flag to determine output architecture.

35963

- -model|-arch|-isysroot)

35964

- compiler_flags="$compiler_flags $arg"

35965

+ -model|-arch|-isysroot|--sysroot)

35966

+ func_append compiler_flags " $arg"

35967

func_append compile_command " $arg"

35968

func_append finalize_command " $arg"

35969

prev=xcompiler

35970

@@ -4577,12 +5644,12 @@ func_mode_link ()

35971

;;

35972

35973

35974

- compiler_flags="$compiler_flags $arg"

35975

+ func_append compiler_flags " $arg"

35976

func_append compile_command " $arg"

35977

func_append finalize_command " $arg"

35978

case "$new_inherited_linker_flags " in

35979

*" $arg "*) ;;

35980

- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;

35981

+ * ) func_append new_inherited_linker_flags " $arg" ;;

35982

esac

35983

continue

35984

;;

35985

@@ -4649,13 +5716,17 @@ func_mode_link ()

35986

# We need an absolute path.

35987

case $dir in

35988

[\\/]* | [A-Za-z]:[\\/]*) ;;

35989

+ =*)

35990

+ func_stripname '=' '' "$dir"

35991

+ dir=$lt_sysroot$func_stripname_result

35992

+ ;;

35993

35994

func_fatal_error "only absolute run-paths are allowed"

35995

;;

35996

esac

35997

case "$xrpath " in

35998

*" $dir "*) ;;

35999

- *) xrpath="$xrpath $dir" ;;

36000

+ *) func_append xrpath " $dir" ;;

36001

esac

36002

continue

36003

;;

36004

@@ -4708,8 +5779,8 @@ func_mode_link ()

36005

for flag in $args; do

36006

IFS="$save_ifs"

36007

func_quote_for_eval "$flag"

36008

- arg="$arg $wl$func_quote_for_eval_result"

36009

- compiler_flags="$compiler_flags $func_quote_for_eval_result"

36010

+ func_append arg " $func_quote_for_eval_result"

36011

+ func_append compiler_flags " $func_quote_for_eval_result"

36012

done

36013

IFS="$save_ifs"

36014

func_stripname ' ' '' "$arg"

36015

@@ -4724,9 +5795,9 @@ func_mode_link ()

36016

for flag in $args; do

36017

IFS="$save_ifs"

36018

func_quote_for_eval "$flag"

36019

- arg="$arg $wl$func_quote_for_eval_result"

36020

- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"

36021

- linker_flags="$linker_flags $func_quote_for_eval_result"

36022

+ func_append arg " $wl$func_quote_for_eval_result"

36023

+ func_append compiler_flags " $wl$func_quote_for_eval_result"

36024

+ func_append linker_flags " $func_quote_for_eval_result"

36025

done

36026

IFS="$save_ifs"

36027

func_stripname ' ' '' "$arg"

36028

@@ -4754,23 +5825,27 @@ func_mode_link ()

36029

arg="$func_quote_for_eval_result"

36030

;;

36031

36032

- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler

36033

- # -r[0-9][0-9]* specifies the processor on the SGI compiler

36034

- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler

36035

- # +DA*, +DD* enable 64-bit mode on the HP compiler

36036

- # -q* pass through compiler args for the IBM compiler

36037

- # -m*, -t[45]*, -txscale* pass through architecture-specific

36038

- # compiler args for GCC

36039

- # -F/path gives path to uninstalled frameworks, gcc on darwin

36040

- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC

36041

- # @file GCC response files

36042

+ # Flags to be passed through unchanged, with rationale:

36043

+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler

36044

+ # -r[0-9][0-9]* specify processor for the SGI compiler

36045

+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler

36046

+ # +DA*, +DD* enable 64-bit mode for the HP compiler

36047

+ # -q* compiler args for the IBM compiler

36048

+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC

36049

+ # -F/path path to uninstalled frameworks, gcc on darwin

36050

+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC

36051

+ # @file GCC response files

36052

+ # -tp=* Portland pgcc target processor selection

36053

+ # --sysroot=* for sysroot support

36054

+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization

36055

-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \

36056

- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)

36057

+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \

36058

+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin)

36059

func_quote_for_eval "$arg"

36060

arg="$func_quote_for_eval_result"

36061

func_append compile_command " $arg"

36062

func_append finalize_command " $arg"

36063

- compiler_flags="$compiler_flags $arg"

36064

+ func_append compiler_flags " $arg"

36065

continue

36066

;;

36067

36068

@@ -4782,7 +5857,7 @@ func_mode_link ()

36069

36070

*.$objext)

36071

# A standard object.

36072

- objs="$objs $arg"

36073

+ func_append objs " $arg"

36074

;;

36075

36076

*.lo)

36077

@@ -4813,7 +5888,7 @@ func_mode_link ()

36078

36079

if test "$prev" = dlfiles; then

36080

if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then

36081

- dlfiles="$dlfiles $pic_object"

36082

+ func_append dlfiles " $pic_object"

36083

prev=

36084

continue

36085

else

36086

@@ -4825,7 +5900,7 @@ func_mode_link ()

36087

# CHECK ME: I think I busted this. -Ossama

36088

if test "$prev" = dlprefiles; then

36089

# Preload the old-style object.

36090

- dlprefiles="$dlprefiles $pic_object"

36091

+ func_append dlprefiles " $pic_object"

36092

prev=

36093

36094

36095

@@ -4870,24 +5945,25 @@ func_mode_link ()

36096

36097

*.$libext)

36098

# An archive.

36099

- deplibs="$deplibs $arg"

36100

- old_deplibs="$old_deplibs $arg"

36101

+ func_append deplibs " $arg"

36102

+ func_append old_deplibs " $arg"

36103

continue

36104

;;

36105

36106

*.la)

36107

# A libtool-controlled library.

36108

36109

+ func_resolve_sysroot "$arg"

36110

if test "$prev" = dlfiles; then

36111

# This library was specified with -dlopen.

36112

- dlfiles="$dlfiles $arg"

36113

+ func_append dlfiles " $func_resolve_sysroot_result"

36114

prev=

36115

elif test "$prev" = dlprefiles; then

36116

# The library was specified with -dlpreopen.

36117

- dlprefiles="$dlprefiles $arg"

36118

+ func_append dlprefiles " $func_resolve_sysroot_result"

36119

prev=

36120

else

36121

- deplibs="$deplibs $arg"

36122

+ func_append deplibs " $func_resolve_sysroot_result"

36123

36124

continue

36125

;;

36126

@@ -4925,7 +6001,7 @@ func_mode_link ()

36127

36128

if test -n "$shlibpath_var"; then

36129

# get the directories listed in $shlibpath_var

36130

- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`

36131

+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`

36132

else

36133

shlib_search_path=

36134

36135

@@ -4934,6 +6010,8 @@ func_mode_link ()

36136

36137

func_dirname "$output" "/" ""

36138

output_objdir="$func_dirname_result$objdir"

36139

+ func_to_tool_file "$output_objdir/"

36140

+ tool_output_objdir=$func_to_tool_file_result

36141

# Create the object directory.

36142

func_mkdir_p "$output_objdir"

36143

36144

@@ -4954,12 +6032,12 @@ func_mode_link ()

36145

# Find all interdependent deplibs by searching for libraries

36146

# that are linked more than once (e.g. -la -lb -la)

36147

for deplib in $deplibs; do

36148

- if $opt_duplicate_deps ; then

36149

+ if $opt_preserve_dup_deps ; then

36150

case "$libs " in

36151

- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

36152

+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;

36153

esac

36154

36155

- libs="$libs $deplib"

36156

+ func_append libs " $deplib"

36157

done

36158

36159

if test "$linkmode" = lib; then

36160

@@ -4972,9 +6050,9 @@ func_mode_link ()

36161

if $opt_duplicate_compiler_generated_deps; then

36162

for pre_post_dep in $predeps $postdeps; do

36163

case "$pre_post_deps " in

36164

- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;

36165

+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;

36166

esac

36167

- pre_post_deps="$pre_post_deps $pre_post_dep"

36168

+ func_append pre_post_deps " $pre_post_dep"

36169

done

36170

36171

pre_post_deps=

36172

@@ -5044,17 +6122,19 @@ func_mode_link ()

36173

for lib in $dlprefiles; do

36174

# Ignore non-libtool-libs

36175

dependency_libs=

36176

+ func_resolve_sysroot "$lib"

36177

case $lib in

36178

- *.la) func_source "$lib" ;;

36179

+ *.la) func_source "$func_resolve_sysroot_result" ;;

36180

esac

36181

36182

# Collect preopened libtool deplibs, except any this library

36183

# has declared as weak libs

36184

for deplib in $dependency_libs; do

36185

- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`

36186

+ func_basename "$deplib"

36187

+ deplib_base=$func_basename_result

36188

case " $weak_libs " in

36189

*" $deplib_base "*) ;;

36190

- *) deplibs="$deplibs $deplib" ;;

36191

+ *) func_append deplibs " $deplib" ;;

36192

esac

36193

done

36194

done

36195

@@ -5075,11 +6155,11 @@ func_mode_link ()

36196

compile_deplibs="$deplib $compile_deplibs"

36197

finalize_deplibs="$deplib $finalize_deplibs"

36198

else

36199

- compiler_flags="$compiler_flags $deplib"

36200

+ func_append compiler_flags " $deplib"

36201

if test "$linkmode" = lib ; then

36202

case "$new_inherited_linker_flags " in

36203

*" $deplib "*) ;;

36204

- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;

36205

+ * ) func_append new_inherited_linker_flags " $deplib" ;;

36206

esac

36207

36208

36209

@@ -5164,7 +6244,7 @@ func_mode_link ()

36210

if test "$linkmode" = lib ; then

36211

case "$new_inherited_linker_flags " in

36212

*" $deplib "*) ;;

36213

- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;

36214

+ * ) func_append new_inherited_linker_flags " $deplib" ;;

36215

esac

36216

36217

36218

@@ -5177,7 +6257,8 @@ func_mode_link ()

36219

test "$pass" = conv && continue

36220

newdependency_libs="$deplib $newdependency_libs"

36221

func_stripname '-L' '' "$deplib"

36222

- newlib_search_path="$newlib_search_path $func_stripname_result"

36223

+ func_resolve_sysroot "$func_stripname_result"

36224

+ func_append newlib_search_path " $func_resolve_sysroot_result"

36225

;;

36226

prog)

36227

if test "$pass" = conv; then

36228

@@ -5191,7 +6272,8 @@ func_mode_link ()

36229

finalize_deplibs="$deplib $finalize_deplibs"

36230

36231

func_stripname '-L' '' "$deplib"

36232

- newlib_search_path="$newlib_search_path $func_stripname_result"

36233

+ func_resolve_sysroot "$func_stripname_result"

36234

+ func_append newlib_search_path " $func_resolve_sysroot_result"

36235

;;

36236

36237

func_warning "\`-L' is ignored for archives/objects"

36238

@@ -5202,17 +6284,21 @@ func_mode_link ()

36239

-R*)

36240

if test "$pass" = link; then

36241

func_stripname '-R' '' "$deplib"

36242

- dir=$func_stripname_result

36243

+ func_resolve_sysroot "$func_stripname_result"

36244

+ dir=$func_resolve_sysroot_result

36245

# Make sure the xrpath contains only unique directories.

36246

case "$xrpath " in

36247

*" $dir "*) ;;

36248

- *) xrpath="$xrpath $dir" ;;

36249

+ *) func_append xrpath " $dir" ;;

36250

esac

36251

36252

deplibs="$deplib $deplibs"

36253

continue

36254

;;

36255

- *.la) lib="$deplib" ;;

36256

+ *.la)

36257

+ func_resolve_sysroot "$deplib"

36258

+ lib=$func_resolve_sysroot_result

36259

+ ;;

36260

*.$libext)

36261

if test "$pass" = conv; then

36262

deplibs="$deplib $deplibs"

36263

@@ -5230,7 +6316,7 @@ func_mode_link ()

36264

match_pattern*)

36265

set dummy $deplibs_check_method; shift

36266

match_pattern_regex=`expr "$deplibs_check_method" : "$1 $.*$"`

36267

- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \

36268

+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \

36269

| $EGREP "$match_pattern_regex" > /dev/null; then

36270

valid_a_lib=yes

36271

36272

@@ -5240,15 +6326,15 @@ func_mode_link ()

36273

;;

36274

esac

36275

if test "$valid_a_lib" != yes; then

36276

- $ECHO

36277

+ echo

36278

$ECHO "*** Warning: Trying to link with static lib archive $deplib."

36279

- $ECHO "*** I have the capability to make that library automatically link in when"

36280

- $ECHO "*** you link to this library. But I can only do this if you have a"

36281

- $ECHO "*** shared version of the library, which you do not appear to have"

36282

- $ECHO "*** because the file extensions .$libext of this argument makes me believe"

36283

- $ECHO "*** that it is just a static archive that I should not use here."

36284

+ echo "*** I have the capability to make that library automatically link in when"

36285

+ echo "*** you link to this library. But I can only do this if you have a"

36286

+ echo "*** shared version of the library, which you do not appear to have"

36287

+ echo "*** because the file extensions .$libext of this argument makes me believe"

36288

+ echo "*** that it is just a static archive that I should not use here."

36289

else

36290

- $ECHO

36291

+ echo

36292

$ECHO "*** Warning: Linking the shared library $output against the"

36293

$ECHO "*** static library $deplib is not portable!"

36294

deplibs="$deplib $deplibs"

36295

@@ -5275,11 +6361,11 @@ func_mode_link ()

36296

if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then

36297

# If there is no dlopen support or we're linking statically,

36298

# we need to preload.

36299

- newdlprefiles="$newdlprefiles $deplib"

36300

+ func_append newdlprefiles " $deplib"

36301

compile_deplibs="$deplib $compile_deplibs"

36302

finalize_deplibs="$deplib $finalize_deplibs"

36303

else

36304

- newdlfiles="$newdlfiles $deplib"

36305

+ func_append newdlfiles " $deplib"

36306

36307

36308

continue

36309

@@ -5321,20 +6407,20 @@ func_mode_link ()

36310

36311

# Convert "-framework foo" to "foo.ltframework"

36312

if test -n "$inherited_linker_flags"; then

36313

- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework $[^ $]*$/\1.ltframework/g'`

36314

+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework $[^ $]*$/\1.ltframework/g'`

36315

for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do

36316

case " $new_inherited_linker_flags " in

36317

*" $tmp_inherited_linker_flag "*) ;;

36318

- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;

36319

+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;

36320

esac

36321

done

36322

36323

- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

36324

+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

36325

if test "$linkmode,$pass" = "lib,link" ||

36326

test "$linkmode,$pass" = "prog,scan" ||

36327

{ test "$linkmode" != prog && test "$linkmode" != lib; }; then

36328

- test -n "$dlopen" && dlfiles="$dlfiles $dlopen"

36329

- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"

36330

+ test -n "$dlopen" && func_append dlfiles " $dlopen"

36331

+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"

36332

36333

36334

if test "$pass" = conv; then

36335

@@ -5345,17 +6431,17 @@ func_mode_link ()

36336

func_fatal_error "cannot find name of link library for \`$lib'"

36337

38801

36338

# It is a libtool convenience library, so add in its objects.

38802

convenience="$convenience $ladir/$objdir/$old_library"

38803

old_convenience="$old_convenience $ladir/$objdir/$old_library"

38804

+ tmp_libs=

38805

+ for deplib in $dependency_libs; do

38806

+ deplibs="$deplib $deplibs"

38807

+ if $opt_duplicate_deps ; then

38808

+ case "$tmp_libs " in

38809

+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

38810

+ esac

38811

+ fi

38812

+ tmp_libs="$tmp_libs $deplib"

38813

+ done

36339

- convenience="$convenience $ladir/$objdir/$old_library"

36340

- old_convenience="$old_convenience $ladir/$objdir/$old_library"

36341

+ func_append convenience " $ladir/$objdir/$old_library"

36342

+ func_append old_convenience " $ladir/$objdir/$old_library"

36343

tmp_libs=

36344

for deplib in $dependency_libs; do

36345

deplibs="$deplib $deplibs"

36346

- if $opt_duplicate_deps ; then

36347

+ if $opt_preserve_dup_deps ; then

36348

case "$tmp_libs " in

36349

- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

36350

+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;

36351

esac

36352

36353

- tmp_libs="$tmp_libs $deplib"

36354

+ func_append tmp_libs " $deplib"

36355

done

38814

36356

elif test "$linkmode" != prog && test "$linkmode" != lib; then

38815

36357

func_fatal_error "\`$lib' is not a convenience library"

38816

38817

- tmp_libs=

38818

- for deplib in $dependency_libs; do

38819

- deplibs="$deplib $deplibs"

36358

@@ -5366,9 +6452,15 @@ func_mode_link ()

36359

36360

# Get the name of the library we link against.

36361

linklib=

36362

- for l in $old_library $library_names; do

36363

- linklib="$l"

36364

- done

36365

+ if test -n "$old_library" &&

36366

+ { test "$prefer_static_libs" = yes ||

36367

+ test "$prefer_static_libs,$installed" = "built,no"; }; then

36368

+ linklib=$old_library

36369

+ else

36370

+ for l in $old_library $library_names; do

36371

+ linklib="$l"

36372

+ done

36373

+ fi

36374

if test -z "$linklib"; then

36375

func_fatal_error "cannot find name of link library for \`$lib'"

36376

36377

@@ -5385,9 +6477,9 @@ func_mode_link ()

36378

# statically, we need to preload. We also need to preload any

36379

# dependent libraries so libltdl's deplib preloader doesn't

36380

# bomb out in the load deplibs phase.

36381

- dlprefiles="$dlprefiles $lib $dependency_libs"

36382

+ func_append dlprefiles " $lib $dependency_libs"

36383

else

36384

- newdlfiles="$newdlfiles $lib"

36385

+ func_append newdlfiles " $lib"

36386

36387

continue

36388

fi # $pass = dlopen

36389

@@ -5409,14 +6501,14 @@ func_mode_link ()

36390

36391

# Find the relevant object directory and library name.

36392

if test "X$installed" = Xyes; then

36393

- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then

36394

+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then

36395

func_warning "library \`$lib' was moved."

36396

dir="$ladir"

36397

absdir="$abs_ladir"

36398

libdir="$abs_ladir"

36399

else

36400

- dir="$libdir"

36401

- absdir="$libdir"

36402

+ dir="$lt_sysroot$libdir"

36403

+ absdir="$lt_sysroot$libdir"

36404

36405

test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes

36406

else

36407

@@ -5424,12 +6516,12 @@ func_mode_link ()

36408

dir="$ladir"

36409

absdir="$abs_ladir"

36410

# Remove this search path later

36411

- notinst_path="$notinst_path $abs_ladir"

36412

+ func_append notinst_path " $abs_ladir"

36413

else

36414

dir="$ladir/$objdir"

36415

absdir="$abs_ladir/$objdir"

36416

# Remove this search path later

36417

- notinst_path="$notinst_path $abs_ladir"

36418

+ func_append notinst_path " $abs_ladir"

36419

36420

fi # $installed = yes

36421

func_stripname 'lib' '.la' "$laname"

36422

@@ -5440,20 +6532,46 @@ func_mode_link ()

36423

if test -z "$libdir" && test "$linkmode" = prog; then

36424

func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"

36425

36426

- # Prefer using a static library (so that no silly _DYNAMIC symbols

36427

- # are required to link).

36428

- if test -n "$old_library"; then

36429

- newdlprefiles="$newdlprefiles $dir/$old_library"

36430

- # Keep a list of preopened convenience libraries to check

36431

- # that they are being used correctly in the link pass.

36432

- test -z "$libdir" && \

36433

- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"

36434

- # Otherwise, use the dlname, so that lt_dlopen finds it.

36435

- elif test -n "$dlname"; then

36436

- newdlprefiles="$newdlprefiles $dir/$dlname"

36437

- else

36438

- newdlprefiles="$newdlprefiles $dir/$linklib"

36439

- fi

36440

+ case "$host" in

36441

+ # special handling for platforms with PE-DLLs.

36442

+ *cygwin* | *mingw* | *cegcc* )

36443

+ # Linker will automatically link against shared library if both

36444

+ # static and shared are present. Therefore, ensure we extract

36445

+ # symbols from the import library if a shared library is present

36446

+ # (otherwise, the dlopen module name will be incorrect). We do

36447

+ # this by putting the import library name into $newdlprefiles.

36448

+ # We recover the dlopen module name by 'saving' the la file

36449

+ # name in a special purpose variable, and (later) extracting the

36450

+ # dlname from the la file.

36451

+ if test -n "$dlname"; then

36452

+ func_tr_sh "$dir/$linklib"

36453

+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"

36454

+ func_append newdlprefiles " $dir/$linklib"

36455

+ else

36456

+ func_append newdlprefiles " $dir/$old_library"

36457

+ # Keep a list of preopened convenience libraries to check

36458

+ # that they are being used correctly in the link pass.

36459

+ test -z "$libdir" && \

36460

+ func_append dlpreconveniencelibs " $dir/$old_library"

36461

+ fi

36462

+ ;;

36463

+ * )

36464

+ # Prefer using a static library (so that no silly _DYNAMIC symbols

36465

+ # are required to link).

36466

+ if test -n "$old_library"; then

36467

+ func_append newdlprefiles " $dir/$old_library"

36468

+ # Keep a list of preopened convenience libraries to check

36469

+ # that they are being used correctly in the link pass.

36470

+ test -z "$libdir" && \

36471

+ func_append dlpreconveniencelibs " $dir/$old_library"

36472

+ # Otherwise, use the dlname, so that lt_dlopen finds it.

36473

+ elif test -n "$dlname"; then

36474

+ func_append newdlprefiles " $dir/$dlname"

36475

+ else

36476

+ func_append newdlprefiles " $dir/$linklib"

36477

+ fi

36478

+ ;;

36479

+ esac

36480

fi # $pass = dlpreopen

36481

36482

if test -z "$libdir"; then

36483

@@ -5471,7 +6589,7 @@ func_mode_link ()

36484

36485

36486

if test "$linkmode" = prog && test "$pass" != link; then

36487

- newlib_search_path="$newlib_search_path $ladir"

36488

+ func_append newlib_search_path " $ladir"

36489

deplibs="$lib $deplibs"

36490

36491

linkalldeplibs=no

36492

@@ -5484,7 +6602,8 @@ func_mode_link ()

36493

for deplib in $dependency_libs; do

36494

case $deplib in

36495

-L*) func_stripname '-L' '' "$deplib"

36496

- newlib_search_path="$newlib_search_path $func_stripname_result"

36497

+ func_resolve_sysroot "$func_stripname_result"

36498

+ func_append newlib_search_path " $func_resolve_sysroot_result"

36499

;;

36500

esac

36501

# Need to link against all dependency_libs?

36502

@@ -5495,12 +6614,12 @@ func_mode_link ()

36503

# or/and link against static libraries

36504

newdependency_libs="$deplib $newdependency_libs"

36505

38820

36506

- if $opt_duplicate_deps ; then

38821

- case "$tmp_libs " in

36507

+ if $opt_preserve_dup_deps ; then

36508

case "$tmp_libs " in

38822

36509

- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

38823

- esac

38824

- fi

36510

+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;

36511

esac

36512

38825

36513

- tmp_libs="$tmp_libs $deplib"

38826

- done

36514

+ func_append tmp_libs " $deplib"

36515

done # for deplib

38827

36516

continue

38828

fi # $pass = conv

36517

fi # $linkmode = prog...

36518

@@ -5515,7 +6634,7 @@ func_mode_link ()

36519

# Make sure the rpath contains only unique directories.

36520

case "$temp_rpath:" in

36521

*"$absdir:"*) ;;

36522

- *) temp_rpath="$temp_rpath$absdir:" ;;

36523

+ *) func_append temp_rpath "$absdir:" ;;

36524

esac

36525

38829

36526

38830

@@ -5029,7 +5559,7 @@ func_mode_link ()

38831

if test -n "$library_names" &&

38832

{ test "$use_static_libs" = no || test -z "$old_library"; }; then

36527

@@ -5527,7 +6646,7 @@ func_mode_link ()

36528

36529

case "$compile_rpath " in

36530

*" $absdir "*) ;;

36531

- *) compile_rpath="$compile_rpath $absdir"

36532

+ *) func_append compile_rpath " $absdir" ;;

36533

esac

36534

;;

36535

esac

36536

@@ -5536,7 +6655,7 @@ func_mode_link ()

36537

36538

case "$finalize_rpath " in

36539

*" $libdir "*) ;;

36540

- *) finalize_rpath="$finalize_rpath $libdir"

36541

+ *) func_append finalize_rpath " $libdir" ;;

36542

esac

36543

;;

36544

esac

36545

@@ -5561,12 +6680,12 @@ func_mode_link ()

38833

36546

case $host in

38834

- *cygwin* | *mingw*)

38835

+ *cygwin* | *mingw* | *cegcc*)

36547

*cygwin* | *mingw* | *cegcc*)

38836

36548

# No point in relinking DLLs because paths are not encoded

38837

notinst_deplibs="$notinst_deplibs $lib"

36549

- notinst_deplibs="$notinst_deplibs $lib"

36550

+ func_append notinst_deplibs " $lib"

38838

36551

need_relink=no

38839

@@ -5099,7 +5629,7 @@ func_mode_link ()

38840

elif test -n "$soname_spec"; then

38841

# bleh windows

38842

case $host in

38843

- *cygwin* | mingw*)

38844

+ *cygwin* | mingw* | *cegcc*)

38845

func_arith $current - $age

38846

major=$func_arith_result

38847

versuffix="-$major"

38848

@@ -5366,6 +5896,7 @@ func_mode_link ()

36552

;;

36553

36554

if test "$installed" = no; then

36555

- notinst_deplibs="$notinst_deplibs $lib"

36556

+ func_append notinst_deplibs " $lib"

36557

need_relink=yes

36558

36559

;;

36560

@@ -5583,7 +6702,7 @@ func_mode_link ()

36561

36562

done

36563

if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then

36564

- $ECHO

36565

+ echo

36566

if test "$linkmode" = prog; then

36567

$ECHO "*** Warning: Linking the executable $output against the loadable module"

36568

else

36569

@@ -5601,7 +6720,7 @@ func_mode_link ()

36570

36571

case "$compile_rpath " in

36572

*" $absdir "*) ;;

36573

- *) compile_rpath="$compile_rpath $absdir"

36574

+ *) func_append compile_rpath " $absdir" ;;

36575

esac

36576

;;

36577

esac

36578

@@ -5610,7 +6729,7 @@ func_mode_link ()

36579

36580

case "$finalize_rpath " in

36581

*" $libdir "*) ;;

36582

- *) finalize_rpath="$finalize_rpath $libdir"

36583

+ *) func_append finalize_rpath " $libdir" ;;

36584

esac

36585

;;

36586

esac

36587

@@ -5664,7 +6783,7 @@ func_mode_link ()

36588

linklib=$newlib

36589

fi # test -n "$old_archive_from_expsyms_cmds"

36590

36591

- if test "$linkmode" = prog || test "$mode" != relink; then

36592

+ if test "$linkmode" = prog || test "$opt_mode" != relink; then

36593

add_shlibpath=

36594

add_dir=

36595

add=

36596

@@ -5686,9 +6805,9 @@ func_mode_link ()

36597

if test "X$dlopenmodule" != "X$lib"; then

36598

$ECHO "*** Warning: lib $linklib is a module, not a shared library"

36599

if test -z "$old_library" ; then

36600

- $ECHO

36601

- $ECHO "*** And there doesn't seem to be a static archive available"

36602

- $ECHO "*** The link will probably fail, sorry"

36603

+ echo

36604

+ echo "*** And there doesn't seem to be a static archive available"

36605

+ echo "*** The link will probably fail, sorry"

36606

else

36607

add="$dir/$old_library"

36608

36609

@@ -5720,7 +6839,7 @@ func_mode_link ()

36610

if test -n "$inst_prefix_dir"; then

36611

case $libdir in

36612

[\\/]*)

36613

- add_dir="$add_dir -L$inst_prefix_dir$libdir"

36614

+ func_append add_dir " -L$inst_prefix_dir$libdir"

36615

;;

36616

esac

36617

36618

@@ -5742,7 +6861,7 @@ func_mode_link ()

36619

if test -n "$add_shlibpath"; then

36620

case :$compile_shlibpath: in

36621

*":$add_shlibpath:"*) ;;

36622

- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;

36623

+ *) func_append compile_shlibpath "$add_shlibpath:" ;;

36624

esac

36625

36626

if test "$linkmode" = prog; then

36627

@@ -5756,13 +6875,13 @@ func_mode_link ()

36628

test "$hardcode_shlibpath_var" = yes; then

36629

case :$finalize_shlibpath: in

36630

*":$libdir:"*) ;;

36631

- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;

36632

+ *) func_append finalize_shlibpath "$libdir:" ;;

36633

esac

36634

36635

36636

36637

36638

- if test "$linkmode" = prog || test "$mode" = relink; then

36639

+ if test "$linkmode" = prog || test "$opt_mode" = relink; then

36640

add_shlibpath=

36641

add_dir=

36642

add=

36643

@@ -5776,7 +6895,7 @@ func_mode_link ()

36644

elif test "$hardcode_shlibpath_var" = yes; then

36645

case :$finalize_shlibpath: in

36646

*":$libdir:"*) ;;

36647

- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;

36648

+ *) func_append finalize_shlibpath "$libdir:" ;;

36649

esac

36650

add="-l$name"

36651

elif test "$hardcode_automatic" = yes; then

36652

@@ -5793,7 +6912,7 @@ func_mode_link ()

36653

if test -n "$inst_prefix_dir"; then

36654

case $libdir in

36655

[\\/]*)

36656

- add_dir="$add_dir -L$inst_prefix_dir$libdir"

36657

+ func_append add_dir " -L$inst_prefix_dir$libdir"

36658

;;

36659

esac

36660

36661

@@ -5828,21 +6947,21 @@ func_mode_link ()

36662

36663

# Just print a warning and add the library to dependency_libs so

36664

# that the program can be linked against the static library.

36665

- $ECHO

36666

+ echo

36667

$ECHO "*** Warning: This system can not link to static lib archive $lib."

36668

- $ECHO "*** I have the capability to make that library automatically link in when"

36669

- $ECHO "*** you link to this library. But I can only do this if you have a"

36670

- $ECHO "*** shared version of the library, which you do not appear to have."

36671

+ echo "*** I have the capability to make that library automatically link in when"

36672

+ echo "*** you link to this library. But I can only do this if you have a"

36673

+ echo "*** shared version of the library, which you do not appear to have."

36674

if test "$module" = yes; then

36675

- $ECHO "*** But as you try to build a module library, libtool will still create "

36676

- $ECHO "*** a static module, that should work as long as the dlopening application"

36677

- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."

36678

+ echo "*** But as you try to build a module library, libtool will still create "

36679

+ echo "*** a static module, that should work as long as the dlopening application"

36680

+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime."

36681

if test -z "$global_symbol_pipe"; then

36682

- $ECHO

36683

- $ECHO "*** However, this would only work if libtool was able to extract symbol"

36684

- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"

36685

- $ECHO "*** not find such a program. So, this module is probably useless."

36686

- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."

36687

+ echo

36688

+ echo "*** However, this would only work if libtool was able to extract symbol"

36689

+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"

36690

+ echo "*** not find such a program. So, this module is probably useless."

36691

+ echo "*** \`nm' from GNU binutils and a full rebuild may help."

36692

36693

if test "$build_old_libs" = no; then

36694

build_libtool_libs=module

36695

@@ -5870,27 +6989,33 @@ func_mode_link ()

36696

temp_xrpath=$func_stripname_result

36697

case " $xrpath " in

36698

*" $temp_xrpath "*) ;;

36699

- *) xrpath="$xrpath $temp_xrpath";;

36700

+ *) func_append xrpath " $temp_xrpath";;

36701

esac;;

36702

- *) temp_deplibs="$temp_deplibs $libdir";;

36703

+ *) func_append temp_deplibs " $libdir";;

36704

esac

36705

done

36706

dependency_libs="$temp_deplibs"

36707

36708

36709

- newlib_search_path="$newlib_search_path $absdir"

36710

+ func_append newlib_search_path " $absdir"

36711

# Link against this library

36712

test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"

36713

# ... and its dependency_libs

36714

tmp_libs=

36715

for deplib in $dependency_libs; do

36716

newdependency_libs="$deplib $newdependency_libs"

36717

- if $opt_duplicate_deps ; then

36718

+ case $deplib in

36719

+ -L*) func_stripname '-L' '' "$deplib"

36720

+ func_resolve_sysroot "$func_stripname_result";;

36721

+ *) func_resolve_sysroot "$deplib" ;;

36722

+ esac

36723

+ if $opt_preserve_dup_deps ; then

36724

case "$tmp_libs " in

36725

- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

36726

+ *" $func_resolve_sysroot_result "*)

36727

+ func_append specialdeplibs " $func_resolve_sysroot_result" ;;

36728

esac

36729

36730

- tmp_libs="$tmp_libs $deplib"

36731

+ func_append tmp_libs " $func_resolve_sysroot_result"

36732

done

36733

38849

36734

if test "$link_all_deplibs" != no; then

38850

# Add the search paths of all dependency libraries

38851

for deplib in $dependency_libs; do

38852

+ path=

36735

@@ -5900,8 +7025,10 @@ func_mode_link ()

38853

36736

case $deplib in

38854

36737

-L*) path="$deplib" ;;

38855

36738

*.la)

38856

@@ -5679,6 +6210,9 @@ func_mode_link ()

36739

+ func_resolve_sysroot "$deplib"

36740

+ deplib=$func_resolve_sysroot_result

36741

func_dirname "$deplib" "" "."

36742

- dir="$func_dirname_result"

36743

+ dir=$func_dirname_result

36744

# We need an absolute path.

36745

case $dir in

36746

[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;

36747

@@ -5928,8 +7055,8 @@ func_mode_link ()

36748

if test -z "$darwin_install_name"; then

36749

darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`

36750

36751

- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"

36752

- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"

36753

+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"

36754

+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"

36755

path=

36756

36757

36758

@@ -5962,7 +7089,7 @@ func_mode_link ()

36759

compile_deplibs="$new_inherited_linker_flags $compile_deplibs"

36760

finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"

36761

else

36762

- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

36763

+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

36764

36765

36766

dependency_libs="$newdependency_libs"

36767

@@ -5979,7 +7106,7 @@ func_mode_link ()

36768

for dir in $newlib_search_path; do

36769

case "$lib_search_path " in

36770

*" $dir "*) ;;

36771

- *) lib_search_path="$lib_search_path $dir" ;;

36772

+ *) func_append lib_search_path " $dir" ;;

36773

esac

36774

done

36775

newlib_search_path=

36776

@@ -6037,10 +7164,10 @@ func_mode_link ()

36777

-L*)

36778

case " $tmp_libs " in

36779

*" $deplib "*) ;;

36780

- *) tmp_libs="$tmp_libs $deplib" ;;

36781

+ *) func_append tmp_libs " $deplib" ;;

36782

esac

36783

;;

36784

- *) tmp_libs="$tmp_libs $deplib" ;;

36785

+ *) func_append tmp_libs " $deplib" ;;

36786

esac

36787

done

36788

eval $var=\"$tmp_libs\"

36789

@@ -6056,7 +7183,7 @@ func_mode_link ()

36790

;;

36791

esac

36792

if test -n "$i" ; then

36793

- tmp_libs="$tmp_libs $i"

36794

+ func_append tmp_libs " $i"

36795

36796

done

36797

dependency_libs=$tmp_libs

36798

@@ -6097,7 +7224,7 @@ func_mode_link ()

36799

# Now set the variables for building old libraries.

36800

build_libtool_libs=no

36801

oldlibs="$output"

36802

- objs="$objs$old_deplibs"

36803

+ func_append objs "$old_deplibs"

36804

;;

36805

36806

lib)

36807

@@ -6130,10 +7257,10 @@ func_mode_link ()

36808

if test "$deplibs_check_method" != pass_all; then

36809

func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"

36810

else

36811

- $ECHO

36812

+ echo

36813

$ECHO "*** Warning: Linking the shared library $output against the non-libtool"

36814

$ECHO "*** objects $objs is not portable!"

36815

- libobjs="$libobjs $objs"

36816

+ func_append libobjs " $objs"

36817

36818

36819

36820

@@ -6198,7 +7325,7 @@ func_mode_link ()

36821

age="$number_minor"

36822

revision="$number_revision"

36823

;;

36824

- freebsd-aout|freebsd-elf|sunos)

36825

+ freebsd-aout|freebsd-elf|qnx|sunos)

36826

current="$number_major"

38857

36827

revision="$number_minor"

38858

lt_irix_increment=no

38859

;;

38860

+ *)

38861

+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"

38862

+ ;;

38863

esac

36828

age="0"

36829

@@ -6334,7 +7461,7 @@ func_mode_link ()

36830

done

36831

36832

# Make executables depend on our current version.

36833

- verstring="$verstring:${current}.0"

36834

+ func_append verstring ":${current}.0"

38864

36835

;;

38865

no)

38866

@@ -5878,7 +6412,7 @@ func_mode_link ()

38867

tempremovelist=`$ECHO "$output_objdir/*"`

38868

for p in $tempremovelist; do

38869

case $p in

38870

- *.$objext)

38871

+ *.$objext | *.gcno)

36836

36837

qnx)

36838

@@ -6402,10 +7529,10 @@ func_mode_link ()

36839

36840

36841

func_generate_dlsyms "$libname" "$libname" "yes"

36842

- libobjs="$libobjs $symfileobj"

36843

+ func_append libobjs " $symfileobj"

36844

test "X$libobjs" = "X " && libobjs=

36845

36846

- if test "$mode" != relink; then

36847

+ if test "$opt_mode" != relink; then

36848

# Remove our outputs, but don't remove object files since they

36849

# may have been created when compiling PIC objects.

36850

removelist=

36851

@@ -6421,7 +7548,7 @@ func_mode_link ()

36852

continue

36853

36854

36855

- removelist="$removelist $p"

36856

+ func_append removelist " $p"

38872

36857

;;

38873

$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)

38874

if test "X$precious_files_regex" != "X"; then

38875

@@ -5949,7 +6483,7 @@ func_mode_link ()

36858

*) ;;

36859

esac

36860

@@ -6432,27 +7559,28 @@ func_mode_link ()

36861

36862

# Now set the variables for building old libraries.

36863

if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then

36864

- oldlibs="$oldlibs $output_objdir/$libname.$libext"

36865

+ func_append oldlibs " $output_objdir/$libname.$libext"

36866

36867

# Transform .lo files to .o files.

36868

- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`

36869

+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`

36870

36871

36872

# Eliminate all temporary directories.

36873

#for path in $notinst_path; do

36874

- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`

36875

- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`

36876

- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`

36877

+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`

36878

+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`

36879

+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`

36880

#done

36881

36882

if test -n "$xrpath"; then

36883

# If the user specified any rpath flags, then add them.

36884

temp_xrpath=

36885

for libdir in $xrpath; do

36886

- temp_xrpath="$temp_xrpath -R$libdir"

36887

+ func_replace_sysroot "$libdir"

36888

+ func_append temp_xrpath " -R$func_replace_sysroot_result"

36889

case "$finalize_rpath " in

36890

*" $libdir "*) ;;

36891

- *) finalize_rpath="$finalize_rpath $libdir" ;;

36892

+ *) func_append finalize_rpath " $libdir" ;;

36893

esac

36894

done

36895

if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then

36896

@@ -6466,7 +7594,7 @@ func_mode_link ()

36897

for lib in $old_dlfiles; do

36898

case " $dlprefiles $dlfiles " in

36899

*" $lib "*) ;;

36900

- *) dlfiles="$dlfiles $lib" ;;

36901

+ *) func_append dlfiles " $lib" ;;

36902

esac

36903

done

36904

36905

@@ -6476,19 +7604,19 @@ func_mode_link ()

36906

for lib in $old_dlprefiles; do

36907

case "$dlprefiles " in

36908

*" $lib "*) ;;

36909

- *) dlprefiles="$dlprefiles $lib" ;;

36910

+ *) func_append dlprefiles " $lib" ;;

36911

esac

36912

done

36913

38876

36914

if test "$build_libtool_libs" = yes; then

38877

36915

if test -n "$rpath"; then

38878

36916

case $host in

38879

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)

38880

36917

36918

38881

36919

# these systems don't actually have a c library (as such)!

38882

36920

;;

38883

36921

*-*-rhapsody* | *-*-darwin1.[012])

38884

@@ -6448,7 +6982,7 @@ EOF

36922

# Rhapsody C library is in the System framework

36923

- deplibs="$deplibs System.ltframework"

36924

+ func_append deplibs " System.ltframework"

36925

;;

36926

*-*-netbsd*)

36927

# Don't link with libc until the a.out ld.so is fixed.

36928

@@ -6505,7 +7633,7 @@ func_mode_link ()

36929

36930

# Add libc to deplibs on all other systems if necessary.

36931

if test "$build_libtool_need_lc" = "yes"; then

36932

- deplibs="$deplibs -lc"

36933

+ func_append deplibs " -lc"

36934

36935

;;

36936

esac

36937

@@ -6554,7 +7682,7 @@ EOF

36938

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

36939

case " $predeps $postdeps " in

36940

*" $i "*)

36941

- newdeplibs="$newdeplibs $i"

36942

+ func_append newdeplibs " $i"

36943

i=""

36944

;;

36945

esac

36946

@@ -6565,21 +7693,21 @@ EOF

36947

set dummy $deplib_matches; shift

36948

deplib_match=$1

36949

if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then

36950

- newdeplibs="$newdeplibs $i"

36951

+ func_append newdeplibs " $i"

36952

else

36953

droppeddeps=yes

36954

- $ECHO

36955

+ echo

36956

$ECHO "*** Warning: dynamic linker does not accept needed library $i."

36957

- $ECHO "*** I have the capability to make that library automatically link in when"

36958

- $ECHO "*** you link to this library. But I can only do this if you have a"

36959

- $ECHO "*** shared version of the library, which I believe you do not have"

36960

- $ECHO "*** because a test_compile did reveal that the linker did not use it for"

36961

- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."

36962

+ echo "*** I have the capability to make that library automatically link in when"

36963

+ echo "*** you link to this library. But I can only do this if you have a"

36964

+ echo "*** shared version of the library, which I believe you do not have"

36965

+ echo "*** because a test_compile did reveal that the linker did not use it for"

36966

+ echo "*** its dynamic dependency list that programs get resolved with at runtime."

36967

36968

36969

;;

36970

36971

- newdeplibs="$newdeplibs $i"

36972

+ func_append newdeplibs " $i"

36973

;;

36974

esac

36975

done

36976

@@ -6597,7 +7725,7 @@ EOF

36977

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

36978

case " $predeps $postdeps " in

36979

*" $i "*)

36980

- newdeplibs="$newdeplibs $i"

36981

+ func_append newdeplibs " $i"

36982

i=""

36983

;;

36984

esac

36985

@@ -6608,29 +7736,29 @@ EOF

36986

set dummy $deplib_matches; shift

36987

deplib_match=$1

36988

if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then

36989

- newdeplibs="$newdeplibs $i"

36990

+ func_append newdeplibs " $i"

36991

else

36992

droppeddeps=yes

36993

- $ECHO

36994

+ echo

36995

$ECHO "*** Warning: dynamic linker does not accept needed library $i."

36996

- $ECHO "*** I have the capability to make that library automatically link in when"

36997

- $ECHO "*** you link to this library. But I can only do this if you have a"

36998

- $ECHO "*** shared version of the library, which you do not appear to have"

36999

- $ECHO "*** because a test_compile did reveal that the linker did not use this one"

37000

- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."

37001

+ echo "*** I have the capability to make that library automatically link in when"

37002

+ echo "*** you link to this library. But I can only do this if you have a"

37003

+ echo "*** shared version of the library, which you do not appear to have"

37004

+ echo "*** because a test_compile did reveal that the linker did not use this one"

37005

+ echo "*** as a dynamic dependency that programs can get resolved with at runtime."

37006

37007

37008

else

37009

droppeddeps=yes

37010

- $ECHO

37011

+ echo

37012

$ECHO "*** Warning! Library $i is needed by this library but I was not able to"

37013

- $ECHO "*** make it link in! You will probably need to install it or some"

37014

- $ECHO "*** library that it depends on before this library will be fully"

37015

- $ECHO "*** functional. Installing it before continuing would be even better."

37016

+ echo "*** make it link in! You will probably need to install it or some"

37017

+ echo "*** library that it depends on before this library will be fully"

37018

+ echo "*** functional. Installing it before continuing would be even better."

37019

37020

;;

37021

37022

- newdeplibs="$newdeplibs $i"

37023

+ func_append newdeplibs " $i"

37024

;;

37025

esac

37026

done

37027

@@ -6647,15 +7775,27 @@ EOF

37028

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

37029

case " $predeps $postdeps " in

37030

*" $a_deplib "*)

37031

- newdeplibs="$newdeplibs $a_deplib"

37032

+ func_append newdeplibs " $a_deplib"

37033

a_deplib=""

37034

;;

37035

esac

37036

37037

if test -n "$a_deplib" ; then

37038

libname=`eval "\\$ECHO \"$libname_spec\""`

37039

+ if test -n "$file_magic_glob"; then

37040

+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`

37041

+ else

37042

+ libnameglob=$libname

37043

+ fi

37044

+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`

37045

for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do

37046

- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`

37047

+ if test "$want_nocaseglob" = yes; then

37048

+ shopt -s nocaseglob

37049

+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`

37050

+ $nocaseglob

37051

+ else

37052

+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`

37053

+ fi

37054

for potent_lib in $potential_libs; do

37055

# Follow soft links.

37056

if ls -lLd "$potent_lib" 2>/dev/null |

37057

@@ -6672,13 +7812,13 @@ EOF

37058

potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`

37059

case $potliblink in

37060

[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;

37061

- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;

37062

+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;

37063

esac

37064

done

37065

if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |

37066

$SED -e 10q |

37067

$EGREP "$file_magic_regex" > /dev/null; then

37068

- newdeplibs="$newdeplibs $a_deplib"

37069

+ func_append newdeplibs " $a_deplib"

37070

a_deplib=""

37071

break 2

37072

37073

@@ -6687,12 +7827,12 @@ EOF

37074

37075

if test -n "$a_deplib" ; then

37076

droppeddeps=yes

37077

- $ECHO

37078

+ echo

37079

$ECHO "*** Warning: linker path does not have real file for library $a_deplib."

37080

- $ECHO "*** I have the capability to make that library automatically link in when"

37081

- $ECHO "*** you link to this library. But I can only do this if you have a"

37082

- $ECHO "*** shared version of the library, which you do not appear to have"

37083

- $ECHO "*** because I did check the linker path looking for a file starting"

37084

+ echo "*** I have the capability to make that library automatically link in when"

37085

+ echo "*** you link to this library. But I can only do this if you have a"

37086

+ echo "*** shared version of the library, which you do not appear to have"

37087

+ echo "*** because I did check the linker path looking for a file starting"

37088

if test -z "$potlib" ; then

37089

$ECHO "*** with $libname but no candidates were found. (...for file magic test)"

37090

else

37091

@@ -6703,7 +7843,7 @@ EOF

37092

;;

37093

37094

# Add a -L argument.

37095

- newdeplibs="$newdeplibs $a_deplib"

37096

+ func_append newdeplibs " $a_deplib"

37097

;;

37098

esac

37099

done # Gone through all deplibs.

37100

@@ -6719,7 +7859,7 @@ EOF

37101

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

37102

case " $predeps $postdeps " in

37103

*" $a_deplib "*)

37104

- newdeplibs="$newdeplibs $a_deplib"

37105

+ func_append newdeplibs " $a_deplib"

37106

a_deplib=""

37107

;;

37108

esac

37109

@@ -6730,9 +7870,9 @@ EOF

37110

potential_libs=`ls $i/$libname[.-]* 2>/dev/null`

37111

for potent_lib in $potential_libs; do

37112

potlib="$potent_lib" # see symlink-check above in file_magic test

37113

- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \

37114

+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \

37115

$EGREP "$match_pattern_regex" > /dev/null; then

37116

- newdeplibs="$newdeplibs $a_deplib"

37117

+ func_append newdeplibs " $a_deplib"

37118

a_deplib=""

37119

break 2

37120

37121

@@ -6741,12 +7881,12 @@ EOF

37122

37123

if test -n "$a_deplib" ; then

37124

droppeddeps=yes

37125

- $ECHO

37126

+ echo

37127

$ECHO "*** Warning: linker path does not have real file for library $a_deplib."

37128

- $ECHO "*** I have the capability to make that library automatically link in when"

37129

- $ECHO "*** you link to this library. But I can only do this if you have a"

37130

- $ECHO "*** shared version of the library, which you do not appear to have"

37131

- $ECHO "*** because I did check the linker path looking for a file starting"

37132

+ echo "*** I have the capability to make that library automatically link in when"

37133

+ echo "*** you link to this library. But I can only do this if you have a"

37134

+ echo "*** shared version of the library, which you do not appear to have"

37135

+ echo "*** because I did check the linker path looking for a file starting"

37136

if test -z "$potlib" ; then

37137

$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"

37138

else

37139

@@ -6757,32 +7897,32 @@ EOF

37140

;;

37141

37142

# Add a -L argument.

37143

- newdeplibs="$newdeplibs $a_deplib"

37144

+ func_append newdeplibs " $a_deplib"

37145

;;

37146

esac

37147

done # Gone through all deplibs.

37148

;;

37149

none | unknown | *)

37150

newdeplibs=""

37151

- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \

37152

- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`

37153

+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`

37154

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

37155

for i in $predeps $postdeps ; do

37156

# can't use Xsed below, because $i might contain '/'

37157

- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`

37158

+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`

37159

done

37160

37161

- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |

37162

- $GREP . >/dev/null; then

37163

- $ECHO

37164

+ case $tmp_deplibs in

37165

+ *[!\ \ ]*)

37166

+ echo

37167

if test "X$deplibs_check_method" = "Xnone"; then

37168

- $ECHO "*** Warning: inter-library dependencies are not supported in this platform."

37169

+ echo "*** Warning: inter-library dependencies are not supported in this platform."

37170

else

37171

- $ECHO "*** Warning: inter-library dependencies are not known to be supported."

37172

+ echo "*** Warning: inter-library dependencies are not known to be supported."

37173

37174

- $ECHO "*** All declared inter-library dependencies are being dropped."

37175

+ echo "*** All declared inter-library dependencies are being dropped."

37176

droppeddeps=yes

37177

- fi

37178

+ ;;

37179

+ esac

37180

;;

37181

esac

37182

versuffix=$versuffix_save

37183

@@ -6794,23 +7934,23 @@ EOF

37184

case $host in

37185

*-*-rhapsody* | *-*-darwin1.[012])

37186

# On Rhapsody replace the C library with the System framework

37187

- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`

37188

+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`

37189

;;

37190

esac

37191

37192

if test "$droppeddeps" = yes; then

37193

if test "$module" = yes; then

37194

- $ECHO

37195

- $ECHO "*** Warning: libtool could not satisfy all declared inter-library"

37196

+ echo

37197

+ echo "*** Warning: libtool could not satisfy all declared inter-library"

37198

$ECHO "*** dependencies of module $libname. Therefore, libtool will create"

37199

- $ECHO "*** a static module, that should work as long as the dlopening"

37200

- $ECHO "*** application is linked with the -dlopen flag."

37201

+ echo "*** a static module, that should work as long as the dlopening"

37202

+ echo "*** application is linked with the -dlopen flag."

37203

if test -z "$global_symbol_pipe"; then

37204

- $ECHO

37205

- $ECHO "*** However, this would only work if libtool was able to extract symbol"

37206

- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"

37207

- $ECHO "*** not find such a program. So, this module is probably useless."

37208

- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."

37209

+ echo

37210

+ echo "*** However, this would only work if libtool was able to extract symbol"

37211

+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could"

37212

+ echo "*** not find such a program. So, this module is probably useless."

37213

+ echo "*** \`nm' from GNU binutils and a full rebuild may help."

37214

37215

if test "$build_old_libs" = no; then

37216

oldlibs="$output_objdir/$libname.$libext"

37217

@@ -6820,16 +7960,16 @@ EOF

37218

build_libtool_libs=no

37219

37220

else

37221

- $ECHO "*** The inter-library dependencies that have been dropped here will be"

37222

- $ECHO "*** automatically added whenever a program is linked with this library"

37223

- $ECHO "*** or is declared to -dlopen it."

37224

+ echo "*** The inter-library dependencies that have been dropped here will be"

37225

+ echo "*** automatically added whenever a program is linked with this library"

37226

+ echo "*** or is declared to -dlopen it."

37227

37228

if test "$allow_undefined" = no; then

37229

- $ECHO

37230

- $ECHO "*** Since this library must not contain undefined symbols,"

37231

- $ECHO "*** because either the platform does not support them or"

37232

- $ECHO "*** it was explicitly requested with -no-undefined,"

37233

- $ECHO "*** libtool will only create a static version of it."

37234

+ echo

37235

+ echo "*** Since this library must not contain undefined symbols,"

37236

+ echo "*** because either the platform does not support them or"

37237

+ echo "*** it was explicitly requested with -no-undefined,"

37238

+ echo "*** libtool will only create a static version of it."

37239

if test "$build_old_libs" = no; then

37240

oldlibs="$output_objdir/$libname.$libext"

37241

build_libtool_libs=module

37242

@@ -6846,9 +7986,9 @@ EOF

37243

# Time to change all our "foo.ltframework" stuff back to "-framework foo"

37244

case $host in

37245

*-*-darwin*)

37246

- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

37247

- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

37248

- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

37249

+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

37250

+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

37251

+ deplibs=`$ECHO " $deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

37252

;;

37253

esac

37254

37255

@@ -6861,7 +8001,7 @@ EOF

37256

37257

case " $deplibs " in

37258

*" -L$path/$objdir "*)

37259

- new_libs="$new_libs -L$path/$objdir" ;;

37260

+ func_append new_libs " -L$path/$objdir" ;;

37261

esac

37262

;;

37263

esac

37264

@@ -6871,10 +8011,10 @@ EOF

37265

-L*)

37266

case " $new_libs " in

37267

*" $deplib "*) ;;

37268

- *) new_libs="$new_libs $deplib" ;;

37269

+ *) func_append new_libs " $deplib" ;;

37270

esac

37271

;;

37272

- *) new_libs="$new_libs $deplib" ;;

37273

+ *) func_append new_libs " $deplib" ;;

37274

esac

37275

done

37276

deplibs="$new_libs"

37277

@@ -6891,10 +8031,12 @@ EOF

37278

hardcode_libdirs=

37279

dep_rpath=

37280

rpath="$finalize_rpath"

37281

- test "$mode" != relink && rpath="$compile_rpath$rpath"

37282

+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath"

37283

for libdir in $rpath; do

37284

if test -n "$hardcode_libdir_flag_spec"; then

37285

if test -n "$hardcode_libdir_separator"; then

37286

+ func_replace_sysroot "$libdir"

37287

+ libdir=$func_replace_sysroot_result

37288

if test -z "$hardcode_libdirs"; then

37289

hardcode_libdirs="$libdir"

37290

else

37291

@@ -6903,18 +8045,18 @@ EOF

37292

*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)

37293

;;

37294

37295

- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"

37296

+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"

37297

;;

37298

esac

37299

37300

else

37301

eval flag=\"$hardcode_libdir_flag_spec\"

37302

- dep_rpath="$dep_rpath $flag"

37303

+ func_append dep_rpath " $flag"

37304

37305

elif test -n "$runpath_var"; then

37306

case "$perm_rpath " in

37307

*" $libdir "*) ;;

37308

- *) perm_rpath="$perm_rpath $libdir" ;;

37309

+ *) func_apped perm_rpath " $libdir" ;;

37310

esac

37311

37312

done

37313

@@ -6932,7 +8074,7 @@ EOF

37314

# We should set the runpath_var.

37315

rpath=

37316

for dir in $perm_rpath; do

37317

- rpath="$rpath$dir:"

37318

+ func_append rpath "$dir:"

37319

done

37320

eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"

37321

37322

@@ -6940,7 +8082,7 @@ EOF

37323

37324

37325

shlibpath="$finalize_shlibpath"

37326

- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"

37327

+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"

37328

if test -n "$shlibpath"; then

37329

eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"

37330

37331

@@ -6966,18 +8108,18 @@ EOF

37332

linknames=

37333

for link

37334

37335

- linknames="$linknames $link"

37336

+ func_append linknames " $link"

37337

done

37338

37339

# Use standard objects if they are pic

37340

- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`

37341

+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`

37342

test "X$libobjs" = "X " && libobjs=

37343

37344

delfiles=

37345

if test -n "$export_symbols" && test -n "$include_expsyms"; then

37346

$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"

37347

export_symbols="$output_objdir/$libname.uexp"

37348

- delfiles="$delfiles $export_symbols"

37349

+ func_append delfiles " $export_symbols"

37350

38885

37351

38886

37352

orig_export_symbols=

38887

case $host_os in

38888

- cygwin* | mingw*)

38889

+ cygwin* | mingw* | cegcc*)

38890

if test -n "$export_symbols" && test -z "$export_symbols_regex"; then

38891

# exporting using user supplied symfile

38892

if test "x`$SED 1q $export_symbols`" != xEXPORTS; then

38893

@@ -7073,14 +7607,16 @@ EOF

37353

@@ -7008,13 +8150,45 @@ EOF

37354

$opt_dry_run || $RM $export_symbols

37355

cmds=$export_symbols_cmds

37356

save_ifs="$IFS"; IFS='~'

37357

- for cmd in $cmds; do

37358

+ for cmd1 in $cmds; do

37359

IFS="$save_ifs"

37360

- eval cmd=\"$cmd\"

37361

- func_len " $cmd"

37362

- len=$func_len_result

37363

- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then

37364

+ # Take the normal branch if the nm_file_list_spec branch

37365

+ # doesn't work or if tool conversion is not needed.

37366

+ case $nm_file_list_spec~$to_tool_file_cmd in

37367

+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)

37368

+ try_normal_branch=yes

37369

+ eval cmd=\"$cmd1\"

37370

+ func_len " $cmd"

37371

+ len=$func_len_result

37372

+ ;;

37373

+ *)

37374

+ try_normal_branch=no

37375

+ ;;

37376

+ esac

37377

+ if test "$try_normal_branch" = yes \

37378

+ && { test "$len" -lt "$max_cmd_len" \

37379

+ || test "$max_cmd_len" -le -1; }

37380

+ then

37381

+ func_show_eval "$cmd" 'exit $?'

37382

+ skipped_export=false

37383

+ elif test -n "$nm_file_list_spec"; then

37384

+ func_basename "$output"

37385

+ output_la=$func_basename_result

37386

+ save_libobjs=$libobjs

37387

+ save_output=$output

37388

+ output=${output_objdir}/${output_la}.nm

37389

+ func_to_tool_file "$output"

37390

+ libobjs=$nm_file_list_spec$func_to_tool_file_result

37391

+ func_append delfiles " $output"

37392

+ func_verbose "creating $NM input file list: $output"

37393

+ for obj in $save_libobjs; do

37394

+ func_to_tool_file "$obj"

37395

+ $ECHO "$func_to_tool_file_result"

37396

+ done > "$output"

37397

+ eval cmd=\"$cmd1\"

37398

func_show_eval "$cmd" 'exit $?'

37399

+ output=$save_output

37400

+ libobjs=$save_libobjs

37401

skipped_export=false

37402

else

37403

# The command line is too long to execute in one step.

37404

@@ -7036,7 +8210,7 @@ EOF

37405

if test -n "$export_symbols" && test -n "$include_expsyms"; then

37406

tmp_export_symbols="$export_symbols"

37407

test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"

37408

- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'

37409

+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'

37410

37411

37412

if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then

37413

@@ -7048,7 +8222,7 @@ EOF

37414

# global variables. join(1) would be nice here, but unfortunately

37415

# isn't a blessed tool.

37416

$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter

37417

- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"

37418

+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"

37419

export_symbols=$output_objdir/$libname.def

37420

$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols

37421

37422

@@ -7058,7 +8232,7 @@ EOF

37423

case " $convenience " in

37424

*" $test_deplib "*) ;;

37425

37426

- tmp_deplibs="$tmp_deplibs $test_deplib"

37427

+ func_append tmp_deplibs " $test_deplib"

37428

;;

37429

esac

37430

done

37431

@@ -7078,21 +8252,21 @@ EOF

37432

test "X$libobjs" = "X " && libobjs=

37433

else

37434

gentop="$output_objdir/${outputname}x"

37435

- generated="$generated $gentop"

37436

+ func_append generated " $gentop"

37437

37438

func_extract_archives $gentop $convenience

37439

- libobjs="$libobjs $func_extract_archives_result"

37440

+ func_append libobjs " $func_extract_archives_result"

37441

test "X$libobjs" = "X " && libobjs=

37442

37443

37444

37445

if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then

37446

eval flag=\"$thread_safe_flag_spec\"

37447

- linker_flags="$linker_flags $flag"

37448

+ func_append linker_flags " $flag"

37449

37450

37451

# Make a backup of the uninstalled library when relinking

37452

- if test "$mode" = relink; then

37453

+ if test "$opt_mode" = relink; then

37454

$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?

37455

37456

37457

@@ -7137,7 +8311,8 @@ EOF

37458

save_libobjs=$libobjs

37459

37460

save_output=$output

37461

- output_la=`$ECHO "X$output" | $Xsed -e "$basename"`

37462

+ func_basename "$output"

37463

+ output_la=$func_basename_result

37464

37465

# Clear the reloadable object creation command queue and

37466

# initialize k to one.

37467

@@ -7150,13 +8325,16 @@ EOF

37468

if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then

37469

output=${output_objdir}/${output_la}.lnkscript

37470

func_verbose "creating GNU ld script: $output"

37471

- $ECHO 'INPUT (' > $output

37472

+ echo 'INPUT (' > $output

37473

for obj in $save_libobjs

37474

37475

- $ECHO "$obj" >> $output

37476

+ func_to_tool_file "$obj"

37477

+ $ECHO "$func_to_tool_file_result" >> $output

37478

done

37479

- $ECHO ')' >> $output

37480

- delfiles="$delfiles $output"

37481

+ echo ')' >> $output

37482

+ func_append delfiles " $output"

37483

+ func_to_tool_file "$output"

37484

+ output=$func_to_tool_file_result

37485

elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then

37486

output=${output_objdir}/${output_la}.lnk

37487

func_verbose "creating linker input file list: $output"

37488

@@ -7170,10 +8348,12 @@ EOF

37489

37490

for obj

37491

37492

- $ECHO "$obj" >> $output

37493

+ func_to_tool_file "$obj"

37494

+ $ECHO "$func_to_tool_file_result" >> $output

37495

done

37496

- delfiles="$delfiles $output"

37497

- output=$firstobj\"$file_list_spec$output\"

37498

+ func_append delfiles " $output"

37499

+ func_to_tool_file "$output"

37500

+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\"

37501

else

37502

if test -n "$save_libobjs"; then

37503

func_verbose "creating reloadable object files..."

37504

@@ -7197,17 +8377,19 @@ EOF

37505

# command to the queue.

37506

if test "$k" -eq 1 ; then

37507

# The first file doesn't have a previous command to add.

37508

- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"

37509

+ reload_objs=$objlist

37510

+ eval concat_cmds=\"$reload_cmds\"

37511

else

37512

# All subsequent reloadable object files will link in

37513

# the last one created.

37514

- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"

37515

+ reload_objs="$objlist $last_robj"

37516

+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"

37517

37518

last_robj=$output_objdir/$output_la-${k}.$objext

37519

func_arith $k + 1

37520

k=$func_arith_result

37521

output=$output_objdir/$output_la-${k}.$objext

37522

- objlist=$obj

37523

+ objlist=" $obj"

37524

func_len " $last_robj"

37525

func_arith $len0 + $func_len_result

37526

len=$func_arith_result

37527

@@ -7217,11 +8399,12 @@ EOF

37528

# reloadable object file. All subsequent reloadable object

37529

# files will link in the last one created.

37530

test -z "$concat_cmds" || concat_cmds=$concat_cmds~

37531

- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"

37532

+ reload_objs="$objlist $last_robj"

37533

+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\"

37534

if test -n "$last_robj"; then

37535

eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"

37536

37537

- delfiles="$delfiles $output"

37538

+ func_append delfiles " $output"

37539

37540

else

37541

output=

37542

@@ -7255,7 +8438,7 @@ EOF

37543

lt_exit=$?

37544

37545

# Restore the uninstalled library and exit

37546

- if test "$mode" = relink; then

37547

+ if test "$opt_mode" = relink; then

37548

( cd "$output_objdir" && \

37549

$RM "${realname}T" && \

37550

$MV "${realname}U" "$realname" )

37551

@@ -7276,7 +8459,7 @@ EOF

37552

if test -n "$export_symbols" && test -n "$include_expsyms"; then

37553

tmp_export_symbols="$export_symbols"

37554

test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"

37555

- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'

37556

+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'

37557

37558

37559

if test -n "$orig_export_symbols"; then

37560

@@ -7288,7 +8471,7 @@ EOF

37561

# global variables. join(1) would be nice here, but unfortunately

37562

# isn't a blessed tool.

37563

$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,$.*$$[ \,].*$,s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter

37564

- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"

37565

+ func_append delfiles " $export_symbols $output_objdir/$libname.filter"

37566

export_symbols=$output_objdir/$libname.def

37567

$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols

37568

37569

@@ -7329,10 +8512,10 @@ EOF

37570

# Add any objects from preloaded convenience libraries

37571

if test -n "$dlprefiles"; then

37572

gentop="$output_objdir/${outputname}x"

37573

- generated="$generated $gentop"

37574

+ func_append generated " $gentop"

37575

37576

func_extract_archives $gentop $dlprefiles

37577

- libobjs="$libobjs $func_extract_archives_result"

37578

+ func_append libobjs " $func_extract_archives_result"

37579

test "X$libobjs" = "X " && libobjs=

37580

37581

37582

@@ -7348,7 +8531,7 @@ EOF

37583

lt_exit=$?

37584

37585

# Restore the uninstalled library and exit

37586

- if test "$mode" = relink; then

37587

+ if test "$opt_mode" = relink; then

37588

( cd "$output_objdir" && \

37589

$RM "${realname}T" && \

37590

$MV "${realname}U" "$realname" )

37591

@@ -7360,7 +8543,7 @@ EOF

37592

IFS="$save_ifs"

37593

37594

# Restore the uninstalled library and exit

37595

- if test "$mode" = relink; then

37596

+ if test "$opt_mode" = relink; then

37597

$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?

37598

37599

if test -n "$convenience"; then

37600

@@ -7441,18 +8624,21 @@ EOF

37601

if test -n "$convenience"; then

37602

if test -n "$whole_archive_flag_spec"; then

37603

eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"

37604

- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`

37605

+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`

37606

else

37607

gentop="$output_objdir/${obj}x"

37608

- generated="$generated $gentop"

37609

+ func_append generated " $gentop"

37610

37611

func_extract_archives $gentop $convenience

37612

reload_conv_objs="$reload_objs $func_extract_archives_result"

37613

37614

37615

37616

+ # If we're not building shared, we need to use non_pic_objs

37617

+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"

37618

37619

# Create the old-style object.

37620

- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test

37621

+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test

37622

37623

output="$obj"

37624

func_execute_cmds "$reload_cmds" 'exit $?'

37625

@@ -7512,8 +8698,8 @@ EOF

37626

case $host in

37627

*-*-rhapsody* | *-*-darwin1.[012])

37628

# On Rhapsody replace the C library is the System framework

37629

- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`

37630

- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`

37631

+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`

37632

+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`

37633

;;

37634

esac

37635

37636

@@ -7524,14 +8710,14 @@ EOF

37637

if test "$tagname" = CXX ; then

37638

case ${MACOSX_DEPLOYMENT_TARGET-10.0} in

37639

10.[0123])

37640

- compile_command="$compile_command ${wl}-bind_at_load"

37641

- finalize_command="$finalize_command ${wl}-bind_at_load"

37642

+ func_append compile_command " ${wl}-bind_at_load"

37643

+ func_append finalize_command " ${wl}-bind_at_load"

37644

;;

37645

esac

37646

37647

# Time to change all our "foo.ltframework" stuff back to "-framework foo"

37648

- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

37649

- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% $[^ $]*$.ltframework% -framework \1%g'`

37650

+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

37651

+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% $[^ $]*$.ltframework% -framework \1%g'`

37652

;;

37653

esac

37654

37655

@@ -7545,7 +8731,7 @@ EOF

37656

37657

case " $compile_deplibs " in

37658

*" -L$path/$objdir "*)

37659

- new_libs="$new_libs -L$path/$objdir" ;;

37660

+ func_append new_libs " -L$path/$objdir" ;;

37661

esac

37662

;;

37663

esac

37664

@@ -7555,17 +8741,17 @@ EOF

37665

-L*)

37666

case " $new_libs " in

37667

*" $deplib "*) ;;

37668

- *) new_libs="$new_libs $deplib" ;;

37669

+ *) func_append new_libs " $deplib" ;;

37670

esac

37671

;;

37672

- *) new_libs="$new_libs $deplib" ;;

37673

+ *) func_append new_libs " $deplib" ;;

37674

esac

37675

done

37676

compile_deplibs="$new_libs"

37677

37678

37679

- compile_command="$compile_command $compile_deplibs"

37680

- finalize_command="$finalize_command $finalize_deplibs"

37681

+ func_append compile_command " $compile_deplibs"

37682

+ func_append finalize_command " $finalize_deplibs"

37683

37684

if test -n "$rpath$xrpath"; then

37685

# If the user specified any rpath flags, then add them.

37686

@@ -7573,7 +8759,7 @@ EOF

37687

# This is the magic to use -rpath.

37688

case "$finalize_rpath " in

37689

*" $libdir "*) ;;

37690

- *) finalize_rpath="$finalize_rpath $libdir" ;;

37691

+ *) func_append finalize_rpath " $libdir" ;;

37692

esac

37693

done

37694

37695

@@ -7592,18 +8778,18 @@ EOF

37696

*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)

37697

;;

37698

37699

- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"

37700

+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"

37701

;;

37702

esac

37703

37704

else

37705

eval flag=\"$hardcode_libdir_flag_spec\"

37706

- rpath="$rpath $flag"

37707

+ func_append rpath " $flag"

37708

37709

elif test -n "$runpath_var"; then

37710

case "$perm_rpath " in

37711

*" $libdir "*) ;;

37712

- *) perm_rpath="$perm_rpath $libdir" ;;

37713

+ *) func_append perm_rpath " $libdir" ;;

38894

37714

esac

38895

37715

38896

37716

case $host in

38897

- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)

38898

+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)

38899

testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`

37717

@@ -7612,12 +8798,12 @@ EOF

38900

37718

case :$dllsearchpath: in

38901

37719

*":$libdir:"*) ;;

38902

+ ::) dllsearchpath=$libdir;;

38903

*) dllsearchpath="$dllsearchpath:$libdir";;

37720

::) dllsearchpath=$libdir;;

37721

- *) dllsearchpath="$dllsearchpath:$libdir";;

37722

+ *) func_append dllsearchpath ":$libdir";;

38904

37723

esac

38905

37724

case :$dllsearchpath: in

38906

37725

*":$testbindir:"*) ;;

38907

+ ::) dllsearchpath=$testbindir;;

38908

*) dllsearchpath="$dllsearchpath:$testbindir";;

37726

::) dllsearchpath=$testbindir;;

37727

- *) dllsearchpath="$dllsearchpath:$testbindir";;

37728

+ *) func_append dllsearchpath ":$testbindir";;

38909

37729

esac

38910

37730

;;

38911

@@ -7150,6 +7686,10 @@ EOF

37731

esac

37732

@@ -7643,18 +8829,18 @@ EOF

37733

*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)

37734

;;

37735

37736

- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"

37737

+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"

37738

;;

37739

esac

37740

37741

else

37742

eval flag=\"$hardcode_libdir_flag_spec\"

37743

- rpath="$rpath $flag"

37744

+ func_append rpath " $flag"

37745

37746

elif test -n "$runpath_var"; then

37747

case "$finalize_perm_rpath " in

37748

*" $libdir "*) ;;

37749

- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;

37750

+ *) func_append finalize_perm_rpath " $libdir" ;;

37751

esac

37752

37753

done

37754

@@ -7668,8 +8854,8 @@ EOF

37755

37756

if test -n "$libobjs" && test "$build_old_libs" = yes; then

37757

# Transform all the library objects into standard objects.

37758

- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`

37759

- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`

37760

+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`

37761

+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`

37762

37763

37764

func_generate_dlsyms "$outputname" "@PROGRAM@" "no"

37765

@@ -7681,15 +8867,15 @@ EOF

37766

37767

wrappers_required=yes

37768

case $host in

37769

+ *cegcc* | *mingw32ce*)

37770

+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.

37771

+ wrappers_required=no

37772

+ ;;

37773

*cygwin* | *mingw* )

37774

if test "$build_libtool_libs" != yes; then

38912

37775

wrappers_required=no

38913

37776

38914

37777

;;

38915

+ *cegcc)

38916

+ # Disable wrappers for cegcc, we are cross compiling anyway.

38917

+ wrappers_required=no

38918

+ ;;

37778

- *cegcc)

37779

- # Disable wrappers for cegcc, we are cross compiling anyway.

37780

- wrappers_required=no

37781

- ;;

38919

37782

38920

37783

if test "$need_relink" = no || test "$build_libtool_libs" != yes; then

38921

37784

wrappers_required=no

38922

@@ -7302,11 +7842,10 @@ EOF

38923

38924

func_emit_cwrapperexe_src > $cwrappersource

38925

38926

- # we should really use a build-platform specific compiler

38927

- # here, but OTOH, the wrappers (shell script and this C one)

38928

- # are only useful if you want to execute the "real" binary.

38929

- # Since the "real" binary is built for $host, then this

38930

- # wrapper might as well be built for $host, too.

38931

+ # The wrapper executable is built using the $host compiler,

38932

+ # because it contains $host paths and files. If cross-

38933

+ # compiling, it, like the target executable, must be

38934

+ # executed on the $host or under an emulation environment.

38935

$opt_dry_run || {

38936

$LTCC $LTCFLAGS -o $cwrapper $cwrappersource

38937

$STRIP $cwrapper

38938

@@ -7591,7 +8130,7 @@ EOF

37785

@@ -7698,13 +8884,19 @@ EOF

37786

esac

37787

if test "$wrappers_required" = no; then

37788

# Replace the output file specification.

37789

- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`

37790

+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`

37791

link_command="$compile_command$compile_rpath"

37792

37793

# We have no uninstalled library dependencies, so finalize right now.

37794

exit_status=0

37795

func_show_eval "$link_command" 'exit_status=$?'

37796

37797

+ if test -n "$postlink_cmds"; then

37798

+ func_to_tool_file "$output"

37799

+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`

37800

+ func_execute_cmds "$postlink_cmds" 'exit $?'

37801

+ fi

37802

37803

# Delete the generated files.

37804

if test -f "$output_objdir/${outputname}S.${objext}"; then

37805

func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'

37806

@@ -7727,7 +8919,7 @@ EOF

37807

# We should set the runpath_var.

37808

rpath=

37809

for dir in $perm_rpath; do

37810

- rpath="$rpath$dir:"

37811

+ func_append rpath "$dir:"

37812

done

37813

compile_var="$runpath_var=\"$rpath\$$runpath_var\" "

37814

37815

@@ -7735,7 +8927,7 @@ EOF

37816

# We should set the runpath_var.

37817

rpath=

37818

for dir in $finalize_perm_rpath; do

37819

- rpath="$rpath$dir:"

37820

+ func_append rpath "$dir:"

37821

done

37822

finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "

37823

37824

@@ -7745,11 +8937,18 @@ EOF

37825

# We don't need to create a wrapper script.

37826

link_command="$compile_var$compile_command$compile_rpath"

37827

# Replace the output file specification.

37828

- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`

37829

+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`

37830

# Delete the old output file.

37831

$opt_dry_run || $RM $output

37832

# Link the executable and exit

37833

func_show_eval "$link_command" 'exit $?'

37834

37835

+ if test -n "$postlink_cmds"; then

37836

+ func_to_tool_file "$output"

37837

+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`

37838

+ func_execute_cmds "$postlink_cmds" 'exit $?'

37839

+ fi

37840

37841

exit $EXIT_SUCCESS

37842

37843

37844

@@ -7764,7 +8963,7 @@ EOF

37845

if test "$fast_install" != no; then

37846

link_command="$finalize_var$compile_command$finalize_rpath"

37847

if test "$fast_install" = yes; then

37848

- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`

37849

+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`

37850

else

37851

# fast_install is set to needless

37852

relink_command=

37853

@@ -7776,13 +8975,19 @@ EOF

37854

37855

37856

# Replace the output file specification.

37857

- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`

37858

+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`

37859

37860

# Delete the old output files.

37861

$opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname

37862

37863

func_show_eval "$link_command" 'exit $?'

37864

37865

+ if test -n "$postlink_cmds"; then

37866

+ func_to_tool_file "$output_objdir/$outputname"

37867

+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`

37868

+ func_execute_cmds "$postlink_cmds" 'exit $?'

37869

+ fi

37870

37871

# Now create the wrapper script.

37872

func_verbose "creating $output"

37873

37874

@@ -7800,18 +9005,7 @@ EOF

37875

37876

done

37877

relink_command="(cd `pwd`; $relink_command)"

37878

- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`

37879

- fi

37880

37881

- # Quote $ECHO for shipping.

37882

- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then

37883

- case $progpath in

37884

- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;

37885

- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;

37886

- esac

37887

- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`

37888

- else

37889

- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`

37890

+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`

37891

37892

37893

# Only actually do things if not in dry run mode.

37894

@@ -7891,7 +9085,7 @@ EOF

37895

else

37896

oldobjs="$old_deplibs $non_pic_objects"

37897

if test "$preload" = yes && test -f "$symfileobj"; then

37898

- oldobjs="$oldobjs $symfileobj"

37899

+ func_append oldobjs " $symfileobj"

37900

37901

37902

addlibs="$old_convenience"

37903

@@ -7899,10 +9093,10 @@ EOF

37904

37905

if test -n "$addlibs"; then

37906

gentop="$output_objdir/${outputname}x"

37907

- generated="$generated $gentop"

37908

+ func_append generated " $gentop"

37909

37910

func_extract_archives $gentop $addlibs

37911

- oldobjs="$oldobjs $func_extract_archives_result"

37912

+ func_append oldobjs " $func_extract_archives_result"

37913

37914

37915

# Do each command in the archive commands.

37916

@@ -7913,10 +9107,10 @@ EOF

37917

# Add any objects from preloaded convenience libraries

37918

if test -n "$dlprefiles"; then

37919

gentop="$output_objdir/${outputname}x"

37920

- generated="$generated $gentop"

37921

+ func_append generated " $gentop"

37922

37923

func_extract_archives $gentop $dlprefiles

37924

- oldobjs="$oldobjs $func_extract_archives_result"

37925

+ func_append oldobjs " $func_extract_archives_result"

37926

37927

37928

# POSIX demands no paths to be encoded in archives. We have

37929

@@ -7932,9 +9126,9 @@ EOF

37930

done | sort | sort -uc >/dev/null 2>&1); then

37931

37932

else

37933

- $ECHO "copying selected object files to avoid basename conflicts..."

37934

+ echo "copying selected object files to avoid basename conflicts..."

37935

gentop="$output_objdir/${outputname}x"

37936

- generated="$generated $gentop"

37937

+ func_append generated " $gentop"

37938

func_mkdir_p "$gentop"

37939

save_oldobjs=$oldobjs

37940

oldobjs=

37941

@@ -7958,9 +9152,9 @@ EOF

37942

esac

37943

done

37944

func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"

37945

- oldobjs="$oldobjs $gentop/$newobj"

37946

+ func_append oldobjs " $gentop/$newobj"

37947

;;

37948

- *) oldobjs="$oldobjs $obj" ;;

37949

+ *) func_append oldobjs " $obj" ;;

37950

esac

37951

done

37952

37953

@@ -7970,6 +9164,16 @@ EOF

37954

len=$func_len_result

37955

if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then

37956

cmds=$old_archive_cmds

37957

+ elif test -n "$archiver_list_spec"; then

37958

+ func_verbose "using command file archive linking..."

37959

+ for obj in $oldobjs

37960

+ do

37961

+ func_to_tool_file "$obj"

37962

+ $ECHO "$func_to_tool_file_result"

37963

+ done > $output_objdir/$libname.libcmd

37964

+ func_to_tool_file "$output_objdir/$libname.libcmd"

37965

+ oldobjs=" $archiver_list_spec$func_to_tool_file_result"

37966

+ cmds=$old_archive_cmds

37967

else

37968

# the command line is too long to link in one step, link in parts

37969

func_verbose "using piecewise archive linking..."

37970

@@ -8043,7 +9247,7 @@ EOF

37971

done

37972

# Quote the link command for shipping.

37973

relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"

37974

- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`

37975

+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`

37976

if test "$hardcode_automatic" = yes ; then

37977

relink_command=

37978

37979

@@ -8066,9 +9270,19 @@ EOF

37980

eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`

37981

test -z "$libdir" && \

37982

func_fatal_error "\`$deplib' is not a valid libtool archive"

37983

- newdependency_libs="$newdependency_libs $libdir/$name"

37984

+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"

37985

+ ;;

37986

+ -L*)

37987

+ func_stripname -L '' "$deplib"

37988

+ func_replace_sysroot "$func_stripname_result"

37989

+ func_append newdependency_libs " -L$func_replace_sysroot_result"

37990

;;

37991

- *) newdependency_libs="$newdependency_libs $deplib" ;;

37992

+ -R*)

37993

+ func_stripname -R '' "$deplib"

37994

+ func_replace_sysroot "$func_stripname_result"

37995

+ func_append newdependency_libs " -R$func_replace_sysroot_result"

37996

+ ;;

37997

+ *) func_append newdependency_libs " $deplib" ;;

37998

esac

37999

done

38000

dependency_libs="$newdependency_libs"

38001

@@ -8082,9 +9296,9 @@ EOF

38002

eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`

38003

test -z "$libdir" && \

38004

func_fatal_error "\`$lib' is not a valid libtool archive"

38005

- newdlfiles="$newdlfiles $libdir/$name"

38006

+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"

38007

;;

38008

- *) newdlfiles="$newdlfiles $lib" ;;

38009

+ *) func_append newdlfiles " $lib" ;;

38010

esac

38011

done

38012

dlfiles="$newdlfiles"

38013

@@ -8101,7 +9315,7 @@ EOF

38014

eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $lib`

38015

test -z "$libdir" && \

38016

func_fatal_error "\`$lib' is not a valid libtool archive"

38017

- newdlprefiles="$newdlprefiles $libdir/$name"

38018

+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"

38019

;;

38020

esac

38021

done

38022

@@ -8113,7 +9327,7 @@ EOF

38023

[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;

38024

*) abs=`pwd`"/$lib" ;;

38025

esac

38026

- newdlfiles="$newdlfiles $abs"

38027

+ func_append newdlfiles " $abs"

38028

done

38029

dlfiles="$newdlfiles"

38030

newdlprefiles=

38031

@@ -8122,15 +9336,33 @@ EOF

38032

[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;

38033

*) abs=`pwd`"/$lib" ;;

38034

esac

38035

- newdlprefiles="$newdlprefiles $abs"

38036

+ func_append newdlprefiles " $abs"

38037

done

38038

dlprefiles="$newdlprefiles"

38039

38040

$RM $output

38939

38041

# place dlname in correct position for cygwin

38042

+ # In fact, it would be nice if we could use this code for all target

38043

+ # systems that can't hard-code library paths into their executables

38044

+ # and that have no shared library path variable independent of PATH,

38045

+ # but it turns out we can't easily determine that from inspecting

38046

+ # libtool variables, so we have to hard-code the OSs to which it

38047

+ # applies here; at the moment, that means platforms that use the PE

38048

+ # object format with DLL files. See the long comment at the top of

38049

+ # tests/bindir.at for full details.

38940

38050

tdlname=$dlname

38941

38051

case $host,$output,$installed,$module,$dlname in

38942

- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;

38943

+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;

38052

- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;

38053

+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)

38054

+ # If a -bindir argument was supplied, place the dll there.

38055

+ if test "x$bindir" != x ;

38056

+ then

38057

+ func_relative_path "$install_libdir" "$bindir"

38058

+ tdlname=$func_relative_path_result$dlname

38059

+ else

38060

+ # Otherwise fall back on heuristic.

38061

+ tdlname=../bin/$dlname

38062

+ fi

38063

+ ;;

38944

38064

esac

38945

38065

$ECHO > $output "\

38946

38066

# $outputname - a libtool library file

38947

--- protobuf-2.3.0.orig/gtest/build-aux/config.h.in

38948

+++ protobuf-2.3.0/gtest/build-aux/config.h.in

38949

@@ -52,6 +52,9 @@

38950

/* Define to the one symbol short name of this package. */

38951

#undef PACKAGE_TARNAME

38952

38953

+/* Define to the home page for this package. */

38954

+#undef PACKAGE_URL

38955

38956

/* Define to the version of this package. */

38957

#undef PACKAGE_VERSION

38958

38959

--- protobuf-2.3.0.orig/gtest/build-aux/config.sub

38960

+++ protobuf-2.3.0/gtest/build-aux/config.sub

38961

@@ -1,10 +1,10 @@

38962

#! /bin/sh

38963

# Configuration validation subroutine script.

38964

38965

-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,

38966

-# Inc.

38967

+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

38968

+# Free Software Foundation, Inc.

38969

38970

-timestamp='2007-06-28'

38971

+timestamp='2010-01-22'

38972

38973

# This file is (in principle) common to ALL GNU software.

38974

# The presence of a machine in this file suggests that SOME GNU software

38975

@@ -32,13 +32,16 @@ timestamp='2007-06-28'

38976

38977

38978

# Please send patches to <config-patches@gnu.org>. Submit a context

38979

-# diff and a properly formatted ChangeLog entry.

38980

+# diff and a properly formatted GNU ChangeLog entry.

38981

38982

# Configuration subroutine to validate and canonicalize a configuration type.

38983

# Supply the specified configuration type as an argument.

38984

# If it is invalid, we print an error message on stderr and exit with code 1.

38985

# Otherwise, we print the canonical config type on stdout and succeed.

38986

38987

+# You can get the latest version of this script from:

38988

+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD

38989

38990

# This file is supposed to be the same for all GNU packages

38991

# and recognize all the CPU types, system types and aliases

38992

# that are meaningful with *any* GNU software.

38993

@@ -72,8 +75,9 @@ Report bugs and patches to <config-patch

38994

version="\

38995

GNU config.sub ($timestamp)

38996

38997

38998

-Free Software Foundation, Inc.

38999

39000

+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free

39001

+Software Foundation, Inc.

39002

39003

This is free software; see the source for copying conditions. There is NO

39004

warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

39005

@@ -122,6 +126,7 @@ maybe_os=`echo $1 | sed 's/^$.*$-\([^-

39006

case $maybe_os in

39007

39008

39009

+ kopensolaris*-gnu* | \

39010

storm-chaos* | os2-emx* | rtmk-nova*)

39011

os=-$maybe_os

39012

basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`

39013

@@ -148,10 +153,13 @@ case $os in

39014

-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\

39015

-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \

39016

39017

- -apple | -axis | -knuth | -cray)

39018

+ -apple | -axis | -knuth | -cray | -microblaze)

39019

os=

39020

basic_machine=$1

39021

;;

39022

+ -bluegene*)

39023

+ os=-cnk

39024

+ ;;

39025

-sim | -cisco | -oki | -wec | -winbond)

39026

os=

39027

basic_machine=$1

39028

@@ -249,13 +257,16 @@ case $basic_machine in

39029

39030

| i370 | i860 | i960 | ia64 \

39031

| ip2k | iq2000 \

39032

+ | lm32 \

39033

| m32c | m32r | m32rle | m68000 | m68k | m88k \

39034

- | maxq | mb | microblaze | mcore | mep \

39035

+ | maxq | mb | microblaze | mcore | mep | metag \

39036

39037

| mips16 \

39038

| mips64 | mips64el \

39039

- | mips64vr | mips64vrel \

39040

+ | mips64octeon | mips64octeonel \

39041

| mips64orion | mips64orionel \

39042

+ | mips64r5900 | mips64r5900el \

39043

+ | mips64vr | mips64vrel \

39044

| mips64vr4100 | mips64vr4100el \

39045

| mips64vr4300 | mips64vr4300el \

39046

| mips64vr5000 | mips64vr5000el \

39047

@@ -268,6 +279,7 @@ case $basic_machine in

39048

| mipsisa64sr71k | mipsisa64sr71kel \

39049

| mipstx39 | mipstx39el \

39050

| mn10200 | mn10300 \

39051

+ | moxie \

39052

| mt \

39053

| msp430 \

39054

| nios | nios2 \

39055

@@ -276,20 +288,22 @@ case $basic_machine in

39056

| pdp10 | pdp11 | pj | pjl \

39057

39058

| pyramid \

39059

+ | rx \

39060

| score \

39061

- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

39062

+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

39063

| sh64 | sh64le \

39064

39065

| sparcv8 | sparcv9 | sparcv9b | sparcv9v \

39066

| spu | strongarm \

39067

39068

+ | ubicom32 \

39069

| v850 | v850e \

39070

| we32k \

39071

39072

- | z8k)

39073

+ | z8k | z80)

39074

basic_machine=$basic_machine-unknown

39075

;;

39076

- m6811 | m68hc11 | m6812 | m68hc12)

39077

+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)

39078

# Motorola 68HC11/12.

39079

basic_machine=$basic_machine-unknown

39080

os=-none

39081

@@ -329,14 +343,17 @@ case $basic_machine in

39082

39083

| i*86-* | i860-* | i960-* | ia64-* \

39084

| ip2k-* | iq2000-* \

39085

+ | lm32-* \

39086

| m32c-* | m32r-* | m32rle-* \

39087

| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \

39088

- | m88110-* | m88k-* | maxq-* | mcore-* \

39089

+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \

39090

39091

| mips16-* \

39092

| mips64-* | mips64el-* \

39093

- | mips64vr-* | mips64vrel-* \

39094

+ | mips64octeon-* | mips64octeonel-* \

39095

| mips64orion-* | mips64orionel-* \

39096

+ | mips64r5900-* | mips64r5900el-* \

39097

+ | mips64vr-* | mips64vrel-* \

39098

| mips64vr4100-* | mips64vr4100el-* \

39099

| mips64vr4300-* | mips64vr4300el-* \

39100

| mips64vr5000-* | mips64vr5000el-* \

39101

@@ -357,21 +374,27 @@ case $basic_machine in

39102

| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

39103

39104

| pyramid-* \

39105

- | romp-* | rs6000-* \

39106

- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

39107

+ | romp-* | rs6000-* | rx-* \

39108

+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \

39109

39110

39111

| sparclite-* \

39112

39113

| tahoe-* | thumb-* \

39114

39115

+ | tile-* | tilegx-* \

39116

| tron-* \

39117

+ | ubicom32-* \

39118

| v850-* | v850e-* | vax-* \

39119

| we32k-* \

39120

| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \

39121

- | xstormy16-* | xtensa-* \

39122

+ | xstormy16-* | xtensa*-* \

39123

| ymp-* \

39124

- | z8k-*)

39125

+ | z8k-* | z80-*)

39126

+ ;;

39127

+ # Recognize the basic CPU types without company name, with glob match.

39128

+ xtensa*)

39129

+ basic_machine=$basic_machine-unknown

39130

;;

39131

# Recognize the various machine names and aliases which stand

39132

# for a CPU type and a company and sometimes even an OS.

39133

@@ -435,6 +458,10 @@ case $basic_machine in

39134

basic_machine=m68k-apollo

39135

os=-bsd

39136

;;

39137

+ aros)

39138

+ basic_machine=i386-pc

39139

+ os=-aros

39140

+ ;;

39141

aux)

39142

basic_machine=m68k-apple

39143

os=-aux

39144

@@ -443,10 +470,26 @@ case $basic_machine in

39145

basic_machine=ns32k-sequent

39146

os=-dynix

39147

;;

39148

+ blackfin)

39149

+ basic_machine=bfin-unknown

39150

+ os=-linux

39151

+ ;;

39152

+ blackfin-*)

39153

+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`

39154

+ os=-linux

39155

+ ;;

39156

+ bluegene*)

39157

+ basic_machine=powerpc-ibm

39158

+ os=-cnk

39159

+ ;;

39160

c90)

39161

basic_machine=c90-cray

39162

os=-unicos

39163

;;

39164

+ cegcc)

39165

+ basic_machine=arm-unknown

39166

+ os=-cegcc

39167

+ ;;

39168

convex-c1)

39169

basic_machine=c1-convex

39170

os=-bsd

39171

@@ -514,6 +557,10 @@ case $basic_machine in

39172

basic_machine=m88k-motorola

39173

os=-sysv3

39174

;;

39175

+ dicos)

39176

+ basic_machine=i686-pc

39177

+ os=-dicos

39178

+ ;;

39179

djgpp)

39180

basic_machine=i586-pc

39181

os=-msdosdjgpp

39182

@@ -668,6 +715,14 @@ case $basic_machine in

39183

basic_machine=m68k-isi

39184

os=-sysv

39185

;;

39186

+ m68knommu)

39187

+ basic_machine=m68k-unknown

39188

+ os=-linux

39189

+ ;;

39190

+ m68knommu-*)

39191

+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`

39192

+ os=-linux

39193

+ ;;

39194

m88k-omron*)

39195

basic_machine=m88k-omron

39196

;;

39197

@@ -679,6 +734,9 @@ case $basic_machine in

39198

basic_machine=ns32k-utek

39199

os=-sysv

39200

;;

39201

+ microblaze)

39202

+ basic_machine=microblaze-xilinx

39203

+ ;;

39204

mingw32)

39205

basic_machine=i386-pc

39206

os=-mingw32

39207

@@ -813,6 +871,14 @@ case $basic_machine in

39208

basic_machine=i860-intel

39209

os=-osf

39210

;;

39211

+ parisc)

39212

+ basic_machine=hppa-unknown

39213

+ os=-linux

39214

+ ;;

39215

+ parisc-*)

39216

+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`

39217

+ os=-linux

39218

+ ;;

39219

pbd)

39220

basic_machine=sparc-tti

39221

;;

39222

@@ -1021,6 +1087,15 @@ case $basic_machine in

39223

basic_machine=tic6x-unknown

39224

os=-coff

39225

;;

39226

+ # This must be matched before tile*.

39227

+ tilegx*)

39228

+ basic_machine=tilegx-unknown

39229

+ os=-linux-gnu

39230

+ ;;

39231

+ tile*)

39232

+ basic_machine=tile-unknown

39233

+ os=-linux-gnu

39234

+ ;;

39235

tx39)

39236

basic_machine=mipstx39-unknown

39237

;;

39238

@@ -1096,6 +1171,10 @@ case $basic_machine in

39239

basic_machine=z8k-unknown

39240

os=-sim

39241

;;

39242

+ z80-*-coff)

39243

+ basic_machine=z80-unknown

39244

+ os=-sim

39245

+ ;;

39246

none)

39247

basic_machine=none-none

39248

os=-none

39249

@@ -1134,7 +1213,7 @@ case $basic_machine in

39250

we32k)

39251

basic_machine=we32k-att

39252

;;

39253

- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)

39254

39255

basic_machine=sh-unknown

39256

;;

39257

sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)

39258

@@ -1184,6 +1263,9 @@ case $os in

39259

# First match some system type aliases

39260

# that might get confused with valid system types.

39261

# -solaris* is a basic system type, with this one exception.

39262

+ -auroraux)

39263

+ os=-auroraux

39264

+ ;;

39265

-solaris1 | -solaris1.*)

39266

os=`echo $os | sed -e 's|solaris1|sunos4|'`

39267

;;

39268

@@ -1204,10 +1286,11 @@ case $os in

39269

# Each alternative MUST END IN A *, to match a version number.

39270

# -sysv* is not here because it comes later, after sysvr4.

39271

39272

- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\

39273

39274

+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\

39275

39276

+ | -sym* | -kopensolaris* \

39277

39278

- | -aos* \

39279

+ | -aos* | -aros* \

39280

39281

39282

39283

@@ -1216,7 +1299,7 @@ case $os in

39284

39285

39286

| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \

39287

- | -chorusos* | -chorusrdb* \

39288

+ | -chorusos* | -chorusrdb* | -cegcc* \

39289

39290

| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \

39291

| -uxpv* | -beos* | -mpeix* | -udk* \

39292

@@ -1226,7 +1309,7 @@ case $os in

39293

39294

39295

| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \

39296

39297

39298

# Remember, each alternative MUST END IN *, to match a version number.

39299

;;

39300

-qnx*)

39301

@@ -1356,6 +1439,11 @@ case $os in

39302

-zvmoe)

39303

os=-zvmoe

39304

;;

39305

+ -dicos*)

39306

+ os=-dicos

39307

+ ;;

39308

+ -nacl*)

39309

+ ;;

39310

-none)

39311

;;

39312

39313

@@ -1553,7 +1641,7 @@ case $basic_machine in

39314

-sunos*)

39315

vendor=sun

39316

;;

39317

- -aix*)

39318

+ -cnk*|-aix*)

39319

vendor=ibm

39320

;;

39321

-beos*)

39322

--- protobuf-2.3.0.orig/gtest/build-aux/depcomp

39323

+++ protobuf-2.3.0/gtest/build-aux/depcomp

39324

@@ -1,10 +1,10 @@

39325

#! /bin/sh

39326

# depcomp - compile a program generating dependencies as side-effects

39327

39328

-scriptversion=2007-03-29.01

39329

+scriptversion=2009-04-28.21; # UTC

39330

39331

39332

-# Foundation, Inc.

39333

39334

+# Software Foundation, Inc.

39335

39336

# This program is free software; you can redistribute it and/or modify

39337

# it under the terms of the GNU General Public License as published by

39338

@@ -17,9 +17,7 @@ scriptversion=2007-03-29.01

39339

# GNU General Public License for more details.

39340

39341

# You should have received a copy of the GNU General Public License

39342

-# along with this program; if not, write to the Free Software

39343

-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

39344

-# 02110-1301, USA.

39345

+# along with this program. If not, see <http://www.gnu.org/licenses/>.

39346

39347

# As a special exception to the GNU General Public License, if you

39348

# distribute this file as part of a program that contains a

39349

@@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then

39350

depmode=dashmstdout

39351

39352

39353

+cygpath_u="cygpath -u -f -"

39354

+if test "$depmode" = msvcmsys; then

39355

+ # This is just like msvisualcpp but w/o cygpath translation.

39356

+ # Just convert the backslash-escaped backslashes to single forward

39357

+ # slashes to satisfy depend.m4

39358

+ cygpath_u="sed s,\\\\\\\\,/,g"

39359

+ depmode=msvisualcpp

39360

+fi

39361

39362

case "$depmode" in

39363

gcc3)

39364

## gcc 3 implements dependency tracking that does exactly what

39365

@@ -192,14 +199,14 @@ sgi)

39366

' < "$tmpdepfile" \

39367

| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \

39368

tr '

39369

-' ' ' >> $depfile

39370

- echo >> $depfile

39371

+' ' ' >> "$depfile"

39372

+ echo >> "$depfile"

39373

39374

# The second pass generates a dummy entry for each header file.

39375

tr ' ' '

39376

' < "$tmpdepfile" \

39377

| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \

39378

- >> $depfile

39379

+ >> "$depfile"

39380

else

39381

# The sourcefile does not contain any dependencies, so just

39382

# store a dummy comment line, to avoid errors with the Makefile

39383

@@ -328,7 +335,12 @@ hp2)

39384

if test -f "$tmpdepfile"; then

39385

sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"

39386

# Add `dependent.h:' lines.

39387

- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"

39388

+ sed -ne '2,${

39389

+ s/^ *//

39390

+ s/ \\*$//

39391

+ s/$/:/

39392

+ p

39393

+ }' "$tmpdepfile" >> "$depfile"

39394

else

39395

echo "#dummy" > "$depfile"

39396

39397

@@ -404,7 +416,7 @@ dashmstdout)

39398

39399

# Remove the call to Libtool.

39400

if test "$libtool" = yes; then

39401

- while test $1 != '--mode=compile'; do

39402

+ while test "X$1" != 'X--mode=compile'; do

39403

shift

39404

done

39405

shift

39406

@@ -455,32 +467,39 @@ makedepend)

39407

"$@" || exit $?

39408

# Remove any Libtool call

39409

if test "$libtool" = yes; then

39410

- while test $1 != '--mode=compile'; do

39411

+ while test "X$1" != 'X--mode=compile'; do

39412

shift

39413

done

39414

shift

39415

39416

# X makedepend

39417

shift

39418

- cleared=no

39419

- for arg in "$@"; do

39420

+ cleared=no eat=no

39421

+ for arg

39422

+ do

39423

case $cleared in

39424

no)

39425

set ""; shift

39426

cleared=yes ;;

39427

esac

39428

+ if test $eat = yes; then

39429

+ eat=no

39430

+ continue

39431

+ fi

39432

case "$arg" in

39433

-D*|-I*)

39434

set fnord "$@" "$arg"; shift ;;

39435

# Strip any option that makedepend may not understand. Remove

39436

# the object too, otherwise makedepend will parse it as a source file.

39437

+ -arch)

39438

+ eat=yes ;;

39439

-*|$object)

39440

;;

39441

39442

set fnord "$@" "$arg"; shift ;;

39443

esac

39444

done

39445

- obj_suffix="`echo $object | sed 's/^.*\././'`"

39446

+ obj_suffix=`echo "$object" | sed 's/^.*\././'`

39447

touch "$tmpdepfile"

39448

${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"

39449

rm -f "$depfile"

39450

@@ -500,7 +519,7 @@ cpp)

39451

39452

# Remove the call to Libtool.

39453

if test "$libtool" = yes; then

39454

- while test $1 != '--mode=compile'; do

39455

+ while test "X$1" != 'X--mode=compile'; do

39456

shift

39457

done

39458

shift

39459

@@ -538,13 +557,27 @@ cpp)

39460

39461

msvisualcpp)

39462

# Important note: in order to support this mode, a compiler *must*

39463

- # always write the preprocessed file to stdout, regardless of -o,

39464

- # because we must use -o when running libtool.

39465

+ # always write the preprocessed file to stdout.

39466

"$@" || exit $?

39467

39468

+ # Remove the call to Libtool.

39469

+ if test "$libtool" = yes; then

39470

+ while test "X$1" != 'X--mode=compile'; do

39471

+ shift

39472

+ done

39473

+ shift

39474

+ fi

39475

39476

IFS=" "

39477

for arg

39478

39479

case "$arg" in

39480

+ -o)

39481

+ shift

39482

+ ;;

39483

+ $object)

39484

+ shift

39485

+ ;;

39486

"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")

39487

set fnord "$@"

39488

shift

39489

@@ -557,16 +590,23 @@ msvisualcpp)

38067

@@ -8189,7 +9421,7 @@ relink_command=\"$relink_command\""

38068

exit $EXIT_SUCCESS

38069

}

38070

38071

-{ test "$mode" = link || test "$mode" = relink; } &&

38072

+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&

38073

func_mode_link ${1+"$@"}

38074

38075

38076

@@ -8209,9 +9441,9 @@ func_mode_uninstall ()

38077

for arg

38078

38079

case $arg in

38080

- -f) RM="$RM $arg"; rmforce=yes ;;

38081

- -*) RM="$RM $arg" ;;

38082

- *) files="$files $arg" ;;

38083

+ -f) func_append RM " $arg"; rmforce=yes ;;

38084

+ -*) func_append RM " $arg" ;;

38085

+ *) func_append files " $arg" ;;

38086

esac

38087

done

38088

38089

@@ -8220,24 +9452,23 @@ func_mode_uninstall ()

38090

38091

rmdirs=

38092

38093

- origobjdir="$objdir"

38094

for file in $files; do

38095

func_dirname "$file" "" "."

38096

dir="$func_dirname_result"

38097

if test "X$dir" = X.; then

38098

- objdir="$origobjdir"

38099

+ odir="$objdir"

38100

else

38101

- objdir="$dir/$origobjdir"

38102

+ odir="$dir/$objdir"

38103

38104

func_basename "$file"

38105

name="$func_basename_result"

38106

- test "$mode" = uninstall && objdir="$dir"

38107

+ test "$opt_mode" = uninstall && odir="$dir"

38108

38109

- # Remember objdir for removal later, being careful to avoid duplicates

38110

- if test "$mode" = clean; then

38111

+ # Remember odir for removal later, being careful to avoid duplicates

38112

+ if test "$opt_mode" = clean; then

38113

case " $rmdirs " in

38114

- *" $objdir "*) ;;

38115

- *) rmdirs="$rmdirs $objdir" ;;

38116

+ *" $odir "*) ;;

38117

+ *) func_append rmdirs " $odir" ;;

38118

esac

38119

38120

38121

@@ -8263,18 +9494,17 @@ func_mode_uninstall ()

38122

38123

# Delete the libtool libraries and symlinks.

38124

for n in $library_names; do

38125

- rmfiles="$rmfiles $objdir/$n"

38126

+ func_append rmfiles " $odir/$n"

38127

done

38128

- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"

38129

+ test -n "$old_library" && func_append rmfiles " $odir/$old_library"

38130

38131

- case "$mode" in

38132

+ case "$opt_mode" in

38133

clean)

38134

- case " $library_names " in

38135

- # " " in the beginning catches empty $dlname

38136

+ case " $library_names " in

38137

*" $dlname "*) ;;

38138

- *) rmfiles="$rmfiles $objdir/$dlname" ;;

38139

+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;

38140

esac

38141

- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"

38142

+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"

38143

;;

38144

uninstall)

38145

if test -n "$library_names"; then

38146

@@ -8302,19 +9532,19 @@ func_mode_uninstall ()

38147

# Add PIC object to the list of files to remove.

38148

if test -n "$pic_object" &&

38149

test "$pic_object" != none; then

38150

- rmfiles="$rmfiles $dir/$pic_object"

38151

+ func_append rmfiles " $dir/$pic_object"

38152

38153

38154

# Add non-PIC object to the list of files to remove.

38155

if test -n "$non_pic_object" &&

38156

test "$non_pic_object" != none; then

38157

- rmfiles="$rmfiles $dir/$non_pic_object"

38158

+ func_append rmfiles " $dir/$non_pic_object"

38159

38160

39490

38161

;;

39491

esac

39492

done

39493

- "$@" -E |

39494

- sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"

39495

+ "$@" -E 2>/dev/null |

39496

+ sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"

39497

rm -f "$depfile"

39498

echo "$object : \\" > "$depfile"

39499

- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s:: \1 \\:p' >> "$depfile"

39500

+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s:: \1 \\:p' >> "$depfile"

39501

echo " " >> "$depfile"

39502

- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::\1\::p' >> "$depfile"

39503

+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"

39504

rm -f "$tmpdepfile"

39505

;;

39506

39507

+msvcmsys)

39508

+ # This case exists only to let depend.m4 do its work. It works by

39509

+ # looking at the text of this script. This case will never be run,

39510

+ # since it is checked for above.

39511

+ exit 1

39512

+ ;;

39513

39514

none)

39515

exec "$@"

39516

;;

39517

@@ -585,5 +625,6 @@ exit 0

39518

# eval: (add-hook 'write-file-hooks 'time-stamp)

39519

# time-stamp-start: "scriptversion="

39520

# time-stamp-format: "%:y-%02m-%02d.%02H"

39521

-# time-stamp-end: "$"

39522

+# time-stamp-time-zone: "UTC"

39523

+# time-stamp-end: "; # UTC"

39524

# End:

39525

--- protobuf-2.3.0.orig/gtest/build-aux/install-sh

39526

+++ protobuf-2.3.0/gtest/build-aux/install-sh

39527

@@ -1,7 +1,7 @@

39528

#!/bin/sh

39529

# install - install a program, script, or datafile

39530

39531

-scriptversion=2006-12-25.00

39532

+scriptversion=2009-04-28.21; # UTC

39533

39534

# This originates from X11R5 (mit/util/scripts/install.sh), which was

39535

# later released in X11R6 (xc/config/util/install.sh) with the

39536

@@ -515,5 +515,6 @@ done

39537

# eval: (add-hook 'write-file-hooks 'time-stamp)

39538

# time-stamp-start: "scriptversion="

39539

# time-stamp-format: "%:y-%02m-%02d.%02H"

39540

-# time-stamp-end: "$"

39541

+# time-stamp-time-zone: "UTC"

39542

+# time-stamp-end: "; # UTC"

39543

# End:

39544

--- protobuf-2.3.0.orig/gtest/build-aux/missing

39545

+++ protobuf-2.3.0/gtest/build-aux/missing

39546

@@ -1,10 +1,10 @@

39547

#! /bin/sh

39548

# Common stub for a few missing GNU programs while installing.

39549

39550

-scriptversion=2006-05-10.23

39551

+scriptversion=2009-04-28.21; # UTC

39552

39553

39554

-# Free Software Foundation, Inc.

39555

39556

+# 2008, 2009 Free Software Foundation, Inc.

39557

# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.

39558

39559

# This program is free software; you can redistribute it and/or modify

39560

@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23

39561

# GNU General Public License for more details.

39562

39563

# You should have received a copy of the GNU General Public License

39564

-# along with this program; if not, write to the Free Software

39565

-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

39566

-# 02110-1301, USA.

39567

+# along with this program. If not, see <http://www.gnu.org/licenses/>.

39568

39569

# As a special exception to the GNU General Public License, if you

39570

# distribute this file as part of a program that contains a

39571

@@ -89,6 +87,9 @@ Supported PROGRAM values:

39572

tar try tar, gnutar, gtar, then tar without non-portable flags

39573

yacc create \`y.tab.[ch]', if possible, from existing .[ch]

39574

39575

+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and

39576

+\`g' are ignored when checking the name.

39577

39578

Send bug reports to <bug-automake@gnu.org>."

39579

exit $?

39580

;;

39581

@@ -106,15 +107,22 @@ Send bug reports to <bug-automake@gnu.or

39582

39583

esac

39584

39585

+# normalize program name to check for.

39586

+program=`echo "$1" | sed '

39587

+ s/^gnu-//; t

39588

+ s/^gnu//; t

39589

+ s/^g//; t'`

39590

39591

# Now exit if we have it, but it failed. Also exit now if we

39592

# don't have it and --version was passed (most likely to detect

39593

-# the program).

39594

+# the program). This is about non-GNU programs, so use $1 not

39595

+# $program.

39596

case $1 in

39597

- lex|yacc)

39598

+ lex*|yacc*)

39599

# Not GNU programs, they don't have --version.

39600

;;

39601

39602

- tar)

39603

+ tar*)

39604

if test -n "$run"; then

39605

echo 1>&2 "ERROR: \`tar' requires --run"

39606

exit 1

39607

@@ -138,7 +146,7 @@ esac

39608

39609

# If it does not exist, or fails to run (possibly an outdated version),

39610

# try to emulate it.

39611

-case $1 in

39612

+case $program in

39613

aclocal*)

39614

echo 1>&2 "\

39615

WARNING: \`$1' is $msg. You should only need it if

39616

@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg. You should only

39617

touch aclocal.m4

39618

;;

39619

39620

- autoconf)

39621

+ autoconf*)

39622

echo 1>&2 "\

39623

WARNING: \`$1' is $msg. You should only need it if

39624

you modified \`${configure_ac}'. You might want to install the

39625

@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg. You should only

39626

touch configure

39627

;;

39628

39629

- autoheader)

39630

+ autoheader*)

39631

echo 1>&2 "\

39632

WARNING: \`$1' is $msg. You should only need it if

39633

you modified \`acconfig.h' or \`${configure_ac}'. You might want

39634

@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg. You should only

39635

while read f; do touch "$f"; done

39636

;;

39637

39638

- autom4te)

39639

+ autom4te*)

39640

echo 1>&2 "\

39641

WARNING: \`$1' is needed, but is $msg.

39642

You might have modified some files without having the

39643

@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.

39644

39645

;;

39646

39647

- bison|yacc)

39648

+ bison*|yacc*)

39649

echo 1>&2 "\

39650

WARNING: \`$1' $msg. You should only need it if

39651

you modified a \`.y' file. You may need the \`Bison' package

39652

@@ -240,7 +248,7 @@ WARNING: \`$1' $msg. You should only ne

39653

39654

;;

39655

39656

- lex|flex)

39657

+ lex*|flex*)

39658

echo 1>&2 "\

39659

WARNING: \`$1' is $msg. You should only need it if

39660

you modified a \`.l' file. You may need the \`Flex' package

39661

@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg. You should only

39662

39663

;;

39664

39665

- help2man)

39666

+ help2man*)

39667

echo 1>&2 "\

39668

WARNING: \`$1' is $msg. You should only need it if

39669

you modified a dependency of a manual page. You may need the

39670

@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg. You should only

39671

else

39672

test -z "$file" || exec >$file

39673

echo ".ab help2man is required to generate this page"

39674

- exit 1

39675

+ exit $?

39676

39677

;;

39678

39679

- makeinfo)

39680

+ makeinfo*)

39681

echo 1>&2 "\

39682

WARNING: \`$1' is $msg. You should only need it if

39683

you modified a \`.texi' or \`.texinfo' file, or any other file

39684

@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg. You should only

39685

touch $file

39686

;;

39687

39688

- tar)

39689

+ tar*)

39690

shift

39691

39692

# We have already tried tar in the generic part.

39693

@@ -363,5 +371,6 @@ exit 0

39694

# eval: (add-hook 'write-file-hooks 'time-stamp)

39695

# time-stamp-start: "scriptversion="

39696

# time-stamp-format: "%:y-%02m-%02d.%02H"

39697

-# time-stamp-end: "$"

39698

+# time-stamp-time-zone: "UTC"

39699

+# time-stamp-end: "; # UTC"

39700

# End:

38162

38163

38164

- if test "$mode" = clean ; then

38165

+ if test "$opt_mode" = clean ; then

38166

noexename=$name

38167

case $file in

38168

*.exe)

38169

@@ -8324,7 +9554,7 @@ func_mode_uninstall ()

38170

noexename=$func_stripname_result

38171

# $file with .exe has already been added to rmfiles,

38172

# add $file without .exe

38173

- rmfiles="$rmfiles $file"

38174

+ func_append rmfiles " $file"

38175

;;

38176

esac

38177

# Do a test to see if this is a libtool program.

38178

@@ -8333,7 +9563,7 @@ func_mode_uninstall ()

38179

func_ltwrapper_scriptname "$file"

38180

relink_command=

38181

func_source $func_ltwrapper_scriptname_result

38182

- rmfiles="$rmfiles $func_ltwrapper_scriptname_result"

38183

+ func_append rmfiles " $func_ltwrapper_scriptname_result"

38184

else

38185

relink_command=

38186

func_source $dir/$noexename

38187

@@ -8341,12 +9571,12 @@ func_mode_uninstall ()

38188

38189

# note $name still contains .exe if it was in $file originally

38190

# as does the version of $file that was added into $rmfiles

38191

- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"

38192

+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}"

38193

if test "$fast_install" = yes && test -n "$relink_command"; then

38194

- rmfiles="$rmfiles $objdir/lt-$name"

38195

+ func_append rmfiles " $odir/lt-$name"

38196

38197

if test "X$noexename" != "X$name" ; then

38198

- rmfiles="$rmfiles $objdir/lt-${noexename}.c"

38199

+ func_append rmfiles " $odir/lt-${noexename}.c"

38200

38201

38202

38203

@@ -8354,7 +9584,6 @@ func_mode_uninstall ()

38204

esac

38205

func_show_eval "$RM $rmfiles" 'exit_status=1'

38206

done

38207

- objdir="$origobjdir"

38208

38209

# Try to remove the ${objdir}s in the directories where we deleted files

38210

for dir in $rmdirs; do

38211

@@ -8366,16 +9595,16 @@ func_mode_uninstall ()

38212

exit $exit_status

38213

}

38214

38215

-{ test "$mode" = uninstall || test "$mode" = clean; } &&

38216

+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&

38217

func_mode_uninstall ${1+"$@"}

38218

38219

-test -z "$mode" && {

38220

+test -z "$opt_mode" && {

38221

help="$generic_help"

38222

func_fatal_help "you must specify a MODE"

38223

}

38224

38225

test -z "$exec_cmd" && \

38226

- func_fatal_help "invalid operation mode \`$mode'"

38227

+ func_fatal_help "invalid operation mode \`$opt_mode'"

38228

38229

if test -n "$exec_cmd"; then

38230

eval exec "$exec_cmd"

Older »