~ubuntu-branches/ubuntu/trusty/expat/trusty-proposed : revision 11

1

#! /bin/sh /usr/share/dpatch/dpatch-run

2

## 342684_libtoolize.dpatch by Petr Salinger and

3

## Ardo van Rangelrooij <ardo@debian.org>

4

##

5

## All lines beginning with `## DP:' are a description of the patch.

6

## DP: We need a newer libtool version to support GNU/kFreeBSD.

7

## DP:

8

## DP: <URL:http://bugs.debian.org/342684>

9

## DP: <URL:http://bugs.debian.org/439127>

10

11

@DPATCH@

12

diff -urNad trunk~/configure trunk/configure

13

--- trunk~/configure 2007-06-05 20:19:38.000000000 +0200

14

+++ trunk/configure 2008-05-07 05:23:02.000000000 +0200

15

@@ -1,27 +1,56 @@

16

#! /bin/sh

17

# Guess values for system-dependent variables and create Makefiles.

18

-# Generated by GNU Autoconf 2.59 for expat 2.0.1.

19

+# Generated by GNU Autoconf 2.61 for expat 2.0.1.

20

#

21

# Report bugs to <expat-bugs@libexpat.org>.

22

#

23

24

25

+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

26

# This configure script is free software; the Free Software Foundation

27

# gives unlimited permission to copy, distribute and modify it.

28

## --------------------- ##

29

## M4sh Initialization. ##

30

## --------------------- ##

31

32

-# Be Bourne compatible

33

+# Be more Bourne compatible

34

+DUALCASE=1; export DUALCASE # for MKS sh

35

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

36

emulate sh

37

NULLCMD=:

38

# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

39

# is contrary to our usage. Disable this feature.

40

alias -g '${1+"$@"}'='"$@"'

41

-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then

42

- set -o posix

43

+ setopt NO_GLOB_SUBST

44

+else

45

+ case `(set -o) 2>/dev/null` in

46

+ *posix*) set -o posix ;;

47

+esac

48

+

49

+fi

50

+

51

+

52

+

53

+

54

+# PATH needs CR

55

+# Avoid depending upon Character Ranges.

56

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

57

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

58

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

59

+as_cr_digits='0123456789'

60

+as_cr_alnum=$as_cr_Letters$as_cr_digits

61

+

62

+# The user is always right.

63

+if test "${PATH_SEPARATOR+set}" != set; then

64

+ echo "#! /bin/sh" >conf$$.sh

65

+ echo "exit 0" >>conf$$.sh

66

+ chmod +x conf$$.sh

67

+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

68

+ PATH_SEPARATOR=';'

69

+ else

70

+ PATH_SEPARATOR=:

71

+ fi

72

+ rm -f conf$$.sh

73

fi

74

-DUALCASE=1; export DUALCASE # for MKS sh

75

76

# Support unset when possible.

77

if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

78

@@ -31,8 +60,43 @@

79

fi

80

81

82

+# IFS

83

+# We need space, tab and new line, in precisely that order. Quoting is

84

+# there to prevent editors from complaining about space-tab.

85

+# (If _AS_PATH_WALK were called with IFS unset, it would disable word

86

+# splitting by setting IFS to empty value.)

87

+as_nl='

88

+'

89

+IFS=" "" $as_nl"

90

+

91

+# Find who we are. Look in the path if we contain no directory separator.

92

+case $0 in

93

+ *[\\/]* ) as_myself=$0 ;;

94

+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

95

+for as_dir in $PATH

96

+do

97

+ IFS=$as_save_IFS

98

+ test -z "$as_dir" && as_dir=.

99

+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

100

+done

101

+IFS=$as_save_IFS

102

+

103

+ ;;

104

+esac

105

+# We did not find ourselves, most probably we were run as `sh COMMAND'

106

+# in which case we are not to be found in the path.

107

+if test "x$as_myself" = x; then

108

+ as_myself=$0

109

+fi

110

+if test ! -f "$as_myself"; then

111

+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

112

+ { (exit 1); exit 1; }

113

+fi

114

+

115

# Work around bugs in pre-3.0 UWIN ksh.

116

-$as_unset ENV MAIL MAILPATH

117

+for as_var in ENV MAIL MAILPATH

118

+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

119

+done

120

PS1='$ '

121

PS2='> '

122

PS4='+ '

123

@@ -46,18 +110,19 @@

124

if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

125

eval $as_var=C; export $as_var

126

else

127

- $as_unset $as_var

128

+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

129

fi

130

done

131

132

# Required to use basename.

133

-if expr a : '$a$' >/dev/null 2>&1; then

134

+if expr a : '$a$' >/dev/null 2>&1 &&

135

+ test "X`expr 00001 : '.*$...$'`" = X001; then

136

as_expr=expr

137

else

138

as_expr=false

139

fi

140

141

-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then

142

+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then

143

as_basename=basename

144

else

145

as_basename=false

146

@@ -65,157 +130,388 @@

147

148

149

# Name of the executable.

150

-as_me=`$as_basename "$0" ||

151

+as_me=`$as_basename -- "$0" ||

152

$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

153

X"$0" : 'X$//$$' \| \

154

- X"$0" : 'X$/$$' \| \

155

- . : '$.$' 2>/dev/null ||

156

+ X"$0" : 'X$/$' \| . 2>/dev/null ||

157

echo X/"$0" |

158

- sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; }

159

- /^X\/$\/\/$$/{ s//\1/; q; }

160

- /^X\/$\/$.*/{ s//\1/; q; }

161

- s/.*/./; q'`

162

+ sed '/^.*\/$[^/][^/]*$\/*$/{

163

+ s//\1/

164

+ q

165

+ }

166

+ /^X\/$\/\/$$/{

167

+ s//\1/

168

+ q

169

+ }

170

+ /^X\/$\/$.*/{

171

+ s//\1/

172

+ q

173

+ }

174

+ s/.*/./; q'`

175

176

+# CDPATH.

177

+$as_unset CDPATH

178

179

-# PATH needs CR, and LINENO needs CR and PATH.

180

-# Avoid depending upon Character Ranges.

181

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

182

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

183

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

184

-as_cr_digits='0123456789'

185

-as_cr_alnum=$as_cr_Letters$as_cr_digits

186

187

-# The user is always right.

188

-if test "${PATH_SEPARATOR+set}" != set; then

189

- echo "#! /bin/sh" >conf$$.sh

190

- echo "exit 0" >>conf$$.sh

191

- chmod +x conf$$.sh

192

- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

193

- PATH_SEPARATOR=';'

194

- else

195

- PATH_SEPARATOR=:

196

- fi

197

- rm -f conf$$.sh

198

+if test "x$CONFIG_SHELL" = x; then

199

+ if (eval ":") 2>/dev/null; then

200

+ as_have_required=yes

201

+else

202

+ as_have_required=no

203

fi

204

205

+ if test $as_have_required = yes && (eval ":

206

+(as_func_return () {

207

+ (exit \$1)

208

+}

209

+as_func_success () {

210

+ as_func_return 0

211

+}

212

+as_func_failure () {

213

+ as_func_return 1

214

+}

215

+as_func_ret_success () {

216

+ return 0

217

+}

218

+as_func_ret_failure () {

219

+ return 1

220

+}

221

222

- as_lineno_1=$LINENO

223

- as_lineno_2=$LINENO

224

- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

225

- test "x$as_lineno_1" != "x$as_lineno_2" &&

226

- test "x$as_lineno_3" = "x$as_lineno_2" || {

227

- # Find who we are. Look in the path if we contain no path at all

228

- # relative or not.

229

- case $0 in

230

- *[\\/]* ) as_myself=$0 ;;

231

- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

232

-for as_dir in $PATH

233

-do

234

- IFS=$as_save_IFS

235

- test -z "$as_dir" && as_dir=.

236

- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

237

-done

238

+exitcode=0

239

+if as_func_success; then

240

+ :

241

+else

242

+ exitcode=1

243

+ echo as_func_success failed.

244

+fi

245

246

- ;;

247

- esac

248

- # We did not find ourselves, most probably we were run as `sh COMMAND'

249

- # in which case we are not to be found in the path.

250

- if test "x$as_myself" = x; then

251

- as_myself=$0

252

- fi

253

- if test ! -f "$as_myself"; then

254

- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2

255

- { (exit 1); exit 1; }; }

256

- fi

257

- case $CONFIG_SHELL in

258

- '')

259

+if as_func_failure; then

260

+ exitcode=1

261

+ echo as_func_failure succeeded.

262

+fi

263

+

264

+if as_func_ret_success; then

265

+ :

266

+else

267

+ exitcode=1

268

+ echo as_func_ret_success failed.

269

+fi

270

+

271

+if as_func_ret_failure; then

272

+ exitcode=1

273

+ echo as_func_ret_failure succeeded.

274

+fi

275

+

276

+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then

277

+ :

278

+else

279

+ exitcode=1

280

+ echo positional parameters were not saved.

281

+fi

282

+

283

+test \$exitcode = 0) || { (exit 1); exit 1; }

284

+

285

+(

286

+ as_lineno_1=\$LINENO

287

+ as_lineno_2=\$LINENO

288

+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&

289

+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }

290

+") 2> /dev/null; then

291

+ :

292

+else

293

+ as_candidate_shells=

294

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

295

for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH

296

do

297

IFS=$as_save_IFS

298

test -z "$as_dir" && as_dir=.

299

- for as_base in sh bash ksh sh5; do

300

- case $as_dir in

301

+ case $as_dir in

302

/*)

303

- if ("$as_dir/$as_base" -c '

304

+ for as_base in sh bash ksh sh5; do

305

+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"

306

+ done;;

307

+ esac

308

+done

309

+IFS=$as_save_IFS

310

+

311

+

312

+ for as_shell in $as_candidate_shells $SHELL; do

313

+ # Try only shells that exist, to save several forks.

314

+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&

315

+ { ("$as_shell") 2> /dev/null <<\_ASEOF

316

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

317

+ emulate sh

318

+ NULLCMD=:

319

+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

320

+ # is contrary to our usage. Disable this feature.

321

+ alias -g '${1+"$@"}'='"$@"'

322

+ setopt NO_GLOB_SUBST

323

+else

324

+ case `(set -o) 2>/dev/null` in

325

+ *posix*) set -o posix ;;

326

+esac

327

+

328

+fi

329

+

330

+

331

+:

332

+_ASEOF

333

+}; then

334

+ CONFIG_SHELL=$as_shell

335

+ as_have_required=yes

336

+ if { "$as_shell" 2> /dev/null <<\_ASEOF

337

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

338

+ emulate sh

339

+ NULLCMD=:

340

+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

341

+ # is contrary to our usage. Disable this feature.

342

+ alias -g '${1+"$@"}'='"$@"'

343

+ setopt NO_GLOB_SUBST

344

+else

345

+ case `(set -o) 2>/dev/null` in

346

+ *posix*) set -o posix ;;

347

+esac

348

+

349

+fi

350

+

351

+

352

+:

353

+(as_func_return () {

354

+ (exit $1)

355

+}

356

+as_func_success () {

357

+ as_func_return 0

358

+}

359

+as_func_failure () {

360

+ as_func_return 1

361

+}

362

+as_func_ret_success () {

363

+ return 0

364

+}

365

+as_func_ret_failure () {

366

+ return 1

367

+}

368

+

369

+exitcode=0

370

+if as_func_success; then

371

+ :

372

+else

373

+ exitcode=1

374

+ echo as_func_success failed.

375

+fi

376

+

377

+if as_func_failure; then

378

+ exitcode=1

379

+ echo as_func_failure succeeded.

380

+fi

381

+

382

+if as_func_ret_success; then

383

+ :

384

+else

385

+ exitcode=1

386

+ echo as_func_ret_success failed.

387

+fi

388

+

389

+if as_func_ret_failure; then

390

+ exitcode=1

391

+ echo as_func_ret_failure succeeded.

392

+fi

393

+

394

+if ( set x; as_func_ret_success y && test x = "$1" ); then

395

+ :

396

+else

397

+ exitcode=1

398

+ echo positional parameters were not saved.

399

+fi

400

+

401

+test $exitcode = 0) || { (exit 1); exit 1; }

402

+

403

+(

404

as_lineno_1=$LINENO

405

as_lineno_2=$LINENO

406

- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

407

test "x$as_lineno_1" != "x$as_lineno_2" &&

408

- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then

409

- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }

410

- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }

411

- CONFIG_SHELL=$as_dir/$as_base

412

- export CONFIG_SHELL

413

- exec "$CONFIG_SHELL" "$0" ${1+"$@"}

414

- fi;;

415

- esac

416

- done

417

-done

418

-;;

419

- esac

420

+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }

421

+

422

+_ASEOF

423

+}; then

424

+ break

425

+fi

426

+

427

+fi

428

+

429

+ done

430

+

431

+ if test "x$CONFIG_SHELL" != x; then

432

+ for as_var in BASH_ENV ENV

433

+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

434

+ done

435

+ export CONFIG_SHELL

436

+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}

437

+fi

438

+

439

+

440

+ if test $as_have_required = no; then

441

+ echo This script requires a shell more modern than all the

442

+ echo shells that I found on your system. Please install a

443

+ echo modern shell, or manually run the script under such a

444

+ echo shell if you do have one.

445

+ { (exit 1); exit 1; }

446

+fi

447

+

448

+

449

+fi

450

+

451

+fi

452

+

453

+

454

+

455

+(eval "as_func_return () {

456

+ (exit \$1)

457

+}

458

+as_func_success () {

459

+ as_func_return 0

460

+}

461

+as_func_failure () {

462

+ as_func_return 1

463

+}

464

+as_func_ret_success () {

465

+ return 0

466

+}

467

+as_func_ret_failure () {

468

+ return 1

469

+}

470

+

471

+exitcode=0

472

+if as_func_success; then

473

+ :

474

+else

475

+ exitcode=1

476

+ echo as_func_success failed.

477

+fi

478

+

479

+if as_func_failure; then

480

+ exitcode=1

481

+ echo as_func_failure succeeded.

482

+fi

483

+

484

+if as_func_ret_success; then

485

+ :

486

+else

487

+ exitcode=1

488

+ echo as_func_ret_success failed.

489

+fi

490

+

491

+if as_func_ret_failure; then

492

+ exitcode=1

493

+ echo as_func_ret_failure succeeded.

494

+fi

495

+

496

+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then

497

+ :

498

+else

499

+ exitcode=1

500

+ echo positional parameters were not saved.

501

+fi

502

+

503

+test \$exitcode = 0") || {

504

+ echo No shell found that supports shell functions.

505

+ echo Please tell autoconf@gnu.org about your system,

506

+ echo including any error possibly output before this

507

+ echo message

508

+}

509

+

510

+

511

+

512

+ as_lineno_1=$LINENO

513

+ as_lineno_2=$LINENO

514

+ test "x$as_lineno_1" != "x$as_lineno_2" &&

515

+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {

516

517

# Create $as_me.lineno as a copy of $as_myself, but with $LINENO

518

# uniformly replaced by the line number. The first 'sed' inserts a

519

- # line-number line before each line; the second 'sed' does the real

520

- # work. The second script uses 'N' to pair each line-number line

521

- # with the numbered line, and appends trailing '-' during

522

- # substitution so that $LINENO is not a special case at line end.

523

+ # line-number line after each line using $LINENO; the second 'sed'

524

+ # does the real work. The second script uses 'N' to pair each

525

+ # line-number line with the line containing $LINENO, and appends

526

+ # trailing '-' during substitution so that $LINENO is not a special

527

+ # case at line end.

528

# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

529

- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)

530

- sed '=' <$as_myself |

531

+ # scripts with optimization help from Paolo Bonzini. Blame Lee

532

+ # E. McMahon (1931-1989) for sed's syntax. :-)

533

+ sed -n '

534

+ p

535

+ /[$]LINENO/=

536

+ ' <$as_myself |

537

sed '

538

+ s/[$]LINENO.*/&-/

539

+ t lineno

540

+ b

541

+ :lineno

542

N

543

- s,$,-,

544

- : loop

545

- s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3,

546

+ :loop

547

+ s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/

548

t loop

549

- s,-$,,

550

- s,^['$as_cr_digits']*\n,,

551

+ s/-\n.*//

552

' >$as_me.lineno &&

553

- chmod +x $as_me.lineno ||

554

+ chmod +x "$as_me.lineno" ||

555

{ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

556

{ (exit 1); exit 1; }; }

557

558

# Don't try to exec as it changes $[0], causing all sort of problems

559

# (the dirname of $[0] is not the place where we might find the

560

- # original and so on. Autoconf is especially sensible to this).

561

- . ./$as_me.lineno

562

+ # original and so on. Autoconf is especially sensitive to this).

563

+ . "./$as_me.lineno"

564

# Exit status is that of the last command.

565

exit

566

}

567

568

569

-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in

570

- *c*,-n*) ECHO_N= ECHO_C='

571

-' ECHO_T=' ' ;;

572

- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;

573

- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;

574

+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

575

+ as_dirname=dirname

576

+else

577

+ as_dirname=false

578

+fi

579

+

580

+ECHO_C= ECHO_N= ECHO_T=

581

+case `echo -n x` in

582

+-n*)

583

+ case `echo 'x\c'` in

584

+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.

585

+ *) ECHO_C='\c';;

586

+ esac;;

587

+*)

588

+ ECHO_N='-n';;

589

esac

590

591

-if expr a : '$a$' >/dev/null 2>&1; then

592

+if expr a : '$a$' >/dev/null 2>&1 &&

593

+ test "X`expr 00001 : '.*$...$'`" = X001; then

594

as_expr=expr

595

else

596

as_expr=false

597

fi

598

599

rm -f conf$$ conf$$.exe conf$$.file

600

+if test -d conf$$.dir; then

601

+ rm -f conf$$.dir/conf$$.file

602

+else

603

+ rm -f conf$$.dir

604

+ mkdir conf$$.dir

605

+fi

606

echo >conf$$.file

607

if ln -s conf$$.file conf$$ 2>/dev/null; then

608

- # We could just check for DJGPP; but this test a) works b) is more generic

609

- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).

610

- if test -f conf$$.exe; then

611

- # Don't use ln at all; we don't have any links

612

+ as_ln_s='ln -s'

613

+ # ... but there are two gotchas:

614

+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

615

+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

616

+ # In both cases, we have to default to `cp -p'.

617

+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

618

as_ln_s='cp -p'

619

- else

620

- as_ln_s='ln -s'

621

- fi

622

elif ln conf$$.file conf$$ 2>/dev/null; then

623

as_ln_s=ln

624

else

625

as_ln_s='cp -p'

626

fi

627

-rm -f conf$$ conf$$.exe conf$$.file

628

+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

629

+rmdir conf$$.dir 2>/dev/null

630

631

if mkdir -p . 2>/dev/null; then

632

as_mkdir_p=:

633

@@ -224,7 +520,28 @@

634

as_mkdir_p=false

635

fi

636

637

-as_executable_p="test -f"

638

+if test -x / >/dev/null 2>&1; then

639

+ as_test_x='test -x'

640

+else

641

+ if ls -dL / >/dev/null 2>&1; then

642

+ as_ls_L_option=L

643

+ else

644

+ as_ls_L_option=

645

+ fi

646

+ as_test_x='

647

+ eval sh -c '\''

648

+ if test -d "$1"; then

649

+ test -d "$1/.";

650

+ else

651

+ case $1 in

652

+ -*)set "./$1";;

653

+ esac;

654

+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

655

+ ???[sx]*):;;*)false;;esac;fi

656

+ '\'' sh

657

+ '

658

+fi

659

+as_executable_p=$as_test_x

660

661

# Sed expression to map a string onto a valid CPP name.

662

as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

663

@@ -233,15 +550,6 @@

664

as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

665

666

667

-# IFS

668

-# We need space, tab and new line, in precisely that order.

669

-as_nl='

670

-'

671

-IFS=" $as_nl"

672

-

673

-# CDPATH.

674

-$as_unset CDPATH

675

-

676

677

678

# Check that we are running under the correct shell.

679

@@ -397,29 +705,26 @@

680

681

tagnames=${tagnames+${tagnames},}F77

682

683

+exec 7<&0 </dev/null 6>&1

684

+

685

# Name of the host.

686

# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,

687

# so uname gets run too.

688

ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`

689

690

-exec 6>&1

691

-

692

#

693

# Initializations.

694

#

695

ac_default_prefix=/usr/local

696

+ac_clean_files=

697

ac_config_libobj_dir=.

698

+LIBOBJS=

699

cross_compiling=no

700

subdirs=

701

MFLAGS=

702

MAKEFLAGS=

703

SHELL=${CONFIG_SHELL-/bin/sh}

704

705

-# Maximum number of lines to put in a shell here document.

706

-# This variable seems obsolete. It should probably be removed, and

707

-# only ac_max_sed_lines should be used.

708

-: ${ac_max_here_lines=38}

709

-

710

# Identity of this package.

711

PACKAGE_NAME='expat'

712

PACKAGE_TARNAME='expat'

713

@@ -431,42 +736,139 @@

714

# Factoring default headers for most tests.

715

ac_includes_default="\

716

#include <stdio.h>

717

-#if HAVE_SYS_TYPES_H

718

+#ifdef HAVE_SYS_TYPES_H

719

# include <sys/types.h>

720

#endif

721

-#if HAVE_SYS_STAT_H

722

+#ifdef HAVE_SYS_STAT_H

723

# include <sys/stat.h>

724

#endif

725

-#if STDC_HEADERS

726

+#ifdef STDC_HEADERS

727

# include <stdlib.h>

728

# include <stddef.h>

729

#else

730

-# if HAVE_STDLIB_H

731

+# ifdef HAVE_STDLIB_H

732

# include <stdlib.h>

733

# endif

734

#endif

735

-#if HAVE_STRING_H

736

-# if !STDC_HEADERS && HAVE_MEMORY_H

737

+#ifdef HAVE_STRING_H

738

+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H

739

# include <memory.h>

740

# endif

741

# include <string.h>

742

#endif

743

-#if HAVE_STRINGS_H

744

+#ifdef HAVE_STRINGS_H

745

# include <strings.h>

746

#endif

747

-#if HAVE_INTTYPES_H

748

+#ifdef HAVE_INTTYPES_H

749

# include <inttypes.h>

750

-#else

751

-# if HAVE_STDINT_H

752

-# include <stdint.h>

753

-# endif

754

#endif

755

-#if HAVE_UNISTD_H

756

+#ifdef HAVE_STDINT_H

757

+# include <stdint.h>

758

+#endif

759

+#ifdef HAVE_UNISTD_H

760

# include <unistd.h>

761

#endif"

762

763

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBCURRENT LIBREVISION LIBAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA FILEMAP LIBOBJS LTLIBOBJS'

764

+ac_subst_vars='SHELL

765

+PATH_SEPARATOR

766

+PACKAGE_NAME

767

+PACKAGE_TARNAME

768

+PACKAGE_VERSION

769

+PACKAGE_STRING

770

+PACKAGE_BUGREPORT

771

+exec_prefix

772

+prefix

773

+program_transform_name

774

+bindir

775

+sbindir

776

+libexecdir

777

+datarootdir

778

+datadir

779

+sysconfdir

780

+sharedstatedir

781

+localstatedir

782

+includedir

783

+oldincludedir

784

+docdir

785

+infodir

786

+htmldir

787

+dvidir

788

+pdfdir

789

+psdir

790

+libdir

791

+localedir

792

+mandir

793

+DEFS

794

+ECHO_C

795

+ECHO_N

796

+ECHO_T

797

+LIBS

798

+build_alias

799

+host_alias

800

+target_alias

801

+build

802

+build_cpu

803

+build_vendor

804

+build_os

805

+host

806

+host_cpu

807

+host_vendor

808

+host_os

809

+CC

810

+CFLAGS

811

+LDFLAGS

812

+CPPFLAGS

813

+ac_ct_CC

814

+EXEEXT

815

+OBJEXT

816

+SED

817

+GREP

818

+EGREP

819

+LN_S

820

+ECHO

821

+AR

822

+RANLIB

823

+STRIP

824

+DSYMUTIL

825

+NMEDIT

826

+DLLTOOL

827

+AS

828

+OBJDUMP

829

+CPP

830

+CXX

831

+CXXFLAGS

832

+ac_ct_CXX

833

+CXXCPP

834

+F77

835

+FFLAGS

836

+ac_ct_F77

837

+LIBTOOL

838

+LIBCURRENT

839

+LIBREVISION

840

+LIBAGE

841

+INSTALL_PROGRAM

842

+INSTALL_SCRIPT

843

+INSTALL_DATA

844

+FILEMAP

845

+LIBOBJS

846

+LTLIBOBJS'

847

ac_subst_files=''

848

+ ac_precious_vars='build_alias

849

+host_alias

850

+target_alias

851

+CC

852

+CFLAGS

853

+LDFLAGS

854

+LIBS

855

+CPPFLAGS

856

+CPP

857

+CXX

858

+CXXFLAGS

859

+CCC

860

+CXXCPP

861

+F77

862

+FFLAGS'

863

+

864

865

# Initialize some variables set by options.

866

ac_init_help=

867

@@ -493,34 +895,48 @@

868

# and all the variables that are supposed to be based on exec_prefix

869

# by default will actually change.

870

# Use braces instead of parens because sh, perl, etc. also accept them.

871

+# (The list follows the same order as the GNU Coding Standards.)

872

bindir='${exec_prefix}/bin'

873

sbindir='${exec_prefix}/sbin'

874

libexecdir='${exec_prefix}/libexec'

875

-datadir='${prefix}/share'

876

+datarootdir='${prefix}/share'

877

+datadir='${datarootdir}'

878

sysconfdir='${prefix}/etc'

879

sharedstatedir='${prefix}/com'

880

localstatedir='${prefix}/var'

881

-libdir='${exec_prefix}/lib'

882

includedir='${prefix}/include'

883

oldincludedir='/usr/include'

884

-infodir='${prefix}/info'

885

-mandir='${prefix}/man'

886

+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'

887

+infodir='${datarootdir}/info'

888

+htmldir='${docdir}'

889

+dvidir='${docdir}'

890

+pdfdir='${docdir}'

891

+psdir='${docdir}'

892

+libdir='${exec_prefix}/lib'

893

+localedir='${datarootdir}/locale'

894

+mandir='${datarootdir}/man'

895

896

ac_prev=

897

+ac_dashdash=

898

for ac_option

899

do

900

# If the previous option needs an argument, assign it.

901

if test -n "$ac_prev"; then

902

- eval "$ac_prev=\$ac_option"

903

+ eval $ac_prev=\$ac_option

904

ac_prev=

905

continue

906

fi

907

908

- ac_optarg=`expr "x$ac_option" : 'x[^=]*=$.*$'`

909

+ case $ac_option in

910

+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;;

911

+ *) ac_optarg=yes ;;

912

+ esac

913

914

# Accept the important Cygnus configure options, so we can diagnose typos.

915

916

- case $ac_option in

917

+ case $ac_dashdash$ac_option in

918

+ --)

919

+ ac_dashdash=yes ;;

920

921

922

ac_prev=bindir ;;

923

@@ -542,33 +958,45 @@

924

--config-cache | -C)

925

cache_file=config.cache ;;

926

927

928

+ -datadir | --datadir | --datadi | --datad)

929

ac_prev=datadir ;;

930

931

- | --da=*)

932

+ -datadir=* | --datadir=* | --datadi=* | --datad=*)

933

datadir=$ac_optarg ;;

934

935

+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \

936

+ | --dataroo | --dataro | --datar)

937

+ ac_prev=datarootdir ;;

938

+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \

939

+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)

940

+ datarootdir=$ac_optarg ;;

941

+

942

-disable-* | --disable-*)

943

ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'`

944

# Reject names that are not valid shell variable names.

945

- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&

946

+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&

947

{ echo "$as_me: error: invalid feature name: $ac_feature" >&2

948

{ (exit 1); exit 1; }; }

949

- ac_feature=`echo $ac_feature | sed 's/-/_/g'`

950

- eval "enable_$ac_feature=no" ;;

951

+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`

952

+ eval enable_$ac_feature=no ;;

953

+

954

+ -docdir | --docdir | --docdi | --doc | --do)

955

+ ac_prev=docdir ;;

956

+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)

957

+ docdir=$ac_optarg ;;

958

+

959

960

+ ac_prev=dvidir ;;

961

962

+ dvidir=$ac_optarg ;;

963

964

-enable-* | --enable-*)

965

ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`

966

# Reject names that are not valid shell variable names.

967

- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&

968

+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&

969

{ echo "$as_me: error: invalid feature name: $ac_feature" >&2

970

{ (exit 1); exit 1; }; }

971

- ac_feature=`echo $ac_feature | sed 's/-/_/g'`

972

- case $ac_option in

973

- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;

974

- *) ac_optarg=yes ;;

975

- esac

976

- eval "enable_$ac_feature='$ac_optarg'" ;;

977

+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`

978

+ eval enable_$ac_feature=\$ac_optarg ;;

979

980

-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \

981

982

@@ -595,6 +1023,12 @@

983

-host=* | --host=* | --hos=* | --ho=*)

984

host_alias=$ac_optarg ;;

985

986

987

+ ac_prev=htmldir ;;

988

989

+ | --ht=*)

990

+ htmldir=$ac_optarg ;;

991

+

992

-includedir | --includedir | --includedi | --included | --include \

993

| --includ | --inclu | --incl | --inc)

994

ac_prev=includedir ;;

995

@@ -619,13 +1053,16 @@

996

| --libexe=* | --libex=* | --libe=*)

997

libexecdir=$ac_optarg ;;

998

999

+ -localedir | --localedir | --localedi | --localed | --locale)

1000

+ ac_prev=localedir ;;

1001

+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)

1002

+ localedir=$ac_optarg ;;

1003

+

1004

-localstatedir | --localstatedir | --localstatedi | --localstated \

1005

- | --localstate | --localstat | --localsta | --localst \

1006

- | --locals | --local | --loca | --loc | --lo)

1007

1008

ac_prev=localstatedir ;;

1009

-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \

1010

- | --localstate=* | --localstat=* | --localsta=* | --localst=* \

1011

- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)

1012

1013

localstatedir=$ac_optarg ;;

1014

1015

-mandir | --mandir | --mandi | --mand | --man | --ma | --m)

1016

@@ -690,6 +1127,16 @@

1017

| --progr-tra=* | --program-tr=* | --program-t=*)

1018

program_transform_name=$ac_optarg ;;

1019

1020

1021

+ ac_prev=pdfdir ;;

1022

1023

+ pdfdir=$ac_optarg ;;

1024

+

1025

+ -psdir | --psdir | --psdi | --psd | --ps)

1026

+ ac_prev=psdir ;;

1027

+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)

1028

+ psdir=$ac_optarg ;;

1029

+

1030

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

1031

1032

silent=yes ;;

1033

@@ -742,24 +1189,20 @@

1034

-with-* | --with-*)

1035

ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'`

1036

# Reject names that are not valid shell variable names.

1037

- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&

1038

+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&

1039

{ echo "$as_me: error: invalid package name: $ac_package" >&2

1040

{ (exit 1); exit 1; }; }

1041

- ac_package=`echo $ac_package| sed 's/-/_/g'`

1042

- case $ac_option in

1043

- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;

1044

- *) ac_optarg=yes ;;

1045

- esac

1046

- eval "with_$ac_package='$ac_optarg'" ;;

1047

+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`

1048

+ eval with_$ac_package=\$ac_optarg ;;

1049

1050

-without-* | --without-*)

1051

ac_package=`expr "x$ac_option" : 'x-*without-$.*$'`

1052

# Reject names that are not valid shell variable names.

1053

- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&

1054

+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&

1055

{ echo "$as_me: error: invalid package name: $ac_package" >&2

1056

{ (exit 1); exit 1; }; }

1057

- ac_package=`echo $ac_package | sed 's/-/_/g'`

1058

- eval "with_$ac_package=no" ;;

1059

+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`

1060

+ eval with_$ac_package=no ;;

1061

1062

--x)

1063

# Obsolete; use --with-x.

1064

@@ -790,8 +1233,7 @@

1065

expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&

1066

{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2

1067

{ (exit 1); exit 1; }; }

1068

- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`

1069

- eval "$ac_envvar='$ac_optarg'"

1070

+ eval $ac_envvar=\$ac_optarg

1071

export $ac_envvar ;;

1072

1073

*)

1074

@@ -811,27 +1253,19 @@

1075

{ (exit 1); exit 1; }; }

1076

fi

1077

1078

-# Be sure to have absolute paths.

1079

-for ac_var in exec_prefix prefix

1080

-do

1081

- eval ac_val=$`echo $ac_var`

1082

- case $ac_val in

1083

- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;

1084

- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2

1085

- { (exit 1); exit 1; }; };;

1086

- esac

1087

-done

1088

-

1089

-# Be sure to have absolute paths.

1090

-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \

1091

- localstatedir libdir includedir oldincludedir infodir mandir

1092

+# Be sure to have absolute directory names.

1093

+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \

1094

+ datadir sysconfdir sharedstatedir localstatedir includedir \

1095

+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \

1096

+ libdir localedir mandir

1097

do

1098

- eval ac_val=$`echo $ac_var`

1099

+ eval ac_val=\$$ac_var

1100

case $ac_val in

1101

- [\\/$]* | ?:[\\/]* ) ;;

1102

- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2

1103

- { (exit 1); exit 1; }; };;

1104

+ [\\/$]* | ?:[\\/]* ) continue;;

1105

+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;

1106

esac

1107

+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2

1108

+ { (exit 1); exit 1; }; }

1109

done

1110

1111

# There might be people who depend on the old broken behavior: `$host'

1112

@@ -858,94 +1292,76 @@

1113

test "$silent" = yes && exec 6>/dev/null

1114

1115

1116

+ac_pwd=`pwd` && test -n "$ac_pwd" &&

1117

+ac_ls_di=`ls -di .` &&

1118

+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||

1119

+ { echo "$as_me: error: Working directory cannot be determined" >&2

1120

+ { (exit 1); exit 1; }; }

1121

+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||

1122

+ { echo "$as_me: error: pwd does not report name of working directory" >&2

1123

+ { (exit 1); exit 1; }; }

1124

+

1125

+

1126

# Find the source files, if location was not specified.

1127

if test -z "$srcdir"; then

1128

ac_srcdir_defaulted=yes

1129

- # Try the directory containing this script, then its parent.

1130

- ac_confdir=`(dirname "$0") 2>/dev/null ||

1131

+ # Try the directory containing this script, then the parent directory.

1132

+ ac_confdir=`$as_dirname -- "$0" ||

1133

$as_expr X"$0" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

1134

X"$0" : 'X$//$[^/]' \| \

1135

X"$0" : 'X$//$$' \| \

1136

- X"$0" : 'X$/$' \| \

1137

- . : '$.$' 2>/dev/null ||

1138

+ X"$0" : 'X$/$' \| . 2>/dev/null ||

1139

echo X"$0" |

1140

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

1141

- /^X$\/\/$[^/].*/{ s//\1/; q; }

1142

- /^X$\/\/$$/{ s//\1/; q; }

1143

- /^X$\/$.*/{ s//\1/; q; }

1144

- s/.*/./; q'`

1145

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

1146

+ s//\1/

1147

+ q

1148

+ }

1149

+ /^X$\/\/$[^/].*/{

1150

+ s//\1/

1151

+ q

1152

+ }

1153

+ /^X$\/\/$$/{

1154

+ s//\1/

1155

+ q

1156

+ }

1157

+ /^X$\/$.*/{

1158

+ s//\1/

1159

+ q

1160

+ }

1161

+ s/.*/./; q'`

1162

srcdir=$ac_confdir

1163

- if test ! -r $srcdir/$ac_unique_file; then

1164

+ if test ! -r "$srcdir/$ac_unique_file"; then

1165

srcdir=..

1166

fi

1167

else

1168

ac_srcdir_defaulted=no

1169

fi

1170

-if test ! -r $srcdir/$ac_unique_file; then

1171

- if test "$ac_srcdir_defaulted" = yes; then

1172

- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2

1173

- { (exit 1); exit 1; }; }

1174

- else

1175

- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2

1176

+if test ! -r "$srcdir/$ac_unique_file"; then

1177

+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."

1178

+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2

1179

{ (exit 1); exit 1; }; }

1180

- fi

1181

fi

1182

-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||

1183

- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2

1184

+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"

1185

+ac_abs_confdir=`(

1186

+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2

1187

{ (exit 1); exit 1; }; }

1188

-srcdir=`echo "$srcdir" | sed 's%$[^\\/]$[\\/]*$%\1%'`

1189

-ac_env_build_alias_set=${build_alias+set}

1190

-ac_env_build_alias_value=$build_alias

1191

-ac_cv_env_build_alias_set=${build_alias+set}

1192

-ac_cv_env_build_alias_value=$build_alias

1193

-ac_env_host_alias_set=${host_alias+set}

1194

-ac_env_host_alias_value=$host_alias

1195

-ac_cv_env_host_alias_set=${host_alias+set}

1196

-ac_cv_env_host_alias_value=$host_alias

1197

-ac_env_target_alias_set=${target_alias+set}

1198

-ac_env_target_alias_value=$target_alias

1199

-ac_cv_env_target_alias_set=${target_alias+set}

1200

-ac_cv_env_target_alias_value=$target_alias

1201

-ac_env_CC_set=${CC+set}

1202

-ac_env_CC_value=$CC

1203

-ac_cv_env_CC_set=${CC+set}

1204

-ac_cv_env_CC_value=$CC

1205

-ac_env_CFLAGS_set=${CFLAGS+set}

1206

-ac_env_CFLAGS_value=$CFLAGS

1207

-ac_cv_env_CFLAGS_set=${CFLAGS+set}

1208

-ac_cv_env_CFLAGS_value=$CFLAGS

1209

-ac_env_LDFLAGS_set=${LDFLAGS+set}

1210

-ac_env_LDFLAGS_value=$LDFLAGS

1211

-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}

1212

-ac_cv_env_LDFLAGS_value=$LDFLAGS

1213

-ac_env_CPPFLAGS_set=${CPPFLAGS+set}

1214

-ac_env_CPPFLAGS_value=$CPPFLAGS

1215

-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}

1216

-ac_cv_env_CPPFLAGS_value=$CPPFLAGS

1217

-ac_env_CPP_set=${CPP+set}

1218

-ac_env_CPP_value=$CPP

1219

-ac_cv_env_CPP_set=${CPP+set}

1220

-ac_cv_env_CPP_value=$CPP

1221

-ac_env_CXX_set=${CXX+set}

1222

-ac_env_CXX_value=$CXX

1223

-ac_cv_env_CXX_set=${CXX+set}

1224

-ac_cv_env_CXX_value=$CXX

1225

-ac_env_CXXFLAGS_set=${CXXFLAGS+set}

1226

-ac_env_CXXFLAGS_value=$CXXFLAGS

1227

-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}

1228

-ac_cv_env_CXXFLAGS_value=$CXXFLAGS

1229

-ac_env_CXXCPP_set=${CXXCPP+set}

1230

-ac_env_CXXCPP_value=$CXXCPP

1231

-ac_cv_env_CXXCPP_set=${CXXCPP+set}

1232

-ac_cv_env_CXXCPP_value=$CXXCPP

1233

-ac_env_F77_set=${F77+set}

1234

-ac_env_F77_value=$F77

1235

-ac_cv_env_F77_set=${F77+set}

1236

-ac_cv_env_F77_value=$F77

1237

-ac_env_FFLAGS_set=${FFLAGS+set}

1238

-ac_env_FFLAGS_value=$FFLAGS

1239

-ac_cv_env_FFLAGS_set=${FFLAGS+set}

1240

-ac_cv_env_FFLAGS_value=$FFLAGS

1241

+ pwd)`

1242

+# When building in place, set srcdir=.

1243

+if test "$ac_abs_confdir" = "$ac_pwd"; then

1244

+ srcdir=.

1245

+fi

1246

+# Remove unnecessary trailing slashes from srcdir.

1247

+# Double slashes in file names in object file debugging info

1248

+# mess up M-x gdb in Emacs.

1249

+case $srcdir in

1250

+*/) srcdir=`expr "X$srcdir" : 'X$.*[^/]$' \| "X$srcdir" : 'X$.*$'`;;

1251

+esac

1252

+for ac_var in $ac_precious_vars; do

1253

+ eval ac_env_${ac_var}_set=\${${ac_var}+set}

1254

+ eval ac_env_${ac_var}_value=\$${ac_var}

1255

+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}

1256

+ eval ac_cv_env_${ac_var}_value=\$${ac_var}

1257

+done

1258

1259

#

1260

# Report the --help message.

1261

@@ -974,9 +1390,6 @@

1262

-n, --no-create do not create output files

1263

--srcdir=DIR find the sources in DIR [configure dir or \`..']

1264

1265

-_ACEOF

1266

-

1267

- cat <<_ACEOF

1268

Installation directories:

1269

--prefix=PREFIX install architecture-independent files in PREFIX

1270

[$ac_default_prefix]

1271

@@ -994,15 +1407,22 @@

1272

--bindir=DIR user executables [EPREFIX/bin]

1273

--sbindir=DIR system admin executables [EPREFIX/sbin]

1274

--libexecdir=DIR program executables [EPREFIX/libexec]

1275

- --datadir=DIR read-only architecture-independent data [PREFIX/share]

1276

--sysconfdir=DIR read-only single-machine data [PREFIX/etc]

1277

--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]

1278

--localstatedir=DIR modifiable single-machine data [PREFIX/var]

1279

--libdir=DIR object code libraries [EPREFIX/lib]

1280

--includedir=DIR C header files [PREFIX/include]

1281

--oldincludedir=DIR C header files for non-gcc [/usr/include]

1282

- --infodir=DIR info documentation [PREFIX/info]

1283

- --mandir=DIR man documentation [PREFIX/man]

1284

+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]

1285

+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]

1286

+ --infodir=DIR info documentation [DATAROOTDIR/info]

1287

+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]

1288

+ --mandir=DIR man documentation [DATAROOTDIR/man]

1289

+ --docdir=DIR documentation root [DATAROOTDIR/doc/expat]

1290

+ --htmldir=DIR html documentation [DOCDIR]

1291

+ --dvidir=DIR dvi documentation [DOCDIR]

1292

+ --pdfdir=DIR pdf documentation [DOCDIR]

1293

+ --psdir=DIR ps documentation [DOCDIR]

1294

_ACEOF

1295

1296

cat <<\_ACEOF

1297

@@ -1022,10 +1442,8 @@

1298

Optional Features:

1299

--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)

1300

--enable-FEATURE[=ARG] include FEATURE [ARG=yes]

1301

- --enable-shared[=PKGS]

1302

- build shared libraries [default=yes]

1303

- --enable-static[=PKGS]

1304

- build static libraries [default=yes]

1305

+ --enable-shared[=PKGS] build shared libraries [default=yes]

1306

+ --enable-static[=PKGS] build static libraries [default=yes]

1307

--enable-fast-install[=PKGS]

1308

optimize for fast installation [default=yes]

1309

--disable-libtool-lock avoid locking (might break parallel builds)

1310

@@ -1036,16 +1454,16 @@

1311

--with-gnu-ld assume the C compiler uses GNU ld [default=no]

1312

--with-pic try to use only PIC/non-PIC objects [default=use

1313

both]

1314

- --with-tags[=TAGS]

1315

- include additional configurations [automatic]

1316

+ --with-tags[=TAGS] include additional configurations [automatic]

1317

1318

Some influential environment variables:

1319

CC C compiler command

1320

CFLAGS C compiler flags

1321

LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a

1322

nonstandard directory <lib dir>

1323

- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have

1324

- headers in a nonstandard directory <include dir>

1325

+ LIBS libraries to pass to the linker, e.g. -l<library>

1326

+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if

1327

+ you have headers in a nonstandard directory <include dir>

1328

CPP C preprocessor

1329

CXX C++ compiler command

1330

CXXFLAGS C++ compiler flags

1331

@@ -1058,120 +1476,86 @@

1332

1333

Report bugs to <expat-bugs@libexpat.org>.

1334

_ACEOF

1335

+ac_status=$?

1336

fi

1337

1338

if test "$ac_init_help" = "recursive"; then

1339

# If there are subdirs, report their specific --help.

1340

- ac_popdir=`pwd`

1341

for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue

1342

- test -d $ac_dir || continue

1343

+ test -d "$ac_dir" || continue

1344

ac_builddir=.

1345

1346

-if test "$ac_dir" != .; then

1347

+case "$ac_dir" in

1348

+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

1349

+*)

1350

ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

1351

- # A "../" for each directory in $ac_dir_suffix.

1352

- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`

1353

-else

1354

- ac_dir_suffix= ac_top_builddir=

1355

-fi

1356

+ # A ".." for each directory in $ac_dir_suffix.

1357

+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

1358

+ case $ac_top_builddir_sub in

1359

+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;

1360

+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

1361

+ esac ;;

1362

+esac

1363

+ac_abs_top_builddir=$ac_pwd

1364

+ac_abs_builddir=$ac_pwd$ac_dir_suffix

1365

+# for backward compatibility:

1366

+ac_top_builddir=$ac_top_build_prefix

1367

1368

case $srcdir in

1369

- .) # No --srcdir option. We are building in place.

1370

+ .) # We are building in place.

1371

ac_srcdir=.

1372

- if test -z "$ac_top_builddir"; then

1373

- ac_top_srcdir=.

1374

- else

1375

- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`

1376

- fi ;;

1377

- [\\/]* | ?:[\\/]* ) # Absolute path.

1378

+ ac_top_srcdir=$ac_top_builddir_sub

1379

+ ac_abs_top_srcdir=$ac_pwd ;;

1380

+ [\\/]* | ?:[\\/]* ) # Absolute name.

1381

ac_srcdir=$srcdir$ac_dir_suffix;

1382

- ac_top_srcdir=$srcdir ;;

1383

- *) # Relative path.

1384

- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix

1385

- ac_top_srcdir=$ac_top_builddir$srcdir ;;

1386

-esac

1387

-

1388

-# Do not use `cd foo && pwd` to compute absolute paths, because

1389

-# the directories may not exist.

1390

-case `pwd` in

1391

-.) ac_abs_builddir="$ac_dir";;

1392

-*)

1393

- case "$ac_dir" in

1394

- .) ac_abs_builddir=`pwd`;;

1395

- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;

1396

- *) ac_abs_builddir=`pwd`/"$ac_dir";;

1397

- esac;;

1398

-esac

1399

-case $ac_abs_builddir in

1400

-.) ac_abs_top_builddir=${ac_top_builddir}.;;

1401

-*)

1402

- case ${ac_top_builddir}. in

1403

- .) ac_abs_top_builddir=$ac_abs_builddir;;

1404

- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;

1405

- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;

1406

- esac;;

1407

-esac

1408

-case $ac_abs_builddir in

1409

-.) ac_abs_srcdir=$ac_srcdir;;

1410

-*)

1411

- case $ac_srcdir in

1412

- .) ac_abs_srcdir=$ac_abs_builddir;;

1413

- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;

1414

- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;

1415

- esac;;

1416

-esac

1417

-case $ac_abs_builddir in

1418

-.) ac_abs_top_srcdir=$ac_top_srcdir;;

1419

-*)

1420

- case $ac_top_srcdir in

1421

- .) ac_abs_top_srcdir=$ac_abs_builddir;;

1422

- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;

1423

- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;

1424

- esac;;

1425

+ ac_top_srcdir=$srcdir

1426

+ ac_abs_top_srcdir=$srcdir ;;

1427

+ *) # Relative name.

1428

+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix

1429

+ ac_top_srcdir=$ac_top_build_prefix$srcdir

1430

+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;

1431

esac

1432

+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

1433

1434

- cd $ac_dir

1435

- # Check for guested configure; otherwise get Cygnus style configure.

1436

- if test -f $ac_srcdir/configure.gnu; then

1437

- echo

1438

- $SHELL $ac_srcdir/configure.gnu --help=recursive

1439

- elif test -f $ac_srcdir/configure; then

1440

- echo

1441

- $SHELL $ac_srcdir/configure --help=recursive

1442

- elif test -f $ac_srcdir/configure.ac ||

1443

- test -f $ac_srcdir/configure.in; then

1444

- echo

1445

- $ac_configure --help

1446

+ cd "$ac_dir" || { ac_status=$?; continue; }

1447

+ # Check for guested configure.

1448

+ if test -f "$ac_srcdir/configure.gnu"; then

1449

+ echo &&

1450

+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive

1451

+ elif test -f "$ac_srcdir/configure"; then

1452

+ echo &&

1453

+ $SHELL "$ac_srcdir/configure" --help=recursive

1454

else

1455

echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2

1456

- fi

1457

- cd $ac_popdir

1458

+ fi || ac_status=$?

1459

+ cd "$ac_pwd" || { ac_status=$?; break; }

1460

done

1461

fi

1462

1463

-test -n "$ac_init_help" && exit 0

1464

+test -n "$ac_init_help" && exit $ac_status

1465

if $ac_init_version; then

1466

cat <<\_ACEOF

1467

expat configure 2.0.1

1468

-generated by GNU Autoconf 2.59

1469

+generated by GNU Autoconf 2.61

1470

1471

1472

1473

+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

1474

This configure script is free software; the Free Software Foundation

1475

gives unlimited permission to copy, distribute and modify it.

1476

_ACEOF

1477

- exit 0

1478

+ exit

1479

fi

1480

-exec 5>config.log

1481

-cat >&5 <<_ACEOF

1482

+cat >config.log <<_ACEOF

1483

This file contains any messages produced by compilers while

1484

running configure, to aid debugging if configure makes a mistake.

1485

1486

It was created by expat $as_me 2.0.1, which was

1487

-generated by GNU Autoconf 2.59. Invocation command line was

1488

+generated by GNU Autoconf 2.61. Invocation command line was

1489

1490

$ $0 $@

1491

1492

_ACEOF

1493

+exec 5>>config.log

1494

{

1495

cat <<_ASUNAME

1496

## --------- ##

1497

@@ -1190,7 +1574,7 @@

1498

/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`

1499

/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`

1500

/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`

1501

-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`

1502

+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`

1503

/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`

1504

/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`

1505

/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`

1506

@@ -1204,6 +1588,7 @@

1507

test -z "$as_dir" && as_dir=.

1508

echo "PATH: $as_dir"

1509

done

1510

+IFS=$as_save_IFS

1511

1512

} >&5

1513

1514

@@ -1225,7 +1610,6 @@

1515

ac_configure_args=

1516

ac_configure_args0=

1517

ac_configure_args1=

1518

-ac_sep=

1519

ac_must_keep_next=false

1520

for ac_pass in 1 2

1521

do

1522

@@ -1236,7 +1620,7 @@

1523

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

1524

1525

continue ;;

1526

- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?\"\']*)

1527

+ *\'*)

1528

ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

1529

esac

1530

case $ac_pass in

1531

@@ -1258,9 +1642,7 @@

1532

-* ) ac_must_keep_next=true ;;

1533

esac

1534

fi

1535

- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"

1536

- # Get rid of the leading space.

1537

- ac_sep=" "

1538

+ ac_configure_args="$ac_configure_args '$ac_arg'"

1539

;;

1540

esac

1541

done

1542

@@ -1271,8 +1653,8 @@

1543

# When interrupted or exit'd, cleanup temporary files, and complete

1544

# config.log. We remove comments because anyway the quotes in there

1545

# would cause problems or look ugly.

1546

-# WARNING: Be sure not to use single quotes in there, as some shells,

1547

-# such as our DU 5.0 friend, will then `close' the trap.

1548

+# WARNING: Use '\'' to represent an apostrophe within the trap.

1549

+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.

1550

trap 'exit_status=$?

1551

# Save into config.log some information that might help in debugging.

1552

{

1553

@@ -1285,20 +1667,34 @@

1554

_ASBOX

1555

echo

1556

# The following way of writing the cache mishandles newlines in values,

1557

-{

1558

+(

1559

+ for ac_var in `(set) 2>&1 | sed -n '\''s/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'\''`; do

1560

+ eval ac_val=\$$ac_var

1561

+ case $ac_val in #(

1562

+ *${as_nl}*)

1563

+ case $ac_var in #(

1564

+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5

1565

+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;

1566

+ esac

1567

+ case $ac_var in #(

1568

+ _ | IFS | as_nl) ;; #(

1569

+ *) $as_unset $ac_var ;;

1570

+ esac ;;

1571

+ esac

1572

+ done

1573

(set) 2>&1 |

1574

- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in

1575

- *ac_space=\ *)

1576

+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(

1577

+ *${as_nl}ac_space=\ *)

1578

sed -n \

1579

- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;

1580

- s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='"'"'\\2'"'"'/p"

1581

- ;;

1582

+ "s/'\''/'\''\\\\'\'''\''/g;

1583

+ s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\''\\2'\''/p"

1584

+ ;; #(

1585

*)

1586

- sed -n \

1587

- "s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p"

1588

+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"

1589

;;

1590

- esac;

1591

-}

1592

+ esac |

1593

+ sort

1594

+)

1595

echo

1596

1597

cat <<\_ASBOX

1598

@@ -1309,22 +1705,28 @@

1599

echo

1600

for ac_var in $ac_subst_vars

1601

do

1602

- eval ac_val=$`echo $ac_var`

1603

- echo "$ac_var='"'"'$ac_val'"'"'"

1604

+ eval ac_val=\$$ac_var

1605

+ case $ac_val in

1606

+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

1607

+ esac

1608

+ echo "$ac_var='\''$ac_val'\''"

1609

done | sort

1610

echo

1611

1612

if test -n "$ac_subst_files"; then

1613

cat <<\_ASBOX

1614

-## ------------- ##

1615

-## Output files. ##

1616

-## ------------- ##

1617

+## ------------------- ##

1618

+## File substitutions. ##

1619

+## ------------------- ##

1620

_ASBOX

1621

echo

1622

for ac_var in $ac_subst_files

1623

do

1624

- eval ac_val=$`echo $ac_var`

1625

- echo "$ac_var='"'"'$ac_val'"'"'"

1626

+ eval ac_val=\$$ac_var

1627

+ case $ac_val in

1628

+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

1629

+ esac

1630

+ echo "$ac_var='\''$ac_val'\''"

1631

done | sort

1632

echo

1633

fi

1634

@@ -1336,26 +1738,24 @@

1635

## ----------- ##

1636

_ASBOX

1637

echo

1638

- sed "/^$/d" confdefs.h | sort

1639

+ cat confdefs.h

1640

echo

1641

fi

1642

test "$ac_signal" != 0 &&

1643

echo "$as_me: caught signal $ac_signal"

1644

echo "$as_me: exit $exit_status"

1645

} >&5

1646

- rm -f core *.core &&

1647

- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&

1648

+ rm -f core *.core core.conftest.* &&

1649

+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&

1650

exit $exit_status

1651

- ' 0

1652

+' 0

1653

for ac_signal in 1 2 13 15; do

1654

trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal

1655

done

1656

ac_signal=0

1657

1658

# confdefs.h avoids OS command line length limits that DEFS can exceed.

1659

-rm -rf conftest* confdefs.h

1660

-# AIX cpp loses on an empty file, so make sure it contains at least a newline.

1661

-echo >confdefs.h

1662

+rm -f -r conftest* confdefs.h

1663

1664

# Predefined preprocessor variables.

1665

1666

@@ -1386,14 +1786,17 @@

1667

1668

# Let the site file select an alternate cache file if it wants to.

1669

# Prefer explicitly selected file to automatically selected ones.

1670

-if test -z "$CONFIG_SITE"; then

1671

- if test "x$prefix" != xNONE; then

1672

- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"

1673

- else

1674

- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"

1675

- fi

1676

+if test -n "$CONFIG_SITE"; then

1677

+ set x "$CONFIG_SITE"

1678

+elif test "x$prefix" != xNONE; then

1679

+ set x "$prefix/share/config.site" "$prefix/etc/config.site"

1680

+else

1681

+ set x "$ac_default_prefix/share/config.site" \

1682

+ "$ac_default_prefix/etc/config.site"

1683

fi

1684

-for ac_site_file in $CONFIG_SITE; do

1685

+shift

1686

+for ac_site_file

1687

+do

1688

if test -r "$ac_site_file"; then

1689

{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5

1690

echo "$as_me: loading site script $ac_site_file" >&6;}

1691

@@ -1409,8 +1812,8 @@

1692

{ echo "$as_me:$LINENO: loading cache $cache_file" >&5

1693

echo "$as_me: loading cache $cache_file" >&6;}

1694

case $cache_file in

1695

- [\\/]* | ?:[\\/]* ) . $cache_file;;

1696

- *) . ./$cache_file;;

1697

+ [\\/]* | ?:[\\/]* ) . "$cache_file";;

1698

+ *) . "./$cache_file";;

1699

esac

1700

fi

1701

else

1702

@@ -1422,12 +1825,11 @@

1703

# Check that the precious variables saved in the cache have kept the same

1704

# value.

1705

ac_cache_corrupted=false

1706

-for ac_var in `(set) 2>&1 |

1707

- sed -n 's/^ac_env_$[a-zA-Z_0-9]*$_set=.*/\1/p'`; do

1708

+for ac_var in $ac_precious_vars; do

1709

eval ac_old_set=\$ac_cv_env_${ac_var}_set

1710

eval ac_new_set=\$ac_env_${ac_var}_set

1711

- eval ac_old_val="\$ac_cv_env_${ac_var}_value"

1712

- eval ac_new_val="\$ac_env_${ac_var}_value"

1713

+ eval ac_old_val=\$ac_cv_env_${ac_var}_value

1714

+ eval ac_new_val=\$ac_env_${ac_var}_value

1715

case $ac_old_set,$ac_new_set in

1716

set,)

1717

{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

1718

@@ -1452,8 +1854,7 @@

1719

# Pass precious variables to config.status.

1720

if test "$ac_new_set" = set; then

1721

case $ac_new_val in

1722

- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?\"\']*)

1723

- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;

1724

+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;

1725

*) ac_arg=$ac_var=$ac_new_val ;;

1726

esac

1727

case " $ac_configure_args " in

1728

@@ -1470,12 +1871,6 @@

1729

{ (exit 1); exit 1; }; }

1730

fi

1731

1732

-ac_ext=c

1733

-ac_cpp='$CPP $CPPFLAGS'

1734

-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

1735

-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

1736

-ac_compiler_gnu=$ac_cv_c_compiler_gnu

1737

-

1738

1739

1740

1741

@@ -1500,35 +1895,46 @@

1742

1743

1744

1745

+ac_ext=c

1746

+ac_cpp='$CPP $CPPFLAGS'

1747

+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

1748

+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

1749

+ac_compiler_gnu=$ac_cv_c_compiler_gnu

1750

1751

1752

1753

1754

1755

ac_aux_dir=

1756

-for ac_dir in conftools $srcdir/conftools; do

1757

- if test -f $ac_dir/install-sh; then

1758

+for ac_dir in conftools "$srcdir"/conftools; do

1759

+ if test -f "$ac_dir/install-sh"; then

1760

ac_aux_dir=$ac_dir

1761

ac_install_sh="$ac_aux_dir/install-sh -c"

1762

break

1763

- elif test -f $ac_dir/install.sh; then

1764

+ elif test -f "$ac_dir/install.sh"; then

1765

ac_aux_dir=$ac_dir

1766

ac_install_sh="$ac_aux_dir/install.sh -c"

1767

break

1768

- elif test -f $ac_dir/shtool; then

1769

+ elif test -f "$ac_dir/shtool"; then

1770

ac_aux_dir=$ac_dir

1771

ac_install_sh="$ac_aux_dir/shtool install -c"

1772

break

1773

fi

1774

done

1775

if test -z "$ac_aux_dir"; then

1776

- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in conftools $srcdir/conftools" >&5

1777

-echo "$as_me: error: cannot find install-sh or install.sh in conftools $srcdir/conftools" >&2;}

1778

+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in conftools \"$srcdir\"/conftools" >&5

1779

+echo "$as_me: error: cannot find install-sh or install.sh in conftools \"$srcdir\"/conftools" >&2;}

1780

{ (exit 1); exit 1; }; }

1781

fi

1782

-ac_config_guess="$SHELL $ac_aux_dir/config.guess"

1783

-ac_config_sub="$SHELL $ac_aux_dir/config.sub"

1784

-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.

1785

+

1786

+# These three variables are undocumented and unsupported,

1787

+# and are intended to be withdrawn in a future Autoconf release.

1788

+# They can cause serious problems if a builder's source tree is in a directory

1789

+# whose full name contains unusual characters.

1790

+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.

1791

+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.

1792

+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.

1793

+

1794

1795

1796

1797

@@ -1537,19 +1943,19 @@

1798

LIBREVISION=2

1799

LIBAGE=5

1800

1801

- ac_config_headers="$ac_config_headers expat_config.h"

1802

+ac_config_headers="$ac_config_headers expat_config.h"

1803

1804

1805

# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

1806

1807

-## Free Software Foundation, Inc.

1808

1809

+## 2008 Free Software Foundation, Inc.

1810

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

1811

##

1812

## This file is free software; the Free Software Foundation gives

1813

## unlimited permission to copy and/or distribute it, with or without

1814

## modifications, as long as this notice is preserved.

1815

1816

-# serial 48 AC_PROG_LIBTOOL

1817

+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL

1818

1819

1820

# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

1821

@@ -1597,6 +2003,10 @@

1822

# the simple link test code.

1823

# _LT_LINKER_BOILERPLATE

1824

1825

+# _LT_REQUIRED_DARWIN_CHECKS

1826

+# --------------------------

1827

+# Check for some things on darwin

1828

+

1829

1830

# _LT_AC_SYS_LIBPATH_AIX

1831

# ----------------------

1832

@@ -1767,13 +2177,13 @@

1833

1834

# AC_PATH_TOOL_PREFIX

1835

# -------------------

1836

-# find a file program which can recognise shared library

1837

+# find a file program which can recognize shared library

1838

# AC_PATH_TOOL_PREFIX

1839

1840

1841

# AC_PATH_MAGIC

1842

# -------------

1843

-# find a file program which can recognise a shared library

1844

+# find a file program which can recognize a shared library

1845

# AC_PATH_MAGIC

1846

1847

1848

@@ -1994,6 +2404,19 @@

1849

1850

1851

1852

+

1853

+# Cheap backport of AS_EXECUTABLE_P and required macros

1854

+# from Autoconf 2.59; we should not use $as_executable_p directly.

1855

+

1856

+# _AS_TEST_PREPARE

1857

+# ----------------

1858

+# _AS_TEST_PREPARE

1859

+

1860

+# AS_EXECUTABLE_P

1861

+# ---------------

1862

+# Check whether a file is executable.

1863

+# AS_EXECUTABLE_P

1864

+

1865

############################################################

1866

# NOTE: This macro has been submitted for inclusion into #

1867

# GNU Autoconf as AC_PROG_SED. When it is available in #

1868

@@ -2011,10 +2434,9 @@

1869

1870

1871

1872

-# Check whether --enable-shared or --disable-shared was given.

1873

+# Check whether --enable-shared was given.

1874

if test "${enable_shared+set}" = set; then

1875

- enableval="$enable_shared"

1876

- p=${PACKAGE-default}

1877

+ enableval=$enable_shared; p=${PACKAGE-default}

1878

case $enableval in

1879

yes) enable_shared=yes ;;

1880

no) enable_shared=no ;;

1881

@@ -2033,12 +2455,12 @@

1882

esac

1883

else

1884

enable_shared=yes

1885

-fi;

1886

+fi

1887

1888

-# Check whether --enable-static or --disable-static was given.

1889

+

1890

+# Check whether --enable-static was given.

1891

if test "${enable_static+set}" = set; then

1892

- enableval="$enable_static"

1893

- p=${PACKAGE-default}

1894

+ enableval=$enable_static; p=${PACKAGE-default}

1895

case $enableval in

1896

yes) enable_static=yes ;;

1897

no) enable_static=no ;;

1898

@@ -2057,12 +2479,12 @@

1899

esac

1900

else

1901

enable_static=yes

1902

-fi;

1903

+fi

1904

1905

-# Check whether --enable-fast-install or --disable-fast-install was given.

1906

+

1907

+# Check whether --enable-fast-install was given.

1908

if test "${enable_fast_install+set}" = set; then

1909

- enableval="$enable_fast_install"

1910

- p=${PACKAGE-default}

1911

+ enableval=$enable_fast_install; p=${PACKAGE-default}

1912

case $enableval in

1913

yes) enable_fast_install=yes ;;

1914

no) enable_fast_install=no ;;

1915

@@ -2081,60 +2503,90 @@

1916

esac

1917

else

1918

enable_fast_install=yes

1919

-fi;

1920

+fi

1921

+

1922

1923

# Make sure we can run config.sub.

1924

-$ac_config_sub sun4 >/dev/null 2>&1 ||

1925

- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5

1926

-echo "$as_me: error: cannot run $ac_config_sub" >&2;}

1927

+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||

1928

+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5

1929

+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}

1930

{ (exit 1); exit 1; }; }

1931

1932

-echo "$as_me:$LINENO: checking build system type" >&5

1933

-echo $ECHO_N "checking build system type... $ECHO_C" >&6

1934

+{ echo "$as_me:$LINENO: checking build system type" >&5

1935

+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }

1936

if test "${ac_cv_build+set}" = set; then

1937

echo $ECHO_N "(cached) $ECHO_C" >&6

1938

else

1939

- ac_cv_build_alias=$build_alias

1940

-test -z "$ac_cv_build_alias" &&

1941

- ac_cv_build_alias=`$ac_config_guess`

1942

-test -z "$ac_cv_build_alias" &&

1943

+ ac_build_alias=$build_alias

1944

+test "x$ac_build_alias" = x &&

1945

+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`

1946

+test "x$ac_build_alias" = x &&

1947

{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5

1948

echo "$as_me: error: cannot guess build type; you must specify one" >&2;}

1949

{ (exit 1); exit 1; }; }

1950

-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||

1951

- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5

1952

-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}

1953

+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||

1954

+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5

1955

+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}

1956

{ (exit 1); exit 1; }; }

1957

1958

fi

1959

-echo "$as_me:$LINENO: result: $ac_cv_build" >&5

1960

-echo "${ECHO_T}$ac_cv_build" >&6

1961

+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5

1962

+echo "${ECHO_T}$ac_cv_build" >&6; }

1963

+case $ac_cv_build in

1964

+*-*-*) ;;

1965

+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5

1966

+echo "$as_me: error: invalid value of canonical build" >&2;}

1967

+ { (exit 1); exit 1; }; };;

1968

+esac

1969

build=$ac_cv_build

1970

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

1971

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

1972

-build_os=`echo $ac_cv_build | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`

1973

+ac_save_IFS=$IFS; IFS='-'

1974

+set x $ac_cv_build

1975

+shift

1976

+build_cpu=$1

1977

+build_vendor=$2

1978

+shift; shift

1979

+# Remember, the first character of IFS is used to create $*,

1980

+# except with old shells:

1981

+build_os=$*

1982

+IFS=$ac_save_IFS

1983

+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac

1984

1985

1986

-echo "$as_me:$LINENO: checking host system type" >&5

1987

-echo $ECHO_N "checking host system type... $ECHO_C" >&6

1988

+{ echo "$as_me:$LINENO: checking host system type" >&5

1989

+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }

1990

if test "${ac_cv_host+set}" = set; then

1991

echo $ECHO_N "(cached) $ECHO_C" >&6

1992

else

1993

- ac_cv_host_alias=$host_alias

1994

-test -z "$ac_cv_host_alias" &&

1995

- ac_cv_host_alias=$ac_cv_build_alias

1996

-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||

1997

- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5

1998

-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}

1999

+ if test "x$host_alias" = x; then

2000

+ ac_cv_host=$ac_cv_build

2001

+else

2002

+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||

2003

+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5

2004

+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}

2005

{ (exit 1); exit 1; }; }

2006

+fi

2007

2008

fi

2009

-echo "$as_me:$LINENO: result: $ac_cv_host" >&5

2010

-echo "${ECHO_T}$ac_cv_host" >&6

2011

+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5

2012

+echo "${ECHO_T}$ac_cv_host" >&6; }

2013

+case $ac_cv_host in

2014

+*-*-*) ;;

2015

+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5

2016

+echo "$as_me: error: invalid value of canonical host" >&2;}

2017

+ { (exit 1); exit 1; }; };;

2018

+esac

2019

host=$ac_cv_host

2020

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

2021

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

2022

-host_os=`echo $ac_cv_host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`

2023

+ac_save_IFS=$IFS; IFS='-'

2024

+set x $ac_cv_host

2025

+shift

2026

+host_cpu=$1

2027

+host_vendor=$2

2028

+shift; shift

2029

+# Remember, the first character of IFS is used to create $*,

2030

+# except with old shells:

2031

+host_os=$*

2032

+IFS=$ac_save_IFS

2033

+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac

2034

2035

2036

ac_ext=c

2037

@@ -2145,8 +2597,8 @@

2038

if test -n "$ac_tool_prefix"; then

2039

# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

2040

set dummy ${ac_tool_prefix}gcc; ac_word=$2

2041

-echo "$as_me:$LINENO: checking for $ac_word" >&5

2042

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

2043

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

2044

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

2045

if test "${ac_cv_prog_CC+set}" = set; then

2046

echo $ECHO_N "(cached) $ECHO_C" >&6

2047

else

2048

@@ -2159,32 +2611,34 @@

2049

IFS=$as_save_IFS

2050

test -z "$as_dir" && as_dir=.

2051

for ac_exec_ext in '' $ac_executable_extensions; do

2052

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

2053

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

2054

ac_cv_prog_CC="${ac_tool_prefix}gcc"

2055

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

2056

break 2

2057

fi

2058

done

2059

done

2060

+IFS=$as_save_IFS

2061

2062

fi

2063

fi

2064

CC=$ac_cv_prog_CC

2065

if test -n "$CC"; then

2066

- echo "$as_me:$LINENO: result: $CC" >&5

2067

-echo "${ECHO_T}$CC" >&6

2068

+ { echo "$as_me:$LINENO: result: $CC" >&5

2069

+echo "${ECHO_T}$CC" >&6; }

2070

else

2071

- echo "$as_me:$LINENO: result: no" >&5

2072

-echo "${ECHO_T}no" >&6

2073

+ { echo "$as_me:$LINENO: result: no" >&5

2074

+echo "${ECHO_T}no" >&6; }

2075

fi

2076

2077

+

2078

fi

2079

if test -z "$ac_cv_prog_CC"; then

2080

ac_ct_CC=$CC

2081

# Extract the first word of "gcc", so it can be a program name with args.

2082

set dummy gcc; ac_word=$2

2083

-echo "$as_me:$LINENO: checking for $ac_word" >&5

2084

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

2085

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

2086

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

2087

if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

2088

echo $ECHO_N "(cached) $ECHO_C" >&6

2089

else

2090

@@ -2197,36 +2651,51 @@

2091

IFS=$as_save_IFS

2092

test -z "$as_dir" && as_dir=.

2093

for ac_exec_ext in '' $ac_executable_extensions; do

2094

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

2095

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

2096

ac_cv_prog_ac_ct_CC="gcc"

2097

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

2098

break 2

2099

fi

2100

done

2101

done

2102

+IFS=$as_save_IFS

2103

2104

fi

2105

fi

2106

ac_ct_CC=$ac_cv_prog_ac_ct_CC

2107

if test -n "$ac_ct_CC"; then

2108

- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

2109

-echo "${ECHO_T}$ac_ct_CC" >&6

2110

+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

2111

+echo "${ECHO_T}$ac_ct_CC" >&6; }

2112

else

2113

- echo "$as_me:$LINENO: result: no" >&5

2114

-echo "${ECHO_T}no" >&6

2115

+ { echo "$as_me:$LINENO: result: no" >&5

2116

+echo "${ECHO_T}no" >&6; }

2117

fi

2118

2119

- CC=$ac_ct_CC

2120

+ if test "x$ac_ct_CC" = x; then

2121

+ CC=""

2122

+ else

2123

+ case $cross_compiling:$ac_tool_warned in

2124

+yes:)

2125

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

2126

+whose name does not start with the host triplet. If you think this

2127

+configuration is useful to you, please write to autoconf@gnu.org." >&5

2128

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

2129

+whose name does not start with the host triplet. If you think this

2130

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

2131

+ac_tool_warned=yes ;;

2132

+esac

2133

+ CC=$ac_ct_CC

2134

+ fi

2135

else

2136

CC="$ac_cv_prog_CC"

2137

fi

2138

2139

if test -z "$CC"; then

2140

- if test -n "$ac_tool_prefix"; then

2141

- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

2142

+ if test -n "$ac_tool_prefix"; then

2143

+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

2144

set dummy ${ac_tool_prefix}cc; ac_word=$2

2145

-echo "$as_me:$LINENO: checking for $ac_word" >&5

2146

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

2147

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

2148

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

2149

if test "${ac_cv_prog_CC+set}" = set; then

2150

echo $ECHO_N "(cached) $ECHO_C" >&6

2151

else

2152

@@ -2239,74 +2708,34 @@

2153

IFS=$as_save_IFS

2154

test -z "$as_dir" && as_dir=.

2155

for ac_exec_ext in '' $ac_executable_extensions; do

2156

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

2157

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

2158

ac_cv_prog_CC="${ac_tool_prefix}cc"

2159

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

2160

break 2

2161

fi

2162

done

2163

done

2164

+IFS=$as_save_IFS

2165

2166

fi

2167

fi

2168

CC=$ac_cv_prog_CC

2169

if test -n "$CC"; then

2170

- echo "$as_me:$LINENO: result: $CC" >&5

2171

-echo "${ECHO_T}$CC" >&6

2172

-else

2173

- echo "$as_me:$LINENO: result: no" >&5

2174

-echo "${ECHO_T}no" >&6

2175

-fi

2176

-

2177

-fi

2178

-if test -z "$ac_cv_prog_CC"; then

2179

- ac_ct_CC=$CC

2180

- # Extract the first word of "cc", so it can be a program name with args.

2181

-set dummy cc; ac_word=$2

2182

-echo "$as_me:$LINENO: checking for $ac_word" >&5

2183

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

2184

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

2185

- echo $ECHO_N "(cached) $ECHO_C" >&6

2186

-else

2187

- if test -n "$ac_ct_CC"; then

2188

- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

2189

-else

2190

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

2191

-for as_dir in $PATH

2192

-do

2193

- IFS=$as_save_IFS

2194

- test -z "$as_dir" && as_dir=.

2195

- for ac_exec_ext in '' $ac_executable_extensions; do

2196

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

2197

- ac_cv_prog_ac_ct_CC="cc"

2198

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

2199

- break 2

2200

- fi

2201

-done

2202

-done

2203

-

2204

-fi

2205

-fi

2206

-ac_ct_CC=$ac_cv_prog_ac_ct_CC

2207

-if test -n "$ac_ct_CC"; then

2208

- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

2209

-echo "${ECHO_T}$ac_ct_CC" >&6

2210

+ { echo "$as_me:$LINENO: result: $CC" >&5

2211

+echo "${ECHO_T}$CC" >&6; }

2212

else

2213

- echo "$as_me:$LINENO: result: no" >&5

2214

-echo "${ECHO_T}no" >&6

2215

+ { echo "$as_me:$LINENO: result: no" >&5

2216

+echo "${ECHO_T}no" >&6; }

2217

fi

2218

2219

- CC=$ac_ct_CC

2220

-else

2221

- CC="$ac_cv_prog_CC"

2222

-fi

2223

2224

+ fi

2225

fi

2226

if test -z "$CC"; then

2227

# Extract the first word of "cc", so it can be a program name with args.

2228

set dummy cc; ac_word=$2

2229

-echo "$as_me:$LINENO: checking for $ac_word" >&5

2230

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

2231

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

2232

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

2233

if test "${ac_cv_prog_CC+set}" = set; then

2234

echo $ECHO_N "(cached) $ECHO_C" >&6

2235

else

2236

@@ -2320,7 +2749,7 @@

2237

IFS=$as_save_IFS

2238

test -z "$as_dir" && as_dir=.

2239

for ac_exec_ext in '' $ac_executable_extensions; do

2240

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

2241

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

2242

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

2243

ac_prog_rejected=yes

2244

continue

2245

@@ -2331,6 +2760,7 @@

2246

fi

2247

done

2248

done

2249

+IFS=$as_save_IFS

2250

2251

if test $ac_prog_rejected = yes; then

2252

# We found a bogon in the path, so make sure we never use it.

2253

@@ -2348,22 +2778,23 @@

2254

fi

2255

CC=$ac_cv_prog_CC

2256

if test -n "$CC"; then

2257

- echo "$as_me:$LINENO: result: $CC" >&5

2258

-echo "${ECHO_T}$CC" >&6

2259

+ { echo "$as_me:$LINENO: result: $CC" >&5

2260

+echo "${ECHO_T}$CC" >&6; }

2261

else

2262

- echo "$as_me:$LINENO: result: no" >&5

2263

-echo "${ECHO_T}no" >&6

2264

+ { echo "$as_me:$LINENO: result: no" >&5

2265

+echo "${ECHO_T}no" >&6; }

2266

fi

2267

2268

+

2269

fi

2270

if test -z "$CC"; then

2271

if test -n "$ac_tool_prefix"; then

2272

- for ac_prog in cl

2273

+ for ac_prog in cl.exe

2274

do

2275

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

2276

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

2277

-echo "$as_me:$LINENO: checking for $ac_word" >&5

2278

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

2279

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

2280

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

2281

if test "${ac_cv_prog_CC+set}" = set; then

2282

echo $ECHO_N "(cached) $ECHO_C" >&6

2283

else

2284

@@ -2376,36 +2807,38 @@

2285

IFS=$as_save_IFS

2286

test -z "$as_dir" && as_dir=.

2287

for ac_exec_ext in '' $ac_executable_extensions; do

2288

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

2289

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

2290

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

2291

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

2292

break 2

2293

fi

2294

done

2295

done

2296

+IFS=$as_save_IFS

2297

2298

fi

2299

fi

2300

CC=$ac_cv_prog_CC

2301

if test -n "$CC"; then

2302

- echo "$as_me:$LINENO: result: $CC" >&5

2303

-echo "${ECHO_T}$CC" >&6

2304

+ { echo "$as_me:$LINENO: result: $CC" >&5

2305

+echo "${ECHO_T}$CC" >&6; }

2306

else

2307

- echo "$as_me:$LINENO: result: no" >&5

2308

-echo "${ECHO_T}no" >&6

2309

+ { echo "$as_me:$LINENO: result: no" >&5

2310

+echo "${ECHO_T}no" >&6; }

2311

fi

2312

2313

+

2314

test -n "$CC" && break

2315

done

2316

fi

2317

if test -z "$CC"; then

2318

ac_ct_CC=$CC

2319

- for ac_prog in cl

2320

+ for ac_prog in cl.exe

2321

do

2322

# Extract the first word of "$ac_prog", so it can be a program name with args.

2323

set dummy $ac_prog; ac_word=$2

2324

-echo "$as_me:$LINENO: checking for $ac_word" >&5

2325

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

2326

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

2327

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

2328

if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

2329

echo $ECHO_N "(cached) $ECHO_C" >&6

2330

else

2331

@@ -2418,29 +2851,45 @@

2332

IFS=$as_save_IFS

2333

test -z "$as_dir" && as_dir=.

2334

for ac_exec_ext in '' $ac_executable_extensions; do

2335

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

2336

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

2337

ac_cv_prog_ac_ct_CC="$ac_prog"

2338

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

2339

break 2

2340

fi

2341

done

2342

done

2343

+IFS=$as_save_IFS

2344

2345

fi

2346

fi

2347

ac_ct_CC=$ac_cv_prog_ac_ct_CC

2348

if test -n "$ac_ct_CC"; then

2349

- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

2350

-echo "${ECHO_T}$ac_ct_CC" >&6

2351

+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

2352

+echo "${ECHO_T}$ac_ct_CC" >&6; }

2353

else

2354

- echo "$as_me:$LINENO: result: no" >&5

2355

-echo "${ECHO_T}no" >&6

2356

+ { echo "$as_me:$LINENO: result: no" >&5

2357

+echo "${ECHO_T}no" >&6; }

2358

fi

2359

2360

+

2361

test -n "$ac_ct_CC" && break

2362

done

2363

2364

- CC=$ac_ct_CC

2365

+ if test "x$ac_ct_CC" = x; then

2366

+ CC=""

2367

+ else

2368

+ case $cross_compiling:$ac_tool_warned in

2369

+yes:)

2370

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

2371

+whose name does not start with the host triplet. If you think this

2372

+configuration is useful to you, please write to autoconf@gnu.org." >&5

2373

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

2374

+whose name does not start with the host triplet. If you think this

2375

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

2376

+ac_tool_warned=yes ;;

2377

+esac

2378

+ CC=$ac_ct_CC

2379

+ fi

2380

fi

2381

2382

fi

2383

@@ -2453,21 +2902,35 @@

2384

{ (exit 1); exit 1; }; }

2385

2386

# Provide some information about the compiler.

2387

-echo "$as_me:$LINENO:" \

2388

- "checking for C compiler version" >&5

2389

+echo "$as_me:$LINENO: checking for C compiler version" >&5

2390

ac_compiler=`set X $ac_compile; echo $2`

2391

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5

2392

- (eval $ac_compiler --version </dev/null >&5) 2>&5

2393

+{ (ac_try="$ac_compiler --version >&5"

2394

+case "(($ac_try" in

2395

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2396

+ *) ac_try_echo=$ac_try;;

2397

+esac

2398

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2399

+ (eval "$ac_compiler --version >&5") 2>&5

2400

ac_status=$?

2401

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2402

(exit $ac_status); }

2403

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5

2404

- (eval $ac_compiler -v </dev/null >&5) 2>&5

2405

+{ (ac_try="$ac_compiler -v >&5"

2406

+case "(($ac_try" in

2407

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2408

+ *) ac_try_echo=$ac_try;;

2409

+esac

2410

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2411

+ (eval "$ac_compiler -v >&5") 2>&5

2412

ac_status=$?

2413

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2414

(exit $ac_status); }

2415

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5

2416

- (eval $ac_compiler -V </dev/null >&5) 2>&5

2417

+{ (ac_try="$ac_compiler -V >&5"

2418

+case "(($ac_try" in

2419

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2420

+ *) ac_try_echo=$ac_try;;

2421

+esac

2422

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2423

+ (eval "$ac_compiler -V >&5") 2>&5

2424

ac_status=$?

2425

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2426

(exit $ac_status); }

2427

@@ -2492,47 +2955,77 @@

2428

# Try to create an executable without -o first, disregard a.out.

2429

# It will help us diagnose broken compilers, and finding out an intuition

2430

# of exeext.

2431

-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

2432

-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6

2433

+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

2434

+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }

2435

ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

2436

-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5

2437

- (eval $ac_link_default) 2>&5

2438

+#

2439

+# List of possible output files, starting from the most likely.

2440

+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)

2441

+# only as a last resort. b.out is created by i960 compilers.

2442

+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'

2443

+#

2444

+# The IRIX 6 linker writes into existing files which may not be

2445

+# executable, retaining their permissions. Remove them first so a

2446

+# subsequent execution test works.

2447

+ac_rmfiles=

2448

+for ac_file in $ac_files

2449

+do

2450

+ case $ac_file in

2451

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

2452

+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;

2453

+ esac

2454

+done

2455

+rm -f $ac_rmfiles

2456

+

2457

+if { (ac_try="$ac_link_default"

2458

+case "(($ac_try" in

2459

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2460

+ *) ac_try_echo=$ac_try;;

2461

+esac

2462

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2463

+ (eval "$ac_link_default") 2>&5

2464

ac_status=$?

2465

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2466

(exit $ac_status); }; then

2467

- # Find the output, starting from the most likely. This scheme is

2468

-# not robust to junk in `.', hence go to wildcards (a.*) only as a last

2469

-# resort.

2470

-

2471

-# Be careful to initialize this variable, since it used to be cached.

2472

-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.

2473

-ac_cv_exeext=

2474

-# b.out is created by i960 compilers.

2475

-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out

2476

+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.

2477

+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'

2478

+# in a Makefile. We should not override ac_cv_exeext if it was cached,

2479

+# so that the user can short-circuit this test for compilers unknown to

2480

+# Autoconf.

2481

+for ac_file in $ac_files ''

2482

do

2483

test -f "$ac_file" || continue

2484

case $ac_file in

2485

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )

2486

- ;;

2487

- conftest.$ac_ext )

2488

- # This is the source file.

2489

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )

2490

;;

2491

[ab].out )

2492

# We found the default executable, but exeext='' is most

2493

# certainly right.

2494

break;;

2495

*.* )

2496

- ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

2497

- # FIXME: I believe we export ac_cv_exeext for Libtool,

2498

- # but it would be cool to find out if it's true. Does anybody

2499

- # maintain Libtool? --akim.

2500

- export ac_cv_exeext

2501

+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;

2502

+ then :; else

2503

+ ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

2504

+ fi

2505

+ # We set ac_cv_exeext here because the later test for it is not

2506

+ # safe: cross compilers may not add the suffix if given an `-o'

2507

+ # argument, so we may need to know it at that point already.

2508

+ # Even if this section looks crufty: it has the advantage of

2509

+ # actually working.

2510

break;;

2511

* )

2512

break;;

2513

esac

2514

done

2515

+test "$ac_cv_exeext" = no && ac_cv_exeext=

2516

+

2517

else

2518

+ ac_file=''

2519

+fi

2520

+

2521

+{ echo "$as_me:$LINENO: result: $ac_file" >&5

2522

+echo "${ECHO_T}$ac_file" >&6; }

2523

+if test -z "$ac_file"; then

2524

echo "$as_me: failed program was:" >&5

2525

sed 's/^/| /' conftest.$ac_ext >&5

2526

2527

@@ -2544,19 +3037,21 @@

2528

fi

2529

2530

ac_exeext=$ac_cv_exeext

2531

-echo "$as_me:$LINENO: result: $ac_file" >&5

2532

-echo "${ECHO_T}$ac_file" >&6

2533

2534

-# Check the compiler produces executables we can run. If not, either

2535

+# Check that the compiler produces executables we can run. If not, either

2536

# the compiler is broken, or we cross compile.

2537

-echo "$as_me:$LINENO: checking whether the C compiler works" >&5

2538

-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6

2539

+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5

2540

+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }

2541

# FIXME: These cross compiler hacks should be removed for Autoconf 3.0

2542

# If not cross compiling, check that we can run a simple program.

2543

if test "$cross_compiling" != yes; then

2544

if { ac_try='./$ac_file'

2545

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

2546

- (eval $ac_try) 2>&5

2547

+ { (case "(($ac_try" in

2548

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2549

+ *) ac_try_echo=$ac_try;;

2550

+esac

2551

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2552

+ (eval "$ac_try") 2>&5

2553

ac_status=$?

2554

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2555

(exit $ac_status); }; }; then

2556

@@ -2575,22 +3070,27 @@

2557

fi

2558

fi

2559

fi

2560

-echo "$as_me:$LINENO: result: yes" >&5

2561

-echo "${ECHO_T}yes" >&6

2562

+{ echo "$as_me:$LINENO: result: yes" >&5

2563

+echo "${ECHO_T}yes" >&6; }

2564

2565

rm -f a.out a.exe conftest$ac_cv_exeext b.out

2566

ac_clean_files=$ac_clean_files_save

2567

-# Check the compiler produces executables we can run. If not, either

2568

+# Check that the compiler produces executables we can run. If not, either

2569

# the compiler is broken, or we cross compile.

2570

-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

2571

-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6

2572

-echo "$as_me:$LINENO: result: $cross_compiling" >&5

2573

-echo "${ECHO_T}$cross_compiling" >&6

2574

+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

2575

+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }

2576

+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5

2577

+echo "${ECHO_T}$cross_compiling" >&6; }

2578

2579

-echo "$as_me:$LINENO: checking for suffix of executables" >&5

2580

-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6

2581

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

2582

- (eval $ac_link) 2>&5

2583

+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5

2584

+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }

2585

+if { (ac_try="$ac_link"

2586

+case "(($ac_try" in

2587

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2588

+ *) ac_try_echo=$ac_try;;

2589

+esac

2590

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2591

+ (eval "$ac_link") 2>&5

2592

ac_status=$?

2593

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2594

(exit $ac_status); }; then

2595

@@ -2601,9 +3101,8 @@

2596

for ac_file in conftest.exe conftest conftest.*; do

2597

test -f "$ac_file" || continue

2598

case $ac_file in

2599

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;

2600

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

2601

*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

2602

- export ac_cv_exeext

2603

break;;

2604

* ) break;;

2605

esac

2606

@@ -2617,14 +3116,14 @@

2607

fi

2608

2609

rm -f conftest$ac_cv_exeext

2610

-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5

2611

-echo "${ECHO_T}$ac_cv_exeext" >&6

2612

+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5

2613

+echo "${ECHO_T}$ac_cv_exeext" >&6; }

2614

2615

rm -f conftest.$ac_ext

2616

EXEEXT=$ac_cv_exeext

2617

ac_exeext=$EXEEXT

2618

-echo "$as_me:$LINENO: checking for suffix of object files" >&5

2619

-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6

2620

+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5

2621

+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }

2622

if test "${ac_cv_objext+set}" = set; then

2623

echo $ECHO_N "(cached) $ECHO_C" >&6

2624

else

2625

@@ -2644,14 +3143,20 @@

2626

}

2627

_ACEOF

2628

rm -f conftest.o conftest.obj

2629

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

2630

- (eval $ac_compile) 2>&5

2631

+if { (ac_try="$ac_compile"

2632

+case "(($ac_try" in

2633

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2634

+ *) ac_try_echo=$ac_try;;

2635

+esac

2636

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2637

+ (eval "$ac_compile") 2>&5

2638

ac_status=$?

2639

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2640

(exit $ac_status); }; then

2641

- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do

2642

+ for ac_file in conftest.o conftest.obj conftest.*; do

2643

+ test -f "$ac_file" || continue;

2644

case $ac_file in

2645

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;

2646

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;

2647

*) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`

2648

break;;

2649

esac

2650

@@ -2669,12 +3174,12 @@

2651

2652

rm -f conftest.$ac_cv_objext conftest.$ac_ext

2653

fi

2654

-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5

2655

-echo "${ECHO_T}$ac_cv_objext" >&6

2656

+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5

2657

+echo "${ECHO_T}$ac_cv_objext" >&6; }

2658

OBJEXT=$ac_cv_objext

2659

ac_objext=$OBJEXT

2660

-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

2661

-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6

2662

+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

2663

+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }

2664

if test "${ac_cv_c_compiler_gnu+set}" = set; then

2665

echo $ECHO_N "(cached) $ECHO_C" >&6

2666

else

2667

@@ -2697,50 +3202,49 @@

2668

}

2669

_ACEOF

2670

rm -f conftest.$ac_objext

2671

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

2672

- (eval $ac_compile) 2>conftest.er1

2673

+if { (ac_try="$ac_compile"

2674

+case "(($ac_try" in

2675

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2676

+ *) ac_try_echo=$ac_try;;

2677

+esac

2678

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2679

+ (eval "$ac_compile") 2>conftest.er1

2680

ac_status=$?

2681

grep -v '^ *+' conftest.er1 >conftest.err

2682

rm -f conftest.er1

2683

cat conftest.err >&5

2684

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2685

- (exit $ac_status); } &&

2686

- { ac_try='test -z "$ac_c_werror_flag"

2687

- || test ! -s conftest.err'

2688

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

2689

- (eval $ac_try) 2>&5

2690

- ac_status=$?

2691

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

2692

- (exit $ac_status); }; } &&

2693

- { ac_try='test -s conftest.$ac_objext'

2694

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

2695

- (eval $ac_try) 2>&5

2696

- ac_status=$?

2697

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

2698

- (exit $ac_status); }; }; then

2699

+ (exit $ac_status); } && {

2700

+ test -z "$ac_c_werror_flag" ||

2701

+ test ! -s conftest.err

2702

+ } && test -s conftest.$ac_objext; then

2703

ac_compiler_gnu=yes

2704

else

2705

echo "$as_me: failed program was:" >&5

2706

sed 's/^/| /' conftest.$ac_ext >&5

2707

2708

-ac_compiler_gnu=no

2709

+ ac_compiler_gnu=no

2710

fi

2711

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

2712

+

2713

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

2714

ac_cv_c_compiler_gnu=$ac_compiler_gnu

2715

2716

fi

2717

-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

2718

-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6

2719

+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

2720

+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }

2721

GCC=`test $ac_compiler_gnu = yes && echo yes`

2722

ac_test_CFLAGS=${CFLAGS+set}

2723

ac_save_CFLAGS=$CFLAGS

2724

-CFLAGS="-g"

2725

-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

2726

-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6

2727

+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

2728

+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }

2729

if test "${ac_cv_prog_cc_g+set}" = set; then

2730

echo $ECHO_N "(cached) $ECHO_C" >&6

2731

else

2732

- cat >conftest.$ac_ext <<_ACEOF

2733

+ ac_save_c_werror_flag=$ac_c_werror_flag

2734

+ ac_c_werror_flag=yes

2735

+ ac_cv_prog_cc_g=no

2736

+ CFLAGS="-g"

2737

+ cat >conftest.$ac_ext <<_ACEOF

2738

/* confdefs.h. */

2739

_ACEOF

2740

cat confdefs.h >>conftest.$ac_ext

2741

@@ -2756,38 +3260,118 @@

2742

}

2743

_ACEOF

2744

rm -f conftest.$ac_objext

2745

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

2746

- (eval $ac_compile) 2>conftest.er1

2747

+if { (ac_try="$ac_compile"

2748

+case "(($ac_try" in

2749

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2750

+ *) ac_try_echo=$ac_try;;

2751

+esac

2752

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2753

+ (eval "$ac_compile") 2>conftest.er1

2754

ac_status=$?

2755

grep -v '^ *+' conftest.er1 >conftest.err

2756

rm -f conftest.er1

2757

cat conftest.err >&5

2758

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2759

- (exit $ac_status); } &&

2760

- { ac_try='test -z "$ac_c_werror_flag"

2761

- || test ! -s conftest.err'

2762

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

2763

- (eval $ac_try) 2>&5

2764

+ (exit $ac_status); } && {

2765

+ test -z "$ac_c_werror_flag" ||

2766

+ test ! -s conftest.err

2767

+ } && test -s conftest.$ac_objext; then

2768

+ ac_cv_prog_cc_g=yes

2769

+else

2770

+ echo "$as_me: failed program was:" >&5

2771

+sed 's/^/| /' conftest.$ac_ext >&5

2772

+

2773

+ CFLAGS=""

2774

+ cat >conftest.$ac_ext <<_ACEOF

2775

+/* confdefs.h. */

2776

+_ACEOF

2777

+cat confdefs.h >>conftest.$ac_ext

2778

+cat >>conftest.$ac_ext <<_ACEOF

2779

+/* end confdefs.h. */

2780

+

2781

+int

2782

+main ()

2783

+{

2784

+

2785

+ ;

2786

+ return 0;

2787

+}

2788

+_ACEOF

2789

+rm -f conftest.$ac_objext

2790

+if { (ac_try="$ac_compile"

2791

+case "(($ac_try" in

2792

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2793

+ *) ac_try_echo=$ac_try;;

2794

+esac

2795

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2796

+ (eval "$ac_compile") 2>conftest.er1

2797

ac_status=$?

2798

+ grep -v '^ *+' conftest.er1 >conftest.err

2799

+ rm -f conftest.er1

2800

+ cat conftest.err >&5

2801

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2802

- (exit $ac_status); }; } &&

2803

- { ac_try='test -s conftest.$ac_objext'

2804

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

2805

- (eval $ac_try) 2>&5

2806

+ (exit $ac_status); } && {

2807

+ test -z "$ac_c_werror_flag" ||

2808

+ test ! -s conftest.err

2809

+ } && test -s conftest.$ac_objext; then

2810

+ :

2811

+else

2812

+ echo "$as_me: failed program was:" >&5

2813

+sed 's/^/| /' conftest.$ac_ext >&5

2814

+

2815

+ ac_c_werror_flag=$ac_save_c_werror_flag

2816

+ CFLAGS="-g"

2817

+ cat >conftest.$ac_ext <<_ACEOF

2818

+/* confdefs.h. */

2819

+_ACEOF

2820

+cat confdefs.h >>conftest.$ac_ext

2821

+cat >>conftest.$ac_ext <<_ACEOF

2822

+/* end confdefs.h. */

2823

+

2824

+int

2825

+main ()

2826

+{

2827

+

2828

+ ;

2829

+ return 0;

2830

+}

2831

+_ACEOF

2832

+rm -f conftest.$ac_objext

2833

+if { (ac_try="$ac_compile"

2834

+case "(($ac_try" in

2835

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2836

+ *) ac_try_echo=$ac_try;;

2837

+esac

2838

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2839

+ (eval "$ac_compile") 2>conftest.er1

2840

ac_status=$?

2841

+ grep -v '^ *+' conftest.er1 >conftest.err

2842

+ rm -f conftest.er1

2843

+ cat conftest.err >&5

2844

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2845

- (exit $ac_status); }; }; then

2846

+ (exit $ac_status); } && {

2847

+ test -z "$ac_c_werror_flag" ||

2848

+ test ! -s conftest.err

2849

+ } && test -s conftest.$ac_objext; then

2850

ac_cv_prog_cc_g=yes

2851

else

2852

echo "$as_me: failed program was:" >&5

2853

sed 's/^/| /' conftest.$ac_ext >&5

2854

2855

-ac_cv_prog_cc_g=no

2856

+

2857

fi

2858

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

2859

+

2860

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

2861

fi

2862

-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

2863

-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6

2864

+

2865

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

2866

+fi

2867

+

2868

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

2869

+ ac_c_werror_flag=$ac_save_c_werror_flag

2870

+fi

2871

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

2872

+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }

2873

if test "$ac_test_CFLAGS" = set; then

2874

CFLAGS=$ac_save_CFLAGS

2875

elif test $ac_cv_prog_cc_g = yes; then

2876

@@ -2803,12 +3387,12 @@

2877

CFLAGS=

2878

fi

2879

fi

2880

-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5

2881

-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6

2882

-if test "${ac_cv_prog_cc_stdc+set}" = set; then

2883

+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

2884

+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }

2885

+if test "${ac_cv_prog_cc_c89+set}" = set; then

2886

echo $ECHO_N "(cached) $ECHO_C" >&6

2887

else

2888

- ac_cv_prog_cc_stdc=no

2889

+ ac_cv_prog_cc_c89=no

2890

ac_save_CC=$CC

2891

cat >conftest.$ac_ext <<_ACEOF

2892

/* confdefs.h. */

2893

@@ -2842,12 +3426,17 @@

2894

/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has

2895

function prototypes and stuff, but not '\xHH' hex character constants.

2896

These don't provoke an error unfortunately, instead are silently treated

2897

- as 'x'. The following induces an error, until -std1 is added to get

2898

+ as 'x'. The following induces an error, until -std is added to get

2899

proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an

2900

array size at least. It's necessary to write '\x00'==0 to get something

2901

- that's true only with -std1. */

2902

+ that's true only with -std. */

2903

int osf4_cc_array ['\x00' == 0 ? 1 : -1];

2904

2905

+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters

2906

+ inside strings and character constants. */

2907

+#define FOO(x) 'x'

2908

+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];

2909

+

2910

int test (int i, double x);

2911

struct s1 {int (*f) (int a);};

2912

struct s2 {int (*f) (double a);};

2913

@@ -2862,213 +3451,65 @@

2914

return 0;

2915

}

2916

_ACEOF

2917

-# Don't try gcc -ansi; that turns off useful extensions and

2918

-# breaks some systems' header files.

2919

-# AIX -qlanglvl=ansi

2920

-# Ultrix and OSF/1 -std1

2921

-# HP-UX 10.20 and later -Ae

2922

-# HP-UX older versions -Aa -D_HPUX_SOURCE

2923

-# SVR4 -Xc -D__EXTENSIONS__

2924

-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

2925

+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \

2926

+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

2927

do

2928

CC="$ac_save_CC $ac_arg"

2929

rm -f conftest.$ac_objext

2930

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

2931

- (eval $ac_compile) 2>conftest.er1

2932

+if { (ac_try="$ac_compile"

2933

+case "(($ac_try" in

2934

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2935

+ *) ac_try_echo=$ac_try;;

2936

+esac

2937

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2938

+ (eval "$ac_compile") 2>conftest.er1

2939

ac_status=$?

2940

grep -v '^ *+' conftest.er1 >conftest.err

2941

rm -f conftest.er1

2942

cat conftest.err >&5

2943

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2944

- (exit $ac_status); } &&

2945

- { ac_try='test -z "$ac_c_werror_flag"

2946

- || test ! -s conftest.err'

2947

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

2948

- (eval $ac_try) 2>&5

2949

- ac_status=$?

2950

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

2951

- (exit $ac_status); }; } &&

2952

- { ac_try='test -s conftest.$ac_objext'

2953

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

2954

- (eval $ac_try) 2>&5

2955

- ac_status=$?

2956

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

2957

- (exit $ac_status); }; }; then

2958

- ac_cv_prog_cc_stdc=$ac_arg

2959

-break

2960

+ (exit $ac_status); } && {

2961

+ test -z "$ac_c_werror_flag" ||

2962

+ test ! -s conftest.err

2963

+ } && test -s conftest.$ac_objext; then

2964

+ ac_cv_prog_cc_c89=$ac_arg

2965

else

2966

echo "$as_me: failed program was:" >&5

2967

sed 's/^/| /' conftest.$ac_ext >&5

2968

2969

+

2970

fi

2971

-rm -f conftest.err conftest.$ac_objext

2972

+

2973

+rm -f core conftest.err conftest.$ac_objext

2974

+ test "x$ac_cv_prog_cc_c89" != "xno" && break

2975

done

2976

-rm -f conftest.$ac_ext conftest.$ac_objext

2977

+rm -f conftest.$ac_ext

2978

CC=$ac_save_CC

2979

2980

fi

2981

-

2982

-case "x$ac_cv_prog_cc_stdc" in

2983

- x|xno)

2984

- echo "$as_me:$LINENO: result: none needed" >&5

2985

-echo "${ECHO_T}none needed" >&6 ;;

2986

+# AC_CACHE_VAL

2987

+case "x$ac_cv_prog_cc_c89" in

2988

+ x)

2989

+ { echo "$as_me:$LINENO: result: none needed" >&5

2990

+echo "${ECHO_T}none needed" >&6; } ;;

2991

+ xno)

2992

+ { echo "$as_me:$LINENO: result: unsupported" >&5

2993

+echo "${ECHO_T}unsupported" >&6; } ;;

2994

*)

2995

- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5

2996

-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6

2997

- CC="$CC $ac_cv_prog_cc_stdc" ;;

2998

+ CC="$CC $ac_cv_prog_cc_c89"

2999

+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

3000

+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;

3001

esac

3002

3003

-# Some people use a C++ compiler to compile C. Since we use `exit',

3004

-# in C++ we need to declare it. In case someone uses the same compiler

3005

-# for both compiling C and C++ we need to have the C++ compiler decide

3006

-# the declaration of exit, since it's the most demanding environment.

3007

-cat >conftest.$ac_ext <<_ACEOF

3008

-#ifndef __cplusplus

3009

- choke me

3010

-#endif

3011

-_ACEOF

3012

-rm -f conftest.$ac_objext

3013

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3014

- (eval $ac_compile) 2>conftest.er1

3015

- ac_status=$?

3016

- grep -v '^ *+' conftest.er1 >conftest.err

3017

- rm -f conftest.er1

3018

- cat conftest.err >&5

3019

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3020

- (exit $ac_status); } &&

3021

- { ac_try='test -z "$ac_c_werror_flag"

3022

- || test ! -s conftest.err'

3023

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3024

- (eval $ac_try) 2>&5

3025

- ac_status=$?

3026

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3027

- (exit $ac_status); }; } &&

3028

- { ac_try='test -s conftest.$ac_objext'

3029

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3030

- (eval $ac_try) 2>&5

3031

- ac_status=$?

3032

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3033

- (exit $ac_status); }; }; then

3034

- for ac_declaration in \

3035

- '' \

3036

- 'extern "C" void std::exit (int) throw (); using std::exit;' \

3037

- 'extern "C" void std::exit (int); using std::exit;' \

3038

- 'extern "C" void exit (int) throw ();' \

3039

- 'extern "C" void exit (int);' \

3040

- 'void exit (int);'

3041

-do

3042

- cat >conftest.$ac_ext <<_ACEOF

3043

-/* confdefs.h. */

3044

-_ACEOF

3045

-cat confdefs.h >>conftest.$ac_ext

3046

-cat >>conftest.$ac_ext <<_ACEOF

3047

-/* end confdefs.h. */

3048

-$ac_declaration

3049

-#include <stdlib.h>

3050

-int

3051

-main ()

3052

-{

3053

-exit (42);

3054

- ;

3055

- return 0;

3056

-}

3057

-_ACEOF

3058

-rm -f conftest.$ac_objext

3059

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3060

- (eval $ac_compile) 2>conftest.er1

3061

- ac_status=$?

3062

- grep -v '^ *+' conftest.er1 >conftest.err

3063

- rm -f conftest.er1

3064

- cat conftest.err >&5

3065

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3066

- (exit $ac_status); } &&

3067

- { ac_try='test -z "$ac_c_werror_flag"

3068

- || test ! -s conftest.err'

3069

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3070

- (eval $ac_try) 2>&5

3071

- ac_status=$?

3072

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3073

- (exit $ac_status); }; } &&

3074

- { ac_try='test -s conftest.$ac_objext'

3075

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3076

- (eval $ac_try) 2>&5

3077

- ac_status=$?

3078

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3079

- (exit $ac_status); }; }; then

3080

- :

3081

-else

3082

- echo "$as_me: failed program was:" >&5

3083

-sed 's/^/| /' conftest.$ac_ext >&5

3084

3085

-continue

3086

-fi

3087

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3088

- cat >conftest.$ac_ext <<_ACEOF

3089

-/* confdefs.h. */

3090

-_ACEOF

3091

-cat confdefs.h >>conftest.$ac_ext

3092

-cat >>conftest.$ac_ext <<_ACEOF

3093

-/* end confdefs.h. */

3094

-$ac_declaration

3095

-int

3096

-main ()

3097

-{

3098

-exit (42);

3099

- ;

3100

- return 0;

3101

-}

3102

-_ACEOF

3103

-rm -f conftest.$ac_objext

3104

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3105

- (eval $ac_compile) 2>conftest.er1

3106

- ac_status=$?

3107

- grep -v '^ *+' conftest.er1 >conftest.err

3108

- rm -f conftest.er1

3109

- cat conftest.err >&5

3110

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3111

- (exit $ac_status); } &&

3112

- { ac_try='test -z "$ac_c_werror_flag"

3113

- || test ! -s conftest.err'

3114

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3115

- (eval $ac_try) 2>&5

3116

- ac_status=$?

3117

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3118

- (exit $ac_status); }; } &&

3119

- { ac_try='test -s conftest.$ac_objext'

3120

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3121

- (eval $ac_try) 2>&5

3122

- ac_status=$?

3123

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3124

- (exit $ac_status); }; }; then

3125

- break

3126

-else

3127

- echo "$as_me: failed program was:" >&5

3128

-sed 's/^/| /' conftest.$ac_ext >&5

3129

-

3130

-fi

3131

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3132

-done

3133

-rm -f conftest*

3134

-if test -n "$ac_declaration"; then

3135

- echo '#ifdef __cplusplus' >>confdefs.h

3136

- echo $ac_declaration >>confdefs.h

3137

- echo '#endif' >>confdefs.h

3138

-fi

3139

-

3140

-else

3141

- echo "$as_me: failed program was:" >&5

3142

-sed 's/^/| /' conftest.$ac_ext >&5

3143

-

3144

-fi

3145

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3146

ac_ext=c

3147

ac_cpp='$CPP $CPPFLAGS'

3148

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

3149

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

3150

ac_compiler_gnu=$ac_cv_c_compiler_gnu

3151

3152

-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5

3153

-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6

3154

+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5

3155

+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }

3156

if test "${lt_cv_path_SED+set}" = set; then

3157

echo $ECHO_N "(cached) $ECHO_C" >&6

3158

else

3159

@@ -3081,12 +3522,13 @@

3160

test -z "$as_dir" && as_dir=.

3161

for lt_ac_prog in sed gsed; do

3162

for ac_exec_ext in '' $ac_executable_extensions; do

3163

- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then

3164

+ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then

3165

lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"

3166

fi

3167

done

3168

done

3169

done

3170

+IFS=$as_save_IFS

3171

lt_ac_max=0

3172

lt_ac_count=0

3173

# Add /usr/xpg4/bin/sed as it is typically found on Solaris

3174

@@ -3121,37 +3563,185 @@

3175

fi

3176

3177

SED=$lt_cv_path_SED

3178

-echo "$as_me:$LINENO: result: $SED" >&5

3179

-echo "${ECHO_T}$SED" >&6

3180

3181

-echo "$as_me:$LINENO: checking for egrep" >&5

3182

-echo $ECHO_N "checking for egrep... $ECHO_C" >&6

3183

-if test "${ac_cv_prog_egrep+set}" = set; then

3184

+{ echo "$as_me:$LINENO: result: $SED" >&5

3185

+echo "${ECHO_T}$SED" >&6; }

3186

+

3187

+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5

3188

+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }

3189

+if test "${ac_cv_path_GREP+set}" = set; then

3190

echo $ECHO_N "(cached) $ECHO_C" >&6

3191

else

3192

- if echo a | (grep -E '(a|b)') >/dev/null 2>&1

3193

- then ac_cv_prog_egrep='grep -E'

3194

- else ac_cv_prog_egrep='egrep'

3195

+ # Extract the first word of "grep ggrep" to use in msg output

3196

+if test -z "$GREP"; then

3197

+set dummy grep ggrep; ac_prog_name=$2

3198

+if test "${ac_cv_path_GREP+set}" = set; then

3199

+ echo $ECHO_N "(cached) $ECHO_C" >&6

3200

+else

3201

+ ac_path_GREP_found=false

3202

+# Loop through the user's path and test for each of PROGNAME-LIST

3203

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3204

+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

3205

+do

3206

+ IFS=$as_save_IFS

3207

+ test -z "$as_dir" && as_dir=.

3208

+ for ac_prog in grep ggrep; do

3209

+ for ac_exec_ext in '' $ac_executable_extensions; do

3210

+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

3211

+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

3212

+ # Check for GNU ac_path_GREP and select it if it is found.

3213

+ # Check for GNU $ac_path_GREP

3214

+case `"$ac_path_GREP" --version 2>&1` in

3215

+*GNU*)

3216

+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;

3217

+*)

3218

+ ac_count=0

3219

+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

3220

+ while :

3221

+ do

3222

+ cat "conftest.in" "conftest.in" >"conftest.tmp"

3223

+ mv "conftest.tmp" "conftest.in"

3224

+ cp "conftest.in" "conftest.nl"

3225

+ echo 'GREP' >> "conftest.nl"

3226

+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break

3227

+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

3228

+ ac_count=`expr $ac_count + 1`

3229

+ if test $ac_count -gt ${ac_path_GREP_max-0}; then

3230

+ # Best one so far, save it but keep looking for a better one

3231

+ ac_cv_path_GREP="$ac_path_GREP"

3232

+ ac_path_GREP_max=$ac_count

3233

fi

3234

+ # 10*(2^10) chars as input seems more than enough

3235

+ test $ac_count -gt 10 && break

3236

+ done

3237

+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

3238

+esac

3239

+

3240

+

3241

+ $ac_path_GREP_found && break 3

3242

+ done

3243

+done

3244

+

3245

+done

3246

+IFS=$as_save_IFS

3247

+

3248

+

3249

fi

3250

-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5

3251

-echo "${ECHO_T}$ac_cv_prog_egrep" >&6

3252

- EGREP=$ac_cv_prog_egrep

3253

3254

+GREP="$ac_cv_path_GREP"

3255

+if test -z "$GREP"; then

3256

+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

3257

+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

3258

+ { (exit 1); exit 1; }; }

3259

+fi

3260

+

3261

+else

3262

+ ac_cv_path_GREP=$GREP

3263

+fi

3264

+

3265

+

3266

+fi

3267

+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5

3268

+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }

3269

+ GREP="$ac_cv_path_GREP"

3270

3271

3272

-# Check whether --with-gnu-ld or --without-gnu-ld was given.

3273

+{ echo "$as_me:$LINENO: checking for egrep" >&5

3274

+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }

3275

+if test "${ac_cv_path_EGREP+set}" = set; then

3276

+ echo $ECHO_N "(cached) $ECHO_C" >&6

3277

+else

3278

+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1

3279

+ then ac_cv_path_EGREP="$GREP -E"

3280

+ else

3281

+ # Extract the first word of "egrep" to use in msg output

3282

+if test -z "$EGREP"; then

3283

+set dummy egrep; ac_prog_name=$2

3284

+if test "${ac_cv_path_EGREP+set}" = set; then

3285

+ echo $ECHO_N "(cached) $ECHO_C" >&6

3286

+else

3287

+ ac_path_EGREP_found=false

3288

+# Loop through the user's path and test for each of PROGNAME-LIST

3289

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3290

+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

3291

+do

3292

+ IFS=$as_save_IFS

3293

+ test -z "$as_dir" && as_dir=.

3294

+ for ac_prog in egrep; do

3295

+ for ac_exec_ext in '' $ac_executable_extensions; do

3296

+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

3297

+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

3298

+ # Check for GNU ac_path_EGREP and select it if it is found.

3299

+ # Check for GNU $ac_path_EGREP

3300

+case `"$ac_path_EGREP" --version 2>&1` in

3301

+*GNU*)

3302

+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;

3303

+*)

3304

+ ac_count=0

3305

+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

3306

+ while :

3307

+ do

3308

+ cat "conftest.in" "conftest.in" >"conftest.tmp"

3309

+ mv "conftest.tmp" "conftest.in"

3310

+ cp "conftest.in" "conftest.nl"

3311

+ echo 'EGREP' >> "conftest.nl"

3312

+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break

3313

+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

3314

+ ac_count=`expr $ac_count + 1`

3315

+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then

3316

+ # Best one so far, save it but keep looking for a better one

3317

+ ac_cv_path_EGREP="$ac_path_EGREP"

3318

+ ac_path_EGREP_max=$ac_count

3319

+ fi

3320

+ # 10*(2^10) chars as input seems more than enough

3321

+ test $ac_count -gt 10 && break

3322

+ done

3323

+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

3324

+esac

3325

+

3326

+

3327

+ $ac_path_EGREP_found && break 3

3328

+ done

3329

+done

3330

+

3331

+done

3332

+IFS=$as_save_IFS

3333

+

3334

+

3335

+fi

3336

+

3337

+EGREP="$ac_cv_path_EGREP"

3338

+if test -z "$EGREP"; then

3339

+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

3340

+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

3341

+ { (exit 1); exit 1; }; }

3342

+fi

3343

+

3344

+else

3345

+ ac_cv_path_EGREP=$EGREP

3346

+fi

3347

+

3348

+

3349

+ fi

3350

+fi

3351

+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5

3352

+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }

3353

+ EGREP="$ac_cv_path_EGREP"

3354

+

3355

+

3356

+

3357

+# Check whether --with-gnu-ld was given.

3358

if test "${with_gnu_ld+set}" = set; then

3359

- withval="$with_gnu_ld"

3360

- test "$withval" = no || with_gnu_ld=yes

3361

+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

3362

else

3363

with_gnu_ld=no

3364

-fi;

3365

+fi

3366

+

3367

ac_prog=ld

3368

if test "$GCC" = yes; then

3369

# Check if gcc -print-prog-name=ld gives a path.

3370

- echo "$as_me:$LINENO: checking for ld used by $CC" >&5

3371

-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6

3372

+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

3373

+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

3374

case $host in

3375

*-*-mingw*)

3376

# gcc leaves a trailing carriage return which upsets mingw

3377

@@ -3180,11 +3770,11 @@

3378

;;

3379

esac

3380

elif test "$with_gnu_ld" = yes; then

3381

- echo "$as_me:$LINENO: checking for GNU ld" >&5

3382

-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6

3383

+ { echo "$as_me:$LINENO: checking for GNU ld" >&5

3384

+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

3385

else

3386

- echo "$as_me:$LINENO: checking for non-GNU ld" >&5

3387

-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6

3388

+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

3389

+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

3390

fi

3391

if test "${lt_cv_path_LD+set}" = set; then

3392

echo $ECHO_N "(cached) $ECHO_C" >&6

3393

@@ -3217,17 +3807,17 @@

3394

3395

LD="$lt_cv_path_LD"

3396

if test -n "$LD"; then

3397

- echo "$as_me:$LINENO: result: $LD" >&5

3398

-echo "${ECHO_T}$LD" >&6

3399

+ { echo "$as_me:$LINENO: result: $LD" >&5

3400

+echo "${ECHO_T}$LD" >&6; }

3401

else

3402

- echo "$as_me:$LINENO: result: no" >&5

3403

-echo "${ECHO_T}no" >&6

3404

+ { echo "$as_me:$LINENO: result: no" >&5

3405

+echo "${ECHO_T}no" >&6; }

3406

fi

3407

test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

3408

echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

3409

{ (exit 1); exit 1; }; }

3410

-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

3411

-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6

3412

+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

3413

+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

3414

if test "${lt_cv_prog_gnu_ld+set}" = set; then

3415

echo $ECHO_N "(cached) $ECHO_C" >&6

3416

else

3417

@@ -3241,20 +3831,20 @@

3418

;;

3419

esac

3420

fi

3421

-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

3422

-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6

3423

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

3424

+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

3425

with_gnu_ld=$lt_cv_prog_gnu_ld

3426

3427

3428

-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5

3429

-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6

3430

+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5

3431

+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }

3432

if test "${lt_cv_ld_reload_flag+set}" = set; then

3433

echo $ECHO_N "(cached) $ECHO_C" >&6

3434

else

3435

lt_cv_ld_reload_flag='-r'

3436

fi

3437

-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5

3438

-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6

3439

+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5

3440

+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }

3441

reload_flag=$lt_cv_ld_reload_flag

3442

case $reload_flag in

3443

"" | " "*) ;;

3444

@@ -3271,8 +3861,8 @@

3445

;;

3446

esac

3447

3448

-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5

3449

-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6

3450

+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5

3451

+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }

3452

if test "${lt_cv_path_NM+set}" = set; then

3453

echo $ECHO_N "(cached) $ECHO_C" >&6

3454

else

3455

@@ -3320,23 +3910,23 @@

3456

test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm

3457

fi

3458

fi

3459

-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5

3460

-echo "${ECHO_T}$lt_cv_path_NM" >&6

3461

+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5

3462

+echo "${ECHO_T}$lt_cv_path_NM" >&6; }

3463

NM="$lt_cv_path_NM"

3464

3465

-echo "$as_me:$LINENO: checking whether ln -s works" >&5

3466

-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6

3467

+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5

3468

+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }

3469

LN_S=$as_ln_s

3470

if test "$LN_S" = "ln -s"; then

3471

- echo "$as_me:$LINENO: result: yes" >&5

3472

-echo "${ECHO_T}yes" >&6

3473

+ { echo "$as_me:$LINENO: result: yes" >&5

3474

+echo "${ECHO_T}yes" >&6; }

3475

else

3476

- echo "$as_me:$LINENO: result: no, using $LN_S" >&5

3477

-echo "${ECHO_T}no, using $LN_S" >&6

3478

+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5

3479

+echo "${ECHO_T}no, using $LN_S" >&6; }

3480

fi

3481

3482

-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5

3483

-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6

3484

+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5

3485

+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }

3486

if test "${lt_cv_deplibs_check_method+set}" = set; then

3487

echo $ECHO_N "(cached) $ECHO_C" >&6

3488

else

3489

@@ -3355,7 +3945,7 @@

3490

# whether `pass_all' will *always* work, you probably want this one.

3491

3492

case $host_os in

3493

-aix4* | aix5*)

3494

+aix[4-9]*)

3495

lt_cv_deplibs_check_method=pass_all

3496

;;

3497

3498

@@ -3377,16 +3967,22 @@

3499

3500

mingw* | pw32*)

3501

# Base MSYS/MinGW do not provide the 'file' command needed by

3502

- # func_win32_libid shell function, so use a weaker test based on 'objdump'.

3503

- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'

3504

- lt_cv_file_magic_cmd='$OBJDUMP -f'

3505

+ # func_win32_libid shell function, so use a weaker test based on 'objdump',

3506

+ # unless we find 'file', for example because we are cross-compiling.

3507

+ if ( file / ) >/dev/null 2>&1; then

3508

+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'

3509

+ lt_cv_file_magic_cmd='func_win32_libid'

3510

+ else

3511

+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'

3512

+ lt_cv_file_magic_cmd='$OBJDUMP -f'

3513

+ fi

3514

;;

3515

3516

darwin* | rhapsody*)

3517

lt_cv_deplibs_check_method=pass_all

3518

;;

3519

3520

-freebsd* | kfreebsd*-gnu | dragonfly*)

3521

+freebsd* | dragonfly*)

3522

if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

3523

case $host_cpu in

3524

i*86 )

3525

@@ -3424,7 +4020,7 @@

3526

esac

3527

;;

3528

3529

-interix3*)

3530

+interix[3-9]*)

3531

# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here

3532

lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'

3533

;;

3534

@@ -3440,11 +4036,11 @@

3535

;;

3536

3537

# This must be Linux ELF.

3538

-linux*)

3539

+linux* | k*bsd*-gnu)

3540

lt_cv_deplibs_check_method=pass_all

3541

;;

3542

3543

-netbsd*)

3544

+netbsd* | netbsdelf*-gnu)

3545

if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

3546

lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'

3547

else

3548

@@ -3474,6 +4070,10 @@

3549

lt_cv_deplibs_check_method=pass_all

3550

;;

3551

3552

+rdos*)

3553

+ lt_cv_deplibs_check_method=pass_all

3554

+ ;;

3555

+

3556

solaris*)

3557

lt_cv_deplibs_check_method=pass_all

3558

;;

3559

@@ -3511,8 +4111,8 @@

3560

esac

3561

3562

fi

3563

-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5

3564

-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6

3565

+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5

3566

+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }

3567

file_magic_cmd=$lt_cv_file_magic_cmd

3568

deplibs_check_method=$lt_cv_deplibs_check_method

3569

test -z "$deplibs_check_method" && deplibs_check_method=unknown

3570

@@ -3530,11 +4130,11 @@

3571

compiler=$CC

3572

3573

3574

-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.

3575

+# Check whether --enable-libtool-lock was given.

3576

if test "${enable_libtool_lock+set}" = set; then

3577

- enableval="$enable_libtool_lock"

3578

+ enableval=$enable_libtool_lock;

3579

+fi

3580

3581

-fi;

3582

test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

3583

3584

# Some flags need to be propagated to the compiler or linker for good

3585

@@ -3561,7 +4161,7 @@

3586

;;

3587

*-*-irix6*)

3588

# Find out which ABI we are using.

3589

- echo '#line 3564 "configure"' > conftest.$ac_ext

3590

+ echo '#line 4164 "configure"' > conftest.$ac_ext

3591

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3592

(eval $ac_compile) 2>&5

3593

ac_status=$?

3594

@@ -3596,7 +4196,8 @@

3595

rm -rf conftest*

3596

;;

3597

3598

-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)

3599

+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \

3600

+s390*-*linux*|sparc*-*linux*)

3601

# Find out which ABI we are using.

3602

echo 'int i;' > conftest.$ac_ext

3603

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3604

@@ -3607,6 +4208,9 @@

3605

case `/usr/bin/file conftest.o` in

3606

*32-bit*)

3607

case $host in

3608

+ x86_64-*kfreebsd*-gnu)

3609

+ LD="${LD-ld} -m elf_i386_fbsd"

3610

+ ;;

3611

x86_64-*linux*)

3612

LD="${LD-ld} -m elf_i386"

3613

;;

3614

@@ -3623,6 +4227,9 @@

3615

;;

3616

*64-bit*)

3617

case $host in

3618

+ x86_64-*kfreebsd*-gnu)

3619

+ LD="${LD-ld} -m elf_x86_64_fbsd"

3620

+ ;;

3621

x86_64-*linux*)

3622

LD="${LD-ld} -m elf_x86_64"

3623

;;

3624

@@ -3646,8 +4253,8 @@

3625

# On SCO OpenServer 5, we need -belf to get full-featured binaries.

3626

SAVE_CFLAGS="$CFLAGS"

3627

CFLAGS="$CFLAGS -belf"

3628

- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5

3629

-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6

3630

+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5

3631

+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }

3632

if test "${lt_cv_cc_needs_belf+set}" = set; then

3633

echo $ECHO_N "(cached) $ECHO_C" >&6

3634

else

3635

@@ -3673,35 +4280,32 @@

3636

}

3637

_ACEOF

3638

rm -f conftest.$ac_objext conftest$ac_exeext

3639

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

3640

- (eval $ac_link) 2>conftest.er1

3641

+if { (ac_try="$ac_link"

3642

+case "(($ac_try" in

3643

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3644

+ *) ac_try_echo=$ac_try;;

3645

+esac

3646

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3647

+ (eval "$ac_link") 2>conftest.er1

3648

ac_status=$?

3649

grep -v '^ *+' conftest.er1 >conftest.err

3650

rm -f conftest.er1

3651

cat conftest.err >&5

3652

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3653

- (exit $ac_status); } &&

3654

- { ac_try='test -z "$ac_c_werror_flag"

3655

- || test ! -s conftest.err'

3656

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3657

- (eval $ac_try) 2>&5

3658

- ac_status=$?

3659

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3660

- (exit $ac_status); }; } &&

3661

- { ac_try='test -s conftest$ac_exeext'

3662

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3663

- (eval $ac_try) 2>&5

3664

- ac_status=$?

3665

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3666

- (exit $ac_status); }; }; then

3667

+ (exit $ac_status); } && {

3668

+ test -z "$ac_c_werror_flag" ||

3669

+ test ! -s conftest.err

3670

+ } && test -s conftest$ac_exeext &&

3671

+ $as_test_x conftest$ac_exeext; then

3672

lt_cv_cc_needs_belf=yes

3673

else

3674

echo "$as_me: failed program was:" >&5

3675

sed 's/^/| /' conftest.$ac_ext >&5

3676

3677

-lt_cv_cc_needs_belf=no

3678

+ lt_cv_cc_needs_belf=no

3679

fi

3680

-rm -f conftest.err conftest.$ac_objext \

3681

+

3682

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

3683

conftest$ac_exeext conftest.$ac_ext

3684

ac_ext=c

3685

ac_cpp='$CPP $CPPFLAGS'

3686

@@ -3710,8 +4314,8 @@

3687

ac_compiler_gnu=$ac_cv_c_compiler_gnu

3688

3689

fi

3690

-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5

3691

-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6

3692

+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5

3693

+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }

3694

if test x"$lt_cv_cc_needs_belf" != x"yes"; then

3695

# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf

3696

CFLAGS="$SAVE_CFLAGS"

3697

@@ -3729,7 +4333,11 @@

3698

*64-bit*)

3699

case $lt_cv_prog_gnu_ld in

3700

yes*) LD="${LD-ld} -m elf64_sparc" ;;

3701

- *) LD="${LD-ld} -64" ;;

3702

+ *)

3703

+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then

3704

+ LD="${LD-ld} -64"

3705

+ fi

3706

+ ;;

3707

esac

3708

;;

3709

esac

3710

@@ -3741,8 +4349,8 @@

3711

if test -n "$ac_tool_prefix"; then

3712

# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.

3713

set dummy ${ac_tool_prefix}dlltool; ac_word=$2

3714

-echo "$as_me:$LINENO: checking for $ac_word" >&5

3715

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

3716

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

3717

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

3718

if test "${ac_cv_prog_DLLTOOL+set}" = set; then

3719

echo $ECHO_N "(cached) $ECHO_C" >&6

3720

else

3721

@@ -3755,32 +4363,34 @@

3722

IFS=$as_save_IFS

3723

test -z "$as_dir" && as_dir=.

3724

for ac_exec_ext in '' $ac_executable_extensions; do

3725

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

3726

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3727

ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"

3728

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

3729

break 2

3730

fi

3731

done

3732

done

3733

+IFS=$as_save_IFS

3734

3735

fi

3736

fi

3737

DLLTOOL=$ac_cv_prog_DLLTOOL

3738

if test -n "$DLLTOOL"; then

3739

- echo "$as_me:$LINENO: result: $DLLTOOL" >&5

3740

-echo "${ECHO_T}$DLLTOOL" >&6

3741

+ { echo "$as_me:$LINENO: result: $DLLTOOL" >&5

3742

+echo "${ECHO_T}$DLLTOOL" >&6; }

3743

else

3744

- echo "$as_me:$LINENO: result: no" >&5

3745

-echo "${ECHO_T}no" >&6

3746

+ { echo "$as_me:$LINENO: result: no" >&5

3747

+echo "${ECHO_T}no" >&6; }

3748

fi

3749

3750

+

3751

fi

3752

if test -z "$ac_cv_prog_DLLTOOL"; then

3753

ac_ct_DLLTOOL=$DLLTOOL

3754

# Extract the first word of "dlltool", so it can be a program name with args.

3755

set dummy dlltool; ac_word=$2

3756

-echo "$as_me:$LINENO: checking for $ac_word" >&5

3757

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

3758

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

3759

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

3760

if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then

3761

echo $ECHO_N "(cached) $ECHO_C" >&6

3762

else

3763

@@ -3793,27 +4403,41 @@

3764

IFS=$as_save_IFS

3765

test -z "$as_dir" && as_dir=.

3766

for ac_exec_ext in '' $ac_executable_extensions; do

3767

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

3768

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3769

ac_cv_prog_ac_ct_DLLTOOL="dlltool"

3770

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

3771

break 2

3772

fi

3773

done

3774

done

3775

+IFS=$as_save_IFS

3776

3777

- test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false"

3778

fi

3779

fi

3780

ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL

3781

if test -n "$ac_ct_DLLTOOL"; then

3782

- echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5

3783

-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6

3784

+ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5

3785

+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }

3786

else

3787

- echo "$as_me:$LINENO: result: no" >&5

3788

-echo "${ECHO_T}no" >&6

3789

+ { echo "$as_me:$LINENO: result: no" >&5

3790

+echo "${ECHO_T}no" >&6; }

3791

fi

3792

3793

- DLLTOOL=$ac_ct_DLLTOOL

3794

+ if test "x$ac_ct_DLLTOOL" = x; then

3795

+ DLLTOOL="false"

3796

+ else

3797

+ case $cross_compiling:$ac_tool_warned in

3798

+yes:)

3799

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

3800

+whose name does not start with the host triplet. If you think this

3801

+configuration is useful to you, please write to autoconf@gnu.org." >&5

3802

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

3803

+whose name does not start with the host triplet. If you think this

3804

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

3805

+ac_tool_warned=yes ;;

3806

+esac

3807

+ DLLTOOL=$ac_ct_DLLTOOL

3808

+ fi

3809

else

3810

DLLTOOL="$ac_cv_prog_DLLTOOL"

3811

fi

3812

@@ -3821,8 +4445,8 @@

3813

if test -n "$ac_tool_prefix"; then

3814

# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.

3815

set dummy ${ac_tool_prefix}as; ac_word=$2

3816

-echo "$as_me:$LINENO: checking for $ac_word" >&5

3817

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

3818

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

3819

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

3820

if test "${ac_cv_prog_AS+set}" = set; then

3821

echo $ECHO_N "(cached) $ECHO_C" >&6

3822

else

3823

@@ -3835,32 +4459,34 @@

3824

IFS=$as_save_IFS

3825

test -z "$as_dir" && as_dir=.

3826

for ac_exec_ext in '' $ac_executable_extensions; do

3827

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

3828

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3829

ac_cv_prog_AS="${ac_tool_prefix}as"

3830

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

3831

break 2

3832

fi

3833

done

3834

done

3835

+IFS=$as_save_IFS

3836

3837

fi

3838

fi

3839

AS=$ac_cv_prog_AS

3840

if test -n "$AS"; then

3841

- echo "$as_me:$LINENO: result: $AS" >&5

3842

-echo "${ECHO_T}$AS" >&6

3843

+ { echo "$as_me:$LINENO: result: $AS" >&5

3844

+echo "${ECHO_T}$AS" >&6; }

3845

else

3846

- echo "$as_me:$LINENO: result: no" >&5

3847

-echo "${ECHO_T}no" >&6

3848

+ { echo "$as_me:$LINENO: result: no" >&5

3849

+echo "${ECHO_T}no" >&6; }

3850

fi

3851

3852

+

3853

fi

3854

if test -z "$ac_cv_prog_AS"; then

3855

ac_ct_AS=$AS

3856

# Extract the first word of "as", so it can be a program name with args.

3857

set dummy as; ac_word=$2

3858

-echo "$as_me:$LINENO: checking for $ac_word" >&5

3859

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

3860

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

3861

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

3862

if test "${ac_cv_prog_ac_ct_AS+set}" = set; then

3863

echo $ECHO_N "(cached) $ECHO_C" >&6

3864

else

3865

@@ -3873,27 +4499,41 @@

3866

IFS=$as_save_IFS

3867

test -z "$as_dir" && as_dir=.

3868

for ac_exec_ext in '' $ac_executable_extensions; do

3869

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

3870

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3871

ac_cv_prog_ac_ct_AS="as"

3872

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

3873

break 2

3874

fi

3875

done

3876

done

3877

+IFS=$as_save_IFS

3878

3879

- test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false"

3880

fi

3881

fi

3882

ac_ct_AS=$ac_cv_prog_ac_ct_AS

3883

if test -n "$ac_ct_AS"; then

3884

- echo "$as_me:$LINENO: result: $ac_ct_AS" >&5

3885

-echo "${ECHO_T}$ac_ct_AS" >&6

3886

+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5

3887

+echo "${ECHO_T}$ac_ct_AS" >&6; }

3888

else

3889

- echo "$as_me:$LINENO: result: no" >&5

3890

-echo "${ECHO_T}no" >&6

3891

+ { echo "$as_me:$LINENO: result: no" >&5

3892

+echo "${ECHO_T}no" >&6; }

3893

fi

3894

3895

- AS=$ac_ct_AS

3896

+ if test "x$ac_ct_AS" = x; then

3897

+ AS="false"

3898

+ else

3899

+ case $cross_compiling:$ac_tool_warned in

3900

+yes:)

3901

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

3902

+whose name does not start with the host triplet. If you think this

3903

+configuration is useful to you, please write to autoconf@gnu.org." >&5

3904

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

3905

+whose name does not start with the host triplet. If you think this

3906

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

3907

+ac_tool_warned=yes ;;

3908

+esac

3909

+ AS=$ac_ct_AS

3910

+ fi

3911

else

3912

AS="$ac_cv_prog_AS"

3913

fi

3914

@@ -3901,8 +4541,8 @@

3915

if test -n "$ac_tool_prefix"; then

3916

# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.

3917

set dummy ${ac_tool_prefix}objdump; ac_word=$2

3918

-echo "$as_me:$LINENO: checking for $ac_word" >&5

3919

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

3920

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

3921

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

3922

if test "${ac_cv_prog_OBJDUMP+set}" = set; then

3923

echo $ECHO_N "(cached) $ECHO_C" >&6

3924

else

3925

@@ -3915,32 +4555,34 @@

3926

IFS=$as_save_IFS

3927

test -z "$as_dir" && as_dir=.

3928

for ac_exec_ext in '' $ac_executable_extensions; do

3929

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

3930

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3931

ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"

3932

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

3933

break 2

3934

fi

3935

done

3936

done

3937

+IFS=$as_save_IFS

3938

3939

fi

3940

fi

3941

OBJDUMP=$ac_cv_prog_OBJDUMP

3942

if test -n "$OBJDUMP"; then

3943

- echo "$as_me:$LINENO: result: $OBJDUMP" >&5

3944

-echo "${ECHO_T}$OBJDUMP" >&6

3945

+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5

3946

+echo "${ECHO_T}$OBJDUMP" >&6; }

3947

else

3948

- echo "$as_me:$LINENO: result: no" >&5

3949

-echo "${ECHO_T}no" >&6

3950

+ { echo "$as_me:$LINENO: result: no" >&5

3951

+echo "${ECHO_T}no" >&6; }

3952

fi

3953

3954

+

3955

fi

3956

if test -z "$ac_cv_prog_OBJDUMP"; then

3957

ac_ct_OBJDUMP=$OBJDUMP

3958

# Extract the first word of "objdump", so it can be a program name with args.

3959

set dummy objdump; ac_word=$2

3960

-echo "$as_me:$LINENO: checking for $ac_word" >&5

3961

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

3962

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

3963

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

3964

if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then

3965

echo $ECHO_N "(cached) $ECHO_C" >&6

3966

else

3967

@@ -3953,27 +4595,41 @@

3968

IFS=$as_save_IFS

3969

test -z "$as_dir" && as_dir=.

3970

for ac_exec_ext in '' $ac_executable_extensions; do

3971

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

3972

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3973

ac_cv_prog_ac_ct_OBJDUMP="objdump"

3974

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

3975

break 2

3976

fi

3977

done

3978

done

3979

+IFS=$as_save_IFS

3980

3981

- test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"

3982

fi

3983

fi

3984

ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP

3985

if test -n "$ac_ct_OBJDUMP"; then

3986

- echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5

3987

-echo "${ECHO_T}$ac_ct_OBJDUMP" >&6

3988

+ { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5

3989

+echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }

3990

else

3991

- echo "$as_me:$LINENO: result: no" >&5

3992

-echo "${ECHO_T}no" >&6

3993

+ { echo "$as_me:$LINENO: result: no" >&5

3994

+echo "${ECHO_T}no" >&6; }

3995

fi

3996

3997

- OBJDUMP=$ac_ct_OBJDUMP

3998

+ if test "x$ac_ct_OBJDUMP" = x; then

3999

+ OBJDUMP="false"

4000

+ else

4001

+ case $cross_compiling:$ac_tool_warned in

4002

+yes:)

4003

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

4004

+whose name does not start with the host triplet. If you think this

4005

+configuration is useful to you, please write to autoconf@gnu.org." >&5

4006

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

4007

+whose name does not start with the host triplet. If you think this

4008

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

4009

+ac_tool_warned=yes ;;

4010

+esac

4011

+ OBJDUMP=$ac_ct_OBJDUMP

4012

+ fi

4013

else

4014

OBJDUMP="$ac_cv_prog_OBJDUMP"

4015

fi

4016

@@ -3990,8 +4646,8 @@

4017

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

4018

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

4019

ac_compiler_gnu=$ac_cv_c_compiler_gnu

4020

-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5

4021

-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6

4022

+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5

4023

+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }

4024

# On Suns, sometimes $CPP names a directory.

4025

if test -n "$CPP" && test -d "$CPP"; then

4026

CPP=

4027

@@ -4025,24 +4681,22 @@

4028

#endif

4029

Syntax error

4030

_ACEOF

4031

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

4032

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

4033

+if { (ac_try="$ac_cpp conftest.$ac_ext"

4034

+case "(($ac_try" in

4035

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4036

+ *) ac_try_echo=$ac_try;;

4037

+esac

4038

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4039

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

4040

ac_status=$?

4041

grep -v '^ *+' conftest.er1 >conftest.err

4042

rm -f conftest.er1

4043

cat conftest.err >&5

4044

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4045

- (exit $ac_status); } >/dev/null; then

4046

- if test -s conftest.err; then

4047

- ac_cpp_err=$ac_c_preproc_warn_flag

4048

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

4049

- else

4050

- ac_cpp_err=

4051

- fi

4052

-else

4053

- ac_cpp_err=yes

4054

-fi

4055

-if test -z "$ac_cpp_err"; then

4056

+ (exit $ac_status); } >/dev/null && {

4057

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

4058

+ test ! -s conftest.err

4059

+ }; then

4060

:

4061

else

4062

echo "$as_me: failed program was:" >&5

4063

@@ -4051,9 +4705,10 @@

4064

# Broken: fails on valid input.

4065

continue

4066

fi

4067

+

4068

rm -f conftest.err conftest.$ac_ext

4069

4070

- # OK, works on sane cases. Now check whether non-existent headers

4071

+ # OK, works on sane cases. Now check whether nonexistent headers

4072

# can be detected and how.

4073

cat >conftest.$ac_ext <<_ACEOF

4074

/* confdefs.h. */

4075

@@ -4063,24 +4718,22 @@

4076

/* end confdefs.h. */

4077

#include <ac_nonexistent.h>

4078

_ACEOF

4079

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

4080

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

4081

+if { (ac_try="$ac_cpp conftest.$ac_ext"

4082

+case "(($ac_try" in

4083

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4084

+ *) ac_try_echo=$ac_try;;

4085

+esac

4086

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4087

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

4088

ac_status=$?

4089

grep -v '^ *+' conftest.er1 >conftest.err

4090

rm -f conftest.er1

4091

cat conftest.err >&5

4092

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4093

- (exit $ac_status); } >/dev/null; then

4094

- if test -s conftest.err; then

4095

- ac_cpp_err=$ac_c_preproc_warn_flag

4096

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

4097

- else

4098

- ac_cpp_err=

4099

- fi

4100

-else

4101

- ac_cpp_err=yes

4102

-fi

4103

-if test -z "$ac_cpp_err"; then

4104

+ (exit $ac_status); } >/dev/null && {

4105

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

4106

+ test ! -s conftest.err

4107

+ }; then

4108

# Broken: success on invalid input.

4109

continue

4110

else

4111

@@ -4091,6 +4744,7 @@

4112

ac_preproc_ok=:

4113

break

4114

fi

4115

+

4116

rm -f conftest.err conftest.$ac_ext

4117

4118

done

4119

@@ -4108,8 +4762,8 @@

4120

else

4121

ac_cv_prog_CPP=$CPP

4122

fi

4123

-echo "$as_me:$LINENO: result: $CPP" >&5

4124

-echo "${ECHO_T}$CPP" >&6

4125

+{ echo "$as_me:$LINENO: result: $CPP" >&5

4126

+echo "${ECHO_T}$CPP" >&6; }

4127

ac_preproc_ok=false

4128

for ac_c_preproc_warn_flag in '' yes

4129

do

4130

@@ -4132,24 +4786,22 @@

4131

#endif

4132

Syntax error

4133

_ACEOF

4134

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

4135

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

4136

+if { (ac_try="$ac_cpp conftest.$ac_ext"

4137

+case "(($ac_try" in

4138

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4139

+ *) ac_try_echo=$ac_try;;

4140

+esac

4141

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4142

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

4143

ac_status=$?

4144

grep -v '^ *+' conftest.er1 >conftest.err

4145

rm -f conftest.er1

4146

cat conftest.err >&5

4147

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4148

- (exit $ac_status); } >/dev/null; then

4149

- if test -s conftest.err; then

4150

- ac_cpp_err=$ac_c_preproc_warn_flag

4151

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

4152

- else

4153

- ac_cpp_err=

4154

- fi

4155

-else

4156

- ac_cpp_err=yes

4157

-fi

4158

-if test -z "$ac_cpp_err"; then

4159

+ (exit $ac_status); } >/dev/null && {

4160

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

4161

+ test ! -s conftest.err

4162

+ }; then

4163

:

4164

else

4165

echo "$as_me: failed program was:" >&5

4166

@@ -4158,9 +4810,10 @@

4167

# Broken: fails on valid input.

4168

continue

4169

fi

4170

+

4171

rm -f conftest.err conftest.$ac_ext

4172

4173

- # OK, works on sane cases. Now check whether non-existent headers

4174

+ # OK, works on sane cases. Now check whether nonexistent headers

4175

# can be detected and how.

4176

cat >conftest.$ac_ext <<_ACEOF

4177

/* confdefs.h. */

4178

@@ -4170,24 +4823,22 @@

4179

/* end confdefs.h. */

4180

#include <ac_nonexistent.h>

4181

_ACEOF

4182

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

4183

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

4184

+if { (ac_try="$ac_cpp conftest.$ac_ext"

4185

+case "(($ac_try" in

4186

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4187

+ *) ac_try_echo=$ac_try;;

4188

+esac

4189

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4190

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

4191

ac_status=$?

4192

grep -v '^ *+' conftest.er1 >conftest.err

4193

rm -f conftest.er1

4194

cat conftest.err >&5

4195

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4196

- (exit $ac_status); } >/dev/null; then

4197

- if test -s conftest.err; then

4198

- ac_cpp_err=$ac_c_preproc_warn_flag

4199

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

4200

- else

4201

- ac_cpp_err=

4202

- fi

4203

-else

4204

- ac_cpp_err=yes

4205

-fi

4206

-if test -z "$ac_cpp_err"; then

4207

+ (exit $ac_status); } >/dev/null && {

4208

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

4209

+ test ! -s conftest.err

4210

+ }; then

4211

# Broken: success on invalid input.

4212

continue

4213

else

4214

@@ -4198,6 +4849,7 @@

4215

ac_preproc_ok=:

4216

break

4217

fi

4218

+

4219

rm -f conftest.err conftest.$ac_ext

4220

4221

done

4222

@@ -4220,8 +4872,8 @@

4223

ac_compiler_gnu=$ac_cv_c_compiler_gnu

4224

4225

4226

-echo "$as_me:$LINENO: checking for ANSI C header files" >&5

4227

-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6

4228

+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5

4229

+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }

4230

if test "${ac_cv_header_stdc+set}" = set; then

4231

echo $ECHO_N "(cached) $ECHO_C" >&6

4232

else

4233

@@ -4245,35 +4897,31 @@

4234

}

4235

_ACEOF

4236

rm -f conftest.$ac_objext

4237

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4238

- (eval $ac_compile) 2>conftest.er1

4239

+if { (ac_try="$ac_compile"

4240

+case "(($ac_try" in

4241

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4242

+ *) ac_try_echo=$ac_try;;

4243

+esac

4244

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4245

+ (eval "$ac_compile") 2>conftest.er1

4246

ac_status=$?

4247

grep -v '^ *+' conftest.er1 >conftest.err

4248

rm -f conftest.er1

4249

cat conftest.err >&5

4250

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4251

- (exit $ac_status); } &&

4252

- { ac_try='test -z "$ac_c_werror_flag"

4253

- || test ! -s conftest.err'

4254

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4255

- (eval $ac_try) 2>&5

4256

- ac_status=$?

4257

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4258

- (exit $ac_status); }; } &&

4259

- { ac_try='test -s conftest.$ac_objext'

4260

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4261

- (eval $ac_try) 2>&5

4262

- ac_status=$?

4263

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4264

- (exit $ac_status); }; }; then

4265

+ (exit $ac_status); } && {

4266

+ test -z "$ac_c_werror_flag" ||

4267

+ test ! -s conftest.err

4268

+ } && test -s conftest.$ac_objext; then

4269

ac_cv_header_stdc=yes

4270

else

4271

echo "$as_me: failed program was:" >&5

4272

sed 's/^/| /' conftest.$ac_ext >&5

4273

4274

-ac_cv_header_stdc=no

4275

+ ac_cv_header_stdc=no

4276

fi

4277

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

4278

+

4279

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4280

4281

if test $ac_cv_header_stdc = yes; then

4282

# SunOS 4.x string.h does not declare mem*, contrary to ANSI.

4283

@@ -4329,6 +4977,7 @@

4284

cat >>conftest.$ac_ext <<_ACEOF

4285

/* end confdefs.h. */

4286

#include <ctype.h>

4287

+#include <stdlib.h>

4288

#if ((' ' & 0x0FF) == 0x020)

4289

# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')

4290

# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))

4291

@@ -4348,18 +4997,27 @@

4292

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

4293

if (XOR (islower (i), ISLOWER (i))

4294

|| toupper (i) != TOUPPER (i))

4295

- exit(2);

4296

- exit (0);

4297

+ return 2;

4298

+ return 0;

4299

}

4300

_ACEOF

4301

rm -f conftest$ac_exeext

4302

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

4303

- (eval $ac_link) 2>&5

4304

+if { (ac_try="$ac_link"

4305

+case "(($ac_try" in

4306

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4307

+ *) ac_try_echo=$ac_try;;

4308

+esac

4309

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4310

+ (eval "$ac_link") 2>&5

4311

ac_status=$?

4312

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4313

(exit $ac_status); } && { ac_try='./conftest$ac_exeext'

4314

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4315

- (eval $ac_try) 2>&5

4316

+ { (case "(($ac_try" in

4317

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4318

+ *) ac_try_echo=$ac_try;;

4319

+esac

4320

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4321

+ (eval "$ac_try") 2>&5

4322

ac_status=$?

4323

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4324

(exit $ac_status); }; }; then

4325

@@ -4372,12 +5030,14 @@

4326

( exit $ac_status )

4327

ac_cv_header_stdc=no

4328

fi

4329

-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

4330

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

4331

fi

4332

+

4333

+

4334

fi

4335

fi

4336

-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

4337

-echo "${ECHO_T}$ac_cv_header_stdc" >&6

4338

+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

4339

+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }

4340

if test $ac_cv_header_stdc = yes; then

4341

4342

cat >>confdefs.h <<\_ACEOF

4343

@@ -4400,9 +5060,9 @@

4344

inttypes.h stdint.h unistd.h

4345

do

4346

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

4347

-echo "$as_me:$LINENO: checking for $ac_header" >&5

4348

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

4349

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

4350

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

4351

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

4352

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

4353

echo $ECHO_N "(cached) $ECHO_C" >&6

4354

else

4355

cat >conftest.$ac_ext <<_ACEOF

4356

@@ -4416,38 +5076,35 @@

4357

#include <$ac_header>

4358

_ACEOF

4359

rm -f conftest.$ac_objext

4360

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4361

- (eval $ac_compile) 2>conftest.er1

4362

+if { (ac_try="$ac_compile"

4363

+case "(($ac_try" in

4364

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4365

+ *) ac_try_echo=$ac_try;;

4366

+esac

4367

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4368

+ (eval "$ac_compile") 2>conftest.er1

4369

ac_status=$?

4370

grep -v '^ *+' conftest.er1 >conftest.err

4371

rm -f conftest.er1

4372

cat conftest.err >&5

4373

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4374

- (exit $ac_status); } &&

4375

- { ac_try='test -z "$ac_c_werror_flag"

4376

- || test ! -s conftest.err'

4377

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4378

- (eval $ac_try) 2>&5

4379

- ac_status=$?

4380

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4381

- (exit $ac_status); }; } &&

4382

- { ac_try='test -s conftest.$ac_objext'

4383

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4384

- (eval $ac_try) 2>&5

4385

- ac_status=$?

4386

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4387

- (exit $ac_status); }; }; then

4388

+ (exit $ac_status); } && {

4389

+ test -z "$ac_c_werror_flag" ||

4390

+ test ! -s conftest.err

4391

+ } && test -s conftest.$ac_objext; then

4392

eval "$as_ac_Header=yes"

4393

else

4394

echo "$as_me: failed program was:" >&5

4395

sed 's/^/| /' conftest.$ac_ext >&5

4396

4397

-eval "$as_ac_Header=no"

4398

+ eval "$as_ac_Header=no"

4399

fi

4400

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

4401

+

4402

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4403

fi

4404

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

4405

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

4406

+ac_res=`eval echo '${'$as_ac_Header'}'`

4407

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

4408

+echo "${ECHO_T}$ac_res" >&6; }

4409

if test `eval echo '${'$as_ac_Header'}'` = yes; then

4410

cat >>confdefs.h <<_ACEOF

4411

#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

4412

@@ -4462,18 +5119,19 @@

4413

for ac_header in dlfcn.h

4414

do

4415

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

4416

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

4417

- echo "$as_me:$LINENO: checking for $ac_header" >&5

4418

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

4419

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

4420

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

4421

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

4422

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

4423

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

4424

echo $ECHO_N "(cached) $ECHO_C" >&6

4425

fi

4426

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

4427

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

4428

+ac_res=`eval echo '${'$as_ac_Header'}'`

4429

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

4430

+echo "${ECHO_T}$ac_res" >&6; }

4431

else

4432

# Is the header compilable?

4433

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

4434

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

4435

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

4436

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

4437

cat >conftest.$ac_ext <<_ACEOF

4438

/* confdefs.h. */

4439

_ACEOF

4440

@@ -4484,41 +5142,37 @@

4441

#include <$ac_header>

4442

_ACEOF

4443

rm -f conftest.$ac_objext

4444

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4445

- (eval $ac_compile) 2>conftest.er1

4446

+if { (ac_try="$ac_compile"

4447

+case "(($ac_try" in

4448

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4449

+ *) ac_try_echo=$ac_try;;

4450

+esac

4451

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4452

+ (eval "$ac_compile") 2>conftest.er1

4453

ac_status=$?

4454

grep -v '^ *+' conftest.er1 >conftest.err

4455

rm -f conftest.er1

4456

cat conftest.err >&5

4457

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4458

- (exit $ac_status); } &&

4459

- { ac_try='test -z "$ac_c_werror_flag"

4460

- || test ! -s conftest.err'

4461

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4462

- (eval $ac_try) 2>&5

4463

- ac_status=$?

4464

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4465

- (exit $ac_status); }; } &&

4466

- { ac_try='test -s conftest.$ac_objext'

4467

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4468

- (eval $ac_try) 2>&5

4469

- ac_status=$?

4470

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4471

- (exit $ac_status); }; }; then

4472

+ (exit $ac_status); } && {

4473

+ test -z "$ac_c_werror_flag" ||

4474

+ test ! -s conftest.err

4475

+ } && test -s conftest.$ac_objext; then

4476

ac_header_compiler=yes

4477

else

4478

echo "$as_me: failed program was:" >&5

4479

sed 's/^/| /' conftest.$ac_ext >&5

4480

4481

-ac_header_compiler=no

4482

+ ac_header_compiler=no

4483

fi

4484

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

4485

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

4486

-echo "${ECHO_T}$ac_header_compiler" >&6

4487

+

4488

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4489

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

4490

+echo "${ECHO_T}$ac_header_compiler" >&6; }

4491

4492

# Is the header present?

4493

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

4494

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

4495

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

4496

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

4497

cat >conftest.$ac_ext <<_ACEOF

4498

/* confdefs.h. */

4499

_ACEOF

4500

@@ -4527,24 +5181,22 @@

4501

/* end confdefs.h. */

4502

#include <$ac_header>

4503

_ACEOF

4504

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

4505

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

4506

+if { (ac_try="$ac_cpp conftest.$ac_ext"

4507

+case "(($ac_try" in

4508

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4509

+ *) ac_try_echo=$ac_try;;

4510

+esac

4511

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4512

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

4513

ac_status=$?

4514

grep -v '^ *+' conftest.er1 >conftest.err

4515

rm -f conftest.er1

4516

cat conftest.err >&5

4517

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4518

- (exit $ac_status); } >/dev/null; then

4519

- if test -s conftest.err; then

4520

- ac_cpp_err=$ac_c_preproc_warn_flag

4521

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

4522

- else

4523

- ac_cpp_err=

4524

- fi

4525

-else

4526

- ac_cpp_err=yes

4527

-fi

4528

-if test -z "$ac_cpp_err"; then

4529

+ (exit $ac_status); } >/dev/null && {

4530

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

4531

+ test ! -s conftest.err

4532

+ }; then

4533

ac_header_preproc=yes

4534

else

4535

echo "$as_me: failed program was:" >&5

4536

@@ -4552,9 +5204,10 @@

4537

4538

ac_header_preproc=no

4539

fi

4540

+

4541

rm -f conftest.err conftest.$ac_ext

4542

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

4543

-echo "${ECHO_T}$ac_header_preproc" >&6

4544

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

4545

+echo "${ECHO_T}$ac_header_preproc" >&6; }

4546

4547

# So? What about this header?

4548

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

4549

@@ -4578,25 +5231,24 @@

4550

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

4551

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

4552

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

4553

- (

4554

- cat <<\_ASBOX

4555

+ ( cat <<\_ASBOX

4556

## -------------------------------------- ##

4557

## Report this to expat-bugs@libexpat.org ##

4558

## -------------------------------------- ##

4559

_ASBOX

4560

- ) |

4561

- sed "s/^/$as_me: WARNING: /" >&2

4562

+ ) | sed "s/^/$as_me: WARNING: /" >&2

4563

;;

4564

esac

4565

-echo "$as_me:$LINENO: checking for $ac_header" >&5

4566

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

4567

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

4568

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

4569

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

4570

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

4571

echo $ECHO_N "(cached) $ECHO_C" >&6

4572

else

4573

eval "$as_ac_Header=\$ac_header_preproc"

4574

fi

4575

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

4576

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

4577

+ac_res=`eval echo '${'$as_ac_Header'}'`

4578

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

4579

+echo "${ECHO_T}$ac_res" >&6; }

4580

4581

fi

4582

if test `eval echo '${'$as_ac_Header'}'` = yes; then

4583

@@ -4608,18 +5260,22 @@

4584

4585

done

4586

4587

-ac_ext=cc

4588

+ac_ext=cpp

4589

ac_cpp='$CXXCPP $CPPFLAGS'

4590

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

4591

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

4592

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

4593

-if test -n "$ac_tool_prefix"; then

4594

- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC

4595

+if test -z "$CXX"; then

4596

+ if test -n "$CCC"; then

4597

+ CXX=$CCC

4598

+ else

4599

+ if test -n "$ac_tool_prefix"; then

4600

+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

4601

do

4602

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

4603

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

4604

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4605

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4606

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4607

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4608

if test "${ac_cv_prog_CXX+set}" = set; then

4609

echo $ECHO_N "(cached) $ECHO_C" >&6

4610

else

4611

@@ -4632,36 +5288,38 @@

4612

IFS=$as_save_IFS

4613

test -z "$as_dir" && as_dir=.

4614

for ac_exec_ext in '' $ac_executable_extensions; do

4615

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4616

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4617

ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

4618

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4619

break 2

4620

fi

4621

done

4622

done

4623

+IFS=$as_save_IFS

4624

4625

fi

4626

fi

4627

CXX=$ac_cv_prog_CXX

4628

if test -n "$CXX"; then

4629

- echo "$as_me:$LINENO: result: $CXX" >&5

4630

-echo "${ECHO_T}$CXX" >&6

4631

+ { echo "$as_me:$LINENO: result: $CXX" >&5

4632

+echo "${ECHO_T}$CXX" >&6; }

4633

else

4634

- echo "$as_me:$LINENO: result: no" >&5

4635

-echo "${ECHO_T}no" >&6

4636

+ { echo "$as_me:$LINENO: result: no" >&5

4637

+echo "${ECHO_T}no" >&6; }

4638

fi

4639

4640

+

4641

test -n "$CXX" && break

4642

done

4643

fi

4644

if test -z "$CXX"; then

4645

ac_ct_CXX=$CXX

4646

- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC

4647

+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

4648

do

4649

# Extract the first word of "$ac_prog", so it can be a program name with args.

4650

set dummy $ac_prog; ac_word=$2

4651

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4652

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4653

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4654

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4655

if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then

4656

echo $ECHO_N "(cached) $ECHO_C" >&6

4657

else

4658

@@ -4674,55 +5332,85 @@

4659

IFS=$as_save_IFS

4660

test -z "$as_dir" && as_dir=.

4661

for ac_exec_ext in '' $ac_executable_extensions; do

4662

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4663

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4664

ac_cv_prog_ac_ct_CXX="$ac_prog"

4665

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4666

break 2

4667

fi

4668

done

4669

done

4670

+IFS=$as_save_IFS

4671

4672

fi

4673

fi

4674

ac_ct_CXX=$ac_cv_prog_ac_ct_CXX

4675

if test -n "$ac_ct_CXX"; then

4676

- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

4677

-echo "${ECHO_T}$ac_ct_CXX" >&6

4678

+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

4679

+echo "${ECHO_T}$ac_ct_CXX" >&6; }

4680

else

4681

- echo "$as_me:$LINENO: result: no" >&5

4682

-echo "${ECHO_T}no" >&6

4683

+ { echo "$as_me:$LINENO: result: no" >&5

4684

+echo "${ECHO_T}no" >&6; }

4685

fi

4686

4687

+

4688

test -n "$ac_ct_CXX" && break

4689

done

4690

-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"

4691

4692

- CXX=$ac_ct_CXX

4693

+ if test "x$ac_ct_CXX" = x; then

4694

+ CXX="g++"

4695

+ else

4696

+ case $cross_compiling:$ac_tool_warned in

4697

+yes:)

4698

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

4699

+whose name does not start with the host triplet. If you think this

4700

+configuration is useful to you, please write to autoconf@gnu.org." >&5

4701

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

4702

+whose name does not start with the host triplet. If you think this

4703

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

4704

+ac_tool_warned=yes ;;

4705

+esac

4706

+ CXX=$ac_ct_CXX

4707

+ fi

4708

fi

4709

4710

-

4711

+ fi

4712

+fi

4713

# Provide some information about the compiler.

4714

-echo "$as_me:$LINENO:" \

4715

- "checking for C++ compiler version" >&5

4716

+echo "$as_me:$LINENO: checking for C++ compiler version" >&5

4717

ac_compiler=`set X $ac_compile; echo $2`

4718

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5

4719

- (eval $ac_compiler --version </dev/null >&5) 2>&5

4720

+{ (ac_try="$ac_compiler --version >&5"

4721

+case "(($ac_try" in

4722

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4723

+ *) ac_try_echo=$ac_try;;

4724

+esac

4725

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4726

+ (eval "$ac_compiler --version >&5") 2>&5

4727

ac_status=$?

4728

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4729

(exit $ac_status); }

4730

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5

4731

- (eval $ac_compiler -v </dev/null >&5) 2>&5

4732

+{ (ac_try="$ac_compiler -v >&5"

4733

+case "(($ac_try" in

4734

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4735

+ *) ac_try_echo=$ac_try;;

4736

+esac

4737

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4738

+ (eval "$ac_compiler -v >&5") 2>&5

4739

ac_status=$?

4740

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4741

(exit $ac_status); }

4742

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5

4743

- (eval $ac_compiler -V </dev/null >&5) 2>&5

4744

+{ (ac_try="$ac_compiler -V >&5"

4745

+case "(($ac_try" in

4746

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4747

+ *) ac_try_echo=$ac_try;;

4748

+esac

4749

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4750

+ (eval "$ac_compiler -V >&5") 2>&5

4751

ac_status=$?

4752

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4753

(exit $ac_status); }

4754

4755

-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

4756

-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6

4757

+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

4758

+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }

4759

if test "${ac_cv_cxx_compiler_gnu+set}" = set; then

4760

echo $ECHO_N "(cached) $ECHO_C" >&6

4761

else

4762

@@ -4745,50 +5433,49 @@

4763

}

4764

_ACEOF

4765

rm -f conftest.$ac_objext

4766

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4767

- (eval $ac_compile) 2>conftest.er1

4768

+if { (ac_try="$ac_compile"

4769

+case "(($ac_try" in

4770

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4771

+ *) ac_try_echo=$ac_try;;

4772

+esac

4773

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4774

+ (eval "$ac_compile") 2>conftest.er1

4775

ac_status=$?

4776

grep -v '^ *+' conftest.er1 >conftest.err

4777

rm -f conftest.er1

4778

cat conftest.err >&5

4779

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4780

- (exit $ac_status); } &&

4781

- { ac_try='test -z "$ac_cxx_werror_flag"

4782

- || test ! -s conftest.err'

4783

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4784

- (eval $ac_try) 2>&5

4785

- ac_status=$?

4786

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4787

- (exit $ac_status); }; } &&

4788

- { ac_try='test -s conftest.$ac_objext'

4789

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4790

- (eval $ac_try) 2>&5

4791

- ac_status=$?

4792

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4793

- (exit $ac_status); }; }; then

4794

+ (exit $ac_status); } && {

4795

+ test -z "$ac_cxx_werror_flag" ||

4796

+ test ! -s conftest.err

4797

+ } && test -s conftest.$ac_objext; then

4798

ac_compiler_gnu=yes

4799

else

4800

echo "$as_me: failed program was:" >&5

4801

sed 's/^/| /' conftest.$ac_ext >&5

4802

4803

-ac_compiler_gnu=no

4804

+ ac_compiler_gnu=no

4805

fi

4806

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

4807

+

4808

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4809

ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

4810

4811

fi

4812

-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

4813

-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6

4814

+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

4815

+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }

4816

GXX=`test $ac_compiler_gnu = yes && echo yes`

4817

ac_test_CXXFLAGS=${CXXFLAGS+set}

4818

ac_save_CXXFLAGS=$CXXFLAGS

4819

-CXXFLAGS="-g"

4820

-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

4821

-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6

4822

+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

4823

+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }

4824

if test "${ac_cv_prog_cxx_g+set}" = set; then

4825

echo $ECHO_N "(cached) $ECHO_C" >&6

4826

else

4827

- cat >conftest.$ac_ext <<_ACEOF

4828

+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag

4829

+ ac_cxx_werror_flag=yes

4830

+ ac_cv_prog_cxx_g=no

4831

+ CXXFLAGS="-g"

4832

+ cat >conftest.$ac_ext <<_ACEOF

4833

/* confdefs.h. */

4834

_ACEOF

4835

cat confdefs.h >>conftest.$ac_ext

4836

@@ -4804,160 +5491,134 @@

4837

}

4838

_ACEOF

4839

rm -f conftest.$ac_objext

4840

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4841

- (eval $ac_compile) 2>conftest.er1

4842

+if { (ac_try="$ac_compile"

4843

+case "(($ac_try" in

4844

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4845

+ *) ac_try_echo=$ac_try;;

4846

+esac

4847

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4848

+ (eval "$ac_compile") 2>conftest.er1

4849

ac_status=$?

4850

grep -v '^ *+' conftest.er1 >conftest.err

4851

rm -f conftest.er1

4852

cat conftest.err >&5

4853

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4854

- (exit $ac_status); } &&

4855

- { ac_try='test -z "$ac_cxx_werror_flag"

4856

- || test ! -s conftest.err'

4857

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4858

- (eval $ac_try) 2>&5

4859

- ac_status=$?

4860

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4861

- (exit $ac_status); }; } &&

4862

- { ac_try='test -s conftest.$ac_objext'

4863

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4864

- (eval $ac_try) 2>&5

4865

- ac_status=$?

4866

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4867

- (exit $ac_status); }; }; then

4868

+ (exit $ac_status); } && {

4869

+ test -z "$ac_cxx_werror_flag" ||

4870

+ test ! -s conftest.err

4871

+ } && test -s conftest.$ac_objext; then

4872

ac_cv_prog_cxx_g=yes

4873

else

4874

echo "$as_me: failed program was:" >&5

4875

sed 's/^/| /' conftest.$ac_ext >&5

4876

4877

-ac_cv_prog_cxx_g=no

4878

-fi

4879

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

4880

-fi

4881

-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

4882

-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6

4883

-if test "$ac_test_CXXFLAGS" = set; then

4884

- CXXFLAGS=$ac_save_CXXFLAGS

4885

-elif test $ac_cv_prog_cxx_g = yes; then

4886

- if test "$GXX" = yes; then

4887

- CXXFLAGS="-g -O2"

4888

- else

4889

- CXXFLAGS="-g"

4890

- fi

4891

-else

4892

- if test "$GXX" = yes; then

4893

- CXXFLAGS="-O2"

4894

- else

4895

- CXXFLAGS=

4896

- fi

4897

-fi

4898

-for ac_declaration in \

4899

- '' \

4900

- 'extern "C" void std::exit (int) throw (); using std::exit;' \

4901

- 'extern "C" void std::exit (int); using std::exit;' \

4902

- 'extern "C" void exit (int) throw ();' \

4903

- 'extern "C" void exit (int);' \

4904

- 'void exit (int);'

4905

-do

4906

- cat >conftest.$ac_ext <<_ACEOF

4907

+ CXXFLAGS=""

4908

+ cat >conftest.$ac_ext <<_ACEOF

4909

/* confdefs.h. */

4910

_ACEOF

4911

cat confdefs.h >>conftest.$ac_ext

4912

cat >>conftest.$ac_ext <<_ACEOF

4913

/* end confdefs.h. */

4914

-$ac_declaration

4915

-#include <stdlib.h>

4916

+

4917

int

4918

main ()

4919

{

4920

-exit (42);

4921

+

4922

;

4923

return 0;

4924

}

4925

_ACEOF

4926

rm -f conftest.$ac_objext

4927

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4928

- (eval $ac_compile) 2>conftest.er1

4929

+if { (ac_try="$ac_compile"

4930

+case "(($ac_try" in

4931

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4932

+ *) ac_try_echo=$ac_try;;

4933

+esac

4934

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4935

+ (eval "$ac_compile") 2>conftest.er1

4936

ac_status=$?

4937

grep -v '^ *+' conftest.er1 >conftest.err

4938

rm -f conftest.er1

4939

cat conftest.err >&5

4940

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4941

- (exit $ac_status); } &&

4942

- { ac_try='test -z "$ac_cxx_werror_flag"

4943

- || test ! -s conftest.err'

4944

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4945

- (eval $ac_try) 2>&5

4946

- ac_status=$?

4947

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4948

- (exit $ac_status); }; } &&

4949

- { ac_try='test -s conftest.$ac_objext'

4950

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4951

- (eval $ac_try) 2>&5

4952

- ac_status=$?

4953

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4954

- (exit $ac_status); }; }; then

4955

+ (exit $ac_status); } && {

4956

+ test -z "$ac_cxx_werror_flag" ||

4957

+ test ! -s conftest.err

4958

+ } && test -s conftest.$ac_objext; then

4959

:

4960

else

4961

echo "$as_me: failed program was:" >&5

4962

sed 's/^/| /' conftest.$ac_ext >&5

4963

4964

-continue

4965

-fi

4966

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

4967

- cat >conftest.$ac_ext <<_ACEOF

4968

+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag

4969

+ CXXFLAGS="-g"

4970

+ cat >conftest.$ac_ext <<_ACEOF

4971

/* confdefs.h. */

4972

_ACEOF

4973

cat confdefs.h >>conftest.$ac_ext

4974

cat >>conftest.$ac_ext <<_ACEOF

4975

/* end confdefs.h. */

4976

-$ac_declaration

4977

+

4978

int

4979

main ()

4980

{

4981

-exit (42);

4982

+

4983

;

4984

return 0;

4985

}

4986

_ACEOF

4987

rm -f conftest.$ac_objext

4988

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4989

- (eval $ac_compile) 2>conftest.er1

4990

+if { (ac_try="$ac_compile"

4991

+case "(($ac_try" in

4992

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4993

+ *) ac_try_echo=$ac_try;;

4994

+esac

4995

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4996

+ (eval "$ac_compile") 2>conftest.er1

4997

ac_status=$?

4998

grep -v '^ *+' conftest.er1 >conftest.err

4999

rm -f conftest.er1

5000

cat conftest.err >&5

5001

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5002

- (exit $ac_status); } &&

5003

- { ac_try='test -z "$ac_cxx_werror_flag"

5004

- || test ! -s conftest.err'

5005

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5006

- (eval $ac_try) 2>&5

5007

- ac_status=$?

5008

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5009

- (exit $ac_status); }; } &&

5010

- { ac_try='test -s conftest.$ac_objext'

5011

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5012

- (eval $ac_try) 2>&5

5013

- ac_status=$?

5014

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5015

- (exit $ac_status); }; }; then

5016

- break

5017

+ (exit $ac_status); } && {

5018

+ test -z "$ac_cxx_werror_flag" ||

5019

+ test ! -s conftest.err

5020

+ } && test -s conftest.$ac_objext; then

5021

+ ac_cv_prog_cxx_g=yes

5022

else

5023

echo "$as_me: failed program was:" >&5

5024

sed 's/^/| /' conftest.$ac_ext >&5

5025

5026

+

5027

fi

5028

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5029

-done

5030

-rm -f conftest*

5031

-if test -n "$ac_declaration"; then

5032

- echo '#ifdef __cplusplus' >>confdefs.h

5033

- echo $ac_declaration >>confdefs.h

5034

- echo '#endif' >>confdefs.h

5035

+

5036

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5037

fi

5038

5039

-ac_ext=cc

5040

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5041

+fi

5042

+

5043

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5044

+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag

5045

+fi

5046

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

5047

+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }

5048

+if test "$ac_test_CXXFLAGS" = set; then

5049

+ CXXFLAGS=$ac_save_CXXFLAGS

5050

+elif test $ac_cv_prog_cxx_g = yes; then

5051

+ if test "$GXX" = yes; then

5052

+ CXXFLAGS="-g -O2"

5053

+ else

5054

+ CXXFLAGS="-g"

5055

+ fi

5056

+else

5057

+ if test "$GXX" = yes; then

5058

+ CXXFLAGS="-O2"

5059

+ else

5060

+ CXXFLAGS=

5061

+ fi

5062

+fi

5063

+ac_ext=cpp

5064

ac_cpp='$CXXCPP $CPPFLAGS'

5065

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

5066

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

5067

@@ -4968,13 +5629,13 @@

5068

if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

5069

( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

5070

(test "X$CXX" != "Xg++"))) ; then

5071

- ac_ext=cc

5072

+ ac_ext=cpp

5073

ac_cpp='$CXXCPP $CPPFLAGS'

5074

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

5075

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

5076

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

5077

-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5

5078

-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6

5079

+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5

5080

+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }

5081

if test -z "$CXXCPP"; then

5082

if test "${ac_cv_prog_CXXCPP+set}" = set; then

5083

echo $ECHO_N "(cached) $ECHO_C" >&6

5084

@@ -5004,24 +5665,22 @@

5085

#endif

5086

Syntax error

5087

_ACEOF

5088

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

5089

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

5090

+if { (ac_try="$ac_cpp conftest.$ac_ext"

5091

+case "(($ac_try" in

5092

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5093

+ *) ac_try_echo=$ac_try;;

5094

+esac

5095

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5096

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

5097

ac_status=$?

5098

grep -v '^ *+' conftest.er1 >conftest.err

5099

rm -f conftest.er1

5100

cat conftest.err >&5

5101

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5102

- (exit $ac_status); } >/dev/null; then

5103

- if test -s conftest.err; then

5104

- ac_cpp_err=$ac_cxx_preproc_warn_flag

5105

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

5106

- else

5107

- ac_cpp_err=

5108

- fi

5109

-else

5110

- ac_cpp_err=yes

5111

-fi

5112

-if test -z "$ac_cpp_err"; then

5113

+ (exit $ac_status); } >/dev/null && {

5114

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

5115

+ test ! -s conftest.err

5116

+ }; then

5117

:

5118

else

5119

echo "$as_me: failed program was:" >&5

5120

@@ -5030,9 +5689,10 @@

5121

# Broken: fails on valid input.

5122

continue

5123

fi

5124

+

5125

rm -f conftest.err conftest.$ac_ext

5126

5127

- # OK, works on sane cases. Now check whether non-existent headers

5128

+ # OK, works on sane cases. Now check whether nonexistent headers

5129

# can be detected and how.

5130

cat >conftest.$ac_ext <<_ACEOF

5131

/* confdefs.h. */

5132

@@ -5042,24 +5702,22 @@

5133

/* end confdefs.h. */

5134

#include <ac_nonexistent.h>

5135

_ACEOF

5136

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

5137

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

5138

+if { (ac_try="$ac_cpp conftest.$ac_ext"

5139

+case "(($ac_try" in

5140

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5141

+ *) ac_try_echo=$ac_try;;

5142

+esac

5143

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5144

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

5145

ac_status=$?

5146

grep -v '^ *+' conftest.er1 >conftest.err

5147

rm -f conftest.er1

5148

cat conftest.err >&5

5149

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5150

- (exit $ac_status); } >/dev/null; then

5151

- if test -s conftest.err; then

5152

- ac_cpp_err=$ac_cxx_preproc_warn_flag

5153

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

5154

- else

5155

- ac_cpp_err=

5156

- fi

5157

-else

5158

- ac_cpp_err=yes

5159

-fi

5160

-if test -z "$ac_cpp_err"; then

5161

+ (exit $ac_status); } >/dev/null && {

5162

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

5163

+ test ! -s conftest.err

5164

+ }; then

5165

# Broken: success on invalid input.

5166

continue

5167

else

5168

@@ -5070,6 +5728,7 @@

5169

ac_preproc_ok=:

5170

break

5171

fi

5172

+

5173

rm -f conftest.err conftest.$ac_ext

5174

5175

done

5176

@@ -5087,8 +5746,8 @@

5177

else

5178

ac_cv_prog_CXXCPP=$CXXCPP

5179

fi

5180

-echo "$as_me:$LINENO: result: $CXXCPP" >&5

5181

-echo "${ECHO_T}$CXXCPP" >&6

5182

+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5

5183

+echo "${ECHO_T}$CXXCPP" >&6; }

5184

ac_preproc_ok=false

5185

for ac_cxx_preproc_warn_flag in '' yes

5186

do

5187

@@ -5111,24 +5770,22 @@

5188

#endif

5189

Syntax error

5190

_ACEOF

5191

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

5192

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

5193

+if { (ac_try="$ac_cpp conftest.$ac_ext"

5194

+case "(($ac_try" in

5195

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5196

+ *) ac_try_echo=$ac_try;;

5197

+esac

5198

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5199

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

5200

ac_status=$?

5201

grep -v '^ *+' conftest.er1 >conftest.err

5202

rm -f conftest.er1

5203

cat conftest.err >&5

5204

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5205

- (exit $ac_status); } >/dev/null; then

5206

- if test -s conftest.err; then

5207

- ac_cpp_err=$ac_cxx_preproc_warn_flag

5208

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

5209

- else

5210

- ac_cpp_err=

5211

- fi

5212

-else

5213

- ac_cpp_err=yes

5214

-fi

5215

-if test -z "$ac_cpp_err"; then

5216

+ (exit $ac_status); } >/dev/null && {

5217

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

5218

+ test ! -s conftest.err

5219

+ }; then

5220

:

5221

else

5222

echo "$as_me: failed program was:" >&5

5223

@@ -5137,9 +5794,10 @@

5224

# Broken: fails on valid input.

5225

continue

5226

fi

5227

+

5228

rm -f conftest.err conftest.$ac_ext

5229

5230

- # OK, works on sane cases. Now check whether non-existent headers

5231

+ # OK, works on sane cases. Now check whether nonexistent headers

5232

# can be detected and how.

5233

cat >conftest.$ac_ext <<_ACEOF

5234

/* confdefs.h. */

5235

@@ -5149,24 +5807,22 @@

5236

/* end confdefs.h. */

5237

#include <ac_nonexistent.h>

5238

_ACEOF

5239

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

5240

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

5241

+if { (ac_try="$ac_cpp conftest.$ac_ext"

5242

+case "(($ac_try" in

5243

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5244

+ *) ac_try_echo=$ac_try;;

5245

+esac

5246

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5247

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

5248

ac_status=$?

5249

grep -v '^ *+' conftest.er1 >conftest.err

5250

rm -f conftest.er1

5251

cat conftest.err >&5

5252

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5253

- (exit $ac_status); } >/dev/null; then

5254

- if test -s conftest.err; then

5255

- ac_cpp_err=$ac_cxx_preproc_warn_flag

5256

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

5257

- else

5258

- ac_cpp_err=

5259

- fi

5260

-else

5261

- ac_cpp_err=yes

5262

-fi

5263

-if test -z "$ac_cpp_err"; then

5264

+ (exit $ac_status); } >/dev/null && {

5265

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

5266

+ test ! -s conftest.err

5267

+ }; then

5268

# Broken: success on invalid input.

5269

continue

5270

else

5271

@@ -5177,6 +5833,7 @@

5272

ac_preproc_ok=:

5273

break

5274

fi

5275

+

5276

rm -f conftest.err conftest.$ac_ext

5277

5278

done

5279

@@ -5192,7 +5849,7 @@

5280

{ (exit 1); exit 1; }; }

5281

fi

5282

5283

-ac_ext=cc

5284

+ac_ext=cpp

5285

ac_cpp='$CXXCPP $CPPFLAGS'

5286

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

5287

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

5288

@@ -5206,12 +5863,12 @@

5289

ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

5290

ac_compiler_gnu=$ac_cv_f77_compiler_gnu

5291

if test -n "$ac_tool_prefix"; then

5292

- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran

5293

+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn

5294

do

5295

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

5296

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

5297

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5298

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5299

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5300

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5301

if test "${ac_cv_prog_F77+set}" = set; then

5302

echo $ECHO_N "(cached) $ECHO_C" >&6

5303

else

5304

@@ -5224,36 +5881,38 @@

5305

IFS=$as_save_IFS

5306

test -z "$as_dir" && as_dir=.

5307

for ac_exec_ext in '' $ac_executable_extensions; do

5308

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5309

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5310

ac_cv_prog_F77="$ac_tool_prefix$ac_prog"

5311

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5312

break 2

5313

fi

5314

done

5315

done

5316

+IFS=$as_save_IFS

5317

5318

fi

5319

fi

5320

F77=$ac_cv_prog_F77

5321

if test -n "$F77"; then

5322

- echo "$as_me:$LINENO: result: $F77" >&5

5323

-echo "${ECHO_T}$F77" >&6

5324

+ { echo "$as_me:$LINENO: result: $F77" >&5

5325

+echo "${ECHO_T}$F77" >&6; }

5326

else

5327

- echo "$as_me:$LINENO: result: no" >&5

5328

-echo "${ECHO_T}no" >&6

5329

+ { echo "$as_me:$LINENO: result: no" >&5

5330

+echo "${ECHO_T}no" >&6; }

5331

fi

5332

5333

+

5334

test -n "$F77" && break

5335

done

5336

fi

5337

if test -z "$F77"; then

5338

ac_ct_F77=$F77

5339

- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran

5340

+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn

5341

do

5342

# Extract the first word of "$ac_prog", so it can be a program name with args.

5343

set dummy $ac_prog; ac_word=$2

5344

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5345

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5346

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5347

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5348

if test "${ac_cv_prog_ac_ct_F77+set}" = set; then

5349

echo $ECHO_N "(cached) $ECHO_C" >&6

5350

else

5351

@@ -5266,48 +5925,78 @@

5352

IFS=$as_save_IFS

5353

test -z "$as_dir" && as_dir=.

5354

for ac_exec_ext in '' $ac_executable_extensions; do

5355

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5356

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5357

ac_cv_prog_ac_ct_F77="$ac_prog"

5358

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5359

break 2

5360

fi

5361

done

5362

done

5363

+IFS=$as_save_IFS

5364

5365

fi

5366

fi

5367

ac_ct_F77=$ac_cv_prog_ac_ct_F77

5368

if test -n "$ac_ct_F77"; then

5369

- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5

5370

-echo "${ECHO_T}$ac_ct_F77" >&6

5371

+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5

5372

+echo "${ECHO_T}$ac_ct_F77" >&6; }

5373

else

5374

- echo "$as_me:$LINENO: result: no" >&5

5375

-echo "${ECHO_T}no" >&6

5376

+ { echo "$as_me:$LINENO: result: no" >&5

5377

+echo "${ECHO_T}no" >&6; }

5378

fi

5379

5380

+

5381

test -n "$ac_ct_F77" && break

5382

done

5383

5384

- F77=$ac_ct_F77

5385

+ if test "x$ac_ct_F77" = x; then

5386

+ F77=""

5387

+ else

5388

+ case $cross_compiling:$ac_tool_warned in

5389

+yes:)

5390

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

5391

+whose name does not start with the host triplet. If you think this

5392

+configuration is useful to you, please write to autoconf@gnu.org." >&5

5393

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

5394

+whose name does not start with the host triplet. If you think this

5395

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

5396

+ac_tool_warned=yes ;;

5397

+esac

5398

+ F77=$ac_ct_F77

5399

+ fi

5400

fi

5401

5402

5403

# Provide some information about the compiler.

5404

-echo "$as_me:5296:" \

5405

- "checking for Fortran 77 compiler version" >&5

5406

+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5

5407

ac_compiler=`set X $ac_compile; echo $2`

5408

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5

5409

- (eval $ac_compiler --version </dev/null >&5) 2>&5

5410

+{ (ac_try="$ac_compiler --version >&5"

5411

+case "(($ac_try" in

5412

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5413

+ *) ac_try_echo=$ac_try;;

5414

+esac

5415

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5416

+ (eval "$ac_compiler --version >&5") 2>&5

5417

ac_status=$?

5418

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5419

(exit $ac_status); }

5420

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5

5421

- (eval $ac_compiler -v </dev/null >&5) 2>&5

5422

+{ (ac_try="$ac_compiler -v >&5"

5423

+case "(($ac_try" in

5424

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5425

+ *) ac_try_echo=$ac_try;;

5426

+esac

5427

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5428

+ (eval "$ac_compiler -v >&5") 2>&5

5429

ac_status=$?

5430

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5431

(exit $ac_status); }

5432

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5

5433

- (eval $ac_compiler -V </dev/null >&5) 2>&5

5434

+{ (ac_try="$ac_compiler -V >&5"

5435

+case "(($ac_try" in

5436

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5437

+ *) ac_try_echo=$ac_try;;

5438

+esac

5439

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5440

+ (eval "$ac_compiler -V >&5") 2>&5

5441

ac_status=$?

5442

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5443

(exit $ac_status); }

5444

@@ -5317,8 +6006,8 @@

5445

# input file. (Note that this only needs to work for GNU compilers.)

5446

ac_save_ext=$ac_ext

5447

ac_ext=F

5448

-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5

5449

-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6

5450

+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5

5451

+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }

5452

if test "${ac_cv_f77_compiler_gnu+set}" = set; then

5453

echo $ECHO_N "(cached) $ECHO_C" >&6

5454

else

5455

@@ -5331,46 +6020,42 @@

5456

end

5457

_ACEOF

5458

rm -f conftest.$ac_objext

5459

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5460

- (eval $ac_compile) 2>conftest.er1

5461

+if { (ac_try="$ac_compile"

5462

+case "(($ac_try" in

5463

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5464

+ *) ac_try_echo=$ac_try;;

5465

+esac

5466

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5467

+ (eval "$ac_compile") 2>conftest.er1

5468

ac_status=$?

5469

grep -v '^ *+' conftest.er1 >conftest.err

5470

rm -f conftest.er1

5471

cat conftest.err >&5

5472

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5473

- (exit $ac_status); } &&

5474

- { ac_try='test -z "$ac_f77_werror_flag"

5475

- || test ! -s conftest.err'

5476

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5477

- (eval $ac_try) 2>&5

5478

- ac_status=$?

5479

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5480

- (exit $ac_status); }; } &&

5481

- { ac_try='test -s conftest.$ac_objext'

5482

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5483

- (eval $ac_try) 2>&5

5484

- ac_status=$?

5485

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5486

- (exit $ac_status); }; }; then

5487

+ (exit $ac_status); } && {

5488

+ test -z "$ac_f77_werror_flag" ||

5489

+ test ! -s conftest.err

5490

+ } && test -s conftest.$ac_objext; then

5491

ac_compiler_gnu=yes

5492

else

5493

echo "$as_me: failed program was:" >&5

5494

sed 's/^/| /' conftest.$ac_ext >&5

5495

5496

-ac_compiler_gnu=no

5497

+ ac_compiler_gnu=no

5498

fi

5499

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5500

+

5501

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5502

ac_cv_f77_compiler_gnu=$ac_compiler_gnu

5503

5504

fi

5505

-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5

5506

-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6

5507

+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5

5508

+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }

5509

ac_ext=$ac_save_ext

5510

ac_test_FFLAGS=${FFLAGS+set}

5511

ac_save_FFLAGS=$FFLAGS

5512

FFLAGS=

5513

-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5

5514

-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6

5515

+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5

5516

+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }

5517

if test "${ac_cv_prog_f77_g+set}" = set; then

5518

echo $ECHO_N "(cached) $ECHO_C" >&6

5519

else

5520

@@ -5381,39 +6066,35 @@

5521

end

5522

_ACEOF

5523

rm -f conftest.$ac_objext

5524

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5525

- (eval $ac_compile) 2>conftest.er1

5526

+if { (ac_try="$ac_compile"

5527

+case "(($ac_try" in

5528

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5529

+ *) ac_try_echo=$ac_try;;

5530

+esac

5531

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5532

+ (eval "$ac_compile") 2>conftest.er1

5533

ac_status=$?

5534

grep -v '^ *+' conftest.er1 >conftest.err

5535

rm -f conftest.er1

5536

cat conftest.err >&5

5537

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5538

- (exit $ac_status); } &&

5539

- { ac_try='test -z "$ac_f77_werror_flag"

5540

- || test ! -s conftest.err'

5541

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5542

- (eval $ac_try) 2>&5

5543

- ac_status=$?

5544

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5545

- (exit $ac_status); }; } &&

5546

- { ac_try='test -s conftest.$ac_objext'

5547

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5548

- (eval $ac_try) 2>&5

5549

- ac_status=$?

5550

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5551

- (exit $ac_status); }; }; then

5552

+ (exit $ac_status); } && {

5553

+ test -z "$ac_f77_werror_flag" ||

5554

+ test ! -s conftest.err

5555

+ } && test -s conftest.$ac_objext; then

5556

ac_cv_prog_f77_g=yes

5557

else

5558

echo "$as_me: failed program was:" >&5

5559

sed 's/^/| /' conftest.$ac_ext >&5

5560

5561

-ac_cv_prog_f77_g=no

5562

+ ac_cv_prog_f77_g=no

5563

fi

5564

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5565

+

5566

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5567

5568

fi

5569

-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5

5570

-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6

5571

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5

5572

+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }

5573

if test "$ac_test_FFLAGS" = set; then

5574

FFLAGS=$ac_save_FFLAGS

5575

elif test $ac_cv_prog_f77_g = yes; then

5576

@@ -5440,10 +6121,9 @@

5577

5578

5579

# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!

5580

-

5581

# find the maximum length of command line arguments

5582

-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5

5583

-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6

5584

+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5

5585

+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }

5586

if test "${lt_cv_sys_max_cmd_len+set}" = set; then

5587

echo $ECHO_N "(cached) $ECHO_C" >&6

5588

else

5589

@@ -5527,43 +6207,47 @@

5590

fi

5591

;;

5592

*)

5593

- # If test is not a shell built-in, we'll probably end up computing a

5594

- # maximum length that is only half of the actual maximum length, but

5595

- # we can't tell.

5596

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

5597

- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \

5598

+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`

5599

+ if test -n "$lt_cv_sys_max_cmd_len"; then

5600

+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`

5601

+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`

5602

+ else

5603

+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}

5604

+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \

5605

= "XX$teststring") >/dev/null 2>&1 &&

5606

- new_result=`expr "X$teststring" : ".*" 2>&1` &&

5607

- lt_cv_sys_max_cmd_len=$new_result &&

5608

- test $i != 17 # 1/2 MB should be enough

5609

- do

5610

- i=`expr $i + 1`

5611

- teststring=$teststring$teststring

5612

- done

5613

- teststring=

5614

- # Add a significant safety factor because C++ compilers can tack on massive

5615

- # amounts of additional arguments before passing them to the linker.

5616

- # It appears as though 1/2 is a usable value.

5617

- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`

5618

+ new_result=`expr "X$teststring" : ".*" 2>&1` &&

5619

+ lt_cv_sys_max_cmd_len=$new_result &&

5620

+ test $i != 17 # 1/2 MB should be enough

5621

+ do

5622

+ i=`expr $i + 1`

5623

+ teststring=$teststring$teststring

5624

+ done

5625

+ teststring=

5626

+ # Add a significant safety factor because C++ compilers can tack on massive

5627

+ # amounts of additional arguments before passing them to the linker.

5628

+ # It appears as though 1/2 is a usable value.

5629

+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`

5630

+ fi

5631

;;

5632

esac

5633

5634

fi

5635

5636

if test -n $lt_cv_sys_max_cmd_len ; then

5637

- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5

5638

-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6

5639

+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5

5640

+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }

5641

else

5642

- echo "$as_me:$LINENO: result: none" >&5

5643

-echo "${ECHO_T}none" >&6

5644

+ { echo "$as_me:$LINENO: result: none" >&5

5645

+echo "${ECHO_T}none" >&6; }

5646

fi

5647

5648

5649

5650

5651

+

5652

# Check for command to grab the raw symbol name followed by C symbol from nm.

5653

-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

5654

-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6

5655

+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

5656

+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }

5657

if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then

5658

echo $ECHO_N "(cached) $ECHO_C" >&6

5659

else

5660

@@ -5598,7 +6282,7 @@

5661

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

5662

lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (lt_ptr) \&\2},/p'"

5663

;;

5664

-linux*)

5665

+linux* | k*bsd*-gnu)

5666

if test "$host_cpu" = ia64; then

5667

symcode='[ABCDGIRSTW]'

5668

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

5669

@@ -5751,7 +6435,7 @@

5670

echo "$progname: failed program was:" >&5

5671

cat conftest.$ac_ext >&5

5672

fi

5673

- rm -f conftest* conftst*

5674

+ rm -rf conftest* conftst*

5675

5676

# Do not use the global_symbol_pipe unless it works.

5677

if test "$pipe_works" = yes; then

5678

@@ -5767,15 +6451,15 @@

5679

lt_cv_sys_global_symbol_to_cdecl=

5680

fi

5681

if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then

5682

- echo "$as_me:$LINENO: result: failed" >&5

5683

-echo "${ECHO_T}failed" >&6

5684

+ { echo "$as_me:$LINENO: result: failed" >&5

5685

+echo "${ECHO_T}failed" >&6; }

5686

else

5687

- echo "$as_me:$LINENO: result: ok" >&5

5688

-echo "${ECHO_T}ok" >&6

5689

+ { echo "$as_me:$LINENO: result: ok" >&5

5690

+echo "${ECHO_T}ok" >&6; }

5691

fi

5692

5693

-echo "$as_me:$LINENO: checking for objdir" >&5

5694

-echo $ECHO_N "checking for objdir... $ECHO_C" >&6

5695

+{ echo "$as_me:$LINENO: checking for objdir" >&5

5696

+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }

5697

if test "${lt_cv_objdir+set}" = set; then

5698

echo $ECHO_N "(cached) $ECHO_C" >&6

5699

else

5700

@@ -5789,8 +6473,8 @@

5701

fi

5702

rmdir .libs 2>/dev/null

5703

fi

5704

-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5

5705

-echo "${ECHO_T}$lt_cv_objdir" >&6

5706

+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5

5707

+echo "${ECHO_T}$lt_cv_objdir" >&6; }

5708

objdir=$lt_cv_objdir

5709

5710

5711

@@ -5841,8 +6525,8 @@

5712

if test -n "$ac_tool_prefix"; then

5713

# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.

5714

set dummy ${ac_tool_prefix}ar; ac_word=$2

5715

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5716

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5717

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5718

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5719

if test "${ac_cv_prog_AR+set}" = set; then

5720

echo $ECHO_N "(cached) $ECHO_C" >&6

5721

else

5722

@@ -5855,32 +6539,34 @@

5723

IFS=$as_save_IFS

5724

test -z "$as_dir" && as_dir=.

5725

for ac_exec_ext in '' $ac_executable_extensions; do

5726

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5727

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5728

ac_cv_prog_AR="${ac_tool_prefix}ar"

5729

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5730

break 2

5731

fi

5732

done

5733

done

5734

+IFS=$as_save_IFS

5735

5736

fi

5737

fi

5738

AR=$ac_cv_prog_AR

5739

if test -n "$AR"; then

5740

- echo "$as_me:$LINENO: result: $AR" >&5

5741

-echo "${ECHO_T}$AR" >&6

5742

+ { echo "$as_me:$LINENO: result: $AR" >&5

5743

+echo "${ECHO_T}$AR" >&6; }

5744

else

5745

- echo "$as_me:$LINENO: result: no" >&5

5746

-echo "${ECHO_T}no" >&6

5747

+ { echo "$as_me:$LINENO: result: no" >&5

5748

+echo "${ECHO_T}no" >&6; }

5749

fi

5750

5751

+

5752

fi

5753

if test -z "$ac_cv_prog_AR"; then

5754

ac_ct_AR=$AR

5755

# Extract the first word of "ar", so it can be a program name with args.

5756

set dummy ar; ac_word=$2

5757

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5758

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5759

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5760

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5761

if test "${ac_cv_prog_ac_ct_AR+set}" = set; then

5762

echo $ECHO_N "(cached) $ECHO_C" >&6

5763

else

5764

@@ -5893,27 +6579,41 @@

5765

IFS=$as_save_IFS

5766

test -z "$as_dir" && as_dir=.

5767

for ac_exec_ext in '' $ac_executable_extensions; do

5768

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5769

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5770

ac_cv_prog_ac_ct_AR="ar"

5771

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5772

break 2

5773

fi

5774

done

5775

done

5776

+IFS=$as_save_IFS

5777

5778

- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"

5779

fi

5780

fi

5781

ac_ct_AR=$ac_cv_prog_ac_ct_AR

5782

if test -n "$ac_ct_AR"; then

5783

- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5

5784

-echo "${ECHO_T}$ac_ct_AR" >&6

5785

+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5

5786

+echo "${ECHO_T}$ac_ct_AR" >&6; }

5787

else

5788

- echo "$as_me:$LINENO: result: no" >&5

5789

-echo "${ECHO_T}no" >&6

5790

+ { echo "$as_me:$LINENO: result: no" >&5

5791

+echo "${ECHO_T}no" >&6; }

5792

fi

5793

5794

- AR=$ac_ct_AR

5795

+ if test "x$ac_ct_AR" = x; then

5796

+ AR="false"

5797

+ else

5798

+ case $cross_compiling:$ac_tool_warned in

5799

+yes:)

5800

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

5801

+whose name does not start with the host triplet. If you think this

5802

+configuration is useful to you, please write to autoconf@gnu.org." >&5

5803

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

5804

+whose name does not start with the host triplet. If you think this

5805

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

5806

+ac_tool_warned=yes ;;

5807

+esac

5808

+ AR=$ac_ct_AR

5809

+ fi

5810

else

5811

AR="$ac_cv_prog_AR"

5812

fi

5813

@@ -5921,8 +6621,8 @@

5814

if test -n "$ac_tool_prefix"; then

5815

# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.

5816

set dummy ${ac_tool_prefix}ranlib; ac_word=$2

5817

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5818

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5819

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5820

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5821

if test "${ac_cv_prog_RANLIB+set}" = set; then

5822

echo $ECHO_N "(cached) $ECHO_C" >&6

5823

else

5824

@@ -5935,32 +6635,34 @@

5825

IFS=$as_save_IFS

5826

test -z "$as_dir" && as_dir=.

5827

for ac_exec_ext in '' $ac_executable_extensions; do

5828

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5829

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5830

ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

5831

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5832

break 2

5833

fi

5834

done

5835

done

5836

+IFS=$as_save_IFS

5837

5838

fi

5839

fi

5840

RANLIB=$ac_cv_prog_RANLIB

5841

if test -n "$RANLIB"; then

5842

- echo "$as_me:$LINENO: result: $RANLIB" >&5

5843

-echo "${ECHO_T}$RANLIB" >&6

5844

+ { echo "$as_me:$LINENO: result: $RANLIB" >&5

5845

+echo "${ECHO_T}$RANLIB" >&6; }

5846

else

5847

- echo "$as_me:$LINENO: result: no" >&5

5848

-echo "${ECHO_T}no" >&6

5849

+ { echo "$as_me:$LINENO: result: no" >&5

5850

+echo "${ECHO_T}no" >&6; }

5851

fi

5852

5853

+

5854

fi

5855

if test -z "$ac_cv_prog_RANLIB"; then

5856

ac_ct_RANLIB=$RANLIB

5857

# Extract the first word of "ranlib", so it can be a program name with args.

5858

set dummy ranlib; ac_word=$2

5859

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5860

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5861

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5862

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5863

if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then

5864

echo $ECHO_N "(cached) $ECHO_C" >&6

5865

else

5866

@@ -5973,27 +6675,41 @@

5867

IFS=$as_save_IFS

5868

test -z "$as_dir" && as_dir=.

5869

for ac_exec_ext in '' $ac_executable_extensions; do

5870

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5871

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5872

ac_cv_prog_ac_ct_RANLIB="ranlib"

5873

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5874

break 2

5875

fi

5876

done

5877

done

5878

+IFS=$as_save_IFS

5879

5880

- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"

5881

fi

5882

fi

5883

ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB

5884

if test -n "$ac_ct_RANLIB"; then

5885

- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5

5886

-echo "${ECHO_T}$ac_ct_RANLIB" >&6

5887

+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5

5888

+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }

5889

else

5890

- echo "$as_me:$LINENO: result: no" >&5

5891

-echo "${ECHO_T}no" >&6

5892

+ { echo "$as_me:$LINENO: result: no" >&5

5893

+echo "${ECHO_T}no" >&6; }

5894

fi

5895

5896

- RANLIB=$ac_ct_RANLIB

5897

+ if test "x$ac_ct_RANLIB" = x; then

5898

+ RANLIB=":"

5899

+ else

5900

+ case $cross_compiling:$ac_tool_warned in

5901

+yes:)

5902

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

5903

+whose name does not start with the host triplet. If you think this

5904

+configuration is useful to you, please write to autoconf@gnu.org." >&5

5905

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

5906

+whose name does not start with the host triplet. If you think this

5907

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

5908

+ac_tool_warned=yes ;;

5909

+esac

5910

+ RANLIB=$ac_ct_RANLIB

5911

+ fi

5912

else

5913

RANLIB="$ac_cv_prog_RANLIB"

5914

fi

5915

@@ -6001,8 +6717,8 @@

5916

if test -n "$ac_tool_prefix"; then

5917

# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

5918

set dummy ${ac_tool_prefix}strip; ac_word=$2

5919

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5920

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5921

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5922

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5923

if test "${ac_cv_prog_STRIP+set}" = set; then

5924

echo $ECHO_N "(cached) $ECHO_C" >&6

5925

else

5926

@@ -6015,32 +6731,34 @@

5927

IFS=$as_save_IFS

5928

test -z "$as_dir" && as_dir=.

5929

for ac_exec_ext in '' $ac_executable_extensions; do

5930

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5931

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5932

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

5933

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5934

break 2

5935

fi

5936

done

5937

done

5938

+IFS=$as_save_IFS

5939

5940

fi

5941

fi

5942

STRIP=$ac_cv_prog_STRIP

5943

if test -n "$STRIP"; then

5944

- echo "$as_me:$LINENO: result: $STRIP" >&5

5945

-echo "${ECHO_T}$STRIP" >&6

5946

+ { echo "$as_me:$LINENO: result: $STRIP" >&5

5947

+echo "${ECHO_T}$STRIP" >&6; }

5948

else

5949

- echo "$as_me:$LINENO: result: no" >&5

5950

-echo "${ECHO_T}no" >&6

5951

+ { echo "$as_me:$LINENO: result: no" >&5

5952

+echo "${ECHO_T}no" >&6; }

5953

fi

5954

5955

+

5956

fi

5957

if test -z "$ac_cv_prog_STRIP"; then

5958

ac_ct_STRIP=$STRIP

5959

# Extract the first word of "strip", so it can be a program name with args.

5960

set dummy strip; ac_word=$2

5961

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5962

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5963

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5964

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5965

if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then

5966

echo $ECHO_N "(cached) $ECHO_C" >&6

5967

else

5968

@@ -6053,27 +6771,41 @@

5969

IFS=$as_save_IFS

5970

test -z "$as_dir" && as_dir=.

5971

for ac_exec_ext in '' $ac_executable_extensions; do

5972

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5973

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5974

ac_cv_prog_ac_ct_STRIP="strip"

5975

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5976

break 2

5977

fi

5978

done

5979

done

5980

+IFS=$as_save_IFS

5981

5982

- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"

5983

fi

5984

fi

5985

ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

5986

if test -n "$ac_ct_STRIP"; then

5987

- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

5988

-echo "${ECHO_T}$ac_ct_STRIP" >&6

5989

+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

5990

+echo "${ECHO_T}$ac_ct_STRIP" >&6; }

5991

else

5992

- echo "$as_me:$LINENO: result: no" >&5

5993

-echo "${ECHO_T}no" >&6

5994

+ { echo "$as_me:$LINENO: result: no" >&5

5995

+echo "${ECHO_T}no" >&6; }

5996

fi

5997

5998

- STRIP=$ac_ct_STRIP

5999

+ if test "x$ac_ct_STRIP" = x; then

6000

+ STRIP=":"

6001

+ else

6002

+ case $cross_compiling:$ac_tool_warned in

6003

+yes:)

6004

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6005

+whose name does not start with the host triplet. If you think this

6006

+configuration is useful to you, please write to autoconf@gnu.org." >&5

6007

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6008

+whose name does not start with the host triplet. If you think this

6009

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6010

+ac_tool_warned=yes ;;

6011

+esac

6012

+ STRIP=$ac_ct_STRIP

6013

+ fi

6014

else

6015

STRIP="$ac_cv_prog_STRIP"

6016

fi

6017

@@ -6101,7 +6833,7 @@

6018

test -z "$ac_objext" && ac_objext=o

6019

6020

# Determine commands to create old-style static archives.

6021

-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'

6022

+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'

6023

old_postinstall_cmds='chmod 644 $oldlib'

6024

old_postuninstall_cmds=

6025

6026

@@ -6132,8 +6864,8 @@

6027

case $deplibs_check_method in

6028

file_magic*)

6029

if test "$file_magic_cmd" = '$MAGIC_CMD'; then

6030

- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5

6031

-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6

6032

+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5

6033

+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }

6034

if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

6035

echo $ECHO_N "(cached) $ECHO_C" >&6

6036

else

6037

@@ -6185,17 +6917,17 @@

6038

6039

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

6040

if test -n "$MAGIC_CMD"; then

6041

- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

6042

-echo "${ECHO_T}$MAGIC_CMD" >&6

6043

+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

6044

+echo "${ECHO_T}$MAGIC_CMD" >&6; }

6045

else

6046

- echo "$as_me:$LINENO: result: no" >&5

6047

-echo "${ECHO_T}no" >&6

6048

+ { echo "$as_me:$LINENO: result: no" >&5

6049

+echo "${ECHO_T}no" >&6; }

6050

fi

6051

6052

if test -z "$lt_cv_path_MAGIC_CMD"; then

6053

if test -n "$ac_tool_prefix"; then

6054

- echo "$as_me:$LINENO: checking for file" >&5

6055

-echo $ECHO_N "checking for file... $ECHO_C" >&6

6056

+ { echo "$as_me:$LINENO: checking for file" >&5

6057

+echo $ECHO_N "checking for file... $ECHO_C" >&6; }

6058

if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

6059

echo $ECHO_N "(cached) $ECHO_C" >&6

6060

else

6061

@@ -6247,11 +6979,11 @@

6062

6063

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

6064

if test -n "$MAGIC_CMD"; then

6065

- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

6066

-echo "${ECHO_T}$MAGIC_CMD" >&6

6067

+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

6068

+echo "${ECHO_T}$MAGIC_CMD" >&6; }

6069

else

6070

- echo "$as_me:$LINENO: result: no" >&5

6071

-echo "${ECHO_T}no" >&6

6072

+ { echo "$as_me:$LINENO: result: no" >&5

6073

+echo "${ECHO_T}no" >&6; }

6074

fi

6075

6076

else

6077

@@ -6263,24 +6995,336 @@

6078

;;

6079

esac

6080

6081

+

6082

+ case $host_os in

6083

+ rhapsody* | darwin*)

6084

+ if test -n "$ac_tool_prefix"; then

6085

+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.

6086

+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2

6087

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6088

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6089

+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then

6090

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6091

+else

6092

+ if test -n "$DSYMUTIL"; then

6093

+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.

6094

+else

6095

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

6096

+for as_dir in $PATH

6097

+do

6098

+ IFS=$as_save_IFS

6099

+ test -z "$as_dir" && as_dir=.

6100

+ for ac_exec_ext in '' $ac_executable_extensions; do

6101

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6102

+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"

6103

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6104

+ break 2

6105

+ fi

6106

+done

6107

+done

6108

+IFS=$as_save_IFS

6109

+

6110

+fi

6111

+fi

6112

+DSYMUTIL=$ac_cv_prog_DSYMUTIL

6113

+if test -n "$DSYMUTIL"; then

6114

+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5

6115

+echo "${ECHO_T}$DSYMUTIL" >&6; }

6116

+else

6117

+ { echo "$as_me:$LINENO: result: no" >&5

6118

+echo "${ECHO_T}no" >&6; }

6119

+fi

6120

+

6121

+

6122

+fi

6123

+if test -z "$ac_cv_prog_DSYMUTIL"; then

6124

+ ac_ct_DSYMUTIL=$DSYMUTIL

6125

+ # Extract the first word of "dsymutil", so it can be a program name with args.

6126

+set dummy dsymutil; ac_word=$2

6127

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6128

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6129

+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then

6130

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6131

+else

6132

+ if test -n "$ac_ct_DSYMUTIL"; then

6133

+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.

6134

+else

6135

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

6136

+for as_dir in $PATH

6137

+do

6138

+ IFS=$as_save_IFS

6139

+ test -z "$as_dir" && as_dir=.

6140

+ for ac_exec_ext in '' $ac_executable_extensions; do

6141

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6142

+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"

6143

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6144

+ break 2

6145

+ fi

6146

+done

6147

+done

6148

+IFS=$as_save_IFS

6149

+

6150

+fi

6151

+fi

6152

+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL

6153

+if test -n "$ac_ct_DSYMUTIL"; then

6154

+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5

6155

+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }

6156

+else

6157

+ { echo "$as_me:$LINENO: result: no" >&5

6158

+echo "${ECHO_T}no" >&6; }

6159

+fi

6160

+

6161

+ if test "x$ac_ct_DSYMUTIL" = x; then

6162

+ DSYMUTIL=":"

6163

+ else

6164

+ case $cross_compiling:$ac_tool_warned in

6165

+yes:)

6166

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6167

+whose name does not start with the host triplet. If you think this

6168

+configuration is useful to you, please write to autoconf@gnu.org." >&5

6169

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6170

+whose name does not start with the host triplet. If you think this

6171

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6172

+ac_tool_warned=yes ;;

6173

+esac

6174

+ DSYMUTIL=$ac_ct_DSYMUTIL

6175

+ fi

6176

+else

6177

+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"

6178

+fi

6179

+

6180

+ if test -n "$ac_tool_prefix"; then

6181

+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.

6182

+set dummy ${ac_tool_prefix}nmedit; ac_word=$2

6183

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6184

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6185

+if test "${ac_cv_prog_NMEDIT+set}" = set; then

6186

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6187

+else

6188

+ if test -n "$NMEDIT"; then

6189

+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.

6190

+else

6191

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

6192

+for as_dir in $PATH

6193

+do

6194

+ IFS=$as_save_IFS

6195

+ test -z "$as_dir" && as_dir=.

6196

+ for ac_exec_ext in '' $ac_executable_extensions; do

6197

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6198

+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"

6199

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6200

+ break 2

6201

+ fi

6202

+done

6203

+done

6204

+IFS=$as_save_IFS

6205

+

6206

+fi

6207

+fi

6208

+NMEDIT=$ac_cv_prog_NMEDIT

6209

+if test -n "$NMEDIT"; then

6210

+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5

6211

+echo "${ECHO_T}$NMEDIT" >&6; }

6212

+else

6213

+ { echo "$as_me:$LINENO: result: no" >&5

6214

+echo "${ECHO_T}no" >&6; }

6215

+fi

6216

+

6217

+

6218

+fi

6219

+if test -z "$ac_cv_prog_NMEDIT"; then

6220

+ ac_ct_NMEDIT=$NMEDIT

6221

+ # Extract the first word of "nmedit", so it can be a program name with args.

6222

+set dummy nmedit; ac_word=$2

6223

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6224

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6225

+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then

6226

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6227

+else

6228

+ if test -n "$ac_ct_NMEDIT"; then

6229

+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.

6230

+else

6231

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

6232

+for as_dir in $PATH

6233

+do

6234

+ IFS=$as_save_IFS

6235

+ test -z "$as_dir" && as_dir=.

6236

+ for ac_exec_ext in '' $ac_executable_extensions; do

6237

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6238

+ ac_cv_prog_ac_ct_NMEDIT="nmedit"

6239

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6240

+ break 2

6241

+ fi

6242

+done

6243

+done

6244

+IFS=$as_save_IFS

6245

+

6246

+fi

6247

+fi

6248

+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT

6249

+if test -n "$ac_ct_NMEDIT"; then

6250

+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5

6251

+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }

6252

+else

6253

+ { echo "$as_me:$LINENO: result: no" >&5

6254

+echo "${ECHO_T}no" >&6; }

6255

+fi

6256

+

6257

+ if test "x$ac_ct_NMEDIT" = x; then

6258

+ NMEDIT=":"

6259

+ else

6260

+ case $cross_compiling:$ac_tool_warned in

6261

+yes:)

6262

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6263

+whose name does not start with the host triplet. If you think this

6264

+configuration is useful to you, please write to autoconf@gnu.org." >&5

6265

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6266

+whose name does not start with the host triplet. If you think this

6267

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6268

+ac_tool_warned=yes ;;

6269

+esac

6270

+ NMEDIT=$ac_ct_NMEDIT

6271

+ fi

6272

+else

6273

+ NMEDIT="$ac_cv_prog_NMEDIT"

6274

+fi

6275

+

6276

+

6277

+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5

6278

+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }

6279

+if test "${lt_cv_apple_cc_single_mod+set}" = set; then

6280

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6281

+else

6282

+ lt_cv_apple_cc_single_mod=no

6283

+ if test -z "${LT_MULTI_MODULE}"; then

6284

+ # By default we will add the -single_module flag. You can override

6285

+ # by either setting the environment variable LT_MULTI_MODULE

6286

+ # non-empty at configure time, or by adding -multi_module to the

6287

+ # link flags.

6288

+ echo "int foo(void){return 1;}" > conftest.c

6289

+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \

6290

+ -dynamiclib ${wl}-single_module conftest.c

6291

+ if test -f libconftest.dylib; then

6292

+ lt_cv_apple_cc_single_mod=yes

6293

+ rm -rf libconftest.dylib*

6294

+ fi

6295

+ rm conftest.c

6296

+ fi

6297

+fi

6298

+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5

6299

+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }

6300

+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5

6301

+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }

6302

+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then

6303

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6304

+else

6305

+ lt_cv_ld_exported_symbols_list=no

6306

+ save_LDFLAGS=$LDFLAGS

6307

+ echo "_main" > conftest.sym

6308

+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"

6309

+ cat >conftest.$ac_ext <<_ACEOF

6310

+/* confdefs.h. */

6311

+_ACEOF

6312

+cat confdefs.h >>conftest.$ac_ext

6313

+cat >>conftest.$ac_ext <<_ACEOF

6314

+/* end confdefs.h. */

6315

+

6316

+int

6317

+main ()

6318

+{

6319

+

6320

+ ;

6321

+ return 0;

6322

+}

6323

+_ACEOF

6324

+rm -f conftest.$ac_objext conftest$ac_exeext

6325

+if { (ac_try="$ac_link"

6326

+case "(($ac_try" in

6327

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6328

+ *) ac_try_echo=$ac_try;;

6329

+esac

6330

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6331

+ (eval "$ac_link") 2>conftest.er1

6332

+ ac_status=$?

6333

+ grep -v '^ *+' conftest.er1 >conftest.err

6334

+ rm -f conftest.er1

6335

+ cat conftest.err >&5

6336

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6337

+ (exit $ac_status); } && {

6338

+ test -z "$ac_c_werror_flag" ||

6339

+ test ! -s conftest.err

6340

+ } && test -s conftest$ac_exeext &&

6341

+ $as_test_x conftest$ac_exeext; then

6342

+ lt_cv_ld_exported_symbols_list=yes

6343

+else

6344

+ echo "$as_me: failed program was:" >&5

6345

+sed 's/^/| /' conftest.$ac_ext >&5

6346

+

6347

+ lt_cv_ld_exported_symbols_list=no

6348

+fi

6349

+

6350

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

6351

+ conftest$ac_exeext conftest.$ac_ext

6352

+ LDFLAGS="$save_LDFLAGS"

6353

+

6354

+fi

6355

+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5

6356

+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }

6357

+ case $host_os in

6358

+ rhapsody* | darwin1.[0123])

6359

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

6360

+ darwin1.*)

6361

+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

6362

+ darwin*)

6363

+ # if running on 10.5 or later, the deployment target defaults

6364

+ # to the OS version, if on x86, and 10.4, the deployment

6365

+ # target defaults to 10.4. Don't you love it?

6366

+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in

6367

+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)

6368

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

6369

+ 10.[012]*)

6370

+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

6371

+ 10.*)

6372

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

6373

+ esac

6374

+ ;;

6375

+ esac

6376

+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then

6377

+ _lt_dar_single_mod='$single_module'

6378

+ fi

6379

+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then

6380

+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'

6381

+ else

6382

+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"

6383

+ fi

6384

+ if test "$DSYMUTIL" != ":"; then

6385

+ _lt_dsymutil="~$DSYMUTIL \$lib || :"

6386

+ else

6387

+ _lt_dsymutil=

6388

+ fi

6389

+ ;;

6390

+ esac

6391

+

6392

+

6393

enable_dlopen=no

6394

enable_win32_dll=yes

6395

6396

-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.

6397

+# Check whether --enable-libtool-lock was given.

6398

if test "${enable_libtool_lock+set}" = set; then

6399

- enableval="$enable_libtool_lock"

6400

+ enableval=$enable_libtool_lock;

6401

+fi

6402

6403

-fi;

6404

test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

6405

6406

6407

-# Check whether --with-pic or --without-pic was given.

6408

+# Check whether --with-pic was given.

6409

if test "${with_pic+set}" = set; then

6410

- withval="$with_pic"

6411

- pic_mode="$withval"

6412

+ withval=$with_pic; pic_mode="$withval"

6413

else

6414

pic_mode=default

6415

-fi;

6416

+fi

6417

+

6418

test -z "$pic_mode" && pic_mode=default

6419

6420

# Use C for the default configuration in the libtool script

6421

@@ -6301,10 +7345,10 @@

6422

objext=$objext

6423

6424

# Code to be used in simple compile tests

6425

-lt_simple_compile_test_code="int some_variable = 0;\n"

6426

+lt_simple_compile_test_code="int some_variable = 0;"

6427

6428

# Code to be used in simple link tests

6429

-lt_simple_link_test_code='int main(){return(0);}\n'

6430

+lt_simple_link_test_code='int main(){return(0);}'

6431

6432

6433

# If no C compiler was specified, use CC.

6434

@@ -6319,16 +7363,16 @@

6435

6436

# save warnings/boilerplate of simple test code

6437

ac_outfile=conftest.$ac_objext

6438

-printf "$lt_simple_compile_test_code" >conftest.$ac_ext

6439

+echo "$lt_simple_compile_test_code" >conftest.$ac_ext

6440

eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

6441

_lt_compiler_boilerplate=`cat conftest.err`

6442

$rm conftest*

6443

6444

ac_outfile=conftest.$ac_objext

6445

-printf "$lt_simple_link_test_code" >conftest.$ac_ext

6446

+echo "$lt_simple_link_test_code" >conftest.$ac_ext

6447

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

6448

_lt_linker_boilerplate=`cat conftest.err`

6449

-$rm conftest*

6450

+$rm -r conftest*

6451

6452

6453

## CAVEAT EMPTOR:

6454

@@ -6342,14 +7386,14 @@

6455

lt_prog_compiler_no_builtin_flag=' -fno-builtin'

6456

6457

6458

-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

6459

-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6

6460

+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

6461

+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }

6462

if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then

6463

echo $ECHO_N "(cached) $ECHO_C" >&6

6464

else

6465

lt_cv_prog_compiler_rtti_exceptions=no

6466

ac_outfile=conftest.$ac_objext

6467

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

6468

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

6469

lt_compiler_flag="-fno-rtti -fno-exceptions"

6470

# Insert the option either (1) after the last *FLAGS variable, or

6471

# (2) before a word containing "conftest.", or (3) at the end.

6472

@@ -6360,11 +7404,11 @@

6473

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

6474

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

6475

-e 's:$: $lt_compiler_flag:'`

6476

- (eval echo "\"\$as_me:6363: $lt_compile\"" >&5)

6477

+ (eval echo "\"\$as_me:7407: $lt_compile\"" >&5)

6478

(eval "$lt_compile" 2>conftest.err)

6479

ac_status=$?

6480

cat conftest.err >&5

6481

- echo "$as_me:6367: \$? = $ac_status" >&5

6482

+ echo "$as_me:7411: \$? = $ac_status" >&5

6483

if (exit $ac_status) && test -s "$ac_outfile"; then

6484

# The compiler can only warn and ignore the option if not recognized

6485

# So say no if there are warnings other than the usual output.

6486

@@ -6377,8 +7421,8 @@

6487

$rm conftest*

6488

6489

fi

6490

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

6491

-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6

6492

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

6493

+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }

6494

6495

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

6496

lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"

6497

@@ -6392,8 +7436,8 @@

6498

lt_prog_compiler_pic=

6499

lt_prog_compiler_static=

6500

6501

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

6502

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

6503

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

6504

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

6505

6506

if test "$GCC" = yes; then

6507

lt_prog_compiler_wl='-Wl,'

6508

@@ -6415,13 +7459,15 @@

6509

lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'

6510

;;

6511

6512

6513

+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

6514

# PIC is the default for these OSes.

6515

;;

6516

6517

- mingw* | pw32* | os2*)

6518

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

6519

# This hack is so that the source file can tell whether it is being

6520

# built for inclusion in a dll (and should export symbols for example).

6521

+ # Although the cygwin gcc ignores -fPIC, still need this for old-style

6522

+ # (--disable-auto-import) libraries

6523

lt_prog_compiler_pic='-DDLL_EXPORT'

6524

;;

6525

6526

@@ -6431,7 +7477,7 @@

6527

lt_prog_compiler_pic='-fno-common'

6528

;;

6529

6530

- interix3*)

6531

+ interix[3-9]*)

6532

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

6533

# Instead, we relocate shared libraries at runtime.

6534

;;

6535

@@ -6489,7 +7535,7 @@

6536

esac

6537

;;

6538

6539

- mingw* | pw32* | os2*)

6540

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

6541

# This hack is so that the source file can tell whether it is being

6542

# built for inclusion in a dll (and should export symbols for example).

6543

lt_prog_compiler_pic='-DDLL_EXPORT'

6544

@@ -6522,7 +7568,7 @@

6545

lt_prog_compiler_static='-Bstatic'

6546

;;

6547

6548

- linux*)

6549

+ linux* | k*bsd*-gnu)

6550

case $cc_basename in

6551

icc* | ecc*)

6552

lt_prog_compiler_wl='-Wl,'

6553

@@ -6541,6 +7587,22 @@

6554

# All Alpha code is PIC.

6555

lt_prog_compiler_static='-non_shared'

6556

;;

6557

+ *)

6558

+ case `$CC -V 2>&1 | sed 5q` in

6559

+ *Sun\ C*)

6560

+ # Sun C 5.9

6561

+ lt_prog_compiler_pic='-KPIC'

6562

+ lt_prog_compiler_static='-Bstatic'

6563

+ lt_prog_compiler_wl='-Wl,'

6564

+ ;;

6565

+ *Sun\ F*)

6566

+ # Sun Fortran 8.3 passes all unrecognized flags to the linker

6567

+ lt_prog_compiler_pic='-KPIC'

6568

+ lt_prog_compiler_static='-Bstatic'

6569

+ lt_prog_compiler_wl=''

6570

+ ;;

6571

+ esac

6572

+ ;;

6573

esac

6574

;;

6575

6576

@@ -6550,6 +7612,10 @@

6577

lt_prog_compiler_static='-non_shared'

6578

;;

6579

6580

+ rdos*)

6581

+ lt_prog_compiler_static='-non_shared'

6582

+ ;;

6583

+

6584

solaris*)

6585

lt_prog_compiler_pic='-KPIC'

6586

lt_prog_compiler_static='-Bstatic'

6587

@@ -6602,22 +7668,22 @@

6588

esac

6589

fi

6590

6591

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5

6592

-echo "${ECHO_T}$lt_prog_compiler_pic" >&6

6593

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5

6594

+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }

6595

6596

#

6597

# Check to make sure the PIC flag actually works.

6598

#

6599

if test -n "$lt_prog_compiler_pic"; then

6600

6601

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

6602

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6

6603

-if test "${lt_prog_compiler_pic_works+set}" = set; then

6604

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

6605

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }

6606

+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then

6607

echo $ECHO_N "(cached) $ECHO_C" >&6

6608

else

6609

- lt_prog_compiler_pic_works=no

6610

+ lt_cv_prog_compiler_pic_works=no

6611

ac_outfile=conftest.$ac_objext

6612

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

6613

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

6614

lt_compiler_flag="$lt_prog_compiler_pic -DPIC"

6615

# Insert the option either (1) after the last *FLAGS variable, or

6616

# (2) before a word containing "conftest.", or (3) at the end.

6617

@@ -6628,27 +7694,27 @@

6618

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

6619

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

6620

-e 's:$: $lt_compiler_flag:'`

6621

- (eval echo "\"\$as_me:6631: $lt_compile\"" >&5)

6622

+ (eval echo "\"\$as_me:7697: $lt_compile\"" >&5)

6623

(eval "$lt_compile" 2>conftest.err)

6624

ac_status=$?

6625

cat conftest.err >&5

6626

- echo "$as_me:6635: \$? = $ac_status" >&5

6627

+ echo "$as_me:7701: \$? = $ac_status" >&5

6628

if (exit $ac_status) && test -s "$ac_outfile"; then

6629

# The compiler can only warn and ignore the option if not recognized

6630

# So say no if there are warnings other than the usual output.

6631

$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

6632

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

6633

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

6634

- lt_prog_compiler_pic_works=yes

6635

+ lt_cv_prog_compiler_pic_works=yes

6636

fi

6637

fi

6638

$rm conftest*

6639

6640

fi

6641

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5

6642

-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6

6643

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5

6644

+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }

6645

6646

-if test x"$lt_prog_compiler_pic_works" = xyes; then

6647

+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then

6648

case $lt_prog_compiler_pic in

6649

"" | " "*) ;;

6650

*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;

6651

@@ -6673,15 +7739,15 @@

6652

# Check to make sure the static flag actually works.

6653

#

6654

wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"

6655

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

6656

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

6657

-if test "${lt_prog_compiler_static_works+set}" = set; then

6658

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

6659

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

6660

+if test "${lt_cv_prog_compiler_static_works+set}" = set; then

6661

echo $ECHO_N "(cached) $ECHO_C" >&6

6662

else

6663

- lt_prog_compiler_static_works=no

6664

+ lt_cv_prog_compiler_static_works=no

6665

save_LDFLAGS="$LDFLAGS"

6666

LDFLAGS="$LDFLAGS $lt_tmp_static_flag"

6667

- printf "$lt_simple_link_test_code" > conftest.$ac_ext

6668

+ echo "$lt_simple_link_test_code" > conftest.$ac_ext

6669

if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

6670

# The linker can only warn and ignore the option if not recognized

6671

# So say no if there are warnings

6672

@@ -6691,28 +7757,28 @@

6673

$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp

6674

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

6675

if diff conftest.exp conftest.er2 >/dev/null; then

6676

- lt_prog_compiler_static_works=yes

6677

+ lt_cv_prog_compiler_static_works=yes

6678

fi

6679

else

6680

- lt_prog_compiler_static_works=yes

6681

+ lt_cv_prog_compiler_static_works=yes

6682

fi

6683

fi

6684

- $rm conftest*

6685

+ $rm -r conftest*

6686

LDFLAGS="$save_LDFLAGS"

6687

6688

fi

6689

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5

6690

-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6

6691

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5

6692

+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }

6693

6694

-if test x"$lt_prog_compiler_static_works" = xyes; then

6695

+if test x"$lt_cv_prog_compiler_static_works" = xyes; then

6696

:

6697

else

6698

lt_prog_compiler_static=

6699

fi

6700

6701

6702

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

6703

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

6704

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

6705

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

6706

if test "${lt_cv_prog_compiler_c_o+set}" = set; then

6707

echo $ECHO_N "(cached) $ECHO_C" >&6

6708

else

6709

@@ -6721,7 +7787,7 @@

6710

mkdir conftest

6711

cd conftest

6712

mkdir out

6713

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

6714

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

6715

6716

lt_compiler_flag="-o out/conftest2.$ac_objext"

6717

# Insert the option either (1) after the last *FLAGS variable, or

6718

@@ -6732,11 +7798,11 @@

6719

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

6720

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

6721

-e 's:$: $lt_compiler_flag:'`

6722

- (eval echo "\"\$as_me:6735: $lt_compile\"" >&5)

6723

+ (eval echo "\"\$as_me:7801: $lt_compile\"" >&5)

6724

(eval "$lt_compile" 2>out/conftest.err)

6725

ac_status=$?

6726

cat out/conftest.err >&5

6727

- echo "$as_me:6739: \$? = $ac_status" >&5

6728

+ echo "$as_me:7805: \$? = $ac_status" >&5

6729

if (exit $ac_status) && test -s out/conftest2.$ac_objext

6730

then

6731

# The compiler can only warn and ignore the option if not recognized

6732

@@ -6758,23 +7824,23 @@

6733

$rm conftest*

6734

6735

fi

6736

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

6737

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6

6738

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

6739

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }

6740

6741

6742

hard_links="nottested"

6743

if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then

6744

# do not overwrite the value of need_locks provided by the user

6745

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

6746

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

6747

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

6748

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

6749

hard_links=yes

6750

$rm conftest*

6751

ln conftest.a conftest.b 2>/dev/null && hard_links=no

6752

touch conftest.a

6753

ln conftest.a conftest.b 2>&5 || hard_links=no

6754

ln conftest.a conftest.b 2>/dev/null && hard_links=no

6755

- echo "$as_me:$LINENO: result: $hard_links" >&5

6756

-echo "${ECHO_T}$hard_links" >&6

6757

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

6758

+echo "${ECHO_T}$hard_links" >&6; }

6759

if test "$hard_links" = no; then

6760

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

6761

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

6762

@@ -6784,8 +7850,8 @@

6763

need_locks=no

6764

fi

6765

6766

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

6767

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

6768

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

6769

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

6770

6771

runpath_var=

6772

allow_undefined_flag=

6773

@@ -6816,12 +7882,13 @@

6774

# it will be wrapped by ` (' and `)$', so one must not match beginning or

6775

# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',

6776

# as well as any symbol that contains `d'.

6777

- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"

6778

+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

6779

# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out

6780

# platforms (ab)use it in PIC code, but their linkers get confused if

6781

# the symbol is explicitly referenced. Since portable code cannot

6782

# rely on this symbol name, it's probably fine to never include it in

6783

# preloaded symbol tables.

6784

+ # Exclude shared library initialization/finalization symbols.

6785

extract_expsyms_cmds=

6786

# Just being paranoid about ensuring that cc_basename is set.

6787

for cc_temp in $compiler""; do

6788

@@ -6880,7 +7947,7 @@

6789

6790

# See if GNU ld supports shared libraries.

6791

case $host_os in

6792

- aix3* | aix4* | aix5*)

6793

+ aix[3-9]*)

6794

# On AIX/PPC, the GNU linker is very broken

6795

if test "$host_cpu" != ia64; then

6796

ld_shlibs=no

6797

@@ -6928,7 +7995,7 @@

6798

allow_undefined_flag=unsupported

6799

always_export_symbols=no

6800

enable_shared_with_static_runtimes=yes

6801

6802

+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'

6803

6804

if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then

6805

archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

6806

@@ -6946,7 +8013,7 @@

6807

fi

6808

;;

6809

6810

- interix3*)

6811

+ interix[3-9]*)

6812

hardcode_direct=no

6813

hardcode_shlibpath_var=no

6814

hardcode_libdir_flag_spec='${wl}-rpath,$libdir'

6815

@@ -6961,7 +8028,7 @@

6816

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'

6817

;;

6818

6819

- linux*)

6820

+ gnu* | linux* | k*bsd*-gnu)

6821

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

6822

tmp_addflag=

6823

case $cc_basename,$host_cpu in

6824

@@ -6979,20 +8046,30 @@

6825

ifc* | ifort*) # Intel Fortran compiler

6826

tmp_addflag=' -nofor_main' ;;

6827

esac

6828

- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

6829

+ case `$CC -V 2>&1 | sed 5q` in

6830

+ *Sun\ C*) # Sun C 5.9

6831

+ 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'

6832

+ tmp_sharedflag='-G' ;;

6833

+ *Sun\ F*) # Sun Fortran 8.3

6834

+ tmp_sharedflag='-G' ;;

6835

+ *)

6836

+ tmp_sharedflag='-shared' ;;

6837

+ esac

6838

+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

6839

6840

if test $supports_anon_versioning = yes; then

6841

archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~

6842

cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~

6843

$echo "local: *; };" >> $output_objdir/$libname.ver~

6844

- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

6845

+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

6846

fi

6847

+ link_all_deplibs=no

6848

else

6849

ld_shlibs=no

6850

fi

6851

;;

6852

6853

- netbsd*)

6854

+ netbsd* | netbsdelf*-gnu)

6855

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

6856

archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

6857

wlarc=

6858

@@ -7090,7 +8167,7 @@

6859

fi

6860

;;

6861

6862

- aix4* | aix5*)

6863

+ aix[4-9]*)

6864

if test "$host_cpu" = ia64; then

6865

# On IA64, the linker does run time linking by default, so we don't

6866

# have to do anything special.

6867

@@ -7110,7 +8187,7 @@

6868

# Test if we are trying to use run time linking or normal

6869

# AIX style linking. If -brtl is somewhere in LDFLAGS, we

6870

# need to do runtime linking.

6871

- case $host_os in aix4.[23]|aix4.[23].*|aix5*)

6872

+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)

6873

for ld_flag in $LDFLAGS; do

6874

if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then

6875

aix_use_runtimelinking=yes

6876

@@ -7144,7 +8221,7 @@

6877

strings "$collect2name" | grep resolve_lib_name >/dev/null

6878

then

6879

# We have reworked collect2

6880

- hardcode_direct=yes

6881

+ :

6882

else

6883

# We have old collect2

6884

hardcode_direct=unsupported

6885

@@ -7200,39 +8277,44 @@

6886

}

6887

_ACEOF

6888

rm -f conftest.$ac_objext conftest$ac_exeext

6889

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

6890

- (eval $ac_link) 2>conftest.er1

6891

+if { (ac_try="$ac_link"

6892

+case "(($ac_try" in

6893

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6894

+ *) ac_try_echo=$ac_try;;

6895

+esac

6896

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6897

+ (eval "$ac_link") 2>conftest.er1

6898

ac_status=$?

6899

grep -v '^ *+' conftest.er1 >conftest.err

6900

rm -f conftest.er1

6901

cat conftest.err >&5

6902

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6903

- (exit $ac_status); } &&

6904

- { ac_try='test -z "$ac_c_werror_flag"

6905

- || test ! -s conftest.err'

6906

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6907

- (eval $ac_try) 2>&5

6908

- ac_status=$?

6909

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6910

- (exit $ac_status); }; } &&

6911

- { ac_try='test -s conftest$ac_exeext'

6912

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6913

- (eval $ac_try) 2>&5

6914

- ac_status=$?

6915

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6916

- (exit $ac_status); }; }; then

6917

+ (exit $ac_status); } && {

6918

+ test -z "$ac_c_werror_flag" ||

6919

+ test ! -s conftest.err

6920

+ } && test -s conftest$ac_exeext &&

6921

+ $as_test_x conftest$ac_exeext; then

6922

6923

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

6924

-}'`

6925

+lt_aix_libpath_sed='

6926

+ /Import File Strings/,/^$/ {

6927

+ /^0/ {

6928

+ s/^0 *$.*$$/\1/

6929

+ p

6930

+ }

6931

+ }'

6932

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6933

# Check for a 64-bit object if we didn't find anything.

6934

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

6935

-}'`; fi

6936

+if test -z "$aix_libpath"; then

6937

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6938

+fi

6939

else

6940

echo "$as_me: failed program was:" >&5

6941

sed 's/^/| /' conftest.$ac_ext >&5

6942

6943

+

6944

fi

6945

-rm -f conftest.err conftest.$ac_objext \

6946

+

6947

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

6948

conftest$ac_exeext conftest.$ac_ext

6949

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

6950

6951

@@ -7261,39 +8343,44 @@

6952

}

6953

_ACEOF

6954

rm -f conftest.$ac_objext conftest$ac_exeext

6955

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

6956

- (eval $ac_link) 2>conftest.er1

6957

+if { (ac_try="$ac_link"

6958

+case "(($ac_try" in

6959

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6960

+ *) ac_try_echo=$ac_try;;

6961

+esac

6962

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6963

+ (eval "$ac_link") 2>conftest.er1

6964

ac_status=$?

6965

grep -v '^ *+' conftest.er1 >conftest.err

6966

rm -f conftest.er1

6967

cat conftest.err >&5

6968

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6969

- (exit $ac_status); } &&

6970

- { ac_try='test -z "$ac_c_werror_flag"

6971

- || test ! -s conftest.err'

6972

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6973

- (eval $ac_try) 2>&5

6974

- ac_status=$?

6975

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6976

- (exit $ac_status); }; } &&

6977

- { ac_try='test -s conftest$ac_exeext'

6978

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6979

- (eval $ac_try) 2>&5

6980

- ac_status=$?

6981

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6982

- (exit $ac_status); }; }; then

6983

+ (exit $ac_status); } && {

6984

+ test -z "$ac_c_werror_flag" ||

6985

+ test ! -s conftest.err

6986

+ } && test -s conftest$ac_exeext &&

6987

+ $as_test_x conftest$ac_exeext; then

6988

6989

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

6990

-}'`

6991

+lt_aix_libpath_sed='

6992

+ /Import File Strings/,/^$/ {

6993

+ /^0/ {

6994

+ s/^0 *$.*$$/\1/

6995

+ p

6996

+ }

6997

+ }'

6998

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

6999

# Check for a 64-bit object if we didn't find anything.

7000

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

7001

-}'`; fi

7002

+if test -z "$aix_libpath"; then

7003

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

7004

+fi

7005

else

7006

echo "$as_me: failed program was:" >&5

7007

sed 's/^/| /' conftest.$ac_ext >&5

7008

7009

+

7010

fi

7011

-rm -f conftest.err conftest.$ac_objext \

7012

+

7013

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7014

conftest$ac_exeext conftest.$ac_ext

7015

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

7016

7017

@@ -7339,7 +8426,7 @@

7018

# The linker will automatically build a .lib file if we build a DLL.

7019

old_archive_From_new_cmds='true'

7020

# FIXME: Should let the user specify the lib program.

7021

- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'

7022

+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'

7023

fix_srcfile_path='`cygpath -w "$srcfile"`'

7024

enable_shared_with_static_runtimes=yes

7025

;;

7026

@@ -7372,19 +8459,18 @@

7027

link_all_deplibs=yes

7028

if test "$GCC" = yes ; then

7029

output_verbose_link_cmd='echo'

7030

- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'

7031

- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

7032

- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

7033

- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

7034

- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

7035

+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"

7036

+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

7037

+ 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}"

7038

+ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"

7039

else

7040

case $cc_basename in

7041

xlc*)

7042

output_verbose_link_cmd='echo'

7043

- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'

7044

+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'

7045

module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

7046

# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

7047

- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

7048

+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

7049

module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

7050

;;

7051

*)

7052

@@ -7424,7 +8510,7 @@

7053

;;

7054

7055

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

7056

- freebsd* | kfreebsd*-gnu | dragonfly*)

7057

+ freebsd* | dragonfly*)

7058

archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

7059

hardcode_libdir_flag_spec='-R$libdir'

7060

hardcode_direct=yes

7061

@@ -7526,7 +8612,7 @@

7062

link_all_deplibs=yes

7063

;;

7064

7065

- netbsd*)

7066

+ netbsd* | netbsdelf*-gnu)

7067

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

7068

archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

7069

else

7070

@@ -7546,24 +8632,28 @@

7071

;;

7072

7073

openbsd*)

7074

- hardcode_direct=yes

7075

- hardcode_shlibpath_var=no

7076

- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

7077

- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

7078

- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'

7079

- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'

7080

- export_dynamic_flag_spec='${wl}-E'

7081

+ if test -f /usr/libexec/ld.so; then

7082

+ hardcode_direct=yes

7083

+ hardcode_shlibpath_var=no

7084

+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

7085

+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

7086

+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'

7087

+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'

7088

+ export_dynamic_flag_spec='${wl}-E'

7089

+ else

7090

+ case $host_os in

7091

+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)

7092

+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'

7093

+ hardcode_libdir_flag_spec='-R$libdir'

7094

+ ;;

7095

+ *)

7096

+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

7097

+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'

7098

+ ;;

7099

+ esac

7100

+ fi

7101

else

7102

- case $host_os in

7103

- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)

7104

- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'

7105

- hardcode_libdir_flag_spec='-R$libdir'

7106

- ;;

7107

- *)

7108

- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

7109

- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'

7110

- ;;

7111

- esac

7112

+ ld_shlibs=no

7113

fi

7114

;;

7115

7116

@@ -7622,17 +8712,16 @@

7117

case $host_os in

7118

solaris2.[0-5] | solaris2.[0-5].*) ;;

7119

*)

7120

- # The compiler driver will combine linker options so we

7121

- # cannot just pass the convience library names through

7122

- # without $wl, iff we do not link with $LD.

7123

- # Luckily, gcc supports the same syntax we need for Sun Studio.

7124

+ # The compiler driver will combine and reorder linker options,

7125

+ # but understands `-z linker_flag'. GCC discards it without `$wl',

7126

+ # but is careful enough not to reorder.

7127

# Supported since Solaris 2.6 (maybe 2.5.1?)

7128

- case $wlarc in

7129

- '')

7130

- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;

7131

- *)

7132

- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;

7133

- esac ;;

7134

+ if test "$GCC" = yes; then

7135

+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'

7136

+ else

7137

+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'

7138

+ fi

7139

+ ;;

7140

esac

7141

link_all_deplibs=yes

7142

;;

7143

@@ -7689,7 +8778,7 @@

7144

fi

7145

;;

7146

7147

- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)

7148

+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)

7149

no_undefined_flag='${wl}-z,text'

7150

archive_cmds_need_lc=no

7151

hardcode_shlibpath_var=no

7152

@@ -7742,8 +8831,8 @@

7153

esac

7154

fi

7155

7156

-echo "$as_me:$LINENO: result: $ld_shlibs" >&5

7157

-echo "${ECHO_T}$ld_shlibs" >&6

7158

+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5

7159

+echo "${ECHO_T}$ld_shlibs" >&6; }

7160

test "$ld_shlibs" = no && can_build_shared=no

7161

7162

#

7163

@@ -7763,10 +8852,10 @@

7164

# Test whether the compiler implicitly links with -lc since on some

7165

# systems, -lgcc has to come before -lc. If gcc already passes -lc

7166

# to ld, don't add -lc before -lgcc.

7167

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

7168

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

7169

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

7170

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

7171

$rm conftest*

7172

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

7173

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

7174

7175

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

7176

(eval $ac_compile) 2>&5

7177

@@ -7801,16 +8890,16 @@

7178

cat conftest.err 1>&5

7179

fi

7180

$rm conftest*

7181

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5

7182

-echo "${ECHO_T}$archive_cmds_need_lc" >&6

7183

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5

7184

+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }

7185

;;

7186

esac

7187

fi

7188

;;

7189

esac

7190

7191

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

7192

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

7193

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

7194

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

7195

library_names_spec=

7196

libname_spec='lib$name'

7197

soname_spec=

7198

@@ -7824,17 +8913,55 @@

7199

version_type=none

7200

dynamic_linker="$host_os ld.so"

7201

sys_lib_dlsearch_path_spec="/lib /usr/lib"

7202

+

7203

if test "$GCC" = yes; then

7204

- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

7205

- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

7206

+ case $host_os in

7207

+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;

7208

+ *) lt_awk_arg="/^libraries:/" ;;

7209

+ esac

7210

+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`

7211

+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then

7212

# if the path contains ";" then we assume it to be the separator

7213

# otherwise default to the standard path separator (i.e. ":") - it is

7214

# assumed that no part of a normal pathname contains ";" but that should

7215

# okay in the real world where ";" in dirpaths is itself problematic.

7216

- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

7217

+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`

7218

else

7219

- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

7220

+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

7221

fi

7222

+ # Ok, now we have the path, separated by spaces, we can step through it

7223

+ # and add multilib dir if necessary.

7224

+ lt_tmp_lt_search_path_spec=

7225

+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`

7226

+ for lt_sys_path in $lt_search_path_spec; do

7227

+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then

7228

+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"

7229

+ else

7230

+ test -d "$lt_sys_path" && \

7231

+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

7232

+ fi

7233

+ done

7234

+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '

7235

+BEGIN {RS=" "; FS="/|\n";} {

7236

+ lt_foo="";

7237

+ lt_count=0;

7238

+ for (lt_i = NF; lt_i > 0; lt_i--) {

7239

+ if ($lt_i != "" && $lt_i != ".") {

7240

+ if ($lt_i == "..") {

7241

+ lt_count++;

7242

+ } else {

7243

+ if (lt_count == 0) {

7244

+ lt_foo="/" $lt_i lt_foo;

7245

+ } else {

7246

+ lt_count--;

7247

+ }

7248

+ }

7249

+ }

7250

+ }

7251

+ if (lt_foo != "") { lt_freq[lt_foo]++; }

7252

+ if (lt_freq[lt_foo] == 1) { print lt_foo; }

7253

+}'`

7254

+ sys_lib_search_path_spec=`echo $lt_search_path_spec`

7255

else

7256

sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

7257

fi

7258

@@ -7855,7 +8982,7 @@

7259

soname_spec='${libname}${release}${shared_ext}$major'

7260

;;

7261

7262

-aix4* | aix5*)

7263

+aix[4-9]*)

7264

version_type=linux

7265

need_lib_prefix=no

7266

need_version=no

7267

@@ -7994,12 +9121,8 @@

7268

shlibpath_overrides_runpath=yes

7269

shlibpath_var=DYLD_LIBRARY_PATH

7270

shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'

7271

- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.

7272

- if test "$GCC" = yes; then

7273

- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`

7274

- else

7275

- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'

7276

- fi

7277

+

7278

+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"

7279

sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'

7280

;;

7281

7282

@@ -8016,18 +9139,6 @@

7283

dynamic_linker=no

7284

;;

7285

7286

-kfreebsd*-gnu)

7287

- version_type=linux

7288

- need_lib_prefix=no

7289

- need_version=no

7290

- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

7291

- soname_spec='${libname}${release}${shared_ext}$major'

7292

- shlibpath_var=LD_LIBRARY_PATH

7293

- shlibpath_overrides_runpath=no

7294

- hardcode_into_libs=yes

7295

- dynamic_linker='GNU ld.so'

7296

- ;;

7297

-

7298

freebsd* | dragonfly*)

7299

# DragonFly does not have aout. When/if they implement a new

7300

# versioning mechanism, adjust this.

7301

@@ -8065,7 +9176,7 @@

7302

shlibpath_overrides_runpath=no

7303

hardcode_into_libs=yes

7304

;;

7305

- freebsd*) # from 4.6 on

7306

+ *) # from 4.6 on, and DragonFly

7307

shlibpath_overrides_runpath=yes

7308

hardcode_into_libs=yes

7309

;;

7310

@@ -8128,7 +9239,7 @@

7311

postinstall_cmds='chmod 555 $lib'

7312

;;

7313

7314

-interix3*)

7315

+interix[3-9]*)

7316

version_type=linux

7317

need_lib_prefix=no

7318

need_version=no

7319

@@ -8183,7 +9294,7 @@

7320

;;

7321

7322

# This must be Linux ELF.

7323

-linux*)

7324

+linux* | k*bsd*-gnu)

7325

version_type=linux

7326

need_lib_prefix=no

7327

need_version=no

7328

@@ -8199,7 +9310,7 @@

7329

7330

# Append ld.so.conf contents to the search path

7331

if test -f /etc/ld.so.conf; then

7332

- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

7333

+ 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' ' '`

7334

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

7335

fi

7336

7337

@@ -8212,7 +9323,7 @@

7338

dynamic_linker='GNU/Linux ld.so'

7339

;;

7340

7341

-knetbsd*-gnu)

7342

+netbsdelf*-gnu)

7343

version_type=linux

7344

need_lib_prefix=no

7345

need_version=no

7346

@@ -8221,7 +9332,7 @@

7347

shlibpath_var=LD_LIBRARY_PATH

7348

shlibpath_overrides_runpath=no

7349

hardcode_into_libs=yes

7350

- dynamic_linker='GNU ld.so'

7351

+ dynamic_linker='NetBSD ld.elf_so'

7352

;;

7353

7354

netbsd*)

7355

@@ -8305,6 +9416,10 @@

7356

sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"

7357

;;

7358

7359

+rdos*)

7360

+ dynamic_linker=no

7361

+ ;;

7362

+

7363

solaris*)

7364

version_type=linux

7365

need_lib_prefix=no

7366

@@ -8397,17 +9512,32 @@

7367

dynamic_linker=no

7368

;;

7369

esac

7370

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

7371

-echo "${ECHO_T}$dynamic_linker" >&6

7372

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

7373

+echo "${ECHO_T}$dynamic_linker" >&6; }

7374

test "$dynamic_linker" = no && can_build_shared=no

7375

7376

+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then

7377

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7378

+else

7379

+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"

7380

+fi

7381

+

7382

+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

7383

+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then

7384

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7385

+else

7386

+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"

7387

+fi

7388

+

7389

+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"

7390

+

7391

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

7392

if test "$GCC" = yes; then

7393

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

7394

fi

7395

7396

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

7397

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

7398

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

7399

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

7400

hardcode_action=

7401

if test -n "$hardcode_libdir_flag_spec" || \

7402

test -n "$runpath_var" || \

7403

@@ -8431,8 +9561,8 @@

7404

# directories.

7405

hardcode_action=unsupported

7406

fi

7407

-echo "$as_me:$LINENO: result: $hardcode_action" >&5

7408

-echo "${ECHO_T}$hardcode_action" >&6

7409

+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5

7410

+echo "${ECHO_T}$hardcode_action" >&6; }

7411

7412

if test "$hardcode_action" = relink; then

7413

# Fast installation is not supported

7414

@@ -8445,29 +9575,30 @@

7415

7416

striplib=

7417

old_striplib=

7418

-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5

7419

-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6

7420

+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5

7421

+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }

7422

if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then

7423

test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"

7424

test -z "$striplib" && striplib="$STRIP --strip-unneeded"

7425

- echo "$as_me:$LINENO: result: yes" >&5

7426

-echo "${ECHO_T}yes" >&6

7427

+ { echo "$as_me:$LINENO: result: yes" >&5

7428

+echo "${ECHO_T}yes" >&6; }

7429

else

7430

# FIXME - insert some real tests, host_os isn't really good enough

7431

case $host_os in

7432

darwin*)

7433

if test -n "$STRIP" ; then

7434

striplib="$STRIP -x"

7435

- echo "$as_me:$LINENO: result: yes" >&5

7436

-echo "${ECHO_T}yes" >&6

7437

+ old_striplib="$STRIP -S"

7438

+ { echo "$as_me:$LINENO: result: yes" >&5

7439

+echo "${ECHO_T}yes" >&6; }

7440

else

7441

- echo "$as_me:$LINENO: result: no" >&5

7442

-echo "${ECHO_T}no" >&6

7443

+ { echo "$as_me:$LINENO: result: no" >&5

7444

+echo "${ECHO_T}no" >&6; }

7445

fi

7446

;;

7447

*)

7448

- echo "$as_me:$LINENO: result: no" >&5

7449

-echo "${ECHO_T}no" >&6

7450

+ { echo "$as_me:$LINENO: result: no" >&5

7451

+echo "${ECHO_T}no" >&6; }

7452

;;

7453

esac

7454

fi

7455

@@ -8499,8 +9630,8 @@

7456

7457

darwin*)

7458

# if libdl is installed we need to link against it

7459

- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

7460

-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6

7461

+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

7462

+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

7463

if test "${ac_cv_lib_dl_dlopen+set}" = set; then

7464

echo $ECHO_N "(cached) $ECHO_C" >&6

7465

else

7466

@@ -8513,56 +9644,53 @@

7467

cat >>conftest.$ac_ext <<_ACEOF

7468

/* end confdefs.h. */

7469

7470

-/* Override any gcc2 internal prototype to avoid an error. */

7471

+/* Override any GCC internal prototype to avoid an error.

7472

+ Use char because int might match the return type of a GCC

7473

+ builtin and then its argument prototype would still apply. */

7474

#ifdef __cplusplus

7475

extern "C"

7476

#endif

7477

-/* We use char because int might match the return type of a gcc2

7478

- builtin and then its argument prototype would still apply. */

7479

char dlopen ();

7480

int

7481

main ()

7482

{

7483

-dlopen ();

7484

+return dlopen ();

7485

;

7486

return 0;

7487

}

7488

_ACEOF

7489

rm -f conftest.$ac_objext conftest$ac_exeext

7490

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7491

- (eval $ac_link) 2>conftest.er1

7492

+if { (ac_try="$ac_link"

7493

+case "(($ac_try" in

7494

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7495

+ *) ac_try_echo=$ac_try;;

7496

+esac

7497

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7498

+ (eval "$ac_link") 2>conftest.er1

7499

ac_status=$?

7500

grep -v '^ *+' conftest.er1 >conftest.err

7501

rm -f conftest.er1

7502

cat conftest.err >&5

7503

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7504

- (exit $ac_status); } &&

7505

- { ac_try='test -z "$ac_c_werror_flag"

7506

- || test ! -s conftest.err'

7507

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7508

- (eval $ac_try) 2>&5

7509

- ac_status=$?

7510

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7511

- (exit $ac_status); }; } &&

7512

- { ac_try='test -s conftest$ac_exeext'

7513

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7514

- (eval $ac_try) 2>&5

7515

- ac_status=$?

7516

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7517

- (exit $ac_status); }; }; then

7518

+ (exit $ac_status); } && {

7519

+ test -z "$ac_c_werror_flag" ||

7520

+ test ! -s conftest.err

7521

+ } && test -s conftest$ac_exeext &&

7522

+ $as_test_x conftest$ac_exeext; then

7523

ac_cv_lib_dl_dlopen=yes

7524

else

7525

echo "$as_me: failed program was:" >&5

7526

sed 's/^/| /' conftest.$ac_ext >&5

7527

7528

-ac_cv_lib_dl_dlopen=no

7529

+ ac_cv_lib_dl_dlopen=no

7530

fi

7531

-rm -f conftest.err conftest.$ac_objext \

7532

+

7533

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7534

conftest$ac_exeext conftest.$ac_ext

7535

LIBS=$ac_check_lib_save_LIBS

7536

fi

7537

-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

7538

-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6

7539

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

7540

+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

7541

if test $ac_cv_lib_dl_dlopen = yes; then

7542

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

7543

else

7544

@@ -8576,8 +9704,8 @@

7545

;;

7546

7547

*)

7548

- echo "$as_me:$LINENO: checking for shl_load" >&5

7549

-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6

7550

+ { echo "$as_me:$LINENO: checking for shl_load" >&5

7551

+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }

7552

if test "${ac_cv_func_shl_load+set}" = set; then

7553

echo $ECHO_N "(cached) $ECHO_C" >&6

7554

else

7555

@@ -8604,73 +9732,64 @@

7556

7557

#undef shl_load

7558

7559

-/* Override any gcc2 internal prototype to avoid an error. */

7560

+/* Override any GCC internal prototype to avoid an error.

7561

+ Use char because int might match the return type of a GCC

7562

+ builtin and then its argument prototype would still apply. */

7563

#ifdef __cplusplus

7564

extern "C"

7565

-{

7566

#endif

7567

-/* We use char because int might match the return type of a gcc2

7568

- builtin and then its argument prototype would still apply. */

7569

char shl_load ();

7570

/* The GNU C library defines this for functions which it implements

7571

to always fail with ENOSYS. Some functions are actually named

7572

something starting with __ and the normal name is an alias. */

7573

-#if defined (__stub_shl_load) || defined (__stub___shl_load)

7574

+#if defined __stub_shl_load || defined __stub___shl_load

7575

choke me

7576

-#else

7577

-char (*f) () = shl_load;

7578

-#endif

7579

-#ifdef __cplusplus

7580

-}

7581

#endif

7582

7583

int

7584

main ()

7585

{

7586

-return f != shl_load;

7587

+return shl_load ();

7588

;

7589

return 0;

7590

}

7591

_ACEOF

7592

rm -f conftest.$ac_objext conftest$ac_exeext

7593

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7594

- (eval $ac_link) 2>conftest.er1

7595

+if { (ac_try="$ac_link"

7596

+case "(($ac_try" in

7597

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7598

+ *) ac_try_echo=$ac_try;;

7599

+esac

7600

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7601

+ (eval "$ac_link") 2>conftest.er1

7602

ac_status=$?

7603

grep -v '^ *+' conftest.er1 >conftest.err

7604

rm -f conftest.er1

7605

cat conftest.err >&5

7606

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7607

- (exit $ac_status); } &&

7608

- { ac_try='test -z "$ac_c_werror_flag"

7609

- || test ! -s conftest.err'

7610

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7611

- (eval $ac_try) 2>&5

7612

- ac_status=$?

7613

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7614

- (exit $ac_status); }; } &&

7615

- { ac_try='test -s conftest$ac_exeext'

7616

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7617

- (eval $ac_try) 2>&5

7618

- ac_status=$?

7619

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7620

- (exit $ac_status); }; }; then

7621

+ (exit $ac_status); } && {

7622

+ test -z "$ac_c_werror_flag" ||

7623

+ test ! -s conftest.err

7624

+ } && test -s conftest$ac_exeext &&

7625

+ $as_test_x conftest$ac_exeext; then

7626

ac_cv_func_shl_load=yes

7627

else

7628

echo "$as_me: failed program was:" >&5

7629

sed 's/^/| /' conftest.$ac_ext >&5

7630

7631

-ac_cv_func_shl_load=no

7632

+ ac_cv_func_shl_load=no

7633

fi

7634

-rm -f conftest.err conftest.$ac_objext \

7635

+

7636

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7637

conftest$ac_exeext conftest.$ac_ext

7638

fi

7639

-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

7640

-echo "${ECHO_T}$ac_cv_func_shl_load" >&6

7641

+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

7642

+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }

7643

if test $ac_cv_func_shl_load = yes; then

7644

lt_cv_dlopen="shl_load"

7645

else

7646

- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

7647

-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6

7648

+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

7649

+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }

7650

if test "${ac_cv_lib_dld_shl_load+set}" = set; then

7651

echo $ECHO_N "(cached) $ECHO_C" >&6

7652

else

7653

@@ -8683,61 +9802,58 @@

7654

cat >>conftest.$ac_ext <<_ACEOF

7655

/* end confdefs.h. */

7656

7657

-/* Override any gcc2 internal prototype to avoid an error. */

7658

+/* Override any GCC internal prototype to avoid an error.

7659

+ Use char because int might match the return type of a GCC

7660

+ builtin and then its argument prototype would still apply. */

7661

#ifdef __cplusplus

7662

extern "C"

7663

#endif

7664

-/* We use char because int might match the return type of a gcc2

7665

- builtin and then its argument prototype would still apply. */

7666

char shl_load ();

7667

int

7668

main ()

7669

{

7670

-shl_load ();

7671

+return shl_load ();

7672

;

7673

return 0;

7674

}

7675

_ACEOF

7676

rm -f conftest.$ac_objext conftest$ac_exeext

7677

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7678

- (eval $ac_link) 2>conftest.er1

7679

+if { (ac_try="$ac_link"

7680

+case "(($ac_try" in

7681

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7682

+ *) ac_try_echo=$ac_try;;

7683

+esac

7684

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7685

+ (eval "$ac_link") 2>conftest.er1

7686

ac_status=$?

7687

grep -v '^ *+' conftest.er1 >conftest.err

7688

rm -f conftest.er1

7689

cat conftest.err >&5

7690

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7691

- (exit $ac_status); } &&

7692

- { ac_try='test -z "$ac_c_werror_flag"

7693

- || test ! -s conftest.err'

7694

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7695

- (eval $ac_try) 2>&5

7696

- ac_status=$?

7697

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7698

- (exit $ac_status); }; } &&

7699

- { ac_try='test -s conftest$ac_exeext'

7700

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7701

- (eval $ac_try) 2>&5

7702

- ac_status=$?

7703

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7704

- (exit $ac_status); }; }; then

7705

+ (exit $ac_status); } && {

7706

+ test -z "$ac_c_werror_flag" ||

7707

+ test ! -s conftest.err

7708

+ } && test -s conftest$ac_exeext &&

7709

+ $as_test_x conftest$ac_exeext; then

7710

ac_cv_lib_dld_shl_load=yes

7711

else

7712

echo "$as_me: failed program was:" >&5

7713

sed 's/^/| /' conftest.$ac_ext >&5

7714

7715

-ac_cv_lib_dld_shl_load=no

7716

+ ac_cv_lib_dld_shl_load=no

7717

fi

7718

-rm -f conftest.err conftest.$ac_objext \

7719

+

7720

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7721

conftest$ac_exeext conftest.$ac_ext

7722

LIBS=$ac_check_lib_save_LIBS

7723

fi

7724

-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5

7725

-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6

7726

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5

7727

+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }

7728

if test $ac_cv_lib_dld_shl_load = yes; then

7729

- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"

7730

+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"

7731

else

7732

- echo "$as_me:$LINENO: checking for dlopen" >&5

7733

-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6

7734

+ { echo "$as_me:$LINENO: checking for dlopen" >&5

7735

+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }

7736

if test "${ac_cv_func_dlopen+set}" = set; then

7737

echo $ECHO_N "(cached) $ECHO_C" >&6

7738

else

7739

@@ -8764,73 +9880,64 @@

7740

7741

#undef dlopen

7742

7743

-/* Override any gcc2 internal prototype to avoid an error. */

7744

+/* Override any GCC internal prototype to avoid an error.

7745

+ Use char because int might match the return type of a GCC

7746

+ builtin and then its argument prototype would still apply. */

7747

#ifdef __cplusplus

7748

extern "C"

7749

-{

7750

#endif

7751

-/* We use char because int might match the return type of a gcc2

7752

- builtin and then its argument prototype would still apply. */

7753

char dlopen ();

7754

/* The GNU C library defines this for functions which it implements

7755

to always fail with ENOSYS. Some functions are actually named

7756

something starting with __ and the normal name is an alias. */

7757

-#if defined (__stub_dlopen) || defined (__stub___dlopen)

7758

+#if defined __stub_dlopen || defined __stub___dlopen

7759

choke me

7760

-#else

7761

-char (*f) () = dlopen;

7762

-#endif

7763

-#ifdef __cplusplus

7764

-}

7765

#endif

7766

7767

int

7768

main ()

7769

{

7770

-return f != dlopen;

7771

+return dlopen ();

7772

;

7773

return 0;

7774

}

7775

_ACEOF

7776

rm -f conftest.$ac_objext conftest$ac_exeext

7777

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7778

- (eval $ac_link) 2>conftest.er1

7779

+if { (ac_try="$ac_link"

7780

+case "(($ac_try" in

7781

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7782

+ *) ac_try_echo=$ac_try;;

7783

+esac

7784

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7785

+ (eval "$ac_link") 2>conftest.er1

7786

ac_status=$?

7787

grep -v '^ *+' conftest.er1 >conftest.err

7788

rm -f conftest.er1

7789

cat conftest.err >&5

7790

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7791

- (exit $ac_status); } &&

7792

- { ac_try='test -z "$ac_c_werror_flag"

7793

- || test ! -s conftest.err'

7794

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7795

- (eval $ac_try) 2>&5

7796

- ac_status=$?

7797

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7798

- (exit $ac_status); }; } &&

7799

- { ac_try='test -s conftest$ac_exeext'

7800

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7801

- (eval $ac_try) 2>&5

7802

- ac_status=$?

7803

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7804

- (exit $ac_status); }; }; then

7805

+ (exit $ac_status); } && {

7806

+ test -z "$ac_c_werror_flag" ||

7807

+ test ! -s conftest.err

7808

+ } && test -s conftest$ac_exeext &&

7809

+ $as_test_x conftest$ac_exeext; then

7810

ac_cv_func_dlopen=yes

7811

else

7812

echo "$as_me: failed program was:" >&5

7813

sed 's/^/| /' conftest.$ac_ext >&5

7814

7815

-ac_cv_func_dlopen=no

7816

+ ac_cv_func_dlopen=no

7817

fi

7818

-rm -f conftest.err conftest.$ac_objext \

7819

+

7820

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7821

conftest$ac_exeext conftest.$ac_ext

7822

fi

7823

-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

7824

-echo "${ECHO_T}$ac_cv_func_dlopen" >&6

7825

+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

7826

+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }

7827

if test $ac_cv_func_dlopen = yes; then

7828

lt_cv_dlopen="dlopen"

7829

else

7830

- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

7831

-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6

7832

+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

7833

+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

7834

if test "${ac_cv_lib_dl_dlopen+set}" = set; then

7835

echo $ECHO_N "(cached) $ECHO_C" >&6

7836

else

7837

@@ -8843,61 +9950,58 @@

7838

cat >>conftest.$ac_ext <<_ACEOF

7839

/* end confdefs.h. */

7840

7841

-/* Override any gcc2 internal prototype to avoid an error. */

7842

+/* Override any GCC internal prototype to avoid an error.

7843

+ Use char because int might match the return type of a GCC

7844

+ builtin and then its argument prototype would still apply. */

7845

#ifdef __cplusplus

7846

extern "C"

7847

#endif

7848

-/* We use char because int might match the return type of a gcc2

7849

- builtin and then its argument prototype would still apply. */

7850

char dlopen ();

7851

int

7852

main ()

7853

{

7854

-dlopen ();

7855

+return dlopen ();

7856

;

7857

return 0;

7858

}

7859

_ACEOF

7860

rm -f conftest.$ac_objext conftest$ac_exeext

7861

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7862

- (eval $ac_link) 2>conftest.er1

7863

+if { (ac_try="$ac_link"

7864

+case "(($ac_try" in

7865

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7866

+ *) ac_try_echo=$ac_try;;

7867

+esac

7868

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7869

+ (eval "$ac_link") 2>conftest.er1

7870

ac_status=$?

7871

grep -v '^ *+' conftest.er1 >conftest.err

7872

rm -f conftest.er1

7873

cat conftest.err >&5

7874

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7875

- (exit $ac_status); } &&

7876

- { ac_try='test -z "$ac_c_werror_flag"

7877

- || test ! -s conftest.err'

7878

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7879

- (eval $ac_try) 2>&5

7880

- ac_status=$?

7881

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7882

- (exit $ac_status); }; } &&

7883

- { ac_try='test -s conftest$ac_exeext'

7884

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7885

- (eval $ac_try) 2>&5

7886

- ac_status=$?

7887

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7888

- (exit $ac_status); }; }; then

7889

+ (exit $ac_status); } && {

7890

+ test -z "$ac_c_werror_flag" ||

7891

+ test ! -s conftest.err

7892

+ } && test -s conftest$ac_exeext &&

7893

+ $as_test_x conftest$ac_exeext; then

7894

ac_cv_lib_dl_dlopen=yes

7895

else

7896

echo "$as_me: failed program was:" >&5

7897

sed 's/^/| /' conftest.$ac_ext >&5

7898

7899

-ac_cv_lib_dl_dlopen=no

7900

+ ac_cv_lib_dl_dlopen=no

7901

fi

7902

-rm -f conftest.err conftest.$ac_objext \

7903

+

7904

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7905

conftest$ac_exeext conftest.$ac_ext

7906

LIBS=$ac_check_lib_save_LIBS

7907

fi

7908

-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

7909

-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6

7910

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

7911

+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

7912

if test $ac_cv_lib_dl_dlopen = yes; then

7913

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

7914

else

7915

- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5

7916

-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6

7917

+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5

7918

+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }

7919

if test "${ac_cv_lib_svld_dlopen+set}" = set; then

7920

echo $ECHO_N "(cached) $ECHO_C" >&6

7921

else

7922

@@ -8910,61 +10014,58 @@

7923

cat >>conftest.$ac_ext <<_ACEOF

7924

/* end confdefs.h. */

7925

7926

-/* Override any gcc2 internal prototype to avoid an error. */

7927

+/* Override any GCC internal prototype to avoid an error.

7928

+ Use char because int might match the return type of a GCC

7929

+ builtin and then its argument prototype would still apply. */

7930

#ifdef __cplusplus

7931

extern "C"

7932

#endif

7933

-/* We use char because int might match the return type of a gcc2

7934

- builtin and then its argument prototype would still apply. */

7935

char dlopen ();

7936

int

7937

main ()

7938

{

7939

-dlopen ();

7940

+return dlopen ();

7941

;

7942

return 0;

7943

}

7944

_ACEOF

7945

rm -f conftest.$ac_objext conftest$ac_exeext

7946

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7947

- (eval $ac_link) 2>conftest.er1

7948

+if { (ac_try="$ac_link"

7949

+case "(($ac_try" in

7950

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7951

+ *) ac_try_echo=$ac_try;;

7952

+esac

7953

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7954

+ (eval "$ac_link") 2>conftest.er1

7955

ac_status=$?

7956

grep -v '^ *+' conftest.er1 >conftest.err

7957

rm -f conftest.er1

7958

cat conftest.err >&5

7959

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7960

- (exit $ac_status); } &&

7961

- { ac_try='test -z "$ac_c_werror_flag"

7962

- || test ! -s conftest.err'

7963

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7964

- (eval $ac_try) 2>&5

7965

- ac_status=$?

7966

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7967

- (exit $ac_status); }; } &&

7968

- { ac_try='test -s conftest$ac_exeext'

7969

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7970

- (eval $ac_try) 2>&5

7971

- ac_status=$?

7972

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7973

- (exit $ac_status); }; }; then

7974

+ (exit $ac_status); } && {

7975

+ test -z "$ac_c_werror_flag" ||

7976

+ test ! -s conftest.err

7977

+ } && test -s conftest$ac_exeext &&

7978

+ $as_test_x conftest$ac_exeext; then

7979

ac_cv_lib_svld_dlopen=yes

7980

else

7981

echo "$as_me: failed program was:" >&5

7982

sed 's/^/| /' conftest.$ac_ext >&5

7983

7984

-ac_cv_lib_svld_dlopen=no

7985

+ ac_cv_lib_svld_dlopen=no

7986

fi

7987

-rm -f conftest.err conftest.$ac_objext \

7988

+

7989

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7990

conftest$ac_exeext conftest.$ac_ext

7991

LIBS=$ac_check_lib_save_LIBS

7992

fi

7993

-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5

7994

-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6

7995

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5

7996

+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }

7997

if test $ac_cv_lib_svld_dlopen = yes; then

7998

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"

7999

else

8000

- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5

8001

-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6

8002

+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5

8003

+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }

8004

if test "${ac_cv_lib_dld_dld_link+set}" = set; then

8005

echo $ECHO_N "(cached) $ECHO_C" >&6

8006

else

8007

@@ -8977,58 +10078,55 @@

8008

cat >>conftest.$ac_ext <<_ACEOF

8009

/* end confdefs.h. */

8010

8011

-/* Override any gcc2 internal prototype to avoid an error. */

8012

+/* Override any GCC internal prototype to avoid an error.

8013

+ Use char because int might match the return type of a GCC

8014

+ builtin and then its argument prototype would still apply. */

8015

#ifdef __cplusplus

8016

extern "C"

8017

#endif

8018

-/* We use char because int might match the return type of a gcc2

8019

- builtin and then its argument prototype would still apply. */

8020

char dld_link ();

8021

int

8022

main ()

8023

{

8024

-dld_link ();

8025

+return dld_link ();

8026

;

8027

return 0;

8028

}

8029

_ACEOF

8030

rm -f conftest.$ac_objext conftest$ac_exeext

8031

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8032

- (eval $ac_link) 2>conftest.er1

8033

+if { (ac_try="$ac_link"

8034

+case "(($ac_try" in

8035

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8036

+ *) ac_try_echo=$ac_try;;

8037

+esac

8038

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8039

+ (eval "$ac_link") 2>conftest.er1

8040

ac_status=$?

8041

grep -v '^ *+' conftest.er1 >conftest.err

8042

rm -f conftest.er1

8043

cat conftest.err >&5

8044

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8045

- (exit $ac_status); } &&

8046

- { ac_try='test -z "$ac_c_werror_flag"

8047

- || test ! -s conftest.err'

8048

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8049

- (eval $ac_try) 2>&5

8050

- ac_status=$?

8051

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8052

- (exit $ac_status); }; } &&

8053

- { ac_try='test -s conftest$ac_exeext'

8054

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8055

- (eval $ac_try) 2>&5

8056

- ac_status=$?

8057

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8058

- (exit $ac_status); }; }; then

8059

+ (exit $ac_status); } && {

8060

+ test -z "$ac_c_werror_flag" ||

8061

+ test ! -s conftest.err

8062

+ } && test -s conftest$ac_exeext &&

8063

+ $as_test_x conftest$ac_exeext; then

8064

ac_cv_lib_dld_dld_link=yes

8065

else

8066

echo "$as_me: failed program was:" >&5

8067

sed 's/^/| /' conftest.$ac_ext >&5

8068

8069

-ac_cv_lib_dld_dld_link=no

8070

+ ac_cv_lib_dld_dld_link=no

8071

fi

8072

-rm -f conftest.err conftest.$ac_objext \

8073

+

8074

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8075

conftest$ac_exeext conftest.$ac_ext

8076

LIBS=$ac_check_lib_save_LIBS

8077

fi

8078

-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5

8079

-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6

8080

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5

8081

+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }

8082

if test $ac_cv_lib_dld_dld_link = yes; then

8083

- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"

8084

+ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"

8085

fi

8086

8087

8088

@@ -9066,8 +10164,8 @@

8089

save_LIBS="$LIBS"

8090

LIBS="$lt_cv_dlopen_libs $LIBS"

8091

8092

- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5

8093

-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6

8094

+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5

8095

+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }

8096

if test "${lt_cv_dlopen_self+set}" = set; then

8097

echo $ECHO_N "(cached) $ECHO_C" >&6

8098

else

8099

@@ -9077,7 +10175,7 @@

8100

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

8101

lt_status=$lt_dlunknown

8102

cat > conftest.$ac_ext <<EOF

8103

-#line 9080 "configure"

8104

+#line 10178 "configure"

8105

#include "confdefs.h"

8106

8107

#if HAVE_DLFCN_H

8108

@@ -9161,13 +10259,13 @@

8109

8110

8111

fi

8112

-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5

8113

-echo "${ECHO_T}$lt_cv_dlopen_self" >&6

8114

+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5

8115

+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }

8116

8117

if test "x$lt_cv_dlopen_self" = xyes; then

8118

wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"

8119

- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5

8120

-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6

8121

+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5

8122

+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }

8123

if test "${lt_cv_dlopen_self_static+set}" = set; then

8124

echo $ECHO_N "(cached) $ECHO_C" >&6

8125

else

8126

@@ -9177,7 +10275,7 @@

8127

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

8128

lt_status=$lt_dlunknown

8129

cat > conftest.$ac_ext <<EOF

8130

-#line 9180 "configure"

8131

+#line 10278 "configure"

8132

#include "confdefs.h"

8133

8134

#if HAVE_DLFCN_H

8135

@@ -9261,8 +10359,8 @@

8136

8137

8138

fi

8139

-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5

8140

-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6

8141

+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5

8142

+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }

8143

fi

8144

8145

CPPFLAGS="$save_CPPFLAGS"

8146

@@ -9284,13 +10382,13 @@

8147

8148

8149

# Report which library types will actually be built

8150

-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

8151

-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6

8152

-echo "$as_me:$LINENO: result: $can_build_shared" >&5

8153

-echo "${ECHO_T}$can_build_shared" >&6

8154

+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

8155

+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }

8156

+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5

8157

+echo "${ECHO_T}$can_build_shared" >&6; }

8158

8159

-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

8160

-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6

8161

+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

8162

+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }

8163

test "$can_build_shared" = "no" && enable_shared=no

8164

8165

# On AIX, shared libraries and static libraries use the same namespace, and

8166

@@ -9304,21 +10402,21 @@

8167

fi

8168

;;

8169

8170

-aix4* | aix5*)

8171

+aix[4-9]*)

8172

if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then

8173

test "$enable_shared" = yes && enable_static=no

8174

fi

8175

;;

8176

esac

8177

-echo "$as_me:$LINENO: result: $enable_shared" >&5

8178

-echo "${ECHO_T}$enable_shared" >&6

8179

+{ echo "$as_me:$LINENO: result: $enable_shared" >&5

8180

+echo "${ECHO_T}$enable_shared" >&6; }

8181

8182

-echo "$as_me:$LINENO: checking whether to build static libraries" >&5

8183

-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6

8184

+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5

8185

+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }

8186

# Make sure either enable_shared or enable_static is yes.

8187

test "$enable_shared" = yes || enable_static=yes

8188

-echo "$as_me:$LINENO: result: $enable_static" >&5

8189

-echo "${ECHO_T}$enable_static" >&6

8190

+{ echo "$as_me:$LINENO: result: $enable_static" >&5

8191

+echo "${ECHO_T}$enable_static" >&6; }

8192

8193

# The else clause should only fire when bootstrapping the

8194

# libtool distribution, otherwise you forgot to ship ltmain.sh

8195

@@ -9360,6 +10458,7 @@

8196

predeps \

8197

postdeps \

8198

compiler_lib_search_path \

8199

+ compiler_lib_search_dirs \

8200

archive_cmds \

8201

archive_expsym_cmds \

8202

postinstall_cmds \

8203

@@ -9375,6 +10474,7 @@

8204

module_cmds \

8205

module_expsym_cmds \

8206

lt_cv_prog_compiler_c_o \

8207

+ fix_srcfile_path \

8208

exclude_expsyms \

8209

include_expsyms; do

8210

8211

@@ -9419,7 +10519,7 @@

8212

# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)

8213

# NOTE: Changes made to this file will be lost: look at ltmain.sh.

8214

#

8215

8216

8217

# Free Software Foundation, Inc.

8218

#

8219

# This file is part of GNU Libtool:

8220

@@ -9655,6 +10755,10 @@

8221

# shared library.

8222

postdeps=$lt_postdeps

8223

8224

+# The directories searched by this compiler when creating a shared

8225

+# library

8226

+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs

8227

+

8228

# The library search path used internally by the compiler when linking

8229

# a shared library.

8230

compiler_lib_search_path=$lt_compiler_lib_search_path

8231

@@ -9743,7 +10847,7 @@

8232

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

8233

8234

# Fix the shell variable \$srcfile for the compiler.

8235

-fix_srcfile_path="$fix_srcfile_path"

8236

+fix_srcfile_path=$lt_fix_srcfile_path

8237

8238

# Set to yes if exported symbols are required.

8239

always_export_symbols=$always_export_symbols

8240

@@ -9810,11 +10914,11 @@

8241

CC="$lt_save_CC"

8242

8243

8244

-# Check whether --with-tags or --without-tags was given.

8245

+# Check whether --with-tags was given.

8246

if test "${with_tags+set}" = set; then

8247

- withval="$with_tags"

8248

- tagnames="$withval"

8249

-fi;

8250

+ withval=$with_tags; tagnames="$withval"

8251

+fi

8252

+

8253

8254

if test -f "$ltmain" && test -n "$tagnames"; then

8255

if test ! -f "${ofile}"; then

8256

@@ -9868,7 +10972,7 @@

8257

if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

8258

( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

8259

(test "X$CXX" != "Xg++"))) ; then

8260

- ac_ext=cc

8261

+ ac_ext=cpp

8262

ac_cpp='$CXXCPP $CPPFLAGS'

8263

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

8264

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

8265

@@ -9903,6 +11007,7 @@

8266

predeps_CXX=

8267

postdeps_CXX=

8268

compiler_lib_search_path_CXX=

8269

+compiler_lib_search_dirs_CXX=

8270

8271

# Source file extension for C++ test sources.

8272

ac_ext=cpp

8273

@@ -9912,10 +11017,10 @@

8274

objext_CXX=$objext

8275

8276

# Code to be used in simple compile tests

8277

-lt_simple_compile_test_code="int some_variable = 0;\n"

8278

+lt_simple_compile_test_code="int some_variable = 0;"

8279

8280

# Code to be used in simple link tests

8281

-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'

8282

+lt_simple_link_test_code='int main(int, char *[]) { return(0); }'

8283

8284

# ltmain only uses $CC for tagged configurations so make sure $CC is set.

8285

8286

@@ -9931,16 +11036,16 @@

8287

8288

# save warnings/boilerplate of simple test code

8289

ac_outfile=conftest.$ac_objext

8290

-printf "$lt_simple_compile_test_code" >conftest.$ac_ext

8291

+echo "$lt_simple_compile_test_code" >conftest.$ac_ext

8292

eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

8293

_lt_compiler_boilerplate=`cat conftest.err`

8294

$rm conftest*

8295

8296

ac_outfile=conftest.$ac_objext

8297

-printf "$lt_simple_link_test_code" >conftest.$ac_ext

8298

+echo "$lt_simple_link_test_code" >conftest.$ac_ext

8299

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

8300

_lt_linker_boilerplate=`cat conftest.err`

8301

-$rm conftest*

8302

+$rm -r conftest*

8303

8304

8305

# Allow CC to be a program name with arguments.

8306

@@ -9987,18 +11092,18 @@

8307

# Set up default GNU C++ configuration

8308

8309

8310

-# Check whether --with-gnu-ld or --without-gnu-ld was given.

8311

+# Check whether --with-gnu-ld was given.

8312

if test "${with_gnu_ld+set}" = set; then

8313

- withval="$with_gnu_ld"

8314

- test "$withval" = no || with_gnu_ld=yes

8315

+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

8316

else

8317

with_gnu_ld=no

8318

-fi;

8319

+fi

8320

+

8321

ac_prog=ld

8322

if test "$GCC" = yes; then

8323

# Check if gcc -print-prog-name=ld gives a path.

8324

- echo "$as_me:$LINENO: checking for ld used by $CC" >&5

8325

-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6

8326

+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

8327

+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

8328

case $host in

8329

*-*-mingw*)

8330

# gcc leaves a trailing carriage return which upsets mingw

8331

@@ -10027,11 +11132,11 @@

8332

;;

8333

esac

8334

elif test "$with_gnu_ld" = yes; then

8335

- echo "$as_me:$LINENO: checking for GNU ld" >&5

8336

-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6

8337

+ { echo "$as_me:$LINENO: checking for GNU ld" >&5

8338

+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

8339

else

8340

- echo "$as_me:$LINENO: checking for non-GNU ld" >&5

8341

-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6

8342

+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

8343

+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

8344

fi

8345

if test "${lt_cv_path_LD+set}" = set; then

8346

echo $ECHO_N "(cached) $ECHO_C" >&6

8347

@@ -10064,17 +11169,17 @@

8348

8349

LD="$lt_cv_path_LD"

8350

if test -n "$LD"; then

8351

- echo "$as_me:$LINENO: result: $LD" >&5

8352

-echo "${ECHO_T}$LD" >&6

8353

+ { echo "$as_me:$LINENO: result: $LD" >&5

8354

+echo "${ECHO_T}$LD" >&6; }

8355

else

8356

- echo "$as_me:$LINENO: result: no" >&5

8357

-echo "${ECHO_T}no" >&6

8358

+ { echo "$as_me:$LINENO: result: no" >&5

8359

+echo "${ECHO_T}no" >&6; }

8360

fi

8361

test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

8362

echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

8363

{ (exit 1); exit 1; }; }

8364

-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

8365

-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6

8366

+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

8367

+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

8368

if test "${lt_cv_prog_gnu_ld+set}" = set; then

8369

echo $ECHO_N "(cached) $ECHO_C" >&6

8370

else

8371

@@ -10088,8 +11193,8 @@

8372

;;

8373

esac

8374

fi

8375

-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

8376

-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6

8377

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

8378

+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

8379

with_gnu_ld=$lt_cv_prog_gnu_ld

8380

8381

8382

@@ -10139,15 +11244,15 @@

8383

fi

8384

8385

# PORTME: fill in a description of your system's C++ link characteristics

8386

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8387

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

8388

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8389

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

8390

ld_shlibs_CXX=yes

8391

case $host_os in

8392

aix3*)

8393

# FIXME: insert proper C++ library support

8394

ld_shlibs_CXX=no

8395

;;

8396

- aix4* | aix5*)

8397

+ aix[4-9]*)

8398

if test "$host_cpu" = ia64; then

8399

# On IA64, the linker does run time linking by default, so we don't

8400

# have to do anything special.

8401

@@ -10160,7 +11265,7 @@

8402

# Test if we are trying to use run time linking or normal

8403

# AIX style linking. If -brtl is somewhere in LDFLAGS, we

8404

# need to do runtime linking.

8405

- case $host_os in aix4.[23]|aix4.[23].*|aix5*)

8406

+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)

8407

for ld_flag in $LDFLAGS; do

8408

case $ld_flag in

8409

*-brtl*)

8410

@@ -10196,7 +11301,7 @@

8411

strings "$collect2name" | grep resolve_lib_name >/dev/null

8412

then

8413

# We have reworked collect2

8414

- hardcode_direct_CXX=yes

8415

+ :

8416

else

8417

# We have old collect2

8418

hardcode_direct_CXX=unsupported

8419

@@ -10252,39 +11357,44 @@

8420

}

8421

_ACEOF

8422

rm -f conftest.$ac_objext conftest$ac_exeext

8423

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8424

- (eval $ac_link) 2>conftest.er1

8425

+if { (ac_try="$ac_link"

8426

+case "(($ac_try" in

8427

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8428

+ *) ac_try_echo=$ac_try;;

8429

+esac

8430

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8431

+ (eval "$ac_link") 2>conftest.er1

8432

ac_status=$?

8433

grep -v '^ *+' conftest.er1 >conftest.err

8434

rm -f conftest.er1

8435

cat conftest.err >&5

8436

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8437

- (exit $ac_status); } &&

8438

- { ac_try='test -z "$ac_cxx_werror_flag"

8439

- || test ! -s conftest.err'

8440

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8441

- (eval $ac_try) 2>&5

8442

- ac_status=$?

8443

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8444

- (exit $ac_status); }; } &&

8445

- { ac_try='test -s conftest$ac_exeext'

8446

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8447

- (eval $ac_try) 2>&5

8448

- ac_status=$?

8449

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8450

- (exit $ac_status); }; }; then

8451

+ (exit $ac_status); } && {

8452

+ test -z "$ac_cxx_werror_flag" ||

8453

+ test ! -s conftest.err

8454

+ } && test -s conftest$ac_exeext &&

8455

+ $as_test_x conftest$ac_exeext; then

8456

8457

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8458

-}'`

8459

+lt_aix_libpath_sed='

8460

+ /Import File Strings/,/^$/ {

8461

+ /^0/ {

8462

+ s/^0 *$.*$$/\1/

8463

+ p

8464

+ }

8465

+ }'

8466

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

8467

# Check for a 64-bit object if we didn't find anything.

8468

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8469

-}'`; fi

8470

+if test -z "$aix_libpath"; then

8471

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

8472

+fi

8473

else

8474

echo "$as_me: failed program was:" >&5

8475

sed 's/^/| /' conftest.$ac_ext >&5

8476

8477

+

8478

fi

8479

-rm -f conftest.err conftest.$ac_objext \

8480

+

8481

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8482

conftest$ac_exeext conftest.$ac_ext

8483

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8484

8485

@@ -10314,39 +11424,44 @@

8486

}

8487

_ACEOF

8488

rm -f conftest.$ac_objext conftest$ac_exeext

8489

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8490

- (eval $ac_link) 2>conftest.er1

8491

+if { (ac_try="$ac_link"

8492

+case "(($ac_try" in

8493

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8494

+ *) ac_try_echo=$ac_try;;

8495

+esac

8496

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8497

+ (eval "$ac_link") 2>conftest.er1

8498

ac_status=$?

8499

grep -v '^ *+' conftest.er1 >conftest.err

8500

rm -f conftest.er1

8501

cat conftest.err >&5

8502

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8503

- (exit $ac_status); } &&

8504

- { ac_try='test -z "$ac_cxx_werror_flag"

8505

- || test ! -s conftest.err'

8506

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8507

- (eval $ac_try) 2>&5

8508

- ac_status=$?

8509

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8510

- (exit $ac_status); }; } &&

8511

- { ac_try='test -s conftest$ac_exeext'

8512

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8513

- (eval $ac_try) 2>&5

8514

- ac_status=$?

8515

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8516

- (exit $ac_status); }; }; then

8517

+ (exit $ac_status); } && {

8518

+ test -z "$ac_cxx_werror_flag" ||

8519

+ test ! -s conftest.err

8520

+ } && test -s conftest$ac_exeext &&

8521

+ $as_test_x conftest$ac_exeext; then

8522

8523

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8524

-}'`

8525

+lt_aix_libpath_sed='

8526

+ /Import File Strings/,/^$/ {

8527

+ /^0/ {

8528

+ s/^0 *$.*$$/\1/

8529

+ p

8530

+ }

8531

+ }'

8532

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

8533

# Check for a 64-bit object if we didn't find anything.

8534

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

8535

-}'`; fi

8536

+if test -z "$aix_libpath"; then

8537

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

8538

+fi

8539

else

8540

echo "$as_me: failed program was:" >&5

8541

sed 's/^/| /' conftest.$ac_ext >&5

8542

8543

+

8544

fi

8545

-rm -f conftest.err conftest.$ac_objext \

8546

+

8547

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8548

conftest$ac_exeext conftest.$ac_ext

8549

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8550

8551

@@ -10408,59 +11523,31 @@

8552

fi

8553

;;

8554

darwin* | rhapsody*)

8555

- case $host_os in

8556

- rhapsody* | darwin1.[012])

8557

- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'

8558

- ;;

8559

- *) # Darwin 1.3 on

8560

- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then

8561

- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'

8562

- else

8563

- case ${MACOSX_DEPLOYMENT_TARGET} in

8564

- 10.[012])

8565

- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'

8566

- ;;

8567

- 10.*)

8568

- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'

8569

- ;;

8570

- esac

8571

- fi

8572

- ;;

8573

- esac

8574

archive_cmds_need_lc_CXX=no

8575

hardcode_direct_CXX=no

8576

hardcode_automatic_CXX=yes

8577

hardcode_shlibpath_var_CXX=unsupported

8578

whole_archive_flag_spec_CXX=''

8579

link_all_deplibs_CXX=yes

8580

-

8581

- if test "$GXX" = yes ; then

8582

- lt_int_apple_cc_single_mod=no

8583

+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"

8584

+ if test "$GXX" = yes ; then

8585

output_verbose_link_cmd='echo'

8586

- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then

8587

- lt_int_apple_cc_single_mod=yes

8588

+ 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}"

8589

+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

8590

+ 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}"

8591

+ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"

8592

+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then

8593

+ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"

8594

+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"

8595

fi

8596

- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then

8597

- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'

8598

- else

8599

- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'

8600

- fi

8601

- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

8602

- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

8603

- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then

8604

- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

8605

- else

8606

- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

8607

- fi

8608

- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

8609

else

8610

case $cc_basename in

8611

xlc*)

8612

output_verbose_link_cmd='echo'

8613

- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'

8614

+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'

8615

module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

8616

# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

8617

- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

8618

+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

8619

module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

8620

;;

8621

*)

8622

@@ -10494,7 +11581,7 @@

8623

freebsd-elf*)

8624

archive_cmds_need_lc_CXX=no

8625

;;

8626

- freebsd* | kfreebsd*-gnu | dragonfly*)

8627

+ freebsd* | dragonfly*)

8628

# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF

8629

# conventions

8630

ld_shlibs_CXX=yes

8631

@@ -10543,9 +11630,7 @@

8632

hardcode_libdir_separator_CXX=:

8633

8634

case $host_cpu in

8635

- hppa*64*|ia64*)

8636

- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'

8637

- ;;

8638

+ hppa*64*|ia64*) ;;

8639

*)

8640

export_dynamic_flag_spec_CXX='${wl}-E'

8641

;;

8642

@@ -10613,7 +11698,7 @@

8643

;;

8644

esac

8645

;;

8646

- interix3*)

8647

+ interix[3-9]*)

8648

hardcode_direct_CXX=no

8649

hardcode_shlibpath_var_CXX=no

8650

hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'

8651

@@ -10653,7 +11738,7 @@

8652

hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'

8653

hardcode_libdir_separator_CXX=:

8654

;;

8655

- linux*)

8656

+ linux* | k*bsd*-gnu)

8657

case $cc_basename in

8658

KCC*)

8659

# Kuck and Associates, Inc. (KAI) C++ Compiler

8660

@@ -10705,7 +11790,7 @@

8661

export_dynamic_flag_spec_CXX='${wl}--export-dynamic'

8662

whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'

8663

;;

8664

- pgCC*)

8665

+ pgCC* | pgcpp*)

8666

# Portland Group C++ compiler

8667

archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

8668

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'

8669

@@ -10733,6 +11818,29 @@

8670

# dependencies.

8671

output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $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; echo $list'

8672

;;

8673

+ *)

8674

+ case `$CC -V 2>&1 | sed 5q` in

8675

+ *Sun\ C*)

8676

+ # Sun C++ 5.9

8677

+ no_undefined_flag_CXX=' -zdefs'

8678

+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

8679

+ 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'

8680

+ hardcode_libdir_flag_spec_CXX='-R$libdir'

8681

+ 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'

8682

+

8683

+ # Not sure whether something based on

8684

+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1

8685

+ # would be better.

8686

+ output_verbose_link_cmd='echo'

8687

+

8688

+ # Archives containing C++ object files must be created using

8689

+ # "CC -xar", where "CC" is the Sun C++ compiler. This is

8690

+ # necessary to make sure instantiated templates are included

8691

+ # in the archive.

8692

+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'

8693

+ ;;

8694

+ esac

8695

+ ;;

8696

esac

8697

;;

8698

lynxos*)

8699

@@ -10755,7 +11863,7 @@

8700

;;

8701

esac

8702

;;

8703

- netbsd*)

8704

+ netbsd* | netbsdelf*-gnu)

8705

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

8706

archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'

8707

wlarc=

8708

@@ -10771,16 +11879,20 @@

8709

ld_shlibs_CXX=no

8710

;;

8711

openbsd*)

8712

- hardcode_direct_CXX=yes

8713

- hardcode_shlibpath_var_CXX=no

8714

- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'

8715

- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'

8716

- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

8717

- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'

8718

- export_dynamic_flag_spec_CXX='${wl}-E'

8719

- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'

8720

+ if test -f /usr/libexec/ld.so; then

8721

+ hardcode_direct_CXX=yes

8722

+ hardcode_shlibpath_var_CXX=no

8723

+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'

8724

+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'

8725

+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

8726

+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'

8727

+ export_dynamic_flag_spec_CXX='${wl}-E'

8728

+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'

8729

+ fi

8730

+ output_verbose_link_cmd='echo'

8731

+ else

8732

+ ld_shlibs_CXX=no

8733

fi

8734

- output_verbose_link_cmd='echo'

8735

;;

8736

osf3*)

8737

case $cc_basename in

8738

@@ -10942,15 +12054,10 @@

8739

case $host_os in

8740

solaris2.[0-5] | solaris2.[0-5].*) ;;

8741

*)

8742

- # The C++ compiler is used as linker so we must use $wl

8743

- # flag to pass the commands to the underlying system

8744

- # linker. We must also pass each convience library through

8745

- # to the system linker between allextract/defaultextract.

8746

- # The C++ compiler will combine linker options so we

8747

- # cannot just pass the convience library names through

8748

- # without $wl.

8749

+ # The compiler driver will combine and reorder linker options,

8750

+ # but understands `-z linker_flag'.

8751

# Supported since Solaris 2.6 (maybe 2.5.1?)

8752

- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'

8753

+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'

8754

;;

8755

esac

8756

link_all_deplibs_CXX=yes

8757

@@ -10997,6 +12104,12 @@

8758

fi

8759

8760

hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'

8761

+ case $host_os in

8762

+ solaris2.[0-5] | solaris2.[0-5].*) ;;

8763

+ *)

8764

+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'

8765

+ ;;

8766

+ esac

8767

fi

8768

;;

8769

esac

8770

@@ -11077,8 +12190,8 @@

8771

ld_shlibs_CXX=no

8772

;;

8773

esac

8774

-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

8775

-echo "${ECHO_T}$ld_shlibs_CXX" >&6

8776

+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

8777

+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

8778

test "$ld_shlibs_CXX" = no && can_build_shared=no

8779

8780

GCC_CXX="$GXX"

8781

@@ -11088,7 +12201,6 @@

8782

## There is no encapsulation within the following macros, do not change

8783

## the running order or otherwise move them around unless you know exactly

8784

## what you are doing...

8785

-

8786

cat > conftest.$ac_ext <<EOF

8787

class Foo

8788

{

8789

@@ -11190,9 +12302,14 @@

8790

8791

$rm -f confest.$objext

8792

8793

+compiler_lib_search_dirs_CXX=

8794

+if test -n "$compiler_lib_search_path_CXX"; then

8795

+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`

8796

+fi

8797

+

8798

# PORTME: override above test on systems where it is broken

8799

case $host_os in

8800

-interix3*)

8801

+interix[3-9]*)

8802

# Interix 3.5 installs completely hosed .la files for C++, so rather than

8803

# hack all around it, let's just trust "g++" to DTRT.

8804

predep_objects_CXX=

8805

@@ -11200,19 +12317,51 @@

8806

postdeps_CXX=

8807

;;

8808

8809

+linux*)

8810

+ case `$CC -V 2>&1 | sed 5q` in

8811

+ *Sun\ C*)

8812

+ # Sun C++ 5.9

8813

+ #

8814

+ # The more standards-conforming stlport4 library is

8815

+ # incompatible with the Cstd library. Avoid specifying

8816

+ # it if it's in CXXFLAGS. Ignore libCrun as

8817

+ # -library=stlport4 depends on it.

8818

+ case " $CXX $CXXFLAGS " in

8819

+ *" -library=stlport4 "*)

8820

+ solaris_use_stlport4=yes

8821

+ ;;

8822

+ esac

8823

+ if test "$solaris_use_stlport4" != yes; then

8824

+ postdeps_CXX='-library=Cstd -library=Crun'

8825

+ fi

8826

+ ;;

8827

+ esac

8828

+ ;;

8829

+

8830

solaris*)

8831

case $cc_basename in

8832

CC*)

8833

+ # The more standards-conforming stlport4 library is

8834

+ # incompatible with the Cstd library. Avoid specifying

8835

+ # it if it's in CXXFLAGS. Ignore libCrun as

8836

+ # -library=stlport4 depends on it.

8837

+ case " $CXX $CXXFLAGS " in

8838

+ *" -library=stlport4 "*)

8839

+ solaris_use_stlport4=yes

8840

+ ;;

8841

+ esac

8842

+

8843

# Adding this requires a known-good setup of shared libraries for

8844

# Sun compiler versions before 5.6, else PIC objects from an old

8845

# archive will be linked into the output, leading to subtle bugs.

8846

- postdeps_CXX='-lCstd -lCrun'

8847

+ if test "$solaris_use_stlport4" != yes; then

8848

+ postdeps_CXX='-library=Cstd -library=Crun'

8849

+ fi

8850

;;

8851

esac

8852

;;

8853

esac

8854

8855

-

8856

case " $postdeps_CXX " in

8857

*" -lc "*) archive_cmds_need_lc_CXX=no ;;

8858

esac

8859

@@ -11221,8 +12370,8 @@

8860

lt_prog_compiler_pic_CXX=

8861

lt_prog_compiler_static_CXX=

8862

8863

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

8864

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

8865

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

8866

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

8867

8868

# C++ specific cases for pic, static, wl, etc.

8869

if test "$GXX" = yes; then

8870

@@ -11243,12 +12392,14 @@

8871

# like `-m68040'.

8872

lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'

8873

;;

8874

8875

+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

8876

# PIC is the default for these OSes.

8877

;;

8878

- mingw* | os2* | pw32*)

8879

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

8880

# This hack is so that the source file can tell whether it is being

8881

# built for inclusion in a dll (and should export symbols for example).

8882

+ # Although the cygwin gcc ignores -fPIC, still need this for old-style

8883

+ # (--disable-auto-import) libraries

8884

lt_prog_compiler_pic_CXX='-DDLL_EXPORT'

8885

;;

8886

darwin* | rhapsody*)

8887

@@ -11260,7 +12411,7 @@

8888

# DJGPP does not support shared libraries at all

8889

lt_prog_compiler_pic_CXX=

8890

;;

8891

- interix3*)

8892

+ interix[3-9]*)

8893

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

8894

# Instead, we relocate shared libraries at runtime.

8895

;;

8896

@@ -11286,7 +12437,7 @@

8897

esac

8898

else

8899

case $host_os in

8900

- aix4* | aix5*)

8901

+ aix[4-9]*)

8902

# All AIX code is PIC.

8903

if test "$host_cpu" = ia64; then

8904

# AIX 5 now supports IA64 processor

8905

@@ -11326,7 +12477,7 @@

8906

;;

8907

esac

8908

;;

8909

- freebsd* | kfreebsd*-gnu | dragonfly*)

8910

+ freebsd* | dragonfly*)

8911

# FreeBSD uses GNU C++

8912

;;

8913

hpux9* | hpux10* | hpux11*)

8914

@@ -11369,7 +12520,7 @@

8915

;;

8916

esac

8917

;;

8918

- linux*)

8919

+ linux* | k*bsd*-gnu)

8920

case $cc_basename in

8921

KCC*)

8922

# KAI C++ Compiler

8923

@@ -11382,7 +12533,7 @@

8924

lt_prog_compiler_pic_CXX='-KPIC'

8925

lt_prog_compiler_static_CXX='-static'

8926

;;

8927

- pgCC*)

8928

+ pgCC* | pgcpp*)

8929

# Portland Group C++ compiler.

8930

lt_prog_compiler_wl_CXX='-Wl,'

8931

lt_prog_compiler_pic_CXX='-fpic'

8932

@@ -11396,6 +12547,14 @@

8933

lt_prog_compiler_static_CXX='-non_shared'

8934

;;

8935

*)

8936

+ case `$CC -V 2>&1 | sed 5q` in

8937

+ *Sun\ C*)

8938

+ # Sun C++ 5.9

8939

+ lt_prog_compiler_pic_CXX='-KPIC'

8940

+ lt_prog_compiler_static_CXX='-Bstatic'

8941

+ lt_prog_compiler_wl_CXX='-Qoption ld '

8942

+ ;;

8943

+ esac

8944

;;

8945

esac

8946

;;

8947

@@ -11412,7 +12571,7 @@

8948

;;

8949

esac

8950

;;

8951

- netbsd*)

8952

+ netbsd* | netbsdelf*-gnu)

8953

;;

8954

osf3* | osf4* | osf5*)

8955

case $cc_basename in

8956

@@ -11495,22 +12654,22 @@

8957

esac

8958

fi

8959

8960

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5

8961

-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6

8962

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5

8963

+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }

8964

8965

#

8966

# Check to make sure the PIC flag actually works.

8967

#

8968

if test -n "$lt_prog_compiler_pic_CXX"; then

8969

8970

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

8971

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6

8972

-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then

8973

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

8974

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }

8975

+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then

8976

echo $ECHO_N "(cached) $ECHO_C" >&6

8977

else

8978

- lt_prog_compiler_pic_works_CXX=no

8979

+ lt_cv_prog_compiler_pic_works_CXX=no

8980

ac_outfile=conftest.$ac_objext

8981

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

8982

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

8983

lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"

8984

# Insert the option either (1) after the last *FLAGS variable, or

8985

# (2) before a word containing "conftest.", or (3) at the end.

8986

@@ -11521,27 +12680,27 @@

8987

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

8988

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

8989

-e 's:$: $lt_compiler_flag:'`

8990

- (eval echo "\"\$as_me:11524: $lt_compile\"" >&5)

8991

+ (eval echo "\"\$as_me:12683: $lt_compile\"" >&5)

8992

(eval "$lt_compile" 2>conftest.err)

8993

ac_status=$?

8994

cat conftest.err >&5

8995

- echo "$as_me:11528: \$? = $ac_status" >&5

8996

+ echo "$as_me:12687: \$? = $ac_status" >&5

8997

if (exit $ac_status) && test -s "$ac_outfile"; then

8998

# The compiler can only warn and ignore the option if not recognized

8999

# So say no if there are warnings other than the usual output.

9000

$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

9001

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

9002

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

9003

- lt_prog_compiler_pic_works_CXX=yes

9004

+ lt_cv_prog_compiler_pic_works_CXX=yes

9005

fi

9006

fi

9007

$rm conftest*

9008

9009

fi

9010

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5

9011

-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6

9012

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5

9013

+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }

9014

9015

-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then

9016

+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then

9017

case $lt_prog_compiler_pic_CXX in

9018

"" | " "*) ;;

9019

*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;

9020

@@ -11566,15 +12725,15 @@

9021

# Check to make sure the static flag actually works.

9022

#

9023

wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"

9024

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9025

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

9026

-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then

9027

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9028

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

9029

+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then

9030

echo $ECHO_N "(cached) $ECHO_C" >&6

9031

else

9032

- lt_prog_compiler_static_works_CXX=no

9033

+ lt_cv_prog_compiler_static_works_CXX=no

9034

save_LDFLAGS="$LDFLAGS"

9035

LDFLAGS="$LDFLAGS $lt_tmp_static_flag"

9036

- printf "$lt_simple_link_test_code" > conftest.$ac_ext

9037

+ echo "$lt_simple_link_test_code" > conftest.$ac_ext

9038

if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

9039

# The linker can only warn and ignore the option if not recognized

9040

# So say no if there are warnings

9041

@@ -11584,28 +12743,28 @@

9042

$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp

9043

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

9044

if diff conftest.exp conftest.er2 >/dev/null; then

9045

- lt_prog_compiler_static_works_CXX=yes

9046

+ lt_cv_prog_compiler_static_works_CXX=yes

9047

fi

9048

else

9049

- lt_prog_compiler_static_works_CXX=yes

9050

+ lt_cv_prog_compiler_static_works_CXX=yes

9051

fi

9052

fi

9053

- $rm conftest*

9054

+ $rm -r conftest*

9055

LDFLAGS="$save_LDFLAGS"

9056

9057

fi

9058

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5

9059

-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6

9060

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5

9061

+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }

9062

9063

-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then

9064

+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then

9065

:

9066

else

9067

lt_prog_compiler_static_CXX=

9068

fi

9069

9070

9071

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9072

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

9073

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9074

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

9075

if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then

9076

echo $ECHO_N "(cached) $ECHO_C" >&6

9077

else

9078

@@ -11614,7 +12773,7 @@

9079

mkdir conftest

9080

cd conftest

9081

mkdir out

9082

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

9083

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

9084

9085

lt_compiler_flag="-o out/conftest2.$ac_objext"

9086

# Insert the option either (1) after the last *FLAGS variable, or

9087

@@ -11625,11 +12784,11 @@

9088

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9089

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9090

-e 's:$: $lt_compiler_flag:'`

9091

- (eval echo "\"\$as_me:11628: $lt_compile\"" >&5)

9092

+ (eval echo "\"\$as_me:12787: $lt_compile\"" >&5)

9093

(eval "$lt_compile" 2>out/conftest.err)

9094

ac_status=$?

9095

cat out/conftest.err >&5

9096

- echo "$as_me:11632: \$? = $ac_status" >&5

9097

+ echo "$as_me:12791: \$? = $ac_status" >&5

9098

if (exit $ac_status) && test -s out/conftest2.$ac_objext

9099

then

9100

# The compiler can only warn and ignore the option if not recognized

9101

@@ -11651,23 +12810,23 @@

9102

$rm conftest*

9103

9104

fi

9105

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

9106

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6

9107

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

9108

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }

9109

9110

9111

hard_links="nottested"

9112

if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then

9113

# do not overwrite the value of need_locks provided by the user

9114

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9115

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

9116

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9117

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

9118

hard_links=yes

9119

$rm conftest*

9120

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9121

touch conftest.a

9122

ln conftest.a conftest.b 2>&5 || hard_links=no

9123

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9124

- echo "$as_me:$LINENO: result: $hard_links" >&5

9125

-echo "${ECHO_T}$hard_links" >&6

9126

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

9127

+echo "${ECHO_T}$hard_links" >&6; }

9128

if test "$hard_links" = no; then

9129

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

9130

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

9131

@@ -11677,12 +12836,12 @@

9132

need_locks=no

9133

fi

9134

9135

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9136

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

9137

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9138

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

9139

9140

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

9141

case $host_os in

9142

- aix4* | aix5*)

9143

+ aix[4-9]*)

9144

# If we're using GNU nm, then we don't want the "-C" option.

9145

# -C means demangle to AIX nm, but means don't demangle with GNU nm

9146

if $NM -V 2>&1 | grep 'GNU' > /dev/null; then

9147

@@ -11695,15 +12854,19 @@

9148

export_symbols_cmds_CXX="$ltdll_cmds"

9149

;;

9150

cygwin* | mingw*)

9151

- 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'

9152

+ 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'

9153

+ ;;

9154

+ linux* | k*bsd*-gnu)

9155

+ link_all_deplibs_CXX=no

9156

;;

9157

*)

9158

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

9159

;;

9160

esac

9161

+ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

9162

9163

-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

9164

-echo "${ECHO_T}$ld_shlibs_CXX" >&6

9165

+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

9166

+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

9167

test "$ld_shlibs_CXX" = no && can_build_shared=no

9168

9169

#

9170

@@ -11723,10 +12886,10 @@

9171

# Test whether the compiler implicitly links with -lc since on some

9172

# systems, -lgcc has to come before -lc. If gcc already passes -lc

9173

# to ld, don't add -lc before -lgcc.

9174

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

9175

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

9176

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

9177

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

9178

$rm conftest*

9179

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

9180

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

9181

9182

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

9183

(eval $ac_compile) 2>&5

9184

@@ -11761,16 +12924,16 @@

9185

cat conftest.err 1>&5

9186

fi

9187

$rm conftest*

9188

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5

9189

-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6

9190

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5

9191

+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }

9192

;;

9193

esac

9194

fi

9195

;;

9196

esac

9197

9198

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

9199

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

9200

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

9201

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

9202

library_names_spec=

9203

libname_spec='lib$name'

9204

soname_spec=

9205

@@ -11784,20 +12947,7 @@

9206

version_type=none

9207

dynamic_linker="$host_os ld.so"

9208

sys_lib_dlsearch_path_spec="/lib /usr/lib"

9209

-if test "$GCC" = yes; then

9210

- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

9211

- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

9212

- # if the path contains ";" then we assume it to be the separator

9213

- # otherwise default to the standard path separator (i.e. ":") - it is

9214

- # assumed that no part of a normal pathname contains ";" but that should

9215

- # okay in the real world where ";" in dirpaths is itself problematic.

9216

- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

9217

- else

9218

- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

9219

- fi

9220

-else

9221

- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

9222

-fi

9223

+

9224

need_lib_prefix=unknown

9225

hardcode_into_libs=no

9226

9227

@@ -11815,7 +12965,7 @@

9228

soname_spec='${libname}${release}${shared_ext}$major'

9229

;;

9230

9231

-aix4* | aix5*)

9232

+aix[4-9]*)

9233

version_type=linux

9234

need_lib_prefix=no

9235

need_version=no

9236

@@ -11954,12 +13104,7 @@

9237

shlibpath_overrides_runpath=yes

9238

shlibpath_var=DYLD_LIBRARY_PATH

9239

shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'

9240

- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.

9241

- if test "$GCC" = yes; then

9242

- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`

9243

- else

9244

- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'

9245

- fi

9246

+

9247

sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'

9248

;;

9249

9250

@@ -11976,18 +13121,6 @@

9251

dynamic_linker=no

9252

;;

9253

9254

-kfreebsd*-gnu)

9255

- version_type=linux

9256

- need_lib_prefix=no

9257

- need_version=no

9258

- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

9259

- soname_spec='${libname}${release}${shared_ext}$major'

9260

- shlibpath_var=LD_LIBRARY_PATH

9261

- shlibpath_overrides_runpath=no

9262

- hardcode_into_libs=yes

9263

- dynamic_linker='GNU ld.so'

9264

- ;;

9265

-

9266

freebsd* | dragonfly*)

9267

# DragonFly does not have aout. When/if they implement a new

9268

# versioning mechanism, adjust this.

9269

@@ -12025,7 +13158,7 @@

9270

shlibpath_overrides_runpath=no

9271

hardcode_into_libs=yes

9272

;;

9273

- freebsd*) # from 4.6 on

9274

+ *) # from 4.6 on, and DragonFly

9275

shlibpath_overrides_runpath=yes

9276

hardcode_into_libs=yes

9277

;;

9278

@@ -12088,7 +13221,7 @@

9279

postinstall_cmds='chmod 555 $lib'

9280

;;

9281

9282

-interix3*)

9283

+interix[3-9]*)

9284

version_type=linux

9285

need_lib_prefix=no

9286

need_version=no

9287

@@ -12143,7 +13276,7 @@

9288

;;

9289

9290

# This must be Linux ELF.

9291

-linux*)

9292

+linux* | k*bsd*-gnu)

9293

version_type=linux

9294

need_lib_prefix=no

9295

need_version=no

9296

@@ -12159,7 +13292,7 @@

9297

9298

# Append ld.so.conf contents to the search path

9299

if test -f /etc/ld.so.conf; then

9300

- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

9301

+ 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' ' '`

9302

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

9303

fi

9304

9305

@@ -12172,7 +13305,7 @@

9306

dynamic_linker='GNU/Linux ld.so'

9307

;;

9308

9309

-knetbsd*-gnu)

9310

+netbsdelf*-gnu)

9311

version_type=linux

9312

need_lib_prefix=no

9313

need_version=no

9314

@@ -12181,7 +13314,7 @@

9315

shlibpath_var=LD_LIBRARY_PATH

9316

shlibpath_overrides_runpath=no

9317

hardcode_into_libs=yes

9318

- dynamic_linker='GNU ld.so'

9319

+ dynamic_linker='NetBSD ld.elf_so'

9320

;;

9321

9322

netbsd*)

9323

@@ -12265,6 +13398,10 @@

9324

sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"

9325

;;

9326

9327

+rdos*)

9328

+ dynamic_linker=no

9329

+ ;;

9330

+

9331

solaris*)

9332

version_type=linux

9333

need_lib_prefix=no

9334

@@ -12357,17 +13494,32 @@

9335

dynamic_linker=no

9336

;;

9337

esac

9338

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

9339

-echo "${ECHO_T}$dynamic_linker" >&6

9340

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

9341

+echo "${ECHO_T}$dynamic_linker" >&6; }

9342

test "$dynamic_linker" = no && can_build_shared=no

9343

9344

+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then

9345

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9346

+else

9347

+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"

9348

+fi

9349

+

9350

+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

9351

+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then

9352

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9353

+else

9354

+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"

9355

+fi

9356

+

9357

+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"

9358

+

9359

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

9360

if test "$GCC" = yes; then

9361

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

9362

fi

9363

9364

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

9365

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

9366

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

9367

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

9368

hardcode_action_CXX=

9369

if test -n "$hardcode_libdir_flag_spec_CXX" || \

9370

test -n "$runpath_var_CXX" || \

9371

@@ -12391,8 +13543,8 @@

9372

# directories.

9373

hardcode_action_CXX=unsupported

9374

fi

9375

-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5

9376

-echo "${ECHO_T}$hardcode_action_CXX" >&6

9377

+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5

9378

+echo "${ECHO_T}$hardcode_action_CXX" >&6; }

9379

9380

if test "$hardcode_action_CXX" = relink; then

9381

# Fast installation is not supported

9382

@@ -12444,6 +13596,7 @@

9383

predeps_CXX \

9384

postdeps_CXX \

9385

compiler_lib_search_path_CXX \

9386

+ compiler_lib_search_dirs_CXX \

9387

archive_cmds_CXX \

9388

archive_expsym_cmds_CXX \

9389

postinstall_cmds_CXX \

9390

@@ -12459,6 +13612,7 @@

9391

module_cmds_CXX \

9392

module_expsym_cmds_CXX \

9393

lt_cv_prog_compiler_c_o_CXX \

9394

+ fix_srcfile_path_CXX \

9395

exclude_expsyms_CXX \

9396

include_expsyms_CXX; do

9397

9398

@@ -12691,6 +13845,10 @@

9399

# shared library.

9400

postdeps=$lt_postdeps_CXX

9401

9402

+# The directories searched by this compiler when creating a shared

9403

+# library

9404

+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX

9405

+

9406

# The library search path used internally by the compiler when linking

9407

# a shared library.

9408

compiler_lib_search_path=$lt_compiler_lib_search_path_CXX

9409

@@ -12779,7 +13937,7 @@

9410

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

9411

9412

# Fix the shell variable \$srcfile for the compiler.

9413

-fix_srcfile_path="$fix_srcfile_path_CXX"

9414

+fix_srcfile_path=$lt_fix_srcfile_path

9415

9416

# Set to yes if exported symbols are required.

9417

always_export_symbols=$always_export_symbols_CXX

9418

@@ -12870,10 +14028,17 @@

9419

objext_F77=$objext

9420

9421

# Code to be used in simple compile tests

9422

-lt_simple_compile_test_code=" subroutine t\n return\n end\n"

9423

+lt_simple_compile_test_code="\

9424

+ subroutine t

9425

+ return

9426

+ end

9427

+"

9428

9429

# Code to be used in simple link tests

9430

-lt_simple_link_test_code=" program t\n end\n"

9431

+lt_simple_link_test_code="\

9432

+ program t

9433

+ end

9434

+"

9435

9436

# ltmain only uses $CC for tagged configurations so make sure $CC is set.

9437

9438

@@ -12889,16 +14054,16 @@

9439

9440

# save warnings/boilerplate of simple test code

9441

ac_outfile=conftest.$ac_objext

9442

-printf "$lt_simple_compile_test_code" >conftest.$ac_ext

9443

+echo "$lt_simple_compile_test_code" >conftest.$ac_ext

9444

eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

9445

_lt_compiler_boilerplate=`cat conftest.err`

9446

$rm conftest*

9447

9448

ac_outfile=conftest.$ac_objext

9449

-printf "$lt_simple_link_test_code" >conftest.$ac_ext

9450

+echo "$lt_simple_link_test_code" >conftest.$ac_ext

9451

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

9452

_lt_linker_boilerplate=`cat conftest.err`

9453

-$rm conftest*

9454

+$rm -r conftest*

9455

9456

9457

# Allow CC to be a program name with arguments.

9458

@@ -12917,13 +14082,13 @@

9459

cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

9460

9461

9462

-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

9463

-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6

9464

-echo "$as_me:$LINENO: result: $can_build_shared" >&5

9465

-echo "${ECHO_T}$can_build_shared" >&6

9466

+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

9467

+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }

9468

+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5

9469

+echo "${ECHO_T}$can_build_shared" >&6; }

9470

9471

-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

9472

-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6

9473

+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

9474

+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }

9475

test "$can_build_shared" = "no" && enable_shared=no

9476

9477

# On AIX, shared libraries and static libraries use the same namespace, and

9478

@@ -12936,21 +14101,21 @@

9479

postinstall_cmds='$RANLIB $lib'

9480

fi

9481

;;

9482

-aix4* | aix5*)

9483

+aix[4-9]*)

9484

if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then

9485

test "$enable_shared" = yes && enable_static=no

9486

fi

9487

;;

9488

esac

9489

-echo "$as_me:$LINENO: result: $enable_shared" >&5

9490

-echo "${ECHO_T}$enable_shared" >&6

9491

+{ echo "$as_me:$LINENO: result: $enable_shared" >&5

9492

+echo "${ECHO_T}$enable_shared" >&6; }

9493

9494

-echo "$as_me:$LINENO: checking whether to build static libraries" >&5

9495

-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6

9496

+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5

9497

+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }

9498

# Make sure either enable_shared or enable_static is yes.

9499

test "$enable_shared" = yes || enable_static=yes

9500

-echo "$as_me:$LINENO: result: $enable_static" >&5

9501

-echo "${ECHO_T}$enable_static" >&6

9502

+{ echo "$as_me:$LINENO: result: $enable_static" >&5

9503

+echo "${ECHO_T}$enable_static" >&6; }

9504

9505

GCC_F77="$G77"

9506

LD_F77="$LD"

9507

@@ -12959,8 +14124,8 @@

9508

lt_prog_compiler_pic_F77=

9509

lt_prog_compiler_static_F77=

9510

9511

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

9512

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

9513

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

9514

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

9515

9516

if test "$GCC" = yes; then

9517

lt_prog_compiler_wl_F77='-Wl,'

9518

@@ -12982,13 +14147,15 @@

9519

lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'

9520

;;

9521

9522

9523

+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

9524

# PIC is the default for these OSes.

9525

;;

9526

9527

- mingw* | pw32* | os2*)

9528

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

9529

# This hack is so that the source file can tell whether it is being

9530

# built for inclusion in a dll (and should export symbols for example).

9531

+ # Although the cygwin gcc ignores -fPIC, still need this for old-style

9532

+ # (--disable-auto-import) libraries

9533

lt_prog_compiler_pic_F77='-DDLL_EXPORT'

9534

;;

9535

9536

@@ -12998,7 +14165,7 @@

9537

lt_prog_compiler_pic_F77='-fno-common'

9538

;;

9539

9540

- interix3*)

9541

+ interix[3-9]*)

9542

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

9543

# Instead, we relocate shared libraries at runtime.

9544

;;

9545

@@ -13056,7 +14223,7 @@

9546

esac

9547

;;

9548

9549

- mingw* | pw32* | os2*)

9550

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

9551

# This hack is so that the source file can tell whether it is being

9552

# built for inclusion in a dll (and should export symbols for example).

9553

lt_prog_compiler_pic_F77='-DDLL_EXPORT'

9554

@@ -13089,7 +14256,7 @@

9555

lt_prog_compiler_static_F77='-Bstatic'

9556

;;

9557

9558

- linux*)

9559

+ linux* | k*bsd*-gnu)

9560

case $cc_basename in

9561

icc* | ecc*)

9562

lt_prog_compiler_wl_F77='-Wl,'

9563

@@ -13108,6 +14275,22 @@

9564

# All Alpha code is PIC.

9565

lt_prog_compiler_static_F77='-non_shared'

9566

;;

9567

+ *)

9568

+ case `$CC -V 2>&1 | sed 5q` in

9569

+ *Sun\ C*)

9570

+ # Sun C 5.9

9571

+ lt_prog_compiler_pic_F77='-KPIC'

9572

+ lt_prog_compiler_static_F77='-Bstatic'

9573

+ lt_prog_compiler_wl_F77='-Wl,'

9574

+ ;;

9575

+ *Sun\ F*)

9576

+ # Sun Fortran 8.3 passes all unrecognized flags to the linker

9577

+ lt_prog_compiler_pic_F77='-KPIC'

9578

+ lt_prog_compiler_static_F77='-Bstatic'

9579

+ lt_prog_compiler_wl_F77=''

9580

+ ;;

9581

+ esac

9582

+ ;;

9583

esac

9584

;;

9585

9586

@@ -13117,6 +14300,10 @@

9587

lt_prog_compiler_static_F77='-non_shared'

9588

;;

9589

9590

+ rdos*)

9591

+ lt_prog_compiler_static_F77='-non_shared'

9592

+ ;;

9593

+

9594

solaris*)

9595

lt_prog_compiler_pic_F77='-KPIC'

9596

lt_prog_compiler_static_F77='-Bstatic'

9597

@@ -13169,22 +14356,22 @@

9598

esac

9599

fi

9600

9601

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5

9602

-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6

9603

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5

9604

+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }

9605

9606

#

9607

# Check to make sure the PIC flag actually works.

9608

#

9609

if test -n "$lt_prog_compiler_pic_F77"; then

9610

9611

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5

9612

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6

9613

-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then

9614

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5

9615

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }

9616

+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then

9617

echo $ECHO_N "(cached) $ECHO_C" >&6

9618

else

9619

- lt_prog_compiler_pic_works_F77=no

9620

+ lt_cv_prog_compiler_pic_works_F77=no

9621

ac_outfile=conftest.$ac_objext

9622

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

9623

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

9624

lt_compiler_flag="$lt_prog_compiler_pic_F77"

9625

# Insert the option either (1) after the last *FLAGS variable, or

9626

# (2) before a word containing "conftest.", or (3) at the end.

9627

@@ -13195,27 +14382,27 @@

9628

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9629

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9630

-e 's:$: $lt_compiler_flag:'`

9631

- (eval echo "\"\$as_me:13198: $lt_compile\"" >&5)

9632

+ (eval echo "\"\$as_me:14385: $lt_compile\"" >&5)

9633

(eval "$lt_compile" 2>conftest.err)

9634

ac_status=$?

9635

cat conftest.err >&5

9636

- echo "$as_me:13202: \$? = $ac_status" >&5

9637

+ echo "$as_me:14389: \$? = $ac_status" >&5

9638

if (exit $ac_status) && test -s "$ac_outfile"; then

9639

# The compiler can only warn and ignore the option if not recognized

9640

# So say no if there are warnings other than the usual output.

9641

$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

9642

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

9643

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

9644

- lt_prog_compiler_pic_works_F77=yes

9645

+ lt_cv_prog_compiler_pic_works_F77=yes

9646

fi

9647

fi

9648

$rm conftest*

9649

9650

fi

9651

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5

9652

-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6

9653

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5

9654

+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }

9655

9656

-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then

9657

+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then

9658

case $lt_prog_compiler_pic_F77 in

9659

"" | " "*) ;;

9660

*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;

9661

@@ -13240,15 +14427,15 @@

9662

# Check to make sure the static flag actually works.

9663

#

9664

wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"

9665

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9666

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

9667

-if test "${lt_prog_compiler_static_works_F77+set}" = set; then

9668

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9669

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

9670

+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then

9671

echo $ECHO_N "(cached) $ECHO_C" >&6

9672

else

9673

- lt_prog_compiler_static_works_F77=no

9674

+ lt_cv_prog_compiler_static_works_F77=no

9675

save_LDFLAGS="$LDFLAGS"

9676

LDFLAGS="$LDFLAGS $lt_tmp_static_flag"

9677

- printf "$lt_simple_link_test_code" > conftest.$ac_ext

9678

+ echo "$lt_simple_link_test_code" > conftest.$ac_ext

9679

if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

9680

# The linker can only warn and ignore the option if not recognized

9681

# So say no if there are warnings

9682

@@ -13258,28 +14445,28 @@

9683

$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp

9684

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

9685

if diff conftest.exp conftest.er2 >/dev/null; then

9686

- lt_prog_compiler_static_works_F77=yes

9687

+ lt_cv_prog_compiler_static_works_F77=yes

9688

fi

9689

else

9690

- lt_prog_compiler_static_works_F77=yes

9691

+ lt_cv_prog_compiler_static_works_F77=yes

9692

fi

9693

fi

9694

- $rm conftest*

9695

+ $rm -r conftest*

9696

LDFLAGS="$save_LDFLAGS"

9697

9698

fi

9699

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5

9700

-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6

9701

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5

9702

+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }

9703

9704

-if test x"$lt_prog_compiler_static_works_F77" = xyes; then

9705

+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then

9706

:

9707

else

9708

lt_prog_compiler_static_F77=

9709

fi

9710

9711

9712

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9713

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

9714

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9715

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

9716

if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then

9717

echo $ECHO_N "(cached) $ECHO_C" >&6

9718

else

9719

@@ -13288,7 +14475,7 @@

9720

mkdir conftest

9721

cd conftest

9722

mkdir out

9723

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

9724

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

9725

9726

lt_compiler_flag="-o out/conftest2.$ac_objext"

9727

# Insert the option either (1) after the last *FLAGS variable, or

9728

@@ -13299,11 +14486,11 @@

9729

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9730

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9731

-e 's:$: $lt_compiler_flag:'`

9732

- (eval echo "\"\$as_me:13302: $lt_compile\"" >&5)

9733

+ (eval echo "\"\$as_me:14489: $lt_compile\"" >&5)

9734

(eval "$lt_compile" 2>out/conftest.err)

9735

ac_status=$?

9736

cat out/conftest.err >&5

9737

- echo "$as_me:13306: \$? = $ac_status" >&5

9738

+ echo "$as_me:14493: \$? = $ac_status" >&5

9739

if (exit $ac_status) && test -s out/conftest2.$ac_objext

9740

then

9741

# The compiler can only warn and ignore the option if not recognized

9742

@@ -13325,23 +14512,23 @@

9743

$rm conftest*

9744

9745

fi

9746

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5

9747

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6

9748

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5

9749

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }

9750

9751

9752

hard_links="nottested"

9753

if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then

9754

# do not overwrite the value of need_locks provided by the user

9755

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9756

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

9757

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9758

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

9759

hard_links=yes

9760

$rm conftest*

9761

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9762

touch conftest.a

9763

ln conftest.a conftest.b 2>&5 || hard_links=no

9764

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9765

- echo "$as_me:$LINENO: result: $hard_links" >&5

9766

-echo "${ECHO_T}$hard_links" >&6

9767

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

9768

+echo "${ECHO_T}$hard_links" >&6; }

9769

if test "$hard_links" = no; then

9770

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

9771

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

9772

@@ -13351,8 +14538,8 @@

9773

need_locks=no

9774

fi

9775

9776

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9777

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

9778

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9779

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

9780

9781

runpath_var=

9782

allow_undefined_flag_F77=

9783

@@ -13383,12 +14570,13 @@

9784

# it will be wrapped by ` (' and `)$', so one must not match beginning or

9785

# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',

9786

# as well as any symbol that contains `d'.

9787

- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"

9788

+ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

9789

# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out

9790

# platforms (ab)use it in PIC code, but their linkers get confused if

9791

# the symbol is explicitly referenced. Since portable code cannot

9792

# rely on this symbol name, it's probably fine to never include it in

9793

# preloaded symbol tables.

9794

+ # Exclude shared library initialization/finalization symbols.

9795

extract_expsyms_cmds=

9796

# Just being paranoid about ensuring that cc_basename is set.

9797

for cc_temp in $compiler""; do

9798

@@ -13447,7 +14635,7 @@

9799

9800

# See if GNU ld supports shared libraries.

9801

case $host_os in

9802

- aix3* | aix4* | aix5*)

9803

+ aix[3-9]*)

9804

# On AIX/PPC, the GNU linker is very broken

9805

if test "$host_cpu" != ia64; then

9806

ld_shlibs_F77=no

9807

@@ -13495,7 +14683,7 @@

9808

allow_undefined_flag_F77=unsupported

9809

always_export_symbols_F77=no

9810

enable_shared_with_static_runtimes_F77=yes

9811

9812

+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'

9813

9814

if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then

9815

archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

9816

@@ -13513,7 +14701,7 @@

9817

fi

9818

;;

9819

9820

- interix3*)

9821

+ interix[3-9]*)

9822

hardcode_direct_F77=no

9823

hardcode_shlibpath_var_F77=no

9824

hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'

9825

@@ -13528,7 +14716,7 @@

9826

archive_expsym_cmds_F77='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'

9827

;;

9828

9829

- linux*)

9830

+ gnu* | linux* | k*bsd*-gnu)

9831

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

9832

tmp_addflag=

9833

case $cc_basename,$host_cpu in

9834

@@ -13546,20 +14734,30 @@

9835

ifc* | ifort*) # Intel Fortran compiler

9836

tmp_addflag=' -nofor_main' ;;

9837

esac

9838

- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

9839

+ case `$CC -V 2>&1 | sed 5q` in

9840

+ *Sun\ C*) # Sun C 5.9

9841

+ whole_archive_flag_spec_F77='${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'

9842

+ tmp_sharedflag='-G' ;;

9843

+ *Sun\ F*) # Sun Fortran 8.3

9844

+ tmp_sharedflag='-G' ;;

9845

+ *)

9846

+ tmp_sharedflag='-shared' ;;

9847

+ esac

9848

+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

9849

9850

if test $supports_anon_versioning = yes; then

9851

archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~

9852

cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~

9853

$echo "local: *; };" >> $output_objdir/$libname.ver~

9854

- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

9855

+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

9856

fi

9857

+ link_all_deplibs_F77=no

9858

else

9859

ld_shlibs_F77=no

9860

fi

9861

;;

9862

9863

- netbsd*)

9864

+ netbsd* | netbsdelf*-gnu)

9865

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

9866

archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

9867

wlarc=

9868

@@ -13657,7 +14855,7 @@

9869

fi

9870

;;

9871

9872

- aix4* | aix5*)

9873

+ aix[4-9]*)

9874

if test "$host_cpu" = ia64; then

9875

# On IA64, the linker does run time linking by default, so we don't

9876

# have to do anything special.

9877

@@ -13677,7 +14875,7 @@

9878

# Test if we are trying to use run time linking or normal

9879

# AIX style linking. If -brtl is somewhere in LDFLAGS, we

9880

# need to do runtime linking.

9881

- case $host_os in aix4.[23]|aix4.[23].*|aix5*)

9882

+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)

9883

for ld_flag in $LDFLAGS; do

9884

if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then

9885

aix_use_runtimelinking=yes

9886

@@ -13711,7 +14909,7 @@

9887

strings "$collect2name" | grep resolve_lib_name >/dev/null

9888

then

9889

# We have reworked collect2

9890

- hardcode_direct_F77=yes

9891

+ :

9892

else

9893

# We have old collect2

9894

hardcode_direct_F77=unsupported

9895

@@ -13757,39 +14955,44 @@

9896

end

9897

_ACEOF

9898

rm -f conftest.$ac_objext conftest$ac_exeext

9899

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

9900

- (eval $ac_link) 2>conftest.er1

9901

+if { (ac_try="$ac_link"

9902

+case "(($ac_try" in

9903

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9904

+ *) ac_try_echo=$ac_try;;

9905

+esac

9906

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9907

+ (eval "$ac_link") 2>conftest.er1

9908

ac_status=$?

9909

grep -v '^ *+' conftest.er1 >conftest.err

9910

rm -f conftest.er1

9911

cat conftest.err >&5

9912

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9913

- (exit $ac_status); } &&

9914

- { ac_try='test -z "$ac_f77_werror_flag"

9915

- || test ! -s conftest.err'

9916

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9917

- (eval $ac_try) 2>&5

9918

- ac_status=$?

9919

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9920

- (exit $ac_status); }; } &&

9921

- { ac_try='test -s conftest$ac_exeext'

9922

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9923

- (eval $ac_try) 2>&5

9924

- ac_status=$?

9925

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9926

- (exit $ac_status); }; }; then

9927

+ (exit $ac_status); } && {

9928

+ test -z "$ac_f77_werror_flag" ||

9929

+ test ! -s conftest.err

9930

+ } && test -s conftest$ac_exeext &&

9931

+ $as_test_x conftest$ac_exeext; then

9932

9933

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

9934

-}'`

9935

+lt_aix_libpath_sed='

9936

+ /Import File Strings/,/^$/ {

9937

+ /^0/ {

9938

+ s/^0 *$.*$$/\1/

9939

+ p

9940

+ }

9941

+ }'

9942

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

9943

# Check for a 64-bit object if we didn't find anything.

9944

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

9945

-}'`; fi

9946

+if test -z "$aix_libpath"; then

9947

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

9948

+fi

9949

else

9950

echo "$as_me: failed program was:" >&5

9951

sed 's/^/| /' conftest.$ac_ext >&5

9952

9953

+

9954

fi

9955

-rm -f conftest.err conftest.$ac_objext \

9956

+

9957

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9958

conftest$ac_exeext conftest.$ac_ext

9959

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

9960

9961

@@ -13808,39 +15011,44 @@

9962

end

9963

_ACEOF

9964

rm -f conftest.$ac_objext conftest$ac_exeext

9965

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

9966

- (eval $ac_link) 2>conftest.er1

9967

+if { (ac_try="$ac_link"

9968

+case "(($ac_try" in

9969

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9970

+ *) ac_try_echo=$ac_try;;

9971

+esac

9972

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9973

+ (eval "$ac_link") 2>conftest.er1

9974

ac_status=$?

9975

grep -v '^ *+' conftest.er1 >conftest.err

9976

rm -f conftest.er1

9977

cat conftest.err >&5

9978

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9979

- (exit $ac_status); } &&

9980

- { ac_try='test -z "$ac_f77_werror_flag"

9981

- || test ! -s conftest.err'

9982

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9983

- (eval $ac_try) 2>&5

9984

- ac_status=$?

9985

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9986

- (exit $ac_status); }; } &&

9987

- { ac_try='test -s conftest$ac_exeext'

9988

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9989

- (eval $ac_try) 2>&5

9990

- ac_status=$?

9991

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9992

- (exit $ac_status); }; }; then

9993

+ (exit $ac_status); } && {

9994

+ test -z "$ac_f77_werror_flag" ||

9995

+ test ! -s conftest.err

9996

+ } && test -s conftest$ac_exeext &&

9997

+ $as_test_x conftest$ac_exeext; then

9998

9999

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

10000

-}'`

10001

+lt_aix_libpath_sed='

10002

+ /Import File Strings/,/^$/ {

10003

+ /^0/ {

10004

+ s/^0 *$.*$$/\1/

10005

+ p

10006

+ }

10007

+ }'

10008

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

10009

# Check for a 64-bit object if we didn't find anything.

10010

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

10011

-}'`; fi

10012

+if test -z "$aix_libpath"; then

10013

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

10014

+fi

10015

else

10016

echo "$as_me: failed program was:" >&5

10017

sed 's/^/| /' conftest.$ac_ext >&5

10018

10019

+

10020

fi

10021

-rm -f conftest.err conftest.$ac_objext \

10022

+

10023

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10024

conftest$ac_exeext conftest.$ac_ext

10025

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

10026

10027

@@ -13886,7 +15094,7 @@

10028

# The linker will automatically build a .lib file if we build a DLL.

10029

old_archive_From_new_cmds_F77='true'

10030

# FIXME: Should let the user specify the lib program.

10031

- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'

10032

+ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'

10033

fix_srcfile_path_F77='`cygpath -w "$srcfile"`'

10034

enable_shared_with_static_runtimes_F77=yes

10035

;;

10036

@@ -13919,19 +15127,18 @@

10037

link_all_deplibs_F77=yes

10038

if test "$GCC" = yes ; then

10039

output_verbose_link_cmd='echo'

10040

- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'

10041

- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

10042

- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

10043

- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

10044

- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

10045

+ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"

10046

+ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

10047

+ archive_expsym_cmds_F77="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}"

10048

+ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"

10049

else

10050

case $cc_basename in

10051

xlc*)

10052

output_verbose_link_cmd='echo'

10053

- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'

10054

+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'

10055

module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

10056

# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

10057

- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

10058

+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

10059

module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

10060

;;

10061

*)

10062

@@ -13971,7 +15178,7 @@

10063

;;

10064

10065

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

10066

- freebsd* | kfreebsd*-gnu | dragonfly*)

10067

+ freebsd* | dragonfly*)

10068

archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

10069

hardcode_libdir_flag_spec_F77='-R$libdir'

10070

hardcode_direct_F77=yes

10071

@@ -14073,7 +15280,7 @@

10072

link_all_deplibs_F77=yes

10073

;;

10074

10075

- netbsd*)

10076

+ netbsd* | netbsdelf*-gnu)

10077

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

10078

archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

10079

else

10080

@@ -14093,24 +15300,28 @@

10081

;;

10082

10083

openbsd*)

10084

- hardcode_direct_F77=yes

10085

- hardcode_shlibpath_var_F77=no

10086

- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

10087

- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

10088

- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'

10089

- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'

10090

- export_dynamic_flag_spec_F77='${wl}-E'

10091

+ if test -f /usr/libexec/ld.so; then

10092

+ hardcode_direct_F77=yes

10093

+ hardcode_shlibpath_var_F77=no

10094

+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

10095

+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

10096

+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'

10097

+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'

10098

+ export_dynamic_flag_spec_F77='${wl}-E'

10099

+ else

10100

+ case $host_os in

10101

+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)

10102

+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'

10103

+ hardcode_libdir_flag_spec_F77='-R$libdir'

10104

+ ;;

10105

+ *)

10106

+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

10107

+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'

10108

+ ;;

10109

+ esac

10110

+ fi

10111

else

10112

- case $host_os in

10113

- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)

10114

- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'

10115

- hardcode_libdir_flag_spec_F77='-R$libdir'

10116

- ;;

10117

- *)

10118

- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

10119

- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'

10120

- ;;

10121

- esac

10122

+ ld_shlibs_F77=no

10123

fi

10124

;;

10125

10126

@@ -14169,17 +15380,16 @@

10127

case $host_os in

10128

solaris2.[0-5] | solaris2.[0-5].*) ;;

10129

*)

10130

- # The compiler driver will combine linker options so we

10131

- # cannot just pass the convience library names through

10132

- # without $wl, iff we do not link with $LD.

10133

- # Luckily, gcc supports the same syntax we need for Sun Studio.

10134

+ # The compiler driver will combine and reorder linker options,

10135

+ # but understands `-z linker_flag'. GCC discards it without `$wl',

10136

+ # but is careful enough not to reorder.

10137

# Supported since Solaris 2.6 (maybe 2.5.1?)

10138

- case $wlarc in

10139

- '')

10140

- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;

10141

- *)

10142

- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;

10143

- esac ;;

10144

+ if test "$GCC" = yes; then

10145

+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'

10146

+ else

10147

+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'

10148

+ fi

10149

+ ;;

10150

esac

10151

link_all_deplibs_F77=yes

10152

;;

10153

@@ -14236,7 +15446,7 @@

10154

fi

10155

;;

10156

10157

- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)

10158

+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)

10159

no_undefined_flag_F77='${wl}-z,text'

10160

archive_cmds_need_lc_F77=no

10161

hardcode_shlibpath_var_F77=no

10162

@@ -14289,8 +15499,8 @@

10163

esac

10164

fi

10165

10166

-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5

10167

-echo "${ECHO_T}$ld_shlibs_F77" >&6

10168

+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5

10169

+echo "${ECHO_T}$ld_shlibs_F77" >&6; }

10170

test "$ld_shlibs_F77" = no && can_build_shared=no

10171

10172

#

10173

@@ -14310,10 +15520,10 @@

10174

# Test whether the compiler implicitly links with -lc since on some

10175

# systems, -lgcc has to come before -lc. If gcc already passes -lc

10176

# to ld, don't add -lc before -lgcc.

10177

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

10178

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

10179

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

10180

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

10181

$rm conftest*

10182

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

10183

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

10184

10185

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

10186

(eval $ac_compile) 2>&5

10187

@@ -14348,16 +15558,16 @@

10188

cat conftest.err 1>&5

10189

fi

10190

$rm conftest*

10191

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5

10192

-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6

10193

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5

10194

+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }

10195

;;

10196

esac

10197

fi

10198

;;

10199

esac

10200

10201

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

10202

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

10203

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

10204

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

10205

library_names_spec=

10206

libname_spec='lib$name'

10207

soname_spec=

10208

@@ -14371,20 +15581,7 @@

10209

version_type=none

10210

dynamic_linker="$host_os ld.so"

10211

sys_lib_dlsearch_path_spec="/lib /usr/lib"

10212

-if test "$GCC" = yes; then

10213

- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

10214

- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

10215

- # if the path contains ";" then we assume it to be the separator

10216

- # otherwise default to the standard path separator (i.e. ":") - it is

10217

- # assumed that no part of a normal pathname contains ";" but that should

10218

- # okay in the real world where ";" in dirpaths is itself problematic.

10219

- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

10220

- else

10221

- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

10222

- fi

10223

-else

10224

- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

10225

-fi

10226

+

10227

need_lib_prefix=unknown

10228

hardcode_into_libs=no

10229

10230

@@ -14402,7 +15599,7 @@

10231

soname_spec='${libname}${release}${shared_ext}$major'

10232

;;

10233

10234

-aix4* | aix5*)

10235

+aix[4-9]*)

10236

version_type=linux

10237

need_lib_prefix=no

10238

need_version=no

10239

@@ -14541,12 +15738,7 @@

10240

shlibpath_overrides_runpath=yes

10241

shlibpath_var=DYLD_LIBRARY_PATH

10242

shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'

10243

- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.

10244

- if test "$GCC" = yes; then

10245

- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`

10246

- else

10247

- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'

10248

- fi

10249

+

10250

sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'

10251

;;

10252

10253

@@ -14563,18 +15755,6 @@

10254

dynamic_linker=no

10255

;;

10256

10257

-kfreebsd*-gnu)

10258

- version_type=linux

10259

- need_lib_prefix=no

10260

- need_version=no

10261

- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

10262

- soname_spec='${libname}${release}${shared_ext}$major'

10263

- shlibpath_var=LD_LIBRARY_PATH

10264

- shlibpath_overrides_runpath=no

10265

- hardcode_into_libs=yes

10266

- dynamic_linker='GNU ld.so'

10267

- ;;

10268

-

10269

freebsd* | dragonfly*)

10270

# DragonFly does not have aout. When/if they implement a new

10271

# versioning mechanism, adjust this.

10272

@@ -14612,7 +15792,7 @@

10273

shlibpath_overrides_runpath=no

10274

hardcode_into_libs=yes

10275

;;

10276

- freebsd*) # from 4.6 on

10277

+ *) # from 4.6 on, and DragonFly

10278

shlibpath_overrides_runpath=yes

10279

hardcode_into_libs=yes

10280

;;

10281

@@ -14675,7 +15855,7 @@

10282

postinstall_cmds='chmod 555 $lib'

10283

;;

10284

10285

-interix3*)

10286

+interix[3-9]*)

10287

version_type=linux

10288

need_lib_prefix=no

10289

need_version=no

10290

@@ -14730,7 +15910,7 @@

10291

;;

10292

10293

# This must be Linux ELF.

10294

-linux*)

10295

+linux* | k*bsd*-gnu)

10296

version_type=linux

10297

need_lib_prefix=no

10298

need_version=no

10299

@@ -14746,7 +15926,7 @@

10300

10301

# Append ld.so.conf contents to the search path

10302

if test -f /etc/ld.so.conf; then

10303

- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

10304

+ 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' ' '`

10305

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

10306

fi

10307

10308

@@ -14759,7 +15939,7 @@

10309

dynamic_linker='GNU/Linux ld.so'

10310

;;

10311

10312

-knetbsd*-gnu)

10313

+netbsdelf*-gnu)

10314

version_type=linux

10315

need_lib_prefix=no

10316

need_version=no

10317

@@ -14768,7 +15948,7 @@

10318

shlibpath_var=LD_LIBRARY_PATH

10319

shlibpath_overrides_runpath=no

10320

hardcode_into_libs=yes

10321

- dynamic_linker='GNU ld.so'

10322

+ dynamic_linker='NetBSD ld.elf_so'

10323

;;

10324

10325

netbsd*)

10326

@@ -14852,6 +16032,10 @@

10327

sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"

10328

;;

10329

10330

+rdos*)

10331

+ dynamic_linker=no

10332

+ ;;

10333

+

10334

solaris*)

10335

version_type=linux

10336

need_lib_prefix=no

10337

@@ -14944,17 +16128,32 @@

10338

dynamic_linker=no

10339

;;

10340

esac

10341

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

10342

-echo "${ECHO_T}$dynamic_linker" >&6

10343

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

10344

+echo "${ECHO_T}$dynamic_linker" >&6; }

10345

test "$dynamic_linker" = no && can_build_shared=no

10346

10347

+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then

10348

+ echo $ECHO_N "(cached) $ECHO_C" >&6

10349

+else

10350

+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"

10351

+fi

10352

+

10353

+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

10354

+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then

10355

+ echo $ECHO_N "(cached) $ECHO_C" >&6

10356

+else

10357

+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"

10358

+fi

10359

+

10360

+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"

10361

+

10362

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

10363

if test "$GCC" = yes; then

10364

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

10365

fi

10366

10367

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

10368

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

10369

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

10370

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

10371

hardcode_action_F77=

10372

if test -n "$hardcode_libdir_flag_spec_F77" || \

10373

test -n "$runpath_var_F77" || \

10374

@@ -14978,8 +16177,8 @@

10375

# directories.

10376

hardcode_action_F77=unsupported

10377

fi

10378

-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5

10379

-echo "${ECHO_T}$hardcode_action_F77" >&6

10380

+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5

10381

+echo "${ECHO_T}$hardcode_action_F77" >&6; }

10382

10383

if test "$hardcode_action_F77" = relink; then

10384

# Fast installation is not supported

10385

@@ -15031,6 +16230,7 @@

10386

predeps_F77 \

10387

postdeps_F77 \

10388

compiler_lib_search_path_F77 \

10389

+ compiler_lib_search_dirs_F77 \

10390

archive_cmds_F77 \

10391

archive_expsym_cmds_F77 \

10392

postinstall_cmds_F77 \

10393

@@ -15046,6 +16246,7 @@

10394

module_cmds_F77 \

10395

module_expsym_cmds_F77 \

10396

lt_cv_prog_compiler_c_o_F77 \

10397

+ fix_srcfile_path_F77 \

10398

exclude_expsyms_F77 \

10399

include_expsyms_F77; do

10400

10401

@@ -15278,6 +16479,10 @@

10402

# shared library.

10403

postdeps=$lt_postdeps_F77

10404

10405

+# The directories searched by this compiler when creating a shared

10406

+# library

10407

+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77

10408

+

10409

# The library search path used internally by the compiler when linking

10410

# a shared library.

10411

compiler_lib_search_path=$lt_compiler_lib_search_path_F77

10412

@@ -15366,7 +16571,7 @@

10413

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

10414

10415

# Fix the shell variable \$srcfile for the compiler.

10416

-fix_srcfile_path="$fix_srcfile_path_F77"

10417

+fix_srcfile_path=$lt_fix_srcfile_path

10418

10419

# Set to yes if exported symbols are required.

10420

always_export_symbols=$always_export_symbols_F77

10421

@@ -15416,7 +16621,6 @@

10422

if test -n "$GCJ" && test "X$GCJ" != "Xno"; then

10423

10424

10425

-

10426

# Source file extension for Java test sources.

10427

ac_ext=java

10428

10429

@@ -15425,10 +16629,10 @@

10430

objext_GCJ=$objext

10431

10432

# Code to be used in simple compile tests

10433

-lt_simple_compile_test_code="class foo {}\n"

10434

+lt_simple_compile_test_code="class foo {}"

10435

10436

# Code to be used in simple link tests

10437

-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'

10438

+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'

10439

10440

# ltmain only uses $CC for tagged configurations so make sure $CC is set.

10441

10442

@@ -15444,16 +16648,16 @@

10443

10444

# save warnings/boilerplate of simple test code

10445

ac_outfile=conftest.$ac_objext

10446

-printf "$lt_simple_compile_test_code" >conftest.$ac_ext

10447

+echo "$lt_simple_compile_test_code" >conftest.$ac_ext

10448

eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

10449

_lt_compiler_boilerplate=`cat conftest.err`

10450

$rm conftest*

10451

10452

ac_outfile=conftest.$ac_objext

10453

-printf "$lt_simple_link_test_code" >conftest.$ac_ext

10454

+echo "$lt_simple_link_test_code" >conftest.$ac_ext

10455

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

10456

_lt_linker_boilerplate=`cat conftest.err`

10457

-$rm conftest*

10458

+$rm -r conftest*

10459

10460

10461

# Allow CC to be a program name with arguments.

10462

@@ -15488,14 +16692,14 @@

10463

lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'

10464

10465

10466

-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

10467

-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6

10468

+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

10469

+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }

10470

if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then

10471

echo $ECHO_N "(cached) $ECHO_C" >&6

10472

else

10473

lt_cv_prog_compiler_rtti_exceptions=no

10474

ac_outfile=conftest.$ac_objext

10475

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

10476

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

10477

lt_compiler_flag="-fno-rtti -fno-exceptions"

10478

# Insert the option either (1) after the last *FLAGS variable, or

10479

# (2) before a word containing "conftest.", or (3) at the end.

10480

@@ -15506,11 +16710,11 @@

10481

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

10482

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

10483

-e 's:$: $lt_compiler_flag:'`

10484

- (eval echo "\"\$as_me:15509: $lt_compile\"" >&5)

10485

+ (eval echo "\"\$as_me:16713: $lt_compile\"" >&5)

10486

(eval "$lt_compile" 2>conftest.err)

10487

ac_status=$?

10488

cat conftest.err >&5

10489

- echo "$as_me:15513: \$? = $ac_status" >&5

10490

+ echo "$as_me:16717: \$? = $ac_status" >&5

10491

if (exit $ac_status) && test -s "$ac_outfile"; then

10492

# The compiler can only warn and ignore the option if not recognized

10493

# So say no if there are warnings other than the usual output.

10494

@@ -15523,8 +16727,8 @@

10495

$rm conftest*

10496

10497

fi

10498

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

10499

-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6

10500

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

10501

+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }

10502

10503

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

10504

lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"

10505

@@ -15538,8 +16742,8 @@

10506

lt_prog_compiler_pic_GCJ=

10507

lt_prog_compiler_static_GCJ=

10508

10509

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

10510

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

10511

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

10512

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

10513

10514

if test "$GCC" = yes; then

10515

lt_prog_compiler_wl_GCJ='-Wl,'

10516

@@ -15561,14 +16765,16 @@

10517

lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'

10518

;;

10519

10520

10521

+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

10522

# PIC is the default for these OSes.

10523

;;

10524

10525

- mingw* | pw32* | os2*)

10526

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

10527

# This hack is so that the source file can tell whether it is being

10528

# built for inclusion in a dll (and should export symbols for example).

10529

- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'

10530

+ # Although the cygwin gcc ignores -fPIC, still need this for old-style

10531

+ # (--disable-auto-import) libraries

10532

+

10533

;;

10534

10535

darwin* | rhapsody*)

10536

@@ -15577,7 +16783,7 @@

10537

lt_prog_compiler_pic_GCJ='-fno-common'

10538

;;

10539

10540

- interix3*)

10541

+ interix[3-9]*)

10542

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

10543

# Instead, we relocate shared libraries at runtime.

10544

;;

10545

@@ -15635,10 +16841,10 @@

10546

esac

10547

;;

10548

10549

- mingw* | pw32* | os2*)

10550

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

10551

# This hack is so that the source file can tell whether it is being

10552

# built for inclusion in a dll (and should export symbols for example).

10553

- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'

10554

+

10555

;;

10556

10557

hpux9* | hpux10* | hpux11*)

10558

@@ -15668,7 +16874,7 @@

10559

lt_prog_compiler_static_GCJ='-Bstatic'

10560

;;

10561

10562

- linux*)

10563

+ linux* | k*bsd*-gnu)

10564

case $cc_basename in

10565

icc* | ecc*)

10566

lt_prog_compiler_wl_GCJ='-Wl,'

10567

@@ -15687,6 +16893,22 @@

10568

# All Alpha code is PIC.

10569

lt_prog_compiler_static_GCJ='-non_shared'

10570

;;

10571

+ *)

10572

+ case `$CC -V 2>&1 | sed 5q` in

10573

+ *Sun\ C*)

10574

+ # Sun C 5.9

10575

+ lt_prog_compiler_pic_GCJ='-KPIC'

10576

+ lt_prog_compiler_static_GCJ='-Bstatic'

10577

+ lt_prog_compiler_wl_GCJ='-Wl,'

10578

+ ;;

10579

+ *Sun\ F*)

10580

+ # Sun Fortran 8.3 passes all unrecognized flags to the linker

10581

+ lt_prog_compiler_pic_GCJ='-KPIC'

10582

+ lt_prog_compiler_static_GCJ='-Bstatic'

10583

+ lt_prog_compiler_wl_GCJ=''

10584

+ ;;

10585

+ esac

10586

+ ;;

10587

esac

10588

;;

10589

10590

@@ -15696,6 +16918,10 @@

10591

lt_prog_compiler_static_GCJ='-non_shared'

10592

;;

10593

10594

+ rdos*)

10595

+ lt_prog_compiler_static_GCJ='-non_shared'

10596

+ ;;

10597

+

10598

solaris*)

10599

lt_prog_compiler_pic_GCJ='-KPIC'

10600

lt_prog_compiler_static_GCJ='-Bstatic'

10601

@@ -15748,22 +16974,22 @@

10602

esac

10603

fi

10604

10605

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5

10606

-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6

10607

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5

10608

+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }

10609

10610

#

10611

# Check to make sure the PIC flag actually works.

10612

#

10613

if test -n "$lt_prog_compiler_pic_GCJ"; then

10614

10615

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5

10616

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6

10617

-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then

10618

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5

10619

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }

10620

+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then

10621

echo $ECHO_N "(cached) $ECHO_C" >&6

10622

else

10623

- lt_prog_compiler_pic_works_GCJ=no

10624

+ lt_cv_prog_compiler_pic_works_GCJ=no

10625

ac_outfile=conftest.$ac_objext

10626

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

10627

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

10628

lt_compiler_flag="$lt_prog_compiler_pic_GCJ"

10629

# Insert the option either (1) after the last *FLAGS variable, or

10630

# (2) before a word containing "conftest.", or (3) at the end.

10631

@@ -15774,27 +17000,27 @@

10632

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

10633

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

10634

-e 's:$: $lt_compiler_flag:'`

10635

- (eval echo "\"\$as_me:15777: $lt_compile\"" >&5)

10636

+ (eval echo "\"\$as_me:17003: $lt_compile\"" >&5)

10637

(eval "$lt_compile" 2>conftest.err)

10638

ac_status=$?

10639

cat conftest.err >&5

10640

- echo "$as_me:15781: \$? = $ac_status" >&5

10641

+ echo "$as_me:17007: \$? = $ac_status" >&5

10642

if (exit $ac_status) && test -s "$ac_outfile"; then

10643

# The compiler can only warn and ignore the option if not recognized

10644

# So say no if there are warnings other than the usual output.

10645

$echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp

10646

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

10647

if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then

10648

- lt_prog_compiler_pic_works_GCJ=yes

10649

+ lt_cv_prog_compiler_pic_works_GCJ=yes

10650

fi

10651

fi

10652

$rm conftest*

10653

10654

fi

10655

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5

10656

-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6

10657

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5

10658

+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }

10659

10660

-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then

10661

+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then

10662

case $lt_prog_compiler_pic_GCJ in

10663

"" | " "*) ;;

10664

*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;

10665

@@ -15819,15 +17045,15 @@

10666

# Check to make sure the static flag actually works.

10667

#

10668

wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"

10669

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

10670

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

10671

-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then

10672

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

10673

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

10674

+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then

10675

echo $ECHO_N "(cached) $ECHO_C" >&6

10676

else

10677

- lt_prog_compiler_static_works_GCJ=no

10678

+ lt_cv_prog_compiler_static_works_GCJ=no

10679

save_LDFLAGS="$LDFLAGS"

10680

LDFLAGS="$LDFLAGS $lt_tmp_static_flag"

10681

- printf "$lt_simple_link_test_code" > conftest.$ac_ext

10682

+ echo "$lt_simple_link_test_code" > conftest.$ac_ext

10683

if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

10684

# The linker can only warn and ignore the option if not recognized

10685

# So say no if there are warnings

10686

@@ -15837,28 +17063,28 @@

10687

$echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp

10688

$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

10689

if diff conftest.exp conftest.er2 >/dev/null; then

10690

- lt_prog_compiler_static_works_GCJ=yes

10691

+ lt_cv_prog_compiler_static_works_GCJ=yes

10692

fi

10693

else

10694

- lt_prog_compiler_static_works_GCJ=yes

10695

+ lt_cv_prog_compiler_static_works_GCJ=yes

10696

fi

10697

fi

10698

- $rm conftest*

10699

+ $rm -r conftest*

10700

LDFLAGS="$save_LDFLAGS"

10701

10702

fi

10703

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5

10704

-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6

10705

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5

10706

+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }

10707

10708

-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then

10709

+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then

10710

:

10711

else

10712

lt_prog_compiler_static_GCJ=

10713

fi

10714

10715

10716

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

10717

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

10718

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

10719

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

10720

if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then

10721

echo $ECHO_N "(cached) $ECHO_C" >&6

10722

else

10723

@@ -15867,7 +17093,7 @@

10724

mkdir conftest

10725

cd conftest

10726

mkdir out

10727

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

10728

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

10729

10730

lt_compiler_flag="-o out/conftest2.$ac_objext"

10731

# Insert the option either (1) after the last *FLAGS variable, or

10732

@@ -15878,11 +17104,11 @@

10733

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

10734

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

10735

-e 's:$: $lt_compiler_flag:'`

10736

- (eval echo "\"\$as_me:15881: $lt_compile\"" >&5)

10737

+ (eval echo "\"\$as_me:17107: $lt_compile\"" >&5)

10738

(eval "$lt_compile" 2>out/conftest.err)

10739

ac_status=$?

10740

cat out/conftest.err >&5

10741

- echo "$as_me:15885: \$? = $ac_status" >&5

10742

+ echo "$as_me:17111: \$? = $ac_status" >&5

10743

if (exit $ac_status) && test -s out/conftest2.$ac_objext

10744

then

10745

# The compiler can only warn and ignore the option if not recognized

10746

@@ -15904,23 +17130,23 @@

10747

$rm conftest*

10748

10749

fi

10750

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5

10751

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6

10752

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5

10753

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }

10754

10755

10756

hard_links="nottested"

10757

if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then

10758

# do not overwrite the value of need_locks provided by the user

10759

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

10760

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

10761

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

10762

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

10763

hard_links=yes

10764

$rm conftest*

10765

ln conftest.a conftest.b 2>/dev/null && hard_links=no

10766

touch conftest.a

10767

ln conftest.a conftest.b 2>&5 || hard_links=no

10768

ln conftest.a conftest.b 2>/dev/null && hard_links=no

10769

- echo "$as_me:$LINENO: result: $hard_links" >&5

10770

-echo "${ECHO_T}$hard_links" >&6

10771

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

10772

+echo "${ECHO_T}$hard_links" >&6; }

10773

if test "$hard_links" = no; then

10774

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

10775

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

10776

@@ -15930,8 +17156,8 @@

10777

need_locks=no

10778

fi

10779

10780

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

10781

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

10782

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

10783

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

10784

10785

runpath_var=

10786

allow_undefined_flag_GCJ=

10787

@@ -15962,12 +17188,13 @@

10788

# it will be wrapped by ` (' and `)$', so one must not match beginning or

10789

# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',

10790

# as well as any symbol that contains `d'.

10791

- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"

10792

+ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

10793

# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out

10794

# platforms (ab)use it in PIC code, but their linkers get confused if

10795

# the symbol is explicitly referenced. Since portable code cannot

10796

# rely on this symbol name, it's probably fine to never include it in

10797

# preloaded symbol tables.

10798

+ # Exclude shared library initialization/finalization symbols.

10799

extract_expsyms_cmds=

10800

# Just being paranoid about ensuring that cc_basename is set.

10801

for cc_temp in $compiler""; do

10802

@@ -16026,7 +17253,7 @@

10803

10804

# See if GNU ld supports shared libraries.

10805

case $host_os in

10806

- aix3* | aix4* | aix5*)

10807

+ aix[3-9]*)

10808

# On AIX/PPC, the GNU linker is very broken

10809

if test "$host_cpu" != ia64; then

10810

ld_shlibs_GCJ=no

10811

@@ -16074,7 +17301,7 @@

10812

allow_undefined_flag_GCJ=unsupported

10813

always_export_symbols_GCJ=no

10814

enable_shared_with_static_runtimes_GCJ=yes

10815

10816

+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'

10817

10818

if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then

10819

archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

10820

@@ -16092,7 +17319,7 @@

10821

fi

10822

;;

10823

10824

- interix3*)

10825

+ interix[3-9]*)

10826

hardcode_direct_GCJ=no

10827

hardcode_shlibpath_var_GCJ=no

10828

hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'

10829

@@ -16107,7 +17334,7 @@

10830

archive_expsym_cmds_GCJ='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'

10831

;;

10832

10833

- linux*)

10834

+ gnu* | linux* | k*bsd*-gnu)

10835

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

10836

tmp_addflag=

10837

case $cc_basename,$host_cpu in

10838

@@ -16125,20 +17352,30 @@

10839

ifc* | ifort*) # Intel Fortran compiler

10840

tmp_addflag=' -nofor_main' ;;

10841

esac

10842

- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

10843

+ case `$CC -V 2>&1 | sed 5q` in

10844

+ *Sun\ C*) # Sun C 5.9

10845

+ whole_archive_flag_spec_GCJ='${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'

10846

+ tmp_sharedflag='-G' ;;

10847

+ *Sun\ F*) # Sun Fortran 8.3

10848

+ tmp_sharedflag='-G' ;;

10849

+ *)

10850

+ tmp_sharedflag='-shared' ;;

10851

+ esac

10852

+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

10853

10854

if test $supports_anon_versioning = yes; then

10855

archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~

10856

cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~

10857

$echo "local: *; };" >> $output_objdir/$libname.ver~

10858

- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

10859

+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

10860

fi

10861

+ link_all_deplibs_GCJ=no

10862

else

10863

ld_shlibs_GCJ=no

10864

fi

10865

;;

10866

10867

- netbsd*)

10868

+ netbsd* | netbsdelf*-gnu)

10869

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

10870

archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

10871

wlarc=

10872

@@ -16236,7 +17473,7 @@

10873

fi

10874

;;

10875

10876

- aix4* | aix5*)

10877

+ aix[4-9]*)

10878

if test "$host_cpu" = ia64; then

10879

# On IA64, the linker does run time linking by default, so we don't

10880

# have to do anything special.

10881

@@ -16256,7 +17493,7 @@

10882

# Test if we are trying to use run time linking or normal

10883

# AIX style linking. If -brtl is somewhere in LDFLAGS, we

10884

# need to do runtime linking.

10885

- case $host_os in aix4.[23]|aix4.[23].*|aix5*)

10886

+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)

10887

for ld_flag in $LDFLAGS; do

10888

if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then

10889

aix_use_runtimelinking=yes

10890

@@ -16290,7 +17527,7 @@

10891

strings "$collect2name" | grep resolve_lib_name >/dev/null

10892

then

10893

# We have reworked collect2

10894

- hardcode_direct_GCJ=yes

10895

+ :

10896

else

10897

# We have old collect2

10898

hardcode_direct_GCJ=unsupported

10899

@@ -16346,39 +17583,44 @@

10900

}

10901

_ACEOF

10902

rm -f conftest.$ac_objext conftest$ac_exeext

10903

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

10904

- (eval $ac_link) 2>conftest.er1

10905

+if { (ac_try="$ac_link"

10906

+case "(($ac_try" in

10907

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10908

+ *) ac_try_echo=$ac_try;;

10909

+esac

10910

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10911

+ (eval "$ac_link") 2>conftest.er1

10912

ac_status=$?

10913

grep -v '^ *+' conftest.er1 >conftest.err

10914

rm -f conftest.er1

10915

cat conftest.err >&5

10916

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10917

- (exit $ac_status); } &&

10918

- { ac_try='test -z "$ac_c_werror_flag"

10919

- || test ! -s conftest.err'

10920

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10921

- (eval $ac_try) 2>&5

10922

- ac_status=$?

10923

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10924

- (exit $ac_status); }; } &&

10925

- { ac_try='test -s conftest$ac_exeext'

10926

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10927

- (eval $ac_try) 2>&5

10928

- ac_status=$?

10929

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10930

- (exit $ac_status); }; }; then

10931

+ (exit $ac_status); } && {

10932

+ test -z "$ac_c_werror_flag" ||

10933

+ test ! -s conftest.err

10934

+ } && test -s conftest$ac_exeext &&

10935

+ $as_test_x conftest$ac_exeext; then

10936

10937

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

10938

-}'`

10939

+lt_aix_libpath_sed='

10940

+ /Import File Strings/,/^$/ {

10941

+ /^0/ {

10942

+ s/^0 *$.*$$/\1/

10943

+ p

10944

+ }

10945

+ }'

10946

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

10947

# Check for a 64-bit object if we didn't find anything.

10948

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

10949

-}'`; fi

10950

+if test -z "$aix_libpath"; then

10951

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

10952

+fi

10953

else

10954

echo "$as_me: failed program was:" >&5

10955

sed 's/^/| /' conftest.$ac_ext >&5

10956

10957

+

10958

fi

10959

-rm -f conftest.err conftest.$ac_objext \

10960

+

10961

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10962

conftest$ac_exeext conftest.$ac_ext

10963

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

10964

10965

@@ -16407,39 +17649,44 @@

10966

}

10967

_ACEOF

10968

rm -f conftest.$ac_objext conftest$ac_exeext

10969

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

10970

- (eval $ac_link) 2>conftest.er1

10971

+if { (ac_try="$ac_link"

10972

+case "(($ac_try" in

10973

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10974

+ *) ac_try_echo=$ac_try;;

10975

+esac

10976

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10977

+ (eval "$ac_link") 2>conftest.er1

10978

ac_status=$?

10979

grep -v '^ *+' conftest.er1 >conftest.err

10980

rm -f conftest.er1

10981

cat conftest.err >&5

10982

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10983

- (exit $ac_status); } &&

10984

- { ac_try='test -z "$ac_c_werror_flag"

10985

- || test ! -s conftest.err'

10986

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10987

- (eval $ac_try) 2>&5

10988

- ac_status=$?

10989

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10990

- (exit $ac_status); }; } &&

10991

- { ac_try='test -s conftest$ac_exeext'

10992

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10993

- (eval $ac_try) 2>&5

10994

- ac_status=$?

10995

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10996

- (exit $ac_status); }; }; then

10997

+ (exit $ac_status); } && {

10998

+ test -z "$ac_c_werror_flag" ||

10999

+ test ! -s conftest.err

11000

+ } && test -s conftest$ac_exeext &&

11001

+ $as_test_x conftest$ac_exeext; then

11002

11003

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

11004

-}'`

11005

+lt_aix_libpath_sed='

11006

+ /Import File Strings/,/^$/ {

11007

+ /^0/ {

11008

+ s/^0 *$.*$$/\1/

11009

+ p

11010

+ }

11011

+ }'

11012

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

11013

# Check for a 64-bit object if we didn't find anything.

11014

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

11015

-}'`; fi

11016

+if test -z "$aix_libpath"; then

11017

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

11018

+fi

11019

else

11020

echo "$as_me: failed program was:" >&5

11021

sed 's/^/| /' conftest.$ac_ext >&5

11022

11023

+

11024

fi

11025

-rm -f conftest.err conftest.$ac_objext \

11026

+

11027

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11028

conftest$ac_exeext conftest.$ac_ext

11029

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

11030

11031

@@ -16485,7 +17732,7 @@

11032

# The linker will automatically build a .lib file if we build a DLL.

11033

old_archive_From_new_cmds_GCJ='true'

11034

# FIXME: Should let the user specify the lib program.

11035

- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'

11036

+ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'

11037

fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'

11038

enable_shared_with_static_runtimes_GCJ=yes

11039

;;

11040

@@ -16518,19 +17765,18 @@

11041

link_all_deplibs_GCJ=yes

11042

if test "$GCC" = yes ; then

11043

output_verbose_link_cmd='echo'

11044

- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'

11045

- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

11046

- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

11047

- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

11048

- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

11049

+ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"

11050

+ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

11051

+ archive_expsym_cmds_GCJ="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}"

11052

+ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"

11053

else

11054

case $cc_basename in

11055

xlc*)

11056

output_verbose_link_cmd='echo'

11057

- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'

11058

+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'

11059

module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

11060

# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

11061

- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

11062

+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

11063

module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

11064

;;

11065

*)

11066

@@ -16570,7 +17816,7 @@

11067

;;

11068

11069

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

11070

- freebsd* | kfreebsd*-gnu | dragonfly*)

11071

+ freebsd* | dragonfly*)

11072

archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

11073

hardcode_libdir_flag_spec_GCJ='-R$libdir'

11074

hardcode_direct_GCJ=yes

11075

@@ -16672,7 +17918,7 @@

11076

link_all_deplibs_GCJ=yes

11077

;;

11078

11079

- netbsd*)

11080

+ netbsd* | netbsdelf*-gnu)

11081

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

11082

archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

11083

else

11084

@@ -16692,24 +17938,28 @@

11085

;;

11086

11087

openbsd*)

11088

- hardcode_direct_GCJ=yes

11089

- hardcode_shlibpath_var_GCJ=no

11090

- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

11091

- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

11092

- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'

11093

- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'

11094

- export_dynamic_flag_spec_GCJ='${wl}-E'

11095

+ if test -f /usr/libexec/ld.so; then

11096

+ hardcode_direct_GCJ=yes

11097

+ hardcode_shlibpath_var_GCJ=no

11098

+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

11099

+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

11100

+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'

11101

+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'

11102

+ export_dynamic_flag_spec_GCJ='${wl}-E'

11103

+ else

11104

+ case $host_os in

11105

+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)

11106

+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'

11107

+ hardcode_libdir_flag_spec_GCJ='-R$libdir'

11108

+ ;;

11109

+ *)

11110

+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

11111

+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'

11112

+ ;;

11113

+ esac

11114

+ fi

11115

else

11116

- case $host_os in

11117

- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)

11118

- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'

11119

- hardcode_libdir_flag_spec_GCJ='-R$libdir'

11120

- ;;

11121

- *)

11122

- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

11123

- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'

11124

- ;;

11125

- esac

11126

+ ld_shlibs_GCJ=no

11127

fi

11128

;;

11129

11130

@@ -16768,17 +18018,16 @@

11131

case $host_os in

11132

solaris2.[0-5] | solaris2.[0-5].*) ;;

11133

*)

11134

- # The compiler driver will combine linker options so we

11135

- # cannot just pass the convience library names through

11136

- # without $wl, iff we do not link with $LD.

11137

- # Luckily, gcc supports the same syntax we need for Sun Studio.

11138

+ # The compiler driver will combine and reorder linker options,

11139

+ # but understands `-z linker_flag'. GCC discards it without `$wl',

11140

+ # but is careful enough not to reorder.

11141

# Supported since Solaris 2.6 (maybe 2.5.1?)

11142

- case $wlarc in

11143

- '')

11144

- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;

11145

- *)

11146

- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;

11147

- esac ;;

11148

+ if test "$GCC" = yes; then

11149

+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'

11150

+ else

11151

+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'

11152

+ fi

11153

+ ;;

11154

esac

11155

link_all_deplibs_GCJ=yes

11156

;;

11157

@@ -16835,7 +18084,7 @@

11158

fi

11159

;;

11160

11161

- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)

11162

+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)

11163

no_undefined_flag_GCJ='${wl}-z,text'

11164

archive_cmds_need_lc_GCJ=no

11165

hardcode_shlibpath_var_GCJ=no

11166

@@ -16888,8 +18137,8 @@

11167

esac

11168

fi

11169

11170

-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5

11171

-echo "${ECHO_T}$ld_shlibs_GCJ" >&6

11172

+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5

11173

+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }

11174

test "$ld_shlibs_GCJ" = no && can_build_shared=no

11175

11176

#

11177

@@ -16909,10 +18158,10 @@

11178

# Test whether the compiler implicitly links with -lc since on some

11179

# systems, -lgcc has to come before -lc. If gcc already passes -lc

11180

# to ld, don't add -lc before -lgcc.

11181

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

11182

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

11183

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

11184

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

11185

$rm conftest*

11186

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

11187

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

11188

11189

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

11190

(eval $ac_compile) 2>&5

11191

@@ -16947,16 +18196,16 @@

11192

cat conftest.err 1>&5

11193

fi

11194

$rm conftest*

11195

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5

11196

-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6

11197

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5

11198

+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }

11199

;;

11200

esac

11201

fi

11202

;;

11203

esac

11204

11205

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

11206

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

11207

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

11208

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

11209

library_names_spec=

11210

libname_spec='lib$name'

11211

soname_spec=

11212

@@ -16970,20 +18219,7 @@

11213

version_type=none

11214

dynamic_linker="$host_os ld.so"

11215

sys_lib_dlsearch_path_spec="/lib /usr/lib"

11216

-if test "$GCC" = yes; then

11217

- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

11218

- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

11219

- # if the path contains ";" then we assume it to be the separator

11220

- # otherwise default to the standard path separator (i.e. ":") - it is

11221

- # assumed that no part of a normal pathname contains ";" but that should

11222

- # okay in the real world where ";" in dirpaths is itself problematic.

11223

- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

11224

- else

11225

- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

11226

- fi

11227

-else

11228

- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

11229

-fi

11230

+

11231

need_lib_prefix=unknown

11232

hardcode_into_libs=no

11233

11234

@@ -17001,7 +18237,7 @@

11235

soname_spec='${libname}${release}${shared_ext}$major'

11236

;;

11237

11238

-aix4* | aix5*)

11239

+aix[4-9]*)

11240

version_type=linux

11241

need_lib_prefix=no

11242

need_version=no

11243

@@ -17140,12 +18376,7 @@

11244

shlibpath_overrides_runpath=yes

11245

shlibpath_var=DYLD_LIBRARY_PATH

11246

shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'

11247

- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.

11248

- if test "$GCC" = yes; then

11249

- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`

11250

- else

11251

- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'

11252

- fi

11253

+

11254

sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'

11255

;;

11256

11257

@@ -17162,18 +18393,6 @@

11258

dynamic_linker=no

11259

;;

11260

11261

-kfreebsd*-gnu)

11262

- version_type=linux

11263

- need_lib_prefix=no

11264

- need_version=no

11265

- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

11266

- soname_spec='${libname}${release}${shared_ext}$major'

11267

- shlibpath_var=LD_LIBRARY_PATH

11268

- shlibpath_overrides_runpath=no

11269

- hardcode_into_libs=yes

11270

- dynamic_linker='GNU ld.so'

11271

- ;;

11272

-

11273

freebsd* | dragonfly*)

11274

# DragonFly does not have aout. When/if they implement a new

11275

# versioning mechanism, adjust this.

11276

@@ -17211,7 +18430,7 @@

11277

shlibpath_overrides_runpath=no

11278

hardcode_into_libs=yes

11279

;;

11280

- freebsd*) # from 4.6 on

11281

+ *) # from 4.6 on, and DragonFly

11282

shlibpath_overrides_runpath=yes

11283

hardcode_into_libs=yes

11284

;;

11285

@@ -17274,7 +18493,7 @@

11286

postinstall_cmds='chmod 555 $lib'

11287

;;

11288

11289

-interix3*)

11290

+interix[3-9]*)

11291

version_type=linux

11292

need_lib_prefix=no

11293

need_version=no

11294

@@ -17329,7 +18548,7 @@

11295

;;

11296

11297

# This must be Linux ELF.

11298

-linux*)

11299

+linux* | k*bsd*-gnu)

11300

version_type=linux

11301

need_lib_prefix=no

11302

need_version=no

11303

@@ -17345,7 +18564,7 @@

11304

11305

# Append ld.so.conf contents to the search path

11306

if test -f /etc/ld.so.conf; then

11307

- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

11308

+ 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' ' '`

11309

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

11310

fi

11311

11312

@@ -17358,7 +18577,7 @@

11313

dynamic_linker='GNU/Linux ld.so'

11314

;;

11315

11316

-knetbsd*-gnu)

11317

+netbsdelf*-gnu)

11318

version_type=linux

11319

need_lib_prefix=no

11320

need_version=no

11321

@@ -17367,7 +18586,7 @@

11322

shlibpath_var=LD_LIBRARY_PATH

11323

shlibpath_overrides_runpath=no

11324

hardcode_into_libs=yes

11325

- dynamic_linker='GNU ld.so'

11326

+ dynamic_linker='NetBSD ld.elf_so'

11327

;;

11328

11329

netbsd*)

11330

@@ -17451,6 +18670,10 @@

11331

sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"

11332

;;

11333

11334

+rdos*)

11335

+ dynamic_linker=no

11336

+ ;;

11337

+

11338

solaris*)

11339

version_type=linux

11340

need_lib_prefix=no

11341

@@ -17543,17 +18766,32 @@

11342

dynamic_linker=no

11343

;;

11344

esac

11345

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

11346

-echo "${ECHO_T}$dynamic_linker" >&6

11347

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

11348

+echo "${ECHO_T}$dynamic_linker" >&6; }

11349

test "$dynamic_linker" = no && can_build_shared=no

11350

11351

+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then

11352

+ echo $ECHO_N "(cached) $ECHO_C" >&6

11353

+else

11354

+ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"

11355

+fi

11356

+

11357

+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

11358

+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then

11359

+ echo $ECHO_N "(cached) $ECHO_C" >&6

11360

+else

11361

+ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"

11362

+fi

11363

+

11364

+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"

11365

+

11366

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

11367

if test "$GCC" = yes; then

11368

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

11369

fi

11370

11371

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

11372

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

11373

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

11374

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

11375

hardcode_action_GCJ=

11376

if test -n "$hardcode_libdir_flag_spec_GCJ" || \

11377

test -n "$runpath_var_GCJ" || \

11378

@@ -17577,8 +18815,8 @@

11379

# directories.

11380

hardcode_action_GCJ=unsupported

11381

fi

11382

-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5

11383

-echo "${ECHO_T}$hardcode_action_GCJ" >&6

11384

+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5

11385

+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }

11386

11387

if test "$hardcode_action_GCJ" = relink; then

11388

# Fast installation is not supported

11389

@@ -17630,6 +18868,7 @@

11390

predeps_GCJ \

11391

postdeps_GCJ \

11392

compiler_lib_search_path_GCJ \

11393

+ compiler_lib_search_dirs_GCJ \

11394

archive_cmds_GCJ \

11395

archive_expsym_cmds_GCJ \

11396

postinstall_cmds_GCJ \

11397

@@ -17645,6 +18884,7 @@

11398

module_cmds_GCJ \

11399

module_expsym_cmds_GCJ \

11400

lt_cv_prog_compiler_c_o_GCJ \

11401

+ fix_srcfile_path_GCJ \

11402

exclude_expsyms_GCJ \

11403

include_expsyms_GCJ; do

11404

11405

@@ -17877,6 +19117,10 @@

11406

# shared library.

11407

postdeps=$lt_postdeps_GCJ

11408

11409

+# The directories searched by this compiler when creating a shared

11410

+# library

11411

+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ

11412

+

11413

# The library search path used internally by the compiler when linking

11414

# a shared library.

11415

compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ

11416

@@ -17965,7 +19209,7 @@

11417

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

11418

11419

# Fix the shell variable \$srcfile for the compiler.

11420

-fix_srcfile_path="$fix_srcfile_path_GCJ"

11421

+fix_srcfile_path=$lt_fix_srcfile_path

11422

11423

# Set to yes if exported symbols are required.

11424

always_export_symbols=$always_export_symbols_GCJ

11425

@@ -18014,7 +19258,6 @@

11426

RC)

11427

11428

11429

-

11430

# Source file extension for RC test sources.

11431

ac_ext=rc

11432

11433

@@ -18023,7 +19266,7 @@

11434

objext_RC=$objext

11435

11436

# Code to be used in simple compile tests

11437

-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'

11438

+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'

11439

11440

# Code to be used in simple link tests

11441

lt_simple_link_test_code="$lt_simple_compile_test_code"

11442

@@ -18042,16 +19285,16 @@

11443

11444

# save warnings/boilerplate of simple test code

11445

ac_outfile=conftest.$ac_objext

11446

-printf "$lt_simple_compile_test_code" >conftest.$ac_ext

11447

+echo "$lt_simple_compile_test_code" >conftest.$ac_ext

11448

eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

11449

_lt_compiler_boilerplate=`cat conftest.err`

11450

$rm conftest*

11451

11452

ac_outfile=conftest.$ac_objext

11453

-printf "$lt_simple_link_test_code" >conftest.$ac_ext

11454

+echo "$lt_simple_link_test_code" >conftest.$ac_ext

11455

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

11456

_lt_linker_boilerplate=`cat conftest.err`

11457

-$rm conftest*

11458

+$rm -r conftest*

11459

11460

11461

# Allow CC to be a program name with arguments.

11462

@@ -18111,6 +19354,7 @@

11463

predeps_RC \

11464

postdeps_RC \

11465

compiler_lib_search_path_RC \

11466

+ compiler_lib_search_dirs_RC \

11467

archive_cmds_RC \

11468

archive_expsym_cmds_RC \

11469

postinstall_cmds_RC \

11470

@@ -18126,6 +19370,7 @@

11471

module_cmds_RC \

11472

module_expsym_cmds_RC \

11473

lt_cv_prog_compiler_c_o_RC \

11474

+ fix_srcfile_path_RC \

11475

exclude_expsyms_RC \

11476

include_expsyms_RC; do

11477

11478

@@ -18358,6 +19603,10 @@

11479

# shared library.

11480

postdeps=$lt_postdeps_RC

11481

11482

+# The directories searched by this compiler when creating a shared

11483

+# library

11484

+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC

11485

+

11486

# The library search path used internally by the compiler when linking

11487

# a shared library.

11488

compiler_lib_search_path=$lt_compiler_lib_search_path_RC

11489

@@ -18446,7 +19695,7 @@

11490

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

11491

11492

# Fix the shell variable \$srcfile for the compiler.

11493

-fix_srcfile_path="$fix_srcfile_path_RC"

11494

+fix_srcfile_path=$lt_fix_srcfile_path

11495

11496

# Set to yes if exported symbols are required.

11497

always_export_symbols=$always_export_symbols_RC

11498

@@ -18558,8 +19807,8 @@

11499

if test -n "$ac_tool_prefix"; then

11500

# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

11501

set dummy ${ac_tool_prefix}gcc; ac_word=$2

11502

-echo "$as_me:$LINENO: checking for $ac_word" >&5

11503

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

11504

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11505

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11506

if test "${ac_cv_prog_CC+set}" = set; then

11507

echo $ECHO_N "(cached) $ECHO_C" >&6

11508

else

11509

@@ -18572,32 +19821,34 @@

11510

IFS=$as_save_IFS

11511

test -z "$as_dir" && as_dir=.

11512

for ac_exec_ext in '' $ac_executable_extensions; do

11513

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

11514

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11515

ac_cv_prog_CC="${ac_tool_prefix}gcc"

11516

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11517

break 2

11518

fi

11519

done

11520

done

11521

+IFS=$as_save_IFS

11522

11523

fi

11524

fi

11525

CC=$ac_cv_prog_CC

11526

if test -n "$CC"; then

11527

- echo "$as_me:$LINENO: result: $CC" >&5

11528

-echo "${ECHO_T}$CC" >&6

11529

+ { echo "$as_me:$LINENO: result: $CC" >&5

11530

+echo "${ECHO_T}$CC" >&6; }

11531

else

11532

- echo "$as_me:$LINENO: result: no" >&5

11533

-echo "${ECHO_T}no" >&6

11534

+ { echo "$as_me:$LINENO: result: no" >&5

11535

+echo "${ECHO_T}no" >&6; }

11536

fi

11537

11538

+

11539

fi

11540

if test -z "$ac_cv_prog_CC"; then

11541

ac_ct_CC=$CC

11542

# Extract the first word of "gcc", so it can be a program name with args.

11543

set dummy gcc; ac_word=$2

11544

-echo "$as_me:$LINENO: checking for $ac_word" >&5

11545

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

11546

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11547

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11548

if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

11549

echo $ECHO_N "(cached) $ECHO_C" >&6

11550

else

11551

@@ -18610,36 +19861,51 @@

11552

IFS=$as_save_IFS

11553

test -z "$as_dir" && as_dir=.

11554

for ac_exec_ext in '' $ac_executable_extensions; do

11555

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

11556

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11557

ac_cv_prog_ac_ct_CC="gcc"

11558

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11559

break 2

11560

fi

11561

done

11562

done

11563

+IFS=$as_save_IFS

11564

11565

fi

11566

fi

11567

ac_ct_CC=$ac_cv_prog_ac_ct_CC

11568

if test -n "$ac_ct_CC"; then

11569

- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

11570

-echo "${ECHO_T}$ac_ct_CC" >&6

11571

+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

11572

+echo "${ECHO_T}$ac_ct_CC" >&6; }

11573

else

11574

- echo "$as_me:$LINENO: result: no" >&5

11575

-echo "${ECHO_T}no" >&6

11576

+ { echo "$as_me:$LINENO: result: no" >&5

11577

+echo "${ECHO_T}no" >&6; }

11578

fi

11579

11580

- CC=$ac_ct_CC

11581

+ if test "x$ac_ct_CC" = x; then

11582

+ CC=""

11583

+ else

11584

+ case $cross_compiling:$ac_tool_warned in

11585

+yes:)

11586

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

11587

+whose name does not start with the host triplet. If you think this

11588

+configuration is useful to you, please write to autoconf@gnu.org." >&5

11589

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

11590

+whose name does not start with the host triplet. If you think this

11591

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

11592

+ac_tool_warned=yes ;;

11593

+esac

11594

+ CC=$ac_ct_CC

11595

+ fi

11596

else

11597

CC="$ac_cv_prog_CC"

11598

fi

11599

11600

if test -z "$CC"; then

11601

- if test -n "$ac_tool_prefix"; then

11602

- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

11603

+ if test -n "$ac_tool_prefix"; then

11604

+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

11605

set dummy ${ac_tool_prefix}cc; ac_word=$2

11606

-echo "$as_me:$LINENO: checking for $ac_word" >&5

11607

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

11608

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11609

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11610

if test "${ac_cv_prog_CC+set}" = set; then

11611

echo $ECHO_N "(cached) $ECHO_C" >&6

11612

else

11613

@@ -18652,74 +19918,34 @@

11614

IFS=$as_save_IFS

11615

test -z "$as_dir" && as_dir=.

11616

for ac_exec_ext in '' $ac_executable_extensions; do

11617

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

11618

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11619

ac_cv_prog_CC="${ac_tool_prefix}cc"

11620

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11621

break 2

11622

fi

11623

done

11624

done

11625

+IFS=$as_save_IFS

11626

11627

fi

11628

fi

11629

CC=$ac_cv_prog_CC

11630

if test -n "$CC"; then

11631

- echo "$as_me:$LINENO: result: $CC" >&5

11632

-echo "${ECHO_T}$CC" >&6

11633

-else

11634

- echo "$as_me:$LINENO: result: no" >&5

11635

-echo "${ECHO_T}no" >&6

11636

-fi

11637

-

11638

-fi

11639

-if test -z "$ac_cv_prog_CC"; then

11640

- ac_ct_CC=$CC

11641

- # Extract the first word of "cc", so it can be a program name with args.

11642

-set dummy cc; ac_word=$2

11643

-echo "$as_me:$LINENO: checking for $ac_word" >&5

11644

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

11645

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

11646

- echo $ECHO_N "(cached) $ECHO_C" >&6

11647

-else

11648

- if test -n "$ac_ct_CC"; then

11649

- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

11650

-else

11651

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

11652

-for as_dir in $PATH

11653

-do

11654

- IFS=$as_save_IFS

11655

- test -z "$as_dir" && as_dir=.

11656

- for ac_exec_ext in '' $ac_executable_extensions; do

11657

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

11658

- ac_cv_prog_ac_ct_CC="cc"

11659

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11660

- break 2

11661

- fi

11662

-done

11663

-done

11664

-

11665

-fi

11666

-fi

11667

-ac_ct_CC=$ac_cv_prog_ac_ct_CC

11668

-if test -n "$ac_ct_CC"; then

11669

- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

11670

-echo "${ECHO_T}$ac_ct_CC" >&6

11671

+ { echo "$as_me:$LINENO: result: $CC" >&5

11672

+echo "${ECHO_T}$CC" >&6; }

11673

else

11674

- echo "$as_me:$LINENO: result: no" >&5

11675

-echo "${ECHO_T}no" >&6

11676

+ { echo "$as_me:$LINENO: result: no" >&5

11677

+echo "${ECHO_T}no" >&6; }

11678

fi

11679

11680

- CC=$ac_ct_CC

11681

-else

11682

- CC="$ac_cv_prog_CC"

11683

-fi

11684

11685

+ fi

11686

fi

11687

if test -z "$CC"; then

11688

# Extract the first word of "cc", so it can be a program name with args.

11689

set dummy cc; ac_word=$2

11690

-echo "$as_me:$LINENO: checking for $ac_word" >&5

11691

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

11692

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11693

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11694

if test "${ac_cv_prog_CC+set}" = set; then

11695

echo $ECHO_N "(cached) $ECHO_C" >&6

11696

else

11697

@@ -18733,7 +19959,7 @@

11698

IFS=$as_save_IFS

11699

test -z "$as_dir" && as_dir=.

11700

for ac_exec_ext in '' $ac_executable_extensions; do

11701

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

11702

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11703

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

11704

ac_prog_rejected=yes

11705

continue

11706

@@ -18744,6 +19970,7 @@

11707

fi

11708

done

11709

done

11710

+IFS=$as_save_IFS

11711

11712

if test $ac_prog_rejected = yes; then

11713

# We found a bogon in the path, so make sure we never use it.

11714

@@ -18761,22 +19988,23 @@

11715

fi

11716

CC=$ac_cv_prog_CC

11717

if test -n "$CC"; then

11718

- echo "$as_me:$LINENO: result: $CC" >&5

11719

-echo "${ECHO_T}$CC" >&6

11720

+ { echo "$as_me:$LINENO: result: $CC" >&5

11721

+echo "${ECHO_T}$CC" >&6; }

11722

else

11723

- echo "$as_me:$LINENO: result: no" >&5

11724

-echo "${ECHO_T}no" >&6

11725

+ { echo "$as_me:$LINENO: result: no" >&5

11726

+echo "${ECHO_T}no" >&6; }

11727

fi

11728

11729

+

11730

fi

11731

if test -z "$CC"; then

11732

if test -n "$ac_tool_prefix"; then

11733

- for ac_prog in cl

11734

+ for ac_prog in cl.exe

11735

do

11736

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

11737

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

11738

-echo "$as_me:$LINENO: checking for $ac_word" >&5

11739

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

11740

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11741

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11742

if test "${ac_cv_prog_CC+set}" = set; then

11743

echo $ECHO_N "(cached) $ECHO_C" >&6

11744

else

11745

@@ -18789,36 +20017,38 @@

11746

IFS=$as_save_IFS

11747

test -z "$as_dir" && as_dir=.

11748

for ac_exec_ext in '' $ac_executable_extensions; do

11749

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

11750

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11751

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

11752

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11753

break 2

11754

fi

11755

done

11756

done

11757

+IFS=$as_save_IFS

11758

11759

fi

11760

fi

11761

CC=$ac_cv_prog_CC

11762

if test -n "$CC"; then

11763

- echo "$as_me:$LINENO: result: $CC" >&5

11764

-echo "${ECHO_T}$CC" >&6

11765

+ { echo "$as_me:$LINENO: result: $CC" >&5

11766

+echo "${ECHO_T}$CC" >&6; }

11767

else

11768

- echo "$as_me:$LINENO: result: no" >&5

11769

-echo "${ECHO_T}no" >&6

11770

+ { echo "$as_me:$LINENO: result: no" >&5

11771

+echo "${ECHO_T}no" >&6; }

11772

fi

11773

11774

+

11775

test -n "$CC" && break

11776

done

11777

fi

11778

if test -z "$CC"; then

11779

ac_ct_CC=$CC

11780

- for ac_prog in cl

11781

+ for ac_prog in cl.exe

11782

do

11783

# Extract the first word of "$ac_prog", so it can be a program name with args.

11784

set dummy $ac_prog; ac_word=$2

11785

-echo "$as_me:$LINENO: checking for $ac_word" >&5

11786

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

11787

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11788

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11789

if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

11790

echo $ECHO_N "(cached) $ECHO_C" >&6

11791

else

11792

@@ -18831,29 +20061,45 @@

11793

IFS=$as_save_IFS

11794

test -z "$as_dir" && as_dir=.

11795

for ac_exec_ext in '' $ac_executable_extensions; do

11796

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

11797

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11798

ac_cv_prog_ac_ct_CC="$ac_prog"

11799

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11800

break 2

11801

fi

11802

done

11803

done

11804

+IFS=$as_save_IFS

11805

11806

fi

11807

fi

11808

ac_ct_CC=$ac_cv_prog_ac_ct_CC

11809

if test -n "$ac_ct_CC"; then

11810

- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

11811

-echo "${ECHO_T}$ac_ct_CC" >&6

11812

+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

11813

+echo "${ECHO_T}$ac_ct_CC" >&6; }

11814

else

11815

- echo "$as_me:$LINENO: result: no" >&5

11816

-echo "${ECHO_T}no" >&6

11817

+ { echo "$as_me:$LINENO: result: no" >&5

11818

+echo "${ECHO_T}no" >&6; }

11819

fi

11820

11821

+

11822

test -n "$ac_ct_CC" && break

11823

done

11824

11825

- CC=$ac_ct_CC

11826

+ if test "x$ac_ct_CC" = x; then

11827

+ CC=""

11828

+ else

11829

+ case $cross_compiling:$ac_tool_warned in

11830

+yes:)

11831

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

11832

+whose name does not start with the host triplet. If you think this

11833

+configuration is useful to you, please write to autoconf@gnu.org." >&5

11834

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

11835

+whose name does not start with the host triplet. If you think this

11836

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

11837

+ac_tool_warned=yes ;;

11838

+esac

11839

+ CC=$ac_ct_CC

11840

+ fi

11841

fi

11842

11843

fi

11844

@@ -18866,27 +20112,41 @@

11845

{ (exit 1); exit 1; }; }

11846

11847

# Provide some information about the compiler.

11848

-echo "$as_me:$LINENO:" \

11849

- "checking for C compiler version" >&5

11850

+echo "$as_me:$LINENO: checking for C compiler version" >&5

11851

ac_compiler=`set X $ac_compile; echo $2`

11852

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5

11853

- (eval $ac_compiler --version </dev/null >&5) 2>&5

11854

+{ (ac_try="$ac_compiler --version >&5"

11855

+case "(($ac_try" in

11856

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11857

+ *) ac_try_echo=$ac_try;;

11858

+esac

11859

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11860

+ (eval "$ac_compiler --version >&5") 2>&5

11861

ac_status=$?

11862

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11863

(exit $ac_status); }

11864

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5

11865

- (eval $ac_compiler -v </dev/null >&5) 2>&5

11866

+{ (ac_try="$ac_compiler -v >&5"

11867

+case "(($ac_try" in

11868

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11869

+ *) ac_try_echo=$ac_try;;

11870

+esac

11871

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11872

+ (eval "$ac_compiler -v >&5") 2>&5

11873

ac_status=$?

11874

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11875

(exit $ac_status); }

11876

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5

11877

- (eval $ac_compiler -V </dev/null >&5) 2>&5

11878

+{ (ac_try="$ac_compiler -V >&5"

11879

+case "(($ac_try" in

11880

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11881

+ *) ac_try_echo=$ac_try;;

11882

+esac

11883

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11884

+ (eval "$ac_compiler -V >&5") 2>&5

11885

ac_status=$?

11886

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11887

(exit $ac_status); }

11888

11889

-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

11890

-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6

11891

+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

11892

+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }

11893

if test "${ac_cv_c_compiler_gnu+set}" = set; then

11894

echo $ECHO_N "(cached) $ECHO_C" >&6

11895

else

11896

@@ -18909,50 +20169,49 @@

11897

}

11898

_ACEOF

11899

rm -f conftest.$ac_objext

11900

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

11901

- (eval $ac_compile) 2>conftest.er1

11902

+if { (ac_try="$ac_compile"

11903

+case "(($ac_try" in

11904

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11905

+ *) ac_try_echo=$ac_try;;

11906

+esac

11907

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11908

+ (eval "$ac_compile") 2>conftest.er1

11909

ac_status=$?

11910

grep -v '^ *+' conftest.er1 >conftest.err

11911

rm -f conftest.er1

11912

cat conftest.err >&5

11913

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11914

- (exit $ac_status); } &&

11915

- { ac_try='test -z "$ac_c_werror_flag"

11916

- || test ! -s conftest.err'

11917

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11918

- (eval $ac_try) 2>&5

11919

- ac_status=$?

11920

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11921

- (exit $ac_status); }; } &&

11922

- { ac_try='test -s conftest.$ac_objext'

11923

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11924

- (eval $ac_try) 2>&5

11925

- ac_status=$?

11926

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11927

- (exit $ac_status); }; }; then

11928

+ (exit $ac_status); } && {

11929

+ test -z "$ac_c_werror_flag" ||

11930

+ test ! -s conftest.err

11931

+ } && test -s conftest.$ac_objext; then

11932

ac_compiler_gnu=yes

11933

else

11934

echo "$as_me: failed program was:" >&5

11935

sed 's/^/| /' conftest.$ac_ext >&5

11936

11937

-ac_compiler_gnu=no

11938

+ ac_compiler_gnu=no

11939

fi

11940

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

11941

+

11942

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

11943

ac_cv_c_compiler_gnu=$ac_compiler_gnu

11944

11945

fi

11946

-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

11947

-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6

11948

+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

11949

+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }

11950

GCC=`test $ac_compiler_gnu = yes && echo yes`

11951

ac_test_CFLAGS=${CFLAGS+set}

11952

ac_save_CFLAGS=$CFLAGS

11953

-CFLAGS="-g"

11954

-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

11955

-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6

11956

+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

11957

+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }

11958

if test "${ac_cv_prog_cc_g+set}" = set; then

11959

echo $ECHO_N "(cached) $ECHO_C" >&6

11960

else

11961

- cat >conftest.$ac_ext <<_ACEOF

11962

+ ac_save_c_werror_flag=$ac_c_werror_flag

11963

+ ac_c_werror_flag=yes

11964

+ ac_cv_prog_cc_g=no

11965

+ CFLAGS="-g"

11966

+ cat >conftest.$ac_ext <<_ACEOF

11967

/* confdefs.h. */

11968

_ACEOF

11969

cat confdefs.h >>conftest.$ac_ext

11970

@@ -18968,38 +20227,118 @@

11971

}

11972

_ACEOF

11973

rm -f conftest.$ac_objext

11974

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

11975

- (eval $ac_compile) 2>conftest.er1

11976

+if { (ac_try="$ac_compile"

11977

+case "(($ac_try" in

11978

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11979

+ *) ac_try_echo=$ac_try;;

11980

+esac

11981

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11982

+ (eval "$ac_compile") 2>conftest.er1

11983

ac_status=$?

11984

grep -v '^ *+' conftest.er1 >conftest.err

11985

rm -f conftest.er1

11986

cat conftest.err >&5

11987

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11988

- (exit $ac_status); } &&

11989

- { ac_try='test -z "$ac_c_werror_flag"

11990

- || test ! -s conftest.err'

11991

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11992

- (eval $ac_try) 2>&5

11993

+ (exit $ac_status); } && {

11994

+ test -z "$ac_c_werror_flag" ||

11995

+ test ! -s conftest.err

11996

+ } && test -s conftest.$ac_objext; then

11997

+ ac_cv_prog_cc_g=yes

11998

+else

11999

+ echo "$as_me: failed program was:" >&5

12000

+sed 's/^/| /' conftest.$ac_ext >&5

12001

+

12002

+ CFLAGS=""

12003

+ cat >conftest.$ac_ext <<_ACEOF

12004

+/* confdefs.h. */

12005

+_ACEOF

12006

+cat confdefs.h >>conftest.$ac_ext

12007

+cat >>conftest.$ac_ext <<_ACEOF

12008

+/* end confdefs.h. */

12009

+

12010

+int

12011

+main ()

12012

+{

12013

+

12014

+ ;

12015

+ return 0;

12016

+}

12017

+_ACEOF

12018

+rm -f conftest.$ac_objext

12019

+if { (ac_try="$ac_compile"

12020

+case "(($ac_try" in

12021

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12022

+ *) ac_try_echo=$ac_try;;

12023

+esac

12024

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12025

+ (eval "$ac_compile") 2>conftest.er1

12026

ac_status=$?

12027

+ grep -v '^ *+' conftest.er1 >conftest.err

12028

+ rm -f conftest.er1

12029

+ cat conftest.err >&5

12030

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12031

- (exit $ac_status); }; } &&

12032

- { ac_try='test -s conftest.$ac_objext'

12033

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12034

- (eval $ac_try) 2>&5

12035

+ (exit $ac_status); } && {

12036

+ test -z "$ac_c_werror_flag" ||

12037

+ test ! -s conftest.err

12038

+ } && test -s conftest.$ac_objext; then

12039

+ :

12040

+else

12041

+ echo "$as_me: failed program was:" >&5

12042

+sed 's/^/| /' conftest.$ac_ext >&5

12043

+

12044

+ ac_c_werror_flag=$ac_save_c_werror_flag

12045

+ CFLAGS="-g"

12046

+ cat >conftest.$ac_ext <<_ACEOF

12047

+/* confdefs.h. */

12048

+_ACEOF

12049

+cat confdefs.h >>conftest.$ac_ext

12050

+cat >>conftest.$ac_ext <<_ACEOF

12051

+/* end confdefs.h. */

12052

+

12053

+int

12054

+main ()

12055

+{

12056

+

12057

+ ;

12058

+ return 0;

12059

+}

12060

+_ACEOF

12061

+rm -f conftest.$ac_objext

12062

+if { (ac_try="$ac_compile"

12063

+case "(($ac_try" in

12064

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12065

+ *) ac_try_echo=$ac_try;;

12066

+esac

12067

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12068

+ (eval "$ac_compile") 2>conftest.er1

12069

ac_status=$?

12070

+ grep -v '^ *+' conftest.er1 >conftest.err

12071

+ rm -f conftest.er1

12072

+ cat conftest.err >&5

12073

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12074

- (exit $ac_status); }; }; then

12075

+ (exit $ac_status); } && {

12076

+ test -z "$ac_c_werror_flag" ||

12077

+ test ! -s conftest.err

12078

+ } && test -s conftest.$ac_objext; then

12079

ac_cv_prog_cc_g=yes

12080

else

12081

echo "$as_me: failed program was:" >&5

12082

sed 's/^/| /' conftest.$ac_ext >&5

12083

12084

-ac_cv_prog_cc_g=no

12085

+

12086

fi

12087

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

12088

+

12089

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12090

fi

12091

-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

12092

-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6

12093

+

12094

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12095

+fi

12096

+

12097

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12098

+ ac_c_werror_flag=$ac_save_c_werror_flag

12099

+fi

12100

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

12101

+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }

12102

if test "$ac_test_CFLAGS" = set; then

12103

CFLAGS=$ac_save_CFLAGS

12104

elif test $ac_cv_prog_cc_g = yes; then

12105

@@ -19015,12 +20354,12 @@

12106

CFLAGS=

12107

fi

12108

fi

12109

-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5

12110

-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6

12111

-if test "${ac_cv_prog_cc_stdc+set}" = set; then

12112

+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

12113

+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }

12114

+if test "${ac_cv_prog_cc_c89+set}" = set; then

12115

echo $ECHO_N "(cached) $ECHO_C" >&6

12116

else

12117

- ac_cv_prog_cc_stdc=no

12118

+ ac_cv_prog_cc_c89=no

12119

ac_save_CC=$CC

12120

cat >conftest.$ac_ext <<_ACEOF

12121

/* confdefs.h. */

12122

@@ -19054,12 +20393,17 @@

12123

/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has

12124

function prototypes and stuff, but not '\xHH' hex character constants.

12125

These don't provoke an error unfortunately, instead are silently treated

12126

- as 'x'. The following induces an error, until -std1 is added to get

12127

+ as 'x'. The following induces an error, until -std is added to get

12128

proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an

12129

array size at least. It's necessary to write '\x00'==0 to get something

12130

- that's true only with -std1. */

12131

+ that's true only with -std. */

12132

int osf4_cc_array ['\x00' == 0 ? 1 : -1];

12133

12134

+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters

12135

+ inside strings and character constants. */

12136

+#define FOO(x) 'x'

12137

+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];

12138

+

12139

int test (int i, double x);

12140

struct s1 {int (*f) (int a);};

12141

struct s2 {int (*f) (double a);};

12142

@@ -19074,205 +20418,57 @@

12143

return 0;

12144

}

12145

_ACEOF

12146

-# Don't try gcc -ansi; that turns off useful extensions and

12147

-# breaks some systems' header files.

12148

-# AIX -qlanglvl=ansi

12149

-# Ultrix and OSF/1 -std1

12150

-# HP-UX 10.20 and later -Ae

12151

-# HP-UX older versions -Aa -D_HPUX_SOURCE

12152

-# SVR4 -Xc -D__EXTENSIONS__

12153

-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

12154

+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \

12155

+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

12156

do

12157

CC="$ac_save_CC $ac_arg"

12158

rm -f conftest.$ac_objext

12159

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12160

- (eval $ac_compile) 2>conftest.er1

12161

+if { (ac_try="$ac_compile"

12162

+case "(($ac_try" in

12163

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12164

+ *) ac_try_echo=$ac_try;;

12165

+esac

12166

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12167

+ (eval "$ac_compile") 2>conftest.er1

12168

ac_status=$?

12169

grep -v '^ *+' conftest.er1 >conftest.err

12170

rm -f conftest.er1

12171

cat conftest.err >&5

12172

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12173

- (exit $ac_status); } &&

12174

- { ac_try='test -z "$ac_c_werror_flag"

12175

- || test ! -s conftest.err'

12176

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12177

- (eval $ac_try) 2>&5

12178

- ac_status=$?

12179

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12180

- (exit $ac_status); }; } &&

12181

- { ac_try='test -s conftest.$ac_objext'

12182

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12183

- (eval $ac_try) 2>&5

12184

- ac_status=$?

12185

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12186

- (exit $ac_status); }; }; then

12187

- ac_cv_prog_cc_stdc=$ac_arg

12188

-break

12189

+ (exit $ac_status); } && {

12190

+ test -z "$ac_c_werror_flag" ||

12191

+ test ! -s conftest.err

12192

+ } && test -s conftest.$ac_objext; then

12193

+ ac_cv_prog_cc_c89=$ac_arg

12194

else

12195

echo "$as_me: failed program was:" >&5

12196

sed 's/^/| /' conftest.$ac_ext >&5

12197

12198

+

12199

fi

12200

-rm -f conftest.err conftest.$ac_objext

12201

+

12202

+rm -f core conftest.err conftest.$ac_objext

12203

+ test "x$ac_cv_prog_cc_c89" != "xno" && break

12204

done

12205

-rm -f conftest.$ac_ext conftest.$ac_objext

12206

+rm -f conftest.$ac_ext

12207

CC=$ac_save_CC

12208

12209

fi

12210

-

12211

-case "x$ac_cv_prog_cc_stdc" in

12212

- x|xno)

12213

- echo "$as_me:$LINENO: result: none needed" >&5

12214

-echo "${ECHO_T}none needed" >&6 ;;

12215

+# AC_CACHE_VAL

12216

+case "x$ac_cv_prog_cc_c89" in

12217

+ x)

12218

+ { echo "$as_me:$LINENO: result: none needed" >&5

12219

+echo "${ECHO_T}none needed" >&6; } ;;

12220

+ xno)

12221

+ { echo "$as_me:$LINENO: result: unsupported" >&5

12222

+echo "${ECHO_T}unsupported" >&6; } ;;

12223

*)

12224

- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5

12225

-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6

12226

- CC="$CC $ac_cv_prog_cc_stdc" ;;

12227

+ CC="$CC $ac_cv_prog_cc_c89"

12228

+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

12229

+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;

12230

esac

12231

12232

-# Some people use a C++ compiler to compile C. Since we use `exit',

12233

-# in C++ we need to declare it. In case someone uses the same compiler

12234

-# for both compiling C and C++ we need to have the C++ compiler decide

12235

-# the declaration of exit, since it's the most demanding environment.

12236

-cat >conftest.$ac_ext <<_ACEOF

12237

-#ifndef __cplusplus

12238

- choke me

12239

-#endif

12240

-_ACEOF

12241

-rm -f conftest.$ac_objext

12242

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12243

- (eval $ac_compile) 2>conftest.er1

12244

- ac_status=$?

12245

- grep -v '^ *+' conftest.er1 >conftest.err

12246

- rm -f conftest.er1

12247

- cat conftest.err >&5

12248

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12249

- (exit $ac_status); } &&

12250

- { ac_try='test -z "$ac_c_werror_flag"

12251

- || test ! -s conftest.err'

12252

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12253

- (eval $ac_try) 2>&5

12254

- ac_status=$?

12255

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12256

- (exit $ac_status); }; } &&

12257

- { ac_try='test -s conftest.$ac_objext'

12258

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12259

- (eval $ac_try) 2>&5

12260

- ac_status=$?

12261

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12262

- (exit $ac_status); }; }; then

12263

- for ac_declaration in \

12264

- '' \

12265

- 'extern "C" void std::exit (int) throw (); using std::exit;' \

12266

- 'extern "C" void std::exit (int); using std::exit;' \

12267

- 'extern "C" void exit (int) throw ();' \

12268

- 'extern "C" void exit (int);' \

12269

- 'void exit (int);'

12270

-do

12271

- cat >conftest.$ac_ext <<_ACEOF

12272

-/* confdefs.h. */

12273

-_ACEOF

12274

-cat confdefs.h >>conftest.$ac_ext

12275

-cat >>conftest.$ac_ext <<_ACEOF

12276

-/* end confdefs.h. */

12277

-$ac_declaration

12278

-#include <stdlib.h>

12279

-int

12280

-main ()

12281

-{

12282

-exit (42);

12283

- ;

12284

- return 0;

12285

-}

12286

-_ACEOF

12287

-rm -f conftest.$ac_objext

12288

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12289

- (eval $ac_compile) 2>conftest.er1

12290

- ac_status=$?

12291

- grep -v '^ *+' conftest.er1 >conftest.err

12292

- rm -f conftest.er1

12293

- cat conftest.err >&5

12294

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12295

- (exit $ac_status); } &&

12296

- { ac_try='test -z "$ac_c_werror_flag"

12297

- || test ! -s conftest.err'

12298

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12299

- (eval $ac_try) 2>&5

12300

- ac_status=$?

12301

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12302

- (exit $ac_status); }; } &&

12303

- { ac_try='test -s conftest.$ac_objext'

12304

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12305

- (eval $ac_try) 2>&5

12306

- ac_status=$?

12307

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12308

- (exit $ac_status); }; }; then

12309

- :

12310

-else

12311

- echo "$as_me: failed program was:" >&5

12312

-sed 's/^/| /' conftest.$ac_ext >&5

12313

12314

-continue

12315

-fi

12316

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

12317

- cat >conftest.$ac_ext <<_ACEOF

12318

-/* confdefs.h. */

12319

-_ACEOF

12320

-cat confdefs.h >>conftest.$ac_ext

12321

-cat >>conftest.$ac_ext <<_ACEOF

12322

-/* end confdefs.h. */

12323

-$ac_declaration

12324

-int

12325

-main ()

12326

-{

12327

-exit (42);

12328

- ;

12329

- return 0;

12330

-}

12331

-_ACEOF

12332

-rm -f conftest.$ac_objext

12333

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12334

- (eval $ac_compile) 2>conftest.er1

12335

- ac_status=$?

12336

- grep -v '^ *+' conftest.er1 >conftest.err

12337

- rm -f conftest.er1

12338

- cat conftest.err >&5

12339

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12340

- (exit $ac_status); } &&

12341

- { ac_try='test -z "$ac_c_werror_flag"

12342

- || test ! -s conftest.err'

12343

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12344

- (eval $ac_try) 2>&5

12345

- ac_status=$?

12346

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12347

- (exit $ac_status); }; } &&

12348

- { ac_try='test -s conftest.$ac_objext'

12349

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12350

- (eval $ac_try) 2>&5

12351

- ac_status=$?

12352

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12353

- (exit $ac_status); }; }; then

12354

- break

12355

-else

12356

- echo "$as_me: failed program was:" >&5

12357

-sed 's/^/| /' conftest.$ac_ext >&5

12358

-

12359

-fi

12360

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

12361

-done

12362

-rm -f conftest*

12363

-if test -n "$ac_declaration"; then

12364

- echo '#ifdef __cplusplus' >>confdefs.h

12365

- echo $ac_declaration >>confdefs.h

12366

- echo '#endif' >>confdefs.h

12367

-fi

12368

-

12369

-else

12370

- echo "$as_me: failed program was:" >&5

12371

-sed 's/^/| /' conftest.$ac_ext >&5

12372

-

12373

-fi

12374

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

12375

ac_ext=c

12376

ac_cpp='$CPP $CPPFLAGS'

12377

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

12378

@@ -19292,8 +20488,8 @@

12379

# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"

12380

# OS/2's system install, which has a completely different semantic

12381

# ./install, which can be erroneously created by make from ./install.sh.

12382

-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5

12383

-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6

12384

+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5

12385

+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }

12386

if test -z "$INSTALL"; then

12387

if test "${ac_cv_path_install+set}" = set; then

12388

echo $ECHO_N "(cached) $ECHO_C" >&6

12389

@@ -19315,7 +20511,7 @@

12390

# by default.

12391

for ac_prog in ginstall scoinst install; do

12392

for ac_exec_ext in '' $ac_executable_extensions; do

12393

- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then

12394

+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then

12395

if test $ac_prog = install &&

12396

grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then

12397

# AIX install. It has an incompatible calling convention.

12398

@@ -19334,21 +20530,22 @@

12399

;;

12400

esac

12401

done

12402

+IFS=$as_save_IFS

12403

12404

12405

fi

12406

if test "${ac_cv_path_install+set}" = set; then

12407

INSTALL=$ac_cv_path_install

12408

else

12409

- # As a last resort, use the slow shell script. We don't cache a

12410

- # path for INSTALL within a source directory, because that will

12411

+ # As a last resort, use the slow shell script. Don't cache a

12412

+ # value for INSTALL within a source directory, because that will

12413

# break other packages using the cache if that directory is

12414

- # removed, or if the path is relative.

12415

+ # removed, or if the value is a relative name.

12416

INSTALL=$ac_install_sh

12417

fi

12418

fi

12419

-echo "$as_me:$LINENO: result: $INSTALL" >&5

12420

-echo "${ECHO_T}$INSTALL" >&6

12421

+{ echo "$as_me:$LINENO: result: $INSTALL" >&5

12422

+echo "${ECHO_T}$INSTALL" >&6; }

12423

12424

# Use test -z because SunOS4 sh mishandles braces in ${var-val}.

12425

# It thinks the first close brace ends the variable substitution.

12426

@@ -19362,8 +20559,8 @@

12427

if test "$GCC" = yes ; then

12428

OLDCFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes"

12429

CFLAGS="$OLDCFLAGS -fexceptions"

12430

- echo "$as_me:$LINENO: checking whether $CC accepts -fexceptions" >&5

12431

-echo $ECHO_N "checking whether $CC accepts -fexceptions... $ECHO_C" >&6

12432

+ { echo "$as_me:$LINENO: checking whether $CC accepts -fexceptions" >&5

12433

+echo $ECHO_N "checking whether $CC accepts -fexceptions... $ECHO_C" >&6; }

12434

cat >conftest.$ac_ext <<_ACEOF

12435

/* confdefs.h. */

12436

_ACEOF

12437

@@ -19380,43 +20577,40 @@

12438

}

12439

_ACEOF

12440

rm -f conftest.$ac_objext conftest$ac_exeext

12441

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12442

- (eval $ac_link) 2>conftest.er1

12443

+if { (ac_try="$ac_link"

12444

+case "(($ac_try" in

12445

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12446

+ *) ac_try_echo=$ac_try;;

12447

+esac

12448

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12449

+ (eval "$ac_link") 2>conftest.er1

12450

ac_status=$?

12451

grep -v '^ *+' conftest.er1 >conftest.err

12452

rm -f conftest.er1

12453

cat conftest.err >&5

12454

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12455

- (exit $ac_status); } &&

12456

- { ac_try='test -z "$ac_c_werror_flag"

12457

- || test ! -s conftest.err'

12458

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12459

- (eval $ac_try) 2>&5

12460

- ac_status=$?

12461

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12462

- (exit $ac_status); }; } &&

12463

- { ac_try='test -s conftest$ac_exeext'

12464

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12465

- (eval $ac_try) 2>&5

12466

- ac_status=$?

12467

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12468

- (exit $ac_status); }; }; then

12469

- echo "$as_me:$LINENO: result: yes" >&5

12470

-echo "${ECHO_T}yes" >&6

12471

+ (exit $ac_status); } && {

12472

+ test -z "$ac_c_werror_flag" ||

12473

+ test ! -s conftest.err

12474

+ } && test -s conftest$ac_exeext &&

12475

+ $as_test_x conftest$ac_exeext; then

12476

+ { echo "$as_me:$LINENO: result: yes" >&5

12477

+echo "${ECHO_T}yes" >&6; }

12478

else

12479

echo "$as_me: failed program was:" >&5

12480

sed 's/^/| /' conftest.$ac_ext >&5

12481

12482

-echo "$as_me:$LINENO: result: no" >&5

12483

-echo "${ECHO_T}no" >&6; CFLAGS="$OLDCFLAGS"

12484

+ { echo "$as_me:$LINENO: result: no" >&5

12485

+echo "${ECHO_T}no" >&6; }; CFLAGS="$OLDCFLAGS"

12486

fi

12487

-rm -f conftest.err conftest.$ac_objext \

12488

+

12489

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12490

conftest$ac_exeext conftest.$ac_ext

12491

CXXFLAGS=`echo "$CFLAGS" | sed 's/ -Wmissing-prototypes -Wstrict-prototypes//'`

12492

fi

12493

12494

-echo "$as_me:$LINENO: checking for ANSI C header files" >&5

12495

-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6

12496

+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5

12497

+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }

12498

if test "${ac_cv_header_stdc+set}" = set; then

12499

echo $ECHO_N "(cached) $ECHO_C" >&6

12500

else

12501

@@ -19440,35 +20634,31 @@

12502

}

12503

_ACEOF

12504

rm -f conftest.$ac_objext

12505

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12506

- (eval $ac_compile) 2>conftest.er1

12507

+if { (ac_try="$ac_compile"

12508

+case "(($ac_try" in

12509

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12510

+ *) ac_try_echo=$ac_try;;

12511

+esac

12512

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12513

+ (eval "$ac_compile") 2>conftest.er1

12514

ac_status=$?

12515

grep -v '^ *+' conftest.er1 >conftest.err

12516

rm -f conftest.er1

12517

cat conftest.err >&5

12518

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12519

- (exit $ac_status); } &&

12520

- { ac_try='test -z "$ac_c_werror_flag"

12521

- || test ! -s conftest.err'

12522

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12523

- (eval $ac_try) 2>&5

12524

- ac_status=$?

12525

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12526

- (exit $ac_status); }; } &&

12527

- { ac_try='test -s conftest.$ac_objext'

12528

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12529

- (eval $ac_try) 2>&5

12530

- ac_status=$?

12531

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12532

- (exit $ac_status); }; }; then

12533

+ (exit $ac_status); } && {

12534

+ test -z "$ac_c_werror_flag" ||

12535

+ test ! -s conftest.err

12536

+ } && test -s conftest.$ac_objext; then

12537

ac_cv_header_stdc=yes

12538

else

12539

echo "$as_me: failed program was:" >&5

12540

sed 's/^/| /' conftest.$ac_ext >&5

12541

12542

-ac_cv_header_stdc=no

12543

+ ac_cv_header_stdc=no

12544

fi

12545

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

12546

+

12547

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12548

12549

if test $ac_cv_header_stdc = yes; then

12550

# SunOS 4.x string.h does not declare mem*, contrary to ANSI.

12551

@@ -19524,6 +20714,7 @@

12552

cat >>conftest.$ac_ext <<_ACEOF

12553

/* end confdefs.h. */

12554

#include <ctype.h>

12555

+#include <stdlib.h>

12556

#if ((' ' & 0x0FF) == 0x020)

12557

# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')

12558

# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))

12559

@@ -19543,18 +20734,27 @@

12560

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

12561

if (XOR (islower (i), ISLOWER (i))

12562

|| toupper (i) != TOUPPER (i))

12563

- exit(2);

12564

- exit (0);

12565

+ return 2;

12566

+ return 0;

12567

}

12568

_ACEOF

12569

rm -f conftest$ac_exeext

12570

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12571

- (eval $ac_link) 2>&5

12572

+if { (ac_try="$ac_link"

12573

+case "(($ac_try" in

12574

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12575

+ *) ac_try_echo=$ac_try;;

12576

+esac

12577

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12578

+ (eval "$ac_link") 2>&5

12579

ac_status=$?

12580

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12581

(exit $ac_status); } && { ac_try='./conftest$ac_exeext'

12582

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12583

- (eval $ac_try) 2>&5

12584

+ { (case "(($ac_try" in

12585

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12586

+ *) ac_try_echo=$ac_try;;

12587

+esac

12588

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12589

+ (eval "$ac_try") 2>&5

12590

ac_status=$?

12591

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12592

(exit $ac_status); }; }; then

12593

@@ -19567,12 +20767,14 @@

12594

( exit $ac_status )

12595

ac_cv_header_stdc=no

12596

fi

12597

-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

12598

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

12599

fi

12600

+

12601

+

12602

fi

12603

fi

12604

-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

12605

-echo "${ECHO_T}$ac_cv_header_stdc" >&6

12606

+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

12607

+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }

12608

if test $ac_cv_header_stdc = yes; then

12609

12610

cat >>confdefs.h <<\_ACEOF

12611

@@ -19583,8 +20785,8 @@

12612

12613

12614

12615

-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5

12616

-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6

12617

+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5

12618

+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }

12619

if test "${ac_cv_c_bigendian+set}" = set; then

12620

echo $ECHO_N "(cached) $ECHO_C" >&6

12621

else

12622

@@ -19610,27 +20812,22 @@

12623

}

12624

_ACEOF

12625

rm -f conftest.$ac_objext

12626

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12627

- (eval $ac_compile) 2>conftest.er1

12628

+if { (ac_try="$ac_compile"

12629

+case "(($ac_try" in

12630

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12631

+ *) ac_try_echo=$ac_try;;

12632

+esac

12633

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12634

+ (eval "$ac_compile") 2>conftest.er1

12635

ac_status=$?

12636

grep -v '^ *+' conftest.er1 >conftest.err

12637

rm -f conftest.er1

12638

cat conftest.err >&5

12639

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12640

- (exit $ac_status); } &&

12641

- { ac_try='test -z "$ac_c_werror_flag"

12642

- || test ! -s conftest.err'

12643

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12644

- (eval $ac_try) 2>&5

12645

- ac_status=$?

12646

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12647

- (exit $ac_status); }; } &&

12648

- { ac_try='test -s conftest.$ac_objext'

12649

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12650

- (eval $ac_try) 2>&5

12651

- ac_status=$?

12652

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12653

- (exit $ac_status); }; }; then

12654

+ (exit $ac_status); } && {

12655

+ test -z "$ac_c_werror_flag" ||

12656

+ test ! -s conftest.err

12657

+ } && test -s conftest.$ac_objext; then

12658

# It does; now see whether it defined to BIG_ENDIAN or not.

12659

cat >conftest.$ac_ext <<_ACEOF

12660

/* confdefs.h. */

12661

@@ -19652,41 +20849,39 @@

12662

}

12663

_ACEOF

12664

rm -f conftest.$ac_objext

12665

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12666

- (eval $ac_compile) 2>conftest.er1

12667

+if { (ac_try="$ac_compile"

12668

+case "(($ac_try" in

12669

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12670

+ *) ac_try_echo=$ac_try;;

12671

+esac

12672

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12673

+ (eval "$ac_compile") 2>conftest.er1

12674

ac_status=$?

12675

grep -v '^ *+' conftest.er1 >conftest.err

12676

rm -f conftest.er1

12677

cat conftest.err >&5

12678

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12679

- (exit $ac_status); } &&

12680

- { ac_try='test -z "$ac_c_werror_flag"

12681

- || test ! -s conftest.err'

12682

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12683

- (eval $ac_try) 2>&5

12684

- ac_status=$?

12685

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12686

- (exit $ac_status); }; } &&

12687

- { ac_try='test -s conftest.$ac_objext'

12688

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12689

- (eval $ac_try) 2>&5

12690

- ac_status=$?

12691

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12692

- (exit $ac_status); }; }; then

12693

+ (exit $ac_status); } && {

12694

+ test -z "$ac_c_werror_flag" ||

12695

+ test ! -s conftest.err

12696

+ } && test -s conftest.$ac_objext; then

12697

ac_cv_c_bigendian=yes

12698

else

12699

echo "$as_me: failed program was:" >&5

12700

sed 's/^/| /' conftest.$ac_ext >&5

12701

12702

-ac_cv_c_bigendian=no

12703

+ ac_cv_c_bigendian=no

12704

fi

12705

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

12706

+

12707

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12708

else

12709

echo "$as_me: failed program was:" >&5

12710

sed 's/^/| /' conftest.$ac_ext >&5

12711

12712

+

12713

fi

12714

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

12715

+

12716

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12717

if test $ac_cv_c_bigendian = unknown; then

12718

if test "$cross_compiling" = yes; then

12719

echo $ac_n "cross-compiling... " 2>&6

12720

@@ -19709,13 +20904,22 @@

12721

}

12722

_ACEOF

12723

rm -f conftest$ac_exeext

12724

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12725

- (eval $ac_link) 2>&5

12726

+if { (ac_try="$ac_link"

12727

+case "(($ac_try" in

12728

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12729

+ *) ac_try_echo=$ac_try;;

12730

+esac

12731

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12732

+ (eval "$ac_link") 2>&5

12733

ac_status=$?

12734

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12735

(exit $ac_status); } && { ac_try='./conftest$ac_exeext'

12736

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12737

- (eval $ac_try) 2>&5

12738

+ { (case "(($ac_try" in

12739

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12740

+ *) ac_try_echo=$ac_try;;

12741

+esac

12742

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12743

+ (eval "$ac_try") 2>&5

12744

ac_status=$?

12745

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12746

(exit $ac_status); }; }; then

12747

@@ -19728,15 +20932,17 @@

12748

( exit $ac_status )

12749

ac_cv_c_bigendian=yes

12750

fi

12751

-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

12752

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

12753

fi

12754

+

12755

+

12756

fi

12757

fi

12758

-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5

12759

-echo "${ECHO_T}$ac_cv_c_bigendian" >&6

12760

+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5

12761

+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }

12762

if test $ac_cv_c_bigendian = unknown; then

12763

-echo "$as_me:$LINENO: checking to probe for byte ordering" >&5

12764

-echo $ECHO_N "checking to probe for byte ordering... $ECHO_C" >&6

12765

+{ echo "$as_me:$LINENO: checking to probe for byte ordering" >&5

12766

+echo $ECHO_N "checking to probe for byte ordering... $ECHO_C" >&6; }

12767

12768

cat >conftest.c <<EOF

12769

short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };

12770

@@ -19764,8 +20970,8 @@

12771

echo $ac_n 'guessing bigendian ... ' >&6

12772

fi

12773

fi

12774

-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5

12775

-echo "${ECHO_T}$ac_cv_c_bigendian" >&6

12776

+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5

12777

+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }

12778

fi

12779

if test $ac_cv_c_bigendian = yes; then

12780

12781

@@ -19789,8 +20995,8 @@

12782

fi

12783

12784

12785

-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5

12786

-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6

12787

+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5

12788

+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }

12789

if test "${ac_cv_c_const+set}" = set; then

12790

echo $ECHO_N "(cached) $ECHO_C" >&6

12791

else

12792

@@ -19808,10 +21014,10 @@

12793

#ifndef __cplusplus

12794

/* Ultrix mips cc rejects this. */

12795

typedef int charset[2];

12796

- const charset x;

12797

+ const charset cs;

12798

/* SunOS 4.1.1 cc rejects this. */

12799

- char const *const *ccp;

12800

- char **p;

12801

+ char const *const *pcpcc;

12802

+ char **ppc;

12803

/* NEC SVR4.0.2 mips cc rejects this. */

12804

struct point {int x, y;};

12805

static struct point const zero = {0,0};

12806

@@ -19820,16 +21026,17 @@

12807

an arm of an if-expression whose if-part is not a constant

12808

expression */

12809

const char *g = "string";

12810

- ccp = &g + (g ? g-g : 0);

12811

+ pcpcc = &g + (g ? g-g : 0);

12812

/* HPUX 7.0 cc rejects these. */

12813

- ++ccp;

12814

- p = (char**) ccp;

12815

- ccp = (char const *const *) p;

12816

+ ++pcpcc;

12817

+ ppc = (char**) pcpcc;

12818

+ pcpcc = (char const *const *) ppc;

12819

{ /* SCO 3.2v4 cc rejects this. */

12820

char *t;

12821

char const *s = 0 ? (char *) 0 : (char const *) 0;

12822

12823

*t++ = 0;

12824

+ if (s) return 0;

12825

}

12826

{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */

12827

int x[] = {25, 17};

12828

@@ -19848,7 +21055,9 @@

12829

}

12830

{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */

12831

const int foo = 10;

12832

+ if (!foo) return 0;

12833

}

12834

+ return !cs[0] && !zero.x;

12835

#endif

12836

12837

;

12838

@@ -19856,38 +21065,34 @@

12839

}

12840

_ACEOF

12841

rm -f conftest.$ac_objext

12842

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12843

- (eval $ac_compile) 2>conftest.er1

12844

+if { (ac_try="$ac_compile"

12845

+case "(($ac_try" in

12846

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12847

+ *) ac_try_echo=$ac_try;;

12848

+esac

12849

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12850

+ (eval "$ac_compile") 2>conftest.er1

12851

ac_status=$?

12852

grep -v '^ *+' conftest.er1 >conftest.err

12853

rm -f conftest.er1

12854

cat conftest.err >&5

12855

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12856

- (exit $ac_status); } &&

12857

- { ac_try='test -z "$ac_c_werror_flag"

12858

- || test ! -s conftest.err'

12859

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12860

- (eval $ac_try) 2>&5

12861

- ac_status=$?

12862

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12863

- (exit $ac_status); }; } &&

12864

- { ac_try='test -s conftest.$ac_objext'

12865

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12866

- (eval $ac_try) 2>&5

12867

- ac_status=$?

12868

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12869

- (exit $ac_status); }; }; then

12870

+ (exit $ac_status); } && {

12871

+ test -z "$ac_c_werror_flag" ||

12872

+ test ! -s conftest.err

12873

+ } && test -s conftest.$ac_objext; then

12874

ac_cv_c_const=yes

12875

else

12876

echo "$as_me: failed program was:" >&5

12877

sed 's/^/| /' conftest.$ac_ext >&5

12878

12879

-ac_cv_c_const=no

12880

+ ac_cv_c_const=no

12881

fi

12882

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

12883

+

12884

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12885

fi

12886

-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5

12887

-echo "${ECHO_T}$ac_cv_c_const" >&6

12888

+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5

12889

+echo "${ECHO_T}$ac_cv_c_const" >&6; }

12890

if test $ac_cv_c_const = no; then

12891

12892

cat >>confdefs.h <<\_ACEOF

12893

@@ -19896,8 +21101,8 @@

12894

12895

fi

12896

12897

-echo "$as_me:$LINENO: checking for size_t" >&5

12898

-echo $ECHO_N "checking for size_t... $ECHO_C" >&6

12899

+{ echo "$as_me:$LINENO: checking for size_t" >&5

12900

+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }

12901

if test "${ac_cv_type_size_t+set}" = set; then

12902

echo $ECHO_N "(cached) $ECHO_C" >&6

12903

else

12904

@@ -19908,56 +21113,53 @@

12905

cat >>conftest.$ac_ext <<_ACEOF

12906

/* end confdefs.h. */

12907

$ac_includes_default

12908

+typedef size_t ac__type_new_;

12909

int

12910

main ()

12911

{

12912

-if ((size_t *) 0)

12913

+if ((ac__type_new_ *) 0)

12914

return 0;

12915

-if (sizeof (size_t))

12916

+if (sizeof (ac__type_new_))

12917

return 0;

12918

;

12919

return 0;

12920

}

12921

_ACEOF

12922

rm -f conftest.$ac_objext

12923

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12924

- (eval $ac_compile) 2>conftest.er1

12925

+if { (ac_try="$ac_compile"

12926

+case "(($ac_try" in

12927

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12928

+ *) ac_try_echo=$ac_try;;

12929

+esac

12930

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12931

+ (eval "$ac_compile") 2>conftest.er1

12932

ac_status=$?

12933

grep -v '^ *+' conftest.er1 >conftest.err

12934

rm -f conftest.er1

12935

cat conftest.err >&5

12936

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12937

- (exit $ac_status); } &&

12938

- { ac_try='test -z "$ac_c_werror_flag"

12939

- || test ! -s conftest.err'

12940

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12941

- (eval $ac_try) 2>&5

12942

- ac_status=$?

12943

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12944

- (exit $ac_status); }; } &&

12945

- { ac_try='test -s conftest.$ac_objext'

12946

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12947

- (eval $ac_try) 2>&5

12948

- ac_status=$?

12949

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12950

- (exit $ac_status); }; }; then

12951

+ (exit $ac_status); } && {

12952

+ test -z "$ac_c_werror_flag" ||

12953

+ test ! -s conftest.err

12954

+ } && test -s conftest.$ac_objext; then

12955

ac_cv_type_size_t=yes

12956

else

12957

echo "$as_me: failed program was:" >&5

12958

sed 's/^/| /' conftest.$ac_ext >&5

12959

12960

-ac_cv_type_size_t=no

12961

+ ac_cv_type_size_t=no

12962

fi

12963

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

12964

+

12965

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12966

fi

12967

-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5

12968

-echo "${ECHO_T}$ac_cv_type_size_t" >&6

12969

+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5

12970

+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }

12971

if test $ac_cv_type_size_t = yes; then

12972

:

12973

else

12974

12975

cat >>confdefs.h <<_ACEOF

12976

-#define size_t unsigned

12977

+#define size_t unsigned int

12978

_ACEOF

12979

12980

fi

12981

@@ -19967,9 +21169,9 @@

12982

for ac_func in memmove bcopy

12983

do

12984

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

12985

-echo "$as_me:$LINENO: checking for $ac_func" >&5

12986

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

12987

-if eval "test \"\${$as_ac_var+set}\" = set"; then

12988

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

12989

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

12990

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

12991

echo $ECHO_N "(cached) $ECHO_C" >&6

12992

else

12993

cat >conftest.$ac_ext <<_ACEOF

12994

@@ -19995,68 +21197,60 @@

12995

12996

#undef $ac_func

12997

12998

-/* Override any gcc2 internal prototype to avoid an error. */

12999

+/* Override any GCC internal prototype to avoid an error.

13000

+ Use char because int might match the return type of a GCC

13001

+ builtin and then its argument prototype would still apply. */

13002

#ifdef __cplusplus

13003

extern "C"

13004

-{

13005

#endif

13006

-/* We use char because int might match the return type of a gcc2

13007

- builtin and then its argument prototype would still apply. */

13008

char $ac_func ();

13009

/* The GNU C library defines this for functions which it implements

13010

to always fail with ENOSYS. Some functions are actually named

13011

something starting with __ and the normal name is an alias. */

13012

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

13013

+#if defined __stub_$ac_func || defined __stub___$ac_func

13014

choke me

13015

-#else

13016

-char (*f) () = $ac_func;

13017

-#endif

13018

-#ifdef __cplusplus

13019

-}

13020

#endif

13021

13022

int

13023

main ()

13024

{

13025

-return f != $ac_func;

13026

+return $ac_func ();

13027

;

13028

return 0;

13029

}

13030

_ACEOF

13031

rm -f conftest.$ac_objext conftest$ac_exeext

13032

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13033

- (eval $ac_link) 2>conftest.er1

13034

+if { (ac_try="$ac_link"

13035

+case "(($ac_try" in

13036

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13037

+ *) ac_try_echo=$ac_try;;

13038

+esac

13039

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13040

+ (eval "$ac_link") 2>conftest.er1

13041

ac_status=$?

13042

grep -v '^ *+' conftest.er1 >conftest.err

13043

rm -f conftest.er1

13044

cat conftest.err >&5

13045

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13046

- (exit $ac_status); } &&

13047

- { ac_try='test -z "$ac_c_werror_flag"

13048

- || test ! -s conftest.err'

13049

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13050

- (eval $ac_try) 2>&5

13051

- ac_status=$?

13052

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13053

- (exit $ac_status); }; } &&

13054

- { ac_try='test -s conftest$ac_exeext'

13055

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13056

- (eval $ac_try) 2>&5

13057

- ac_status=$?

13058

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13059

- (exit $ac_status); }; }; then

13060

+ (exit $ac_status); } && {

13061

+ test -z "$ac_c_werror_flag" ||

13062

+ test ! -s conftest.err

13063

+ } && test -s conftest$ac_exeext &&

13064

+ $as_test_x conftest$ac_exeext; then

13065

eval "$as_ac_var=yes"

13066

else

13067

echo "$as_me: failed program was:" >&5

13068

sed 's/^/| /' conftest.$ac_ext >&5

13069

13070

-eval "$as_ac_var=no"

13071

+ eval "$as_ac_var=no"

13072

fi

13073

-rm -f conftest.err conftest.$ac_objext \

13074

+

13075

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13076

conftest$ac_exeext conftest.$ac_ext

13077

fi

13078

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

13079

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

13080

+ac_res=`eval echo '${'$as_ac_var'}'`

13081

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

13082

+echo "${ECHO_T}$ac_res" >&6; }

13083

if test `eval echo '${'$as_ac_var'}'` = yes; then

13084

cat >>confdefs.h <<_ACEOF

13085

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

13086

@@ -20071,18 +21265,19 @@

13087

for ac_header in fcntl.h unistd.h

13088

do

13089

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

13090

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

13091

- echo "$as_me:$LINENO: checking for $ac_header" >&5

13092

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

13093

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

13094

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

13095

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

13096

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

13097

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

13098

echo $ECHO_N "(cached) $ECHO_C" >&6

13099

fi

13100

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

13101

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

13102

+ac_res=`eval echo '${'$as_ac_Header'}'`

13103

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

13104

+echo "${ECHO_T}$ac_res" >&6; }

13105

else

13106

# Is the header compilable?

13107

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

13108

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

13109

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

13110

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

13111

cat >conftest.$ac_ext <<_ACEOF

13112

/* confdefs.h. */

13113

_ACEOF

13114

@@ -20093,41 +21288,37 @@

13115

#include <$ac_header>

13116

_ACEOF

13117

rm -f conftest.$ac_objext

13118

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

13119

- (eval $ac_compile) 2>conftest.er1

13120

+if { (ac_try="$ac_compile"

13121

+case "(($ac_try" in

13122

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13123

+ *) ac_try_echo=$ac_try;;

13124

+esac

13125

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13126

+ (eval "$ac_compile") 2>conftest.er1

13127

ac_status=$?

13128

grep -v '^ *+' conftest.er1 >conftest.err

13129

rm -f conftest.er1

13130

cat conftest.err >&5

13131

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13132

- (exit $ac_status); } &&

13133

- { ac_try='test -z "$ac_c_werror_flag"

13134

- || test ! -s conftest.err'

13135

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13136

- (eval $ac_try) 2>&5

13137

- ac_status=$?

13138

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13139

- (exit $ac_status); }; } &&

13140

- { ac_try='test -s conftest.$ac_objext'

13141

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13142

- (eval $ac_try) 2>&5

13143

- ac_status=$?

13144

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13145

- (exit $ac_status); }; }; then

13146

+ (exit $ac_status); } && {

13147

+ test -z "$ac_c_werror_flag" ||

13148

+ test ! -s conftest.err

13149

+ } && test -s conftest.$ac_objext; then

13150

ac_header_compiler=yes

13151

else

13152

echo "$as_me: failed program was:" >&5

13153

sed 's/^/| /' conftest.$ac_ext >&5

13154

13155

-ac_header_compiler=no

13156

+ ac_header_compiler=no

13157

fi

13158

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

13159

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

13160

-echo "${ECHO_T}$ac_header_compiler" >&6

13161

+

13162

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

13163

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

13164

+echo "${ECHO_T}$ac_header_compiler" >&6; }

13165

13166

# Is the header present?

13167

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

13168

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

13169

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

13170

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

13171

cat >conftest.$ac_ext <<_ACEOF

13172

/* confdefs.h. */

13173

_ACEOF

13174

@@ -20136,24 +21327,22 @@

13175

/* end confdefs.h. */

13176

#include <$ac_header>

13177

_ACEOF

13178

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

13179

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

13180

+if { (ac_try="$ac_cpp conftest.$ac_ext"

13181

+case "(($ac_try" in

13182

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13183

+ *) ac_try_echo=$ac_try;;

13184

+esac

13185

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13186

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

13187

ac_status=$?

13188

grep -v '^ *+' conftest.er1 >conftest.err

13189

rm -f conftest.er1

13190

cat conftest.err >&5

13191

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13192

- (exit $ac_status); } >/dev/null; then

13193

- if test -s conftest.err; then

13194

- ac_cpp_err=$ac_c_preproc_warn_flag

13195

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

13196

- else

13197

- ac_cpp_err=

13198

- fi

13199

-else

13200

- ac_cpp_err=yes

13201

-fi

13202

-if test -z "$ac_cpp_err"; then

13203

+ (exit $ac_status); } >/dev/null && {

13204

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

13205

+ test ! -s conftest.err

13206

+ }; then

13207

ac_header_preproc=yes

13208

else

13209

echo "$as_me: failed program was:" >&5

13210

@@ -20161,9 +21350,10 @@

13211

13212

ac_header_preproc=no

13213

fi

13214

+

13215

rm -f conftest.err conftest.$ac_ext

13216

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

13217

-echo "${ECHO_T}$ac_header_preproc" >&6

13218

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

13219

+echo "${ECHO_T}$ac_header_preproc" >&6; }

13220

13221

# So? What about this header?

13222

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

13223

@@ -20187,25 +21377,24 @@

13224

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

13225

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

13226

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

13227

- (

13228

- cat <<\_ASBOX

13229

+ ( cat <<\_ASBOX

13230

## -------------------------------------- ##

13231

## Report this to expat-bugs@libexpat.org ##

13232

## -------------------------------------- ##

13233

_ASBOX

13234

- ) |

13235

- sed "s/^/$as_me: WARNING: /" >&2

13236

+ ) | sed "s/^/$as_me: WARNING: /" >&2

13237

;;

13238

esac

13239

-echo "$as_me:$LINENO: checking for $ac_header" >&5

13240

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

13241

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

13242

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

13243

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

13244

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

13245

echo $ECHO_N "(cached) $ECHO_C" >&6

13246

else

13247

eval "$as_ac_Header=\$ac_header_preproc"

13248

fi

13249

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

13250

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

13251

+ac_res=`eval echo '${'$as_ac_Header'}'`

13252

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

13253

+echo "${ECHO_T}$ac_res" >&6; }

13254

13255

fi

13256

if test `eval echo '${'$as_ac_Header'}'` = yes; then

13257

@@ -20217,8 +21406,8 @@

13258

13259

done

13260

13261

-echo "$as_me:$LINENO: checking for off_t" >&5

13262

-echo $ECHO_N "checking for off_t... $ECHO_C" >&6

13263

+{ echo "$as_me:$LINENO: checking for off_t" >&5

13264

+echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }

13265

if test "${ac_cv_type_off_t+set}" = set; then

13266

echo $ECHO_N "(cached) $ECHO_C" >&6

13267

else

13268

@@ -20229,56 +21418,53 @@

13269

cat >>conftest.$ac_ext <<_ACEOF

13270

/* end confdefs.h. */

13271

$ac_includes_default

13272

+typedef off_t ac__type_new_;

13273

int

13274

main ()

13275

{

13276

-if ((off_t *) 0)

13277

+if ((ac__type_new_ *) 0)

13278

return 0;

13279

-if (sizeof (off_t))

13280

+if (sizeof (ac__type_new_))

13281

return 0;

13282

;

13283

return 0;

13284

}

13285

_ACEOF

13286

rm -f conftest.$ac_objext

13287

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

13288

- (eval $ac_compile) 2>conftest.er1

13289

+if { (ac_try="$ac_compile"

13290

+case "(($ac_try" in

13291

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13292

+ *) ac_try_echo=$ac_try;;

13293

+esac

13294

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13295

+ (eval "$ac_compile") 2>conftest.er1

13296

ac_status=$?

13297

grep -v '^ *+' conftest.er1 >conftest.err

13298

rm -f conftest.er1

13299

cat conftest.err >&5

13300

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13301

- (exit $ac_status); } &&

13302

- { ac_try='test -z "$ac_c_werror_flag"

13303

- || test ! -s conftest.err'

13304

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13305

- (eval $ac_try) 2>&5

13306

- ac_status=$?

13307

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13308

- (exit $ac_status); }; } &&

13309

- { ac_try='test -s conftest.$ac_objext'

13310

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13311

- (eval $ac_try) 2>&5

13312

- ac_status=$?

13313

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13314

- (exit $ac_status); }; }; then

13315

+ (exit $ac_status); } && {

13316

+ test -z "$ac_c_werror_flag" ||

13317

+ test ! -s conftest.err

13318

+ } && test -s conftest.$ac_objext; then

13319

ac_cv_type_off_t=yes

13320

else

13321

echo "$as_me: failed program was:" >&5

13322

sed 's/^/| /' conftest.$ac_ext >&5

13323

13324

-ac_cv_type_off_t=no

13325

+ ac_cv_type_off_t=no

13326

fi

13327

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

13328

+

13329

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

13330

fi

13331

-echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5

13332

-echo "${ECHO_T}$ac_cv_type_off_t" >&6

13333

+{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5

13334

+echo "${ECHO_T}$ac_cv_type_off_t" >&6; }

13335

if test $ac_cv_type_off_t = yes; then

13336

:

13337

else

13338

13339

cat >>confdefs.h <<_ACEOF

13340

-#define off_t long

13341

+#define off_t long int

13342

_ACEOF

13343

13344

fi

13345

@@ -20288,18 +21474,19 @@

13346

for ac_header in stdlib.h unistd.h

13347

do

13348

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

13349

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

13350

- echo "$as_me:$LINENO: checking for $ac_header" >&5

13351

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

13352

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

13353

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

13354

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

13355

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

13356

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

13357

echo $ECHO_N "(cached) $ECHO_C" >&6

13358

fi

13359

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

13360

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

13361

+ac_res=`eval echo '${'$as_ac_Header'}'`

13362

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

13363

+echo "${ECHO_T}$ac_res" >&6; }

13364

else

13365

# Is the header compilable?

13366

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

13367

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

13368

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

13369

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

13370

cat >conftest.$ac_ext <<_ACEOF

13371

/* confdefs.h. */

13372

_ACEOF

13373

@@ -20310,41 +21497,37 @@

13374

#include <$ac_header>

13375

_ACEOF

13376

rm -f conftest.$ac_objext

13377

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

13378

- (eval $ac_compile) 2>conftest.er1

13379

+if { (ac_try="$ac_compile"

13380

+case "(($ac_try" in

13381

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13382

+ *) ac_try_echo=$ac_try;;

13383

+esac

13384

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13385

+ (eval "$ac_compile") 2>conftest.er1

13386

ac_status=$?

13387

grep -v '^ *+' conftest.er1 >conftest.err

13388

rm -f conftest.er1

13389

cat conftest.err >&5

13390

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13391

- (exit $ac_status); } &&

13392

- { ac_try='test -z "$ac_c_werror_flag"

13393

- || test ! -s conftest.err'

13394

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13395

- (eval $ac_try) 2>&5

13396

- ac_status=$?

13397

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13398

- (exit $ac_status); }; } &&

13399

- { ac_try='test -s conftest.$ac_objext'

13400

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13401

- (eval $ac_try) 2>&5

13402

- ac_status=$?

13403

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13404

- (exit $ac_status); }; }; then

13405

+ (exit $ac_status); } && {

13406

+ test -z "$ac_c_werror_flag" ||

13407

+ test ! -s conftest.err

13408

+ } && test -s conftest.$ac_objext; then

13409

ac_header_compiler=yes

13410

else

13411

echo "$as_me: failed program was:" >&5

13412

sed 's/^/| /' conftest.$ac_ext >&5

13413

13414

-ac_header_compiler=no

13415

+ ac_header_compiler=no

13416

fi

13417

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

13418

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

13419

-echo "${ECHO_T}$ac_header_compiler" >&6

13420

+

13421

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

13422

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

13423

+echo "${ECHO_T}$ac_header_compiler" >&6; }

13424

13425

# Is the header present?

13426

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

13427

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

13428

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

13429

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

13430

cat >conftest.$ac_ext <<_ACEOF

13431

/* confdefs.h. */

13432

_ACEOF

13433

@@ -20353,24 +21536,22 @@

13434

/* end confdefs.h. */

13435

#include <$ac_header>

13436

_ACEOF

13437

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

13438

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

13439

+if { (ac_try="$ac_cpp conftest.$ac_ext"

13440

+case "(($ac_try" in

13441

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13442

+ *) ac_try_echo=$ac_try;;

13443

+esac

13444

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13445

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

13446

ac_status=$?

13447

grep -v '^ *+' conftest.er1 >conftest.err

13448

rm -f conftest.er1

13449

cat conftest.err >&5

13450

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13451

- (exit $ac_status); } >/dev/null; then

13452

- if test -s conftest.err; then

13453

- ac_cpp_err=$ac_c_preproc_warn_flag

13454

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

13455

- else

13456

- ac_cpp_err=

13457

- fi

13458

-else

13459

- ac_cpp_err=yes

13460

-fi

13461

-if test -z "$ac_cpp_err"; then

13462

+ (exit $ac_status); } >/dev/null && {

13463

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

13464

+ test ! -s conftest.err

13465

+ }; then

13466

ac_header_preproc=yes

13467

else

13468

echo "$as_me: failed program was:" >&5

13469

@@ -20378,9 +21559,10 @@

13470

13471

ac_header_preproc=no

13472

fi

13473

+

13474

rm -f conftest.err conftest.$ac_ext

13475

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

13476

-echo "${ECHO_T}$ac_header_preproc" >&6

13477

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

13478

+echo "${ECHO_T}$ac_header_preproc" >&6; }

13479

13480

# So? What about this header?

13481

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

13482

@@ -20404,25 +21586,24 @@

13483

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

13484

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

13485

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

13486

- (

13487

- cat <<\_ASBOX

13488

+ ( cat <<\_ASBOX

13489

## -------------------------------------- ##

13490

## Report this to expat-bugs@libexpat.org ##

13491

## -------------------------------------- ##

13492

_ASBOX

13493

- ) |

13494

- sed "s/^/$as_me: WARNING: /" >&2

13495

+ ) | sed "s/^/$as_me: WARNING: /" >&2

13496

;;

13497

esac

13498

-echo "$as_me:$LINENO: checking for $ac_header" >&5

13499

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

13500

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

13501

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

13502

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

13503

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

13504

echo $ECHO_N "(cached) $ECHO_C" >&6

13505

else

13506

eval "$as_ac_Header=\$ac_header_preproc"

13507

fi

13508

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

13509

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

13510

+ac_res=`eval echo '${'$as_ac_Header'}'`

13511

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

13512

+echo "${ECHO_T}$ac_res" >&6; }

13513

13514

fi

13515

if test `eval echo '${'$as_ac_Header'}'` = yes; then

13516

@@ -20438,9 +21619,9 @@

13517

for ac_func in getpagesize

13518

do

13519

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

13520

-echo "$as_me:$LINENO: checking for $ac_func" >&5

13521

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

13522

-if eval "test \"\${$as_ac_var+set}\" = set"; then

13523

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

13524

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

13525

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

13526

echo $ECHO_N "(cached) $ECHO_C" >&6

13527

else

13528

cat >conftest.$ac_ext <<_ACEOF

13529

@@ -20466,68 +21647,60 @@

13530

13531

#undef $ac_func

13532

13533

-/* Override any gcc2 internal prototype to avoid an error. */

13534

+/* Override any GCC internal prototype to avoid an error.

13535

+ Use char because int might match the return type of a GCC

13536

+ builtin and then its argument prototype would still apply. */

13537

#ifdef __cplusplus

13538

extern "C"

13539

-{

13540

#endif

13541

-/* We use char because int might match the return type of a gcc2

13542

- builtin and then its argument prototype would still apply. */

13543

char $ac_func ();

13544

/* The GNU C library defines this for functions which it implements

13545

to always fail with ENOSYS. Some functions are actually named

13546

something starting with __ and the normal name is an alias. */

13547

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

13548

+#if defined __stub_$ac_func || defined __stub___$ac_func

13549

choke me

13550

-#else

13551

-char (*f) () = $ac_func;

13552

-#endif

13553

-#ifdef __cplusplus

13554

-}

13555

#endif

13556

13557

int

13558

main ()

13559

{

13560

-return f != $ac_func;

13561

+return $ac_func ();

13562

;

13563

return 0;

13564

}

13565

_ACEOF

13566

rm -f conftest.$ac_objext conftest$ac_exeext

13567

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13568

- (eval $ac_link) 2>conftest.er1

13569

+if { (ac_try="$ac_link"

13570

+case "(($ac_try" in

13571

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13572

+ *) ac_try_echo=$ac_try;;

13573

+esac

13574

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13575

+ (eval "$ac_link") 2>conftest.er1

13576

ac_status=$?

13577

grep -v '^ *+' conftest.er1 >conftest.err

13578

rm -f conftest.er1

13579

cat conftest.err >&5

13580

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13581

- (exit $ac_status); } &&

13582

- { ac_try='test -z "$ac_c_werror_flag"

13583

- || test ! -s conftest.err'

13584

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13585

- (eval $ac_try) 2>&5

13586

- ac_status=$?

13587

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13588

- (exit $ac_status); }; } &&

13589

- { ac_try='test -s conftest$ac_exeext'

13590

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13591

- (eval $ac_try) 2>&5

13592

- ac_status=$?

13593

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13594

- (exit $ac_status); }; }; then

13595

+ (exit $ac_status); } && {

13596

+ test -z "$ac_c_werror_flag" ||

13597

+ test ! -s conftest.err

13598

+ } && test -s conftest$ac_exeext &&

13599

+ $as_test_x conftest$ac_exeext; then

13600

eval "$as_ac_var=yes"

13601

else

13602

echo "$as_me: failed program was:" >&5

13603

sed 's/^/| /' conftest.$ac_ext >&5

13604

13605

-eval "$as_ac_var=no"

13606

+ eval "$as_ac_var=no"

13607

fi

13608

-rm -f conftest.err conftest.$ac_objext \

13609

+

13610

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13611

conftest$ac_exeext conftest.$ac_ext

13612

fi

13613

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

13614

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

13615

+ac_res=`eval echo '${'$as_ac_var'}'`

13616

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

13617

+echo "${ECHO_T}$ac_res" >&6; }

13618

if test `eval echo '${'$as_ac_var'}'` = yes; then

13619

cat >>confdefs.h <<_ACEOF

13620

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

13621

@@ -20536,8 +21709,8 @@

13622

fi

13623

done

13624

13625

-echo "$as_me:$LINENO: checking for working mmap" >&5

13626

-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6

13627

+{ echo "$as_me:$LINENO: checking for working mmap" >&5

13628

+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }

13629

if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then

13630

echo $ECHO_N "(cached) $ECHO_C" >&6

13631

else

13632

@@ -20579,21 +21752,21 @@

13633

#include <fcntl.h>

13634

#include <sys/mman.h>

13635

13636

-#if !STDC_HEADERS && !HAVE_STDLIB_H

13637

+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H

13638

char *malloc ();

13639

#endif

13640

13641

/* This mess was copied from the GNU getpagesize.h. */

13642

-#if !HAVE_GETPAGESIZE

13643

+#ifndef HAVE_GETPAGESIZE

13644

/* Assume that all systems that can run configure have sys/param.h. */

13645

-# if !HAVE_SYS_PARAM_H

13646

+# ifndef HAVE_SYS_PARAM_H

13647

# define HAVE_SYS_PARAM_H 1

13648

# endif

13649

13650

# ifdef _SC_PAGESIZE

13651

# define getpagesize() sysconf(_SC_PAGESIZE)

13652

# else /* no _SC_PAGESIZE */

13653

-# if HAVE_SYS_PARAM_H

13654

+# ifdef HAVE_SYS_PARAM_H

13655

# include <sys/param.h>

13656

# ifdef EXEC_PAGESIZE

13657

# define getpagesize() EXEC_PAGESIZE

13658

@@ -20632,15 +21805,15 @@

13659

/* First, make a file with some known garbage in it. */

13660

data = (char *) malloc (pagesize);

13661

if (!data)

13662

- exit (1);

13663

+ return 1;

13664

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

13665

*(data + i) = rand ();

13666

umask (0);

13667

fd = creat ("conftest.mmap", 0600);

13668

if (fd < 0)

13669

- exit (1);

13670

+ return 1;

13671

if (write (fd, data, pagesize) != pagesize)

13672

- exit (1);

13673

+ return 1;

13674

close (fd);

13675

13676

/* Next, try to mmap the file at a fixed address which already has

13677

@@ -20648,17 +21821,17 @@

13678

we see the same garbage. */

13679

fd = open ("conftest.mmap", O_RDWR);

13680

if (fd < 0)

13681

- exit (1);

13682

+ return 1;

13683

data2 = (char *) malloc (2 * pagesize);

13684

if (!data2)

13685

- exit (1);

13686

- data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);

13687

+ return 1;

13688

+ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);

13689

if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,

13690

MAP_PRIVATE | MAP_FIXED, fd, 0L))

13691

- exit (1);

13692

+ return 1;

13693

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

13694

if (*(data + i) != *(data2 + i))

13695

- exit (1);

13696

+ return 1;

13697

13698

/* Finally, make sure that changes to the mapped area do not

13699

percolate back to the file as seen by read(). (This is a bug on

13700

@@ -20667,24 +21840,33 @@

13701

*(data2 + i) = *(data2 + i) + 1;

13702

data3 = (char *) malloc (pagesize);

13703

if (!data3)

13704

- exit (1);

13705

+ return 1;

13706

if (read (fd, data3, pagesize) != pagesize)

13707

- exit (1);

13708

+ return 1;

13709

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

13710

if (*(data + i) != *(data3 + i))

13711

- exit (1);

13712

+ return 1;

13713

close (fd);

13714

- exit (0);

13715

+ return 0;

13716

}

13717

_ACEOF

13718

rm -f conftest$ac_exeext

13719

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13720

- (eval $ac_link) 2>&5

13721

+if { (ac_try="$ac_link"

13722

+case "(($ac_try" in

13723

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13724

+ *) ac_try_echo=$ac_try;;

13725

+esac

13726

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13727

+ (eval "$ac_link") 2>&5

13728

ac_status=$?

13729

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13730

(exit $ac_status); } && { ac_try='./conftest$ac_exeext'

13731

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13732

- (eval $ac_try) 2>&5

13733

+ { (case "(($ac_try" in

13734

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13735

+ *) ac_try_echo=$ac_try;;

13736

+esac

13737

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13738

+ (eval "$ac_try") 2>&5

13739

ac_status=$?

13740

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13741

(exit $ac_status); }; }; then

13742

@@ -20697,11 +21879,13 @@

13743

( exit $ac_status )

13744

ac_cv_func_mmap_fixed_mapped=no

13745

fi

13746

-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

13747

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

13748

fi

13749

+

13750

+

13751

fi

13752

-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5

13753

-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6

13754

+{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5

13755

+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }

13756

if test $ac_cv_func_mmap_fixed_mapped = yes; then

13757

13758

cat >>confdefs.h <<\_ACEOF

13759

@@ -20727,9 +21911,351 @@

13760

# If not, we'll just define __func__ to "".

13761

# AC_CPP_FUNC

13762

13763

+ case $ac_cv_prog_cc_stdc in

13764

+ no) ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;;

13765

+ *) { echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5

13766

+echo $ECHO_N "checking for $CC option to accept ISO C99... $ECHO_C" >&6; }

13767

+if test "${ac_cv_prog_cc_c99+set}" = set; then

13768

+ echo $ECHO_N "(cached) $ECHO_C" >&6

13769

+else

13770

+ ac_cv_prog_cc_c99=no

13771

+ac_save_CC=$CC

13772

+cat >conftest.$ac_ext <<_ACEOF

13773

+/* confdefs.h. */

13774

+_ACEOF

13775

+cat confdefs.h >>conftest.$ac_ext

13776

+cat >>conftest.$ac_ext <<_ACEOF

13777

+/* end confdefs.h. */

13778

+#include <stdarg.h>

13779

+#include <stdbool.h>

13780

+#include <stdlib.h>

13781

+#include <wchar.h>

13782

+#include <stdio.h>

13783

13784

-echo "$as_me:$LINENO: checking for an ANSI C99-conforming __func__" >&5

13785

-echo $ECHO_N "checking for an ANSI C99-conforming __func__... $ECHO_C" >&6

13786

+// Check varargs macros. These examples are taken from C99 6.10.3.5.

13787

+#define debug(...) fprintf (stderr, __VA_ARGS__)

13788

+#define showlist(...) puts (#__VA_ARGS__)

13789

+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))

13790

+static void

13791

+test_varargs_macros (void)

13792

+{

13793

+ int x = 1234;

13794

+ int y = 5678;

13795

+ debug ("Flag");

13796

+ debug ("X = %d\n", x);

13797

+ showlist (The first, second, and third items.);

13798

+ report (x>y, "x is %d but y is %d", x, y);

13799

+}

13800

+

13801

+// Check long long types.

13802

+#define BIG64 18446744073709551615ull

13803

+#define BIG32 4294967295ul

13804

+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)

13805

+#if !BIG_OK

13806

+ your preprocessor is broken;

13807

+#endif

13808

+#if BIG_OK

13809

+#else

13810

+ your preprocessor is broken;

13811

+#endif

13812

+static long long int bignum = -9223372036854775807LL;

13813

+static unsigned long long int ubignum = BIG64;

13814

+

13815

+struct incomplete_array

13816

+{

13817

+ int datasize;

13818

+ double data[];

13819

+};

13820

+

13821

+struct named_init {

13822

+ int number;

13823

+ const wchar_t *name;

13824

+ double average;

13825

+};

13826

+

13827

+typedef const char *ccp;

13828

+

13829

+static inline int

13830

+test_restrict (ccp restrict text)

13831

+{

13832

+ // See if C++-style comments work.

13833

+ // Iterate through items via the restricted pointer.

13834

+ // Also check for declarations in for loops.

13835

+ for (unsigned int i = 0; *(text+i) != '\0'; ++i)

13836

+ continue;

13837

+ return 0;

13838

+}

13839

+

13840

+// Check varargs and va_copy.

13841

+static void

13842

+test_varargs (const char *format, ...)

13843

+{

13844

+ va_list args;

13845

+ va_start (args, format);

13846

+ va_list args_copy;

13847

+ va_copy (args_copy, args);

13848

+

13849

+ const char *str;

13850

+ int number;

13851

+ float fnumber;

13852

+

13853

+ while (*format)

13854

+ {

13855

+ switch (*format++)

13856

+ {

13857

+ case 's': // string

13858

+ str = va_arg (args_copy, const char *);

13859

+ break;

13860

+ case 'd': // int

13861

+ number = va_arg (args_copy, int);

13862

+ break;

13863

+ case 'f': // float

13864

+ fnumber = va_arg (args_copy, double);

13865

+ break;

13866

+ default:

13867

+ break;

13868

+ }

13869

+ }

13870

+ va_end (args_copy);

13871

+ va_end (args);

13872

+}

13873

+

13874

+int

13875

+main ()

13876

+{

13877

+

13878

+ // Check bool.

13879

+ _Bool success = false;

13880

+

13881

+ // Check restrict.

13882

+ if (test_restrict ("String literal") == 0)

13883

+ success = true;

13884

+ char *restrict newvar = "Another string";

13885

+

13886

+ // Check varargs.

13887

+ test_varargs ("s, d' f .", "string", 65, 34.234);

13888

+ test_varargs_macros ();

13889

+

13890

+ // Check flexible array members.

13891

+ struct incomplete_array *ia =

13892

+ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));

13893

+ ia->datasize = 10;

13894

+ for (int i = 0; i < ia->datasize; ++i)

13895

+ ia->data[i] = i * 1.234;

13896

+

13897

+ // Check named initializers.

13898

+ struct named_init ni = {

13899

+ .number = 34,

13900

+ .name = L"Test wide string",

13901

+ .average = 543.34343,

13902

+ };

13903

+

13904

+ ni.number = 58;

13905

+

13906

+ int dynamic_array[ni.number];

13907

+ dynamic_array[ni.number - 1] = 543;

13908

+

13909

+ // work around unused variable warnings

13910

+ return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'

13911

+ || dynamic_array[ni.number - 1] != 543);

13912

+

13913

+ ;

13914

+ return 0;

13915

+}

13916

+_ACEOF

13917

+for ac_arg in '' -std=gnu99 -c99 -qlanglvl=extc99

13918

+do

13919

+ CC="$ac_save_CC $ac_arg"

13920

+ rm -f conftest.$ac_objext

13921

+if { (ac_try="$ac_compile"

13922

+case "(($ac_try" in

13923

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13924

+ *) ac_try_echo=$ac_try;;

13925

+esac

13926

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13927

+ (eval "$ac_compile") 2>conftest.er1

13928

+ ac_status=$?

13929

+ grep -v '^ *+' conftest.er1 >conftest.err

13930

+ rm -f conftest.er1

13931

+ cat conftest.err >&5

13932

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13933

+ (exit $ac_status); } && {

13934

+ test -z "$ac_c_werror_flag" ||

13935

+ test ! -s conftest.err

13936

+ } && test -s conftest.$ac_objext; then

13937

+ ac_cv_prog_cc_c99=$ac_arg

13938

+else

13939

+ echo "$as_me: failed program was:" >&5

13940

+sed 's/^/| /' conftest.$ac_ext >&5

13941

+

13942

+

13943

+fi

13944

+

13945

+rm -f core conftest.err conftest.$ac_objext

13946

+ test "x$ac_cv_prog_cc_c99" != "xno" && break

13947

+done

13948

+rm -f conftest.$ac_ext

13949

+CC=$ac_save_CC

13950

+

13951

+fi

13952

+# AC_CACHE_VAL

13953

+case "x$ac_cv_prog_cc_c99" in

13954

+ x)

13955

+ { echo "$as_me:$LINENO: result: none needed" >&5

13956

+echo "${ECHO_T}none needed" >&6; } ;;

13957

+ xno)

13958

+ { echo "$as_me:$LINENO: result: unsupported" >&5

13959

+echo "${ECHO_T}unsupported" >&6; } ;;

13960

+ *)

13961

+ CC="$CC $ac_cv_prog_cc_c99"

13962

+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5

13963

+echo "${ECHO_T}$ac_cv_prog_cc_c99" >&6; } ;;

13964

+esac

13965

+if test "x$ac_cv_prog_cc_c99" != xno; then

13966

+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99

13967

+else

13968

+ { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

13969

+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }

13970

+if test "${ac_cv_prog_cc_c89+set}" = set; then

13971

+ echo $ECHO_N "(cached) $ECHO_C" >&6

13972

+else

13973

+ ac_cv_prog_cc_c89=no

13974

+ac_save_CC=$CC

13975

+cat >conftest.$ac_ext <<_ACEOF

13976

+/* confdefs.h. */

13977

+_ACEOF

13978

+cat confdefs.h >>conftest.$ac_ext

13979

+cat >>conftest.$ac_ext <<_ACEOF

13980

+/* end confdefs.h. */

13981

+#include <stdarg.h>

13982

+#include <stdio.h>

13983

+#include <sys/types.h>

13984

+#include <sys/stat.h>

13985

+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */

13986

+struct buf { int x; };

13987

+FILE * (*rcsopen) (struct buf *, struct stat *, int);

13988

+static char *e (p, i)

13989

+ char **p;

13990

+ int i;

13991

+{

13992

+ return p[i];

13993

+}

13994

+static char *f (char * (*g) (char **, int), char **p, ...)

13995

+{

13996

+ char *s;

13997

+ va_list v;

13998

+ va_start (v,p);

13999

+ s = g (p, va_arg (v,int));

14000

+ va_end (v);

14001

+ return s;

14002

+}

14003

+

14004

+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has

14005

+ function prototypes and stuff, but not '\xHH' hex character constants.

14006

+ These don't provoke an error unfortunately, instead are silently treated

14007

+ as 'x'. The following induces an error, until -std is added to get

14008

+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an

14009

+ array size at least. It's necessary to write '\x00'==0 to get something

14010

+ that's true only with -std. */

14011

+int osf4_cc_array ['\x00' == 0 ? 1 : -1];

14012

+

14013

+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters

14014

+ inside strings and character constants. */

14015

+#define FOO(x) 'x'

14016

+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];

14017

+

14018

+int test (int i, double x);

14019

+struct s1 {int (*f) (int a);};

14020

+struct s2 {int (*f) (double a);};

14021

+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);

14022

+int argc;

14023

+char **argv;

14024

+int

14025

+main ()

14026

+{

14027

+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];

14028

+ ;

14029

+ return 0;

14030

+}

14031

+_ACEOF

14032

+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \

14033

+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

14034

+do

14035

+ CC="$ac_save_CC $ac_arg"

14036

+ rm -f conftest.$ac_objext

14037

+if { (ac_try="$ac_compile"

14038

+case "(($ac_try" in

14039

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14040

+ *) ac_try_echo=$ac_try;;

14041

+esac

14042

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14043

+ (eval "$ac_compile") 2>conftest.er1

14044

+ ac_status=$?

14045

+ grep -v '^ *+' conftest.er1 >conftest.err

14046

+ rm -f conftest.er1

14047

+ cat conftest.err >&5

14048

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

14049

+ (exit $ac_status); } && {

14050

+ test -z "$ac_c_werror_flag" ||

14051

+ test ! -s conftest.err

14052

+ } && test -s conftest.$ac_objext; then

14053

+ ac_cv_prog_cc_c89=$ac_arg

14054

+else

14055

+ echo "$as_me: failed program was:" >&5

14056

+sed 's/^/| /' conftest.$ac_ext >&5

14057

+

14058

+

14059

+fi

14060

+

14061

+rm -f core conftest.err conftest.$ac_objext

14062

+ test "x$ac_cv_prog_cc_c89" != "xno" && break

14063

+done

14064

+rm -f conftest.$ac_ext

14065

+CC=$ac_save_CC

14066

+

14067

+fi

14068

+# AC_CACHE_VAL

14069

+case "x$ac_cv_prog_cc_c89" in

14070

+ x)

14071

+ { echo "$as_me:$LINENO: result: none needed" >&5

14072

+echo "${ECHO_T}none needed" >&6; } ;;

14073

+ xno)

14074

+ { echo "$as_me:$LINENO: result: unsupported" >&5

14075

+echo "${ECHO_T}unsupported" >&6; } ;;

14076

+ *)

14077

+ CC="$CC $ac_cv_prog_cc_c89"

14078

+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

14079

+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;

14080

+esac

14081

+if test "x$ac_cv_prog_cc_c89" != xno; then

14082

+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89

14083

+else

14084

+ ac_cv_prog_cc_stdc=no

14085

+fi

14086

+

14087

+

14088

+fi

14089

+

14090

+ ;;

14091

+esac

14092

+ { echo "$as_me:$LINENO: checking for $CC option to accept ISO Standard C" >&5

14093

+echo $ECHO_N "checking for $CC option to accept ISO Standard C... $ECHO_C" >&6; }

14094

+ if test "${ac_cv_prog_cc_stdc+set}" = set; then

14095

+ echo $ECHO_N "(cached) $ECHO_C" >&6

14096

+fi

14097

+

14098

+ case $ac_cv_prog_cc_stdc in

14099

+ no) { echo "$as_me:$LINENO: result: unsupported" >&5

14100

+echo "${ECHO_T}unsupported" >&6; } ;;

14101

+ '') { echo "$as_me:$LINENO: result: none needed" >&5

14102

+echo "${ECHO_T}none needed" >&6; } ;;

14103

+ *) { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5

14104

+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6; } ;;

14105

+esac

14106

+

14107

+

14108

+{ echo "$as_me:$LINENO: checking for an ANSI C99-conforming __func__" >&5

14109

+echo $ECHO_N "checking for an ANSI C99-conforming __func__... $ECHO_C" >&6; }

14110

if test "${ac_cv_cpp_func+set}" = set; then

14111

echo $ECHO_N "(cached) $ECHO_C" >&6

14112

else

14113

@@ -20749,33 +22275,28 @@

14114

}

14115

_ACEOF

14116

rm -f conftest.$ac_objext

14117

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

14118

- (eval $ac_compile) 2>conftest.er1

14119

+if { (ac_try="$ac_compile"

14120

+case "(($ac_try" in

14121

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14122

+ *) ac_try_echo=$ac_try;;

14123

+esac

14124

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14125

+ (eval "$ac_compile") 2>conftest.er1

14126

ac_status=$?

14127

grep -v '^ *+' conftest.er1 >conftest.err

14128

rm -f conftest.er1

14129

cat conftest.err >&5

14130

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14131

- (exit $ac_status); } &&

14132

- { ac_try='test -z "$ac_c_werror_flag"

14133

- || test ! -s conftest.err'

14134

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14135

- (eval $ac_try) 2>&5

14136

- ac_status=$?

14137

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14138

- (exit $ac_status); }; } &&

14139

- { ac_try='test -s conftest.$ac_objext'

14140

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14141

- (eval $ac_try) 2>&5

14142

- ac_status=$?

14143

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14144

- (exit $ac_status); }; }; then

14145

+ (exit $ac_status); } && {

14146

+ test -z "$ac_c_werror_flag" ||

14147

+ test ! -s conftest.err

14148

+ } && test -s conftest.$ac_objext; then

14149

ac_cv_cpp_func=yes

14150

else

14151

echo "$as_me: failed program was:" >&5

14152

sed 's/^/| /' conftest.$ac_ext >&5

14153

14154

-cat >conftest.$ac_ext <<_ACEOF

14155

+ cat >conftest.$ac_ext <<_ACEOF

14156

/* confdefs.h. */

14157

_ACEOF

14158

cat confdefs.h >>conftest.$ac_ext

14159

@@ -20791,40 +22312,37 @@

14160

}

14161

_ACEOF

14162

rm -f conftest.$ac_objext

14163

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

14164

- (eval $ac_compile) 2>conftest.er1

14165

+if { (ac_try="$ac_compile"

14166

+case "(($ac_try" in

14167

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14168

+ *) ac_try_echo=$ac_try;;

14169

+esac

14170

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14171

+ (eval "$ac_compile") 2>conftest.er1

14172

ac_status=$?

14173

grep -v '^ *+' conftest.er1 >conftest.err

14174

rm -f conftest.er1

14175

cat conftest.err >&5

14176

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14177

- (exit $ac_status); } &&

14178

- { ac_try='test -z "$ac_c_werror_flag"

14179

- || test ! -s conftest.err'

14180

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14181

- (eval $ac_try) 2>&5

14182

- ac_status=$?

14183

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14184

- (exit $ac_status); }; } &&

14185

- { ac_try='test -s conftest.$ac_objext'

14186

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14187

- (eval $ac_try) 2>&5

14188

- ac_status=$?

14189

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14190

- (exit $ac_status); }; }; then

14191

+ (exit $ac_status); } && {

14192

+ test -z "$ac_c_werror_flag" ||

14193

+ test ! -s conftest.err

14194

+ } && test -s conftest.$ac_objext; then

14195

ac_cv_cpp_func=__FUNCTION__

14196

else

14197

echo "$as_me: failed program was:" >&5

14198

sed 's/^/| /' conftest.$ac_ext >&5

14199

14200

-ac_cv_cpp_func=no

14201

+ ac_cv_cpp_func=no

14202

fi

14203

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

14204

+

14205

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

14206

fi

14207

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

14208

+

14209

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

14210

fi

14211

-echo "$as_me:$LINENO: result: $ac_cv_cpp_func" >&5

14212

-echo "${ECHO_T}$ac_cv_cpp_func" >&6

14213

+{ echo "$as_me:$LINENO: result: $ac_cv_cpp_func" >&5

14214

+echo "${ECHO_T}$ac_cv_cpp_func" >&6; }

14215

if test $ac_cv_cpp_func = __FUNCTION__; then

14216

14217

cat >>confdefs.h <<\_ACEOF

14218

@@ -20857,7 +22375,7 @@

14219

_ACEOF

14220

14221

14222

- ac_config_files="$ac_config_files Makefile"

14223

+ac_config_files="$ac_config_files Makefile"

14224

14225

cat >confcache <<\_ACEOF

14226

# This file is a shell script that caches the results of configure

14227

@@ -20877,39 +22395,58 @@

14228

14229

# The following way of writing the cache mishandles newlines in values,

14230

# but we know of no workaround that is simple, portable, and efficient.

14231

-# So, don't put newlines in cache variables' values.

14232

+# So, we kill variables containing newlines.

14233

# Ultrix sh set writes to stderr and can't be redirected directly,

14234

# and sets the high bit in the cache file unless we assign to the vars.

14235

-{

14236

+(

14237

+ for ac_var in `(set) 2>&1 | sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'`; do

14238

+ eval ac_val=\$$ac_var

14239

+ case $ac_val in #(

14240

+ *${as_nl}*)

14241

+ case $ac_var in #(

14242

+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5

14243

+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;

14244

+ esac

14245

+ case $ac_var in #(

14246

+ _ | IFS | as_nl) ;; #(

14247

+ *) $as_unset $ac_var ;;

14248

+ esac ;;

14249

+ esac

14250

+ done

14251

+

14252

(set) 2>&1 |

14253

- case `(ac_space=' '; set | grep ac_space) 2>&1` in

14254

- *ac_space=\ *)

14255

+ case $as_nl`(ac_space=' '; set) 2>&1` in #(

14256

+ *${as_nl}ac_space=\ *)

14257

# `set' does not quote correctly, so add quotes (double-quote

14258

# substitution turns \\\\ into \\, and sed turns \\ into \).

14259

sed -n \

14260

"s/'/'\\\\''/g;

14261

s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"

14262

- ;;

14263

+ ;; #(

14264

*)

14265

# `set' quotes correctly as required by POSIX, so do not add quotes.

14266

- sed -n \

14267

- "s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p"

14268

+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"

14269

;;

14270

- esac;

14271

-} |

14272

+ esac |

14273

+ sort

14274

+) |

14275

sed '

14276

+ /^ac_cv_env_/b end

14277

t clear

14278

- : clear

14279

+ :clear

14280

s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/

14281

t end

14282

- /^ac_cv_env/!s/^$[^=]*$=$.*$$/\1=${\1=\2}/

14283

- : end' >>confcache

14284

-if diff $cache_file confcache >/dev/null 2>&1; then :; else

14285

- if test -w $cache_file; then

14286

- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"

14287

+ s/^$[^=]*$=$.*$$/\1=${\1=\2}/

14288

+ :end' >>confcache

14289

+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else

14290

+ if test -w "$cache_file"; then

14291

+ test "x$cache_file" != "x/dev/null" &&

14292

+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5

14293

+echo "$as_me: updating cache $cache_file" >&6;}

14294

cat confcache >$cache_file

14295

else

14296

- echo "not updating unwritable cache $cache_file"

14297

+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5

14298

+echo "$as_me: not updating unwritable cache $cache_file" >&6;}

14299

fi

14300

fi

14301

rm -f confcache

14302

@@ -20918,32 +22455,18 @@

14303

# Let make expand exec_prefix.

14304

test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'

14305

14306

-# VPATH may cause trouble with some makes, so we remove $(srcdir),

14307

-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and

14308

-# trailing colons and then remove the whole line if VPATH becomes empty

14309

-# (actually we leave an empty line to preserve line numbers).

14310

-if test "x$srcdir" = x.; then

14311

- ac_vpsub='/^[ ]*VPATH[ ]*=/{

14312

-s/:*\$(srcdir):*/:/;

14313

-s/:*\${srcdir}:*/:/;

14314

-s/:*@srcdir@:*/:/;

14315

-s/^$[^=]*=[ ]*$:*/\1/;

14316

-s/:*$//;

14317

-s/^[^=]*=[ ]*$//;

14318

-}'

14319

-fi

14320

-

14321

DEFS=-DHAVE_CONFIG_H

14322

14323

ac_libobjs=

14324

ac_ltlibobjs=

14325

for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue

14326

# 1. Remove the extension, and $U if already installed.

14327

- ac_i=`echo "$ac_i" |

14328

- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`

14329

- # 2. Add them.

14330

- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"

14331

- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'

14332

+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'

14333

+ ac_i=`echo "$ac_i" | sed "$ac_script"`

14334

+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR

14335

+ # will be set to the directory where LIBOBJS objects are built.

14336

+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"

14337

+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'

14338

done

14339

LIBOBJS=$ac_libobjs

14340

14341

@@ -20974,17 +22497,45 @@

14342

## M4sh Initialization. ##

14343

## --------------------- ##

14344

14345

-# Be Bourne compatible

14346

+# Be more Bourne compatible

14347

+DUALCASE=1; export DUALCASE # for MKS sh

14348

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

14349

emulate sh

14350

NULLCMD=:

14351

# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

14352

# is contrary to our usage. Disable this feature.

14353

alias -g '${1+"$@"}'='"$@"'

14354

-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then

14355

- set -o posix

14356

+ setopt NO_GLOB_SUBST

14357

+else

14358

+ case `(set -o) 2>/dev/null` in

14359

+ *posix*) set -o posix ;;

14360

+esac

14361

+

14362

+fi

14363

+

14364

+

14365

+

14366

+

14367

+# PATH needs CR

14368

+# Avoid depending upon Character Ranges.

14369

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

14370

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

14371

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

14372

+as_cr_digits='0123456789'

14373

+as_cr_alnum=$as_cr_Letters$as_cr_digits

14374

+

14375

+# The user is always right.

14376

+if test "${PATH_SEPARATOR+set}" != set; then

14377

+ echo "#! /bin/sh" >conf$$.sh

14378

+ echo "exit 0" >>conf$$.sh

14379

+ chmod +x conf$$.sh

14380

+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

14381

+ PATH_SEPARATOR=';'

14382

+ else

14383

+ PATH_SEPARATOR=:

14384

+ fi

14385

+ rm -f conf$$.sh

14386

fi

14387

-DUALCASE=1; export DUALCASE # for MKS sh

14388

14389

# Support unset when possible.

14390

if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

14391

@@ -20994,8 +22545,43 @@

14392

fi

14393

14394

14395

+# IFS

14396

+# We need space, tab and new line, in precisely that order. Quoting is

14397

+# there to prevent editors from complaining about space-tab.

14398

+# (If _AS_PATH_WALK were called with IFS unset, it would disable word

14399

+# splitting by setting IFS to empty value.)

14400

+as_nl='

14401

+'

14402

+IFS=" "" $as_nl"

14403

+

14404

+# Find who we are. Look in the path if we contain no directory separator.

14405

+case $0 in

14406

+ *[\\/]* ) as_myself=$0 ;;

14407

+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

14408

+for as_dir in $PATH

14409

+do

14410

+ IFS=$as_save_IFS

14411

+ test -z "$as_dir" && as_dir=.

14412

+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

14413

+done

14414

+IFS=$as_save_IFS

14415

+

14416

+ ;;

14417

+esac

14418

+# We did not find ourselves, most probably we were run as `sh COMMAND'

14419

+# in which case we are not to be found in the path.

14420

+if test "x$as_myself" = x; then

14421

+ as_myself=$0

14422

+fi

14423

+if test ! -f "$as_myself"; then

14424

+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

14425

+ { (exit 1); exit 1; }

14426

+fi

14427

+

14428

# Work around bugs in pre-3.0 UWIN ksh.

14429

-$as_unset ENV MAIL MAILPATH

14430

+for as_var in ENV MAIL MAILPATH

14431

+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

14432

+done

14433

PS1='$ '

14434

PS2='> '

14435

PS4='+ '

14436

@@ -21009,18 +22595,19 @@

14437

if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

14438

eval $as_var=C; export $as_var

14439

else

14440

- $as_unset $as_var

14441

+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

14442

fi

14443

done

14444

14445

# Required to use basename.

14446

-if expr a : '$a$' >/dev/null 2>&1; then

14447

+if expr a : '$a$' >/dev/null 2>&1 &&

14448

+ test "X`expr 00001 : '.*$...$'`" = X001; then

14449

as_expr=expr

14450

else

14451

as_expr=false

14452

fi

14453

14454

-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then

14455

+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then

14456

as_basename=basename

14457

else

14458

as_basename=false

14459

@@ -21028,159 +22615,120 @@

14460

14461

14462

# Name of the executable.

14463

-as_me=`$as_basename "$0" ||

14464

+as_me=`$as_basename -- "$0" ||

14465

$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

14466

X"$0" : 'X$//$$' \| \

14467

- X"$0" : 'X$/$$' \| \

14468

- . : '$.$' 2>/dev/null ||

14469

+ X"$0" : 'X$/$' \| . 2>/dev/null ||

14470

echo X/"$0" |

14471

- sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; }

14472

- /^X\/$\/\/$$/{ s//\1/; q; }

14473

- /^X\/$\/$.*/{ s//\1/; q; }

14474

- s/.*/./; q'`

14475

-

14476

+ sed '/^.*\/$[^/][^/]*$\/*$/{

14477

+ s//\1/

14478

+ q

14479

+ }

14480

+ /^X\/$\/\/$$/{

14481

+ s//\1/

14482

+ q

14483

+ }

14484

+ /^X\/$\/$.*/{

14485

+ s//\1/

14486

+ q

14487

+ }

14488

+ s/.*/./; q'`

14489

14490

-# PATH needs CR, and LINENO needs CR and PATH.

14491

-# Avoid depending upon Character Ranges.

14492

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

14493

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

14494

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

14495

-as_cr_digits='0123456789'

14496

-as_cr_alnum=$as_cr_Letters$as_cr_digits

14497

+# CDPATH.

14498

+$as_unset CDPATH

14499

14500

-# The user is always right.

14501

-if test "${PATH_SEPARATOR+set}" != set; then

14502

- echo "#! /bin/sh" >conf$$.sh

14503

- echo "exit 0" >>conf$$.sh

14504

- chmod +x conf$$.sh

14505

- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

14506

- PATH_SEPARATOR=';'

14507

- else

14508

- PATH_SEPARATOR=:

14509

- fi

14510

- rm -f conf$$.sh

14511

-fi

14512

14513

14514

as_lineno_1=$LINENO

14515

as_lineno_2=$LINENO

14516

- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

14517

test "x$as_lineno_1" != "x$as_lineno_2" &&

14518

- test "x$as_lineno_3" = "x$as_lineno_2" || {

14519

- # Find who we are. Look in the path if we contain no path at all

14520

- # relative or not.

14521

- case $0 in

14522

- *[\\/]* ) as_myself=$0 ;;

14523

- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

14524

-for as_dir in $PATH

14525

-do

14526

- IFS=$as_save_IFS

14527

- test -z "$as_dir" && as_dir=.

14528

- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

14529

-done

14530

-

14531

- ;;

14532

- esac

14533

- # We did not find ourselves, most probably we were run as `sh COMMAND'

14534

- # in which case we are not to be found in the path.

14535

- if test "x$as_myself" = x; then

14536

- as_myself=$0

14537

- fi

14538

- if test ! -f "$as_myself"; then

14539

- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5

14540

-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}

14541

- { (exit 1); exit 1; }; }

14542

- fi

14543

- case $CONFIG_SHELL in

14544

- '')

14545

- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

14546

-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH

14547

-do

14548

- IFS=$as_save_IFS

14549

- test -z "$as_dir" && as_dir=.

14550

- for as_base in sh bash ksh sh5; do

14551

- case $as_dir in

14552

- /*)

14553

- if ("$as_dir/$as_base" -c '

14554

- as_lineno_1=$LINENO

14555

- as_lineno_2=$LINENO

14556

- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

14557

- test "x$as_lineno_1" != "x$as_lineno_2" &&

14558

- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then

14559

- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }

14560

- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }

14561

- CONFIG_SHELL=$as_dir/$as_base

14562

- export CONFIG_SHELL

14563

- exec "$CONFIG_SHELL" "$0" ${1+"$@"}

14564

- fi;;

14565

- esac

14566

- done

14567

-done

14568

-;;

14569

- esac

14570

+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {

14571

14572

# Create $as_me.lineno as a copy of $as_myself, but with $LINENO

14573

# uniformly replaced by the line number. The first 'sed' inserts a

14574

- # line-number line before each line; the second 'sed' does the real

14575

- # work. The second script uses 'N' to pair each line-number line

14576

- # with the numbered line, and appends trailing '-' during

14577

- # substitution so that $LINENO is not a special case at line end.

14578

+ # line-number line after each line using $LINENO; the second 'sed'

14579

+ # does the real work. The second script uses 'N' to pair each

14580

+ # line-number line with the line containing $LINENO, and appends

14581

+ # trailing '-' during substitution so that $LINENO is not a special

14582

+ # case at line end.

14583

# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

14584

- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)

14585

- sed '=' <$as_myself |

14586

+ # scripts with optimization help from Paolo Bonzini. Blame Lee

14587

+ # E. McMahon (1931-1989) for sed's syntax. :-)

14588

+ sed -n '

14589

+ p

14590

+ /[$]LINENO/=

14591

+ ' <$as_myself |

14592

sed '

14593

+ s/[$]LINENO.*/&-/

14594

+ t lineno

14595

+ b

14596

+ :lineno

14597

N

14598

- s,$,-,

14599

- : loop

14600

- s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3,

14601

+ :loop

14602

+ s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/

14603

t loop

14604

- s,-$,,

14605

- s,^['$as_cr_digits']*\n,,

14606

+ s/-\n.*//

14607

' >$as_me.lineno &&

14608

- chmod +x $as_me.lineno ||

14609

- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5

14610

-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}

14611

+ chmod +x "$as_me.lineno" ||

14612

+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

14613

{ (exit 1); exit 1; }; }

14614

14615

# Don't try to exec as it changes $[0], causing all sort of problems

14616

# (the dirname of $[0] is not the place where we might find the

14617

- # original and so on. Autoconf is especially sensible to this).

14618

- . ./$as_me.lineno

14619

+ # original and so on. Autoconf is especially sensitive to this).

14620

+ . "./$as_me.lineno"

14621

# Exit status is that of the last command.

14622

exit

14623

}

14624

14625

14626

-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in

14627

- *c*,-n*) ECHO_N= ECHO_C='

14628

-' ECHO_T=' ' ;;

14629

- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;

14630

- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;

14631

+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

14632

+ as_dirname=dirname

14633

+else

14634

+ as_dirname=false

14635

+fi

14636

+

14637

+ECHO_C= ECHO_N= ECHO_T=

14638

+case `echo -n x` in

14639

+-n*)

14640

+ case `echo 'x\c'` in

14641

+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.

14642

+ *) ECHO_C='\c';;

14643

+ esac;;

14644

+*)

14645

+ ECHO_N='-n';;

14646

esac

14647

14648

-if expr a : '$a$' >/dev/null 2>&1; then

14649

+if expr a : '$a$' >/dev/null 2>&1 &&

14650

+ test "X`expr 00001 : '.*$...$'`" = X001; then

14651

as_expr=expr

14652

else

14653

as_expr=false

14654

fi

14655

14656

rm -f conf$$ conf$$.exe conf$$.file

14657

+if test -d conf$$.dir; then

14658

+ rm -f conf$$.dir/conf$$.file

14659

+else

14660

+ rm -f conf$$.dir

14661

+ mkdir conf$$.dir

14662

+fi

14663

echo >conf$$.file

14664

if ln -s conf$$.file conf$$ 2>/dev/null; then

14665

- # We could just check for DJGPP; but this test a) works b) is more generic

14666

- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).

14667

- if test -f conf$$.exe; then

14668

- # Don't use ln at all; we don't have any links

14669

+ as_ln_s='ln -s'

14670

+ # ... but there are two gotchas:

14671

+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

14672

+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

14673

+ # In both cases, we have to default to `cp -p'.

14674

+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

14675

as_ln_s='cp -p'

14676

- else

14677

- as_ln_s='ln -s'

14678

- fi

14679

elif ln conf$$.file conf$$ 2>/dev/null; then

14680

as_ln_s=ln

14681

else

14682

as_ln_s='cp -p'

14683

fi

14684

-rm -f conf$$ conf$$.exe conf$$.file

14685

+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

14686

+rmdir conf$$.dir 2>/dev/null

14687

14688

if mkdir -p . 2>/dev/null; then

14689

as_mkdir_p=:

14690

@@ -21189,7 +22737,28 @@

14691

as_mkdir_p=false

14692

fi

14693

14694

-as_executable_p="test -f"

14695

+if test -x / >/dev/null 2>&1; then

14696

+ as_test_x='test -x'

14697

+else

14698

+ if ls -dL / >/dev/null 2>&1; then

14699

+ as_ls_L_option=L

14700

+ else

14701

+ as_ls_L_option=

14702

+ fi

14703

+ as_test_x='

14704

+ eval sh -c '\''

14705

+ if test -d "$1"; then

14706

+ test -d "$1/.";

14707

+ else

14708

+ case $1 in

14709

+ -*)set "./$1";;

14710

+ esac;

14711

+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

14712

+ ???[sx]*):;;*)false;;esac;fi

14713

+ '\'' sh

14714

+ '

14715

+fi

14716

+as_executable_p=$as_test_x

14717

14718

# Sed expression to map a string onto a valid CPP name.

14719

as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

14720

@@ -21198,31 +22767,14 @@

14721

as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

14722

14723

14724

-# IFS

14725

-# We need space, tab and new line, in precisely that order.

14726

-as_nl='

14727

-'

14728

-IFS=" $as_nl"

14729

-

14730

-# CDPATH.

14731

-$as_unset CDPATH

14732

-

14733

exec 6>&1

14734

14735

-# Open the log real soon, to keep \$[0] and so on meaningful, and to

14736

+# Save the log message, to keep $[0] and so on meaningful, and to

14737

# report actual input values of CONFIG_FILES etc. instead of their

14738

-# values after options handling. Logging --version etc. is OK.

14739

-exec 5>>config.log

14740

-{

14741

- echo

14742

- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX

14743

-## Running $as_me. ##

14744

-_ASBOX

14745

-} >&5

14746

-cat >&5 <<_CSEOF

14747

-

14748

+# values after options handling.

14749

+ac_log="

14750

This file was extended by expat $as_me 2.0.1, which was

14751

-generated by GNU Autoconf 2.59. Invocation command line was

14752

+generated by GNU Autoconf 2.61. Invocation command line was

14753

14754

CONFIG_FILES = $CONFIG_FILES

14755

CONFIG_HEADERS = $CONFIG_HEADERS

14756

@@ -21230,30 +22782,19 @@

14757

CONFIG_COMMANDS = $CONFIG_COMMANDS

14758

$ $0 $@

14759

14760

-_CSEOF

14761

-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5

14762

-echo >&5

14763

+on `(hostname || uname -n) 2>/dev/null | sed 1q`

14764

+"

14765

+

14766

_ACEOF

14767

14768

+cat >>$CONFIG_STATUS <<_ACEOF

14769

# Files that config.status was made for.

14770

-if test -n "$ac_config_files"; then

14771

- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS

14772

-fi

14773

-

14774

-if test -n "$ac_config_headers"; then

14775

- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS

14776

-fi

14777

-

14778

-if test -n "$ac_config_links"; then

14779

- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS

14780

-fi

14781

+config_files="$ac_config_files"

14782

+config_headers="$ac_config_headers"

14783

14784

-if test -n "$ac_config_commands"; then

14785

- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS

14786

-fi

14787

+_ACEOF

14788

14789

cat >>$CONFIG_STATUS <<\_ACEOF

14790

-

14791

ac_cs_usage="\

14792

\`$as_me' instantiates files from templates according to the

14793

current configuration.

14794

@@ -21261,7 +22802,7 @@

14795

Usage: $0 [OPTIONS] [FILE]...

14796

14797

-h, --help print this help, then exit

14798

- -V, --version print version number, then exit

14799

+ -V, --version print version number and configuration settings, then exit

14800

-q, --quiet do not print progress messages

14801

-d, --debug don't remove temporary files

14802

--recheck update $as_me by reconfiguring in the same conditions

14803

@@ -21277,19 +22818,21 @@

14804

$config_headers

14805

14806

Report bugs to <bug-autoconf@gnu.org>."

14807

-_ACEOF

14808

14809

+_ACEOF

14810

cat >>$CONFIG_STATUS <<_ACEOF

14811

ac_cs_version="\\

14812

expat config.status 2.0.1

14813

-configured by $0, generated by GNU Autoconf 2.59,

14814

- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

14815

+configured by $0, generated by GNU Autoconf 2.61,

14816

+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

14817

14818

14819

14820

This config.status script is free software; the Free Software Foundation

14821

gives unlimited permission to copy, distribute and modify it."

14822

-srcdir=$srcdir

14823

-INSTALL="$INSTALL"

14824

+

14825

+ac_pwd='$ac_pwd'

14826

+srcdir='$srcdir'

14827

+INSTALL='$INSTALL'

14828

_ACEOF

14829

14830

cat >>$CONFIG_STATUS <<\_ACEOF

14831

@@ -21300,39 +22843,24 @@

14832

do

14833

case $1 in

14834

--*=*)

14835

- ac_option=`expr "x$1" : 'x$[^=]*$='`

14836

- ac_optarg=`expr "x$1" : 'x[^=]*=$.*$'`

14837

+ ac_option=`expr "X$1" : 'X$[^=]*$='`

14838

+ ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'`

14839

ac_shift=:

14840

;;

14841

- -*)

14842

+ *)

14843

ac_option=$1

14844

ac_optarg=$2

14845

ac_shift=shift

14846

;;

14847

- *) # This is not an option, so the user has probably given explicit

14848

- # arguments.

14849

- ac_option=$1

14850

- ac_need_defaults=false;;

14851

esac

14852

14853

case $ac_option in

14854

# Handling of the options.

14855

-_ACEOF

14856

-cat >>$CONFIG_STATUS <<\_ACEOF

14857

14858

ac_cs_recheck=: ;;

14859

- --version | --vers* | -V )

14860

- echo "$ac_cs_version"; exit 0 ;;

14861

- --he | --h)

14862

- # Conflict between --help and --header

14863

- { { echo "$as_me:$LINENO: error: ambiguous option: $1

14864

-Try \`$0 --help' for more information." >&5

14865

-echo "$as_me: error: ambiguous option: $1

14866

-Try \`$0 --help' for more information." >&2;}

14867

- { (exit 1); exit 1; }; };;

14868

- --help | --hel | -h )

14869

- echo "$ac_cs_usage"; exit 0 ;;

14870

- --debug | --d* | -d )

14871

+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )

14872

+ echo "$ac_cs_version"; exit ;;

14873

+ --debug | --debu | --deb | --de | --d | -d )

14874

debug=: ;;

14875

--file | --fil | --fi | --f )

14876

$ac_shift

14877

@@ -21342,18 +22870,24 @@

14878

$ac_shift

14879

CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"

14880

ac_need_defaults=false;;

14881

+ --he | --h)

14882

+ # Conflict between --help and --header

14883

+ { echo "$as_me: error: ambiguous option: $1

14884

+Try \`$0 --help' for more information." >&2

14885

+ { (exit 1); exit 1; }; };;

14886

+ --help | --hel | -h )

14887

+ echo "$ac_cs_usage"; exit ;;

14888

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

14889

| -silent | --silent | --silen | --sile | --sil | --si | --s)

14890

ac_cs_silent=: ;;

14891

14892

# This is an error.

14893

- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1

14894

-Try \`$0 --help' for more information." >&5

14895

-echo "$as_me: error: unrecognized option: $1

14896

-Try \`$0 --help' for more information." >&2;}

14897

+ -*) { echo "$as_me: error: unrecognized option: $1

14898

+Try \`$0 --help' for more information." >&2

14899

{ (exit 1); exit 1; }; } ;;

14900

14901

- *) ac_config_targets="$ac_config_targets $1" ;;

14902

+ *) ac_config_targets="$ac_config_targets $1"

14903

+ ac_need_defaults=false ;;

14904

14905

esac

14906

shift

14907

@@ -21369,29 +22903,43 @@

14908

_ACEOF

14909

cat >>$CONFIG_STATUS <<_ACEOF

14910

if \$ac_cs_recheck; then

14911

- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6

14912

- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

14913

+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6

14914

+ CONFIG_SHELL=$SHELL

14915

+ export CONFIG_SHELL

14916

+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

14917

fi

14918

14919

_ACEOF

14920

+cat >>$CONFIG_STATUS <<\_ACEOF

14921

+exec 5>>config.log

14922

+{

14923

+ echo

14924

+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX

14925

+## Running $as_me. ##

14926

+_ASBOX

14927

+ echo "$ac_log"

14928

+} >&5

14929

14930

-

14931

-

14932

-

14933

+_ACEOF

14934

+cat >>$CONFIG_STATUS <<_ACEOF

14935

+_ACEOF

14936

14937

cat >>$CONFIG_STATUS <<\_ACEOF

14938

+

14939

+# Handling of arguments.

14940

for ac_config_target in $ac_config_targets

14941

do

14942

- case "$ac_config_target" in

14943

- # Handling of arguments.

14944

- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;

14945

- "expat_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS expat_config.h" ;;

14946

+ case $ac_config_target in

14947

+ "expat_config.h") CONFIG_HEADERS="$CONFIG_HEADERS expat_config.h" ;;

14948

+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

14949

+

14950

*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

14951

echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

14952

{ (exit 1); exit 1; }; };;

14953

esac

14954

done

14955

14956

+

14957

# If the user did not use the arguments to specify the items to instantiate,

14958

# then the envvar interface is used. Set only those that are not.

14959

# We use the long form for the default assignment because of an extremely

14960

@@ -21402,585 +22950,535 @@

14961

fi

14962

14963

# Have a temporary directory for convenience. Make it in the build tree

14964

-# simply because there is no reason to put it here, and in addition,

14965

+# simply because there is no reason against having it here, and in addition,

14966

# creating and moving files from /tmp can sometimes cause problems.

14967

-# Create a temporary directory, and hook for its removal unless debugging.

14968

+# Hook for its removal unless debugging.

14969

+# Note that there is a small window in which the directory will not be cleaned:

14970

+# after its creation but before its name has been assigned to `$tmp'.

14971

$debug ||

14972

{

14973

- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0

14974

+ tmp=

14975

+ trap 'exit_status=$?

14976

+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status

14977

+' 0

14978

trap '{ (exit 1); exit 1; }' 1 2 13 15

14979

}

14980

-

14981

# Create a (secure) tmp directory for tmp files.

14982

14983

{

14984

- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&

14985

+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&

14986

test -n "$tmp" && test -d "$tmp"

14987

} ||

14988

{

14989

- tmp=./confstat$$-$RANDOM

14990

- (umask 077 && mkdir $tmp)

14991

+ tmp=./conf$$-$RANDOM

14992

+ (umask 077 && mkdir "$tmp")

14993

} ||

14994

{

14995

echo "$me: cannot create a temporary directory in ." >&2

14996

{ (exit 1); exit 1; }

14997

}

14998

14999

-_ACEOF

15000

-

15001

-cat >>$CONFIG_STATUS <<_ACEOF

15002

-

15003

#

15004

-# CONFIG_FILES section.

15005

+# Set up the sed scripts for CONFIG_FILES section.

15006

#

15007

15008

# No need to generate the scripts if there are no CONFIG_FILES.

15009

# This happens for instance when ./config.status config.h

15010

-if test -n "\$CONFIG_FILES"; then

15011

- # Protect against being on the right side of a sed subst in config.status.

15012

- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;

15013

- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF

15014

-s,@SHELL@,$SHELL,;t t

15015

-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t

15016

-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t

15017

-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t

15018

-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t

15019

-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t

15020

-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t

15021

-s,@exec_prefix@,$exec_prefix,;t t

15022

-s,@prefix@,$prefix,;t t

15023

-s,@program_transform_name@,$program_transform_name,;t t

15024

-s,@bindir@,$bindir,;t t

15025

-s,@sbindir@,$sbindir,;t t

15026

-s,@libexecdir@,$libexecdir,;t t

15027

-s,@datadir@,$datadir,;t t

15028

-s,@sysconfdir@,$sysconfdir,;t t

15029

-s,@sharedstatedir@,$sharedstatedir,;t t

15030

-s,@localstatedir@,$localstatedir,;t t

15031

-s,@libdir@,$libdir,;t t

15032

-s,@includedir@,$includedir,;t t

15033

-s,@oldincludedir@,$oldincludedir,;t t

15034

-s,@infodir@,$infodir,;t t

15035

-s,@mandir@,$mandir,;t t

15036

-s,@build_alias@,$build_alias,;t t

15037

-s,@host_alias@,$host_alias,;t t

15038

-s,@target_alias@,$target_alias,;t t

15039

-s,@DEFS@,$DEFS,;t t

15040

-s,@ECHO_C@,$ECHO_C,;t t

15041

-s,@ECHO_N@,$ECHO_N,;t t

15042

-s,@ECHO_T@,$ECHO_T,;t t

15043

-s,@LIBS@,$LIBS,;t t

15044

-s,@build@,$build,;t t

15045

-s,@build_cpu@,$build_cpu,;t t

15046

-s,@build_vendor@,$build_vendor,;t t

15047

-s,@build_os@,$build_os,;t t

15048

-s,@host@,$host,;t t

15049

-s,@host_cpu@,$host_cpu,;t t

15050

-s,@host_vendor@,$host_vendor,;t t

15051

-s,@host_os@,$host_os,;t t

15052

-s,@CC@,$CC,;t t

15053

-s,@CFLAGS@,$CFLAGS,;t t

15054

-s,@LDFLAGS@,$LDFLAGS,;t t

15055

-s,@CPPFLAGS@,$CPPFLAGS,;t t

15056

-s,@ac_ct_CC@,$ac_ct_CC,;t t

15057

-s,@EXEEXT@,$EXEEXT,;t t

15058

-s,@OBJEXT@,$OBJEXT,;t t

15059

-s,@EGREP@,$EGREP,;t t

15060

-s,@LN_S@,$LN_S,;t t

15061

-s,@ECHO@,$ECHO,;t t

15062

-s,@AR@,$AR,;t t

15063

-s,@ac_ct_AR@,$ac_ct_AR,;t t

15064

-s,@RANLIB@,$RANLIB,;t t

15065

-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t

15066

-s,@STRIP@,$STRIP,;t t

15067

-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t

15068

-s,@DLLTOOL@,$DLLTOOL,;t t

15069

-s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t

15070

-s,@AS@,$AS,;t t

15071

-s,@ac_ct_AS@,$ac_ct_AS,;t t

15072

-s,@OBJDUMP@,$OBJDUMP,;t t

15073

-s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t

15074

-s,@CPP@,$CPP,;t t

15075

-s,@CXX@,$CXX,;t t

15076

-s,@CXXFLAGS@,$CXXFLAGS,;t t

15077

-s,@ac_ct_CXX@,$ac_ct_CXX,;t t

15078

-s,@CXXCPP@,$CXXCPP,;t t

15079

-s,@F77@,$F77,;t t

15080

-s,@FFLAGS@,$FFLAGS,;t t

15081

-s,@ac_ct_F77@,$ac_ct_F77,;t t

15082

-s,@LIBTOOL@,$LIBTOOL,;t t

15083

-s,@LIBCURRENT@,$LIBCURRENT,;t t

15084

-s,@LIBREVISION@,$LIBREVISION,;t t

15085

-s,@LIBAGE@,$LIBAGE,;t t

15086

-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t

15087

-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t

15088

-s,@INSTALL_DATA@,$INSTALL_DATA,;t t

15089

-s,@FILEMAP@,$FILEMAP,;t t

15090

-s,@LIBOBJS@,$LIBOBJS,;t t

15091

-s,@LTLIBOBJS@,$LTLIBOBJS,;t t

15092

-CEOF

15093

+if test -n "$CONFIG_FILES"; then

15094

15095

_ACEOF

15096

15097

- cat >>$CONFIG_STATUS <<\_ACEOF

15098

- # Split the substitutions into bite-sized pieces for seds with

15099

- # small command number limits, like on Digital OSF/1 and HP-UX.

15100

- ac_max_sed_lines=48

15101

- ac_sed_frag=1 # Number of current file.

15102

- ac_beg=1 # First line for current file.

15103

- ac_end=$ac_max_sed_lines # Line after last line for current file.

15104

- ac_more_lines=:

15105

- ac_sed_cmds=

15106

- while $ac_more_lines; do

15107

- if test $ac_beg -gt 1; then

15108

- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag

15109

- else

15110

- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag

15111

- fi

15112

- if test ! -s $tmp/subs.frag; then

15113

- ac_more_lines=false

15114

- else

15115

- # The purpose of the label and of the branching condition is to

15116

- # speed up the sed processing (if there are no `@' at all, there

15117

- # is no need to browse any of the substitutions).

15118

- # These are the two extra sed commands mentioned above.

15119

- (echo ':t

15120

- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed

15121

- if test -z "$ac_sed_cmds"; then

15122

- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"

15123

- else

15124

- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"

15125

- fi

15126

- ac_sed_frag=`expr $ac_sed_frag + 1`

15127

- ac_beg=$ac_end

15128

- ac_end=`expr $ac_end + $ac_max_sed_lines`

15129

- fi

15130

- done

15131

- if test -z "$ac_sed_cmds"; then

15132

- ac_sed_cmds=cat

15133

+

15134

+

15135

+ac_delim='%!_!# '

15136

+for ac_last_try in false false false false false :; do

15137

+ cat >conf$$subs.sed <<_ACEOF

15138

+SHELL!$SHELL$ac_delim

15139

+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim

15140

+PACKAGE_NAME!$PACKAGE_NAME$ac_delim

15141

+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim

15142

+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim

15143

+PACKAGE_STRING!$PACKAGE_STRING$ac_delim

15144

+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim

15145

+exec_prefix!$exec_prefix$ac_delim

15146

+prefix!$prefix$ac_delim

15147

+program_transform_name!$program_transform_name$ac_delim

15148

+bindir!$bindir$ac_delim

15149

+sbindir!$sbindir$ac_delim

15150

+libexecdir!$libexecdir$ac_delim

15151

+datarootdir!$datarootdir$ac_delim

15152

+datadir!$datadir$ac_delim

15153

+sysconfdir!$sysconfdir$ac_delim

15154

+sharedstatedir!$sharedstatedir$ac_delim

15155

+localstatedir!$localstatedir$ac_delim

15156

+includedir!$includedir$ac_delim

15157

+oldincludedir!$oldincludedir$ac_delim

15158

+docdir!$docdir$ac_delim

15159

+infodir!$infodir$ac_delim

15160

+htmldir!$htmldir$ac_delim

15161

+dvidir!$dvidir$ac_delim

15162

+pdfdir!$pdfdir$ac_delim

15163

+psdir!$psdir$ac_delim

15164

+libdir!$libdir$ac_delim

15165

+localedir!$localedir$ac_delim

15166

+mandir!$mandir$ac_delim

15167

+DEFS!$DEFS$ac_delim

15168

+ECHO_C!$ECHO_C$ac_delim

15169

+ECHO_N!$ECHO_N$ac_delim

15170

+ECHO_T!$ECHO_T$ac_delim

15171

+LIBS!$LIBS$ac_delim

15172

+build_alias!$build_alias$ac_delim

15173

+host_alias!$host_alias$ac_delim

15174

+target_alias!$target_alias$ac_delim

15175

+build!$build$ac_delim

15176

+build_cpu!$build_cpu$ac_delim

15177

+build_vendor!$build_vendor$ac_delim

15178

+build_os!$build_os$ac_delim

15179

+host!$host$ac_delim

15180

+host_cpu!$host_cpu$ac_delim

15181

+host_vendor!$host_vendor$ac_delim

15182

+host_os!$host_os$ac_delim

15183

+CC!$CC$ac_delim

15184

+CFLAGS!$CFLAGS$ac_delim

15185

+LDFLAGS!$LDFLAGS$ac_delim

15186

+CPPFLAGS!$CPPFLAGS$ac_delim

15187

+ac_ct_CC!$ac_ct_CC$ac_delim

15188

+EXEEXT!$EXEEXT$ac_delim

15189

+OBJEXT!$OBJEXT$ac_delim

15190

+SED!$SED$ac_delim

15191

+GREP!$GREP$ac_delim

15192

+EGREP!$EGREP$ac_delim

15193

+LN_S!$LN_S$ac_delim

15194

+ECHO!$ECHO$ac_delim

15195

+AR!$AR$ac_delim

15196

+RANLIB!$RANLIB$ac_delim

15197

+STRIP!$STRIP$ac_delim

15198

+DSYMUTIL!$DSYMUTIL$ac_delim

15199

+NMEDIT!$NMEDIT$ac_delim

15200

+DLLTOOL!$DLLTOOL$ac_delim

15201

+AS!$AS$ac_delim

15202

+OBJDUMP!$OBJDUMP$ac_delim

15203

+CPP!$CPP$ac_delim

15204

+CXX!$CXX$ac_delim

15205

+CXXFLAGS!$CXXFLAGS$ac_delim

15206

+ac_ct_CXX!$ac_ct_CXX$ac_delim

15207

+CXXCPP!$CXXCPP$ac_delim

15208

+F77!$F77$ac_delim

15209

+FFLAGS!$FFLAGS$ac_delim

15210

+ac_ct_F77!$ac_ct_F77$ac_delim

15211

+LIBTOOL!$LIBTOOL$ac_delim

15212

+LIBCURRENT!$LIBCURRENT$ac_delim

15213

+LIBREVISION!$LIBREVISION$ac_delim

15214

+LIBAGE!$LIBAGE$ac_delim

15215

+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim

15216

+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim

15217

+INSTALL_DATA!$INSTALL_DATA$ac_delim

15218

+FILEMAP!$FILEMAP$ac_delim

15219

+LIBOBJS!$LIBOBJS$ac_delim

15220

+LTLIBOBJS!$LTLIBOBJS$ac_delim

15221

+_ACEOF

15222

+

15223

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then

15224

+ break

15225

+ elif $ac_last_try; then

15226

+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

15227

+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

15228

+ { (exit 1); exit 1; }; }

15229

+ else

15230

+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

15231

fi

15232

-fi # test -n "$CONFIG_FILES"

15233

+done

15234

15235

+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

15236

+if test -n "$ac_eof"; then

15237

+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

15238

+ ac_eof=`expr $ac_eof + 1`

15239

+fi

15240

+

15241

+cat >>$CONFIG_STATUS <<_ACEOF

15242

+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof

15243

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end

15244

+_ACEOF

15245

+sed '

15246

+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

15247

+s/^/s,@/; s/!/@,|#_!!_#|/

15248

+:n

15249

+t n

15250

+s/'"$ac_delim"'$/,g/; t

15251

+s/$/\\/; p

15252

+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

15253

+' >>$CONFIG_STATUS <conf$$subs.sed

15254

+rm -f conf$$subs.sed

15255

+cat >>$CONFIG_STATUS <<_ACEOF

15256

+:end

15257

+s/|#_!!_#|//g

15258

+CEOF$ac_eof

15259

_ACEOF

15260

+

15261

+

15262

+# VPATH may cause trouble with some makes, so we remove $(srcdir),

15263

+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and

15264

+# trailing colons and then remove the whole line if VPATH becomes empty

15265

+# (actually we leave an empty line to preserve line numbers).

15266

+if test "x$srcdir" = x.; then

15267

+ ac_vpsub='/^[ ]*VPATH[ ]*=/{

15268

+s/:*\$(srcdir):*/:/

15269

+s/:*\${srcdir}:*/:/

15270

+s/:*@srcdir@:*/:/

15271

+s/^$[^=]*=[ ]*$:*/\1/

15272

+s/:*$//

15273

+s/^[^=]*=[ ]*$//

15274

+}'

15275

+fi

15276

+

15277

cat >>$CONFIG_STATUS <<\_ACEOF

15278

-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue

15279

- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

15280

- case $ac_file in

15281

- - | *:- | *:-:* ) # input from stdin

15282

- cat >$tmp/stdin

15283

- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

15284

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

15285

- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

15286

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

15287

- * ) ac_file_in=$ac_file.in ;;

15288

+fi # test -n "$CONFIG_FILES"

15289

+

15290

+

15291

+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS

15292

+do

15293

+ case $ac_tag in

15294

+ :[FHLC]) ac_mode=$ac_tag; continue;;

15295

+ esac

15296

+ case $ac_mode$ac_tag in

15297

+ :[FHL]*:*);;

15298

+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5

15299

+echo "$as_me: error: Invalid tag $ac_tag." >&2;}

15300

+ { (exit 1); exit 1; }; };;

15301

+ :[FH]-) ac_tag=-:-;;

15302

+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;

15303

esac

15304

+ ac_save_IFS=$IFS

15305

+ IFS=:

15306

+ set x $ac_tag

15307

+ IFS=$ac_save_IFS

15308

+ shift

15309

+ ac_file=$1

15310

+ shift

15311

15312

- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.

15313

- ac_dir=`(dirname "$ac_file") 2>/dev/null ||

15314

+ case $ac_mode in

15315

+ :L) ac_source=$1;;

15316

+ :[FH])

15317

+ ac_file_inputs=

15318

+ for ac_f

15319

+ do

15320

+ case $ac_f in

15321

+ -) ac_f="$tmp/stdin";;

15322

+ *) # Look for the file first in the build tree, then in the source tree

15323

+ # (if the path is not absolute). The absolute path cannot be DOS-style,

15324

+ # because $ac_f cannot contain `:'.

15325

+ test -f "$ac_f" ||

15326

+ case $ac_f in

15327

+ [\\/$]*) false;;

15328

+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;

15329

+ esac ||

15330

+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5

15331

+echo "$as_me: error: cannot find input file: $ac_f" >&2;}

15332

+ { (exit 1); exit 1; }; };;

15333

+ esac

15334

+ ac_file_inputs="$ac_file_inputs $ac_f"

15335

+ done

15336

+

15337

+ # Let's still pretend it is `configure' which instantiates (i.e., don't

15338

+ # use $as_me), people would be surprised to read:

15339

+ # /* config.h. Generated by config.status. */

15340

+ configure_input="Generated from "`IFS=:

15341

+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."

15342

+ if test x"$ac_file" != x-; then

15343

+ configure_input="$ac_file. $configure_input"

15344

+ { echo "$as_me:$LINENO: creating $ac_file" >&5

15345

+echo "$as_me: creating $ac_file" >&6;}

15346

+ fi

15347

+

15348

+ case $ac_tag in

15349

+ *:-:* | *:-) cat >"$tmp/stdin";;

15350

+ esac

15351

+ ;;

15352

+ esac

15353

+

15354

+ ac_dir=`$as_dirname -- "$ac_file" ||

15355

$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

15356

X"$ac_file" : 'X$//$[^/]' \| \

15357

X"$ac_file" : 'X$//$$' \| \

15358

- X"$ac_file" : 'X$/$' \| \

15359

- . : '$.$' 2>/dev/null ||

15360

+ X"$ac_file" : 'X$/$' \| . 2>/dev/null ||

15361

echo X"$ac_file" |

15362

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

15363

- /^X$\/\/$[^/].*/{ s//\1/; q; }

15364

- /^X$\/\/$$/{ s//\1/; q; }

15365

- /^X$\/$.*/{ s//\1/; q; }

15366

- s/.*/./; q'`

15367

- { if $as_mkdir_p; then

15368

- mkdir -p "$ac_dir"

15369

- else

15370

- as_dir="$ac_dir"

15371

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15372

+ s//\1/

15373

+ q

15374

+ }

15375

+ /^X$\/\/$[^/].*/{

15376

+ s//\1/

15377

+ q

15378

+ }

15379

+ /^X$\/\/$$/{

15380

+ s//\1/

15381

+ q

15382

+ }

15383

+ /^X$\/$.*/{

15384

+ s//\1/

15385

+ q

15386

+ }

15387

+ s/.*/./; q'`

15388

+ { as_dir="$ac_dir"

15389

+ case $as_dir in #(

15390

+ -*) as_dir=./$as_dir;;

15391

+ esac

15392

+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

15393

as_dirs=

15394

- while test ! -d "$as_dir"; do

15395

- as_dirs="$as_dir $as_dirs"

15396

- as_dir=`(dirname "$as_dir") 2>/dev/null ||

15397

+ while :; do

15398

+ case $as_dir in #(

15399

+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

15400

+ *) as_qdir=$as_dir;;

15401

+ esac

15402

+ as_dirs="'$as_qdir' $as_dirs"

15403

+ as_dir=`$as_dirname -- "$as_dir" ||

15404

$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

15405

X"$as_dir" : 'X$//$[^/]' \| \

15406

X"$as_dir" : 'X$//$$' \| \

15407

- X"$as_dir" : 'X$/$' \| \

15408

- . : '$.$' 2>/dev/null ||

15409

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

15410

echo X"$as_dir" |

15411

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

15412

- /^X$\/\/$[^/].*/{ s//\1/; q; }

15413

- /^X$\/\/$$/{ s//\1/; q; }

15414

- /^X$\/$.*/{ s//\1/; q; }

15415

- s/.*/./; q'`

15416

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15417

+ s//\1/

15418

+ q

15419

+ }

15420

+ /^X$\/\/$[^/].*/{

15421

+ s//\1/

15422

+ q

15423

+ }

15424

+ /^X$\/\/$$/{

15425

+ s//\1/

15426

+ q

15427

+ }

15428

+ /^X$\/$.*/{

15429

+ s//\1/

15430

+ q

15431

+ }

15432

+ s/.*/./; q'`

15433

+ test -d "$as_dir" && break

15434

done

15435

- test ! -n "$as_dirs" || mkdir $as_dirs

15436

- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5

15437

-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}

15438

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

15439

+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

15440

+echo "$as_me: error: cannot create directory $as_dir" >&2;}

15441

{ (exit 1); exit 1; }; }; }

15442

-

15443

ac_builddir=.

15444

15445

-if test "$ac_dir" != .; then

15446

+case "$ac_dir" in

15447

+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

15448

+*)

15449

ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

15450

- # A "../" for each directory in $ac_dir_suffix.

15451

- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`

15452

-else

15453

- ac_dir_suffix= ac_top_builddir=

15454

-fi

15455

+ # A ".." for each directory in $ac_dir_suffix.

15456

+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

15457

+ case $ac_top_builddir_sub in

15458

+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;

15459

+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

15460

+ esac ;;

15461

+esac

15462

+ac_abs_top_builddir=$ac_pwd

15463

+ac_abs_builddir=$ac_pwd$ac_dir_suffix

15464

+# for backward compatibility:

15465

+ac_top_builddir=$ac_top_build_prefix

15466

15467

case $srcdir in

15468

- .) # No --srcdir option. We are building in place.

15469

+ .) # We are building in place.

15470

ac_srcdir=.

15471

- if test -z "$ac_top_builddir"; then

15472

- ac_top_srcdir=.

15473

- else

15474

- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`

15475

- fi ;;

15476

- [\\/]* | ?:[\\/]* ) # Absolute path.

15477

+ ac_top_srcdir=$ac_top_builddir_sub

15478

+ ac_abs_top_srcdir=$ac_pwd ;;

15479

+ [\\/]* | ?:[\\/]* ) # Absolute name.

15480

ac_srcdir=$srcdir$ac_dir_suffix;

15481

- ac_top_srcdir=$srcdir ;;

15482

- *) # Relative path.

15483

- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix

15484

- ac_top_srcdir=$ac_top_builddir$srcdir ;;

15485

+ ac_top_srcdir=$srcdir

15486

+ ac_abs_top_srcdir=$srcdir ;;

15487

+ *) # Relative name.

15488

+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix

15489

+ ac_top_srcdir=$ac_top_build_prefix$srcdir

15490

+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;

15491

esac

15492

+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

15493

15494

-# Do not use `cd foo && pwd` to compute absolute paths, because

15495

-# the directories may not exist.

15496

-case `pwd` in

15497

-.) ac_abs_builddir="$ac_dir";;

15498

-*)

15499

- case "$ac_dir" in

15500

- .) ac_abs_builddir=`pwd`;;

15501

- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;

15502

- *) ac_abs_builddir=`pwd`/"$ac_dir";;

15503

- esac;;

15504

-esac

15505

-case $ac_abs_builddir in

15506

-.) ac_abs_top_builddir=${ac_top_builddir}.;;

15507

-*)

15508

- case ${ac_top_builddir}. in

15509

- .) ac_abs_top_builddir=$ac_abs_builddir;;

15510

- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;

15511

- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;

15512

- esac;;

15513

-esac

15514

-case $ac_abs_builddir in

15515

-.) ac_abs_srcdir=$ac_srcdir;;

15516

-*)

15517

- case $ac_srcdir in

15518

- .) ac_abs_srcdir=$ac_abs_builddir;;

15519

- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;

15520

- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;

15521

- esac;;

15522

-esac

15523

-case $ac_abs_builddir in

15524

-.) ac_abs_top_srcdir=$ac_top_srcdir;;

15525

-*)

15526

- case $ac_top_srcdir in

15527

- .) ac_abs_top_srcdir=$ac_abs_builddir;;

15528

- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;

15529

- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;

15530

- esac;;

15531

-esac

15532

15533

+ case $ac_mode in

15534

+ :F)

15535

+ #

15536

+ # CONFIG_FILE

15537

+ #

15538

15539

case $INSTALL in

15540

[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;

15541

- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;

15542

+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;

15543

esac

15544

+_ACEOF

15545

15546

- if test x"$ac_file" != x-; then

15547

- { echo "$as_me:$LINENO: creating $ac_file" >&5

15548

-echo "$as_me: creating $ac_file" >&6;}

15549

- rm -f "$ac_file"

15550

- fi

15551

- # Let's still pretend it is `configure' which instantiates (i.e., don't

15552

- # use $as_me), people would be surprised to read:

15553

- # /* config.h. Generated by config.status. */

15554

- if test x"$ac_file" = x-; then

15555

- configure_input=

15556

- else

15557

- configure_input="$ac_file. "

15558

- fi

15559

- configure_input=$configure_input"Generated from `echo $ac_file_in |

15560

- sed 's,.*/,,'` by configure."

15561

+cat >>$CONFIG_STATUS <<\_ACEOF

15562

+# If the template does not know about datarootdir, expand it.

15563

+# FIXME: This hack should be removed a few years after 2.60.

15564

+ac_datarootdir_hack=; ac_datarootdir_seen=

15565

15566

- # First look for the input files in the build tree, otherwise in the

15567

- # src tree.

15568

- ac_file_inputs=`IFS=:

15569

- for f in $ac_file_in; do

15570

- case $f in

15571

- -) echo $tmp/stdin ;;

15572

- [\\/$]*)

15573

- # Absolute (can't be DOS-style, as IFS=:)

15574

- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

15575

-echo "$as_me: error: cannot find input file: $f" >&2;}

15576

- { (exit 1); exit 1; }; }

15577

- echo "$f";;

15578

- *) # Relative

15579

- if test -f "$f"; then

15580

- # Build tree

15581

- echo "$f"

15582

- elif test -f "$srcdir/$f"; then

15583

- # Source tree

15584

- echo "$srcdir/$f"

15585

- else

15586

- # /dev/null tree

15587

- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

15588

-echo "$as_me: error: cannot find input file: $f" >&2;}

15589

- { (exit 1); exit 1; }; }

15590

- fi;;

15591

- esac

15592

- done` || { (exit 1); exit 1; }

15593

+case `sed -n '/datarootdir/ {

15594

+ p

15595

+ q

15596

+}

15597

+/@datadir@/p

15598

+/@docdir@/p

15599

+/@infodir@/p

15600

+/@localedir@/p

15601

+/@mandir@/p

15602

+' $ac_file_inputs` in

15603

+*datarootdir*) ac_datarootdir_seen=yes;;

15604

+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)

15605

+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

15606

+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

15607

_ACEOF

15608

cat >>$CONFIG_STATUS <<_ACEOF

15609

+ ac_datarootdir_hack='

15610

+ s&@datadir@&$datadir&g

15611

+ s&@docdir@&$docdir&g

15612

+ s&@infodir@&$infodir&g

15613

+ s&@localedir@&$localedir&g

15614

+ s&@mandir@&$mandir&g

15615

+ s&\\\${datarootdir}&$datarootdir&g' ;;

15616

+esac

15617

+_ACEOF

15618

+

15619

+# Neutralize VPATH when `$srcdir' = `.'.

15620

+# Shell code in configure.ac might set extrasub.

15621

+# FIXME: do we really want to maintain this feature?

15622

+cat >>$CONFIG_STATUS <<_ACEOF

15623

sed "$ac_vpsub

15624

$extrasub

15625

_ACEOF

15626

cat >>$CONFIG_STATUS <<\_ACEOF

15627

:t

15628

/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

15629

-s,@configure_input@,$configure_input,;t t

15630

-s,@srcdir@,$ac_srcdir,;t t

15631

-s,@abs_srcdir@,$ac_abs_srcdir,;t t

15632

-s,@top_srcdir@,$ac_top_srcdir,;t t

15633

-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t

15634

-s,@builddir@,$ac_builddir,;t t

15635

-s,@abs_builddir@,$ac_abs_builddir,;t t

15636

-s,@top_builddir@,$ac_top_builddir,;t t

15637

-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t

15638

-s,@INSTALL@,$ac_INSTALL,;t t

15639

-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out

15640

- rm -f $tmp/stdin

15641

- if test x"$ac_file" != x-; then

15642

- mv $tmp/out $ac_file

15643

- else

15644

- cat $tmp/out

15645

- rm -f $tmp/out

15646

- fi

15647

-

15648

-done

15649

-_ACEOF

15650

-cat >>$CONFIG_STATUS <<\_ACEOF

15651

-

15652

-#

15653

-# CONFIG_HEADER section.

15654

-#

15655

+s&@configure_input@&$configure_input&;t t

15656

+s&@top_builddir@&$ac_top_builddir_sub&;t t

15657

+s&@srcdir@&$ac_srcdir&;t t

15658

+s&@abs_srcdir@&$ac_abs_srcdir&;t t

15659

+s&@top_srcdir@&$ac_top_srcdir&;t t

15660

+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t

15661

+s&@builddir@&$ac_builddir&;t t

15662

+s&@abs_builddir@&$ac_abs_builddir&;t t

15663

+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t

15664

+s&@INSTALL@&$ac_INSTALL&;t t

15665

+$ac_datarootdir_hack

15666

+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out

15667

15668

-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where

15669

-# NAME is the cpp macro being defined and VALUE is the value it is being given.

15670

-#

15671

-# ac_d sets the value in "#define NAME VALUE" lines.

15672

-ac_dA='s,^$[ ]*$#$[ ]*define[ ][ ]*$'

15673

-ac_dB='[ ].*$,\1#\2'

15674

-ac_dC=' '

15675

-ac_dD=',;t'

15676

-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".

15677

-ac_uA='s,^$[ ]*$#$[ ]*$undef$[ ][ ]*$'

15678

-ac_uB='$,\1#\2define\3'

15679

-ac_uC=' '

15680

-ac_uD=',;t'

15681

+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&

15682

+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

15683

+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

15684

+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'

15685

+which seems to be undefined. Please make sure it is defined." >&5

15686

+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

15687

+which seems to be undefined. Please make sure it is defined." >&2;}

15688

15689

-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue

15690

- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

15691

+ rm -f "$tmp/stdin"

15692

case $ac_file in

15693

- - | *:- | *:-:* ) # input from stdin

15694

- cat >$tmp/stdin

15695

- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

15696

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

15697

- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

15698

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

15699

- * ) ac_file_in=$ac_file.in ;;

15700

+ -) cat "$tmp/out"; rm -f "$tmp/out";;

15701

+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;

15702

esac

15703

-

15704

- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5

15705

-echo "$as_me: creating $ac_file" >&6;}

15706

-

15707

- # First look for the input files in the build tree, otherwise in the

15708

- # src tree.

15709

- ac_file_inputs=`IFS=:

15710

- for f in $ac_file_in; do

15711

- case $f in

15712

- -) echo $tmp/stdin ;;

15713

- [\\/$]*)

15714

- # Absolute (can't be DOS-style, as IFS=:)

15715

- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

15716

-echo "$as_me: error: cannot find input file: $f" >&2;}

15717

- { (exit 1); exit 1; }; }

15718

- # Do quote $f, to prevent DOS paths from being IFS'd.

15719

- echo "$f";;

15720

- *) # Relative

15721

- if test -f "$f"; then

15722

- # Build tree

15723

- echo "$f"

15724

- elif test -f "$srcdir/$f"; then

15725

- # Source tree

15726

- echo "$srcdir/$f"

15727

- else

15728

- # /dev/null tree

15729

- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

15730

-echo "$as_me: error: cannot find input file: $f" >&2;}

15731

- { (exit 1); exit 1; }; }

15732

- fi;;

15733

- esac

15734

- done` || { (exit 1); exit 1; }

15735

- # Remove the trailing spaces.

15736

- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in

15737

-

15738

+ ;;

15739

+ :H)

15740

+ #

15741

+ # CONFIG_HEADER

15742

+ #

15743

_ACEOF

15744

15745

-# Transform confdefs.h into two sed scripts, `conftest.defines' and

15746

-# `conftest.undefs', that substitutes the proper values into

15747

-# config.h.in to produce config.h. The first handles `#define'

15748

-# templates, and the second `#undef' templates.

15749

-# And first: Protect against being on the right side of a sed subst in

15750

-# config.status. Protect against being in an unquoted here document

15751

-# in config.status.

15752

-rm -f conftest.defines conftest.undefs

15753

-# Using a here document instead of a string reduces the quoting nightmare.

15754

-# Putting comments in sed scripts is not portable.

15755

-#

15756

-# `end' is used to avoid that the second main sed command (meant for

15757

-# 0-ary CPP macros) applies to n-ary macro definitions.

15758

-# See the Autoconf documentation for `clear'.

15759

-cat >confdef2sed.sed <<\_ACEOF

15760

-s/[\\&,]/\\&/g

15761

-s,[\\$`],\\&,g

15762

-t clear

15763

-: clear

15764

-s,^[ ]*#[ ]*define[ ][ ]*$[^ (][^ (]*$$([^)]*)$[ ]*$.*$$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp

15765

-t end

15766

-s,^[ ]*#[ ]*define[ ][ ]*$[^ ][^ ]*$[ ]*$.*$$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp

15767

-: end

15768

-_ACEOF

15769

-# If some macros were called several times there might be several times

15770

-# the same #defines, which is useless. Nevertheless, we may not want to

15771

-# sort them, since we want the *last* AC-DEFINE to be honored.

15772

-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines

15773

-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs

15774

-rm -f confdef2sed.sed

15775

+# Transform confdefs.h into a sed script `conftest.defines', that

15776

+# substitutes the proper values into config.h.in to produce config.h.

15777

+rm -f conftest.defines conftest.tail

15778

+# First, append a space to every undef/define line, to ease matching.

15779

+echo 's/$/ /' >conftest.defines

15780

+# Then, protect against being on the right side of a sed subst, or in

15781

+# an unquoted here document, in config.status. If some macros were

15782

+# called several times there might be several #defines for the same

15783

+# symbol, which is useless. But do not sort them, since the last

15784

+# AC_DEFINE must be honored.

15785

+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*

15786

+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where

15787

+# NAME is the cpp macro being defined, VALUE is the value it is being given.

15788

+# PARAMS is the parameter list in the macro definition--in most cases, it's

15789

+# just an empty string.

15790

+ac_dA='s,^\$[ #]*\$[^ ]*\\([ ]*'

15791

+ac_dB='\\)[ (].*,\\1define\\2'

15792

+ac_dC=' '

15793

+ac_dD=' ,'

15794

15795

-# This sed command replaces #undef with comments. This is necessary, for

15796

+uniq confdefs.h |

15797

+ sed -n '

15798

+ t rset

15799

+ :rset

15800

+ s/^[ ]*#[ ]*define[ ][ ]*//

15801

+ t ok

15802

+ d

15803

+ :ok

15804

+ s/[\\&,]/\\&/g

15805

+ s/^$'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p

15806

+ s/^$'"$ac_word_re"'$[ ]*$.*$/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p

15807

+ ' >>conftest.defines

15808

+

15809

+# Remove the space that was appended to ease matching.

15810

+# Then replace #undef with comments. This is necessary, for

15811

# example, in the case of _POSIX_SOURCE, which is predefined and required

15812

# on some systems where configure will not decide to define it.

15813

-cat >>conftest.undefs <<\_ACEOF

15814

-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,

15815

-_ACEOF

15816

+# (The regexp can be short, since the line contains either #define or #undef.)

15817

+echo 's/ $//

15818

+s,^[ #]*u.*,/* & */,' >>conftest.defines

15819

15820

-# Break up conftest.defines because some shells have a limit on the size

15821

-# of here documents, and old seds have small limits too (100 cmds).

15822

-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS

15823

-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS

15824

-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS

15825

-echo ' :' >>$CONFIG_STATUS

15826

-rm -f conftest.tail

15827

-while grep . conftest.defines >/dev/null

15828

+# Break up conftest.defines:

15829

+ac_max_sed_lines=50

15830

+

15831

+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"

15832

+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"

15833

+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"

15834

+# et cetera.

15835

+ac_in='$ac_file_inputs'

15836

+ac_out='"$tmp/out1"'

15837

+ac_nxt='"$tmp/out2"'

15838

+

15839

+while :

15840

do

15841

- # Write a limited-size here document to $tmp/defines.sed.

15842

- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS

15843

- # Speed up: don't consider the non `#define' lines.

15844

- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS

15845

- # Work around the forget-to-reset-the-flag bug.

15846

- echo 't clr' >>$CONFIG_STATUS

15847

- echo ': clr' >>$CONFIG_STATUS

15848

- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS

15849

+ # Write a here document:

15850

+ cat >>$CONFIG_STATUS <<_ACEOF

15851

+ # First, check the format of the line:

15852

+ cat >"\$tmp/defines.sed" <<\\CEOF

15853

+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def

15854

+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def

15855

+b

15856

+:def

15857

+_ACEOF

15858

+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS

15859

echo 'CEOF

15860

- sed -f $tmp/defines.sed $tmp/in >$tmp/out

15861

- rm -f $tmp/in

15862

- mv $tmp/out $tmp/in

15863

-' >>$CONFIG_STATUS

15864

- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail

15865

+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS

15866

+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in

15867

+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail

15868

+ grep . conftest.tail >/dev/null || break

15869

rm -f conftest.defines

15870

mv conftest.tail conftest.defines

15871

done

15872

-rm -f conftest.defines

15873

-echo ' fi # grep' >>$CONFIG_STATUS

15874

-echo >>$CONFIG_STATUS

15875

-

15876

-# Break up conftest.undefs because some shells have a limit on the size

15877

-# of here documents, and old seds have small limits too (100 cmds).

15878

-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS

15879

-rm -f conftest.tail

15880

-while grep . conftest.undefs >/dev/null

15881

-do

15882

- # Write a limited-size here document to $tmp/undefs.sed.

15883

- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS

15884

- # Speed up: don't consider the non `#undef'

15885

- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS

15886

- # Work around the forget-to-reset-the-flag bug.

15887

- echo 't clr' >>$CONFIG_STATUS

15888

- echo ': clr' >>$CONFIG_STATUS

15889

- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS

15890

- echo 'CEOF

15891

- sed -f $tmp/undefs.sed $tmp/in >$tmp/out

15892

- rm -f $tmp/in

15893

- mv $tmp/out $tmp/in

15894

-' >>$CONFIG_STATUS

15895

- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail

15896

- rm -f conftest.undefs

15897

- mv conftest.tail conftest.undefs

15898

-done

15899

-rm -f conftest.undefs

15900

+rm -f conftest.defines conftest.tail

15901

15902

+echo "ac_result=$ac_in" >>$CONFIG_STATUS

15903

cat >>$CONFIG_STATUS <<\_ACEOF

15904

- # Let's still pretend it is `configure' which instantiates (i.e., don't

15905

- # use $as_me), people would be surprised to read:

15906

- # /* config.h. Generated by config.status. */

15907

- if test x"$ac_file" = x-; then

15908

- echo "/* Generated by configure. */" >$tmp/config.h

15909

- else

15910

- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h

15911

- fi

15912

- cat $tmp/in >>$tmp/config.h

15913

- rm -f $tmp/in

15914

if test x"$ac_file" != x-; then

15915

- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then

15916

+ echo "/* $configure_input */" >"$tmp/config.h"

15917

+ cat "$ac_result" >>"$tmp/config.h"

15918

+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then

15919

{ echo "$as_me:$LINENO: $ac_file is unchanged" >&5

15920

echo "$as_me: $ac_file is unchanged" >&6;}

15921

else

15922

- ac_dir=`(dirname "$ac_file") 2>/dev/null ||

15923

-$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

15924

- X"$ac_file" : 'X$//$[^/]' \| \

15925

- X"$ac_file" : 'X$//$$' \| \

15926

- X"$ac_file" : 'X$/$' \| \

15927

- . : '$.$' 2>/dev/null ||

15928

-echo X"$ac_file" |

15929

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

15930

- /^X$\/\/$[^/].*/{ s//\1/; q; }

15931

- /^X$\/\/$$/{ s//\1/; q; }

15932

- /^X$\/$.*/{ s//\1/; q; }

15933

- s/.*/./; q'`

15934

- { if $as_mkdir_p; then

15935

- mkdir -p "$ac_dir"

15936

- else

15937

- as_dir="$ac_dir"

15938

- as_dirs=

15939

- while test ! -d "$as_dir"; do

15940

- as_dirs="$as_dir $as_dirs"

15941

- as_dir=`(dirname "$as_dir") 2>/dev/null ||

15942

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

15943

- X"$as_dir" : 'X$//$[^/]' \| \

15944

- X"$as_dir" : 'X$//$$' \| \

15945

- X"$as_dir" : 'X$/$' \| \

15946

- . : '$.$' 2>/dev/null ||

15947

-echo X"$as_dir" |

15948

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

15949

- /^X$\/\/$[^/].*/{ s//\1/; q; }

15950

- /^X$\/\/$$/{ s//\1/; q; }

15951

- /^X$\/$.*/{ s//\1/; q; }

15952

- s/.*/./; q'`

15953

- done

15954

- test ! -n "$as_dirs" || mkdir $as_dirs

15955

- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5

15956

-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}

15957

- { (exit 1); exit 1; }; }; }

15958

-

15959

rm -f $ac_file

15960

- mv $tmp/config.h $ac_file

15961

+ mv "$tmp/config.h" $ac_file

15962

fi

15963

else

15964

- cat $tmp/config.h

15965

- rm -f $tmp/config.h

15966

+ echo "/* $configure_input */"

15967

+ cat "$ac_result"

15968

fi

15969

-done

15970

-_ACEOF

15971

+ rm -f "$tmp/out12"

15972

+ ;;

15973

+

15974

+

15975

+ esac

15976

+

15977

+done # for ac_tag

15978

15979

-cat >>$CONFIG_STATUS <<\_ACEOF

15980

15981

{ (exit 0); exit 0; }

15982

_ACEOF

15983

diff -urNad trunk~/conftools/config.guess trunk/conftools/config.guess

15984

--- trunk~/conftools/config.guess 2006-09-22 16:42:54.000000000 +0200

15985

+++ trunk/conftools/config.guess 2008-05-07 05:22:46.000000000 +0200

15986

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

15987

#! /bin/sh

15988

# Attempt to guess a canonical system name.

15989

15990

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

15991

-# Inc.

15992

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

15993

+# Free Software Foundation, Inc.

15994

15995

-timestamp='2006-07-02'

15996

+timestamp='2008-01-23'

15997

15998

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

15999

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

16000

@@ -56,8 +56,8 @@

16001

GNU config.guess ($timestamp)

16002

16003

Originally written by Per Bothner.

16004

16005

-Free Software Foundation, Inc.

16006

16007

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

16008

16009

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

16010

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

16011

@@ -161,6 +161,7 @@

16012

arm*) machine=arm-unknown ;;

16013

sh3el) machine=shl-unknown ;;

16014

sh3eb) machine=sh-unknown ;;

16015

+ sh5el) machine=sh5le-unknown ;;

16016

*) machine=${UNAME_MACHINE_ARCH}-unknown ;;

16017

esac

16018

# The Operating System including object format, if it has switched

16019

@@ -329,7 +330,7 @@

16020

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

16021

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

16022

exit ;;

16023

- i86pc:SunOS:5.*:*)

16024

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

16025

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

16026

exit ;;

16027

sun4*:SunOS:6*:*)

16028

@@ -531,7 +532,7 @@

16029

echo rs6000-ibm-aix3.2

16030

fi

16031

exit ;;

16032

- *:AIX:*:[45])

16033

+ *:AIX:*:[456])

16034

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

16035

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

16036

IBM_ARCH=rs6000

16037

@@ -780,7 +781,7 @@

16038

i*:CYGWIN*:*)

16039

echo ${UNAME_MACHINE}-pc-cygwin

16040

exit ;;

16041

- i*:MINGW*:*)

16042

+ *:MINGW*:*)

16043

echo ${UNAME_MACHINE}-pc-mingw32

16044

exit ;;

16045

i*:windows32*:*)

16046

@@ -790,12 +791,18 @@

16047

i*:PW*:*)

16048

echo ${UNAME_MACHINE}-pc-pw32

16049

exit ;;

16050

- x86:Interix*:[3456]*)

16051

- echo i586-pc-interix${UNAME_RELEASE}

16052

- exit ;;

16053

- EM64T:Interix*:[3456]*)

16054

- echo x86_64-unknown-interix${UNAME_RELEASE}

16055

- exit ;;

16056

+ *:Interix*:[3456]*)

16057

+ case ${UNAME_MACHINE} in

16058

+ x86)

16059

+ echo i586-pc-interix${UNAME_RELEASE}

16060

+ exit ;;

16061

+ EM64T | authenticamd)

16062

+ echo x86_64-unknown-interix${UNAME_RELEASE}

16063

+ exit ;;

16064

+ IA64)

16065

+ echo ia64-unknown-interix${UNAME_RELEASE}

16066

+ exit ;;

16067

+ esac ;;

16068

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

16069

echo i${UNAME_MACHINE}-pc-mks

16070

exit ;;

16071

@@ -829,7 +836,14 @@

16072

echo ${UNAME_MACHINE}-pc-minix

16073

exit ;;

16074

arm*:Linux:*:*)

16075

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

16076

+ eval $set_cc_for_build

16077

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

16078

+ | grep -q __ARM_EABI__

16079

+ then

16080

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

16081

+ else

16082

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

16083

+ fi

16084

exit ;;

16085

avr32*:Linux:*:*)

16086

echo ${UNAME_MACHINE}-unknown-linux-gnu

16087

@@ -950,6 +964,9 @@

16088

x86_64:Linux:*:*)

16089

echo x86_64-unknown-linux-gnu

16090

exit ;;

16091

+ xtensa*:Linux:*:*)

16092

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

16093

+ exit ;;

16094

i*86:Linux:*:*)

16095

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

16096

# first see if it will tell us. cd to the root directory to prevent

16097

@@ -1208,6 +1225,15 @@

16098

SX-6:SUPER-UX:*:*)

16099

echo sx6-nec-superux${UNAME_RELEASE}

16100

exit ;;

16101

+ SX-7:SUPER-UX:*:*)

16102

+ echo sx7-nec-superux${UNAME_RELEASE}

16103

+ exit ;;

16104

+ SX-8:SUPER-UX:*:*)

16105

+ echo sx8-nec-superux${UNAME_RELEASE}

16106

+ exit ;;

16107

+ SX-8R:SUPER-UX:*:*)

16108

+ echo sx8r-nec-superux${UNAME_RELEASE}

16109

+ exit ;;

16110

Power*:Rhapsody:*:*)

16111

echo powerpc-apple-rhapsody${UNAME_RELEASE}

16112

exit ;;

16113

@@ -1458,9 +1484,9 @@

16114

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

16115

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

16116

16117

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

16118

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

16119

and

16120

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

16121

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

16122

16123

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

16124

send the following data and any information you think might be

16125

diff -urNad trunk~/conftools/config.sub trunk/conftools/config.sub

16126

--- trunk~/conftools/config.sub 2006-09-22 16:42:54.000000000 +0200

16127

+++ trunk/conftools/config.sub 2008-05-07 05:22:46.000000000 +0200

16128

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

16129

#! /bin/sh

16130

# Configuration validation subroutine script.

16131

16132

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

16133

-# Inc.

16134

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

16135

+# Free Software Foundation, Inc.

16136

16137

-timestamp='2006-09-20'

16138

+timestamp='2008-01-16'

16139

16140

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

16141

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

16142

@@ -72,8 +72,8 @@

16143

version="\

16144

GNU config.sub ($timestamp)

16145

16146

16147

-Free Software Foundation, Inc.

16148

16149

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

16150

16151

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

16152

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

16153

@@ -245,12 +245,12 @@

16154

| bfin \

16155

| c4x | clipper \

16156

| d10v | d30v | dlx | dsp16xx \

16157

- | fr30 | frv \

16158

+ | fido | fr30 | frv \

16159

16160

| i370 | i860 | i960 | ia64 \

16161

| ip2k | iq2000 \

16162

| m32c | m32r | m32rle | m68000 | m68k | m88k \

16163

- | maxq | mb | microblaze | mcore \

16164

+ | maxq | mb | microblaze | mcore | mep \

16165

16166

| mips16 \

16167

| mips64 | mips64el \

16168

@@ -324,7 +324,7 @@

16169

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

16170

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

16171

| elxsi-* \

16172

- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \

16173

+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \

16174

| h8300-* | h8500-* \

16175

16176

| i*86-* | i860-* | i960-* | ia64-* \

16177

@@ -369,10 +369,14 @@

16178

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

16179

| we32k-* \

16180

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

16181

- | xstormy16-* | xtensa-* \

16182

+ | xstormy16-* | xtensa*-* \

16183

| ymp-* \

16184

| z8k-*)

16185

;;

16186

+ # Recognize the basic CPU types without company name, with glob match.

16187

+ xtensa*)

16188

+ basic_machine=$basic_machine-unknown

16189

+ ;;

16190

# Recognize the various machine names and aliases which stand

16191

# for a CPU type and a company and sometimes even an OS.

16192

386bsd)

16193

@@ -443,6 +447,14 @@

16194

basic_machine=ns32k-sequent

16195

os=-dynix

16196

;;

16197

+ blackfin)

16198

+ basic_machine=bfin-unknown

16199

+ os=-linux

16200

+ ;;

16201

+ blackfin-*)

16202

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

16203

+ os=-linux

16204

+ ;;

16205

c90)

16206

basic_machine=c90-cray

16207

os=-unicos

16208

@@ -475,8 +487,8 @@

16209

basic_machine=craynv-cray

16210

os=-unicosmp

16211

;;

16212

- cr16c)

16213

- basic_machine=cr16c-unknown

16214

+ cr16)

16215

+ basic_machine=cr16-unknown

16216

os=-elf

16217

;;

16218

crds | unos)

16219

@@ -668,6 +680,14 @@

16220

basic_machine=m68k-isi

16221

os=-sysv

16222

;;

16223

+ m68knommu)

16224

+ basic_machine=m68k-unknown

16225

+ os=-linux

16226

+ ;;

16227

+ m68knommu-*)

16228

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

16229

+ os=-linux

16230

+ ;;

16231

m88k-omron*)

16232

basic_machine=m88k-omron

16233

;;

16234

@@ -683,6 +703,10 @@

16235

basic_machine=i386-pc

16236

os=-mingw32

16237

;;

16238

+ mingw32ce)

16239

+ basic_machine=arm-unknown

16240

+ os=-mingw32ce

16241

+ ;;

16242

miniframe)

16243

basic_machine=m68000-convergent

16244

;;

16245

@@ -809,6 +833,14 @@

16246

basic_machine=i860-intel

16247

os=-osf

16248

;;

16249

+ parisc)

16250

+ basic_machine=hppa-unknown

16251

+ os=-linux

16252

+ ;;

16253

+ parisc-*)

16254

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

16255

+ os=-linux

16256

+ ;;

16257

pbd)

16258

basic_machine=sparc-tti

16259

;;

16260

@@ -925,6 +957,9 @@

16261

basic_machine=sh-hitachi

16262

os=-hms

16263

;;

16264

+ sh5el)

16265

+ basic_machine=sh5le-unknown

16266

+ ;;

16267

sh64)

16268

basic_machine=sh64-unknown

16269

;;

16270

@@ -1014,6 +1049,10 @@

16271

basic_machine=tic6x-unknown

16272

os=-coff

16273

;;

16274

+ tile*)

16275

+ basic_machine=tile-unknown

16276

+ os=-linux-gnu

16277

+ ;;

16278

tx39)

16279

basic_machine=mipstx39-unknown

16280

;;

16281

@@ -1219,7 +1258,7 @@

16282

16283

16284

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

16285

- | -skyos* | -haiku* | -rdos* | -toppers*)

16286

16287

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

16288

;;

16289

-qnx*)

16290

@@ -1414,6 +1453,9 @@

16291

m68*-cisco)

16292

os=-aout

16293

;;

16294

+ mep-*)

16295

+ os=-elf

16296

+ ;;

16297

mips*-cisco)

16298

os=-elf

16299

;;

16300

diff -urNad trunk~/conftools/libtool.m4 trunk/conftools/libtool.m4

16301

--- trunk~/conftools/libtool.m4 2007-06-05 20:19:34.000000000 +0200

16302

+++ trunk/conftools/libtool.m4 2008-05-07 05:22:57.000000000 +0200

16303

@@ -1,13 +1,13 @@

16304

# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

16305

16306

-## Free Software Foundation, Inc.

16307

16308

+## 2008 Free Software Foundation, Inc.

16309

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

16310

##

16311

## This file is free software; the Free Software Foundation gives

16312

## unlimited permission to copy and/or distribute it, with or without

16313

## modifications, as long as this notice is preserved.

16314

16315

-# serial 48 AC_PROG_LIBTOOL

16316

+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL

16317

16318

16319

# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

16320

@@ -95,7 +95,6 @@

16321

AC_REQUIRE([AC_OBJEXT])dnl

16322

AC_REQUIRE([AC_EXEEXT])dnl

16323

dnl

16324

-

16325

AC_LIBTOOL_SYS_MAX_CMD_LEN

16326

AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE

16327

AC_LIBTOOL_OBJDIR

16328

@@ -170,7 +169,7 @@

16329

test -z "$ac_objext" && ac_objext=o

16330

16331

# Determine commands to create old-style static archives.

16332

-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'

16333

+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'

16334

old_postinstall_cmds='chmod 644 $oldlib'

16335

old_postuninstall_cmds=

16336

16337

@@ -197,6 +196,8 @@

16338

;;

16339

esac

16340

16341

+_LT_REQUIRED_DARWIN_CHECKS

16342

+

16343

AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)

16344

AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],

16345

enable_win32_dll=yes, enable_win32_dll=no)

16346

@@ -257,8 +258,9 @@

16347

# Check for compiler boilerplate output or warnings with

16348

# the simple compiler test code.

16349

AC_DEFUN([_LT_COMPILER_BOILERPLATE],

16350

-[ac_outfile=conftest.$ac_objext

16351

-printf "$lt_simple_compile_test_code" >conftest.$ac_ext

16352

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

16353

+ac_outfile=conftest.$ac_objext

16354

+echo "$lt_simple_compile_test_code" >conftest.$ac_ext

16355

eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

16356

_lt_compiler_boilerplate=`cat conftest.err`

16357

$rm conftest*

16358

@@ -270,13 +272,85 @@

16359

# Check for linker boilerplate output or warnings with

16360

# the simple link test code.

16361

AC_DEFUN([_LT_LINKER_BOILERPLATE],

16362

-[ac_outfile=conftest.$ac_objext

16363

-printf "$lt_simple_link_test_code" >conftest.$ac_ext

16364

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

16365

+ac_outfile=conftest.$ac_objext

16366

+echo "$lt_simple_link_test_code" >conftest.$ac_ext

16367

eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

16368

_lt_linker_boilerplate=`cat conftest.err`

16369

-$rm conftest*

16370

+$rm -r conftest*

16371

])# _LT_LINKER_BOILERPLATE

16372

16373

+# _LT_REQUIRED_DARWIN_CHECKS

16374

+# --------------------------

16375

+# Check for some things on darwin

16376

+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[

16377

+ case $host_os in

16378

+ rhapsody* | darwin*)

16379

+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])

16380

+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])

16381

+

16382

+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],

16383

+ [lt_cv_apple_cc_single_mod=no

16384

+ if test -z "${LT_MULTI_MODULE}"; then

16385

+ # By default we will add the -single_module flag. You can override

16386

+ # by either setting the environment variable LT_MULTI_MODULE

16387

+ # non-empty at configure time, or by adding -multi_module to the

16388

+ # link flags.

16389

+ echo "int foo(void){return 1;}" > conftest.c

16390

+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \

16391

+ -dynamiclib ${wl}-single_module conftest.c

16392

+ if test -f libconftest.dylib; then

16393

+ lt_cv_apple_cc_single_mod=yes

16394

+ rm -rf libconftest.dylib*

16395

+ fi

16396

+ rm conftest.c

16397

+ fi])

16398

+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],

16399

+ [lt_cv_ld_exported_symbols_list],

16400

+ [lt_cv_ld_exported_symbols_list=no

16401

+ save_LDFLAGS=$LDFLAGS

16402

+ echo "_main" > conftest.sym

16403

+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"

16404

+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],

16405

+ [lt_cv_ld_exported_symbols_list=yes],

16406

+ [lt_cv_ld_exported_symbols_list=no])

16407

+ LDFLAGS="$save_LDFLAGS"

16408

+ ])

16409

+ case $host_os in

16410

+ rhapsody* | darwin1.[[0123]])

16411

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

16412

+ darwin1.*)

16413

+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

16414

+ darwin*)

16415

+ # if running on 10.5 or later, the deployment target defaults

16416

+ # to the OS version, if on x86, and 10.4, the deployment

16417

+ # target defaults to 10.4. Don't you love it?

16418

+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in

16419

+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)

16420

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

16421

+ 10.[[012]]*)

16422

+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

16423

+ 10.*)

16424

+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

16425

+ esac

16426

+ ;;

16427

+ esac

16428

+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then

16429

+ _lt_dar_single_mod='$single_module'

16430

+ fi

16431

+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then

16432

+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'

16433

+ else

16434

+ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"

16435

+ fi

16436

+ if test "$DSYMUTIL" != ":"; then

16437

+ _lt_dsymutil="~$DSYMUTIL \$lib || :"

16438

+ else

16439

+ _lt_dsymutil=

16440

+ fi

16441

+ ;;

16442

+ esac

16443

+])

16444

16445

# _LT_AC_SYS_LIBPATH_AIX

16446

# ----------------------

16447

@@ -287,12 +361,20 @@

16448

# If we don't find anything, use the default library path according

16449

# to the aix ld manual.

16450

AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],

16451

-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[

16452

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

16453

-}'`

16454

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

16455

+AC_LINK_IFELSE(AC_LANG_PROGRAM,[

16456

+lt_aix_libpath_sed='

16457

+ /Import File Strings/,/^$/ {

16458

+ /^0/ {

16459

+ s/^0 *$.*$$/\1/

16460

+ p

16461

+ }

16462

+ }'

16463

+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

16464

# Check for a 64-bit object if we didn't find anything.

16465

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

16466

-}'`; fi],[])

16467

+if test -z "$aix_libpath"; then

16468

+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

16469

+fi],[])

16470

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

16471

])# _LT_AC_SYS_LIBPATH_AIX

16472

16473

@@ -523,13 +605,17 @@

16474

rm -rf conftest*

16475

;;

16476

16477

-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)

16478

+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \

16479

+s390*-*linux*|sparc*-*linux*)

16480

# Find out which ABI we are using.

16481

echo 'int i;' > conftest.$ac_ext

16482

if AC_TRY_EVAL(ac_compile); then

16483

case `/usr/bin/file conftest.o` in

16484

*32-bit*)

16485

case $host in

16486

+ x86_64-*kfreebsd*-gnu)

16487

+ LD="${LD-ld} -m elf_i386_fbsd"

16488

+ ;;

16489

x86_64-*linux*)

16490

LD="${LD-ld} -m elf_i386"

16491

;;

16492

@@ -546,6 +632,9 @@

16493

;;

16494

*64-bit*)

16495

case $host in

16496

+ x86_64-*kfreebsd*-gnu)

16497

+ LD="${LD-ld} -m elf_x86_64_fbsd"

16498

+ ;;

16499

x86_64-*linux*)

16500

LD="${LD-ld} -m elf_x86_64"

16501

;;

16502

@@ -586,7 +675,11 @@

16503

*64-bit*)

16504

case $lt_cv_prog_gnu_ld in

16505

yes*) LD="${LD-ld} -m elf64_sparc" ;;

16506

- *) LD="${LD-ld} -64" ;;

16507

+ *)

16508

+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then

16509

+ LD="${LD-ld} -64"

16510

+ fi

16511

+ ;;

16512

esac

16513

;;

16514

esac

16515

@@ -617,7 +710,7 @@

16516

AC_CACHE_CHECK([$1], [$2],

16517

[$2=no

16518

ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])

16519

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

16520

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

16521

lt_compiler_flag="$3"

16522

# Insert the option either (1) after the last *FLAGS variable, or

16523

# (2) before a word containing "conftest.", or (3) at the end.

16524

@@ -658,11 +751,12 @@

16525

# ------------------------------------------------------------

16526

# Check whether the given compiler option works

16527

AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],

16528

-[AC_CACHE_CHECK([$1], [$2],

16529

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

16530

+AC_CACHE_CHECK([$1], [$2],

16531

[$2=no

16532

save_LDFLAGS="$LDFLAGS"

16533

LDFLAGS="$LDFLAGS $3"

16534

- printf "$lt_simple_link_test_code" > conftest.$ac_ext

16535

+ echo "$lt_simple_link_test_code" > conftest.$ac_ext

16536

if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

16537

# The linker can only warn and ignore the option if not recognized

16538

# So say no if there are warnings

16539

@@ -678,7 +772,7 @@

16540

$2=yes

16541

fi

16542

fi

16543

- $rm conftest*

16544

+ $rm -r conftest*

16545

LDFLAGS="$save_LDFLAGS"

16546

])

16547

16548

@@ -776,24 +870,27 @@

16549

fi

16550

;;

16551

*)

16552

- # If test is not a shell built-in, we'll probably end up computing a

16553

- # maximum length that is only half of the actual maximum length, but

16554

- # we can't tell.

16555

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

16556

- while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \

16557

+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`

16558

+ if test -n "$lt_cv_sys_max_cmd_len"; then

16559

+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`

16560

+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`

16561

+ else

16562

+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}

16563

+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \

16564

= "XX$teststring") >/dev/null 2>&1 &&

16565

- new_result=`expr "X$teststring" : ".*" 2>&1` &&

16566

- lt_cv_sys_max_cmd_len=$new_result &&

16567

- test $i != 17 # 1/2 MB should be enough

16568

- do

16569

- i=`expr $i + 1`

16570

- teststring=$teststring$teststring

16571

- done

16572

- teststring=

16573

- # Add a significant safety factor because C++ compilers can tack on massive

16574

- # amounts of additional arguments before passing them to the linker.

16575

- # It appears as though 1/2 is a usable value.

16576

- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`

16577

+ new_result=`expr "X$teststring" : ".*" 2>&1` &&

16578

+ lt_cv_sys_max_cmd_len=$new_result &&

16579

+ test $i != 17 # 1/2 MB should be enough

16580

+ do

16581

+ i=`expr $i + 1`

16582

+ teststring=$teststring$teststring

16583

+ done

16584

+ teststring=

16585

+ # Add a significant safety factor because C++ compilers can tack on massive

16586

+ # amounts of additional arguments before passing them to the linker.

16587

+ # It appears as though 1/2 is a usable value.

16588

+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`

16589

+ fi

16590

;;

16591

esac

16592

])

16593

@@ -946,7 +1043,7 @@

16594

AC_CHECK_FUNC([shl_load],

16595

[lt_cv_dlopen="shl_load"],

16596

[AC_CHECK_LIB([dld], [shl_load],

16597

- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],

16598

+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],

16599

[AC_CHECK_FUNC([dlopen],

16600

[lt_cv_dlopen="dlopen"],

16601

[AC_CHECK_LIB([dl], [dlopen],

16602

@@ -954,7 +1051,7 @@

16603

[AC_CHECK_LIB([svld], [dlopen],

16604

[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],

16605

[AC_CHECK_LIB([dld], [dld_link],

16606

- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])

16607

+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])

16608

])

16609

])

16610

])

16611

@@ -1020,7 +1117,8 @@

16612

# ---------------------------------

16613

# Check to see if options -c and -o are simultaneously supported by compiler

16614

AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],

16615

-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl

16616

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

16617

+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl

16618

AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],

16619

[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],

16620

[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no

16621

@@ -1028,7 +1126,7 @@

16622

mkdir conftest

16623

cd conftest

16624

mkdir out

16625

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

16626

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

16627

16628

lt_compiler_flag="-o out/conftest2.$ac_objext"

16629

# Insert the option either (1) after the last *FLAGS variable, or

16630

@@ -1168,6 +1266,7 @@

16631

darwin*)

16632

if test -n "$STRIP" ; then

16633

striplib="$STRIP -x"

16634

+ old_striplib="$STRIP -S"

16635

AC_MSG_RESULT([yes])

16636

else

16637

AC_MSG_RESULT([no])

16638

@@ -1185,7 +1284,8 @@

16639

# -----------------------------

16640

# PORTME Fill in your ld.so characteristics

16641

AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],

16642

-[AC_MSG_CHECKING([dynamic linker characteristics])

16643

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

16644

+AC_MSG_CHECKING([dynamic linker characteristics])

16645

library_names_spec=

16646

libname_spec='lib$name'

16647

soname_spec=

16648

@@ -1199,20 +1299,58 @@

16649

version_type=none

16650

dynamic_linker="$host_os ld.so"

16651

sys_lib_dlsearch_path_spec="/lib /usr/lib"

16652

+m4_if($1,[],[

16653

if test "$GCC" = yes; then

16654

- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`

16655

- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then

16656

+ case $host_os in

16657

+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;

16658

+ *) lt_awk_arg="/^libraries:/" ;;

16659

+ esac

16660

+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`

16661

+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then

16662

# if the path contains ";" then we assume it to be the separator

16663

# otherwise default to the standard path separator (i.e. ":") - it is

16664

# assumed that no part of a normal pathname contains ";" but that should

16665

# okay in the real world where ";" in dirpaths is itself problematic.

16666

- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`

16667

+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`

16668

else

16669

- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

16670

+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`

16671

fi

16672

+ # Ok, now we have the path, separated by spaces, we can step through it

16673

+ # and add multilib dir if necessary.

16674

+ lt_tmp_lt_search_path_spec=

16675

+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`

16676

+ for lt_sys_path in $lt_search_path_spec; do

16677

+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then

16678

+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"

16679

+ else

16680

+ test -d "$lt_sys_path" && \

16681

+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"

16682

+ fi

16683

+ done

16684

+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '

16685

+BEGIN {RS=" "; FS="/|\n";} {

16686

+ lt_foo="";

16687

+ lt_count=0;

16688

+ for (lt_i = NF; lt_i > 0; lt_i--) {

16689

+ if ($lt_i != "" && $lt_i != ".") {

16690

+ if ($lt_i == "..") {

16691

+ lt_count++;

16692

+ } else {

16693

+ if (lt_count == 0) {

16694

+ lt_foo="/" $lt_i lt_foo;

16695

+ } else {

16696

+ lt_count--;

16697

+ }

16698

+ }

16699

+ }

16700

+ }

16701

+ if (lt_foo != "") { lt_freq[[lt_foo]]++; }

16702

+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }

16703

+}'`

16704

+ sys_lib_search_path_spec=`echo $lt_search_path_spec`

16705

else

16706

sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"

16707

-fi

16708

+fi])

16709

need_lib_prefix=unknown

16710

hardcode_into_libs=no

16711

16712

@@ -1230,7 +1368,7 @@

16713

soname_spec='${libname}${release}${shared_ext}$major'

16714

;;

16715

16716

-aix4* | aix5*)

16717

+aix[[4-9]]*)

16718

version_type=linux

16719

need_lib_prefix=no

16720

need_version=no

16721

@@ -1369,12 +1507,8 @@

16722

shlibpath_overrides_runpath=yes

16723

shlibpath_var=DYLD_LIBRARY_PATH

16724

shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'

16725

- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.

16726

- if test "$GCC" = yes; then

16727

- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`

16728

- else

16729

- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'

16730

- fi

16731

+ m4_if([$1], [],[

16732

+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])

16733

sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'

16734

;;

16735

16736

@@ -1391,18 +1525,6 @@

16737

dynamic_linker=no

16738

;;

16739

16740

-kfreebsd*-gnu)

16741

- version_type=linux

16742

- need_lib_prefix=no

16743

- need_version=no

16744

- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

16745

- soname_spec='${libname}${release}${shared_ext}$major'

16746

- shlibpath_var=LD_LIBRARY_PATH

16747

- shlibpath_overrides_runpath=no

16748

- hardcode_into_libs=yes

16749

- dynamic_linker='GNU ld.so'

16750

- ;;

16751

-

16752

freebsd* | dragonfly*)

16753

# DragonFly does not have aout. When/if they implement a new

16754

# versioning mechanism, adjust this.

16755

@@ -1440,7 +1562,7 @@

16756

shlibpath_overrides_runpath=no

16757

hardcode_into_libs=yes

16758

;;

16759

- freebsd*) # from 4.6 on

16760

+ *) # from 4.6 on, and DragonFly

16761

shlibpath_overrides_runpath=yes

16762

hardcode_into_libs=yes

16763

;;

16764

@@ -1503,7 +1625,7 @@

16765

postinstall_cmds='chmod 555 $lib'

16766

;;

16767

16768

-interix3*)

16769

+interix[[3-9]]*)

16770

version_type=linux

16771

need_lib_prefix=no

16772

need_version=no

16773

@@ -1558,7 +1680,7 @@

16774

;;

16775

16776

# This must be Linux ELF.

16777

-linux*)

16778

+linux* | k*bsd*-gnu)

16779

version_type=linux

16780

need_lib_prefix=no

16781

need_version=no

16782

@@ -1574,7 +1696,7 @@

16783

16784

# Append ld.so.conf contents to the search path

16785

if test -f /etc/ld.so.conf; then

16786

- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

16787

+ 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' ' '`

16788

sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

16789

fi

16790

16791

@@ -1587,7 +1709,7 @@

16792

dynamic_linker='GNU/Linux ld.so'

16793

;;

16794

16795

-knetbsd*-gnu)

16796

+netbsdelf*-gnu)

16797

version_type=linux

16798

need_lib_prefix=no

16799

need_version=no

16800

@@ -1596,7 +1718,7 @@

16801

shlibpath_var=LD_LIBRARY_PATH

16802

shlibpath_overrides_runpath=no

16803

hardcode_into_libs=yes

16804

- dynamic_linker='GNU ld.so'

16805

+ dynamic_linker='NetBSD ld.elf_so'

16806

;;

16807

16808

netbsd*)

16809

@@ -1680,6 +1802,10 @@

16810

sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"

16811

;;

16812

16813

+rdos*)

16814

+ dynamic_linker=no

16815

+ ;;

16816

+

16817

solaris*)

16818

version_type=linux

16819

need_lib_prefix=no

16820

@@ -1775,6 +1901,13 @@

16821

AC_MSG_RESULT([$dynamic_linker])

16822

test "$dynamic_linker" = no && can_build_shared=no

16823

16824

+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],

16825

+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])

16826

+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

16827

+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],

16828

+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])

16829

+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"

16830

+

16831

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

16832

if test "$GCC" = yes; then

16833

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

16834

@@ -1785,7 +1918,8 @@

16835

# _LT_AC_TAGCONFIG

16836

# ----------------

16837

AC_DEFUN([_LT_AC_TAGCONFIG],

16838

-[AC_ARG_WITH([tags],

16839

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

16840

+AC_ARG_WITH([tags],

16841

[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],

16842

[include additional configurations @<:@automatic@:>@])],

16843

[tagnames="$withval"])

16844

@@ -2046,7 +2180,7 @@

16845

16846

# AC_PATH_TOOL_PREFIX

16847

# -------------------

16848

-# find a file program which can recognise shared library

16849

+# find a file program which can recognize shared library

16850

AC_DEFUN([AC_PATH_TOOL_PREFIX],

16851

[AC_REQUIRE([AC_PROG_EGREP])dnl

16852

AC_MSG_CHECKING([for $1])

16853

@@ -2109,7 +2243,7 @@

16854

16855

# AC_PATH_MAGIC

16856

# -------------

16857

-# find a file program which can recognise a shared library

16858

+# find a file program which can recognize a shared library

16859

AC_DEFUN([AC_PATH_MAGIC],

16860

[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)

16861

if test -z "$lt_cv_path_MAGIC_CMD"; then

16862

@@ -2256,7 +2390,7 @@

16863

# how to check for library dependencies

16864

# -- PORTME fill in with the dynamic library characteristics

16865

AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],

16866

-[AC_CACHE_CHECK([how to recognise dependent libraries],

16867

+[AC_CACHE_CHECK([how to recognize dependent libraries],

16868

lt_cv_deplibs_check_method,

16869

[lt_cv_file_magic_cmd='$MAGIC_CMD'

16870

lt_cv_file_magic_test_file=

16871

@@ -2273,7 +2407,7 @@

16872

# whether `pass_all' will *always* work, you probably want this one.

16873

16874

case $host_os in

16875

-aix4* | aix5*)

16876

+aix[[4-9]]*)

16877

lt_cv_deplibs_check_method=pass_all

16878

;;

16879

16880

@@ -2295,16 +2429,22 @@

16881

16882

mingw* | pw32*)

16883

# Base MSYS/MinGW do not provide the 'file' command needed by

16884

- # func_win32_libid shell function, so use a weaker test based on 'objdump'.

16885

- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'

16886

- lt_cv_file_magic_cmd='$OBJDUMP -f'

16887

+ # func_win32_libid shell function, so use a weaker test based on 'objdump',

16888

+ # unless we find 'file', for example because we are cross-compiling.

16889

+ if ( file / ) >/dev/null 2>&1; then

16890

+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'

16891

+ lt_cv_file_magic_cmd='func_win32_libid'

16892

+ else

16893

+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'

16894

+ lt_cv_file_magic_cmd='$OBJDUMP -f'

16895

+ fi

16896

;;

16897

16898

darwin* | rhapsody*)

16899

lt_cv_deplibs_check_method=pass_all

16900

;;

16901

16902

-freebsd* | kfreebsd*-gnu | dragonfly*)

16903

+freebsd* | dragonfly*)

16904

if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

16905

case $host_cpu in

16906

i*86 )

16907

@@ -2342,7 +2482,7 @@

16908

esac

16909

;;

16910

16911

-interix3*)

16912

+interix[[3-9]]*)

16913

# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here

16914

lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'

16915

;;

16916

@@ -2358,11 +2498,11 @@

16917

;;

16918

16919

# This must be Linux ELF.

16920

-linux*)

16921

+linux* | k*bsd*-gnu)

16922

lt_cv_deplibs_check_method=pass_all

16923

;;

16924

16925

-netbsd*)

16926

+netbsd* | netbsdelf*-gnu)

16927

if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

16928

lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'

16929

else

16930

@@ -2392,6 +2532,10 @@

16931

lt_cv_deplibs_check_method=pass_all

16932

;;

16933

16934

+rdos*)

16935

+ lt_cv_deplibs_check_method=pass_all

16936

+ ;;

16937

+

16938

solaris*)

16939

lt_cv_deplibs_check_method=pass_all

16940

;;

16941

@@ -2444,7 +2588,7 @@

16942

lt_cv_path_NM="$NM"

16943

else

16944

lt_nm_to_check="${ac_tool_prefix}nm"

16945

- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then

16946

+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then

16947

lt_nm_to_check="$lt_nm_to_check nm"

16948

fi

16949

for lt_tmp_nm in $lt_nm_to_check; do

16950

@@ -2660,10 +2804,10 @@

16951

_LT_AC_TAGVAR(objext, $1)=$objext

16952

16953

# Code to be used in simple compile tests

16954

-lt_simple_compile_test_code="int some_variable = 0;\n"

16955

+lt_simple_compile_test_code="int some_variable = 0;"

16956

16957

# Code to be used in simple link tests

16958

-lt_simple_link_test_code='int main(){return(0);}\n'

16959

+lt_simple_link_test_code='int main(){return(0);}'

16960

16961

_LT_AC_SYS_COMPILER

16962

16963

@@ -2703,7 +2847,7 @@

16964

fi

16965

;;

16966

16967

-aix4* | aix5*)

16968

+aix[[4-9]]*)

16969

if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then

16970

test "$enable_shared" = yes && enable_static=no

16971

fi

16972

@@ -2760,6 +2904,7 @@

16973

_LT_AC_TAGVAR(predeps, $1)=

16974

_LT_AC_TAGVAR(postdeps, $1)=

16975

_LT_AC_TAGVAR(compiler_lib_search_path, $1)=

16976

+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=

16977

16978

# Source file extension for C++ test sources.

16979

ac_ext=cpp

16980

@@ -2769,10 +2914,10 @@

16981

_LT_AC_TAGVAR(objext, $1)=$objext

16982

16983

# Code to be used in simple compile tests

16984

-lt_simple_compile_test_code="int some_variable = 0;\n"

16985

+lt_simple_compile_test_code="int some_variable = 0;"

16986

16987

# Code to be used in simple link tests

16988

-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'

16989

+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'

16990

16991

# ltmain only uses $CC for tagged configurations so make sure $CC is set.

16992

_LT_AC_SYS_COMPILER

16993

@@ -2869,7 +3014,7 @@

16994

# FIXME: insert proper C++ library support

16995

_LT_AC_TAGVAR(ld_shlibs, $1)=no

16996

;;

16997

- aix4* | aix5*)

16998

+ aix[[4-9]]*)

16999

if test "$host_cpu" = ia64; then

17000

# On IA64, the linker does run time linking by default, so we don't

17001

# have to do anything special.

17002

@@ -2882,7 +3027,7 @@

17003

# Test if we are trying to use run time linking or normal

17004

# AIX style linking. If -brtl is somewhere in LDFLAGS, we

17005

# need to do runtime linking.

17006

- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)

17007

+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)

17008

for ld_flag in $LDFLAGS; do

17009

case $ld_flag in

17010

*-brtl*)

17011

@@ -2918,7 +3063,7 @@

17012

strings "$collect2name" | grep resolve_lib_name >/dev/null

17013

then

17014

# We have reworked collect2

17015

- _LT_AC_TAGVAR(hardcode_direct, $1)=yes

17016

+ :

17017

else

17018

# We have old collect2

17019

_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported

17020

@@ -3028,59 +3173,31 @@

17021

fi

17022

;;

17023

darwin* | rhapsody*)

17024

- case $host_os in

17025

- rhapsody* | darwin1.[[012]])

17026

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'

17027

- ;;

17028

- *) # Darwin 1.3 on

17029

- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then

17030

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'

17031

- else

17032

- case ${MACOSX_DEPLOYMENT_TARGET} in

17033

- 10.[[012]])

17034

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'

17035

- ;;

17036

- 10.*)

17037

- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'

17038

- ;;

17039

- esac

17040

- fi

17041

- ;;

17042

- esac

17043

_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no

17044

_LT_AC_TAGVAR(hardcode_direct, $1)=no

17045

_LT_AC_TAGVAR(hardcode_automatic, $1)=yes

17046

_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported

17047

_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''

17048

_LT_AC_TAGVAR(link_all_deplibs, $1)=yes

17049

-

17050

- if test "$GXX" = yes ; then

17051

- lt_int_apple_cc_single_mod=no

17052

+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"

17053

+ if test "$GXX" = yes ; then

17054

output_verbose_link_cmd='echo'

17055

- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then

17056

- lt_int_apple_cc_single_mod=yes

17057

+ _LT_AC_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}"

17058

+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

17059

+ _LT_AC_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}"

17060

+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"

17061

+ if test "$lt_cv_apple_cc_single_mod" != "yes"; then

17062

+ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"

17063

+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"

17064

fi

17065

- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then

17066

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'

17067

- else

17068

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'

17069

- fi

17070

- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

17071

- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

17072

- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then

17073

- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

17074

- else

17075

- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

17076

- fi

17077

- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

17078

else

17079

case $cc_basename in

17080

xlc*)

17081

output_verbose_link_cmd='echo'

17082

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'

17083

+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'

17084

_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

17085

# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

17086

- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

17087

+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

17088

_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

17089

;;

17090

*)

17091

@@ -3114,7 +3231,7 @@

17092

freebsd-elf*)

17093

_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no

17094

;;

17095

- freebsd* | kfreebsd*-gnu | dragonfly*)

17096

+ freebsd* | dragonfly*)

17097

# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF

17098

# conventions

17099

_LT_AC_TAGVAR(ld_shlibs, $1)=yes

17100

@@ -3163,9 +3280,7 @@

17101

_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:

17102

17103

case $host_cpu in

17104

- hppa*64*|ia64*)

17105

- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'

17106

- ;;

17107

+ hppa*64*|ia64*) ;;

17108

*)

17109

_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'

17110

;;

17111

@@ -3233,7 +3348,7 @@

17112

;;

17113

esac

17114

;;

17115

- interix3*)

17116

+ interix[[3-9]]*)

17117

_LT_AC_TAGVAR(hardcode_direct, $1)=no

17118

_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no

17119

_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

17120

@@ -3273,7 +3388,7 @@

17121

_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

17122

_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:

17123

;;

17124

- linux*)

17125

+ linux* | k*bsd*-gnu)

17126

case $cc_basename in

17127

KCC*)

17128

# Kuck and Associates, Inc. (KAI) C++ Compiler

17129

@@ -3325,7 +3440,7 @@

17130

_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'

17131

_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'

17132

;;

17133

- pgCC*)

17134

+ pgCC* | pgcpp*)

17135

# Portland Group C++ compiler

17136

_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'

17137

_LT_AC_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'

17138

@@ -3353,6 +3468,29 @@

17139

# dependencies.

17140

output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $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; echo $list'

17141

;;

17142

+ *)

17143

+ case `$CC -V 2>&1 | sed 5q` in

17144

+ *Sun\ C*)

17145

+ # Sun C++ 5.9

17146

+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'

17147

+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'

17148

+ _LT_AC_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'

17149

+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

17150

+ _LT_AC_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'

17151

+

17152

+ # Not sure whether something based on

17153

+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1

17154

+ # would be better.

17155

+ output_verbose_link_cmd='echo'

17156

+

17157

+ # Archives containing C++ object files must be created using

17158

+ # "CC -xar", where "CC" is the Sun C++ compiler. This is

17159

+ # necessary to make sure instantiated templates are included

17160

+ # in the archive.

17161

+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'

17162

+ ;;

17163

+ esac

17164

+ ;;

17165

esac

17166

;;

17167

lynxos*)

17168

@@ -3375,7 +3513,7 @@

17169

;;

17170

esac

17171

;;

17172

- netbsd*)

17173

+ netbsd* | netbsdelf*-gnu)

17174

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

17175

_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'

17176

wlarc=

17177

@@ -3391,16 +3529,20 @@

17178

_LT_AC_TAGVAR(ld_shlibs, $1)=no

17179

;;

17180

openbsd*)

17181

- _LT_AC_TAGVAR(hardcode_direct, $1)=yes

17182

- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no

17183

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'

17184

- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

17185

- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

17186

- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'

17187

- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'

17188

- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'

17189

+ if test -f /usr/libexec/ld.so; then

17190

+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes

17191

+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no

17192

+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'

17193

+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

17194

+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

17195

+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'

17196

+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'

17197

+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'

17198

+ fi

17199

+ output_verbose_link_cmd='echo'

17200

+ else

17201

+ _LT_AC_TAGVAR(ld_shlibs, $1)=no

17202

fi

17203

- output_verbose_link_cmd='echo'

17204

;;

17205

osf3*)

17206

case $cc_basename in

17207

@@ -3562,15 +3704,10 @@

17208

case $host_os in

17209

solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;

17210

*)

17211

- # The C++ compiler is used as linker so we must use $wl

17212

- # flag to pass the commands to the underlying system

17213

- # linker. We must also pass each convience library through

17214

- # to the system linker between allextract/defaultextract.

17215

- # The C++ compiler will combine linker options so we

17216

- # cannot just pass the convience library names through

17217

- # without $wl.

17218

+ # The compiler driver will combine and reorder linker options,

17219

+ # but understands `-z linker_flag'.

17220

# Supported since Solaris 2.6 (maybe 2.5.1?)

17221

- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'

17222

+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'

17223

;;

17224

esac

17225

_LT_AC_TAGVAR(link_all_deplibs, $1)=yes

17226

@@ -3617,6 +3754,12 @@

17227

fi

17228

17229

_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'

17230

+ case $host_os in

17231

+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;

17232

+ *)

17233

+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'

17234

+ ;;

17235

+ esac

17236

fi

17237

;;

17238

esac

17239

@@ -3736,7 +3879,8 @@

17240

# compiler output when linking a shared library.

17241

# Parse the compiler output and extract the necessary

17242

# objects, libraries and library flags.

17243

-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[

17244

+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],

17245

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

17246

dnl we can't use the lt_simple_compile_test_code here,

17247

dnl because it contains code intended for an executable,

17248

dnl not a library. It's possible we should let each

17249

@@ -3861,10 +4005,15 @@

17250

17251

$rm -f confest.$objext

17252

17253

+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=

17254

+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then

17255

+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`

17256

+fi

17257

+

17258

# PORTME: override above test on systems where it is broken

17259

ifelse([$1],[CXX],

17260

[case $host_os in

17261

-interix3*)

17262

+interix[[3-9]]*)

17263

# Interix 3.5 installs completely hosed .la files for C++, so rather than

17264

# hack all around it, let's just trust "g++" to DTRT.

17265

_LT_AC_TAGVAR(predep_objects,$1)=

17266

@@ -3872,19 +4021,51 @@

17267

_LT_AC_TAGVAR(postdeps,$1)=

17268

;;

17269

17270

+linux*)

17271

+ case `$CC -V 2>&1 | sed 5q` in

17272

+ *Sun\ C*)

17273

+ # Sun C++ 5.9

17274

+ #

17275

+ # The more standards-conforming stlport4 library is

17276

+ # incompatible with the Cstd library. Avoid specifying

17277

+ # it if it's in CXXFLAGS. Ignore libCrun as

17278

+ # -library=stlport4 depends on it.

17279

+ case " $CXX $CXXFLAGS " in

17280

+ *" -library=stlport4 "*)

17281

+ solaris_use_stlport4=yes

17282

+ ;;

17283

+ esac

17284

+ if test "$solaris_use_stlport4" != yes; then

17285

+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'

17286

+ fi

17287

+ ;;

17288

+ esac

17289

+ ;;

17290

+

17291

solaris*)

17292

case $cc_basename in

17293

CC*)

17294

+ # The more standards-conforming stlport4 library is

17295

+ # incompatible with the Cstd library. Avoid specifying

17296

+ # it if it's in CXXFLAGS. Ignore libCrun as

17297

+ # -library=stlport4 depends on it.

17298

+ case " $CXX $CXXFLAGS " in

17299

+ *" -library=stlport4 "*)

17300

+ solaris_use_stlport4=yes

17301

+ ;;

17302

+ esac

17303

+

17304

# Adding this requires a known-good setup of shared libraries for

17305

# Sun compiler versions before 5.6, else PIC objects from an old

17306

# archive will be linked into the output, leading to subtle bugs.

17307

- _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'

17308

+ if test "$solaris_use_stlport4" != yes; then

17309

+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'

17310

+ fi

17311

;;

17312

esac

17313

;;

17314

esac

17315

])

17316

-

17317

case " $_LT_AC_TAGVAR(postdeps, $1) " in

17318

*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;

17319

esac

17320

@@ -3927,10 +4108,17 @@

17321

_LT_AC_TAGVAR(objext, $1)=$objext

17322

17323

# Code to be used in simple compile tests

17324

-lt_simple_compile_test_code=" subroutine t\n return\n end\n"

17325

+lt_simple_compile_test_code="\

17326

+ subroutine t

17327

+ return

17328

+ end

17329

+"

17330

17331

# Code to be used in simple link tests

17332

-lt_simple_link_test_code=" program t\n end\n"

17333

+lt_simple_link_test_code="\

17334

+ program t

17335

+ end

17336

+"

17337

17338

# ltmain only uses $CC for tagged configurations so make sure $CC is set.

17339

_LT_AC_SYS_COMPILER

17340

@@ -3962,7 +4150,7 @@

17341

postinstall_cmds='$RANLIB $lib'

17342

fi

17343

;;

17344

-aix4* | aix5*)

17345

+aix[[4-9]]*)

17346

if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then

17347

test "$enable_shared" = yes && enable_static=no

17348

fi

17349

@@ -4009,10 +4197,10 @@

17350

_LT_AC_TAGVAR(objext, $1)=$objext

17351

17352

# Code to be used in simple compile tests

17353

-lt_simple_compile_test_code="class foo {}\n"

17354

+lt_simple_compile_test_code="class foo {}"

17355

17356

# Code to be used in simple link tests

17357

-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'

17358

+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'

17359

17360

# ltmain only uses $CC for tagged configurations so make sure $CC is set.

17361

_LT_AC_SYS_COMPILER

17362

@@ -4069,7 +4257,7 @@

17363

_LT_AC_TAGVAR(objext, $1)=$objext

17364

17365

# Code to be used in simple compile tests

17366

-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'

17367

+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'

17368

17369

# Code to be used in simple link tests

17370

lt_simple_link_test_code="$lt_simple_compile_test_code"

17371

@@ -4143,6 +4331,7 @@

17372

_LT_AC_TAGVAR(predeps, $1) \

17373

_LT_AC_TAGVAR(postdeps, $1) \

17374

_LT_AC_TAGVAR(compiler_lib_search_path, $1) \

17375

+ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \

17376

_LT_AC_TAGVAR(archive_cmds, $1) \

17377

_LT_AC_TAGVAR(archive_expsym_cmds, $1) \

17378

_LT_AC_TAGVAR(postinstall_cmds, $1) \

17379

@@ -4158,6 +4347,7 @@

17380

_LT_AC_TAGVAR(module_cmds, $1) \

17381

_LT_AC_TAGVAR(module_expsym_cmds, $1) \

17382

_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \

17383

+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \

17384

_LT_AC_TAGVAR(exclude_expsyms, $1) \

17385

_LT_AC_TAGVAR(include_expsyms, $1); do

17386

17387

@@ -4204,7 +4394,7 @@

17388

# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)

17389

# NOTE: Changes made to this file will be lost: look at ltmain.sh.

17390

#

17391

17392

17393

# Free Software Foundation, Inc.

17394

#

17395

# This file is part of GNU Libtool:

17396

@@ -4441,6 +4631,10 @@

17397

# shared library.

17398

postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)

17399

17400

+# The directories searched by this compiler when creating a shared

17401

+# library

17402

+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)

17403

+

17404

# The library search path used internally by the compiler when linking

17405

# a shared library.

17406

compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)

17407

@@ -4529,7 +4723,7 @@

17408

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

17409

17410

# Fix the shell variable \$srcfile for the compiler.

17411

-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"

17412

+fix_srcfile_path=$lt_fix_srcfile_path

17413

17414

# Set to yes if exported symbols are required.

17415

always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)

17416

@@ -4612,6 +4806,7 @@

17417

# ---------------------------------

17418

AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],

17419

[AC_REQUIRE([AC_CANONICAL_HOST])

17420

+AC_REQUIRE([LT_AC_PROG_SED])

17421

AC_REQUIRE([AC_PROG_NM])

17422

AC_REQUIRE([AC_OBJEXT])

17423

# Check for command to grab the raw symbol name followed by C symbol from nm.

17424

@@ -4648,7 +4843,7 @@

17425

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

17426

lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (lt_ptr) \&\2},/p'"

17427

;;

17428

-linux*)

17429

+linux* | k*bsd*-gnu)

17430

if test "$host_cpu" = ia64; then

17431

symcode='[[ABCDGIRSTW]]'

17432

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

17433

@@ -4789,7 +4984,7 @@

17434

echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD

17435

cat conftest.$ac_ext >&5

17436

fi

17437

- rm -f conftest* conftst*

17438

+ rm -rf conftest* conftst*

17439

17440

# Do not use the global_symbol_pipe unless it works.

17441

if test "$pipe_works" = yes; then

17442

@@ -4838,13 +5033,16 @@

17443

# like `-m68040'.

17444

_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'

17445

;;

17446

17447

+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

17448

# PIC is the default for these OSes.

17449

;;

17450

- mingw* | os2* | pw32*)

17451

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

17452

# This hack is so that the source file can tell whether it is being

17453

# built for inclusion in a dll (and should export symbols for example).

17454

- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'

17455

+ # Although the cygwin gcc ignores -fPIC, still need this for old-style

17456

+ # (--disable-auto-import) libraries

17457

+ m4_if([$1], [GCJ], [],

17458

+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])

17459

;;

17460

darwin* | rhapsody*)

17461

# PIC is the default on this platform

17462

@@ -4855,7 +5053,7 @@

17463

# DJGPP does not support shared libraries at all

17464

_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=

17465

;;

17466

- interix3*)

17467

+ interix[[3-9]]*)

17468

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

17469

# Instead, we relocate shared libraries at runtime.

17470

;;

17471

@@ -4881,7 +5079,7 @@

17472

esac

17473

else

17474

case $host_os in

17475

- aix4* | aix5*)

17476

+ aix[[4-9]]*)

17477

# All AIX code is PIC.

17478

if test "$host_cpu" = ia64; then

17479

# AIX 5 now supports IA64 processor

17480

@@ -4921,7 +5119,7 @@

17481

;;

17482

esac

17483

;;

17484

- freebsd* | kfreebsd*-gnu | dragonfly*)

17485

+ freebsd* | dragonfly*)

17486

# FreeBSD uses GNU C++

17487

;;

17488

hpux9* | hpux10* | hpux11*)

17489

@@ -4964,7 +5162,7 @@

17490

;;

17491

esac

17492

;;

17493

- linux*)

17494

+ linux* | k*bsd*-gnu)

17495

case $cc_basename in

17496

KCC*)

17497

# KAI C++ Compiler

17498

@@ -4977,7 +5175,7 @@

17499

_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

17500

_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'

17501

;;

17502

- pgCC*)

17503

+ pgCC* | pgcpp*)

17504

# Portland Group C++ compiler.

17505

_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

17506

_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'

17507

@@ -4991,6 +5189,14 @@

17508

_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

17509

;;

17510

*)

17511

+ case `$CC -V 2>&1 | sed 5q` in

17512

+ *Sun\ C*)

17513

+ # Sun C++ 5.9

17514

+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

17515

+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

17516

+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '

17517

+ ;;

17518

+ esac

17519

;;

17520

esac

17521

;;

17522

@@ -5007,7 +5213,7 @@

17523

;;

17524

esac

17525

;;

17526

- netbsd*)

17527

+ netbsd* | netbsdelf*-gnu)

17528

;;

17529

osf3* | osf4* | osf5*)

17530

case $cc_basename in

17531

@@ -5111,14 +5317,17 @@

17532

_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'

17533

;;

17534

17535

17536

+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)

17537

# PIC is the default for these OSes.

17538

;;

17539

17540

- mingw* | pw32* | os2*)

17541

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

17542

# This hack is so that the source file can tell whether it is being

17543

# built for inclusion in a dll (and should export symbols for example).

17544

- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'

17545

+ # Although the cygwin gcc ignores -fPIC, still need this for old-style

17546

+ # (--disable-auto-import) libraries

17547

+ m4_if([$1], [GCJ], [],

17548

+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])

17549

;;

17550

17551

darwin* | rhapsody*)

17552

@@ -5127,7 +5336,7 @@

17553

_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'

17554

;;

17555

17556

- interix3*)

17557

+ interix[[3-9]]*)

17558

# Interix 3.x gcc -fpic/-fPIC options generate broken code.

17559

# Instead, we relocate shared libraries at runtime.

17560

;;

17561

@@ -5185,10 +5394,11 @@

17562

esac

17563

;;

17564

17565

- mingw* | pw32* | os2*)

17566

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

17567

# This hack is so that the source file can tell whether it is being

17568

# built for inclusion in a dll (and should export symbols for example).

17569

- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'

17570

+ m4_if([$1], [GCJ], [],

17571

+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])

17572

;;

17573

17574

hpux9* | hpux10* | hpux11*)

17575

@@ -5218,7 +5428,7 @@

17576

_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

17577

;;

17578

17579

- linux*)

17580

+ linux* | k*bsd*-gnu)

17581

case $cc_basename in

17582

icc* | ecc*)

17583

_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

17584

@@ -5237,6 +5447,22 @@

17585

# All Alpha code is PIC.

17586

_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

17587

;;

17588

+ *)

17589

+ case `$CC -V 2>&1 | sed 5q` in

17590

+ *Sun\ C*)

17591

+ # Sun C 5.9

17592

+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

17593

+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

17594

+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

17595

+ ;;

17596

+ *Sun\ F*)

17597

+ # Sun Fortran 8.3 passes all unrecognized flags to the linker

17598

+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

17599

+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

17600

+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''

17601

+ ;;

17602

+ esac

17603

+ ;;

17604

esac

17605

;;

17606

17607

@@ -5246,6 +5472,10 @@

17608

_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

17609

;;

17610

17611

+ rdos*)

17612

+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

17613

+ ;;

17614

+

17615

solaris*)

17616

_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'

17617

_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

17618

@@ -5305,7 +5535,7 @@

17619

#

17620

if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then

17621

AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],

17622

- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),

17623

+ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),

17624

[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],

17625

[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in

17626

"" | " "*) ;;

17627

@@ -5329,7 +5559,7 @@

17628

#

17629

wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"

17630

AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],

17631

- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),

17632

+ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),

17633

$lt_tmp_static_flag,

17634

[],

17635

[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])

17636

@@ -5340,11 +5570,12 @@

17637

# ------------------------------------

17638

# See if the linker supports building shared libraries.

17639

AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],

17640

-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])

17641

+[AC_REQUIRE([LT_AC_PROG_SED])dnl

17642

+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])

17643

ifelse([$1],[CXX],[

17644

_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

17645

case $host_os in

17646

- aix4* | aix5*)

17647

+ aix[[4-9]]*)

17648

# If we're using GNU nm, then we don't want the "-C" option.

17649

# -C means demangle to AIX nm, but means don't demangle with GNU nm

17650

if $NM -V 2>&1 | grep 'GNU' > /dev/null; then

17651

@@ -5357,12 +5588,16 @@

17652

_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"

17653

;;

17654

cygwin* | mingw*)

17655

- _LT_AC_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'

17656

+ _LT_AC_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'

17657

+ ;;

17658

+ linux* | k*bsd*-gnu)

17659

+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no

17660

;;

17661

*)

17662

_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

17663

;;

17664

esac

17665

+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']

17666

],[

17667

runpath_var=

17668

_LT_AC_TAGVAR(allow_undefined_flag, $1)=

17669

@@ -5393,12 +5628,14 @@

17670

# it will be wrapped by ` (' and `)$', so one must not match beginning or

17671

# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',

17672

# as well as any symbol that contains `d'.

17673

- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"

17674

+ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']

17675

# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out

17676

# platforms (ab)use it in PIC code, but their linkers get confused if

17677

# the symbol is explicitly referenced. Since portable code cannot

17678

# rely on this symbol name, it's probably fine to never include it in

17679

# preloaded symbol tables.

17680

+ # Exclude shared library initialization/finalization symbols.

17681

+dnl Note also adjust exclude_expsyms for C++ above.

17682

extract_expsyms_cmds=

17683

# Just being paranoid about ensuring that cc_basename is set.

17684

_LT_CC_BASENAME([$compiler])

17685

@@ -5448,7 +5685,7 @@

17686

17687

# See if GNU ld supports shared libraries.

17688

case $host_os in

17689

- aix3* | aix4* | aix5*)

17690

+ aix[[3-9]]*)

17691

# On AIX/PPC, the GNU linker is very broken

17692

if test "$host_cpu" != ia64; then

17693

_LT_AC_TAGVAR(ld_shlibs, $1)=no

17694

@@ -5496,7 +5733,7 @@

17695

_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported

17696

_LT_AC_TAGVAR(always_export_symbols, $1)=no

17697

_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

17698

17699

+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]$[[^ ]]*$/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'

17700

17701

if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then

17702

_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'

17703

@@ -5514,7 +5751,7 @@

17704

fi

17705

;;

17706

17707

- interix3*)

17708

+ interix[[3-9]]*)

17709

_LT_AC_TAGVAR(hardcode_direct, $1)=no

17710

_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no

17711

_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

17712

@@ -5529,7 +5766,7 @@

17713

_LT_AC_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'

17714

;;

17715

17716

- linux*)

17717

+ gnu* | linux* | k*bsd*-gnu)

17718

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

17719

tmp_addflag=

17720

case $cc_basename,$host_cpu in

17721

@@ -5547,20 +5784,30 @@

17722

ifc* | ifort*) # Intel Fortran compiler

17723

tmp_addflag=' -nofor_main' ;;

17724

esac

17725

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

17726

+ case `$CC -V 2>&1 | sed 5q` in

17727

+ *Sun\ C*) # Sun C 5.9

17728

+ _LT_AC_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'

17729

+ tmp_sharedflag='-G' ;;

17730

+ *Sun\ F*) # Sun Fortran 8.3

17731

+ tmp_sharedflag='-G' ;;

17732

+ *)

17733

+ tmp_sharedflag='-shared' ;;

17734

+ esac

17735

+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'

17736

17737

if test $supports_anon_versioning = yes; then

17738

_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~

17739

cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~

17740

$echo "local: *; };" >> $output_objdir/$libname.ver~

17741

- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

17742

+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

17743

fi

17744

+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no

17745

else

17746

_LT_AC_TAGVAR(ld_shlibs, $1)=no

17747

fi

17748

;;

17749

17750

- netbsd*)

17751

+ netbsd* | netbsdelf*-gnu)

17752

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

17753

_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

17754

wlarc=

17755

@@ -5593,7 +5840,7 @@

17756

17757

sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)

17758

case `$LD -v 2>&1` in

17759

- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)

17760

+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)

17761

_LT_AC_TAGVAR(ld_shlibs, $1)=no

17762

cat <<_LT_EOF 1>&2

17763

17764

@@ -5658,7 +5905,7 @@

17765

fi

17766

;;

17767

17768

- aix4* | aix5*)

17769

+ aix[[4-9]]*)

17770

if test "$host_cpu" = ia64; then

17771

# On IA64, the linker does run time linking by default, so we don't

17772

# have to do anything special.

17773

@@ -5678,7 +5925,7 @@

17774

# Test if we are trying to use run time linking or normal

17775

# AIX style linking. If -brtl is somewhere in LDFLAGS, we

17776

# need to do runtime linking.

17777

- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)

17778

+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)

17779

for ld_flag in $LDFLAGS; do

17780

if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then

17781

aix_use_runtimelinking=yes

17782

@@ -5712,7 +5959,7 @@

17783

strings "$collect2name" | grep resolve_lib_name >/dev/null

17784

then

17785

# We have reworked collect2

17786

- _LT_AC_TAGVAR(hardcode_direct, $1)=yes

17787

+ :

17788

else

17789

# We have old collect2

17790

_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported

17791

@@ -5805,7 +6052,7 @@

17792

# The linker will automatically build a .lib file if we build a DLL.

17793

_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'

17794

# FIXME: Should let the user specify the lib program.

17795

- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'

17796

+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'

17797

_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'

17798

_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes

17799

;;

17800

@@ -5838,19 +6085,18 @@

17801

_LT_AC_TAGVAR(link_all_deplibs, $1)=yes

17802

if test "$GCC" = yes ; then

17803

output_verbose_link_cmd='echo'

17804

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'

17805

- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

17806

- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

17807

- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

17808

- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

17809

+ _LT_AC_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}"

17810

+ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"

17811

+ _LT_AC_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}"

17812

+ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"

17813

else

17814

case $cc_basename in

17815

xlc*)

17816

output_verbose_link_cmd='echo'

17817

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'

17818

+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'

17819

_LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'

17820

# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds

17821

- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

17822

+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

17823

_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'

17824

;;

17825

*)

17826

@@ -5890,7 +6136,7 @@

17827

;;

17828

17829

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

17830

- freebsd* | kfreebsd*-gnu | dragonfly*)

17831

+ freebsd* | dragonfly*)

17832

_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

17833

_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

17834

_LT_AC_TAGVAR(hardcode_direct, $1)=yes

17835

@@ -5992,7 +6238,7 @@

17836

_LT_AC_TAGVAR(link_all_deplibs, $1)=yes

17837

;;

17838

17839

- netbsd*)

17840

+ netbsd* | netbsdelf*-gnu)

17841

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

17842

_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

17843

else

17844

@@ -6012,24 +6258,28 @@

17845

;;

17846

17847

openbsd*)

17848

- _LT_AC_TAGVAR(hardcode_direct, $1)=yes

17849

- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no

17850

- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

17851

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

17852

- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'

17853

- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

17854

- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'

17855

+ if test -f /usr/libexec/ld.so; then

17856

+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes

17857

+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no

17858

+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then

17859

+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

17860

+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'

17861

+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

17862

+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'

17863

+ else

17864

+ case $host_os in

17865

+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)

17866

+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'

17867

+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

17868

+ ;;

17869

+ *)

17870

+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

17871

+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

17872

+ ;;

17873

+ esac

17874

+ fi

17875

else

17876

- case $host_os in

17877

- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)

17878

- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'

17879

- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

17880

- ;;

17881

- *)

17882

- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'

17883

- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'

17884

- ;;

17885

- esac

17886

+ _LT_AC_TAGVAR(ld_shlibs, $1)=no

17887

fi

17888

;;

17889

17890

@@ -6088,17 +6338,16 @@

17891

case $host_os in

17892

solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;

17893

*)

17894

- # The compiler driver will combine linker options so we

17895

- # cannot just pass the convience library names through

17896

- # without $wl, iff we do not link with $LD.

17897

- # Luckily, gcc supports the same syntax we need for Sun Studio.

17898

+ # The compiler driver will combine and reorder linker options,

17899

+ # but understands `-z linker_flag'. GCC discards it without `$wl',

17900

+ # but is careful enough not to reorder.

17901

# Supported since Solaris 2.6 (maybe 2.5.1?)

17902

- case $wlarc in

17903

- '')

17904

- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;

17905

- *)

17906

- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;

17907

- esac ;;

17908

+ if test "$GCC" = yes; then

17909

+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'

17910

+ else

17911

+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'

17912

+ fi

17913

+ ;;

17914

esac

17915

_LT_AC_TAGVAR(link_all_deplibs, $1)=yes

17916

;;

17917

@@ -6155,7 +6404,7 @@

17918

fi

17919

;;

17920

17921

- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)

17922

+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)

17923

_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'

17924

_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no

17925

_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no

17926

@@ -6230,7 +6479,7 @@

17927

# to ld, don't add -lc before -lgcc.

17928

AC_MSG_CHECKING([whether -lc should be explicitly linked in])

17929

$rm conftest*

17930

- printf "$lt_simple_compile_test_code" > conftest.$ac_ext

17931

+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext

17932

17933

if AC_TRY_EVAL(ac_compile) 2>conftest.err; then

17934

soname=conftest

17935

@@ -6333,6 +6582,30 @@

17936

[AC_CHECK_TOOL(RC, windres, no)

17937

])

17938

17939

+

17940

+# Cheap backport of AS_EXECUTABLE_P and required macros

17941

+# from Autoconf 2.59; we should not use $as_executable_p directly.

17942

+

17943

+# _AS_TEST_PREPARE

17944

+# ----------------

17945

+m4_ifndef([_AS_TEST_PREPARE],

17946

+[m4_defun([_AS_TEST_PREPARE],

17947

+[if test -x / >/dev/null 2>&1; then

17948

+ as_executable_p='test -x'

17949

+else

17950

+ as_executable_p='test -f'

17951

+fi

17952

+])])# _AS_TEST_PREPARE

17953

+

17954

+# AS_EXECUTABLE_P

17955

+# ---------------

17956

+# Check whether a file is executable.

17957

+m4_ifndef([AS_EXECUTABLE_P],

17958

+[m4_defun([AS_EXECUTABLE_P],

17959

+[AS_REQUIRE([_AS_TEST_PREPARE])dnl

17960

+$as_executable_p $1[]dnl

17961

+])])# AS_EXECUTABLE_P

17962

+

17963

############################################################

17964

# NOTE: This macro has been submitted for inclusion into #

17965

# GNU Autoconf as AC_PROG_SED. When it is available in #

17966

@@ -6355,12 +6628,13 @@

17967

test -z "$as_dir" && as_dir=.

17968

for lt_ac_prog in sed gsed; do

17969

for ac_exec_ext in '' $ac_executable_extensions; do

17970

- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then

17971

+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then

17972

lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"

17973

fi

17974

done

17975

done

17976

done

17977

+IFS=$as_save_IFS

17978

lt_ac_max=0

17979

lt_ac_count=0

17980

# Add /usr/xpg4/bin/sed as it is typically found on Solaris

17981

@@ -6393,5 +6667,6 @@

17982

done

17983

])

17984

SED=$lt_cv_path_SED

17985

+AC_SUBST([SED])

17986

AC_MSG_RESULT([$SED])

17987

])

17988

diff -urNad trunk~/conftools/ltmain.sh trunk/conftools/ltmain.sh

17989

--- trunk~/conftools/ltmain.sh 2006-12-19 20:28:40.000000000 +0100

17990

+++ trunk/conftools/ltmain.sh 2008-05-07 05:22:46.000000000 +0200

17991

@@ -1,8 +1,8 @@

17992

# ltmain.sh - Provide generalized library-building support services.

17993

# NOTE: Changing this file will not affect anything until you rerun configure.

17994

#

17995

17996

-# Free Software Foundation, Inc.

17997

17998

+# 2007, 2008 Free Software Foundation, Inc.

17999

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

18000

#

18001

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

18002

@@ -43,14 +43,22 @@

18003

18004

PROGRAM=ltmain.sh

18005

PACKAGE=libtool

18006

-VERSION=1.5.22

18007

-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"

18008

+VERSION="1.5.26 Debian 1.5.26-4"

18009

+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"

18010

18011

-# See if we are running on zsh, and set the options which allow our

18012

-# commands through without removal of \ escapes.

18013

-if test -n "${ZSH_VERSION+set}" ; then

18014

+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).

18015

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

18016

+ emulate sh

18017

+ NULLCMD=:

18018

+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

18019

+ # is contrary to our usage. Disable this feature.

18020

+ alias -g '${1+"$@"}'='"$@"'

18021

setopt NO_GLOB_SUBST

18022

+else

18023

+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac

18024

fi

18025

+BIN_SH=xpg4; export BIN_SH # for Tru64

18026

+DUALCASE=1; export DUALCASE # for MKS sh

18027

18028

# Check that we have a working $echo.

18029

if test "X$1" = X--no-reexec; then

18030

@@ -105,11 +113,19 @@

18031

# These must not be set unconditionally because not all systems understand

18032

# e.g. LANG=C (notably SCO).

18033

# We save the old values to restore during execute mode.

18034

-if test "${LC_ALL+set}" = set; then

18035

- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL

18036

-fi

18037

-if test "${LANG+set}" = set; then

18038

- save_LANG="$LANG"; LANG=C; export LANG

18039

+lt_env=

18040

+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES

18041

+do

18042

+ eval "if test \"\${$lt_var+set}\" = set; then

18043

+ save_$lt_var=\$$lt_var

18044

+ lt_env=\"$lt_var=\$$lt_var \$lt_env\"

18045

+ $lt_var=C

18046

+ export $lt_var

18047

+ fi"

18048

+done

18049

+

18050

+if test -n "$lt_env"; then

18051

+ lt_env="env $lt_env"

18052

fi

18053

18054

# Make sure IFS has a sensible default

18055

@@ -136,6 +152,8 @@

18056

preserve_args=

18057

lo2o="s/\\.lo\$/.${objext}/"

18058

o2lo="s/\\.${objext}\$/.lo/"

18059

+extracted_archives=

18060

+extracted_serial=0

18061

18062

#####################################

18063

# Shell function definitions:

18064

@@ -196,7 +214,13 @@

18065

if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \

18066

$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then

18067

win32_nmres=`eval $NM -f posix -A $1 | \

18068

- $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`

18069

+ $SED -n -e '1,100{

18070

+ / I /{

18071

+ s,.*,import,

18072

+ p

18073

+ q

18074

+ }

18075

+ }'`

18076

case $win32_nmres in

18077

import*) win32_libid_type="x86 archive import";;

18078

*) win32_libid_type="x86 archive static";;

18079

@@ -327,7 +351,17 @@

18080

*) my_xabs=`pwd`"/$my_xlib" ;;

18081

esac

18082

my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`

18083

- my_xdir="$my_gentop/$my_xlib"

18084

+ my_xlib_u=$my_xlib

18085

+ while :; do

18086

+ case " $extracted_archives " in

18087

+ *" $my_xlib_u "*)

18088

+ extracted_serial=`expr $extracted_serial + 1`

18089

+ my_xlib_u=lt$extracted_serial-$my_xlib ;;

18090

+ *) break ;;

18091

+ esac

18092

+ done

18093

+ extracted_archives="$extracted_archives $my_xlib_u"

18094

+ my_xdir="$my_gentop/$my_xlib_u"

18095

18096

$show "${rm}r $my_xdir"

18097

$run ${rm}r "$my_xdir"

18098

@@ -454,11 +488,12 @@

18099

;;

18100

18101

--version)

18102

- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"

18103

- $echo

18104

18105

- $echo "This is free software; see the source for copying conditions. There is NO"

18106

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

18107

+ echo "\

18108

+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP

18109

+

18110

18111

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

18112

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

18113

exit $?

18114

;;

18115

18116

@@ -755,9 +790,11 @@

18117

*.class) xform=class ;;

18118

*.cpp) xform=cpp ;;

18119

*.cxx) xform=cxx ;;

18120

- *.f90) xform=f90 ;;

18121

+ *.[fF][09]?) xform=[fF][09]. ;;

18122

*.for) xform=for ;;

18123

*.java) xform=java ;;

18124

+ *.obj) xform=obj ;;

18125

+ *.sx) xform=sx ;;

18126

esac

18127

18128

libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`

18129

@@ -926,7 +963,7 @@

18130

$run $rm "$lobj" "$output_obj"

18131

18132

$show "$command"

18133

- if $run eval "$command"; then :

18134

+ if $run eval $lt_env "$command"; then :

18135

else

18136

test -n "$output_obj" && $run $rm $removelist

18137

exit $EXIT_FAILURE

18138

@@ -998,7 +1035,7 @@

18139

command="$command$suppress_output"

18140

$run $rm "$obj" "$output_obj"

18141

$show "$command"

18142

- if $run eval "$command"; then :

18143

+ if $run eval $lt_env "$command"; then :

18144

else

18145

$run $rm $removelist

18146

exit $EXIT_FAILURE

18147

@@ -1131,6 +1168,7 @@

18148

thread_safe=no

18149

vinfo=

18150

vinfo_number=no

18151

+ single_module="${wl}-single_module"

18152

18153

func_infer_tag $base_compile

18154

18155

@@ -1138,8 +1176,9 @@

18156

for arg

18157

do

18158

case $arg in

18159

- -all-static | -static)

18160

- if test "X$arg" = "X-all-static"; then

18161

+ -all-static | -static | -static-libtool-libs)

18162

+ case $arg in

18163

+ -all-static)

18164

if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then

18165

$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2

18166

fi

18167

@@ -1147,12 +1186,20 @@

18168

dlopen_self=$dlopen_self_static

18169

fi

18170

prefer_static_libs=yes

18171

- else

18172

+ ;;

18173

+ -static)

18174

if test -z "$pic_flag" && test -n "$link_static_flag"; then

18175

dlopen_self=$dlopen_self_static

18176

fi

18177

prefer_static_libs=built

18178

- fi

18179

+ ;;

18180

+ -static-libtool-libs)

18181

+ if test -z "$pic_flag" && test -n "$link_static_flag"; then

18182

+ dlopen_self=$dlopen_self_static

18183

+ fi

18184

+ prefer_static_libs=yes

18185

+ ;;

18186

+ esac

18187

build_libtool_libs=no

18188

build_old_libs=yes

18189

break

18190

@@ -1600,13 +1647,18 @@

18191

continue

18192

;;

18193

18194

18195

18196

compiler_flags="$compiler_flags $arg"

18197

compile_command="$compile_command $arg"

18198

finalize_command="$finalize_command $arg"

18199

continue

18200

;;

18201

18202

+ -multi_module)

18203

+ single_module="${wl}-multi_module"

18204

+ continue

18205

+ ;;

18206

+

18207

-module)

18208

module=yes

18209

continue

18210

@@ -1620,10 +1672,11 @@

18211

# -m* pass through architecture-specific compiler args for GCC

18212

# -m*, -t[45]*, -txscale* pass through architecture-specific

18213

# compiler args for GCC

18214

- # -pg pass through profiling flag for GCC

18215

+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC

18216

+ # -F/path gives path to uninstalled frameworks, gcc on darwin

18217

# @file GCC response files

18218

- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \

18219

- -t[45]*|-txscale*|@*)

18220

+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \

18221

+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)

18222

18223

# Unknown arguments in both finalize_command and compile_command need

18224

# to be aesthetically quoted because they are evaled later.

18225

@@ -1651,9 +1704,9 @@

18226

18227

-no-install)

18228

case $host in

18229

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

18230

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

18231

# The PATH hackery in wrapper scripts is required on Windows

18232

- # in order for the loader to find any dlls it needs.

18233

+ # and Darwin in order for the loader to find any dlls it needs.

18234

$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2

18235

$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2

18236

fast_install=no

18237

@@ -1712,7 +1765,7 @@

18238

continue

18239

;;

18240

18241

- -static)

18242

+ -static | -static-libtool-libs)

18243

# The effects of -static are defined in a previous loop.

18244

# We used to do the same as -all-static on platforms that

18245

# didn't have a PIC flag, but the assumption that the effects

18246

@@ -2082,7 +2135,10 @@

18247

case $pass in

18248

dlopen) libs="$dlfiles" ;;

18249

dlpreopen) libs="$dlprefiles" ;;

18250

- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;

18251

+ link)

18252

+ libs="$deplibs %DEPLIBS%"

18253

+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"

18254

+ ;;

18255

esac

18256

fi

18257

if test "$pass" = dlopen; then

18258

@@ -2094,7 +2150,7 @@

18259

lib=

18260

found=no

18261

case $deplib in

18262

18263

18264

if test "$linkmode,$pass" = "prog,link"; then

18265

compile_deplibs="$deplib $compile_deplibs"

18266

finalize_deplibs="$deplib $finalize_deplibs"

18267

@@ -2109,7 +2165,12 @@

18268

continue

18269

fi

18270

name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`

18271

- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do

18272

+ if test "$linkmode" = lib; then

18273

+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"

18274

+ else

18275

+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"

18276

+ fi

18277

+ for searchdir in $searchdirs; do

18278

for search_ext in .la $std_shrext .so .a; do

18279

# Search the libtool library

18280

lib="$searchdir/lib${name}${search_ext}"

18281

@@ -2490,7 +2551,9 @@

18282

18283

if test "$linkmode,$pass" = "prog,link"; then

18284

if test -n "$library_names" &&

18285

- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then

18286

+ { { test "$prefer_static_libs" = no ||

18287

+ test "$prefer_static_libs,$installed" = "built,yes"; } ||

18288

+ test -z "$old_library"; }; then

18289

# We need to hardcode the library path

18290

if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then

18291

# Make sure the rpath contains only unique directories.

18292

@@ -2903,12 +2966,18 @@

18293

# we do not want to link against static libs,

18294

# but need to link against shared

18295

eval deplibrary_names=`${SED} -n -e 's/^library_names=$.*$$/\1/p' $deplib`

18296

+ eval deplibdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`

18297

if test -n "$deplibrary_names" ; then

18298

for tmp in $deplibrary_names ; do

18299

depdepl=$tmp

18300

done

18301

- if test -f "$path/$depdepl" ; then

18302

+ if test -f "$deplibdir/$depdepl" ; then

18303

+ depdepl="$deplibdir/$depdepl"

18304

+ elif test -f "$path/$depdepl" ; then

18305

depdepl="$path/$depdepl"

18306

+ else

18307

+ # Can't find it, oh well...

18308

+ depdepl=

18309

fi

18310

# do not add paths which are already there

18311

case " $newlib_search_path " in

18312

@@ -3056,9 +3125,10 @@

18313

18314

case $linkmode in

18315

oldlib)

18316

- if test -n "$deplibs"; then

18317

- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2

18318

- fi

18319

+ case " $deplibs" in

18320

+ *\ -l* | *\ -L*)

18321

+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;

18322

+ esac

18323

18324

if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then

18325

$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2

18326

@@ -3186,7 +3256,7 @@

18327

# which has an extra 1 added just for fun

18328

#

18329

case $version_type in

18330

- darwin|linux|osf|windows)

18331

+ darwin|linux|osf|windows|none)

18332

current=`expr $number_major + $number_minor`

18333

age="$number_minor"

18334

revision="$number_revision"

18335

@@ -3197,9 +3267,15 @@

18336

age="0"

18337

;;

18338

irix|nonstopux)

18339

- current=`expr $number_major + $number_minor - 1`

18340

+ current=`expr $number_major + $number_minor`

18341

age="$number_minor"

18342

revision="$number_minor"

18343

+ lt_irix_increment=no

18344

+ ;;

18345

+ *)

18346

+ $echo "$modename: unknown library version type \`$version_type'" 1>&2

18347

+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2

18348

+ exit $EXIT_FAILURE

18349

;;

18350

esac

18351

;;

18352

@@ -3258,7 +3334,8 @@

18353

versuffix="$major.$age.$revision"

18354

# Darwin ld doesn't like 0 for these options...

18355

minor_current=`expr $current + 1`

18356

- verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"

18357

+ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"

18358

+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"

18359

;;

18360

18361

freebsd-aout)

18362

@@ -3272,8 +3349,11 @@

18363

;;

18364

18365

irix | nonstopux)

18366

- major=`expr $current - $age + 1`

18367

-

18368

+ if test "X$lt_irix_increment" = "Xno"; then

18369

+ major=`expr $current - $age`

18370

+ else

18371

+ major=`expr $current - $age + 1`

18372

+ fi

18373

case $version_type in

18374

nonstopux) verstring_prefix=nonstopux ;;

18375

*) verstring_prefix=sgi ;;

18376

@@ -3410,11 +3490,11 @@

18377

fi

18378

18379

# Eliminate all temporary directories.

18380

- for path in $notinst_path; do

18381

- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`

18382

- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`

18383

- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`

18384

- done

18385

+ #for path in $notinst_path; do

18386

+ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`

18387

+ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`

18388

+ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`

18389

+ #done

18390

18391

if test -n "$xrpath"; then

18392

# If the user specified any rpath flags, then add them.

18393

@@ -3515,13 +3595,12 @@

18394

int main() { return 0; }

18395

EOF

18396

$rm conftest

18397

- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs

18398

- if test "$?" -eq 0 ; then

18399

+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then

18400

ldd_output=`ldd conftest`

18401

for i in $deplibs; do

18402

name=`expr $i : '-l$.*$'`

18403

# If $name is empty we are operating on a -L argument.

18404

- if test "$name" != "" && test "$name" -ne "0"; then

18405

+ if test "$name" != "" && test "$name" != "0"; then

18406

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

18407

case " $predeps $postdeps " in

18408

*" $i "*)

18409

@@ -3560,9 +3639,7 @@

18410

# If $name is empty we are operating on a -L argument.

18411

if test "$name" != "" && test "$name" != "0"; then

18412

$rm conftest

18413

- $LTCC $LTCFLAGS -o conftest conftest.c $i

18414

- # Did it work?

18415

- if test "$?" -eq 0 ; then

18416

+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then

18417

ldd_output=`ldd conftest`

18418

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

18419

case " $predeps $postdeps " in

18420

@@ -3594,7 +3671,7 @@

18421

droppeddeps=yes

18422

$echo

18423

$echo "*** Warning! Library $i is needed by this library but I was not able to"

18424

- $echo "*** make it link in! You will probably need to install it or some"

18425

+ $echo "*** make it link in! You will probably need to install it or some"

18426

$echo "*** library that it depends on before this library will be fully"

18427

$echo "*** functional. Installing it before continuing would be even better."

18428

fi

18429

@@ -3880,7 +3957,10 @@

18430

test -n "$hardcode_libdirs"; then

18431

libdir="$hardcode_libdirs"

18432

if test -n "$hardcode_libdir_flag_spec_ld"; then

18433

- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"

18434

+ case $archive_cmds in

18435

+ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;

18436

+ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;

18437

+ esac

18438

else

18439

eval dep_rpath=\"$hardcode_libdir_flag_spec\"

18440

fi

18441

@@ -4190,9 +4270,10 @@

18442

;;

18443

18444

obj)

18445

- if test -n "$deplibs"; then

18446

- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2

18447

- fi

18448

+ case " $deplibs" in

18449

+ *\ -l* | *\ -L*)

18450

+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;

18451

+ esac

18452

18453

if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then

18454

$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2

18455

@@ -4239,12 +4320,14 @@

18456

reload_conv_objs=

18457

gentop=

18458

# reload_cmds runs $LD directly, so let us get rid of

18459

- # -Wl from whole_archive_flag_spec

18460

+ # -Wl from whole_archive_flag_spec and hope we can get by with

18461

+ # turning comma into space..

18462

wl=

18463

18464

if test -n "$convenience"; then

18465

if test -n "$whole_archive_flag_spec"; then

18466

- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"

18467

+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"

18468

+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`

18469

else

18470

gentop="$output_objdir/${obj}x"

18471

generated="$generated $gentop"

18472

@@ -4692,16 +4775,16 @@

18473

case $host in

18474

*cygwin* | *mingw* )

18475

if test -f "$output_objdir/${outputname}.def" ; then

18476

- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`

18477

- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`

18478

+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`

18479

+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`

18480

else

18481

- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`

18482

- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`

18483

+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`

18484

+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`

18485

fi

18486

;;

18487

* )

18488

- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`

18489

- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`

18490

+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`

18491

+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`

18492

;;

18493

esac

18494

;;

18495

@@ -4716,13 +4799,13 @@

18496

# really was required.

18497

18498

# Nullify the symbol file.

18499

- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`

18500

- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`

18501

+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`

18502

+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`

18503

fi

18504

18505

if test "$need_relink" = no || test "$build_libtool_libs" != yes; then

18506

# Replace the output file specification.

18507

- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`

18508

+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`

18509

link_command="$compile_command$compile_rpath"

18510

18511

# We have no uninstalled library dependencies, so finalize right now.

18512

@@ -4809,7 +4892,7 @@

18513

if test "$fast_install" != no; then

18514

link_command="$finalize_var$compile_command$finalize_rpath"

18515

if test "$fast_install" = yes; then

18516

- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`

18517

+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`

18518

else

18519

# fast_install is set to needless

18520

relink_command=

18521

@@ -4846,7 +4929,7 @@

18522

fi

18523

done

18524

relink_command="(cd `pwd`; $relink_command)"

18525

- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`

18526

+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`

18527

fi

18528

18529

# Quote $echo for shipping.

18530

@@ -5253,6 +5336,20 @@

18531

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

18532

sed_quote_subst='$sed_quote_subst'

18533

18534

+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).

18535

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

18536

+ emulate sh

18537

+ NULLCMD=:

18538

+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which

18539

+ # is contrary to our usage. Disable this feature.

18540

+ alias -g '\${1+\"\$@\"}'='\"\$@\"'

18541

+ setopt NO_GLOB_SUBST

18542

+else

18543

+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac

18544

+fi

18545

+BIN_SH=xpg4; export BIN_SH # for Tru64

18546

+DUALCASE=1; export DUALCASE # for MKS sh

18547

+

18548

# The HP-UX ksh and POSIX shell print the target directory to stdout

18549

# if CDPATH is set.

18550

(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

18551

@@ -5395,7 +5492,7 @@

18552

;;

18553

esac

18554

$echo >> $output "\

18555

- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"

18556

+ \$echo \"\$0: cannot exec \$program \$*\"

18557

exit $EXIT_FAILURE

18558

fi

18559

else

18560

@@ -5581,7 +5678,7 @@

18561

done

18562

# Quote the link command for shipping.

18563

relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"

18564

- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`

18565

+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`

18566

if test "$hardcode_automatic" = yes ; then

18567

relink_command=

18568

fi

18569

@@ -5926,9 +6023,9 @@

18570

18571

if test -n "$inst_prefix_dir"; then

18572

# Stick the inst_prefix_dir data into the link command.

18573

- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`

18574

+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`

18575

else

18576

- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`

18577

+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`

18578

fi

18579

18580

$echo "$modename: warning: relinking \`$file'" 1>&2

18581

@@ -6137,7 +6234,7 @@

18582

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

18583

outputname="$tmpdir/$file"

18584

# Replace the output file specification.

18585

- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`

18586

+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`

18587

18588

$show "$relink_command"

18589

if $run eval "$relink_command"; then :

18590

@@ -6348,8 +6445,10 @@

18591

if test -f "$dir/$objdir/$dlname"; then

18592

dir="$dir/$objdir"

18593

else

18594

- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2

18595

- exit $EXIT_FAILURE

18596

+ if test ! -f "$dir/$dlname"; then

18597

+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2

18598

+ exit $EXIT_FAILURE

18599

+ fi

18600

fi

18601

;;

18602

18603

@@ -6413,12 +6512,12 @@

18604

fi

18605

18606

# Restore saved environment variables

18607

- if test "${save_LC_ALL+set}" = set; then

18608

- LC_ALL="$save_LC_ALL"; export LC_ALL

18609

- fi

18610

- if test "${save_LANG+set}" = set; then

18611

- LANG="$save_LANG"; export LANG

18612

- fi

18613

+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES

18614

+ do

18615

+ eval "if test \"\${save_$lt_var+set}\" = set; then

18616

+ $lt_var=\$save_$lt_var; export $lt_var

18617

+ fi"

18618

+ done

18619

18620

# Now prepare to actually exec the command.

18621

exec_cmd="\$cmd$args"

18622

@@ -6775,9 +6874,9 @@

18623

-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols

18624

-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)

18625

-export-symbols SYMFILE

18626

- try to export only the symbols listed in SYMFILE

18627

+ try to export only the symbols listed in SYMFILE

18628

-export-symbols-regex REGEX

18629

- try to export only the symbols matching REGEX

18630

+ try to export only the symbols matching REGEX

18631

-LLIBDIR search LIBDIR for required installed libraries

18632

-lNAME OUTPUT-FILE requires the installed library libNAME

18633

-module build a library that can dlopened

18634

@@ -6791,9 +6890,11 @@

18635

-release RELEASE specify package release information

18636

-rpath LIBDIR the created library will eventually be installed in LIBDIR

18637

-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries

18638

- -static do not do any dynamic linking of libtool libraries

18639

+ -static do not do any dynamic linking of uninstalled libtool libraries

18640

+ -static-libtool-libs

18641

+ do not do any dynamic linking of libtool libraries

18642

-version-info CURRENT[:REVISION[:AGE]]

18643

- specify library version info [each variable defaults to 0]

18644

+ specify library version info [each variable defaults to 0]

18645

18646

All other options (arguments beginning with \`-') are ignored.

18647