~ubuntu-branches/ubuntu/lucid/graphviz/lucid-updates

Viewing changes to debian/patches/configure_autoconf_rerun

Committer: Bazaar Package Importer
Author(s): Cyril Brulebois
Date: 2007-05-08 17:16:29 UTC
Revision ID: james.westby@ubuntu.com-20070508171629-smb92q6m5qgol2ff

Tags: 2.12-2

http://bugs.debian.org/422862

http://bugs.debian.org/422873

* Fixed gnomeui + pango/cairo pulling: (Closes: #422862, #422873)
   - added 3_gnomeui_configure_fix patch: adds support in configure.ac
     for --with(out)-gnomeui, so that it can be used to disable the link
     against gnomeui libraries even if they are found;
   - added configure_autoconf_rerun: contains the modifications to configure
     after autoconf has been rerun;
   - added --without-gnomeui and --without-pangocairo in debian/rules
     accordingly;
   - added --without-gtk as well, and turned --with-x into --without-x
     since the associated shared objects weren't built anyway.
* The associated features might be added in separate package(s) later.

files added:
debian/patches/3_gnomeui_configure.ac_fix

debian/patches/3_gnomeui_configure_fix

debian/patches/configure_autoconf_rerun

files modified:
debian/changelog

debian/patches/series

debian/rules

Show diffs side-by-side

added added

removed removed

debian/patches/configure_autoconf_rerun

Index: graphviz-2.12/configure

===================================================================

--- graphviz-2.12.orig/configure 2007-05-10 15:39:15.000000000 +0200

+++ graphviz-2.12/configure 2007-05-10 15:40:06.000000000 +0200

@@ -1,25 +1,54 @@

#! /bin/sh

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

-# Generated by GNU Autoconf 2.59 for graphviz 2.12.

+# Generated by GNU Autoconf 2.61 for graphviz 2.12.

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

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

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

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

## M4sh Initialization. ##

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

-# Be Bourne compatible

+# Be more Bourne compatible

+DUALCASE=1; export DUALCASE # for MKS sh

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

emulate sh

NULLCMD=:

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

# is contrary to our usage. Disable this feature.

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

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

- set -o posix

+ setopt NO_GLOB_SUBST

+else

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

+ *posix*) set -o posix ;;

+esac

+fi

+# PATH needs CR

+# Avoid depending upon Character Ranges.

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

+as_cr_digits='0123456789'

+as_cr_alnum=$as_cr_Letters$as_cr_digits

+# The user is always right.

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

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

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

+ chmod +x conf$$.sh

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

+ PATH_SEPARATOR=';'

+ else

+ PATH_SEPARATOR=:

+ fi

+ rm -f conf$$.sh

-DUALCASE=1; export DUALCASE # for MKS sh

# Support unset when possible.

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

@@ -29,8 +58,43 @@

+# IFS

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

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

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

+# splitting by setting IFS to empty value.)

+as_nl='

+IFS=" "" $as_nl"

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

+case $0 in

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

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

+for as_dir in $PATH

+do

+ IFS=$as_save_IFS

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

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

+done

+IFS=$as_save_IFS

+ ;;

+esac

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

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

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

+ as_myself=$0

+fi

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

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

100

+ { (exit 1); exit 1; }

101

+fi

102

103

# Work around bugs in pre-3.0 UWIN ksh.

104

-$as_unset ENV MAIL MAILPATH

105

+for as_var in ENV MAIL MAILPATH

106

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

107

+done

108

PS1='$ '

109

PS2='> '

110

PS4='+ '

111

@@ -44,18 +108,19 @@

112

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

113

eval $as_var=C; export $as_var

114

else

115

- $as_unset $as_var

116

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

117

118

done

119

120

# Required to use basename.

121

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

122

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

123

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

124

as_expr=expr

125

else

126

as_expr=false

127

128

129

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

130

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

131

as_basename=basename

132

else

133

as_basename=false

134

@@ -63,157 +128,388 @@

135

136

137

# Name of the executable.

138

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

139

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

140

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

141

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

142

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

143

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

144

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

145

echo X/"$0" |

146

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

147

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

148

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

149

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

150

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

151

+ s//\1/

152

+ q

153

+ }

154

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

155

+ s//\1/

156

+ q

157

+ }

158

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

159

+ s//\1/

160

+ q

161

+ }

162

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

163

164

+# CDPATH.

165

+$as_unset CDPATH

166

167

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

168

-# Avoid depending upon Character Ranges.

169

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

170

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

171

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

172

-as_cr_digits='0123456789'

173

-as_cr_alnum=$as_cr_Letters$as_cr_digits

174

175

-# The user is always right.

176

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

177

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

178

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

179

- chmod +x conf$$.sh

180

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

181

- PATH_SEPARATOR=';'

182

- else

183

- PATH_SEPARATOR=:

184

- fi

185

- rm -f conf$$.sh

186

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

187

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

188

+ as_have_required=yes

189

+else

190

+ as_have_required=no

191

192

193

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

194

+(as_func_return () {

195

+ (exit \$1)

196

197

+as_func_success () {

198

+ as_func_return 0

199

200

+as_func_failure () {

201

+ as_func_return 1

202

203

+as_func_ret_success () {

204

+ return 0

205

206

+as_func_ret_failure () {

207

+ return 1

208

209

210

- as_lineno_1=$LINENO

211

- as_lineno_2=$LINENO

212

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

213

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

214

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

215

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

216

- # relative or not.

217

- case $0 in

218

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

219

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

220

-for as_dir in $PATH

221

-do

222

- IFS=$as_save_IFS

223

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

224

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

225

-done

226

+exitcode=0

227

+if as_func_success; then

228

+ :

229

+else

230

+ exitcode=1

231

+ echo as_func_success failed.

232

+fi

233

234

- ;;

235

- esac

236

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

237

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

238

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

239

- as_myself=$0

240

- fi

241

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

242

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

243

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

244

- fi

245

- case $CONFIG_SHELL in

246

- '')

247

+if as_func_failure; then

248

+ exitcode=1

249

+ echo as_func_failure succeeded.

250

+fi

251

252

+if as_func_ret_success; then

253

+ :

254

+else

255

+ exitcode=1

256

+ echo as_func_ret_success failed.

257

+fi

258

259

+if as_func_ret_failure; then

260

+ exitcode=1

261

+ echo as_func_ret_failure succeeded.

262

+fi

263

264

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

265

+ :

266

+else

267

+ exitcode=1

268

+ echo positional parameters were not saved.

269

+fi

270

271

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

272

273

274

+ as_lineno_1=\$LINENO

275

+ as_lineno_2=\$LINENO

276

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

277

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

278

+") 2> /dev/null; then

279

+ :

280

+else

281

+ as_candidate_shells=

282

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

283

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

284

285

IFS=$as_save_IFS

286

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

287

- for as_base in sh bash ksh sh5; do

288

- case $as_dir in

289

+ case $as_dir in

290

/*)

291

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

292

+ for as_base in sh bash ksh sh5; do

293

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

294

+ done;;

295

+ esac

296

+done

297

+IFS=$as_save_IFS

298

299

300

+ for as_shell in $as_candidate_shells $SHELL; do

301

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

302

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

303

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

304

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

305

+ emulate sh

306

+ NULLCMD=:

307

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

308

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

309

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

310

+ setopt NO_GLOB_SUBST

311

+else

312

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

313

+ *posix*) set -o posix ;;

314

+esac

315

316

+fi

317

318

319

320

+_ASEOF

321

+}; then

322

+ CONFIG_SHELL=$as_shell

323

+ as_have_required=yes

324

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

325

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

326

+ emulate sh

327

+ NULLCMD=:

328

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

329

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

330

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

331

+ setopt NO_GLOB_SUBST

332

+else

333

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

334

+ *posix*) set -o posix ;;

335

+esac

336

337

+fi

338

339

340

341

+(as_func_return () {

342

+ (exit $1)

343

344

+as_func_success () {

345

+ as_func_return 0

346

347

+as_func_failure () {

348

+ as_func_return 1

349

350

+as_func_ret_success () {

351

+ return 0

352

353

+as_func_ret_failure () {

354

+ return 1

355

356

357

+exitcode=0

358

+if as_func_success; then

359

+ :

360

+else

361

+ exitcode=1

362

+ echo as_func_success failed.

363

+fi

364

365

+if as_func_failure; then

366

+ exitcode=1

367

+ echo as_func_failure succeeded.

368

+fi

369

370

+if as_func_ret_success; then

371

+ :

372

+else

373

+ exitcode=1

374

+ echo as_func_ret_success failed.

375

+fi

376

377

+if as_func_ret_failure; then

378

+ exitcode=1

379

+ echo as_func_ret_failure succeeded.

380

+fi

381

382

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

383

+ :

384

+else

385

+ exitcode=1

386

+ echo positional parameters were not saved.

387

+fi

388

389

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

390

391

392

as_lineno_1=$LINENO

393

as_lineno_2=$LINENO

394

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

395

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

396

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

397

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

398

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

399

- CONFIG_SHELL=$as_dir/$as_base

400

- export CONFIG_SHELL

401

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

402

- fi;;

403

- esac

404

- done

405

-done

406

-;;

407

- esac

408

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

409

410

+_ASEOF

411

+}; then

412

+ break

413

+fi

414

415

+fi

416

417

+ done

418

419

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

420

+ for as_var in BASH_ENV ENV

421

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

422

+ done

423

+ export CONFIG_SHELL

424

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

425

+fi

426

427

428

+ if test $as_have_required = no; then

429

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

430

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

431

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

432

+ echo shell if you do have one.

433

+ { (exit 1); exit 1; }

434

+fi

435

436

437

+fi

438

439

+fi

440

441

442

443

+(eval "as_func_return () {

444

+ (exit \$1)

445

446

+as_func_success () {

447

+ as_func_return 0

448

449

+as_func_failure () {

450

+ as_func_return 1

451

452

+as_func_ret_success () {

453

+ return 0

454

455

+as_func_ret_failure () {

456

+ return 1

457

458

459

+exitcode=0

460

+if as_func_success; then

461

+ :

462

+else

463

+ exitcode=1

464

+ echo as_func_success failed.

465

+fi

466

467

+if as_func_failure; then

468

+ exitcode=1

469

+ echo as_func_failure succeeded.

470

+fi

471

472

+if as_func_ret_success; then

473

+ :

474

+else

475

+ exitcode=1

476

+ echo as_func_ret_success failed.

477

+fi

478

479

+if as_func_ret_failure; then

480

+ exitcode=1

481

+ echo as_func_ret_failure succeeded.

482

+fi

483

484

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

485

+ :

486

+else

487

+ exitcode=1

488

+ echo positional parameters were not saved.

489

+fi

490

491

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

492

+ echo No shell found that supports shell functions.

493

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

494

+ echo including any error possibly output before this

495

+ echo message

496

497

498

499

500

+ as_lineno_1=$LINENO

501

+ as_lineno_2=$LINENO

502

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

503

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

504

505

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

506

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

507

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

508

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

509

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

510

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

511

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

512

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

513

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

514

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

515

+ # case at line end.

516

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

517

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

518

- sed '=' <$as_myself |

519

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

520

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

521

+ sed -n '

522

+ p

523

+ /[$]LINENO/=

524

+ ' <$as_myself |

525

sed '

526

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

527

+ t lineno

528

+ b

529

+ :lineno

530

531

- s,$,-,

532

- : loop

533

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

534

+ :loop

535

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

536

t loop

537

- s,-$,,

538

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

539

+ s/-\n.*//

540

' >$as_me.lineno &&

541

- chmod +x $as_me.lineno ||

542

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

543

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

544

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

545

546

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

547

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

548

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

549

- . ./$as_me.lineno

550

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

551

+ . "./$as_me.lineno"

552

# Exit status is that of the last command.

553

exit

554

}

555

556

557

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

558

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

559

-' ECHO_T=' ' ;;

560

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

561

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

562

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

563

+ as_dirname=dirname

564

+else

565

+ as_dirname=false

566

+fi

567

568

+ECHO_C= ECHO_N= ECHO_T=

569

+case `echo -n x` in

570

+-n*)

571

+ case `echo 'x\c'` in

572

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

573

+ *) ECHO_C='\c';;

574

+ esac;;

575

+*)

576

+ ECHO_N='-n';;

577

esac

578

579

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

580

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

581

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

582

as_expr=expr

583

else

584

as_expr=false

585

586

587

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

588

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

589

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

590

+else

591

+ rm -f conf$$.dir

592

+ mkdir conf$$.dir

593

+fi

594

echo >conf$$.file

595

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

596

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

597

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

598

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

599

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

600

+ as_ln_s='ln -s'

601

+ # ... but there are two gotchas:

602

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

603

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

604

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

605

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

606

as_ln_s='cp -p'

607

- else

608

- as_ln_s='ln -s'

609

- fi

610

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

611

as_ln_s=ln

612

else

613

as_ln_s='cp -p'

614

615

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

616

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

617

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

618

619

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

620

as_mkdir_p=:

621

@@ -222,7 +518,28 @@

622

as_mkdir_p=false

623

624

625

-as_executable_p="test -f"

626

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

627

+ as_test_x='test -x'

628

+else

629

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

630

+ as_ls_L_option=L

631

+ else

632

+ as_ls_L_option=

633

+ fi

634

+ as_test_x='

635

+ eval sh -c '\''

636

+ if test -d "$1"; then

637

+ test -d "$1/.";

638

+ else

639

+ case $1 in

640

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

641

+ esac;

642

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

643

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

644

+ '\'' sh

645

+ '

646

+fi

647

+as_executable_p=$as_test_x

648

649

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

650

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

651

@@ -231,15 +548,6 @@

652

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

653

654

655

-# IFS

656

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

657

-as_nl='

658

659

-IFS=" $as_nl"

660

661

-# CDPATH.

662

-$as_unset CDPATH

663

664

665

666

# Check that we are running under the correct shell.

667

@@ -395,29 +703,26 @@

668

669

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

670

671

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

672

673

# Name of the host.

674

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

675

# so uname gets run too.

676

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

677

678

-exec 6>&1

679

680

681

# Initializations.

682

683

ac_default_prefix=/usr/local

684

+ac_clean_files=

685

ac_config_libobj_dir=.

686

+LIBOBJS=

687

cross_compiling=no

688

subdirs=

689

MFLAGS=

690

MAKEFLAGS=

691

SHELL=${CONFIG_SHELL-/bin/sh}

692

693

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

694

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

695

-# only ac_max_sed_lines should be used.

696

-: ${ac_max_here_lines=38}

697

698

# Identity of this package.

699

PACKAGE_NAME='graphviz'

700

PACKAGE_TARNAME='graphviz'

701

@@ -430,43 +735,367 @@

702

# Factoring default headers for most tests.

703

ac_includes_default="\

704

#include <stdio.h>

705

-#if HAVE_SYS_TYPES_H

706

+#ifdef HAVE_SYS_TYPES_H

707

# include <sys/types.h>

708

#endif

709

-#if HAVE_SYS_STAT_H

710

+#ifdef HAVE_SYS_STAT_H

711

# include <sys/stat.h>

712

#endif

713

-#if STDC_HEADERS

714

+#ifdef STDC_HEADERS

715

# include <stdlib.h>

716

# include <stddef.h>

717

#else

718

-# if HAVE_STDLIB_H

719

+# ifdef HAVE_STDLIB_H

720

# include <stdlib.h>

721

# endif

722

#endif

723

-#if HAVE_STRING_H

724

-# if !STDC_HEADERS && HAVE_MEMORY_H

725

+#ifdef HAVE_STRING_H

726

+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H

727

# include <memory.h>

728

# endif

729

# include <string.h>

730

#endif

731

-#if HAVE_STRINGS_H

732

+#ifdef HAVE_STRINGS_H

733

# include <strings.h>

734

#endif

735

-#if HAVE_INTTYPES_H

736

+#ifdef HAVE_INTTYPES_H

737

# include <inttypes.h>

738

-#else

739

-# if HAVE_STDINT_H

740

-# include <stdint.h>

741

-# endif

742

#endif

743

-#if HAVE_UNISTD_H

744

+#ifdef HAVE_STDINT_H

745

+# include <stdint.h>

746

+#endif

747

+#ifdef HAVE_UNISTD_H

748

# include <unistd.h>

749

#endif"

750

751

-ac_subdirs_all="$ac_subdirs_all libltdl"

752

-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 VERSION_INFO build build_cpu build_vendor build_os host host_cpu host_vendor host_os GVPLUGIN_VERSION CYGWIN MINGW32 DARWIN INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC LN_S SED GREP SORT CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP MATH_LIBS LIBGEN_LIBS ALLOCA LIBOBJS subdirs ENABLE_LTDL_TRUE ENABLE_LTDL_FALSE INCLTDL LIBLTDL ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WITH_CODEGENS_TRUE WITH_CODEGENS_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WITH_X_TRUE WITH_X_FALSE SWIG SWIG_VERSION WITH_SWIG_TRUE WITH_SWIG_FALSE SHARP SHARP_INCLUDES SHARP_LIBS WITH_SHARP_TRUE WITH_SHARP_FALSE GUILE GUILE_INCLUDES GUILE_LIBS WITH_GUILE_TRUE WITH_GUILE_FALSE IO IO_INCLUDES IO_LIBS WITH_IO_TRUE WITH_IO_FALSE JAVA JAVA_INCLUDES JAVA_LIBS WITH_JAVA_TRUE WITH_JAVA_FALSE LUA LUA_INCLUDES LUA_LIBS WITH_LUA_TRUE WITH_LUA_FALSE OCAML OCAML_INCLUDES OCAML_LIBS WITH_OCAML_TRUE WITH_OCAML_FALSE PERL PERL_INCLUDES PERL_LIBS WITH_PERL_TRUE WITH_PERL_FALSE PHP PHP_INCLUDES PHP_LIBS WITH_PHP_TRUE WITH_PHP_FALSE PYTHON PYTHON_INCLUDES PYTHON_LIBS WITH_PYTHON_TRUE WITH_PYTHON_FALSE RUBY RUBY_INCLUDES RUBY_LIBS WITH_RUBY_TRUE WITH_RUBY_FALSE TCLSH TCL_INCLUDES HAVE_TCL WITH_TCL_TRUE WITH_TCL_FALSE TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_CFLAGS TCL_DEFS TCL_LIBS TCL_SHLIB_SUFFIX TCL_SRC_DIR TCL_STUB_LIB_SPEC WISH TK_INCLUDES HAVE_TK WITH_TK_TRUE WITH_TK_FALSE TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DEFS TK_XINCLUDES TK_LIB_SPEC TK_SRC_DIR TK_CFLAGS TK_STUB_LIB_SPEC SOCKET_LIBS EXPAT_CONFIG EXPAT_INCLUDES EXPAT_LIBS XPM_INCLUDES XPM_LIBS XAW_INCLUDES XAW_LIBS WITH_XAW_TRUE WITH_XAW_FALSE Z_INCLUDES Z_LIBS IPSEPCOLA_INCLUDES IPSEPCOLA_LIBS WITH_IPSEPCOLA_TRUE WITH_IPSEPCOLA_FALSE PKG_CONFIG ac_pt_PKG_CONFIG PANGOCAIRO_CFLAGS PANGOCAIRO_LIBS WITH_PANGOCAIRO_TRUE WITH_PANGOCAIRO_FALSE GTK_CFLAGS GTK_LIBS WITH_GTK_TRUE WITH_GTK_FALSE GNOMEUI_CFLAGS GNOMEUI_LIBS WITH_GNOMEUI_TRUE WITH_GNOMEUI_FALSE GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS MING_CONFIG MAKESWF MING_CFLAGS MING_LIBS WITH_MING_TRUE WITH_MING_FALSE GDLIB_CONFIG GD_INCLUDES GD_LIBS HAVE_LIBGD WITH_LIBGD_TRUE WITH_LIBGD_FALSE WITH_MYLIBGD_TRUE WITH_MYLIBGD_FALSE LIBICONV LTLIBICONV ICONV_INCLUDES ICONV_LIBS FREETYPE_CONFIG FT_INCLUDES FT_LIBS FONTCONFIG_CONFIG FONTCONFIG_CFLAGS FONTCONFIG_LIBS FC_INCLUDES FC_LIBS LIBPNG_CONFIG PNG_INCLUDES PNG_LIBS JPEG_INCLUDES JPEG_LIBS TCLINT_INCLUDES TKINT_INCLUDES TCL_PKGINDEX TK_PKGINDEX LTLIBOBJS'

753

+ac_subst_vars='SHELL

754

+PATH_SEPARATOR

755

+PACKAGE_NAME

756

+PACKAGE_TARNAME

757

+PACKAGE_VERSION

758

+PACKAGE_STRING

759

+PACKAGE_BUGREPORT

760

+exec_prefix

761

+prefix

762

+program_transform_name

763

+bindir

764

+sbindir

765

+libexecdir

766

+datarootdir

767

+datadir

768

+sysconfdir

769

+sharedstatedir

770

+localstatedir

771

+includedir

772

+oldincludedir

773

+docdir

774

+infodir

775

+htmldir

776

+dvidir

777

+pdfdir

778

+psdir

779

+libdir

780

+localedir

781

+mandir

782

+DEFS

783

+ECHO_C

784

+ECHO_N

785

+ECHO_T

786

+LIBS

787

+build_alias

788

+host_alias

789

+target_alias

790

+VERSION_INFO

791

+build

792

+build_cpu

793

+build_vendor

794

+build_os

795

+host

796

+host_cpu

797

+host_vendor

798

+host_os

799

+GVPLUGIN_VERSION

800

+CYGWIN

801

+MINGW32

802

+DARWIN

803

+INSTALL_PROGRAM

804

+INSTALL_SCRIPT

805

+INSTALL_DATA

806

+CYGPATH_W

807

+PACKAGE

808

+VERSION

809

+ACLOCAL

810

+AUTOCONF

811

+AUTOMAKE

812

+AUTOHEADER

813

+MAKEINFO

814

+install_sh

815

+STRIP

816

+INSTALL_STRIP_PROGRAM

817

+mkdir_p

818

+AWK

819

+SET_MAKE

820

+am__leading_dot

821

+AMTAR

822

+am__tar

823

+am__untar

824

+ENABLE_STATIC_TRUE

825

+ENABLE_STATIC_FALSE

826

+ENABLE_SHARED_TRUE

827

+ENABLE_SHARED_FALSE

828

+CC

829

+CFLAGS

830

+LDFLAGS

831

+CPPFLAGS

832

+ac_ct_CC

833

+EXEEXT

834

+OBJEXT

835

+DEPDIR

836

+am__include

837

+am__quote

838

+AMDEP_TRUE

839

+AMDEP_FALSE

840

+AMDEPBACKSLASH

841

+CCDEPMODE

842

+am__fastdepCC_TRUE

843

+am__fastdepCC_FALSE

844

+LEX

845

+LEX_OUTPUT_ROOT

846

+LEXLIB

847

+YACC

848

+YFLAGS

849

+LN_S

850

+SED

851

+GREP

852

+SORT

853

+CXX

854

+CXXFLAGS

855

+ac_ct_CXX

856

+CXXDEPMODE

857

+am__fastdepCXX_TRUE

858

+am__fastdepCXX_FALSE

859

+CPP

860

+EGREP

861

+MATH_LIBS

862

+LIBGEN_LIBS

863

+ALLOCA

864

+LIBOBJS

865

+subdirs

866

+ENABLE_LTDL_TRUE

867

+ENABLE_LTDL_FALSE

868

+INCLTDL

869

+LIBLTDL

870

+ECHO

871

+AR

872

+RANLIB

873

+CXXCPP

874

+F77

875

+FFLAGS

876

+ac_ct_F77

877

+LIBTOOL

878

+WITH_CODEGENS_TRUE

879

+WITH_CODEGENS_FALSE

880

+XMKMF

881

+X_CFLAGS

882

+X_PRE_LIBS

883

+X_LIBS

884

+X_EXTRA_LIBS

885

+WITH_X_TRUE

886

+WITH_X_FALSE

887

+SWIG

888

+SWIG_VERSION

889

+WITH_SWIG_TRUE

890

+WITH_SWIG_FALSE

891

+SHARP

892

+SHARP_INCLUDES

893

+SHARP_LIBS

894

+WITH_SHARP_TRUE

895

+WITH_SHARP_FALSE

896

+GUILE

897

+GUILE_INCLUDES

898

+GUILE_LIBS

899

+WITH_GUILE_TRUE

900

+WITH_GUILE_FALSE

901

+IO

902

+IO_INCLUDES

903

+IO_LIBS

904

+WITH_IO_TRUE

905

+WITH_IO_FALSE

906

+JAVA

907

+JAVA_INCLUDES

908

+JAVA_LIBS

909

+WITH_JAVA_TRUE

910

+WITH_JAVA_FALSE

911

+LUA

912

+LUA_INCLUDES

913

+LUA_LIBS

914

+WITH_LUA_TRUE

915

+WITH_LUA_FALSE

916

+OCAML

917

+OCAML_INCLUDES

918

+OCAML_LIBS

919

+WITH_OCAML_TRUE

920

+WITH_OCAML_FALSE

921

+PERL

922

+PERL_INCLUDES

923

+PERL_LIBS

924

+WITH_PERL_TRUE

925

+WITH_PERL_FALSE

926

+PHP

927

+PHP_INCLUDES

928

+PHP_LIBS

929

+WITH_PHP_TRUE

930

+WITH_PHP_FALSE

931

+PYTHON

932

+PYTHON_INCLUDES

933

+PYTHON_LIBS

934

+WITH_PYTHON_TRUE

935

+WITH_PYTHON_FALSE

936

+RUBY

937

+RUBY_INCLUDES

938

+RUBY_LIBS

939

+WITH_RUBY_TRUE

940

+WITH_RUBY_FALSE

941

+TCLSH

942

+TCL_INCLUDES

943

+HAVE_TCL

944

+WITH_TCL_TRUE

945

+WITH_TCL_FALSE

946

+TCL_VERSION

947

+TCL_MAJOR_VERSION

948

+TCL_MINOR_VERSION

949

+TCL_PATCH_LEVEL

950

+TCL_CFLAGS

951

+TCL_DEFS

952

+TCL_LIBS

953

+TCL_SHLIB_SUFFIX

954

+TCL_SRC_DIR

955

+TCL_STUB_LIB_SPEC

956

+WISH

957

+TK_INCLUDES

958

+HAVE_TK

959

+WITH_TK_TRUE

960

+WITH_TK_FALSE

961

+TK_VERSION

962

+TK_MAJOR_VERSION

963

+TK_MINOR_VERSION

964

+TK_PATCH_LEVEL

965

+TK_DEFS

966

+TK_XINCLUDES

967

+TK_LIB_SPEC

968

+TK_SRC_DIR

969

+TK_CFLAGS

970

+TK_STUB_LIB_SPEC

971

+SOCKET_LIBS

972

+EXPAT_CONFIG

973

+EXPAT_INCLUDES

974

+EXPAT_LIBS

975

+XPM_INCLUDES

976

+XPM_LIBS

977

+XAW_INCLUDES

978

+XAW_LIBS

979

+WITH_XAW_TRUE

980

+WITH_XAW_FALSE

981

+Z_INCLUDES

982

+Z_LIBS

983

+IPSEPCOLA_INCLUDES

984

+IPSEPCOLA_LIBS

985

+WITH_IPSEPCOLA_TRUE

986

+WITH_IPSEPCOLA_FALSE

987

+PKG_CONFIG

988

+PANGOCAIRO_CFLAGS

989

+PANGOCAIRO_LIBS

990

+WITH_PANGOCAIRO_TRUE

991

+WITH_PANGOCAIRO_FALSE

992

+GTK_CFLAGS

993

+GTK_LIBS

994

+WITH_GTK_TRUE

995

+WITH_GTK_FALSE

996

+GNOMEUI_CFLAGS

997

+GNOMEUI_LIBS

998

+WITH_GNOMEUI_TRUE

999

+WITH_GNOMEUI_FALSE

1000

+GETTEXT_PACKAGE

1001

+USE_NLS

1002

+MSGFMT

1003

+GMSGFMT

1004

+XGETTEXT

1005

+CATALOGS

1006

+CATOBJEXT

1007

+DATADIRNAME

1008

+GMOFILES

1009

+INSTOBJEXT

1010

+INTLLIBS

1011

+PO_IN_DATADIR_TRUE

1012

+PO_IN_DATADIR_FALSE

1013

+POFILES

1014

+POSUB

1015

+MKINSTALLDIRS

1016

+MING_CONFIG

1017

+MAKESWF

1018

+MING_CFLAGS

1019

+MING_LIBS

1020

+WITH_MING_TRUE

1021

+WITH_MING_FALSE

1022

+GDLIB_CONFIG

1023

+GD_INCLUDES

1024

+GD_LIBS

1025

+HAVE_LIBGD

1026

+WITH_LIBGD_TRUE

1027

+WITH_LIBGD_FALSE

1028

+WITH_MYLIBGD_TRUE

1029

+WITH_MYLIBGD_FALSE

1030

+LIBICONV

1031

+LTLIBICONV

1032

+ICONV_INCLUDES

1033

+ICONV_LIBS

1034

+FREETYPE_CONFIG

1035

+FT_INCLUDES

1036

+FT_LIBS

1037

+FONTCONFIG_CONFIG

1038

+FONTCONFIG_CFLAGS

1039

+FONTCONFIG_LIBS

1040

+FC_INCLUDES

1041

+FC_LIBS

1042

+LIBPNG_CONFIG

1043

+PNG_INCLUDES

1044

+PNG_LIBS

1045

+JPEG_INCLUDES

1046

+JPEG_LIBS

1047

+TCLINT_INCLUDES

1048

+TKINT_INCLUDES

1049

+TCL_PKGINDEX

1050

+TK_PKGINDEX

1051

+LTLIBOBJS'

1052

ac_subst_files=''

1053

+ ac_precious_vars='build_alias

1054

+host_alias

1055

+target_alias

1056

+CC

1057

+CFLAGS

1058

+LDFLAGS

1059

+LIBS

1060

+CPPFLAGS

1061

+YACC

1062

+YFLAGS

1063

+CXX

1064

+CXXFLAGS

1065

+CCC

1066

+CPP

1067

+CXXCPP

1068

+F77

1069

+FFLAGS

1070

+XMKMF

1071

+PKG_CONFIG

1072

+PANGOCAIRO_CFLAGS

1073

+PANGOCAIRO_LIBS

1074

+GTK_CFLAGS

1075

+GTK_LIBS

1076

+GNOMEUI_CFLAGS

1077

+GNOMEUI_LIBS

1078

+FONTCONFIG_CFLAGS

1079

+FONTCONFIG_LIBS'

1080

+ac_subdirs_all='libltdl'

1081

1082

# Initialize some variables set by options.

1083

ac_init_help=

1084

@@ -493,34 +1122,48 @@

1085

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

1086

# by default will actually change.

1087

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

1088

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

1089

bindir='${exec_prefix}/bin'

1090

sbindir='${exec_prefix}/sbin'

1091

libexecdir='${exec_prefix}/libexec'

1092

-datadir='${prefix}/share'

1093

+datarootdir='${prefix}/share'

1094

+datadir='${datarootdir}'

1095

sysconfdir='${prefix}/etc'

1096

sharedstatedir='${prefix}/com'

1097

localstatedir='${prefix}/var'

1098

-libdir='${exec_prefix}/lib'

1099

includedir='${prefix}/include'

1100

oldincludedir='/usr/include'

1101

-infodir='${prefix}/info'

1102

-mandir='${prefix}/man'

1103

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

1104

+infodir='${datarootdir}/info'

1105

+htmldir='${docdir}'

1106

+dvidir='${docdir}'

1107

+pdfdir='${docdir}'

1108

+psdir='${docdir}'

1109

+libdir='${exec_prefix}/lib'

1110

+localedir='${datarootdir}/locale'

1111

+mandir='${datarootdir}/man'

1112

1113

ac_prev=

1114

+ac_dashdash=

1115

for ac_option

1116

1117

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

1118

if test -n "$ac_prev"; then

1119

- eval "$ac_prev=\$ac_option"

1120

+ eval $ac_prev=\$ac_option

1121

ac_prev=

1122

continue

1123

1124

1125

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

1126

+ case $ac_option in

1127

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

1128

+ *) ac_optarg=yes ;;

1129

+ esac

1130

1131

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

1132

1133

- case $ac_option in

1134

+ case $ac_dashdash$ac_option in

1135

+ --)

1136

+ ac_dashdash=yes ;;

1137

1138

1139

ac_prev=bindir ;;

1140

@@ -542,33 +1185,45 @@

1141

--config-cache | -C)

1142

cache_file=config.cache ;;

1143

1144

1145

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

1146

ac_prev=datadir ;;

1147

1148

- | --da=*)

1149

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

1150

datadir=$ac_optarg ;;

1151

1152

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

1153

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

1154

+ ac_prev=datarootdir ;;

1155

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

1156

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

1157

+ datarootdir=$ac_optarg ;;

1158

1159

-disable-* | --disable-*)

1160

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

1161

# Reject names that are not valid shell variable names.

1162

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

1163

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

1164

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

1165

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

1166

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

1167

- eval "enable_$ac_feature=no" ;;

1168

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

1169

+ eval enable_$ac_feature=no ;;

1170

1171

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

1172

+ ac_prev=docdir ;;

1173

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

1174

+ docdir=$ac_optarg ;;

1175

1176

1177

+ ac_prev=dvidir ;;

1178

1179

+ dvidir=$ac_optarg ;;

1180

1181

-enable-* | --enable-*)

1182

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

1183

# Reject names that are not valid shell variable names.

1184

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

1185

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

1186

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

1187

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

1188

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

1189

- case $ac_option in

1190

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

1191

- *) ac_optarg=yes ;;

1192

- esac

1193

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

1194

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

1195

+ eval enable_$ac_feature=\$ac_optarg ;;

1196

1197

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

1198

1199

@@ -595,6 +1250,12 @@

1200

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

1201

host_alias=$ac_optarg ;;

1202

1203

1204

+ ac_prev=htmldir ;;

1205

1206

+ | --ht=*)

1207

+ htmldir=$ac_optarg ;;

1208

1209

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

1210

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

1211

ac_prev=includedir ;;

1212

@@ -619,13 +1280,16 @@

1213

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

1214

libexecdir=$ac_optarg ;;

1215

1216

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

1217

+ ac_prev=localedir ;;

1218

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

1219

+ localedir=$ac_optarg ;;

1220

1221

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

1222

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

1223

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

1224

1225

ac_prev=localstatedir ;;

1226

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

1227

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

1228

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

1229

1230

localstatedir=$ac_optarg ;;

1231

1232

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

1233

@@ -690,6 +1354,16 @@

1234

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

1235

program_transform_name=$ac_optarg ;;

1236

1237

1238

+ ac_prev=pdfdir ;;

1239

1240

+ pdfdir=$ac_optarg ;;

1241

1242

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

1243

+ ac_prev=psdir ;;

1244

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

1245

+ psdir=$ac_optarg ;;

1246

1247

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

1248

1249

silent=yes ;;

1250

@@ -742,24 +1416,20 @@

1251

-with-* | --with-*)

1252

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

1253

# Reject names that are not valid shell variable names.

1254

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

1255

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

1256

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

1257

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

1258

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

1259

- case $ac_option in

1260

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

1261

- *) ac_optarg=yes ;;

1262

- esac

1263

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

1264

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

1265

+ eval with_$ac_package=\$ac_optarg ;;

1266

1267

-without-* | --without-*)

1268

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

1269

# Reject names that are not valid shell variable names.

1270

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

1271

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

1272

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

1273

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

1274

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

1275

- eval "with_$ac_package=no" ;;

1276

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

1277

+ eval with_$ac_package=no ;;

1278

1279

--x)

1280

# Obsolete; use --with-x.

1281

@@ -790,8 +1460,7 @@

1282

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

1283

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

1284

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

1285

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

1286

- eval "$ac_envvar='$ac_optarg'"

1287

+ eval $ac_envvar=\$ac_optarg

1288

export $ac_envvar ;;

1289

1290

1291

@@ -811,27 +1480,19 @@

1292

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

1293

1294

1295

-# Be sure to have absolute paths.

1296

-for ac_var in exec_prefix prefix

1297

-do

1298

- eval ac_val=$`echo $ac_var`

1299

- case $ac_val in

1300

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

1301

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

1302

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

1303

- esac

1304

-done

1305

1306

-# Be sure to have absolute paths.

1307

-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \

1308

- localstatedir libdir includedir oldincludedir infodir mandir

1309

+# Be sure to have absolute directory names.

1310

+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \

1311

+ datadir sysconfdir sharedstatedir localstatedir includedir \

1312

+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \

1313

+ libdir localedir mandir

1314

1315

- eval ac_val=$`echo $ac_var`

1316

+ eval ac_val=\$$ac_var

1317

case $ac_val in

1318

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

1319

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

1320

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

1321

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

1322

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

1323

esac

1324

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

1325

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

1326

done

1327

1328

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

1329

@@ -858,130 +1519,76 @@

1330

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

1331

1332

1333

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

1334

-if test -z "$srcdir"; then

1335

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

1336

+ac_ls_di=`ls -di .` &&

1337

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

1338

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

1339

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

1340

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

1341

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

1342

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

1343

1344

1345

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

1346

+if test -z "$srcdir"; then

1347

ac_srcdir_defaulted=yes

1348

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

1349

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

1350

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

1351

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

1352

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

1353

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

1354

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

1355

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

1356

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

1357

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

1358

echo X"$0" |

1359

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

1360

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

1361

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

1362

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

1363

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

1364

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

1365

+ s//\1/

1366

+ q

1367

+ }

1368

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

1369

+ s//\1/

1370

+ q

1371

+ }

1372

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

1373

+ s//\1/

1374

+ q

1375

+ }

1376

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

1377

+ s//\1/

1378

+ q

1379

+ }

1380

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

1381

srcdir=$ac_confdir

1382

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

1383

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

1384

srcdir=..

1385

1386

else

1387

ac_srcdir_defaulted=no

1388

1389

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

1390

- if test "$ac_srcdir_defaulted" = yes; then

1391

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

1392

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

1393

- else

1394

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

1395

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

1396

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

1397

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

1398

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

1399

- fi

1400

1401

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

1402

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

1403

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

1404

+ac_abs_confdir=`(

1405

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

1406

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

1407

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

1408

-ac_env_build_alias_set=${build_alias+set}

1409

-ac_env_build_alias_value=$build_alias

1410

-ac_cv_env_build_alias_set=${build_alias+set}

1411

-ac_cv_env_build_alias_value=$build_alias

1412

-ac_env_host_alias_set=${host_alias+set}

1413

-ac_env_host_alias_value=$host_alias

1414

-ac_cv_env_host_alias_set=${host_alias+set}

1415

-ac_cv_env_host_alias_value=$host_alias

1416

-ac_env_target_alias_set=${target_alias+set}

1417

-ac_env_target_alias_value=$target_alias

1418

-ac_cv_env_target_alias_set=${target_alias+set}

1419

-ac_cv_env_target_alias_value=$target_alias

1420

-ac_env_CC_set=${CC+set}

1421

-ac_env_CC_value=$CC

1422

-ac_cv_env_CC_set=${CC+set}

1423

-ac_cv_env_CC_value=$CC

1424

-ac_env_CFLAGS_set=${CFLAGS+set}

1425

-ac_env_CFLAGS_value=$CFLAGS

1426

-ac_cv_env_CFLAGS_set=${CFLAGS+set}

1427

-ac_cv_env_CFLAGS_value=$CFLAGS

1428

-ac_env_LDFLAGS_set=${LDFLAGS+set}

1429

-ac_env_LDFLAGS_value=$LDFLAGS

1430

-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}

1431

-ac_cv_env_LDFLAGS_value=$LDFLAGS

1432

-ac_env_CPPFLAGS_set=${CPPFLAGS+set}

1433

-ac_env_CPPFLAGS_value=$CPPFLAGS

1434

-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}

1435

-ac_cv_env_CPPFLAGS_value=$CPPFLAGS

1436

-ac_env_CXX_set=${CXX+set}

1437

-ac_env_CXX_value=$CXX

1438

-ac_cv_env_CXX_set=${CXX+set}

1439

-ac_cv_env_CXX_value=$CXX

1440

-ac_env_CXXFLAGS_set=${CXXFLAGS+set}

1441

-ac_env_CXXFLAGS_value=$CXXFLAGS

1442

-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}

1443

-ac_cv_env_CXXFLAGS_value=$CXXFLAGS

1444

-ac_env_CPP_set=${CPP+set}

1445

-ac_env_CPP_value=$CPP

1446

-ac_cv_env_CPP_set=${CPP+set}

1447

-ac_cv_env_CPP_value=$CPP

1448

-ac_env_CXXCPP_set=${CXXCPP+set}

1449

-ac_env_CXXCPP_value=$CXXCPP

1450

-ac_cv_env_CXXCPP_set=${CXXCPP+set}

1451

-ac_cv_env_CXXCPP_value=$CXXCPP

1452

-ac_env_F77_set=${F77+set}

1453

-ac_env_F77_value=$F77

1454

-ac_cv_env_F77_set=${F77+set}

1455

-ac_cv_env_F77_value=$F77

1456

-ac_env_FFLAGS_set=${FFLAGS+set}

1457

-ac_env_FFLAGS_value=$FFLAGS

1458

-ac_cv_env_FFLAGS_set=${FFLAGS+set}

1459

-ac_cv_env_FFLAGS_value=$FFLAGS

1460

-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}

1461

-ac_env_PKG_CONFIG_value=$PKG_CONFIG

1462

-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}

1463

-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG

1464

-ac_env_PANGOCAIRO_CFLAGS_set=${PANGOCAIRO_CFLAGS+set}

1465

-ac_env_PANGOCAIRO_CFLAGS_value=$PANGOCAIRO_CFLAGS

1466

-ac_cv_env_PANGOCAIRO_CFLAGS_set=${PANGOCAIRO_CFLAGS+set}

1467

-ac_cv_env_PANGOCAIRO_CFLAGS_value=$PANGOCAIRO_CFLAGS

1468

-ac_env_PANGOCAIRO_LIBS_set=${PANGOCAIRO_LIBS+set}

1469

-ac_env_PANGOCAIRO_LIBS_value=$PANGOCAIRO_LIBS

1470

-ac_cv_env_PANGOCAIRO_LIBS_set=${PANGOCAIRO_LIBS+set}

1471

-ac_cv_env_PANGOCAIRO_LIBS_value=$PANGOCAIRO_LIBS

1472

-ac_env_GTK_CFLAGS_set=${GTK_CFLAGS+set}

1473

-ac_env_GTK_CFLAGS_value=$GTK_CFLAGS

1474

-ac_cv_env_GTK_CFLAGS_set=${GTK_CFLAGS+set}

1475

-ac_cv_env_GTK_CFLAGS_value=$GTK_CFLAGS

1476

-ac_env_GTK_LIBS_set=${GTK_LIBS+set}

1477

-ac_env_GTK_LIBS_value=$GTK_LIBS

1478

-ac_cv_env_GTK_LIBS_set=${GTK_LIBS+set}

1479

-ac_cv_env_GTK_LIBS_value=$GTK_LIBS

1480

-ac_env_GNOMEUI_CFLAGS_set=${GNOMEUI_CFLAGS+set}

1481

-ac_env_GNOMEUI_CFLAGS_value=$GNOMEUI_CFLAGS

1482

-ac_cv_env_GNOMEUI_CFLAGS_set=${GNOMEUI_CFLAGS+set}

1483

-ac_cv_env_GNOMEUI_CFLAGS_value=$GNOMEUI_CFLAGS

1484

-ac_env_GNOMEUI_LIBS_set=${GNOMEUI_LIBS+set}

1485

-ac_env_GNOMEUI_LIBS_value=$GNOMEUI_LIBS

1486

-ac_cv_env_GNOMEUI_LIBS_set=${GNOMEUI_LIBS+set}

1487

-ac_cv_env_GNOMEUI_LIBS_value=$GNOMEUI_LIBS

1488

-ac_env_FONTCONFIG_CFLAGS_set=${FONTCONFIG_CFLAGS+set}

1489

-ac_env_FONTCONFIG_CFLAGS_value=$FONTCONFIG_CFLAGS

1490

-ac_cv_env_FONTCONFIG_CFLAGS_set=${FONTCONFIG_CFLAGS+set}

1491

-ac_cv_env_FONTCONFIG_CFLAGS_value=$FONTCONFIG_CFLAGS

1492

-ac_env_FONTCONFIG_LIBS_set=${FONTCONFIG_LIBS+set}

1493

-ac_env_FONTCONFIG_LIBS_value=$FONTCONFIG_LIBS

1494

-ac_cv_env_FONTCONFIG_LIBS_set=${FONTCONFIG_LIBS+set}

1495

-ac_cv_env_FONTCONFIG_LIBS_value=$FONTCONFIG_LIBS

1496

+ pwd)`

1497

+# When building in place, set srcdir=.

1498

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

1499

+ srcdir=.

1500

+fi

1501

+# Remove unnecessary trailing slashes from srcdir.

1502

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

1503

+# mess up M-x gdb in Emacs.

1504

+case $srcdir in

1505

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

1506

+esac

1507

+for ac_var in $ac_precious_vars; do

1508

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

1509

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

1510

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

1511

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

1512

+done

1513

1514

1515

# Report the --help message.

1516

@@ -1010,9 +1617,6 @@

1517

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

1518

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

1519

1520

-_ACEOF

1521

1522

- cat <<_ACEOF

1523

Installation directories:

1524

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

1525

[$ac_default_prefix]

1526

@@ -1030,15 +1634,22 @@

1527

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

1528

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

1529

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

1530

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

1531

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

1532

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

1533

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

1534

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

1535

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

1536

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

1537

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

1538

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

1539

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

1540

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

1541

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

1542

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

1543

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

1544

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

1545

+ --htmldir=DIR html documentation [DOCDIR]

1546

+ --dvidir=DIR dvi documentation [DOCDIR]

1547

+ --pdfdir=DIR pdf documentation [DOCDIR]

1548

+ --psdir=DIR ps documentation [DOCDIR]

1549

_ACEOF

1550

1551

cat <<\_ACEOF

1552

@@ -1068,11 +1679,9 @@

1553

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

1554

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

1555

--enable-static build static executable

1556

- --enable-static[=PKGS]

1557

- build static libraries [default=yes]

1558

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

1559

--enable-shared build shared executable

1560

- --enable-shared[=PKGS]

1561

- build shared libraries [default=yes]

1562

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

1563

--disable-dependency-tracking speeds up one-time build

1564

--enable-dependency-tracking do not reject slow dependency extractors

1565

--enable-ltdl support on-demand plugin loading

1566

@@ -1099,8 +1708,7 @@

1567

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

1568

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

1569

both]

1570

- --with-tags[=TAGS]

1571

- include additional configurations [automatic]

1572

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

1573

--with-codegens use old codegens

1574

--with-efence use efence for debugging memory use

1575

--with-x use the X Window System

1576

@@ -1120,6 +1728,7 @@

1577

--with-ipsepcola with IPSEPCOLA features in neato layout engine

1578

--with-pangocairo use pangocairo library

1579

--with-gtk use gtk+ library

1580

+ --with-gnomeui use gnomeui library

1581

--with-ming=<ming-config>

1582

Use ming to build tests

1583

--with-libgd use gd library

1584

@@ -1146,14 +1755,21 @@

1585

CFLAGS C compiler flags

1586

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

1587

nonstandard directory <lib dir>

1588

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

1589

- headers in a nonstandard directory <include dir>

1590

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

1591

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

1592

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

1593

+ YACC The `Yet Another C Compiler' implementation to use. Defaults to

1594

+ the first program found out of: `bison -y', `byacc', `yacc'.

1595

+ YFLAGS The list of arguments that will be passed by default to $YACC.

1596

+ This script will default YFLAGS to the empty string to avoid a

1597

+ default value of `-d' given by some make applications.

1598

CXX C++ compiler command

1599

CXXFLAGS C++ compiler flags

1600

CPP C preprocessor

1601

CXXCPP C++ preprocessor

1602

F77 Fortran 77 compiler command

1603

FFLAGS Fortran 77 compiler flags

1604

+ XMKMF Path to xmkmf, Makefile generator for X Window System

1605

PKG_CONFIG path to pkg-config utility

1606

PANGOCAIRO_CFLAGS

1607

C compiler flags for PANGOCAIRO, overriding pkg-config

1608

@@ -1174,120 +1790,86 @@

1609

it to find libraries and programs with nonstandard names/locations.

1610

1611

_ACEOF

1612

+ac_status=$?

1613

1614

1615

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

1616

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

1617

- ac_popdir=`pwd`

1618

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

1619

- test -d $ac_dir || continue

1620

+ test -d "$ac_dir" || continue

1621

ac_builddir=.

1622

1623

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

1624

+case "$ac_dir" in

1625

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

1626

+*)

1627

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

1628

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

1629

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

1630

-else

1631

- ac_dir_suffix= ac_top_builddir=

1632

-fi

1633

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

1634

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

1635

+ case $ac_top_builddir_sub in

1636

+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;

1637

+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

1638

+ esac ;;

1639

+esac

1640

+ac_abs_top_builddir=$ac_pwd

1641

+ac_abs_builddir=$ac_pwd$ac_dir_suffix

1642

+# for backward compatibility:

1643

+ac_top_builddir=$ac_top_build_prefix

1644

1645

case $srcdir in

1646

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

1647

+ .) # We are building in place.

1648

ac_srcdir=.

1649

- if test -z "$ac_top_builddir"; then

1650

- ac_top_srcdir=.

1651

- else

1652

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

1653

- fi ;;

1654

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

1655

+ ac_top_srcdir=$ac_top_builddir_sub

1656

+ ac_abs_top_srcdir=$ac_pwd ;;

1657

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

1658

ac_srcdir=$srcdir$ac_dir_suffix;

1659

- ac_top_srcdir=$srcdir ;;

1660

- *) # Relative path.

1661

- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix

1662

- ac_top_srcdir=$ac_top_builddir$srcdir ;;

1663

-esac

1664

1665

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

1666

-# the directories may not exist.

1667

-case `pwd` in

1668

-.) ac_abs_builddir="$ac_dir";;

1669

-*)

1670

- case "$ac_dir" in

1671

- .) ac_abs_builddir=`pwd`;;

1672

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

1673

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

1674

- esac;;

1675

-esac

1676

-case $ac_abs_builddir in

1677

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

1678

-*)

1679

- case ${ac_top_builddir}. in

1680

- .) ac_abs_top_builddir=$ac_abs_builddir;;

1681

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

1682

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

1683

- esac;;

1684

-esac

1685

-case $ac_abs_builddir in

1686

-.) ac_abs_srcdir=$ac_srcdir;;

1687

-*)

1688

- case $ac_srcdir in

1689

- .) ac_abs_srcdir=$ac_abs_builddir;;

1690

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

1691

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

1692

- esac;;

1693

-esac

1694

-case $ac_abs_builddir in

1695

-.) ac_abs_top_srcdir=$ac_top_srcdir;;

1696

-*)

1697

- case $ac_top_srcdir in

1698

- .) ac_abs_top_srcdir=$ac_abs_builddir;;

1699

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

1700

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

1701

- esac;;

1702

-esac

1703

1704

- cd $ac_dir

1705

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

1706

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

1707

- echo

1708

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

1709

- elif test -f $ac_srcdir/configure; then

1710

- echo

1711

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

1712

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

1713

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

1714

- echo

1715

- $ac_configure --help

1716

+ ac_top_srcdir=$srcdir

1717

+ ac_abs_top_srcdir=$srcdir ;;

1718

+ *) # Relative name.

1719

+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix

1720

+ ac_top_srcdir=$ac_top_build_prefix$srcdir

1721

+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;

1722

+esac

1723

+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

1724

1725

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

1726

+ # Check for guested configure.

1727

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

1728

+ echo &&

1729

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

1730

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

1731

+ echo &&

1732

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

1733

else

1734

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

1735

- fi

1736

- cd $ac_popdir

1737

+ fi || ac_status=$?

1738

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

1739

done

1740

1741

1742

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

1743

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

1744

if $ac_init_version; then

1745

cat <<\_ACEOF

1746

graphviz configure 2.12

1747

-generated by GNU Autoconf 2.59

1748

+generated by GNU Autoconf 2.61

1749

1750

1751

1752

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

1753

This configure script is free software; the Free Software Foundation

1754

gives unlimited permission to copy, distribute and modify it.

1755

_ACEOF

1756

- exit 0

1757

+ exit

1758

1759

-exec 5>config.log

1760

-cat >&5 <<_ACEOF

1761

+cat >config.log <<_ACEOF

1762

This file contains any messages produced by compilers while

1763

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

1764

1765

It was created by graphviz $as_me 2.12, which was

1766

-generated by GNU Autoconf 2.59. Invocation command line was

1767

+generated by GNU Autoconf 2.61. Invocation command line was

1768

1769

$ $0 $@

1770

1771

_ACEOF

1772

+exec 5>>config.log

1773

{

1774

cat <<_ASUNAME

1775

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

1776

@@ -1306,7 +1888,7 @@

1777

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

1778

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

1779

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

1780

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

1781

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

1782

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

1783

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

1784

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

1785

@@ -1320,6 +1902,7 @@

1786

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

1787

echo "PATH: $as_dir"

1788

done

1789

+IFS=$as_save_IFS

1790

1791

} >&5

1792

1793

@@ -1341,7 +1924,6 @@

1794

ac_configure_args=

1795

ac_configure_args0=

1796

ac_configure_args1=

1797

-ac_sep=

1798

ac_must_keep_next=false

1799

for ac_pass in 1 2

1800

1801

@@ -1352,7 +1934,7 @@

1802

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

1803

1804

continue ;;

1805

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

1806

+ *\'*)

1807

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

1808

esac

1809

case $ac_pass in

1810

@@ -1374,9 +1956,7 @@

1811

-* ) ac_must_keep_next=true ;;

1812

esac

1813

1814

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

1815

- # Get rid of the leading space.

1816

- ac_sep=" "

1817

+ ac_configure_args="$ac_configure_args '$ac_arg'"

1818

;;

1819

esac

1820

done

1821

@@ -1387,8 +1967,8 @@

1822

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

1823

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

1824

# would cause problems or look ugly.

1825

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

1826

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

1827

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

1828

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

1829

trap 'exit_status=$?

1830

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

1831

{

1832

@@ -1401,20 +1981,34 @@

1833

_ASBOX

1834

echo

1835

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

1836

1837

1838

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

1839

+ eval ac_val=\$$ac_var

1840

+ case $ac_val in #(

1841

+ *${as_nl}*)

1842

+ case $ac_var in #(

1843

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

1844

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

1845

+ esac

1846

+ case $ac_var in #(

1847

+ _ | IFS | as_nl) ;; #(

1848

+ *) $as_unset $ac_var ;;

1849

+ esac ;;

1850

+ esac

1851

+ done

1852

(set) 2>&1 |

1853

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

1854

- *ac_space=\ *)

1855

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

1856

+ *${as_nl}ac_space=\ *)

1857

sed -n \

1858

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

1859

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

1860

- ;;

1861

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

1862

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

1863

+ ;; #(

1864

1865

- sed -n \

1866

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

1867

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

1868

;;

1869

- esac;

1870

1871

+ esac |

1872

+ sort

1873

1874

echo

1875

1876

cat <<\_ASBOX

1877

@@ -1425,22 +2019,28 @@

1878

echo

1879

for ac_var in $ac_subst_vars

1880

1881

- eval ac_val=$`echo $ac_var`

1882

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

1883

+ eval ac_val=\$$ac_var

1884

+ case $ac_val in

1885

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

1886

+ esac

1887

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

1888

done | sort

1889

echo

1890

1891

if test -n "$ac_subst_files"; then

1892

cat <<\_ASBOX

1893

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

1894

-## Output files. ##

1895

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

1896

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

1897

+## File substitutions. ##

1898

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

1899

_ASBOX

1900

echo

1901

for ac_var in $ac_subst_files

1902

1903

- eval ac_val=$`echo $ac_var`

1904

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

1905

+ eval ac_val=\$$ac_var

1906

+ case $ac_val in

1907

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

1908

+ esac

1909

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

1910

done | sort

1911

echo

1912

1913

@@ -1452,26 +2052,24 @@

1914

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

1915

_ASBOX

1916

echo

1917

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

1918

+ cat confdefs.h

1919

echo

1920

1921

test "$ac_signal" != 0 &&

1922

echo "$as_me: caught signal $ac_signal"

1923

echo "$as_me: exit $exit_status"

1924

} >&5

1925

- rm -f core *.core &&

1926

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

1927

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

1928

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

1929

exit $exit_status

1930

- ' 0

1931

+' 0

1932

for ac_signal in 1 2 13 15; do

1933

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

1934

done

1935

ac_signal=0

1936

1937

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

1938

-rm -rf conftest* confdefs.h

1939

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

1940

-echo >confdefs.h

1941

+rm -f -r conftest* confdefs.h

1942

1943

# Predefined preprocessor variables.

1944

1945

@@ -1502,14 +2100,17 @@

1946

1947

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

1948

# Prefer explicitly selected file to automatically selected ones.

1949

-if test -z "$CONFIG_SITE"; then

1950

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

1951

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

1952

- else

1953

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

1954

- fi

1955

+if test -n "$CONFIG_SITE"; then

1956

+ set x "$CONFIG_SITE"

1957

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

1958

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

1959

+else

1960

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

1961

+ "$ac_default_prefix/etc/config.site"

1962

1963

-for ac_site_file in $CONFIG_SITE; do

1964

+shift

1965

+for ac_site_file

1966

+do

1967

if test -r "$ac_site_file"; then

1968

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

1969

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

1970

@@ -1525,8 +2126,8 @@

1971

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

1972

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

1973

case $cache_file in

1974

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

1975

- *) . ./$cache_file;;

1976

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

1977

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

1978

esac

1979

1980

else

1981

@@ -1538,12 +2139,11 @@

1982

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

1983

# value.

1984

ac_cache_corrupted=false

1985

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

1986

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

1987

+for ac_var in $ac_precious_vars; do

1988

eval ac_old_set=\$ac_cv_env_${ac_var}_set

1989

eval ac_new_set=\$ac_env_${ac_var}_set

1990

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

1991

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

1992

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

1993

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

1994

case $ac_old_set,$ac_new_set in

1995

set,)

1996

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

1997

@@ -1568,8 +2168,7 @@

1998

# Pass precious variables to config.status.

1999

if test "$ac_new_set" = set; then

2000

case $ac_new_val in

2001

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

2002

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

2003

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

2004

*) ac_arg=$ac_var=$ac_new_val ;;

2005

esac

2006

case " $ac_configure_args " in

2007

@@ -1586,12 +2185,6 @@

2008

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

2009

2010

2011

-ac_ext=c

2012

-ac_cpp='$CPP $CPPFLAGS'

2013

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

2014

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

2015

-ac_compiler_gnu=$ac_cv_c_compiler_gnu

2016

2017

2018

2019

2020

@@ -1616,6 +2209,11 @@

2021

2022

2023

2024

+ac_ext=c

2025

+ac_cpp='$CPP $CPPFLAGS'

2026

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

2027

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

2028

+ac_compiler_gnu=$ac_cv_c_compiler_gnu

2029

2030

2031

2032

@@ -1639,84 +2237,119 @@

2033

2034

2035

ac_aux_dir=

2036

-for ac_dir in config $srcdir/config; do

2037

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

2038

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

2039

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

2040

ac_aux_dir=$ac_dir

2041

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

2042

break

2043

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

2044

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

2045

ac_aux_dir=$ac_dir

2046

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

2047

break

2048

- elif test -f $ac_dir/shtool; then

2049

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

2050

ac_aux_dir=$ac_dir

2051

ac_install_sh="$ac_aux_dir/shtool install -c"

2052

break

2053

2054

done

2055

if test -z "$ac_aux_dir"; then

2056

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

2057

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

2058

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

2059

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

2060

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

2061

2062

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

2063

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

2064

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

2065

2066

+# These three variables are undocumented and unsupported,

2067

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

2068

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

2069

+# whose full name contains unusual characters.

2070

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

2071

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

2072

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

2073

2074

2075

2076

2077

# Make sure we can run config.sub.

2078

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

2079

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

2080

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

2081

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

2082

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

2083

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

2084

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

2085

2086

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

2087

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

2088

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

2089

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

2090

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

2091

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

2092

else

2093

- ac_cv_build_alias=$build_alias

2094

-test -z "$ac_cv_build_alias" &&

2095

- ac_cv_build_alias=`$ac_config_guess`

2096

-test -z "$ac_cv_build_alias" &&

2097

+ ac_build_alias=$build_alias

2098

+test "x$ac_build_alias" = x &&

2099

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

2100

+test "x$ac_build_alias" = x &&

2101

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

2102

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

2103

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

2104

-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||

2105

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

2106

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

2107

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

2108

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

2109

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

2110

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

2111

2112

2113

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

2114

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

2115

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

2116

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

2117

+case $ac_cv_build in

2118

+*-*-*) ;;

2119

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

2120

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

2121

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

2122

+esac

2123

build=$ac_cv_build

2124

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

2125

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

2126

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

2127

+ac_save_IFS=$IFS; IFS='-'

2128

+set x $ac_cv_build

2129

+shift

2130

+build_cpu=$1

2131

+build_vendor=$2

2132

+shift; shift

2133

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

2134

+# except with old shells:

2135

+build_os=$*

2136

+IFS=$ac_save_IFS

2137

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

2138

2139

2140

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

2141

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

2142

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

2143

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

2144

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

2145

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

2146

else

2147

- ac_cv_host_alias=$host_alias

2148

-test -z "$ac_cv_host_alias" &&

2149

- ac_cv_host_alias=$ac_cv_build_alias

2150

-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||

2151

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

2152

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

2153

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

2154

+ ac_cv_host=$ac_cv_build

2155

+else

2156

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

2157

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

2158

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

2159

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

2160

+fi

2161

2162

2163

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

2164

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

2165

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

2166

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

2167

+case $ac_cv_host in

2168

+*-*-*) ;;

2169

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

2170

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

2171

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

2172

+esac

2173

host=$ac_cv_host

2174

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

2175

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

2176

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

2177

+ac_save_IFS=$IFS; IFS='-'

2178

+set x $ac_cv_host

2179

+shift

2180

+host_cpu=$1

2181

+host_vendor=$2

2182

+shift; shift

2183

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

2184

+# except with old shells:

2185

+host_os=$*

2186

+IFS=$ac_save_IFS

2187

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

2188

2189

2190

2191

@@ -1815,8 +2448,8 @@

2192

# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"

2193

# OS/2's system install, which has a completely different semantic

2194

# ./install, which can be erroneously created by make from ./install.sh.

2195

-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5

2196

-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6

2197

+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5

2198

+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }

2199

if test -z "$INSTALL"; then

2200

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

2201

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

2202

@@ -1838,7 +2471,7 @@

2203

# by default.

2204

for ac_prog in ginstall scoinst install; do

2205

for ac_exec_ext in '' $ac_executable_extensions; do

2206

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

2207

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

2208

if test $ac_prog = install &&

2209

grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then

2210

# AIX install. It has an incompatible calling convention.

2211

@@ -1857,21 +2490,22 @@

2212

;;

2213

esac

2214

done

2215

+IFS=$as_save_IFS

2216

2217

2218

2219

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

2220

INSTALL=$ac_cv_path_install

2221

else

2222

- # As a last resort, use the slow shell script. We don't cache a

2223

- # path for INSTALL within a source directory, because that will

2224

+ # As a last resort, use the slow shell script. Don't cache a

2225

+ # value for INSTALL within a source directory, because that will

2226

# break other packages using the cache if that directory is

2227

- # removed, or if the path is relative.

2228

+ # removed, or if the value is a relative name.

2229

INSTALL=$ac_install_sh

2230

2231

2232

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

2233

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

2234

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

2235

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

2236

2237

# Use test -z because SunOS4 sh mishandles braces in ${var-val}.

2238

# It thinks the first close brace ends the variable substitution.

2239

@@ -1881,8 +2515,8 @@

2240

2241

test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

2242

2243

-echo "$as_me:$LINENO: checking whether build environment is sane" >&5

2244

-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6

2245

+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5

2246

+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }

2247

# Just in case

2248

sleep 1

2249

echo timestamp > conftest.file

2250

@@ -1924,20 +2558,20 @@

2251

Check your system clock" >&2;}

2252

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

2253

2254

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

2255

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

2256

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

2257

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

2258

test "$program_prefix" != NONE &&

2259

- program_transform_name="s,^,$program_prefix,;$program_transform_name"

2260

+ program_transform_name="s&^&$program_prefix&;$program_transform_name"

2261

# Use a double $ so make ignores it.

2262

test "$program_suffix" != NONE &&

2263

- program_transform_name="s,\$,$program_suffix,;$program_transform_name"

2264

+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"

2265

# Double any \ or $. echo might interpret backslashes.

2266

# By default was `s,x,x', remove it if useless.

2267

cat <<\_ACEOF >conftest.sed

2268

s/[\\$]/&&/g;s/;s,x,x,$//

2269

_ACEOF

2270

program_transform_name=`echo $program_transform_name | sed -f conftest.sed`

2271

-rm conftest.sed

2272

+rm -f conftest.sed

2273

2274

# expand $ac_aux_dir to an absolute path

2275

am_aux_dir=`cd $ac_aux_dir && pwd`

2276

@@ -1989,8 +2623,8 @@

2277

2278

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

2279

set dummy $ac_prog; ac_word=$2

2280

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

2281

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

2282

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

2283

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

2284

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

2285

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

2286

else

2287

@@ -2003,54 +2637,57 @@

2288

IFS=$as_save_IFS

2289

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

2290

for ac_exec_ext in '' $ac_executable_extensions; do

2291

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

2292

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

2293

ac_cv_prog_AWK="$ac_prog"

2294

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

2295

break 2

2296

2297

done

2298

done

2299

+IFS=$as_save_IFS

2300

2301

2302

2303

AWK=$ac_cv_prog_AWK

2304

if test -n "$AWK"; then

2305

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

2306

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

2307

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

2308

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

2309

else

2310

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

2311

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

2312

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

2313

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

2314

2315

2316

2317

test -n "$AWK" && break

2318

done

2319

2320

-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5

2321

-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6

2322

-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`

2323

-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then

2324

+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5

2325

+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }

2326

+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

2327

+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then

2328

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

2329

else

2330

cat >conftest.make <<\_ACEOF

2331

+SHELL = /bin/sh

2332

all:

2333

- @echo 'ac_maketemp="$(MAKE)"'

2334

+ @echo '@@@%%%=$(MAKE)=@@@%%%'

2335

_ACEOF

2336

# GNU make sometimes prints "make[1]: Entering...", which would confuse us.

2337

-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`

2338

-if test -n "$ac_maketemp"; then

2339

- eval ac_cv_prog_make_${ac_make}_set=yes

2340

-else

2341

- eval ac_cv_prog_make_${ac_make}_set=no

2342

-fi

2343

+case `${MAKE-make} -f conftest.make 2>/dev/null` in

2344

+ *@@@%%%=?*=@@@%%%*)

2345

+ eval ac_cv_prog_make_${ac_make}_set=yes;;

2346

+ *)

2347

+ eval ac_cv_prog_make_${ac_make}_set=no;;

2348

+esac

2349

rm -f conftest.make

2350

2351

-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then

2352

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

2353

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

2354

+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then

2355

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

2356

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

2357

SET_MAKE=

2358

else

2359

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

2360

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

2361

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

2362

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

2363

SET_MAKE="MAKE=${MAKE-make}"

2364

2365

2366

@@ -2121,8 +2758,8 @@

2367

if test -n "$ac_tool_prefix"; then

2368

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

2369

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

2370

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

2371

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

2372

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

2373

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

2374

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

2375

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

2376

else

2377

@@ -2135,32 +2772,34 @@

2378

IFS=$as_save_IFS

2379

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

2380

for ac_exec_ext in '' $ac_executable_extensions; do

2381

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

2382

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

2383

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

2384

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

2385

break 2

2386

2387

done

2388

done

2389

+IFS=$as_save_IFS

2390

2391

2392

2393

STRIP=$ac_cv_prog_STRIP

2394

if test -n "$STRIP"; then

2395

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

2396

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

2397

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

2398

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

2399

else

2400

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

2401

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

2402

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

2403

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

2404

2405

2406

2407

2408

if test -z "$ac_cv_prog_STRIP"; then

2409

ac_ct_STRIP=$STRIP

2410

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

2411

set dummy strip; ac_word=$2

2412

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

2413

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

2414

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

2415

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

2416

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

2417

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

2418

else

2419

@@ -2173,27 +2812,41 @@

2420

IFS=$as_save_IFS

2421

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

2422

for ac_exec_ext in '' $ac_executable_extensions; do

2423

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

2424

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

2425

ac_cv_prog_ac_ct_STRIP="strip"

2426

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

2427

break 2

2428

2429

done

2430

done

2431

+IFS=$as_save_IFS

2432

2433

- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"

2434

2435

2436

ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

2437

if test -n "$ac_ct_STRIP"; then

2438

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

2439

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

2440

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

2441

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

2442

else

2443

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

2444

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

2445

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

2446

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

2447

2448

2449

- STRIP=$ac_ct_STRIP

2450

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

2451

+ STRIP=":"

2452

+ else

2453

+ case $cross_compiling:$ac_tool_warned in

2454

+yes:)

2455

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

2456

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

2457

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

2458

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

2459

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

2460

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

2461

+ac_tool_warned=yes ;;

2462

+esac

2463

+ STRIP=$ac_ct_STRIP

2464

+ fi

2465

else

2466

STRIP="$ac_cv_prog_STRIP"

2467

2468

@@ -2213,7 +2866,7 @@

2469

2470

2471

2472

- ac_config_headers="$ac_config_headers config.h"

2473

+ac_config_headers="$ac_config_headers config.h"

2474

2475

2476

# put BUILDDATE in its own file so that only targets that use it get rebuilt

2477

@@ -2243,16 +2896,15 @@

2478

2479

# Static/Shared binaries

2480

2481

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

2482

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

2483

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

2484

- enableval="$enable_static"

2485

+ enableval=$enable_static;

2486

+fi

2487

2488

-fi;

2489

if test "x$enable_static" = "xyes"; then

2490

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

2491

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

2492

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

2493

- enableval="$enable_static"

2494

- p=${PACKAGE-default}

2495

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

2496

case $enableval in

2497

yes) enable_static=yes ;;

2498

no) enable_static=no ;;

2499

@@ -2271,7 +2923,8 @@

2500

esac

2501

else

2502

enable_static=yes

2503

-fi;

2504

+fi

2505

2506

2507

2508

cat >>confdefs.h <<\_ACEOF

2509

@@ -2279,10 +2932,9 @@

2510

_ACEOF

2511

2512

else

2513

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

2514

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

2515

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

2516

- enableval="$enable_static"

2517

- p=${PACKAGE-default}

2518

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

2519

case $enableval in

2520

yes) enable_static=yes ;;

2521

no) enable_static=no ;;

2522

@@ -2301,7 +2953,8 @@

2523

esac

2524

else

2525

enable_static=no

2526

-fi;

2527

+fi

2528

2529

2530

2531

2532

@@ -2316,16 +2969,15 @@

2533

2534

2535

2536

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

2537

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

2538

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

2539

- enableval="$enable_shared"

2540

+ enableval=$enable_shared;

2541

+fi

2542

2543

-fi;

2544

if test "x$enable_shared" != "xno"; then

2545

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

2546

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

2547

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

2548

- enableval="$enable_shared"

2549

- p=${PACKAGE-default}

2550

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

2551

case $enableval in

2552

yes) enable_shared=yes ;;

2553

no) enable_shared=no ;;

2554

@@ -2344,7 +2996,8 @@

2555

esac

2556

else

2557

enable_shared=yes

2558

-fi;

2559

+fi

2560

2561

2562

2563

cat >>confdefs.h <<\_ACEOF

2564

@@ -2352,10 +3005,9 @@

2565

_ACEOF

2566

2567

else

2568

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

2569

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

2570

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

2571

- enableval="$enable_shared"

2572

- p=${PACKAGE-default}

2573

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

2574

case $enableval in

2575

yes) enable_shared=yes ;;

2576

no) enable_shared=no ;;

2577

@@ -2374,7 +3026,8 @@

2578

esac

2579

else

2580

enable_shared=no

2581

-fi;

2582

+fi

2583

2584

2585

2586

2587

@@ -2392,7 +3045,7 @@

2588

2589

DEPDIR="${am__leading_dot}deps"

2590

2591

- ac_config_commands="$ac_config_commands depfiles"

2592

+ac_config_commands="$ac_config_commands depfiles"

2593

2594

2595

am_make=${MAKE-make}

2596

@@ -2402,8 +3055,8 @@

2597

.PHONY: am__doit

2598

END

2599

# If we don't find an include directive, just comment out the code.

2600

-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5

2601

-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6

2602

+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5

2603

+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }

2604

am__include="#"

2605

am__quote=

2606

_am_result=none

2607

@@ -2430,15 +3083,15 @@

2608

2609

2610

2611

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

2612

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

2613

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

2614

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

2615

rm -f confinc confmf

2616

2617

-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.

2618

+# Check whether --enable-dependency-tracking was given.

2619

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

2620

- enableval="$enable_dependency_tracking"

2621

+ enableval=$enable_dependency_tracking;

2622

+fi

2623

2624

-fi;

2625

if test "x$enable_dependency_tracking" != xno; then

2626

am_depcomp="$ac_aux_dir/depcomp"

2627

AMDEPBACKSLASH='\'

2628

@@ -2463,8 +3116,8 @@

2629

if test -n "$ac_tool_prefix"; then

2630

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

2631

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

2632

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

2633

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

2634

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

2635

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

2636

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

2637

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

2638

else

2639

@@ -2477,32 +3130,34 @@

2640

IFS=$as_save_IFS

2641

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

2642

for ac_exec_ext in '' $ac_executable_extensions; do

2643

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

2644

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

2645

ac_cv_prog_CC="${ac_tool_prefix}gcc"

2646

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

2647

break 2

2648

2649

done

2650

done

2651

+IFS=$as_save_IFS

2652

2653

2654

2655

CC=$ac_cv_prog_CC

2656

if test -n "$CC"; then

2657

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

2658

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

2659

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

2660

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

2661

else

2662

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

2663

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

2664

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

2665

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

2666

2667

2668

2669

2670

if test -z "$ac_cv_prog_CC"; then

2671

ac_ct_CC=$CC

2672

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

2673

set dummy gcc; ac_word=$2

2674

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

2675

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

2676

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

2677

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

2678

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

2679

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

2680

else

2681

@@ -2515,36 +3170,51 @@

2682

IFS=$as_save_IFS

2683

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

2684

for ac_exec_ext in '' $ac_executable_extensions; do

2685

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

2686

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

2687

ac_cv_prog_ac_ct_CC="gcc"

2688

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

2689

break 2

2690

2691

done

2692

done

2693

+IFS=$as_save_IFS

2694

2695

2696

2697

ac_ct_CC=$ac_cv_prog_ac_ct_CC

2698

if test -n "$ac_ct_CC"; then

2699

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

2700

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

2701

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

2702

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

2703

else

2704

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

2705

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

2706

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

2707

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

2708

2709

2710

- CC=$ac_ct_CC

2711

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

2712

+ CC=""

2713

+ else

2714

+ case $cross_compiling:$ac_tool_warned in

2715

+yes:)

2716

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

2717

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

2718

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

2719

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

2720

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

2721

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

2722

+ac_tool_warned=yes ;;

2723

+esac

2724

+ CC=$ac_ct_CC

2725

+ fi

2726

else

2727

CC="$ac_cv_prog_CC"

2728

2729

2730

if test -z "$CC"; then

2731

- if test -n "$ac_tool_prefix"; then

2732

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

2733

+ if test -n "$ac_tool_prefix"; then

2734

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

2735

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

2736

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

2737

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

2738

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

2739

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

2740

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

2741

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

2742

else

2743

@@ -2557,74 +3227,34 @@

2744

IFS=$as_save_IFS

2745

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

2746

for ac_exec_ext in '' $ac_executable_extensions; do

2747

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

2748

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

2749

ac_cv_prog_CC="${ac_tool_prefix}cc"

2750

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

2751

break 2

2752

2753

done

2754

done

2755

+IFS=$as_save_IFS

2756

2757

2758

2759

CC=$ac_cv_prog_CC

2760

if test -n "$CC"; then

2761

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

2762

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

2763

-else

2764

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

2765

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

2766

-fi

2767

2768

-fi

2769

-if test -z "$ac_cv_prog_CC"; then

2770

- ac_ct_CC=$CC

2771

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

2772

-set dummy cc; ac_word=$2

2773

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

2774

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

2775

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

2776

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

2777

-else

2778

- if test -n "$ac_ct_CC"; then

2779

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

2780

-else

2781

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

2782

-for as_dir in $PATH

2783

-do

2784

- IFS=$as_save_IFS

2785

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

2786

- for ac_exec_ext in '' $ac_executable_extensions; do

2787

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

2788

- ac_cv_prog_ac_ct_CC="cc"

2789

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

2790

- break 2

2791

- fi

2792

-done

2793

-done

2794

2795

-fi

2796

-fi

2797

-ac_ct_CC=$ac_cv_prog_ac_ct_CC

2798

-if test -n "$ac_ct_CC"; then

2799

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

2800

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

2801

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

2802

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

2803

else

2804

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

2805

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

2806

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

2807

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

2808

2809

2810

- CC=$ac_ct_CC

2811

-else

2812

- CC="$ac_cv_prog_CC"

2813

-fi

2814

2815

+ fi

2816

2817

if test -z "$CC"; then

2818

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

2819

set dummy cc; ac_word=$2

2820

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

2821

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

2822

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

2823

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

2824

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

2825

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

2826

else

2827

@@ -2638,7 +3268,7 @@

2828

IFS=$as_save_IFS

2829

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

2830

for ac_exec_ext in '' $ac_executable_extensions; do

2831

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

2832

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

2833

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

2834

ac_prog_rejected=yes

2835

continue

2836

@@ -2649,6 +3279,7 @@

2837

2838

done

2839

done

2840

+IFS=$as_save_IFS

2841

2842

if test $ac_prog_rejected = yes; then

2843

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

2844

@@ -2666,22 +3297,23 @@

2845

2846

CC=$ac_cv_prog_CC

2847

if test -n "$CC"; then

2848

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

2849

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

2850

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

2851

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

2852

else

2853

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

2854

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

2855

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

2856

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

2857

2858

2859

2860

2861

if test -z "$CC"; then

2862

if test -n "$ac_tool_prefix"; then

2863

- for ac_prog in cl

2864

+ for ac_prog in cl.exe

2865

2866

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

2867

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

2868

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

2869

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

2870

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

2871

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

2872

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

2873

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

2874

else

2875

@@ -2694,36 +3326,38 @@

2876

IFS=$as_save_IFS

2877

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

2878

for ac_exec_ext in '' $ac_executable_extensions; do

2879

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

2880

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

2881

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

2882

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

2883

break 2

2884

2885

done

2886

done

2887

+IFS=$as_save_IFS

2888

2889

2890

2891

CC=$ac_cv_prog_CC

2892

if test -n "$CC"; then

2893

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

2894

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

2895

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

2896

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

2897

else

2898

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

2899

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

2900

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

2901

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

2902

2903

2904

2905

test -n "$CC" && break

2906

done

2907

2908

if test -z "$CC"; then

2909

ac_ct_CC=$CC

2910

- for ac_prog in cl

2911

+ for ac_prog in cl.exe

2912

2913

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

2914

set dummy $ac_prog; ac_word=$2

2915

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

2916

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

2917

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

2918

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

2919

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

2920

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

2921

else

2922

@@ -2736,29 +3370,45 @@

2923

IFS=$as_save_IFS

2924

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

2925

for ac_exec_ext in '' $ac_executable_extensions; do

2926

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

2927

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

2928

ac_cv_prog_ac_ct_CC="$ac_prog"

2929

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

2930

break 2

2931

2932

done

2933

done

2934

+IFS=$as_save_IFS

2935

2936

2937

2938

ac_ct_CC=$ac_cv_prog_ac_ct_CC

2939

if test -n "$ac_ct_CC"; then

2940

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

2941

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

2942

+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

2943

+echo "${ECHO_T}$ac_ct_CC" >&6; }

2944

else

2945

- echo "$as_me:$LINENO: result: no" >&5

2946

-echo "${ECHO_T}no" >&6

2947

+ { echo "$as_me:$LINENO: result: no" >&5

2948

+echo "${ECHO_T}no" >&6; }

2949

2950

2951

2952

test -n "$ac_ct_CC" && break

2953

done

2954

2955

- CC=$ac_ct_CC

2956

+ if test "x$ac_ct_CC" = x; then

2957

+ CC=""

2958

+ else

2959

+ case $cross_compiling:$ac_tool_warned in

2960

+yes:)

2961

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

2962

+whose name does not start with the host triplet. If you think this

2963

+configuration is useful to you, please write to autoconf@gnu.org." >&5

2964

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

2965

+whose name does not start with the host triplet. If you think this

2966

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

2967

+ac_tool_warned=yes ;;

2968

+esac

2969

+ CC=$ac_ct_CC

2970

+ fi

2971

2972

2973

2974

@@ -2771,21 +3421,35 @@

2975

{ (exit 1); exit 1; }; }

2976

2977

# Provide some information about the compiler.

2978

-echo "$as_me:$LINENO:" \

2979

- "checking for C compiler version" >&5

2980

+echo "$as_me:$LINENO: checking for C compiler version" >&5

2981

ac_compiler=`set X $ac_compile; echo $2`

2982

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5

2983

- (eval $ac_compiler --version </dev/null >&5) 2>&5

2984

+{ (ac_try="$ac_compiler --version >&5"

2985

+case "(($ac_try" in

2986

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2987

+ *) ac_try_echo=$ac_try;;

2988

+esac

2989

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2990

+ (eval "$ac_compiler --version >&5") 2>&5

2991

ac_status=$?

2992

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2993

(exit $ac_status); }

2994

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5

2995

- (eval $ac_compiler -v </dev/null >&5) 2>&5

2996

+{ (ac_try="$ac_compiler -v >&5"

2997

+case "(($ac_try" in

2998

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2999

+ *) ac_try_echo=$ac_try;;

3000

+esac

3001

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3002

+ (eval "$ac_compiler -v >&5") 2>&5

3003

ac_status=$?

3004

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3005

(exit $ac_status); }

3006

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5

3007

- (eval $ac_compiler -V </dev/null >&5) 2>&5

3008

+{ (ac_try="$ac_compiler -V >&5"

3009

+case "(($ac_try" in

3010

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3011

+ *) ac_try_echo=$ac_try;;

3012

+esac

3013

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3014

+ (eval "$ac_compiler -V >&5") 2>&5

3015

ac_status=$?

3016

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3017

(exit $ac_status); }

3018

@@ -2810,47 +3474,77 @@

3019

# Try to create an executable without -o first, disregard a.out.

3020

# It will help us diagnose broken compilers, and finding out an intuition

3021

# of exeext.

3022

-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

3023

-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6

3024

+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

3025

+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }

3026

ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

3027

-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5

3028

- (eval $ac_link_default) 2>&5

3029

3030

+# List of possible output files, starting from the most likely.

3031

+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)

3032

+# only as a last resort. b.out is created by i960 compilers.

3033

+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'

3034

3035

+# The IRIX 6 linker writes into existing files which may not be

3036

+# executable, retaining their permissions. Remove them first so a

3037

+# subsequent execution test works.

3038

+ac_rmfiles=

3039

+for ac_file in $ac_files

3040

+do

3041

+ case $ac_file in

3042

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

3043

+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;

3044

+ esac

3045

+done

3046

+rm -f $ac_rmfiles

3047

3048

+if { (ac_try="$ac_link_default"

3049

+case "(($ac_try" in

3050

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3051

+ *) ac_try_echo=$ac_try;;

3052

+esac

3053

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3054

+ (eval "$ac_link_default") 2>&5

3055

ac_status=$?

3056

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3057

(exit $ac_status); }; then

3058

- # Find the output, starting from the most likely. This scheme is

3059

-# not robust to junk in `.', hence go to wildcards (a.*) only as a last

3060

-# resort.

3061

3062

-# Be careful to initialize this variable, since it used to be cached.

3063

-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.

3064

-ac_cv_exeext=

3065

-# b.out is created by i960 compilers.

3066

-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out

3067

+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.

3068

+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'

3069

+# in a Makefile. We should not override ac_cv_exeext if it was cached,

3070

+# so that the user can short-circuit this test for compilers unknown to

3071

+# Autoconf.

3072

+for ac_file in $ac_files ''

3073

3074

test -f "$ac_file" || continue

3075

case $ac_file in

3076

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )

3077

- ;;

3078

- conftest.$ac_ext )

3079

- # This is the source file.

3080

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )

3081

;;

3082

[ab].out )

3083

# We found the default executable, but exeext='' is most

3084

# certainly right.

3085

break;;

3086

*.* )

3087

- ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

3088

- # FIXME: I believe we export ac_cv_exeext for Libtool,

3089

- # but it would be cool to find out if it's true. Does anybody

3090

- # maintain Libtool? --akim.

3091

- export ac_cv_exeext

3092

+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;

3093

+ then :; else

3094

+ ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

3095

+ fi

3096

+ # We set ac_cv_exeext here because the later test for it is not

3097

+ # safe: cross compilers may not add the suffix if given an `-o'

3098

+ # argument, so we may need to know it at that point already.

3099

+ # Even if this section looks crufty: it has the advantage of

3100

+ # actually working.

3101

break;;

3102

* )

3103

break;;

3104

esac

3105

done

3106

+test "$ac_cv_exeext" = no && ac_cv_exeext=

3107

3108

else

3109

+ ac_file=''

3110

+fi

3111

3112

+{ echo "$as_me:$LINENO: result: $ac_file" >&5

3113

+echo "${ECHO_T}$ac_file" >&6; }

3114

+if test -z "$ac_file"; then

3115

echo "$as_me: failed program was:" >&5

3116

sed 's/^/| /' conftest.$ac_ext >&5

3117

3118

@@ -2862,19 +3556,21 @@

3119

3120

3121

ac_exeext=$ac_cv_exeext

3122

-echo "$as_me:$LINENO: result: $ac_file" >&5

3123

-echo "${ECHO_T}$ac_file" >&6

3124

3125

-# Check the compiler produces executables we can run. If not, either

3126

+# Check that the compiler produces executables we can run. If not, either

3127

# the compiler is broken, or we cross compile.

3128

-echo "$as_me:$LINENO: checking whether the C compiler works" >&5

3129

-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6

3130

+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5

3131

+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }

3132

# FIXME: These cross compiler hacks should be removed for Autoconf 3.0

3133

# If not cross compiling, check that we can run a simple program.

3134

if test "$cross_compiling" != yes; then

3135

if { ac_try='./$ac_file'

3136

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3137

- (eval $ac_try) 2>&5

3138

+ { (case "(($ac_try" in

3139

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3140

+ *) ac_try_echo=$ac_try;;

3141

+esac

3142

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3143

+ (eval "$ac_try") 2>&5

3144

ac_status=$?

3145

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3146

(exit $ac_status); }; }; then

3147

@@ -2893,22 +3589,27 @@

3148

3149

3150

3151

-echo "$as_me:$LINENO: result: yes" >&5

3152

-echo "${ECHO_T}yes" >&6

3153

+{ echo "$as_me:$LINENO: result: yes" >&5

3154

+echo "${ECHO_T}yes" >&6; }

3155

3156

rm -f a.out a.exe conftest$ac_cv_exeext b.out

3157

ac_clean_files=$ac_clean_files_save

3158

-# Check the compiler produces executables we can run. If not, either

3159

+# Check that the compiler produces executables we can run. If not, either

3160

# the compiler is broken, or we cross compile.

3161

-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

3162

-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6

3163

-echo "$as_me:$LINENO: result: $cross_compiling" >&5

3164

-echo "${ECHO_T}$cross_compiling" >&6

3165

3166

-echo "$as_me:$LINENO: checking for suffix of executables" >&5

3167

-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6

3168

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

3169

- (eval $ac_link) 2>&5

3170

+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

3171

+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }

3172

+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5

3173

+echo "${ECHO_T}$cross_compiling" >&6; }

3174

3175

+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5

3176

+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }

3177

+if { (ac_try="$ac_link"

3178

+case "(($ac_try" in

3179

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3180

+ *) ac_try_echo=$ac_try;;

3181

+esac

3182

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3183

+ (eval "$ac_link") 2>&5

3184

ac_status=$?

3185

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3186

(exit $ac_status); }; then

3187

@@ -2919,9 +3620,8 @@

3188

for ac_file in conftest.exe conftest conftest.*; do

3189

test -f "$ac_file" || continue

3190

case $ac_file in

3191

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;

3192

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

3193

*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

3194

- export ac_cv_exeext

3195

break;;

3196

* ) break;;

3197

esac

3198

@@ -2935,14 +3635,14 @@

3199

3200

3201

rm -f conftest$ac_cv_exeext

3202

-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5

3203

-echo "${ECHO_T}$ac_cv_exeext" >&6

3204

+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5

3205

+echo "${ECHO_T}$ac_cv_exeext" >&6; }

3206

3207

rm -f conftest.$ac_ext

3208

EXEEXT=$ac_cv_exeext

3209

ac_exeext=$EXEEXT

3210

-echo "$as_me:$LINENO: checking for suffix of object files" >&5

3211

-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6

3212

+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5

3213

+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }

3214

if test "${ac_cv_objext+set}" = set; then

3215

echo $ECHO_N "(cached) $ECHO_C" >&6

3216

else

3217

@@ -2962,14 +3662,20 @@

3218

}

3219

_ACEOF

3220

rm -f conftest.o conftest.obj

3221

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3222

- (eval $ac_compile) 2>&5

3223

+if { (ac_try="$ac_compile"

3224

+case "(($ac_try" in

3225

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3226

+ *) ac_try_echo=$ac_try;;

3227

+esac

3228

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3229

+ (eval "$ac_compile") 2>&5

3230

ac_status=$?

3231

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3232

(exit $ac_status); }; then

3233

- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do

3234

+ for ac_file in conftest.o conftest.obj conftest.*; do

3235

+ test -f "$ac_file" || continue;

3236

case $ac_file in

3237

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;

3238

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;

3239

*) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`

3240

break;;

3241

esac

3242

@@ -2987,12 +3693,12 @@

3243

3244

rm -f conftest.$ac_cv_objext conftest.$ac_ext

3245

3246

-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5

3247

-echo "${ECHO_T}$ac_cv_objext" >&6

3248

+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5

3249

+echo "${ECHO_T}$ac_cv_objext" >&6; }

3250

OBJEXT=$ac_cv_objext

3251

ac_objext=$OBJEXT

3252

-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

3253

-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6

3254

+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

3255

+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }

3256

if test "${ac_cv_c_compiler_gnu+set}" = set; then

3257

echo $ECHO_N "(cached) $ECHO_C" >&6

3258

else

3259

@@ -3015,50 +3721,49 @@

3260

}

3261

_ACEOF

3262

rm -f conftest.$ac_objext

3263

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3264

- (eval $ac_compile) 2>conftest.er1

3265

+if { (ac_try="$ac_compile"

3266

+case "(($ac_try" in

3267

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3268

+ *) ac_try_echo=$ac_try;;

3269

+esac

3270

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3271

+ (eval "$ac_compile") 2>conftest.er1

3272

ac_status=$?

3273

grep -v '^ *+' conftest.er1 >conftest.err

3274

rm -f conftest.er1

3275

cat conftest.err >&5

3276

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3277

- (exit $ac_status); } &&

3278

- { ac_try='test -z "$ac_c_werror_flag"

3279

- || test ! -s conftest.err'

3280

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3281

- (eval $ac_try) 2>&5

3282

- ac_status=$?

3283

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3284

- (exit $ac_status); }; } &&

3285

- { ac_try='test -s conftest.$ac_objext'

3286

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3287

- (eval $ac_try) 2>&5

3288

- ac_status=$?

3289

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3290

- (exit $ac_status); }; }; then

3291

+ (exit $ac_status); } && {

3292

+ test -z "$ac_c_werror_flag" ||

3293

+ test ! -s conftest.err

3294

+ } && test -s conftest.$ac_objext; then

3295

ac_compiler_gnu=yes

3296

else

3297

echo "$as_me: failed program was:" >&5

3298

sed 's/^/| /' conftest.$ac_ext >&5

3299

3300

-ac_compiler_gnu=no

3301

+ ac_compiler_gnu=no

3302

3303

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3304

3305

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3306

ac_cv_c_compiler_gnu=$ac_compiler_gnu

3307

3308

3309

-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

3310

-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6

3311

+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

3312

+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }

3313

GCC=`test $ac_compiler_gnu = yes && echo yes`

3314

ac_test_CFLAGS=${CFLAGS+set}

3315

ac_save_CFLAGS=$CFLAGS

3316

-CFLAGS="-g"

3317

-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

3318

-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6

3319

+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

3320

+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }

3321

if test "${ac_cv_prog_cc_g+set}" = set; then

3322

echo $ECHO_N "(cached) $ECHO_C" >&6

3323

else

3324

- cat >conftest.$ac_ext <<_ACEOF

3325

+ ac_save_c_werror_flag=$ac_c_werror_flag

3326

+ ac_c_werror_flag=yes

3327

+ ac_cv_prog_cc_g=no

3328

+ CFLAGS="-g"

3329

+ cat >conftest.$ac_ext <<_ACEOF

3330

/* confdefs.h. */

3331

_ACEOF

3332

cat confdefs.h >>conftest.$ac_ext

3333

@@ -3074,38 +3779,118 @@

3334

}

3335

_ACEOF

3336

rm -f conftest.$ac_objext

3337

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3338

- (eval $ac_compile) 2>conftest.er1

3339

+if { (ac_try="$ac_compile"

3340

+case "(($ac_try" in

3341

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3342

+ *) ac_try_echo=$ac_try;;

3343

+esac

3344

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3345

+ (eval "$ac_compile") 2>conftest.er1

3346

ac_status=$?

3347

grep -v '^ *+' conftest.er1 >conftest.err

3348

rm -f conftest.er1

3349

cat conftest.err >&5

3350

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3351

- (exit $ac_status); } &&

3352

- { ac_try='test -z "$ac_c_werror_flag"

3353

- || test ! -s conftest.err'

3354

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3355

- (eval $ac_try) 2>&5

3356

+ (exit $ac_status); } && {

3357

+ test -z "$ac_c_werror_flag" ||

3358

+ test ! -s conftest.err

3359

+ } && test -s conftest.$ac_objext; then

3360

+ ac_cv_prog_cc_g=yes

3361

+else

3362

+ echo "$as_me: failed program was:" >&5

3363

+sed 's/^/| /' conftest.$ac_ext >&5

3364

3365

+ CFLAGS=""

3366

+ cat >conftest.$ac_ext <<_ACEOF

3367

+/* confdefs.h. */

3368

+_ACEOF

3369

+cat confdefs.h >>conftest.$ac_ext

3370

+cat >>conftest.$ac_ext <<_ACEOF

3371

+/* end confdefs.h. */

3372

3373

+int

3374

+main ()

3375

3376

3377

+ ;

3378

+ return 0;

3379

3380

+_ACEOF

3381

+rm -f conftest.$ac_objext

3382

+if { (ac_try="$ac_compile"

3383

+case "(($ac_try" in

3384

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3385

+ *) ac_try_echo=$ac_try;;

3386

+esac

3387

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3388

+ (eval "$ac_compile") 2>conftest.er1

3389

ac_status=$?

3390

+ grep -v '^ *+' conftest.er1 >conftest.err

3391

+ rm -f conftest.er1

3392

+ cat conftest.err >&5

3393

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3394

- (exit $ac_status); }; } &&

3395

- { ac_try='test -s conftest.$ac_objext'

3396

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3397

- (eval $ac_try) 2>&5

3398

+ (exit $ac_status); } && {

3399

+ test -z "$ac_c_werror_flag" ||

3400

+ test ! -s conftest.err

3401

+ } && test -s conftest.$ac_objext; then

3402

+ :

3403

+else

3404

+ echo "$as_me: failed program was:" >&5

3405

+sed 's/^/| /' conftest.$ac_ext >&5

3406

3407

+ ac_c_werror_flag=$ac_save_c_werror_flag

3408

+ CFLAGS="-g"

3409

+ cat >conftest.$ac_ext <<_ACEOF

3410

+/* confdefs.h. */

3411

+_ACEOF

3412

+cat confdefs.h >>conftest.$ac_ext

3413

+cat >>conftest.$ac_ext <<_ACEOF

3414

+/* end confdefs.h. */

3415

3416

+int

3417

+main ()

3418

3419

3420

+ ;

3421

+ return 0;

3422

3423

+_ACEOF

3424

+rm -f conftest.$ac_objext

3425

+if { (ac_try="$ac_compile"

3426

+case "(($ac_try" in

3427

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3428

+ *) ac_try_echo=$ac_try;;

3429

+esac

3430

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3431

+ (eval "$ac_compile") 2>conftest.er1

3432

ac_status=$?

3433

+ grep -v '^ *+' conftest.er1 >conftest.err

3434

+ rm -f conftest.er1

3435

+ cat conftest.err >&5

3436

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3437

- (exit $ac_status); }; }; then

3438

+ (exit $ac_status); } && {

3439

+ test -z "$ac_c_werror_flag" ||

3440

+ test ! -s conftest.err

3441

+ } && test -s conftest.$ac_objext; then

3442

ac_cv_prog_cc_g=yes

3443

else

3444

echo "$as_me: failed program was:" >&5

3445

sed 's/^/| /' conftest.$ac_ext >&5

3446

3447

-ac_cv_prog_cc_g=no

3448

3449

+fi

3450

3451

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3452

3453

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3454

3455

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3456

+fi

3457

3458

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3459

+ ac_c_werror_flag=$ac_save_c_werror_flag

3460

3461

-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

3462

-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6

3463

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

3464

+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }

3465

if test "$ac_test_CFLAGS" = set; then

3466

CFLAGS=$ac_save_CFLAGS

3467

elif test $ac_cv_prog_cc_g = yes; then

3468

@@ -3121,12 +3906,12 @@

3469

CFLAGS=

3470

3471

3472

-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5

3473

-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6

3474

-if test "${ac_cv_prog_cc_stdc+set}" = set; then

3475

+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

3476

+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }

3477

+if test "${ac_cv_prog_cc_c89+set}" = set; then

3478

echo $ECHO_N "(cached) $ECHO_C" >&6

3479

else

3480

- ac_cv_prog_cc_stdc=no

3481

+ ac_cv_prog_cc_c89=no

3482

ac_save_CC=$CC

3483

cat >conftest.$ac_ext <<_ACEOF

3484

/* confdefs.h. */

3485

@@ -3160,12 +3945,17 @@

3486

/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has

3487

function prototypes and stuff, but not '\xHH' hex character constants.

3488

These don't provoke an error unfortunately, instead are silently treated

3489

- as 'x'. The following induces an error, until -std1 is added to get

3490

+ as 'x'. The following induces an error, until -std is added to get

3491

proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an

3492

array size at least. It's necessary to write '\x00'==0 to get something

3493

- that's true only with -std1. */

3494

+ that's true only with -std. */

3495

int osf4_cc_array ['\x00' == 0 ? 1 : -1];

3496

3497

+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters

3498

+ inside strings and character constants. */

3499

+#define FOO(x) 'x'

3500

+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];

3501

3502

int test (int i, double x);

3503

struct s1 {int (*f) (int a);};

3504

struct s2 {int (*f) (double a);};

3505

@@ -3180,205 +3970,57 @@

3506

return 0;

3507

}

3508

_ACEOF

3509

-# Don't try gcc -ansi; that turns off useful extensions and

3510

-# breaks some systems' header files.

3511

-# AIX -qlanglvl=ansi

3512

-# Ultrix and OSF/1 -std1

3513

-# HP-UX 10.20 and later -Ae

3514

-# HP-UX older versions -Aa -D_HPUX_SOURCE

3515

-# SVR4 -Xc -D__EXTENSIONS__

3516

-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

3517

+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \

3518

+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

3519

3520

CC="$ac_save_CC $ac_arg"

3521

rm -f conftest.$ac_objext

3522

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3523

- (eval $ac_compile) 2>conftest.er1

3524

+if { (ac_try="$ac_compile"

3525

+case "(($ac_try" in

3526

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3527

+ *) ac_try_echo=$ac_try;;

3528

+esac

3529

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3530

+ (eval "$ac_compile") 2>conftest.er1

3531

ac_status=$?

3532

grep -v '^ *+' conftest.er1 >conftest.err

3533

rm -f conftest.er1

3534

cat conftest.err >&5

3535

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3536

- (exit $ac_status); } &&

3537

- { ac_try='test -z "$ac_c_werror_flag"

3538

- || test ! -s conftest.err'

3539

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3540

- (eval $ac_try) 2>&5

3541

- ac_status=$?

3542

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3543

- (exit $ac_status); }; } &&

3544

- { ac_try='test -s conftest.$ac_objext'

3545

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3546

- (eval $ac_try) 2>&5

3547

- ac_status=$?

3548

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3549

- (exit $ac_status); }; }; then

3550

- ac_cv_prog_cc_stdc=$ac_arg

3551

-break

3552

+ (exit $ac_status); } && {

3553

+ test -z "$ac_c_werror_flag" ||

3554

+ test ! -s conftest.err

3555

+ } && test -s conftest.$ac_objext; then

3556

+ ac_cv_prog_cc_c89=$ac_arg

3557

else

3558

echo "$as_me: failed program was:" >&5

3559

sed 's/^/| /' conftest.$ac_ext >&5

3560

3561

3562

3563

-rm -f conftest.err conftest.$ac_objext

3564

3565

+rm -f core conftest.err conftest.$ac_objext

3566

+ test "x$ac_cv_prog_cc_c89" != "xno" && break

3567

done

3568

-rm -f conftest.$ac_ext conftest.$ac_objext

3569

+rm -f conftest.$ac_ext

3570

CC=$ac_save_CC

3571

3572

3573

3574

-case "x$ac_cv_prog_cc_stdc" in

3575

- x|xno)

3576

- echo "$as_me:$LINENO: result: none needed" >&5

3577

-echo "${ECHO_T}none needed" >&6 ;;

3578

+# AC_CACHE_VAL

3579

+case "x$ac_cv_prog_cc_c89" in

3580

+ x)

3581

+ { echo "$as_me:$LINENO: result: none needed" >&5

3582

+echo "${ECHO_T}none needed" >&6; } ;;

3583

+ xno)

3584

+ { echo "$as_me:$LINENO: result: unsupported" >&5

3585

+echo "${ECHO_T}unsupported" >&6; } ;;

3586

3587

- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5

3588

-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6

3589

- CC="$CC $ac_cv_prog_cc_stdc" ;;

3590

+ CC="$CC $ac_cv_prog_cc_c89"

3591

+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

3592

+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;

3593

esac

3594

3595

-# Some people use a C++ compiler to compile C. Since we use `exit',

3596

-# in C++ we need to declare it. In case someone uses the same compiler

3597

-# for both compiling C and C++ we need to have the C++ compiler decide

3598

-# the declaration of exit, since it's the most demanding environment.

3599

-cat >conftest.$ac_ext <<_ACEOF

3600

-#ifndef __cplusplus

3601

- choke me

3602

-#endif

3603

-_ACEOF

3604

-rm -f conftest.$ac_objext

3605

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3606

- (eval $ac_compile) 2>conftest.er1

3607

- ac_status=$?

3608

- grep -v '^ *+' conftest.er1 >conftest.err

3609

- rm -f conftest.er1

3610

- cat conftest.err >&5

3611

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3612

- (exit $ac_status); } &&

3613

- { ac_try='test -z "$ac_c_werror_flag"

3614

- || test ! -s conftest.err'

3615

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3616

- (eval $ac_try) 2>&5

3617

- ac_status=$?

3618

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3619

- (exit $ac_status); }; } &&

3620

- { ac_try='test -s conftest.$ac_objext'

3621

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3622

- (eval $ac_try) 2>&5

3623

- ac_status=$?

3624

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3625

- (exit $ac_status); }; }; then

3626

- for ac_declaration in \

3627

- '' \

3628

- 'extern "C" void std::exit (int) throw (); using std::exit;' \

3629

- 'extern "C" void std::exit (int); using std::exit;' \

3630

- 'extern "C" void exit (int) throw ();' \

3631

- 'extern "C" void exit (int);' \

3632

- 'void exit (int);'

3633

-do

3634

- cat >conftest.$ac_ext <<_ACEOF

3635

-/* confdefs.h. */

3636

-_ACEOF

3637

-cat confdefs.h >>conftest.$ac_ext

3638

-cat >>conftest.$ac_ext <<_ACEOF

3639

-/* end confdefs.h. */

3640

-$ac_declaration

3641

-#include <stdlib.h>

3642

-int

3643

-main ()

3644

3645

-exit (42);

3646

- ;

3647

- return 0;

3648

3649

-_ACEOF

3650

-rm -f conftest.$ac_objext

3651

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3652

- (eval $ac_compile) 2>conftest.er1

3653

- ac_status=$?

3654

- grep -v '^ *+' conftest.er1 >conftest.err

3655

- rm -f conftest.er1

3656

- cat conftest.err >&5

3657

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3658

- (exit $ac_status); } &&

3659

- { ac_try='test -z "$ac_c_werror_flag"

3660

- || test ! -s conftest.err'

3661

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3662

- (eval $ac_try) 2>&5

3663

- ac_status=$?

3664

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3665

- (exit $ac_status); }; } &&

3666

- { ac_try='test -s conftest.$ac_objext'

3667

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3668

- (eval $ac_try) 2>&5

3669

- ac_status=$?

3670

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3671

- (exit $ac_status); }; }; then

3672

- :

3673

-else

3674

- echo "$as_me: failed program was:" >&5

3675

-sed 's/^/| /' conftest.$ac_ext >&5

3676

3677

-continue

3678

-fi

3679

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3680

- cat >conftest.$ac_ext <<_ACEOF

3681

-/* confdefs.h. */

3682

-_ACEOF

3683

-cat confdefs.h >>conftest.$ac_ext

3684

-cat >>conftest.$ac_ext <<_ACEOF

3685

-/* end confdefs.h. */

3686

-$ac_declaration

3687

-int

3688

-main ()

3689

3690

-exit (42);

3691

- ;

3692

- return 0;

3693

3694

-_ACEOF

3695

-rm -f conftest.$ac_objext

3696

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3697

- (eval $ac_compile) 2>conftest.er1

3698

- ac_status=$?

3699

- grep -v '^ *+' conftest.er1 >conftest.err

3700

- rm -f conftest.er1

3701

- cat conftest.err >&5

3702

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3703

- (exit $ac_status); } &&

3704

- { ac_try='test -z "$ac_c_werror_flag"

3705

- || test ! -s conftest.err'

3706

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3707

- (eval $ac_try) 2>&5

3708

- ac_status=$?

3709

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3710

- (exit $ac_status); }; } &&

3711

- { ac_try='test -s conftest.$ac_objext'

3712

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3713

- (eval $ac_try) 2>&5

3714

- ac_status=$?

3715

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3716

- (exit $ac_status); }; }; then

3717

- break

3718

-else

3719

- echo "$as_me: failed program was:" >&5

3720

-sed 's/^/| /' conftest.$ac_ext >&5

3721

3722

-fi

3723

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3724

-done

3725

-rm -f conftest*

3726

-if test -n "$ac_declaration"; then

3727

- echo '#ifdef __cplusplus' >>confdefs.h

3728

- echo $ac_declaration >>confdefs.h

3729

- echo '#endif' >>confdefs.h

3730

-fi

3731

3732

-else

3733

- echo "$as_me: failed program was:" >&5

3734

-sed 's/^/| /' conftest.$ac_ext >&5

3735

3736

-fi

3737

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3738

ac_ext=c

3739

ac_cpp='$CPP $CPPFLAGS'

3740

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

3741

@@ -3387,8 +4029,8 @@

3742

3743

depcc="$CC" am_compiler_list=

3744

3745

-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

3746

-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6

3747

+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

3748

+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

3749

if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then

3750

echo $ECHO_N "(cached) $ECHO_C" >&6

3751

else

3752

@@ -3477,8 +4119,8 @@

3753

3754

3755

3756

-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

3757

-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6

3758

+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

3759

+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }

3760

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

3761

3762

3763

@@ -3495,13 +4137,12 @@

3764

3765

3766

3767

-echo "$as_me:$LINENO: checking for library containing strerror" >&5

3768

-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6

3769

+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5

3770

+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }

3771

if test "${ac_cv_search_strerror+set}" = set; then

3772

echo $ECHO_N "(cached) $ECHO_C" >&6

3773

else

3774

ac_func_search_save_LIBS=$LIBS

3775

-ac_cv_search_strerror=no

3776

cat >conftest.$ac_ext <<_ACEOF

3777

/* confdefs.h. */

3778

_ACEOF

3779

@@ -3509,115 +4150,73 @@

3780

cat >>conftest.$ac_ext <<_ACEOF

3781

/* end confdefs.h. */

3782

3783

-/* Override any gcc2 internal prototype to avoid an error. */

3784

+/* Override any GCC internal prototype to avoid an error.

3785

+ Use char because int might match the return type of a GCC

3786

+ builtin and then its argument prototype would still apply. */

3787

#ifdef __cplusplus

3788

extern "C"

3789

#endif

3790

-/* We use char because int might match the return type of a gcc2

3791

- builtin and then its argument prototype would still apply. */

3792

char strerror ();

3793

int

3794

main ()

3795

{

3796

-strerror ();

3797

+return strerror ();

3798

;

3799

return 0;

3800

}

3801

_ACEOF

3802

-rm -f conftest.$ac_objext conftest$ac_exeext

3803

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

3804

- (eval $ac_link) 2>conftest.er1

3805

+for ac_lib in '' cposix; do

3806

+ if test -z "$ac_lib"; then

3807

+ ac_res="none required"

3808

+ else

3809

+ ac_res=-l$ac_lib

3810

+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"

3811

+ fi

3812

+ rm -f conftest.$ac_objext conftest$ac_exeext

3813

+if { (ac_try="$ac_link"

3814

+case "(($ac_try" in

3815

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3816

+ *) ac_try_echo=$ac_try;;

3817

+esac

3818

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3819

+ (eval "$ac_link") 2>conftest.er1

3820

ac_status=$?

3821

grep -v '^ *+' conftest.er1 >conftest.err

3822

rm -f conftest.er1

3823

cat conftest.err >&5

3824

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3825

- (exit $ac_status); } &&

3826

- { ac_try='test -z "$ac_c_werror_flag"

3827

- || test ! -s conftest.err'

3828

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3829

- (eval $ac_try) 2>&5

3830

- ac_status=$?

3831

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3832

- (exit $ac_status); }; } &&

3833

- { ac_try='test -s conftest$ac_exeext'

3834

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3835

- (eval $ac_try) 2>&5

3836

- ac_status=$?

3837

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3838

- (exit $ac_status); }; }; then

3839

- ac_cv_search_strerror="none required"

3840

+ (exit $ac_status); } && {

3841

+ test -z "$ac_c_werror_flag" ||

3842

+ test ! -s conftest.err

3843

+ } && test -s conftest$ac_exeext &&

3844

+ $as_test_x conftest$ac_exeext; then

3845

+ ac_cv_search_strerror=$ac_res

3846

else

3847

echo "$as_me: failed program was:" >&5

3848

sed 's/^/| /' conftest.$ac_ext >&5

3849

3850

-fi

3851

-rm -f conftest.err conftest.$ac_objext \

3852

- conftest$ac_exeext conftest.$ac_ext

3853

-if test "$ac_cv_search_strerror" = no; then

3854

- for ac_lib in cposix; do

3855

- LIBS="-l$ac_lib $ac_func_search_save_LIBS"

3856

- cat >conftest.$ac_ext <<_ACEOF

3857

-/* confdefs.h. */

3858

-_ACEOF

3859

-cat confdefs.h >>conftest.$ac_ext

3860

-cat >>conftest.$ac_ext <<_ACEOF

3861

-/* end confdefs.h. */

3862

3863

-/* Override any gcc2 internal prototype to avoid an error. */

3864

-#ifdef __cplusplus

3865

-extern "C"

3866

-#endif

3867

-/* We use char because int might match the return type of a gcc2

3868

- builtin and then its argument prototype would still apply. */

3869

-char strerror ();

3870

-int

3871

-main ()

3872

3873

-strerror ();

3874

- ;

3875

- return 0;

3876

3877

-_ACEOF

3878

-rm -f conftest.$ac_objext conftest$ac_exeext

3879

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

3880

- (eval $ac_link) 2>conftest.er1

3881

- ac_status=$?

3882

- grep -v '^ *+' conftest.er1 >conftest.err

3883

- rm -f conftest.er1

3884

- cat conftest.err >&5

3885

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3886

- (exit $ac_status); } &&

3887

- { ac_try='test -z "$ac_c_werror_flag"

3888

- || test ! -s conftest.err'

3889

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3890

- (eval $ac_try) 2>&5

3891

- ac_status=$?

3892

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3893

- (exit $ac_status); }; } &&

3894

- { ac_try='test -s conftest$ac_exeext'

3895

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3896

- (eval $ac_try) 2>&5

3897

- ac_status=$?

3898

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3899

- (exit $ac_status); }; }; then

3900

- ac_cv_search_strerror="-l$ac_lib"

3901

-break

3902

-else

3903

- echo "$as_me: failed program was:" >&5

3904

-sed 's/^/| /' conftest.$ac_ext >&5

3905

+fi

3906

3907

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

3908

+ conftest$ac_exeext

3909

+ if test "${ac_cv_search_strerror+set}" = set; then

3910

+ break

3911

3912

-rm -f conftest.err conftest.$ac_objext \

3913

- conftest$ac_exeext conftest.$ac_ext

3914

- done

3915

+done

3916

+if test "${ac_cv_search_strerror+set}" = set; then

3917

+ :

3918

+else

3919

+ ac_cv_search_strerror=no

3920

3921

+rm conftest.$ac_ext

3922

LIBS=$ac_func_search_save_LIBS

3923

3924

-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5

3925

-echo "${ECHO_T}$ac_cv_search_strerror" >&6

3926

-if test "$ac_cv_search_strerror" != no; then

3927

- test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"

3928

+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5

3929

+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }

3930

+ac_res=$ac_cv_search_strerror

3931

+if test "$ac_res" != no; then

3932

+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

3933

3934

3935

3936

@@ -3625,8 +4224,8 @@

3937

3938

# Extract the first word of "$ac_prog", so it can be a program name with args.

3939

set dummy $ac_prog; ac_word=$2

3940

-echo "$as_me:$LINENO: checking for $ac_word" >&5

3941

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

3942

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

3943

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

3944

if test "${ac_cv_prog_LEX+set}" = set; then

3945

echo $ECHO_N "(cached) $ECHO_C" >&6

3946

else

3947

@@ -3639,253 +4238,182 @@

3948

IFS=$as_save_IFS

3949

test -z "$as_dir" && as_dir=.

3950

for ac_exec_ext in '' $ac_executable_extensions; do

3951

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

3952

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

3953

ac_cv_prog_LEX="$ac_prog"

3954

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

3955

break 2

3956

3957

done

3958

done

3959

+IFS=$as_save_IFS

3960

3961

3962

3963

LEX=$ac_cv_prog_LEX

3964

if test -n "$LEX"; then

3965

- echo "$as_me:$LINENO: result: $LEX" >&5

3966

-echo "${ECHO_T}$LEX" >&6

3967

+ { echo "$as_me:$LINENO: result: $LEX" >&5

3968

+echo "${ECHO_T}$LEX" >&6; }

3969

else

3970

- echo "$as_me:$LINENO: result: no" >&5

3971

-echo "${ECHO_T}no" >&6

3972

+ { echo "$as_me:$LINENO: result: no" >&5

3973

+echo "${ECHO_T}no" >&6; }

3974

3975

3976

3977

test -n "$LEX" && break

3978

done

3979

test -n "$LEX" || LEX=":"

3980

3981

-if test -z "$LEXLIB"

3982

-then

3983

- echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5

3984

-echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6

3985

-if test "${ac_cv_lib_fl_yywrap+set}" = set; then

3986

- echo $ECHO_N "(cached) $ECHO_C" >&6

3987

-else

3988

- ac_check_lib_save_LIBS=$LIBS

3989

-LIBS="-lfl $LIBS"

3990

-cat >conftest.$ac_ext <<_ACEOF

3991

-/* confdefs.h. */

3992

-_ACEOF

3993

-cat confdefs.h >>conftest.$ac_ext

3994

-cat >>conftest.$ac_ext <<_ACEOF

3995

-/* end confdefs.h. */

3996

3997

-/* Override any gcc2 internal prototype to avoid an error. */

3998

-#ifdef __cplusplus

3999

-extern "C"

4000

+if test "x$LEX" != "x:"; then

4001

+ cat >conftest.l <<_ACEOF

4002

+%%

4003

+a { ECHO; }

4004

+b { REJECT; }

4005

+c { yymore (); }

4006

+d { yyless (1); }

4007

+e { yyless (input () != 0); }

4008

+f { unput (yytext[0]); }

4009

+. { BEGIN INITIAL; }

4010

+%%

4011

+#ifdef YYTEXT_POINTER

4012

+extern char *yytext;

4013

#endif

4014

-/* We use char because int might match the return type of a gcc2

4015

- builtin and then its argument prototype would still apply. */

4016

-char yywrap ();

4017

int

4018

-main ()

4019

+main (void)

4020

{

4021

-yywrap ();

4022

- ;

4023

- return 0;

4024

+ return ! yylex () + ! yywrap ();

4025

}

4026

_ACEOF

4027

-rm -f conftest.$ac_objext conftest$ac_exeext

4028

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

4029

- (eval $ac_link) 2>conftest.er1

4030

- ac_status=$?

4031

- grep -v '^ *+' conftest.er1 >conftest.err

4032

- rm -f conftest.er1

4033

- cat conftest.err >&5

4034

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4035

- (exit $ac_status); } &&

4036

- { ac_try='test -z "$ac_c_werror_flag"

4037

- || test ! -s conftest.err'

4038

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4039

- (eval $ac_try) 2>&5

4040

- ac_status=$?

4041

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4042

- (exit $ac_status); }; } &&

4043

- { ac_try='test -s conftest$ac_exeext'

4044

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4045

- (eval $ac_try) 2>&5

4046

+{ (ac_try="$LEX conftest.l"

4047

+case "(($ac_try" in

4048

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4049

+ *) ac_try_echo=$ac_try;;

4050

+esac

4051

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4052

+ (eval "$LEX conftest.l") 2>&5

4053

ac_status=$?

4054

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4055

- (exit $ac_status); }; }; then

4056

- ac_cv_lib_fl_yywrap=yes

4057

+ (exit $ac_status); }

4058

+{ echo "$as_me:$LINENO: checking lex output file root" >&5

4059

+echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }

4060

+if test "${ac_cv_prog_lex_root+set}" = set; then

4061

+ echo $ECHO_N "(cached) $ECHO_C" >&6

4062

else

4063

- echo "$as_me: failed program was:" >&5

4064

-sed 's/^/| /' conftest.$ac_ext >&5

4065

4066

-ac_cv_lib_fl_yywrap=no

4067

+if test -f lex.yy.c; then

4068

+ ac_cv_prog_lex_root=lex.yy

4069

+elif test -f lexyy.c; then

4070

+ ac_cv_prog_lex_root=lexyy

4071

+else

4072

+ { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5

4073

+echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}

4074

+ { (exit 1); exit 1; }; }

4075

4076

-rm -f conftest.err conftest.$ac_objext \

4077

- conftest$ac_exeext conftest.$ac_ext

4078

-LIBS=$ac_check_lib_save_LIBS

4079

4080

-echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5

4081

-echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6

4082

-if test $ac_cv_lib_fl_yywrap = yes; then

4083

- LEXLIB="-lfl"

4084

-else

4085

- echo "$as_me:$LINENO: checking for yywrap in -ll" >&5

4086

-echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6

4087

-if test "${ac_cv_lib_l_yywrap+set}" = set; then

4088

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5

4089

+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }

4090

+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root

4091

4092

+if test -z "${LEXLIB+set}"; then

4093

+ { echo "$as_me:$LINENO: checking lex library" >&5

4094

+echo $ECHO_N "checking lex library... $ECHO_C" >&6; }

4095

+if test "${ac_cv_lib_lex+set}" = set; then

4096

echo $ECHO_N "(cached) $ECHO_C" >&6

4097

else

4098

- ac_check_lib_save_LIBS=$LIBS

4099

-LIBS="-ll $LIBS"

4100

-cat >conftest.$ac_ext <<_ACEOF

4101

-/* confdefs.h. */

4102

-_ACEOF

4103

-cat confdefs.h >>conftest.$ac_ext

4104

-cat >>conftest.$ac_ext <<_ACEOF

4105

-/* end confdefs.h. */

4106

4107

-/* Override any gcc2 internal prototype to avoid an error. */

4108

-#ifdef __cplusplus

4109

-extern "C"

4110

-#endif

4111

-/* We use char because int might match the return type of a gcc2

4112

- builtin and then its argument prototype would still apply. */

4113

-char yywrap ();

4114

-int

4115

-main ()

4116

4117

-yywrap ();

4118

- ;

4119

- return 0;

4120

4121

+ ac_save_LIBS=$LIBS

4122

+ ac_cv_lib_lex='none needed'

4123

+ for ac_lib in '' -lfl -ll; do

4124

+ LIBS="$ac_lib $ac_save_LIBS"

4125

+ cat >conftest.$ac_ext <<_ACEOF

4126

+`cat $LEX_OUTPUT_ROOT.c`

4127

_ACEOF

4128

rm -f conftest.$ac_objext conftest$ac_exeext

4129

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

4130

- (eval $ac_link) 2>conftest.er1

4131

+if { (ac_try="$ac_link"

4132

+case "(($ac_try" in

4133

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4134

+ *) ac_try_echo=$ac_try;;

4135

+esac

4136

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4137

+ (eval "$ac_link") 2>conftest.er1

4138

ac_status=$?

4139

grep -v '^ *+' conftest.er1 >conftest.err

4140

rm -f conftest.er1

4141

cat conftest.err >&5

4142

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4143

- (exit $ac_status); } &&

4144

- { ac_try='test -z "$ac_c_werror_flag"

4145

- || test ! -s conftest.err'

4146

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4147

- (eval $ac_try) 2>&5

4148

- ac_status=$?

4149

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4150

- (exit $ac_status); }; } &&

4151

- { ac_try='test -s conftest$ac_exeext'

4152

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4153

- (eval $ac_try) 2>&5

4154

- ac_status=$?

4155

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4156

- (exit $ac_status); }; }; then

4157

- ac_cv_lib_l_yywrap=yes

4158

+ (exit $ac_status); } && {

4159

+ test -z "$ac_c_werror_flag" ||

4160

+ test ! -s conftest.err

4161

+ } && test -s conftest$ac_exeext &&

4162

+ $as_test_x conftest$ac_exeext; then

4163

+ ac_cv_lib_lex=$ac_lib

4164

else

4165

echo "$as_me: failed program was:" >&5

4166

sed 's/^/| /' conftest.$ac_ext >&5

4167

4168

-ac_cv_lib_l_yywrap=no

4169

-fi

4170

-rm -f conftest.err conftest.$ac_objext \

4171

- conftest$ac_exeext conftest.$ac_ext

4172

-LIBS=$ac_check_lib_save_LIBS

4173

-fi

4174

-echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5

4175

-echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6

4176

-if test $ac_cv_lib_l_yywrap = yes; then

4177

- LEXLIB="-ll"

4178

-fi

4179

4180

4181

4182

-fi

4183

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4184

+ conftest$ac_exeext conftest.$ac_ext

4185

+ test "$ac_cv_lib_lex" != 'none needed' && break

4186

+ done

4187

+ LIBS=$ac_save_LIBS

4188

4189

-if test "x$LEX" != "x:"; then

4190

- echo "$as_me:$LINENO: checking lex output file root" >&5

4191

-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6

4192

-if test "${ac_cv_prog_lex_root+set}" = set; then

4193

- echo $ECHO_N "(cached) $ECHO_C" >&6

4194

-else

4195

- # The minimal lex program is just a single line: %%. But some broken lexes

4196

-# (Solaris, I think it was) want two %% lines, so accommodate them.

4197

-cat >conftest.l <<_ACEOF

4198

-%%

4199

-%%

4200

-_ACEOF

4201

-{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5

4202

- (eval $LEX conftest.l) 2>&5

4203

- ac_status=$?

4204

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4205

- (exit $ac_status); }

4206

-if test -f lex.yy.c; then

4207

- ac_cv_prog_lex_root=lex.yy

4208

-elif test -f lexyy.c; then

4209

- ac_cv_prog_lex_root=lexyy

4210

-else

4211

- { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5

4212

-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}

4213

- { (exit 1); exit 1; }; }

4214

4215

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5

4216

+echo "${ECHO_T}$ac_cv_lib_lex" >&6; }

4217

+ test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex

4218

4219

-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5

4220

-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6

4221

-rm -f conftest.l

4222

-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root

4223

4224

-echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5

4225

-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6

4226

4227

+{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5

4228

+echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }

4229

if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then

4230

echo $ECHO_N "(cached) $ECHO_C" >&6

4231

else

4232

# POSIX says lex can declare yytext either as a pointer or an array; the

4233

-# default is implementation-dependent. Figure out which it is, since

4234

+# default is implementation-dependent. Figure out which it is, since

4235

# not all implementations provide the %pointer and %array declarations.

4236

ac_cv_prog_lex_yytext_pointer=no

4237

-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c

4238

ac_save_LIBS=$LIBS

4239

-LIBS="$LIBS $LEXLIB"

4240

+LIBS="$LEXLIB $ac_save_LIBS"

4241

cat >conftest.$ac_ext <<_ACEOF

4242

+#define YYTEXT_POINTER 1

4243

`cat $LEX_OUTPUT_ROOT.c`

4244

_ACEOF

4245

rm -f conftest.$ac_objext conftest$ac_exeext

4246

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

4247

- (eval $ac_link) 2>conftest.er1

4248

+if { (ac_try="$ac_link"

4249

+case "(($ac_try" in

4250

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4251

+ *) ac_try_echo=$ac_try;;

4252

+esac

4253

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4254

+ (eval "$ac_link") 2>conftest.er1

4255

ac_status=$?

4256

grep -v '^ *+' conftest.er1 >conftest.err

4257

rm -f conftest.er1

4258

cat conftest.err >&5

4259

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4260

- (exit $ac_status); } &&

4261

- { ac_try='test -z "$ac_c_werror_flag"

4262

- || test ! -s conftest.err'

4263

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4264

- (eval $ac_try) 2>&5

4265

- ac_status=$?

4266

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4267

- (exit $ac_status); }; } &&

4268

- { ac_try='test -s conftest$ac_exeext'

4269

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4270

- (eval $ac_try) 2>&5

4271

- ac_status=$?

4272

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

4273

- (exit $ac_status); }; }; then

4274

+ (exit $ac_status); } && {

4275

+ test -z "$ac_c_werror_flag" ||

4276

+ test ! -s conftest.err

4277

+ } && test -s conftest$ac_exeext &&

4278

+ $as_test_x conftest$ac_exeext; then

4279

ac_cv_prog_lex_yytext_pointer=yes

4280

else

4281

echo "$as_me: failed program was:" >&5

4282

sed 's/^/| /' conftest.$ac_ext >&5

4283

4284

4285

4286

-rm -f conftest.err conftest.$ac_objext \

4287

4288

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4289

conftest$ac_exeext conftest.$ac_ext

4290

LIBS=$ac_save_LIBS

4291

-rm -f "${LEX_OUTPUT_ROOT}.c"

4292

4293

4294

-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5

4295

-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6

4296

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5

4297

+echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }

4298

if test $ac_cv_prog_lex_yytext_pointer = yes; then

4299

4300

cat >>confdefs.h <<\_ACEOF

4301

@@ -3893,6 +4421,7 @@

4302

_ACEOF

4303

4304

4305

+rm -f conftest.l $LEX_OUTPUT_ROOT.c

4306

4307

4308

if test "$LEX" = :; then

4309

@@ -3902,8 +4431,8 @@

4310

4311

# Extract the first word of "$ac_prog", so it can be a program name with args.

4312

set dummy $ac_prog; ac_word=$2

4313

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4314

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4315

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4316

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4317

if test "${ac_cv_prog_YACC+set}" = set; then

4318

echo $ECHO_N "(cached) $ECHO_C" >&6

4319

else

4320

@@ -3916,25 +4445,27 @@

4321

IFS=$as_save_IFS

4322

test -z "$as_dir" && as_dir=.

4323

for ac_exec_ext in '' $ac_executable_extensions; do

4324

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4325

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4326

ac_cv_prog_YACC="$ac_prog"

4327

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4328

break 2

4329

4330

done

4331

done

4332

+IFS=$as_save_IFS

4333

4334

4335

4336

YACC=$ac_cv_prog_YACC

4337

if test -n "$YACC"; then

4338

- echo "$as_me:$LINENO: result: $YACC" >&5

4339

-echo "${ECHO_T}$YACC" >&6

4340

+ { echo "$as_me:$LINENO: result: $YACC" >&5

4341

+echo "${ECHO_T}$YACC" >&6; }

4342

else

4343

- echo "$as_me:$LINENO: result: no" >&5

4344

-echo "${ECHO_T}no" >&6

4345

+ { echo "$as_me:$LINENO: result: no" >&5

4346

+echo "${ECHO_T}no" >&6; }

4347

4348

4349

4350

test -n "$YACC" && break

4351

done

4352

test -n "$YACC" || YACC="yacc"

4353

@@ -3943,8 +4474,8 @@

4354

4355

# Extract the first word of "$ac_prog", so it can be a program name with args.

4356

set dummy $ac_prog; ac_word=$2

4357

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4358

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4359

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4360

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4361

if test "${ac_cv_prog_AWK+set}" = set; then

4362

echo $ECHO_N "(cached) $ECHO_C" >&6

4363

else

4364

@@ -3957,25 +4488,27 @@

4365

IFS=$as_save_IFS

4366

test -z "$as_dir" && as_dir=.

4367

for ac_exec_ext in '' $ac_executable_extensions; do

4368

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4369

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4370

ac_cv_prog_AWK="$ac_prog"

4371

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4372

break 2

4373

4374

done

4375

done

4376

+IFS=$as_save_IFS

4377

4378

4379

4380

AWK=$ac_cv_prog_AWK

4381

if test -n "$AWK"; then

4382

- echo "$as_me:$LINENO: result: $AWK" >&5

4383

-echo "${ECHO_T}$AWK" >&6

4384

+ { echo "$as_me:$LINENO: result: $AWK" >&5

4385

+echo "${ECHO_T}$AWK" >&6; }

4386

else

4387

- echo "$as_me:$LINENO: result: no" >&5

4388

-echo "${ECHO_T}no" >&6

4389

+ { echo "$as_me:$LINENO: result: no" >&5

4390

+echo "${ECHO_T}no" >&6; }

4391

4392

4393

4394

test -n "$AWK" && break

4395

done

4396

4397

@@ -3992,8 +4525,8 @@

4398

# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"

4399

# OS/2's system install, which has a completely different semantic

4400

# ./install, which can be erroneously created by make from ./install.sh.

4401

-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5

4402

-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6

4403

+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5

4404

+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }

4405

if test -z "$INSTALL"; then

4406

if test "${ac_cv_path_install+set}" = set; then

4407

echo $ECHO_N "(cached) $ECHO_C" >&6

4408

@@ -4015,7 +4548,7 @@

4409

# by default.

4410

for ac_prog in ginstall scoinst install; do

4411

for ac_exec_ext in '' $ac_executable_extensions; do

4412

- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then

4413

+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then

4414

if test $ac_prog = install &&

4415

grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then

4416

# AIX install. It has an incompatible calling convention.

4417

@@ -4034,21 +4567,22 @@

4418

;;

4419

esac

4420

done

4421

+IFS=$as_save_IFS

4422

4423

4424

4425

if test "${ac_cv_path_install+set}" = set; then

4426

INSTALL=$ac_cv_path_install

4427

else

4428

- # As a last resort, use the slow shell script. We don't cache a

4429

- # path for INSTALL within a source directory, because that will

4430

+ # As a last resort, use the slow shell script. Don't cache a

4431

+ # value for INSTALL within a source directory, because that will

4432

# break other packages using the cache if that directory is

4433

- # removed, or if the path is relative.

4434

+ # removed, or if the value is a relative name.

4435

INSTALL=$ac_install_sh

4436

4437

4438

-echo "$as_me:$LINENO: result: $INSTALL" >&5

4439

-echo "${ECHO_T}$INSTALL" >&6

4440

+{ echo "$as_me:$LINENO: result: $INSTALL" >&5

4441

+echo "${ECHO_T}$INSTALL" >&6; }

4442

4443

# Use test -z because SunOS4 sh mishandles braces in ${var-val}.

4444

# It thinks the first close brace ends the variable substitution.

4445

@@ -4058,21 +4592,21 @@

4446

4447

test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

4448

4449

-echo "$as_me:$LINENO: checking whether ln -s works" >&5

4450

-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6

4451

+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5

4452

+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }

4453

LN_S=$as_ln_s

4454

if test "$LN_S" = "ln -s"; then

4455

- echo "$as_me:$LINENO: result: yes" >&5

4456

-echo "${ECHO_T}yes" >&6

4457

+ { echo "$as_me:$LINENO: result: yes" >&5

4458

+echo "${ECHO_T}yes" >&6; }

4459

else

4460

- echo "$as_me:$LINENO: result: no, using $LN_S" >&5

4461

-echo "${ECHO_T}no, using $LN_S" >&6

4462

+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5

4463

+echo "${ECHO_T}no, using $LN_S" >&6; }

4464

4465

4466

# Extract the first word of "sed", so it can be a program name with args.

4467

set dummy sed; ac_word=$2

4468

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4469

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4470

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4471

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4472

if test "${ac_cv_prog_SED+set}" = set; then

4473

echo $ECHO_N "(cached) $ECHO_C" >&6

4474

else

4475

@@ -4085,30 +4619,32 @@

4476

IFS=$as_save_IFS

4477

test -z "$as_dir" && as_dir=.

4478

for ac_exec_ext in '' $ac_executable_extensions; do

4479

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4480

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4481

ac_cv_prog_SED="sed"

4482

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4483

break 2

4484

4485

done

4486

done

4487

+IFS=$as_save_IFS

4488

4489

test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false"

4490

4491

4492

SED=$ac_cv_prog_SED

4493

if test -n "$SED"; then

4494

- echo "$as_me:$LINENO: result: $SED" >&5

4495

-echo "${ECHO_T}$SED" >&6

4496

+ { echo "$as_me:$LINENO: result: $SED" >&5

4497

+echo "${ECHO_T}$SED" >&6; }

4498

else

4499

- echo "$as_me:$LINENO: result: no" >&5

4500

-echo "${ECHO_T}no" >&6

4501

+ { echo "$as_me:$LINENO: result: no" >&5

4502

+echo "${ECHO_T}no" >&6; }

4503

4504

4505

4506

# Extract the first word of "grep", so it can be a program name with args.

4507

set dummy grep; ac_word=$2

4508

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4509

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4510

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4511

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4512

if test "${ac_cv_prog_GREP+set}" = set; then

4513

echo $ECHO_N "(cached) $ECHO_C" >&6

4514

else

4515

@@ -4121,30 +4657,32 @@

4516

IFS=$as_save_IFS

4517

test -z "$as_dir" && as_dir=.

4518

for ac_exec_ext in '' $ac_executable_extensions; do

4519

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4520

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4521

ac_cv_prog_GREP="grep"

4522

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4523

break 2

4524

4525

done

4526

done

4527

+IFS=$as_save_IFS

4528

4529

test -z "$ac_cv_prog_GREP" && ac_cv_prog_GREP="false"

4530

4531

4532

GREP=$ac_cv_prog_GREP

4533

if test -n "$GREP"; then

4534

- echo "$as_me:$LINENO: result: $GREP" >&5

4535

-echo "${ECHO_T}$GREP" >&6

4536

+ { echo "$as_me:$LINENO: result: $GREP" >&5

4537

+echo "${ECHO_T}$GREP" >&6; }

4538

else

4539

- echo "$as_me:$LINENO: result: no" >&5

4540

-echo "${ECHO_T}no" >&6

4541

+ { echo "$as_me:$LINENO: result: no" >&5

4542

+echo "${ECHO_T}no" >&6; }

4543

4544

4545

4546

# Extract the first word of "sort", so it can be a program name with args.

4547

set dummy sort; ac_word=$2

4548

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4549

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4550

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4551

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4552

if test "${ac_cv_prog_SORT+set}" = set; then

4553

echo $ECHO_N "(cached) $ECHO_C" >&6

4554

else

4555

@@ -4157,27 +4695,29 @@

4556

IFS=$as_save_IFS

4557

test -z "$as_dir" && as_dir=.

4558

for ac_exec_ext in '' $ac_executable_extensions; do

4559

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4560

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4561

ac_cv_prog_SORT="sort"

4562

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4563

break 2

4564

4565

done

4566

done

4567

+IFS=$as_save_IFS

4568

4569

test -z "$ac_cv_prog_SORT" && ac_cv_prog_SORT="false"

4570

4571

4572

SORT=$ac_cv_prog_SORT

4573

if test -n "$SORT"; then

4574

- echo "$as_me:$LINENO: result: $SORT" >&5

4575

-echo "${ECHO_T}$SORT" >&6

4576

+ { echo "$as_me:$LINENO: result: $SORT" >&5

4577

+echo "${ECHO_T}$SORT" >&6; }

4578

else

4579

- echo "$as_me:$LINENO: result: no" >&5

4580

-echo "${ECHO_T}no" >&6

4581

+ { echo "$as_me:$LINENO: result: no" >&5

4582

+echo "${ECHO_T}no" >&6; }

4583

4584

4585

4586

4587

# are we building for windows?

4588

# (these tests must follow AC_ISC_POSIX)

4589

#AC_CYGWIN

4590

@@ -4192,8 +4732,8 @@

4591

if test -n "$ac_tool_prefix"; then

4592

# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

4593

set dummy ${ac_tool_prefix}gcc; ac_word=$2

4594

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4595

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4596

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4597

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4598

if test "${ac_cv_prog_CC+set}" = set; then

4599

echo $ECHO_N "(cached) $ECHO_C" >&6

4600

else

4601

@@ -4206,32 +4746,34 @@

4602

IFS=$as_save_IFS

4603

test -z "$as_dir" && as_dir=.

4604

for ac_exec_ext in '' $ac_executable_extensions; do

4605

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4606

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4607

ac_cv_prog_CC="${ac_tool_prefix}gcc"

4608

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4609

break 2

4610

4611

done

4612

done

4613

+IFS=$as_save_IFS

4614

4615

4616

4617

CC=$ac_cv_prog_CC

4618

if test -n "$CC"; then

4619

- echo "$as_me:$LINENO: result: $CC" >&5

4620

-echo "${ECHO_T}$CC" >&6

4621

+ { echo "$as_me:$LINENO: result: $CC" >&5

4622

+echo "${ECHO_T}$CC" >&6; }

4623

else

4624

- echo "$as_me:$LINENO: result: no" >&5

4625

-echo "${ECHO_T}no" >&6

4626

+ { echo "$as_me:$LINENO: result: no" >&5

4627

+echo "${ECHO_T}no" >&6; }

4628

4629

4630

4631

4632

if test -z "$ac_cv_prog_CC"; then

4633

ac_ct_CC=$CC

4634

# Extract the first word of "gcc", so it can be a program name with args.

4635

set dummy gcc; ac_word=$2

4636

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4637

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4638

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4639

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4640

if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

4641

echo $ECHO_N "(cached) $ECHO_C" >&6

4642

else

4643

@@ -4244,36 +4786,51 @@

4644

IFS=$as_save_IFS

4645

test -z "$as_dir" && as_dir=.

4646

for ac_exec_ext in '' $ac_executable_extensions; do

4647

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4648

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4649

ac_cv_prog_ac_ct_CC="gcc"

4650

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4651

break 2

4652

4653

done

4654

done

4655

+IFS=$as_save_IFS

4656

4657

4658

4659

ac_ct_CC=$ac_cv_prog_ac_ct_CC

4660

if test -n "$ac_ct_CC"; then

4661

- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

4662

-echo "${ECHO_T}$ac_ct_CC" >&6

4663

+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

4664

+echo "${ECHO_T}$ac_ct_CC" >&6; }

4665

else

4666

- echo "$as_me:$LINENO: result: no" >&5

4667

-echo "${ECHO_T}no" >&6

4668

+ { echo "$as_me:$LINENO: result: no" >&5

4669

+echo "${ECHO_T}no" >&6; }

4670

4671

4672

- CC=$ac_ct_CC

4673

+ if test "x$ac_ct_CC" = x; then

4674

+ CC=""

4675

+ else

4676

+ case $cross_compiling:$ac_tool_warned in

4677

+yes:)

4678

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

4679

+whose name does not start with the host triplet. If you think this

4680

+configuration is useful to you, please write to autoconf@gnu.org." >&5

4681

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

4682

+whose name does not start with the host triplet. If you think this

4683

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

4684

+ac_tool_warned=yes ;;

4685

+esac

4686

+ CC=$ac_ct_CC

4687

+ fi

4688

else

4689

CC="$ac_cv_prog_CC"

4690

4691

4692

if test -z "$CC"; then

4693

- if test -n "$ac_tool_prefix"; then

4694

- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

4695

+ if test -n "$ac_tool_prefix"; then

4696

+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

4697

set dummy ${ac_tool_prefix}cc; ac_word=$2

4698

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4699

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4700

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4701

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4702

if test "${ac_cv_prog_CC+set}" = set; then

4703

echo $ECHO_N "(cached) $ECHO_C" >&6

4704

else

4705

@@ -4286,74 +4843,34 @@

4706

IFS=$as_save_IFS

4707

test -z "$as_dir" && as_dir=.

4708

for ac_exec_ext in '' $ac_executable_extensions; do

4709

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4710

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4711

ac_cv_prog_CC="${ac_tool_prefix}cc"

4712

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4713

break 2

4714

4715

done

4716

done

4717

+IFS=$as_save_IFS

4718

4719

4720

4721

CC=$ac_cv_prog_CC

4722

if test -n "$CC"; then

4723

- echo "$as_me:$LINENO: result: $CC" >&5

4724

-echo "${ECHO_T}$CC" >&6

4725

+ { echo "$as_me:$LINENO: result: $CC" >&5

4726

+echo "${ECHO_T}$CC" >&6; }

4727

else

4728

- echo "$as_me:$LINENO: result: no" >&5

4729

-echo "${ECHO_T}no" >&6

4730

+ { echo "$as_me:$LINENO: result: no" >&5

4731

+echo "${ECHO_T}no" >&6; }

4732

4733

4734

4735

+ fi

4736

4737

-if test -z "$ac_cv_prog_CC"; then

4738

- ac_ct_CC=$CC

4739

+if test -z "$CC"; then

4740

# Extract the first word of "cc", so it can be a program name with args.

4741

set dummy cc; ac_word=$2

4742

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4743

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4744

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

4745

- echo $ECHO_N "(cached) $ECHO_C" >&6

4746

-else

4747

- if test -n "$ac_ct_CC"; then

4748

- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.

4749

-else

4750

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

4751

-for as_dir in $PATH

4752

-do

4753

- IFS=$as_save_IFS

4754

- test -z "$as_dir" && as_dir=.

4755

- for ac_exec_ext in '' $ac_executable_extensions; do

4756

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4757

- ac_cv_prog_ac_ct_CC="cc"

4758

- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4759

- break 2

4760

- fi

4761

-done

4762

-done

4763

4764

-fi

4765

-fi

4766

-ac_ct_CC=$ac_cv_prog_ac_ct_CC

4767

-if test -n "$ac_ct_CC"; then

4768

- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

4769

-echo "${ECHO_T}$ac_ct_CC" >&6

4770

-else

4771

- echo "$as_me:$LINENO: result: no" >&5

4772

-echo "${ECHO_T}no" >&6

4773

-fi

4774

4775

- CC=$ac_ct_CC

4776

-else

4777

- CC="$ac_cv_prog_CC"

4778

-fi

4779

4780

-fi

4781

-if test -z "$CC"; then

4782

- # Extract the first word of "cc", so it can be a program name with args.

4783

-set dummy cc; ac_word=$2

4784

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4785

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4786

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4787

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4788

if test "${ac_cv_prog_CC+set}" = set; then

4789

echo $ECHO_N "(cached) $ECHO_C" >&6

4790

else

4791

@@ -4367,7 +4884,7 @@

4792

IFS=$as_save_IFS

4793

test -z "$as_dir" && as_dir=.

4794

for ac_exec_ext in '' $ac_executable_extensions; do

4795

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4796

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4797

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

4798

ac_prog_rejected=yes

4799

continue

4800

@@ -4378,6 +4895,7 @@

4801

4802

done

4803

done

4804

+IFS=$as_save_IFS

4805

4806

if test $ac_prog_rejected = yes; then

4807

# We found a bogon in the path, so make sure we never use it.

4808

@@ -4395,22 +4913,23 @@

4809

4810

CC=$ac_cv_prog_CC

4811

if test -n "$CC"; then

4812

- echo "$as_me:$LINENO: result: $CC" >&5

4813

-echo "${ECHO_T}$CC" >&6

4814

+ { echo "$as_me:$LINENO: result: $CC" >&5

4815

+echo "${ECHO_T}$CC" >&6; }

4816

else

4817

- echo "$as_me:$LINENO: result: no" >&5

4818

-echo "${ECHO_T}no" >&6

4819

+ { echo "$as_me:$LINENO: result: no" >&5

4820

+echo "${ECHO_T}no" >&6; }

4821

4822

4823

4824

4825

if test -z "$CC"; then

4826

if test -n "$ac_tool_prefix"; then

4827

- for ac_prog in cl

4828

+ for ac_prog in cl.exe

4829

4830

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

4831

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

4832

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4833

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4834

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4835

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4836

if test "${ac_cv_prog_CC+set}" = set; then

4837

echo $ECHO_N "(cached) $ECHO_C" >&6

4838

else

4839

@@ -4423,36 +4942,38 @@

4840

IFS=$as_save_IFS

4841

test -z "$as_dir" && as_dir=.

4842

for ac_exec_ext in '' $ac_executable_extensions; do

4843

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4844

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4845

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

4846

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4847

break 2

4848

4849

done

4850

done

4851

+IFS=$as_save_IFS

4852

4853

4854

4855

CC=$ac_cv_prog_CC

4856

if test -n "$CC"; then

4857

- echo "$as_me:$LINENO: result: $CC" >&5

4858

-echo "${ECHO_T}$CC" >&6

4859

+ { echo "$as_me:$LINENO: result: $CC" >&5

4860

+echo "${ECHO_T}$CC" >&6; }

4861

else

4862

- echo "$as_me:$LINENO: result: no" >&5

4863

-echo "${ECHO_T}no" >&6

4864

+ { echo "$as_me:$LINENO: result: no" >&5

4865

+echo "${ECHO_T}no" >&6; }

4866

4867

4868

4869

test -n "$CC" && break

4870

done

4871

4872

if test -z "$CC"; then

4873

ac_ct_CC=$CC

4874

- for ac_prog in cl

4875

+ for ac_prog in cl.exe

4876

4877

# Extract the first word of "$ac_prog", so it can be a program name with args.

4878

set dummy $ac_prog; ac_word=$2

4879

-echo "$as_me:$LINENO: checking for $ac_word" >&5

4880

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

4881

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

4882

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

4883

if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

4884

echo $ECHO_N "(cached) $ECHO_C" >&6

4885

else

4886

@@ -4465,29 +4986,45 @@

4887

IFS=$as_save_IFS

4888

test -z "$as_dir" && as_dir=.

4889

for ac_exec_ext in '' $ac_executable_extensions; do

4890

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

4891

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4892

ac_cv_prog_ac_ct_CC="$ac_prog"

4893

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4894

break 2

4895

4896

done

4897

done

4898

+IFS=$as_save_IFS

4899

4900

4901

4902

ac_ct_CC=$ac_cv_prog_ac_ct_CC

4903

if test -n "$ac_ct_CC"; then

4904

- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

4905

-echo "${ECHO_T}$ac_ct_CC" >&6

4906

+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

4907

+echo "${ECHO_T}$ac_ct_CC" >&6; }

4908

else

4909

- echo "$as_me:$LINENO: result: no" >&5

4910

-echo "${ECHO_T}no" >&6

4911

+ { echo "$as_me:$LINENO: result: no" >&5

4912

+echo "${ECHO_T}no" >&6; }

4913

4914

4915

4916

test -n "$ac_ct_CC" && break

4917

done

4918

4919

- CC=$ac_ct_CC

4920

+ if test "x$ac_ct_CC" = x; then

4921

+ CC=""

4922

+ else

4923

+ case $cross_compiling:$ac_tool_warned in

4924

+yes:)

4925

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

4926

+whose name does not start with the host triplet. If you think this

4927

+configuration is useful to you, please write to autoconf@gnu.org." >&5

4928

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

4929

+whose name does not start with the host triplet. If you think this

4930

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

4931

+ac_tool_warned=yes ;;

4932

+esac

4933

+ CC=$ac_ct_CC

4934

+ fi

4935

4936

4937

4938

@@ -4500,27 +5037,41 @@

4939

{ (exit 1); exit 1; }; }

4940

4941

# Provide some information about the compiler.

4942

-echo "$as_me:$LINENO:" \

4943

- "checking for C compiler version" >&5

4944

+echo "$as_me:$LINENO: checking for C compiler version" >&5

4945

ac_compiler=`set X $ac_compile; echo $2`

4946

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5

4947

- (eval $ac_compiler --version </dev/null >&5) 2>&5

4948

+{ (ac_try="$ac_compiler --version >&5"

4949

+case "(($ac_try" in

4950

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4951

+ *) ac_try_echo=$ac_try;;

4952

+esac

4953

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4954

+ (eval "$ac_compiler --version >&5") 2>&5

4955

ac_status=$?

4956

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4957

(exit $ac_status); }

4958

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5

4959

- (eval $ac_compiler -v </dev/null >&5) 2>&5

4960

+{ (ac_try="$ac_compiler -v >&5"

4961

+case "(($ac_try" in

4962

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4963

+ *) ac_try_echo=$ac_try;;

4964

+esac

4965

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4966

+ (eval "$ac_compiler -v >&5") 2>&5

4967

ac_status=$?

4968

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4969

(exit $ac_status); }

4970

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5

4971

- (eval $ac_compiler -V </dev/null >&5) 2>&5

4972

+{ (ac_try="$ac_compiler -V >&5"

4973

+case "(($ac_try" in

4974

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4975

+ *) ac_try_echo=$ac_try;;

4976

+esac

4977

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4978

+ (eval "$ac_compiler -V >&5") 2>&5

4979

ac_status=$?

4980

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4981

(exit $ac_status); }

4982

4983

-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

4984

-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6

4985

+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

4986

+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }

4987

if test "${ac_cv_c_compiler_gnu+set}" = set; then

4988

echo $ECHO_N "(cached) $ECHO_C" >&6

4989

else

4990

@@ -4543,50 +5094,49 @@

4991

}

4992

_ACEOF

4993

rm -f conftest.$ac_objext

4994

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4995

- (eval $ac_compile) 2>conftest.er1

4996

+if { (ac_try="$ac_compile"

4997

+case "(($ac_try" in

4998

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4999

+ *) ac_try_echo=$ac_try;;

5000

+esac

5001

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5002

+ (eval "$ac_compile") 2>conftest.er1

5003

ac_status=$?

5004

grep -v '^ *+' conftest.er1 >conftest.err

5005

rm -f conftest.er1

5006

cat conftest.err >&5

5007

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5008

- (exit $ac_status); } &&

5009

- { ac_try='test -z "$ac_c_werror_flag"

5010

- || test ! -s conftest.err'

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); }; } &&

5016

- { ac_try='test -s conftest.$ac_objext'

5017

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5018

- (eval $ac_try) 2>&5

5019

- ac_status=$?

5020

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5021

- (exit $ac_status); }; }; then

5022

+ (exit $ac_status); } && {

5023

+ test -z "$ac_c_werror_flag" ||

5024

+ test ! -s conftest.err

5025

+ } && test -s conftest.$ac_objext; then

5026

ac_compiler_gnu=yes

5027

else

5028

echo "$as_me: failed program was:" >&5

5029

sed 's/^/| /' conftest.$ac_ext >&5

5030

5031

-ac_compiler_gnu=no

5032

+ ac_compiler_gnu=no

5033

5034

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5035

5036

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5037

ac_cv_c_compiler_gnu=$ac_compiler_gnu

5038

5039

5040

-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

5041

-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6

5042

+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

5043

+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }

5044

GCC=`test $ac_compiler_gnu = yes && echo yes`

5045

ac_test_CFLAGS=${CFLAGS+set}

5046

ac_save_CFLAGS=$CFLAGS

5047

-CFLAGS="-g"

5048

-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

5049

-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6

5050

+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

5051

+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }

5052

if test "${ac_cv_prog_cc_g+set}" = set; then

5053

echo $ECHO_N "(cached) $ECHO_C" >&6

5054

else

5055

- cat >conftest.$ac_ext <<_ACEOF

5056

+ ac_save_c_werror_flag=$ac_c_werror_flag

5057

+ ac_c_werror_flag=yes

5058

+ ac_cv_prog_cc_g=no

5059

+ CFLAGS="-g"

5060

+ cat >conftest.$ac_ext <<_ACEOF

5061

/* confdefs.h. */

5062

_ACEOF

5063

cat confdefs.h >>conftest.$ac_ext

5064

@@ -4602,38 +5152,118 @@

5065

}

5066

_ACEOF

5067

rm -f conftest.$ac_objext

5068

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5069

- (eval $ac_compile) 2>conftest.er1

5070

+if { (ac_try="$ac_compile"

5071

+case "(($ac_try" in

5072

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5073

+ *) ac_try_echo=$ac_try;;

5074

+esac

5075

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5076

+ (eval "$ac_compile") 2>conftest.er1

5077

ac_status=$?

5078

grep -v '^ *+' conftest.er1 >conftest.err

5079

rm -f conftest.er1

5080

cat conftest.err >&5

5081

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5082

- (exit $ac_status); } &&

5083

- { ac_try='test -z "$ac_c_werror_flag"

5084

- || test ! -s conftest.err'

5085

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5086

- (eval $ac_try) 2>&5

5087

+ (exit $ac_status); } && {

5088

+ test -z "$ac_c_werror_flag" ||

5089

+ test ! -s conftest.err

5090

+ } && test -s conftest.$ac_objext; then

5091

+ ac_cv_prog_cc_g=yes

5092

+else

5093

+ echo "$as_me: failed program was:" >&5

5094

+sed 's/^/| /' conftest.$ac_ext >&5

5095

5096

+ CFLAGS=""

5097

+ cat >conftest.$ac_ext <<_ACEOF

5098

+/* confdefs.h. */

5099

+_ACEOF

5100

+cat confdefs.h >>conftest.$ac_ext

5101

+cat >>conftest.$ac_ext <<_ACEOF

5102

+/* end confdefs.h. */

5103

5104

+int

5105

+main ()

5106

5107

5108

+ ;

5109

+ return 0;

5110

5111

+_ACEOF

5112

+rm -f conftest.$ac_objext

5113

+if { (ac_try="$ac_compile"

5114

+case "(($ac_try" in

5115

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5116

+ *) ac_try_echo=$ac_try;;

5117

+esac

5118

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5119

+ (eval "$ac_compile") 2>conftest.er1

5120

ac_status=$?

5121

+ grep -v '^ *+' conftest.er1 >conftest.err

5122

+ rm -f conftest.er1

5123

+ cat conftest.err >&5

5124

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5125

- (exit $ac_status); }; } &&

5126

- { ac_try='test -s conftest.$ac_objext'

5127

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5128

- (eval $ac_try) 2>&5

5129

+ (exit $ac_status); } && {

5130

+ test -z "$ac_c_werror_flag" ||

5131

+ test ! -s conftest.err

5132

+ } && test -s conftest.$ac_objext; then

5133

+ :

5134

+else

5135

+ echo "$as_me: failed program was:" >&5

5136

+sed 's/^/| /' conftest.$ac_ext >&5

5137

5138

+ ac_c_werror_flag=$ac_save_c_werror_flag

5139

+ CFLAGS="-g"

5140

+ cat >conftest.$ac_ext <<_ACEOF

5141

+/* confdefs.h. */

5142

+_ACEOF

5143

+cat confdefs.h >>conftest.$ac_ext

5144

+cat >>conftest.$ac_ext <<_ACEOF

5145

+/* end confdefs.h. */

5146

5147

+int

5148

+main ()

5149

5150

5151

+ ;

5152

+ return 0;

5153

5154

+_ACEOF

5155

+rm -f conftest.$ac_objext

5156

+if { (ac_try="$ac_compile"

5157

+case "(($ac_try" in

5158

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5159

+ *) ac_try_echo=$ac_try;;

5160

+esac

5161

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5162

+ (eval "$ac_compile") 2>conftest.er1

5163

ac_status=$?

5164

+ grep -v '^ *+' conftest.er1 >conftest.err

5165

+ rm -f conftest.er1

5166

+ cat conftest.err >&5

5167

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5168

- (exit $ac_status); }; }; then

5169

+ (exit $ac_status); } && {

5170

+ test -z "$ac_c_werror_flag" ||

5171

+ test ! -s conftest.err

5172

+ } && test -s conftest.$ac_objext; then

5173

ac_cv_prog_cc_g=yes

5174

else

5175

echo "$as_me: failed program was:" >&5

5176

sed 's/^/| /' conftest.$ac_ext >&5

5177

5178

-ac_cv_prog_cc_g=no

5179

5180

+fi

5181

5182

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5183

5184

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5185

5186

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5187

+fi

5188

5189

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5190

+ ac_c_werror_flag=$ac_save_c_werror_flag

5191

5192

-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

5193

-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6

5194

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

5195

+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }

5196

if test "$ac_test_CFLAGS" = set; then

5197

CFLAGS=$ac_save_CFLAGS

5198

elif test $ac_cv_prog_cc_g = yes; then

5199

@@ -4649,12 +5279,12 @@

5200

CFLAGS=

5201

5202

5203

-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5

5204

-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6

5205

-if test "${ac_cv_prog_cc_stdc+set}" = set; then

5206

+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

5207

+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }

5208

+if test "${ac_cv_prog_cc_c89+set}" = set; then

5209

echo $ECHO_N "(cached) $ECHO_C" >&6

5210

else

5211

- ac_cv_prog_cc_stdc=no

5212

+ ac_cv_prog_cc_c89=no

5213

ac_save_CC=$CC

5214

cat >conftest.$ac_ext <<_ACEOF

5215

/* confdefs.h. */

5216

@@ -4688,12 +5318,17 @@

5217

/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has

5218

function prototypes and stuff, but not '\xHH' hex character constants.

5219

These don't provoke an error unfortunately, instead are silently treated

5220

- as 'x'. The following induces an error, until -std1 is added to get

5221

+ as 'x'. The following induces an error, until -std is added to get

5222

proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an

5223

array size at least. It's necessary to write '\x00'==0 to get something

5224

- that's true only with -std1. */

5225

+ that's true only with -std. */

5226

int osf4_cc_array ['\x00' == 0 ? 1 : -1];

5227

5228

+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters

5229

+ inside strings and character constants. */

5230

+#define FOO(x) 'x'

5231

+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];

5232

5233

int test (int i, double x);

5234

struct s1 {int (*f) (int a);};

5235

struct s2 {int (*f) (double a);};

5236

@@ -4708,205 +5343,57 @@

5237

return 0;

5238

}

5239

_ACEOF

5240

-# Don't try gcc -ansi; that turns off useful extensions and

5241

-# breaks some systems' header files.

5242

-# AIX -qlanglvl=ansi

5243

-# Ultrix and OSF/1 -std1

5244

-# HP-UX 10.20 and later -Ae

5245

-# HP-UX older versions -Aa -D_HPUX_SOURCE

5246

-# SVR4 -Xc -D__EXTENSIONS__

5247

-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

5248

+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \

5249

+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

5250

5251

CC="$ac_save_CC $ac_arg"

5252

rm -f conftest.$ac_objext

5253

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5254

- (eval $ac_compile) 2>conftest.er1

5255

+if { (ac_try="$ac_compile"

5256

+case "(($ac_try" in

5257

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5258

+ *) ac_try_echo=$ac_try;;

5259

+esac

5260

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5261

+ (eval "$ac_compile") 2>conftest.er1

5262

ac_status=$?

5263

grep -v '^ *+' conftest.er1 >conftest.err

5264

rm -f conftest.er1

5265

cat conftest.err >&5

5266

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5267

- (exit $ac_status); } &&

5268

- { ac_try='test -z "$ac_c_werror_flag"

5269

- || test ! -s conftest.err'

5270

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5271

- (eval $ac_try) 2>&5

5272

- ac_status=$?

5273

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5274

- (exit $ac_status); }; } &&

5275

- { ac_try='test -s conftest.$ac_objext'

5276

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5277

- (eval $ac_try) 2>&5

5278

- ac_status=$?

5279

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5280

- (exit $ac_status); }; }; then

5281

- ac_cv_prog_cc_stdc=$ac_arg

5282

-break

5283

+ (exit $ac_status); } && {

5284

+ test -z "$ac_c_werror_flag" ||

5285

+ test ! -s conftest.err

5286

+ } && test -s conftest.$ac_objext; then

5287

+ ac_cv_prog_cc_c89=$ac_arg

5288

else

5289

echo "$as_me: failed program was:" >&5

5290

sed 's/^/| /' conftest.$ac_ext >&5

5291

5292

5293

5294

-rm -f conftest.err conftest.$ac_objext

5295

5296

+rm -f core conftest.err conftest.$ac_objext

5297

+ test "x$ac_cv_prog_cc_c89" != "xno" && break

5298

done

5299

-rm -f conftest.$ac_ext conftest.$ac_objext

5300

+rm -f conftest.$ac_ext

5301

CC=$ac_save_CC

5302

5303

5304

5305

-case "x$ac_cv_prog_cc_stdc" in

5306

- x|xno)

5307

- echo "$as_me:$LINENO: result: none needed" >&5

5308

-echo "${ECHO_T}none needed" >&6 ;;

5309

+# AC_CACHE_VAL

5310

+case "x$ac_cv_prog_cc_c89" in

5311

+ x)

5312

+ { echo "$as_me:$LINENO: result: none needed" >&5

5313

+echo "${ECHO_T}none needed" >&6; } ;;

5314

+ xno)

5315

+ { echo "$as_me:$LINENO: result: unsupported" >&5

5316

+echo "${ECHO_T}unsupported" >&6; } ;;

5317

5318

- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5

5319

-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6

5320

- CC="$CC $ac_cv_prog_cc_stdc" ;;

5321

+ CC="$CC $ac_cv_prog_cc_c89"

5322

+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

5323

+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;

5324

esac

5325

5326

-# Some people use a C++ compiler to compile C. Since we use `exit',

5327

-# in C++ we need to declare it. In case someone uses the same compiler

5328

-# for both compiling C and C++ we need to have the C++ compiler decide

5329

-# the declaration of exit, since it's the most demanding environment.

5330

-cat >conftest.$ac_ext <<_ACEOF

5331

-#ifndef __cplusplus

5332

- choke me

5333

-#endif

5334

-_ACEOF

5335

-rm -f conftest.$ac_objext

5336

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5337

- (eval $ac_compile) 2>conftest.er1

5338

- ac_status=$?

5339

- grep -v '^ *+' conftest.er1 >conftest.err

5340

- rm -f conftest.er1

5341

- cat conftest.err >&5

5342

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5343

- (exit $ac_status); } &&

5344

- { ac_try='test -z "$ac_c_werror_flag"

5345

- || test ! -s conftest.err'

5346

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5347

- (eval $ac_try) 2>&5

5348

- ac_status=$?

5349

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5350

- (exit $ac_status); }; } &&

5351

- { ac_try='test -s conftest.$ac_objext'

5352

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5353

- (eval $ac_try) 2>&5

5354

- ac_status=$?

5355

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5356

- (exit $ac_status); }; }; then

5357

- for ac_declaration in \

5358

- '' \

5359

- 'extern "C" void std::exit (int) throw (); using std::exit;' \

5360

- 'extern "C" void std::exit (int); using std::exit;' \

5361

- 'extern "C" void exit (int) throw ();' \

5362

- 'extern "C" void exit (int);' \

5363

- 'void exit (int);'

5364

-do

5365

- cat >conftest.$ac_ext <<_ACEOF

5366

-/* confdefs.h. */

5367

-_ACEOF

5368

-cat confdefs.h >>conftest.$ac_ext

5369

-cat >>conftest.$ac_ext <<_ACEOF

5370

-/* end confdefs.h. */

5371

-$ac_declaration

5372

-#include <stdlib.h>

5373

-int

5374

-main ()

5375

5376

-exit (42);

5377

- ;

5378

- return 0;

5379

5380

-_ACEOF

5381

-rm -f conftest.$ac_objext

5382

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5383

- (eval $ac_compile) 2>conftest.er1

5384

- ac_status=$?

5385

- grep -v '^ *+' conftest.er1 >conftest.err

5386

- rm -f conftest.er1

5387

- cat conftest.err >&5

5388

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5389

- (exit $ac_status); } &&

5390

- { ac_try='test -z "$ac_c_werror_flag"

5391

- || test ! -s conftest.err'

5392

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5393

- (eval $ac_try) 2>&5

5394

- ac_status=$?

5395

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5396

- (exit $ac_status); }; } &&

5397

- { ac_try='test -s conftest.$ac_objext'

5398

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5399

- (eval $ac_try) 2>&5

5400

- ac_status=$?

5401

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5402

- (exit $ac_status); }; }; then

5403

- :

5404

-else

5405

- echo "$as_me: failed program was:" >&5

5406

-sed 's/^/| /' conftest.$ac_ext >&5

5407

5408

-continue

5409

-fi

5410

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5411

- cat >conftest.$ac_ext <<_ACEOF

5412

-/* confdefs.h. */

5413

-_ACEOF

5414

-cat confdefs.h >>conftest.$ac_ext

5415

-cat >>conftest.$ac_ext <<_ACEOF

5416

-/* end confdefs.h. */

5417

-$ac_declaration

5418

-int

5419

-main ()

5420

5421

-exit (42);

5422

- ;

5423

- return 0;

5424

5425

-_ACEOF

5426

-rm -f conftest.$ac_objext

5427

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5428

- (eval $ac_compile) 2>conftest.er1

5429

- ac_status=$?

5430

- grep -v '^ *+' conftest.er1 >conftest.err

5431

- rm -f conftest.er1

5432

- cat conftest.err >&5

5433

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5434

- (exit $ac_status); } &&

5435

- { ac_try='test -z "$ac_c_werror_flag"

5436

- || test ! -s conftest.err'

5437

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5438

- (eval $ac_try) 2>&5

5439

- ac_status=$?

5440

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5441

- (exit $ac_status); }; } &&

5442

- { ac_try='test -s conftest.$ac_objext'

5443

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5444

- (eval $ac_try) 2>&5

5445

- ac_status=$?

5446

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5447

- (exit $ac_status); }; }; then

5448

- break

5449

-else

5450

- echo "$as_me: failed program was:" >&5

5451

-sed 's/^/| /' conftest.$ac_ext >&5

5452

5453

-fi

5454

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5455

-done

5456

-rm -f conftest*

5457

-if test -n "$ac_declaration"; then

5458

- echo '#ifdef __cplusplus' >>confdefs.h

5459

- echo $ac_declaration >>confdefs.h

5460

- echo '#endif' >>confdefs.h

5461

-fi

5462

5463

-else

5464

- echo "$as_me: failed program was:" >&5

5465

-sed 's/^/| /' conftest.$ac_ext >&5

5466

5467

-fi

5468

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5469

ac_ext=c

5470

ac_cpp='$CPP $CPPFLAGS'

5471

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

5472

@@ -4915,8 +5402,8 @@

5473

5474

depcc="$CC" am_compiler_list=

5475

5476

-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

5477

-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6

5478

+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

5479

+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

5480

if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then

5481

echo $ECHO_N "(cached) $ECHO_C" >&6

5482

else

5483

@@ -5005,8 +5492,8 @@

5484

5485

5486

5487

-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

5488

-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6

5489

+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

5490

+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }

5491

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

5492

5493

5494

@@ -5022,18 +5509,22 @@

5495

5496

5497

5498

-ac_ext=cc

5499

+ac_ext=cpp

5500

ac_cpp='$CXXCPP $CPPFLAGS'

5501

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

5502

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

5503

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

5504

-if test -n "$ac_tool_prefix"; then

5505

- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC

5506

+if test -z "$CXX"; then

5507

+ if test -n "$CCC"; then

5508

+ CXX=$CCC

5509

+ else

5510

+ if test -n "$ac_tool_prefix"; then

5511

+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

5512

5513

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

5514

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

5515

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5516

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5517

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5518

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5519

if test "${ac_cv_prog_CXX+set}" = set; then

5520

echo $ECHO_N "(cached) $ECHO_C" >&6

5521

else

5522

@@ -5046,36 +5537,38 @@

5523

IFS=$as_save_IFS

5524

test -z "$as_dir" && as_dir=.

5525

for ac_exec_ext in '' $ac_executable_extensions; do

5526

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5527

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5528

ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

5529

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5530

break 2

5531

5532

done

5533

done

5534

+IFS=$as_save_IFS

5535

5536

5537

5538

CXX=$ac_cv_prog_CXX

5539

if test -n "$CXX"; then

5540

- echo "$as_me:$LINENO: result: $CXX" >&5

5541

-echo "${ECHO_T}$CXX" >&6

5542

+ { echo "$as_me:$LINENO: result: $CXX" >&5

5543

+echo "${ECHO_T}$CXX" >&6; }

5544

else

5545

- echo "$as_me:$LINENO: result: no" >&5

5546

-echo "${ECHO_T}no" >&6

5547

+ { echo "$as_me:$LINENO: result: no" >&5

5548

+echo "${ECHO_T}no" >&6; }

5549

5550

5551

5552

test -n "$CXX" && break

5553

done

5554

5555

if test -z "$CXX"; then

5556

ac_ct_CXX=$CXX

5557

- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC

5558

+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

5559

5560

# Extract the first word of "$ac_prog", so it can be a program name with args.

5561

set dummy $ac_prog; ac_word=$2

5562

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5563

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5564

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5565

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5566

if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then

5567

echo $ECHO_N "(cached) $ECHO_C" >&6

5568

else

5569

@@ -5088,55 +5581,85 @@

5570

IFS=$as_save_IFS

5571

test -z "$as_dir" && as_dir=.

5572

for ac_exec_ext in '' $ac_executable_extensions; do

5573

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5574

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5575

ac_cv_prog_ac_ct_CXX="$ac_prog"

5576

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5577

break 2

5578

5579

done

5580

done

5581

+IFS=$as_save_IFS

5582

5583

5584

5585

ac_ct_CXX=$ac_cv_prog_ac_ct_CXX

5586

if test -n "$ac_ct_CXX"; then

5587

- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

5588

-echo "${ECHO_T}$ac_ct_CXX" >&6

5589

+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

5590

+echo "${ECHO_T}$ac_ct_CXX" >&6; }

5591

else

5592

- echo "$as_me:$LINENO: result: no" >&5

5593

-echo "${ECHO_T}no" >&6

5594

+ { echo "$as_me:$LINENO: result: no" >&5

5595

+echo "${ECHO_T}no" >&6; }

5596

5597

5598

5599

test -n "$ac_ct_CXX" && break

5600

done

5601

-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"

5602

5603

- CXX=$ac_ct_CXX

5604

+ if test "x$ac_ct_CXX" = x; then

5605

+ CXX="g++"

5606

+ else

5607

+ case $cross_compiling:$ac_tool_warned in

5608

+yes:)

5609

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

5610

+whose name does not start with the host triplet. If you think this

5611

+configuration is useful to you, please write to autoconf@gnu.org." >&5

5612

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

5613

+whose name does not start with the host triplet. If you think this

5614

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

5615

+ac_tool_warned=yes ;;

5616

+esac

5617

+ CXX=$ac_ct_CXX

5618

+ fi

5619

5620

5621

5622

+ fi

5623

+fi

5624

# Provide some information about the compiler.

5625

-echo "$as_me:$LINENO:" \

5626

- "checking for C++ compiler version" >&5

5627

+echo "$as_me:$LINENO: checking for C++ compiler version" >&5

5628

ac_compiler=`set X $ac_compile; echo $2`

5629

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5

5630

- (eval $ac_compiler --version </dev/null >&5) 2>&5

5631

+{ (ac_try="$ac_compiler --version >&5"

5632

+case "(($ac_try" in

5633

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5634

+ *) ac_try_echo=$ac_try;;

5635

+esac

5636

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5637

+ (eval "$ac_compiler --version >&5") 2>&5

5638

ac_status=$?

5639

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5640

(exit $ac_status); }

5641

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5

5642

- (eval $ac_compiler -v </dev/null >&5) 2>&5

5643

+{ (ac_try="$ac_compiler -v >&5"

5644

+case "(($ac_try" in

5645

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5646

+ *) ac_try_echo=$ac_try;;

5647

+esac

5648

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5649

+ (eval "$ac_compiler -v >&5") 2>&5

5650

ac_status=$?

5651

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5652

(exit $ac_status); }

5653

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5

5654

- (eval $ac_compiler -V </dev/null >&5) 2>&5

5655

+{ (ac_try="$ac_compiler -V >&5"

5656

+case "(($ac_try" in

5657

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5658

+ *) ac_try_echo=$ac_try;;

5659

+esac

5660

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5661

+ (eval "$ac_compiler -V >&5") 2>&5

5662

ac_status=$?

5663

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5664

(exit $ac_status); }

5665

5666

-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

5667

-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6

5668

+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

5669

+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }

5670

if test "${ac_cv_cxx_compiler_gnu+set}" = set; then

5671

echo $ECHO_N "(cached) $ECHO_C" >&6

5672

else

5673

@@ -5159,50 +5682,49 @@

5674

}

5675

_ACEOF

5676

rm -f conftest.$ac_objext

5677

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5678

- (eval $ac_compile) 2>conftest.er1

5679

+if { (ac_try="$ac_compile"

5680

+case "(($ac_try" in

5681

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5682

+ *) ac_try_echo=$ac_try;;

5683

+esac

5684

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5685

+ (eval "$ac_compile") 2>conftest.er1

5686

ac_status=$?

5687

grep -v '^ *+' conftest.er1 >conftest.err

5688

rm -f conftest.er1

5689

cat conftest.err >&5

5690

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5691

- (exit $ac_status); } &&

5692

- { ac_try='test -z "$ac_cxx_werror_flag"

5693

- || test ! -s conftest.err'

5694

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5695

- (eval $ac_try) 2>&5

5696

- ac_status=$?

5697

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5698

- (exit $ac_status); }; } &&

5699

- { ac_try='test -s conftest.$ac_objext'

5700

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5701

- (eval $ac_try) 2>&5

5702

- ac_status=$?

5703

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5704

- (exit $ac_status); }; }; then

5705

+ (exit $ac_status); } && {

5706

+ test -z "$ac_cxx_werror_flag" ||

5707

+ test ! -s conftest.err

5708

+ } && test -s conftest.$ac_objext; then

5709

ac_compiler_gnu=yes

5710

else

5711

echo "$as_me: failed program was:" >&5

5712

sed 's/^/| /' conftest.$ac_ext >&5

5713

5714

-ac_compiler_gnu=no

5715

+ ac_compiler_gnu=no

5716

5717

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5718

5719

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5720

ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

5721

5722

5723

-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

5724

-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6

5725

+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

5726

+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }

5727

GXX=`test $ac_compiler_gnu = yes && echo yes`

5728

ac_test_CXXFLAGS=${CXXFLAGS+set}

5729

ac_save_CXXFLAGS=$CXXFLAGS

5730

-CXXFLAGS="-g"

5731

-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

5732

-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6

5733

+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

5734

+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }

5735

if test "${ac_cv_prog_cxx_g+set}" = set; then

5736

echo $ECHO_N "(cached) $ECHO_C" >&6

5737

else

5738

- cat >conftest.$ac_ext <<_ACEOF

5739

+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag

5740

+ ac_cxx_werror_flag=yes

5741

+ ac_cv_prog_cxx_g=no

5742

+ CXXFLAGS="-g"

5743

+ cat >conftest.$ac_ext <<_ACEOF

5744

/* confdefs.h. */

5745

_ACEOF

5746

cat confdefs.h >>conftest.$ac_ext

5747

@@ -5218,159 +5740,133 @@

5748

}

5749

_ACEOF

5750

rm -f conftest.$ac_objext

5751

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5752

- (eval $ac_compile) 2>conftest.er1

5753

+if { (ac_try="$ac_compile"

5754

+case "(($ac_try" in

5755

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5756

+ *) ac_try_echo=$ac_try;;

5757

+esac

5758

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5759

+ (eval "$ac_compile") 2>conftest.er1

5760

ac_status=$?

5761

grep -v '^ *+' conftest.er1 >conftest.err

5762

rm -f conftest.er1

5763

cat conftest.err >&5

5764

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5765

- (exit $ac_status); } &&

5766

- { ac_try='test -z "$ac_cxx_werror_flag"

5767

- || test ! -s conftest.err'

5768

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5769

- (eval $ac_try) 2>&5

5770

- ac_status=$?

5771

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5772

- (exit $ac_status); }; } &&

5773

- { ac_try='test -s conftest.$ac_objext'

5774

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5775

- (eval $ac_try) 2>&5

5776

- ac_status=$?

5777

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5778

- (exit $ac_status); }; }; then

5779

+ (exit $ac_status); } && {

5780

+ test -z "$ac_cxx_werror_flag" ||

5781

+ test ! -s conftest.err

5782

+ } && test -s conftest.$ac_objext; then

5783

ac_cv_prog_cxx_g=yes

5784

else

5785

echo "$as_me: failed program was:" >&5

5786

sed 's/^/| /' conftest.$ac_ext >&5

5787

5788

-ac_cv_prog_cxx_g=no

5789

-fi

5790

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5791

-fi

5792

-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

5793

-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6

5794

-if test "$ac_test_CXXFLAGS" = set; then

5795

- CXXFLAGS=$ac_save_CXXFLAGS

5796

-elif test $ac_cv_prog_cxx_g = yes; then

5797

- if test "$GXX" = yes; then

5798

- CXXFLAGS="-g -O2"

5799

- else

5800

- CXXFLAGS="-g"

5801

- fi

5802

-else

5803

- if test "$GXX" = yes; then

5804

- CXXFLAGS="-O2"

5805

- else

5806

- CXXFLAGS=

5807

- fi

5808

-fi

5809

-for ac_declaration in \

5810

- '' \

5811

- 'extern "C" void std::exit (int) throw (); using std::exit;' \

5812

- 'extern "C" void std::exit (int); using std::exit;' \

5813

- 'extern "C" void exit (int) throw ();' \

5814

- 'extern "C" void exit (int);' \

5815

- 'void exit (int);'

5816

-do

5817

- cat >conftest.$ac_ext <<_ACEOF

5818

+ CXXFLAGS=""

5819

+ cat >conftest.$ac_ext <<_ACEOF

5820

/* confdefs.h. */

5821

_ACEOF

5822

cat confdefs.h >>conftest.$ac_ext

5823

cat >>conftest.$ac_ext <<_ACEOF

5824

/* end confdefs.h. */

5825

-$ac_declaration

5826

-#include <stdlib.h>

5827

5828

int

5829

main ()

5830

{

5831

-exit (42);

5832

5833

;

5834

return 0;

5835

}

5836

_ACEOF

5837

rm -f conftest.$ac_objext

5838

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5839

- (eval $ac_compile) 2>conftest.er1

5840

+if { (ac_try="$ac_compile"

5841

+case "(($ac_try" in

5842

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5843

+ *) ac_try_echo=$ac_try;;

5844

+esac

5845

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5846

+ (eval "$ac_compile") 2>conftest.er1

5847

ac_status=$?

5848

grep -v '^ *+' conftest.er1 >conftest.err

5849

rm -f conftest.er1

5850

cat conftest.err >&5

5851

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5852

- (exit $ac_status); } &&

5853

- { ac_try='test -z "$ac_cxx_werror_flag"

5854

- || test ! -s conftest.err'

5855

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5856

- (eval $ac_try) 2>&5

5857

- ac_status=$?

5858

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5859

- (exit $ac_status); }; } &&

5860

- { ac_try='test -s conftest.$ac_objext'

5861

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5862

- (eval $ac_try) 2>&5

5863

- ac_status=$?

5864

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5865

- (exit $ac_status); }; }; then

5866

+ (exit $ac_status); } && {

5867

+ test -z "$ac_cxx_werror_flag" ||

5868

+ test ! -s conftest.err

5869

+ } && test -s conftest.$ac_objext; then

5870

5871

else

5872

echo "$as_me: failed program was:" >&5

5873

sed 's/^/| /' conftest.$ac_ext >&5

5874

5875

-continue

5876

-fi

5877

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5878

- cat >conftest.$ac_ext <<_ACEOF

5879

+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag

5880

+ CXXFLAGS="-g"

5881

+ cat >conftest.$ac_ext <<_ACEOF

5882

/* confdefs.h. */

5883

_ACEOF

5884

cat confdefs.h >>conftest.$ac_ext

5885

cat >>conftest.$ac_ext <<_ACEOF

5886

/* end confdefs.h. */

5887

-$ac_declaration

5888

5889

int

5890

main ()

5891

{

5892

-exit (42);

5893

5894

;

5895

return 0;

5896

}

5897

_ACEOF

5898

rm -f conftest.$ac_objext

5899

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5900

- (eval $ac_compile) 2>conftest.er1

5901

+if { (ac_try="$ac_compile"

5902

+case "(($ac_try" in

5903

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5904

+ *) ac_try_echo=$ac_try;;

5905

+esac

5906

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5907

+ (eval "$ac_compile") 2>conftest.er1

5908

ac_status=$?

5909

grep -v '^ *+' conftest.er1 >conftest.err

5910

rm -f conftest.er1

5911

cat conftest.err >&5

5912

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5913

- (exit $ac_status); } &&

5914

- { ac_try='test -z "$ac_cxx_werror_flag"

5915

- || test ! -s conftest.err'

5916

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5917

- (eval $ac_try) 2>&5

5918

- ac_status=$?

5919

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5920

- (exit $ac_status); }; } &&

5921

- { ac_try='test -s conftest.$ac_objext'

5922

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5923

- (eval $ac_try) 2>&5

5924

- ac_status=$?

5925

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5926

- (exit $ac_status); }; }; then

5927

- break

5928

+ (exit $ac_status); } && {

5929

+ test -z "$ac_cxx_werror_flag" ||

5930

+ test ! -s conftest.err

5931

+ } && test -s conftest.$ac_objext; then

5932

+ ac_cv_prog_cxx_g=yes

5933

else

5934

echo "$as_me: failed program was:" >&5

5935

sed 's/^/| /' conftest.$ac_ext >&5

5936

5937

5938

5939

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5940

-done

5941

-rm -f conftest*

5942

-if test -n "$ac_declaration"; then

5943

- echo '#ifdef __cplusplus' >>confdefs.h

5944

- echo $ac_declaration >>confdefs.h

5945

- echo '#endif' >>confdefs.h

5946

5947

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5948

+fi

5949

5950

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5951

5952

5953

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5954

+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag

5955

+fi

5956

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

5957

+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }

5958

+if test "$ac_test_CXXFLAGS" = set; then

5959

+ CXXFLAGS=$ac_save_CXXFLAGS

5960

+elif test $ac_cv_prog_cxx_g = yes; then

5961

+ if test "$GXX" = yes; then

5962

+ CXXFLAGS="-g -O2"

5963

+ else

5964

+ CXXFLAGS="-g"

5965

+ fi

5966

+else

5967

+ if test "$GXX" = yes; then

5968

+ CXXFLAGS="-O2"

5969

+ else

5970

+ CXXFLAGS=

5971

+ fi

5972

+fi

5973

ac_ext=c

5974

ac_cpp='$CPP $CPPFLAGS'

5975

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

5976

@@ -5379,8 +5875,8 @@

5977

5978

depcc="$CXX" am_compiler_list=

5979

5980

-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

5981

-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6

5982

+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

5983

+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

5984

if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then

5985

echo $ECHO_N "(cached) $ECHO_C" >&6

5986

else

5987

@@ -5469,8 +5965,8 @@

5988

5989

5990

5991

-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5

5992

-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6

5993

+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5

5994

+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }

5995

CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

5996

5997

5998

@@ -5559,8 +6055,8 @@

5999

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

6000

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

6001

ac_compiler_gnu=$ac_cv_c_compiler_gnu

6002

-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5

6003

-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6

6004

+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5

6005

+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }

6006

# On Suns, sometimes $CPP names a directory.

6007

if test -n "$CPP" && test -d "$CPP"; then

6008

CPP=

6009

@@ -5594,24 +6090,22 @@

6010

#endif

6011

Syntax error

6012

_ACEOF

6013

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

6014

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

6015

+if { (ac_try="$ac_cpp conftest.$ac_ext"

6016

+case "(($ac_try" in

6017

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6018

+ *) ac_try_echo=$ac_try;;

6019

+esac

6020

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6021

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6022

ac_status=$?

6023

grep -v '^ *+' conftest.er1 >conftest.err

6024

rm -f conftest.er1

6025

cat conftest.err >&5

6026

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6027

- (exit $ac_status); } >/dev/null; then

6028

- if test -s conftest.err; then

6029

- ac_cpp_err=$ac_c_preproc_warn_flag

6030

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

6031

- else

6032

- ac_cpp_err=

6033

- fi

6034

-else

6035

- ac_cpp_err=yes

6036

-fi

6037

-if test -z "$ac_cpp_err"; then

6038

+ (exit $ac_status); } >/dev/null && {

6039

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

6040

+ test ! -s conftest.err

6041

+ }; then

6042

6043

else

6044

echo "$as_me: failed program was:" >&5

6045

@@ -5620,9 +6114,10 @@

6046

# Broken: fails on valid input.

6047

continue

6048

6049

6050

rm -f conftest.err conftest.$ac_ext

6051

6052

- # OK, works on sane cases. Now check whether non-existent headers

6053

+ # OK, works on sane cases. Now check whether nonexistent headers

6054

# can be detected and how.

6055

cat >conftest.$ac_ext <<_ACEOF

6056

/* confdefs.h. */

6057

@@ -5632,24 +6127,22 @@

6058

/* end confdefs.h. */

6059

#include <ac_nonexistent.h>

6060

_ACEOF

6061

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

6062

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

6063

+if { (ac_try="$ac_cpp conftest.$ac_ext"

6064

+case "(($ac_try" in

6065

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6066

+ *) ac_try_echo=$ac_try;;

6067

+esac

6068

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6069

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6070

ac_status=$?

6071

grep -v '^ *+' conftest.er1 >conftest.err

6072

rm -f conftest.er1

6073

cat conftest.err >&5

6074

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6075

- (exit $ac_status); } >/dev/null; then

6076

- if test -s conftest.err; then

6077

- ac_cpp_err=$ac_c_preproc_warn_flag

6078

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

6079

- else

6080

- ac_cpp_err=

6081

- fi

6082

-else

6083

- ac_cpp_err=yes

6084

-fi

6085

-if test -z "$ac_cpp_err"; then

6086

+ (exit $ac_status); } >/dev/null && {

6087

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

6088

+ test ! -s conftest.err

6089

+ }; then

6090

# Broken: success on invalid input.

6091

continue

6092

else

6093

@@ -5660,6 +6153,7 @@

6094

ac_preproc_ok=:

6095

break

6096

6097

6098

rm -f conftest.err conftest.$ac_ext

6099

6100

done

6101

@@ -5677,8 +6171,8 @@

6102

else

6103

ac_cv_prog_CPP=$CPP

6104

6105

-echo "$as_me:$LINENO: result: $CPP" >&5

6106

-echo "${ECHO_T}$CPP" >&6

6107

+{ echo "$as_me:$LINENO: result: $CPP" >&5

6108

+echo "${ECHO_T}$CPP" >&6; }

6109

ac_preproc_ok=false

6110

for ac_c_preproc_warn_flag in '' yes

6111

6112

@@ -5701,24 +6195,22 @@

6113

#endif

6114

Syntax error

6115

_ACEOF

6116

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

6117

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

6118

+if { (ac_try="$ac_cpp conftest.$ac_ext"

6119

+case "(($ac_try" in

6120

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6121

+ *) ac_try_echo=$ac_try;;

6122

+esac

6123

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6124

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6125

ac_status=$?

6126

grep -v '^ *+' conftest.er1 >conftest.err

6127

rm -f conftest.er1

6128

cat conftest.err >&5

6129

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6130

- (exit $ac_status); } >/dev/null; then

6131

- if test -s conftest.err; then

6132

- ac_cpp_err=$ac_c_preproc_warn_flag

6133

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

6134

- else

6135

- ac_cpp_err=

6136

- fi

6137

-else

6138

- ac_cpp_err=yes

6139

-fi

6140

-if test -z "$ac_cpp_err"; then

6141

+ (exit $ac_status); } >/dev/null && {

6142

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

6143

+ test ! -s conftest.err

6144

+ }; then

6145

6146

else

6147

echo "$as_me: failed program was:" >&5

6148

@@ -5727,9 +6219,10 @@

6149

# Broken: fails on valid input.

6150

continue

6151

6152

6153

rm -f conftest.err conftest.$ac_ext

6154

6155

- # OK, works on sane cases. Now check whether non-existent headers

6156

+ # OK, works on sane cases. Now check whether nonexistent headers

6157

# can be detected and how.

6158

cat >conftest.$ac_ext <<_ACEOF

6159

/* confdefs.h. */

6160

@@ -5739,24 +6232,22 @@

6161

/* end confdefs.h. */

6162

#include <ac_nonexistent.h>

6163

_ACEOF

6164

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

6165

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

6166

+if { (ac_try="$ac_cpp conftest.$ac_ext"

6167

+case "(($ac_try" in

6168

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6169

+ *) ac_try_echo=$ac_try;;

6170

+esac

6171

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6172

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6173

ac_status=$?

6174

grep -v '^ *+' conftest.er1 >conftest.err

6175

rm -f conftest.er1

6176

cat conftest.err >&5

6177

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6178

- (exit $ac_status); } >/dev/null; then

6179

- if test -s conftest.err; then

6180

- ac_cpp_err=$ac_c_preproc_warn_flag

6181

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

6182

- else

6183

- ac_cpp_err=

6184

- fi

6185

-else

6186

- ac_cpp_err=yes

6187

-fi

6188

-if test -z "$ac_cpp_err"; then

6189

+ (exit $ac_status); } >/dev/null && {

6190

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

6191

+ test ! -s conftest.err

6192

+ }; then

6193

# Broken: success on invalid input.

6194

continue

6195

else

6196

@@ -5767,6 +6258,7 @@

6197

ac_preproc_ok=:

6198

break

6199

6200

6201

rm -f conftest.err conftest.$ac_ext

6202

6203

done

6204

@@ -5789,23 +6281,170 @@

6205

ac_compiler_gnu=$ac_cv_c_compiler_gnu

6206

6207

6208

-echo "$as_me:$LINENO: checking for egrep" >&5

6209

-echo $ECHO_N "checking for egrep... $ECHO_C" >&6

6210

-if test "${ac_cv_prog_egrep+set}" = set; then

6211

+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5

6212

+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }

6213

+if test "${ac_cv_path_GREP+set}" = set; then

6214

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6215

+else

6216

+ # Extract the first word of "grep ggrep" to use in msg output

6217

+if test -z "$GREP"; then

6218

+set dummy grep ggrep; ac_prog_name=$2

6219

+if test "${ac_cv_path_GREP+set}" = set; then

6220

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6221

+else

6222

+ ac_path_GREP_found=false

6223

+# Loop through the user's path and test for each of PROGNAME-LIST

6224

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

6225

+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

6226

+do

6227

+ IFS=$as_save_IFS

6228

+ test -z "$as_dir" && as_dir=.

6229

+ for ac_prog in grep ggrep; do

6230

+ for ac_exec_ext in '' $ac_executable_extensions; do

6231

+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

6232

+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

6233

+ # Check for GNU ac_path_GREP and select it if it is found.

6234

+ # Check for GNU $ac_path_GREP

6235

+case `"$ac_path_GREP" --version 2>&1` in

6236

+*GNU*)

6237

+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;

6238

+*)

6239

+ ac_count=0

6240

+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

6241

+ while :

6242

+ do

6243

+ cat "conftest.in" "conftest.in" >"conftest.tmp"

6244

+ mv "conftest.tmp" "conftest.in"

6245

+ cp "conftest.in" "conftest.nl"

6246

+ echo 'GREP' >> "conftest.nl"

6247

+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break

6248

+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

6249

+ ac_count=`expr $ac_count + 1`

6250

+ if test $ac_count -gt ${ac_path_GREP_max-0}; then

6251

+ # Best one so far, save it but keep looking for a better one

6252

+ ac_cv_path_GREP="$ac_path_GREP"

6253

+ ac_path_GREP_max=$ac_count

6254

+ fi

6255

+ # 10*(2^10) chars as input seems more than enough

6256

+ test $ac_count -gt 10 && break

6257

+ done

6258

+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

6259

+esac

6260

6261

6262

+ $ac_path_GREP_found && break 3

6263

+ done

6264

+done

6265

6266

+done

6267

+IFS=$as_save_IFS

6268

6269

6270

+fi

6271

6272

+GREP="$ac_cv_path_GREP"

6273

+if test -z "$GREP"; then

6274

+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

6275

+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

6276

+ { (exit 1); exit 1; }; }

6277

+fi

6278

6279

+else

6280

+ ac_cv_path_GREP=$GREP

6281

+fi

6282

6283

6284

+fi

6285

+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5

6286

+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }

6287

+ GREP="$ac_cv_path_GREP"

6288

6289

6290

+{ echo "$as_me:$LINENO: checking for egrep" >&5

6291

+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }

6292

+if test "${ac_cv_path_EGREP+set}" = set; then

6293

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6294

+else

6295

+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1

6296

+ then ac_cv_path_EGREP="$GREP -E"

6297

+ else

6298

+ # Extract the first word of "egrep" to use in msg output

6299

+if test -z "$EGREP"; then

6300

+set dummy egrep; ac_prog_name=$2

6301

+if test "${ac_cv_path_EGREP+set}" = set; then

6302

echo $ECHO_N "(cached) $ECHO_C" >&6

6303

else

6304

- if echo a | (grep -E '(a|b)') >/dev/null 2>&1

6305

- then ac_cv_prog_egrep='grep -E'

6306

- else ac_cv_prog_egrep='egrep'

6307

+ ac_path_EGREP_found=false

6308

+# Loop through the user's path and test for each of PROGNAME-LIST

6309

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

6310

+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

6311

+do

6312

+ IFS=$as_save_IFS

6313

+ test -z "$as_dir" && as_dir=.

6314

+ for ac_prog in egrep; do

6315

+ for ac_exec_ext in '' $ac_executable_extensions; do

6316

+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

6317

+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

6318

+ # Check for GNU ac_path_EGREP and select it if it is found.

6319

+ # Check for GNU $ac_path_EGREP

6320

+case `"$ac_path_EGREP" --version 2>&1` in

6321

+*GNU*)

6322

+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;

6323

+*)

6324

+ ac_count=0

6325

+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

6326

+ while :

6327

+ do

6328

+ cat "conftest.in" "conftest.in" >"conftest.tmp"

6329

+ mv "conftest.tmp" "conftest.in"

6330

+ cp "conftest.in" "conftest.nl"

6331

+ echo 'EGREP' >> "conftest.nl"

6332

+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break

6333

+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

6334

+ ac_count=`expr $ac_count + 1`

6335

+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then

6336

+ # Best one so far, save it but keep looking for a better one

6337

+ ac_cv_path_EGREP="$ac_path_EGREP"

6338

+ ac_path_EGREP_max=$ac_count

6339

6340

+ # 10*(2^10) chars as input seems more than enough

6341

+ test $ac_count -gt 10 && break

6342

+ done

6343

+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

6344

+esac

6345

6346

6347

+ $ac_path_EGREP_found && break 3

6348

+ done

6349

+done

6350

6351

+done

6352

+IFS=$as_save_IFS

6353

6354

6355

+fi

6356

6357

+EGREP="$ac_cv_path_EGREP"

6358

+if test -z "$EGREP"; then

6359

+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

6360

+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

6361

+ { (exit 1); exit 1; }; }

6362

6363

-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5

6364

-echo "${ECHO_T}$ac_cv_prog_egrep" >&6

6365

- EGREP=$ac_cv_prog_egrep

6366

6367

+else

6368

+ ac_cv_path_EGREP=$EGREP

6369

+fi

6370

6371

6372

+ fi

6373

+fi

6374

+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5

6375

+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }

6376

+ EGREP="$ac_cv_path_EGREP"

6377

6378

-echo "$as_me:$LINENO: checking for ANSI C header files" >&5

6379

-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6

6380

6381

+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5

6382

+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }

6383

if test "${ac_cv_header_stdc+set}" = set; then

6384

echo $ECHO_N "(cached) $ECHO_C" >&6

6385

else

6386

@@ -5829,35 +6468,31 @@

6387

}

6388

_ACEOF

6389

rm -f conftest.$ac_objext

6390

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6391

- (eval $ac_compile) 2>conftest.er1

6392

+if { (ac_try="$ac_compile"

6393

+case "(($ac_try" in

6394

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6395

+ *) ac_try_echo=$ac_try;;

6396

+esac

6397

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6398

+ (eval "$ac_compile") 2>conftest.er1

6399

ac_status=$?

6400

grep -v '^ *+' conftest.er1 >conftest.err

6401

rm -f conftest.er1

6402

cat conftest.err >&5

6403

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6404

- (exit $ac_status); } &&

6405

- { ac_try='test -z "$ac_c_werror_flag"

6406

- || test ! -s conftest.err'

6407

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6408

- (eval $ac_try) 2>&5

6409

- ac_status=$?

6410

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6411

- (exit $ac_status); }; } &&

6412

- { ac_try='test -s conftest.$ac_objext'

6413

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6414

- (eval $ac_try) 2>&5

6415

- ac_status=$?

6416

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6417

- (exit $ac_status); }; }; then

6418

+ (exit $ac_status); } && {

6419

+ test -z "$ac_c_werror_flag" ||

6420

+ test ! -s conftest.err

6421

+ } && test -s conftest.$ac_objext; then

6422

ac_cv_header_stdc=yes

6423

else

6424

echo "$as_me: failed program was:" >&5

6425

sed 's/^/| /' conftest.$ac_ext >&5

6426

6427

-ac_cv_header_stdc=no

6428

+ ac_cv_header_stdc=no

6429

6430

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

6431

6432

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6433

6434

if test $ac_cv_header_stdc = yes; then

6435

# SunOS 4.x string.h does not declare mem*, contrary to ANSI.

6436

@@ -5913,6 +6548,7 @@

6437

cat >>conftest.$ac_ext <<_ACEOF

6438

/* end confdefs.h. */

6439

#include <ctype.h>

6440

+#include <stdlib.h>

6441

#if ((' ' & 0x0FF) == 0x020)

6442

# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')

6443

# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))

6444

@@ -5932,18 +6568,27 @@

6445

for (i = 0; i < 256; i++)

6446

if (XOR (islower (i), ISLOWER (i))

6447

|| toupper (i) != TOUPPER (i))

6448

- exit(2);

6449

- exit (0);

6450

+ return 2;

6451

+ return 0;

6452

}

6453

_ACEOF

6454

rm -f conftest$ac_exeext

6455

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

6456

- (eval $ac_link) 2>&5

6457

+if { (ac_try="$ac_link"

6458

+case "(($ac_try" in

6459

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6460

+ *) ac_try_echo=$ac_try;;

6461

+esac

6462

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6463

+ (eval "$ac_link") 2>&5

6464

ac_status=$?

6465

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6466

(exit $ac_status); } && { ac_try='./conftest$ac_exeext'

6467

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6468

- (eval $ac_try) 2>&5

6469

+ { (case "(($ac_try" in

6470

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6471

+ *) ac_try_echo=$ac_try;;

6472

+esac

6473

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6474

+ (eval "$ac_try") 2>&5

6475

ac_status=$?

6476

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6477

(exit $ac_status); }; }; then

6478

@@ -5956,12 +6601,14 @@

6479

( exit $ac_status )

6480

ac_cv_header_stdc=no

6481

6482

-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

6483

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

6484

6485

6486

6487

6488

6489

-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

6490

-echo "${ECHO_T}$ac_cv_header_stdc" >&6

6491

+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

6492

+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }

6493

if test $ac_cv_header_stdc = yes; then

6494

6495

cat >>confdefs.h <<\_ACEOF

6496

@@ -5984,9 +6631,9 @@

6497

inttypes.h stdint.h unistd.h

6498

6499

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

6500

-echo "$as_me:$LINENO: checking for $ac_header" >&5

6501

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

6502

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

6503

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

6504

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

6505

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

6506

echo $ECHO_N "(cached) $ECHO_C" >&6

6507

else

6508

cat >conftest.$ac_ext <<_ACEOF

6509

@@ -6000,38 +6647,35 @@

6510

#include <$ac_header>

6511

_ACEOF

6512

rm -f conftest.$ac_objext

6513

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6514

- (eval $ac_compile) 2>conftest.er1

6515

+if { (ac_try="$ac_compile"

6516

+case "(($ac_try" in

6517

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6518

+ *) ac_try_echo=$ac_try;;

6519

+esac

6520

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6521

+ (eval "$ac_compile") 2>conftest.er1

6522

ac_status=$?

6523

grep -v '^ *+' conftest.er1 >conftest.err

6524

rm -f conftest.er1

6525

cat conftest.err >&5

6526

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6527

- (exit $ac_status); } &&

6528

- { ac_try='test -z "$ac_c_werror_flag"

6529

- || test ! -s conftest.err'

6530

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6531

- (eval $ac_try) 2>&5

6532

- ac_status=$?

6533

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6534

- (exit $ac_status); }; } &&

6535

- { ac_try='test -s conftest.$ac_objext'

6536

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6537

- (eval $ac_try) 2>&5

6538

- ac_status=$?

6539

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6540

- (exit $ac_status); }; }; then

6541

+ (exit $ac_status); } && {

6542

+ test -z "$ac_c_werror_flag" ||

6543

+ test ! -s conftest.err

6544

+ } && test -s conftest.$ac_objext; then

6545

eval "$as_ac_Header=yes"

6546

else

6547

echo "$as_me: failed program was:" >&5

6548

sed 's/^/| /' conftest.$ac_ext >&5

6549

6550

-eval "$as_ac_Header=no"

6551

+ eval "$as_ac_Header=no"

6552

6553

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

6554

6555

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6556

6557

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

6558

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

6559

+ac_res=`eval echo '${'$as_ac_Header'}'`

6560

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

6561

+echo "${ECHO_T}$ac_res" >&6; }

6562

if test `eval echo '${'$as_ac_Header'}'` = yes; then

6563

cat >>confdefs.h <<_ACEOF

6564

#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

6565

@@ -6042,8 +6686,8 @@

6566

done

6567

6568

6569

-echo "$as_me:$LINENO: checking for mode_t" >&5

6570

-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6

6571

+{ echo "$as_me:$LINENO: checking for mode_t" >&5

6572

+echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }

6573

if test "${ac_cv_type_mode_t+set}" = set; then

6574

echo $ECHO_N "(cached) $ECHO_C" >&6

6575

else

6576

@@ -6054,50 +6698,47 @@

6577

cat >>conftest.$ac_ext <<_ACEOF

6578

/* end confdefs.h. */

6579

$ac_includes_default

6580

+typedef mode_t ac__type_new_;

6581

int

6582

main ()

6583

{

6584

-if ((mode_t *) 0)

6585

+if ((ac__type_new_ *) 0)

6586

return 0;

6587

-if (sizeof (mode_t))

6588

+if (sizeof (ac__type_new_))

6589

return 0;

6590

;

6591

return 0;

6592

}

6593

_ACEOF

6594

rm -f conftest.$ac_objext

6595

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6596

- (eval $ac_compile) 2>conftest.er1

6597

+if { (ac_try="$ac_compile"

6598

+case "(($ac_try" in

6599

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6600

+ *) ac_try_echo=$ac_try;;

6601

+esac

6602

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6603

+ (eval "$ac_compile") 2>conftest.er1

6604

ac_status=$?

6605

grep -v '^ *+' conftest.er1 >conftest.err

6606

rm -f conftest.er1

6607

cat conftest.err >&5

6608

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6609

- (exit $ac_status); } &&

6610

- { ac_try='test -z "$ac_c_werror_flag"

6611

- || test ! -s conftest.err'

6612

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6613

- (eval $ac_try) 2>&5

6614

- ac_status=$?

6615

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6616

- (exit $ac_status); }; } &&

6617

- { ac_try='test -s conftest.$ac_objext'

6618

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6619

- (eval $ac_try) 2>&5

6620

- ac_status=$?

6621

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6622

- (exit $ac_status); }; }; then

6623

+ (exit $ac_status); } && {

6624

+ test -z "$ac_c_werror_flag" ||

6625

+ test ! -s conftest.err

6626

+ } && test -s conftest.$ac_objext; then

6627

ac_cv_type_mode_t=yes

6628

else

6629

echo "$as_me: failed program was:" >&5

6630

sed 's/^/| /' conftest.$ac_ext >&5

6631

6632

-ac_cv_type_mode_t=no

6633

+ ac_cv_type_mode_t=no

6634

6635

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

6636

6637

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6638

6639

-echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5

6640

-echo "${ECHO_T}$ac_cv_type_mode_t" >&6

6641

+{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5

6642

+echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }

6643

if test $ac_cv_type_mode_t = yes; then

6644

6645

else

6646

@@ -6108,8 +6749,8 @@

6647

6648

6649

6650

-echo "$as_me:$LINENO: checking for pid_t" >&5

6651

-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6

6652

+{ echo "$as_me:$LINENO: checking for pid_t" >&5

6653

+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }

6654

if test "${ac_cv_type_pid_t+set}" = set; then

6655

echo $ECHO_N "(cached) $ECHO_C" >&6

6656

else

6657

@@ -6120,50 +6761,47 @@

6658

cat >>conftest.$ac_ext <<_ACEOF

6659

/* end confdefs.h. */

6660

$ac_includes_default

6661

+typedef pid_t ac__type_new_;

6662

int

6663

main ()

6664

{

6665

-if ((pid_t *) 0)

6666

+if ((ac__type_new_ *) 0)

6667

return 0;

6668

-if (sizeof (pid_t))

6669

+if (sizeof (ac__type_new_))

6670

return 0;

6671

;

6672

return 0;

6673

}

6674

_ACEOF

6675

rm -f conftest.$ac_objext

6676

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6677

- (eval $ac_compile) 2>conftest.er1

6678

+if { (ac_try="$ac_compile"

6679

+case "(($ac_try" in

6680

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6681

+ *) ac_try_echo=$ac_try;;

6682

+esac

6683

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6684

+ (eval "$ac_compile") 2>conftest.er1

6685

ac_status=$?

6686

grep -v '^ *+' conftest.er1 >conftest.err

6687

rm -f conftest.er1

6688

cat conftest.err >&5

6689

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6690

- (exit $ac_status); } &&

6691

- { ac_try='test -z "$ac_c_werror_flag"

6692

- || test ! -s conftest.err'

6693

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6694

- (eval $ac_try) 2>&5

6695

- ac_status=$?

6696

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6697

- (exit $ac_status); }; } &&

6698

- { ac_try='test -s conftest.$ac_objext'

6699

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6700

- (eval $ac_try) 2>&5

6701

- ac_status=$?

6702

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6703

- (exit $ac_status); }; }; then

6704

+ (exit $ac_status); } && {

6705

+ test -z "$ac_c_werror_flag" ||

6706

+ test ! -s conftest.err

6707

+ } && test -s conftest.$ac_objext; then

6708

ac_cv_type_pid_t=yes

6709

else

6710

echo "$as_me: failed program was:" >&5

6711

sed 's/^/| /' conftest.$ac_ext >&5

6712

6713

-ac_cv_type_pid_t=no

6714

+ ac_cv_type_pid_t=no

6715

6716

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

6717

6718

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6719

6720

-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5

6721

-echo "${ECHO_T}$ac_cv_type_pid_t" >&6

6722

+{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5

6723

+echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }

6724

if test $ac_cv_type_pid_t = yes; then

6725

6726

else

6727

@@ -6174,8 +6812,8 @@

6728

6729

6730

6731

-echo "$as_me:$LINENO: checking for size_t" >&5

6732

-echo $ECHO_N "checking for size_t... $ECHO_C" >&6

6733

+{ echo "$as_me:$LINENO: checking for size_t" >&5

6734

+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }

6735

if test "${ac_cv_type_size_t+set}" = set; then

6736

echo $ECHO_N "(cached) $ECHO_C" >&6

6737

else

6738

@@ -6186,62 +6824,59 @@

6739

cat >>conftest.$ac_ext <<_ACEOF

6740

/* end confdefs.h. */

6741

$ac_includes_default

6742

+typedef size_t ac__type_new_;

6743

int

6744

main ()

6745

{

6746

-if ((size_t *) 0)

6747

+if ((ac__type_new_ *) 0)

6748

return 0;

6749

-if (sizeof (size_t))

6750

+if (sizeof (ac__type_new_))

6751

return 0;

6752

;

6753

return 0;

6754

}

6755

_ACEOF

6756

rm -f conftest.$ac_objext

6757

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6758

- (eval $ac_compile) 2>conftest.er1

6759

+if { (ac_try="$ac_compile"

6760

+case "(($ac_try" in

6761

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6762

+ *) ac_try_echo=$ac_try;;

6763

+esac

6764

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6765

+ (eval "$ac_compile") 2>conftest.er1

6766

ac_status=$?

6767

grep -v '^ *+' conftest.er1 >conftest.err

6768

rm -f conftest.er1

6769

cat conftest.err >&5

6770

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6771

- (exit $ac_status); } &&

6772

- { ac_try='test -z "$ac_c_werror_flag"

6773

- || test ! -s conftest.err'

6774

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6775

- (eval $ac_try) 2>&5

6776

- ac_status=$?

6777

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6778

- (exit $ac_status); }; } &&

6779

- { ac_try='test -s conftest.$ac_objext'

6780

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6781

- (eval $ac_try) 2>&5

6782

- ac_status=$?

6783

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6784

- (exit $ac_status); }; }; then

6785

+ (exit $ac_status); } && {

6786

+ test -z "$ac_c_werror_flag" ||

6787

+ test ! -s conftest.err

6788

+ } && test -s conftest.$ac_objext; then

6789

ac_cv_type_size_t=yes

6790

else

6791

echo "$as_me: failed program was:" >&5

6792

sed 's/^/| /' conftest.$ac_ext >&5

6793

6794

-ac_cv_type_size_t=no

6795

+ ac_cv_type_size_t=no

6796

6797

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

6798

6799

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6800

6801

-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5

6802

-echo "${ECHO_T}$ac_cv_type_size_t" >&6

6803

+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5

6804

+echo "${ECHO_T}$ac_cv_type_size_t" >&6; }

6805

if test $ac_cv_type_size_t = yes; then

6806

6807

else

6808

6809

cat >>confdefs.h <<_ACEOF

6810

-#define size_t unsigned

6811

+#define size_t unsigned int

6812

_ACEOF

6813

6814

6815

6816

-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5

6817

-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6

6818

+{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5

6819

+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }

6820

if test "${ac_cv_type_uid_t+set}" = set; then

6821

echo $ECHO_N "(cached) $ECHO_C" >&6

6822

else

6823

@@ -6263,8 +6898,8 @@

6824

rm -f conftest*

6825

6826

6827

-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5

6828

-echo "${ECHO_T}$ac_cv_type_uid_t" >&6

6829

+{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5

6830

+echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }

6831

if test $ac_cv_type_uid_t = no; then

6832

6833

cat >>confdefs.h <<\_ACEOF

6834

@@ -6321,18 +6956,19 @@

6835

sys/ioctl.h sys/inotify.h

6836

6837

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

6838

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

6839

- echo "$as_me:$LINENO: checking for $ac_header" >&5

6840

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

6841

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

6842

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

6843

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

6844

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

6845

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

6846

echo $ECHO_N "(cached) $ECHO_C" >&6

6847

6848

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

6849

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

6850

+ac_res=`eval echo '${'$as_ac_Header'}'`

6851

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

6852

+echo "${ECHO_T}$ac_res" >&6; }

6853

else

6854

# Is the header compilable?

6855

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

6856

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

6857

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

6858

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

6859

cat >conftest.$ac_ext <<_ACEOF

6860

/* confdefs.h. */

6861

_ACEOF

6862

@@ -6343,41 +6979,37 @@

6863

#include <$ac_header>

6864

_ACEOF

6865

rm -f conftest.$ac_objext

6866

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6867

- (eval $ac_compile) 2>conftest.er1

6868

+if { (ac_try="$ac_compile"

6869

+case "(($ac_try" in

6870

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6871

+ *) ac_try_echo=$ac_try;;

6872

+esac

6873

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6874

+ (eval "$ac_compile") 2>conftest.er1

6875

ac_status=$?

6876

grep -v '^ *+' conftest.er1 >conftest.err

6877

rm -f conftest.er1

6878

cat conftest.err >&5

6879

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6880

- (exit $ac_status); } &&

6881

- { ac_try='test -z "$ac_c_werror_flag"

6882

- || test ! -s conftest.err'

6883

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6884

- (eval $ac_try) 2>&5

6885

- ac_status=$?

6886

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6887

- (exit $ac_status); }; } &&

6888

- { ac_try='test -s conftest.$ac_objext'

6889

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6890

- (eval $ac_try) 2>&5

6891

- ac_status=$?

6892

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

6893

- (exit $ac_status); }; }; then

6894

+ (exit $ac_status); } && {

6895

+ test -z "$ac_c_werror_flag" ||

6896

+ test ! -s conftest.err

6897

+ } && test -s conftest.$ac_objext; then

6898

ac_header_compiler=yes

6899

else

6900

echo "$as_me: failed program was:" >&5

6901

sed 's/^/| /' conftest.$ac_ext >&5

6902

6903

-ac_header_compiler=no

6904

+ ac_header_compiler=no

6905

6906

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

6907

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

6908

-echo "${ECHO_T}$ac_header_compiler" >&6

6909

6910

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6911

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

6912

+echo "${ECHO_T}$ac_header_compiler" >&6; }

6913

6914

# Is the header present?

6915

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

6916

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

6917

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

6918

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

6919

cat >conftest.$ac_ext <<_ACEOF

6920

/* confdefs.h. */

6921

_ACEOF

6922

@@ -6386,24 +7018,22 @@

6923

/* end confdefs.h. */

6924

#include <$ac_header>

6925

_ACEOF

6926

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

6927

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

6928

+if { (ac_try="$ac_cpp conftest.$ac_ext"

6929

+case "(($ac_try" in

6930

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6931

+ *) ac_try_echo=$ac_try;;

6932

+esac

6933

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6934

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6935

ac_status=$?

6936

grep -v '^ *+' conftest.er1 >conftest.err

6937

rm -f conftest.er1

6938

cat conftest.err >&5

6939

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6940

- (exit $ac_status); } >/dev/null; then

6941

- if test -s conftest.err; then

6942

- ac_cpp_err=$ac_c_preproc_warn_flag

6943

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

6944

- else

6945

- ac_cpp_err=

6946

- fi

6947

-else

6948

- ac_cpp_err=yes

6949

-fi

6950

-if test -z "$ac_cpp_err"; then

6951

+ (exit $ac_status); } >/dev/null && {

6952

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

6953

+ test ! -s conftest.err

6954

+ }; then

6955

ac_header_preproc=yes

6956

else

6957

echo "$as_me: failed program was:" >&5

6958

@@ -6411,9 +7041,10 @@

6959

6960

ac_header_preproc=no

6961

6962

6963

rm -f conftest.err conftest.$ac_ext

6964

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

6965

-echo "${ECHO_T}$ac_header_preproc" >&6

6966

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

6967

+echo "${ECHO_T}$ac_header_preproc" >&6; }

6968

6969

# So? What about this header?

6970

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

6971

@@ -6437,25 +7068,19 @@

6972

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

6973

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

6974

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

6975

- (

6976

- cat <<\_ASBOX

6977

-## ----------------------------------- ##

6978

-## Report this to the graphviz lists. ##

6979

-## ----------------------------------- ##

6980

-_ASBOX

6981

- ) |

6982

- sed "s/^/$as_me: WARNING: /" >&2

6983

6984

;;

6985

esac

6986

-echo "$as_me:$LINENO: checking for $ac_header" >&5

6987

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

6988

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

6989

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

6990

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

6991

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

6992

echo $ECHO_N "(cached) $ECHO_C" >&6

6993

else

6994

eval "$as_ac_Header=\$ac_header_preproc"

6995

6996

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

6997

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

6998

+ac_res=`eval echo '${'$as_ac_Header'}'`

6999

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

7000

+echo "${ECHO_T}$ac_res" >&6; }

7001

7002

7003

if test `eval echo '${'$as_ac_Header'}'` = yes; then

7004

@@ -6467,8 +7092,8 @@

7005

7006

done

7007

7008

-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5

7009

-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6

7010

+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5

7011

+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }

7012

if test "${ac_cv_header_time+set}" = set; then

7013

echo $ECHO_N "(cached) $ECHO_C" >&6

7014

else

7015

@@ -6492,38 +7117,34 @@

7016

}

7017

_ACEOF

7018

rm -f conftest.$ac_objext

7019

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

7020

- (eval $ac_compile) 2>conftest.er1

7021

+if { (ac_try="$ac_compile"

7022

+case "(($ac_try" in

7023

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7024

+ *) ac_try_echo=$ac_try;;

7025

+esac

7026

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7027

+ (eval "$ac_compile") 2>conftest.er1

7028

ac_status=$?

7029

grep -v '^ *+' conftest.er1 >conftest.err

7030

rm -f conftest.er1

7031

cat conftest.err >&5

7032

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7033

- (exit $ac_status); } &&

7034

- { ac_try='test -z "$ac_c_werror_flag"

7035

- || test ! -s conftest.err'

7036

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7037

- (eval $ac_try) 2>&5

7038

- ac_status=$?

7039

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7040

- (exit $ac_status); }; } &&

7041

- { ac_try='test -s conftest.$ac_objext'

7042

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7043

- (eval $ac_try) 2>&5

7044

- ac_status=$?

7045

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7046

- (exit $ac_status); }; }; then

7047

+ (exit $ac_status); } && {

7048

+ test -z "$ac_c_werror_flag" ||

7049

+ test ! -s conftest.err

7050

+ } && test -s conftest.$ac_objext; then

7051

ac_cv_header_time=yes

7052

else

7053

echo "$as_me: failed program was:" >&5

7054

sed 's/^/| /' conftest.$ac_ext >&5

7055

7056

-ac_cv_header_time=no

7057

+ ac_cv_header_time=no

7058

7059

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

7060

7061

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7062

7063

-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5

7064

-echo "${ECHO_T}$ac_cv_header_time" >&6

7065

+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5

7066

+echo "${ECHO_T}$ac_cv_header_time" >&6; }

7067

if test $ac_cv_header_time = yes; then

7068

7069

cat >>confdefs.h <<\_ACEOF

7070

@@ -6540,9 +7161,9 @@

7071

ac_header_dirent=no

7072

for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do

7073

as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`

7074

-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5

7075

-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6

7076

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

7077

+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5

7078

+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }

7079

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

7080

echo $ECHO_N "(cached) $ECHO_C" >&6

7081

else

7082

cat >conftest.$ac_ext <<_ACEOF

7083

@@ -6564,38 +7185,35 @@

7084

}

7085

_ACEOF

7086

rm -f conftest.$ac_objext

7087

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

7088

- (eval $ac_compile) 2>conftest.er1

7089

+if { (ac_try="$ac_compile"

7090

+case "(($ac_try" in

7091

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7092

+ *) ac_try_echo=$ac_try;;

7093

+esac

7094

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7095

+ (eval "$ac_compile") 2>conftest.er1

7096

ac_status=$?

7097

grep -v '^ *+' conftest.er1 >conftest.err

7098

rm -f conftest.er1

7099

cat conftest.err >&5

7100

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7101

- (exit $ac_status); } &&

7102

- { ac_try='test -z "$ac_c_werror_flag"

7103

- || test ! -s conftest.err'

7104

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7105

- (eval $ac_try) 2>&5

7106

- ac_status=$?

7107

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7108

- (exit $ac_status); }; } &&

7109

- { ac_try='test -s conftest.$ac_objext'

7110

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7111

- (eval $ac_try) 2>&5

7112

- ac_status=$?

7113

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7114

- (exit $ac_status); }; }; then

7115

+ (exit $ac_status); } && {

7116

+ test -z "$ac_c_werror_flag" ||

7117

+ test ! -s conftest.err

7118

+ } && test -s conftest.$ac_objext; then

7119

eval "$as_ac_Header=yes"

7120

else

7121

echo "$as_me: failed program was:" >&5

7122

sed 's/^/| /' conftest.$ac_ext >&5

7123

7124

-eval "$as_ac_Header=no"

7125

+ eval "$as_ac_Header=no"

7126

7127

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

7128

7129

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7130

7131

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

7132

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

7133

+ac_res=`eval echo '${'$as_ac_Header'}'`

7134

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

7135

+echo "${ECHO_T}$ac_res" >&6; }

7136

if test `eval echo '${'$as_ac_Header'}'` = yes; then

7137

cat >>confdefs.h <<_ACEOF

7138

#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1

7139

@@ -6607,13 +7225,12 @@

7140

done

7141

# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.

7142

if test $ac_header_dirent = dirent.h; then

7143

- echo "$as_me:$LINENO: checking for library containing opendir" >&5

7144

-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6

7145

+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5

7146

+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }

7147

if test "${ac_cv_search_opendir+set}" = set; then

7148

echo $ECHO_N "(cached) $ECHO_C" >&6

7149

else

7150

ac_func_search_save_LIBS=$LIBS

7151

-ac_cv_search_opendir=no

7152

cat >conftest.$ac_ext <<_ACEOF

7153

/* confdefs.h. */

7154

_ACEOF

7155

@@ -6621,126 +7238,83 @@

7156

cat >>conftest.$ac_ext <<_ACEOF

7157

/* end confdefs.h. */

7158

7159

-/* Override any gcc2 internal prototype to avoid an error. */

7160

+/* Override any GCC internal prototype to avoid an error.

7161

+ Use char because int might match the return type of a GCC

7162

+ builtin and then its argument prototype would still apply. */

7163

#ifdef __cplusplus

7164

extern "C"

7165

#endif

7166

-/* We use char because int might match the return type of a gcc2

7167

- builtin and then its argument prototype would still apply. */

7168

char opendir ();

7169

int

7170

main ()

7171

{

7172

-opendir ();

7173

+return opendir ();

7174

;

7175

return 0;

7176

}

7177

_ACEOF

7178

-rm -f conftest.$ac_objext conftest$ac_exeext

7179

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7180

- (eval $ac_link) 2>conftest.er1

7181

+for ac_lib in '' dir; do

7182

+ if test -z "$ac_lib"; then

7183

+ ac_res="none required"

7184

+ else

7185

+ ac_res=-l$ac_lib

7186

+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"

7187

+ fi

7188

+ rm -f conftest.$ac_objext conftest$ac_exeext

7189

+if { (ac_try="$ac_link"

7190

+case "(($ac_try" in

7191

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7192

+ *) ac_try_echo=$ac_try;;

7193

+esac

7194

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7195

+ (eval "$ac_link") 2>conftest.er1

7196

ac_status=$?

7197

grep -v '^ *+' conftest.er1 >conftest.err

7198

rm -f conftest.er1

7199

cat conftest.err >&5

7200

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7201

- (exit $ac_status); } &&

7202

- { ac_try='test -z "$ac_c_werror_flag"

7203

- || test ! -s conftest.err'

7204

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7205

- (eval $ac_try) 2>&5

7206

- ac_status=$?

7207

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7208

- (exit $ac_status); }; } &&

7209

- { ac_try='test -s conftest$ac_exeext'

7210

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7211

- (eval $ac_try) 2>&5

7212

- ac_status=$?

7213

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7214

- (exit $ac_status); }; }; then

7215

- ac_cv_search_opendir="none required"

7216

+ (exit $ac_status); } && {

7217

+ test -z "$ac_c_werror_flag" ||

7218

+ test ! -s conftest.err

7219

+ } && test -s conftest$ac_exeext &&

7220

+ $as_test_x conftest$ac_exeext; then

7221

+ ac_cv_search_opendir=$ac_res

7222

else

7223

echo "$as_me: failed program was:" >&5

7224

sed 's/^/| /' conftest.$ac_ext >&5

7225

7226

7227

7228

-rm -f conftest.err conftest.$ac_objext \

7229

- conftest$ac_exeext conftest.$ac_ext

7230

-if test "$ac_cv_search_opendir" = no; then

7231

- for ac_lib in dir; do

7232

- LIBS="-l$ac_lib $ac_func_search_save_LIBS"

7233

- cat >conftest.$ac_ext <<_ACEOF

7234

-/* confdefs.h. */

7235

-_ACEOF

7236

-cat confdefs.h >>conftest.$ac_ext

7237

-cat >>conftest.$ac_ext <<_ACEOF

7238

-/* end confdefs.h. */

7239

7240

-/* Override any gcc2 internal prototype to avoid an error. */

7241

-#ifdef __cplusplus

7242

-extern "C"

7243

-#endif

7244

-/* We use char because int might match the return type of a gcc2

7245

- builtin and then its argument prototype would still apply. */

7246

-char opendir ();

7247

-int

7248

-main ()

7249

7250

-opendir ();

7251

- ;

7252

- return 0;

7253

7254

-_ACEOF

7255

-rm -f conftest.$ac_objext conftest$ac_exeext

7256

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7257

- (eval $ac_link) 2>conftest.er1

7258

- ac_status=$?

7259

- grep -v '^ *+' conftest.er1 >conftest.err

7260

- rm -f conftest.er1

7261

- cat conftest.err >&5

7262

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7263

- (exit $ac_status); } &&

7264

- { ac_try='test -z "$ac_c_werror_flag"

7265

- || test ! -s conftest.err'

7266

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7267

- (eval $ac_try) 2>&5

7268

- ac_status=$?

7269

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7270

- (exit $ac_status); }; } &&

7271

- { ac_try='test -s conftest$ac_exeext'

7272

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7273

- (eval $ac_try) 2>&5

7274

- ac_status=$?

7275

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7276

- (exit $ac_status); }; }; then

7277

- ac_cv_search_opendir="-l$ac_lib"

7278

-break

7279

-else

7280

- echo "$as_me: failed program was:" >&5

7281

-sed 's/^/| /' conftest.$ac_ext >&5

7282

7283

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7284

+ conftest$ac_exeext

7285

+ if test "${ac_cv_search_opendir+set}" = set; then

7286

+ break

7287

7288

-rm -f conftest.err conftest.$ac_objext \

7289

- conftest$ac_exeext conftest.$ac_ext

7290

- done

7291

+done

7292

+if test "${ac_cv_search_opendir+set}" = set; then

7293

+ :

7294

+else

7295

+ ac_cv_search_opendir=no

7296

7297

+rm conftest.$ac_ext

7298

LIBS=$ac_func_search_save_LIBS

7299

7300

-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5

7301

-echo "${ECHO_T}$ac_cv_search_opendir" >&6

7302

-if test "$ac_cv_search_opendir" != no; then

7303

- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"

7304

+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5

7305

+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }

7306

+ac_res=$ac_cv_search_opendir

7307

+if test "$ac_res" != no; then

7308

+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

7309

7310

7311

7312

else

7313

- echo "$as_me:$LINENO: checking for library containing opendir" >&5

7314

-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6

7315

+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5

7316

+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }

7317

if test "${ac_cv_search_opendir+set}" = set; then

7318

echo $ECHO_N "(cached) $ECHO_C" >&6

7319

else

7320

ac_func_search_save_LIBS=$LIBS

7321

-ac_cv_search_opendir=no

7322

cat >conftest.$ac_ext <<_ACEOF

7323

/* confdefs.h. */

7324

_ACEOF

7325

@@ -6748,122 +7322,80 @@

7326

cat >>conftest.$ac_ext <<_ACEOF

7327

/* end confdefs.h. */

7328

7329

-/* Override any gcc2 internal prototype to avoid an error. */

7330

+/* Override any GCC internal prototype to avoid an error.

7331

+ Use char because int might match the return type of a GCC

7332

+ builtin and then its argument prototype would still apply. */

7333

#ifdef __cplusplus

7334

extern "C"

7335

#endif

7336

-/* We use char because int might match the return type of a gcc2

7337

- builtin and then its argument prototype would still apply. */

7338

char opendir ();

7339

int

7340

main ()

7341

{

7342

-opendir ();

7343

+return opendir ();

7344

;

7345

return 0;

7346

}

7347

_ACEOF

7348

-rm -f conftest.$ac_objext conftest$ac_exeext

7349

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7350

- (eval $ac_link) 2>conftest.er1

7351

+for ac_lib in '' x; do

7352

+ if test -z "$ac_lib"; then

7353

+ ac_res="none required"

7354

+ else

7355

+ ac_res=-l$ac_lib

7356

+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"

7357

+ fi

7358

+ rm -f conftest.$ac_objext conftest$ac_exeext

7359

+if { (ac_try="$ac_link"

7360

+case "(($ac_try" in

7361

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7362

+ *) ac_try_echo=$ac_try;;

7363

+esac

7364

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7365

+ (eval "$ac_link") 2>conftest.er1

7366

ac_status=$?

7367

grep -v '^ *+' conftest.er1 >conftest.err

7368

rm -f conftest.er1

7369

cat conftest.err >&5

7370

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7371

- (exit $ac_status); } &&

7372

- { ac_try='test -z "$ac_c_werror_flag"

7373

- || test ! -s conftest.err'

7374

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7375

- (eval $ac_try) 2>&5

7376

- ac_status=$?

7377

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7378

- (exit $ac_status); }; } &&

7379

- { ac_try='test -s conftest$ac_exeext'

7380

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7381

- (eval $ac_try) 2>&5

7382

- ac_status=$?

7383

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7384

- (exit $ac_status); }; }; then

7385

- ac_cv_search_opendir="none required"

7386

+ (exit $ac_status); } && {

7387

+ test -z "$ac_c_werror_flag" ||

7388

+ test ! -s conftest.err

7389

+ } && test -s conftest$ac_exeext &&

7390

+ $as_test_x conftest$ac_exeext; then

7391

+ ac_cv_search_opendir=$ac_res

7392

else

7393

echo "$as_me: failed program was:" >&5

7394

sed 's/^/| /' conftest.$ac_ext >&5

7395

7396

-fi

7397

-rm -f conftest.err conftest.$ac_objext \

7398

- conftest$ac_exeext conftest.$ac_ext

7399

-if test "$ac_cv_search_opendir" = no; then

7400

- for ac_lib in x; do

7401

- LIBS="-l$ac_lib $ac_func_search_save_LIBS"

7402

- cat >conftest.$ac_ext <<_ACEOF

7403

-/* confdefs.h. */

7404

-_ACEOF

7405

-cat confdefs.h >>conftest.$ac_ext

7406

-cat >>conftest.$ac_ext <<_ACEOF

7407

-/* end confdefs.h. */

7408

7409

-/* Override any gcc2 internal prototype to avoid an error. */

7410

-#ifdef __cplusplus

7411

-extern "C"

7412

-#endif

7413

-/* We use char because int might match the return type of a gcc2

7414

- builtin and then its argument prototype would still apply. */

7415

-char opendir ();

7416

-int

7417

-main ()

7418

7419

-opendir ();

7420

- ;

7421

- return 0;

7422

7423

-_ACEOF

7424

-rm -f conftest.$ac_objext conftest$ac_exeext

7425

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7426

- (eval $ac_link) 2>conftest.er1

7427

- ac_status=$?

7428

- grep -v '^ *+' conftest.er1 >conftest.err

7429

- rm -f conftest.er1

7430

- cat conftest.err >&5

7431

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7432

- (exit $ac_status); } &&

7433

- { ac_try='test -z "$ac_c_werror_flag"

7434

- || test ! -s conftest.err'

7435

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7436

- (eval $ac_try) 2>&5

7437

- ac_status=$?

7438

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7439

- (exit $ac_status); }; } &&

7440

- { ac_try='test -s conftest$ac_exeext'

7441

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7442

- (eval $ac_try) 2>&5

7443

- ac_status=$?

7444

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7445

- (exit $ac_status); }; }; then

7446

- ac_cv_search_opendir="-l$ac_lib"

7447

-break

7448

-else

7449

- echo "$as_me: failed program was:" >&5

7450

-sed 's/^/| /' conftest.$ac_ext >&5

7451

+fi

7452

7453

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7454

+ conftest$ac_exeext

7455

+ if test "${ac_cv_search_opendir+set}" = set; then

7456

+ break

7457

7458

-rm -f conftest.err conftest.$ac_objext \

7459

- conftest$ac_exeext conftest.$ac_ext

7460

- done

7461

+done

7462

+if test "${ac_cv_search_opendir+set}" = set; then

7463

+ :

7464

+else

7465

+ ac_cv_search_opendir=no

7466

7467

+rm conftest.$ac_ext

7468

LIBS=$ac_func_search_save_LIBS

7469

7470

-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5

7471

-echo "${ECHO_T}$ac_cv_search_opendir" >&6

7472

-if test "$ac_cv_search_opendir" != no; then

7473

- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"

7474

+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5

7475

+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }

7476

+ac_res=$ac_cv_search_opendir

7477

+if test "$ac_res" != no; then

7478

+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

7479

7480

7481

7482

7483

7484

-echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5

7485

-echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6

7486

+{ echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5

7487

+echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6; }

7488

if test "${ac_cv_header_stdbool_h+set}" = set; then

7489

echo $ECHO_N "(cached) $ECHO_C" >&6

7490

else

7491

@@ -6876,22 +7408,22 @@

7492

7493

#include <stdbool.h>

7494

#ifndef bool

7495

-# error bool is not defined

7496

+ "error: bool is not defined"

7497

#endif

7498

#ifndef false

7499

-# error false is not defined

7500

+ "error: false is not defined"

7501

#endif

7502

#if false

7503

-# error false is not 0

7504

+ "error: false is not 0"

7505

#endif

7506

#ifndef true

7507

-# error true is not defined

7508

+ "error: true is not defined"

7509

#endif

7510

#if true != 1

7511

-# error true is not 1

7512

+ "error: true is not 1"

7513

#endif

7514

#ifndef __bool_true_false_are_defined

7515

-# error __bool_true_false_are_defined is not defined

7516

+ "error: __bool_true_false_are_defined is not defined"

7517

#endif

7518

7519

struct s { _Bool s: 1; _Bool t; } s;

7520

@@ -6899,56 +7431,87 @@

7521

char a[true == 1 ? 1 : -1];

7522

char b[false == 0 ? 1 : -1];

7523

char c[__bool_true_false_are_defined == 1 ? 1 : -1];

7524

- char d[(bool) -0.5 == true ? 1 : -1];

7525

+ char d[(bool) 0.5 == true ? 1 : -1];

7526

bool e = &s;

7527

- char f[(_Bool) -0.0 == false ? 1 : -1];

7528

+ char f[(_Bool) 0.0 == false ? 1 : -1];

7529

char g[true];

7530

char h[sizeof (_Bool)];

7531

char i[sizeof s.t];

7532

+ enum { j = false, k = true, l = false * true, m = true * 256 };

7533

+ _Bool n[m];

7534

+ char o[sizeof n == m * sizeof n[0] ? 1 : -1];

7535

+ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];

7536

+# if defined __xlc__ || defined __GNUC__

7537

+ /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0

7538

+ reported by James Lemley on 2005-10-05; see

7539

+ http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html

7540

+ This test is not quite right, since xlc is allowed to

7541

+ reject this program, as the initializer for xlcbug is

7542

+ not one of the forms that C requires support for.

7543

+ However, doing the test right would require a runtime

7544

+ test, and that would make cross-compilation harder.

7545

+ Let us hope that IBM fixes the xlc bug, and also adds

7546

+ support for this kind of constant expression. In the

7547

+ meantime, this test will reject xlc, which is OK, since

7548

+ our stdbool.h substitute should suffice. We also test

7549

+ this with GCC, where it should work, to detect more

7550

+ quickly whether someone messes up the test in the

7551

+ future. */

7552

+ char digs[] = "0123456789";

7553

+ int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);

7554

+# endif

7555

+ /* Catch a bug in an HP-UX C compiler. See

7556

+ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html

7557

+ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html

7558

+ */

7559

+ _Bool q = true;

7560

+ _Bool *pq = &q;

7561

7562

int

7563

main ()

7564

{

7565

- return !a + !b + !c + !d + !e + !f + !g + !h + !i;

7566

7567

+ *pq |= q;

7568

+ *pq |= ! q;

7569

+ /* Refer to every declared value, to avoid compiler optimizations. */

7570

+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l

7571

+ + !m + !n + !o + !p + !q + !pq);

7572

7573

;

7574

return 0;

7575

}

7576

_ACEOF

7577

rm -f conftest.$ac_objext

7578

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

7579

- (eval $ac_compile) 2>conftest.er1

7580

+if { (ac_try="$ac_compile"

7581

+case "(($ac_try" in

7582

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7583

+ *) ac_try_echo=$ac_try;;

7584

+esac

7585

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7586

+ (eval "$ac_compile") 2>conftest.er1

7587

ac_status=$?

7588

grep -v '^ *+' conftest.er1 >conftest.err

7589

rm -f conftest.er1

7590

cat conftest.err >&5

7591

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7592

- (exit $ac_status); } &&

7593

- { ac_try='test -z "$ac_c_werror_flag"

7594

- || test ! -s conftest.err'

7595

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7596

- (eval $ac_try) 2>&5

7597

- ac_status=$?

7598

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7599

- (exit $ac_status); }; } &&

7600

- { ac_try='test -s conftest.$ac_objext'

7601

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7602

- (eval $ac_try) 2>&5

7603

- ac_status=$?

7604

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7605

- (exit $ac_status); }; }; then

7606

+ (exit $ac_status); } && {

7607

+ test -z "$ac_c_werror_flag" ||

7608

+ test ! -s conftest.err

7609

+ } && test -s conftest.$ac_objext; then

7610

ac_cv_header_stdbool_h=yes

7611

else

7612

echo "$as_me: failed program was:" >&5

7613

sed 's/^/| /' conftest.$ac_ext >&5

7614

7615

-ac_cv_header_stdbool_h=no

7616

+ ac_cv_header_stdbool_h=no

7617

7618

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

7619

7620

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7621

7622

-echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5

7623

-echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6

7624

-echo "$as_me:$LINENO: checking for _Bool" >&5

7625

-echo $ECHO_N "checking for _Bool... $ECHO_C" >&6

7626

+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5

7627

+echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6; }

7628

+{ echo "$as_me:$LINENO: checking for _Bool" >&5

7629

+echo $ECHO_N "checking for _Bool... $ECHO_C" >&6; }

7630

if test "${ac_cv_type__Bool+set}" = set; then

7631

echo $ECHO_N "(cached) $ECHO_C" >&6

7632

else

7633

@@ -6959,50 +7522,47 @@

7634

cat >>conftest.$ac_ext <<_ACEOF

7635

/* end confdefs.h. */

7636

$ac_includes_default

7637

+typedef _Bool ac__type_new_;

7638

int

7639

main ()

7640

{

7641

-if ((_Bool *) 0)

7642

+if ((ac__type_new_ *) 0)

7643

return 0;

7644

-if (sizeof (_Bool))

7645

+if (sizeof (ac__type_new_))

7646

return 0;

7647

;

7648

return 0;

7649

}

7650

_ACEOF

7651

rm -f conftest.$ac_objext

7652

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

7653

- (eval $ac_compile) 2>conftest.er1

7654

+if { (ac_try="$ac_compile"

7655

+case "(($ac_try" in

7656

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7657

+ *) ac_try_echo=$ac_try;;

7658

+esac

7659

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7660

+ (eval "$ac_compile") 2>conftest.er1

7661

ac_status=$?

7662

grep -v '^ *+' conftest.er1 >conftest.err

7663

rm -f conftest.er1

7664

cat conftest.err >&5

7665

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7666

- (exit $ac_status); } &&

7667

- { ac_try='test -z "$ac_c_werror_flag"

7668

- || test ! -s conftest.err'

7669

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7670

- (eval $ac_try) 2>&5

7671

- ac_status=$?

7672

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7673

- (exit $ac_status); }; } &&

7674

- { ac_try='test -s conftest.$ac_objext'

7675

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7676

- (eval $ac_try) 2>&5

7677

- ac_status=$?

7678

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7679

- (exit $ac_status); }; }; then

7680

+ (exit $ac_status); } && {

7681

+ test -z "$ac_c_werror_flag" ||

7682

+ test ! -s conftest.err

7683

+ } && test -s conftest.$ac_objext; then

7684

ac_cv_type__Bool=yes

7685

else

7686

echo "$as_me: failed program was:" >&5

7687

sed 's/^/| /' conftest.$ac_ext >&5

7688

7689

-ac_cv_type__Bool=no

7690

+ ac_cv_type__Bool=no

7691

7692

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

7693

7694

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7695

7696

-echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5

7697

-echo "${ECHO_T}$ac_cv_type__Bool" >&6

7698

+{ echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5

7699

+echo "${ECHO_T}$ac_cv_type__Bool" >&6; }

7700

if test $ac_cv_type__Bool = yes; then

7701

7702

cat >>confdefs.h <<_ACEOF

7703

@@ -7028,8 +7588,8 @@

7704

# AM_GNU_GETTEXT

7705

7706

# Check for socklen_t

7707

-echo "$as_me:$LINENO: checking for socklen_t" >&5

7708

-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6

7709

+{ echo "$as_me:$LINENO: checking for socklen_t" >&5

7710

+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }

7711

if test "${ac_cv_type_socklen_t+set}" = set; then

7712

echo $ECHO_N "(cached) $ECHO_C" >&6

7713

else

7714

@@ -7058,8 +7618,8 @@

7715

7716

7717

7718

-echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5

7719

-echo "${ECHO_T}$ac_cv_type_socklen_t" >&6

7720

+{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5

7721

+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; }

7722

if test $ac_cv_type_socklen_t = no; then

7723

7724

cat >>confdefs.h <<\_ACEOF

7725

@@ -7070,8 +7630,8 @@

7726

7727

# -----------------------------------

7728

# Test if compiler supports bool

7729

-echo "$as_me:$LINENO: checking for bool" >&5

7730

-echo $ECHO_N "checking for bool... $ECHO_C" >&6

7731

+{ echo "$as_me:$LINENO: checking for bool" >&5

7732

+echo $ECHO_N "checking for bool... $ECHO_C" >&6; }

7733

cat >conftest.$ac_ext <<_ACEOF

7734

/* confdefs.h. */

7735

_ACEOF

7736

@@ -7094,30 +7654,25 @@

7737

}

7738

_ACEOF

7739

rm -f conftest.$ac_objext

7740

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

7741

- (eval $ac_compile) 2>conftest.er1

7742

+if { (ac_try="$ac_compile"

7743

+case "(($ac_try" in

7744

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7745

+ *) ac_try_echo=$ac_try;;

7746

+esac

7747

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7748

+ (eval "$ac_compile") 2>conftest.er1

7749

ac_status=$?

7750

grep -v '^ *+' conftest.er1 >conftest.err

7751

rm -f conftest.er1

7752

cat conftest.err >&5

7753

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7754

- (exit $ac_status); } &&

7755

- { ac_try='test -z "$ac_c_werror_flag"

7756

- || test ! -s conftest.err'

7757

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7758

- (eval $ac_try) 2>&5

7759

- ac_status=$?

7760

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7761

- (exit $ac_status); }; } &&

7762

- { ac_try='test -s conftest.$ac_objext'

7763

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7764

- (eval $ac_try) 2>&5

7765

- ac_status=$?

7766

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7767

- (exit $ac_status); }; }; then

7768

+ (exit $ac_status); } && {

7769

+ test -z "$ac_c_werror_flag" ||

7770

+ test ! -s conftest.err

7771

+ } && test -s conftest.$ac_objext; then

7772

7773

-echo "$as_me:$LINENO: result: yes" >&5

7774

-echo "${ECHO_T}yes" >&6

7775

+{ echo "$as_me:$LINENO: result: yes" >&5

7776

+echo "${ECHO_T}yes" >&6; }

7777

7778

cat >>confdefs.h <<\_ACEOF

7779

#define HAVE_BOOL 1

7780

@@ -7129,15 +7684,16 @@

7781

sed 's/^/| /' conftest.$ac_ext >&5

7782

7783

7784

-echo "$as_me:$LINENO: result: no" >&5

7785

-echo "${ECHO_T}no" >&6

7786

+{ echo "$as_me:$LINENO: result: no" >&5

7787

+echo "${ECHO_T}no" >&6; }

7788

7789

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

7790

7791

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7792

7793

# -----------------------------------

7794

# Test for direct I/O

7795

-echo "$as_me:$LINENO: checking for struct dioattr" >&5

7796

-echo $ECHO_N "checking for struct dioattr... $ECHO_C" >&6

7797

+{ echo "$as_me:$LINENO: checking for struct dioattr" >&5

7798

+echo $ECHO_N "checking for struct dioattr... $ECHO_C" >&6; }

7799

cat >conftest.$ac_ext <<_ACEOF

7800

/* confdefs.h. */

7801

_ACEOF

7802

@@ -7157,30 +7713,25 @@

7803

}

7804

_ACEOF

7805

rm -f conftest.$ac_objext

7806

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

7807

- (eval $ac_compile) 2>conftest.er1

7808

+if { (ac_try="$ac_compile"

7809

+case "(($ac_try" in

7810

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7811

+ *) ac_try_echo=$ac_try;;

7812

+esac

7813

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7814

+ (eval "$ac_compile") 2>conftest.er1

7815

ac_status=$?

7816

grep -v '^ *+' conftest.er1 >conftest.err

7817

rm -f conftest.er1

7818

cat conftest.err >&5

7819

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7820

- (exit $ac_status); } &&

7821

- { ac_try='test -z "$ac_c_werror_flag"

7822

- || test ! -s conftest.err'

7823

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7824

- (eval $ac_try) 2>&5

7825

- ac_status=$?

7826

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7827

- (exit $ac_status); }; } &&

7828

- { ac_try='test -s conftest.$ac_objext'

7829

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7830

- (eval $ac_try) 2>&5

7831

- ac_status=$?

7832

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7833

- (exit $ac_status); }; }; then

7834

+ (exit $ac_status); } && {

7835

+ test -z "$ac_c_werror_flag" ||

7836

+ test ! -s conftest.err

7837

+ } && test -s conftest.$ac_objext; then

7838

7839

-echo "$as_me:$LINENO: result: yes" >&5

7840

-echo "${ECHO_T}yes" >&6

7841

+{ echo "$as_me:$LINENO: result: yes" >&5

7842

+echo "${ECHO_T}yes" >&6; }

7843

7844

cat >>confdefs.h <<\_ACEOF

7845

#define HAVE_STRUCT_DIOATTR 1

7846

@@ -7191,15 +7742,16 @@

7847

sed 's/^/| /' conftest.$ac_ext >&5

7848

7849

7850

-echo "$as_me:$LINENO: result: no" >&5

7851

-echo "${ECHO_T}no" >&6

7852

+{ echo "$as_me:$LINENO: result: no" >&5

7853

+echo "${ECHO_T}no" >&6; }

7854

7855

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

7856

7857

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7858

7859

7860

save_LIBS=$LIBS

7861

-echo "$as_me:$LINENO: checking for main in -lm" >&5

7862

-echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6

7863

+{ echo "$as_me:$LINENO: checking for main in -lm" >&5

7864

+echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6; }

7865

if test "${ac_cv_lib_m_main+set}" = set; then

7866

echo $ECHO_N "(cached) $ECHO_C" >&6

7867

else

7868

@@ -7216,46 +7768,43 @@

7869

int

7870

main ()

7871

{

7872

-main ();

7873

+return main ();

7874

;

7875

return 0;

7876

}

7877

_ACEOF

7878

rm -f conftest.$ac_objext conftest$ac_exeext

7879

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7880

- (eval $ac_link) 2>conftest.er1

7881

+if { (ac_try="$ac_link"

7882

+case "(($ac_try" in

7883

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7884

+ *) ac_try_echo=$ac_try;;

7885

+esac

7886

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7887

+ (eval "$ac_link") 2>conftest.er1

7888

ac_status=$?

7889

grep -v '^ *+' conftest.er1 >conftest.err

7890

rm -f conftest.er1

7891

cat conftest.err >&5

7892

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7893

- (exit $ac_status); } &&

7894

- { ac_try='test -z "$ac_c_werror_flag"

7895

- || test ! -s conftest.err'

7896

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7897

- (eval $ac_try) 2>&5

7898

- ac_status=$?

7899

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7900

- (exit $ac_status); }; } &&

7901

- { ac_try='test -s conftest$ac_exeext'

7902

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7903

- (eval $ac_try) 2>&5

7904

- ac_status=$?

7905

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7906

- (exit $ac_status); }; }; then

7907

+ (exit $ac_status); } && {

7908

+ test -z "$ac_c_werror_flag" ||

7909

+ test ! -s conftest.err

7910

+ } && test -s conftest$ac_exeext &&

7911

+ $as_test_x conftest$ac_exeext; then

7912

ac_cv_lib_m_main=yes

7913

else

7914

echo "$as_me: failed program was:" >&5

7915

sed 's/^/| /' conftest.$ac_ext >&5

7916

7917

-ac_cv_lib_m_main=no

7918

+ ac_cv_lib_m_main=no

7919

7920

-rm -f conftest.err conftest.$ac_objext \

7921

7922

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7923

conftest$ac_exeext conftest.$ac_ext

7924

LIBS=$ac_check_lib_save_LIBS

7925

7926

-echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5

7927

-echo "${ECHO_T}$ac_cv_lib_m_main" >&6

7928

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5

7929

+echo "${ECHO_T}$ac_cv_lib_m_main" >&6; }

7930

if test $ac_cv_lib_m_main = yes; then

7931

MATH_LIBS="-lm"

7932

7933

@@ -7269,9 +7818,9 @@

7934

for ac_func in feenableexcept fesetenv

7935

7936

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

7937

-echo "$as_me:$LINENO: checking for $ac_func" >&5

7938

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

7939

-if eval "test \"\${$as_ac_var+set}\" = set"; then

7940

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

7941

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

7942

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

7943

echo $ECHO_N "(cached) $ECHO_C" >&6

7944

else

7945

cat >conftest.$ac_ext <<_ACEOF

7946

@@ -7297,68 +7846,60 @@

7947

7948

#undef $ac_func

7949

7950

-/* Override any gcc2 internal prototype to avoid an error. */

7951

+/* Override any GCC internal prototype to avoid an error.

7952

+ Use char because int might match the return type of a GCC

7953

+ builtin and then its argument prototype would still apply. */

7954

#ifdef __cplusplus

7955

extern "C"

7956

7957

#endif

7958

-/* We use char because int might match the return type of a gcc2

7959

- builtin and then its argument prototype would still apply. */

7960

char $ac_func ();

7961

/* The GNU C library defines this for functions which it implements

7962

to always fail with ENOSYS. Some functions are actually named

7963

something starting with __ and the normal name is an alias. */

7964

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

7965

+#if defined __stub_$ac_func || defined __stub___$ac_func

7966

choke me

7967

-#else

7968

-char (*f) () = $ac_func;

7969

-#endif

7970

-#ifdef __cplusplus

7971

7972

#endif

7973

7974

int

7975

main ()

7976

{

7977

-return f != $ac_func;

7978

+return $ac_func ();

7979

;

7980

return 0;

7981

}

7982

_ACEOF

7983

rm -f conftest.$ac_objext conftest$ac_exeext

7984

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7985

- (eval $ac_link) 2>conftest.er1

7986

+if { (ac_try="$ac_link"

7987

+case "(($ac_try" in

7988

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7989

+ *) ac_try_echo=$ac_try;;

7990

+esac

7991

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7992

+ (eval "$ac_link") 2>conftest.er1

7993

ac_status=$?

7994

grep -v '^ *+' conftest.er1 >conftest.err

7995

rm -f conftest.er1

7996

cat conftest.err >&5

7997

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7998

- (exit $ac_status); } &&

7999

- { ac_try='test -z "$ac_c_werror_flag"

8000

- || test ! -s conftest.err'

8001

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8002

- (eval $ac_try) 2>&5

8003

- ac_status=$?

8004

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8005

- (exit $ac_status); }; } &&

8006

- { ac_try='test -s conftest$ac_exeext'

8007

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8008

- (eval $ac_try) 2>&5

8009

- ac_status=$?

8010

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8011

- (exit $ac_status); }; }; then

8012

+ (exit $ac_status); } && {

8013

+ test -z "$ac_c_werror_flag" ||

8014

+ test ! -s conftest.err

8015

+ } && test -s conftest$ac_exeext &&

8016

+ $as_test_x conftest$ac_exeext; then

8017

eval "$as_ac_var=yes"

8018

else

8019

echo "$as_me: failed program was:" >&5

8020

sed 's/^/| /' conftest.$ac_ext >&5

8021

8022

-eval "$as_ac_var=no"

8023

+ eval "$as_ac_var=no"

8024

8025

-rm -f conftest.err conftest.$ac_objext \

8026

8027

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8028

conftest$ac_exeext conftest.$ac_ext

8029

8030

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

8031

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

8032

+ac_res=`eval echo '${'$as_ac_var'}'`

8033

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

8034

+echo "${ECHO_T}$ac_res" >&6; }

8035

if test `eval echo '${'$as_ac_var'}'` = yes; then

8036

cat >>confdefs.h <<_ACEOF

8037

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

8038

@@ -7374,17 +7915,17 @@

8039

save_CPPFLAGS=$CPPFLAGS

8040

save_LDFLAGS=$LDFLAGS

8041

if test "${ac_cv_header_libgen_h+set}" = set; then

8042

- echo "$as_me:$LINENO: checking for libgen.h" >&5

8043

-echo $ECHO_N "checking for libgen.h... $ECHO_C" >&6

8044

+ { echo "$as_me:$LINENO: checking for libgen.h" >&5

8045

+echo $ECHO_N "checking for libgen.h... $ECHO_C" >&6; }

8046

if test "${ac_cv_header_libgen_h+set}" = set; then

8047

echo $ECHO_N "(cached) $ECHO_C" >&6

8048

8049

-echo "$as_me:$LINENO: result: $ac_cv_header_libgen_h" >&5

8050

-echo "${ECHO_T}$ac_cv_header_libgen_h" >&6

8051

+{ echo "$as_me:$LINENO: result: $ac_cv_header_libgen_h" >&5

8052

+echo "${ECHO_T}$ac_cv_header_libgen_h" >&6; }

8053

else

8054

# Is the header compilable?

8055

-echo "$as_me:$LINENO: checking libgen.h usability" >&5

8056

-echo $ECHO_N "checking libgen.h usability... $ECHO_C" >&6

8057

+{ echo "$as_me:$LINENO: checking libgen.h usability" >&5

8058

+echo $ECHO_N "checking libgen.h usability... $ECHO_C" >&6; }

8059

cat >conftest.$ac_ext <<_ACEOF

8060

/* confdefs.h. */

8061

_ACEOF

8062

@@ -7395,41 +7936,37 @@

8063

#include <libgen.h>

8064

_ACEOF

8065

rm -f conftest.$ac_objext

8066

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

8067

- (eval $ac_compile) 2>conftest.er1

8068

+if { (ac_try="$ac_compile"

8069

+case "(($ac_try" in

8070

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8071

+ *) ac_try_echo=$ac_try;;

8072

+esac

8073

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8074

+ (eval "$ac_compile") 2>conftest.er1

8075

ac_status=$?

8076

grep -v '^ *+' conftest.er1 >conftest.err

8077

rm -f conftest.er1

8078

cat conftest.err >&5

8079

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8080

- (exit $ac_status); } &&

8081

- { ac_try='test -z "$ac_c_werror_flag"

8082

- || test ! -s conftest.err'

8083

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8084

- (eval $ac_try) 2>&5

8085

- ac_status=$?

8086

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8087

- (exit $ac_status); }; } &&

8088

- { ac_try='test -s conftest.$ac_objext'

8089

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8090

- (eval $ac_try) 2>&5

8091

- ac_status=$?

8092

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8093

- (exit $ac_status); }; }; then

8094

+ (exit $ac_status); } && {

8095

+ test -z "$ac_c_werror_flag" ||

8096

+ test ! -s conftest.err

8097

+ } && test -s conftest.$ac_objext; then

8098

ac_header_compiler=yes

8099

else

8100

echo "$as_me: failed program was:" >&5

8101

sed 's/^/| /' conftest.$ac_ext >&5

8102

8103

-ac_header_compiler=no

8104

+ ac_header_compiler=no

8105

8106

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

8107

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

8108

-echo "${ECHO_T}$ac_header_compiler" >&6

8109

8110

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

8111

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

8112

+echo "${ECHO_T}$ac_header_compiler" >&6; }

8113

8114

# Is the header present?

8115

-echo "$as_me:$LINENO: checking libgen.h presence" >&5

8116

-echo $ECHO_N "checking libgen.h presence... $ECHO_C" >&6

8117

+{ echo "$as_me:$LINENO: checking libgen.h presence" >&5

8118

+echo $ECHO_N "checking libgen.h presence... $ECHO_C" >&6; }

8119

cat >conftest.$ac_ext <<_ACEOF

8120

/* confdefs.h. */

8121

_ACEOF

8122

@@ -7438,24 +7975,22 @@

8123

/* end confdefs.h. */

8124

#include <libgen.h>

8125

_ACEOF

8126

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

8127

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

8128

+if { (ac_try="$ac_cpp conftest.$ac_ext"

8129

+case "(($ac_try" in

8130

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8131

+ *) ac_try_echo=$ac_try;;

8132

+esac

8133

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8134

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

8135

ac_status=$?

8136

grep -v '^ *+' conftest.er1 >conftest.err

8137

rm -f conftest.er1

8138

cat conftest.err >&5

8139

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8140

- (exit $ac_status); } >/dev/null; then

8141

- if test -s conftest.err; then

8142

- ac_cpp_err=$ac_c_preproc_warn_flag

8143

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

8144

- else

8145

- ac_cpp_err=

8146

- fi

8147

-else

8148

- ac_cpp_err=yes

8149

-fi

8150

-if test -z "$ac_cpp_err"; then

8151

+ (exit $ac_status); } >/dev/null && {

8152

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

8153

+ test ! -s conftest.err

8154

+ }; then

8155

ac_header_preproc=yes

8156

else

8157

echo "$as_me: failed program was:" >&5

8158

@@ -7463,9 +7998,10 @@

8159

8160

ac_header_preproc=no

8161

8162

8163

rm -f conftest.err conftest.$ac_ext

8164

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

8165

-echo "${ECHO_T}$ac_header_preproc" >&6

8166

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

8167

+echo "${ECHO_T}$ac_header_preproc" >&6; }

8168

8169

# So? What about this header?

8170

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

8171

@@ -7489,30 +8025,23 @@

8172

echo "$as_me: WARNING: libgen.h: proceeding with the preprocessor's result" >&2;}

8173

{ echo "$as_me:$LINENO: WARNING: libgen.h: in the future, the compiler will take precedence" >&5

8174

echo "$as_me: WARNING: libgen.h: in the future, the compiler will take precedence" >&2;}

8175

- (

8176

- cat <<\_ASBOX

8177

-## ----------------------------------- ##

8178

-## Report this to the graphviz lists. ##

8179

-## ----------------------------------- ##

8180

-_ASBOX

8181

- ) |

8182

- sed "s/^/$as_me: WARNING: /" >&2

8183

8184

;;

8185

esac

8186

-echo "$as_me:$LINENO: checking for libgen.h" >&5

8187

-echo $ECHO_N "checking for libgen.h... $ECHO_C" >&6

8188

+{ echo "$as_me:$LINENO: checking for libgen.h" >&5

8189

+echo $ECHO_N "checking for libgen.h... $ECHO_C" >&6; }

8190

if test "${ac_cv_header_libgen_h+set}" = set; then

8191

echo $ECHO_N "(cached) $ECHO_C" >&6

8192

else

8193

ac_cv_header_libgen_h=$ac_header_preproc

8194

8195

-echo "$as_me:$LINENO: result: $ac_cv_header_libgen_h" >&5

8196

-echo "${ECHO_T}$ac_cv_header_libgen_h" >&6

8197

+{ echo "$as_me:$LINENO: result: $ac_cv_header_libgen_h" >&5

8198

+echo "${ECHO_T}$ac_cv_header_libgen_h" >&6; }

8199

8200

8201

if test $ac_cv_header_libgen_h = yes; then

8202

- echo "$as_me:$LINENO: checking for basename in -lgen" >&5

8203

-echo $ECHO_N "checking for basename in -lgen... $ECHO_C" >&6

8204

+ { echo "$as_me:$LINENO: checking for basename in -lgen" >&5

8205

+echo $ECHO_N "checking for basename in -lgen... $ECHO_C" >&6; }

8206

if test "${ac_cv_lib_gen_basename+set}" = set; then

8207

echo $ECHO_N "(cached) $ECHO_C" >&6

8208

else

8209

@@ -7525,56 +8054,53 @@

8210

cat >>conftest.$ac_ext <<_ACEOF

8211

/* end confdefs.h. */

8212

8213

-/* Override any gcc2 internal prototype to avoid an error. */

8214

+/* Override any GCC internal prototype to avoid an error.

8215

+ Use char because int might match the return type of a GCC

8216

+ builtin and then its argument prototype would still apply. */

8217

#ifdef __cplusplus

8218

extern "C"

8219

#endif

8220

-/* We use char because int might match the return type of a gcc2

8221

- builtin and then its argument prototype would still apply. */

8222

char basename ();

8223

int

8224

main ()

8225

{

8226

-basename ();

8227

+return basename ();

8228

;

8229

return 0;

8230

}

8231

_ACEOF

8232

rm -f conftest.$ac_objext conftest$ac_exeext

8233

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8234

- (eval $ac_link) 2>conftest.er1

8235

+if { (ac_try="$ac_link"

8236

+case "(($ac_try" in

8237

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8238

+ *) ac_try_echo=$ac_try;;

8239

+esac

8240

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8241

+ (eval "$ac_link") 2>conftest.er1

8242

ac_status=$?

8243

grep -v '^ *+' conftest.er1 >conftest.err

8244

rm -f conftest.er1

8245

cat conftest.err >&5

8246

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8247

- (exit $ac_status); } &&

8248

- { ac_try='test -z "$ac_c_werror_flag"

8249

- || test ! -s conftest.err'

8250

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8251

- (eval $ac_try) 2>&5

8252

- ac_status=$?

8253

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8254

- (exit $ac_status); }; } &&

8255

- { ac_try='test -s conftest$ac_exeext'

8256

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8257

- (eval $ac_try) 2>&5

8258

- ac_status=$?

8259

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8260

- (exit $ac_status); }; }; then

8261

+ (exit $ac_status); } && {

8262

+ test -z "$ac_c_werror_flag" ||

8263

+ test ! -s conftest.err

8264

+ } && test -s conftest$ac_exeext &&

8265

+ $as_test_x conftest$ac_exeext; then

8266

ac_cv_lib_gen_basename=yes

8267

else

8268

echo "$as_me: failed program was:" >&5

8269

sed 's/^/| /' conftest.$ac_ext >&5

8270

8271

-ac_cv_lib_gen_basename=no

8272

+ ac_cv_lib_gen_basename=no

8273

8274

-rm -f conftest.err conftest.$ac_objext \

8275

8276

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8277

conftest$ac_exeext conftest.$ac_ext

8278

LIBS=$ac_check_lib_save_LIBS

8279

8280

-echo "$as_me:$LINENO: result: $ac_cv_lib_gen_basename" >&5

8281

-echo "${ECHO_T}$ac_cv_lib_gen_basename" >&6

8282

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gen_basename" >&5

8283

+echo "${ECHO_T}$ac_cv_lib_gen_basename" >&6; }

8284

if test $ac_cv_lib_gen_basename = yes; then

8285

LIBGEN_LIBS="-lgen"

8286

8287

@@ -7599,8 +8125,8 @@

8288

# Checks for library functions

8289

# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works

8290

# for constant arguments. Useless!

8291

-echo "$as_me:$LINENO: checking for working alloca.h" >&5

8292

-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6

8293

+{ echo "$as_me:$LINENO: checking for working alloca.h" >&5

8294

+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }

8295

if test "${ac_cv_working_alloca_h+set}" = set; then

8296

echo $ECHO_N "(cached) $ECHO_C" >&6

8297

else

8298

@@ -7615,44 +8141,42 @@

8299

main ()

8300

{

8301

char *p = (char *) alloca (2 * sizeof (int));

8302

+ if (p) return 0;

8303

;

8304

return 0;

8305

}

8306

_ACEOF

8307

rm -f conftest.$ac_objext conftest$ac_exeext

8308

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8309

- (eval $ac_link) 2>conftest.er1

8310

+if { (ac_try="$ac_link"

8311

+case "(($ac_try" in

8312

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8313

+ *) ac_try_echo=$ac_try;;

8314

+esac

8315

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8316

+ (eval "$ac_link") 2>conftest.er1

8317

ac_status=$?

8318

grep -v '^ *+' conftest.er1 >conftest.err

8319

rm -f conftest.er1

8320

cat conftest.err >&5

8321

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8322

- (exit $ac_status); } &&

8323

- { ac_try='test -z "$ac_c_werror_flag"

8324

- || test ! -s conftest.err'

8325

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8326

- (eval $ac_try) 2>&5

8327

- ac_status=$?

8328

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8329

- (exit $ac_status); }; } &&

8330

- { ac_try='test -s conftest$ac_exeext'

8331

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8332

- (eval $ac_try) 2>&5

8333

- ac_status=$?

8334

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8335

- (exit $ac_status); }; }; then

8336

+ (exit $ac_status); } && {

8337

+ test -z "$ac_c_werror_flag" ||

8338

+ test ! -s conftest.err

8339

+ } && test -s conftest$ac_exeext &&

8340

+ $as_test_x conftest$ac_exeext; then

8341

ac_cv_working_alloca_h=yes

8342

else

8343

echo "$as_me: failed program was:" >&5

8344

sed 's/^/| /' conftest.$ac_ext >&5

8345

8346

-ac_cv_working_alloca_h=no

8347

+ ac_cv_working_alloca_h=no

8348

8349

-rm -f conftest.err conftest.$ac_objext \

8350

8351

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8352

conftest$ac_exeext conftest.$ac_ext

8353

8354

-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5

8355

-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6

8356

+{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5

8357

+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }

8358

if test $ac_cv_working_alloca_h = yes; then

8359

8360

cat >>confdefs.h <<\_ACEOF

8361

@@ -7661,8 +8185,8 @@

8362

8363

8364

8365

-echo "$as_me:$LINENO: checking for alloca" >&5

8366

-echo $ECHO_N "checking for alloca... $ECHO_C" >&6

8367

+{ echo "$as_me:$LINENO: checking for alloca" >&5

8368

+echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }

8369

if test "${ac_cv_func_alloca_works+set}" = set; then

8370

echo $ECHO_N "(cached) $ECHO_C" >&6

8371

else

8372

@@ -7679,7 +8203,7 @@

8373

# include <malloc.h>

8374

# define alloca _alloca

8375

# else

8376

-# if HAVE_ALLOCA_H

8377

+# ifdef HAVE_ALLOCA_H

8378

# include <alloca.h>

8379

# else

8380

# ifdef _AIX

8381

@@ -7697,44 +8221,42 @@

8382

main ()

8383

{

8384

char *p = (char *) alloca (1);

8385

+ if (p) return 0;

8386

;

8387

return 0;

8388

}

8389

_ACEOF

8390

rm -f conftest.$ac_objext conftest$ac_exeext

8391

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8392

- (eval $ac_link) 2>conftest.er1

8393

+if { (ac_try="$ac_link"

8394

+case "(($ac_try" in

8395

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8396

+ *) ac_try_echo=$ac_try;;

8397

+esac

8398

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8399

+ (eval "$ac_link") 2>conftest.er1

8400

ac_status=$?

8401

grep -v '^ *+' conftest.er1 >conftest.err

8402

rm -f conftest.er1

8403

cat conftest.err >&5

8404

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8405

- (exit $ac_status); } &&

8406

- { ac_try='test -z "$ac_c_werror_flag"

8407

- || test ! -s conftest.err'

8408

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8409

- (eval $ac_try) 2>&5

8410

- ac_status=$?

8411

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8412

- (exit $ac_status); }; } &&

8413

- { ac_try='test -s conftest$ac_exeext'

8414

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8415

- (eval $ac_try) 2>&5

8416

- ac_status=$?

8417

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8418

- (exit $ac_status); }; }; then

8419

+ (exit $ac_status); } && {

8420

+ test -z "$ac_c_werror_flag" ||

8421

+ test ! -s conftest.err

8422

+ } && test -s conftest$ac_exeext &&

8423

+ $as_test_x conftest$ac_exeext; then

8424

ac_cv_func_alloca_works=yes

8425

else

8426

echo "$as_me: failed program was:" >&5

8427

sed 's/^/| /' conftest.$ac_ext >&5

8428

8429

-ac_cv_func_alloca_works=no

8430

+ ac_cv_func_alloca_works=no

8431

8432

-rm -f conftest.err conftest.$ac_objext \

8433

8434

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8435

conftest$ac_exeext conftest.$ac_ext

8436

8437

-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5

8438

-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6

8439

+{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5

8440

+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }

8441

8442

if test $ac_cv_func_alloca_works = yes; then

8443

8444

@@ -7748,15 +8270,15 @@

8445

# contain a buggy version. If you still want to use their alloca,

8446

# use ar to extract alloca.o from them instead of compiling alloca.c.

8447

8448

-ALLOCA=alloca.$ac_objext

8449

+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext

8450

8451

cat >>confdefs.h <<\_ACEOF

8452

#define C_ALLOCA 1

8453

_ACEOF

8454

8455

8456

-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5

8457

-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6

8458

+{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5

8459

+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }

8460

if test "${ac_cv_os_cray+set}" = set; then

8461

echo $ECHO_N "(cached) $ECHO_C" >&6

8462

else

8463

@@ -7766,7 +8288,7 @@

8464

cat confdefs.h >>conftest.$ac_ext

8465

cat >>conftest.$ac_ext <<_ACEOF

8466

/* end confdefs.h. */

8467

-#if defined(CRAY) && ! defined(CRAY2)

8468

+#if defined CRAY && ! defined CRAY2

8469

webecray

8470

#else

8471

wenotbecray

8472

@@ -7782,14 +8304,14 @@

8473

rm -f conftest*

8474

8475

8476

-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5

8477

-echo "${ECHO_T}$ac_cv_os_cray" >&6

8478

+{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5

8479

+echo "${ECHO_T}$ac_cv_os_cray" >&6; }

8480

if test $ac_cv_os_cray = yes; then

8481

for ac_func in _getb67 GETB67 getb67; do

8482

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

8483

-echo "$as_me:$LINENO: checking for $ac_func" >&5

8484

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

8485

-if eval "test \"\${$as_ac_var+set}\" = set"; then

8486

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

8487

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

8488

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

8489

echo $ECHO_N "(cached) $ECHO_C" >&6

8490

else

8491

cat >conftest.$ac_ext <<_ACEOF

8492

@@ -7815,68 +8337,60 @@

8493

8494

#undef $ac_func

8495

8496

-/* Override any gcc2 internal prototype to avoid an error. */

8497

+/* Override any GCC internal prototype to avoid an error.

8498

+ Use char because int might match the return type of a GCC

8499

+ builtin and then its argument prototype would still apply. */

8500

#ifdef __cplusplus

8501

extern "C"

8502

8503

#endif

8504

-/* We use char because int might match the return type of a gcc2

8505

- builtin and then its argument prototype would still apply. */

8506

char $ac_func ();

8507

/* The GNU C library defines this for functions which it implements

8508

to always fail with ENOSYS. Some functions are actually named

8509

something starting with __ and the normal name is an alias. */

8510

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

8511

+#if defined __stub_$ac_func || defined __stub___$ac_func

8512

choke me

8513

-#else

8514

-char (*f) () = $ac_func;

8515

-#endif

8516

-#ifdef __cplusplus

8517

8518

#endif

8519

8520

int

8521

main ()

8522

{

8523

-return f != $ac_func;

8524

+return $ac_func ();

8525

;

8526

return 0;

8527

}

8528

_ACEOF

8529

rm -f conftest.$ac_objext conftest$ac_exeext

8530

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8531

- (eval $ac_link) 2>conftest.er1

8532

+if { (ac_try="$ac_link"

8533

+case "(($ac_try" in

8534

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8535

+ *) ac_try_echo=$ac_try;;

8536

+esac

8537

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8538

+ (eval "$ac_link") 2>conftest.er1

8539

ac_status=$?

8540

grep -v '^ *+' conftest.er1 >conftest.err

8541

rm -f conftest.er1

8542

cat conftest.err >&5

8543

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8544

- (exit $ac_status); } &&

8545

- { ac_try='test -z "$ac_c_werror_flag"

8546

- || test ! -s conftest.err'

8547

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8548

- (eval $ac_try) 2>&5

8549

- ac_status=$?

8550

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8551

- (exit $ac_status); }; } &&

8552

- { ac_try='test -s conftest$ac_exeext'

8553

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8554

- (eval $ac_try) 2>&5

8555

- ac_status=$?

8556

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8557

- (exit $ac_status); }; }; then

8558

+ (exit $ac_status); } && {

8559

+ test -z "$ac_c_werror_flag" ||

8560

+ test ! -s conftest.err

8561

+ } && test -s conftest$ac_exeext &&

8562

+ $as_test_x conftest$ac_exeext; then

8563

eval "$as_ac_var=yes"

8564

else

8565

echo "$as_me: failed program was:" >&5

8566

sed 's/^/| /' conftest.$ac_ext >&5

8567

8568

-eval "$as_ac_var=no"

8569

+ eval "$as_ac_var=no"

8570

8571

-rm -f conftest.err conftest.$ac_objext \

8572

8573

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8574

conftest$ac_exeext conftest.$ac_ext

8575

8576

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

8577

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

8578

+ac_res=`eval echo '${'$as_ac_var'}'`

8579

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

8580

+echo "${ECHO_T}$ac_res" >&6; }

8581

if test `eval echo '${'$as_ac_var'}'` = yes; then

8582

8583

cat >>confdefs.h <<_ACEOF

8584

@@ -7889,8 +8403,8 @@

8585

done

8586

8587

8588

-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5

8589

-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6

8590

+{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5

8591

+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }

8592

if test "${ac_cv_c_stack_direction+set}" = set; then

8593

echo $ECHO_N "(cached) $ECHO_C" >&6

8594

else

8595

@@ -7903,6 +8417,7 @@

8596

cat confdefs.h >>conftest.$ac_ext

8597

cat >>conftest.$ac_ext <<_ACEOF

8598

/* end confdefs.h. */

8599

+$ac_includes_default

8600

int

8601

find_stack_direction ()

8602

{

8603

@@ -7920,17 +8435,26 @@

8604

int

8605

main ()

8606

{

8607

- exit (find_stack_direction () < 0);

8608

+ return find_stack_direction () < 0;

8609

}

8610

_ACEOF

8611

rm -f conftest$ac_exeext

8612

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8613

- (eval $ac_link) 2>&5

8614

+if { (ac_try="$ac_link"

8615

+case "(($ac_try" in

8616

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8617

+ *) ac_try_echo=$ac_try;;

8618

+esac

8619

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8620

+ (eval "$ac_link") 2>&5

8621

ac_status=$?

8622

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8623

(exit $ac_status); } && { ac_try='./conftest$ac_exeext'

8624

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8625

- (eval $ac_try) 2>&5

8626

+ { (case "(($ac_try" in

8627

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8628

+ *) ac_try_echo=$ac_try;;

8629

+esac

8630

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8631

+ (eval "$ac_try") 2>&5

8632

ac_status=$?

8633

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8634

(exit $ac_status); }; }; then

8635

@@ -7943,11 +8467,13 @@

8636

( exit $ac_status )

8637

ac_cv_c_stack_direction=-1

8638

8639

-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

8640

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

8641

8642

8643

8644

8645

-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5

8646

-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6

8647

+{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5

8648

+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }

8649

8650

cat >>confdefs.h <<_ACEOF

8651

#define STACK_DIRECTION $ac_cv_c_stack_direction

8652

@@ -7979,9 +8505,9 @@

8653

strtoul strtoll strtoull uname

8654

8655

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

8656

-echo "$as_me:$LINENO: checking for $ac_func" >&5

8657

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

8658

-if eval "test \"\${$as_ac_var+set}\" = set"; then

8659

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

8660

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

8661

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

8662

echo $ECHO_N "(cached) $ECHO_C" >&6

8663

else

8664

cat >conftest.$ac_ext <<_ACEOF

8665

@@ -8007,68 +8533,60 @@

8666

8667

#undef $ac_func

8668

8669

-/* Override any gcc2 internal prototype to avoid an error. */

8670

+/* Override any GCC internal prototype to avoid an error.

8671

+ Use char because int might match the return type of a GCC

8672

+ builtin and then its argument prototype would still apply. */

8673

#ifdef __cplusplus

8674

extern "C"

8675

8676

#endif

8677

-/* We use char because int might match the return type of a gcc2

8678

- builtin and then its argument prototype would still apply. */

8679

char $ac_func ();

8680

/* The GNU C library defines this for functions which it implements

8681

to always fail with ENOSYS. Some functions are actually named

8682

something starting with __ and the normal name is an alias. */

8683

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

8684

+#if defined __stub_$ac_func || defined __stub___$ac_func

8685

choke me

8686

-#else

8687

-char (*f) () = $ac_func;

8688

-#endif

8689

-#ifdef __cplusplus

8690

8691

#endif

8692

8693

int

8694

main ()

8695

{

8696

-return f != $ac_func;

8697

+return $ac_func ();

8698

;

8699

return 0;

8700

}

8701

_ACEOF

8702

rm -f conftest.$ac_objext conftest$ac_exeext

8703

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8704

- (eval $ac_link) 2>conftest.er1

8705

+if { (ac_try="$ac_link"

8706

+case "(($ac_try" in

8707

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8708

+ *) ac_try_echo=$ac_try;;

8709

+esac

8710

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8711

+ (eval "$ac_link") 2>conftest.er1

8712

ac_status=$?

8713

grep -v '^ *+' conftest.er1 >conftest.err

8714

rm -f conftest.er1

8715

cat conftest.err >&5

8716

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8717

- (exit $ac_status); } &&

8718

- { ac_try='test -z "$ac_c_werror_flag"

8719

- || test ! -s conftest.err'

8720

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8721

- (eval $ac_try) 2>&5

8722

- ac_status=$?

8723

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8724

- (exit $ac_status); }; } &&

8725

- { ac_try='test -s conftest$ac_exeext'

8726

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8727

- (eval $ac_try) 2>&5

8728

- ac_status=$?

8729

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8730

- (exit $ac_status); }; }; then

8731

+ (exit $ac_status); } && {

8732

+ test -z "$ac_c_werror_flag" ||

8733

+ test ! -s conftest.err

8734

+ } && test -s conftest$ac_exeext &&

8735

+ $as_test_x conftest$ac_exeext; then

8736

eval "$as_ac_var=yes"

8737

else

8738

echo "$as_me: failed program was:" >&5

8739

sed 's/^/| /' conftest.$ac_ext >&5

8740

8741

-eval "$as_ac_var=no"

8742

+ eval "$as_ac_var=no"

8743

8744

-rm -f conftest.err conftest.$ac_objext \

8745

8746

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8747

conftest$ac_exeext conftest.$ac_ext

8748

8749

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

8750

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

8751

+ac_res=`eval echo '${'$as_ac_var'}'`

8752

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

8753

+echo "${ECHO_T}$ac_res" >&6; }

8754

if test `eval echo '${'$as_ac_var'}'` = yes; then

8755

cat >>confdefs.h <<_ACEOF

8756

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

8757

@@ -8083,9 +8601,9 @@

8758

for ac_func in strcasecmp strncasecmp

8759

8760

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

8761

-echo "$as_me:$LINENO: checking for $ac_func" >&5

8762

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

8763

-if eval "test \"\${$as_ac_var+set}\" = set"; then

8764

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

8765

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

8766

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

8767

echo $ECHO_N "(cached) $ECHO_C" >&6

8768

else

8769

cat >conftest.$ac_ext <<_ACEOF

8770

@@ -8111,80 +8629,70 @@

8771

8772

#undef $ac_func

8773

8774

-/* Override any gcc2 internal prototype to avoid an error. */

8775

+/* Override any GCC internal prototype to avoid an error.

8776

+ Use char because int might match the return type of a GCC

8777

+ builtin and then its argument prototype would still apply. */

8778

#ifdef __cplusplus

8779

extern "C"

8780

8781

#endif

8782

-/* We use char because int might match the return type of a gcc2

8783

- builtin and then its argument prototype would still apply. */

8784

char $ac_func ();

8785

/* The GNU C library defines this for functions which it implements

8786

to always fail with ENOSYS. Some functions are actually named

8787

something starting with __ and the normal name is an alias. */

8788

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

8789

+#if defined __stub_$ac_func || defined __stub___$ac_func

8790

choke me

8791

-#else

8792

-char (*f) () = $ac_func;

8793

-#endif

8794

-#ifdef __cplusplus

8795

8796

#endif

8797

8798

int

8799

main ()

8800

{

8801

-return f != $ac_func;

8802

+return $ac_func ();

8803

;

8804

return 0;

8805

}

8806

_ACEOF

8807

rm -f conftest.$ac_objext conftest$ac_exeext

8808

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8809

- (eval $ac_link) 2>conftest.er1

8810

+if { (ac_try="$ac_link"

8811

+case "(($ac_try" in

8812

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8813

+ *) ac_try_echo=$ac_try;;

8814

+esac

8815

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8816

+ (eval "$ac_link") 2>conftest.er1

8817

ac_status=$?

8818

grep -v '^ *+' conftest.er1 >conftest.err

8819

rm -f conftest.er1

8820

cat conftest.err >&5

8821

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8822

- (exit $ac_status); } &&

8823

- { ac_try='test -z "$ac_c_werror_flag"

8824

- || test ! -s conftest.err'

8825

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8826

- (eval $ac_try) 2>&5

8827

- ac_status=$?

8828

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8829

- (exit $ac_status); }; } &&

8830

- { ac_try='test -s conftest$ac_exeext'

8831

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8832

- (eval $ac_try) 2>&5

8833

- ac_status=$?

8834

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8835

- (exit $ac_status); }; }; then

8836

+ (exit $ac_status); } && {

8837

+ test -z "$ac_c_werror_flag" ||

8838

+ test ! -s conftest.err

8839

+ } && test -s conftest$ac_exeext &&

8840

+ $as_test_x conftest$ac_exeext; then

8841

eval "$as_ac_var=yes"

8842

else

8843

echo "$as_me: failed program was:" >&5

8844

sed 's/^/| /' conftest.$ac_ext >&5

8845

8846

-eval "$as_ac_var=no"

8847

+ eval "$as_ac_var=no"

8848

8849

-rm -f conftest.err conftest.$ac_objext \

8850

8851

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8852

conftest$ac_exeext conftest.$ac_ext

8853

8854

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

8855

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

8856

+ac_res=`eval echo '${'$as_ac_var'}'`

8857

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

8858

+echo "${ECHO_T}$ac_res" >&6; }

8859

if test `eval echo '${'$as_ac_var'}'` = yes; then

8860

cat >>confdefs.h <<_ACEOF

8861

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

8862

_ACEOF

8863

8864

else

8865

- case $LIBOBJS in

8866

- "$ac_func.$ac_objext" | \

8867

- *" $ac_func.$ac_objext" | \

8868

- "$ac_func.$ac_objext "* | \

8869

+ case " $LIBOBJS " in

8870

*" $ac_func.$ac_objext "* ) ;;

8871

- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;

8872

+ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"

8873

+ ;;

8874

esac

8875

8876

8877

@@ -8193,25 +8701,23 @@

8878

8879

8880

8881

-# Check whether --enable-ltdl or --disable-ltdl was given.

8882

+# Check whether --enable-ltdl was given.

8883

if test "${enable_ltdl+set}" = set; then

8884

- enableval="$enable_ltdl"

8885

+ enableval=$enable_ltdl;

8886

+fi

8887

8888

-fi;

8889

if test "x$enable_ltdl" != "xno"; then

8890

8891

cat >>confdefs.h <<\_ACEOF

8892

#define ENABLE_LTDL 1

8893

_ACEOF

8894

8895

+ subdirs="$subdirs libltdl"

8896

8897

8898

-subdirs="$subdirs libltdl"

8899

8900

8901

8902

- echo "$as_me:$LINENO: checking for lt_dlinit in -lltdl" >&5

8903

-echo $ECHO_N "checking for lt_dlinit in -lltdl... $ECHO_C" >&6

8904

+ { echo "$as_me:$LINENO: checking for lt_dlinit in -lltdl" >&5

8905

+echo $ECHO_N "checking for lt_dlinit in -lltdl... $ECHO_C" >&6; }

8906

if test "${ac_cv_lib_ltdl_lt_dlinit+set}" = set; then

8907

echo $ECHO_N "(cached) $ECHO_C" >&6

8908

else

8909

@@ -8224,56 +8730,53 @@

8910

cat >>conftest.$ac_ext <<_ACEOF

8911

/* end confdefs.h. */

8912

8913

-/* Override any gcc2 internal prototype to avoid an error. */

8914

+/* Override any GCC internal prototype to avoid an error.

8915

+ Use char because int might match the return type of a GCC

8916

+ builtin and then its argument prototype would still apply. */

8917

#ifdef __cplusplus

8918

extern "C"

8919

#endif

8920

-/* We use char because int might match the return type of a gcc2

8921

- builtin and then its argument prototype would still apply. */

8922

char lt_dlinit ();

8923

int

8924

main ()

8925

{

8926

-lt_dlinit ();

8927

+return lt_dlinit ();

8928

;

8929

return 0;

8930

}

8931

_ACEOF

8932

rm -f conftest.$ac_objext conftest$ac_exeext

8933

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8934

- (eval $ac_link) 2>conftest.er1

8935

+if { (ac_try="$ac_link"

8936

+case "(($ac_try" in

8937

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8938

+ *) ac_try_echo=$ac_try;;

8939

+esac

8940

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8941

+ (eval "$ac_link") 2>conftest.er1

8942

ac_status=$?

8943

grep -v '^ *+' conftest.er1 >conftest.err

8944

rm -f conftest.er1

8945

cat conftest.err >&5

8946

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8947

- (exit $ac_status); } &&

8948

- { ac_try='test -z "$ac_c_werror_flag"

8949

- || test ! -s conftest.err'

8950

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8951

- (eval $ac_try) 2>&5

8952

- ac_status=$?

8953

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8954

- (exit $ac_status); }; } &&

8955

- { ac_try='test -s conftest$ac_exeext'

8956

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8957

- (eval $ac_try) 2>&5

8958

- ac_status=$?

8959

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8960

- (exit $ac_status); }; }; then

8961

+ (exit $ac_status); } && {

8962

+ test -z "$ac_c_werror_flag" ||

8963

+ test ! -s conftest.err

8964

+ } && test -s conftest$ac_exeext &&

8965

+ $as_test_x conftest$ac_exeext; then

8966

ac_cv_lib_ltdl_lt_dlinit=yes

8967

else

8968

echo "$as_me: failed program was:" >&5

8969

sed 's/^/| /' conftest.$ac_ext >&5

8970

8971

-ac_cv_lib_ltdl_lt_dlinit=no

8972

+ ac_cv_lib_ltdl_lt_dlinit=no

8973

8974

-rm -f conftest.err conftest.$ac_objext \

8975

8976

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8977

conftest$ac_exeext conftest.$ac_ext

8978

LIBS=$ac_check_lib_save_LIBS

8979

8980

-echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlinit" >&5

8981

-echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlinit" >&6

8982

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlinit" >&5

8983

+echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlinit" >&6; }

8984

if test $ac_cv_lib_ltdl_lt_dlinit = yes; then

8985

test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no

8986

else

8987

@@ -8311,10 +8814,9 @@

8988

8989

8990

8991

-# Check whether --enable-fast-install or --disable-fast-install was given.

8992

+# Check whether --enable-fast-install was given.

8993

if test "${enable_fast_install+set}" = set; then

8994

- enableval="$enable_fast_install"

8995

- p=${PACKAGE-default}

8996

+ enableval=$enable_fast_install; p=${PACKAGE-default}

8997

case $enableval in

8998

yes) enable_fast_install=yes ;;

8999

no) enable_fast_install=no ;;

9000

@@ -8333,10 +8835,11 @@

9001

esac

9002

else

9003

enable_fast_install=yes

9004

-fi;

9005

+fi

9006

9007

9008

-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5

9009

-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6

9010

+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5

9011

+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }

9012

if test "${lt_cv_path_SED+set}" = set; then

9013

echo $ECHO_N "(cached) $ECHO_C" >&6

9014

else

9015

@@ -8389,22 +8892,22 @@

9016

9017

9018

SED=$lt_cv_path_SED

9019

-echo "$as_me:$LINENO: result: $SED" >&5

9020

-echo "${ECHO_T}$SED" >&6

9021

+{ echo "$as_me:$LINENO: result: $SED" >&5

9022

+echo "${ECHO_T}$SED" >&6; }

9023

9024

9025

-# Check whether --with-gnu-ld or --without-gnu-ld was given.

9026

+# Check whether --with-gnu-ld was given.

9027

if test "${with_gnu_ld+set}" = set; then

9028

- withval="$with_gnu_ld"

9029

- test "$withval" = no || with_gnu_ld=yes

9030

+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

9031

else

9032

with_gnu_ld=no

9033

-fi;

9034

+fi

9035

9036

ac_prog=ld

9037

if test "$GCC" = yes; then

9038

# Check if gcc -print-prog-name=ld gives a path.

9039

- echo "$as_me:$LINENO: checking for ld used by $CC" >&5

9040

-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6

9041

+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

9042

+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

9043

case $host in

9044

*-*-mingw*)

9045

# gcc leaves a trailing carriage return which upsets mingw

9046

@@ -8433,11 +8936,11 @@

9047

;;

9048

esac

9049

elif test "$with_gnu_ld" = yes; then

9050

- echo "$as_me:$LINENO: checking for GNU ld" >&5

9051

-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6

9052

+ { echo "$as_me:$LINENO: checking for GNU ld" >&5

9053

+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

9054

else

9055

- echo "$as_me:$LINENO: checking for non-GNU ld" >&5

9056

-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6

9057

+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

9058

+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

9059

9060

if test "${lt_cv_path_LD+set}" = set; then

9061

echo $ECHO_N "(cached) $ECHO_C" >&6

9062

@@ -8470,17 +8973,17 @@

9063

9064

LD="$lt_cv_path_LD"

9065

if test -n "$LD"; then

9066

- echo "$as_me:$LINENO: result: $LD" >&5

9067

-echo "${ECHO_T}$LD" >&6

9068

+ { echo "$as_me:$LINENO: result: $LD" >&5

9069

+echo "${ECHO_T}$LD" >&6; }

9070

else

9071

- echo "$as_me:$LINENO: result: no" >&5

9072

-echo "${ECHO_T}no" >&6

9073

+ { echo "$as_me:$LINENO: result: no" >&5

9074

+echo "${ECHO_T}no" >&6; }

9075

9076

test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

9077

echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

9078

{ (exit 1); exit 1; }; }

9079

-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

9080

-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6

9081

+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

9082

+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

9083

if test "${lt_cv_prog_gnu_ld+set}" = set; then

9084

echo $ECHO_N "(cached) $ECHO_C" >&6

9085

else

9086

@@ -8494,20 +8997,20 @@

9087

;;

9088

esac

9089

9090

-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

9091

-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6

9092

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

9093

+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

9094

with_gnu_ld=$lt_cv_prog_gnu_ld

9095

9096

9097

-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5

9098

-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6

9099

+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5

9100

+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }

9101

if test "${lt_cv_ld_reload_flag+set}" = set; then

9102

echo $ECHO_N "(cached) $ECHO_C" >&6

9103

else

9104

lt_cv_ld_reload_flag='-r'

9105

9106

-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5

9107

-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6

9108

+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5

9109

+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }

9110

reload_flag=$lt_cv_ld_reload_flag

9111

case $reload_flag in

9112

"" | " "*) ;;

9113

@@ -8524,8 +9027,8 @@

9114

;;

9115

esac

9116

9117

-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5

9118

-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6

9119

+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5

9120

+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }

9121

if test "${lt_cv_path_NM+set}" = set; then

9122

echo $ECHO_N "(cached) $ECHO_C" >&6

9123

else

9124

@@ -8573,12 +9076,12 @@

9125

test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm

9126

9127

9128

-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5

9129

-echo "${ECHO_T}$lt_cv_path_NM" >&6

9130

+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5

9131

+echo "${ECHO_T}$lt_cv_path_NM" >&6; }

9132

NM="$lt_cv_path_NM"

9133

9134

-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5

9135

-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6

9136

+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5

9137

+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }

9138

if test "${lt_cv_deplibs_check_method+set}" = set; then

9139

echo $ECHO_N "(cached) $ECHO_C" >&6

9140

else

9141

@@ -8753,8 +9256,8 @@

9142

esac

9143

9144

9145

-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5

9146

-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6

9147

+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5

9148

+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }

9149

file_magic_cmd=$lt_cv_file_magic_cmd

9150

deplibs_check_method=$lt_cv_deplibs_check_method

9151

test -z "$deplibs_check_method" && deplibs_check_method=unknown

9152

@@ -8771,11 +9274,11 @@

9153

# Allow CC to be a program name with arguments.

9154

compiler=$CC

9155

9156

-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.

9157

+# Check whether --enable-libtool-lock was given.

9158

if test "${enable_libtool_lock+set}" = set; then

9159

- enableval="$enable_libtool_lock"

9160

+ enableval=$enable_libtool_lock;

9161

+fi

9162

9163

-fi;

9164

test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

9165

9166

# Some flags need to be propagated to the compiler or linker for good

9167

@@ -8802,7 +9305,7 @@

9168

;;

9169

*-*-irix6*)

9170

# Find out which ABI we are using.

9171

- echo '#line 8805 "configure"' > conftest.$ac_ext

9172

+ echo '#line 9308 "configure"' > conftest.$ac_ext

9173

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

9174

(eval $ac_compile) 2>&5

9175

ac_status=$?

9176

@@ -8887,8 +9390,8 @@

9177

# On SCO OpenServer 5, we need -belf to get full-featured binaries.

9178

SAVE_CFLAGS="$CFLAGS"

9179

CFLAGS="$CFLAGS -belf"

9180

- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5

9181

-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6

9182

+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5

9183

+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }

9184

if test "${lt_cv_cc_needs_belf+set}" = set; then

9185

echo $ECHO_N "(cached) $ECHO_C" >&6

9186

else

9187

@@ -8914,35 +9417,32 @@

9188

}

9189

_ACEOF

9190

rm -f conftest.$ac_objext conftest$ac_exeext

9191

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

9192

- (eval $ac_link) 2>conftest.er1

9193

+if { (ac_try="$ac_link"

9194

+case "(($ac_try" in

9195

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9196

+ *) ac_try_echo=$ac_try;;

9197

+esac

9198

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9199

+ (eval "$ac_link") 2>conftest.er1

9200

ac_status=$?

9201

grep -v '^ *+' conftest.er1 >conftest.err

9202

rm -f conftest.er1

9203

cat conftest.err >&5

9204

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9205

- (exit $ac_status); } &&

9206

- { ac_try='test -z "$ac_c_werror_flag"

9207

- || test ! -s conftest.err'

9208

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9209

- (eval $ac_try) 2>&5

9210

- ac_status=$?

9211

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9212

- (exit $ac_status); }; } &&

9213

- { ac_try='test -s conftest$ac_exeext'

9214

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9215

- (eval $ac_try) 2>&5

9216

- ac_status=$?

9217

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9218

- (exit $ac_status); }; }; then

9219

+ (exit $ac_status); } && {

9220

+ test -z "$ac_c_werror_flag" ||

9221

+ test ! -s conftest.err

9222

+ } && test -s conftest$ac_exeext &&

9223

+ $as_test_x conftest$ac_exeext; then

9224

lt_cv_cc_needs_belf=yes

9225

else

9226

echo "$as_me: failed program was:" >&5

9227

sed 's/^/| /' conftest.$ac_ext >&5

9228

9229

-lt_cv_cc_needs_belf=no

9230

+ lt_cv_cc_needs_belf=no

9231

9232

-rm -f conftest.err conftest.$ac_objext \

9233

9234

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9235

conftest$ac_exeext conftest.$ac_ext

9236

ac_ext=c

9237

ac_cpp='$CPP $CPPFLAGS'

9238

@@ -8951,8 +9451,8 @@

9239

ac_compiler_gnu=$ac_cv_c_compiler_gnu

9240

9241

9242

-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5

9243

-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6

9244

+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5

9245

+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }

9246

if test x"$lt_cv_cc_needs_belf" != x"yes"; then

9247

# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf

9248

CFLAGS="$SAVE_CFLAGS"

9249

@@ -8988,18 +9488,19 @@

9250

for ac_header in dlfcn.h

9251

9252

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

9253

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

9254

- echo "$as_me:$LINENO: checking for $ac_header" >&5

9255

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

9256

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

9257

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

9258

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

9259

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

9260

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

9261

echo $ECHO_N "(cached) $ECHO_C" >&6

9262

9263

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

9264

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

9265

+ac_res=`eval echo '${'$as_ac_Header'}'`

9266

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

9267

+echo "${ECHO_T}$ac_res" >&6; }

9268

else

9269

# Is the header compilable?

9270

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

9271

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

9272

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

9273

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

9274

cat >conftest.$ac_ext <<_ACEOF

9275

/* confdefs.h. */

9276

_ACEOF

9277

@@ -9010,41 +9511,37 @@

9278

#include <$ac_header>

9279

_ACEOF

9280

rm -f conftest.$ac_objext

9281

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

9282

- (eval $ac_compile) 2>conftest.er1

9283

+if { (ac_try="$ac_compile"

9284

+case "(($ac_try" in

9285

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9286

+ *) ac_try_echo=$ac_try;;

9287

+esac

9288

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9289

+ (eval "$ac_compile") 2>conftest.er1

9290

ac_status=$?

9291

grep -v '^ *+' conftest.er1 >conftest.err

9292

rm -f conftest.er1

9293

cat conftest.err >&5

9294

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9295

- (exit $ac_status); } &&

9296

- { ac_try='test -z "$ac_c_werror_flag"

9297

- || test ! -s conftest.err'

9298

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9299

- (eval $ac_try) 2>&5

9300

- ac_status=$?

9301

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9302

- (exit $ac_status); }; } &&

9303

- { ac_try='test -s conftest.$ac_objext'

9304

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9305

- (eval $ac_try) 2>&5

9306

- ac_status=$?

9307

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9308

- (exit $ac_status); }; }; then

9309

+ (exit $ac_status); } && {

9310

+ test -z "$ac_c_werror_flag" ||

9311

+ test ! -s conftest.err

9312

+ } && test -s conftest.$ac_objext; then

9313

ac_header_compiler=yes

9314

else

9315

echo "$as_me: failed program was:" >&5

9316

sed 's/^/| /' conftest.$ac_ext >&5

9317

9318

-ac_header_compiler=no

9319

+ ac_header_compiler=no

9320

9321

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

9322

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

9323

-echo "${ECHO_T}$ac_header_compiler" >&6

9324

9325

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

9326

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

9327

+echo "${ECHO_T}$ac_header_compiler" >&6; }

9328

9329

# Is the header present?

9330

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

9331

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

9332

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

9333

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

9334

cat >conftest.$ac_ext <<_ACEOF

9335

/* confdefs.h. */

9336

_ACEOF

9337

@@ -9053,24 +9550,22 @@

9338

/* end confdefs.h. */

9339

#include <$ac_header>

9340

_ACEOF

9341

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

9342

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

9343

+if { (ac_try="$ac_cpp conftest.$ac_ext"

9344

+case "(($ac_try" in

9345

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9346

+ *) ac_try_echo=$ac_try;;

9347

+esac

9348

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9349

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

9350

ac_status=$?

9351

grep -v '^ *+' conftest.er1 >conftest.err

9352

rm -f conftest.er1

9353

cat conftest.err >&5

9354

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9355

- (exit $ac_status); } >/dev/null; then

9356

- if test -s conftest.err; then

9357

- ac_cpp_err=$ac_c_preproc_warn_flag

9358

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

9359

- else

9360

- ac_cpp_err=

9361

- fi

9362

-else

9363

- ac_cpp_err=yes

9364

-fi

9365

-if test -z "$ac_cpp_err"; then

9366

+ (exit $ac_status); } >/dev/null && {

9367

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

9368

+ test ! -s conftest.err

9369

+ }; then

9370

ac_header_preproc=yes

9371

else

9372

echo "$as_me: failed program was:" >&5

9373

@@ -9078,9 +9573,10 @@

9374

9375

ac_header_preproc=no

9376

9377

9378

rm -f conftest.err conftest.$ac_ext

9379

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

9380

-echo "${ECHO_T}$ac_header_preproc" >&6

9381

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

9382

+echo "${ECHO_T}$ac_header_preproc" >&6; }

9383

9384

# So? What about this header?

9385

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

9386

@@ -9104,25 +9600,19 @@

9387

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

9388

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

9389

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

9390

- (

9391

- cat <<\_ASBOX

9392

-## ----------------------------------- ##

9393

-## Report this to the graphviz lists. ##

9394

-## ----------------------------------- ##

9395

-_ASBOX

9396

- ) |

9397

- sed "s/^/$as_me: WARNING: /" >&2

9398

9399

;;

9400

esac

9401

-echo "$as_me:$LINENO: checking for $ac_header" >&5

9402

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

9403

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

9404

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

9405

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

9406

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

9407

echo $ECHO_N "(cached) $ECHO_C" >&6

9408

else

9409

eval "$as_ac_Header=\$ac_header_preproc"

9410

9411

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

9412

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

9413

+ac_res=`eval echo '${'$as_ac_Header'}'`

9414

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

9415

+echo "${ECHO_T}$ac_res" >&6; }

9416

9417

9418

if test `eval echo '${'$as_ac_Header'}'` = yes; then

9419

@@ -9139,13 +9629,13 @@

9420

if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

9421

( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

9422

(test "X$CXX" != "Xg++"))) ; then

9423

- ac_ext=cc

9424

+ ac_ext=cpp

9425

ac_cpp='$CXXCPP $CPPFLAGS'

9426

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

9427

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

9428

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

9429

-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5

9430

-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6

9431

+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5

9432

+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }

9433

if test -z "$CXXCPP"; then

9434

if test "${ac_cv_prog_CXXCPP+set}" = set; then

9435

echo $ECHO_N "(cached) $ECHO_C" >&6

9436

@@ -9175,24 +9665,22 @@

9437

#endif

9438

Syntax error

9439

_ACEOF

9440

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

9441

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

9442

+if { (ac_try="$ac_cpp conftest.$ac_ext"

9443

+case "(($ac_try" in

9444

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9445

+ *) ac_try_echo=$ac_try;;

9446

+esac

9447

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9448

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

9449

ac_status=$?

9450

grep -v '^ *+' conftest.er1 >conftest.err

9451

rm -f conftest.er1

9452

cat conftest.err >&5

9453

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9454

- (exit $ac_status); } >/dev/null; then

9455

- if test -s conftest.err; then

9456

- ac_cpp_err=$ac_cxx_preproc_warn_flag

9457

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

9458

- else

9459

- ac_cpp_err=

9460

- fi

9461

-else

9462

- ac_cpp_err=yes

9463

-fi

9464

-if test -z "$ac_cpp_err"; then

9465

+ (exit $ac_status); } >/dev/null && {

9466

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

9467

+ test ! -s conftest.err

9468

+ }; then

9469

9470

else

9471

echo "$as_me: failed program was:" >&5

9472

@@ -9201,9 +9689,10 @@

9473

# Broken: fails on valid input.

9474

continue

9475

9476

9477

rm -f conftest.err conftest.$ac_ext

9478

9479

- # OK, works on sane cases. Now check whether non-existent headers

9480

+ # OK, works on sane cases. Now check whether nonexistent headers

9481

# can be detected and how.

9482

cat >conftest.$ac_ext <<_ACEOF

9483

/* confdefs.h. */

9484

@@ -9213,24 +9702,22 @@

9485

/* end confdefs.h. */

9486

#include <ac_nonexistent.h>

9487

_ACEOF

9488

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

9489

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

9490

+if { (ac_try="$ac_cpp conftest.$ac_ext"

9491

+case "(($ac_try" in

9492

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9493

+ *) ac_try_echo=$ac_try;;

9494

+esac

9495

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9496

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

9497

ac_status=$?

9498

grep -v '^ *+' conftest.er1 >conftest.err

9499

rm -f conftest.er1

9500

cat conftest.err >&5

9501

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9502

- (exit $ac_status); } >/dev/null; then

9503

- if test -s conftest.err; then

9504

- ac_cpp_err=$ac_cxx_preproc_warn_flag

9505

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

9506

- else

9507

- ac_cpp_err=

9508

- fi

9509

-else

9510

- ac_cpp_err=yes

9511

-fi

9512

-if test -z "$ac_cpp_err"; then

9513

+ (exit $ac_status); } >/dev/null && {

9514

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

9515

+ test ! -s conftest.err

9516

+ }; then

9517

# Broken: success on invalid input.

9518

continue

9519

else

9520

@@ -9241,6 +9728,7 @@

9521

ac_preproc_ok=:

9522

break

9523

9524

9525

rm -f conftest.err conftest.$ac_ext

9526

9527

done

9528

@@ -9258,8 +9746,8 @@

9529

else

9530

ac_cv_prog_CXXCPP=$CXXCPP

9531

9532

-echo "$as_me:$LINENO: result: $CXXCPP" >&5

9533

-echo "${ECHO_T}$CXXCPP" >&6

9534

+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5

9535

+echo "${ECHO_T}$CXXCPP" >&6; }

9536

ac_preproc_ok=false

9537

for ac_cxx_preproc_warn_flag in '' yes

9538

9539

@@ -9282,24 +9770,22 @@

9540

#endif

9541

Syntax error

9542

_ACEOF

9543

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

9544

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

9545

+if { (ac_try="$ac_cpp conftest.$ac_ext"

9546

+case "(($ac_try" in

9547

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9548

+ *) ac_try_echo=$ac_try;;

9549

+esac

9550

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9551

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

9552

ac_status=$?

9553

grep -v '^ *+' conftest.er1 >conftest.err

9554

rm -f conftest.er1

9555

cat conftest.err >&5

9556

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9557

- (exit $ac_status); } >/dev/null; then

9558

- if test -s conftest.err; then

9559

- ac_cpp_err=$ac_cxx_preproc_warn_flag

9560

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

9561

- else

9562

- ac_cpp_err=

9563

- fi

9564

-else

9565

- ac_cpp_err=yes

9566

-fi

9567

-if test -z "$ac_cpp_err"; then

9568

+ (exit $ac_status); } >/dev/null && {

9569

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

9570

+ test ! -s conftest.err

9571

+ }; then

9572

9573

else

9574

echo "$as_me: failed program was:" >&5

9575

@@ -9308,9 +9794,10 @@

9576

# Broken: fails on valid input.

9577

continue

9578

9579

9580

rm -f conftest.err conftest.$ac_ext

9581

9582

- # OK, works on sane cases. Now check whether non-existent headers

9583

+ # OK, works on sane cases. Now check whether nonexistent headers

9584

# can be detected and how.

9585

cat >conftest.$ac_ext <<_ACEOF

9586

/* confdefs.h. */

9587

@@ -9320,24 +9807,22 @@

9588

/* end confdefs.h. */

9589

#include <ac_nonexistent.h>

9590

_ACEOF

9591

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

9592

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

9593

+if { (ac_try="$ac_cpp conftest.$ac_ext"

9594

+case "(($ac_try" in

9595

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9596

+ *) ac_try_echo=$ac_try;;

9597

+esac

9598

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9599

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

9600

ac_status=$?

9601

grep -v '^ *+' conftest.er1 >conftest.err

9602

rm -f conftest.er1

9603

cat conftest.err >&5

9604

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9605

- (exit $ac_status); } >/dev/null; then

9606

- if test -s conftest.err; then

9607

- ac_cpp_err=$ac_cxx_preproc_warn_flag

9608

- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag

9609

- else

9610

- ac_cpp_err=

9611

- fi

9612

-else

9613

- ac_cpp_err=yes

9614

-fi

9615

-if test -z "$ac_cpp_err"; then

9616

+ (exit $ac_status); } >/dev/null && {

9617

+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

9618

+ test ! -s conftest.err

9619

+ }; then

9620

# Broken: success on invalid input.

9621

continue

9622

else

9623

@@ -9348,6 +9833,7 @@

9624

ac_preproc_ok=:

9625

break

9626

9627

9628

rm -f conftest.err conftest.$ac_ext

9629

9630

done

9631

@@ -9363,7 +9849,7 @@

9632

{ (exit 1); exit 1; }; }

9633

9634

9635

-ac_ext=cc

9636

+ac_ext=cpp

9637

ac_cpp='$CXXCPP $CPPFLAGS'

9638

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

9639

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

9640

@@ -9377,12 +9863,12 @@

9641

ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

9642

ac_compiler_gnu=$ac_cv_f77_compiler_gnu

9643

if test -n "$ac_tool_prefix"; then

9644

- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran

9645

+ 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

9646

9647

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

9648

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

9649

-echo "$as_me:$LINENO: checking for $ac_word" >&5

9650

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

9651

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

9652

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

9653

if test "${ac_cv_prog_F77+set}" = set; then

9654

echo $ECHO_N "(cached) $ECHO_C" >&6

9655

else

9656

@@ -9395,36 +9881,38 @@

9657

IFS=$as_save_IFS

9658

test -z "$as_dir" && as_dir=.

9659

for ac_exec_ext in '' $ac_executable_extensions; do

9660

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

9661

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9662

ac_cv_prog_F77="$ac_tool_prefix$ac_prog"

9663

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9664

break 2

9665

9666

done

9667

done

9668

+IFS=$as_save_IFS

9669

9670

9671

9672

F77=$ac_cv_prog_F77

9673

if test -n "$F77"; then

9674

- echo "$as_me:$LINENO: result: $F77" >&5

9675

-echo "${ECHO_T}$F77" >&6

9676

+ { echo "$as_me:$LINENO: result: $F77" >&5

9677

+echo "${ECHO_T}$F77" >&6; }

9678

else

9679

- echo "$as_me:$LINENO: result: no" >&5

9680

-echo "${ECHO_T}no" >&6

9681

+ { echo "$as_me:$LINENO: result: no" >&5

9682

+echo "${ECHO_T}no" >&6; }

9683

9684

9685

9686

test -n "$F77" && break

9687

done

9688

9689

if test -z "$F77"; then

9690

ac_ct_F77=$F77

9691

- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran

9692

+ 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

9693

9694

# Extract the first word of "$ac_prog", so it can be a program name with args.

9695

set dummy $ac_prog; ac_word=$2

9696

-echo "$as_me:$LINENO: checking for $ac_word" >&5

9697

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

9698

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

9699

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

9700

if test "${ac_cv_prog_ac_ct_F77+set}" = set; then

9701

echo $ECHO_N "(cached) $ECHO_C" >&6

9702

else

9703

@@ -9437,48 +9925,78 @@

9704

IFS=$as_save_IFS

9705

test -z "$as_dir" && as_dir=.

9706

for ac_exec_ext in '' $ac_executable_extensions; do

9707

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

9708

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9709

ac_cv_prog_ac_ct_F77="$ac_prog"

9710

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9711

break 2

9712

9713

done

9714

done

9715

+IFS=$as_save_IFS

9716

9717

9718

9719

ac_ct_F77=$ac_cv_prog_ac_ct_F77

9720

if test -n "$ac_ct_F77"; then

9721

- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5

9722

-echo "${ECHO_T}$ac_ct_F77" >&6

9723

+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5

9724

+echo "${ECHO_T}$ac_ct_F77" >&6; }

9725

else

9726

- echo "$as_me:$LINENO: result: no" >&5

9727

-echo "${ECHO_T}no" >&6

9728

+ { echo "$as_me:$LINENO: result: no" >&5

9729

+echo "${ECHO_T}no" >&6; }

9730

9731

9732

9733

test -n "$ac_ct_F77" && break

9734

done

9735

9736

- F77=$ac_ct_F77

9737

+ if test "x$ac_ct_F77" = x; then

9738

+ F77=""

9739

+ else

9740

+ case $cross_compiling:$ac_tool_warned in

9741

+yes:)

9742

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

9743

+whose name does not start with the host triplet. If you think this

9744

+configuration is useful to you, please write to autoconf@gnu.org." >&5

9745

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

9746

+whose name does not start with the host triplet. If you think this

9747

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

9748

+ac_tool_warned=yes ;;

9749

+esac

9750

+ F77=$ac_ct_F77

9751

+ fi

9752

9753

9754

9755

# Provide some information about the compiler.

9756

-echo "$as_me:9467:" \

9757

- "checking for Fortran 77 compiler version" >&5

9758

+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5

9759

ac_compiler=`set X $ac_compile; echo $2`

9760

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5

9761

- (eval $ac_compiler --version </dev/null >&5) 2>&5

9762

+{ (ac_try="$ac_compiler --version >&5"

9763

+case "(($ac_try" in

9764

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9765

+ *) ac_try_echo=$ac_try;;

9766

+esac

9767

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9768

+ (eval "$ac_compiler --version >&5") 2>&5

9769

ac_status=$?

9770

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9771

(exit $ac_status); }

9772

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5

9773

- (eval $ac_compiler -v </dev/null >&5) 2>&5

9774

+{ (ac_try="$ac_compiler -v >&5"

9775

+case "(($ac_try" in

9776

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9777

+ *) ac_try_echo=$ac_try;;

9778

+esac

9779

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9780

+ (eval "$ac_compiler -v >&5") 2>&5

9781

ac_status=$?

9782

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9783

(exit $ac_status); }

9784

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5

9785

- (eval $ac_compiler -V </dev/null >&5) 2>&5

9786

+{ (ac_try="$ac_compiler -V >&5"

9787

+case "(($ac_try" in

9788

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9789

+ *) ac_try_echo=$ac_try;;

9790

+esac

9791

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9792

+ (eval "$ac_compiler -V >&5") 2>&5

9793

ac_status=$?

9794

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9795

(exit $ac_status); }

9796

@@ -9488,8 +10006,8 @@

9797

# input file. (Note that this only needs to work for GNU compilers.)

9798

ac_save_ext=$ac_ext

9799

ac_ext=F

9800

-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5

9801

-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6

9802

+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5

9803

+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }

9804

if test "${ac_cv_f77_compiler_gnu+set}" = set; then

9805

echo $ECHO_N "(cached) $ECHO_C" >&6

9806

else

9807

@@ -9502,46 +10020,42 @@

9808

end

9809

_ACEOF

9810

rm -f conftest.$ac_objext

9811

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

9812

- (eval $ac_compile) 2>conftest.er1

9813

+if { (ac_try="$ac_compile"

9814

+case "(($ac_try" in

9815

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9816

+ *) ac_try_echo=$ac_try;;

9817

+esac

9818

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9819

+ (eval "$ac_compile") 2>conftest.er1

9820

ac_status=$?

9821

grep -v '^ *+' conftest.er1 >conftest.err

9822

rm -f conftest.er1

9823

cat conftest.err >&5

9824

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9825

- (exit $ac_status); } &&

9826

- { ac_try='test -z "$ac_f77_werror_flag"

9827

- || test ! -s conftest.err'

9828

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9829

- (eval $ac_try) 2>&5

9830

- ac_status=$?

9831

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9832

- (exit $ac_status); }; } &&

9833

- { ac_try='test -s conftest.$ac_objext'

9834

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9835

- (eval $ac_try) 2>&5

9836

- ac_status=$?

9837

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9838

- (exit $ac_status); }; }; then

9839

+ (exit $ac_status); } && {

9840

+ test -z "$ac_f77_werror_flag" ||

9841

+ test ! -s conftest.err

9842

+ } && test -s conftest.$ac_objext; then

9843

ac_compiler_gnu=yes

9844

else

9845

echo "$as_me: failed program was:" >&5

9846

sed 's/^/| /' conftest.$ac_ext >&5

9847

9848

-ac_compiler_gnu=no

9849

+ ac_compiler_gnu=no

9850

9851

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

9852

9853

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

9854

ac_cv_f77_compiler_gnu=$ac_compiler_gnu

9855

9856

9857

-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5

9858

-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6

9859

+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5

9860

+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }

9861

ac_ext=$ac_save_ext

9862

ac_test_FFLAGS=${FFLAGS+set}

9863

ac_save_FFLAGS=$FFLAGS

9864

FFLAGS=

9865

-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5

9866

-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6

9867

+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5

9868

+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }

9869

if test "${ac_cv_prog_f77_g+set}" = set; then

9870

echo $ECHO_N "(cached) $ECHO_C" >&6

9871

else

9872

@@ -9552,39 +10066,35 @@

9873

end

9874

_ACEOF

9875

rm -f conftest.$ac_objext

9876

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

9877

- (eval $ac_compile) 2>conftest.er1

9878

+if { (ac_try="$ac_compile"

9879

+case "(($ac_try" in

9880

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9881

+ *) ac_try_echo=$ac_try;;

9882

+esac

9883

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9884

+ (eval "$ac_compile") 2>conftest.er1

9885

ac_status=$?

9886

grep -v '^ *+' conftest.er1 >conftest.err

9887

rm -f conftest.er1

9888

cat conftest.err >&5

9889

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9890

- (exit $ac_status); } &&

9891

- { ac_try='test -z "$ac_f77_werror_flag"

9892

- || test ! -s conftest.err'

9893

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9894

- (eval $ac_try) 2>&5

9895

- ac_status=$?

9896

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9897

- (exit $ac_status); }; } &&

9898

- { ac_try='test -s conftest.$ac_objext'

9899

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9900

- (eval $ac_try) 2>&5

9901

- ac_status=$?

9902

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9903

- (exit $ac_status); }; }; then

9904

+ (exit $ac_status); } && {

9905

+ test -z "$ac_f77_werror_flag" ||

9906

+ test ! -s conftest.err

9907

+ } && test -s conftest.$ac_objext; then

9908

ac_cv_prog_f77_g=yes

9909

else

9910

echo "$as_me: failed program was:" >&5

9911

sed 's/^/| /' conftest.$ac_ext >&5

9912

9913

-ac_cv_prog_f77_g=no

9914

+ ac_cv_prog_f77_g=no

9915

9916

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

9917

9918

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

9919

9920

9921

-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5

9922

-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6

9923

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5

9924

+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }

9925

if test "$ac_test_FFLAGS" = set; then

9926

FFLAGS=$ac_save_FFLAGS

9927

elif test $ac_cv_prog_f77_g = yes; then

9928

@@ -9613,8 +10123,8 @@

9929

# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!

9930

9931

# find the maximum length of command line arguments

9932

-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5

9933

-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6

9934

+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5

9935

+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }

9936

if test "${lt_cv_sys_max_cmd_len+set}" = set; then

9937

echo $ECHO_N "(cached) $ECHO_C" >&6

9938

else

9939

@@ -9722,19 +10232,19 @@

9940

9941

9942

if test -n $lt_cv_sys_max_cmd_len ; then

9943

- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5

9944

-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6

9945

+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5

9946

+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }

9947

else

9948

- echo "$as_me:$LINENO: result: none" >&5

9949

-echo "${ECHO_T}none" >&6

9950

+ { echo "$as_me:$LINENO: result: none" >&5

9951

+echo "${ECHO_T}none" >&6; }

9952

9953

9954

9955

9956

9957

# Check for command to grab the raw symbol name followed by C symbol from nm.

9958

-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

9959

-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6

9960

+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

9961

+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }

9962

if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then

9963

echo $ECHO_N "(cached) $ECHO_C" >&6

9964

else

9965

@@ -9938,15 +10448,15 @@

9966

lt_cv_sys_global_symbol_to_cdecl=

9967

9968

if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then

9969

- echo "$as_me:$LINENO: result: failed" >&5

9970

-echo "${ECHO_T}failed" >&6

9971

+ { echo "$as_me:$LINENO: result: failed" >&5

9972

+echo "${ECHO_T}failed" >&6; }

9973

else

9974

- echo "$as_me:$LINENO: result: ok" >&5

9975

-echo "${ECHO_T}ok" >&6

9976

+ { echo "$as_me:$LINENO: result: ok" >&5

9977

+echo "${ECHO_T}ok" >&6; }

9978

9979

9980

-echo "$as_me:$LINENO: checking for objdir" >&5

9981

-echo $ECHO_N "checking for objdir... $ECHO_C" >&6

9982

+{ echo "$as_me:$LINENO: checking for objdir" >&5

9983

+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }

9984

if test "${lt_cv_objdir+set}" = set; then

9985

echo $ECHO_N "(cached) $ECHO_C" >&6

9986

else

9987

@@ -9960,8 +10470,8 @@

9988

9989

rmdir .libs 2>/dev/null

9990

9991

-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5

9992

-echo "${ECHO_T}$lt_cv_objdir" >&6

9993

+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5

9994

+echo "${ECHO_T}$lt_cv_objdir" >&6; }

9995

objdir=$lt_cv_objdir

9996

9997

9998

@@ -10012,8 +10522,8 @@

9999

if test -n "$ac_tool_prefix"; then

10000

# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.

10001

set dummy ${ac_tool_prefix}ar; ac_word=$2

10002

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10003

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10004

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10005

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10006

if test "${ac_cv_prog_AR+set}" = set; then

10007

echo $ECHO_N "(cached) $ECHO_C" >&6

10008

else

10009

@@ -10026,32 +10536,34 @@

10010

IFS=$as_save_IFS

10011

test -z "$as_dir" && as_dir=.

10012

for ac_exec_ext in '' $ac_executable_extensions; do

10013

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10014

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10015

ac_cv_prog_AR="${ac_tool_prefix}ar"

10016

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10017

break 2

10018

10019

done

10020

done

10021

+IFS=$as_save_IFS

10022

10023

10024

10025

AR=$ac_cv_prog_AR

10026

if test -n "$AR"; then

10027

- echo "$as_me:$LINENO: result: $AR" >&5

10028

-echo "${ECHO_T}$AR" >&6

10029

+ { echo "$as_me:$LINENO: result: $AR" >&5

10030

+echo "${ECHO_T}$AR" >&6; }

10031

else

10032

- echo "$as_me:$LINENO: result: no" >&5

10033

-echo "${ECHO_T}no" >&6

10034

+ { echo "$as_me:$LINENO: result: no" >&5

10035

+echo "${ECHO_T}no" >&6; }

10036

10037

10038

10039

10040

if test -z "$ac_cv_prog_AR"; then

10041

ac_ct_AR=$AR

10042

# Extract the first word of "ar", so it can be a program name with args.

10043

set dummy ar; ac_word=$2

10044

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10045

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10046

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10047

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10048

if test "${ac_cv_prog_ac_ct_AR+set}" = set; then

10049

echo $ECHO_N "(cached) $ECHO_C" >&6

10050

else

10051

@@ -10064,27 +10576,41 @@

10052

IFS=$as_save_IFS

10053

test -z "$as_dir" && as_dir=.

10054

for ac_exec_ext in '' $ac_executable_extensions; do

10055

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10056

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10057

ac_cv_prog_ac_ct_AR="ar"

10058

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10059

break 2

10060

10061

done

10062

done

10063

+IFS=$as_save_IFS

10064

10065

- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"

10066

10067

10068

ac_ct_AR=$ac_cv_prog_ac_ct_AR

10069

if test -n "$ac_ct_AR"; then

10070

- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5

10071

-echo "${ECHO_T}$ac_ct_AR" >&6

10072

+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5

10073

+echo "${ECHO_T}$ac_ct_AR" >&6; }

10074

else

10075

- echo "$as_me:$LINENO: result: no" >&5

10076

-echo "${ECHO_T}no" >&6

10077

+ { echo "$as_me:$LINENO: result: no" >&5

10078

+echo "${ECHO_T}no" >&6; }

10079

10080

10081

- AR=$ac_ct_AR

10082

+ if test "x$ac_ct_AR" = x; then

10083

+ AR="false"

10084

+ else

10085

+ case $cross_compiling:$ac_tool_warned in

10086

+yes:)

10087

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

10088

+whose name does not start with the host triplet. If you think this

10089

+configuration is useful to you, please write to autoconf@gnu.org." >&5

10090

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

10091

+whose name does not start with the host triplet. If you think this

10092

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

10093

+ac_tool_warned=yes ;;

10094

+esac

10095

+ AR=$ac_ct_AR

10096

+ fi

10097

else

10098

AR="$ac_cv_prog_AR"

10099

10100

@@ -10092,8 +10618,8 @@

10101

if test -n "$ac_tool_prefix"; then

10102

# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.

10103

set dummy ${ac_tool_prefix}ranlib; ac_word=$2

10104

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10105

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10106

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10107

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10108

if test "${ac_cv_prog_RANLIB+set}" = set; then

10109

echo $ECHO_N "(cached) $ECHO_C" >&6

10110

else

10111

@@ -10106,32 +10632,34 @@

10112

IFS=$as_save_IFS

10113

test -z "$as_dir" && as_dir=.

10114

for ac_exec_ext in '' $ac_executable_extensions; do

10115

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10116

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10117

ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

10118

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10119

break 2

10120

10121

done

10122

done

10123

+IFS=$as_save_IFS

10124

10125

10126

10127

RANLIB=$ac_cv_prog_RANLIB

10128

if test -n "$RANLIB"; then

10129

- echo "$as_me:$LINENO: result: $RANLIB" >&5

10130

-echo "${ECHO_T}$RANLIB" >&6

10131

+ { echo "$as_me:$LINENO: result: $RANLIB" >&5

10132

+echo "${ECHO_T}$RANLIB" >&6; }

10133

else

10134

- echo "$as_me:$LINENO: result: no" >&5

10135

-echo "${ECHO_T}no" >&6

10136

+ { echo "$as_me:$LINENO: result: no" >&5

10137

+echo "${ECHO_T}no" >&6; }

10138

10139

10140

10141

10142

if test -z "$ac_cv_prog_RANLIB"; then

10143

ac_ct_RANLIB=$RANLIB

10144

# Extract the first word of "ranlib", so it can be a program name with args.

10145

set dummy ranlib; ac_word=$2

10146

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10147

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10148

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10149

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10150

if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then

10151

echo $ECHO_N "(cached) $ECHO_C" >&6

10152

else

10153

@@ -10144,27 +10672,41 @@

10154

IFS=$as_save_IFS

10155

test -z "$as_dir" && as_dir=.

10156

for ac_exec_ext in '' $ac_executable_extensions; do

10157

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10158

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10159

ac_cv_prog_ac_ct_RANLIB="ranlib"

10160

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10161

break 2

10162

10163

done

10164

done

10165

+IFS=$as_save_IFS

10166

10167

- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"

10168

10169

10170

ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB

10171

if test -n "$ac_ct_RANLIB"; then

10172

- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5

10173

-echo "${ECHO_T}$ac_ct_RANLIB" >&6

10174

+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5

10175

+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }

10176

else

10177

- echo "$as_me:$LINENO: result: no" >&5

10178

-echo "${ECHO_T}no" >&6

10179

+ { echo "$as_me:$LINENO: result: no" >&5

10180

+echo "${ECHO_T}no" >&6; }

10181

10182

10183

- RANLIB=$ac_ct_RANLIB

10184

+ if test "x$ac_ct_RANLIB" = x; then

10185

+ RANLIB=":"

10186

+ else

10187

+ case $cross_compiling:$ac_tool_warned in

10188

+yes:)

10189

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

10190

+whose name does not start with the host triplet. If you think this

10191

+configuration is useful to you, please write to autoconf@gnu.org." >&5

10192

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

10193

+whose name does not start with the host triplet. If you think this

10194

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

10195

+ac_tool_warned=yes ;;

10196

+esac

10197

+ RANLIB=$ac_ct_RANLIB

10198

+ fi

10199

else

10200

RANLIB="$ac_cv_prog_RANLIB"

10201

10202

@@ -10172,8 +10714,8 @@

10203

if test -n "$ac_tool_prefix"; then

10204

# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

10205

set dummy ${ac_tool_prefix}strip; ac_word=$2

10206

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10207

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10208

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10209

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10210

if test "${ac_cv_prog_STRIP+set}" = set; then

10211

echo $ECHO_N "(cached) $ECHO_C" >&6

10212

else

10213

@@ -10186,32 +10728,34 @@

10214

IFS=$as_save_IFS

10215

test -z "$as_dir" && as_dir=.

10216

for ac_exec_ext in '' $ac_executable_extensions; do

10217

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10218

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10219

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

10220

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10221

break 2

10222

10223

done

10224

done

10225

+IFS=$as_save_IFS

10226

10227

10228

10229

STRIP=$ac_cv_prog_STRIP

10230

if test -n "$STRIP"; then

10231

- echo "$as_me:$LINENO: result: $STRIP" >&5

10232

-echo "${ECHO_T}$STRIP" >&6

10233

+ { echo "$as_me:$LINENO: result: $STRIP" >&5

10234

+echo "${ECHO_T}$STRIP" >&6; }

10235

else

10236

- echo "$as_me:$LINENO: result: no" >&5

10237

-echo "${ECHO_T}no" >&6

10238

+ { echo "$as_me:$LINENO: result: no" >&5

10239

+echo "${ECHO_T}no" >&6; }

10240

10241

10242

10243

10244

if test -z "$ac_cv_prog_STRIP"; then

10245

ac_ct_STRIP=$STRIP

10246

# Extract the first word of "strip", so it can be a program name with args.

10247

set dummy strip; ac_word=$2

10248

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10249

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10250

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10251

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10252

if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then

10253

echo $ECHO_N "(cached) $ECHO_C" >&6

10254

else

10255

@@ -10224,27 +10768,41 @@

10256

IFS=$as_save_IFS

10257

test -z "$as_dir" && as_dir=.

10258

for ac_exec_ext in '' $ac_executable_extensions; do

10259

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10260

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10261

ac_cv_prog_ac_ct_STRIP="strip"

10262

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10263

break 2

10264

10265

done

10266

done

10267

+IFS=$as_save_IFS

10268

10269

- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"

10270

10271

10272

ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

10273

if test -n "$ac_ct_STRIP"; then

10274

- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

10275

-echo "${ECHO_T}$ac_ct_STRIP" >&6

10276

+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

10277

+echo "${ECHO_T}$ac_ct_STRIP" >&6; }

10278

else

10279

- echo "$as_me:$LINENO: result: no" >&5

10280

-echo "${ECHO_T}no" >&6

10281

+ { echo "$as_me:$LINENO: result: no" >&5

10282

+echo "${ECHO_T}no" >&6; }

10283

10284

10285

- STRIP=$ac_ct_STRIP

10286

+ if test "x$ac_ct_STRIP" = x; then

10287

+ STRIP=":"

10288

+ else

10289

+ case $cross_compiling:$ac_tool_warned in

10290

+yes:)

10291

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

10292

+whose name does not start with the host triplet. If you think this

10293

+configuration is useful to you, please write to autoconf@gnu.org." >&5

10294

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

10295

+whose name does not start with the host triplet. If you think this

10296

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

10297

+ac_tool_warned=yes ;;

10298

+esac

10299

+ STRIP=$ac_ct_STRIP

10300

+ fi

10301

else

10302

STRIP="$ac_cv_prog_STRIP"

10303

10304

@@ -10303,8 +10861,8 @@

10305

case $deplibs_check_method in

10306

file_magic*)

10307

if test "$file_magic_cmd" = '$MAGIC_CMD'; then

10308

- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5

10309

-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6

10310

+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5

10311

+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }

10312

if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

10313

echo $ECHO_N "(cached) $ECHO_C" >&6

10314

else

10315

@@ -10356,17 +10914,17 @@

10316

10317

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

10318

if test -n "$MAGIC_CMD"; then

10319

- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

10320

-echo "${ECHO_T}$MAGIC_CMD" >&6

10321

+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

10322

+echo "${ECHO_T}$MAGIC_CMD" >&6; }

10323

else

10324

- echo "$as_me:$LINENO: result: no" >&5

10325

-echo "${ECHO_T}no" >&6

10326

+ { echo "$as_me:$LINENO: result: no" >&5

10327

+echo "${ECHO_T}no" >&6; }

10328

10329

10330

if test -z "$lt_cv_path_MAGIC_CMD"; then

10331

if test -n "$ac_tool_prefix"; then

10332

- echo "$as_me:$LINENO: checking for file" >&5

10333

-echo $ECHO_N "checking for file... $ECHO_C" >&6

10334

+ { echo "$as_me:$LINENO: checking for file" >&5

10335

+echo $ECHO_N "checking for file... $ECHO_C" >&6; }

10336

if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

10337

echo $ECHO_N "(cached) $ECHO_C" >&6

10338

else

10339

@@ -10418,11 +10976,11 @@

10340

10341

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

10342

if test -n "$MAGIC_CMD"; then

10343

- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

10344

-echo "${ECHO_T}$MAGIC_CMD" >&6

10345

+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

10346

+echo "${ECHO_T}$MAGIC_CMD" >&6; }

10347

else

10348

- echo "$as_me:$LINENO: result: no" >&5

10349

-echo "${ECHO_T}no" >&6

10350

+ { echo "$as_me:$LINENO: result: no" >&5

10351

+echo "${ECHO_T}no" >&6; }

10352

10353

10354

else

10355

@@ -10437,21 +10995,21 @@

10356

enable_dlopen=yes

10357

enable_win32_dll=no

10358

10359

-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.

10360

+# Check whether --enable-libtool-lock was given.

10361

if test "${enable_libtool_lock+set}" = set; then

10362

- enableval="$enable_libtool_lock"

10363

+ enableval=$enable_libtool_lock;

10364

+fi

10365

10366

-fi;

10367

test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

10368

10369

10370

-# Check whether --with-pic or --without-pic was given.

10371

+# Check whether --with-pic was given.

10372

if test "${with_pic+set}" = set; then

10373

- withval="$with_pic"

10374

- pic_mode="$withval"

10375

+ withval=$with_pic; pic_mode="$withval"

10376

else

10377

pic_mode=default

10378

-fi;

10379

+fi

10380

10381

test -z "$pic_mode" && pic_mode=default

10382

10383

# Use C for the default configuration in the libtool script

10384

@@ -10509,8 +11067,8 @@

10385

lt_prog_compiler_no_builtin_flag=' -fno-builtin'

10386

10387

10388

-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

10389

-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6

10390

+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

10391

+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }

10392

if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then

10393

echo $ECHO_N "(cached) $ECHO_C" >&6

10394

else

10395

@@ -10527,11 +11085,11 @@

10396

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

10397

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

10398

-e 's:$: $lt_compiler_flag:'`

10399

- (eval echo "\"\$as_me:10530: $lt_compile\"" >&5)

10400

+ (eval echo "\"\$as_me:11088: $lt_compile\"" >&5)

10401

(eval "$lt_compile" 2>conftest.err)

10402

ac_status=$?

10403

cat conftest.err >&5

10404

- echo "$as_me:10534: \$? = $ac_status" >&5

10405

+ echo "$as_me:11092: \$? = $ac_status" >&5

10406

if (exit $ac_status) && test -s "$ac_outfile"; then

10407

# The compiler can only warn and ignore the option if not recognized

10408

# So say no if there are warnings other than the usual output.

10409

@@ -10544,8 +11102,8 @@

10410

$rm conftest*

10411

10412

10413

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

10414

-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6

10415

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

10416

+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }

10417

10418

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

10419

lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"

10420

@@ -10559,8 +11117,8 @@

10421

lt_prog_compiler_pic=

10422

lt_prog_compiler_static=

10423

10424

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

10425

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

10426

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

10427

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

10428

10429

if test "$GCC" = yes; then

10430

lt_prog_compiler_wl='-Wl,'

10431

@@ -10769,16 +11327,16 @@

10432

esac

10433

10434

10435

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5

10436

-echo "${ECHO_T}$lt_prog_compiler_pic" >&6

10437

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5

10438

+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }

10439

10440

10441

# Check to make sure the PIC flag actually works.

10442

10443

if test -n "$lt_prog_compiler_pic"; then

10444

10445

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

10446

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6

10447

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

10448

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }

10449

if test "${lt_prog_compiler_pic_works+set}" = set; then

10450

echo $ECHO_N "(cached) $ECHO_C" >&6

10451

else

10452

@@ -10795,11 +11353,11 @@

10453

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

10454

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

10455

-e 's:$: $lt_compiler_flag:'`

10456

- (eval echo "\"\$as_me:10798: $lt_compile\"" >&5)

10457

+ (eval echo "\"\$as_me:11356: $lt_compile\"" >&5)

10458

(eval "$lt_compile" 2>conftest.err)

10459

ac_status=$?

10460

cat conftest.err >&5

10461

- echo "$as_me:10802: \$? = $ac_status" >&5

10462

+ echo "$as_me:11360: \$? = $ac_status" >&5

10463

if (exit $ac_status) && test -s "$ac_outfile"; then

10464

# The compiler can only warn and ignore the option if not recognized

10465

# So say no if there are warnings other than the usual output.

10466

@@ -10812,8 +11370,8 @@

10467

$rm conftest*

10468

10469

10470

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5

10471

-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6

10472

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5

10473

+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }

10474

10475

if test x"$lt_prog_compiler_pic_works" = xyes; then

10476

case $lt_prog_compiler_pic in

10477

@@ -10840,8 +11398,8 @@

10478

# Check to make sure the static flag actually works.

10479

10480

wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"

10481

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

10482

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

10483

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

10484

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

10485

if test "${lt_prog_compiler_static_works+set}" = set; then

10486

echo $ECHO_N "(cached) $ECHO_C" >&6

10487

else

10488

@@ -10868,8 +11426,8 @@

10489

LDFLAGS="$save_LDFLAGS"

10490

10491

10492

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5

10493

-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6

10494

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5

10495

+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }

10496

10497

if test x"$lt_prog_compiler_static_works" = xyes; then

10498

10499

@@ -10878,8 +11436,8 @@

10500

10501

10502

10503

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

10504

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

10505

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

10506

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

10507

if test "${lt_cv_prog_compiler_c_o+set}" = set; then

10508

echo $ECHO_N "(cached) $ECHO_C" >&6

10509

else

10510

@@ -10899,11 +11457,11 @@

10511

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

10512

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

10513

-e 's:$: $lt_compiler_flag:'`

10514

- (eval echo "\"\$as_me:10902: $lt_compile\"" >&5)

10515

+ (eval echo "\"\$as_me:11460: $lt_compile\"" >&5)

10516

(eval "$lt_compile" 2>out/conftest.err)

10517

ac_status=$?

10518

cat out/conftest.err >&5

10519

- echo "$as_me:10906: \$? = $ac_status" >&5

10520

+ echo "$as_me:11464: \$? = $ac_status" >&5

10521

if (exit $ac_status) && test -s out/conftest2.$ac_objext

10522

then

10523

# The compiler can only warn and ignore the option if not recognized

10524

@@ -10925,23 +11483,23 @@

10525

$rm conftest*

10526

10527

10528

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

10529

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6

10530

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

10531

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }

10532

10533

10534

hard_links="nottested"

10535

if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then

10536

# do not overwrite the value of need_locks provided by the user

10537

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

10538

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

10539

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

10540

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

10541

hard_links=yes

10542

$rm conftest*

10543

ln conftest.a conftest.b 2>/dev/null && hard_links=no

10544

touch conftest.a

10545

ln conftest.a conftest.b 2>&5 || hard_links=no

10546

ln conftest.a conftest.b 2>/dev/null && hard_links=no

10547

- echo "$as_me:$LINENO: result: $hard_links" >&5

10548

-echo "${ECHO_T}$hard_links" >&6

10549

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

10550

+echo "${ECHO_T}$hard_links" >&6; }

10551

if test "$hard_links" = no; then

10552

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

10553

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

10554

@@ -10951,8 +11509,8 @@

10555

need_locks=no

10556

10557

10558

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

10559

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

10560

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

10561

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

10562

10563

runpath_var=

10564

allow_undefined_flag=

10565

@@ -11367,27 +11925,23 @@

10566

}

10567

_ACEOF

10568

rm -f conftest.$ac_objext conftest$ac_exeext

10569

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

10570

- (eval $ac_link) 2>conftest.er1

10571

+if { (ac_try="$ac_link"

10572

+case "(($ac_try" in

10573

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10574

+ *) ac_try_echo=$ac_try;;

10575

+esac

10576

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10577

+ (eval "$ac_link") 2>conftest.er1

10578

ac_status=$?

10579

grep -v '^ *+' conftest.er1 >conftest.err

10580

rm -f conftest.er1

10581

cat conftest.err >&5

10582

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10583

- (exit $ac_status); } &&

10584

- { ac_try='test -z "$ac_c_werror_flag"

10585

- || test ! -s conftest.err'

10586

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10587

- (eval $ac_try) 2>&5

10588

- ac_status=$?

10589

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10590

- (exit $ac_status); }; } &&

10591

- { ac_try='test -s conftest$ac_exeext'

10592

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10593

- (eval $ac_try) 2>&5

10594

- ac_status=$?

10595

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10596

- (exit $ac_status); }; }; then

10597

+ (exit $ac_status); } && {

10598

+ test -z "$ac_c_werror_flag" ||

10599

+ test ! -s conftest.err

10600

+ } && test -s conftest$ac_exeext &&

10601

+ $as_test_x conftest$ac_exeext; then

10602

10603

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

10604

}'`

10605

@@ -11398,8 +11952,10 @@

10606

echo "$as_me: failed program was:" >&5

10607

sed 's/^/| /' conftest.$ac_ext >&5

10608

10609

10610

10611

-rm -f conftest.err conftest.$ac_objext \

10612

10613

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10614

conftest$ac_exeext conftest.$ac_ext

10615

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

10616

10617

@@ -11428,27 +11984,23 @@

10618

}

10619

_ACEOF

10620

rm -f conftest.$ac_objext conftest$ac_exeext

10621

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

10622

- (eval $ac_link) 2>conftest.er1

10623

+if { (ac_try="$ac_link"

10624

+case "(($ac_try" in

10625

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10626

+ *) ac_try_echo=$ac_try;;

10627

+esac

10628

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10629

+ (eval "$ac_link") 2>conftest.er1

10630

ac_status=$?

10631

grep -v '^ *+' conftest.er1 >conftest.err

10632

rm -f conftest.er1

10633

cat conftest.err >&5

10634

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10635

- (exit $ac_status); } &&

10636

- { ac_try='test -z "$ac_c_werror_flag"

10637

- || test ! -s conftest.err'

10638

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10639

- (eval $ac_try) 2>&5

10640

- ac_status=$?

10641

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10642

- (exit $ac_status); }; } &&

10643

- { ac_try='test -s conftest$ac_exeext'

10644

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10645

- (eval $ac_try) 2>&5

10646

- ac_status=$?

10647

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10648

- (exit $ac_status); }; }; then

10649

+ (exit $ac_status); } && {

10650

+ test -z "$ac_c_werror_flag" ||

10651

+ test ! -s conftest.err

10652

+ } && test -s conftest$ac_exeext &&

10653

+ $as_test_x conftest$ac_exeext; then

10654

10655

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

10656

}'`

10657

@@ -11459,8 +12011,10 @@

10658

echo "$as_me: failed program was:" >&5

10659

sed 's/^/| /' conftest.$ac_ext >&5

10660

10661

10662

10663

-rm -f conftest.err conftest.$ac_objext \

10664

10665

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10666

conftest$ac_exeext conftest.$ac_ext

10667

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

10668

10669

@@ -11909,8 +12463,8 @@

10670

esac

10671

10672

10673

-echo "$as_me:$LINENO: result: $ld_shlibs" >&5

10674

-echo "${ECHO_T}$ld_shlibs" >&6

10675

+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5

10676

+echo "${ECHO_T}$ld_shlibs" >&6; }

10677

test "$ld_shlibs" = no && can_build_shared=no

10678

10679

10680

@@ -11930,8 +12484,8 @@

10681

# Test whether the compiler implicitly links with -lc since on some

10682

# systems, -lgcc has to come before -lc. If gcc already passes -lc

10683

# to ld, don't add -lc before -lgcc.

10684

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

10685

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

10686

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

10687

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

10688

$rm conftest*

10689

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

10690

10691

@@ -11968,16 +12522,16 @@

10692

cat conftest.err 1>&5

10693

10694

$rm conftest*

10695

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5

10696

-echo "${ECHO_T}$archive_cmds_need_lc" >&6

10697

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5

10698

+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }

10699

;;

10700

esac

10701

10702

;;

10703

esac

10704

10705

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

10706

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

10707

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

10708

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

10709

library_names_spec=

10710

libname_spec='lib$name'

10711

soname_spec=

10712

@@ -12368,7 +12922,7 @@

10713

libsuff=

10714

case "$host_cpu" in

10715

x86_64*|s390x*|powerpc64*)

10716

- echo '#line 12371 "configure"' > conftest.$ac_ext

10717

+ echo '#line 12925 "configure"' > conftest.$ac_ext

10718

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

10719

(eval $ac_compile) 2>&5

10720

ac_status=$?

10721

@@ -12585,8 +13139,8 @@

10722

dynamic_linker=no

10723

;;

10724

esac

10725

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

10726

-echo "${ECHO_T}$dynamic_linker" >&6

10727

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

10728

+echo "${ECHO_T}$dynamic_linker" >&6; }

10729

test "$dynamic_linker" = no && can_build_shared=no

10730

10731

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

10732

@@ -12594,8 +13148,8 @@

10733

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

10734

10735

10736

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

10737

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

10738

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

10739

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

10740

hardcode_action=

10741

if test -n "$hardcode_libdir_flag_spec" || \

10742

test -n "$runpath_var" || \

10743

@@ -12619,8 +13173,8 @@

10744

# directories.

10745

hardcode_action=unsupported

10746

10747

-echo "$as_me:$LINENO: result: $hardcode_action" >&5

10748

-echo "${ECHO_T}$hardcode_action" >&6

10749

+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5

10750

+echo "${ECHO_T}$hardcode_action" >&6; }

10751

10752

if test "$hardcode_action" = relink; then

10753

# Fast installation is not supported

10754

@@ -12633,29 +13187,29 @@

10755

10756

striplib=

10757

old_striplib=

10758

-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5

10759

-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6

10760

+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5

10761

+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }

10762

if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then

10763

test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"

10764

test -z "$striplib" && striplib="$STRIP --strip-unneeded"

10765

- echo "$as_me:$LINENO: result: yes" >&5

10766

-echo "${ECHO_T}yes" >&6

10767

+ { echo "$as_me:$LINENO: result: yes" >&5

10768

+echo "${ECHO_T}yes" >&6; }

10769

else

10770

# FIXME - insert some real tests, host_os isn't really good enough

10771

case $host_os in

10772

darwin*)

10773

if test -n "$STRIP" ; then

10774

striplib="$STRIP -x"

10775

- echo "$as_me:$LINENO: result: yes" >&5

10776

-echo "${ECHO_T}yes" >&6

10777

+ { echo "$as_me:$LINENO: result: yes" >&5

10778

+echo "${ECHO_T}yes" >&6; }

10779

else

10780

- echo "$as_me:$LINENO: result: no" >&5

10781

-echo "${ECHO_T}no" >&6

10782

+ { echo "$as_me:$LINENO: result: no" >&5

10783

+echo "${ECHO_T}no" >&6; }

10784

10785

;;

10786

10787

- echo "$as_me:$LINENO: result: no" >&5

10788

-echo "${ECHO_T}no" >&6

10789

+ { echo "$as_me:$LINENO: result: no" >&5

10790

+echo "${ECHO_T}no" >&6; }

10791

;;

10792

esac

10793

10794

@@ -12687,8 +13241,8 @@

10795

10796

darwin*)

10797

# if libdl is installed we need to link against it

10798

- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

10799

-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6

10800

+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

10801

+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

10802

if test "${ac_cv_lib_dl_dlopen+set}" = set; then

10803

echo $ECHO_N "(cached) $ECHO_C" >&6

10804

else

10805

@@ -12701,56 +13255,53 @@

10806

cat >>conftest.$ac_ext <<_ACEOF

10807

/* end confdefs.h. */

10808

10809

-/* Override any gcc2 internal prototype to avoid an error. */

10810

+/* Override any GCC internal prototype to avoid an error.

10811

+ Use char because int might match the return type of a GCC

10812

+ builtin and then its argument prototype would still apply. */

10813

#ifdef __cplusplus

10814

extern "C"

10815

#endif

10816

-/* We use char because int might match the return type of a gcc2

10817

- builtin and then its argument prototype would still apply. */

10818

char dlopen ();

10819

int

10820

main ()

10821

{

10822

-dlopen ();

10823

+return dlopen ();

10824

;

10825

return 0;

10826

}

10827

_ACEOF

10828

rm -f conftest.$ac_objext conftest$ac_exeext

10829

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

10830

- (eval $ac_link) 2>conftest.er1

10831

+if { (ac_try="$ac_link"

10832

+case "(($ac_try" in

10833

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10834

+ *) ac_try_echo=$ac_try;;

10835

+esac

10836

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10837

+ (eval "$ac_link") 2>conftest.er1

10838

ac_status=$?

10839

grep -v '^ *+' conftest.er1 >conftest.err

10840

rm -f conftest.er1

10841

cat conftest.err >&5

10842

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10843

- (exit $ac_status); } &&

10844

- { ac_try='test -z "$ac_c_werror_flag"

10845

- || test ! -s conftest.err'

10846

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10847

- (eval $ac_try) 2>&5

10848

- ac_status=$?

10849

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10850

- (exit $ac_status); }; } &&

10851

- { ac_try='test -s conftest$ac_exeext'

10852

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10853

- (eval $ac_try) 2>&5

10854

- ac_status=$?

10855

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10856

- (exit $ac_status); }; }; then

10857

+ (exit $ac_status); } && {

10858

+ test -z "$ac_c_werror_flag" ||

10859

+ test ! -s conftest.err

10860

+ } && test -s conftest$ac_exeext &&

10861

+ $as_test_x conftest$ac_exeext; then

10862

ac_cv_lib_dl_dlopen=yes

10863

else

10864

echo "$as_me: failed program was:" >&5

10865

sed 's/^/| /' conftest.$ac_ext >&5

10866

10867

-ac_cv_lib_dl_dlopen=no

10868

+ ac_cv_lib_dl_dlopen=no

10869

10870

-rm -f conftest.err conftest.$ac_objext \

10871

10872

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10873

conftest$ac_exeext conftest.$ac_ext

10874

LIBS=$ac_check_lib_save_LIBS

10875

10876

-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

10877

-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6

10878

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

10879

+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

10880

if test $ac_cv_lib_dl_dlopen = yes; then

10881

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

10882

else

10883

@@ -12764,8 +13315,8 @@

10884

;;

10885

10886

10887

- echo "$as_me:$LINENO: checking for shl_load" >&5

10888

-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6

10889

+ { echo "$as_me:$LINENO: checking for shl_load" >&5

10890

+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }

10891

if test "${ac_cv_func_shl_load+set}" = set; then

10892

echo $ECHO_N "(cached) $ECHO_C" >&6

10893

else

10894

@@ -12792,73 +13343,64 @@

10895

10896

#undef shl_load

10897

10898

-/* Override any gcc2 internal prototype to avoid an error. */

10899

+/* Override any GCC internal prototype to avoid an error.

10900

+ Use char because int might match the return type of a GCC

10901

+ builtin and then its argument prototype would still apply. */

10902

#ifdef __cplusplus

10903

extern "C"

10904

10905

#endif

10906

-/* We use char because int might match the return type of a gcc2

10907

- builtin and then its argument prototype would still apply. */

10908

char shl_load ();

10909

/* The GNU C library defines this for functions which it implements

10910

to always fail with ENOSYS. Some functions are actually named

10911

something starting with __ and the normal name is an alias. */

10912

-#if defined (__stub_shl_load) || defined (__stub___shl_load)

10913

+#if defined __stub_shl_load || defined __stub___shl_load

10914

choke me

10915

-#else

10916

-char (*f) () = shl_load;

10917

-#endif

10918

-#ifdef __cplusplus

10919

10920

#endif

10921

10922

int

10923

main ()

10924

{

10925

-return f != shl_load;

10926

+return shl_load ();

10927

;

10928

return 0;

10929

}

10930

_ACEOF

10931

rm -f conftest.$ac_objext conftest$ac_exeext

10932

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

10933

- (eval $ac_link) 2>conftest.er1

10934

+if { (ac_try="$ac_link"

10935

+case "(($ac_try" in

10936

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10937

+ *) ac_try_echo=$ac_try;;

10938

+esac

10939

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10940

+ (eval "$ac_link") 2>conftest.er1

10941

ac_status=$?

10942

grep -v '^ *+' conftest.er1 >conftest.err

10943

rm -f conftest.er1

10944

cat conftest.err >&5

10945

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10946

- (exit $ac_status); } &&

10947

- { ac_try='test -z "$ac_c_werror_flag"

10948

- || test ! -s conftest.err'

10949

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10950

- (eval $ac_try) 2>&5

10951

- ac_status=$?

10952

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10953

- (exit $ac_status); }; } &&

10954

- { ac_try='test -s conftest$ac_exeext'

10955

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10956

- (eval $ac_try) 2>&5

10957

- ac_status=$?

10958

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

10959

- (exit $ac_status); }; }; then

10960

+ (exit $ac_status); } && {

10961

+ test -z "$ac_c_werror_flag" ||

10962

+ test ! -s conftest.err

10963

+ } && test -s conftest$ac_exeext &&

10964

+ $as_test_x conftest$ac_exeext; then

10965

ac_cv_func_shl_load=yes

10966

else

10967

echo "$as_me: failed program was:" >&5

10968

sed 's/^/| /' conftest.$ac_ext >&5

10969

10970

-ac_cv_func_shl_load=no

10971

+ ac_cv_func_shl_load=no

10972

10973

-rm -f conftest.err conftest.$ac_objext \

10974

10975

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10976

conftest$ac_exeext conftest.$ac_ext

10977

10978

-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

10979

-echo "${ECHO_T}$ac_cv_func_shl_load" >&6

10980

+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

10981

+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }

10982

if test $ac_cv_func_shl_load = yes; then

10983

lt_cv_dlopen="shl_load"

10984

else

10985

- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

10986

-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6

10987

+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

10988

+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }

10989

if test "${ac_cv_lib_dld_shl_load+set}" = set; then

10990

echo $ECHO_N "(cached) $ECHO_C" >&6

10991

else

10992

@@ -12871,61 +13413,58 @@

10993

cat >>conftest.$ac_ext <<_ACEOF

10994

/* end confdefs.h. */

10995

10996

-/* Override any gcc2 internal prototype to avoid an error. */

10997

+/* Override any GCC internal prototype to avoid an error.

10998

+ Use char because int might match the return type of a GCC

10999

+ builtin and then its argument prototype would still apply. */

11000

#ifdef __cplusplus

11001

extern "C"

11002

#endif

11003

-/* We use char because int might match the return type of a gcc2

11004

- builtin and then its argument prototype would still apply. */

11005

char shl_load ();

11006

int

11007

main ()

11008

{

11009

-shl_load ();

11010

+return shl_load ();

11011

;

11012

return 0;

11013

}

11014

_ACEOF

11015

rm -f conftest.$ac_objext conftest$ac_exeext

11016

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11017

- (eval $ac_link) 2>conftest.er1

11018

+if { (ac_try="$ac_link"

11019

+case "(($ac_try" in

11020

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11021

+ *) ac_try_echo=$ac_try;;

11022

+esac

11023

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11024

+ (eval "$ac_link") 2>conftest.er1

11025

ac_status=$?

11026

grep -v '^ *+' conftest.er1 >conftest.err

11027

rm -f conftest.er1

11028

cat conftest.err >&5

11029

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11030

- (exit $ac_status); } &&

11031

- { ac_try='test -z "$ac_c_werror_flag"

11032

- || test ! -s conftest.err'

11033

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11034

- (eval $ac_try) 2>&5

11035

- ac_status=$?

11036

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11037

- (exit $ac_status); }; } &&

11038

- { ac_try='test -s conftest$ac_exeext'

11039

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11040

- (eval $ac_try) 2>&5

11041

- ac_status=$?

11042

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11043

- (exit $ac_status); }; }; then

11044

+ (exit $ac_status); } && {

11045

+ test -z "$ac_c_werror_flag" ||

11046

+ test ! -s conftest.err

11047

+ } && test -s conftest$ac_exeext &&

11048

+ $as_test_x conftest$ac_exeext; then

11049

ac_cv_lib_dld_shl_load=yes

11050

else

11051

echo "$as_me: failed program was:" >&5

11052

sed 's/^/| /' conftest.$ac_ext >&5

11053

11054

-ac_cv_lib_dld_shl_load=no

11055

+ ac_cv_lib_dld_shl_load=no

11056

11057

-rm -f conftest.err conftest.$ac_objext \

11058

11059

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11060

conftest$ac_exeext conftest.$ac_ext

11061

LIBS=$ac_check_lib_save_LIBS

11062

11063

-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5

11064

-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6

11065

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5

11066

+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }

11067

if test $ac_cv_lib_dld_shl_load = yes; then

11068

lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"

11069

else

11070

- echo "$as_me:$LINENO: checking for dlopen" >&5

11071

-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6

11072

+ { echo "$as_me:$LINENO: checking for dlopen" >&5

11073

+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }

11074

if test "${ac_cv_func_dlopen+set}" = set; then

11075

echo $ECHO_N "(cached) $ECHO_C" >&6

11076

else

11077

@@ -12952,73 +13491,64 @@

11078

11079

#undef dlopen

11080

11081

-/* Override any gcc2 internal prototype to avoid an error. */

11082

+/* Override any GCC internal prototype to avoid an error.

11083

+ Use char because int might match the return type of a GCC

11084

+ builtin and then its argument prototype would still apply. */

11085

#ifdef __cplusplus

11086

extern "C"

11087

11088

#endif

11089

-/* We use char because int might match the return type of a gcc2

11090

- builtin and then its argument prototype would still apply. */

11091

char dlopen ();

11092

/* The GNU C library defines this for functions which it implements

11093

to always fail with ENOSYS. Some functions are actually named

11094

something starting with __ and the normal name is an alias. */

11095

-#if defined (__stub_dlopen) || defined (__stub___dlopen)

11096

+#if defined __stub_dlopen || defined __stub___dlopen

11097

choke me

11098

-#else

11099

-char (*f) () = dlopen;

11100

-#endif

11101

-#ifdef __cplusplus

11102

11103

#endif

11104

11105

int

11106

main ()

11107

{

11108

-return f != dlopen;

11109

+return dlopen ();

11110

;

11111

return 0;

11112

}

11113

_ACEOF

11114

rm -f conftest.$ac_objext conftest$ac_exeext

11115

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11116

- (eval $ac_link) 2>conftest.er1

11117

+if { (ac_try="$ac_link"

11118

+case "(($ac_try" in

11119

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11120

+ *) ac_try_echo=$ac_try;;

11121

+esac

11122

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11123

+ (eval "$ac_link") 2>conftest.er1

11124

ac_status=$?

11125

grep -v '^ *+' conftest.er1 >conftest.err

11126

rm -f conftest.er1

11127

cat conftest.err >&5

11128

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11129

- (exit $ac_status); } &&

11130

- { ac_try='test -z "$ac_c_werror_flag"

11131

- || test ! -s conftest.err'

11132

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11133

- (eval $ac_try) 2>&5

11134

- ac_status=$?

11135

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11136

- (exit $ac_status); }; } &&

11137

- { ac_try='test -s conftest$ac_exeext'

11138

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11139

- (eval $ac_try) 2>&5

11140

- ac_status=$?

11141

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11142

- (exit $ac_status); }; }; then

11143

+ (exit $ac_status); } && {

11144

+ test -z "$ac_c_werror_flag" ||

11145

+ test ! -s conftest.err

11146

+ } && test -s conftest$ac_exeext &&

11147

+ $as_test_x conftest$ac_exeext; then

11148

ac_cv_func_dlopen=yes

11149

else

11150

echo "$as_me: failed program was:" >&5

11151

sed 's/^/| /' conftest.$ac_ext >&5

11152

11153

-ac_cv_func_dlopen=no

11154

+ ac_cv_func_dlopen=no

11155

11156

-rm -f conftest.err conftest.$ac_objext \

11157

11158

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11159

conftest$ac_exeext conftest.$ac_ext

11160

11161

-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

11162

-echo "${ECHO_T}$ac_cv_func_dlopen" >&6

11163

+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

11164

+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }

11165

if test $ac_cv_func_dlopen = yes; then

11166

lt_cv_dlopen="dlopen"

11167

else

11168

- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

11169

-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6

11170

+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

11171

+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

11172

if test "${ac_cv_lib_dl_dlopen+set}" = set; then

11173

echo $ECHO_N "(cached) $ECHO_C" >&6

11174

else

11175

@@ -13031,61 +13561,58 @@

11176

cat >>conftest.$ac_ext <<_ACEOF

11177

/* end confdefs.h. */

11178

11179

-/* Override any gcc2 internal prototype to avoid an error. */

11180

+/* Override any GCC internal prototype to avoid an error.

11181

+ Use char because int might match the return type of a GCC

11182

+ builtin and then its argument prototype would still apply. */

11183

#ifdef __cplusplus

11184

extern "C"

11185

#endif

11186

-/* We use char because int might match the return type of a gcc2

11187

- builtin and then its argument prototype would still apply. */

11188

char dlopen ();

11189

int

11190

main ()

11191

{

11192

-dlopen ();

11193

+return dlopen ();

11194

;

11195

return 0;

11196

}

11197

_ACEOF

11198

rm -f conftest.$ac_objext conftest$ac_exeext

11199

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11200

- (eval $ac_link) 2>conftest.er1

11201

+if { (ac_try="$ac_link"

11202

+case "(($ac_try" in

11203

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11204

+ *) ac_try_echo=$ac_try;;

11205

+esac

11206

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11207

+ (eval "$ac_link") 2>conftest.er1

11208

ac_status=$?

11209

grep -v '^ *+' conftest.er1 >conftest.err

11210

rm -f conftest.er1

11211

cat conftest.err >&5

11212

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11213

- (exit $ac_status); } &&

11214

- { ac_try='test -z "$ac_c_werror_flag"

11215

- || test ! -s conftest.err'

11216

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11217

- (eval $ac_try) 2>&5

11218

- ac_status=$?

11219

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11220

- (exit $ac_status); }; } &&

11221

- { ac_try='test -s conftest$ac_exeext'

11222

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11223

- (eval $ac_try) 2>&5

11224

- ac_status=$?

11225

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11226

- (exit $ac_status); }; }; then

11227

+ (exit $ac_status); } && {

11228

+ test -z "$ac_c_werror_flag" ||

11229

+ test ! -s conftest.err

11230

+ } && test -s conftest$ac_exeext &&

11231

+ $as_test_x conftest$ac_exeext; then

11232

ac_cv_lib_dl_dlopen=yes

11233

else

11234

echo "$as_me: failed program was:" >&5

11235

sed 's/^/| /' conftest.$ac_ext >&5

11236

11237

-ac_cv_lib_dl_dlopen=no

11238

+ ac_cv_lib_dl_dlopen=no

11239

11240

-rm -f conftest.err conftest.$ac_objext \

11241

11242

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11243

conftest$ac_exeext conftest.$ac_ext

11244

LIBS=$ac_check_lib_save_LIBS

11245

11246

-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

11247

-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6

11248

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

11249

+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

11250

if test $ac_cv_lib_dl_dlopen = yes; then

11251

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

11252

else

11253

- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5

11254

-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6

11255

+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5

11256

+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }

11257

if test "${ac_cv_lib_svld_dlopen+set}" = set; then

11258

echo $ECHO_N "(cached) $ECHO_C" >&6

11259

else

11260

@@ -13098,61 +13625,58 @@

11261

cat >>conftest.$ac_ext <<_ACEOF

11262

/* end confdefs.h. */

11263

11264

-/* Override any gcc2 internal prototype to avoid an error. */

11265

+/* Override any GCC internal prototype to avoid an error.

11266

+ Use char because int might match the return type of a GCC

11267

+ builtin and then its argument prototype would still apply. */

11268

#ifdef __cplusplus

11269

extern "C"

11270

#endif

11271

-/* We use char because int might match the return type of a gcc2

11272

- builtin and then its argument prototype would still apply. */

11273

char dlopen ();

11274

int

11275

main ()

11276

{

11277

-dlopen ();

11278

+return dlopen ();

11279

;

11280

return 0;

11281

}

11282

_ACEOF

11283

rm -f conftest.$ac_objext conftest$ac_exeext

11284

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11285

- (eval $ac_link) 2>conftest.er1

11286

+if { (ac_try="$ac_link"

11287

+case "(($ac_try" in

11288

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11289

+ *) ac_try_echo=$ac_try;;

11290

+esac

11291

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11292

+ (eval "$ac_link") 2>conftest.er1

11293

ac_status=$?

11294

grep -v '^ *+' conftest.er1 >conftest.err

11295

rm -f conftest.er1

11296

cat conftest.err >&5

11297

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11298

- (exit $ac_status); } &&

11299

- { ac_try='test -z "$ac_c_werror_flag"

11300

- || test ! -s conftest.err'

11301

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11302

- (eval $ac_try) 2>&5

11303

- ac_status=$?

11304

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11305

- (exit $ac_status); }; } &&

11306

- { ac_try='test -s conftest$ac_exeext'

11307

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11308

- (eval $ac_try) 2>&5

11309

- ac_status=$?

11310

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11311

- (exit $ac_status); }; }; then

11312

+ (exit $ac_status); } && {

11313

+ test -z "$ac_c_werror_flag" ||

11314

+ test ! -s conftest.err

11315

+ } && test -s conftest$ac_exeext &&

11316

+ $as_test_x conftest$ac_exeext; then

11317

ac_cv_lib_svld_dlopen=yes

11318

else

11319

echo "$as_me: failed program was:" >&5

11320

sed 's/^/| /' conftest.$ac_ext >&5

11321

11322

-ac_cv_lib_svld_dlopen=no

11323

+ ac_cv_lib_svld_dlopen=no

11324

11325

-rm -f conftest.err conftest.$ac_objext \

11326

11327

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11328

conftest$ac_exeext conftest.$ac_ext

11329

LIBS=$ac_check_lib_save_LIBS

11330

11331

-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5

11332

-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6

11333

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5

11334

+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }

11335

if test $ac_cv_lib_svld_dlopen = yes; then

11336

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"

11337

else

11338

- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5

11339

-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6

11340

+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5

11341

+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }

11342

if test "${ac_cv_lib_dld_dld_link+set}" = set; then

11343

echo $ECHO_N "(cached) $ECHO_C" >&6

11344

else

11345

@@ -13165,56 +13689,53 @@

11346

cat >>conftest.$ac_ext <<_ACEOF

11347

/* end confdefs.h. */

11348

11349

-/* Override any gcc2 internal prototype to avoid an error. */

11350

+/* Override any GCC internal prototype to avoid an error.

11351

+ Use char because int might match the return type of a GCC

11352

+ builtin and then its argument prototype would still apply. */

11353

#ifdef __cplusplus

11354

extern "C"

11355

#endif

11356

-/* We use char because int might match the return type of a gcc2

11357

- builtin and then its argument prototype would still apply. */

11358

char dld_link ();

11359

int

11360

main ()

11361

{

11362

-dld_link ();

11363

+return dld_link ();

11364

;

11365

return 0;

11366

}

11367

_ACEOF

11368

rm -f conftest.$ac_objext conftest$ac_exeext

11369

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11370

- (eval $ac_link) 2>conftest.er1

11371

+if { (ac_try="$ac_link"

11372

+case "(($ac_try" in

11373

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11374

+ *) ac_try_echo=$ac_try;;

11375

+esac

11376

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11377

+ (eval "$ac_link") 2>conftest.er1

11378

ac_status=$?

11379

grep -v '^ *+' conftest.er1 >conftest.err

11380

rm -f conftest.er1

11381

cat conftest.err >&5

11382

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11383

- (exit $ac_status); } &&

11384

- { ac_try='test -z "$ac_c_werror_flag"

11385

- || test ! -s conftest.err'

11386

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11387

- (eval $ac_try) 2>&5

11388

- ac_status=$?

11389

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11390

- (exit $ac_status); }; } &&

11391

- { ac_try='test -s conftest$ac_exeext'

11392

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11393

- (eval $ac_try) 2>&5

11394

- ac_status=$?

11395

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11396

- (exit $ac_status); }; }; then

11397

+ (exit $ac_status); } && {

11398

+ test -z "$ac_c_werror_flag" ||

11399

+ test ! -s conftest.err

11400

+ } && test -s conftest$ac_exeext &&

11401

+ $as_test_x conftest$ac_exeext; then

11402

ac_cv_lib_dld_dld_link=yes

11403

else

11404

echo "$as_me: failed program was:" >&5

11405

sed 's/^/| /' conftest.$ac_ext >&5

11406

11407

-ac_cv_lib_dld_dld_link=no

11408

+ ac_cv_lib_dld_dld_link=no

11409

11410

-rm -f conftest.err conftest.$ac_objext \

11411

11412

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11413

conftest$ac_exeext conftest.$ac_ext

11414

LIBS=$ac_check_lib_save_LIBS

11415

11416

-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5

11417

-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6

11418

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5

11419

+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }

11420

if test $ac_cv_lib_dld_dld_link = yes; then

11421

lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"

11422

11423

@@ -13254,8 +13775,8 @@

11424

save_LIBS="$LIBS"

11425

LIBS="$lt_cv_dlopen_libs $LIBS"

11426

11427

- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5

11428

-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6

11429

+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5

11430

+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }

11431

if test "${lt_cv_dlopen_self+set}" = set; then

11432

echo $ECHO_N "(cached) $ECHO_C" >&6

11433

else

11434

@@ -13265,7 +13786,7 @@

11435

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

11436

lt_status=$lt_dlunknown

11437

cat > conftest.$ac_ext <<EOF

11438

-#line 13268 "configure"

11439

+#line 13789 "configure"

11440

#include "confdefs.h"

11441

11442

#if HAVE_DLFCN_H

11443

@@ -13349,13 +13870,13 @@

11444

11445

11446

11447

-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5

11448

-echo "${ECHO_T}$lt_cv_dlopen_self" >&6

11449

+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5

11450

+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }

11451

11452

if test "x$lt_cv_dlopen_self" = xyes; then

11453

wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"

11454

- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5

11455

-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6

11456

+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5

11457

+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }

11458

if test "${lt_cv_dlopen_self_static+set}" = set; then

11459

echo $ECHO_N "(cached) $ECHO_C" >&6

11460

else

11461

@@ -13365,7 +13886,7 @@

11462

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

11463

lt_status=$lt_dlunknown

11464

cat > conftest.$ac_ext <<EOF

11465

-#line 13368 "configure"

11466

+#line 13889 "configure"

11467

#include "confdefs.h"

11468

11469

#if HAVE_DLFCN_H

11470

@@ -13449,8 +13970,8 @@

11471

11472

11473

11474

-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5

11475

-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6

11476

+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5

11477

+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }

11478

11479

11480

CPPFLAGS="$save_CPPFLAGS"

11481

@@ -13472,13 +13993,13 @@

11482

11483

11484

# Report which library types will actually be built

11485

-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

11486

-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6

11487

-echo "$as_me:$LINENO: result: $can_build_shared" >&5

11488

-echo "${ECHO_T}$can_build_shared" >&6

11489

+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

11490

+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }

11491

+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5

11492

+echo "${ECHO_T}$can_build_shared" >&6; }

11493

11494

-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

11495

-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6

11496

+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

11497

+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }

11498

test "$can_build_shared" = "no" && enable_shared=no

11499

11500

# On AIX, shared libraries and static libraries use the same namespace, and

11501

@@ -13498,15 +14019,15 @@

11502

11503

;;

11504

esac

11505

-echo "$as_me:$LINENO: result: $enable_shared" >&5

11506

-echo "${ECHO_T}$enable_shared" >&6

11507

+{ echo "$as_me:$LINENO: result: $enable_shared" >&5

11508

+echo "${ECHO_T}$enable_shared" >&6; }

11509

11510

-echo "$as_me:$LINENO: checking whether to build static libraries" >&5

11511

-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6

11512

+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5

11513

+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }

11514

# Make sure either enable_shared or enable_static is yes.

11515

test "$enable_shared" = yes || enable_static=yes

11516

-echo "$as_me:$LINENO: result: $enable_static" >&5

11517

-echo "${ECHO_T}$enable_static" >&6

11518

+{ echo "$as_me:$LINENO: result: $enable_static" >&5

11519

+echo "${ECHO_T}$enable_static" >&6; }

11520

11521

# The else clause should only fire when bootstrapping the

11522

# libtool distribution, otherwise you forgot to ship ltmain.sh

11523

@@ -13998,11 +14519,11 @@

11524

CC="$lt_save_CC"

11525

11526

11527

-# Check whether --with-tags or --without-tags was given.

11528

+# Check whether --with-tags was given.

11529

if test "${with_tags+set}" = set; then

11530

- withval="$with_tags"

11531

- tagnames="$withval"

11532

-fi;

11533

+ withval=$with_tags; tagnames="$withval"

11534

+fi

11535

11536

11537

if test -f "$ltmain" && test -n "$tagnames"; then

11538

if test ! -f "${ofile}"; then

11539

@@ -14056,7 +14577,7 @@

11540

if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

11541

( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

11542

(test "X$CXX" != "Xg++"))) ; then

11543

- ac_ext=cc

11544

+ ac_ext=cpp

11545

ac_cpp='$CXXCPP $CPPFLAGS'

11546

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

11547

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

11548

@@ -14175,18 +14696,18 @@

11549

# Set up default GNU C++ configuration

11550

11551

11552

-# Check whether --with-gnu-ld or --without-gnu-ld was given.

11553

+# Check whether --with-gnu-ld was given.

11554

if test "${with_gnu_ld+set}" = set; then

11555

- withval="$with_gnu_ld"

11556

- test "$withval" = no || with_gnu_ld=yes

11557

+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

11558

else

11559

with_gnu_ld=no

11560

-fi;

11561

+fi

11562

11563

ac_prog=ld

11564

if test "$GCC" = yes; then

11565

# Check if gcc -print-prog-name=ld gives a path.

11566

- echo "$as_me:$LINENO: checking for ld used by $CC" >&5

11567

-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6

11568

+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

11569

+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

11570

case $host in

11571

*-*-mingw*)

11572

# gcc leaves a trailing carriage return which upsets mingw

11573

@@ -14215,11 +14736,11 @@

11574

;;

11575

esac

11576

elif test "$with_gnu_ld" = yes; then

11577

- echo "$as_me:$LINENO: checking for GNU ld" >&5

11578

-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6

11579

+ { echo "$as_me:$LINENO: checking for GNU ld" >&5

11580

+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

11581

else

11582

- echo "$as_me:$LINENO: checking for non-GNU ld" >&5

11583

-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6

11584

+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

11585

+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

11586

11587

if test "${lt_cv_path_LD+set}" = set; then

11588

echo $ECHO_N "(cached) $ECHO_C" >&6

11589

@@ -14252,17 +14773,17 @@

11590

11591

LD="$lt_cv_path_LD"

11592

if test -n "$LD"; then

11593

- echo "$as_me:$LINENO: result: $LD" >&5

11594

-echo "${ECHO_T}$LD" >&6

11595

+ { echo "$as_me:$LINENO: result: $LD" >&5

11596

+echo "${ECHO_T}$LD" >&6; }

11597

else

11598

- echo "$as_me:$LINENO: result: no" >&5

11599

-echo "${ECHO_T}no" >&6

11600

+ { echo "$as_me:$LINENO: result: no" >&5

11601

+echo "${ECHO_T}no" >&6; }

11602

11603

test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

11604

echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

11605

{ (exit 1); exit 1; }; }

11606

-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

11607

-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6

11608

+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

11609

+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

11610

if test "${lt_cv_prog_gnu_ld+set}" = set; then

11611

echo $ECHO_N "(cached) $ECHO_C" >&6

11612

else

11613

@@ -14276,8 +14797,8 @@

11614

;;

11615

esac

11616

11617

-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

11618

-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6

11619

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

11620

+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

11621

with_gnu_ld=$lt_cv_prog_gnu_ld

11622

11623

11624

@@ -14327,8 +14848,8 @@

11625

11626

11627

# PORTME: fill in a description of your system's C++ link characteristics

11628

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

11629

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

11630

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

11631

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

11632

ld_shlibs_CXX=yes

11633

case $host_os in

11634

aix3*)

11635

@@ -14440,27 +14961,23 @@

11636

}

11637

_ACEOF

11638

rm -f conftest.$ac_objext conftest$ac_exeext

11639

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11640

- (eval $ac_link) 2>conftest.er1

11641

+if { (ac_try="$ac_link"

11642

+case "(($ac_try" in

11643

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11644

+ *) ac_try_echo=$ac_try;;

11645

+esac

11646

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11647

+ (eval "$ac_link") 2>conftest.er1

11648

ac_status=$?

11649

grep -v '^ *+' conftest.er1 >conftest.err

11650

rm -f conftest.er1

11651

cat conftest.err >&5

11652

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11653

- (exit $ac_status); } &&

11654

- { ac_try='test -z "$ac_cxx_werror_flag"

11655

- || test ! -s conftest.err'

11656

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11657

- (eval $ac_try) 2>&5

11658

- ac_status=$?

11659

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11660

- (exit $ac_status); }; } &&

11661

- { ac_try='test -s conftest$ac_exeext'

11662

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11663

- (eval $ac_try) 2>&5

11664

- ac_status=$?

11665

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11666

- (exit $ac_status); }; }; then

11667

+ (exit $ac_status); } && {

11668

+ test -z "$ac_cxx_werror_flag" ||

11669

+ test ! -s conftest.err

11670

+ } && test -s conftest$ac_exeext &&

11671

+ $as_test_x conftest$ac_exeext; then

11672

11673

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

11674

}'`

11675

@@ -14471,8 +14988,10 @@

11676

echo "$as_me: failed program was:" >&5

11677

sed 's/^/| /' conftest.$ac_ext >&5

11678

11679

11680

11681

-rm -f conftest.err conftest.$ac_objext \

11682

11683

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11684

conftest$ac_exeext conftest.$ac_ext

11685

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

11686

11687

@@ -14502,27 +15021,23 @@

11688

}

11689

_ACEOF

11690

rm -f conftest.$ac_objext conftest$ac_exeext

11691

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11692

- (eval $ac_link) 2>conftest.er1

11693

+if { (ac_try="$ac_link"

11694

+case "(($ac_try" in

11695

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11696

+ *) ac_try_echo=$ac_try;;

11697

+esac

11698

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11699

+ (eval "$ac_link") 2>conftest.er1

11700

ac_status=$?

11701

grep -v '^ *+' conftest.er1 >conftest.err

11702

rm -f conftest.er1

11703

cat conftest.err >&5

11704

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11705

- (exit $ac_status); } &&

11706

- { ac_try='test -z "$ac_cxx_werror_flag"

11707

- || test ! -s conftest.err'

11708

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11709

- (eval $ac_try) 2>&5

11710

- ac_status=$?

11711

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11712

- (exit $ac_status); }; } &&

11713

- { ac_try='test -s conftest$ac_exeext'

11714

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11715

- (eval $ac_try) 2>&5

11716

- ac_status=$?

11717

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

11718

- (exit $ac_status); }; }; then

11719

+ (exit $ac_status); } && {

11720

+ test -z "$ac_cxx_werror_flag" ||

11721

+ test ! -s conftest.err

11722

+ } && test -s conftest$ac_exeext &&

11723

+ $as_test_x conftest$ac_exeext; then

11724

11725

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

11726

}'`

11727

@@ -14533,8 +15048,10 @@

11728

echo "$as_me: failed program was:" >&5

11729

sed 's/^/| /' conftest.$ac_ext >&5

11730

11731

11732

11733

-rm -f conftest.err conftest.$ac_objext \

11734

11735

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11736

conftest$ac_exeext conftest.$ac_ext

11737

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

11738

11739

@@ -15265,8 +15782,8 @@

11740

ld_shlibs_CXX=no

11741

;;

11742

esac

11743

-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

11744

-echo "${ECHO_T}$ld_shlibs_CXX" >&6

11745

+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

11746

+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

11747

test "$ld_shlibs_CXX" = no && can_build_shared=no

11748

11749

GCC_CXX="$GXX"

11750

@@ -15405,8 +15922,8 @@

11751

lt_prog_compiler_pic_CXX=

11752

lt_prog_compiler_static_CXX=

11753

11754

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

11755

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

11756

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

11757

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

11758

11759

# C++ specific cases for pic, static, wl, etc.

11760

if test "$GXX" = yes; then

11761

@@ -15679,16 +16196,16 @@

11762

esac

11763

11764

11765

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5

11766

-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6

11767

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5

11768

+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }

11769

11770

11771

# Check to make sure the PIC flag actually works.

11772

11773

if test -n "$lt_prog_compiler_pic_CXX"; then

11774

11775

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

11776

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6

11777

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

11778

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }

11779

if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then

11780

echo $ECHO_N "(cached) $ECHO_C" >&6

11781

else

11782

@@ -15705,11 +16222,11 @@

11783

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

11784

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

11785

-e 's:$: $lt_compiler_flag:'`

11786

- (eval echo "\"\$as_me:15708: $lt_compile\"" >&5)

11787

+ (eval echo "\"\$as_me:16225: $lt_compile\"" >&5)

11788

(eval "$lt_compile" 2>conftest.err)

11789

ac_status=$?

11790

cat conftest.err >&5

11791

- echo "$as_me:15712: \$? = $ac_status" >&5

11792

+ echo "$as_me:16229: \$? = $ac_status" >&5

11793

if (exit $ac_status) && test -s "$ac_outfile"; then

11794

# The compiler can only warn and ignore the option if not recognized

11795

# So say no if there are warnings other than the usual output.

11796

@@ -15722,8 +16239,8 @@

11797

$rm conftest*

11798

11799

11800

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5

11801

-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6

11802

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5

11803

+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }

11804

11805

if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then

11806

case $lt_prog_compiler_pic_CXX in

11807

@@ -15750,8 +16267,8 @@

11808

# Check to make sure the static flag actually works.

11809

11810

wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"

11811

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

11812

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

11813

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

11814

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

11815

if test "${lt_prog_compiler_static_works_CXX+set}" = set; then

11816

echo $ECHO_N "(cached) $ECHO_C" >&6

11817

else

11818

@@ -15778,8 +16295,8 @@

11819

LDFLAGS="$save_LDFLAGS"

11820

11821

11822

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5

11823

-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6

11824

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5

11825

+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }

11826

11827

if test x"$lt_prog_compiler_static_works_CXX" = xyes; then

11828

11829

@@ -15788,8 +16305,8 @@

11830

11831

11832

11833

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

11834

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

11835

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

11836

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

11837

if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then

11838

echo $ECHO_N "(cached) $ECHO_C" >&6

11839

else

11840

@@ -15809,11 +16326,11 @@

11841

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

11842

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

11843

-e 's:$: $lt_compiler_flag:'`

11844

- (eval echo "\"\$as_me:15812: $lt_compile\"" >&5)

11845

+ (eval echo "\"\$as_me:16329: $lt_compile\"" >&5)

11846

(eval "$lt_compile" 2>out/conftest.err)

11847

ac_status=$?

11848

cat out/conftest.err >&5

11849

- echo "$as_me:15816: \$? = $ac_status" >&5

11850

+ echo "$as_me:16333: \$? = $ac_status" >&5

11851

if (exit $ac_status) && test -s out/conftest2.$ac_objext

11852

then

11853

# The compiler can only warn and ignore the option if not recognized

11854

@@ -15835,23 +16352,23 @@

11855

$rm conftest*

11856

11857

11858

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

11859

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6

11860

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

11861

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }

11862

11863

11864

hard_links="nottested"

11865

if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then

11866

# do not overwrite the value of need_locks provided by the user

11867

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

11868

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

11869

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

11870

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

11871

hard_links=yes

11872

$rm conftest*

11873

ln conftest.a conftest.b 2>/dev/null && hard_links=no

11874

touch conftest.a

11875

ln conftest.a conftest.b 2>&5 || hard_links=no

11876

ln conftest.a conftest.b 2>/dev/null && hard_links=no

11877

- echo "$as_me:$LINENO: result: $hard_links" >&5

11878

-echo "${ECHO_T}$hard_links" >&6

11879

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

11880

+echo "${ECHO_T}$hard_links" >&6; }

11881

if test "$hard_links" = no; then

11882

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

11883

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

11884

@@ -15861,8 +16378,8 @@

11885

need_locks=no

11886

11887

11888

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

11889

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

11890

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

11891

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

11892

11893

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

11894

case $host_os in

11895

@@ -15886,8 +16403,8 @@

11896

;;

11897

esac

11898

11899

-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

11900

-echo "${ECHO_T}$ld_shlibs_CXX" >&6

11901

+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

11902

+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

11903

test "$ld_shlibs_CXX" = no && can_build_shared=no

11904

11905

11906

@@ -15907,8 +16424,8 @@

11907

# Test whether the compiler implicitly links with -lc since on some

11908

# systems, -lgcc has to come before -lc. If gcc already passes -lc

11909

# to ld, don't add -lc before -lgcc.

11910

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

11911

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

11912

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

11913

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

11914

$rm conftest*

11915

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

11916

11917

@@ -15945,16 +16462,16 @@

11918

cat conftest.err 1>&5

11919

11920

$rm conftest*

11921

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5

11922

-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6

11923

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5

11924

+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }

11925

;;

11926

esac

11927

11928

;;

11929

esac

11930

11931

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

11932

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

11933

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

11934

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

11935

library_names_spec=

11936

libname_spec='lib$name'

11937

soname_spec=

11938

@@ -16345,7 +16862,7 @@

11939

libsuff=

11940

case "$host_cpu" in

11941

x86_64*|s390x*|powerpc64*)

11942

- echo '#line 16348 "configure"' > conftest.$ac_ext

11943

+ echo '#line 16865 "configure"' > conftest.$ac_ext

11944

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

11945

(eval $ac_compile) 2>&5

11946

ac_status=$?

11947

@@ -16562,8 +17079,8 @@

11948

dynamic_linker=no

11949

;;

11950

esac

11951

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

11952

-echo "${ECHO_T}$dynamic_linker" >&6

11953

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

11954

+echo "${ECHO_T}$dynamic_linker" >&6; }

11955

test "$dynamic_linker" = no && can_build_shared=no

11956

11957

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

11958

@@ -16571,8 +17088,8 @@

11959

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

11960

11961

11962

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

11963

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

11964

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

11965

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

11966

hardcode_action_CXX=

11967

if test -n "$hardcode_libdir_flag_spec_CXX" || \

11968

test -n "$runpath_var_CXX" || \

11969

@@ -16596,8 +17113,8 @@

11970

# directories.

11971

hardcode_action_CXX=unsupported

11972

11973

-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5

11974

-echo "${ECHO_T}$hardcode_action_CXX" >&6

11975

+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5

11976

+echo "${ECHO_T}$hardcode_action_CXX" >&6; }

11977

11978

if test "$hardcode_action_CXX" = relink; then

11979

# Fast installation is not supported

11980

@@ -17122,13 +17639,13 @@

11981

cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

11982

11983

11984

-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

11985

-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6

11986

-echo "$as_me:$LINENO: result: $can_build_shared" >&5

11987

-echo "${ECHO_T}$can_build_shared" >&6

11988

+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

11989

+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }

11990

+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5

11991

+echo "${ECHO_T}$can_build_shared" >&6; }

11992

11993

-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

11994

-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6

11995

+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

11996

+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }

11997

test "$can_build_shared" = "no" && enable_shared=no

11998

11999

# On AIX, shared libraries and static libraries use the same namespace, and

12000

@@ -17147,15 +17664,15 @@

12001

12002

;;

12003

esac

12004

-echo "$as_me:$LINENO: result: $enable_shared" >&5

12005

-echo "${ECHO_T}$enable_shared" >&6

12006

+{ echo "$as_me:$LINENO: result: $enable_shared" >&5

12007

+echo "${ECHO_T}$enable_shared" >&6; }

12008

12009

-echo "$as_me:$LINENO: checking whether to build static libraries" >&5

12010

-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6

12011

+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5

12012

+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }

12013

# Make sure either enable_shared or enable_static is yes.

12014

test "$enable_shared" = yes || enable_static=yes

12015

-echo "$as_me:$LINENO: result: $enable_static" >&5

12016

-echo "${ECHO_T}$enable_static" >&6

12017

+{ echo "$as_me:$LINENO: result: $enable_static" >&5

12018

+echo "${ECHO_T}$enable_static" >&6; }

12019

12020

GCC_F77="$G77"

12021

LD_F77="$LD"

12022

@@ -17164,8 +17681,8 @@

12023

lt_prog_compiler_pic_F77=

12024

lt_prog_compiler_static_F77=

12025

12026

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

12027

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

12028

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

12029

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

12030

12031

if test "$GCC" = yes; then

12032

lt_prog_compiler_wl_F77='-Wl,'

12033

@@ -17374,16 +17891,16 @@

12034

esac

12035

12036

12037

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5

12038

-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6

12039

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5

12040

+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }

12041

12042

12043

# Check to make sure the PIC flag actually works.

12044

12045

if test -n "$lt_prog_compiler_pic_F77"; then

12046

12047

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5

12048

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6

12049

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5

12050

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }

12051

if test "${lt_prog_compiler_pic_works_F77+set}" = set; then

12052

echo $ECHO_N "(cached) $ECHO_C" >&6

12053

else

12054

@@ -17400,11 +17917,11 @@

12055

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

12056

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

12057

-e 's:$: $lt_compiler_flag:'`

12058

- (eval echo "\"\$as_me:17403: $lt_compile\"" >&5)

12059

+ (eval echo "\"\$as_me:17920: $lt_compile\"" >&5)

12060

(eval "$lt_compile" 2>conftest.err)

12061

ac_status=$?

12062

cat conftest.err >&5

12063

- echo "$as_me:17407: \$? = $ac_status" >&5

12064

+ echo "$as_me:17924: \$? = $ac_status" >&5

12065

if (exit $ac_status) && test -s "$ac_outfile"; then

12066

# The compiler can only warn and ignore the option if not recognized

12067

# So say no if there are warnings other than the usual output.

12068

@@ -17417,8 +17934,8 @@

12069

$rm conftest*

12070

12071

12072

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5

12073

-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6

12074

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5

12075

+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }

12076

12077

if test x"$lt_prog_compiler_pic_works_F77" = xyes; then

12078

case $lt_prog_compiler_pic_F77 in

12079

@@ -17445,8 +17962,8 @@

12080

# Check to make sure the static flag actually works.

12081

12082

wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"

12083

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

12084

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

12085

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

12086

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

12087

if test "${lt_prog_compiler_static_works_F77+set}" = set; then

12088

echo $ECHO_N "(cached) $ECHO_C" >&6

12089

else

12090

@@ -17473,8 +17990,8 @@

12091

LDFLAGS="$save_LDFLAGS"

12092

12093

12094

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5

12095

-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6

12096

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5

12097

+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }

12098

12099

if test x"$lt_prog_compiler_static_works_F77" = xyes; then

12100

12101

@@ -17483,8 +18000,8 @@

12102

12103

12104

12105

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

12106

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

12107

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

12108

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

12109

if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then

12110

echo $ECHO_N "(cached) $ECHO_C" >&6

12111

else

12112

@@ -17504,11 +18021,11 @@

12113

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

12114

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

12115

-e 's:$: $lt_compiler_flag:'`

12116

- (eval echo "\"\$as_me:17507: $lt_compile\"" >&5)

12117

+ (eval echo "\"\$as_me:18024: $lt_compile\"" >&5)

12118

(eval "$lt_compile" 2>out/conftest.err)

12119

ac_status=$?

12120

cat out/conftest.err >&5

12121

- echo "$as_me:17511: \$? = $ac_status" >&5

12122

+ echo "$as_me:18028: \$? = $ac_status" >&5

12123

if (exit $ac_status) && test -s out/conftest2.$ac_objext

12124

then

12125

# The compiler can only warn and ignore the option if not recognized

12126

@@ -17530,23 +18047,23 @@

12127

$rm conftest*

12128

12129

12130

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5

12131

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6

12132

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5

12133

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }

12134

12135

12136

hard_links="nottested"

12137

if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then

12138

# do not overwrite the value of need_locks provided by the user

12139

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

12140

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

12141

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

12142

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

12143

hard_links=yes

12144

$rm conftest*

12145

ln conftest.a conftest.b 2>/dev/null && hard_links=no

12146

touch conftest.a

12147

ln conftest.a conftest.b 2>&5 || hard_links=no

12148

ln conftest.a conftest.b 2>/dev/null && hard_links=no

12149

- echo "$as_me:$LINENO: result: $hard_links" >&5

12150

-echo "${ECHO_T}$hard_links" >&6

12151

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

12152

+echo "${ECHO_T}$hard_links" >&6; }

12153

if test "$hard_links" = no; then

12154

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

12155

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

12156

@@ -17556,8 +18073,8 @@

12157

need_locks=no

12158

12159

12160

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

12161

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

12162

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

12163

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

12164

12165

runpath_var=

12166

allow_undefined_flag_F77=

12167

@@ -17962,27 +18479,23 @@

12168

end

12169

_ACEOF

12170

rm -f conftest.$ac_objext conftest$ac_exeext

12171

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12172

- (eval $ac_link) 2>conftest.er1

12173

+if { (ac_try="$ac_link"

12174

+case "(($ac_try" in

12175

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12176

+ *) ac_try_echo=$ac_try;;

12177

+esac

12178

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12179

+ (eval "$ac_link") 2>conftest.er1

12180

ac_status=$?

12181

grep -v '^ *+' conftest.er1 >conftest.err

12182

rm -f conftest.er1

12183

cat conftest.err >&5

12184

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12185

- (exit $ac_status); } &&

12186

- { ac_try='test -z "$ac_f77_werror_flag"

12187

- || test ! -s conftest.err'

12188

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12189

- (eval $ac_try) 2>&5

12190

- ac_status=$?

12191

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12192

- (exit $ac_status); }; } &&

12193

- { ac_try='test -s conftest$ac_exeext'

12194

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12195

- (eval $ac_try) 2>&5

12196

- ac_status=$?

12197

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12198

- (exit $ac_status); }; }; then

12199

+ (exit $ac_status); } && {

12200

+ test -z "$ac_f77_werror_flag" ||

12201

+ test ! -s conftest.err

12202

+ } && test -s conftest$ac_exeext &&

12203

+ $as_test_x conftest$ac_exeext; then

12204

12205

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

12206

}'`

12207

@@ -17993,8 +18506,10 @@

12208

echo "$as_me: failed program was:" >&5

12209

sed 's/^/| /' conftest.$ac_ext >&5

12210

12211

12212

12213

-rm -f conftest.err conftest.$ac_objext \

12214

12215

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12216

conftest$ac_exeext conftest.$ac_ext

12217

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

12218

12219

@@ -18013,27 +18528,23 @@

12220

end

12221

_ACEOF

12222

rm -f conftest.$ac_objext conftest$ac_exeext

12223

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12224

- (eval $ac_link) 2>conftest.er1

12225

+if { (ac_try="$ac_link"

12226

+case "(($ac_try" in

12227

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12228

+ *) ac_try_echo=$ac_try;;

12229

+esac

12230

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12231

+ (eval "$ac_link") 2>conftest.er1

12232

ac_status=$?

12233

grep -v '^ *+' conftest.er1 >conftest.err

12234

rm -f conftest.er1

12235

cat conftest.err >&5

12236

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12237

- (exit $ac_status); } &&

12238

- { ac_try='test -z "$ac_f77_werror_flag"

12239

- || test ! -s conftest.err'

12240

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12241

- (eval $ac_try) 2>&5

12242

- ac_status=$?

12243

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12244

- (exit $ac_status); }; } &&

12245

- { ac_try='test -s conftest$ac_exeext'

12246

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12247

- (eval $ac_try) 2>&5

12248

- ac_status=$?

12249

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12250

- (exit $ac_status); }; }; then

12251

+ (exit $ac_status); } && {

12252

+ test -z "$ac_f77_werror_flag" ||

12253

+ test ! -s conftest.err

12254

+ } && test -s conftest$ac_exeext &&

12255

+ $as_test_x conftest$ac_exeext; then

12256

12257

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

12258

}'`

12259

@@ -18044,8 +18555,10 @@

12260

echo "$as_me: failed program was:" >&5

12261

sed 's/^/| /' conftest.$ac_ext >&5

12262

12263

12264

12265

-rm -f conftest.err conftest.$ac_objext \

12266

12267

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12268

conftest$ac_exeext conftest.$ac_ext

12269

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

12270

12271

@@ -18494,8 +19007,8 @@

12272

esac

12273

12274

12275

-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5

12276

-echo "${ECHO_T}$ld_shlibs_F77" >&6

12277

+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5

12278

+echo "${ECHO_T}$ld_shlibs_F77" >&6; }

12279

test "$ld_shlibs_F77" = no && can_build_shared=no

12280

12281

12282

@@ -18515,8 +19028,8 @@

12283

# Test whether the compiler implicitly links with -lc since on some

12284

# systems, -lgcc has to come before -lc. If gcc already passes -lc

12285

# to ld, don't add -lc before -lgcc.

12286

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

12287

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

12288

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

12289

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

12290

$rm conftest*

12291

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

12292

12293

@@ -18553,16 +19066,16 @@

12294

cat conftest.err 1>&5

12295

12296

$rm conftest*

12297

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5

12298

-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6

12299

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5

12300

+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }

12301

;;

12302

esac

12303

12304

;;

12305

esac

12306

12307

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

12308

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

12309

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

12310

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

12311

library_names_spec=

12312

libname_spec='lib$name'

12313

soname_spec=

12314

@@ -18953,7 +19466,7 @@

12315

libsuff=

12316

case "$host_cpu" in

12317

x86_64*|s390x*|powerpc64*)

12318

- echo '#line 18956 "configure"' > conftest.$ac_ext

12319

+ echo '#line 19469 "configure"' > conftest.$ac_ext

12320

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12321

(eval $ac_compile) 2>&5

12322

ac_status=$?

12323

@@ -19170,8 +19683,8 @@

12324

dynamic_linker=no

12325

;;

12326

esac

12327

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

12328

-echo "${ECHO_T}$dynamic_linker" >&6

12329

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

12330

+echo "${ECHO_T}$dynamic_linker" >&6; }

12331

test "$dynamic_linker" = no && can_build_shared=no

12332

12333

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

12334

@@ -19179,8 +19692,8 @@

12335

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

12336

12337

12338

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

12339

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

12340

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

12341

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

12342

hardcode_action_F77=

12343

if test -n "$hardcode_libdir_flag_spec_F77" || \

12344

test -n "$runpath_var_F77" || \

12345

@@ -19204,8 +19717,8 @@

12346

# directories.

12347

hardcode_action_F77=unsupported

12348

12349

-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5

12350

-echo "${ECHO_T}$hardcode_action_F77" >&6

12351

+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5

12352

+echo "${ECHO_T}$hardcode_action_F77" >&6; }

12353

12354

if test "$hardcode_action_F77" = relink; then

12355

# Fast installation is not supported

12356

@@ -19642,7 +20155,6 @@

12357

if test -n "$GCJ" && test "X$GCJ" != "Xno"; then

12358

12359

12360

12361

# Source file extension for Java test sources.

12362

ac_ext=java

12363

12364

@@ -19710,8 +20222,8 @@

12365

lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'

12366

12367

12368

-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

12369

-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6

12370

+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

12371

+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }

12372

if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then

12373

echo $ECHO_N "(cached) $ECHO_C" >&6

12374

else

12375

@@ -19728,11 +20240,11 @@

12376

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

12377

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

12378

-e 's:$: $lt_compiler_flag:'`

12379

- (eval echo "\"\$as_me:19731: $lt_compile\"" >&5)

12380

+ (eval echo "\"\$as_me:20243: $lt_compile\"" >&5)

12381

(eval "$lt_compile" 2>conftest.err)

12382

ac_status=$?

12383

cat conftest.err >&5

12384

- echo "$as_me:19735: \$? = $ac_status" >&5

12385

+ echo "$as_me:20247: \$? = $ac_status" >&5

12386

if (exit $ac_status) && test -s "$ac_outfile"; then

12387

# The compiler can only warn and ignore the option if not recognized

12388

# So say no if there are warnings other than the usual output.

12389

@@ -19745,8 +20257,8 @@

12390

$rm conftest*

12391

12392

12393

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

12394

-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6

12395

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

12396

+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }

12397

12398

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

12399

lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"

12400

@@ -19760,8 +20272,8 @@

12401

lt_prog_compiler_pic_GCJ=

12402

lt_prog_compiler_static_GCJ=

12403

12404

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

12405

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

12406

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

12407

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

12408

12409

if test "$GCC" = yes; then

12410

lt_prog_compiler_wl_GCJ='-Wl,'

12411

@@ -19970,16 +20482,16 @@

12412

esac

12413

12414

12415

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5

12416

-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6

12417

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5

12418

+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }

12419

12420

12421

# Check to make sure the PIC flag actually works.

12422

12423

if test -n "$lt_prog_compiler_pic_GCJ"; then

12424

12425

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5

12426

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6

12427

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5

12428

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }

12429

if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then

12430

echo $ECHO_N "(cached) $ECHO_C" >&6

12431

else

12432

@@ -19996,11 +20508,11 @@

12433

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

12434

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

12435

-e 's:$: $lt_compiler_flag:'`

12436

- (eval echo "\"\$as_me:19999: $lt_compile\"" >&5)

12437

+ (eval echo "\"\$as_me:20511: $lt_compile\"" >&5)

12438

(eval "$lt_compile" 2>conftest.err)

12439

ac_status=$?

12440

cat conftest.err >&5

12441

- echo "$as_me:20003: \$? = $ac_status" >&5

12442

+ echo "$as_me:20515: \$? = $ac_status" >&5

12443

if (exit $ac_status) && test -s "$ac_outfile"; then

12444

# The compiler can only warn and ignore the option if not recognized

12445

# So say no if there are warnings other than the usual output.

12446

@@ -20013,8 +20525,8 @@

12447

$rm conftest*

12448

12449

12450

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5

12451

-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6

12452

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5

12453

+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }

12454

12455

if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then

12456

case $lt_prog_compiler_pic_GCJ in

12457

@@ -20041,8 +20553,8 @@

12458

# Check to make sure the static flag actually works.

12459

12460

wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"

12461

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

12462

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

12463

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

12464

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

12465

if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then

12466

echo $ECHO_N "(cached) $ECHO_C" >&6

12467

else

12468

@@ -20069,8 +20581,8 @@

12469

LDFLAGS="$save_LDFLAGS"

12470

12471

12472

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5

12473

-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6

12474

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5

12475

+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }

12476

12477

if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then

12478

12479

@@ -20079,8 +20591,8 @@

12480

12481

12482

12483

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

12484

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

12485

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

12486

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

12487

if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then

12488

echo $ECHO_N "(cached) $ECHO_C" >&6

12489

else

12490

@@ -20100,11 +20612,11 @@

12491

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

12492

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

12493

-e 's:$: $lt_compiler_flag:'`

12494

- (eval echo "\"\$as_me:20103: $lt_compile\"" >&5)

12495

+ (eval echo "\"\$as_me:20615: $lt_compile\"" >&5)

12496

(eval "$lt_compile" 2>out/conftest.err)

12497

ac_status=$?

12498

cat out/conftest.err >&5

12499

- echo "$as_me:20107: \$? = $ac_status" >&5

12500

+ echo "$as_me:20619: \$? = $ac_status" >&5

12501

if (exit $ac_status) && test -s out/conftest2.$ac_objext

12502

then

12503

# The compiler can only warn and ignore the option if not recognized

12504

@@ -20126,23 +20638,23 @@

12505

$rm conftest*

12506

12507

12508

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5

12509

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6

12510

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5

12511

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }

12512

12513

12514

hard_links="nottested"

12515

if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then

12516

# do not overwrite the value of need_locks provided by the user

12517

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

12518

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

12519

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

12520

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

12521

hard_links=yes

12522

$rm conftest*

12523

ln conftest.a conftest.b 2>/dev/null && hard_links=no

12524

touch conftest.a

12525

ln conftest.a conftest.b 2>&5 || hard_links=no

12526

ln conftest.a conftest.b 2>/dev/null && hard_links=no

12527

- echo "$as_me:$LINENO: result: $hard_links" >&5

12528

-echo "${ECHO_T}$hard_links" >&6

12529

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

12530

+echo "${ECHO_T}$hard_links" >&6; }

12531

if test "$hard_links" = no; then

12532

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

12533

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

12534

@@ -20152,8 +20664,8 @@

12535

need_locks=no

12536

12537

12538

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

12539

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

12540

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

12541

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

12542

12543

runpath_var=

12544

allow_undefined_flag_GCJ=

12545

@@ -20568,27 +21080,23 @@

12546

}

12547

_ACEOF

12548

rm -f conftest.$ac_objext conftest$ac_exeext

12549

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12550

- (eval $ac_link) 2>conftest.er1

12551

+if { (ac_try="$ac_link"

12552

+case "(($ac_try" in

12553

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12554

+ *) ac_try_echo=$ac_try;;

12555

+esac

12556

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12557

+ (eval "$ac_link") 2>conftest.er1

12558

ac_status=$?

12559

grep -v '^ *+' conftest.er1 >conftest.err

12560

rm -f conftest.er1

12561

cat conftest.err >&5

12562

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12563

- (exit $ac_status); } &&

12564

- { ac_try='test -z "$ac_c_werror_flag"

12565

- || test ! -s conftest.err'

12566

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12567

- (eval $ac_try) 2>&5

12568

- ac_status=$?

12569

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12570

- (exit $ac_status); }; } &&

12571

- { ac_try='test -s conftest$ac_exeext'

12572

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12573

- (eval $ac_try) 2>&5

12574

- ac_status=$?

12575

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12576

- (exit $ac_status); }; }; then

12577

+ (exit $ac_status); } && {

12578

+ test -z "$ac_c_werror_flag" ||

12579

+ test ! -s conftest.err

12580

+ } && test -s conftest$ac_exeext &&

12581

+ $as_test_x conftest$ac_exeext; then

12582

12583

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

12584

}'`

12585

@@ -20599,8 +21107,10 @@

12586

echo "$as_me: failed program was:" >&5

12587

sed 's/^/| /' conftest.$ac_ext >&5

12588

12589

12590

12591

-rm -f conftest.err conftest.$ac_objext \

12592

12593

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12594

conftest$ac_exeext conftest.$ac_ext

12595

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

12596

12597

@@ -20629,27 +21139,23 @@

12598

}

12599

_ACEOF

12600

rm -f conftest.$ac_objext conftest$ac_exeext

12601

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12602

- (eval $ac_link) 2>conftest.er1

12603

+if { (ac_try="$ac_link"

12604

+case "(($ac_try" in

12605

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12606

+ *) ac_try_echo=$ac_try;;

12607

+esac

12608

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12609

+ (eval "$ac_link") 2>conftest.er1

12610

ac_status=$?

12611

grep -v '^ *+' conftest.er1 >conftest.err

12612

rm -f conftest.er1

12613

cat conftest.err >&5

12614

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12615

- (exit $ac_status); } &&

12616

- { ac_try='test -z "$ac_c_werror_flag"

12617

- || test ! -s conftest.err'

12618

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12619

- (eval $ac_try) 2>&5

12620

- ac_status=$?

12621

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12622

- (exit $ac_status); }; } &&

12623

- { ac_try='test -s conftest$ac_exeext'

12624

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12625

- (eval $ac_try) 2>&5

12626

- ac_status=$?

12627

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12628

- (exit $ac_status); }; }; then

12629

+ (exit $ac_status); } && {

12630

+ test -z "$ac_c_werror_flag" ||

12631

+ test ! -s conftest.err

12632

+ } && test -s conftest$ac_exeext &&

12633

+ $as_test_x conftest$ac_exeext; then

12634

12635

aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; }

12636

}'`

12637

@@ -20660,8 +21166,10 @@

12638

echo "$as_me: failed program was:" >&5

12639

sed 's/^/| /' conftest.$ac_ext >&5

12640

12641

12642

12643

-rm -f conftest.err conftest.$ac_objext \

12644

12645

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12646

conftest$ac_exeext conftest.$ac_ext

12647

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

12648

12649

@@ -21110,8 +21618,8 @@

12650

esac

12651

12652

12653

-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5

12654

-echo "${ECHO_T}$ld_shlibs_GCJ" >&6

12655

+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5

12656

+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }

12657

test "$ld_shlibs_GCJ" = no && can_build_shared=no

12658

12659

12660

@@ -21131,8 +21639,8 @@

12661

# Test whether the compiler implicitly links with -lc since on some

12662

# systems, -lgcc has to come before -lc. If gcc already passes -lc

12663

# to ld, don't add -lc before -lgcc.

12664

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

12665

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

12666

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

12667

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

12668

$rm conftest*

12669

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

12670

12671

@@ -21169,16 +21677,16 @@

12672

cat conftest.err 1>&5

12673

12674

$rm conftest*

12675

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5

12676

-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6

12677

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5

12678

+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }

12679

;;

12680

esac

12681

12682

;;

12683

esac

12684

12685

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

12686

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

12687

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

12688

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

12689

library_names_spec=

12690

libname_spec='lib$name'

12691

soname_spec=

12692

@@ -21569,7 +22077,7 @@

12693

libsuff=

12694

case "$host_cpu" in

12695

x86_64*|s390x*|powerpc64*)

12696

- echo '#line 21572 "configure"' > conftest.$ac_ext

12697

+ echo '#line 22080 "configure"' > conftest.$ac_ext

12698

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12699

(eval $ac_compile) 2>&5

12700

ac_status=$?

12701

@@ -21786,8 +22294,8 @@

12702

dynamic_linker=no

12703

;;

12704

esac

12705

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

12706

-echo "${ECHO_T}$dynamic_linker" >&6

12707

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

12708

+echo "${ECHO_T}$dynamic_linker" >&6; }

12709

test "$dynamic_linker" = no && can_build_shared=no

12710

12711

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

12712

@@ -21795,8 +22303,8 @@

12713

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

12714

12715

12716

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

12717

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

12718

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

12719

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

12720

hardcode_action_GCJ=

12721

if test -n "$hardcode_libdir_flag_spec_GCJ" || \

12722

test -n "$runpath_var_GCJ" || \

12723

@@ -21820,8 +22328,8 @@

12724

# directories.

12725

hardcode_action_GCJ=unsupported

12726

12727

-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5

12728

-echo "${ECHO_T}$hardcode_action_GCJ" >&6

12729

+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5

12730

+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }

12731

12732

if test "$hardcode_action_GCJ" = relink; then

12733

# Fast installation is not supported

12734

@@ -22257,7 +22765,6 @@

12735

RC)

12736

12737

12738

12739

# Source file extension for RC test sources.

12740

ac_ext=rc

12741

12742

@@ -22791,11 +23298,11 @@

12743

12744

12745

12746

-# Check whether --with-codegens or --without-codegens was given.

12747

+# Check whether --with-codegens was given.

12748

if test "${with_codegens+set}" = set; then

12749

- withval="$with_codegens"

12750

+ withval=$with_codegens;

12751

+fi

12752

12753

-fi;

12754

12755

### default is to build with codegens

12756

if test "x$with_codegens" != "xno"; then

12757

@@ -22822,55 +23329,60 @@

12758

12759

12760

12761

-# Check whether --with-efence or --without-efence was given.

12762

+# Check whether --with-efence was given.

12763

if test "${with_efence+set}" = set; then

12764

- withval="$with_efence"

12765

- EFENCE=true

12766

-fi;

12767

+ withval=$with_efence; EFENCE=true

12768

+fi

12769

12770

12771

if test "x${EFENCE}" != "x"; then

12772

LIBS="$LIBS -lefence"

12773

12774

12775

12776

-echo "$as_me:$LINENO: checking for X" >&5

12777

-echo $ECHO_N "checking for X... $ECHO_C" >&6

12778

+{ echo "$as_me:$LINENO: checking for X" >&5

12779

+echo $ECHO_N "checking for X... $ECHO_C" >&6; }

12780

12781

12782

-# Check whether --with-x or --without-x was given.

12783

+# Check whether --with-x was given.

12784

if test "${with_x+set}" = set; then

12785

- withval="$with_x"

12786

+ withval=$with_x;

12787

+fi

12788

12789

-fi;

12790

# $have_x is `yes', `no', `disabled', or empty when we do not yet know.

12791

if test "x$with_x" = xno; then

12792

# The user explicitly disabled X.

12793

have_x=disabled

12794

else

12795

- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then

12796

- # Both variables are already set.

12797

- have_x=yes

12798

- else

12799

- if test "${ac_cv_have_x+set}" = set; then

12800

+ case $x_includes,$x_libraries in #(

12801

+ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5

12802

+echo "$as_me: error: Cannot use X directory names containing '" >&2;}

12803

+ { (exit 1); exit 1; }; };; #(

12804

+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then

12805

echo $ECHO_N "(cached) $ECHO_C" >&6

12806

else

12807

# One or both of the vars are not set, and there is no cached value.

12808

ac_x_includes=no ac_x_libraries=no

12809

-rm -fr conftest.dir

12810

+rm -f -r conftest.dir

12811

if mkdir conftest.dir; then

12812

cd conftest.dir

12813

- # Make sure to not put "make" in the Imakefile rules, since we grep it out.

12814

cat >Imakefile <<'_ACEOF'

12815

-acfindx:

12816

- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'

12817

+incroot:

12818

+ @echo incroot='${INCROOT}'

12819

+usrlibdir:

12820

+ @echo usrlibdir='${USRLIBDIR}'

12821

+libdir:

12822

+ @echo libdir='${LIBDIR}'

12823

_ACEOF

12824

- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then

12825

+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then

12826

# GNU make sometimes prints "make[1]: Entering...", which would confuse us.

12827

- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`

12828

+ for ac_var in incroot usrlibdir libdir; do

12829

+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"

12830

+ done

12831

# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.

12832

for ac_extension in a so sl; do

12833

- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&

12834

- test -f $ac_im_libdir/libX11.$ac_extension; then

12835

+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&

12836

+ test -f "$ac_im_libdir/libX11.$ac_extension"; then

12837

ac_im_usrlibdir=$ac_im_libdir; break

12838

12839

done

12840

@@ -22878,7 +23390,7 @@

12841

# bogus both because they are the default anyway, and because

12842

# using them would break gcc on systems where it needs fixed includes.

12843

case $ac_im_incroot in

12844

- /usr/include) ;;

12845

+ /usr/include) ac_x_includes= ;;

12846

*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;

12847

esac

12848

case $ac_im_usrlibdir in

12849

@@ -22887,7 +23399,7 @@

12850

esac

12851

12852

cd ..

12853

- rm -fr conftest.dir

12854

+ rm -f -r conftest.dir

12855

12856

12857

# Standard set of common directories for X headers.

12858

@@ -22938,24 +23450,22 @@

12859

/* end confdefs.h. */

12860

#include <X11/Xlib.h>

12861

_ACEOF

12862

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

12863

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

12864

+if { (ac_try="$ac_cpp conftest.$ac_ext"

12865

+case "(($ac_try" in

12866

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12867

+ *) ac_try_echo=$ac_try;;

12868

+esac

12869

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12870

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

12871

ac_status=$?

12872

grep -v '^ *+' conftest.er1 >conftest.err

12873

rm -f conftest.er1

12874

cat conftest.err >&5

12875

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12876

- (exit $ac_status); } >/dev/null; then

12877

- if test -s conftest.err; then

12878

- ac_cpp_err=$ac_c_preproc_warn_flag

12879

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

12880

- else

12881

- ac_cpp_err=

12882

- fi

12883

-else

12884

- ac_cpp_err=yes

12885

-fi

12886

-if test -z "$ac_cpp_err"; then

12887

+ (exit $ac_status); } >/dev/null && {

12888

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

12889

+ test ! -s conftest.err

12890

+ }; then

12891

# We can compile using X headers with no special include directory.

12892

ac_x_includes=

12893

else

12894

@@ -22969,6 +23479,7 @@

12895

12896

done

12897

12898

12899

rm -f conftest.err conftest.$ac_ext

12900

fi # $ac_x_includes = no

12901

12902

@@ -22977,7 +23488,7 @@

12903

# See if we find them without any special options.

12904

# Don't add to $LIBS permanently.

12905

ac_save_LIBS=$LIBS

12906

- LIBS="-lXt $LIBS"

12907

+ LIBS="-lX11 $LIBS"

12908

cat >conftest.$ac_ext <<_ACEOF

12909

/* confdefs.h. */

12910

_ACEOF

12911

@@ -22994,27 +23505,23 @@

12912

}

12913

_ACEOF

12914

rm -f conftest.$ac_objext conftest$ac_exeext

12915

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12916

- (eval $ac_link) 2>conftest.er1

12917

+if { (ac_try="$ac_link"

12918

+case "(($ac_try" in

12919

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12920

+ *) ac_try_echo=$ac_try;;

12921

+esac

12922

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12923

+ (eval "$ac_link") 2>conftest.er1

12924

ac_status=$?

12925

grep -v '^ *+' conftest.er1 >conftest.err

12926

rm -f conftest.er1

12927

cat conftest.err >&5

12928

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12929

- (exit $ac_status); } &&

12930

- { ac_try='test -z "$ac_c_werror_flag"

12931

- || test ! -s conftest.err'

12932

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12933

- (eval $ac_try) 2>&5

12934

- ac_status=$?

12935

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12936

- (exit $ac_status); }; } &&

12937

- { ac_try='test -s conftest$ac_exeext'

12938

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12939

- (eval $ac_try) 2>&5

12940

- ac_status=$?

12941

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

12942

- (exit $ac_status); }; }; then

12943

+ (exit $ac_status); } && {

12944

+ test -z "$ac_c_werror_flag" ||

12945

+ test ! -s conftest.err

12946

+ } && test -s conftest$ac_exeext &&

12947

+ $as_test_x conftest$ac_exeext; then

12948

LIBS=$ac_save_LIBS

12949

# We can link X programs with no special library path.

12950

ac_x_libraries=

12951

@@ -23022,49 +23529,54 @@

12952

echo "$as_me: failed program was:" >&5

12953

sed 's/^/| /' conftest.$ac_ext >&5

12954

12955

-LIBS=$ac_save_LIBS

12956

+ LIBS=$ac_save_LIBS

12957

for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`

12958

12959

# Don't even attempt the hair of trying to link an X program!

12960

for ac_extension in a so sl; do

12961

- if test -r $ac_dir/libXt.$ac_extension; then

12962

+ if test -r "$ac_dir/libX11.$ac_extension"; then

12963

ac_x_libraries=$ac_dir

12964

break 2

12965

12966

done

12967

done

12968

12969

-rm -f conftest.err conftest.$ac_objext \

12970

12971

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12972

conftest$ac_exeext conftest.$ac_ext

12973

fi # $ac_x_libraries = no

12974

12975

-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then

12976

- # Didn't find X anywhere. Cache the known absence of X.

12977

- ac_cv_have_x="have_x=no"

12978

-else

12979

- # Record where we found X for the cache.

12980

- ac_cv_have_x="have_x=yes \

12981

- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"

12982

-fi

12983

+case $ac_x_includes,$ac_x_libraries in #(

12984

+ no,* | *,no | *\'*)

12985

+ # Didn't find X, or a directory has "'" in its name.

12986

+ ac_cv_have_x="have_x=no";; #(

12987

+ *)

12988

+ # Record where we found X for the cache.

12989

+ ac_cv_have_x="have_x=yes\

12990

+ ac_x_includes='$ac_x_includes'\

12991

+ ac_x_libraries='$ac_x_libraries'"

12992

+esac

12993

12994

12995

- fi

12996

+;; #(

12997

+ *) have_x=yes;;

12998

+ esac

12999

eval "$ac_cv_have_x"

13000

fi # $with_x != no

13001

13002

if test "$have_x" != yes; then

13003

- echo "$as_me:$LINENO: result: $have_x" >&5

13004

-echo "${ECHO_T}$have_x" >&6

13005

+ { echo "$as_me:$LINENO: result: $have_x" >&5

13006

+echo "${ECHO_T}$have_x" >&6; }

13007

no_x=yes

13008

else

13009

# If each of the values was on the command line, it overrides each guess.

13010

test "x$x_includes" = xNONE && x_includes=$ac_x_includes

13011

test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries

13012

# Update the cache value to reflect the command line values.

13013

- ac_cv_have_x="have_x=yes \

13014

- ac_x_includes=$x_includes ac_x_libraries=$x_libraries"

13015

- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5

13016

-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6

13017

+ ac_cv_have_x="have_x=yes\

13018

+ ac_x_includes='$x_includes'\

13019

+ ac_x_libraries='$x_libraries'"

13020

+ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5

13021

+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }

13022

13023

13024

if test "$no_x" = yes; then

13025

@@ -23085,12 +23597,12 @@

13026

X_LIBS="$X_LIBS -L$x_libraries"

13027

# For Solaris; some versions of Sun CC require a space after -R and

13028

# others require no space. Words are not sufficient . . . .

13029

- case `(uname -sr) 2>/dev/null` in

13030

- "SunOS 5"*)

13031

- echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5

13032

-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6

13033

- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"

13034

- cat >conftest.$ac_ext <<_ACEOF

13035

+ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5

13036

+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }

13037

+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"

13038

+ ac_xsave_c_werror_flag=$ac_c_werror_flag

13039

+ ac_c_werror_flag=yes

13040

+ cat >conftest.$ac_ext <<_ACEOF

13041

/* confdefs.h. */

13042

_ACEOF

13043

cat confdefs.h >>conftest.$ac_ext

13044

@@ -23106,43 +23618,32 @@

13045

}

13046

_ACEOF

13047

rm -f conftest.$ac_objext conftest$ac_exeext

13048

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13049

- (eval $ac_link) 2>conftest.er1

13050

+if { (ac_try="$ac_link"

13051

+case "(($ac_try" in

13052

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13053

+ *) ac_try_echo=$ac_try;;

13054

+esac

13055

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13056

+ (eval "$ac_link") 2>conftest.er1

13057

ac_status=$?

13058

grep -v '^ *+' conftest.er1 >conftest.err

13059

rm -f conftest.er1

13060

cat conftest.err >&5

13061

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13062

- (exit $ac_status); } &&

13063

- { ac_try='test -z "$ac_c_werror_flag"

13064

- || test ! -s conftest.err'

13065

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13066

- (eval $ac_try) 2>&5

13067

- ac_status=$?

13068

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13069

- (exit $ac_status); }; } &&

13070

- { ac_try='test -s conftest$ac_exeext'

13071

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13072

- (eval $ac_try) 2>&5

13073

- ac_status=$?

13074

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13075

- (exit $ac_status); }; }; then

13076

- ac_R_nospace=yes

13077

+ (exit $ac_status); } && {

13078

+ test -z "$ac_c_werror_flag" ||

13079

+ test ! -s conftest.err

13080

+ } && test -s conftest$ac_exeext &&

13081

+ $as_test_x conftest$ac_exeext; then

13082

+ { echo "$as_me:$LINENO: result: no" >&5

13083

+echo "${ECHO_T}no" >&6; }

13084

+ X_LIBS="$X_LIBS -R$x_libraries"

13085

else

13086

echo "$as_me: failed program was:" >&5

13087

sed 's/^/| /' conftest.$ac_ext >&5

13088

13089

-ac_R_nospace=no

13090

-fi

13091

-rm -f conftest.err conftest.$ac_objext \

13092

- conftest$ac_exeext conftest.$ac_ext

13093

- if test $ac_R_nospace = yes; then

13094

- echo "$as_me:$LINENO: result: no" >&5

13095

-echo "${ECHO_T}no" >&6

13096

- X_LIBS="$X_LIBS -R$x_libraries"

13097

- else

13098

LIBS="$ac_xsave_LIBS -R $x_libraries"

13099

- cat >conftest.$ac_ext <<_ACEOF

13100

+ cat >conftest.$ac_ext <<_ACEOF

13101

/* confdefs.h. */

13102

_ACEOF

13103

cat confdefs.h >>conftest.$ac_ext

13104

@@ -23158,47 +23659,42 @@

13105

}

13106

_ACEOF

13107

rm -f conftest.$ac_objext conftest$ac_exeext

13108

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13109

- (eval $ac_link) 2>conftest.er1

13110

+if { (ac_try="$ac_link"

13111

+case "(($ac_try" in

13112

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13113

+ *) ac_try_echo=$ac_try;;

13114

+esac

13115

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13116

+ (eval "$ac_link") 2>conftest.er1

13117

ac_status=$?

13118

grep -v '^ *+' conftest.er1 >conftest.err

13119

rm -f conftest.er1

13120

cat conftest.err >&5

13121

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13122

- (exit $ac_status); } &&

13123

- { ac_try='test -z "$ac_c_werror_flag"

13124

- || test ! -s conftest.err'

13125

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13126

- (eval $ac_try) 2>&5

13127

- ac_status=$?

13128

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13129

- (exit $ac_status); }; } &&

13130

- { ac_try='test -s conftest$ac_exeext'

13131

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13132

- (eval $ac_try) 2>&5

13133

- ac_status=$?

13134

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13135

- (exit $ac_status); }; }; then

13136

- ac_R_space=yes

13137

+ (exit $ac_status); } && {

13138

+ test -z "$ac_c_werror_flag" ||

13139

+ test ! -s conftest.err

13140

+ } && test -s conftest$ac_exeext &&

13141

+ $as_test_x conftest$ac_exeext; then

13142

+ { echo "$as_me:$LINENO: result: yes" >&5

13143

+echo "${ECHO_T}yes" >&6; }

13144

+ X_LIBS="$X_LIBS -R $x_libraries"

13145

else

13146

echo "$as_me: failed program was:" >&5

13147

sed 's/^/| /' conftest.$ac_ext >&5

13148

13149

-ac_R_space=no

13150

+ { echo "$as_me:$LINENO: result: neither works" >&5

13151

+echo "${ECHO_T}neither works" >&6; }

13152

13153

-rm -f conftest.err conftest.$ac_objext \

13154

13155

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13156

conftest$ac_exeext conftest.$ac_ext

13157

- if test $ac_R_space = yes; then

13158

- echo "$as_me:$LINENO: result: yes" >&5

13159

-echo "${ECHO_T}yes" >&6

13160

- X_LIBS="$X_LIBS -R $x_libraries"

13161

- else

13162

- echo "$as_me:$LINENO: result: neither works" >&5

13163

-echo "${ECHO_T}neither works" >&6

13164

- fi

13165

- fi

13166

- LIBS=$ac_xsave_LIBS

13167

- esac

13168

+fi

13169

13170

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13171

+ conftest$ac_exeext conftest.$ac_ext

13172

+ ac_c_werror_flag=$ac_xsave_c_werror_flag

13173

+ LIBS=$ac_xsave_LIBS

13174

13175

13176

# Check for system-dependent libraries X programs must link with.

13177

@@ -23219,50 +23715,46 @@

13178

cat >>conftest.$ac_ext <<_ACEOF

13179

/* end confdefs.h. */

13180

13181

-/* Override any gcc2 internal prototype to avoid an error. */

13182

+/* Override any GCC internal prototype to avoid an error.

13183

+ Use char because int might match the return type of a GCC

13184

+ builtin and then its argument prototype would still apply. */

13185

#ifdef __cplusplus

13186

extern "C"

13187

#endif

13188

-/* We use char because int might match the return type of a gcc2

13189

- builtin and then its argument prototype would still apply. */

13190

char XOpenDisplay ();

13191

int

13192

main ()

13193

{

13194

-XOpenDisplay ();

13195

+return XOpenDisplay ();

13196

;

13197

return 0;

13198

}

13199

_ACEOF

13200

rm -f conftest.$ac_objext conftest$ac_exeext

13201

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13202

- (eval $ac_link) 2>conftest.er1

13203

+if { (ac_try="$ac_link"

13204

+case "(($ac_try" in

13205

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13206

+ *) ac_try_echo=$ac_try;;

13207

+esac

13208

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13209

+ (eval "$ac_link") 2>conftest.er1

13210

ac_status=$?

13211

grep -v '^ *+' conftest.er1 >conftest.err

13212

rm -f conftest.er1

13213

cat conftest.err >&5

13214

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13215

- (exit $ac_status); } &&

13216

- { ac_try='test -z "$ac_c_werror_flag"

13217

- || test ! -s conftest.err'

13218

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13219

- (eval $ac_try) 2>&5

13220

- ac_status=$?

13221

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13222

- (exit $ac_status); }; } &&

13223

- { ac_try='test -s conftest$ac_exeext'

13224

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13225

- (eval $ac_try) 2>&5

13226

- ac_status=$?

13227

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13228

- (exit $ac_status); }; }; then

13229

+ (exit $ac_status); } && {

13230

+ test -z "$ac_c_werror_flag" ||

13231

+ test ! -s conftest.err

13232

+ } && test -s conftest$ac_exeext &&

13233

+ $as_test_x conftest$ac_exeext; then

13234

13235

else

13236

echo "$as_me: failed program was:" >&5

13237

sed 's/^/| /' conftest.$ac_ext >&5

13238

13239

-echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5

13240

-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6

13241

+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5

13242

+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }

13243

if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then

13244

echo $ECHO_N "(cached) $ECHO_C" >&6

13245

else

13246

@@ -23275,63 +23767,60 @@

13247

cat >>conftest.$ac_ext <<_ACEOF

13248

/* end confdefs.h. */

13249

13250

-/* Override any gcc2 internal prototype to avoid an error. */

13251

+/* Override any GCC internal prototype to avoid an error.

13252

+ Use char because int might match the return type of a GCC

13253

+ builtin and then its argument prototype would still apply. */

13254

#ifdef __cplusplus

13255

extern "C"

13256

#endif

13257

-/* We use char because int might match the return type of a gcc2

13258

- builtin and then its argument prototype would still apply. */

13259

char dnet_ntoa ();

13260

int

13261

main ()

13262

{

13263

-dnet_ntoa ();

13264

+return dnet_ntoa ();

13265

;

13266

return 0;

13267

}

13268

_ACEOF

13269

rm -f conftest.$ac_objext conftest$ac_exeext

13270

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13271

- (eval $ac_link) 2>conftest.er1

13272

+if { (ac_try="$ac_link"

13273

+case "(($ac_try" in

13274

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13275

+ *) ac_try_echo=$ac_try;;

13276

+esac

13277

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13278

+ (eval "$ac_link") 2>conftest.er1

13279

ac_status=$?

13280

grep -v '^ *+' conftest.er1 >conftest.err

13281

rm -f conftest.er1

13282

cat conftest.err >&5

13283

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13284

- (exit $ac_status); } &&

13285

- { ac_try='test -z "$ac_c_werror_flag"

13286

- || test ! -s conftest.err'

13287

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13288

- (eval $ac_try) 2>&5

13289

- ac_status=$?

13290

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13291

- (exit $ac_status); }; } &&

13292

- { ac_try='test -s conftest$ac_exeext'

13293

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13294

- (eval $ac_try) 2>&5

13295

- ac_status=$?

13296

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13297

- (exit $ac_status); }; }; then

13298

+ (exit $ac_status); } && {

13299

+ test -z "$ac_c_werror_flag" ||

13300

+ test ! -s conftest.err

13301

+ } && test -s conftest$ac_exeext &&

13302

+ $as_test_x conftest$ac_exeext; then

13303

ac_cv_lib_dnet_dnet_ntoa=yes

13304

else

13305

echo "$as_me: failed program was:" >&5

13306

sed 's/^/| /' conftest.$ac_ext >&5

13307

13308

-ac_cv_lib_dnet_dnet_ntoa=no

13309

+ ac_cv_lib_dnet_dnet_ntoa=no

13310

13311

-rm -f conftest.err conftest.$ac_objext \

13312

13313

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13314

conftest$ac_exeext conftest.$ac_ext

13315

LIBS=$ac_check_lib_save_LIBS

13316

13317

-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5

13318

-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6

13319

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5

13320

+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }

13321

if test $ac_cv_lib_dnet_dnet_ntoa = yes; then

13322

X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"

13323

13324

13325

if test $ac_cv_lib_dnet_dnet_ntoa = no; then

13326

- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5

13327

-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6

13328

+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5

13329

+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }

13330

if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then

13331

echo $ECHO_N "(cached) $ECHO_C" >&6

13332

else

13333

@@ -23344,63 +23833,61 @@

13334

cat >>conftest.$ac_ext <<_ACEOF

13335

/* end confdefs.h. */

13336

13337

-/* Override any gcc2 internal prototype to avoid an error. */

13338

+/* Override any GCC internal prototype to avoid an error.

13339

+ Use char because int might match the return type of a GCC

13340

+ builtin and then its argument prototype would still apply. */

13341

#ifdef __cplusplus

13342

extern "C"

13343

#endif

13344

-/* We use char because int might match the return type of a gcc2

13345

- builtin and then its argument prototype would still apply. */

13346

char dnet_ntoa ();

13347

int

13348

main ()

13349

{

13350

-dnet_ntoa ();

13351

+return dnet_ntoa ();

13352

;

13353

return 0;

13354

}

13355

_ACEOF

13356

rm -f conftest.$ac_objext conftest$ac_exeext

13357

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13358

- (eval $ac_link) 2>conftest.er1

13359

+if { (ac_try="$ac_link"

13360

+case "(($ac_try" in

13361

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13362

+ *) ac_try_echo=$ac_try;;

13363

+esac

13364

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13365

+ (eval "$ac_link") 2>conftest.er1

13366

ac_status=$?

13367

grep -v '^ *+' conftest.er1 >conftest.err

13368

rm -f conftest.er1

13369

cat conftest.err >&5

13370

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13371

- (exit $ac_status); } &&

13372

- { ac_try='test -z "$ac_c_werror_flag"

13373

- || test ! -s conftest.err'

13374

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13375

- (eval $ac_try) 2>&5

13376

- ac_status=$?

13377

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13378

- (exit $ac_status); }; } &&

13379

- { ac_try='test -s conftest$ac_exeext'

13380

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13381

- (eval $ac_try) 2>&5

13382

- ac_status=$?

13383

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13384

- (exit $ac_status); }; }; then

13385

+ (exit $ac_status); } && {

13386

+ test -z "$ac_c_werror_flag" ||

13387

+ test ! -s conftest.err

13388

+ } && test -s conftest$ac_exeext &&

13389

+ $as_test_x conftest$ac_exeext; then

13390

ac_cv_lib_dnet_stub_dnet_ntoa=yes

13391

else

13392

echo "$as_me: failed program was:" >&5

13393

sed 's/^/| /' conftest.$ac_ext >&5

13394

13395

-ac_cv_lib_dnet_stub_dnet_ntoa=no

13396

+ ac_cv_lib_dnet_stub_dnet_ntoa=no

13397

13398

-rm -f conftest.err conftest.$ac_objext \

13399

13400

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13401

conftest$ac_exeext conftest.$ac_ext

13402

LIBS=$ac_check_lib_save_LIBS

13403

13404

-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5

13405

-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6

13406

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5

13407

+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }

13408

if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then

13409

X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"

13410

13411

13412

13413

13414

-rm -f conftest.err conftest.$ac_objext \

13415

13416

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13417

conftest$ac_exeext conftest.$ac_ext

13418

LIBS="$ac_xsave_LIBS"

13419

13420

@@ -23412,8 +23899,8 @@

13421

# on Irix 5.2, according to T.E. Dickey.

13422

# The functions gethostbyname, getservbyname, and inet_addr are

13423

# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.

13424

- echo "$as_me:$LINENO: checking for gethostbyname" >&5

13425

-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6

13426

+ { echo "$as_me:$LINENO: checking for gethostbyname" >&5

13427

+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }

13428

if test "${ac_cv_func_gethostbyname+set}" = set; then

13429

echo $ECHO_N "(cached) $ECHO_C" >&6

13430

else

13431

@@ -23440,72 +23927,63 @@

13432

13433

#undef gethostbyname

13434

13435

-/* Override any gcc2 internal prototype to avoid an error. */

13436

+/* Override any GCC internal prototype to avoid an error.

13437

+ Use char because int might match the return type of a GCC

13438

+ builtin and then its argument prototype would still apply. */

13439

#ifdef __cplusplus

13440

extern "C"

13441

13442

#endif

13443

-/* We use char because int might match the return type of a gcc2

13444

- builtin and then its argument prototype would still apply. */

13445

char gethostbyname ();

13446

/* The GNU C library defines this for functions which it implements

13447

to always fail with ENOSYS. Some functions are actually named

13448

something starting with __ and the normal name is an alias. */

13449

-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)

13450

+#if defined __stub_gethostbyname || defined __stub___gethostbyname

13451

choke me

13452

-#else

13453

-char (*f) () = gethostbyname;

13454

-#endif

13455

-#ifdef __cplusplus

13456

13457

#endif

13458

13459

int

13460

main ()

13461

{

13462

-return f != gethostbyname;

13463

+return gethostbyname ();

13464

;

13465

return 0;

13466

}

13467

_ACEOF

13468

rm -f conftest.$ac_objext conftest$ac_exeext

13469

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13470

- (eval $ac_link) 2>conftest.er1

13471

+if { (ac_try="$ac_link"

13472

+case "(($ac_try" in

13473

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13474

+ *) ac_try_echo=$ac_try;;

13475

+esac

13476

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13477

+ (eval "$ac_link") 2>conftest.er1

13478

ac_status=$?

13479

grep -v '^ *+' conftest.er1 >conftest.err

13480

rm -f conftest.er1

13481

cat conftest.err >&5

13482

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13483

- (exit $ac_status); } &&

13484

- { ac_try='test -z "$ac_c_werror_flag"

13485

- || test ! -s conftest.err'

13486

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13487

- (eval $ac_try) 2>&5

13488

- ac_status=$?

13489

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13490

- (exit $ac_status); }; } &&

13491

- { ac_try='test -s conftest$ac_exeext'

13492

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13493

- (eval $ac_try) 2>&5

13494

- ac_status=$?

13495

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13496

- (exit $ac_status); }; }; then

13497

+ (exit $ac_status); } && {

13498

+ test -z "$ac_c_werror_flag" ||

13499

+ test ! -s conftest.err

13500

+ } && test -s conftest$ac_exeext &&

13501

+ $as_test_x conftest$ac_exeext; then

13502

ac_cv_func_gethostbyname=yes

13503

else

13504

echo "$as_me: failed program was:" >&5

13505

sed 's/^/| /' conftest.$ac_ext >&5

13506

13507

-ac_cv_func_gethostbyname=no

13508

+ ac_cv_func_gethostbyname=no

13509

13510

-rm -f conftest.err conftest.$ac_objext \

13511

13512

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13513

conftest$ac_exeext conftest.$ac_ext

13514

13515

-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5

13516

-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6

13517

+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5

13518

+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }

13519

13520

if test $ac_cv_func_gethostbyname = no; then

13521

- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5

13522

-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6

13523

+ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5

13524

+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }

13525

if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then

13526

echo $ECHO_N "(cached) $ECHO_C" >&6

13527

else

13528

@@ -23518,63 +23996,60 @@

13529

cat >>conftest.$ac_ext <<_ACEOF

13530

/* end confdefs.h. */

13531

13532

-/* Override any gcc2 internal prototype to avoid an error. */

13533

+/* Override any GCC internal prototype to avoid an error.

13534

+ Use char because int might match the return type of a GCC

13535

+ builtin and then its argument prototype would still apply. */

13536

#ifdef __cplusplus

13537

extern "C"

13538

#endif

13539

-/* We use char because int might match the return type of a gcc2

13540

- builtin and then its argument prototype would still apply. */

13541

char gethostbyname ();

13542

int

13543

main ()

13544

{

13545

-gethostbyname ();

13546

+return gethostbyname ();

13547

;

13548

return 0;

13549

}

13550

_ACEOF

13551

rm -f conftest.$ac_objext conftest$ac_exeext

13552

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13553

- (eval $ac_link) 2>conftest.er1

13554

+if { (ac_try="$ac_link"

13555

+case "(($ac_try" in

13556

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13557

+ *) ac_try_echo=$ac_try;;

13558

+esac

13559

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13560

+ (eval "$ac_link") 2>conftest.er1

13561

ac_status=$?

13562

grep -v '^ *+' conftest.er1 >conftest.err

13563

rm -f conftest.er1

13564

cat conftest.err >&5

13565

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13566

- (exit $ac_status); } &&

13567

- { ac_try='test -z "$ac_c_werror_flag"

13568

- || test ! -s conftest.err'

13569

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13570

- (eval $ac_try) 2>&5

13571

- ac_status=$?

13572

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13573

- (exit $ac_status); }; } &&

13574

- { ac_try='test -s conftest$ac_exeext'

13575

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13576

- (eval $ac_try) 2>&5

13577

- ac_status=$?

13578

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13579

- (exit $ac_status); }; }; then

13580

+ (exit $ac_status); } && {

13581

+ test -z "$ac_c_werror_flag" ||

13582

+ test ! -s conftest.err

13583

+ } && test -s conftest$ac_exeext &&

13584

+ $as_test_x conftest$ac_exeext; then

13585

ac_cv_lib_nsl_gethostbyname=yes

13586

else

13587

echo "$as_me: failed program was:" >&5

13588

sed 's/^/| /' conftest.$ac_ext >&5

13589

13590

-ac_cv_lib_nsl_gethostbyname=no

13591

+ ac_cv_lib_nsl_gethostbyname=no

13592

13593

-rm -f conftest.err conftest.$ac_objext \

13594

13595

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13596

conftest$ac_exeext conftest.$ac_ext

13597

LIBS=$ac_check_lib_save_LIBS

13598

13599

-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5

13600

-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6

13601

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5

13602

+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }

13603

if test $ac_cv_lib_nsl_gethostbyname = yes; then

13604

X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"

13605

13606

13607

if test $ac_cv_lib_nsl_gethostbyname = no; then

13608

- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5

13609

-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6

13610

+ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5

13611

+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }

13612

if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then

13613

echo $ECHO_N "(cached) $ECHO_C" >&6

13614

else

13615

@@ -23587,56 +24062,53 @@

13616

cat >>conftest.$ac_ext <<_ACEOF

13617

/* end confdefs.h. */

13618

13619

-/* Override any gcc2 internal prototype to avoid an error. */

13620

+/* Override any GCC internal prototype to avoid an error.

13621

+ Use char because int might match the return type of a GCC

13622

+ builtin and then its argument prototype would still apply. */

13623

#ifdef __cplusplus

13624

extern "C"

13625

#endif

13626

-/* We use char because int might match the return type of a gcc2

13627

- builtin and then its argument prototype would still apply. */

13628

char gethostbyname ();

13629

int

13630

main ()

13631

{

13632

-gethostbyname ();

13633

+return gethostbyname ();

13634

;

13635

return 0;

13636

}

13637

_ACEOF

13638

rm -f conftest.$ac_objext conftest$ac_exeext

13639

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13640

- (eval $ac_link) 2>conftest.er1

13641

+if { (ac_try="$ac_link"

13642

+case "(($ac_try" in

13643

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13644

+ *) ac_try_echo=$ac_try;;

13645

+esac

13646

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13647

+ (eval "$ac_link") 2>conftest.er1

13648

ac_status=$?

13649

grep -v '^ *+' conftest.er1 >conftest.err

13650

rm -f conftest.er1

13651

cat conftest.err >&5

13652

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13653

- (exit $ac_status); } &&

13654

- { ac_try='test -z "$ac_c_werror_flag"

13655

- || test ! -s conftest.err'

13656

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13657

- (eval $ac_try) 2>&5

13658

- ac_status=$?

13659

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13660

- (exit $ac_status); }; } &&

13661

- { ac_try='test -s conftest$ac_exeext'

13662

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13663

- (eval $ac_try) 2>&5

13664

- ac_status=$?

13665

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13666

- (exit $ac_status); }; }; then

13667

+ (exit $ac_status); } && {

13668

+ test -z "$ac_c_werror_flag" ||

13669

+ test ! -s conftest.err

13670

+ } && test -s conftest$ac_exeext &&

13671

+ $as_test_x conftest$ac_exeext; then

13672

ac_cv_lib_bsd_gethostbyname=yes

13673

else

13674

echo "$as_me: failed program was:" >&5

13675

sed 's/^/| /' conftest.$ac_ext >&5

13676

13677

-ac_cv_lib_bsd_gethostbyname=no

13678

+ ac_cv_lib_bsd_gethostbyname=no

13679

13680

-rm -f conftest.err conftest.$ac_objext \

13681

13682

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13683

conftest$ac_exeext conftest.$ac_ext

13684

LIBS=$ac_check_lib_save_LIBS

13685

13686

-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5

13687

-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6

13688

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5

13689

+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }

13690

if test $ac_cv_lib_bsd_gethostbyname = yes; then

13691

X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"

13692

13693

@@ -23651,8 +24123,8 @@

13694

# variants that don't use the name server (or something). -lsocket

13695

# must be given before -lnsl if both are needed. We assume that

13696

# if connect needs -lnsl, so does gethostbyname.

13697

- echo "$as_me:$LINENO: checking for connect" >&5

13698

-echo $ECHO_N "checking for connect... $ECHO_C" >&6

13699

+ { echo "$as_me:$LINENO: checking for connect" >&5

13700

+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }

13701

if test "${ac_cv_func_connect+set}" = set; then

13702

echo $ECHO_N "(cached) $ECHO_C" >&6

13703

else

13704

@@ -23679,72 +24151,63 @@

13705

13706

#undef connect

13707

13708

-/* Override any gcc2 internal prototype to avoid an error. */

13709

+/* Override any GCC internal prototype to avoid an error.

13710

+ Use char because int might match the return type of a GCC

13711

+ builtin and then its argument prototype would still apply. */

13712

#ifdef __cplusplus

13713

extern "C"

13714

13715

#endif

13716

-/* We use char because int might match the return type of a gcc2

13717

- builtin and then its argument prototype would still apply. */

13718

char connect ();

13719

/* The GNU C library defines this for functions which it implements

13720

to always fail with ENOSYS. Some functions are actually named

13721

something starting with __ and the normal name is an alias. */

13722

-#if defined (__stub_connect) || defined (__stub___connect)

13723

+#if defined __stub_connect || defined __stub___connect

13724

choke me

13725

-#else

13726

-char (*f) () = connect;

13727

-#endif

13728

-#ifdef __cplusplus

13729

13730

#endif

13731

13732

int

13733

main ()

13734

{

13735

-return f != connect;

13736

+return connect ();

13737

;

13738

return 0;

13739

}

13740

_ACEOF

13741

rm -f conftest.$ac_objext conftest$ac_exeext

13742

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13743

- (eval $ac_link) 2>conftest.er1

13744

+if { (ac_try="$ac_link"

13745

+case "(($ac_try" in

13746

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13747

+ *) ac_try_echo=$ac_try;;

13748

+esac

13749

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13750

+ (eval "$ac_link") 2>conftest.er1

13751

ac_status=$?

13752

grep -v '^ *+' conftest.er1 >conftest.err

13753

rm -f conftest.er1

13754

cat conftest.err >&5

13755

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13756

- (exit $ac_status); } &&

13757

- { ac_try='test -z "$ac_c_werror_flag"

13758

- || test ! -s conftest.err'

13759

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13760

- (eval $ac_try) 2>&5

13761

- ac_status=$?

13762

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13763

- (exit $ac_status); }; } &&

13764

- { ac_try='test -s conftest$ac_exeext'

13765

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13766

- (eval $ac_try) 2>&5

13767

- ac_status=$?

13768

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13769

- (exit $ac_status); }; }; then

13770

+ (exit $ac_status); } && {

13771

+ test -z "$ac_c_werror_flag" ||

13772

+ test ! -s conftest.err

13773

+ } && test -s conftest$ac_exeext &&

13774

+ $as_test_x conftest$ac_exeext; then

13775

ac_cv_func_connect=yes

13776

else

13777

echo "$as_me: failed program was:" >&5

13778

sed 's/^/| /' conftest.$ac_ext >&5

13779

13780

-ac_cv_func_connect=no

13781

+ ac_cv_func_connect=no

13782

13783

-rm -f conftest.err conftest.$ac_objext \

13784

13785

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13786

conftest$ac_exeext conftest.$ac_ext

13787

13788

-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5

13789

-echo "${ECHO_T}$ac_cv_func_connect" >&6

13790

+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5

13791

+echo "${ECHO_T}$ac_cv_func_connect" >&6; }

13792

13793

if test $ac_cv_func_connect = no; then

13794

- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5

13795

-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6

13796

+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5

13797

+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }

13798

if test "${ac_cv_lib_socket_connect+set}" = set; then

13799

echo $ECHO_N "(cached) $ECHO_C" >&6

13800

else

13801

@@ -23757,56 +24220,53 @@

13802

cat >>conftest.$ac_ext <<_ACEOF

13803

/* end confdefs.h. */

13804

13805

-/* Override any gcc2 internal prototype to avoid an error. */

13806

+/* Override any GCC internal prototype to avoid an error.

13807

+ Use char because int might match the return type of a GCC

13808

+ builtin and then its argument prototype would still apply. */

13809

#ifdef __cplusplus

13810

extern "C"

13811

#endif

13812

-/* We use char because int might match the return type of a gcc2

13813

- builtin and then its argument prototype would still apply. */

13814

char connect ();

13815

int

13816

main ()

13817

{

13818

-connect ();

13819

+return connect ();

13820

;

13821

return 0;

13822

}

13823

_ACEOF

13824

rm -f conftest.$ac_objext conftest$ac_exeext

13825

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13826

- (eval $ac_link) 2>conftest.er1

13827

+if { (ac_try="$ac_link"

13828

+case "(($ac_try" in

13829

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13830

+ *) ac_try_echo=$ac_try;;

13831

+esac

13832

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13833

+ (eval "$ac_link") 2>conftest.er1

13834

ac_status=$?

13835

grep -v '^ *+' conftest.er1 >conftest.err

13836

rm -f conftest.er1

13837

cat conftest.err >&5

13838

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13839

- (exit $ac_status); } &&

13840

- { ac_try='test -z "$ac_c_werror_flag"

13841

- || test ! -s conftest.err'

13842

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13843

- (eval $ac_try) 2>&5

13844

- ac_status=$?

13845

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13846

- (exit $ac_status); }; } &&

13847

- { ac_try='test -s conftest$ac_exeext'

13848

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13849

- (eval $ac_try) 2>&5

13850

- ac_status=$?

13851

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13852

- (exit $ac_status); }; }; then

13853

+ (exit $ac_status); } && {

13854

+ test -z "$ac_c_werror_flag" ||

13855

+ test ! -s conftest.err

13856

+ } && test -s conftest$ac_exeext &&

13857

+ $as_test_x conftest$ac_exeext; then

13858

ac_cv_lib_socket_connect=yes

13859

else

13860

echo "$as_me: failed program was:" >&5

13861

sed 's/^/| /' conftest.$ac_ext >&5

13862

13863

-ac_cv_lib_socket_connect=no

13864

+ ac_cv_lib_socket_connect=no

13865

13866

-rm -f conftest.err conftest.$ac_objext \

13867

13868

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13869

conftest$ac_exeext conftest.$ac_ext

13870

LIBS=$ac_check_lib_save_LIBS

13871

13872

-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5

13873

-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6

13874

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5

13875

+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }

13876

if test $ac_cv_lib_socket_connect = yes; then

13877

X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"

13878

13879

@@ -23814,8 +24274,8 @@

13880

13881

13882

# Guillermo Gomez says -lposix is necessary on A/UX.

13883

- echo "$as_me:$LINENO: checking for remove" >&5

13884

-echo $ECHO_N "checking for remove... $ECHO_C" >&6

13885

+ { echo "$as_me:$LINENO: checking for remove" >&5

13886

+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }

13887

if test "${ac_cv_func_remove+set}" = set; then

13888

echo $ECHO_N "(cached) $ECHO_C" >&6

13889

else

13890

@@ -23842,72 +24302,63 @@

13891

13892

#undef remove

13893

13894

-/* Override any gcc2 internal prototype to avoid an error. */

13895

+/* Override any GCC internal prototype to avoid an error.

13896

+ Use char because int might match the return type of a GCC

13897

+ builtin and then its argument prototype would still apply. */

13898

#ifdef __cplusplus

13899

extern "C"

13900

13901

#endif

13902

-/* We use char because int might match the return type of a gcc2

13903

- builtin and then its argument prototype would still apply. */

13904

char remove ();

13905

/* The GNU C library defines this for functions which it implements

13906

to always fail with ENOSYS. Some functions are actually named

13907

something starting with __ and the normal name is an alias. */

13908

-#if defined (__stub_remove) || defined (__stub___remove)

13909

+#if defined __stub_remove || defined __stub___remove

13910

choke me

13911

-#else

13912

-char (*f) () = remove;

13913

-#endif

13914

-#ifdef __cplusplus

13915

13916

#endif

13917

13918

int

13919

main ()

13920

{

13921

-return f != remove;

13922

+return remove ();

13923

;

13924

return 0;

13925

}

13926

_ACEOF

13927

rm -f conftest.$ac_objext conftest$ac_exeext

13928

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13929

- (eval $ac_link) 2>conftest.er1

13930

+if { (ac_try="$ac_link"

13931

+case "(($ac_try" in

13932

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13933

+ *) ac_try_echo=$ac_try;;

13934

+esac

13935

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13936

+ (eval "$ac_link") 2>conftest.er1

13937

ac_status=$?

13938

grep -v '^ *+' conftest.er1 >conftest.err

13939

rm -f conftest.er1

13940

cat conftest.err >&5

13941

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13942

- (exit $ac_status); } &&

13943

- { ac_try='test -z "$ac_c_werror_flag"

13944

- || test ! -s conftest.err'

13945

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13946

- (eval $ac_try) 2>&5

13947

- ac_status=$?

13948

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13949

- (exit $ac_status); }; } &&

13950

- { ac_try='test -s conftest$ac_exeext'

13951

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13952

- (eval $ac_try) 2>&5

13953

- ac_status=$?

13954

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

13955

- (exit $ac_status); }; }; then

13956

+ (exit $ac_status); } && {

13957

+ test -z "$ac_c_werror_flag" ||

13958

+ test ! -s conftest.err

13959

+ } && test -s conftest$ac_exeext &&

13960

+ $as_test_x conftest$ac_exeext; then

13961

ac_cv_func_remove=yes

13962

else

13963

echo "$as_me: failed program was:" >&5

13964

sed 's/^/| /' conftest.$ac_ext >&5

13965

13966

-ac_cv_func_remove=no

13967

+ ac_cv_func_remove=no

13968

13969

-rm -f conftest.err conftest.$ac_objext \

13970

13971

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13972

conftest$ac_exeext conftest.$ac_ext

13973

13974

-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5

13975

-echo "${ECHO_T}$ac_cv_func_remove" >&6

13976

+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5

13977

+echo "${ECHO_T}$ac_cv_func_remove" >&6; }

13978

13979

if test $ac_cv_func_remove = no; then

13980

- echo "$as_me:$LINENO: checking for remove in -lposix" >&5

13981

-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6

13982

+ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5

13983

+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }

13984

if test "${ac_cv_lib_posix_remove+set}" = set; then

13985

echo $ECHO_N "(cached) $ECHO_C" >&6

13986

else

13987

@@ -23920,56 +24371,53 @@

13988

cat >>conftest.$ac_ext <<_ACEOF

13989

/* end confdefs.h. */

13990

13991

-/* Override any gcc2 internal prototype to avoid an error. */

13992

+/* Override any GCC internal prototype to avoid an error.

13993

+ Use char because int might match the return type of a GCC

13994

+ builtin and then its argument prototype would still apply. */

13995

#ifdef __cplusplus

13996

extern "C"

13997

#endif

13998

-/* We use char because int might match the return type of a gcc2

13999

- builtin and then its argument prototype would still apply. */

14000

char remove ();

14001

int

14002

main ()

14003

{

14004

-remove ();

14005

+return remove ();

14006

;

14007

return 0;

14008

}

14009

_ACEOF

14010

rm -f conftest.$ac_objext conftest$ac_exeext

14011

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

14012

- (eval $ac_link) 2>conftest.er1

14013

+if { (ac_try="$ac_link"

14014

+case "(($ac_try" in

14015

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14016

+ *) ac_try_echo=$ac_try;;

14017

+esac

14018

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14019

+ (eval "$ac_link") 2>conftest.er1

14020

ac_status=$?

14021

grep -v '^ *+' conftest.er1 >conftest.err

14022

rm -f conftest.er1

14023

cat conftest.err >&5

14024

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14025

- (exit $ac_status); } &&

14026

- { ac_try='test -z "$ac_c_werror_flag"

14027

- || test ! -s conftest.err'

14028

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14029

- (eval $ac_try) 2>&5

14030

- ac_status=$?

14031

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14032

- (exit $ac_status); }; } &&

14033

- { ac_try='test -s conftest$ac_exeext'

14034

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14035

- (eval $ac_try) 2>&5

14036

- ac_status=$?

14037

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14038

- (exit $ac_status); }; }; then

14039

+ (exit $ac_status); } && {

14040

+ test -z "$ac_c_werror_flag" ||

14041

+ test ! -s conftest.err

14042

+ } && test -s conftest$ac_exeext &&

14043

+ $as_test_x conftest$ac_exeext; then

14044

ac_cv_lib_posix_remove=yes

14045

else

14046

echo "$as_me: failed program was:" >&5

14047

sed 's/^/| /' conftest.$ac_ext >&5

14048

14049

-ac_cv_lib_posix_remove=no

14050

+ ac_cv_lib_posix_remove=no

14051

14052

-rm -f conftest.err conftest.$ac_objext \

14053

14054

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14055

conftest$ac_exeext conftest.$ac_ext

14056

LIBS=$ac_check_lib_save_LIBS

14057

14058

-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5

14059

-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6

14060

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5

14061

+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }

14062

if test $ac_cv_lib_posix_remove = yes; then

14063

X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"

14064

14065

@@ -23977,8 +24425,8 @@

14066

14067

14068

# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

14069

- echo "$as_me:$LINENO: checking for shmat" >&5

14070

-echo $ECHO_N "checking for shmat... $ECHO_C" >&6

14071

+ { echo "$as_me:$LINENO: checking for shmat" >&5

14072

+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }

14073

if test "${ac_cv_func_shmat+set}" = set; then

14074

echo $ECHO_N "(cached) $ECHO_C" >&6

14075

else

14076

@@ -24005,72 +24453,63 @@

14077

14078

#undef shmat

14079

14080

-/* Override any gcc2 internal prototype to avoid an error. */

14081

+/* Override any GCC internal prototype to avoid an error.

14082

+ Use char because int might match the return type of a GCC

14083

+ builtin and then its argument prototype would still apply. */

14084

#ifdef __cplusplus

14085

extern "C"

14086

14087

#endif

14088

-/* We use char because int might match the return type of a gcc2

14089

- builtin and then its argument prototype would still apply. */

14090

char shmat ();

14091

/* The GNU C library defines this for functions which it implements

14092

to always fail with ENOSYS. Some functions are actually named

14093

something starting with __ and the normal name is an alias. */

14094

-#if defined (__stub_shmat) || defined (__stub___shmat)

14095

+#if defined __stub_shmat || defined __stub___shmat

14096

choke me

14097

-#else

14098

-char (*f) () = shmat;

14099

-#endif

14100

-#ifdef __cplusplus

14101

14102

#endif

14103

14104

int

14105

main ()

14106

{

14107

-return f != shmat;

14108

+return shmat ();

14109

;

14110

return 0;

14111

}

14112

_ACEOF

14113

rm -f conftest.$ac_objext conftest$ac_exeext

14114

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

14115

- (eval $ac_link) 2>conftest.er1

14116

+if { (ac_try="$ac_link"

14117

+case "(($ac_try" in

14118

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14119

+ *) ac_try_echo=$ac_try;;

14120

+esac

14121

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14122

+ (eval "$ac_link") 2>conftest.er1

14123

ac_status=$?

14124

grep -v '^ *+' conftest.er1 >conftest.err

14125

rm -f conftest.er1

14126

cat conftest.err >&5

14127

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14128

- (exit $ac_status); } &&

14129

- { ac_try='test -z "$ac_c_werror_flag"

14130

- || test ! -s conftest.err'

14131

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14132

- (eval $ac_try) 2>&5

14133

- ac_status=$?

14134

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14135

- (exit $ac_status); }; } &&

14136

- { ac_try='test -s conftest$ac_exeext'

14137

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14138

- (eval $ac_try) 2>&5

14139

- ac_status=$?

14140

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14141

- (exit $ac_status); }; }; then

14142

+ (exit $ac_status); } && {

14143

+ test -z "$ac_c_werror_flag" ||

14144

+ test ! -s conftest.err

14145

+ } && test -s conftest$ac_exeext &&

14146

+ $as_test_x conftest$ac_exeext; then

14147

ac_cv_func_shmat=yes

14148

else

14149

echo "$as_me: failed program was:" >&5

14150

sed 's/^/| /' conftest.$ac_ext >&5

14151

14152

-ac_cv_func_shmat=no

14153

+ ac_cv_func_shmat=no

14154

14155

-rm -f conftest.err conftest.$ac_objext \

14156

14157

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14158

conftest$ac_exeext conftest.$ac_ext

14159

14160

-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5

14161

-echo "${ECHO_T}$ac_cv_func_shmat" >&6

14162

+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5

14163

+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }

14164

14165

if test $ac_cv_func_shmat = no; then

14166

- echo "$as_me:$LINENO: checking for shmat in -lipc" >&5

14167

-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6

14168

+ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5

14169

+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }

14170

if test "${ac_cv_lib_ipc_shmat+set}" = set; then

14171

echo $ECHO_N "(cached) $ECHO_C" >&6

14172

else

14173

@@ -24083,56 +24522,53 @@

14174

cat >>conftest.$ac_ext <<_ACEOF

14175

/* end confdefs.h. */

14176

14177

-/* Override any gcc2 internal prototype to avoid an error. */

14178

+/* Override any GCC internal prototype to avoid an error.

14179

+ Use char because int might match the return type of a GCC

14180

+ builtin and then its argument prototype would still apply. */

14181

#ifdef __cplusplus

14182

extern "C"

14183

#endif

14184

-/* We use char because int might match the return type of a gcc2

14185

- builtin and then its argument prototype would still apply. */

14186

char shmat ();

14187

int

14188

main ()

14189

{

14190

-shmat ();

14191

+return shmat ();

14192

;

14193

return 0;

14194

}

14195

_ACEOF

14196

rm -f conftest.$ac_objext conftest$ac_exeext

14197

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

14198

- (eval $ac_link) 2>conftest.er1

14199

+if { (ac_try="$ac_link"

14200

+case "(($ac_try" in

14201

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14202

+ *) ac_try_echo=$ac_try;;

14203

+esac

14204

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14205

+ (eval "$ac_link") 2>conftest.er1

14206

ac_status=$?

14207

grep -v '^ *+' conftest.er1 >conftest.err

14208

rm -f conftest.er1

14209

cat conftest.err >&5

14210

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14211

- (exit $ac_status); } &&

14212

- { ac_try='test -z "$ac_c_werror_flag"

14213

- || test ! -s conftest.err'

14214

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14215

- (eval $ac_try) 2>&5

14216

- ac_status=$?

14217

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14218

- (exit $ac_status); }; } &&

14219

- { ac_try='test -s conftest$ac_exeext'

14220

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14221

- (eval $ac_try) 2>&5

14222

- ac_status=$?

14223

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14224

- (exit $ac_status); }; }; then

14225

+ (exit $ac_status); } && {

14226

+ test -z "$ac_c_werror_flag" ||

14227

+ test ! -s conftest.err

14228

+ } && test -s conftest$ac_exeext &&

14229

+ $as_test_x conftest$ac_exeext; then

14230

ac_cv_lib_ipc_shmat=yes

14231

else

14232

echo "$as_me: failed program was:" >&5

14233

sed 's/^/| /' conftest.$ac_ext >&5

14234

14235

-ac_cv_lib_ipc_shmat=no

14236

+ ac_cv_lib_ipc_shmat=no

14237

14238

-rm -f conftest.err conftest.$ac_objext \

14239

14240

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14241

conftest$ac_exeext conftest.$ac_ext

14242

LIBS=$ac_check_lib_save_LIBS

14243

14244

-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5

14245

-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6

14246

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5

14247

+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }

14248

if test $ac_cv_lib_ipc_shmat = yes; then

14249

X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"

14250

14251

@@ -24149,8 +24585,8 @@

14252

# These have to be linked with before -lX11, unlike the other

14253

# libraries we check for below, so use a different variable.

14254

# John Interrante, Karl Berry

14255

- echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5

14256

-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6

14257

+ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5

14258

+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }

14259

if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then

14260

echo $ECHO_N "(cached) $ECHO_C" >&6

14261

else

14262

@@ -24163,56 +24599,53 @@

14263

cat >>conftest.$ac_ext <<_ACEOF

14264

/* end confdefs.h. */

14265

14266

-/* Override any gcc2 internal prototype to avoid an error. */

14267

+/* Override any GCC internal prototype to avoid an error.

14268

+ Use char because int might match the return type of a GCC

14269

+ builtin and then its argument prototype would still apply. */

14270

#ifdef __cplusplus

14271

extern "C"

14272

#endif

14273

-/* We use char because int might match the return type of a gcc2

14274

- builtin and then its argument prototype would still apply. */

14275

char IceConnectionNumber ();

14276

int

14277

main ()

14278

{

14279

-IceConnectionNumber ();

14280

+return IceConnectionNumber ();

14281

;

14282

return 0;

14283

}

14284

_ACEOF

14285

rm -f conftest.$ac_objext conftest$ac_exeext

14286

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

14287

- (eval $ac_link) 2>conftest.er1

14288

+if { (ac_try="$ac_link"

14289

+case "(($ac_try" in

14290

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14291

+ *) ac_try_echo=$ac_try;;

14292

+esac

14293

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14294

+ (eval "$ac_link") 2>conftest.er1

14295

ac_status=$?

14296

grep -v '^ *+' conftest.er1 >conftest.err

14297

rm -f conftest.er1

14298

cat conftest.err >&5

14299

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14300

- (exit $ac_status); } &&

14301

- { ac_try='test -z "$ac_c_werror_flag"

14302

- || test ! -s conftest.err'

14303

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14304

- (eval $ac_try) 2>&5

14305

- ac_status=$?

14306

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14307

- (exit $ac_status); }; } &&

14308

- { ac_try='test -s conftest$ac_exeext'

14309

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14310

- (eval $ac_try) 2>&5

14311

- ac_status=$?

14312

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14313

- (exit $ac_status); }; }; then

14314

+ (exit $ac_status); } && {

14315

+ test -z "$ac_c_werror_flag" ||

14316

+ test ! -s conftest.err

14317

+ } && test -s conftest$ac_exeext &&

14318

+ $as_test_x conftest$ac_exeext; then

14319

ac_cv_lib_ICE_IceConnectionNumber=yes

14320

else

14321

echo "$as_me: failed program was:" >&5

14322

sed 's/^/| /' conftest.$ac_ext >&5

14323

14324

-ac_cv_lib_ICE_IceConnectionNumber=no

14325

+ ac_cv_lib_ICE_IceConnectionNumber=no

14326

14327

-rm -f conftest.err conftest.$ac_objext \

14328

14329

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14330

conftest$ac_exeext conftest.$ac_ext

14331

LIBS=$ac_check_lib_save_LIBS

14332

14333

-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5

14334

-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6

14335

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5

14336

+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }

14337

if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then

14338

X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"

14339

14340

@@ -24238,16 +24671,16 @@

14341

14342

14343

14344

-# Check whether --enable-swig or --disable-swig was given.

14345

+# Check whether --enable-swig was given.

14346

if test "${enable_swig+set}" = set; then

14347

- enableval="$enable_swig"

14348

+ enableval=$enable_swig;

14349

+fi

14350

14351

-fi;

14352

if test "x$enable_swig" != "xno"; then

14353

# Extract the first word of "swig", so it can be a program name with args.

14354

set dummy swig; ac_word=$2

14355

-echo "$as_me:$LINENO: checking for $ac_word" >&5

14356

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

14357

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

14358

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

14359

if test "${ac_cv_prog_SWIG+set}" = set; then

14360

echo $ECHO_N "(cached) $ECHO_C" >&6

14361

else

14362

@@ -24260,25 +24693,27 @@

14363

IFS=$as_save_IFS

14364

test -z "$as_dir" && as_dir=.

14365

for ac_exec_ext in '' $ac_executable_extensions; do

14366

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

14367

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

14368

ac_cv_prog_SWIG="swig"

14369

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

14370

break 2

14371

14372

done

14373

done

14374

+IFS=$as_save_IFS

14375

14376

14377

14378

SWIG=$ac_cv_prog_SWIG

14379

if test -n "$SWIG"; then

14380

- echo "$as_me:$LINENO: result: $SWIG" >&5

14381

-echo "${ECHO_T}$SWIG" >&6

14382

+ { echo "$as_me:$LINENO: result: $SWIG" >&5

14383

+echo "${ECHO_T}$SWIG" >&6; }

14384

else

14385

- echo "$as_me:$LINENO: result: no" >&5

14386

-echo "${ECHO_T}no" >&6

14387

+ { echo "$as_me:$LINENO: result: no" >&5

14388

+echo "${ECHO_T}no" >&6; }

14389

14390

14391

14392

if test "x$SWIG" != "x"; then

14393

SWIG_VERSION=`$SWIG -version 2>&1 | $GREP Version | cut -d ' ' -f 3`

14394

SWIG_VERSION_MAJOR=`echo $SWIG_VERSION | cut -d '.' -f 1`

14395

@@ -24312,11 +24747,11 @@

14396

14397

14398

if test "x$SWIG" != "x"; then

14399

-# Check whether --enable-sharp or --disable-sharp was given.

14400

+# Check whether --enable-sharp was given.

14401

if test "${enable_sharp+set}" = set; then

14402

- enableval="$enable_sharp"

14403

+ enableval=$enable_sharp;

14404

+fi

14405

14406

-fi;

14407

if test "x$enable_sharp" != "xno"; then

14408

if test `$SWIG -help 2>&1 | $GREP -c '\-csharp *- Generate'` = 0; then

14409

SHARP=

14410

@@ -24325,8 +24760,8 @@

14411

else

14412

# Extract the first word of "mcs", so it can be a program name with args.

14413

set dummy mcs; ac_word=$2

14414

-echo "$as_me:$LINENO: checking for $ac_word" >&5

14415

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

14416

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

14417

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

14418

if test "${ac_cv_prog_SHARP+set}" = set; then

14419

echo $ECHO_N "(cached) $ECHO_C" >&6

14420

else

14421

@@ -24339,25 +24774,27 @@

14422

IFS=$as_save_IFS

14423

test -z "$as_dir" && as_dir=.

14424

for ac_exec_ext in '' $ac_executable_extensions; do

14425

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

14426

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

14427

ac_cv_prog_SHARP="mcs"

14428

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

14429

break 2

14430

14431

done

14432

done

14433

+IFS=$as_save_IFS

14434

14435

14436

14437

SHARP=$ac_cv_prog_SHARP

14438

if test -n "$SHARP"; then

14439

- echo "$as_me:$LINENO: result: $SHARP" >&5

14440

-echo "${ECHO_T}$SHARP" >&6

14441

+ { echo "$as_me:$LINENO: result: $SHARP" >&5

14442

+echo "${ECHO_T}$SHARP" >&6; }

14443

else

14444

- echo "$as_me:$LINENO: result: no" >&5

14445

-echo "${ECHO_T}no" >&6

14446

+ { echo "$as_me:$LINENO: result: no" >&5

14447

+echo "${ECHO_T}no" >&6; }

14448

14449

14450

14451

SHARP_INCLUDES=

14452

SHARP_LIBS=

14453

14454

@@ -24378,11 +24815,11 @@

14455

14456

14457

if test "x$SWIG" != "x"; then

14458

-# Check whether --enable-guile or --disable-guile was given.

14459

+# Check whether --enable-guile was given.

14460

if test "${enable_guile+set}" = set; then

14461

- enableval="$enable_guile"

14462

+ enableval=$enable_guile;

14463

+fi

14464

14465

-fi;

14466

if test "x$enable_guile" != "xno"; then

14467

if test `$SWIG -help 2>&1 | $GREP -c '\-guile *- Generate'` = 0; then

14468

GUILE=

14469

@@ -24391,8 +24828,8 @@

14470

else

14471

# Extract the first word of "guile", so it can be a program name with args.

14472

set dummy guile; ac_word=$2

14473

-echo "$as_me:$LINENO: checking for $ac_word" >&5

14474

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

14475

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

14476

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

14477

if test "${ac_cv_prog_GUILE+set}" = set; then

14478

echo $ECHO_N "(cached) $ECHO_C" >&6

14479

else

14480

@@ -24405,25 +24842,27 @@

14481

IFS=$as_save_IFS

14482

test -z "$as_dir" && as_dir=.

14483

for ac_exec_ext in '' $ac_executable_extensions; do

14484

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

14485

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

14486

ac_cv_prog_GUILE="guile"

14487

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

14488

break 2

14489

14490

done

14491

done

14492

+IFS=$as_save_IFS

14493

14494

14495

14496

GUILE=$ac_cv_prog_GUILE

14497

if test -n "$GUILE"; then

14498

- echo "$as_me:$LINENO: result: $GUILE" >&5

14499

-echo "${ECHO_T}$GUILE" >&6

14500

+ { echo "$as_me:$LINENO: result: $GUILE" >&5

14501

+echo "${ECHO_T}$GUILE" >&6; }

14502

else

14503

- echo "$as_me:$LINENO: result: no" >&5

14504

-echo "${ECHO_T}no" >&6

14505

+ { echo "$as_me:$LINENO: result: no" >&5

14506

+echo "${ECHO_T}no" >&6; }

14507

14508

14509

14510

if test "x$GUILE" != "x"; then

14511

GUILE_VERSION=`$GUILE --version | head -1 | cut -d ' ' -f 2`

14512

GUILE_VERSION_MAJOR=`echo $GUILE_VERSION | cut -d '.' -f 1`

14513

@@ -24444,17 +24883,17 @@

14514

GUILE_INCLUDES=

14515

GUILE_LIBS=

14516

if test "${ac_cv_header_libguile_h+set}" = set; then

14517

- echo "$as_me:$LINENO: checking for libguile.h" >&5

14518

-echo $ECHO_N "checking for libguile.h... $ECHO_C" >&6

14519

+ { echo "$as_me:$LINENO: checking for libguile.h" >&5

14520

+echo $ECHO_N "checking for libguile.h... $ECHO_C" >&6; }

14521

if test "${ac_cv_header_libguile_h+set}" = set; then

14522

echo $ECHO_N "(cached) $ECHO_C" >&6

14523

14524

-echo "$as_me:$LINENO: result: $ac_cv_header_libguile_h" >&5

14525

-echo "${ECHO_T}$ac_cv_header_libguile_h" >&6

14526

+{ echo "$as_me:$LINENO: result: $ac_cv_header_libguile_h" >&5

14527

+echo "${ECHO_T}$ac_cv_header_libguile_h" >&6; }

14528

else

14529

# Is the header compilable?

14530

-echo "$as_me:$LINENO: checking libguile.h usability" >&5

14531

-echo $ECHO_N "checking libguile.h usability... $ECHO_C" >&6

14532

+{ echo "$as_me:$LINENO: checking libguile.h usability" >&5

14533

+echo $ECHO_N "checking libguile.h usability... $ECHO_C" >&6; }

14534

cat >conftest.$ac_ext <<_ACEOF

14535

/* confdefs.h. */

14536

_ACEOF

14537

@@ -24465,41 +24904,37 @@

14538

#include <libguile.h>

14539

_ACEOF

14540

rm -f conftest.$ac_objext

14541

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

14542

- (eval $ac_compile) 2>conftest.er1

14543

+if { (ac_try="$ac_compile"

14544

+case "(($ac_try" in

14545

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14546

+ *) ac_try_echo=$ac_try;;

14547

+esac

14548

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14549

+ (eval "$ac_compile") 2>conftest.er1

14550

ac_status=$?

14551

grep -v '^ *+' conftest.er1 >conftest.err

14552

rm -f conftest.er1

14553

cat conftest.err >&5

14554

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14555

- (exit $ac_status); } &&

14556

- { ac_try='test -z "$ac_c_werror_flag"

14557

- || test ! -s conftest.err'

14558

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14559

- (eval $ac_try) 2>&5

14560

- ac_status=$?

14561

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14562

- (exit $ac_status); }; } &&

14563

- { ac_try='test -s conftest.$ac_objext'

14564

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14565

- (eval $ac_try) 2>&5

14566

- ac_status=$?

14567

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14568

- (exit $ac_status); }; }; then

14569

+ (exit $ac_status); } && {

14570

+ test -z "$ac_c_werror_flag" ||

14571

+ test ! -s conftest.err

14572

+ } && test -s conftest.$ac_objext; then

14573

ac_header_compiler=yes

14574

else

14575

echo "$as_me: failed program was:" >&5

14576

sed 's/^/| /' conftest.$ac_ext >&5

14577

14578

-ac_header_compiler=no

14579

+ ac_header_compiler=no

14580

14581

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

14582

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

14583

-echo "${ECHO_T}$ac_header_compiler" >&6

14584

14585

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

14586

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

14587

+echo "${ECHO_T}$ac_header_compiler" >&6; }

14588

14589

# Is the header present?

14590

-echo "$as_me:$LINENO: checking libguile.h presence" >&5

14591

-echo $ECHO_N "checking libguile.h presence... $ECHO_C" >&6

14592

+{ echo "$as_me:$LINENO: checking libguile.h presence" >&5

14593

+echo $ECHO_N "checking libguile.h presence... $ECHO_C" >&6; }

14594

cat >conftest.$ac_ext <<_ACEOF

14595

/* confdefs.h. */

14596

_ACEOF

14597

@@ -24508,24 +24943,22 @@

14598

/* end confdefs.h. */

14599

#include <libguile.h>

14600

_ACEOF

14601

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

14602

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

14603

+if { (ac_try="$ac_cpp conftest.$ac_ext"

14604

+case "(($ac_try" in

14605

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14606

+ *) ac_try_echo=$ac_try;;

14607

+esac

14608

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14609

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

14610

ac_status=$?

14611

grep -v '^ *+' conftest.er1 >conftest.err

14612

rm -f conftest.er1

14613

cat conftest.err >&5

14614

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14615

- (exit $ac_status); } >/dev/null; then

14616

- if test -s conftest.err; then

14617

- ac_cpp_err=$ac_c_preproc_warn_flag

14618

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

14619

- else

14620

- ac_cpp_err=

14621

- fi

14622

-else

14623

- ac_cpp_err=yes

14624

-fi

14625

-if test -z "$ac_cpp_err"; then

14626

+ (exit $ac_status); } >/dev/null && {

14627

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

14628

+ test ! -s conftest.err

14629

+ }; then

14630

ac_header_preproc=yes

14631

else

14632

echo "$as_me: failed program was:" >&5

14633

@@ -24533,9 +24966,10 @@

14634

14635

ac_header_preproc=no

14636

14637

14638

rm -f conftest.err conftest.$ac_ext

14639

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

14640

-echo "${ECHO_T}$ac_header_preproc" >&6

14641

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

14642

+echo "${ECHO_T}$ac_header_preproc" >&6; }

14643

14644

# So? What about this header?

14645

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

14646

@@ -24559,25 +24993,18 @@

14647

echo "$as_me: WARNING: libguile.h: proceeding with the preprocessor's result" >&2;}

14648

{ echo "$as_me:$LINENO: WARNING: libguile.h: in the future, the compiler will take precedence" >&5

14649

echo "$as_me: WARNING: libguile.h: in the future, the compiler will take precedence" >&2;}

14650

- (

14651

- cat <<\_ASBOX

14652

-## ----------------------------------- ##

14653

-## Report this to the graphviz lists. ##

14654

-## ----------------------------------- ##

14655

-_ASBOX

14656

- ) |

14657

- sed "s/^/$as_me: WARNING: /" >&2

14658

14659

;;

14660

esac

14661

-echo "$as_me:$LINENO: checking for libguile.h" >&5

14662

-echo $ECHO_N "checking for libguile.h... $ECHO_C" >&6

14663

+{ echo "$as_me:$LINENO: checking for libguile.h" >&5

14664

+echo $ECHO_N "checking for libguile.h... $ECHO_C" >&6; }

14665

if test "${ac_cv_header_libguile_h+set}" = set; then

14666

echo $ECHO_N "(cached) $ECHO_C" >&6

14667

else

14668

ac_cv_header_libguile_h=$ac_header_preproc

14669

14670

-echo "$as_me:$LINENO: result: $ac_cv_header_libguile_h" >&5

14671

-echo "${ECHO_T}$ac_cv_header_libguile_h" >&6

14672

+{ echo "$as_me:$LINENO: result: $ac_cv_header_libguile_h" >&5

14673

+echo "${ECHO_T}$ac_cv_header_libguile_h" >&6; }

14674

14675

14676

if test $ac_cv_header_libguile_h = yes; then

14677

@@ -24611,11 +25038,11 @@

14678

14679

14680

if test "x$SWIG" != "x"; then

14681

-# Check whether --enable-io or --disable-io was given.

14682

+# Check whether --enable-io was given.

14683

if test "${enable_io+set}" = set; then

14684

- enableval="$enable_io"

14685

+ enableval=$enable_io;

14686

+fi

14687

14688

-fi;

14689

if test "x$enable_io" != "xno"; then

14690

if test `$SWIG -help 2>&1 | $GREP -c '\-io *- Generate'` = 0; then

14691

IO=

14692

@@ -24624,8 +25051,8 @@

14693

else

14694

# Extract the first word of "io", so it can be a program name with args.

14695

set dummy io; ac_word=$2

14696

-echo "$as_me:$LINENO: checking for $ac_word" >&5

14697

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

14698

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

14699

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

14700

if test "${ac_cv_prog_IO+set}" = set; then

14701

echo $ECHO_N "(cached) $ECHO_C" >&6

14702

else

14703

@@ -24638,25 +25065,27 @@

14704

IFS=$as_save_IFS

14705

test -z "$as_dir" && as_dir=.

14706

for ac_exec_ext in '' $ac_executable_extensions; do

14707

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

14708

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

14709

ac_cv_prog_IO="io"

14710

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

14711

break 2

14712

14713

done

14714

done

14715

+IFS=$as_save_IFS

14716

14717

14718

14719

IO=$ac_cv_prog_IO

14720

if test -n "$IO"; then

14721

- echo "$as_me:$LINENO: result: $IO" >&5

14722

-echo "${ECHO_T}$IO" >&6

14723

+ { echo "$as_me:$LINENO: result: $IO" >&5

14724

+echo "${ECHO_T}$IO" >&6; }

14725

else

14726

- echo "$as_me:$LINENO: result: no" >&5

14727

-echo "${ECHO_T}no" >&6

14728

+ { echo "$as_me:$LINENO: result: no" >&5

14729

+echo "${ECHO_T}no" >&6; }

14730

14731

14732

14733

IO_INCLUDES=

14734

IO_LIBS=

14735

14736

@@ -24677,11 +25106,11 @@

14737

14738

14739

if test "x$SWIG" != "x"; then

14740

-# Check whether --enable-java or --disable-java was given.

14741

+# Check whether --enable-java was given.

14742

if test "${enable_java+set}" = set; then

14743

- enableval="$enable_java"

14744

+ enableval=$enable_java;

14745

+fi

14746

14747

-fi;

14748

if test "x$enable_java" != "xno"; then

14749

if test `$SWIG -help 2>&1 | $GREP -c '\-java *- Generate'` = 0; then

14750

JAVA=

14751

@@ -24690,8 +25119,8 @@

14752

else

14753

# Extract the first word of "java", so it can be a program name with args.

14754

set dummy java; ac_word=$2

14755

-echo "$as_me:$LINENO: checking for $ac_word" >&5

14756

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

14757

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

14758

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

14759

if test "${ac_cv_prog_JAVA+set}" = set; then

14760

echo $ECHO_N "(cached) $ECHO_C" >&6

14761

else

14762

@@ -24704,39 +25133,41 @@

14763

IFS=$as_save_IFS

14764

test -z "$as_dir" && as_dir=.

14765

for ac_exec_ext in '' $ac_executable_extensions; do

14766

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

14767

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

14768

ac_cv_prog_JAVA="java"

14769

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

14770

break 2

14771

14772

done

14773

done

14774

+IFS=$as_save_IFS

14775

14776

14777

14778

JAVA=$ac_cv_prog_JAVA

14779

if test -n "$JAVA"; then

14780

- echo "$as_me:$LINENO: result: $JAVA" >&5

14781

-echo "${ECHO_T}$JAVA" >&6

14782

+ { echo "$as_me:$LINENO: result: $JAVA" >&5

14783

+echo "${ECHO_T}$JAVA" >&6; }

14784

else

14785

- echo "$as_me:$LINENO: result: no" >&5

14786

-echo "${ECHO_T}no" >&6

14787

+ { echo "$as_me:$LINENO: result: no" >&5

14788

+echo "${ECHO_T}no" >&6; }

14789

14790

14791

14792

JAVA_INCLUDES=

14793

JAVA_LIBS=

14794

if test "${ac_cv_header_jni_h+set}" = set; then

14795

- echo "$as_me:$LINENO: checking for jni.h" >&5

14796

-echo $ECHO_N "checking for jni.h... $ECHO_C" >&6

14797

+ { echo "$as_me:$LINENO: checking for jni.h" >&5

14798

+echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; }

14799

if test "${ac_cv_header_jni_h+set}" = set; then

14800

echo $ECHO_N "(cached) $ECHO_C" >&6

14801

14802

-echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5

14803

-echo "${ECHO_T}$ac_cv_header_jni_h" >&6

14804

+{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5

14805

+echo "${ECHO_T}$ac_cv_header_jni_h" >&6; }

14806

else

14807

# Is the header compilable?

14808

-echo "$as_me:$LINENO: checking jni.h usability" >&5

14809

-echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6

14810

+{ echo "$as_me:$LINENO: checking jni.h usability" >&5

14811

+echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6; }

14812

cat >conftest.$ac_ext <<_ACEOF

14813

/* confdefs.h. */

14814

_ACEOF

14815

@@ -24747,41 +25178,37 @@

14816

#include <jni.h>

14817

_ACEOF

14818

rm -f conftest.$ac_objext

14819

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

14820

- (eval $ac_compile) 2>conftest.er1

14821

+if { (ac_try="$ac_compile"

14822

+case "(($ac_try" in

14823

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14824

+ *) ac_try_echo=$ac_try;;

14825

+esac

14826

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14827

+ (eval "$ac_compile") 2>conftest.er1

14828

ac_status=$?

14829

grep -v '^ *+' conftest.er1 >conftest.err

14830

rm -f conftest.er1

14831

cat conftest.err >&5

14832

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14833

- (exit $ac_status); } &&

14834

- { ac_try='test -z "$ac_c_werror_flag"

14835

- || test ! -s conftest.err'

14836

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14837

- (eval $ac_try) 2>&5

14838

- ac_status=$?

14839

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14840

- (exit $ac_status); }; } &&

14841

- { ac_try='test -s conftest.$ac_objext'

14842

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14843

- (eval $ac_try) 2>&5

14844

- ac_status=$?

14845

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

14846

- (exit $ac_status); }; }; then

14847

+ (exit $ac_status); } && {

14848

+ test -z "$ac_c_werror_flag" ||

14849

+ test ! -s conftest.err

14850

+ } && test -s conftest.$ac_objext; then

14851

ac_header_compiler=yes

14852

else

14853

echo "$as_me: failed program was:" >&5

14854

sed 's/^/| /' conftest.$ac_ext >&5

14855

14856

-ac_header_compiler=no

14857

+ ac_header_compiler=no

14858

14859

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

14860

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

14861

-echo "${ECHO_T}$ac_header_compiler" >&6

14862

14863

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

14864

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

14865

+echo "${ECHO_T}$ac_header_compiler" >&6; }

14866

14867

# Is the header present?

14868

-echo "$as_me:$LINENO: checking jni.h presence" >&5

14869

-echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6

14870

+{ echo "$as_me:$LINENO: checking jni.h presence" >&5

14871

+echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6; }

14872

cat >conftest.$ac_ext <<_ACEOF

14873

/* confdefs.h. */

14874

_ACEOF

14875

@@ -24790,24 +25217,22 @@

14876

/* end confdefs.h. */

14877

#include <jni.h>

14878

_ACEOF

14879

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

14880

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

14881

+if { (ac_try="$ac_cpp conftest.$ac_ext"

14882

+case "(($ac_try" in

14883

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14884

+ *) ac_try_echo=$ac_try;;

14885

+esac

14886

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14887

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

14888

ac_status=$?

14889

grep -v '^ *+' conftest.er1 >conftest.err

14890

rm -f conftest.er1

14891

cat conftest.err >&5

14892

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14893

- (exit $ac_status); } >/dev/null; then

14894

- if test -s conftest.err; then

14895

- ac_cpp_err=$ac_c_preproc_warn_flag

14896

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

14897

- else

14898

- ac_cpp_err=

14899

- fi

14900

-else

14901

- ac_cpp_err=yes

14902

-fi

14903

-if test -z "$ac_cpp_err"; then

14904

+ (exit $ac_status); } >/dev/null && {

14905

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

14906

+ test ! -s conftest.err

14907

+ }; then

14908

ac_header_preproc=yes

14909

else

14910

echo "$as_me: failed program was:" >&5

14911

@@ -24815,9 +25240,10 @@

14912

14913

ac_header_preproc=no

14914

14915

14916

rm -f conftest.err conftest.$ac_ext

14917

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

14918

-echo "${ECHO_T}$ac_header_preproc" >&6

14919

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

14920

+echo "${ECHO_T}$ac_header_preproc" >&6; }

14921

14922

# So? What about this header?

14923

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

14924

@@ -24841,25 +25267,18 @@

14925

echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}

14926

{ echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5

14927

echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;}

14928

- (

14929

- cat <<\_ASBOX

14930

-## ----------------------------------- ##

14931

-## Report this to the graphviz lists. ##

14932

-## ----------------------------------- ##

14933

-_ASBOX

14934

- ) |

14935

- sed "s/^/$as_me: WARNING: /" >&2

14936

14937

;;

14938

esac

14939

-echo "$as_me:$LINENO: checking for jni.h" >&5

14940

-echo $ECHO_N "checking for jni.h... $ECHO_C" >&6

14941

+{ echo "$as_me:$LINENO: checking for jni.h" >&5

14942

+echo $ECHO_N "checking for jni.h... $ECHO_C" >&6; }

14943

if test "${ac_cv_header_jni_h+set}" = set; then

14944

echo $ECHO_N "(cached) $ECHO_C" >&6

14945

else

14946

ac_cv_header_jni_h=$ac_header_preproc

14947

14948

-echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5

14949

-echo "${ECHO_T}$ac_cv_header_jni_h" >&6

14950

+{ echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5

14951

+echo "${ECHO_T}$ac_cv_header_jni_h" >&6; }

14952

14953

14954

if test $ac_cv_header_jni_h = yes; then

14955

@@ -24891,11 +25310,11 @@

14956

14957

14958

if test "x$SWIG" != "x"; then

14959

-# Check whether --enable-lua or --disable-lua was given.

14960

+# Check whether --enable-lua was given.

14961

if test "${enable_lua+set}" = set; then

14962

- enableval="$enable_lua"

14963

+ enableval=$enable_lua;

14964

+fi

14965

14966

-fi;

14967

if test "x$enable_lua" != "xno"; then

14968

if test `$SWIG -help 2>&1 | $GREP -c '\-lua *- Generate'` = 0; then

14969

LUA=

14970

@@ -24904,8 +25323,8 @@

14971

else

14972

# Extract the first word of "lua", so it can be a program name with args.

14973

set dummy lua; ac_word=$2

14974

-echo "$as_me:$LINENO: checking for $ac_word" >&5

14975

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

14976

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

14977

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

14978

if test "${ac_cv_prog_LUA+set}" = set; then

14979

echo $ECHO_N "(cached) $ECHO_C" >&6

14980

else

14981

@@ -24918,39 +25337,41 @@

14982

IFS=$as_save_IFS

14983

test -z "$as_dir" && as_dir=.

14984

for ac_exec_ext in '' $ac_executable_extensions; do

14985

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

14986

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

14987

ac_cv_prog_LUA="lua"

14988

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

14989

break 2

14990

14991

done

14992

done

14993

+IFS=$as_save_IFS

14994

14995

14996

14997

LUA=$ac_cv_prog_LUA

14998

if test -n "$LUA"; then

14999

- echo "$as_me:$LINENO: result: $LUA" >&5

15000

-echo "${ECHO_T}$LUA" >&6

15001

+ { echo "$as_me:$LINENO: result: $LUA" >&5

15002

+echo "${ECHO_T}$LUA" >&6; }

15003

else

15004

- echo "$as_me:$LINENO: result: no" >&5

15005

-echo "${ECHO_T}no" >&6

15006

+ { echo "$as_me:$LINENO: result: no" >&5

15007

+echo "${ECHO_T}no" >&6; }

15008

15009

15010

15011

LUA_INCLUDES=

15012

LUA_LIBS=

15013

if test "${ac_cv_header_lua_h+set}" = set; then

15014

- echo "$as_me:$LINENO: checking for lua.h" >&5

15015

-echo $ECHO_N "checking for lua.h... $ECHO_C" >&6

15016

+ { echo "$as_me:$LINENO: checking for lua.h" >&5

15017

+echo $ECHO_N "checking for lua.h... $ECHO_C" >&6; }

15018

if test "${ac_cv_header_lua_h+set}" = set; then

15019

echo $ECHO_N "(cached) $ECHO_C" >&6

15020

15021

-echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5

15022

-echo "${ECHO_T}$ac_cv_header_lua_h" >&6

15023

+{ echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5

15024

+echo "${ECHO_T}$ac_cv_header_lua_h" >&6; }

15025

else

15026

# Is the header compilable?

15027

-echo "$as_me:$LINENO: checking lua.h usability" >&5

15028

-echo $ECHO_N "checking lua.h usability... $ECHO_C" >&6

15029

+{ echo "$as_me:$LINENO: checking lua.h usability" >&5

15030

+echo $ECHO_N "checking lua.h usability... $ECHO_C" >&6; }

15031

cat >conftest.$ac_ext <<_ACEOF

15032

/* confdefs.h. */

15033

_ACEOF

15034

@@ -24961,41 +25382,37 @@

15035

#include <lua.h>

15036

_ACEOF

15037

rm -f conftest.$ac_objext

15038

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

15039

- (eval $ac_compile) 2>conftest.er1

15040

+if { (ac_try="$ac_compile"

15041

+case "(($ac_try" in

15042

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15043

+ *) ac_try_echo=$ac_try;;

15044

+esac

15045

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15046

+ (eval "$ac_compile") 2>conftest.er1

15047

ac_status=$?

15048

grep -v '^ *+' conftest.er1 >conftest.err

15049

rm -f conftest.er1

15050

cat conftest.err >&5

15051

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15052

- (exit $ac_status); } &&

15053

- { ac_try='test -z "$ac_c_werror_flag"

15054

- || test ! -s conftest.err'

15055

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15056

- (eval $ac_try) 2>&5

15057

- ac_status=$?

15058

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15059

- (exit $ac_status); }; } &&

15060

- { ac_try='test -s conftest.$ac_objext'

15061

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15062

- (eval $ac_try) 2>&5

15063

- ac_status=$?

15064

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15065

- (exit $ac_status); }; }; then

15066

+ (exit $ac_status); } && {

15067

+ test -z "$ac_c_werror_flag" ||

15068

+ test ! -s conftest.err

15069

+ } && test -s conftest.$ac_objext; then

15070

ac_header_compiler=yes

15071

else

15072

echo "$as_me: failed program was:" >&5

15073

sed 's/^/| /' conftest.$ac_ext >&5

15074

15075

-ac_header_compiler=no

15076

+ ac_header_compiler=no

15077

15078

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

15079

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15080

-echo "${ECHO_T}$ac_header_compiler" >&6

15081

15082

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

15083

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15084

+echo "${ECHO_T}$ac_header_compiler" >&6; }

15085

15086

# Is the header present?

15087

-echo "$as_me:$LINENO: checking lua.h presence" >&5

15088

-echo $ECHO_N "checking lua.h presence... $ECHO_C" >&6

15089

+{ echo "$as_me:$LINENO: checking lua.h presence" >&5

15090

+echo $ECHO_N "checking lua.h presence... $ECHO_C" >&6; }

15091

cat >conftest.$ac_ext <<_ACEOF

15092

/* confdefs.h. */

15093

_ACEOF

15094

@@ -25004,24 +25421,22 @@

15095

/* end confdefs.h. */

15096

#include <lua.h>

15097

_ACEOF

15098

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

15099

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

15100

+if { (ac_try="$ac_cpp conftest.$ac_ext"

15101

+case "(($ac_try" in

15102

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15103

+ *) ac_try_echo=$ac_try;;

15104

+esac

15105

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15106

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

15107

ac_status=$?

15108

grep -v '^ *+' conftest.er1 >conftest.err

15109

rm -f conftest.er1

15110

cat conftest.err >&5

15111

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15112

- (exit $ac_status); } >/dev/null; then

15113

- if test -s conftest.err; then

15114

- ac_cpp_err=$ac_c_preproc_warn_flag

15115

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

15116

- else

15117

- ac_cpp_err=

15118

- fi

15119

-else

15120

- ac_cpp_err=yes

15121

-fi

15122

-if test -z "$ac_cpp_err"; then

15123

+ (exit $ac_status); } >/dev/null && {

15124

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

15125

+ test ! -s conftest.err

15126

+ }; then

15127

ac_header_preproc=yes

15128

else

15129

echo "$as_me: failed program was:" >&5

15130

@@ -25029,9 +25444,10 @@

15131

15132

ac_header_preproc=no

15133

15134

15135

rm -f conftest.err conftest.$ac_ext

15136

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15137

-echo "${ECHO_T}$ac_header_preproc" >&6

15138

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15139

+echo "${ECHO_T}$ac_header_preproc" >&6; }

15140

15141

# So? What about this header?

15142

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

15143

@@ -25055,25 +25471,18 @@

15144

echo "$as_me: WARNING: lua.h: proceeding with the preprocessor's result" >&2;}

15145

{ echo "$as_me:$LINENO: WARNING: lua.h: in the future, the compiler will take precedence" >&5

15146

echo "$as_me: WARNING: lua.h: in the future, the compiler will take precedence" >&2;}

15147

- (

15148

- cat <<\_ASBOX

15149

-## ----------------------------------- ##

15150

-## Report this to the graphviz lists. ##

15151

-## ----------------------------------- ##

15152

-_ASBOX

15153

- ) |

15154

- sed "s/^/$as_me: WARNING: /" >&2

15155

15156

;;

15157

esac

15158

-echo "$as_me:$LINENO: checking for lua.h" >&5

15159

-echo $ECHO_N "checking for lua.h... $ECHO_C" >&6

15160

+{ echo "$as_me:$LINENO: checking for lua.h" >&5

15161

+echo $ECHO_N "checking for lua.h... $ECHO_C" >&6; }

15162

if test "${ac_cv_header_lua_h+set}" = set; then

15163

echo $ECHO_N "(cached) $ECHO_C" >&6

15164

else

15165

ac_cv_header_lua_h=$ac_header_preproc

15166

15167

-echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5

15168

-echo "${ECHO_T}$ac_cv_header_lua_h" >&6

15169

+{ echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5

15170

+echo "${ECHO_T}$ac_cv_header_lua_h" >&6; }

15171

15172

15173

if test $ac_cv_header_lua_h = yes; then

15174

@@ -25105,11 +25514,11 @@

15175

15176

15177

if test "x$SWIG" != "x"; then

15178

-# Check whether --enable-ocaml or --disable-ocaml was given.

15179

+# Check whether --enable-ocaml was given.

15180

if test "${enable_ocaml+set}" = set; then

15181

- enableval="$enable_ocaml"

15182

+ enableval=$enable_ocaml;

15183

+fi

15184

15185

-fi;

15186

if test "x$enable_ocaml" != "xno"; then

15187

if test `$SWIG -help 2>&1 | $GREP -c '\-ocaml *- Generate'` = 0; then

15188

OCAML=

15189

@@ -25118,8 +25527,8 @@

15190

else

15191

# Extract the first word of "ocaml", so it can be a program name with args.

15192

set dummy ocaml; ac_word=$2

15193

-echo "$as_me:$LINENO: checking for $ac_word" >&5

15194

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

15195

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

15196

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

15197

if test "${ac_cv_prog_OCAML+set}" = set; then

15198

echo $ECHO_N "(cached) $ECHO_C" >&6

15199

else

15200

@@ -25132,41 +25541,43 @@

15201

IFS=$as_save_IFS

15202

test -z "$as_dir" && as_dir=.

15203

for ac_exec_ext in '' $ac_executable_extensions; do

15204

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

15205

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

15206

ac_cv_prog_OCAML="ocaml"

15207

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

15208

break 2

15209

15210

done

15211

done

15212

+IFS=$as_save_IFS

15213

15214

15215

15216

OCAML=$ac_cv_prog_OCAML

15217

if test -n "$OCAML"; then

15218

- echo "$as_me:$LINENO: result: $OCAML" >&5

15219

-echo "${ECHO_T}$OCAML" >&6

15220

+ { echo "$as_me:$LINENO: result: $OCAML" >&5

15221

+echo "${ECHO_T}$OCAML" >&6; }

15222

else

15223

- echo "$as_me:$LINENO: result: no" >&5

15224

-echo "${ECHO_T}no" >&6

15225

+ { echo "$as_me:$LINENO: result: no" >&5

15226

+echo "${ECHO_T}no" >&6; }

15227

15228

15229

15230

OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml

15231

OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml

15232

save_CPPFLAGS=$CPPFLAGS

15233

CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"

15234

if test "${ac_cv_header_caml_mlvalues_h+set}" = set; then

15235

- echo "$as_me:$LINENO: checking for caml/mlvalues.h" >&5

15236

-echo $ECHO_N "checking for caml/mlvalues.h... $ECHO_C" >&6

15237

+ { echo "$as_me:$LINENO: checking for caml/mlvalues.h" >&5

15238

+echo $ECHO_N "checking for caml/mlvalues.h... $ECHO_C" >&6; }

15239

if test "${ac_cv_header_caml_mlvalues_h+set}" = set; then

15240

echo $ECHO_N "(cached) $ECHO_C" >&6

15241

15242

-echo "$as_me:$LINENO: result: $ac_cv_header_caml_mlvalues_h" >&5

15243

-echo "${ECHO_T}$ac_cv_header_caml_mlvalues_h" >&6

15244

+{ echo "$as_me:$LINENO: result: $ac_cv_header_caml_mlvalues_h" >&5

15245

+echo "${ECHO_T}$ac_cv_header_caml_mlvalues_h" >&6; }

15246

else

15247

# Is the header compilable?

15248

-echo "$as_me:$LINENO: checking caml/mlvalues.h usability" >&5

15249

-echo $ECHO_N "checking caml/mlvalues.h usability... $ECHO_C" >&6

15250

+{ echo "$as_me:$LINENO: checking caml/mlvalues.h usability" >&5

15251

+echo $ECHO_N "checking caml/mlvalues.h usability... $ECHO_C" >&6; }

15252

cat >conftest.$ac_ext <<_ACEOF

15253

/* confdefs.h. */

15254

_ACEOF

15255

@@ -25177,41 +25588,37 @@

15256

#include <caml/mlvalues.h>

15257

_ACEOF

15258

rm -f conftest.$ac_objext

15259

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

15260

- (eval $ac_compile) 2>conftest.er1

15261

+if { (ac_try="$ac_compile"

15262

+case "(($ac_try" in

15263

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15264

+ *) ac_try_echo=$ac_try;;

15265

+esac

15266

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15267

+ (eval "$ac_compile") 2>conftest.er1

15268

ac_status=$?

15269

grep -v '^ *+' conftest.er1 >conftest.err

15270

rm -f conftest.er1

15271

cat conftest.err >&5

15272

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15273

- (exit $ac_status); } &&

15274

- { ac_try='test -z "$ac_c_werror_flag"

15275

- || test ! -s conftest.err'

15276

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15277

- (eval $ac_try) 2>&5

15278

- ac_status=$?

15279

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15280

- (exit $ac_status); }; } &&

15281

- { ac_try='test -s conftest.$ac_objext'

15282

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15283

- (eval $ac_try) 2>&5

15284

- ac_status=$?

15285

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15286

- (exit $ac_status); }; }; then

15287

+ (exit $ac_status); } && {

15288

+ test -z "$ac_c_werror_flag" ||

15289

+ test ! -s conftest.err

15290

+ } && test -s conftest.$ac_objext; then

15291

ac_header_compiler=yes

15292

else

15293

echo "$as_me: failed program was:" >&5

15294

sed 's/^/| /' conftest.$ac_ext >&5

15295

15296

-ac_header_compiler=no

15297

+ ac_header_compiler=no

15298

15299

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

15300

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15301

-echo "${ECHO_T}$ac_header_compiler" >&6

15302

15303

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

15304

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15305

+echo "${ECHO_T}$ac_header_compiler" >&6; }

15306

15307

# Is the header present?

15308

-echo "$as_me:$LINENO: checking caml/mlvalues.h presence" >&5

15309

-echo $ECHO_N "checking caml/mlvalues.h presence... $ECHO_C" >&6

15310

+{ echo "$as_me:$LINENO: checking caml/mlvalues.h presence" >&5

15311

+echo $ECHO_N "checking caml/mlvalues.h presence... $ECHO_C" >&6; }

15312

cat >conftest.$ac_ext <<_ACEOF

15313

/* confdefs.h. */

15314

_ACEOF

15315

@@ -25220,24 +25627,22 @@

15316

/* end confdefs.h. */

15317

#include <caml/mlvalues.h>

15318

_ACEOF

15319

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

15320

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

15321

+if { (ac_try="$ac_cpp conftest.$ac_ext"

15322

+case "(($ac_try" in

15323

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15324

+ *) ac_try_echo=$ac_try;;

15325

+esac

15326

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15327

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

15328

ac_status=$?

15329

grep -v '^ *+' conftest.er1 >conftest.err

15330

rm -f conftest.er1

15331

cat conftest.err >&5

15332

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15333

- (exit $ac_status); } >/dev/null; then

15334

- if test -s conftest.err; then

15335

- ac_cpp_err=$ac_c_preproc_warn_flag

15336

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

15337

- else

15338

- ac_cpp_err=

15339

- fi

15340

-else

15341

- ac_cpp_err=yes

15342

-fi

15343

-if test -z "$ac_cpp_err"; then

15344

+ (exit $ac_status); } >/dev/null && {

15345

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

15346

+ test ! -s conftest.err

15347

+ }; then

15348

ac_header_preproc=yes

15349

else

15350

echo "$as_me: failed program was:" >&5

15351

@@ -25245,9 +25650,10 @@

15352

15353

ac_header_preproc=no

15354

15355

15356

rm -f conftest.err conftest.$ac_ext

15357

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15358

-echo "${ECHO_T}$ac_header_preproc" >&6

15359

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15360

+echo "${ECHO_T}$ac_header_preproc" >&6; }

15361

15362

# So? What about this header?

15363

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

15364

@@ -25271,25 +25677,18 @@

15365

echo "$as_me: WARNING: caml/mlvalues.h: proceeding with the preprocessor's result" >&2;}

15366

{ echo "$as_me:$LINENO: WARNING: caml/mlvalues.h: in the future, the compiler will take precedence" >&5

15367

echo "$as_me: WARNING: caml/mlvalues.h: in the future, the compiler will take precedence" >&2;}

15368

- (

15369

- cat <<\_ASBOX

15370

-## ----------------------------------- ##

15371

-## Report this to the graphviz lists. ##

15372

-## ----------------------------------- ##

15373

-_ASBOX

15374

- ) |

15375

- sed "s/^/$as_me: WARNING: /" >&2

15376

15377

;;

15378

esac

15379

-echo "$as_me:$LINENO: checking for caml/mlvalues.h" >&5

15380

-echo $ECHO_N "checking for caml/mlvalues.h... $ECHO_C" >&6

15381

+{ echo "$as_me:$LINENO: checking for caml/mlvalues.h" >&5

15382

+echo $ECHO_N "checking for caml/mlvalues.h... $ECHO_C" >&6; }

15383

if test "${ac_cv_header_caml_mlvalues_h+set}" = set; then

15384

echo $ECHO_N "(cached) $ECHO_C" >&6

15385

else

15386

ac_cv_header_caml_mlvalues_h=$ac_header_preproc

15387

15388

-echo "$as_me:$LINENO: result: $ac_cv_header_caml_mlvalues_h" >&5

15389

-echo "${ECHO_T}$ac_cv_header_caml_mlvalues_h" >&6

15390

+{ echo "$as_me:$LINENO: result: $ac_cv_header_caml_mlvalues_h" >&5

15391

+echo "${ECHO_T}$ac_cv_header_caml_mlvalues_h" >&6; }

15392

15393

15394

if test $ac_cv_header_caml_mlvalues_h = yes; then

15395

@@ -25322,16 +25721,16 @@

15396

15397

15398

if test "x$SWIG" != "x"; then

15399

-# Check whether --enable-perl or --disable-perl was given.

15400

+# Check whether --enable-perl was given.

15401

if test "${enable_perl+set}" = set; then

15402

- enableval="$enable_perl"

15403

+ enableval=$enable_perl;

15404

+fi

15405

15406

-fi;

15407

if test "x$enable_perl" != "xno"; then

15408

# Extract the first word of "perl", so it can be a program name with args.

15409

set dummy perl; ac_word=$2

15410

-echo "$as_me:$LINENO: checking for $ac_word" >&5

15411

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

15412

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

15413

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

15414

if test "${ac_cv_prog_PERL+set}" = set; then

15415

echo $ECHO_N "(cached) $ECHO_C" >&6

15416

else

15417

@@ -25344,25 +25743,27 @@

15418

IFS=$as_save_IFS

15419

test -z "$as_dir" && as_dir=.

15420

for ac_exec_ext in '' $ac_executable_extensions; do

15421

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

15422

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

15423

ac_cv_prog_PERL="perl"

15424

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

15425

break 2

15426

15427

done

15428

done

15429

+IFS=$as_save_IFS

15430

15431

15432

15433

PERL=$ac_cv_prog_PERL

15434

if test -n "$PERL"; then

15435

- echo "$as_me:$LINENO: result: $PERL" >&5

15436

-echo "${ECHO_T}$PERL" >&6

15437

+ { echo "$as_me:$LINENO: result: $PERL" >&5

15438

+echo "${ECHO_T}$PERL" >&6; }

15439

else

15440

- echo "$as_me:$LINENO: result: no" >&5

15441

-echo "${ECHO_T}no" >&6

15442

+ { echo "$as_me:$LINENO: result: no" >&5

15443

+echo "${ECHO_T}no" >&6; }

15444

15445

15446

15447

if test -n "$PERL" && $PERL -e 'exit !($] <= 5.004)' > /dev/null 2>&1 ; then

15448

PERL=

15449

{ echo "$as_me:$LINENO: WARNING: perl is too old. The PERL packages will not be built" >&5

15450

@@ -25380,17 +25781,17 @@

15451

save_CPPFLAGS=$CPPFLAGS

15452

CPPFLAGS="$CPPFLAGS $PERL_INCLUDES"

15453

if test "${ac_cv_header_EXTERN_h+set}" = set; then

15454

- echo "$as_me:$LINENO: checking for EXTERN.h" >&5

15455

-echo $ECHO_N "checking for EXTERN.h... $ECHO_C" >&6

15456

+ { echo "$as_me:$LINENO: checking for EXTERN.h" >&5

15457

+echo $ECHO_N "checking for EXTERN.h... $ECHO_C" >&6; }

15458

if test "${ac_cv_header_EXTERN_h+set}" = set; then

15459

echo $ECHO_N "(cached) $ECHO_C" >&6

15460

15461

-echo "$as_me:$LINENO: result: $ac_cv_header_EXTERN_h" >&5

15462

-echo "${ECHO_T}$ac_cv_header_EXTERN_h" >&6

15463

+{ echo "$as_me:$LINENO: result: $ac_cv_header_EXTERN_h" >&5

15464

+echo "${ECHO_T}$ac_cv_header_EXTERN_h" >&6; }

15465

else

15466

# Is the header compilable?

15467

-echo "$as_me:$LINENO: checking EXTERN.h usability" >&5

15468

-echo $ECHO_N "checking EXTERN.h usability... $ECHO_C" >&6

15469

+{ echo "$as_me:$LINENO: checking EXTERN.h usability" >&5

15470

+echo $ECHO_N "checking EXTERN.h usability... $ECHO_C" >&6; }

15471

cat >conftest.$ac_ext <<_ACEOF

15472

/* confdefs.h. */

15473

_ACEOF

15474

@@ -25401,41 +25802,37 @@

15475

#include <EXTERN.h>

15476

_ACEOF

15477

rm -f conftest.$ac_objext

15478

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

15479

- (eval $ac_compile) 2>conftest.er1

15480

+if { (ac_try="$ac_compile"

15481

+case "(($ac_try" in

15482

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15483

+ *) ac_try_echo=$ac_try;;

15484

+esac

15485

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15486

+ (eval "$ac_compile") 2>conftest.er1

15487

ac_status=$?

15488

grep -v '^ *+' conftest.er1 >conftest.err

15489

rm -f conftest.er1

15490

cat conftest.err >&5

15491

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15492

- (exit $ac_status); } &&

15493

- { ac_try='test -z "$ac_c_werror_flag"

15494

- || test ! -s conftest.err'

15495

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15496

- (eval $ac_try) 2>&5

15497

- ac_status=$?

15498

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15499

- (exit $ac_status); }; } &&

15500

- { ac_try='test -s conftest.$ac_objext'

15501

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15502

- (eval $ac_try) 2>&5

15503

- ac_status=$?

15504

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15505

- (exit $ac_status); }; }; then

15506

+ (exit $ac_status); } && {

15507

+ test -z "$ac_c_werror_flag" ||

15508

+ test ! -s conftest.err

15509

+ } && test -s conftest.$ac_objext; then

15510

ac_header_compiler=yes

15511

else

15512

echo "$as_me: failed program was:" >&5

15513

sed 's/^/| /' conftest.$ac_ext >&5

15514

15515

-ac_header_compiler=no

15516

+ ac_header_compiler=no

15517

15518

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

15519

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15520

-echo "${ECHO_T}$ac_header_compiler" >&6

15521

15522

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

15523

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15524

+echo "${ECHO_T}$ac_header_compiler" >&6; }

15525

15526

# Is the header present?

15527

-echo "$as_me:$LINENO: checking EXTERN.h presence" >&5

15528

-echo $ECHO_N "checking EXTERN.h presence... $ECHO_C" >&6

15529

+{ echo "$as_me:$LINENO: checking EXTERN.h presence" >&5

15530

+echo $ECHO_N "checking EXTERN.h presence... $ECHO_C" >&6; }

15531

cat >conftest.$ac_ext <<_ACEOF

15532

/* confdefs.h. */

15533

_ACEOF

15534

@@ -25444,24 +25841,22 @@

15535

/* end confdefs.h. */

15536

#include <EXTERN.h>

15537

_ACEOF

15538

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

15539

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

15540

+if { (ac_try="$ac_cpp conftest.$ac_ext"

15541

+case "(($ac_try" in

15542

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15543

+ *) ac_try_echo=$ac_try;;

15544

+esac

15545

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15546

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

15547

ac_status=$?

15548

grep -v '^ *+' conftest.er1 >conftest.err

15549

rm -f conftest.er1

15550

cat conftest.err >&5

15551

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15552

- (exit $ac_status); } >/dev/null; then

15553

- if test -s conftest.err; then

15554

- ac_cpp_err=$ac_c_preproc_warn_flag

15555

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

15556

- else

15557

- ac_cpp_err=

15558

- fi

15559

-else

15560

- ac_cpp_err=yes

15561

-fi

15562

-if test -z "$ac_cpp_err"; then

15563

+ (exit $ac_status); } >/dev/null && {

15564

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

15565

+ test ! -s conftest.err

15566

+ }; then

15567

ac_header_preproc=yes

15568

else

15569

echo "$as_me: failed program was:" >&5

15570

@@ -25469,9 +25864,10 @@

15571

15572

ac_header_preproc=no

15573

15574

15575

rm -f conftest.err conftest.$ac_ext

15576

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15577

-echo "${ECHO_T}$ac_header_preproc" >&6

15578

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15579

+echo "${ECHO_T}$ac_header_preproc" >&6; }

15580

15581

# So? What about this header?

15582

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

15583

@@ -25495,25 +25891,18 @@

15584

echo "$as_me: WARNING: EXTERN.h: proceeding with the preprocessor's result" >&2;}

15585

{ echo "$as_me:$LINENO: WARNING: EXTERN.h: in the future, the compiler will take precedence" >&5

15586

echo "$as_me: WARNING: EXTERN.h: in the future, the compiler will take precedence" >&2;}

15587

- (

15588

- cat <<\_ASBOX

15589

-## ----------------------------------- ##

15590

-## Report this to the graphviz lists. ##

15591

-## ----------------------------------- ##

15592

-_ASBOX

15593

- ) |

15594

- sed "s/^/$as_me: WARNING: /" >&2

15595

15596

;;

15597

esac

15598

-echo "$as_me:$LINENO: checking for EXTERN.h" >&5

15599

-echo $ECHO_N "checking for EXTERN.h... $ECHO_C" >&6

15600

+{ echo "$as_me:$LINENO: checking for EXTERN.h" >&5

15601

+echo $ECHO_N "checking for EXTERN.h... $ECHO_C" >&6; }

15602

if test "${ac_cv_header_EXTERN_h+set}" = set; then

15603

echo $ECHO_N "(cached) $ECHO_C" >&6

15604

else

15605

ac_cv_header_EXTERN_h=$ac_header_preproc

15606

15607

-echo "$as_me:$LINENO: result: $ac_cv_header_EXTERN_h" >&5

15608

-echo "${ECHO_T}$ac_cv_header_EXTERN_h" >&6

15609

+{ echo "$as_me:$LINENO: result: $ac_cv_header_EXTERN_h" >&5

15610

+echo "${ECHO_T}$ac_cv_header_EXTERN_h" >&6; }

15611

15612

15613

if test $ac_cv_header_EXTERN_h = yes; then

15614

@@ -25546,11 +25935,11 @@

15615

15616

15617

if test "x$SWIG" != "x"; then

15618

-# Check whether --enable-php or --disable-php was given.

15619

+# Check whether --enable-php was given.

15620

if test "${enable_php+set}" = set; then

15621

- enableval="$enable_php"

15622

+ enableval=$enable_php;

15623

+fi

15624

15625

-fi;

15626

if test "x$enable_php" != "xno"; then

15627

if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then

15628

PHP=

15629

@@ -25559,8 +25948,8 @@

15630

else

15631

# Extract the first word of "php", so it can be a program name with args.

15632

set dummy php; ac_word=$2

15633

-echo "$as_me:$LINENO: checking for $ac_word" >&5

15634

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

15635

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

15636

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

15637

if test "${ac_cv_prog_PHP+set}" = set; then

15638

echo $ECHO_N "(cached) $ECHO_C" >&6

15639

else

15640

@@ -25573,41 +25962,43 @@

15641

IFS=$as_save_IFS

15642

test -z "$as_dir" && as_dir=.

15643

for ac_exec_ext in '' $ac_executable_extensions; do

15644

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

15645

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

15646

ac_cv_prog_PHP="php"

15647

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

15648

break 2

15649

15650

done

15651

done

15652

+IFS=$as_save_IFS

15653

15654

15655

15656

PHP=$ac_cv_prog_PHP

15657

if test -n "$PHP"; then

15658

- echo "$as_me:$LINENO: result: $PHP" >&5

15659

-echo "${ECHO_T}$PHP" >&6

15660

+ { echo "$as_me:$LINENO: result: $PHP" >&5

15661

+echo "${ECHO_T}$PHP" >&6; }

15662

else

15663

- echo "$as_me:$LINENO: result: no" >&5

15664

-echo "${ECHO_T}no" >&6

15665

+ { echo "$as_me:$LINENO: result: no" >&5

15666

+echo "${ECHO_T}no" >&6; }

15667

15668

15669

15670

PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"

15671

PHP_LIBS=

15672

save_CPPFLAGS=$CPPFLAGS

15673

CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"

15674

if test "${ac_cv_header_zend_h+set}" = set; then

15675

- echo "$as_me:$LINENO: checking for zend.h" >&5

15676

-echo $ECHO_N "checking for zend.h... $ECHO_C" >&6

15677

+ { echo "$as_me:$LINENO: checking for zend.h" >&5

15678

+echo $ECHO_N "checking for zend.h... $ECHO_C" >&6; }

15679

if test "${ac_cv_header_zend_h+set}" = set; then

15680

echo $ECHO_N "(cached) $ECHO_C" >&6

15681

15682

-echo "$as_me:$LINENO: result: $ac_cv_header_zend_h" >&5

15683

-echo "${ECHO_T}$ac_cv_header_zend_h" >&6

15684

+{ echo "$as_me:$LINENO: result: $ac_cv_header_zend_h" >&5

15685

+echo "${ECHO_T}$ac_cv_header_zend_h" >&6; }

15686

else

15687

# Is the header compilable?

15688

-echo "$as_me:$LINENO: checking zend.h usability" >&5

15689

-echo $ECHO_N "checking zend.h usability... $ECHO_C" >&6

15690

+{ echo "$as_me:$LINENO: checking zend.h usability" >&5

15691

+echo $ECHO_N "checking zend.h usability... $ECHO_C" >&6; }

15692

cat >conftest.$ac_ext <<_ACEOF

15693

/* confdefs.h. */

15694

_ACEOF

15695

@@ -25618,41 +26009,37 @@

15696

#include <zend.h>

15697

_ACEOF

15698

rm -f conftest.$ac_objext

15699

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

15700

- (eval $ac_compile) 2>conftest.er1

15701

+if { (ac_try="$ac_compile"

15702

+case "(($ac_try" in

15703

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15704

+ *) ac_try_echo=$ac_try;;

15705

+esac

15706

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15707

+ (eval "$ac_compile") 2>conftest.er1

15708

ac_status=$?

15709

grep -v '^ *+' conftest.er1 >conftest.err

15710

rm -f conftest.er1

15711

cat conftest.err >&5

15712

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15713

- (exit $ac_status); } &&

15714

- { ac_try='test -z "$ac_c_werror_flag"

15715

- || test ! -s conftest.err'

15716

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15717

- (eval $ac_try) 2>&5

15718

- ac_status=$?

15719

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15720

- (exit $ac_status); }; } &&

15721

- { ac_try='test -s conftest.$ac_objext'

15722

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15723

- (eval $ac_try) 2>&5

15724

- ac_status=$?

15725

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15726

- (exit $ac_status); }; }; then

15727

+ (exit $ac_status); } && {

15728

+ test -z "$ac_c_werror_flag" ||

15729

+ test ! -s conftest.err

15730

+ } && test -s conftest.$ac_objext; then

15731

ac_header_compiler=yes

15732

else

15733

echo "$as_me: failed program was:" >&5

15734

sed 's/^/| /' conftest.$ac_ext >&5

15735

15736

-ac_header_compiler=no

15737

+ ac_header_compiler=no

15738

15739

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

15740

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15741

-echo "${ECHO_T}$ac_header_compiler" >&6

15742

15743

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

15744

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15745

+echo "${ECHO_T}$ac_header_compiler" >&6; }

15746

15747

# Is the header present?

15748

-echo "$as_me:$LINENO: checking zend.h presence" >&5

15749

-echo $ECHO_N "checking zend.h presence... $ECHO_C" >&6

15750

+{ echo "$as_me:$LINENO: checking zend.h presence" >&5

15751

+echo $ECHO_N "checking zend.h presence... $ECHO_C" >&6; }

15752

cat >conftest.$ac_ext <<_ACEOF

15753

/* confdefs.h. */

15754

_ACEOF

15755

@@ -25661,24 +26048,22 @@

15756

/* end confdefs.h. */

15757

#include <zend.h>

15758

_ACEOF

15759

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

15760

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

15761

+if { (ac_try="$ac_cpp conftest.$ac_ext"

15762

+case "(($ac_try" in

15763

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15764

+ *) ac_try_echo=$ac_try;;

15765

+esac

15766

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15767

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

15768

ac_status=$?

15769

grep -v '^ *+' conftest.er1 >conftest.err

15770

rm -f conftest.er1

15771

cat conftest.err >&5

15772

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15773

- (exit $ac_status); } >/dev/null; then

15774

- if test -s conftest.err; then

15775

- ac_cpp_err=$ac_c_preproc_warn_flag

15776

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

15777

- else

15778

- ac_cpp_err=

15779

- fi

15780

-else

15781

- ac_cpp_err=yes

15782

-fi

15783

-if test -z "$ac_cpp_err"; then

15784

+ (exit $ac_status); } >/dev/null && {

15785

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

15786

+ test ! -s conftest.err

15787

+ }; then

15788

ac_header_preproc=yes

15789

else

15790

echo "$as_me: failed program was:" >&5

15791

@@ -25686,9 +26071,10 @@

15792

15793

ac_header_preproc=no

15794

15795

15796

rm -f conftest.err conftest.$ac_ext

15797

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15798

-echo "${ECHO_T}$ac_header_preproc" >&6

15799

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15800

+echo "${ECHO_T}$ac_header_preproc" >&6; }

15801

15802

# So? What about this header?

15803

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

15804

@@ -25712,25 +26098,18 @@

15805

echo "$as_me: WARNING: zend.h: proceeding with the preprocessor's result" >&2;}

15806

{ echo "$as_me:$LINENO: WARNING: zend.h: in the future, the compiler will take precedence" >&5

15807

echo "$as_me: WARNING: zend.h: in the future, the compiler will take precedence" >&2;}

15808

- (

15809

- cat <<\_ASBOX

15810

-## ----------------------------------- ##

15811

-## Report this to the graphviz lists. ##

15812

-## ----------------------------------- ##

15813

-_ASBOX

15814

- ) |

15815

- sed "s/^/$as_me: WARNING: /" >&2

15816

15817

;;

15818

esac

15819

-echo "$as_me:$LINENO: checking for zend.h" >&5

15820

-echo $ECHO_N "checking for zend.h... $ECHO_C" >&6

15821

+{ echo "$as_me:$LINENO: checking for zend.h" >&5

15822

+echo $ECHO_N "checking for zend.h... $ECHO_C" >&6; }

15823

if test "${ac_cv_header_zend_h+set}" = set; then

15824

echo $ECHO_N "(cached) $ECHO_C" >&6

15825

else

15826

ac_cv_header_zend_h=$ac_header_preproc

15827

15828

-echo "$as_me:$LINENO: result: $ac_cv_header_zend_h" >&5

15829

-echo "${ECHO_T}$ac_cv_header_zend_h" >&6

15830

+{ echo "$as_me:$LINENO: result: $ac_cv_header_zend_h" >&5

15831

+echo "${ECHO_T}$ac_cv_header_zend_h" >&6; }

15832

15833

15834

if test $ac_cv_header_zend_h = yes; then

15835

@@ -25763,11 +26142,11 @@

15836

15837

15838

if test "x$SWIG" != "x"; then

15839

-# Check whether --enable-python or --disable-python was given.

15840

+# Check whether --enable-python was given.

15841

if test "${enable_python+set}" = set; then

15842

- enableval="$enable_python"

15843

+ enableval=$enable_python;

15844

+fi

15845

15846

-fi;

15847

if test "x$enable_python" != "xno"; then

15848

if test `$SWIG -help 2>&1 | $GREP -c '\-python *- Generate'` = 0; then

15849

PYTHON=

15850

@@ -25776,8 +26155,8 @@

15851

else

15852

# Extract the first word of "python", so it can be a program name with args.

15853

set dummy python; ac_word=$2

15854

-echo "$as_me:$LINENO: checking for $ac_word" >&5

15855

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

15856

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

15857

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

15858

if test "${ac_cv_prog_PYTHON+set}" = set; then

15859

echo $ECHO_N "(cached) $ECHO_C" >&6

15860

else

15861

@@ -25790,25 +26169,27 @@

15862

IFS=$as_save_IFS

15863

test -z "$as_dir" && as_dir=.

15864

for ac_exec_ext in '' $ac_executable_extensions; do

15865

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

15866

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

15867

ac_cv_prog_PYTHON="python"

15868

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

15869

break 2

15870

15871

done

15872

done

15873

+IFS=$as_save_IFS

15874

15875

15876

15877

PYTHON=$ac_cv_prog_PYTHON

15878

if test -n "$PYTHON"; then

15879

- echo "$as_me:$LINENO: result: $PYTHON" >&5

15880

-echo "${ECHO_T}$PYTHON" >&6

15881

+ { echo "$as_me:$LINENO: result: $PYTHON" >&5

15882

+echo "${ECHO_T}$PYTHON" >&6; }

15883

else

15884

- echo "$as_me:$LINENO: result: no" >&5

15885

-echo "${ECHO_T}no" >&6

15886

+ { echo "$as_me:$LINENO: result: no" >&5

15887

+echo "${ECHO_T}no" >&6; }

15888

15889

15890

15891

if test "x$PYTHON" != "x"; then

15892

PYTHON_VERSION=`$PYTHON -V 2>&1 | $GREP Python | cut -d ' ' -f 2`

15893

if test "x$PYTHON_VERSION" = "x"; then

15894

@@ -25837,17 +26218,17 @@

15895

save_CPPFLAGS=$CPPFLAGS

15896

CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"

15897

if test "${ac_cv_header_Python_h+set}" = set; then

15898

- echo "$as_me:$LINENO: checking for Python.h" >&5

15899

-echo $ECHO_N "checking for Python.h... $ECHO_C" >&6

15900

+ { echo "$as_me:$LINENO: checking for Python.h" >&5

15901

+echo $ECHO_N "checking for Python.h... $ECHO_C" >&6; }

15902

if test "${ac_cv_header_Python_h+set}" = set; then

15903

echo $ECHO_N "(cached) $ECHO_C" >&6

15904

15905

-echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5

15906

-echo "${ECHO_T}$ac_cv_header_Python_h" >&6

15907

+{ echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5

15908

+echo "${ECHO_T}$ac_cv_header_Python_h" >&6; }

15909

else

15910

# Is the header compilable?

15911

-echo "$as_me:$LINENO: checking Python.h usability" >&5

15912

-echo $ECHO_N "checking Python.h usability... $ECHO_C" >&6

15913

+{ echo "$as_me:$LINENO: checking Python.h usability" >&5

15914

+echo $ECHO_N "checking Python.h usability... $ECHO_C" >&6; }

15915

cat >conftest.$ac_ext <<_ACEOF

15916

/* confdefs.h. */

15917

_ACEOF

15918

@@ -25858,41 +26239,37 @@

15919

#include <Python.h>

15920

_ACEOF

15921

rm -f conftest.$ac_objext

15922

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

15923

- (eval $ac_compile) 2>conftest.er1

15924

+if { (ac_try="$ac_compile"

15925

+case "(($ac_try" in

15926

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15927

+ *) ac_try_echo=$ac_try;;

15928

+esac

15929

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15930

+ (eval "$ac_compile") 2>conftest.er1

15931

ac_status=$?

15932

grep -v '^ *+' conftest.er1 >conftest.err

15933

rm -f conftest.er1

15934

cat conftest.err >&5

15935

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15936

- (exit $ac_status); } &&

15937

- { ac_try='test -z "$ac_c_werror_flag"

15938

- || test ! -s conftest.err'

15939

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15940

- (eval $ac_try) 2>&5

15941

- ac_status=$?

15942

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15943

- (exit $ac_status); }; } &&

15944

- { ac_try='test -s conftest.$ac_objext'

15945

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15946

- (eval $ac_try) 2>&5

15947

- ac_status=$?

15948

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

15949

- (exit $ac_status); }; }; then

15950

+ (exit $ac_status); } && {

15951

+ test -z "$ac_c_werror_flag" ||

15952

+ test ! -s conftest.err

15953

+ } && test -s conftest.$ac_objext; then

15954

ac_header_compiler=yes

15955

else

15956

echo "$as_me: failed program was:" >&5

15957

sed 's/^/| /' conftest.$ac_ext >&5

15958

15959

-ac_header_compiler=no

15960

+ ac_header_compiler=no

15961

15962

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

15963

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15964

-echo "${ECHO_T}$ac_header_compiler" >&6

15965

15966

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

15967

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15968

+echo "${ECHO_T}$ac_header_compiler" >&6; }

15969

15970

# Is the header present?

15971

-echo "$as_me:$LINENO: checking Python.h presence" >&5

15972

-echo $ECHO_N "checking Python.h presence... $ECHO_C" >&6

15973

+{ echo "$as_me:$LINENO: checking Python.h presence" >&5

15974

+echo $ECHO_N "checking Python.h presence... $ECHO_C" >&6; }

15975

cat >conftest.$ac_ext <<_ACEOF

15976

/* confdefs.h. */

15977

_ACEOF

15978

@@ -25901,24 +26278,22 @@

15979

/* end confdefs.h. */

15980

#include <Python.h>

15981

_ACEOF

15982

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

15983

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

15984

+if { (ac_try="$ac_cpp conftest.$ac_ext"

15985

+case "(($ac_try" in

15986

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15987

+ *) ac_try_echo=$ac_try;;

15988

+esac

15989

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15990

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

15991

ac_status=$?

15992

grep -v '^ *+' conftest.er1 >conftest.err

15993

rm -f conftest.er1

15994

cat conftest.err >&5

15995

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15996

- (exit $ac_status); } >/dev/null; then

15997

- if test -s conftest.err; then

15998

- ac_cpp_err=$ac_c_preproc_warn_flag

15999

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

16000

- else

16001

- ac_cpp_err=

16002

- fi

16003

-else

16004

- ac_cpp_err=yes

16005

-fi

16006

-if test -z "$ac_cpp_err"; then

16007

+ (exit $ac_status); } >/dev/null && {

16008

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

16009

+ test ! -s conftest.err

16010

+ }; then

16011

ac_header_preproc=yes

16012

else

16013

echo "$as_me: failed program was:" >&5

16014

@@ -25926,9 +26301,10 @@

16015

16016

ac_header_preproc=no

16017

16018

16019

rm -f conftest.err conftest.$ac_ext

16020

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

16021

-echo "${ECHO_T}$ac_header_preproc" >&6

16022

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

16023

+echo "${ECHO_T}$ac_header_preproc" >&6; }

16024

16025

# So? What about this header?

16026

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

16027

@@ -25952,25 +26328,18 @@

16028

echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;}

16029

{ echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5

16030

echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;}

16031

- (

16032

- cat <<\_ASBOX

16033

-## ----------------------------------- ##

16034

-## Report this to the graphviz lists. ##

16035

-## ----------------------------------- ##

16036

-_ASBOX

16037

- ) |

16038

- sed "s/^/$as_me: WARNING: /" >&2

16039

16040

;;

16041

esac

16042

-echo "$as_me:$LINENO: checking for Python.h" >&5

16043

-echo $ECHO_N "checking for Python.h... $ECHO_C" >&6

16044

+{ echo "$as_me:$LINENO: checking for Python.h" >&5

16045

+echo $ECHO_N "checking for Python.h... $ECHO_C" >&6; }

16046

if test "${ac_cv_header_Python_h+set}" = set; then

16047

echo $ECHO_N "(cached) $ECHO_C" >&6

16048

else

16049

ac_cv_header_Python_h=$ac_header_preproc

16050

16051

-echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5

16052

-echo "${ECHO_T}$ac_cv_header_Python_h" >&6

16053

+{ echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5

16054

+echo "${ECHO_T}$ac_cv_header_Python_h" >&6; }

16055

16056

16057

if test $ac_cv_header_Python_h = yes; then

16058

@@ -26005,11 +26374,11 @@

16059

16060

16061

if test "x$SWIG" != "x"; then

16062

-# Check whether --enable-ruby or --disable-ruby was given.

16063

+# Check whether --enable-ruby was given.

16064

if test "${enable_ruby+set}" = set; then

16065

- enableval="$enable_ruby"

16066

+ enableval=$enable_ruby;

16067

+fi

16068

16069

-fi;

16070

if test "x$enable_ruby" != "xno"; then

16071

if test `$SWIG -help 2>&1 | $GREP -c '\-ruby *- Generate'` = 0; then

16072

RUBY=

16073

@@ -26018,8 +26387,8 @@

16074

else

16075

# Extract the first word of "ruby", so it can be a program name with args.

16076

set dummy ruby; ac_word=$2

16077

-echo "$as_me:$LINENO: checking for $ac_word" >&5

16078

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

16079

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

16080

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

16081

if test "${ac_cv_prog_RUBY+set}" = set; then

16082

echo $ECHO_N "(cached) $ECHO_C" >&6

16083

else

16084

@@ -26032,42 +26401,44 @@

16085

IFS=$as_save_IFS

16086

test -z "$as_dir" && as_dir=.

16087

for ac_exec_ext in '' $ac_executable_extensions; do

16088

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

16089

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

16090

ac_cv_prog_RUBY="ruby"

16091

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16092

break 2

16093

16094

done

16095

done

16096

+IFS=$as_save_IFS

16097

16098

16099

16100

RUBY=$ac_cv_prog_RUBY

16101

if test -n "$RUBY"; then

16102

- echo "$as_me:$LINENO: result: $RUBY" >&5

16103

-echo "${ECHO_T}$RUBY" >&6

16104

+ { echo "$as_me:$LINENO: result: $RUBY" >&5

16105

+echo "${ECHO_T}$RUBY" >&6; }

16106

else

16107

- echo "$as_me:$LINENO: result: no" >&5

16108

-echo "${ECHO_T}no" >&6

16109

+ { echo "$as_me:$LINENO: result: no" >&5

16110

+echo "${ECHO_T}no" >&6; }

16111

16112

16113

16114

if test "x$RUBY" != "x"; then

16115

RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"

16116

RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` -lruby"

16117

save_CPPFLAGS=$CPPFLAGS

16118

CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"

16119

if test "${ac_cv_header_ruby_h+set}" = set; then

16120

- echo "$as_me:$LINENO: checking for ruby.h" >&5

16121

-echo $ECHO_N "checking for ruby.h... $ECHO_C" >&6

16122

+ { echo "$as_me:$LINENO: checking for ruby.h" >&5

16123

+echo $ECHO_N "checking for ruby.h... $ECHO_C" >&6; }

16124

if test "${ac_cv_header_ruby_h+set}" = set; then

16125

echo $ECHO_N "(cached) $ECHO_C" >&6

16126

16127

-echo "$as_me:$LINENO: result: $ac_cv_header_ruby_h" >&5

16128

-echo "${ECHO_T}$ac_cv_header_ruby_h" >&6

16129

+{ echo "$as_me:$LINENO: result: $ac_cv_header_ruby_h" >&5

16130

+echo "${ECHO_T}$ac_cv_header_ruby_h" >&6; }

16131

else

16132

# Is the header compilable?

16133

-echo "$as_me:$LINENO: checking ruby.h usability" >&5

16134

-echo $ECHO_N "checking ruby.h usability... $ECHO_C" >&6

16135

+{ echo "$as_me:$LINENO: checking ruby.h usability" >&5

16136

+echo $ECHO_N "checking ruby.h usability... $ECHO_C" >&6; }

16137

cat >conftest.$ac_ext <<_ACEOF

16138

/* confdefs.h. */

16139

_ACEOF

16140

@@ -26078,41 +26449,37 @@

16141

#include <ruby.h>

16142

_ACEOF

16143

rm -f conftest.$ac_objext

16144

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

16145

- (eval $ac_compile) 2>conftest.er1

16146

+if { (ac_try="$ac_compile"

16147

+case "(($ac_try" in

16148

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

16149

+ *) ac_try_echo=$ac_try;;

16150

+esac

16151

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

16152

+ (eval "$ac_compile") 2>conftest.er1

16153

ac_status=$?

16154

grep -v '^ *+' conftest.er1 >conftest.err

16155

rm -f conftest.er1

16156

cat conftest.err >&5

16157

echo "$as_me:$LINENO: \$? = $ac_status" >&5

16158

- (exit $ac_status); } &&

16159

- { ac_try='test -z "$ac_c_werror_flag"

16160

- || test ! -s conftest.err'

16161

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

16162

- (eval $ac_try) 2>&5

16163

- ac_status=$?

16164

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

16165

- (exit $ac_status); }; } &&

16166

- { ac_try='test -s conftest.$ac_objext'

16167

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

16168

- (eval $ac_try) 2>&5

16169

- ac_status=$?

16170

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

16171

- (exit $ac_status); }; }; then

16172

+ (exit $ac_status); } && {

16173

+ test -z "$ac_c_werror_flag" ||

16174

+ test ! -s conftest.err

16175

+ } && test -s conftest.$ac_objext; then

16176

ac_header_compiler=yes

16177

else

16178

echo "$as_me: failed program was:" >&5

16179

sed 's/^/| /' conftest.$ac_ext >&5

16180

16181

-ac_header_compiler=no

16182

+ ac_header_compiler=no

16183

16184

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

16185

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

16186

-echo "${ECHO_T}$ac_header_compiler" >&6

16187

16188

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

16189

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

16190

+echo "${ECHO_T}$ac_header_compiler" >&6; }

16191

16192

# Is the header present?

16193

-echo "$as_me:$LINENO: checking ruby.h presence" >&5

16194

-echo $ECHO_N "checking ruby.h presence... $ECHO_C" >&6

16195

+{ echo "$as_me:$LINENO: checking ruby.h presence" >&5

16196

+echo $ECHO_N "checking ruby.h presence... $ECHO_C" >&6; }

16197

cat >conftest.$ac_ext <<_ACEOF

16198

/* confdefs.h. */

16199

_ACEOF

16200

@@ -26121,24 +26488,22 @@

16201

/* end confdefs.h. */

16202

#include <ruby.h>

16203

_ACEOF

16204

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

16205

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

16206

+if { (ac_try="$ac_cpp conftest.$ac_ext"

16207

+case "(($ac_try" in

16208

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

16209

+ *) ac_try_echo=$ac_try;;

16210

+esac

16211

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

16212

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

16213

ac_status=$?

16214

grep -v '^ *+' conftest.er1 >conftest.err

16215

rm -f conftest.er1

16216

cat conftest.err >&5

16217

echo "$as_me:$LINENO: \$? = $ac_status" >&5

16218

- (exit $ac_status); } >/dev/null; then

16219

- if test -s conftest.err; then

16220

- ac_cpp_err=$ac_c_preproc_warn_flag

16221

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

16222

- else

16223

- ac_cpp_err=

16224

- fi

16225

-else

16226

- ac_cpp_err=yes

16227

-fi

16228

-if test -z "$ac_cpp_err"; then

16229

+ (exit $ac_status); } >/dev/null && {

16230

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

16231

+ test ! -s conftest.err

16232

+ }; then

16233

ac_header_preproc=yes

16234

else

16235

echo "$as_me: failed program was:" >&5

16236

@@ -26146,9 +26511,10 @@

16237

16238

ac_header_preproc=no

16239

16240

16241

rm -f conftest.err conftest.$ac_ext

16242

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

16243

-echo "${ECHO_T}$ac_header_preproc" >&6

16244

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

16245

+echo "${ECHO_T}$ac_header_preproc" >&6; }

16246

16247

# So? What about this header?

16248

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

16249

@@ -26172,25 +26538,18 @@

16250

echo "$as_me: WARNING: ruby.h: proceeding with the preprocessor's result" >&2;}

16251

{ echo "$as_me:$LINENO: WARNING: ruby.h: in the future, the compiler will take precedence" >&5

16252

echo "$as_me: WARNING: ruby.h: in the future, the compiler will take precedence" >&2;}

16253

- (

16254

- cat <<\_ASBOX

16255

-## ----------------------------------- ##

16256

-## Report this to the graphviz lists. ##

16257

-## ----------------------------------- ##

16258

-_ASBOX

16259

- ) |

16260

- sed "s/^/$as_me: WARNING: /" >&2

16261

16262

;;

16263

esac

16264

-echo "$as_me:$LINENO: checking for ruby.h" >&5

16265

-echo $ECHO_N "checking for ruby.h... $ECHO_C" >&6

16266

+{ echo "$as_me:$LINENO: checking for ruby.h" >&5

16267

+echo $ECHO_N "checking for ruby.h... $ECHO_C" >&6; }

16268

if test "${ac_cv_header_ruby_h+set}" = set; then

16269

echo $ECHO_N "(cached) $ECHO_C" >&6

16270

else

16271

ac_cv_header_ruby_h=$ac_header_preproc

16272

16273

-echo "$as_me:$LINENO: result: $ac_cv_header_ruby_h" >&5

16274

-echo "${ECHO_T}$ac_cv_header_ruby_h" >&6

16275

+{ echo "$as_me:$LINENO: result: $ac_cv_header_ruby_h" >&5

16276

+echo "${ECHO_T}$ac_cv_header_ruby_h" >&6; }

16277

16278

16279

if test $ac_cv_header_ruby_h = yes; then

16280

@@ -26224,11 +26583,11 @@

16281

16282

16283

if test "x$SWIG" != "x"; then

16284

-# Check whether --enable-tcl or --disable-tcl was given.

16285

+# Check whether --enable-tcl was given.

16286

if test "${enable_tcl+set}" = set; then

16287

- enableval="$enable_tcl"

16288

+ enableval=$enable_tcl;

16289

+fi

16290

16291

-fi;

16292

if test "x$enable_tcl" != "xno"; then

16293

# start by assuming we have it

16294

HAVE_TCL=1

16295

@@ -26244,17 +26603,17 @@

16296

else

16297

16298

16299

-# Check whether --with-tclsh or --without-tclsh was given.

16300

+# Check whether --with-tclsh was given.

16301

if test "${with_tclsh+set}" = set; then

16302

- withval="$with_tclsh"

16303

- TCLSH=$withval

16304

-fi;

16305

+ withval=$with_tclsh; TCLSH=$withval

16306

+fi

16307

16308

16309

if test "x$TCLSH" = "x"; then

16310

# Extract the first word of "tclsh8.4", so it can be a program name with args.

16311

set dummy tclsh8.4; ac_word=$2

16312

-echo "$as_me:$LINENO: checking for $ac_word" >&5

16313

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

16314

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

16315

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

16316

if test "${ac_cv_path_TCLSH+set}" = set; then

16317

echo $ECHO_N "(cached) $ECHO_C" >&6

16318

else

16319

@@ -26269,32 +26628,33 @@

16320

IFS=$as_save_IFS

16321

test -z "$as_dir" && as_dir=.

16322

for ac_exec_ext in '' $ac_executable_extensions; do

16323

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

16324

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

16325

ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"

16326

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16327

break 2

16328

16329

done

16330

done

16331

+IFS=$as_save_IFS

16332

16333

;;

16334

esac

16335

16336

TCLSH=$ac_cv_path_TCLSH

16337

16338

if test -n "$TCLSH"; then

16339

- echo "$as_me:$LINENO: result: $TCLSH" >&5

16340

-echo "${ECHO_T}$TCLSH" >&6

16341

+ { echo "$as_me:$LINENO: result: $TCLSH" >&5

16342

+echo "${ECHO_T}$TCLSH" >&6; }

16343

else

16344

- echo "$as_me:$LINENO: result: no" >&5

16345

-echo "${ECHO_T}no" >&6

16346

+ { echo "$as_me:$LINENO: result: no" >&5

16347

+echo "${ECHO_T}no" >&6; }

16348

16349

16350

16351

if test "x$TCLSH" = "x"; then

16352

# Extract the first word of "tclsh8.3", so it can be a program name with args.

16353

set dummy tclsh8.3; ac_word=$2

16354

-echo "$as_me:$LINENO: checking for $ac_word" >&5

16355

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

16356

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

16357

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

16358

if test "${ac_cv_path_TCLSH+set}" = set; then

16359

echo $ECHO_N "(cached) $ECHO_C" >&6

16360

else

16361

@@ -26309,32 +26669,33 @@

16362

IFS=$as_save_IFS

16363

test -z "$as_dir" && as_dir=.

16364

for ac_exec_ext in '' $ac_executable_extensions; do

16365

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

16366

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

16367

ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"

16368

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16369

break 2

16370

16371

done

16372

done

16373

+IFS=$as_save_IFS

16374

16375

;;

16376

esac

16377

16378

TCLSH=$ac_cv_path_TCLSH

16379

16380

if test -n "$TCLSH"; then

16381

- echo "$as_me:$LINENO: result: $TCLSH" >&5

16382

-echo "${ECHO_T}$TCLSH" >&6

16383

+ { echo "$as_me:$LINENO: result: $TCLSH" >&5

16384

+echo "${ECHO_T}$TCLSH" >&6; }

16385

else

16386

- echo "$as_me:$LINENO: result: no" >&5

16387

-echo "${ECHO_T}no" >&6

16388

+ { echo "$as_me:$LINENO: result: no" >&5

16389

+echo "${ECHO_T}no" >&6; }

16390

16391

16392

16393

if test "x$TCLSH" = "x"; then

16394

# Extract the first word of "tclsh", so it can be a program name with args.

16395

set dummy tclsh; ac_word=$2

16396

-echo "$as_me:$LINENO: checking for $ac_word" >&5

16397

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

16398

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

16399

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

16400

if test "${ac_cv_path_TCLSH+set}" = set; then

16401

echo $ECHO_N "(cached) $ECHO_C" >&6

16402

else

16403

@@ -26349,27 +26710,28 @@

16404

IFS=$as_save_IFS

16405

test -z "$as_dir" && as_dir=.

16406

for ac_exec_ext in '' $ac_executable_extensions; do

16407

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

16408

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

16409

ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"

16410

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16411

break 2

16412

16413

done

16414

done

16415

+IFS=$as_save_IFS

16416

16417

;;

16418

esac

16419

16420

TCLSH=$ac_cv_path_TCLSH

16421

16422

if test -n "$TCLSH"; then

16423

- echo "$as_me:$LINENO: result: $TCLSH" >&5

16424

-echo "${ECHO_T}$TCLSH" >&6

16425

+ { echo "$as_me:$LINENO: result: $TCLSH" >&5

16426

+echo "${ECHO_T}$TCLSH" >&6; }

16427

else

16428

- echo "$as_me:$LINENO: result: no" >&5

16429

-echo "${ECHO_T}no" >&6

16430

+ { echo "$as_me:$LINENO: result: no" >&5

16431

+echo "${ECHO_T}no" >&6; }

16432

16433

16434

16435

16436

16437

16438

@@ -26397,24 +26759,24 @@

16439

16440

16441

if test "x$TCL_INCLUDES" != "x" ; then

16442

- echo "$as_me:$LINENO: result: using tcl headers from $TCL_INCLUDES" >&5

16443

-echo "${ECHO_T}using tcl headers from $TCL_INCLUDES" >&6

16444

+ { echo "$as_me:$LINENO: result: using tcl headers from $TCL_INCLUDES" >&5

16445

+echo "${ECHO_T}using tcl headers from $TCL_INCLUDES" >&6; }

16446

16447

16448

save_CPPFLAGS=$CPPFLAGS

16449

CPPFLAGS="$CPPFLAGS $TCL_INCLUDES"

16450

if test "${ac_cv_header_tcl_h+set}" = set; then

16451

- echo "$as_me:$LINENO: checking for tcl.h" >&5

16452

-echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6

16453

+ { echo "$as_me:$LINENO: checking for tcl.h" >&5

16454

+echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6; }

16455

if test "${ac_cv_header_tcl_h+set}" = set; then

16456

echo $ECHO_N "(cached) $ECHO_C" >&6

16457

16458

-echo "$as_me:$LINENO: result: $ac_cv_header_tcl_h" >&5

16459

-echo "${ECHO_T}$ac_cv_header_tcl_h" >&6

16460

+{ echo "$as_me:$LINENO: result: $ac_cv_header_tcl_h" >&5

16461

+echo "${ECHO_T}$ac_cv_header_tcl_h" >&6; }

16462

else

16463

# Is the header compilable?

16464

-echo "$as_me:$LINENO: checking tcl.h usability" >&5

16465

-echo $ECHO_N "checking tcl.h usability... $ECHO_C" >&6

16466

+{ echo "$as_me:$LINENO: checking tcl.h usability" >&5

16467

+echo $ECHO_N "checking tcl.h usability... $ECHO_C" >&6; }

16468

cat >conftest.$ac_ext <<_ACEOF

16469

/* confdefs.h. */

16470

_ACEOF

16471

@@ -26425,41 +26787,37 @@

16472

#include <tcl.h>

16473

_ACEOF

16474

rm -f conftest.$ac_objext

16475

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

16476

- (eval $ac_compile) 2>conftest.er1

16477

+if { (ac_try="$ac_compile"

16478

+case "(($ac_try" in

16479

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

16480

+ *) ac_try_echo=$ac_try;;

16481

+esac

16482

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

16483

+ (eval "$ac_compile") 2>conftest.er1

16484

ac_status=$?

16485

grep -v '^ *+' conftest.er1 >conftest.err

16486

rm -f conftest.er1

16487

cat conftest.err >&5

16488

echo "$as_me:$LINENO: \$? = $ac_status" >&5

16489

- (exit $ac_status); } &&

16490

- { ac_try='test -z "$ac_c_werror_flag"

16491

- || test ! -s conftest.err'

16492

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

16493

- (eval $ac_try) 2>&5

16494

- ac_status=$?

16495

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

16496

- (exit $ac_status); }; } &&

16497

- { ac_try='test -s conftest.$ac_objext'

16498

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

16499

- (eval $ac_try) 2>&5

16500

- ac_status=$?

16501

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

16502

- (exit $ac_status); }; }; then

16503

+ (exit $ac_status); } && {

16504

+ test -z "$ac_c_werror_flag" ||

16505

+ test ! -s conftest.err

16506

+ } && test -s conftest.$ac_objext; then

16507

ac_header_compiler=yes

16508

else

16509

echo "$as_me: failed program was:" >&5

16510

sed 's/^/| /' conftest.$ac_ext >&5

16511

16512

-ac_header_compiler=no

16513

+ ac_header_compiler=no

16514

16515

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

16516

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

16517

-echo "${ECHO_T}$ac_header_compiler" >&6

16518

16519

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

16520

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

16521

+echo "${ECHO_T}$ac_header_compiler" >&6; }

16522

16523

# Is the header present?

16524

-echo "$as_me:$LINENO: checking tcl.h presence" >&5

16525

-echo $ECHO_N "checking tcl.h presence... $ECHO_C" >&6

16526

+{ echo "$as_me:$LINENO: checking tcl.h presence" >&5

16527

+echo $ECHO_N "checking tcl.h presence... $ECHO_C" >&6; }

16528

cat >conftest.$ac_ext <<_ACEOF

16529

/* confdefs.h. */

16530

_ACEOF

16531

@@ -26468,24 +26826,22 @@

16532

/* end confdefs.h. */

16533

#include <tcl.h>

16534

_ACEOF

16535

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

16536

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

16537

+if { (ac_try="$ac_cpp conftest.$ac_ext"

16538

+case "(($ac_try" in

16539

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

16540

+ *) ac_try_echo=$ac_try;;

16541

+esac

16542

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

16543

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

16544

ac_status=$?

16545

grep -v '^ *+' conftest.er1 >conftest.err

16546

rm -f conftest.er1

16547

cat conftest.err >&5

16548

echo "$as_me:$LINENO: \$? = $ac_status" >&5

16549

- (exit $ac_status); } >/dev/null; then

16550

- if test -s conftest.err; then

16551

- ac_cpp_err=$ac_c_preproc_warn_flag

16552

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

16553

- else

16554

- ac_cpp_err=

16555

- fi

16556

-else

16557

- ac_cpp_err=yes

16558

-fi

16559

-if test -z "$ac_cpp_err"; then

16560

+ (exit $ac_status); } >/dev/null && {

16561

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

16562

+ test ! -s conftest.err

16563

+ }; then

16564

ac_header_preproc=yes

16565

else

16566

echo "$as_me: failed program was:" >&5

16567

@@ -26493,9 +26849,10 @@

16568

16569

ac_header_preproc=no

16570

16571

16572

rm -f conftest.err conftest.$ac_ext

16573

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

16574

-echo "${ECHO_T}$ac_header_preproc" >&6

16575

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

16576

+echo "${ECHO_T}$ac_header_preproc" >&6; }

16577

16578

# So? What about this header?

16579

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

16580

@@ -26519,25 +26876,18 @@

16581

echo "$as_me: WARNING: tcl.h: proceeding with the preprocessor's result" >&2;}

16582

{ echo "$as_me:$LINENO: WARNING: tcl.h: in the future, the compiler will take precedence" >&5

16583

echo "$as_me: WARNING: tcl.h: in the future, the compiler will take precedence" >&2;}

16584

- (

16585

- cat <<\_ASBOX

16586

-## ----------------------------------- ##

16587

-## Report this to the graphviz lists. ##

16588

-## ----------------------------------- ##

16589

-_ASBOX

16590

- ) |

16591

- sed "s/^/$as_me: WARNING: /" >&2

16592

16593

;;

16594

esac

16595

-echo "$as_me:$LINENO: checking for tcl.h" >&5

16596

-echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6

16597

+{ echo "$as_me:$LINENO: checking for tcl.h" >&5

16598

+echo $ECHO_N "checking for tcl.h... $ECHO_C" >&6; }

16599

if test "${ac_cv_header_tcl_h+set}" = set; then

16600

echo $ECHO_N "(cached) $ECHO_C" >&6

16601

else

16602

ac_cv_header_tcl_h=$ac_header_preproc

16603

16604

-echo "$as_me:$LINENO: result: $ac_cv_header_tcl_h" >&5

16605

-echo "${ECHO_T}$ac_cv_header_tcl_h" >&6

16606

+{ echo "$as_me:$LINENO: result: $ac_cv_header_tcl_h" >&5

16607

+echo "${ECHO_T}$ac_cv_header_tcl_h" >&6; }

16608

16609

16610

if test $ac_cv_header_tcl_h = yes; then

16611

@@ -26568,8 +26918,8 @@

16612

16613

16614

if test "x$TCLCONFIG" != "x"; then

16615

- echo "$as_me:$LINENO: result: using $TCLCONFIG" >&5

16616

-echo "${ECHO_T}using $TCLCONFIG" >&6

16617

+ { echo "$as_me:$LINENO: result: using $TCLCONFIG" >&5

16618

+echo "${ECHO_T}using $TCLCONFIG" >&6; }

16619

file=${TCLCONFIG}

16620

. $file

16621

else

16622

@@ -26668,16 +27018,16 @@

16623

16624

if test "$HAVE_TK" = "1"; then

16625

16626

-# Check whether --with-wish or --without-wish was given.

16627

+# Check whether --with-wish was given.

16628

if test "${with_wish+set}" = set; then

16629

- withval="$with_wish"

16630

- WISH=$withval

16631

-fi;

16632

+ withval=$with_wish; WISH=$withval

16633

+fi

16634

16635

if test "x$WISH" = "x"; then

16636

# Extract the first word of "wish8.4", so it can be a program name with args.

16637

set dummy wish8.4; ac_word=$2

16638

-echo "$as_me:$LINENO: checking for $ac_word" >&5

16639

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

16640

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

16641

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

16642

if test "${ac_cv_path_WISH+set}" = set; then

16643

echo $ECHO_N "(cached) $ECHO_C" >&6

16644

else

16645

@@ -26692,32 +27042,33 @@

16646

IFS=$as_save_IFS

16647

test -z "$as_dir" && as_dir=.

16648

for ac_exec_ext in '' $ac_executable_extensions; do

16649

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

16650

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

16651

ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext"

16652

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16653

break 2

16654

16655

done

16656

done

16657

+IFS=$as_save_IFS

16658

16659

;;

16660

esac

16661

16662

WISH=$ac_cv_path_WISH

16663

16664

if test -n "$WISH"; then

16665

- echo "$as_me:$LINENO: result: $WISH" >&5

16666

-echo "${ECHO_T}$WISH" >&6

16667

+ { echo "$as_me:$LINENO: result: $WISH" >&5

16668

+echo "${ECHO_T}$WISH" >&6; }

16669

else

16670

- echo "$as_me:$LINENO: result: no" >&5

16671

-echo "${ECHO_T}no" >&6

16672

+ { echo "$as_me:$LINENO: result: no" >&5

16673

+echo "${ECHO_T}no" >&6; }

16674

16675

16676

16677

if test "x$WISH" = "x"; then

16678

# Extract the first word of "wish8.3", so it can be a program name with args.

16679

set dummy wish8.3; ac_word=$2

16680

-echo "$as_me:$LINENO: checking for $ac_word" >&5

16681

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

16682

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

16683

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

16684

if test "${ac_cv_path_WISH+set}" = set; then

16685

echo $ECHO_N "(cached) $ECHO_C" >&6

16686

else

16687

@@ -26732,32 +27083,33 @@

16688

IFS=$as_save_IFS

16689

test -z "$as_dir" && as_dir=.

16690

for ac_exec_ext in '' $ac_executable_extensions; do

16691

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

16692

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

16693

ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext"

16694

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16695

break 2

16696

16697

done

16698

done

16699

+IFS=$as_save_IFS

16700

16701

;;

16702

esac

16703

16704

WISH=$ac_cv_path_WISH

16705

16706

if test -n "$WISH"; then

16707

- echo "$as_me:$LINENO: result: $WISH" >&5

16708

-echo "${ECHO_T}$WISH" >&6

16709

+ { echo "$as_me:$LINENO: result: $WISH" >&5

16710

+echo "${ECHO_T}$WISH" >&6; }

16711

else

16712

- echo "$as_me:$LINENO: result: no" >&5

16713

-echo "${ECHO_T}no" >&6

16714

+ { echo "$as_me:$LINENO: result: no" >&5

16715

+echo "${ECHO_T}no" >&6; }

16716

16717

16718

16719

if test "x$WISH" = "x"; then

16720

# Extract the first word of "wish", so it can be a program name with args.

16721

set dummy wish; ac_word=$2

16722

-echo "$as_me:$LINENO: checking for $ac_word" >&5

16723

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

16724

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

16725

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

16726

if test "${ac_cv_path_WISH+set}" = set; then

16727

echo $ECHO_N "(cached) $ECHO_C" >&6

16728

else

16729

@@ -26772,27 +27124,28 @@

16730

IFS=$as_save_IFS

16731

test -z "$as_dir" && as_dir=.

16732

for ac_exec_ext in '' $ac_executable_extensions; do

16733

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

16734

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

16735

ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext"

16736

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16737

break 2

16738

16739

done

16740

done

16741

+IFS=$as_save_IFS

16742

16743

;;

16744

esac

16745

16746

WISH=$ac_cv_path_WISH

16747

16748

if test -n "$WISH"; then

16749

- echo "$as_me:$LINENO: result: $WISH" >&5

16750

-echo "${ECHO_T}$WISH" >&6

16751

+ { echo "$as_me:$LINENO: result: $WISH" >&5

16752

+echo "${ECHO_T}$WISH" >&6; }

16753

else

16754

- echo "$as_me:$LINENO: result: no" >&5

16755

-echo "${ECHO_T}no" >&6

16756

+ { echo "$as_me:$LINENO: result: no" >&5

16757

+echo "${ECHO_T}no" >&6; }

16758

16759

16760

16761

16762

16763

16764

@@ -26822,24 +27175,24 @@

16765

16766

16767

if test "x$TK_INCLUDES" != "x" ; then

16768

- echo "$as_me:$LINENO: result: using tk headers from $TK_INCLUDES" >&5

16769

-echo "${ECHO_T}using tk headers from $TK_INCLUDES" >&6

16770

+ { echo "$as_me:$LINENO: result: using tk headers from $TK_INCLUDES" >&5

16771

+echo "${ECHO_T}using tk headers from $TK_INCLUDES" >&6; }

16772

16773

16774

save_CPPFLAGS=$CPPFLAGS

16775

CPPFLAGS="$CPPFLAGS $TCL_INCLUDES $TK_INCLUDES $X_CFLAGS"

16776

if test "${ac_cv_header_tk_h+set}" = set; then

16777

- echo "$as_me:$LINENO: checking for tk.h" >&5

16778

-echo $ECHO_N "checking for tk.h... $ECHO_C" >&6

16779

+ { echo "$as_me:$LINENO: checking for tk.h" >&5

16780

+echo $ECHO_N "checking for tk.h... $ECHO_C" >&6; }

16781

if test "${ac_cv_header_tk_h+set}" = set; then

16782

echo $ECHO_N "(cached) $ECHO_C" >&6

16783

16784

-echo "$as_me:$LINENO: result: $ac_cv_header_tk_h" >&5

16785

-echo "${ECHO_T}$ac_cv_header_tk_h" >&6

16786

+{ echo "$as_me:$LINENO: result: $ac_cv_header_tk_h" >&5

16787

+echo "${ECHO_T}$ac_cv_header_tk_h" >&6; }

16788

else

16789

# Is the header compilable?

16790

-echo "$as_me:$LINENO: checking tk.h usability" >&5

16791

-echo $ECHO_N "checking tk.h usability... $ECHO_C" >&6

16792

+{ echo "$as_me:$LINENO: checking tk.h usability" >&5

16793

+echo $ECHO_N "checking tk.h usability... $ECHO_C" >&6; }

16794

cat >conftest.$ac_ext <<_ACEOF

16795

/* confdefs.h. */

16796

_ACEOF

16797

@@ -26850,41 +27203,37 @@

16798

#include <tk.h>

16799

_ACEOF

16800

rm -f conftest.$ac_objext

16801

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

16802

- (eval $ac_compile) 2>conftest.er1

16803

+if { (ac_try="$ac_compile"

16804

+case "(($ac_try" in

16805

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

16806

+ *) ac_try_echo=$ac_try;;

16807

+esac

16808

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

16809

+ (eval "$ac_compile") 2>conftest.er1

16810

ac_status=$?

16811

grep -v '^ *+' conftest.er1 >conftest.err

16812

rm -f conftest.er1

16813

cat conftest.err >&5

16814

echo "$as_me:$LINENO: \$? = $ac_status" >&5

16815

- (exit $ac_status); } &&

16816

- { ac_try='test -z "$ac_c_werror_flag"

16817

- || test ! -s conftest.err'

16818

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

16819

- (eval $ac_try) 2>&5

16820

- ac_status=$?

16821

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

16822

- (exit $ac_status); }; } &&

16823

- { ac_try='test -s conftest.$ac_objext'

16824

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

16825

- (eval $ac_try) 2>&5

16826

- ac_status=$?

16827

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

16828

- (exit $ac_status); }; }; then

16829

+ (exit $ac_status); } && {

16830

+ test -z "$ac_c_werror_flag" ||

16831

+ test ! -s conftest.err

16832

+ } && test -s conftest.$ac_objext; then

16833

ac_header_compiler=yes

16834

else

16835

echo "$as_me: failed program was:" >&5

16836

sed 's/^/| /' conftest.$ac_ext >&5

16837

16838

-ac_header_compiler=no

16839

+ ac_header_compiler=no

16840

16841

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

16842

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

16843

-echo "${ECHO_T}$ac_header_compiler" >&6

16844

16845

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

16846

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

16847

+echo "${ECHO_T}$ac_header_compiler" >&6; }

16848

16849

# Is the header present?

16850

-echo "$as_me:$LINENO: checking tk.h presence" >&5

16851

-echo $ECHO_N "checking tk.h presence... $ECHO_C" >&6

16852

+{ echo "$as_me:$LINENO: checking tk.h presence" >&5

16853

+echo $ECHO_N "checking tk.h presence... $ECHO_C" >&6; }

16854

cat >conftest.$ac_ext <<_ACEOF

16855

/* confdefs.h. */

16856

_ACEOF

16857

@@ -26893,24 +27242,22 @@

16858

/* end confdefs.h. */

16859

#include <tk.h>

16860

_ACEOF

16861

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

16862

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

16863

+if { (ac_try="$ac_cpp conftest.$ac_ext"

16864

+case "(($ac_try" in

16865

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

16866

+ *) ac_try_echo=$ac_try;;

16867

+esac

16868

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

16869

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

16870

ac_status=$?

16871

grep -v '^ *+' conftest.er1 >conftest.err

16872

rm -f conftest.er1

16873

cat conftest.err >&5

16874

echo "$as_me:$LINENO: \$? = $ac_status" >&5

16875

- (exit $ac_status); } >/dev/null; then

16876

- if test -s conftest.err; then

16877

- ac_cpp_err=$ac_c_preproc_warn_flag

16878

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

16879

- else

16880

- ac_cpp_err=

16881

- fi

16882

-else

16883

- ac_cpp_err=yes

16884

-fi

16885

-if test -z "$ac_cpp_err"; then

16886

+ (exit $ac_status); } >/dev/null && {

16887

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

16888

+ test ! -s conftest.err

16889

+ }; then

16890

ac_header_preproc=yes

16891

else

16892

echo "$as_me: failed program was:" >&5

16893

@@ -26918,9 +27265,10 @@

16894

16895

ac_header_preproc=no

16896

16897

16898

rm -f conftest.err conftest.$ac_ext

16899

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

16900

-echo "${ECHO_T}$ac_header_preproc" >&6

16901

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

16902

+echo "${ECHO_T}$ac_header_preproc" >&6; }

16903

16904

# So? What about this header?

16905

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

16906

@@ -26944,25 +27292,18 @@

16907

echo "$as_me: WARNING: tk.h: proceeding with the preprocessor's result" >&2;}

16908

{ echo "$as_me:$LINENO: WARNING: tk.h: in the future, the compiler will take precedence" >&5

16909

echo "$as_me: WARNING: tk.h: in the future, the compiler will take precedence" >&2;}

16910

- (

16911

- cat <<\_ASBOX

16912

-## ----------------------------------- ##

16913

-## Report this to the graphviz lists. ##

16914

-## ----------------------------------- ##

16915

-_ASBOX

16916

- ) |

16917

- sed "s/^/$as_me: WARNING: /" >&2

16918

16919

;;

16920

esac

16921

-echo "$as_me:$LINENO: checking for tk.h" >&5

16922

-echo $ECHO_N "checking for tk.h... $ECHO_C" >&6

16923

+{ echo "$as_me:$LINENO: checking for tk.h" >&5

16924

+echo $ECHO_N "checking for tk.h... $ECHO_C" >&6; }

16925

if test "${ac_cv_header_tk_h+set}" = set; then

16926

echo $ECHO_N "(cached) $ECHO_C" >&6

16927

else

16928

ac_cv_header_tk_h=$ac_header_preproc

16929

16930

-echo "$as_me:$LINENO: result: $ac_cv_header_tk_h" >&5

16931

-echo "${ECHO_T}$ac_cv_header_tk_h" >&6

16932

+{ echo "$as_me:$LINENO: result: $ac_cv_header_tk_h" >&5

16933

+echo "${ECHO_T}$ac_cv_header_tk_h" >&6; }

16934

16935

16936

if test $ac_cv_header_tk_h = yes; then

16937

@@ -26980,18 +27321,19 @@

16938

for ac_header in tk.h tkInt.h

16939

16940

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

16941

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

16942

- echo "$as_me:$LINENO: checking for $ac_header" >&5

16943

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

16944

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

16945

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

16946

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

16947

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

16948

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

16949

echo $ECHO_N "(cached) $ECHO_C" >&6

16950

16951

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

16952

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

16953

+ac_res=`eval echo '${'$as_ac_Header'}'`

16954

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

16955

+echo "${ECHO_T}$ac_res" >&6; }

16956

else

16957

# Is the header compilable?

16958

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

16959

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

16960

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

16961

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

16962

cat >conftest.$ac_ext <<_ACEOF

16963

/* confdefs.h. */

16964

_ACEOF

16965

@@ -27002,41 +27344,37 @@

16966

#include <$ac_header>

16967

_ACEOF

16968

rm -f conftest.$ac_objext

16969

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

16970

- (eval $ac_compile) 2>conftest.er1

16971

+if { (ac_try="$ac_compile"

16972

+case "(($ac_try" in

16973

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

16974

+ *) ac_try_echo=$ac_try;;

16975

+esac

16976

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

16977

+ (eval "$ac_compile") 2>conftest.er1

16978

ac_status=$?

16979

grep -v '^ *+' conftest.er1 >conftest.err

16980

rm -f conftest.er1

16981

cat conftest.err >&5

16982

echo "$as_me:$LINENO: \$? = $ac_status" >&5

16983

- (exit $ac_status); } &&

16984

- { ac_try='test -z "$ac_c_werror_flag"

16985

- || test ! -s conftest.err'

16986

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

16987

- (eval $ac_try) 2>&5

16988

- ac_status=$?

16989

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

16990

- (exit $ac_status); }; } &&

16991

- { ac_try='test -s conftest.$ac_objext'

16992

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

16993

- (eval $ac_try) 2>&5

16994

- ac_status=$?

16995

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

16996

- (exit $ac_status); }; }; then

16997

+ (exit $ac_status); } && {

16998

+ test -z "$ac_c_werror_flag" ||

16999

+ test ! -s conftest.err

17000

+ } && test -s conftest.$ac_objext; then

17001

ac_header_compiler=yes

17002

else

17003

echo "$as_me: failed program was:" >&5

17004

sed 's/^/| /' conftest.$ac_ext >&5

17005

17006

-ac_header_compiler=no

17007

+ ac_header_compiler=no

17008

17009

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

17010

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

17011

-echo "${ECHO_T}$ac_header_compiler" >&6

17012

17013

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

17014

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

17015

+echo "${ECHO_T}$ac_header_compiler" >&6; }

17016

17017

# Is the header present?

17018

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

17019

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

17020

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

17021

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

17022

cat >conftest.$ac_ext <<_ACEOF

17023

/* confdefs.h. */

17024

_ACEOF

17025

@@ -27045,24 +27383,22 @@

17026

/* end confdefs.h. */

17027

#include <$ac_header>

17028

_ACEOF

17029

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

17030

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

17031

+if { (ac_try="$ac_cpp conftest.$ac_ext"

17032

+case "(($ac_try" in

17033

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

17034

+ *) ac_try_echo=$ac_try;;

17035

+esac

17036

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

17037

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

17038

ac_status=$?

17039

grep -v '^ *+' conftest.er1 >conftest.err

17040

rm -f conftest.er1

17041

cat conftest.err >&5

17042

echo "$as_me:$LINENO: \$? = $ac_status" >&5

17043

- (exit $ac_status); } >/dev/null; then

17044

- if test -s conftest.err; then

17045

- ac_cpp_err=$ac_c_preproc_warn_flag

17046

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

17047

- else

17048

- ac_cpp_err=

17049

- fi

17050

-else

17051

- ac_cpp_err=yes

17052

-fi

17053

-if test -z "$ac_cpp_err"; then

17054

+ (exit $ac_status); } >/dev/null && {

17055

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

17056

+ test ! -s conftest.err

17057

+ }; then

17058

ac_header_preproc=yes

17059

else

17060

echo "$as_me: failed program was:" >&5

17061

@@ -27070,9 +27406,10 @@

17062

17063

ac_header_preproc=no

17064

17065

17066

rm -f conftest.err conftest.$ac_ext

17067

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

17068

-echo "${ECHO_T}$ac_header_preproc" >&6

17069

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

17070

+echo "${ECHO_T}$ac_header_preproc" >&6; }

17071

17072

# So? What about this header?

17073

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

17074

@@ -27096,25 +27433,19 @@

17075

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

17076

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

17077

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

17078

- (

17079

- cat <<\_ASBOX

17080

-## ----------------------------------- ##

17081

-## Report this to the graphviz lists. ##

17082

-## ----------------------------------- ##

17083

-_ASBOX

17084

- ) |

17085

- sed "s/^/$as_me: WARNING: /" >&2

17086

17087

;;

17088

esac

17089

-echo "$as_me:$LINENO: checking for $ac_header" >&5

17090

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

17091

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

17092

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

17093

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

17094

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

17095

echo $ECHO_N "(cached) $ECHO_C" >&6

17096

else

17097

eval "$as_ac_Header=\$ac_header_preproc"

17098

17099

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

17100

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

17101

+ac_res=`eval echo '${'$as_ac_Header'}'`

17102

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

17103

+echo "${ECHO_T}$ac_res" >&6; }

17104

17105

17106

if test `eval echo '${'$as_ac_Header'}'` = yes; then

17107

@@ -27145,8 +27476,8 @@

17108

17109

17110

if test "x$TKCONFIG" != "x"; then

17111

- echo "$as_me:$LINENO: result: using $TKCONFIG" >&5

17112

-echo "${ECHO_T}using $TKCONFIG" >&6

17113

+ { echo "$as_me:$LINENO: result: using $TKCONFIG" >&5

17114

+echo "${ECHO_T}using $TKCONFIG" >&6; }

17115

file=${TKCONFIG}

17116

. $file

17117

else

17118

@@ -27204,26 +27535,26 @@

17119

17120

17121

17122

-# Check whether --with-extraincludedir or --without-extraincludedir was given.

17123

+# Check whether --with-extraincludedir was given.

17124

if test "${with_extraincludedir+set}" = set; then

17125

- withval="$with_extraincludedir"

17126

- EXTRAINCLUDEDIR=$withval

17127

+ withval=$with_extraincludedir; EXTRAINCLUDEDIR=$withval

17128

CPPFLAGS="$CPPFLAGS -I$withval"

17129

-fi;

17130

+fi

17131

17132

17133

-# Check whether --with-extralibdir or --without-extralibdir was given.

17134

17135

+# Check whether --with-extralibdir was given.

17136

if test "${with_extralibdir+set}" = set; then

17137

- withval="$with_extralibdir"

17138

- LDFLAGS="$LDFLAGS -L$withval"

17139

-fi;

17140

+ withval=$with_extralibdir; LDFLAGS="$LDFLAGS -L$withval"

17141

+fi

17142

17143

17144

17145

save_LIBS=$LIBS

17146

LIBS=

17147

tk_checkBoth=0

17148

-echo "$as_me:$LINENO: checking for connect" >&5

17149

-echo $ECHO_N "checking for connect... $ECHO_C" >&6

17150

+{ echo "$as_me:$LINENO: checking for connect" >&5

17151

+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }

17152

if test "${ac_cv_func_connect+set}" = set; then

17153

echo $ECHO_N "(cached) $ECHO_C" >&6

17154

else

17155

@@ -27250,68 +27581,59 @@

17156

17157

#undef connect

17158

17159

-/* Override any gcc2 internal prototype to avoid an error. */

17160

+/* Override any GCC internal prototype to avoid an error.

17161

+ Use char because int might match the return type of a GCC

17162

+ builtin and then its argument prototype would still apply. */

17163

#ifdef __cplusplus

17164

extern "C"

17165

17166

#endif

17167

-/* We use char because int might match the return type of a gcc2

17168

- builtin and then its argument prototype would still apply. */

17169

char connect ();

17170

/* The GNU C library defines this for functions which it implements

17171

to always fail with ENOSYS. Some functions are actually named

17172

something starting with __ and the normal name is an alias. */

17173

-#if defined (__stub_connect) || defined (__stub___connect)

17174

+#if defined __stub_connect || defined __stub___connect

17175

choke me

17176

-#else

17177

-char (*f) () = connect;

17178

-#endif

17179

-#ifdef __cplusplus

17180

17181

#endif

17182

17183

int

17184

main ()

17185

{

17186

-return f != connect;

17187

+return connect ();

17188

;

17189

return 0;

17190

}

17191

_ACEOF

17192

rm -f conftest.$ac_objext conftest$ac_exeext

17193

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

17194

- (eval $ac_link) 2>conftest.er1

17195

+if { (ac_try="$ac_link"

17196

+case "(($ac_try" in

17197

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

17198

+ *) ac_try_echo=$ac_try;;

17199

+esac

17200

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

17201

+ (eval "$ac_link") 2>conftest.er1

17202

ac_status=$?

17203

grep -v '^ *+' conftest.er1 >conftest.err

17204

rm -f conftest.er1

17205

cat conftest.err >&5

17206

echo "$as_me:$LINENO: \$? = $ac_status" >&5

17207

- (exit $ac_status); } &&

17208

- { ac_try='test -z "$ac_c_werror_flag"

17209

- || test ! -s conftest.err'

17210

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17211

- (eval $ac_try) 2>&5

17212

- ac_status=$?

17213

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17214

- (exit $ac_status); }; } &&

17215

- { ac_try='test -s conftest$ac_exeext'

17216

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17217

- (eval $ac_try) 2>&5

17218

- ac_status=$?

17219

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17220

- (exit $ac_status); }; }; then

17221

+ (exit $ac_status); } && {

17222

+ test -z "$ac_c_werror_flag" ||

17223

+ test ! -s conftest.err

17224

+ } && test -s conftest$ac_exeext &&

17225

+ $as_test_x conftest$ac_exeext; then

17226

ac_cv_func_connect=yes

17227

else

17228

echo "$as_me: failed program was:" >&5

17229

sed 's/^/| /' conftest.$ac_ext >&5

17230

17231

-ac_cv_func_connect=no

17232

+ ac_cv_func_connect=no

17233

17234

-rm -f conftest.err conftest.$ac_objext \

17235

17236

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

17237

conftest$ac_exeext conftest.$ac_ext

17238

17239

-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5

17240

-echo "${ECHO_T}$ac_cv_func_connect" >&6

17241

+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5

17242

+echo "${ECHO_T}$ac_cv_func_connect" >&6; }

17243

if test $ac_cv_func_connect = yes; then

17244

tk_checkSocket=0

17245

else

17246

@@ -27319,8 +27641,8 @@

17247

17248

17249

if test "$tk_checkSocket" = 1; then

17250

- echo "$as_me:$LINENO: checking for main in -lsocket" >&5

17251

-echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6

17252

+ { echo "$as_me:$LINENO: checking for main in -lsocket" >&5

17253

+echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6; }

17254

if test "${ac_cv_lib_socket_main+set}" = set; then

17255

echo $ECHO_N "(cached) $ECHO_C" >&6

17256

else

17257

@@ -27337,46 +27659,43 @@

17258

int

17259

main ()

17260

{

17261

-main ();

17262

+return main ();

17263

;

17264

return 0;

17265

}

17266

_ACEOF

17267

rm -f conftest.$ac_objext conftest$ac_exeext

17268

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

17269

- (eval $ac_link) 2>conftest.er1

17270

+if { (ac_try="$ac_link"

17271

+case "(($ac_try" in

17272

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

17273

+ *) ac_try_echo=$ac_try;;

17274

+esac

17275

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

17276

+ (eval "$ac_link") 2>conftest.er1

17277

ac_status=$?

17278

grep -v '^ *+' conftest.er1 >conftest.err

17279

rm -f conftest.er1

17280

cat conftest.err >&5

17281

echo "$as_me:$LINENO: \$? = $ac_status" >&5

17282

- (exit $ac_status); } &&

17283

- { ac_try='test -z "$ac_c_werror_flag"

17284

- || test ! -s conftest.err'

17285

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17286

- (eval $ac_try) 2>&5

17287

- ac_status=$?

17288

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17289

- (exit $ac_status); }; } &&

17290

- { ac_try='test -s conftest$ac_exeext'

17291

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17292

- (eval $ac_try) 2>&5

17293

- ac_status=$?

17294

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17295

- (exit $ac_status); }; }; then

17296

+ (exit $ac_status); } && {

17297

+ test -z "$ac_c_werror_flag" ||

17298

+ test ! -s conftest.err

17299

+ } && test -s conftest$ac_exeext &&

17300

+ $as_test_x conftest$ac_exeext; then

17301

ac_cv_lib_socket_main=yes

17302

else

17303

echo "$as_me: failed program was:" >&5

17304

sed 's/^/| /' conftest.$ac_ext >&5

17305

17306

-ac_cv_lib_socket_main=no

17307

+ ac_cv_lib_socket_main=no

17308

17309

-rm -f conftest.err conftest.$ac_objext \

17310

17311

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

17312

conftest$ac_exeext conftest.$ac_ext

17313

LIBS=$ac_check_lib_save_LIBS

17314

17315

-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5

17316

-echo "${ECHO_T}$ac_cv_lib_socket_main" >&6

17317

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5

17318

+echo "${ECHO_T}$ac_cv_lib_socket_main" >&6; }

17319

if test $ac_cv_lib_socket_main = yes; then

17320

LIBS="$LIBS -lsocket"

17321

else

17322

@@ -27387,8 +27706,8 @@

17323

if test "$tk_checkBoth" = 1; then

17324

tk_oldLibs=$LIBS

17325

LIBS="$LIBS -lsocket -lnsl"

17326

- echo "$as_me:$LINENO: checking for accept" >&5

17327

-echo $ECHO_N "checking for accept... $ECHO_C" >&6

17328

+ { echo "$as_me:$LINENO: checking for accept" >&5

17329

+echo $ECHO_N "checking for accept... $ECHO_C" >&6; }

17330

if test "${ac_cv_func_accept+set}" = set; then

17331

echo $ECHO_N "(cached) $ECHO_C" >&6

17332

else

17333

@@ -27415,68 +27734,59 @@

17334

17335

#undef accept

17336

17337

-/* Override any gcc2 internal prototype to avoid an error. */

17338

+/* Override any GCC internal prototype to avoid an error.

17339

+ Use char because int might match the return type of a GCC

17340

+ builtin and then its argument prototype would still apply. */

17341

#ifdef __cplusplus

17342

extern "C"

17343

17344

#endif

17345

-/* We use char because int might match the return type of a gcc2

17346

- builtin and then its argument prototype would still apply. */

17347

char accept ();

17348

/* The GNU C library defines this for functions which it implements

17349

to always fail with ENOSYS. Some functions are actually named

17350

something starting with __ and the normal name is an alias. */

17351

-#if defined (__stub_accept) || defined (__stub___accept)

17352

+#if defined __stub_accept || defined __stub___accept

17353

choke me

17354

-#else

17355

-char (*f) () = accept;

17356

-#endif

17357

-#ifdef __cplusplus

17358

17359

#endif

17360

17361

int

17362

main ()

17363

{

17364

-return f != accept;

17365

+return accept ();

17366

;

17367

return 0;

17368

}

17369

_ACEOF

17370

rm -f conftest.$ac_objext conftest$ac_exeext

17371

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

17372

- (eval $ac_link) 2>conftest.er1

17373

+if { (ac_try="$ac_link"

17374

+case "(($ac_try" in

17375

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

17376

+ *) ac_try_echo=$ac_try;;

17377

+esac

17378

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

17379

+ (eval "$ac_link") 2>conftest.er1

17380

ac_status=$?

17381

grep -v '^ *+' conftest.er1 >conftest.err

17382

rm -f conftest.er1

17383

cat conftest.err >&5

17384

echo "$as_me:$LINENO: \$? = $ac_status" >&5

17385

- (exit $ac_status); } &&

17386

- { ac_try='test -z "$ac_c_werror_flag"

17387

- || test ! -s conftest.err'

17388

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17389

- (eval $ac_try) 2>&5

17390

- ac_status=$?

17391

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17392

- (exit $ac_status); }; } &&

17393

- { ac_try='test -s conftest$ac_exeext'

17394

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17395

- (eval $ac_try) 2>&5

17396

- ac_status=$?

17397

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17398

- (exit $ac_status); }; }; then

17399

+ (exit $ac_status); } && {

17400

+ test -z "$ac_c_werror_flag" ||

17401

+ test ! -s conftest.err

17402

+ } && test -s conftest$ac_exeext &&

17403

+ $as_test_x conftest$ac_exeext; then

17404

ac_cv_func_accept=yes

17405

else

17406

echo "$as_me: failed program was:" >&5

17407

sed 's/^/| /' conftest.$ac_ext >&5

17408

17409

-ac_cv_func_accept=no

17410

+ ac_cv_func_accept=no

17411

17412

-rm -f conftest.err conftest.$ac_objext \

17413

17414

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

17415

conftest$ac_exeext conftest.$ac_ext

17416

17417

-echo "$as_me:$LINENO: result: $ac_cv_func_accept" >&5

17418

-echo "${ECHO_T}$ac_cv_func_accept" >&6

17419

+{ echo "$as_me:$LINENO: result: $ac_cv_func_accept" >&5

17420

+echo "${ECHO_T}$ac_cv_func_accept" >&6; }

17421

if test $ac_cv_func_accept = yes; then

17422

tk_checkNsl=0

17423

else

17424

@@ -27484,8 +27794,8 @@

17425

17426

17427

17428

-echo "$as_me:$LINENO: checking for gethostbyname" >&5

17429

-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6

17430

+{ echo "$as_me:$LINENO: checking for gethostbyname" >&5

17431

+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }

17432

if test "${ac_cv_func_gethostbyname+set}" = set; then

17433

echo $ECHO_N "(cached) $ECHO_C" >&6

17434

else

17435

@@ -27512,73 +27822,64 @@

17436

17437

#undef gethostbyname

17438

17439

-/* Override any gcc2 internal prototype to avoid an error. */

17440

+/* Override any GCC internal prototype to avoid an error.

17441

+ Use char because int might match the return type of a GCC

17442

+ builtin and then its argument prototype would still apply. */

17443

#ifdef __cplusplus

17444

extern "C"

17445

17446

#endif

17447

-/* We use char because int might match the return type of a gcc2

17448

- builtin and then its argument prototype would still apply. */

17449

char gethostbyname ();

17450

/* The GNU C library defines this for functions which it implements

17451

to always fail with ENOSYS. Some functions are actually named

17452

something starting with __ and the normal name is an alias. */

17453

-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)

17454

+#if defined __stub_gethostbyname || defined __stub___gethostbyname

17455

choke me

17456

-#else

17457

-char (*f) () = gethostbyname;

17458

-#endif

17459

-#ifdef __cplusplus

17460

17461

#endif

17462

17463

int

17464

main ()

17465

{

17466

-return f != gethostbyname;

17467

+return gethostbyname ();

17468

;

17469

return 0;

17470

}

17471

_ACEOF

17472

rm -f conftest.$ac_objext conftest$ac_exeext

17473

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

17474

- (eval $ac_link) 2>conftest.er1

17475

+if { (ac_try="$ac_link"

17476

+case "(($ac_try" in

17477

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

17478

+ *) ac_try_echo=$ac_try;;

17479

+esac

17480

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

17481

+ (eval "$ac_link") 2>conftest.er1

17482

ac_status=$?

17483

grep -v '^ *+' conftest.er1 >conftest.err

17484

rm -f conftest.er1

17485

cat conftest.err >&5

17486

echo "$as_me:$LINENO: \$? = $ac_status" >&5

17487

- (exit $ac_status); } &&

17488

- { ac_try='test -z "$ac_c_werror_flag"

17489

- || test ! -s conftest.err'

17490

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17491

- (eval $ac_try) 2>&5

17492

- ac_status=$?

17493

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17494

- (exit $ac_status); }; } &&

17495

- { ac_try='test -s conftest$ac_exeext'

17496

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17497

- (eval $ac_try) 2>&5

17498

- ac_status=$?

17499

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17500

- (exit $ac_status); }; }; then

17501

+ (exit $ac_status); } && {

17502

+ test -z "$ac_c_werror_flag" ||

17503

+ test ! -s conftest.err

17504

+ } && test -s conftest$ac_exeext &&

17505

+ $as_test_x conftest$ac_exeext; then

17506

ac_cv_func_gethostbyname=yes

17507

else

17508

echo "$as_me: failed program was:" >&5

17509

sed 's/^/| /' conftest.$ac_ext >&5

17510

17511

-ac_cv_func_gethostbyname=no

17512

+ ac_cv_func_gethostbyname=no

17513

17514

-rm -f conftest.err conftest.$ac_objext \

17515

17516

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

17517

conftest$ac_exeext conftest.$ac_ext

17518

17519

-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5

17520

-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6

17521

+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5

17522

+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }

17523

if test $ac_cv_func_gethostbyname = yes; then

17524

17525

else

17526

- echo "$as_me:$LINENO: checking for main in -lnsl" >&5

17527

-echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6

17528

+ { echo "$as_me:$LINENO: checking for main in -lnsl" >&5

17529

+echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6; }

17530

if test "${ac_cv_lib_nsl_main+set}" = set; then

17531

echo $ECHO_N "(cached) $ECHO_C" >&6

17532

else

17533

@@ -27595,46 +27896,43 @@

17534

int

17535

main ()

17536

{

17537

-main ();

17538

+return main ();

17539

;

17540

return 0;

17541

}

17542

_ACEOF

17543

rm -f conftest.$ac_objext conftest$ac_exeext

17544

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

17545

- (eval $ac_link) 2>conftest.er1

17546

+if { (ac_try="$ac_link"

17547

+case "(($ac_try" in

17548

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

17549

+ *) ac_try_echo=$ac_try;;

17550

+esac

17551

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

17552

+ (eval "$ac_link") 2>conftest.er1

17553

ac_status=$?

17554

grep -v '^ *+' conftest.er1 >conftest.err

17555

rm -f conftest.er1

17556

cat conftest.err >&5

17557

echo "$as_me:$LINENO: \$? = $ac_status" >&5

17558

- (exit $ac_status); } &&

17559

- { ac_try='test -z "$ac_c_werror_flag"

17560

- || test ! -s conftest.err'

17561

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17562

- (eval $ac_try) 2>&5

17563

- ac_status=$?

17564

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17565

- (exit $ac_status); }; } &&

17566

- { ac_try='test -s conftest$ac_exeext'

17567

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17568

- (eval $ac_try) 2>&5

17569

- ac_status=$?

17570

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17571

- (exit $ac_status); }; }; then

17572

+ (exit $ac_status); } && {

17573

+ test -z "$ac_c_werror_flag" ||

17574

+ test ! -s conftest.err

17575

+ } && test -s conftest$ac_exeext &&

17576

+ $as_test_x conftest$ac_exeext; then

17577

ac_cv_lib_nsl_main=yes

17578

else

17579

echo "$as_me: failed program was:" >&5

17580

sed 's/^/| /' conftest.$ac_ext >&5

17581

17582

-ac_cv_lib_nsl_main=no

17583

+ ac_cv_lib_nsl_main=no

17584

17585

-rm -f conftest.err conftest.$ac_objext \

17586

17587

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

17588

conftest$ac_exeext conftest.$ac_ext

17589

LIBS=$ac_check_lib_save_LIBS

17590

17591

-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5

17592

-echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6

17593

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5

17594

+echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6; }

17595

if test $ac_cv_lib_nsl_main = yes; then

17596

LIBS="$LIBS -lnsl"

17597

17598

@@ -27650,8 +27948,8 @@

17599

save_LDFLAGS=$LDFLAGS

17600

# Extract the first word of "expat-config", so it can be a program name with args.

17601

set dummy expat-config; ac_word=$2

17602

-echo "$as_me:$LINENO: checking for $ac_word" >&5

17603

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

17604

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

17605

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

17606

if test "${ac_cv_path_EXPAT_CONFIG+set}" = set; then

17607

echo $ECHO_N "(cached) $ECHO_C" >&6

17608

else

17609

@@ -27666,27 +27964,28 @@

17610

IFS=$as_save_IFS

17611

test -z "$as_dir" && as_dir=.

17612

for ac_exec_ext in '' $ac_executable_extensions; do

17613

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

17614

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

17615

ac_cv_path_EXPAT_CONFIG="$as_dir/$ac_word$ac_exec_ext"

17616

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

17617

break 2

17618

17619

done

17620

done

17621

+IFS=$as_save_IFS

17622

17623

;;

17624

esac

17625

17626

EXPAT_CONFIG=$ac_cv_path_EXPAT_CONFIG

17627

17628

if test -n "$EXPAT_CONFIG"; then

17629

- echo "$as_me:$LINENO: result: $EXPAT_CONFIG" >&5

17630

-echo "${ECHO_T}$EXPAT_CONFIG" >&6

17631

+ { echo "$as_me:$LINENO: result: $EXPAT_CONFIG" >&5

17632

+echo "${ECHO_T}$EXPAT_CONFIG" >&6; }

17633

else

17634

- echo "$as_me:$LINENO: result: no" >&5

17635

-echo "${ECHO_T}no" >&6

17636

+ { echo "$as_me:$LINENO: result: no" >&5

17637

+echo "${ECHO_T}no" >&6; }

17638

17639

17640

17641

if test -n "$EXPAT_CONFIG"; then

17642

EXPAT_INCLUDES=`$EXPAT_CONFIG --cflags`

17643

EXPAT_PREFIX=`$EXPAT_CONFIG --prefix`

17644

@@ -27698,19 +27997,19 @@

17645

EXPAT_LIBS=""

17646

17647

17648

-# Check whether --with-expatincludedir or --without-expatincludedir was given.

17649

+# Check whether --with-expatincludedir was given.

17650

if test "${with_expatincludedir+set}" = set; then

17651

- withval="$with_expatincludedir"

17652

- EXPAT_INCLUDES="-I$withval"

17653

-fi;

17654

+ withval=$with_expatincludedir; EXPAT_INCLUDES="-I$withval"

17655

+fi

17656

17657

CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES"

17658

EXPAT_LIBDIR="/usr/lib$LIBPOSTFIX"

17659

17660

-# Check whether --with-expatlibdir or --without-expatlibdir was given.

17661

+# Check whether --with-expatlibdir was given.

17662

if test "${with_expatlibdir+set}" = set; then

17663

- withval="$with_expatlibdir"

17664

- EXPAT_LIBDIR="$withval"

17665

-fi;

17666

+ withval=$with_expatlibdir; EXPAT_LIBDIR="$withval"

17667

+fi

17668

17669

if test "$EXPAT_LIBDIR" != "/usr/lib$LIBPOSTFIX"; then

17670

EXPAT_LIBS="-L$EXPAT_LIBDIR"

17671

LDFLAGS="$LDFLAGS $EXPAT_LIBS"

17672

@@ -27719,17 +28018,17 @@

17673

EXPAT_LIBS="$EXPAT_LIBDIR/libexpat.la"

17674

17675

if test "${ac_cv_header_expat_h+set}" = set; then

17676

- echo "$as_me:$LINENO: checking for expat.h" >&5

17677

-echo $ECHO_N "checking for expat.h... $ECHO_C" >&6

17678

+ { echo "$as_me:$LINENO: checking for expat.h" >&5

17679

+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }

17680

if test "${ac_cv_header_expat_h+set}" = set; then

17681

echo $ECHO_N "(cached) $ECHO_C" >&6

17682

17683

-echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5

17684

-echo "${ECHO_T}$ac_cv_header_expat_h" >&6

17685

+{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5

17686

+echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }

17687

else

17688

# Is the header compilable?

17689

-echo "$as_me:$LINENO: checking expat.h usability" >&5

17690

-echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6

17691

+{ echo "$as_me:$LINENO: checking expat.h usability" >&5

17692

+echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6; }

17693

cat >conftest.$ac_ext <<_ACEOF

17694

/* confdefs.h. */

17695

_ACEOF

17696

@@ -27740,41 +28039,37 @@

17697

#include <expat.h>

17698

_ACEOF

17699

rm -f conftest.$ac_objext

17700

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

17701

- (eval $ac_compile) 2>conftest.er1

17702

+if { (ac_try="$ac_compile"

17703

+case "(($ac_try" in

17704

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

17705

+ *) ac_try_echo=$ac_try;;

17706

+esac

17707

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

17708

+ (eval "$ac_compile") 2>conftest.er1

17709

ac_status=$?

17710

grep -v '^ *+' conftest.er1 >conftest.err

17711

rm -f conftest.er1

17712

cat conftest.err >&5

17713

echo "$as_me:$LINENO: \$? = $ac_status" >&5

17714

- (exit $ac_status); } &&

17715

- { ac_try='test -z "$ac_c_werror_flag"

17716

- || test ! -s conftest.err'

17717

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17718

- (eval $ac_try) 2>&5

17719

- ac_status=$?

17720

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17721

- (exit $ac_status); }; } &&

17722

- { ac_try='test -s conftest.$ac_objext'

17723

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17724

- (eval $ac_try) 2>&5

17725

- ac_status=$?

17726

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17727

- (exit $ac_status); }; }; then

17728

+ (exit $ac_status); } && {

17729

+ test -z "$ac_c_werror_flag" ||

17730

+ test ! -s conftest.err

17731

+ } && test -s conftest.$ac_objext; then

17732

ac_header_compiler=yes

17733

else

17734

echo "$as_me: failed program was:" >&5

17735

sed 's/^/| /' conftest.$ac_ext >&5

17736

17737

-ac_header_compiler=no

17738

+ ac_header_compiler=no

17739

17740

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

17741

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

17742

-echo "${ECHO_T}$ac_header_compiler" >&6

17743

17744

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

17745

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

17746

+echo "${ECHO_T}$ac_header_compiler" >&6; }

17747

17748

# Is the header present?

17749

-echo "$as_me:$LINENO: checking expat.h presence" >&5

17750

-echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6

17751

+{ echo "$as_me:$LINENO: checking expat.h presence" >&5

17752

+echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6; }

17753

cat >conftest.$ac_ext <<_ACEOF

17754

/* confdefs.h. */

17755

_ACEOF

17756

@@ -27783,24 +28078,22 @@

17757

/* end confdefs.h. */

17758

#include <expat.h>

17759

_ACEOF

17760

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

17761

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

17762

+if { (ac_try="$ac_cpp conftest.$ac_ext"

17763

+case "(($ac_try" in

17764

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

17765

+ *) ac_try_echo=$ac_try;;

17766

+esac

17767

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

17768

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

17769

ac_status=$?

17770

grep -v '^ *+' conftest.er1 >conftest.err

17771

rm -f conftest.er1

17772

cat conftest.err >&5

17773

echo "$as_me:$LINENO: \$? = $ac_status" >&5

17774

- (exit $ac_status); } >/dev/null; then

17775

- if test -s conftest.err; then

17776

- ac_cpp_err=$ac_c_preproc_warn_flag

17777

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

17778

- else

17779

- ac_cpp_err=

17780

- fi

17781

-else

17782

- ac_cpp_err=yes

17783

-fi

17784

-if test -z "$ac_cpp_err"; then

17785

+ (exit $ac_status); } >/dev/null && {

17786

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

17787

+ test ! -s conftest.err

17788

+ }; then

17789

ac_header_preproc=yes

17790

else

17791

echo "$as_me: failed program was:" >&5

17792

@@ -27808,9 +28101,10 @@

17793

17794

ac_header_preproc=no

17795

17796

17797

rm -f conftest.err conftest.$ac_ext

17798

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

17799

-echo "${ECHO_T}$ac_header_preproc" >&6

17800

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

17801

+echo "${ECHO_T}$ac_header_preproc" >&6; }

17802

17803

# So? What about this header?

17804

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

17805

@@ -27834,30 +28128,23 @@

17806

echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}

17807

{ echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5

17808

echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;}

17809

- (

17810

- cat <<\_ASBOX

17811

-## ----------------------------------- ##

17812

-## Report this to the graphviz lists. ##

17813

-## ----------------------------------- ##

17814

-_ASBOX

17815

- ) |

17816

- sed "s/^/$as_me: WARNING: /" >&2

17817

17818

;;

17819

esac

17820

-echo "$as_me:$LINENO: checking for expat.h" >&5

17821

-echo $ECHO_N "checking for expat.h... $ECHO_C" >&6

17822

+{ echo "$as_me:$LINENO: checking for expat.h" >&5

17823

+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }

17824

if test "${ac_cv_header_expat_h+set}" = set; then

17825

echo $ECHO_N "(cached) $ECHO_C" >&6

17826

else

17827

ac_cv_header_expat_h=$ac_header_preproc

17828

17829

-echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5

17830

-echo "${ECHO_T}$ac_cv_header_expat_h" >&6

17831

+{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5

17832

+echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }

17833

17834

17835

if test $ac_cv_header_expat_h = yes; then

17836

- echo "$as_me:$LINENO: checking for main in -lexpat" >&5

17837

-echo $ECHO_N "checking for main in -lexpat... $ECHO_C" >&6

17838

+ { echo "$as_me:$LINENO: checking for main in -lexpat" >&5

17839

+echo $ECHO_N "checking for main in -lexpat... $ECHO_C" >&6; }

17840

if test "${ac_cv_lib_expat_main+set}" = set; then

17841

echo $ECHO_N "(cached) $ECHO_C" >&6

17842

else

17843

@@ -27874,46 +28161,43 @@

17844

int

17845

main ()

17846

{

17847

-main ();

17848

+return main ();

17849

;

17850

return 0;

17851

}

17852

_ACEOF

17853

rm -f conftest.$ac_objext conftest$ac_exeext

17854

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

17855

- (eval $ac_link) 2>conftest.er1

17856

+if { (ac_try="$ac_link"

17857

+case "(($ac_try" in

17858

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

17859

+ *) ac_try_echo=$ac_try;;

17860

+esac

17861

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

17862

+ (eval "$ac_link") 2>conftest.er1

17863

ac_status=$?

17864

grep -v '^ *+' conftest.er1 >conftest.err

17865

rm -f conftest.er1

17866

cat conftest.err >&5

17867

echo "$as_me:$LINENO: \$? = $ac_status" >&5

17868

- (exit $ac_status); } &&

17869

- { ac_try='test -z "$ac_c_werror_flag"

17870

- || test ! -s conftest.err'

17871

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17872

- (eval $ac_try) 2>&5

17873

- ac_status=$?

17874

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17875

- (exit $ac_status); }; } &&

17876

- { ac_try='test -s conftest$ac_exeext'

17877

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17878

- (eval $ac_try) 2>&5

17879

- ac_status=$?

17880

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17881

- (exit $ac_status); }; }; then

17882

+ (exit $ac_status); } && {

17883

+ test -z "$ac_c_werror_flag" ||

17884

+ test ! -s conftest.err

17885

+ } && test -s conftest$ac_exeext &&

17886

+ $as_test_x conftest$ac_exeext; then

17887

ac_cv_lib_expat_main=yes

17888

else

17889

echo "$as_me: failed program was:" >&5

17890

sed 's/^/| /' conftest.$ac_ext >&5

17891

17892

-ac_cv_lib_expat_main=no

17893

+ ac_cv_lib_expat_main=no

17894

17895

-rm -f conftest.err conftest.$ac_objext \

17896

17897

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

17898

conftest$ac_exeext conftest.$ac_ext

17899

LIBS=$ac_check_lib_save_LIBS

17900

17901

-echo "$as_me:$LINENO: result: $ac_cv_lib_expat_main" >&5

17902

-echo "${ECHO_T}$ac_cv_lib_expat_main" >&6

17903

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_main" >&5

17904

+echo "${ECHO_T}$ac_cv_lib_expat_main" >&6; }

17905

if test $ac_cv_lib_expat_main = yes; then

17906

EXPAT_LIBS="$EXPAT_LIBS -lexpat"

17907

17908

@@ -27946,21 +28230,21 @@

17909

save_CPPFLAGS=$CPPFLAGS

17910

save_LDFLAGS=$LDFLAGS

17911

17912

-# Check whether --with-Xpmincludedir or --without-Xpmincludedir was given.

17913

+# Check whether --with-Xpmincludedir was given.

17914

if test "${with_Xpmincludedir+set}" = set; then

17915

- withval="$with_Xpmincludedir"

17916

- XPM_INCLUDES="-I$withval"

17917

-fi;

17918

+ withval=$with_Xpmincludedir; XPM_INCLUDES="-I$withval"

17919

+fi

17920

17921

-# Check whether --with-Xpmlibdir or --without-Xpmlibdir was given.

17922

17923

+# Check whether --with-Xpmlibdir was given.

17924

if test "${with_Xpmlibdir+set}" = set; then

17925

- withval="$with_Xpmlibdir"

17926

- XPM_LIBS="-L$withval"

17927

-fi;

17928

+ withval=$with_Xpmlibdir; XPM_LIBS="-L$withval"

17929

+fi

17930

17931

CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"

17932

LDFLAGS="$LDFLAGS $XPM_LIBS $X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS $SOCKET_LIBS"

17933

-echo "$as_me:$LINENO: checking for main in -lXpm" >&5

17934

-echo $ECHO_N "checking for main in -lXpm... $ECHO_C" >&6

17935

+{ echo "$as_me:$LINENO: checking for main in -lXpm" >&5

17936

+echo $ECHO_N "checking for main in -lXpm... $ECHO_C" >&6; }

17937

if test "${ac_cv_lib_Xpm_main+set}" = set; then

17938

echo $ECHO_N "(cached) $ECHO_C" >&6

17939

else

17940

@@ -27977,46 +28261,43 @@

17941

int

17942

main ()

17943

{

17944

-main ();

17945

+return main ();

17946

;

17947

return 0;

17948

}

17949

_ACEOF

17950

rm -f conftest.$ac_objext conftest$ac_exeext

17951

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

17952

- (eval $ac_link) 2>conftest.er1

17953

+if { (ac_try="$ac_link"

17954

+case "(($ac_try" in

17955

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

17956

+ *) ac_try_echo=$ac_try;;

17957

+esac

17958

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

17959

+ (eval "$ac_link") 2>conftest.er1

17960

ac_status=$?

17961

grep -v '^ *+' conftest.er1 >conftest.err

17962

rm -f conftest.er1

17963

cat conftest.err >&5

17964

echo "$as_me:$LINENO: \$? = $ac_status" >&5

17965

- (exit $ac_status); } &&

17966

- { ac_try='test -z "$ac_c_werror_flag"

17967

- || test ! -s conftest.err'

17968

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17969

- (eval $ac_try) 2>&5

17970

- ac_status=$?

17971

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17972

- (exit $ac_status); }; } &&

17973

- { ac_try='test -s conftest$ac_exeext'

17974

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

17975

- (eval $ac_try) 2>&5

17976

- ac_status=$?

17977

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

17978

- (exit $ac_status); }; }; then

17979

+ (exit $ac_status); } && {

17980

+ test -z "$ac_c_werror_flag" ||

17981

+ test ! -s conftest.err

17982

+ } && test -s conftest$ac_exeext &&

17983

+ $as_test_x conftest$ac_exeext; then

17984

ac_cv_lib_Xpm_main=yes

17985

else

17986

echo "$as_me: failed program was:" >&5

17987

sed 's/^/| /' conftest.$ac_ext >&5

17988

17989

-ac_cv_lib_Xpm_main=no

17990

+ ac_cv_lib_Xpm_main=no

17991

17992

-rm -f conftest.err conftest.$ac_objext \

17993

17994

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

17995

conftest$ac_exeext conftest.$ac_ext

17996

LIBS=$ac_check_lib_save_LIBS

17997

17998

-echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_main" >&5

17999

-echo "${ECHO_T}$ac_cv_lib_Xpm_main" >&6

18000

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_main" >&5

18001

+echo "${ECHO_T}$ac_cv_lib_Xpm_main" >&6; }

18002

if test $ac_cv_lib_Xpm_main = yes; then

18003

XPM_LIBS="$XPM_LIBS -lXpm"

18004

18005

@@ -28038,35 +28319,36 @@

18006

save_CPPFLAGS=$CPPFLAGS

18007

save_LDFLAGS=$LDFLAGS

18008

18009

-# Check whether --with-Xawincludedir or --without-Xawincludedir was given.

18010

+# Check whether --with-Xawincludedir was given.

18011

if test "${with_Xawincludedir+set}" = set; then

18012

- withval="$with_Xawincludedir"

18013

- XAW_INCLUDES="-I$withval"

18014

-fi;

18015

+ withval=$with_Xawincludedir; XAW_INCLUDES="-I$withval"

18016

+fi

18017

18018

CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"

18019

18020

-# Check whether --with-Xawlibdir or --without-Xawlibdir was given.

18021

+# Check whether --with-Xawlibdir was given.

18022

if test "${with_Xawlibdir+set}" = set; then

18023

- withval="$with_Xawlibdir"

18024

- XAW_LIBS="-L$withval"

18025

-fi;

18026

+ withval=$with_Xawlibdir; XAW_LIBS="-L$withval"

18027

+fi

18028

18029

LDFLAGS="$LDFLAGS $XAW_LIBS $XPM_LIBS $X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS $SOCKET_LIBS"

18030

18031

for ac_header in X11/Intrinsic.h

18032

18033

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

18034

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

18035

- echo "$as_me:$LINENO: checking for $ac_header" >&5

18036

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

18037

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

18038

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

18039

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

18040

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

18041

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

18042

echo $ECHO_N "(cached) $ECHO_C" >&6

18043

18044

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

18045

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

18046

+ac_res=`eval echo '${'$as_ac_Header'}'`

18047

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

18048

+echo "${ECHO_T}$ac_res" >&6; }

18049

else

18050

# Is the header compilable?

18051

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

18052

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

18053

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

18054

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

18055

cat >conftest.$ac_ext <<_ACEOF

18056

/* confdefs.h. */

18057

_ACEOF

18058

@@ -28077,41 +28359,37 @@

18059

#include <$ac_header>

18060

_ACEOF

18061

rm -f conftest.$ac_objext

18062

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

18063

- (eval $ac_compile) 2>conftest.er1

18064

+if { (ac_try="$ac_compile"

18065

+case "(($ac_try" in

18066

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

18067

+ *) ac_try_echo=$ac_try;;

18068

+esac

18069

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

18070

+ (eval "$ac_compile") 2>conftest.er1

18071

ac_status=$?

18072

grep -v '^ *+' conftest.er1 >conftest.err

18073

rm -f conftest.er1

18074

cat conftest.err >&5

18075

echo "$as_me:$LINENO: \$? = $ac_status" >&5

18076

- (exit $ac_status); } &&

18077

- { ac_try='test -z "$ac_c_werror_flag"

18078

- || test ! -s conftest.err'

18079

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18080

- (eval $ac_try) 2>&5

18081

- ac_status=$?

18082

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18083

- (exit $ac_status); }; } &&

18084

- { ac_try='test -s conftest.$ac_objext'

18085

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18086

- (eval $ac_try) 2>&5

18087

- ac_status=$?

18088

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18089

- (exit $ac_status); }; }; then

18090

+ (exit $ac_status); } && {

18091

+ test -z "$ac_c_werror_flag" ||

18092

+ test ! -s conftest.err

18093

+ } && test -s conftest.$ac_objext; then

18094

ac_header_compiler=yes

18095

else

18096

echo "$as_me: failed program was:" >&5

18097

sed 's/^/| /' conftest.$ac_ext >&5

18098

18099

-ac_header_compiler=no

18100

+ ac_header_compiler=no

18101

18102

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

18103

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

18104

-echo "${ECHO_T}$ac_header_compiler" >&6

18105

18106

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

18107

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

18108

+echo "${ECHO_T}$ac_header_compiler" >&6; }

18109

18110

# Is the header present?

18111

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

18112

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

18113

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

18114

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

18115

cat >conftest.$ac_ext <<_ACEOF

18116

/* confdefs.h. */

18117

_ACEOF

18118

@@ -28120,24 +28398,22 @@

18119

/* end confdefs.h. */

18120

#include <$ac_header>

18121

_ACEOF

18122

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

18123

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

18124

+if { (ac_try="$ac_cpp conftest.$ac_ext"

18125

+case "(($ac_try" in

18126

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

18127

+ *) ac_try_echo=$ac_try;;

18128

+esac

18129

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

18130

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

18131

ac_status=$?

18132

grep -v '^ *+' conftest.er1 >conftest.err

18133

rm -f conftest.er1

18134

cat conftest.err >&5

18135

echo "$as_me:$LINENO: \$? = $ac_status" >&5

18136

- (exit $ac_status); } >/dev/null; then

18137

- if test -s conftest.err; then

18138

- ac_cpp_err=$ac_c_preproc_warn_flag

18139

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

18140

- else

18141

- ac_cpp_err=

18142

- fi

18143

-else

18144

- ac_cpp_err=yes

18145

-fi

18146

-if test -z "$ac_cpp_err"; then

18147

+ (exit $ac_status); } >/dev/null && {

18148

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

18149

+ test ! -s conftest.err

18150

+ }; then

18151

ac_header_preproc=yes

18152

else

18153

echo "$as_me: failed program was:" >&5

18154

@@ -28145,9 +28421,10 @@

18155

18156

ac_header_preproc=no

18157

18158

18159

rm -f conftest.err conftest.$ac_ext

18160

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

18161

-echo "${ECHO_T}$ac_header_preproc" >&6

18162

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

18163

+echo "${ECHO_T}$ac_header_preproc" >&6; }

18164

18165

# So? What about this header?

18166

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

18167

@@ -28171,25 +28448,19 @@

18168

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

18169

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

18170

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

18171

- (

18172

- cat <<\_ASBOX

18173

-## ----------------------------------- ##

18174

-## Report this to the graphviz lists. ##

18175

-## ----------------------------------- ##

18176

-_ASBOX

18177

- ) |

18178

- sed "s/^/$as_me: WARNING: /" >&2

18179

18180

;;

18181

esac

18182

-echo "$as_me:$LINENO: checking for $ac_header" >&5

18183

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

18184

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

18185

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

18186

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

18187

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

18188

echo $ECHO_N "(cached) $ECHO_C" >&6

18189

else

18190

eval "$as_ac_Header=\$ac_header_preproc"

18191

18192

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

18193

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

18194

+ac_res=`eval echo '${'$as_ac_Header'}'`

18195

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

18196

+echo "${ECHO_T}$ac_res" >&6; }

18197

18198

18199

if test `eval echo '${'$as_ac_Header'}'` = yes; then

18200

@@ -28205,9 +28476,9 @@

18201

for ac_header in X11/Xaw/Text.h

18202

18203

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

18204

-echo "$as_me:$LINENO: checking for $ac_header" >&5

18205

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

18206

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

18207

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

18208

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

18209

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

18210

echo $ECHO_N "(cached) $ECHO_C" >&6

18211

else

18212

cat >conftest.$ac_ext <<_ACEOF

18213

@@ -28224,38 +28495,35 @@

18214

#include <$ac_header>

18215

_ACEOF

18216

rm -f conftest.$ac_objext

18217

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

18218

- (eval $ac_compile) 2>conftest.er1

18219

+if { (ac_try="$ac_compile"

18220

+case "(($ac_try" in

18221

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

18222

+ *) ac_try_echo=$ac_try;;

18223

+esac

18224

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

18225

+ (eval "$ac_compile") 2>conftest.er1

18226

ac_status=$?

18227

grep -v '^ *+' conftest.er1 >conftest.err

18228

rm -f conftest.er1

18229

cat conftest.err >&5

18230

echo "$as_me:$LINENO: \$? = $ac_status" >&5

18231

- (exit $ac_status); } &&

18232

- { ac_try='test -z "$ac_c_werror_flag"

18233

- || test ! -s conftest.err'

18234

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18235

- (eval $ac_try) 2>&5

18236

- ac_status=$?

18237

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18238

- (exit $ac_status); }; } &&

18239

- { ac_try='test -s conftest.$ac_objext'

18240

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18241

- (eval $ac_try) 2>&5

18242

- ac_status=$?

18243

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18244

- (exit $ac_status); }; }; then

18245

+ (exit $ac_status); } && {

18246

+ test -z "$ac_c_werror_flag" ||

18247

+ test ! -s conftest.err

18248

+ } && test -s conftest.$ac_objext; then

18249

eval "$as_ac_Header=yes"

18250

else

18251

echo "$as_me: failed program was:" >&5

18252

sed 's/^/| /' conftest.$ac_ext >&5

18253

18254

-eval "$as_ac_Header=no"

18255

+ eval "$as_ac_Header=no"

18256

18257

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

18258

18259

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

18260

18261

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

18262

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

18263

+ac_res=`eval echo '${'$as_ac_Header'}'`

18264

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

18265

+echo "${ECHO_T}$ac_res" >&6; }

18266

if test `eval echo '${'$as_ac_Header'}'` = yes; then

18267

cat >>confdefs.h <<_ACEOF

18268

#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

18269

@@ -28270,8 +28538,8 @@

18270

done

18271

18272

if test "x$with_xaw" != "xno"; then

18273

-echo "$as_me:$LINENO: checking for main in -lXaw" >&5

18274

-echo $ECHO_N "checking for main in -lXaw... $ECHO_C" >&6

18275

+{ echo "$as_me:$LINENO: checking for main in -lXaw" >&5

18276

+echo $ECHO_N "checking for main in -lXaw... $ECHO_C" >&6; }

18277

if test "${ac_cv_lib_Xaw_main+set}" = set; then

18278

echo $ECHO_N "(cached) $ECHO_C" >&6

18279

else

18280

@@ -28288,46 +28556,43 @@

18281

int

18282

main ()

18283

{

18284

-main ();

18285

+return main ();

18286

;

18287

return 0;

18288

}

18289

_ACEOF

18290

rm -f conftest.$ac_objext conftest$ac_exeext

18291

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

18292

- (eval $ac_link) 2>conftest.er1

18293

+if { (ac_try="$ac_link"

18294

+case "(($ac_try" in

18295

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

18296

+ *) ac_try_echo=$ac_try;;

18297

+esac

18298

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

18299

+ (eval "$ac_link") 2>conftest.er1

18300

ac_status=$?

18301

grep -v '^ *+' conftest.er1 >conftest.err

18302

rm -f conftest.er1

18303

cat conftest.err >&5

18304

echo "$as_me:$LINENO: \$? = $ac_status" >&5

18305

- (exit $ac_status); } &&

18306

- { ac_try='test -z "$ac_c_werror_flag"

18307

- || test ! -s conftest.err'

18308

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18309

- (eval $ac_try) 2>&5

18310

- ac_status=$?

18311

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18312

- (exit $ac_status); }; } &&

18313

- { ac_try='test -s conftest$ac_exeext'

18314

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18315

- (eval $ac_try) 2>&5

18316

- ac_status=$?

18317

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18318

- (exit $ac_status); }; }; then

18319

+ (exit $ac_status); } && {

18320

+ test -z "$ac_c_werror_flag" ||

18321

+ test ! -s conftest.err

18322

+ } && test -s conftest$ac_exeext &&

18323

+ $as_test_x conftest$ac_exeext; then

18324

ac_cv_lib_Xaw_main=yes

18325

else

18326

echo "$as_me: failed program was:" >&5

18327

sed 's/^/| /' conftest.$ac_ext >&5

18328

18329

-ac_cv_lib_Xaw_main=no

18330

+ ac_cv_lib_Xaw_main=no

18331

18332

-rm -f conftest.err conftest.$ac_objext \

18333

18334

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

18335

conftest$ac_exeext conftest.$ac_ext

18336

LIBS=$ac_check_lib_save_LIBS

18337

18338

-echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5

18339

-echo "${ECHO_T}$ac_cv_lib_Xaw_main" >&6

18340

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5

18341

+echo "${ECHO_T}$ac_cv_lib_Xaw_main" >&6; }

18342

if test $ac_cv_lib_Xaw_main = yes; then

18343

XAW_LIBS="$XAW_LIBS -lXaw"

18344

else

18345

@@ -28356,31 +28621,31 @@

18346

save_CPPFLAGS=$CPPFLAGS

18347

save_LDFLAGS=$LDFLAGS

18348

18349

-# Check whether --with-zincludedir or --without-zincludedir was given.

18350

+# Check whether --with-zincludedir was given.

18351

if test "${with_zincludedir+set}" = set; then

18352

- withval="$with_zincludedir"

18353

- Z_INCLUDES="-I$withval"

18354

-fi;

18355

+ withval=$with_zincludedir; Z_INCLUDES="-I$withval"

18356

+fi

18357

18358

CPPFLAGS="$CPPFLAGS $Z_INCLUDES"

18359

18360

-# Check whether --with-zlibdir or --without-zlibdir was given.

18361

+# Check whether --with-zlibdir was given.

18362

if test "${with_zlibdir+set}" = set; then

18363

- withval="$with_zlibdir"

18364

- Z_LIBS="-L$withval"

18365

-fi;

18366

+ withval=$with_zlibdir; Z_LIBS="-L$withval"

18367

+fi

18368

18369

LDFLAGS="$LDFLAGS $Z_LIBS"

18370

if test "${ac_cv_header_zlib_h+set}" = set; then

18371

- echo "$as_me:$LINENO: checking for zlib.h" >&5

18372

-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6

18373

+ { echo "$as_me:$LINENO: checking for zlib.h" >&5

18374

+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }

18375

if test "${ac_cv_header_zlib_h+set}" = set; then

18376

echo $ECHO_N "(cached) $ECHO_C" >&6

18377

18378

-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5

18379

-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6

18380

+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5

18381

+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }

18382

else

18383

# Is the header compilable?

18384

-echo "$as_me:$LINENO: checking zlib.h usability" >&5

18385

-echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6

18386

+{ echo "$as_me:$LINENO: checking zlib.h usability" >&5

18387

+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; }

18388

cat >conftest.$ac_ext <<_ACEOF

18389

/* confdefs.h. */

18390

_ACEOF

18391

@@ -28391,41 +28656,37 @@

18392

#include <zlib.h>

18393

_ACEOF

18394

rm -f conftest.$ac_objext

18395

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

18396

- (eval $ac_compile) 2>conftest.er1

18397

+if { (ac_try="$ac_compile"

18398

+case "(($ac_try" in

18399

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

18400

+ *) ac_try_echo=$ac_try;;

18401

+esac

18402

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

18403

+ (eval "$ac_compile") 2>conftest.er1

18404

ac_status=$?

18405

grep -v '^ *+' conftest.er1 >conftest.err

18406

rm -f conftest.er1

18407

cat conftest.err >&5

18408

echo "$as_me:$LINENO: \$? = $ac_status" >&5

18409

- (exit $ac_status); } &&

18410

- { ac_try='test -z "$ac_c_werror_flag"

18411

- || test ! -s conftest.err'

18412

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18413

- (eval $ac_try) 2>&5

18414

- ac_status=$?

18415

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18416

- (exit $ac_status); }; } &&

18417

- { ac_try='test -s conftest.$ac_objext'

18418

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18419

- (eval $ac_try) 2>&5

18420

- ac_status=$?

18421

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18422

- (exit $ac_status); }; }; then

18423

+ (exit $ac_status); } && {

18424

+ test -z "$ac_c_werror_flag" ||

18425

+ test ! -s conftest.err

18426

+ } && test -s conftest.$ac_objext; then

18427

ac_header_compiler=yes

18428

else

18429

echo "$as_me: failed program was:" >&5

18430

sed 's/^/| /' conftest.$ac_ext >&5

18431

18432

-ac_header_compiler=no

18433

+ ac_header_compiler=no

18434

18435

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

18436

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

18437

-echo "${ECHO_T}$ac_header_compiler" >&6

18438

18439

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

18440

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

18441

+echo "${ECHO_T}$ac_header_compiler" >&6; }

18442

18443

# Is the header present?

18444

-echo "$as_me:$LINENO: checking zlib.h presence" >&5

18445

-echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6

18446

+{ echo "$as_me:$LINENO: checking zlib.h presence" >&5

18447

+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; }

18448

cat >conftest.$ac_ext <<_ACEOF

18449

/* confdefs.h. */

18450

_ACEOF

18451

@@ -28434,24 +28695,22 @@

18452

/* end confdefs.h. */

18453

#include <zlib.h>

18454

_ACEOF

18455

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

18456

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

18457

+if { (ac_try="$ac_cpp conftest.$ac_ext"

18458

+case "(($ac_try" in

18459

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

18460

+ *) ac_try_echo=$ac_try;;

18461

+esac

18462

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

18463

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

18464

ac_status=$?

18465

grep -v '^ *+' conftest.er1 >conftest.err

18466

rm -f conftest.er1

18467

cat conftest.err >&5

18468

echo "$as_me:$LINENO: \$? = $ac_status" >&5

18469

- (exit $ac_status); } >/dev/null; then

18470

- if test -s conftest.err; then

18471

- ac_cpp_err=$ac_c_preproc_warn_flag

18472

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

18473

- else

18474

- ac_cpp_err=

18475

- fi

18476

-else

18477

- ac_cpp_err=yes

18478

-fi

18479

-if test -z "$ac_cpp_err"; then

18480

+ (exit $ac_status); } >/dev/null && {

18481

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

18482

+ test ! -s conftest.err

18483

+ }; then

18484

ac_header_preproc=yes

18485

else

18486

echo "$as_me: failed program was:" >&5

18487

@@ -28459,9 +28718,10 @@

18488

18489

ac_header_preproc=no

18490

18491

18492

rm -f conftest.err conftest.$ac_ext

18493

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

18494

-echo "${ECHO_T}$ac_header_preproc" >&6

18495

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

18496

+echo "${ECHO_T}$ac_header_preproc" >&6; }

18497

18498

# So? What about this header?

18499

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

18500

@@ -28485,30 +28745,23 @@

18501

echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}

18502

{ echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5

18503

echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}

18504

- (

18505

- cat <<\_ASBOX

18506

-## ----------------------------------- ##

18507

-## Report this to the graphviz lists. ##

18508

-## ----------------------------------- ##

18509

-_ASBOX

18510

- ) |

18511

- sed "s/^/$as_me: WARNING: /" >&2

18512

18513

;;

18514

esac

18515

-echo "$as_me:$LINENO: checking for zlib.h" >&5

18516

-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6

18517

+{ echo "$as_me:$LINENO: checking for zlib.h" >&5

18518

+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }

18519

if test "${ac_cv_header_zlib_h+set}" = set; then

18520

echo $ECHO_N "(cached) $ECHO_C" >&6

18521

else

18522

ac_cv_header_zlib_h=$ac_header_preproc

18523

18524

-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5

18525

-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6

18526

+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5

18527

+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }

18528

18529

18530

if test $ac_cv_header_zlib_h = yes; then

18531

- echo "$as_me:$LINENO: checking for main in -lz" >&5

18532

-echo $ECHO_N "checking for main in -lz... $ECHO_C" >&6

18533

+ { echo "$as_me:$LINENO: checking for main in -lz" >&5

18534

+echo $ECHO_N "checking for main in -lz... $ECHO_C" >&6; }

18535

if test "${ac_cv_lib_z_main+set}" = set; then

18536

echo $ECHO_N "(cached) $ECHO_C" >&6

18537

else

18538

@@ -28525,46 +28778,43 @@

18539

int

18540

main ()

18541

{

18542

-main ();

18543

+return main ();

18544

;

18545

return 0;

18546

}

18547

_ACEOF

18548

rm -f conftest.$ac_objext conftest$ac_exeext

18549

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

18550

- (eval $ac_link) 2>conftest.er1

18551

+if { (ac_try="$ac_link"

18552

+case "(($ac_try" in

18553

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

18554

+ *) ac_try_echo=$ac_try;;

18555

+esac

18556

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

18557

+ (eval "$ac_link") 2>conftest.er1

18558

ac_status=$?

18559

grep -v '^ *+' conftest.er1 >conftest.err

18560

rm -f conftest.er1

18561

cat conftest.err >&5

18562

echo "$as_me:$LINENO: \$? = $ac_status" >&5

18563

- (exit $ac_status); } &&

18564

- { ac_try='test -z "$ac_c_werror_flag"

18565

- || test ! -s conftest.err'

18566

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18567

- (eval $ac_try) 2>&5

18568

- ac_status=$?

18569

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18570

- (exit $ac_status); }; } &&

18571

- { ac_try='test -s conftest$ac_exeext'

18572

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18573

- (eval $ac_try) 2>&5

18574

- ac_status=$?

18575

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18576

- (exit $ac_status); }; }; then

18577

+ (exit $ac_status); } && {

18578

+ test -z "$ac_c_werror_flag" ||

18579

+ test ! -s conftest.err

18580

+ } && test -s conftest$ac_exeext &&

18581

+ $as_test_x conftest$ac_exeext; then

18582

ac_cv_lib_z_main=yes

18583

else

18584

echo "$as_me: failed program was:" >&5

18585

sed 's/^/| /' conftest.$ac_ext >&5

18586

18587

-ac_cv_lib_z_main=no

18588

+ ac_cv_lib_z_main=no

18589

18590

-rm -f conftest.err conftest.$ac_objext \

18591

18592

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

18593

conftest$ac_exeext conftest.$ac_ext

18594

LIBS=$ac_check_lib_save_LIBS

18595

18596

-echo "$as_me:$LINENO: result: $ac_cv_lib_z_main" >&5

18597

-echo "${ECHO_T}$ac_cv_lib_z_main" >&6

18598

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_main" >&5

18599

+echo "${ECHO_T}$ac_cv_lib_z_main" >&6; }

18600

if test $ac_cv_lib_z_main = yes; then

18601

Z_LIBS="$Z_LIBS -lz"

18602

18603

@@ -28589,11 +28839,11 @@

18604

18605

18606

18607

-# Check whether --with-digcola or --without-digcola was given.

18608

+# Check whether --with-digcola was given.

18609

if test "${with_digcola+set}" = set; then

18610

- withval="$with_digcola"

18611

+ withval=$with_digcola;

18612

+fi

18613

18614

-fi;

18615

if test "x$with_digcola" != "xno"; then

18616

18617

cat >>confdefs.h <<_ACEOF

18618

@@ -28606,11 +28856,11 @@

18619

18620

18621

18622

-# Check whether --with-ipsepcola or --without-ipsepcola was given.

18623

+# Check whether --with-ipsepcola was given.

18624

if test "${with_ipsepcola+set}" = set; then

18625

- withval="$with_ipsepcola"

18626

+ withval=$with_ipsepcola;

18627

+fi

18628

18629

-fi;

18630

if test "x$with_digcola" = "xno"; then

18631

with_ipsepcola=no

18632

18633

@@ -28645,11 +28895,11 @@

18634

18635

18636

18637

-# Check whether --with-pangocairo or --without-pangocairo was given.

18638

+# Check whether --with-pangocairo was given.

18639

if test "${with_pangocairo+set}" = set; then

18640

- withval="$with_pangocairo"

18641

+ withval=$with_pangocairo;

18642

+fi

18643

18644

-fi;

18645

18646

### default is to build with pangocairo

18647

if test "x$with_pangocairo" != "xno"; then

18648

@@ -28663,8 +28913,8 @@

18649

if test -n "$ac_tool_prefix"; then

18650

# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

18651

set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

18652

-echo "$as_me:$LINENO: checking for $ac_word" >&5

18653

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

18654

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

18655

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

18656

if test "${ac_cv_path_PKG_CONFIG+set}" = set; then

18657

echo $ECHO_N "(cached) $ECHO_C" >&6

18658

else

18659

@@ -28679,34 +28929,35 @@

18660

IFS=$as_save_IFS

18661

test -z "$as_dir" && as_dir=.

18662

for ac_exec_ext in '' $ac_executable_extensions; do

18663

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

18664

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

18665

ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

18666

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

18667

break 2

18668

18669

done

18670

done

18671

+IFS=$as_save_IFS

18672

18673

;;

18674

esac

18675

18676

PKG_CONFIG=$ac_cv_path_PKG_CONFIG

18677

18678

if test -n "$PKG_CONFIG"; then

18679

- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5

18680

-echo "${ECHO_T}$PKG_CONFIG" >&6

18681

+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5

18682

+echo "${ECHO_T}$PKG_CONFIG" >&6; }

18683

else

18684

- echo "$as_me:$LINENO: result: no" >&5

18685

-echo "${ECHO_T}no" >&6

18686

+ { echo "$as_me:$LINENO: result: no" >&5

18687

+echo "${ECHO_T}no" >&6; }

18688

18689

18690

18691

18692

if test -z "$ac_cv_path_PKG_CONFIG"; then

18693

ac_pt_PKG_CONFIG=$PKG_CONFIG

18694

# Extract the first word of "pkg-config", so it can be a program name with args.

18695

set dummy pkg-config; ac_word=$2

18696

-echo "$as_me:$LINENO: checking for $ac_word" >&5

18697

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

18698

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

18699

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

18700

if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then

18701

echo $ECHO_N "(cached) $ECHO_C" >&6

18702

else

18703

@@ -28721,28 +28972,42 @@

18704

IFS=$as_save_IFS

18705

test -z "$as_dir" && as_dir=.

18706

for ac_exec_ext in '' $ac_executable_extensions; do

18707

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

18708

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

18709

ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

18710

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

18711

break 2

18712

18713

done

18714

done

18715

+IFS=$as_save_IFS

18716

18717

;;

18718

esac

18719

18720

ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

18721

18722

if test -n "$ac_pt_PKG_CONFIG"; then

18723

- echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5

18724

-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6

18725

+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5

18726

+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }

18727

else

18728

- echo "$as_me:$LINENO: result: no" >&5

18729

-echo "${ECHO_T}no" >&6

18730

+ { echo "$as_me:$LINENO: result: no" >&5

18731

+echo "${ECHO_T}no" >&6; }

18732

18733

18734

- PKG_CONFIG=$ac_pt_PKG_CONFIG

18735

+ if test "x$ac_pt_PKG_CONFIG" = x; then

18736

+ PKG_CONFIG=""

18737

+ else

18738

+ case $cross_compiling:$ac_tool_warned in

18739

+yes:)

18740

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

18741

+whose name does not start with the host triplet. If you think this

18742

+configuration is useful to you, please write to autoconf@gnu.org." >&5

18743

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

18744

+whose name does not start with the host triplet. If you think this

18745

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

18746

+ac_tool_warned=yes ;;

18747

+esac

18748

+ PKG_CONFIG=$ac_pt_PKG_CONFIG

18749

+ fi

18750

else

18751

PKG_CONFIG="$ac_cv_path_PKG_CONFIG"

18752

18753

@@ -28750,22 +29015,22 @@

18754

18755

if test -n "$PKG_CONFIG"; then

18756

_pkg_min_version=0.9.0

18757

- echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5

18758

-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6

18759

+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5

18760

+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }

18761

if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

18762

- echo "$as_me:$LINENO: result: yes" >&5

18763

-echo "${ECHO_T}yes" >&6

18764

+ { echo "$as_me:$LINENO: result: yes" >&5

18765

+echo "${ECHO_T}yes" >&6; }

18766

else

18767

- echo "$as_me:$LINENO: result: no" >&5

18768

-echo "${ECHO_T}no" >&6

18769

+ { echo "$as_me:$LINENO: result: no" >&5

18770

+echo "${ECHO_T}no" >&6; }

18771

PKG_CONFIG=""

18772

18773

18774

18775

18776

pkg_failed=no

18777

-echo "$as_me:$LINENO: checking for PANGOCAIRO" >&5

18778

-echo $ECHO_N "checking for PANGOCAIRO... $ECHO_C" >&6

18779

+{ echo "$as_me:$LINENO: checking for PANGOCAIRO" >&5

18780

+echo $ECHO_N "checking for PANGOCAIRO... $ECHO_C" >&6; }

18781

18782

if test -n "$PKG_CONFIG"; then

18783

if test -n "$PANGOCAIRO_CFLAGS"; then

18784

@@ -28829,8 +29094,8 @@

18785

else

18786

PANGOCAIRO_CFLAGS=$pkg_cv_PANGOCAIRO_CFLAGS

18787

PANGOCAIRO_LIBS=$pkg_cv_PANGOCAIRO_LIBS

18788

- echo "$as_me:$LINENO: result: yes" >&5

18789

-echo "${ECHO_T}yes" >&6

18790

+ { echo "$as_me:$LINENO: result: yes" >&5

18791

+echo "${ECHO_T}yes" >&6; }

18792

HAVE_PANGOCAIRO=1

18793

18794

cat >>confdefs.h <<_ACEOF

18795

@@ -28854,11 +29119,11 @@

18796

18797

18798

18799

-# Check whether --with-gtk or --without-gtk was given.

18800

+# Check whether --with-gtk was given.

18801

if test "${with_gtk+set}" = set; then

18802

- withval="$with_gtk"

18803

+ withval=$with_gtk;

18804

+fi

18805

18806

-fi;

18807

18808

### default is to build with gtk+

18809

if test "x$with_gtk" != "xno"; then

18810

@@ -28868,8 +29133,8 @@

18811

if test "x$with_gtk" = "xyes"; then

18812

18813

pkg_failed=no

18814

-echo "$as_me:$LINENO: checking for GTK" >&5

18815

-echo $ECHO_N "checking for GTK... $ECHO_C" >&6

18816

+{ echo "$as_me:$LINENO: checking for GTK" >&5

18817

+echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }

18818

18819

if test -n "$PKG_CONFIG"; then

18820

if test -n "$GTK_CFLAGS"; then

18821

@@ -28933,8 +29198,8 @@

18822

else

18823

GTK_CFLAGS=$pkg_cv_GTK_CFLAGS

18824

GTK_LIBS=$pkg_cv_GTK_LIBS

18825

- echo "$as_me:$LINENO: result: yes" >&5

18826

-echo "${ECHO_T}yes" >&6

18827

+ { echo "$as_me:$LINENO: result: yes" >&5

18828

+echo "${ECHO_T}yes" >&6; }

18829

HAVE_GTK=1

18830

18831

cat >>confdefs.h <<_ACEOF

18832

@@ -28958,9 +29223,23 @@

18833

18834

18835

18836

+# Check whether --with-gnomeui was given.

18837

+if test "${with_gnomeui+set}" = set; then

18838

+ withval=$with_gnomeui;

18839

+fi

18840

18841

18842

+### default is to build with gnomeui

18843

+if test "x$with_gnomeui" != "xno"; then

18844

+ with_gnomeui=yes

18845

+fi

18846

18847

+if test "x$with_gnomeui" = "xyes"; then

18848

18849

18850

pkg_failed=no

18851

-echo "$as_me:$LINENO: checking for GNOMEUI" >&5

18852

-echo $ECHO_N "checking for GNOMEUI... $ECHO_C" >&6

18853

+{ echo "$as_me:$LINENO: checking for GNOMEUI" >&5

18854

+echo $ECHO_N "checking for GNOMEUI... $ECHO_C" >&6; }

18855

18856

if test -n "$PKG_CONFIG"; then

18857

if test -n "$GNOMEUI_CFLAGS"; then

18858

@@ -29024,8 +29303,8 @@

18859

else

18860

GNOMEUI_CFLAGS=$pkg_cv_GNOMEUI_CFLAGS

18861

GNOMEUI_LIBS=$pkg_cv_GNOMEUI_LIBS

18862

- echo "$as_me:$LINENO: result: yes" >&5

18863

-echo "${ECHO_T}yes" >&6

18864

+ { echo "$as_me:$LINENO: result: yes" >&5

18865

+echo "${ECHO_T}yes" >&6; }

18866

HAVE_GNOMEUI=1

18867

18868

cat >>confdefs.h <<_ACEOF

18869

@@ -29035,6 +29314,7 @@

18870

18871

18872

18873

+fi

18874

18875

18876

if test "x$HAVE_GNOMEUI" != "x"; then

18877

@@ -29061,18 +29341,19 @@

18878

for ac_header in locale.h

18879

18880

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

18881

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

18882

- echo "$as_me:$LINENO: checking for $ac_header" >&5

18883

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

18884

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

18885

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

18886

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

18887

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

18888

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

18889

echo $ECHO_N "(cached) $ECHO_C" >&6

18890

18891

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

18892

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

18893

+ac_res=`eval echo '${'$as_ac_Header'}'`

18894

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

18895

+echo "${ECHO_T}$ac_res" >&6; }

18896

else

18897

# Is the header compilable?

18898

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

18899

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

18900

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

18901

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

18902

cat >conftest.$ac_ext <<_ACEOF

18903

/* confdefs.h. */

18904

_ACEOF

18905

@@ -29083,41 +29364,37 @@

18906

#include <$ac_header>

18907

_ACEOF

18908

rm -f conftest.$ac_objext

18909

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

18910

- (eval $ac_compile) 2>conftest.er1

18911

+if { (ac_try="$ac_compile"

18912

+case "(($ac_try" in

18913

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

18914

+ *) ac_try_echo=$ac_try;;

18915

+esac

18916

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

18917

+ (eval "$ac_compile") 2>conftest.er1

18918

ac_status=$?

18919

grep -v '^ *+' conftest.er1 >conftest.err

18920

rm -f conftest.er1

18921

cat conftest.err >&5

18922

echo "$as_me:$LINENO: \$? = $ac_status" >&5

18923

- (exit $ac_status); } &&

18924

- { ac_try='test -z "$ac_c_werror_flag"

18925

- || test ! -s conftest.err'

18926

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18927

- (eval $ac_try) 2>&5

18928

- ac_status=$?

18929

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18930

- (exit $ac_status); }; } &&

18931

- { ac_try='test -s conftest.$ac_objext'

18932

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18933

- (eval $ac_try) 2>&5

18934

- ac_status=$?

18935

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

18936

- (exit $ac_status); }; }; then

18937

+ (exit $ac_status); } && {

18938

+ test -z "$ac_c_werror_flag" ||

18939

+ test ! -s conftest.err

18940

+ } && test -s conftest.$ac_objext; then

18941

ac_header_compiler=yes

18942

else

18943

echo "$as_me: failed program was:" >&5

18944

sed 's/^/| /' conftest.$ac_ext >&5

18945

18946

-ac_header_compiler=no

18947

+ ac_header_compiler=no

18948

18949

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

18950

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

18951

-echo "${ECHO_T}$ac_header_compiler" >&6

18952

18953

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

18954

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

18955

+echo "${ECHO_T}$ac_header_compiler" >&6; }

18956

18957

# Is the header present?

18958

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

18959

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

18960

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

18961

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

18962

cat >conftest.$ac_ext <<_ACEOF

18963

/* confdefs.h. */

18964

_ACEOF

18965

@@ -29126,24 +29403,22 @@

18966

/* end confdefs.h. */

18967

#include <$ac_header>

18968

_ACEOF

18969

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

18970

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

18971

+if { (ac_try="$ac_cpp conftest.$ac_ext"

18972

+case "(($ac_try" in

18973

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

18974

+ *) ac_try_echo=$ac_try;;

18975

+esac

18976

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

18977

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

18978

ac_status=$?

18979

grep -v '^ *+' conftest.er1 >conftest.err

18980

rm -f conftest.er1

18981

cat conftest.err >&5

18982

echo "$as_me:$LINENO: \$? = $ac_status" >&5

18983

- (exit $ac_status); } >/dev/null; then

18984

- if test -s conftest.err; then

18985

- ac_cpp_err=$ac_c_preproc_warn_flag

18986

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

18987

- else

18988

- ac_cpp_err=

18989

- fi

18990

-else

18991

- ac_cpp_err=yes

18992

-fi

18993

-if test -z "$ac_cpp_err"; then

18994

+ (exit $ac_status); } >/dev/null && {

18995

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

18996

+ test ! -s conftest.err

18997

+ }; then

18998

ac_header_preproc=yes

18999

else

19000

echo "$as_me: failed program was:" >&5

19001

@@ -29151,9 +29426,10 @@

19002

19003

ac_header_preproc=no

19004

19005

19006

rm -f conftest.err conftest.$ac_ext

19007

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

19008

-echo "${ECHO_T}$ac_header_preproc" >&6

19009

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

19010

+echo "${ECHO_T}$ac_header_preproc" >&6; }

19011

19012

# So? What about this header?

19013

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

19014

@@ -29177,25 +29453,19 @@

19015

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

19016

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

19017

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

19018

- (

19019

- cat <<\_ASBOX

19020

-## ----------------------------------- ##

19021

-## Report this to the graphviz lists. ##

19022

-## ----------------------------------- ##

19023

-_ASBOX

19024

- ) |

19025

- sed "s/^/$as_me: WARNING: /" >&2

19026

19027

;;

19028

esac

19029

-echo "$as_me:$LINENO: checking for $ac_header" >&5

19030

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

19031

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

19032

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

19033

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

19034

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

19035

echo $ECHO_N "(cached) $ECHO_C" >&6

19036

else

19037

eval "$as_ac_Header=\$ac_header_preproc"

19038

19039

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

19040

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

19041

+ac_res=`eval echo '${'$as_ac_Header'}'`

19042

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

19043

+echo "${ECHO_T}$ac_res" >&6; }

19044

19045

19046

if test `eval echo '${'$as_ac_Header'}'` = yes; then

19047

@@ -29208,8 +29478,8 @@

19048

done

19049

19050

if test $ac_cv_header_locale_h = yes; then

19051

- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5

19052

-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6

19053

+ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5

19054

+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }

19055

if test "${am_cv_val_LC_MESSAGES+set}" = set; then

19056

echo $ECHO_N "(cached) $ECHO_C" >&6

19057

else

19058

@@ -29229,39 +29499,36 @@

19059

}

19060

_ACEOF

19061

rm -f conftest.$ac_objext conftest$ac_exeext

19062

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

19063

- (eval $ac_link) 2>conftest.er1

19064

+if { (ac_try="$ac_link"

19065

+case "(($ac_try" in

19066

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

19067

+ *) ac_try_echo=$ac_try;;

19068

+esac

19069

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

19070

+ (eval "$ac_link") 2>conftest.er1

19071

ac_status=$?

19072

grep -v '^ *+' conftest.er1 >conftest.err

19073

rm -f conftest.er1

19074

cat conftest.err >&5

19075

echo "$as_me:$LINENO: \$? = $ac_status" >&5

19076

- (exit $ac_status); } &&

19077

- { ac_try='test -z "$ac_c_werror_flag"

19078

- || test ! -s conftest.err'

19079

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19080

- (eval $ac_try) 2>&5

19081

- ac_status=$?

19082

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19083

- (exit $ac_status); }; } &&

19084

- { ac_try='test -s conftest$ac_exeext'

19085

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19086

- (eval $ac_try) 2>&5

19087

- ac_status=$?

19088

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19089

- (exit $ac_status); }; }; then

19090

+ (exit $ac_status); } && {

19091

+ test -z "$ac_c_werror_flag" ||

19092

+ test ! -s conftest.err

19093

+ } && test -s conftest$ac_exeext &&

19094

+ $as_test_x conftest$ac_exeext; then

19095

am_cv_val_LC_MESSAGES=yes

19096

else

19097

echo "$as_me: failed program was:" >&5

19098

sed 's/^/| /' conftest.$ac_ext >&5

19099

19100

-am_cv_val_LC_MESSAGES=no

19101

+ am_cv_val_LC_MESSAGES=no

19102

19103

-rm -f conftest.err conftest.$ac_objext \

19104

19105

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19106

conftest$ac_exeext conftest.$ac_ext

19107

19108

-echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5

19109

-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6

19110

+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5

19111

+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }

19112

if test $am_cv_val_LC_MESSAGES = yes; then

19113

19114

cat >>confdefs.h <<\_ACEOF

19115

@@ -29280,17 +29547,17 @@

19116

INTLLIBS=

19117

19118

if test "${ac_cv_header_libintl_h+set}" = set; then

19119

- echo "$as_me:$LINENO: checking for libintl.h" >&5

19120

-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6

19121

+ { echo "$as_me:$LINENO: checking for libintl.h" >&5

19122

+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }

19123

if test "${ac_cv_header_libintl_h+set}" = set; then

19124

echo $ECHO_N "(cached) $ECHO_C" >&6

19125

19126

-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

19127

-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6

19128

+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

19129

+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }

19130

else

19131

# Is the header compilable?

19132

-echo "$as_me:$LINENO: checking libintl.h usability" >&5

19133

-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6

19134

+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5

19135

+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }

19136

cat >conftest.$ac_ext <<_ACEOF

19137

/* confdefs.h. */

19138

_ACEOF

19139

@@ -29301,41 +29568,37 @@

19140

#include <libintl.h>

19141

_ACEOF

19142

rm -f conftest.$ac_objext

19143

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

19144

- (eval $ac_compile) 2>conftest.er1

19145

+if { (ac_try="$ac_compile"

19146

+case "(($ac_try" in

19147

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

19148

+ *) ac_try_echo=$ac_try;;

19149

+esac

19150

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

19151

+ (eval "$ac_compile") 2>conftest.er1

19152

ac_status=$?

19153

grep -v '^ *+' conftest.er1 >conftest.err

19154

rm -f conftest.er1

19155

cat conftest.err >&5

19156

echo "$as_me:$LINENO: \$? = $ac_status" >&5

19157

- (exit $ac_status); } &&

19158

- { ac_try='test -z "$ac_c_werror_flag"

19159

- || test ! -s conftest.err'

19160

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19161

- (eval $ac_try) 2>&5

19162

- ac_status=$?

19163

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19164

- (exit $ac_status); }; } &&

19165

- { ac_try='test -s conftest.$ac_objext'

19166

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19167

- (eval $ac_try) 2>&5

19168

- ac_status=$?

19169

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19170

- (exit $ac_status); }; }; then

19171

+ (exit $ac_status); } && {

19172

+ test -z "$ac_c_werror_flag" ||

19173

+ test ! -s conftest.err

19174

+ } && test -s conftest.$ac_objext; then

19175

ac_header_compiler=yes

19176

else

19177

echo "$as_me: failed program was:" >&5

19178

sed 's/^/| /' conftest.$ac_ext >&5

19179

19180

-ac_header_compiler=no

19181

+ ac_header_compiler=no

19182

19183

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

19184

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

19185

-echo "${ECHO_T}$ac_header_compiler" >&6

19186

19187

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

19188

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

19189

+echo "${ECHO_T}$ac_header_compiler" >&6; }

19190

19191

# Is the header present?

19192

-echo "$as_me:$LINENO: checking libintl.h presence" >&5

19193

-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6

19194

+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5

19195

+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }

19196

cat >conftest.$ac_ext <<_ACEOF

19197

/* confdefs.h. */

19198

_ACEOF

19199

@@ -29344,24 +29607,22 @@

19200

/* end confdefs.h. */

19201

#include <libintl.h>

19202

_ACEOF

19203

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

19204

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

19205

+if { (ac_try="$ac_cpp conftest.$ac_ext"

19206

+case "(($ac_try" in

19207

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

19208

+ *) ac_try_echo=$ac_try;;

19209

+esac

19210

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

19211

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

19212

ac_status=$?

19213

grep -v '^ *+' conftest.er1 >conftest.err

19214

rm -f conftest.er1

19215

cat conftest.err >&5

19216

echo "$as_me:$LINENO: \$? = $ac_status" >&5

19217

- (exit $ac_status); } >/dev/null; then

19218

- if test -s conftest.err; then

19219

- ac_cpp_err=$ac_c_preproc_warn_flag

19220

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

19221

- else

19222

- ac_cpp_err=

19223

- fi

19224

-else

19225

- ac_cpp_err=yes

19226

-fi

19227

-if test -z "$ac_cpp_err"; then

19228

+ (exit $ac_status); } >/dev/null && {

19229

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

19230

+ test ! -s conftest.err

19231

+ }; then

19232

ac_header_preproc=yes

19233

else

19234

echo "$as_me: failed program was:" >&5

19235

@@ -29369,9 +29630,10 @@

19236

19237

ac_header_preproc=no

19238

19239

19240

rm -f conftest.err conftest.$ac_ext

19241

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

19242

-echo "${ECHO_T}$ac_header_preproc" >&6

19243

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

19244

+echo "${ECHO_T}$ac_header_preproc" >&6; }

19245

19246

# So? What about this header?

19247

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

19248

@@ -29395,25 +29657,18 @@

19249

echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}

19250

{ echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5

19251

echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}

19252

- (

19253

- cat <<\_ASBOX

19254

-## ----------------------------------- ##

19255

-## Report this to the graphviz lists. ##

19256

-## ----------------------------------- ##

19257

-_ASBOX

19258

- ) |

19259

- sed "s/^/$as_me: WARNING: /" >&2

19260

19261

;;

19262

esac

19263

-echo "$as_me:$LINENO: checking for libintl.h" >&5

19264

-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6

19265

+{ echo "$as_me:$LINENO: checking for libintl.h" >&5

19266

+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }

19267

if test "${ac_cv_header_libintl_h+set}" = set; then

19268

echo $ECHO_N "(cached) $ECHO_C" >&6

19269

else

19270

ac_cv_header_libintl_h=$ac_header_preproc

19271

19272

-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

19273

-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6

19274

+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

19275

+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }

19276

19277

19278

if test $ac_cv_header_libintl_h = yes; then

19279

@@ -29423,8 +29678,8 @@

19280

19281

# First check in libc

19282

19283

- echo "$as_me:$LINENO: checking for ngettext in libc" >&5

19284

-echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6

19285

+ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5

19286

+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }

19287

if test "${gt_cv_func_ngettext_libc+set}" = set; then

19288

echo $ECHO_N "(cached) $ECHO_C" >&6

19289

else

19290

@@ -29446,44 +29701,41 @@

19291

}

19292

_ACEOF

19293

rm -f conftest.$ac_objext conftest$ac_exeext

19294

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

19295

- (eval $ac_link) 2>conftest.er1

19296

+if { (ac_try="$ac_link"

19297

+case "(($ac_try" in

19298

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

19299

+ *) ac_try_echo=$ac_try;;

19300

+esac

19301

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

19302

+ (eval "$ac_link") 2>conftest.er1

19303

ac_status=$?

19304

grep -v '^ *+' conftest.er1 >conftest.err

19305

rm -f conftest.er1

19306

cat conftest.err >&5

19307

echo "$as_me:$LINENO: \$? = $ac_status" >&5

19308

- (exit $ac_status); } &&

19309

- { ac_try='test -z "$ac_c_werror_flag"

19310

- || test ! -s conftest.err'

19311

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19312

- (eval $ac_try) 2>&5

19313

- ac_status=$?

19314

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19315

- (exit $ac_status); }; } &&

19316

- { ac_try='test -s conftest$ac_exeext'

19317

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19318

- (eval $ac_try) 2>&5

19319

- ac_status=$?

19320

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19321

- (exit $ac_status); }; }; then

19322

+ (exit $ac_status); } && {

19323

+ test -z "$ac_c_werror_flag" ||

19324

+ test ! -s conftest.err

19325

+ } && test -s conftest$ac_exeext &&

19326

+ $as_test_x conftest$ac_exeext; then

19327

gt_cv_func_ngettext_libc=yes

19328

else

19329

echo "$as_me: failed program was:" >&5

19330

sed 's/^/| /' conftest.$ac_ext >&5

19331

19332

-gt_cv_func_ngettext_libc=no

19333

+ gt_cv_func_ngettext_libc=no

19334

19335

-rm -f conftest.err conftest.$ac_objext \

19336

19337

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19338

conftest$ac_exeext conftest.$ac_ext

19339

19340

19341

-echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5

19342

-echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6

19343

+{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5

19344

+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }

19345

19346

if test "$gt_cv_func_ngettext_libc" = "yes" ; then

19347

- echo "$as_me:$LINENO: checking for dgettext in libc" >&5

19348

-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6

19349

+ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5

19350

+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }

19351

if test "${gt_cv_func_dgettext_libc+set}" = set; then

19352

echo $ECHO_N "(cached) $ECHO_C" >&6

19353

else

19354

@@ -29505,40 +29757,37 @@

19355

}

19356

_ACEOF

19357

rm -f conftest.$ac_objext conftest$ac_exeext

19358

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

19359

- (eval $ac_link) 2>conftest.er1

19360

+if { (ac_try="$ac_link"

19361

+case "(($ac_try" in

19362

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

19363

+ *) ac_try_echo=$ac_try;;

19364

+esac

19365

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

19366

+ (eval "$ac_link") 2>conftest.er1

19367

ac_status=$?

19368

grep -v '^ *+' conftest.er1 >conftest.err

19369

rm -f conftest.er1

19370

cat conftest.err >&5

19371

echo "$as_me:$LINENO: \$? = $ac_status" >&5

19372

- (exit $ac_status); } &&

19373

- { ac_try='test -z "$ac_c_werror_flag"

19374

- || test ! -s conftest.err'

19375

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19376

- (eval $ac_try) 2>&5

19377

- ac_status=$?

19378

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19379

- (exit $ac_status); }; } &&

19380

- { ac_try='test -s conftest$ac_exeext'

19381

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19382

- (eval $ac_try) 2>&5

19383

- ac_status=$?

19384

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19385

- (exit $ac_status); }; }; then

19386

+ (exit $ac_status); } && {

19387

+ test -z "$ac_c_werror_flag" ||

19388

+ test ! -s conftest.err

19389

+ } && test -s conftest$ac_exeext &&

19390

+ $as_test_x conftest$ac_exeext; then

19391

gt_cv_func_dgettext_libc=yes

19392

else

19393

echo "$as_me: failed program was:" >&5

19394

sed 's/^/| /' conftest.$ac_ext >&5

19395

19396

-gt_cv_func_dgettext_libc=no

19397

+ gt_cv_func_dgettext_libc=no

19398

19399

-rm -f conftest.err conftest.$ac_objext \

19400

19401

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19402

conftest$ac_exeext conftest.$ac_ext

19403

19404

19405

-echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5

19406

-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6

19407

+{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5

19408

+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }

19409

19410

19411

if test "$gt_cv_func_ngettext_libc" = "yes" ; then

19412

@@ -29546,9 +29795,9 @@

19413

for ac_func in bind_textdomain_codeset

19414

19415

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

19416

-echo "$as_me:$LINENO: checking for $ac_func" >&5

19417

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

19418

-if eval "test \"\${$as_ac_var+set}\" = set"; then

19419

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

19420

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

19421

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

19422

echo $ECHO_N "(cached) $ECHO_C" >&6

19423

else

19424

cat >conftest.$ac_ext <<_ACEOF

19425

@@ -29574,68 +29823,60 @@

19426

19427

#undef $ac_func

19428

19429

-/* Override any gcc2 internal prototype to avoid an error. */

19430

+/* Override any GCC internal prototype to avoid an error.

19431

+ Use char because int might match the return type of a GCC

19432

+ builtin and then its argument prototype would still apply. */

19433

#ifdef __cplusplus

19434

extern "C"

19435

19436

#endif

19437

-/* We use char because int might match the return type of a gcc2

19438

- builtin and then its argument prototype would still apply. */

19439

char $ac_func ();

19440

/* The GNU C library defines this for functions which it implements

19441

to always fail with ENOSYS. Some functions are actually named

19442

something starting with __ and the normal name is an alias. */

19443

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

19444

+#if defined __stub_$ac_func || defined __stub___$ac_func

19445

choke me

19446

-#else

19447

-char (*f) () = $ac_func;

19448

-#endif

19449

-#ifdef __cplusplus

19450

19451

#endif

19452

19453

int

19454

main ()

19455

{

19456

-return f != $ac_func;

19457

+return $ac_func ();

19458

;

19459

return 0;

19460

}

19461

_ACEOF

19462

rm -f conftest.$ac_objext conftest$ac_exeext

19463

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

19464

- (eval $ac_link) 2>conftest.er1

19465

+if { (ac_try="$ac_link"

19466

+case "(($ac_try" in

19467

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

19468

+ *) ac_try_echo=$ac_try;;

19469

+esac

19470

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

19471

+ (eval "$ac_link") 2>conftest.er1

19472

ac_status=$?

19473

grep -v '^ *+' conftest.er1 >conftest.err

19474

rm -f conftest.er1

19475

cat conftest.err >&5

19476

echo "$as_me:$LINENO: \$? = $ac_status" >&5

19477

- (exit $ac_status); } &&

19478

- { ac_try='test -z "$ac_c_werror_flag"

19479

- || test ! -s conftest.err'

19480

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19481

- (eval $ac_try) 2>&5

19482

- ac_status=$?

19483

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19484

- (exit $ac_status); }; } &&

19485

- { ac_try='test -s conftest$ac_exeext'

19486

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19487

- (eval $ac_try) 2>&5

19488

- ac_status=$?

19489

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19490

- (exit $ac_status); }; }; then

19491

+ (exit $ac_status); } && {

19492

+ test -z "$ac_c_werror_flag" ||

19493

+ test ! -s conftest.err

19494

+ } && test -s conftest$ac_exeext &&

19495

+ $as_test_x conftest$ac_exeext; then

19496

eval "$as_ac_var=yes"

19497

else

19498

echo "$as_me: failed program was:" >&5

19499

sed 's/^/| /' conftest.$ac_ext >&5

19500

19501

-eval "$as_ac_var=no"

19502

+ eval "$as_ac_var=no"

19503

19504

-rm -f conftest.err conftest.$ac_objext \

19505

19506

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19507

conftest$ac_exeext conftest.$ac_ext

19508

19509

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

19510

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

19511

+ac_res=`eval echo '${'$as_ac_var'}'`

19512

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

19513

+echo "${ECHO_T}$ac_res" >&6; }

19514

if test `eval echo '${'$as_ac_var'}'` = yes; then

19515

cat >>confdefs.h <<_ACEOF

19516

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

19517

@@ -29653,8 +29894,8 @@

19518

|| test "$gt_cv_func_ngettext_libc" != "yes" \

19519

|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then

19520

19521

- echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5

19522

-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6

19523

+ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5

19524

+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }

19525

if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then

19526

echo $ECHO_N "(cached) $ECHO_C" >&6

19527

else

19528

@@ -29667,59 +29908,56 @@

19529

cat >>conftest.$ac_ext <<_ACEOF

19530

/* end confdefs.h. */

19531

19532

-/* Override any gcc2 internal prototype to avoid an error. */

19533

+/* Override any GCC internal prototype to avoid an error.

19534

+ Use char because int might match the return type of a GCC

19535

+ builtin and then its argument prototype would still apply. */

19536

#ifdef __cplusplus

19537

extern "C"

19538

#endif

19539

-/* We use char because int might match the return type of a gcc2

19540

- builtin and then its argument prototype would still apply. */

19541

char bindtextdomain ();

19542

int

19543

main ()

19544

{

19545

-bindtextdomain ();

19546

+return bindtextdomain ();

19547

;

19548

return 0;

19549

}

19550

_ACEOF

19551

rm -f conftest.$ac_objext conftest$ac_exeext

19552

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

19553

- (eval $ac_link) 2>conftest.er1

19554

+if { (ac_try="$ac_link"

19555

+case "(($ac_try" in

19556

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

19557

+ *) ac_try_echo=$ac_try;;

19558

+esac

19559

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

19560

+ (eval "$ac_link") 2>conftest.er1

19561

ac_status=$?

19562

grep -v '^ *+' conftest.er1 >conftest.err

19563

rm -f conftest.er1

19564

cat conftest.err >&5

19565

echo "$as_me:$LINENO: \$? = $ac_status" >&5

19566

- (exit $ac_status); } &&

19567

- { ac_try='test -z "$ac_c_werror_flag"

19568

- || test ! -s conftest.err'

19569

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19570

- (eval $ac_try) 2>&5

19571

- ac_status=$?

19572

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19573

- (exit $ac_status); }; } &&

19574

- { ac_try='test -s conftest$ac_exeext'

19575

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19576

- (eval $ac_try) 2>&5

19577

- ac_status=$?

19578

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19579

- (exit $ac_status); }; }; then

19580

+ (exit $ac_status); } && {

19581

+ test -z "$ac_c_werror_flag" ||

19582

+ test ! -s conftest.err

19583

+ } && test -s conftest$ac_exeext &&

19584

+ $as_test_x conftest$ac_exeext; then

19585

ac_cv_lib_intl_bindtextdomain=yes

19586

else

19587

echo "$as_me: failed program was:" >&5

19588

sed 's/^/| /' conftest.$ac_ext >&5

19589

19590

-ac_cv_lib_intl_bindtextdomain=no

19591

+ ac_cv_lib_intl_bindtextdomain=no

19592

19593

-rm -f conftest.err conftest.$ac_objext \

19594

19595

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19596

conftest$ac_exeext conftest.$ac_ext

19597

LIBS=$ac_check_lib_save_LIBS

19598

19599

-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5

19600

-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6

19601

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5

19602

+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }

19603

if test $ac_cv_lib_intl_bindtextdomain = yes; then

19604

- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

19605

-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6

19606

+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

19607

+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }

19608

if test "${ac_cv_lib_intl_ngettext+set}" = set; then

19609

echo $ECHO_N "(cached) $ECHO_C" >&6

19610

else

19611

@@ -29732,59 +29970,56 @@

19612

cat >>conftest.$ac_ext <<_ACEOF

19613

/* end confdefs.h. */

19614

19615

-/* Override any gcc2 internal prototype to avoid an error. */

19616

+/* Override any GCC internal prototype to avoid an error.

19617

+ Use char because int might match the return type of a GCC

19618

+ builtin and then its argument prototype would still apply. */

19619

#ifdef __cplusplus

19620

extern "C"

19621

#endif

19622

-/* We use char because int might match the return type of a gcc2

19623

- builtin and then its argument prototype would still apply. */

19624

char ngettext ();

19625

int

19626

main ()

19627

{

19628

-ngettext ();

19629

+return ngettext ();

19630

;

19631

return 0;

19632

}

19633

_ACEOF

19634

rm -f conftest.$ac_objext conftest$ac_exeext

19635

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

19636

- (eval $ac_link) 2>conftest.er1

19637

+if { (ac_try="$ac_link"

19638

+case "(($ac_try" in

19639

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

19640

+ *) ac_try_echo=$ac_try;;

19641

+esac

19642

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

19643

+ (eval "$ac_link") 2>conftest.er1

19644

ac_status=$?

19645

grep -v '^ *+' conftest.er1 >conftest.err

19646

rm -f conftest.er1

19647

cat conftest.err >&5

19648

echo "$as_me:$LINENO: \$? = $ac_status" >&5

19649

- (exit $ac_status); } &&

19650

- { ac_try='test -z "$ac_c_werror_flag"

19651

- || test ! -s conftest.err'

19652

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19653

- (eval $ac_try) 2>&5

19654

- ac_status=$?

19655

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19656

- (exit $ac_status); }; } &&

19657

- { ac_try='test -s conftest$ac_exeext'

19658

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19659

- (eval $ac_try) 2>&5

19660

- ac_status=$?

19661

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19662

- (exit $ac_status); }; }; then

19663

+ (exit $ac_status); } && {

19664

+ test -z "$ac_c_werror_flag" ||

19665

+ test ! -s conftest.err

19666

+ } && test -s conftest$ac_exeext &&

19667

+ $as_test_x conftest$ac_exeext; then

19668

ac_cv_lib_intl_ngettext=yes

19669

else

19670

echo "$as_me: failed program was:" >&5

19671

sed 's/^/| /' conftest.$ac_ext >&5

19672

19673

-ac_cv_lib_intl_ngettext=no

19674

+ ac_cv_lib_intl_ngettext=no

19675

19676

-rm -f conftest.err conftest.$ac_objext \

19677

19678

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19679

conftest$ac_exeext conftest.$ac_ext

19680

LIBS=$ac_check_lib_save_LIBS

19681

19682

-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

19683

-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6

19684

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

19685

+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }

19686

if test $ac_cv_lib_intl_ngettext = yes; then

19687

- echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5

19688

-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6

19689

+ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5

19690

+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }

19691

if test "${ac_cv_lib_intl_dgettext+set}" = set; then

19692

echo $ECHO_N "(cached) $ECHO_C" >&6

19693

else

19694

@@ -29797,56 +30032,53 @@

19695

cat >>conftest.$ac_ext <<_ACEOF

19696

/* end confdefs.h. */

19697

19698

-/* Override any gcc2 internal prototype to avoid an error. */

19699

+/* Override any GCC internal prototype to avoid an error.

19700

+ Use char because int might match the return type of a GCC

19701

+ builtin and then its argument prototype would still apply. */

19702

#ifdef __cplusplus

19703

extern "C"

19704

#endif

19705

-/* We use char because int might match the return type of a gcc2

19706

- builtin and then its argument prototype would still apply. */

19707

char dgettext ();

19708

int

19709

main ()

19710

{

19711

-dgettext ();

19712

+return dgettext ();

19713

;

19714

return 0;

19715

}

19716

_ACEOF

19717

rm -f conftest.$ac_objext conftest$ac_exeext

19718

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

19719

- (eval $ac_link) 2>conftest.er1

19720

+if { (ac_try="$ac_link"

19721

+case "(($ac_try" in

19722

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

19723

+ *) ac_try_echo=$ac_try;;

19724

+esac

19725

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

19726

+ (eval "$ac_link") 2>conftest.er1

19727

ac_status=$?

19728

grep -v '^ *+' conftest.er1 >conftest.err

19729

rm -f conftest.er1

19730

cat conftest.err >&5

19731

echo "$as_me:$LINENO: \$? = $ac_status" >&5

19732

- (exit $ac_status); } &&

19733

- { ac_try='test -z "$ac_c_werror_flag"

19734

- || test ! -s conftest.err'

19735

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19736

- (eval $ac_try) 2>&5

19737

- ac_status=$?

19738

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19739

- (exit $ac_status); }; } &&

19740

- { ac_try='test -s conftest$ac_exeext'

19741

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19742

- (eval $ac_try) 2>&5

19743

- ac_status=$?

19744

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19745

- (exit $ac_status); }; }; then

19746

+ (exit $ac_status); } && {

19747

+ test -z "$ac_c_werror_flag" ||

19748

+ test ! -s conftest.err

19749

+ } && test -s conftest$ac_exeext &&

19750

+ $as_test_x conftest$ac_exeext; then

19751

ac_cv_lib_intl_dgettext=yes

19752

else

19753

echo "$as_me: failed program was:" >&5

19754

sed 's/^/| /' conftest.$ac_ext >&5

19755

19756

-ac_cv_lib_intl_dgettext=no

19757

+ ac_cv_lib_intl_dgettext=no

19758

19759

-rm -f conftest.err conftest.$ac_objext \

19760

19761

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19762

conftest$ac_exeext conftest.$ac_ext

19763

LIBS=$ac_check_lib_save_LIBS

19764

19765

-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5

19766

-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6

19767

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5

19768

+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }

19769

if test $ac_cv_lib_intl_dgettext = yes; then

19770

gt_cv_func_dgettext_libintl=yes

19771

19772

@@ -29857,12 +30089,12 @@

19773

19774

19775

if test "$gt_cv_func_dgettext_libintl" != "yes" ; then

19776

- echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5

19777

-echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6

19778

- echo "$as_me:$LINENO: result: " >&5

19779

-echo "${ECHO_T}" >&6

19780

- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

19781

-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6

19782

+ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5

19783

+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }

19784

+ { echo "$as_me:$LINENO: result: " >&5

19785

+echo "${ECHO_T}" >&6; }

19786

+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

19787

+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }

19788

if test "${ac_cv_lib_intl_ngettext+set}" = set; then

19789

echo $ECHO_N "(cached) $ECHO_C" >&6

19790

else

19791

@@ -29875,59 +30107,56 @@

19792

cat >>conftest.$ac_ext <<_ACEOF

19793

/* end confdefs.h. */

19794

19795

-/* Override any gcc2 internal prototype to avoid an error. */

19796

+/* Override any GCC internal prototype to avoid an error.

19797

+ Use char because int might match the return type of a GCC

19798

+ builtin and then its argument prototype would still apply. */

19799

#ifdef __cplusplus

19800

extern "C"

19801

#endif

19802

-/* We use char because int might match the return type of a gcc2

19803

- builtin and then its argument prototype would still apply. */

19804

char ngettext ();

19805

int

19806

main ()

19807

{

19808

-ngettext ();

19809

+return ngettext ();

19810

;

19811

return 0;

19812

}

19813

_ACEOF

19814

rm -f conftest.$ac_objext conftest$ac_exeext

19815

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

19816

- (eval $ac_link) 2>conftest.er1

19817

+if { (ac_try="$ac_link"

19818

+case "(($ac_try" in

19819

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

19820

+ *) ac_try_echo=$ac_try;;

19821

+esac

19822

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

19823

+ (eval "$ac_link") 2>conftest.er1

19824

ac_status=$?

19825

grep -v '^ *+' conftest.er1 >conftest.err

19826

rm -f conftest.er1

19827

cat conftest.err >&5

19828

echo "$as_me:$LINENO: \$? = $ac_status" >&5

19829

- (exit $ac_status); } &&

19830

- { ac_try='test -z "$ac_c_werror_flag"

19831

- || test ! -s conftest.err'

19832

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19833

- (eval $ac_try) 2>&5

19834

- ac_status=$?

19835

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19836

- (exit $ac_status); }; } &&

19837

- { ac_try='test -s conftest$ac_exeext'

19838

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19839

- (eval $ac_try) 2>&5

19840

- ac_status=$?

19841

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19842

- (exit $ac_status); }; }; then

19843

+ (exit $ac_status); } && {

19844

+ test -z "$ac_c_werror_flag" ||

19845

+ test ! -s conftest.err

19846

+ } && test -s conftest$ac_exeext &&

19847

+ $as_test_x conftest$ac_exeext; then

19848

ac_cv_lib_intl_ngettext=yes

19849

else

19850

echo "$as_me: failed program was:" >&5

19851

sed 's/^/| /' conftest.$ac_ext >&5

19852

19853

-ac_cv_lib_intl_ngettext=no

19854

+ ac_cv_lib_intl_ngettext=no

19855

19856

-rm -f conftest.err conftest.$ac_objext \

19857

19858

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19859

conftest$ac_exeext conftest.$ac_ext

19860

LIBS=$ac_check_lib_save_LIBS

19861

19862

-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

19863

-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6

19864

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

19865

+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }

19866

if test $ac_cv_lib_intl_ngettext = yes; then

19867

- echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5

19868

-echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6

19869

+ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5

19870

+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }

19871

if test "${ac_cv_lib_intl_dcgettext+set}" = set; then

19872

echo $ECHO_N "(cached) $ECHO_C" >&6

19873

else

19874

@@ -29940,56 +30169,53 @@

19875

cat >>conftest.$ac_ext <<_ACEOF

19876

/* end confdefs.h. */

19877

19878

-/* Override any gcc2 internal prototype to avoid an error. */

19879

+/* Override any GCC internal prototype to avoid an error.

19880

+ Use char because int might match the return type of a GCC

19881

+ builtin and then its argument prototype would still apply. */

19882

#ifdef __cplusplus

19883

extern "C"

19884

#endif

19885

-/* We use char because int might match the return type of a gcc2

19886

- builtin and then its argument prototype would still apply. */

19887

char dcgettext ();

19888

int

19889

main ()

19890

{

19891

-dcgettext ();

19892

+return dcgettext ();

19893

;

19894

return 0;

19895

}

19896

_ACEOF

19897

rm -f conftest.$ac_objext conftest$ac_exeext

19898

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

19899

- (eval $ac_link) 2>conftest.er1

19900

+if { (ac_try="$ac_link"

19901

+case "(($ac_try" in

19902

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

19903

+ *) ac_try_echo=$ac_try;;

19904

+esac

19905

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

19906

+ (eval "$ac_link") 2>conftest.er1

19907

ac_status=$?

19908

grep -v '^ *+' conftest.er1 >conftest.err

19909

rm -f conftest.er1

19910

cat conftest.err >&5

19911

echo "$as_me:$LINENO: \$? = $ac_status" >&5

19912

- (exit $ac_status); } &&

19913

- { ac_try='test -z "$ac_c_werror_flag"

19914

- || test ! -s conftest.err'

19915

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19916

- (eval $ac_try) 2>&5

19917

- ac_status=$?

19918

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19919

- (exit $ac_status); }; } &&

19920

- { ac_try='test -s conftest$ac_exeext'

19921

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

19922

- (eval $ac_try) 2>&5

19923

- ac_status=$?

19924

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

19925

- (exit $ac_status); }; }; then

19926

+ (exit $ac_status); } && {

19927

+ test -z "$ac_c_werror_flag" ||

19928

+ test ! -s conftest.err

19929

+ } && test -s conftest$ac_exeext &&

19930

+ $as_test_x conftest$ac_exeext; then

19931

ac_cv_lib_intl_dcgettext=yes

19932

else

19933

echo "$as_me: failed program was:" >&5

19934

sed 's/^/| /' conftest.$ac_ext >&5

19935

19936

-ac_cv_lib_intl_dcgettext=no

19937

+ ac_cv_lib_intl_dcgettext=no

19938

19939

-rm -f conftest.err conftest.$ac_objext \

19940

19941

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

19942

conftest$ac_exeext conftest.$ac_ext

19943

LIBS=$ac_check_lib_save_LIBS

19944

19945

-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5

19946

-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6

19947

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5

19948

+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }

19949

if test $ac_cv_lib_intl_dcgettext = yes; then

19950

gt_cv_func_dgettext_libintl=yes

19951

libintl_extra_libs=-liconv

19952

@@ -30016,9 +30242,9 @@

19953

for ac_func in bind_textdomain_codeset

19954

19955

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

19956

-echo "$as_me:$LINENO: checking for $ac_func" >&5

19957

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

19958

-if eval "test \"\${$as_ac_var+set}\" = set"; then

19959

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

19960

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

19961

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

19962

echo $ECHO_N "(cached) $ECHO_C" >&6

19963

else

19964

cat >conftest.$ac_ext <<_ACEOF

19965

@@ -30044,68 +30270,60 @@

19966

19967

#undef $ac_func

19968

19969

-/* Override any gcc2 internal prototype to avoid an error. */

19970

+/* Override any GCC internal prototype to avoid an error.

19971

+ Use char because int might match the return type of a GCC

19972

+ builtin and then its argument prototype would still apply. */

19973

#ifdef __cplusplus

19974

extern "C"

19975

19976

#endif

19977

-/* We use char because int might match the return type of a gcc2

19978

- builtin and then its argument prototype would still apply. */

19979

char $ac_func ();

19980

/* The GNU C library defines this for functions which it implements

19981

to always fail with ENOSYS. Some functions are actually named

19982

something starting with __ and the normal name is an alias. */

19983

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

19984

+#if defined __stub_$ac_func || defined __stub___$ac_func

19985

choke me

19986

-#else

19987

-char (*f) () = $ac_func;

19988

-#endif

19989

-#ifdef __cplusplus

19990

19991

#endif

19992

19993

int

19994

main ()

19995

{

19996

-return f != $ac_func;

19997

+return $ac_func ();

19998

;

19999

return 0;

20000

}

20001

_ACEOF

20002

rm -f conftest.$ac_objext conftest$ac_exeext

20003

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

20004

- (eval $ac_link) 2>conftest.er1

20005

+if { (ac_try="$ac_link"

20006

+case "(($ac_try" in

20007

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

20008

+ *) ac_try_echo=$ac_try;;

20009

+esac

20010

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

20011

+ (eval "$ac_link") 2>conftest.er1

20012

ac_status=$?

20013

grep -v '^ *+' conftest.er1 >conftest.err

20014

rm -f conftest.er1

20015

cat conftest.err >&5

20016

echo "$as_me:$LINENO: \$? = $ac_status" >&5

20017

- (exit $ac_status); } &&

20018

- { ac_try='test -z "$ac_c_werror_flag"

20019

- || test ! -s conftest.err'

20020

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20021

- (eval $ac_try) 2>&5

20022

- ac_status=$?

20023

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20024

- (exit $ac_status); }; } &&

20025

- { ac_try='test -s conftest$ac_exeext'

20026

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20027

- (eval $ac_try) 2>&5

20028

- ac_status=$?

20029

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20030

- (exit $ac_status); }; }; then

20031

+ (exit $ac_status); } && {

20032

+ test -z "$ac_c_werror_flag" ||

20033

+ test ! -s conftest.err

20034

+ } && test -s conftest$ac_exeext &&

20035

+ $as_test_x conftest$ac_exeext; then

20036

eval "$as_ac_var=yes"

20037

else

20038

echo "$as_me: failed program was:" >&5

20039

sed 's/^/| /' conftest.$ac_ext >&5

20040

20041

-eval "$as_ac_var=no"

20042

+ eval "$as_ac_var=no"

20043

20044

-rm -f conftest.err conftest.$ac_objext \

20045

20046

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

20047

conftest$ac_exeext conftest.$ac_ext

20048

20049

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

20050

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

20051

+ac_res=`eval echo '${'$as_ac_var'}'`

20052

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

20053

+echo "${ECHO_T}$ac_res" >&6; }

20054

if test `eval echo '${'$as_ac_var'}'` = yes; then

20055

cat >>confdefs.h <<_ACEOF

20056

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

20057

@@ -30144,8 +30362,8 @@

20058

20059

# Extract the first word of "msgfmt", so it can be a program name with args.

20060

set dummy msgfmt; ac_word=$2

20061

-echo "$as_me:$LINENO: checking for $ac_word" >&5

20062

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

20063

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

20064

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

20065

if test "${ac_cv_path_MSGFMT+set}" = set; then

20066

echo $ECHO_N "(cached) $ECHO_C" >&6

20067

else

20068

@@ -30171,11 +30389,11 @@

20069

20070

MSGFMT="$ac_cv_path_MSGFMT"

20071

if test "$MSGFMT" != "no"; then

20072

- echo "$as_me:$LINENO: result: $MSGFMT" >&5

20073

-echo "${ECHO_T}$MSGFMT" >&6

20074

+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5

20075

+echo "${ECHO_T}$MSGFMT" >&6; }

20076

else

20077

- echo "$as_me:$LINENO: result: no" >&5

20078

-echo "${ECHO_T}no" >&6

20079

+ { echo "$as_me:$LINENO: result: no" >&5

20080

+echo "${ECHO_T}no" >&6; }

20081

20082

if test "$MSGFMT" != "no"; then

20083

glib_save_LIBS="$LIBS"

20084

@@ -30184,9 +30402,9 @@

20085

for ac_func in dcgettext

20086

20087

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

20088

-echo "$as_me:$LINENO: checking for $ac_func" >&5

20089

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

20090

-if eval "test \"\${$as_ac_var+set}\" = set"; then

20091

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

20092

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

20093

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

20094

echo $ECHO_N "(cached) $ECHO_C" >&6

20095

else

20096

cat >conftest.$ac_ext <<_ACEOF

20097

@@ -30212,68 +30430,60 @@

20098

20099

#undef $ac_func

20100

20101

-/* Override any gcc2 internal prototype to avoid an error. */

20102

+/* Override any GCC internal prototype to avoid an error.

20103

+ Use char because int might match the return type of a GCC

20104

+ builtin and then its argument prototype would still apply. */

20105

#ifdef __cplusplus

20106

extern "C"

20107

20108

#endif

20109

-/* We use char because int might match the return type of a gcc2

20110

- builtin and then its argument prototype would still apply. */

20111

char $ac_func ();

20112

/* The GNU C library defines this for functions which it implements

20113

to always fail with ENOSYS. Some functions are actually named

20114

something starting with __ and the normal name is an alias. */

20115

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

20116

+#if defined __stub_$ac_func || defined __stub___$ac_func

20117

choke me

20118

-#else

20119

-char (*f) () = $ac_func;

20120

-#endif

20121

-#ifdef __cplusplus

20122

20123

#endif

20124

20125

int

20126

main ()

20127

{

20128

-return f != $ac_func;

20129

+return $ac_func ();

20130

;

20131

return 0;

20132

}

20133

_ACEOF

20134

rm -f conftest.$ac_objext conftest$ac_exeext

20135

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

20136

- (eval $ac_link) 2>conftest.er1

20137

+if { (ac_try="$ac_link"

20138

+case "(($ac_try" in

20139

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

20140

+ *) ac_try_echo=$ac_try;;

20141

+esac

20142

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

20143

+ (eval "$ac_link") 2>conftest.er1

20144

ac_status=$?

20145

grep -v '^ *+' conftest.er1 >conftest.err

20146

rm -f conftest.er1

20147

cat conftest.err >&5

20148

echo "$as_me:$LINENO: \$? = $ac_status" >&5

20149

- (exit $ac_status); } &&

20150

- { ac_try='test -z "$ac_c_werror_flag"

20151

- || test ! -s conftest.err'

20152

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20153

- (eval $ac_try) 2>&5

20154

- ac_status=$?

20155

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20156

- (exit $ac_status); }; } &&

20157

- { ac_try='test -s conftest$ac_exeext'

20158

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20159

- (eval $ac_try) 2>&5

20160

- ac_status=$?

20161

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20162

- (exit $ac_status); }; }; then

20163

+ (exit $ac_status); } && {

20164

+ test -z "$ac_c_werror_flag" ||

20165

+ test ! -s conftest.err

20166

+ } && test -s conftest$ac_exeext &&

20167

+ $as_test_x conftest$ac_exeext; then

20168

eval "$as_ac_var=yes"

20169

else

20170

echo "$as_me: failed program was:" >&5

20171

sed 's/^/| /' conftest.$ac_ext >&5

20172

20173

-eval "$as_ac_var=no"

20174

+ eval "$as_ac_var=no"

20175

20176

-rm -f conftest.err conftest.$ac_objext \

20177

20178

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

20179

conftest$ac_exeext conftest.$ac_ext

20180

20181

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

20182

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

20183

+ac_res=`eval echo '${'$as_ac_var'}'`

20184

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

20185

+echo "${ECHO_T}$ac_res" >&6; }

20186

if test `eval echo '${'$as_ac_var'}'` = yes; then

20187

cat >>confdefs.h <<_ACEOF

20188

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

20189

@@ -30284,8 +30494,8 @@

20190

20191

# Extract the first word of "gmsgfmt", so it can be a program name with args.

20192

set dummy gmsgfmt; ac_word=$2

20193

-echo "$as_me:$LINENO: checking for $ac_word" >&5

20194

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

20195

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

20196

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

20197

if test "${ac_cv_path_GMSGFMT+set}" = set; then

20198

echo $ECHO_N "(cached) $ECHO_C" >&6

20199

else

20200

@@ -30300,32 +30510,33 @@

20201

IFS=$as_save_IFS

20202

test -z "$as_dir" && as_dir=.

20203

for ac_exec_ext in '' $ac_executable_extensions; do

20204

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

20205

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

20206

ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"

20207

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

20208

break 2

20209

20210

done

20211

done

20212

+IFS=$as_save_IFS

20213

20214

test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"

20215

;;

20216

esac

20217

20218

GMSGFMT=$ac_cv_path_GMSGFMT

20219

20220

if test -n "$GMSGFMT"; then

20221

- echo "$as_me:$LINENO: result: $GMSGFMT" >&5

20222

-echo "${ECHO_T}$GMSGFMT" >&6

20223

+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5

20224

+echo "${ECHO_T}$GMSGFMT" >&6; }

20225

else

20226

- echo "$as_me:$LINENO: result: no" >&5

20227

-echo "${ECHO_T}no" >&6

20228

+ { echo "$as_me:$LINENO: result: no" >&5

20229

+echo "${ECHO_T}no" >&6; }

20230

20231

20232

20233

# Extract the first word of "xgettext", so it can be a program name with args.

20234

set dummy xgettext; ac_word=$2

20235

-echo "$as_me:$LINENO: checking for $ac_word" >&5

20236

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

20237

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

20238

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

20239

if test "${ac_cv_path_XGETTEXT+set}" = set; then

20240

echo $ECHO_N "(cached) $ECHO_C" >&6

20241

else

20242

@@ -30351,11 +30562,11 @@

20243

20244

XGETTEXT="$ac_cv_path_XGETTEXT"

20245

if test "$XGETTEXT" != ":"; then

20246

- echo "$as_me:$LINENO: result: $XGETTEXT" >&5

20247

-echo "${ECHO_T}$XGETTEXT" >&6

20248

+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5

20249

+echo "${ECHO_T}$XGETTEXT" >&6; }

20250

else

20251

- echo "$as_me:$LINENO: result: no" >&5

20252

-echo "${ECHO_T}no" >&6

20253

+ { echo "$as_me:$LINENO: result: no" >&5

20254

+echo "${ECHO_T}no" >&6; }

20255

20256

20257

cat >conftest.$ac_ext <<_ACEOF

20258

@@ -30375,37 +30586,33 @@

20259

}

20260

_ACEOF

20261

rm -f conftest.$ac_objext conftest$ac_exeext

20262

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

20263

- (eval $ac_link) 2>conftest.er1

20264

+if { (ac_try="$ac_link"

20265

+case "(($ac_try" in

20266

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

20267

+ *) ac_try_echo=$ac_try;;

20268

+esac

20269

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

20270

+ (eval "$ac_link") 2>conftest.er1

20271

ac_status=$?

20272

grep -v '^ *+' conftest.er1 >conftest.err

20273

rm -f conftest.er1

20274

cat conftest.err >&5

20275

echo "$as_me:$LINENO: \$? = $ac_status" >&5

20276

- (exit $ac_status); } &&

20277

- { ac_try='test -z "$ac_c_werror_flag"

20278

- || test ! -s conftest.err'

20279

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20280

- (eval $ac_try) 2>&5

20281

- ac_status=$?

20282

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20283

- (exit $ac_status); }; } &&

20284

- { ac_try='test -s conftest$ac_exeext'

20285

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20286

- (eval $ac_try) 2>&5

20287

- ac_status=$?

20288

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20289

- (exit $ac_status); }; }; then

20290

+ (exit $ac_status); } && {

20291

+ test -z "$ac_c_werror_flag" ||

20292

+ test ! -s conftest.err

20293

+ } && test -s conftest$ac_exeext &&

20294

+ $as_test_x conftest$ac_exeext; then

20295

CATOBJEXT=.gmo

20296

DATADIRNAME=share

20297

else

20298

echo "$as_me: failed program was:" >&5

20299

sed 's/^/| /' conftest.$ac_ext >&5

20300

20301

-case $host in

20302

+ case $host in

20303

*-*-solaris*)

20304

- echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

20305

-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6

20306

+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

20307

+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }

20308

if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then

20309

echo $ECHO_N "(cached) $ECHO_C" >&6

20310

else

20311

@@ -30432,68 +30639,59 @@

20312

20313

#undef bind_textdomain_codeset

20314

20315

-/* Override any gcc2 internal prototype to avoid an error. */

20316

+/* Override any GCC internal prototype to avoid an error.

20317

+ Use char because int might match the return type of a GCC

20318

+ builtin and then its argument prototype would still apply. */

20319

#ifdef __cplusplus

20320

extern "C"

20321

20322

#endif

20323

-/* We use char because int might match the return type of a gcc2

20324

- builtin and then its argument prototype would still apply. */

20325

char bind_textdomain_codeset ();

20326

/* The GNU C library defines this for functions which it implements

20327

to always fail with ENOSYS. Some functions are actually named

20328

something starting with __ and the normal name is an alias. */

20329

-#if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset)

20330

+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset

20331

choke me

20332

-#else

20333

-char (*f) () = bind_textdomain_codeset;

20334

-#endif

20335

-#ifdef __cplusplus

20336

20337

#endif

20338

20339

int

20340

main ()

20341

{

20342

-return f != bind_textdomain_codeset;

20343

+return bind_textdomain_codeset ();

20344

;

20345

return 0;

20346

}

20347

_ACEOF

20348

rm -f conftest.$ac_objext conftest$ac_exeext

20349

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

20350

- (eval $ac_link) 2>conftest.er1

20351

+if { (ac_try="$ac_link"

20352

+case "(($ac_try" in

20353

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

20354

+ *) ac_try_echo=$ac_try;;

20355

+esac

20356

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

20357

+ (eval "$ac_link") 2>conftest.er1

20358

ac_status=$?

20359

grep -v '^ *+' conftest.er1 >conftest.err

20360

rm -f conftest.er1

20361

cat conftest.err >&5

20362

echo "$as_me:$LINENO: \$? = $ac_status" >&5

20363

- (exit $ac_status); } &&

20364

- { ac_try='test -z "$ac_c_werror_flag"

20365

- || test ! -s conftest.err'

20366

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20367

- (eval $ac_try) 2>&5

20368

- ac_status=$?

20369

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20370

- (exit $ac_status); }; } &&

20371

- { ac_try='test -s conftest$ac_exeext'

20372

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20373

- (eval $ac_try) 2>&5

20374

- ac_status=$?

20375

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20376

- (exit $ac_status); }; }; then

20377

+ (exit $ac_status); } && {

20378

+ test -z "$ac_c_werror_flag" ||

20379

+ test ! -s conftest.err

20380

+ } && test -s conftest$ac_exeext &&

20381

+ $as_test_x conftest$ac_exeext; then

20382

ac_cv_func_bind_textdomain_codeset=yes

20383

else

20384

echo "$as_me: failed program was:" >&5

20385

sed 's/^/| /' conftest.$ac_ext >&5

20386

20387

-ac_cv_func_bind_textdomain_codeset=no

20388

+ ac_cv_func_bind_textdomain_codeset=no

20389

20390

-rm -f conftest.err conftest.$ac_objext \

20391

20392

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

20393

conftest$ac_exeext conftest.$ac_ext

20394

20395

-echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

20396

-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6

20397

+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

20398

+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }

20399

if test $ac_cv_func_bind_textdomain_codeset = yes; then

20400

CATOBJEXT=.gmo

20401

DATADIRNAME=share

20402

@@ -30509,7 +30707,8 @@

20403

;;

20404

esac

20405

20406

-rm -f conftest.err conftest.$ac_objext \

20407

20408

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

20409

conftest$ac_exeext conftest.$ac_ext

20410

LIBS="$glib_save_LIBS"

20411

INSTOBJEXT=.mo

20412

@@ -30534,8 +30733,8 @@

20413

if $XGETTEXT --omit-header /dev/null 2> /dev/null; then

20414

: ;

20415

else

20416

- echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5

20417

-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6

20418

+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5

20419

+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }

20420

XGETTEXT=":"

20421

20422

20423

@@ -30543,7 +30742,7 @@

20424

# We need to process the po/ directory.

20425

POSUB=po

20426

20427

- ac_config_commands="$ac_config_commands default-1"

20428

+ ac_config_commands="$ac_config_commands default-1"

20429

20430

20431

for lang in $ALL_LINGUAS; do

20432

@@ -30567,8 +30766,8 @@

20433

if test "x$ALL_LINGUAS" = "x"; then

20434

LINGUAS=

20435

else

20436

- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5

20437

-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6

20438

+ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5

20439

+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }

20440

NEW_LINGUAS=

20441

for presentlang in $ALL_LINGUAS; do

20442

useit=no

20443

@@ -30592,8 +30791,8 @@

20444

20445

done

20446

LINGUAS=$NEW_LINGUAS

20447

- echo "$as_me:$LINENO: result: $LINGUAS" >&5

20448

-echo "${ECHO_T}$LINGUAS" >&6

20449

+ { echo "$as_me:$LINENO: result: $LINGUAS" >&5

20450

+echo "${ECHO_T}$LINGUAS" >&6; }

20451

20452

20453

if test -n "$LINGUAS"; then

20454

@@ -30632,10 +30831,9 @@

20455

WITH_MING=yes

20456

20457

20458

-# Check whether --with-ming or --without-ming was given.

20459

+# Check whether --with-ming was given.

20460

if test "${with_ming+set}" = set; then

20461

- withval="$with_ming"

20462

20463

+ withval=$with_ming;

20464

case "${withval}" in

20465

yes) WITH_MING=yes

20466

;;

20467

@@ -30648,13 +30846,14 @@

20468

20469

else

20470

MING_CONFIG=""

20471

-fi;

20472

+fi

20473

20474

20475

if test x"$MING_CONFIG" = "x"; then

20476

# Extract the first word of "ming-config", so it can be a program name with args.

20477

set dummy ming-config; ac_word=$2

20478

-echo "$as_me:$LINENO: checking for $ac_word" >&5

20479

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

20480

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

20481

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

20482

if test "${ac_cv_path_MING_CONFIG+set}" = set; then

20483

echo $ECHO_N "(cached) $ECHO_C" >&6

20484

else

20485

@@ -30669,27 +30868,28 @@

20486

IFS=$as_save_IFS

20487

test -z "$as_dir" && as_dir=.

20488

for ac_exec_ext in '' $ac_executable_extensions; do

20489

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

20490

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

20491

ac_cv_path_MING_CONFIG="$as_dir/$ac_word$ac_exec_ext"

20492

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

20493

break 2

20494

20495

done

20496

done

20497

+IFS=$as_save_IFS

20498

20499

;;

20500

esac

20501

20502

MING_CONFIG=$ac_cv_path_MING_CONFIG

20503

20504

if test -n "$MING_CONFIG"; then

20505

- echo "$as_me:$LINENO: result: $MING_CONFIG" >&5

20506

-echo "${ECHO_T}$MING_CONFIG" >&6

20507

+ { echo "$as_me:$LINENO: result: $MING_CONFIG" >&5

20508

+echo "${ECHO_T}$MING_CONFIG" >&6; }

20509

else

20510

- echo "$as_me:$LINENO: result: no" >&5

20511

-echo "${ECHO_T}no" >&6

20512

+ { echo "$as_me:$LINENO: result: no" >&5

20513

+echo "${ECHO_T}no" >&6; }

20514

20515

20516

20517

20518

20519

if test x"$MING_CONFIG" != "x" -a "$WITH_MING" = "yes"; then

20520

@@ -30698,8 +30898,8 @@

20521

MING_PATH=`$MING_CONFIG --bindir`

20522

# Extract the first word of "makeswf", so it can be a program name with args.

20523

set dummy makeswf; ac_word=$2

20524

-echo "$as_me:$LINENO: checking for $ac_word" >&5

20525

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

20526

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

20527

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

20528

if test "${ac_cv_path_MAKESWF+set}" = set; then

20529

echo $ECHO_N "(cached) $ECHO_C" >&6

20530

else

20531

@@ -30715,27 +30915,28 @@

20532

IFS=$as_save_IFS

20533

test -z "$as_dir" && as_dir=.

20534

for ac_exec_ext in '' $ac_executable_extensions; do

20535

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

20536

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

20537

ac_cv_path_MAKESWF="$as_dir/$ac_word$ac_exec_ext"

20538

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

20539

break 2

20540

20541

done

20542

done

20543

+IFS=$as_save_IFS

20544

20545

;;

20546

esac

20547

20548

MAKESWF=$ac_cv_path_MAKESWF

20549

20550

if test -n "$MAKESWF"; then

20551

- echo "$as_me:$LINENO: result: $MAKESWF" >&5

20552

-echo "${ECHO_T}$MAKESWF" >&6

20553

+ { echo "$as_me:$LINENO: result: $MAKESWF" >&5

20554

+echo "${ECHO_T}$MAKESWF" >&6; }

20555

else

20556

- echo "$as_me:$LINENO: result: no" >&5

20557

-echo "${ECHO_T}no" >&6

20558

+ { echo "$as_me:$LINENO: result: no" >&5

20559

+echo "${ECHO_T}no" >&6; }

20560

20561

20562

20563

20564

20565

20566

@@ -30775,18 +30976,18 @@

20567

20568

20569

20570

-# Check whether --with-libgd or --without-libgd was given.

20571

+# Check whether --with-libgd was given.

20572

if test "${with_libgd+set}" = set; then

20573

- withval="$with_libgd"

20574

+ withval=$with_libgd;

20575

+fi

20576

20577

-fi;

20578

20579

20580

-# Check whether --with-mylibgd or --without-mylibgd was given.

20581

+# Check whether --with-mylibgd was given.

20582

if test "${with_mylibgd+set}" = set; then

20583

- withval="$with_mylibgd"

20584

+ withval=$with_mylibgd;

20585

+fi

20586

20587

-fi;

20588

20589

### default is to build with libgd

20590

if test "x$with_libgd" != "xno"; then

20591

@@ -30800,8 +31001,8 @@

20592

if test "x$with_mylibgd" != "xyes"; then

20593

# Extract the first word of "gdlib-config", so it can be a program name with args.

20594

set dummy gdlib-config; ac_word=$2

20595

-echo "$as_me:$LINENO: checking for $ac_word" >&5

20596

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

20597

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

20598

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

20599

if test "${ac_cv_path_GDLIB_CONFIG+set}" = set; then

20600

echo $ECHO_N "(cached) $ECHO_C" >&6

20601

else

20602

@@ -30816,27 +31017,28 @@

20603

IFS=$as_save_IFS

20604

test -z "$as_dir" && as_dir=.

20605

for ac_exec_ext in '' $ac_executable_extensions; do

20606

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

20607

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

20608

ac_cv_path_GDLIB_CONFIG="$as_dir/$ac_word$ac_exec_ext"

20609

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

20610

break 2

20611

20612

done

20613

done

20614

+IFS=$as_save_IFS

20615

20616

;;

20617

esac

20618

20619

GDLIB_CONFIG=$ac_cv_path_GDLIB_CONFIG

20620

20621

if test -n "$GDLIB_CONFIG"; then

20622

- echo "$as_me:$LINENO: result: $GDLIB_CONFIG" >&5

20623

-echo "${ECHO_T}$GDLIB_CONFIG" >&6

20624

+ { echo "$as_me:$LINENO: result: $GDLIB_CONFIG" >&5

20625

+echo "${ECHO_T}$GDLIB_CONFIG" >&6; }

20626

else

20627

- echo "$as_me:$LINENO: result: no" >&5

20628

-echo "${ECHO_T}no" >&6

20629

+ { echo "$as_me:$LINENO: result: no" >&5

20630

+echo "${ECHO_T}no" >&6; }

20631

20632

20633

20634

if test -n "$GDLIB_CONFIG"; then

20635

GD_INCLUDES=`$GDLIB_CONFIG --includes`

20636

GD_LDFLAGS=`$GDLIB_CONFIG --ldflags`

20637

@@ -30889,31 +31091,31 @@

20638

save_CPPFLAGS=$CPPFLAGS

20639

save_LDFLAGS=$LDFLAGS

20640

20641

-# Check whether --with-gdincludedir or --without-gdincludedir was given.

20642

+# Check whether --with-gdincludedir was given.

20643

if test "${with_gdincludedir+set}" = set; then

20644

- withval="$with_gdincludedir"

20645

- GD_INCLUDES="-I$withval"

20646

-fi;

20647

+ withval=$with_gdincludedir; GD_INCLUDES="-I$withval"

20648

+fi

20649

20650

CPPFLAGS="$CPPFLAGS $GD_INCLUDES"

20651

20652

-# Check whether --with-gdlibdir or --without-gdlibdir was given.

20653

+# Check whether --with-gdlibdir was given.

20654

if test "${with_gdlibdir+set}" = set; then

20655

- withval="$with_gdlibdir"

20656

- GD_LDFLAGS="-L$withval"

20657

-fi;

20658

+ withval=$with_gdlibdir; GD_LDFLAGS="-L$withval"

20659

+fi

20660

20661

LDFLAGS="$LDFLAGS $GD_LDFLAGS"

20662

if test "${ac_cv_header_gd_h+set}" = set; then

20663

- echo "$as_me:$LINENO: checking for gd.h" >&5

20664

-echo $ECHO_N "checking for gd.h... $ECHO_C" >&6

20665

+ { echo "$as_me:$LINENO: checking for gd.h" >&5

20666

+echo $ECHO_N "checking for gd.h... $ECHO_C" >&6; }

20667

if test "${ac_cv_header_gd_h+set}" = set; then

20668

echo $ECHO_N "(cached) $ECHO_C" >&6

20669

20670

-echo "$as_me:$LINENO: result: $ac_cv_header_gd_h" >&5

20671

-echo "${ECHO_T}$ac_cv_header_gd_h" >&6

20672

+{ echo "$as_me:$LINENO: result: $ac_cv_header_gd_h" >&5

20673

+echo "${ECHO_T}$ac_cv_header_gd_h" >&6; }

20674

else

20675

# Is the header compilable?

20676

-echo "$as_me:$LINENO: checking gd.h usability" >&5

20677

-echo $ECHO_N "checking gd.h usability... $ECHO_C" >&6

20678

+{ echo "$as_me:$LINENO: checking gd.h usability" >&5

20679

+echo $ECHO_N "checking gd.h usability... $ECHO_C" >&6; }

20680

cat >conftest.$ac_ext <<_ACEOF

20681

/* confdefs.h. */

20682

_ACEOF

20683

@@ -30924,41 +31126,37 @@

20684

#include <gd.h>

20685

_ACEOF

20686

rm -f conftest.$ac_objext

20687

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

20688

- (eval $ac_compile) 2>conftest.er1

20689

+if { (ac_try="$ac_compile"

20690

+case "(($ac_try" in

20691

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

20692

+ *) ac_try_echo=$ac_try;;

20693

+esac

20694

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

20695

+ (eval "$ac_compile") 2>conftest.er1

20696

ac_status=$?

20697

grep -v '^ *+' conftest.er1 >conftest.err

20698

rm -f conftest.er1

20699

cat conftest.err >&5

20700

echo "$as_me:$LINENO: \$? = $ac_status" >&5

20701

- (exit $ac_status); } &&

20702

- { ac_try='test -z "$ac_c_werror_flag"

20703

- || test ! -s conftest.err'

20704

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20705

- (eval $ac_try) 2>&5

20706

- ac_status=$?

20707

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20708

- (exit $ac_status); }; } &&

20709

- { ac_try='test -s conftest.$ac_objext'

20710

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20711

- (eval $ac_try) 2>&5

20712

- ac_status=$?

20713

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20714

- (exit $ac_status); }; }; then

20715

+ (exit $ac_status); } && {

20716

+ test -z "$ac_c_werror_flag" ||

20717

+ test ! -s conftest.err

20718

+ } && test -s conftest.$ac_objext; then

20719

ac_header_compiler=yes

20720

else

20721

echo "$as_me: failed program was:" >&5

20722

sed 's/^/| /' conftest.$ac_ext >&5

20723

20724

-ac_header_compiler=no

20725

+ ac_header_compiler=no

20726

20727

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

20728

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

20729

-echo "${ECHO_T}$ac_header_compiler" >&6

20730

20731

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

20732

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

20733

+echo "${ECHO_T}$ac_header_compiler" >&6; }

20734

20735

# Is the header present?

20736

-echo "$as_me:$LINENO: checking gd.h presence" >&5

20737

-echo $ECHO_N "checking gd.h presence... $ECHO_C" >&6

20738

+{ echo "$as_me:$LINENO: checking gd.h presence" >&5

20739

+echo $ECHO_N "checking gd.h presence... $ECHO_C" >&6; }

20740

cat >conftest.$ac_ext <<_ACEOF

20741

/* confdefs.h. */

20742

_ACEOF

20743

@@ -30967,24 +31165,22 @@

20744

/* end confdefs.h. */

20745

#include <gd.h>

20746

_ACEOF

20747

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

20748

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

20749

+if { (ac_try="$ac_cpp conftest.$ac_ext"

20750

+case "(($ac_try" in

20751

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

20752

+ *) ac_try_echo=$ac_try;;

20753

+esac

20754

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

20755

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

20756

ac_status=$?

20757

grep -v '^ *+' conftest.er1 >conftest.err

20758

rm -f conftest.er1

20759

cat conftest.err >&5

20760

echo "$as_me:$LINENO: \$? = $ac_status" >&5

20761

- (exit $ac_status); } >/dev/null; then

20762

- if test -s conftest.err; then

20763

- ac_cpp_err=$ac_c_preproc_warn_flag

20764

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

20765

- else

20766

- ac_cpp_err=

20767

- fi

20768

-else

20769

- ac_cpp_err=yes

20770

-fi

20771

-if test -z "$ac_cpp_err"; then

20772

+ (exit $ac_status); } >/dev/null && {

20773

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

20774

+ test ! -s conftest.err

20775

+ }; then

20776

ac_header_preproc=yes

20777

else

20778

echo "$as_me: failed program was:" >&5

20779

@@ -30992,9 +31188,10 @@

20780

20781

ac_header_preproc=no

20782

20783

20784

rm -f conftest.err conftest.$ac_ext

20785

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

20786

-echo "${ECHO_T}$ac_header_preproc" >&6

20787

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

20788

+echo "${ECHO_T}$ac_header_preproc" >&6; }

20789

20790

# So? What about this header?

20791

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

20792

@@ -31018,30 +31215,23 @@

20793

echo "$as_me: WARNING: gd.h: proceeding with the preprocessor's result" >&2;}

20794

{ echo "$as_me:$LINENO: WARNING: gd.h: in the future, the compiler will take precedence" >&5

20795

echo "$as_me: WARNING: gd.h: in the future, the compiler will take precedence" >&2;}

20796

- (

20797

- cat <<\_ASBOX

20798

-## ----------------------------------- ##

20799

-## Report this to the graphviz lists. ##

20800

-## ----------------------------------- ##

20801

-_ASBOX

20802

- ) |

20803

- sed "s/^/$as_me: WARNING: /" >&2

20804

20805

;;

20806

esac

20807

-echo "$as_me:$LINENO: checking for gd.h" >&5

20808

-echo $ECHO_N "checking for gd.h... $ECHO_C" >&6

20809

+{ echo "$as_me:$LINENO: checking for gd.h" >&5

20810

+echo $ECHO_N "checking for gd.h... $ECHO_C" >&6; }

20811

if test "${ac_cv_header_gd_h+set}" = set; then

20812

echo $ECHO_N "(cached) $ECHO_C" >&6

20813

else

20814

ac_cv_header_gd_h=$ac_header_preproc

20815

20816

-echo "$as_me:$LINENO: result: $ac_cv_header_gd_h" >&5

20817

-echo "${ECHO_T}$ac_cv_header_gd_h" >&6

20818

+{ echo "$as_me:$LINENO: result: $ac_cv_header_gd_h" >&5

20819

+echo "${ECHO_T}$ac_cv_header_gd_h" >&6; }

20820

20821

20822

if test $ac_cv_header_gd_h = yes; then

20823

- echo "$as_me:$LINENO: checking for main in -lgd" >&5

20824

-echo $ECHO_N "checking for main in -lgd... $ECHO_C" >&6

20825

+ { echo "$as_me:$LINENO: checking for main in -lgd" >&5

20826

+echo $ECHO_N "checking for main in -lgd... $ECHO_C" >&6; }

20827

if test "${ac_cv_lib_gd_main+set}" = set; then

20828

echo $ECHO_N "(cached) $ECHO_C" >&6

20829

else

20830

@@ -31058,46 +31248,43 @@

20831

int

20832

main ()

20833

{

20834

-main ();

20835

+return main ();

20836

;

20837

return 0;

20838

}

20839

_ACEOF

20840

rm -f conftest.$ac_objext conftest$ac_exeext

20841

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

20842

- (eval $ac_link) 2>conftest.er1

20843

+if { (ac_try="$ac_link"

20844

+case "(($ac_try" in

20845

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

20846

+ *) ac_try_echo=$ac_try;;

20847

+esac

20848

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

20849

+ (eval "$ac_link") 2>conftest.er1

20850

ac_status=$?

20851

grep -v '^ *+' conftest.er1 >conftest.err

20852

rm -f conftest.er1

20853

cat conftest.err >&5

20854

echo "$as_me:$LINENO: \$? = $ac_status" >&5

20855

- (exit $ac_status); } &&

20856

- { ac_try='test -z "$ac_c_werror_flag"

20857

- || test ! -s conftest.err'

20858

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20859

- (eval $ac_try) 2>&5

20860

- ac_status=$?

20861

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20862

- (exit $ac_status); }; } &&

20863

- { ac_try='test -s conftest$ac_exeext'

20864

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

20865

- (eval $ac_try) 2>&5

20866

- ac_status=$?

20867

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

20868

- (exit $ac_status); }; }; then

20869

+ (exit $ac_status); } && {

20870

+ test -z "$ac_c_werror_flag" ||

20871

+ test ! -s conftest.err

20872

+ } && test -s conftest$ac_exeext &&

20873

+ $as_test_x conftest$ac_exeext; then

20874

ac_cv_lib_gd_main=yes

20875

else

20876

echo "$as_me: failed program was:" >&5

20877

sed 's/^/| /' conftest.$ac_ext >&5

20878

20879

-ac_cv_lib_gd_main=no

20880

+ ac_cv_lib_gd_main=no

20881

20882

-rm -f conftest.err conftest.$ac_objext \

20883

20884

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

20885

conftest$ac_exeext conftest.$ac_ext

20886

LIBS=$ac_check_lib_save_LIBS

20887

20888

-echo "$as_me:$LINENO: result: $ac_cv_lib_gd_main" >&5

20889

-echo "${ECHO_T}$ac_cv_lib_gd_main" >&6

20890

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gd_main" >&5

20891

+echo "${ECHO_T}$ac_cv_lib_gd_main" >&6; }

20892

if test $ac_cv_lib_gd_main = yes; then

20893

GD_LIBS="$GD_LDFLAGS -lgd $GD_LIBS"

20894

20895

@@ -31167,18 +31354,18 @@

20896

save_CPPFLAGS=$CPPFLAGS

20897

save_LDFLAGS=$LDFLAGS

20898

20899

-# Check whether --with-iconvincludedir or --without-iconvincludedir was given.

20900

+# Check whether --with-iconvincludedir was given.

20901

if test "${with_iconvincludedir+set}" = set; then

20902

- withval="$with_iconvincludedir"

20903

- ICONV_INCLUDES="-I$withval"

20904

-fi;

20905

+ withval=$with_iconvincludedir; ICONV_INCLUDES="-I$withval"

20906

+fi

20907

20908

CPPFLAGS="$CPPFLAGS $ICONV_INCLUDES"

20909

20910

-# Check whether --with-iconvlibdir or --without-iconvlibdir was given.

20911

+# Check whether --with-iconvlibdir was given.

20912

if test "${with_iconvlibdir+set}" = set; then

20913

- withval="$with_iconvlibdir"

20914

- ICONV_LIBS="-L$withval"

20915

-fi;

20916

+ withval=$with_iconvlibdir; ICONV_LIBS="-L$withval"

20917

+fi

20918

20919

LDFLAGS="$LDFLAGS $ICONV_LIBS"

20920

20921

# Some systems have iconv in a separate library (e.g. Tru64 UNIX)

20922

@@ -31199,18 +31386,18 @@

20923

prefix="$acl_save_prefix"

20924

20925

20926

-# Check whether --with-gnu-ld or --without-gnu-ld was given.

20927

+# Check whether --with-gnu-ld was given.

20928

if test "${with_gnu_ld+set}" = set; then

20929

- withval="$with_gnu_ld"

20930

- test "$withval" = no || with_gnu_ld=yes

20931

+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

20932

else

20933

with_gnu_ld=no

20934

-fi;

20935

+fi

20936

20937

ac_prog=ld

20938

if test "$GCC" = yes; then

20939

# Check if gcc -print-prog-name=ld gives a path.

20940

- echo "$as_me:$LINENO: checking for ld used by GCC" >&5

20941

-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6

20942

+ { echo "$as_me:$LINENO: checking for ld used by GCC" >&5

20943

+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }

20944

case $host in

20945

*-*-mingw*)

20946

# gcc leaves a trailing carriage return which upsets mingw

20947

@@ -31239,11 +31426,11 @@

20948

;;

20949

esac

20950

elif test "$with_gnu_ld" = yes; then

20951

- echo "$as_me:$LINENO: checking for GNU ld" >&5

20952

-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6

20953

+ { echo "$as_me:$LINENO: checking for GNU ld" >&5

20954

+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

20955

else

20956

- echo "$as_me:$LINENO: checking for non-GNU ld" >&5

20957

-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6

20958

+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

20959

+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

20960

20961

if test "${acl_cv_path_LD+set}" = set; then

20962

echo $ECHO_N "(cached) $ECHO_C" >&6

20963

@@ -31272,17 +31459,17 @@

20964

20965

LD="$acl_cv_path_LD"

20966

if test -n "$LD"; then

20967

- echo "$as_me:$LINENO: result: $LD" >&5

20968

-echo "${ECHO_T}$LD" >&6

20969

+ { echo "$as_me:$LINENO: result: $LD" >&5

20970

+echo "${ECHO_T}$LD" >&6; }

20971

else

20972

- echo "$as_me:$LINENO: result: no" >&5

20973

-echo "${ECHO_T}no" >&6

20974

+ { echo "$as_me:$LINENO: result: no" >&5

20975

+echo "${ECHO_T}no" >&6; }

20976

20977

test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

20978

echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

20979

{ (exit 1); exit 1; }; }

20980

-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

20981

-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6

20982

+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

20983

+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

20984

if test "${acl_cv_prog_gnu_ld+set}" = set; then

20985

echo $ECHO_N "(cached) $ECHO_C" >&6

20986

else

20987

@@ -31293,14 +31480,14 @@

20988

acl_cv_prog_gnu_ld=no

20989

20990

20991

-echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5

20992

-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6

20993

+{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5

20994

+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }

20995

with_gnu_ld=$acl_cv_prog_gnu_ld

20996

20997

20998

20999

- echo "$as_me:$LINENO: checking for shared library run path origin" >&5

21000

-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6

21001

+ { echo "$as_me:$LINENO: checking for shared library run path origin" >&5

21002

+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }

21003

if test "${acl_cv_rpath+set}" = set; then

21004

echo $ECHO_N "(cached) $ECHO_C" >&6

21005

else

21006

@@ -31312,8 +31499,8 @@

21007

acl_cv_rpath=done

21008

21009

21010

-echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5

21011

-echo "${ECHO_T}$acl_cv_rpath" >&6

21012

+{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5

21013

+echo "${ECHO_T}$acl_cv_rpath" >&6; }

21014

wl="$acl_cv_wl"

21015

libext="$acl_cv_libext"

21016

shlibext="$acl_cv_shlibext"

21017

@@ -31323,13 +31510,13 @@

21018

hardcode_minus_L="$acl_cv_hardcode_minus_L"

21019

sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"

21020

sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"

21021

- # Check whether --enable-rpath or --disable-rpath was given.

21022

+ # Check whether --enable-rpath was given.

21023

if test "${enable_rpath+set}" = set; then

21024

- enableval="$enable_rpath"

21025

- :

21026

+ enableval=$enable_rpath; :

21027

else

21028

enable_rpath=yes

21029

-fi;

21030

+fi

21031

21032

21033

21034

21035

@@ -31351,10 +31538,9 @@

21036

prefix="$acl_save_prefix"

21037

21038

21039

-# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.

21040

+# Check whether --with-libiconv-prefix was given.

21041

if test "${with_libiconv_prefix+set}" = set; then

21042

- withval="$with_libiconv_prefix"

21043

21044

+ withval=$with_libiconv_prefix;

21045

if test "X$withval" = "Xno"; then

21046

use_additional=no

21047

else

21048

@@ -31377,7 +31563,8 @@

21049

21050

21051

21052

-fi;

21053

+fi

21054

21055

LIBICONV=

21056

LTLIBICONV=

21057

INCICONV=

21058

@@ -31744,8 +31931,8 @@

21059

done

21060

21061

21062

- echo "$as_me:$LINENO: checking for iconv" >&5

21063

-echo $ECHO_N "checking for iconv... $ECHO_C" >&6

21064

+ { echo "$as_me:$LINENO: checking for iconv" >&5

21065

+echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }

21066

if test "${am_cv_func_iconv+set}" = set; then

21067

echo $ECHO_N "(cached) $ECHO_C" >&6

21068

else

21069

@@ -31771,34 +31958,32 @@

21070

}

21071

_ACEOF

21072

rm -f conftest.$ac_objext conftest$ac_exeext

21073

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

21074

- (eval $ac_link) 2>conftest.er1

21075

+if { (ac_try="$ac_link"

21076

+case "(($ac_try" in

21077

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

21078

+ *) ac_try_echo=$ac_try;;

21079

+esac

21080

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

21081

+ (eval "$ac_link") 2>conftest.er1

21082

ac_status=$?

21083

grep -v '^ *+' conftest.er1 >conftest.err

21084

rm -f conftest.er1

21085

cat conftest.err >&5

21086

echo "$as_me:$LINENO: \$? = $ac_status" >&5

21087

- (exit $ac_status); } &&

21088

- { ac_try='test -z "$ac_c_werror_flag"

21089

- || test ! -s conftest.err'

21090

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21091

- (eval $ac_try) 2>&5

21092

- ac_status=$?

21093

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21094

- (exit $ac_status); }; } &&

21095

- { ac_try='test -s conftest$ac_exeext'

21096

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21097

- (eval $ac_try) 2>&5

21098

- ac_status=$?

21099

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21100

- (exit $ac_status); }; }; then

21101

+ (exit $ac_status); } && {

21102

+ test -z "$ac_c_werror_flag" ||

21103

+ test ! -s conftest.err

21104

+ } && test -s conftest$ac_exeext &&

21105

+ $as_test_x conftest$ac_exeext; then

21106

am_cv_func_iconv=yes

21107

else

21108

echo "$as_me: failed program was:" >&5

21109

sed 's/^/| /' conftest.$ac_ext >&5

21110

21111

21112

21113

-rm -f conftest.err conftest.$ac_objext \

21114

21115

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

21116

conftest$ac_exeext conftest.$ac_ext

21117

if test "$am_cv_func_iconv" != yes; then

21118

am_save_LIBS="$LIBS"

21119

@@ -31822,42 +32007,40 @@

21120

}

21121

_ACEOF

21122

rm -f conftest.$ac_objext conftest$ac_exeext

21123

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

21124

- (eval $ac_link) 2>conftest.er1

21125

+if { (ac_try="$ac_link"

21126

+case "(($ac_try" in

21127

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

21128

+ *) ac_try_echo=$ac_try;;

21129

+esac

21130

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

21131

+ (eval "$ac_link") 2>conftest.er1

21132

ac_status=$?

21133

grep -v '^ *+' conftest.er1 >conftest.err

21134

rm -f conftest.er1

21135

cat conftest.err >&5

21136

echo "$as_me:$LINENO: \$? = $ac_status" >&5

21137

- (exit $ac_status); } &&

21138

- { ac_try='test -z "$ac_c_werror_flag"

21139

- || test ! -s conftest.err'

21140

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21141

- (eval $ac_try) 2>&5

21142

- ac_status=$?

21143

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21144

- (exit $ac_status); }; } &&

21145

- { ac_try='test -s conftest$ac_exeext'

21146

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21147

- (eval $ac_try) 2>&5

21148

- ac_status=$?

21149

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21150

- (exit $ac_status); }; }; then

21151

+ (exit $ac_status); } && {

21152

+ test -z "$ac_c_werror_flag" ||

21153

+ test ! -s conftest.err

21154

+ } && test -s conftest$ac_exeext &&

21155

+ $as_test_x conftest$ac_exeext; then

21156

am_cv_lib_iconv=yes

21157

am_cv_func_iconv=yes

21158

else

21159

echo "$as_me: failed program was:" >&5

21160

sed 's/^/| /' conftest.$ac_ext >&5

21161

21162

21163

21164

-rm -f conftest.err conftest.$ac_objext \

21165

21166

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

21167

conftest$ac_exeext conftest.$ac_ext

21168

LIBS="$am_save_LIBS"

21169

21170

21171

21172

-echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5

21173

-echo "${ECHO_T}$am_cv_func_iconv" >&6

21174

+{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5

21175

+echo "${ECHO_T}$am_cv_func_iconv" >&6; }

21176

if test "$am_cv_func_iconv" = yes; then

21177

21178

cat >>confdefs.h <<\_ACEOF

21179

@@ -31866,10 +32049,10 @@

21180

21181

21182

if test "$am_cv_lib_iconv" = yes; then

21183

- echo "$as_me:$LINENO: checking how to link with libiconv" >&5

21184

-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6

21185

- echo "$as_me:$LINENO: result: $LIBICONV" >&5

21186

-echo "${ECHO_T}$LIBICONV" >&6

21187

+ { echo "$as_me:$LINENO: checking how to link with libiconv" >&5

21188

+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }

21189

+ { echo "$as_me:$LINENO: result: $LIBICONV" >&5

21190

+echo "${ECHO_T}$LIBICONV" >&6; }

21191

else

21192

CPPFLAGS="$am_save_CPPFLAGS"

21193

LIBICONV=

21194

@@ -31879,8 +32062,8 @@

21195

21196

21197

if test "$am_cv_func_iconv" = yes; then

21198

- echo "$as_me:$LINENO: checking for iconv declaration" >&5

21199

-echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6

21200

+ { echo "$as_me:$LINENO: checking for iconv declaration" >&5

21201

+echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6; }

21202

if test "${am_cv_proto_iconv+set}" = set; then

21203

echo $ECHO_N "(cached) $ECHO_C" >&6

21204

else

21205

@@ -31913,43 +32096,39 @@

21206

}

21207

_ACEOF

21208

rm -f conftest.$ac_objext

21209

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

21210

- (eval $ac_compile) 2>conftest.er1

21211

+if { (ac_try="$ac_compile"

21212

+case "(($ac_try" in

21213

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

21214

+ *) ac_try_echo=$ac_try;;

21215

+esac

21216

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

21217

+ (eval "$ac_compile") 2>conftest.er1

21218

ac_status=$?

21219

grep -v '^ *+' conftest.er1 >conftest.err

21220

rm -f conftest.er1

21221

cat conftest.err >&5

21222

echo "$as_me:$LINENO: \$? = $ac_status" >&5

21223

- (exit $ac_status); } &&

21224

- { ac_try='test -z "$ac_c_werror_flag"

21225

- || test ! -s conftest.err'

21226

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21227

- (eval $ac_try) 2>&5

21228

- ac_status=$?

21229

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21230

- (exit $ac_status); }; } &&

21231

- { ac_try='test -s conftest.$ac_objext'

21232

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21233

- (eval $ac_try) 2>&5

21234

- ac_status=$?

21235

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21236

- (exit $ac_status); }; }; then

21237

+ (exit $ac_status); } && {

21238

+ test -z "$ac_c_werror_flag" ||

21239

+ test ! -s conftest.err

21240

+ } && test -s conftest.$ac_objext; then

21241

am_cv_proto_iconv_arg1=""

21242

else

21243

echo "$as_me: failed program was:" >&5

21244

sed 's/^/| /' conftest.$ac_ext >&5

21245

21246

-am_cv_proto_iconv_arg1="const"

21247

+ am_cv_proto_iconv_arg1="const"

21248

21249

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

21250

21251

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

21252

am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"

21253

21254

21255

am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`

21256

- echo "$as_me:$LINENO: result: ${ac_t:-

21257

+ { echo "$as_me:$LINENO: result: ${ac_t:-

21258

}$am_cv_proto_iconv" >&5

21259

echo "${ECHO_T}${ac_t:-

21260

- }$am_cv_proto_iconv" >&6

21261

+ }$am_cv_proto_iconv" >&6; }

21262

21263

cat >>confdefs.h <<_ACEOF

21264

#define ICONV_CONST $am_cv_proto_iconv_arg1

21265

@@ -31967,18 +32146,19 @@

21266

for ac_header in iconv.h

21267

21268

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

21269

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

21270

- echo "$as_me:$LINENO: checking for $ac_header" >&5

21271

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

21272

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

21273

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

21274

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

21275

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

21276

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

21277

echo $ECHO_N "(cached) $ECHO_C" >&6

21278

21279

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

21280

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

21281

+ac_res=`eval echo '${'$as_ac_Header'}'`

21282

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

21283

+echo "${ECHO_T}$ac_res" >&6; }

21284

else

21285

# Is the header compilable?

21286

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

21287

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

21288

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

21289

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

21290

cat >conftest.$ac_ext <<_ACEOF

21291

/* confdefs.h. */

21292

_ACEOF

21293

@@ -31989,41 +32169,37 @@

21294

#include <$ac_header>

21295

_ACEOF

21296

rm -f conftest.$ac_objext

21297

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

21298

- (eval $ac_compile) 2>conftest.er1

21299

+if { (ac_try="$ac_compile"

21300

+case "(($ac_try" in

21301

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

21302

+ *) ac_try_echo=$ac_try;;

21303

+esac

21304

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

21305

+ (eval "$ac_compile") 2>conftest.er1

21306

ac_status=$?

21307

grep -v '^ *+' conftest.er1 >conftest.err

21308

rm -f conftest.er1

21309

cat conftest.err >&5

21310

echo "$as_me:$LINENO: \$? = $ac_status" >&5

21311

- (exit $ac_status); } &&

21312

- { ac_try='test -z "$ac_c_werror_flag"

21313

- || test ! -s conftest.err'

21314

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21315

- (eval $ac_try) 2>&5

21316

- ac_status=$?

21317

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21318

- (exit $ac_status); }; } &&

21319

- { ac_try='test -s conftest.$ac_objext'

21320

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21321

- (eval $ac_try) 2>&5

21322

- ac_status=$?

21323

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21324

- (exit $ac_status); }; }; then

21325

+ (exit $ac_status); } && {

21326

+ test -z "$ac_c_werror_flag" ||

21327

+ test ! -s conftest.err

21328

+ } && test -s conftest.$ac_objext; then

21329

ac_header_compiler=yes

21330

else

21331

echo "$as_me: failed program was:" >&5

21332

sed 's/^/| /' conftest.$ac_ext >&5

21333

21334

-ac_header_compiler=no

21335

+ ac_header_compiler=no

21336

21337

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

21338

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

21339

-echo "${ECHO_T}$ac_header_compiler" >&6

21340

21341

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

21342

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

21343

+echo "${ECHO_T}$ac_header_compiler" >&6; }

21344

21345

# Is the header present?

21346

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

21347

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

21348

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

21349

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

21350

cat >conftest.$ac_ext <<_ACEOF

21351

/* confdefs.h. */

21352

_ACEOF

21353

@@ -32032,24 +32208,22 @@

21354

/* end confdefs.h. */

21355

#include <$ac_header>

21356

_ACEOF

21357

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

21358

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

21359

+if { (ac_try="$ac_cpp conftest.$ac_ext"

21360

+case "(($ac_try" in

21361

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

21362

+ *) ac_try_echo=$ac_try;;

21363

+esac

21364

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

21365

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

21366

ac_status=$?

21367

grep -v '^ *+' conftest.er1 >conftest.err

21368

rm -f conftest.er1

21369

cat conftest.err >&5

21370

echo "$as_me:$LINENO: \$? = $ac_status" >&5

21371

- (exit $ac_status); } >/dev/null; then

21372

- if test -s conftest.err; then

21373

- ac_cpp_err=$ac_c_preproc_warn_flag

21374

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

21375

- else

21376

- ac_cpp_err=

21377

- fi

21378

-else

21379

- ac_cpp_err=yes

21380

-fi

21381

-if test -z "$ac_cpp_err"; then

21382

+ (exit $ac_status); } >/dev/null && {

21383

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

21384

+ test ! -s conftest.err

21385

+ }; then

21386

ac_header_preproc=yes

21387

else

21388

echo "$as_me: failed program was:" >&5

21389

@@ -32057,9 +32231,10 @@

21390

21391

ac_header_preproc=no

21392

21393

21394

rm -f conftest.err conftest.$ac_ext

21395

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

21396

-echo "${ECHO_T}$ac_header_preproc" >&6

21397

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

21398

+echo "${ECHO_T}$ac_header_preproc" >&6; }

21399

21400

# So? What about this header?

21401

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

21402

@@ -32083,33 +32258,27 @@

21403

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

21404

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

21405

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

21406

- (

21407

- cat <<\_ASBOX

21408

-## ----------------------------------- ##

21409

-## Report this to the graphviz lists. ##

21410

-## ----------------------------------- ##

21411

-_ASBOX

21412

- ) |

21413

- sed "s/^/$as_me: WARNING: /" >&2

21414

21415

;;

21416

esac

21417

-echo "$as_me:$LINENO: checking for $ac_header" >&5

21418

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

21419

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

21420

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

21421

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

21422

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

21423

echo $ECHO_N "(cached) $ECHO_C" >&6

21424

else

21425

eval "$as_ac_Header=\$ac_header_preproc"

21426

21427

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

21428

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

21429

+ac_res=`eval echo '${'$as_ac_Header'}'`

21430

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

21431

+echo "${ECHO_T}$ac_res" >&6; }

21432

21433

21434

if test `eval echo '${'$as_ac_Header'}'` = yes; then

21435

cat >>confdefs.h <<_ACEOF

21436

#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

21437

_ACEOF

21438

- echo "$as_me:$LINENO: checking whether iconv.h defines iconv_t" >&5

21439

-echo $ECHO_N "checking whether iconv.h defines iconv_t... $ECHO_C" >&6

21440

+ { echo "$as_me:$LINENO: checking whether iconv.h defines iconv_t" >&5

21441

+echo $ECHO_N "checking whether iconv.h defines iconv_t... $ECHO_C" >&6; }

21442

cat >conftest.$ac_ext <<_ACEOF

21443

/* confdefs.h. */

21444

_ACEOF

21445

@@ -32121,16 +32290,16 @@

21446

_ACEOF

21447

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

21448

$EGREP "typedef.*iconv_t" >/dev/null 2>&1; then

21449

- echo "$as_me:$LINENO: result: yes" >&5

21450

-echo "${ECHO_T}yes" >&6

21451

+ { echo "$as_me:$LINENO: result: yes" >&5

21452

+echo "${ECHO_T}yes" >&6; }

21453

21454

cat >>confdefs.h <<\_ACEOF

21455

#define HAVE_ICONV_T_DEF 1

21456

_ACEOF

21457

21458

else

21459

- echo "$as_me:$LINENO: result: no" >&5

21460

-echo "${ECHO_T}no" >&6

21461

+ { echo "$as_me:$LINENO: result: no" >&5

21462

+echo "${ECHO_T}no" >&6; }

21463

21464

rm -f conftest*

21465

21466

@@ -32152,11 +32321,11 @@

21467

21468

FREETYPE_DIR="yes"

21469

21470

-# Check whether --with-freetype or --without-freetype was given.

21471

+# Check whether --with-freetype was given.

21472

if test "${with_freetype+set}" = set; then

21473

- withval="$with_freetype"

21474

- FREETYPE_DIR=$withval

21475

-fi;

21476

+ withval=$with_freetype; FREETYPE_DIR=$withval

21477

+fi

21478

21479

21480

### default is to build with freetype

21481

if test "x$with_freetype" = "xno"; then

21482

@@ -32167,8 +32336,8 @@

21483

if test "x$FREETYPE_DIR" = "xyes"; then

21484

# Extract the first word of "freetype-config", so it can be a program name with args.

21485

set dummy freetype-config; ac_word=$2

21486

-echo "$as_me:$LINENO: checking for $ac_word" >&5

21487

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

21488

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

21489

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

21490

if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then

21491

echo $ECHO_N "(cached) $ECHO_C" >&6

21492

else

21493

@@ -32183,32 +32352,33 @@

21494

IFS=$as_save_IFS

21495

test -z "$as_dir" && as_dir=.

21496

for ac_exec_ext in '' $ac_executable_extensions; do

21497

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

21498

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

21499

ac_cv_path_FREETYPE_CONFIG="$as_dir/$ac_word$ac_exec_ext"

21500

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

21501

break 2

21502

21503

done

21504

done

21505

+IFS=$as_save_IFS

21506

21507

;;

21508

esac

21509

21510

FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG

21511

21512

if test -n "$FREETYPE_CONFIG"; then

21513

- echo "$as_me:$LINENO: result: $FREETYPE_CONFIG" >&5

21514

-echo "${ECHO_T}$FREETYPE_CONFIG" >&6

21515

+ { echo "$as_me:$LINENO: result: $FREETYPE_CONFIG" >&5

21516

+echo "${ECHO_T}$FREETYPE_CONFIG" >&6; }

21517

else

21518

- echo "$as_me:$LINENO: result: no" >&5

21519

-echo "${ECHO_T}no" >&6

21520

+ { echo "$as_me:$LINENO: result: no" >&5

21521

+echo "${ECHO_T}no" >&6; }

21522

21523

21524

21525

else

21526

# Extract the first word of "freetype-config", so it can be a program name with args.

21527

set dummy freetype-config; ac_word=$2

21528

-echo "$as_me:$LINENO: checking for $ac_word" >&5

21529

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

21530

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

21531

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

21532

if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then

21533

echo $ECHO_N "(cached) $ECHO_C" >&6

21534

else

21535

@@ -32224,27 +32394,28 @@

21536

IFS=$as_save_IFS

21537

test -z "$as_dir" && as_dir=.

21538

for ac_exec_ext in '' $ac_executable_extensions; do

21539

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

21540

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

21541

ac_cv_path_FREETYPE_CONFIG="$as_dir/$ac_word$ac_exec_ext"

21542

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

21543

break 2

21544

21545

done

21546

done

21547

+IFS=$as_save_IFS

21548

21549

;;

21550

esac

21551

21552

FREETYPE_CONFIG=$ac_cv_path_FREETYPE_CONFIG

21553

21554

if test -n "$FREETYPE_CONFIG"; then

21555

- echo "$as_me:$LINENO: result: $FREETYPE_CONFIG" >&5

21556

-echo "${ECHO_T}$FREETYPE_CONFIG" >&6

21557

+ { echo "$as_me:$LINENO: result: $FREETYPE_CONFIG" >&5

21558

+echo "${ECHO_T}$FREETYPE_CONFIG" >&6; }

21559

else

21560

- echo "$as_me:$LINENO: result: no" >&5

21561

-echo "${ECHO_T}no" >&6

21562

+ { echo "$as_me:$LINENO: result: no" >&5

21563

+echo "${ECHO_T}no" >&6; }

21564

21565

21566

21567

21568

21569

if test -n "$FREETYPE_CONFIG"; then

21570

@@ -32283,18 +32454,19 @@

21571

for ac_header in ft2build.h

21572

21573

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

21574

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

21575

- echo "$as_me:$LINENO: checking for $ac_header" >&5

21576

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

21577

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

21578

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

21579

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

21580

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

21581

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

21582

echo $ECHO_N "(cached) $ECHO_C" >&6

21583

21584

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

21585

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

21586

+ac_res=`eval echo '${'$as_ac_Header'}'`

21587

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

21588

+echo "${ECHO_T}$ac_res" >&6; }

21589

else

21590

# Is the header compilable?

21591

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

21592

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

21593

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

21594

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

21595

cat >conftest.$ac_ext <<_ACEOF

21596

/* confdefs.h. */

21597

_ACEOF

21598

@@ -32305,41 +32477,37 @@

21599

#include <$ac_header>

21600

_ACEOF

21601

rm -f conftest.$ac_objext

21602

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

21603

- (eval $ac_compile) 2>conftest.er1

21604

+if { (ac_try="$ac_compile"

21605

+case "(($ac_try" in

21606

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

21607

+ *) ac_try_echo=$ac_try;;

21608

+esac

21609

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

21610

+ (eval "$ac_compile") 2>conftest.er1

21611

ac_status=$?

21612

grep -v '^ *+' conftest.er1 >conftest.err

21613

rm -f conftest.er1

21614

cat conftest.err >&5

21615

echo "$as_me:$LINENO: \$? = $ac_status" >&5

21616

- (exit $ac_status); } &&

21617

- { ac_try='test -z "$ac_c_werror_flag"

21618

- || test ! -s conftest.err'

21619

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21620

- (eval $ac_try) 2>&5

21621

- ac_status=$?

21622

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21623

- (exit $ac_status); }; } &&

21624

- { ac_try='test -s conftest.$ac_objext'

21625

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21626

- (eval $ac_try) 2>&5

21627

- ac_status=$?

21628

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21629

- (exit $ac_status); }; }; then

21630

+ (exit $ac_status); } && {

21631

+ test -z "$ac_c_werror_flag" ||

21632

+ test ! -s conftest.err

21633

+ } && test -s conftest.$ac_objext; then

21634

ac_header_compiler=yes

21635

else

21636

echo "$as_me: failed program was:" >&5

21637

sed 's/^/| /' conftest.$ac_ext >&5

21638

21639

-ac_header_compiler=no

21640

+ ac_header_compiler=no

21641

21642

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

21643

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

21644

-echo "${ECHO_T}$ac_header_compiler" >&6

21645

21646

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

21647

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

21648

+echo "${ECHO_T}$ac_header_compiler" >&6; }

21649

21650

# Is the header present?

21651

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

21652

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

21653

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

21654

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

21655

cat >conftest.$ac_ext <<_ACEOF

21656

/* confdefs.h. */

21657

_ACEOF

21658

@@ -32348,24 +32516,22 @@

21659

/* end confdefs.h. */

21660

#include <$ac_header>

21661

_ACEOF

21662

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

21663

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

21664

+if { (ac_try="$ac_cpp conftest.$ac_ext"

21665

+case "(($ac_try" in

21666

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

21667

+ *) ac_try_echo=$ac_try;;

21668

+esac

21669

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

21670

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

21671

ac_status=$?

21672

grep -v '^ *+' conftest.er1 >conftest.err

21673

rm -f conftest.er1

21674

cat conftest.err >&5

21675

echo "$as_me:$LINENO: \$? = $ac_status" >&5

21676

- (exit $ac_status); } >/dev/null; then

21677

- if test -s conftest.err; then

21678

- ac_cpp_err=$ac_c_preproc_warn_flag

21679

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

21680

- else

21681

- ac_cpp_err=

21682

- fi

21683

-else

21684

- ac_cpp_err=yes

21685

-fi

21686

-if test -z "$ac_cpp_err"; then

21687

+ (exit $ac_status); } >/dev/null && {

21688

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

21689

+ test ! -s conftest.err

21690

+ }; then

21691

ac_header_preproc=yes

21692

else

21693

echo "$as_me: failed program was:" >&5

21694

@@ -32373,9 +32539,10 @@

21695

21696

ac_header_preproc=no

21697

21698

21699

rm -f conftest.err conftest.$ac_ext

21700

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

21701

-echo "${ECHO_T}$ac_header_preproc" >&6

21702

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

21703

+echo "${ECHO_T}$ac_header_preproc" >&6; }

21704

21705

# So? What about this header?

21706

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

21707

@@ -32399,25 +32566,19 @@

21708

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

21709

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

21710

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

21711

- (

21712

- cat <<\_ASBOX

21713

-## ----------------------------------- ##

21714

-## Report this to the graphviz lists. ##

21715

-## ----------------------------------- ##

21716

-_ASBOX

21717

- ) |

21718

- sed "s/^/$as_me: WARNING: /" >&2

21719

21720

;;

21721

esac

21722

-echo "$as_me:$LINENO: checking for $ac_header" >&5

21723

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

21724

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

21725

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

21726

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

21727

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

21728

echo $ECHO_N "(cached) $ECHO_C" >&6

21729

else

21730

eval "$as_ac_Header=\$ac_header_preproc"

21731

21732

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

21733

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

21734

+ac_res=`eval echo '${'$as_ac_Header'}'`

21735

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

21736

+echo "${ECHO_T}$ac_res" >&6; }

21737

21738

21739

if test `eval echo '${'$as_ac_Header'}'` = yes; then

21740

@@ -32430,8 +32591,8 @@

21741

done

21742

21743

if test `eval echo '${'$as_ac_Header'}'` = yes; then

21744

- echo "$as_me:$LINENO: checking for main in -lfreetype" >&5

21745

-echo $ECHO_N "checking for main in -lfreetype... $ECHO_C" >&6

21746

+ { echo "$as_me:$LINENO: checking for main in -lfreetype" >&5

21747

+echo $ECHO_N "checking for main in -lfreetype... $ECHO_C" >&6; }

21748

if test "${ac_cv_lib_freetype_main+set}" = set; then

21749

echo $ECHO_N "(cached) $ECHO_C" >&6

21750

else

21751

@@ -32448,46 +32609,43 @@

21752

int

21753

main ()

21754

{

21755

-main ();

21756

+return main ();

21757

;

21758

return 0;

21759

}

21760

_ACEOF

21761

rm -f conftest.$ac_objext conftest$ac_exeext

21762

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

21763

- (eval $ac_link) 2>conftest.er1

21764

+if { (ac_try="$ac_link"

21765

+case "(($ac_try" in

21766

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

21767

+ *) ac_try_echo=$ac_try;;

21768

+esac

21769

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

21770

+ (eval "$ac_link") 2>conftest.er1

21771

ac_status=$?

21772

grep -v '^ *+' conftest.er1 >conftest.err

21773

rm -f conftest.er1

21774

cat conftest.err >&5

21775

echo "$as_me:$LINENO: \$? = $ac_status" >&5

21776

- (exit $ac_status); } &&

21777

- { ac_try='test -z "$ac_c_werror_flag"

21778

- || test ! -s conftest.err'

21779

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21780

- (eval $ac_try) 2>&5

21781

- ac_status=$?

21782

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21783

- (exit $ac_status); }; } &&

21784

- { ac_try='test -s conftest$ac_exeext'

21785

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21786

- (eval $ac_try) 2>&5

21787

- ac_status=$?

21788

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21789

- (exit $ac_status); }; }; then

21790

+ (exit $ac_status); } && {

21791

+ test -z "$ac_c_werror_flag" ||

21792

+ test ! -s conftest.err

21793

+ } && test -s conftest$ac_exeext &&

21794

+ $as_test_x conftest$ac_exeext; then

21795

ac_cv_lib_freetype_main=yes

21796

else

21797

echo "$as_me: failed program was:" >&5

21798

sed 's/^/| /' conftest.$ac_ext >&5

21799

21800

-ac_cv_lib_freetype_main=no

21801

+ ac_cv_lib_freetype_main=no

21802

21803

-rm -f conftest.err conftest.$ac_objext \

21804

21805

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

21806

conftest$ac_exeext conftest.$ac_ext

21807

LIBS=$ac_check_lib_save_LIBS

21808

21809

-echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_main" >&5

21810

-echo "${ECHO_T}$ac_cv_lib_freetype_main" >&6

21811

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_main" >&5

21812

+echo "${ECHO_T}$ac_cv_lib_freetype_main" >&6; }

21813

if test $ac_cv_lib_freetype_main = yes; then

21814

FT_LIBS="$FT_LIBTOOL $FT_LIBS"

21815

21816

@@ -32520,11 +32678,11 @@

21817

if test "x$with_mylibgd" = "xyes"; then

21818

21819

21820

-# Check whether --with-fontconfig or --without-fontconfig was given.

21821

+# Check whether --with-fontconfig was given.

21822

if test "${with_fontconfig+set}" = set; then

21823

- withval="$with_fontconfig"

21824

+ withval=$with_fontconfig;

21825

+fi

21826

21827

-fi;

21828

21829

### default is to build with fontconfig

21830

if test "x$with_fontconfig" != "xno"; then

21831

@@ -32538,8 +32696,8 @@

21832

FC_LIBS=""

21833

# Extract the first word of "fontconfig-config", so it can be a program name with args.

21834

set dummy fontconfig-config; ac_word=$2

21835

-echo "$as_me:$LINENO: checking for $ac_word" >&5

21836

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

21837

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

21838

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

21839

if test "${ac_cv_path_FONTCONFIG_CONFIG+set}" = set; then

21840

echo $ECHO_N "(cached) $ECHO_C" >&6

21841

else

21842

@@ -32554,27 +32712,28 @@

21843

IFS=$as_save_IFS

21844

test -z "$as_dir" && as_dir=.

21845

for ac_exec_ext in '' $ac_executable_extensions; do

21846

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

21847

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

21848

ac_cv_path_FONTCONFIG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

21849

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

21850

break 2

21851

21852

done

21853

done

21854

+IFS=$as_save_IFS

21855

21856

;;

21857

esac

21858

21859

FONTCONFIG_CONFIG=$ac_cv_path_FONTCONFIG_CONFIG

21860

21861

if test -n "$FONTCONFIG_CONFIG"; then

21862

- echo "$as_me:$LINENO: result: $FONTCONFIG_CONFIG" >&5

21863

-echo "${ECHO_T}$FONTCONFIG_CONFIG" >&6

21864

+ { echo "$as_me:$LINENO: result: $FONTCONFIG_CONFIG" >&5

21865

+echo "${ECHO_T}$FONTCONFIG_CONFIG" >&6; }

21866

else

21867

- echo "$as_me:$LINENO: result: no" >&5

21868

-echo "${ECHO_T}no" >&6

21869

+ { echo "$as_me:$LINENO: result: no" >&5

21870

+echo "${ECHO_T}no" >&6; }

21871

21872

21873

21874

if test -n "$FONTCONFIG_CONFIG"; then

21875

fc_cflags=`$FONTCONFIG_CONFIG --cflags`

21876

if test "$fc_cflags" != "-I/usr/include" ; then

21877

@@ -32588,8 +32747,8 @@

21878

21879

21880

pkg_failed=no

21881

-echo "$as_me:$LINENO: checking for FONTCONFIG" >&5

21882

-echo $ECHO_N "checking for FONTCONFIG... $ECHO_C" >&6

21883

+{ echo "$as_me:$LINENO: checking for FONTCONFIG" >&5

21884

+echo $ECHO_N "checking for FONTCONFIG... $ECHO_C" >&6; }

21885

21886

if test -n "$PKG_CONFIG"; then

21887

if test -n "$FONTCONFIG_CFLAGS"; then

21888

@@ -32653,8 +32812,8 @@

21889

else

21890

FONTCONFIG_CFLAGS=$pkg_cv_FONTCONFIG_CFLAGS

21891

FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS

21892

- echo "$as_me:$LINENO: result: yes" >&5

21893

-echo "${ECHO_T}yes" >&6

21894

+ { echo "$as_me:$LINENO: result: yes" >&5

21895

+echo "${ECHO_T}yes" >&6; }

21896

21897

cat >>confdefs.h <<_ACEOF

21898

#define HAVE_FONTCONFIG 1

21899

@@ -32668,35 +32827,36 @@

21900

21901

21902

21903

-# Check whether --with-fontconfigincludedir or --without-fontconfigincludedir was given.

21904

+# Check whether --with-fontconfigincludedir was given.

21905

if test "${with_fontconfigincludedir+set}" = set; then

21906

- withval="$with_fontconfigincludedir"

21907

- FC_INCLUDES="-I$withval"

21908

-fi;

21909

+ withval=$with_fontconfigincludedir; FC_INCLUDES="-I$withval"

21910

+fi

21911

21912

CPPFLAGS="$CPPFLAGS $FC_INCLUDES"

21913

21914

-# Check whether --with-fontconfiglibdir or --without-fontconfiglibdir was given.

21915

+# Check whether --with-fontconfiglibdir was given.

21916

if test "${with_fontconfiglibdir+set}" = set; then

21917

- withval="$with_fontconfiglibdir"

21918

- FC_LIBS="-L$withval"

21919

-fi;

21920

+ withval=$with_fontconfiglibdir; FC_LIBS="-L$withval"

21921

+fi

21922

21923

LDFLAGS="$LDFLAGS $FC_LIBS"

21924

21925

for ac_header in fontconfig/fontconfig.h

21926

21927

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

21928

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

21929

- echo "$as_me:$LINENO: checking for $ac_header" >&5

21930

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

21931

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

21932

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

21933

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

21934

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

21935

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

21936

echo $ECHO_N "(cached) $ECHO_C" >&6

21937

21938

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

21939

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

21940

+ac_res=`eval echo '${'$as_ac_Header'}'`

21941

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

21942

+echo "${ECHO_T}$ac_res" >&6; }

21943

else

21944

# Is the header compilable?

21945

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

21946

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

21947

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

21948

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

21949

cat >conftest.$ac_ext <<_ACEOF

21950

/* confdefs.h. */

21951

_ACEOF

21952

@@ -32707,41 +32867,37 @@

21953

#include <$ac_header>

21954

_ACEOF

21955

rm -f conftest.$ac_objext

21956

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

21957

- (eval $ac_compile) 2>conftest.er1

21958

+if { (ac_try="$ac_compile"

21959

+case "(($ac_try" in

21960

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

21961

+ *) ac_try_echo=$ac_try;;

21962

+esac

21963

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

21964

+ (eval "$ac_compile") 2>conftest.er1

21965

ac_status=$?

21966

grep -v '^ *+' conftest.er1 >conftest.err

21967

rm -f conftest.er1

21968

cat conftest.err >&5

21969

echo "$as_me:$LINENO: \$? = $ac_status" >&5

21970

- (exit $ac_status); } &&

21971

- { ac_try='test -z "$ac_c_werror_flag"

21972

- || test ! -s conftest.err'

21973

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21974

- (eval $ac_try) 2>&5

21975

- ac_status=$?

21976

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21977

- (exit $ac_status); }; } &&

21978

- { ac_try='test -s conftest.$ac_objext'

21979

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

21980

- (eval $ac_try) 2>&5

21981

- ac_status=$?

21982

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

21983

- (exit $ac_status); }; }; then

21984

+ (exit $ac_status); } && {

21985

+ test -z "$ac_c_werror_flag" ||

21986

+ test ! -s conftest.err

21987

+ } && test -s conftest.$ac_objext; then

21988

ac_header_compiler=yes

21989

else

21990

echo "$as_me: failed program was:" >&5

21991

sed 's/^/| /' conftest.$ac_ext >&5

21992

21993

-ac_header_compiler=no

21994

+ ac_header_compiler=no

21995

21996

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

21997

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

21998

-echo "${ECHO_T}$ac_header_compiler" >&6

21999

22000

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

22001

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

22002

+echo "${ECHO_T}$ac_header_compiler" >&6; }

22003

22004

# Is the header present?

22005

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

22006

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

22007

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

22008

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

22009

cat >conftest.$ac_ext <<_ACEOF

22010

/* confdefs.h. */

22011

_ACEOF

22012

@@ -32750,24 +32906,22 @@

22013

/* end confdefs.h. */

22014

#include <$ac_header>

22015

_ACEOF

22016

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

22017

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

22018

+if { (ac_try="$ac_cpp conftest.$ac_ext"

22019

+case "(($ac_try" in

22020

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22021

+ *) ac_try_echo=$ac_try;;

22022

+esac

22023

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22024

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

22025

ac_status=$?

22026

grep -v '^ *+' conftest.er1 >conftest.err

22027

rm -f conftest.er1

22028

cat conftest.err >&5

22029

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22030

- (exit $ac_status); } >/dev/null; then

22031

- if test -s conftest.err; then

22032

- ac_cpp_err=$ac_c_preproc_warn_flag

22033

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

22034

- else

22035

- ac_cpp_err=

22036

- fi

22037

-else

22038

- ac_cpp_err=yes

22039

-fi

22040

-if test -z "$ac_cpp_err"; then

22041

+ (exit $ac_status); } >/dev/null && {

22042

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

22043

+ test ! -s conftest.err

22044

+ }; then

22045

ac_header_preproc=yes

22046

else

22047

echo "$as_me: failed program was:" >&5

22048

@@ -32775,9 +32929,10 @@

22049

22050

ac_header_preproc=no

22051

22052

22053

rm -f conftest.err conftest.$ac_ext

22054

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

22055

-echo "${ECHO_T}$ac_header_preproc" >&6

22056

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

22057

+echo "${ECHO_T}$ac_header_preproc" >&6; }

22058

22059

# So? What about this header?

22060

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

22061

@@ -32801,25 +32956,19 @@

22062

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

22063

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

22064

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

22065

- (

22066

- cat <<\_ASBOX

22067

-## ----------------------------------- ##

22068

-## Report this to the graphviz lists. ##

22069

-## ----------------------------------- ##

22070

-_ASBOX

22071

- ) |

22072

- sed "s/^/$as_me: WARNING: /" >&2

22073

22074

;;

22075

esac

22076

-echo "$as_me:$LINENO: checking for $ac_header" >&5

22077

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

22078

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

22079

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

22080

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

22081

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

22082

echo $ECHO_N "(cached) $ECHO_C" >&6

22083

else

22084

eval "$as_ac_Header=\$ac_header_preproc"

22085

22086

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

22087

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

22088

+ac_res=`eval echo '${'$as_ac_Header'}'`

22089

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

22090

+echo "${ECHO_T}$ac_res" >&6; }

22091

22092

22093

if test `eval echo '${'$as_ac_Header'}'` = yes; then

22094

@@ -32832,8 +32981,8 @@

22095

done

22096

22097

if test `eval echo '${'$as_ac_Header'}'` = yes; then

22098

- echo "$as_me:$LINENO: checking for FcGetVersion in -lfontconfig" >&5

22099

-echo $ECHO_N "checking for FcGetVersion in -lfontconfig... $ECHO_C" >&6

22100

+ { echo "$as_me:$LINENO: checking for FcGetVersion in -lfontconfig" >&5

22101

+echo $ECHO_N "checking for FcGetVersion in -lfontconfig... $ECHO_C" >&6; }

22102

if test "${ac_cv_lib_fontconfig_FcGetVersion+set}" = set; then

22103

echo $ECHO_N "(cached) $ECHO_C" >&6

22104

else

22105

@@ -32846,56 +32995,53 @@

22106

cat >>conftest.$ac_ext <<_ACEOF

22107

/* end confdefs.h. */

22108

22109

-/* Override any gcc2 internal prototype to avoid an error. */

22110

+/* Override any GCC internal prototype to avoid an error.

22111

+ Use char because int might match the return type of a GCC

22112

+ builtin and then its argument prototype would still apply. */

22113

#ifdef __cplusplus

22114

extern "C"

22115

#endif

22116

-/* We use char because int might match the return type of a gcc2

22117

- builtin and then its argument prototype would still apply. */

22118

char FcGetVersion ();

22119

int

22120

main ()

22121

{

22122

-FcGetVersion ();

22123

+return FcGetVersion ();

22124

;

22125

return 0;

22126

}

22127

_ACEOF

22128

rm -f conftest.$ac_objext conftest$ac_exeext

22129

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

22130

- (eval $ac_link) 2>conftest.er1

22131

+if { (ac_try="$ac_link"

22132

+case "(($ac_try" in

22133

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22134

+ *) ac_try_echo=$ac_try;;

22135

+esac

22136

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22137

+ (eval "$ac_link") 2>conftest.er1

22138

ac_status=$?

22139

grep -v '^ *+' conftest.er1 >conftest.err

22140

rm -f conftest.er1

22141

cat conftest.err >&5

22142

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22143

- (exit $ac_status); } &&

22144

- { ac_try='test -z "$ac_c_werror_flag"

22145

- || test ! -s conftest.err'

22146

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22147

- (eval $ac_try) 2>&5

22148

- ac_status=$?

22149

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22150

- (exit $ac_status); }; } &&

22151

- { ac_try='test -s conftest$ac_exeext'

22152

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22153

- (eval $ac_try) 2>&5

22154

- ac_status=$?

22155

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22156

- (exit $ac_status); }; }; then

22157

+ (exit $ac_status); } && {

22158

+ test -z "$ac_c_werror_flag" ||

22159

+ test ! -s conftest.err

22160

+ } && test -s conftest$ac_exeext &&

22161

+ $as_test_x conftest$ac_exeext; then

22162

ac_cv_lib_fontconfig_FcGetVersion=yes

22163

else

22164

echo "$as_me: failed program was:" >&5

22165

sed 's/^/| /' conftest.$ac_ext >&5

22166

22167

-ac_cv_lib_fontconfig_FcGetVersion=no

22168

+ ac_cv_lib_fontconfig_FcGetVersion=no

22169

22170

-rm -f conftest.err conftest.$ac_objext \

22171

22172

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

22173

conftest$ac_exeext conftest.$ac_ext

22174

LIBS=$ac_check_lib_save_LIBS

22175

22176

-echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcGetVersion" >&5

22177

-echo "${ECHO_T}$ac_cv_lib_fontconfig_FcGetVersion" >&6

22178

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcGetVersion" >&5

22179

+echo "${ECHO_T}$ac_cv_lib_fontconfig_FcGetVersion" >&6; }

22180

if test $ac_cv_lib_fontconfig_FcGetVersion = yes; then

22181

FC_LIBS="$FC_LIBS -lfontconfig"

22182

22183

@@ -32932,8 +33078,8 @@

22184

save_LDFLAGS=$LDFLAGS

22185

# Extract the first word of "libpng-config", so it can be a program name with args.

22186

set dummy libpng-config; ac_word=$2

22187

-echo "$as_me:$LINENO: checking for $ac_word" >&5

22188

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

22189

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

22190

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

22191

if test "${ac_cv_path_LIBPNG_CONFIG+set}" = set; then

22192

echo $ECHO_N "(cached) $ECHO_C" >&6

22193

else

22194

@@ -32948,27 +33094,28 @@

22195

IFS=$as_save_IFS

22196

test -z "$as_dir" && as_dir=.

22197

for ac_exec_ext in '' $ac_executable_extensions; do

22198

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

22199

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

22200

ac_cv_path_LIBPNG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

22201

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

22202

break 2

22203

22204

done

22205

done

22206

+IFS=$as_save_IFS

22207

22208

;;

22209

esac

22210

22211

LIBPNG_CONFIG=$ac_cv_path_LIBPNG_CONFIG

22212

22213

if test -n "$LIBPNG_CONFIG"; then

22214

- echo "$as_me:$LINENO: result: $LIBPNG_CONFIG" >&5

22215

-echo "${ECHO_T}$LIBPNG_CONFIG" >&6

22216

+ { echo "$as_me:$LINENO: result: $LIBPNG_CONFIG" >&5

22217

+echo "${ECHO_T}$LIBPNG_CONFIG" >&6; }

22218

else

22219

- echo "$as_me:$LINENO: result: no" >&5

22220

-echo "${ECHO_T}no" >&6

22221

+ { echo "$as_me:$LINENO: result: no" >&5

22222

+echo "${ECHO_T}no" >&6; }

22223

22224

22225

22226

if test -n "$LIBPNG_CONFIG"; then

22227

PNG_INCLUDES=`$LIBPNG_CONFIG --cflags`

22228

PNG_PREFIX=`$LIBPNG_CONFIG --prefix`

22229

@@ -32979,31 +33126,31 @@

22230

PNG_INCLUDES=""

22231

22232

22233

-# Check whether --with-pngincludedir or --without-pngincludedir was given.

22234

+# Check whether --with-pngincludedir was given.

22235

if test "${with_pngincludedir+set}" = set; then

22236

- withval="$with_pngincludedir"

22237

- PNG_INCLUDES="-I$withval"

22238

-fi;

22239

+ withval=$with_pngincludedir; PNG_INCLUDES="-I$withval"

22240

+fi

22241

22242

CPPFLAGS="$CPPFLAGS $PNG_INCLUDES $Z_INCLUDES"

22243

22244

-# Check whether --with-pnglibdir or --without-pnglibdir was given.

22245

+# Check whether --with-pnglibdir was given.

22246

if test "${with_pnglibdir+set}" = set; then

22247

- withval="$with_pnglibdir"

22248

- PNG_LIBS="-L$withval"

22249

-fi;

22250

+ withval=$with_pnglibdir; PNG_LIBS="-L$withval"

22251

+fi

22252

22253

LDFLAGS="$LDFLAGS $PNG_LIBS $Z_LIBS"

22254

if test "${ac_cv_header_png_h+set}" = set; then

22255

- echo "$as_me:$LINENO: checking for png.h" >&5

22256

-echo $ECHO_N "checking for png.h... $ECHO_C" >&6

22257

+ { echo "$as_me:$LINENO: checking for png.h" >&5

22258

+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }

22259

if test "${ac_cv_header_png_h+set}" = set; then

22260

echo $ECHO_N "(cached) $ECHO_C" >&6

22261

22262

-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5

22263

-echo "${ECHO_T}$ac_cv_header_png_h" >&6

22264

+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5

22265

+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }

22266

else

22267

# Is the header compilable?

22268

-echo "$as_me:$LINENO: checking png.h usability" >&5

22269

-echo $ECHO_N "checking png.h usability... $ECHO_C" >&6

22270

+{ echo "$as_me:$LINENO: checking png.h usability" >&5

22271

+echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; }

22272

cat >conftest.$ac_ext <<_ACEOF

22273

/* confdefs.h. */

22274

_ACEOF

22275

@@ -33014,41 +33161,37 @@

22276

#include <png.h>

22277

_ACEOF

22278

rm -f conftest.$ac_objext

22279

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

22280

- (eval $ac_compile) 2>conftest.er1

22281

+if { (ac_try="$ac_compile"

22282

+case "(($ac_try" in

22283

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22284

+ *) ac_try_echo=$ac_try;;

22285

+esac

22286

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22287

+ (eval "$ac_compile") 2>conftest.er1

22288

ac_status=$?

22289

grep -v '^ *+' conftest.er1 >conftest.err

22290

rm -f conftest.er1

22291

cat conftest.err >&5

22292

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22293

- (exit $ac_status); } &&

22294

- { ac_try='test -z "$ac_c_werror_flag"

22295

- || test ! -s conftest.err'

22296

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22297

- (eval $ac_try) 2>&5

22298

- ac_status=$?

22299

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22300

- (exit $ac_status); }; } &&

22301

- { ac_try='test -s conftest.$ac_objext'

22302

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22303

- (eval $ac_try) 2>&5

22304

- ac_status=$?

22305

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22306

- (exit $ac_status); }; }; then

22307

+ (exit $ac_status); } && {

22308

+ test -z "$ac_c_werror_flag" ||

22309

+ test ! -s conftest.err

22310

+ } && test -s conftest.$ac_objext; then

22311

ac_header_compiler=yes

22312

else

22313

echo "$as_me: failed program was:" >&5

22314

sed 's/^/| /' conftest.$ac_ext >&5

22315

22316

-ac_header_compiler=no

22317

+ ac_header_compiler=no

22318

22319

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

22320

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

22321

-echo "${ECHO_T}$ac_header_compiler" >&6

22322

22323

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

22324

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

22325

+echo "${ECHO_T}$ac_header_compiler" >&6; }

22326

22327

# Is the header present?

22328

-echo "$as_me:$LINENO: checking png.h presence" >&5

22329

-echo $ECHO_N "checking png.h presence... $ECHO_C" >&6

22330

+{ echo "$as_me:$LINENO: checking png.h presence" >&5

22331

+echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; }

22332

cat >conftest.$ac_ext <<_ACEOF

22333

/* confdefs.h. */

22334

_ACEOF

22335

@@ -33057,24 +33200,22 @@

22336

/* end confdefs.h. */

22337

#include <png.h>

22338

_ACEOF

22339

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

22340

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

22341

+if { (ac_try="$ac_cpp conftest.$ac_ext"

22342

+case "(($ac_try" in

22343

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22344

+ *) ac_try_echo=$ac_try;;

22345

+esac

22346

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22347

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

22348

ac_status=$?

22349

grep -v '^ *+' conftest.er1 >conftest.err

22350

rm -f conftest.er1

22351

cat conftest.err >&5

22352

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22353

- (exit $ac_status); } >/dev/null; then

22354

- if test -s conftest.err; then

22355

- ac_cpp_err=$ac_c_preproc_warn_flag

22356

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

22357

- else

22358

- ac_cpp_err=

22359

- fi

22360

-else

22361

- ac_cpp_err=yes

22362

-fi

22363

-if test -z "$ac_cpp_err"; then

22364

+ (exit $ac_status); } >/dev/null && {

22365

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

22366

+ test ! -s conftest.err

22367

+ }; then

22368

ac_header_preproc=yes

22369

else

22370

echo "$as_me: failed program was:" >&5

22371

@@ -33082,9 +33223,10 @@

22372

22373

ac_header_preproc=no

22374

22375

22376

rm -f conftest.err conftest.$ac_ext

22377

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

22378

-echo "${ECHO_T}$ac_header_preproc" >&6

22379

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

22380

+echo "${ECHO_T}$ac_header_preproc" >&6; }

22381

22382

# So? What about this header?

22383

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

22384

@@ -33108,30 +33250,23 @@

22385

echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}

22386

{ echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5

22387

echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}

22388

- (

22389

- cat <<\_ASBOX

22390

-## ----------------------------------- ##

22391

-## Report this to the graphviz lists. ##

22392

-## ----------------------------------- ##

22393

-_ASBOX

22394

- ) |

22395

- sed "s/^/$as_me: WARNING: /" >&2

22396

22397

;;

22398

esac

22399

-echo "$as_me:$LINENO: checking for png.h" >&5

22400

-echo $ECHO_N "checking for png.h... $ECHO_C" >&6

22401

+{ echo "$as_me:$LINENO: checking for png.h" >&5

22402

+echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }

22403

if test "${ac_cv_header_png_h+set}" = set; then

22404

echo $ECHO_N "(cached) $ECHO_C" >&6

22405

else

22406

ac_cv_header_png_h=$ac_header_preproc

22407

22408

-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5

22409

-echo "${ECHO_T}$ac_cv_header_png_h" >&6

22410

+{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5

22411

+echo "${ECHO_T}$ac_cv_header_png_h" >&6; }

22412

22413

22414

if test $ac_cv_header_png_h = yes; then

22415

- echo "$as_me:$LINENO: checking for main in -lpng" >&5

22416

-echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6

22417

+ { echo "$as_me:$LINENO: checking for main in -lpng" >&5

22418

+echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6; }

22419

if test "${ac_cv_lib_png_main+set}" = set; then

22420

echo $ECHO_N "(cached) $ECHO_C" >&6

22421

else

22422

@@ -33148,46 +33283,43 @@

22423

int

22424

main ()

22425

{

22426

-main ();

22427

+return main ();

22428

;

22429

return 0;

22430

}

22431

_ACEOF

22432

rm -f conftest.$ac_objext conftest$ac_exeext

22433

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

22434

- (eval $ac_link) 2>conftest.er1

22435

+if { (ac_try="$ac_link"

22436

+case "(($ac_try" in

22437

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22438

+ *) ac_try_echo=$ac_try;;

22439

+esac

22440

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22441

+ (eval "$ac_link") 2>conftest.er1

22442

ac_status=$?

22443

grep -v '^ *+' conftest.er1 >conftest.err

22444

rm -f conftest.er1

22445

cat conftest.err >&5

22446

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22447

- (exit $ac_status); } &&

22448

- { ac_try='test -z "$ac_c_werror_flag"

22449

- || test ! -s conftest.err'

22450

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22451

- (eval $ac_try) 2>&5

22452

- ac_status=$?

22453

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22454

- (exit $ac_status); }; } &&

22455

- { ac_try='test -s conftest$ac_exeext'

22456

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22457

- (eval $ac_try) 2>&5

22458

- ac_status=$?

22459

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22460

- (exit $ac_status); }; }; then

22461

+ (exit $ac_status); } && {

22462

+ test -z "$ac_c_werror_flag" ||

22463

+ test ! -s conftest.err

22464

+ } && test -s conftest$ac_exeext &&

22465

+ $as_test_x conftest$ac_exeext; then

22466

ac_cv_lib_png_main=yes

22467

else

22468

echo "$as_me: failed program was:" >&5

22469

sed 's/^/| /' conftest.$ac_ext >&5

22470

22471

-ac_cv_lib_png_main=no

22472

+ ac_cv_lib_png_main=no

22473

22474

-rm -f conftest.err conftest.$ac_objext \

22475

22476

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

22477

conftest$ac_exeext conftest.$ac_ext

22478

LIBS=$ac_check_lib_save_LIBS

22479

22480

-echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5

22481

-echo "${ECHO_T}$ac_cv_lib_png_main" >&6

22482

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5

22483

+echo "${ECHO_T}$ac_cv_lib_png_main" >&6; }

22484

if test $ac_cv_lib_png_main = yes; then

22485

PNG_LIBS="$PNG_LIBS -lpng"

22486

22487

@@ -33224,19 +33356,19 @@

22488

save_CPPFLAGS=$CPPFLAGS

22489

save_LDFLAGS=$LDFLAGS

22490

22491

-# Check whether --with-jpegincludedir or --without-jpegincludedir was given.

22492

+# Check whether --with-jpegincludedir was given.

22493

if test "${with_jpegincludedir+set}" = set; then

22494

- withval="$with_jpegincludedir"

22495

- JPEG_INCLUDES="-I$withval"

22496

-fi;

22497

+ withval=$with_jpegincludedir; JPEG_INCLUDES="-I$withval"

22498

+fi

22499

22500

CPPFLAGS="$CPPFLAGS $JPEG_INCLUDES"

22501

JPEG_LIBDIR="/usr/lib$LIBPOSTFIX"

22502

22503

-# Check whether --with-jpeglibdir or --without-jpeglibdir was given.

22504

+# Check whether --with-jpeglibdir was given.

22505

if test "${with_jpeglibdir+set}" = set; then

22506

- withval="$with_jpeglibdir"

22507

- JPEG_LIBDIR="$withval"

22508

-fi;

22509

+ withval=$with_jpeglibdir; JPEG_LIBDIR="$withval"

22510

+fi

22511

22512

if test "$JPEG_LIBDIR" != "/usr/lib$LIBPOSTFIX"; then

22513

JPEG_LIBS="-L$JPEG_LIBDIR"

22514

LDFLAGS="$LDFLAGS $JPEG_LIBS"

22515

@@ -33245,17 +33377,17 @@

22516

JPEG_LIBS="$JPEG_LIBDIR/libjpeg.la"

22517

22518

if test "${ac_cv_header_jpeglib_h+set}" = set; then

22519

- echo "$as_me:$LINENO: checking for jpeglib.h" >&5

22520

-echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6

22521

+ { echo "$as_me:$LINENO: checking for jpeglib.h" >&5

22522

+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; }

22523

if test "${ac_cv_header_jpeglib_h+set}" = set; then

22524

echo $ECHO_N "(cached) $ECHO_C" >&6

22525

22526

-echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5

22527

-echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6

22528

+{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5

22529

+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }

22530

else

22531

# Is the header compilable?

22532

-echo "$as_me:$LINENO: checking jpeglib.h usability" >&5

22533

-echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6

22534

+{ echo "$as_me:$LINENO: checking jpeglib.h usability" >&5

22535

+echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6; }

22536

cat >conftest.$ac_ext <<_ACEOF

22537

/* confdefs.h. */

22538

_ACEOF

22539

@@ -33266,41 +33398,37 @@

22540

#include <jpeglib.h>

22541

_ACEOF

22542

rm -f conftest.$ac_objext

22543

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

22544

- (eval $ac_compile) 2>conftest.er1

22545

+if { (ac_try="$ac_compile"

22546

+case "(($ac_try" in

22547

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22548

+ *) ac_try_echo=$ac_try;;

22549

+esac

22550

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22551

+ (eval "$ac_compile") 2>conftest.er1

22552

ac_status=$?

22553

grep -v '^ *+' conftest.er1 >conftest.err

22554

rm -f conftest.er1

22555

cat conftest.err >&5

22556

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22557

- (exit $ac_status); } &&

22558

- { ac_try='test -z "$ac_c_werror_flag"

22559

- || test ! -s conftest.err'

22560

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22561

- (eval $ac_try) 2>&5

22562

- ac_status=$?

22563

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22564

- (exit $ac_status); }; } &&

22565

- { ac_try='test -s conftest.$ac_objext'

22566

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22567

- (eval $ac_try) 2>&5

22568

- ac_status=$?

22569

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22570

- (exit $ac_status); }; }; then

22571

+ (exit $ac_status); } && {

22572

+ test -z "$ac_c_werror_flag" ||

22573

+ test ! -s conftest.err

22574

+ } && test -s conftest.$ac_objext; then

22575

ac_header_compiler=yes

22576

else

22577

echo "$as_me: failed program was:" >&5

22578

sed 's/^/| /' conftest.$ac_ext >&5

22579

22580

-ac_header_compiler=no

22581

+ ac_header_compiler=no

22582

22583

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

22584

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

22585

-echo "${ECHO_T}$ac_header_compiler" >&6

22586

22587

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

22588

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

22589

+echo "${ECHO_T}$ac_header_compiler" >&6; }

22590

22591

# Is the header present?

22592

-echo "$as_me:$LINENO: checking jpeglib.h presence" >&5

22593

-echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6

22594

+{ echo "$as_me:$LINENO: checking jpeglib.h presence" >&5

22595

+echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6; }

22596

cat >conftest.$ac_ext <<_ACEOF

22597

/* confdefs.h. */

22598

_ACEOF

22599

@@ -33309,24 +33437,22 @@

22600

/* end confdefs.h. */

22601

#include <jpeglib.h>

22602

_ACEOF

22603

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

22604

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

22605

+if { (ac_try="$ac_cpp conftest.$ac_ext"

22606

+case "(($ac_try" in

22607

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22608

+ *) ac_try_echo=$ac_try;;

22609

+esac

22610

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22611

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

22612

ac_status=$?

22613

grep -v '^ *+' conftest.er1 >conftest.err

22614

rm -f conftest.er1

22615

cat conftest.err >&5

22616

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22617

- (exit $ac_status); } >/dev/null; then

22618

- if test -s conftest.err; then

22619

- ac_cpp_err=$ac_c_preproc_warn_flag

22620

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

22621

- else

22622

- ac_cpp_err=

22623

- fi

22624

-else

22625

- ac_cpp_err=yes

22626

-fi

22627

-if test -z "$ac_cpp_err"; then

22628

+ (exit $ac_status); } >/dev/null && {

22629

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

22630

+ test ! -s conftest.err

22631

+ }; then

22632

ac_header_preproc=yes

22633

else

22634

echo "$as_me: failed program was:" >&5

22635

@@ -33334,9 +33460,10 @@

22636

22637

ac_header_preproc=no

22638

22639

22640

rm -f conftest.err conftest.$ac_ext

22641

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

22642

-echo "${ECHO_T}$ac_header_preproc" >&6

22643

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

22644

+echo "${ECHO_T}$ac_header_preproc" >&6; }

22645

22646

# So? What about this header?

22647

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

22648

@@ -33360,30 +33487,23 @@

22649

echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}

22650

{ echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5

22651

echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;}

22652

- (

22653

- cat <<\_ASBOX

22654

-## ----------------------------------- ##

22655

-## Report this to the graphviz lists. ##

22656

-## ----------------------------------- ##

22657

-_ASBOX

22658

- ) |

22659

- sed "s/^/$as_me: WARNING: /" >&2

22660

22661

;;

22662

esac

22663

-echo "$as_me:$LINENO: checking for jpeglib.h" >&5

22664

-echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6

22665

+{ echo "$as_me:$LINENO: checking for jpeglib.h" >&5

22666

+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; }

22667

if test "${ac_cv_header_jpeglib_h+set}" = set; then

22668

echo $ECHO_N "(cached) $ECHO_C" >&6

22669

else

22670

ac_cv_header_jpeglib_h=$ac_header_preproc

22671

22672

-echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5

22673

-echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6

22674

+{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5

22675

+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }

22676

22677

22678

if test $ac_cv_header_jpeglib_h = yes; then

22679

- echo "$as_me:$LINENO: checking for main in -ljpeg" >&5

22680

-echo $ECHO_N "checking for main in -ljpeg... $ECHO_C" >&6

22681

+ { echo "$as_me:$LINENO: checking for main in -ljpeg" >&5

22682

+echo $ECHO_N "checking for main in -ljpeg... $ECHO_C" >&6; }

22683

if test "${ac_cv_lib_jpeg_main+set}" = set; then

22684

echo $ECHO_N "(cached) $ECHO_C" >&6

22685

else

22686

@@ -33400,46 +33520,43 @@

22687

int

22688

main ()

22689

{

22690

-main ();

22691

+return main ();

22692

;

22693

return 0;

22694

}

22695

_ACEOF

22696

rm -f conftest.$ac_objext conftest$ac_exeext

22697

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

22698

- (eval $ac_link) 2>conftest.er1

22699

+if { (ac_try="$ac_link"

22700

+case "(($ac_try" in

22701

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22702

+ *) ac_try_echo=$ac_try;;

22703

+esac

22704

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22705

+ (eval "$ac_link") 2>conftest.er1

22706

ac_status=$?

22707

grep -v '^ *+' conftest.er1 >conftest.err

22708

rm -f conftest.er1

22709

cat conftest.err >&5

22710

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22711

- (exit $ac_status); } &&

22712

- { ac_try='test -z "$ac_c_werror_flag"

22713

- || test ! -s conftest.err'

22714

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22715

- (eval $ac_try) 2>&5

22716

- ac_status=$?

22717

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22718

- (exit $ac_status); }; } &&

22719

- { ac_try='test -s conftest$ac_exeext'

22720

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22721

- (eval $ac_try) 2>&5

22722

- ac_status=$?

22723

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22724

- (exit $ac_status); }; }; then

22725

+ (exit $ac_status); } && {

22726

+ test -z "$ac_c_werror_flag" ||

22727

+ test ! -s conftest.err

22728

+ } && test -s conftest$ac_exeext &&

22729

+ $as_test_x conftest$ac_exeext; then

22730

ac_cv_lib_jpeg_main=yes

22731

else

22732

echo "$as_me: failed program was:" >&5

22733

sed 's/^/| /' conftest.$ac_ext >&5

22734

22735

-ac_cv_lib_jpeg_main=no

22736

+ ac_cv_lib_jpeg_main=no

22737

22738

-rm -f conftest.err conftest.$ac_objext \

22739

22740

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

22741

conftest$ac_exeext conftest.$ac_ext

22742

LIBS=$ac_check_lib_save_LIBS

22743

22744

-echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_main" >&5

22745

-echo "${ECHO_T}$ac_cv_lib_jpeg_main" >&6

22746

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_main" >&5

22747

+echo "${ECHO_T}$ac_cv_lib_jpeg_main" >&6; }

22748

if test $ac_cv_lib_jpeg_main = yes; then

22749

JPEG_LIBS="$JPEG_LIBS -ljpeg"

22750

22751

@@ -33527,11 +33644,11 @@

22752

# -----------------------------------

22753

# Special checks

22754

22755

-echo "$as_me:$LINENO: checking if have working sincos()" >&5

22756

-echo $ECHO_N "checking if have working sincos()... $ECHO_C" >&6

22757

+{ echo "$as_me:$LINENO: checking if have working sincos()" >&5

22758

+echo $ECHO_N "checking if have working sincos()... $ECHO_C" >&6; }

22759

if test "$cross_compiling" = yes; then

22760

- echo "$as_me:$LINENO: result: no - assumed because cross-compiling" >&5

22761

-echo "${ECHO_T}no - assumed because cross-compiling" >&6

22762

+ { echo "$as_me:$LINENO: result: no - assumed because cross-compiling" >&5

22763

+echo "${ECHO_T}no - assumed because cross-compiling" >&6; }

22764

22765

else

22766

cat >conftest.$ac_ext <<_ACEOF

22767

@@ -33557,18 +33674,27 @@

22768

22769

_ACEOF

22770

rm -f conftest$ac_exeext

22771

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

22772

- (eval $ac_link) 2>&5

22773

+if { (ac_try="$ac_link"

22774

+case "(($ac_try" in

22775

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22776

+ *) ac_try_echo=$ac_try;;

22777

+esac

22778

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22779

+ (eval "$ac_link") 2>&5

22780

ac_status=$?

22781

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22782

(exit $ac_status); } && { ac_try='./conftest$ac_exeext'

22783

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22784

- (eval $ac_try) 2>&5

22785

+ { (case "(($ac_try" in

22786

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22787

+ *) ac_try_echo=$ac_try;;

22788

+esac

22789

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22790

+ (eval "$ac_try") 2>&5

22791

ac_status=$?

22792

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22793

(exit $ac_status); }; }; then

22794

- echo "$as_me:$LINENO: result: yes" >&5

22795

-echo "${ECHO_T}yes" >&6

22796

+ { echo "$as_me:$LINENO: result: yes" >&5

22797

+echo "${ECHO_T}yes" >&6; }

22798

22799

cat >>confdefs.h <<_ACEOF

22800

#define HAVE_SINCOS 1

22801

@@ -33581,16 +33707,18 @@

22802

sed 's/^/| /' conftest.$ac_ext >&5

22803

22804

( exit $ac_status )

22805

-echo "$as_me:$LINENO: result: no" >&5

22806

-echo "${ECHO_T}no" >&6

22807

+{ echo "$as_me:$LINENO: result: no" >&5

22808

+echo "${ECHO_T}no" >&6; }

22809

22810

22811

-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

22812

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

22813

22814

22815

22816

22817

# -----------------------------------

22818

-echo "$as_me:$LINENO: checking if FILE struct contains _cnt" >&5

22819

-echo $ECHO_N "checking if FILE struct contains _cnt... $ECHO_C" >&6

22820

+{ echo "$as_me:$LINENO: checking if FILE struct contains _cnt" >&5

22821

+echo $ECHO_N "checking if FILE struct contains _cnt... $ECHO_C" >&6; }

22822

cat >conftest.$ac_ext <<_ACEOF

22823

/* confdefs.h. */

22824

_ACEOF

22825

@@ -33611,29 +33739,24 @@

22826

}

22827

_ACEOF

22828

rm -f conftest.$ac_objext

22829

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

22830

- (eval $ac_compile) 2>conftest.er1

22831

+if { (ac_try="$ac_compile"

22832

+case "(($ac_try" in

22833

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22834

+ *) ac_try_echo=$ac_try;;

22835

+esac

22836

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22837

+ (eval "$ac_compile") 2>conftest.er1

22838

ac_status=$?

22839

grep -v '^ *+' conftest.er1 >conftest.err

22840

rm -f conftest.er1

22841

cat conftest.err >&5

22842

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22843

- (exit $ac_status); } &&

22844

- { ac_try='test -z "$ac_c_werror_flag"

22845

- || test ! -s conftest.err'

22846

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22847

- (eval $ac_try) 2>&5

22848

- ac_status=$?

22849

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22850

- (exit $ac_status); }; } &&

22851

- { ac_try='test -s conftest.$ac_objext'

22852

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22853

- (eval $ac_try) 2>&5

22854

- ac_status=$?

22855

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22856

- (exit $ac_status); }; }; then

22857

- echo "$as_me:$LINENO: result: yes" >&5

22858

-echo "${ECHO_T}yes" >&6

22859

+ (exit $ac_status); } && {

22860

+ test -z "$ac_c_werror_flag" ||

22861

+ test ! -s conftest.err

22862

+ } && test -s conftest.$ac_objext; then

22863

+ { echo "$as_me:$LINENO: result: yes" >&5

22864

+echo "${ECHO_T}yes" >&6; }

22865

22866

cat >>confdefs.h <<_ACEOF

22867

#define HAVE_FILE_CNT 1

22868

@@ -33644,16 +33767,17 @@

22869

echo "$as_me: failed program was:" >&5

22870

sed 's/^/| /' conftest.$ac_ext >&5

22871

22872

-echo "$as_me:$LINENO: result: no" >&5

22873

-echo "${ECHO_T}no" >&6

22874

+ { echo "$as_me:$LINENO: result: no" >&5

22875

+echo "${ECHO_T}no" >&6; }

22876

22877

22878

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

22879

22880

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

22881

22882

# -----------------------------------

22883

22884

-echo "$as_me:$LINENO: checking if FILE struct contains _r" >&5

22885

-echo $ECHO_N "checking if FILE struct contains _r... $ECHO_C" >&6

22886

+{ echo "$as_me:$LINENO: checking if FILE struct contains _r" >&5

22887

+echo $ECHO_N "checking if FILE struct contains _r... $ECHO_C" >&6; }

22888

cat >conftest.$ac_ext <<_ACEOF

22889

/* confdefs.h. */

22890

_ACEOF

22891

@@ -33674,29 +33798,24 @@

22892

}

22893

_ACEOF

22894

rm -f conftest.$ac_objext

22895

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

22896

- (eval $ac_compile) 2>conftest.er1

22897

+if { (ac_try="$ac_compile"

22898

+case "(($ac_try" in

22899

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22900

+ *) ac_try_echo=$ac_try;;

22901

+esac

22902

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22903

+ (eval "$ac_compile") 2>conftest.er1

22904

ac_status=$?

22905

grep -v '^ *+' conftest.er1 >conftest.err

22906

rm -f conftest.er1

22907

cat conftest.err >&5

22908

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22909

- (exit $ac_status); } &&

22910

- { ac_try='test -z "$ac_c_werror_flag"

22911

- || test ! -s conftest.err'

22912

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22913

- (eval $ac_try) 2>&5

22914

- ac_status=$?

22915

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22916

- (exit $ac_status); }; } &&

22917

- { ac_try='test -s conftest.$ac_objext'

22918

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22919

- (eval $ac_try) 2>&5

22920

- ac_status=$?

22921

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22922

- (exit $ac_status); }; }; then

22923

- echo "$as_me:$LINENO: result: yes" >&5

22924

-echo "${ECHO_T}yes" >&6

22925

+ (exit $ac_status); } && {

22926

+ test -z "$ac_c_werror_flag" ||

22927

+ test ! -s conftest.err

22928

+ } && test -s conftest.$ac_objext; then

22929

+ { echo "$as_me:$LINENO: result: yes" >&5

22930

+echo "${ECHO_T}yes" >&6; }

22931

22932

cat >>confdefs.h <<_ACEOF

22933

#define HAVE_FILE_R 1

22934

@@ -33707,16 +33826,17 @@

22935

echo "$as_me: failed program was:" >&5

22936

sed 's/^/| /' conftest.$ac_ext >&5

22937

22938

-echo "$as_me:$LINENO: result: no" >&5

22939

-echo "${ECHO_T}no" >&6

22940

+ { echo "$as_me:$LINENO: result: no" >&5

22941

+echo "${ECHO_T}no" >&6; }

22942

22943

22944

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

22945

22946

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

22947

22948

# -----------------------------------

22949

22950

-echo "$as_me:$LINENO: checking if FILE struct contains _next" >&5

22951

-echo $ECHO_N "checking if FILE struct contains _next... $ECHO_C" >&6

22952

+{ echo "$as_me:$LINENO: checking if FILE struct contains _next" >&5

22953

+echo $ECHO_N "checking if FILE struct contains _next... $ECHO_C" >&6; }

22954

cat >conftest.$ac_ext <<_ACEOF

22955

/* confdefs.h. */

22956

_ACEOF

22957

@@ -33737,29 +33857,24 @@

22958

}

22959

_ACEOF

22960

rm -f conftest.$ac_objext

22961

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

22962

- (eval $ac_compile) 2>conftest.er1

22963

+if { (ac_try="$ac_compile"

22964

+case "(($ac_try" in

22965

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

22966

+ *) ac_try_echo=$ac_try;;

22967

+esac

22968

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

22969

+ (eval "$ac_compile") 2>conftest.er1

22970

ac_status=$?

22971

grep -v '^ *+' conftest.er1 >conftest.err

22972

rm -f conftest.er1

22973

cat conftest.err >&5

22974

echo "$as_me:$LINENO: \$? = $ac_status" >&5

22975

- (exit $ac_status); } &&

22976

- { ac_try='test -z "$ac_c_werror_flag"

22977

- || test ! -s conftest.err'

22978

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22979

- (eval $ac_try) 2>&5

22980

- ac_status=$?

22981

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22982

- (exit $ac_status); }; } &&

22983

- { ac_try='test -s conftest.$ac_objext'

22984

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

22985

- (eval $ac_try) 2>&5

22986

- ac_status=$?

22987

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

22988

- (exit $ac_status); }; }; then

22989

- echo "$as_me:$LINENO: result: yes" >&5

22990

-echo "${ECHO_T}yes" >&6

22991

+ (exit $ac_status); } && {

22992

+ test -z "$ac_c_werror_flag" ||

22993

+ test ! -s conftest.err

22994

+ } && test -s conftest.$ac_objext; then

22995

+ { echo "$as_me:$LINENO: result: yes" >&5

22996

+echo "${ECHO_T}yes" >&6; }

22997

22998

cat >>confdefs.h <<_ACEOF

22999

#define HAVE_FILE_NEXT 1

23000

@@ -33770,16 +33885,17 @@

23001

echo "$as_me: failed program was:" >&5

23002

sed 's/^/| /' conftest.$ac_ext >&5

23003

23004

-echo "$as_me:$LINENO: result: no" >&5

23005

-echo "${ECHO_T}no" >&6

23006

+ { echo "$as_me:$LINENO: result: no" >&5

23007

+echo "${ECHO_T}no" >&6; }

23008

23009

23010

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

23011

23012

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

23013

23014

# -----------------------------------

23015

23016

-echo "$as_me:$LINENO: checking if FILE struct contains _IO_read_end" >&5

23017

-echo $ECHO_N "checking if FILE struct contains _IO_read_end... $ECHO_C" >&6

23018

+{ echo "$as_me:$LINENO: checking if FILE struct contains _IO_read_end" >&5

23019

+echo $ECHO_N "checking if FILE struct contains _IO_read_end... $ECHO_C" >&6; }

23020

cat >conftest.$ac_ext <<_ACEOF

23021

/* confdefs.h. */

23022

_ACEOF

23023

@@ -33800,29 +33916,24 @@

23024

}

23025

_ACEOF

23026

rm -f conftest.$ac_objext

23027

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

23028

- (eval $ac_compile) 2>conftest.er1

23029

+if { (ac_try="$ac_compile"

23030

+case "(($ac_try" in

23031

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

23032

+ *) ac_try_echo=$ac_try;;

23033

+esac

23034

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

23035

+ (eval "$ac_compile") 2>conftest.er1

23036

ac_status=$?

23037

grep -v '^ *+' conftest.er1 >conftest.err

23038

rm -f conftest.er1

23039

cat conftest.err >&5

23040

echo "$as_me:$LINENO: \$? = $ac_status" >&5

23041

- (exit $ac_status); } &&

23042

- { ac_try='test -z "$ac_c_werror_flag"

23043

- || test ! -s conftest.err'

23044

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

23045

- (eval $ac_try) 2>&5

23046

- ac_status=$?

23047

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

23048

- (exit $ac_status); }; } &&

23049

- { ac_try='test -s conftest.$ac_objext'

23050

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

23051

- (eval $ac_try) 2>&5

23052

- ac_status=$?

23053

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

23054

- (exit $ac_status); }; }; then

23055

- echo "$as_me:$LINENO: result: yes" >&5

23056

-echo "${ECHO_T}yes" >&6

23057

+ (exit $ac_status); } && {

23058

+ test -z "$ac_c_werror_flag" ||

23059

+ test ! -s conftest.err

23060

+ } && test -s conftest.$ac_objext; then

23061

+ { echo "$as_me:$LINENO: result: yes" >&5

23062

+echo "${ECHO_T}yes" >&6; }

23063

23064

cat >>confdefs.h <<_ACEOF

23065

#define HAVE_FILE_IO_READ_END 1

23066

@@ -33833,16 +33944,17 @@

23067

echo "$as_me: failed program was:" >&5

23068

sed 's/^/| /' conftest.$ac_ext >&5

23069

23070

-echo "$as_me:$LINENO: result: no" >&5

23071

-echo "${ECHO_T}no" >&6

23072

+ { echo "$as_me:$LINENO: result: no" >&5

23073

+echo "${ECHO_T}no" >&6; }

23074

23075

23076

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

23077

23078

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

23079

23080

# -----------------------------------

23081

23082

-echo "$as_me:$LINENO: checking if errno externs are declared" >&5

23083

-echo $ECHO_N "checking if errno externs are declared... $ECHO_C" >&6

23084

+{ echo "$as_me:$LINENO: checking if errno externs are declared" >&5

23085

+echo $ECHO_N "checking if errno externs are declared... $ECHO_C" >&6; }

23086

cat >conftest.$ac_ext <<_ACEOF

23087

/* confdefs.h. */

23088

_ACEOF

23089

@@ -33862,29 +33974,25 @@

23090

}

23091

_ACEOF

23092

rm -f conftest.$ac_objext conftest$ac_exeext

23093

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

23094

- (eval $ac_link) 2>conftest.er1

23095

+if { (ac_try="$ac_link"

23096

+case "(($ac_try" in

23097

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

23098

+ *) ac_try_echo=$ac_try;;

23099

+esac

23100

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

23101

+ (eval "$ac_link") 2>conftest.er1

23102

ac_status=$?

23103

grep -v '^ *+' conftest.er1 >conftest.err

23104

rm -f conftest.er1

23105

cat conftest.err >&5

23106

echo "$as_me:$LINENO: \$? = $ac_status" >&5

23107

- (exit $ac_status); } &&

23108

- { ac_try='test -z "$ac_c_werror_flag"

23109

- || test ! -s conftest.err'

23110

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

23111

- (eval $ac_try) 2>&5

23112

- ac_status=$?

23113

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

23114

- (exit $ac_status); }; } &&

23115

- { ac_try='test -s conftest$ac_exeext'

23116

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

23117

- (eval $ac_try) 2>&5

23118

- ac_status=$?

23119

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

23120

- (exit $ac_status); }; }; then

23121

- echo "$as_me:$LINENO: result: yes" >&5

23122

-echo "${ECHO_T}yes" >&6

23123

+ (exit $ac_status); } && {

23124

+ test -z "$ac_c_werror_flag" ||

23125

+ test ! -s conftest.err

23126

+ } && test -s conftest$ac_exeext &&

23127

+ $as_test_x conftest$ac_exeext; then

23128

+ { echo "$as_me:$LINENO: result: yes" >&5

23129

+echo "${ECHO_T}yes" >&6; }

23130

23131

cat >>confdefs.h <<_ACEOF

23132

#define HAVE_ERRNO_DECL 1

23133

@@ -33895,17 +34003,18 @@

23134

echo "$as_me: failed program was:" >&5

23135

sed 's/^/| /' conftest.$ac_ext >&5

23136

23137

-echo "$as_me:$LINENO: result: no" >&5

23138

-echo "${ECHO_T}no" >&6

23139

+ { echo "$as_me:$LINENO: result: no" >&5

23140

+echo "${ECHO_T}no" >&6; }

23141

23142

23143

-rm -f conftest.err conftest.$ac_objext \

23144

23145

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

23146

conftest$ac_exeext conftest.$ac_ext

23147

23148

# -----------------------------------

23149

23150

-echo "$as_me:$LINENO: checking if getopt externs are declared" >&5

23151

-echo $ECHO_N "checking if getopt externs are declared... $ECHO_C" >&6

23152

+{ echo "$as_me:$LINENO: checking if getopt externs are declared" >&5

23153

+echo $ECHO_N "checking if getopt externs are declared... $ECHO_C" >&6; }

23154

cat >conftest.$ac_ext <<_ACEOF

23155

/* confdefs.h. */

23156

_ACEOF

23157

@@ -33928,29 +34037,25 @@

23158

}

23159

_ACEOF

23160

rm -f conftest.$ac_objext conftest$ac_exeext

23161

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

23162

- (eval $ac_link) 2>conftest.er1

23163

+if { (ac_try="$ac_link"

23164

+case "(($ac_try" in

23165

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

23166

+ *) ac_try_echo=$ac_try;;

23167

+esac

23168

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

23169

+ (eval "$ac_link") 2>conftest.er1

23170

ac_status=$?

23171

grep -v '^ *+' conftest.er1 >conftest.err

23172

rm -f conftest.er1

23173

cat conftest.err >&5

23174

echo "$as_me:$LINENO: \$? = $ac_status" >&5

23175

- (exit $ac_status); } &&

23176

- { ac_try='test -z "$ac_c_werror_flag"

23177

- || test ! -s conftest.err'

23178

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

23179

- (eval $ac_try) 2>&5

23180

- ac_status=$?

23181

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

23182

- (exit $ac_status); }; } &&

23183

- { ac_try='test -s conftest$ac_exeext'

23184

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

23185

- (eval $ac_try) 2>&5

23186

- ac_status=$?

23187

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

23188

- (exit $ac_status); }; }; then

23189

- echo "$as_me:$LINENO: result: yes" >&5

23190

-echo "${ECHO_T}yes" >&6

23191

+ (exit $ac_status); } && {

23192

+ test -z "$ac_c_werror_flag" ||

23193

+ test ! -s conftest.err

23194

+ } && test -s conftest$ac_exeext &&

23195

+ $as_test_x conftest$ac_exeext; then

23196

+ { echo "$as_me:$LINENO: result: yes" >&5

23197

+echo "${ECHO_T}yes" >&6; }

23198

23199

cat >>confdefs.h <<_ACEOF

23200

#define HAVE_GETOPT_DECL 1

23201

@@ -33961,17 +34066,18 @@

23202

echo "$as_me: failed program was:" >&5

23203

sed 's/^/| /' conftest.$ac_ext >&5

23204

23205

-echo "$as_me:$LINENO: result: no" >&5

23206

-echo "${ECHO_T}no" >&6

23207

+ { echo "$as_me:$LINENO: result: no" >&5

23208

+echo "${ECHO_T}no" >&6; }

23209

23210

23211

-rm -f conftest.err conftest.$ac_objext \

23212

23213

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

23214

conftest$ac_exeext conftest.$ac_ext

23215

23216

# -----------------------------------

23217

23218

-echo "$as_me:$LINENO: checking if intptr_t is declared" >&5

23219

-echo $ECHO_N "checking if intptr_t is declared... $ECHO_C" >&6

23220

+{ echo "$as_me:$LINENO: checking if intptr_t is declared" >&5

23221

+echo $ECHO_N "checking if intptr_t is declared... $ECHO_C" >&6; }

23222

cat >conftest.$ac_ext <<_ACEOF

23223

/* confdefs.h. */

23224

_ACEOF

23225

@@ -33999,29 +34105,25 @@

23226

}

23227

_ACEOF

23228

rm -f conftest.$ac_objext conftest$ac_exeext

23229

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

23230

- (eval $ac_link) 2>conftest.er1

23231

+if { (ac_try="$ac_link"

23232

+case "(($ac_try" in

23233

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

23234

+ *) ac_try_echo=$ac_try;;

23235

+esac

23236

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

23237

+ (eval "$ac_link") 2>conftest.er1

23238

ac_status=$?

23239

grep -v '^ *+' conftest.er1 >conftest.err

23240

rm -f conftest.er1

23241

cat conftest.err >&5

23242

echo "$as_me:$LINENO: \$? = $ac_status" >&5

23243

- (exit $ac_status); } &&

23244

- { ac_try='test -z "$ac_c_werror_flag"

23245

- || test ! -s conftest.err'

23246

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

23247

- (eval $ac_try) 2>&5

23248

- ac_status=$?

23249

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

23250

- (exit $ac_status); }; } &&

23251

- { ac_try='test -s conftest$ac_exeext'

23252

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

23253

- (eval $ac_try) 2>&5

23254

- ac_status=$?

23255

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

23256

- (exit $ac_status); }; }; then

23257

- echo "$as_me:$LINENO: result: yes" >&5

23258

-echo "${ECHO_T}yes" >&6

23259

+ (exit $ac_status); } && {

23260

+ test -z "$ac_c_werror_flag" ||

23261

+ test ! -s conftest.err

23262

+ } && test -s conftest$ac_exeext &&

23263

+ $as_test_x conftest$ac_exeext; then

23264

+ { echo "$as_me:$LINENO: result: yes" >&5

23265

+echo "${ECHO_T}yes" >&6; }

23266

23267

cat >>confdefs.h <<_ACEOF

23268

#define HAVE_INTPTR_T 1

23269

@@ -34032,17 +34134,18 @@

23270

echo "$as_me: failed program was:" >&5

23271

sed 's/^/| /' conftest.$ac_ext >&5

23272

23273

-echo "$as_me:$LINENO: result: no" >&5

23274

-echo "${ECHO_T}no" >&6

23275

+ { echo "$as_me:$LINENO: result: no" >&5

23276

+echo "${ECHO_T}no" >&6; }

23277

23278

23279

-rm -f conftest.err conftest.$ac_objext \

23280

23281

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

23282

conftest$ac_exeext conftest.$ac_ext

23283

23284

# -----------------------------------

23285

23286

-echo "$as_me:$LINENO: checking if assert needs __eprintf" >&5

23287

-echo $ECHO_N "checking if assert needs __eprintf... $ECHO_C" >&6

23288

+{ echo "$as_me:$LINENO: checking if assert needs __eprintf" >&5

23289

+echo $ECHO_N "checking if assert needs __eprintf... $ECHO_C" >&6; }

23290

cat > conftest.$ac_ext <<EOF

23291

#include "confdefs.h"

23292

#include "assert.h"

23293

@@ -34052,19 +34155,19 @@

23294

EOF

23295

${CC-cc} -c $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext 1>&5

23296

if test "x`nm conftest.o |$GREP __eprintf`" != "x"; then

23297

- echo "$as_me:$LINENO: result: yes" >&5

23298

-echo "${ECHO_T}yes" >&6

23299

+ { echo "$as_me:$LINENO: result: yes" >&5

23300

+echo "${ECHO_T}yes" >&6; }

23301

CFLAGS="$CFLAGS -DNDEBUG"

23302

else

23303

- echo "$as_me:$LINENO: result: no" >&5

23304

-echo "${ECHO_T}no" >&6

23305

+ { echo "$as_me:$LINENO: result: no" >&5

23306

+echo "${ECHO_T}no" >&6; }

23307

23308

rm -f conftest*

23309

23310

# -----------------------------------------------------------------------

23311

23312

# Generate Makefiles

23313

- ac_config_files="$ac_config_files Makefile doc/Makefile doc/info/Makefile contrib/Makefile contrib/prune/Makefile contrib/diffimg/Makefile graphs/Makefile graphs/directed/Makefile graphs/undirected/Makefile lib/Makefile lib/cdt/Makefile lib/cdt/libcdt.pc lib/agraph/Makefile lib/agraph/libagraph.pc lib/graph/Makefile lib/graph/libgraph.pc lib/agutil/Makefile lib/gd/Makefile lib/pathplan/Makefile lib/pathplan/libpathplan.pc lib/ast/Makefile lib/sfio/Makefile lib/sfio/Sfio_dc/Makefile lib/sfio/Sfio_f/Makefile lib/vmalloc/Makefile lib/dotgen/Makefile lib/neatogen/Makefile lib/fdpgen/Makefile lib/circogen/Makefile lib/twopigen/Makefile lib/pack/Makefile lib/pack/libpack.pc lib/expr/Makefile lib/expr/libexpr.pc lib/common/Makefile lib/ingraphs/Makefile lib/vpsc/Makefile lib/gvc/Makefile lib/gvc/libgvc.pc lib/gvc/libgvc_builtins.pc plugin/Makefile plugin/core/Makefile plugin/gd/Makefile plugin/pango/Makefile plugin/ming/Makefile plugin/dot_layout/Makefile plugin/neato_layout/Makefile plugin/xlib/Makefile plugin/gtk/Makefile cmd/Makefile cmd/dot/Makefile cmd/tools/Makefile cmd/gvpr/Makefile cmd/lefty/ws/x11/libfilereq/Makefile cmd/lefty/ws/x11/Makefile cmd/lefty/ws/Makefile cmd/lefty/os/unix/Makefile cmd/lefty/os/Makefile cmd/lefty/dot2l/Makefile cmd/lefty/examples/Makefile cmd/lefty/Makefile cmd/lneato/Makefile cmd/dotty/Makefile tclpkg/Makefile tclpkg/tclstubs/Makefile tclpkg/tkstubs/Makefile tclpkg/tclhandle/Makefile tclpkg/gdtclft/Makefile tclpkg/gdtclft/demo/Makefile tclpkg/tcldot/Makefile tclpkg/tcldot/demo/Makefile tclpkg/tclpathplan/Makefile tclpkg/tclpathplan/demo/Makefile tclpkg/tclpathplan/demo/pathplan_data/Makefile tclpkg/tkspline/Makefile tclpkg/tkspline/demo/Makefile tclpkg/gv/Makefile graphviz.spec Doxyfile"

23314

+ac_config_files="$ac_config_files Makefile doc/Makefile doc/info/Makefile contrib/Makefile contrib/prune/Makefile contrib/diffimg/Makefile graphs/Makefile graphs/directed/Makefile graphs/undirected/Makefile lib/Makefile lib/cdt/Makefile lib/cdt/libcdt.pc lib/agraph/Makefile lib/agraph/libagraph.pc lib/graph/Makefile lib/graph/libgraph.pc lib/agutil/Makefile lib/gd/Makefile lib/pathplan/Makefile lib/pathplan/libpathplan.pc lib/ast/Makefile lib/sfio/Makefile lib/sfio/Sfio_dc/Makefile lib/sfio/Sfio_f/Makefile lib/vmalloc/Makefile lib/dotgen/Makefile lib/neatogen/Makefile lib/fdpgen/Makefile lib/circogen/Makefile lib/twopigen/Makefile lib/pack/Makefile lib/pack/libpack.pc lib/expr/Makefile lib/expr/libexpr.pc lib/common/Makefile lib/ingraphs/Makefile lib/vpsc/Makefile lib/gvc/Makefile lib/gvc/libgvc.pc lib/gvc/libgvc_builtins.pc plugin/Makefile plugin/core/Makefile plugin/gd/Makefile plugin/pango/Makefile plugin/ming/Makefile plugin/dot_layout/Makefile plugin/neato_layout/Makefile plugin/xlib/Makefile plugin/gtk/Makefile cmd/Makefile cmd/dot/Makefile cmd/tools/Makefile cmd/gvpr/Makefile cmd/lefty/ws/x11/libfilereq/Makefile cmd/lefty/ws/x11/Makefile cmd/lefty/ws/Makefile cmd/lefty/os/unix/Makefile cmd/lefty/os/Makefile cmd/lefty/dot2l/Makefile cmd/lefty/examples/Makefile cmd/lefty/Makefile cmd/lneato/Makefile cmd/dotty/Makefile tclpkg/Makefile tclpkg/tclstubs/Makefile tclpkg/tkstubs/Makefile tclpkg/tclhandle/Makefile tclpkg/gdtclft/Makefile tclpkg/gdtclft/demo/Makefile tclpkg/tcldot/Makefile tclpkg/tcldot/demo/Makefile tclpkg/tclpathplan/Makefile tclpkg/tclpathplan/demo/Makefile tclpkg/tclpathplan/demo/pathplan_data/Makefile tclpkg/tkspline/Makefile tclpkg/tkspline/demo/Makefile tclpkg/gv/Makefile graphviz.spec Doxyfile"

23315

23316

23317

cat >confcache <<\_ACEOF

23318

@@ -34085,39 +34188,58 @@

23319

23320

# The following way of writing the cache mishandles newlines in values,

23321

# but we know of no workaround that is simple, portable, and efficient.

23322

-# So, don't put newlines in cache variables' values.

23323

+# So, we kill variables containing newlines.

23324

# Ultrix sh set writes to stderr and can't be redirected directly,

23325

# and sets the high bit in the cache file unless we assign to the vars.

23326

23327

23328

+ for ac_var in `(set) 2>&1 | sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'`; do

23329

+ eval ac_val=\$$ac_var

23330

+ case $ac_val in #(

23331

+ *${as_nl}*)

23332

+ case $ac_var in #(

23333

+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5

23334

+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;

23335

+ esac

23336

+ case $ac_var in #(

23337

+ _ | IFS | as_nl) ;; #(

23338

+ *) $as_unset $ac_var ;;

23339

+ esac ;;

23340

+ esac

23341

+ done

23342

23343

(set) 2>&1 |

23344

- case `(ac_space=' '; set | grep ac_space) 2>&1` in

23345

- *ac_space=\ *)

23346

+ case $as_nl`(ac_space=' '; set) 2>&1` in #(

23347

+ *${as_nl}ac_space=\ *)

23348

# `set' does not quote correctly, so add quotes (double-quote

23349

# substitution turns \\\\ into \\, and sed turns \\ into \).

23350

sed -n \

23351

"s/'/'\\\\''/g;

23352

s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"

23353

- ;;

23354

+ ;; #(

23355

23356

# `set' quotes correctly as required by POSIX, so do not add quotes.

23357

- sed -n \

23358

- "s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p"

23359

+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"

23360

;;

23361

- esac;

23362

-} |

23363

+ esac |

23364

+ sort

23365

+) |

23366

sed '

23367

+ /^ac_cv_env_/b end

23368

t clear

23369

- : clear

23370

+ :clear

23371

s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/

23372

t end

23373

- /^ac_cv_env/!s/^$[^=]*$=$.*$$/\1=${\1=\2}/

23374

- : end' >>confcache

23375

-if diff $cache_file confcache >/dev/null 2>&1; then :; else

23376

- if test -w $cache_file; then

23377

- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"

23378

+ s/^$[^=]*$=$.*$$/\1=${\1=\2}/

23379

+ :end' >>confcache

23380

+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else

23381

+ if test -w "$cache_file"; then

23382

+ test "x$cache_file" != "x/dev/null" &&

23383

+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5

23384

+echo "$as_me: updating cache $cache_file" >&6;}

23385

cat confcache >$cache_file

23386

else

23387

- echo "not updating unwritable cache $cache_file"

23388

+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5

23389

+echo "$as_me: not updating unwritable cache $cache_file" >&6;}

23390

23391

23392

rm -f confcache

23393

@@ -34126,32 +34248,18 @@

23394

# Let make expand exec_prefix.

23395

test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'

23396

23397

-# VPATH may cause trouble with some makes, so we remove $(srcdir),

23398

-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and

23399

-# trailing colons and then remove the whole line if VPATH becomes empty

23400

-# (actually we leave an empty line to preserve line numbers).

23401

-if test "x$srcdir" = x.; then

23402

- ac_vpsub='/^[ ]*VPATH[ ]*=/{

23403

-s/:*\$(srcdir):*/:/;

23404

-s/:*\${srcdir}:*/:/;

23405

-s/:*@srcdir@:*/:/;

23406

-s/^$[^=]*=[ ]*$:*/\1/;

23407

-s/:*$//;

23408

-s/^[^=]*=[ ]*$//;

23409

-}'

23410

-fi

23411

23412

DEFS=-DHAVE_CONFIG_H

23413

23414

ac_libobjs=

23415

ac_ltlibobjs=

23416

for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue

23417

# 1. Remove the extension, and $U if already installed.

23418

- ac_i=`echo "$ac_i" |

23419

- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`

23420

- # 2. Add them.

23421

- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"

23422

- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'

23423

+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'

23424

+ ac_i=`echo "$ac_i" | sed "$ac_script"`

23425

+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR

23426

+ # will be set to the directory where LIBOBJS objects are built.

23427

+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"

23428

+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'

23429

done

23430

LIBOBJS=$ac_libobjs

23431

23432

@@ -34392,30 +34500,93 @@

23433

## M4sh Initialization. ##

23434

## --------------------- ##

23435

23436

-# Be Bourne compatible

23437

+# Be more Bourne compatible

23438

+DUALCASE=1; export DUALCASE # for MKS sh

23439

if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

23440

emulate sh

23441

NULLCMD=:

23442

# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

23443

# is contrary to our usage. Disable this feature.

23444

alias -g '${1+"$@"}'='"$@"'

23445

-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then

23446

- set -o posix

23447

-fi

23448

-DUALCASE=1; export DUALCASE # for MKS sh

23449

23450

-# Support unset when possible.

23451

-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

23452

- as_unset=unset

23453

+ setopt NO_GLOB_SUBST

23454

else

23455

- as_unset=false

23456

+ case `(set -o) 2>/dev/null` in

23457

+ *posix*) set -o posix ;;

23458

+esac

23459

23460

23461

23462

23463

-# Work around bugs in pre-3.0 UWIN ksh.

23464

-$as_unset ENV MAIL MAILPATH

23465

-PS1='$ '

23466

-PS2='> '

23467

23468

23469

+# PATH needs CR

23470

+# Avoid depending upon Character Ranges.

23471

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

23472

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

23473

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

23474

+as_cr_digits='0123456789'

23475

+as_cr_alnum=$as_cr_Letters$as_cr_digits

23476

23477

+# The user is always right.

23478

+if test "${PATH_SEPARATOR+set}" != set; then

23479

+ echo "#! /bin/sh" >conf$$.sh

23480

+ echo "exit 0" >>conf$$.sh

23481

+ chmod +x conf$$.sh

23482

+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

23483

+ PATH_SEPARATOR=';'

23484

+ else

23485

+ PATH_SEPARATOR=:

23486

+ fi

23487

+ rm -f conf$$.sh

23488

+fi

23489

23490

+# Support unset when possible.

23491

+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

23492

+ as_unset=unset

23493

+else

23494

+ as_unset=false

23495

+fi

23496

23497

23498

+# IFS

23499

+# We need space, tab and new line, in precisely that order. Quoting is

23500

+# there to prevent editors from complaining about space-tab.

23501

+# (If _AS_PATH_WALK were called with IFS unset, it would disable word

23502

+# splitting by setting IFS to empty value.)

23503

+as_nl='

23504

23505

+IFS=" "" $as_nl"

23506

23507

+# Find who we are. Look in the path if we contain no directory separator.

23508

+case $0 in

23509

+ *[\\/]* ) as_myself=$0 ;;

23510

+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

23511

+for as_dir in $PATH

23512

+do

23513

+ IFS=$as_save_IFS

23514

+ test -z "$as_dir" && as_dir=.

23515

+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

23516

+done

23517

+IFS=$as_save_IFS

23518

23519

+ ;;

23520

+esac

23521

+# We did not find ourselves, most probably we were run as `sh COMMAND'

23522

+# in which case we are not to be found in the path.

23523

+if test "x$as_myself" = x; then

23524

+ as_myself=$0

23525

+fi

23526

+if test ! -f "$as_myself"; then

23527

+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

23528

+ { (exit 1); exit 1; }

23529

+fi

23530

23531

+# Work around bugs in pre-3.0 UWIN ksh.

23532

+for as_var in ENV MAIL MAILPATH

23533

+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

23534

+done

23535

+PS1='$ '

23536

+PS2='> '

23537

PS4='+ '

23538

23539

# NLS nuisances.

23540

@@ -34427,18 +34598,19 @@

23541

if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

23542

eval $as_var=C; export $as_var

23543

else

23544

- $as_unset $as_var

23545

+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

23546

23547

done

23548

23549

# Required to use basename.

23550

-if expr a : '$a$' >/dev/null 2>&1; then

23551

+if expr a : '$a$' >/dev/null 2>&1 &&

23552

+ test "X`expr 00001 : '.*$...$'`" = X001; then

23553

as_expr=expr

23554

else

23555

as_expr=false

23556

23557

23558

-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then

23559

+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then

23560

as_basename=basename

23561

else

23562

as_basename=false

23563

@@ -34446,159 +34618,120 @@

23564

23565

23566

# Name of the executable.

23567

-as_me=`$as_basename "$0" ||

23568

+as_me=`$as_basename -- "$0" ||

23569

$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

23570

X"$0" : 'X$//$$' \| \

23571

- X"$0" : 'X$/$$' \| \

23572

- . : '$.$' 2>/dev/null ||

23573

+ X"$0" : 'X$/$' \| . 2>/dev/null ||

23574

echo X/"$0" |

23575

- sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; }

23576

- /^X\/$\/\/$$/{ s//\1/; q; }

23577

- /^X\/$\/$.*/{ s//\1/; q; }

23578

- s/.*/./; q'`

23579

23580

23581

-# PATH needs CR, and LINENO needs CR and PATH.

23582

-# Avoid depending upon Character Ranges.

23583

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

23584

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

23585

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

23586

-as_cr_digits='0123456789'

23587

-as_cr_alnum=$as_cr_Letters$as_cr_digits

23588

+ sed '/^.*\/$[^/][^/]*$\/*$/{

23589

+ s//\1/

23590

+ q

23591

+ }

23592

+ /^X\/$\/\/$$/{

23593

+ s//\1/

23594

+ q

23595

+ }

23596

+ /^X\/$\/$.*/{

23597

+ s//\1/

23598

+ q

23599

+ }

23600

+ s/.*/./; q'`

23601

23602

-# The user is always right.

23603

-if test "${PATH_SEPARATOR+set}" != set; then

23604

- echo "#! /bin/sh" >conf$$.sh

23605

- echo "exit 0" >>conf$$.sh

23606

- chmod +x conf$$.sh

23607

- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

23608

- PATH_SEPARATOR=';'

23609

- else

23610

- PATH_SEPARATOR=:

23611

- fi

23612

- rm -f conf$$.sh

23613

-fi

23614

+# CDPATH.

23615

+$as_unset CDPATH

23616

23617

23618

- as_lineno_1=$LINENO

23619

- as_lineno_2=$LINENO

23620

- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

23621

- test "x$as_lineno_1" != "x$as_lineno_2" &&

23622

- test "x$as_lineno_3" = "x$as_lineno_2" || {

23623

- # Find who we are. Look in the path if we contain no path at all

23624

- # relative or not.

23625

- case $0 in

23626

- *[\\/]* ) as_myself=$0 ;;

23627

- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

23628

-for as_dir in $PATH

23629

-do

23630

- IFS=$as_save_IFS

23631

- test -z "$as_dir" && as_dir=.

23632

- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

23633

-done

23634

23635

- ;;

23636

- esac

23637

- # We did not find ourselves, most probably we were run as `sh COMMAND'

23638

- # in which case we are not to be found in the path.

23639

- if test "x$as_myself" = x; then

23640

- as_myself=$0

23641

- fi

23642

- if test ! -f "$as_myself"; then

23643

- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5

23644

-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}

23645

- { (exit 1); exit 1; }; }

23646

- fi

23647

- case $CONFIG_SHELL in

23648

- '')

23649

- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

23650

-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH

23651

-do

23652

- IFS=$as_save_IFS

23653

- test -z "$as_dir" && as_dir=.

23654

- for as_base in sh bash ksh sh5; do

23655

- case $as_dir in

23656

- /*)

23657

- if ("$as_dir/$as_base" -c '

23658

as_lineno_1=$LINENO

23659

as_lineno_2=$LINENO

23660

- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

23661

test "x$as_lineno_1" != "x$as_lineno_2" &&

23662

- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then

23663

- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }

23664

- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }

23665

- CONFIG_SHELL=$as_dir/$as_base

23666

- export CONFIG_SHELL

23667

- exec "$CONFIG_SHELL" "$0" ${1+"$@"}

23668

- fi;;

23669

- esac

23670

- done

23671

-done

23672

-;;

23673

- esac

23674

+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {

23675

23676

# Create $as_me.lineno as a copy of $as_myself, but with $LINENO

23677

# uniformly replaced by the line number. The first 'sed' inserts a

23678

- # line-number line before each line; the second 'sed' does the real

23679

- # work. The second script uses 'N' to pair each line-number line

23680

- # with the numbered line, and appends trailing '-' during

23681

- # substitution so that $LINENO is not a special case at line end.

23682

+ # line-number line after each line using $LINENO; the second 'sed'

23683

+ # does the real work. The second script uses 'N' to pair each

23684

+ # line-number line with the line containing $LINENO, and appends

23685

+ # trailing '-' during substitution so that $LINENO is not a special

23686

+ # case at line end.

23687

# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

23688

- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)

23689

- sed '=' <$as_myself |

23690

+ # scripts with optimization help from Paolo Bonzini. Blame Lee

23691

+ # E. McMahon (1931-1989) for sed's syntax. :-)

23692

+ sed -n '

23693

+ p

23694

+ /[$]LINENO/=

23695

+ ' <$as_myself |

23696

sed '

23697

+ s/[$]LINENO.*/&-/

23698

+ t lineno

23699

+ b

23700

+ :lineno

23701

23702

- s,$,-,

23703

- : loop

23704

- s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3,

23705

+ :loop

23706

+ s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/

23707

t loop

23708

- s,-$,,

23709

- s,^['$as_cr_digits']*\n,,

23710

+ s/-\n.*//

23711

' >$as_me.lineno &&

23712

- chmod +x $as_me.lineno ||

23713

- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5

23714

-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}

23715

+ chmod +x "$as_me.lineno" ||

23716

+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

23717

{ (exit 1); exit 1; }; }

23718

23719

# Don't try to exec as it changes $[0], causing all sort of problems

23720

# (the dirname of $[0] is not the place where we might find the

23721

- # original and so on. Autoconf is especially sensible to this).

23722

- . ./$as_me.lineno

23723

+ # original and so on. Autoconf is especially sensitive to this).

23724

+ . "./$as_me.lineno"

23725

# Exit status is that of the last command.

23726

exit

23727

}

23728

23729

23730

-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in

23731

- *c*,-n*) ECHO_N= ECHO_C='

23732

-' ECHO_T=' ' ;;

23733

- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;

23734

- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;

23735

+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

23736

+ as_dirname=dirname

23737

+else

23738

+ as_dirname=false

23739

+fi

23740

23741

+ECHO_C= ECHO_N= ECHO_T=

23742

+case `echo -n x` in

23743

+-n*)

23744

+ case `echo 'x\c'` in

23745

+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.

23746

+ *) ECHO_C='\c';;

23747

+ esac;;

23748

+*)

23749

+ ECHO_N='-n';;

23750

esac

23751

23752

-if expr a : '$a$' >/dev/null 2>&1; then

23753

+if expr a : '$a$' >/dev/null 2>&1 &&

23754

+ test "X`expr 00001 : '.*$...$'`" = X001; then

23755

as_expr=expr

23756

else

23757

as_expr=false

23758

23759

23760

rm -f conf$$ conf$$.exe conf$$.file

23761

+if test -d conf$$.dir; then

23762

+ rm -f conf$$.dir/conf$$.file

23763

+else

23764

+ rm -f conf$$.dir

23765

+ mkdir conf$$.dir

23766

+fi

23767

echo >conf$$.file

23768

if ln -s conf$$.file conf$$ 2>/dev/null; then

23769

- # We could just check for DJGPP; but this test a) works b) is more generic

23770

- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).

23771

- if test -f conf$$.exe; then

23772

- # Don't use ln at all; we don't have any links

23773

+ as_ln_s='ln -s'

23774

+ # ... but there are two gotchas:

23775

+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

23776

+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

23777

+ # In both cases, we have to default to `cp -p'.

23778

+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

23779

as_ln_s='cp -p'

23780

- else

23781

- as_ln_s='ln -s'

23782

- fi

23783

elif ln conf$$.file conf$$ 2>/dev/null; then

23784

as_ln_s=ln

23785

else

23786

as_ln_s='cp -p'

23787

23788

-rm -f conf$$ conf$$.exe conf$$.file

23789

+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

23790

+rmdir conf$$.dir 2>/dev/null

23791

23792

if mkdir -p . 2>/dev/null; then

23793

as_mkdir_p=:

23794

@@ -34607,7 +34740,28 @@

23795

as_mkdir_p=false

23796

23797

23798

-as_executable_p="test -f"

23799

+if test -x / >/dev/null 2>&1; then

23800

+ as_test_x='test -x'

23801

+else

23802

+ if ls -dL / >/dev/null 2>&1; then

23803

+ as_ls_L_option=L

23804

+ else

23805

+ as_ls_L_option=

23806

+ fi

23807

+ as_test_x='

23808

+ eval sh -c '\''

23809

+ if test -d "$1"; then

23810

+ test -d "$1/.";

23811

+ else

23812

+ case $1 in

23813

+ -*)set "./$1";;

23814

+ esac;

23815

+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

23816

+ ???[sx]*):;;*)false;;esac;fi

23817

+ '\'' sh

23818

+ '

23819

+fi

23820

+as_executable_p=$as_test_x

23821

23822

# Sed expression to map a string onto a valid CPP name.

23823

as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

23824

@@ -34616,31 +34770,14 @@

23825

as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

23826

23827

23828

-# IFS

23829

-# We need space, tab and new line, in precisely that order.

23830

-as_nl='

23831

23832

-IFS=" $as_nl"

23833

23834

-# CDPATH.

23835

-$as_unset CDPATH

23836

23837

exec 6>&1

23838

23839

-# Open the log real soon, to keep \$[0] and so on meaningful, and to

23840

+# Save the log message, to keep $[0] and so on meaningful, and to

23841

# report actual input values of CONFIG_FILES etc. instead of their

23842

-# values after options handling. Logging --version etc. is OK.

23843

-exec 5>>config.log

23844

23845

- echo

23846

- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX

23847

-## Running $as_me. ##

23848

-_ASBOX

23849

-} >&5

23850

-cat >&5 <<_CSEOF

23851

23852

+# values after options handling.

23853

+ac_log="

23854

This file was extended by graphviz $as_me 2.12, which was

23855

-generated by GNU Autoconf 2.59. Invocation command line was

23856

+generated by GNU Autoconf 2.61. Invocation command line was

23857

23858

CONFIG_FILES = $CONFIG_FILES

23859

CONFIG_HEADERS = $CONFIG_HEADERS

23860

@@ -34648,30 +34785,20 @@

23861

CONFIG_COMMANDS = $CONFIG_COMMANDS

23862

$ $0 $@

23863

23864

-_CSEOF

23865

-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5

23866

-echo >&5

23867

+on `(hostname || uname -n) 2>/dev/null | sed 1q`

23868

23869

23870

_ACEOF

23871

23872

+cat >>$CONFIG_STATUS <<_ACEOF

23873

# Files that config.status was made for.

23874

-if test -n "$ac_config_files"; then

23875

- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS

23876

-fi

23877

23878

-if test -n "$ac_config_headers"; then

23879

- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS

23880

-fi

23881

+config_files="$ac_config_files"

23882

+config_headers="$ac_config_headers"

23883

+config_commands="$ac_config_commands"

23884

23885

-if test -n "$ac_config_links"; then

23886

- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS

23887

-fi

23888

23889

-if test -n "$ac_config_commands"; then

23890

- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS

23891

-fi

23892

+_ACEOF

23893

23894

cat >>$CONFIG_STATUS <<\_ACEOF

23895

23896

ac_cs_usage="\

23897

\`$as_me' instantiates files from templates according to the

23898

current configuration.

23899

@@ -34679,7 +34806,7 @@

23900

Usage: $0 [OPTIONS] [FILE]...

23901

23902

-h, --help print this help, then exit

23903

- -V, --version print version number, then exit

23904

+ -V, --version print version number and configuration settings, then exit

23905

-q, --quiet do not print progress messages

23906

-d, --debug don't remove temporary files

23907

--recheck update $as_me by reconfiguring in the same conditions

23908

@@ -34698,19 +34825,21 @@

23909

$config_commands

23910

23911

Report bugs to <bug-autoconf@gnu.org>."

23912

-_ACEOF

23913

23914

+_ACEOF

23915

cat >>$CONFIG_STATUS <<_ACEOF

23916

ac_cs_version="\\

23917

graphviz config.status 2.12

23918

-configured by $0, generated by GNU Autoconf 2.59,

23919

- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

23920

+configured by $0, generated by GNU Autoconf 2.61,

23921

+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

23922

23923

23924

23925

This config.status script is free software; the Free Software Foundation

23926

gives unlimited permission to copy, distribute and modify it."

23927

-srcdir=$srcdir

23928

-INSTALL="$INSTALL"

23929

23930

+ac_pwd='$ac_pwd'

23931

+srcdir='$srcdir'

23932

+INSTALL='$INSTALL'

23933

_ACEOF

23934

23935

cat >>$CONFIG_STATUS <<\_ACEOF

23936

@@ -34721,39 +34850,24 @@

23937

23938

case $1 in

23939

--*=*)

23940

- ac_option=`expr "x$1" : 'x$[^=]*$='`

23941

- ac_optarg=`expr "x$1" : 'x[^=]*=$.*$'`

23942

+ ac_option=`expr "X$1" : 'X$[^=]*$='`

23943

+ ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'`

23944

ac_shift=:

23945

;;

23946

- -*)

23947

+ *)

23948

ac_option=$1

23949

ac_optarg=$2

23950

ac_shift=shift

23951

;;

23952

- *) # This is not an option, so the user has probably given explicit

23953

- # arguments.

23954

- ac_option=$1

23955

- ac_need_defaults=false;;

23956

esac

23957

23958

case $ac_option in

23959

# Handling of the options.

23960

-_ACEOF

23961

-cat >>$CONFIG_STATUS <<\_ACEOF

23962

23963

ac_cs_recheck=: ;;

23964

- --version | --vers* | -V )

23965

- echo "$ac_cs_version"; exit 0 ;;

23966

- --he | --h)

23967

- # Conflict between --help and --header

23968

- { { echo "$as_me:$LINENO: error: ambiguous option: $1

23969

-Try \`$0 --help' for more information." >&5

23970

-echo "$as_me: error: ambiguous option: $1

23971

-Try \`$0 --help' for more information." >&2;}

23972

- { (exit 1); exit 1; }; };;

23973

- --help | --hel | -h )

23974

- echo "$ac_cs_usage"; exit 0 ;;

23975

- --debug | --d* | -d )

23976

+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )

23977

+ echo "$ac_cs_version"; exit ;;

23978

+ --debug | --debu | --deb | --de | --d | -d )

23979

debug=: ;;

23980

--file | --fil | --fi | --f )

23981

$ac_shift

23982

@@ -34763,18 +34877,24 @@

23983

$ac_shift

23984

CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"

23985

ac_need_defaults=false;;

23986

+ --he | --h)

23987

+ # Conflict between --help and --header

23988

+ { echo "$as_me: error: ambiguous option: $1

23989

+Try \`$0 --help' for more information." >&2

23990

+ { (exit 1); exit 1; }; };;

23991

+ --help | --hel | -h )

23992

+ echo "$ac_cs_usage"; exit ;;

23993

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

23994

| -silent | --silent | --silen | --sile | --sil | --si | --s)

23995

ac_cs_silent=: ;;

23996

23997

# This is an error.

23998

- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1

23999

-Try \`$0 --help' for more information." >&5

24000

-echo "$as_me: error: unrecognized option: $1

24001

-Try \`$0 --help' for more information." >&2;}

24002

+ -*) { echo "$as_me: error: unrecognized option: $1

24003

+Try \`$0 --help' for more information." >&2

24004

{ (exit 1); exit 1; }; } ;;

24005

24006

- *) ac_config_targets="$ac_config_targets $1" ;;

24007

+ *) ac_config_targets="$ac_config_targets $1"

24008

+ ac_need_defaults=false ;;

24009

24010

esac

24011

shift

24012

@@ -34790,117 +34910,129 @@

24013

_ACEOF

24014

cat >>$CONFIG_STATUS <<_ACEOF

24015

if \$ac_cs_recheck; then

24016

- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6

24017

- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

24018

+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6

24019

+ CONFIG_SHELL=$SHELL

24020

+ export CONFIG_SHELL

24021

+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

24022

24023

24024

_ACEOF

24025

+cat >>$CONFIG_STATUS <<\_ACEOF

24026

+exec 5>>config.log

24027

24028

+ echo

24029

+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX

24030

+## Running $as_me. ##

24031

+_ASBOX

24032

+ echo "$ac_log"

24033

+} >&5

24034

24035

+_ACEOF

24036

cat >>$CONFIG_STATUS <<_ACEOF

24037

24038

-# INIT-COMMANDS section.

24039

+# INIT-COMMANDS

24040

24041

24042

AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"

24043

24044

24045

_ACEOF

24046

24047

24048

24049

cat >>$CONFIG_STATUS <<\_ACEOF

24050

24051

+# Handling of arguments.

24052

for ac_config_target in $ac_config_targets

24053

24054

- case "$ac_config_target" in

24055

- # Handling of arguments.

24056

- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;

24057

- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;

24058

- "doc/info/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/info/Makefile" ;;

24059

- "contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;

24060

- "contrib/prune/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/prune/Makefile" ;;

24061

- "contrib/diffimg/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/diffimg/Makefile" ;;

24062

- "graphs/Makefile" ) CONFIG_FILES="$CONFIG_FILES graphs/Makefile" ;;

24063

- "graphs/directed/Makefile" ) CONFIG_FILES="$CONFIG_FILES graphs/directed/Makefile" ;;

24064

- "graphs/undirected/Makefile" ) CONFIG_FILES="$CONFIG_FILES graphs/undirected/Makefile" ;;

24065

- "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;

24066

- "lib/cdt/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/cdt/Makefile" ;;

24067

- "lib/cdt/libcdt.pc" ) CONFIG_FILES="$CONFIG_FILES lib/cdt/libcdt.pc" ;;

24068

- "lib/agraph/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/agraph/Makefile" ;;

24069

- "lib/agraph/libagraph.pc" ) CONFIG_FILES="$CONFIG_FILES lib/agraph/libagraph.pc" ;;

24070

- "lib/graph/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/graph/Makefile" ;;

24071

- "lib/graph/libgraph.pc" ) CONFIG_FILES="$CONFIG_FILES lib/graph/libgraph.pc" ;;

24072

- "lib/agutil/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/agutil/Makefile" ;;

24073

- "lib/gd/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/gd/Makefile" ;;

24074

- "lib/pathplan/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/pathplan/Makefile" ;;

24075

- "lib/pathplan/libpathplan.pc" ) CONFIG_FILES="$CONFIG_FILES lib/pathplan/libpathplan.pc" ;;

24076

- "lib/ast/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/ast/Makefile" ;;

24077

- "lib/sfio/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/sfio/Makefile" ;;

24078

- "lib/sfio/Sfio_dc/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/sfio/Sfio_dc/Makefile" ;;

24079

- "lib/sfio/Sfio_f/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/sfio/Sfio_f/Makefile" ;;

24080

- "lib/vmalloc/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/vmalloc/Makefile" ;;

24081

- "lib/dotgen/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/dotgen/Makefile" ;;

24082

- "lib/neatogen/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/neatogen/Makefile" ;;

24083

- "lib/fdpgen/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/fdpgen/Makefile" ;;

24084

- "lib/circogen/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/circogen/Makefile" ;;

24085

- "lib/twopigen/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/twopigen/Makefile" ;;

24086

- "lib/pack/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/pack/Makefile" ;;

24087

- "lib/pack/libpack.pc" ) CONFIG_FILES="$CONFIG_FILES lib/pack/libpack.pc" ;;

24088

- "lib/expr/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/expr/Makefile" ;;

24089

- "lib/expr/libexpr.pc" ) CONFIG_FILES="$CONFIG_FILES lib/expr/libexpr.pc" ;;

24090

- "lib/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/common/Makefile" ;;

24091

- "lib/ingraphs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/ingraphs/Makefile" ;;

24092

- "lib/vpsc/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/vpsc/Makefile" ;;

24093

- "lib/gvc/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/gvc/Makefile" ;;

24094

- "lib/gvc/libgvc.pc" ) CONFIG_FILES="$CONFIG_FILES lib/gvc/libgvc.pc" ;;

24095

- "lib/gvc/libgvc_builtins.pc" ) CONFIG_FILES="$CONFIG_FILES lib/gvc/libgvc_builtins.pc" ;;

24096

- "plugin/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugin/Makefile" ;;

24097

- "plugin/core/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugin/core/Makefile" ;;

24098

- "plugin/gd/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugin/gd/Makefile" ;;

24099

- "plugin/pango/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugin/pango/Makefile" ;;

24100

- "plugin/ming/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugin/ming/Makefile" ;;

24101

- "plugin/dot_layout/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugin/dot_layout/Makefile" ;;

24102

- "plugin/neato_layout/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugin/neato_layout/Makefile" ;;

24103

- "plugin/xlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugin/xlib/Makefile" ;;

24104

- "plugin/gtk/Makefile" ) CONFIG_FILES="$CONFIG_FILES plugin/gtk/Makefile" ;;

24105

- "cmd/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/Makefile" ;;

24106

- "cmd/dot/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/dot/Makefile" ;;

24107

- "cmd/tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/tools/Makefile" ;;

24108

- "cmd/gvpr/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/gvpr/Makefile" ;;

24109

- "cmd/lefty/ws/x11/libfilereq/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/lefty/ws/x11/libfilereq/Makefile" ;;

24110

- "cmd/lefty/ws/x11/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/lefty/ws/x11/Makefile" ;;

24111

- "cmd/lefty/ws/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/lefty/ws/Makefile" ;;

24112

- "cmd/lefty/os/unix/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/lefty/os/unix/Makefile" ;;

24113

- "cmd/lefty/os/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/lefty/os/Makefile" ;;

24114

- "cmd/lefty/dot2l/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/lefty/dot2l/Makefile" ;;

24115

- "cmd/lefty/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/lefty/examples/Makefile" ;;

24116

- "cmd/lefty/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/lefty/Makefile" ;;

24117

- "cmd/lneato/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/lneato/Makefile" ;;

24118

- "cmd/dotty/Makefile" ) CONFIG_FILES="$CONFIG_FILES cmd/dotty/Makefile" ;;

24119

- "tclpkg/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/Makefile" ;;

24120

- "tclpkg/tclstubs/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/tclstubs/Makefile" ;;

24121

- "tclpkg/tkstubs/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/tkstubs/Makefile" ;;

24122

- "tclpkg/tclhandle/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/tclhandle/Makefile" ;;

24123

- "tclpkg/gdtclft/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/gdtclft/Makefile" ;;

24124

- "tclpkg/gdtclft/demo/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/gdtclft/demo/Makefile" ;;

24125

- "tclpkg/tcldot/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/tcldot/Makefile" ;;

24126

- "tclpkg/tcldot/demo/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/tcldot/demo/Makefile" ;;

24127

- "tclpkg/tclpathplan/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/tclpathplan/Makefile" ;;

24128

- "tclpkg/tclpathplan/demo/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/tclpathplan/demo/Makefile" ;;

24129

- "tclpkg/tclpathplan/demo/pathplan_data/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/tclpathplan/demo/pathplan_data/Makefile" ;;

24130

- "tclpkg/tkspline/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/tkspline/Makefile" ;;

24131

- "tclpkg/tkspline/demo/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/tkspline/demo/Makefile" ;;

24132

- "tclpkg/gv/Makefile" ) CONFIG_FILES="$CONFIG_FILES tclpkg/gv/Makefile" ;;

24133

- "graphviz.spec" ) CONFIG_FILES="$CONFIG_FILES graphviz.spec" ;;

24134

- "Doxyfile" ) CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;

24135

- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;

24136

- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;

24137

- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

24138

+ case $ac_config_target in

24139

+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

24140

+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;

24141

+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;

24142

+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

24143

+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;

24144

+ "doc/info/Makefile") CONFIG_FILES="$CONFIG_FILES doc/info/Makefile" ;;

24145

+ "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;

24146

+ "contrib/prune/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/prune/Makefile" ;;

24147

+ "contrib/diffimg/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/diffimg/Makefile" ;;

24148

+ "graphs/Makefile") CONFIG_FILES="$CONFIG_FILES graphs/Makefile" ;;

24149

+ "graphs/directed/Makefile") CONFIG_FILES="$CONFIG_FILES graphs/directed/Makefile" ;;

24150

+ "graphs/undirected/Makefile") CONFIG_FILES="$CONFIG_FILES graphs/undirected/Makefile" ;;

24151

+ "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;

24152

+ "lib/cdt/Makefile") CONFIG_FILES="$CONFIG_FILES lib/cdt/Makefile" ;;

24153

+ "lib/cdt/libcdt.pc") CONFIG_FILES="$CONFIG_FILES lib/cdt/libcdt.pc" ;;

24154

+ "lib/agraph/Makefile") CONFIG_FILES="$CONFIG_FILES lib/agraph/Makefile" ;;

24155

+ "lib/agraph/libagraph.pc") CONFIG_FILES="$CONFIG_FILES lib/agraph/libagraph.pc" ;;

24156

+ "lib/graph/Makefile") CONFIG_FILES="$CONFIG_FILES lib/graph/Makefile" ;;

24157

+ "lib/graph/libgraph.pc") CONFIG_FILES="$CONFIG_FILES lib/graph/libgraph.pc" ;;

24158

+ "lib/agutil/Makefile") CONFIG_FILES="$CONFIG_FILES lib/agutil/Makefile" ;;

24159

+ "lib/gd/Makefile") CONFIG_FILES="$CONFIG_FILES lib/gd/Makefile" ;;

24160

+ "lib/pathplan/Makefile") CONFIG_FILES="$CONFIG_FILES lib/pathplan/Makefile" ;;

24161

+ "lib/pathplan/libpathplan.pc") CONFIG_FILES="$CONFIG_FILES lib/pathplan/libpathplan.pc" ;;

24162

+ "lib/ast/Makefile") CONFIG_FILES="$CONFIG_FILES lib/ast/Makefile" ;;

24163

+ "lib/sfio/Makefile") CONFIG_FILES="$CONFIG_FILES lib/sfio/Makefile" ;;

24164

+ "lib/sfio/Sfio_dc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/sfio/Sfio_dc/Makefile" ;;

24165

+ "lib/sfio/Sfio_f/Makefile") CONFIG_FILES="$CONFIG_FILES lib/sfio/Sfio_f/Makefile" ;;

24166

+ "lib/vmalloc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/vmalloc/Makefile" ;;

24167

+ "lib/dotgen/Makefile") CONFIG_FILES="$CONFIG_FILES lib/dotgen/Makefile" ;;

24168

+ "lib/neatogen/Makefile") CONFIG_FILES="$CONFIG_FILES lib/neatogen/Makefile" ;;

24169

+ "lib/fdpgen/Makefile") CONFIG_FILES="$CONFIG_FILES lib/fdpgen/Makefile" ;;

24170

+ "lib/circogen/Makefile") CONFIG_FILES="$CONFIG_FILES lib/circogen/Makefile" ;;

24171

+ "lib/twopigen/Makefile") CONFIG_FILES="$CONFIG_FILES lib/twopigen/Makefile" ;;

24172

+ "lib/pack/Makefile") CONFIG_FILES="$CONFIG_FILES lib/pack/Makefile" ;;

24173

+ "lib/pack/libpack.pc") CONFIG_FILES="$CONFIG_FILES lib/pack/libpack.pc" ;;

24174

+ "lib/expr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/expr/Makefile" ;;

24175

+ "lib/expr/libexpr.pc") CONFIG_FILES="$CONFIG_FILES lib/expr/libexpr.pc" ;;

24176

+ "lib/common/Makefile") CONFIG_FILES="$CONFIG_FILES lib/common/Makefile" ;;

24177

+ "lib/ingraphs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/ingraphs/Makefile" ;;

24178

+ "lib/vpsc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/vpsc/Makefile" ;;

24179

+ "lib/gvc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/gvc/Makefile" ;;

24180

+ "lib/gvc/libgvc.pc") CONFIG_FILES="$CONFIG_FILES lib/gvc/libgvc.pc" ;;

24181

+ "lib/gvc/libgvc_builtins.pc") CONFIG_FILES="$CONFIG_FILES lib/gvc/libgvc_builtins.pc" ;;

24182

+ "plugin/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/Makefile" ;;

24183

+ "plugin/core/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/core/Makefile" ;;

24184

+ "plugin/gd/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/gd/Makefile" ;;

24185

+ "plugin/pango/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/pango/Makefile" ;;

24186

+ "plugin/ming/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/ming/Makefile" ;;

24187

+ "plugin/dot_layout/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/dot_layout/Makefile" ;;

24188

+ "plugin/neato_layout/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/neato_layout/Makefile" ;;

24189

+ "plugin/xlib/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/xlib/Makefile" ;;

24190

+ "plugin/gtk/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/gtk/Makefile" ;;

24191

+ "cmd/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/Makefile" ;;

24192

+ "cmd/dot/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/dot/Makefile" ;;

24193

+ "cmd/tools/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/tools/Makefile" ;;

24194

+ "cmd/gvpr/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/gvpr/Makefile" ;;

24195

+ "cmd/lefty/ws/x11/libfilereq/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/lefty/ws/x11/libfilereq/Makefile" ;;

24196

+ "cmd/lefty/ws/x11/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/lefty/ws/x11/Makefile" ;;

24197

+ "cmd/lefty/ws/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/lefty/ws/Makefile" ;;

24198

+ "cmd/lefty/os/unix/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/lefty/os/unix/Makefile" ;;

24199

+ "cmd/lefty/os/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/lefty/os/Makefile" ;;

24200

+ "cmd/lefty/dot2l/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/lefty/dot2l/Makefile" ;;

24201

+ "cmd/lefty/examples/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/lefty/examples/Makefile" ;;

24202

+ "cmd/lefty/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/lefty/Makefile" ;;

24203

+ "cmd/lneato/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/lneato/Makefile" ;;

24204

+ "cmd/dotty/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/dotty/Makefile" ;;

24205

+ "tclpkg/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/Makefile" ;;

24206

+ "tclpkg/tclstubs/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/tclstubs/Makefile" ;;

24207

+ "tclpkg/tkstubs/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/tkstubs/Makefile" ;;

24208

+ "tclpkg/tclhandle/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/tclhandle/Makefile" ;;

24209

+ "tclpkg/gdtclft/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/gdtclft/Makefile" ;;

24210

+ "tclpkg/gdtclft/demo/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/gdtclft/demo/Makefile" ;;

24211

+ "tclpkg/tcldot/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/tcldot/Makefile" ;;

24212

+ "tclpkg/tcldot/demo/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/tcldot/demo/Makefile" ;;

24213

+ "tclpkg/tclpathplan/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/tclpathplan/Makefile" ;;

24214

+ "tclpkg/tclpathplan/demo/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/tclpathplan/demo/Makefile" ;;

24215

+ "tclpkg/tclpathplan/demo/pathplan_data/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/tclpathplan/demo/pathplan_data/Makefile" ;;

24216

+ "tclpkg/tkspline/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/tkspline/Makefile" ;;

24217

+ "tclpkg/tkspline/demo/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/tkspline/demo/Makefile" ;;

24218

+ "tclpkg/gv/Makefile") CONFIG_FILES="$CONFIG_FILES tclpkg/gv/Makefile" ;;

24219

+ "graphviz.spec") CONFIG_FILES="$CONFIG_FILES graphviz.spec" ;;

24220

+ "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;

24221

24222

*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

24223

echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

24224

{ (exit 1); exit 1; }; };;

24225

esac

24226

done

24227

24228

24229

# If the user did not use the arguments to specify the items to instantiate,

24230

# then the envvar interface is used. Set only those that are not.

24231

# We use the long form for the default assignment because of an extremely

24232

@@ -34912,797 +35044,867 @@

24233

24234

24235

# Have a temporary directory for convenience. Make it in the build tree

24236

-# simply because there is no reason to put it here, and in addition,

24237

+# simply because there is no reason against having it here, and in addition,

24238

# creating and moving files from /tmp can sometimes cause problems.

24239

-# Create a temporary directory, and hook for its removal unless debugging.

24240

+# Hook for its removal unless debugging.

24241

+# Note that there is a small window in which the directory will not be cleaned:

24242

+# after its creation but before its name has been assigned to `$tmp'.

24243

$debug ||

24244

{

24245

- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0

24246

+ tmp=

24247

+ trap 'exit_status=$?

24248

+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status

24249

+' 0

24250

trap '{ (exit 1); exit 1; }' 1 2 13 15

24251

}

24252

24253

# Create a (secure) tmp directory for tmp files.

24254

24255

{

24256

- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&

24257

+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&

24258

test -n "$tmp" && test -d "$tmp"

24259

} ||

24260

{

24261

- tmp=./confstat$$-$RANDOM

24262

- (umask 077 && mkdir $tmp)

24263

+ tmp=./conf$$-$RANDOM

24264

+ (umask 077 && mkdir "$tmp")

24265

} ||

24266

{

24267

echo "$me: cannot create a temporary directory in ." >&2

24268

{ (exit 1); exit 1; }

24269

}

24270

24271

-_ACEOF

24272

24273

-cat >>$CONFIG_STATUS <<_ACEOF

24274

24275

24276

-# CONFIG_FILES section.

24277

+# Set up the sed scripts for CONFIG_FILES section.

24278

24279

24280

# No need to generate the scripts if there are no CONFIG_FILES.

24281

# This happens for instance when ./config.status config.h

24282

-if test -n "\$CONFIG_FILES"; then

24283

- # Protect against being on the right side of a sed subst in config.status.

24284

- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;

24285

- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF

24286

-s,@SHELL@,$SHELL,;t t

24287

-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t

24288

-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t

24289

-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t

24290

-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t

24291

-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t

24292

-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t

24293

-s,@exec_prefix@,$exec_prefix,;t t

24294

-s,@prefix@,$prefix,;t t

24295

-s,@program_transform_name@,$program_transform_name,;t t

24296

-s,@bindir@,$bindir,;t t

24297

-s,@sbindir@,$sbindir,;t t

24298

-s,@libexecdir@,$libexecdir,;t t

24299

-s,@datadir@,$datadir,;t t

24300

-s,@sysconfdir@,$sysconfdir,;t t

24301

-s,@sharedstatedir@,$sharedstatedir,;t t

24302

-s,@localstatedir@,$localstatedir,;t t

24303

-s,@libdir@,$libdir,;t t

24304

-s,@includedir@,$includedir,;t t

24305

-s,@oldincludedir@,$oldincludedir,;t t

24306

-s,@infodir@,$infodir,;t t

24307

-s,@mandir@,$mandir,;t t

24308

-s,@build_alias@,$build_alias,;t t

24309

-s,@host_alias@,$host_alias,;t t

24310

-s,@target_alias@,$target_alias,;t t

24311

-s,@DEFS@,$DEFS,;t t

24312

-s,@ECHO_C@,$ECHO_C,;t t

24313

-s,@ECHO_N@,$ECHO_N,;t t

24314

-s,@ECHO_T@,$ECHO_T,;t t

24315

-s,@LIBS@,$LIBS,;t t

24316

-s,@VERSION_INFO@,$VERSION_INFO,;t t

24317

-s,@build@,$build,;t t

24318

-s,@build_cpu@,$build_cpu,;t t

24319

-s,@build_vendor@,$build_vendor,;t t

24320

-s,@build_os@,$build_os,;t t

24321

-s,@host@,$host,;t t

24322

-s,@host_cpu@,$host_cpu,;t t

24323

-s,@host_vendor@,$host_vendor,;t t

24324

-s,@host_os@,$host_os,;t t

24325

-s,@GVPLUGIN_VERSION@,$GVPLUGIN_VERSION,;t t

24326

-s,@CYGWIN@,$CYGWIN,;t t

24327

-s,@MINGW32@,$MINGW32,;t t

24328

-s,@DARWIN@,$DARWIN,;t t

24329

-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t

24330

-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t

24331

-s,@INSTALL_DATA@,$INSTALL_DATA,;t t

24332

-s,@CYGPATH_W@,$CYGPATH_W,;t t

24333

-s,@PACKAGE@,$PACKAGE,;t t

24334

-s,@VERSION@,$VERSION,;t t

24335

-s,@ACLOCAL@,$ACLOCAL,;t t

24336

-s,@AUTOCONF@,$AUTOCONF,;t t

24337

-s,@AUTOMAKE@,$AUTOMAKE,;t t

24338

-s,@AUTOHEADER@,$AUTOHEADER,;t t

24339

-s,@MAKEINFO@,$MAKEINFO,;t t

24340

-s,@install_sh@,$install_sh,;t t

24341

-s,@STRIP@,$STRIP,;t t

24342

-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t

24343

-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t

24344

-s,@mkdir_p@,$mkdir_p,;t t

24345

-s,@AWK@,$AWK,;t t

24346

-s,@SET_MAKE@,$SET_MAKE,;t t

24347

-s,@am__leading_dot@,$am__leading_dot,;t t

24348

-s,@AMTAR@,$AMTAR,;t t

24349

-s,@am__tar@,$am__tar,;t t

24350

-s,@am__untar@,$am__untar,;t t

24351

-s,@ENABLE_STATIC_TRUE@,$ENABLE_STATIC_TRUE,;t t

24352

-s,@ENABLE_STATIC_FALSE@,$ENABLE_STATIC_FALSE,;t t

24353

-s,@ENABLE_SHARED_TRUE@,$ENABLE_SHARED_TRUE,;t t

24354

-s,@ENABLE_SHARED_FALSE@,$ENABLE_SHARED_FALSE,;t t

24355

-s,@CC@,$CC,;t t

24356

-s,@CFLAGS@,$CFLAGS,;t t

24357

-s,@LDFLAGS@,$LDFLAGS,;t t

24358

-s,@CPPFLAGS@,$CPPFLAGS,;t t

24359

-s,@ac_ct_CC@,$ac_ct_CC,;t t

24360

-s,@EXEEXT@,$EXEEXT,;t t

24361

-s,@OBJEXT@,$OBJEXT,;t t

24362

-s,@DEPDIR@,$DEPDIR,;t t

24363

-s,@am__include@,$am__include,;t t

24364

-s,@am__quote@,$am__quote,;t t

24365

-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t

24366

-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t

24367

-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t

24368

-s,@CCDEPMODE@,$CCDEPMODE,;t t

24369

-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t

24370

-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t

24371

-s,@LEX@,$LEX,;t t

24372

-s,@LEXLIB@,$LEXLIB,;t t

24373

-s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t

24374

-s,@YACC@,$YACC,;t t

24375

-s,@LN_S@,$LN_S,;t t

24376

-s,@SED@,$SED,;t t

24377

-s,@GREP@,$GREP,;t t

24378

-s,@SORT@,$SORT,;t t

24379

-s,@CXX@,$CXX,;t t

24380

-s,@CXXFLAGS@,$CXXFLAGS,;t t

24381

-s,@ac_ct_CXX@,$ac_ct_CXX,;t t

24382

-s,@CXXDEPMODE@,$CXXDEPMODE,;t t

24383

-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t

24384

-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t

24385

-s,@CPP@,$CPP,;t t

24386

-s,@EGREP@,$EGREP,;t t

24387

-s,@MATH_LIBS@,$MATH_LIBS,;t t

24388

-s,@LIBGEN_LIBS@,$LIBGEN_LIBS,;t t

24389

-s,@ALLOCA@,$ALLOCA,;t t

24390

-s,@LIBOBJS@,$LIBOBJS,;t t

24391

-s,@subdirs@,$subdirs,;t t

24392

-s,@ENABLE_LTDL_TRUE@,$ENABLE_LTDL_TRUE,;t t

24393

-s,@ENABLE_LTDL_FALSE@,$ENABLE_LTDL_FALSE,;t t

24394

-s,@INCLTDL@,$INCLTDL,;t t

24395

-s,@LIBLTDL@,$LIBLTDL,;t t

24396

-s,@ECHO@,$ECHO,;t t

24397

-s,@AR@,$AR,;t t

24398

-s,@ac_ct_AR@,$ac_ct_AR,;t t

24399

-s,@RANLIB@,$RANLIB,;t t

24400

-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t

24401

-s,@CXXCPP@,$CXXCPP,;t t

24402

-s,@F77@,$F77,;t t

24403

-s,@FFLAGS@,$FFLAGS,;t t

24404

-s,@ac_ct_F77@,$ac_ct_F77,;t t

24405

-s,@LIBTOOL@,$LIBTOOL,;t t

24406

-s,@WITH_CODEGENS_TRUE@,$WITH_CODEGENS_TRUE,;t t

24407

-s,@WITH_CODEGENS_FALSE@,$WITH_CODEGENS_FALSE,;t t

24408

-s,@X_CFLAGS@,$X_CFLAGS,;t t

24409

-s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t

24410

-s,@X_LIBS@,$X_LIBS,;t t

24411

-s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t

24412

-s,@WITH_X_TRUE@,$WITH_X_TRUE,;t t

24413

-s,@WITH_X_FALSE@,$WITH_X_FALSE,;t t

24414

-s,@SWIG@,$SWIG,;t t

24415

-s,@SWIG_VERSION@,$SWIG_VERSION,;t t

24416

-s,@WITH_SWIG_TRUE@,$WITH_SWIG_TRUE,;t t

24417

-s,@WITH_SWIG_FALSE@,$WITH_SWIG_FALSE,;t t

24418

-s,@SHARP@,$SHARP,;t t

24419

-s,@SHARP_INCLUDES@,$SHARP_INCLUDES,;t t

24420

-s,@SHARP_LIBS@,$SHARP_LIBS,;t t

24421

-s,@WITH_SHARP_TRUE@,$WITH_SHARP_TRUE,;t t

24422

-s,@WITH_SHARP_FALSE@,$WITH_SHARP_FALSE,;t t

24423

-s,@GUILE@,$GUILE,;t t

24424

-s,@GUILE_INCLUDES@,$GUILE_INCLUDES,;t t

24425

-s,@GUILE_LIBS@,$GUILE_LIBS,;t t

24426

-s,@WITH_GUILE_TRUE@,$WITH_GUILE_TRUE,;t t

24427

-s,@WITH_GUILE_FALSE@,$WITH_GUILE_FALSE,;t t

24428

-s,@IO@,$IO,;t t

24429

-s,@IO_INCLUDES@,$IO_INCLUDES,;t t

24430

-s,@IO_LIBS@,$IO_LIBS,;t t

24431

-s,@WITH_IO_TRUE@,$WITH_IO_TRUE,;t t

24432

-s,@WITH_IO_FALSE@,$WITH_IO_FALSE,;t t

24433

-s,@JAVA@,$JAVA,;t t

24434

-s,@JAVA_INCLUDES@,$JAVA_INCLUDES,;t t

24435

-s,@JAVA_LIBS@,$JAVA_LIBS,;t t

24436

-s,@WITH_JAVA_TRUE@,$WITH_JAVA_TRUE,;t t

24437

-s,@WITH_JAVA_FALSE@,$WITH_JAVA_FALSE,;t t

24438

-s,@LUA@,$LUA,;t t

24439

-s,@LUA_INCLUDES@,$LUA_INCLUDES,;t t

24440

-s,@LUA_LIBS@,$LUA_LIBS,;t t

24441

-s,@WITH_LUA_TRUE@,$WITH_LUA_TRUE,;t t

24442

-s,@WITH_LUA_FALSE@,$WITH_LUA_FALSE,;t t

24443

-s,@OCAML@,$OCAML,;t t

24444

-s,@OCAML_INCLUDES@,$OCAML_INCLUDES,;t t

24445

-s,@OCAML_LIBS@,$OCAML_LIBS,;t t

24446

-s,@WITH_OCAML_TRUE@,$WITH_OCAML_TRUE,;t t

24447

-s,@WITH_OCAML_FALSE@,$WITH_OCAML_FALSE,;t t

24448

-s,@PERL@,$PERL,;t t

24449

-s,@PERL_INCLUDES@,$PERL_INCLUDES,;t t

24450

-s,@PERL_LIBS@,$PERL_LIBS,;t t

24451

-s,@WITH_PERL_TRUE@,$WITH_PERL_TRUE,;t t

24452

-s,@WITH_PERL_FALSE@,$WITH_PERL_FALSE,;t t

24453

-s,@PHP@,$PHP,;t t

24454

-s,@PHP_INCLUDES@,$PHP_INCLUDES,;t t

24455

-s,@PHP_LIBS@,$PHP_LIBS,;t t

24456

-s,@WITH_PHP_TRUE@,$WITH_PHP_TRUE,;t t

24457

-s,@WITH_PHP_FALSE@,$WITH_PHP_FALSE,;t t

24458

-s,@PYTHON@,$PYTHON,;t t

24459

-s,@PYTHON_INCLUDES@,$PYTHON_INCLUDES,;t t

24460

-s,@PYTHON_LIBS@,$PYTHON_LIBS,;t t

24461

-s,@WITH_PYTHON_TRUE@,$WITH_PYTHON_TRUE,;t t

24462

-s,@WITH_PYTHON_FALSE@,$WITH_PYTHON_FALSE,;t t

24463

-s,@RUBY@,$RUBY,;t t

24464

-s,@RUBY_INCLUDES@,$RUBY_INCLUDES,;t t

24465

-s,@RUBY_LIBS@,$RUBY_LIBS,;t t

24466

-s,@WITH_RUBY_TRUE@,$WITH_RUBY_TRUE,;t t

24467

-s,@WITH_RUBY_FALSE@,$WITH_RUBY_FALSE,;t t

24468

-s,@TCLSH@,$TCLSH,;t t

24469

-s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t

24470

-s,@HAVE_TCL@,$HAVE_TCL,;t t

24471

-s,@WITH_TCL_TRUE@,$WITH_TCL_TRUE,;t t

24472

-s,@WITH_TCL_FALSE@,$WITH_TCL_FALSE,;t t

24473

-s,@TCL_VERSION@,$TCL_VERSION,;t t

24474

-s,@TCL_MAJOR_VERSION@,$TCL_MAJOR_VERSION,;t t

24475

-s,@TCL_MINOR_VERSION@,$TCL_MINOR_VERSION,;t t

24476

-s,@TCL_PATCH_LEVEL@,$TCL_PATCH_LEVEL,;t t

24477

-s,@TCL_CFLAGS@,$TCL_CFLAGS,;t t

24478

-s,@TCL_DEFS@,$TCL_DEFS,;t t

24479

-s,@TCL_LIBS@,$TCL_LIBS,;t t

24480

-s,@TCL_SHLIB_SUFFIX@,$TCL_SHLIB_SUFFIX,;t t

24481

-s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t

24482

-s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t

24483

-s,@WISH@,$WISH,;t t

24484

-s,@TK_INCLUDES@,$TK_INCLUDES,;t t

24485

-s,@HAVE_TK@,$HAVE_TK,;t t

24486

-s,@WITH_TK_TRUE@,$WITH_TK_TRUE,;t t

24487

-s,@WITH_TK_FALSE@,$WITH_TK_FALSE,;t t

24488

-s,@TK_VERSION@,$TK_VERSION,;t t

24489

-s,@TK_MAJOR_VERSION@,$TK_MAJOR_VERSION,;t t

24490

-s,@TK_MINOR_VERSION@,$TK_MINOR_VERSION,;t t

24491

-s,@TK_PATCH_LEVEL@,$TK_PATCH_LEVEL,;t t

24492

-s,@TK_DEFS@,$TK_DEFS,;t t

24493

-s,@TK_XINCLUDES@,$TK_XINCLUDES,;t t

24494

-s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t

24495

-s,@TK_SRC_DIR@,$TK_SRC_DIR,;t t

24496

-s,@TK_CFLAGS@,$TK_CFLAGS,;t t

24497

-s,@TK_STUB_LIB_SPEC@,$TK_STUB_LIB_SPEC,;t t

24498

-s,@SOCKET_LIBS@,$SOCKET_LIBS,;t t

24499

-s,@EXPAT_CONFIG@,$EXPAT_CONFIG,;t t

24500

-s,@EXPAT_INCLUDES@,$EXPAT_INCLUDES,;t t

24501

-s,@EXPAT_LIBS@,$EXPAT_LIBS,;t t

24502

-s,@XPM_INCLUDES@,$XPM_INCLUDES,;t t

24503

-s,@XPM_LIBS@,$XPM_LIBS,;t t

24504

-s,@XAW_INCLUDES@,$XAW_INCLUDES,;t t

24505

-s,@XAW_LIBS@,$XAW_LIBS,;t t

24506

-s,@WITH_XAW_TRUE@,$WITH_XAW_TRUE,;t t

24507

-s,@WITH_XAW_FALSE@,$WITH_XAW_FALSE,;t t

24508

-s,@Z_INCLUDES@,$Z_INCLUDES,;t t

24509

-s,@Z_LIBS@,$Z_LIBS,;t t

24510

-s,@IPSEPCOLA_INCLUDES@,$IPSEPCOLA_INCLUDES,;t t

24511

-s,@IPSEPCOLA_LIBS@,$IPSEPCOLA_LIBS,;t t

24512

-s,@WITH_IPSEPCOLA_TRUE@,$WITH_IPSEPCOLA_TRUE,;t t

24513

-s,@WITH_IPSEPCOLA_FALSE@,$WITH_IPSEPCOLA_FALSE,;t t

24514

-s,@PKG_CONFIG@,$PKG_CONFIG,;t t

24515

-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t

24516

-s,@PANGOCAIRO_CFLAGS@,$PANGOCAIRO_CFLAGS,;t t

24517

-s,@PANGOCAIRO_LIBS@,$PANGOCAIRO_LIBS,;t t

24518

-s,@WITH_PANGOCAIRO_TRUE@,$WITH_PANGOCAIRO_TRUE,;t t

24519

-s,@WITH_PANGOCAIRO_FALSE@,$WITH_PANGOCAIRO_FALSE,;t t

24520

-s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t

24521

-s,@GTK_LIBS@,$GTK_LIBS,;t t

24522

-s,@WITH_GTK_TRUE@,$WITH_GTK_TRUE,;t t

24523

-s,@WITH_GTK_FALSE@,$WITH_GTK_FALSE,;t t

24524

-s,@GNOMEUI_CFLAGS@,$GNOMEUI_CFLAGS,;t t

24525

-s,@GNOMEUI_LIBS@,$GNOMEUI_LIBS,;t t

24526

-s,@WITH_GNOMEUI_TRUE@,$WITH_GNOMEUI_TRUE,;t t

24527

-s,@WITH_GNOMEUI_FALSE@,$WITH_GNOMEUI_FALSE,;t t

24528

-s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t

24529

-s,@USE_NLS@,$USE_NLS,;t t

24530

-s,@MSGFMT@,$MSGFMT,;t t

24531

-s,@GMSGFMT@,$GMSGFMT,;t t

24532

-s,@XGETTEXT@,$XGETTEXT,;t t

24533

-s,@CATALOGS@,$CATALOGS,;t t

24534

-s,@CATOBJEXT@,$CATOBJEXT,;t t

24535

-s,@DATADIRNAME@,$DATADIRNAME,;t t

24536

-s,@GMOFILES@,$GMOFILES,;t t

24537

-s,@INSTOBJEXT@,$INSTOBJEXT,;t t

24538

-s,@INTLLIBS@,$INTLLIBS,;t t

24539

-s,@PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t

24540

-s,@PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t

24541

-s,@POFILES@,$POFILES,;t t

24542

-s,@POSUB@,$POSUB,;t t

24543

-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t

24544

-s,@MING_CONFIG@,$MING_CONFIG,;t t

24545

-s,@MAKESWF@,$MAKESWF,;t t

24546

-s,@MING_CFLAGS@,$MING_CFLAGS,;t t

24547

-s,@MING_LIBS@,$MING_LIBS,;t t

24548

-s,@WITH_MING_TRUE@,$WITH_MING_TRUE,;t t

24549

-s,@WITH_MING_FALSE@,$WITH_MING_FALSE,;t t

24550

-s,@GDLIB_CONFIG@,$GDLIB_CONFIG,;t t

24551

-s,@GD_INCLUDES@,$GD_INCLUDES,;t t

24552

-s,@GD_LIBS@,$GD_LIBS,;t t

24553

-s,@HAVE_LIBGD@,$HAVE_LIBGD,;t t

24554

-s,@WITH_LIBGD_TRUE@,$WITH_LIBGD_TRUE,;t t

24555

-s,@WITH_LIBGD_FALSE@,$WITH_LIBGD_FALSE,;t t

24556

-s,@WITH_MYLIBGD_TRUE@,$WITH_MYLIBGD_TRUE,;t t

24557

-s,@WITH_MYLIBGD_FALSE@,$WITH_MYLIBGD_FALSE,;t t

24558

-s,@LIBICONV@,$LIBICONV,;t t

24559

-s,@LTLIBICONV@,$LTLIBICONV,;t t

24560

-s,@ICONV_INCLUDES@,$ICONV_INCLUDES,;t t

24561

-s,@ICONV_LIBS@,$ICONV_LIBS,;t t

24562

-s,@FREETYPE_CONFIG@,$FREETYPE_CONFIG,;t t

24563

-s,@FT_INCLUDES@,$FT_INCLUDES,;t t

24564

-s,@FT_LIBS@,$FT_LIBS,;t t

24565

-s,@FONTCONFIG_CONFIG@,$FONTCONFIG_CONFIG,;t t

24566

-s,@FONTCONFIG_CFLAGS@,$FONTCONFIG_CFLAGS,;t t

24567

-s,@FONTCONFIG_LIBS@,$FONTCONFIG_LIBS,;t t

24568

-s,@FC_INCLUDES@,$FC_INCLUDES,;t t

24569

-s,@FC_LIBS@,$FC_LIBS,;t t

24570

-s,@LIBPNG_CONFIG@,$LIBPNG_CONFIG,;t t

24571

-s,@PNG_INCLUDES@,$PNG_INCLUDES,;t t

24572

-s,@PNG_LIBS@,$PNG_LIBS,;t t

24573

-s,@JPEG_INCLUDES@,$JPEG_INCLUDES,;t t

24574

-s,@JPEG_LIBS@,$JPEG_LIBS,;t t

24575

-s,@TCLINT_INCLUDES@,$TCLINT_INCLUDES,;t t

24576

-s,@TKINT_INCLUDES@,$TKINT_INCLUDES,;t t

24577

-s,@TCL_PKGINDEX@,$TCL_PKGINDEX,;t t

24578

-s,@TK_PKGINDEX@,$TK_PKGINDEX,;t t

24579

-s,@LTLIBOBJS@,$LTLIBOBJS,;t t

24580

-CEOF

24581

24582

-_ACEOF

24583

24584

- cat >>$CONFIG_STATUS <<\_ACEOF

24585

- # Split the substitutions into bite-sized pieces for seds with

24586

- # small command number limits, like on Digital OSF/1 and HP-UX.

24587

- ac_max_sed_lines=48

24588

- ac_sed_frag=1 # Number of current file.

24589

- ac_beg=1 # First line for current file.

24590

- ac_end=$ac_max_sed_lines # Line after last line for current file.

24591

- ac_more_lines=:

24592

- ac_sed_cmds=

24593

- while $ac_more_lines; do

24594

- if test $ac_beg -gt 1; then

24595

- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag

24596

- else

24597

- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag

24598

- fi

24599

- if test ! -s $tmp/subs.frag; then

24600

- ac_more_lines=false

24601

- else

24602

- # The purpose of the label and of the branching condition is to

24603

- # speed up the sed processing (if there are no `@' at all, there

24604

- # is no need to browse any of the substitutions).

24605

- # These are the two extra sed commands mentioned above.

24606

- (echo ':t

24607

- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed

24608

- if test -z "$ac_sed_cmds"; then

24609

- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"

24610

- else

24611

- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"

24612

- fi

24613

- ac_sed_frag=`expr $ac_sed_frag + 1`

24614

- ac_beg=$ac_end

24615

- ac_end=`expr $ac_end + $ac_max_sed_lines`

24616

- fi

24617

- done

24618

- if test -z "$ac_sed_cmds"; then

24619

- ac_sed_cmds=cat

24620

+if test -n "$CONFIG_FILES"; then

24621

24622

+_ACEOF

24623

24624

24625

24626

+ac_delim='%!_!# '

24627

+for ac_last_try in false false false false false :; do

24628

+ cat >conf$$subs.sed <<_ACEOF

24629

+SHELL!$SHELL$ac_delim

24630

+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim

24631

+PACKAGE_NAME!$PACKAGE_NAME$ac_delim

24632

+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim

24633

+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim

24634

+PACKAGE_STRING!$PACKAGE_STRING$ac_delim

24635

+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim

24636

+exec_prefix!$exec_prefix$ac_delim

24637

+prefix!$prefix$ac_delim

24638

+program_transform_name!$program_transform_name$ac_delim

24639

+bindir!$bindir$ac_delim

24640

+sbindir!$sbindir$ac_delim

24641

+libexecdir!$libexecdir$ac_delim

24642

+datarootdir!$datarootdir$ac_delim

24643

+datadir!$datadir$ac_delim

24644

+sysconfdir!$sysconfdir$ac_delim

24645

+sharedstatedir!$sharedstatedir$ac_delim

24646

+localstatedir!$localstatedir$ac_delim

24647

+includedir!$includedir$ac_delim

24648

+oldincludedir!$oldincludedir$ac_delim

24649

+docdir!$docdir$ac_delim

24650

+infodir!$infodir$ac_delim

24651

+htmldir!$htmldir$ac_delim

24652

+dvidir!$dvidir$ac_delim

24653

+pdfdir!$pdfdir$ac_delim

24654

+psdir!$psdir$ac_delim

24655

+libdir!$libdir$ac_delim

24656

+localedir!$localedir$ac_delim

24657

+mandir!$mandir$ac_delim

24658

+DEFS!$DEFS$ac_delim

24659

+ECHO_C!$ECHO_C$ac_delim

24660

+ECHO_N!$ECHO_N$ac_delim

24661

+ECHO_T!$ECHO_T$ac_delim

24662

+LIBS!$LIBS$ac_delim

24663

+build_alias!$build_alias$ac_delim

24664

+host_alias!$host_alias$ac_delim

24665

+target_alias!$target_alias$ac_delim

24666

+VERSION_INFO!$VERSION_INFO$ac_delim

24667

+build!$build$ac_delim

24668

+build_cpu!$build_cpu$ac_delim

24669

+build_vendor!$build_vendor$ac_delim

24670

+build_os!$build_os$ac_delim

24671

+host!$host$ac_delim

24672

+host_cpu!$host_cpu$ac_delim

24673

+host_vendor!$host_vendor$ac_delim

24674

+host_os!$host_os$ac_delim

24675

+GVPLUGIN_VERSION!$GVPLUGIN_VERSION$ac_delim

24676

+CYGWIN!$CYGWIN$ac_delim

24677

+MINGW32!$MINGW32$ac_delim

24678

+DARWIN!$DARWIN$ac_delim

24679

+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim

24680

+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim

24681

+INSTALL_DATA!$INSTALL_DATA$ac_delim

24682

+CYGPATH_W!$CYGPATH_W$ac_delim

24683

+PACKAGE!$PACKAGE$ac_delim

24684

+VERSION!$VERSION$ac_delim

24685

+ACLOCAL!$ACLOCAL$ac_delim

24686

+AUTOCONF!$AUTOCONF$ac_delim

24687

+AUTOMAKE!$AUTOMAKE$ac_delim

24688

+AUTOHEADER!$AUTOHEADER$ac_delim

24689

+MAKEINFO!$MAKEINFO$ac_delim

24690

+install_sh!$install_sh$ac_delim

24691

+STRIP!$STRIP$ac_delim

24692

+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim

24693

+mkdir_p!$mkdir_p$ac_delim

24694

+AWK!$AWK$ac_delim

24695

+SET_MAKE!$SET_MAKE$ac_delim

24696

+am__leading_dot!$am__leading_dot$ac_delim

24697

+AMTAR!$AMTAR$ac_delim

24698

+am__tar!$am__tar$ac_delim

24699

+am__untar!$am__untar$ac_delim

24700

+ENABLE_STATIC_TRUE!$ENABLE_STATIC_TRUE$ac_delim

24701

+ENABLE_STATIC_FALSE!$ENABLE_STATIC_FALSE$ac_delim

24702

+ENABLE_SHARED_TRUE!$ENABLE_SHARED_TRUE$ac_delim

24703

+ENABLE_SHARED_FALSE!$ENABLE_SHARED_FALSE$ac_delim

24704

+CC!$CC$ac_delim

24705

+CFLAGS!$CFLAGS$ac_delim

24706

+LDFLAGS!$LDFLAGS$ac_delim

24707

+CPPFLAGS!$CPPFLAGS$ac_delim

24708

+ac_ct_CC!$ac_ct_CC$ac_delim

24709

+EXEEXT!$EXEEXT$ac_delim

24710

+OBJEXT!$OBJEXT$ac_delim

24711

+DEPDIR!$DEPDIR$ac_delim

24712

+am__include!$am__include$ac_delim

24713

+am__quote!$am__quote$ac_delim

24714

+AMDEP_TRUE!$AMDEP_TRUE$ac_delim

24715

+AMDEP_FALSE!$AMDEP_FALSE$ac_delim

24716

+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim

24717

+CCDEPMODE!$CCDEPMODE$ac_delim

24718

+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim

24719

+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim

24720

+LEX!$LEX$ac_delim

24721

+LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim

24722

+LEXLIB!$LEXLIB$ac_delim

24723

+YACC!$YACC$ac_delim

24724

+YFLAGS!$YFLAGS$ac_delim

24725

+LN_S!$LN_S$ac_delim

24726

+_ACEOF

24727

24728

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then

24729

+ break

24730

+ elif $ac_last_try; then

24731

+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

24732

+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

24733

+ { (exit 1); exit 1; }; }

24734

+ else

24735

+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

24736

24737

-fi # test -n "$CONFIG_FILES"

24738

+done

24739

24740

+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

24741

+if test -n "$ac_eof"; then

24742

+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

24743

+ ac_eof=`expr $ac_eof + 1`

24744

+fi

24745

24746

+cat >>$CONFIG_STATUS <<_ACEOF

24747

+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof

24748

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

24749

+_ACEOF

24750

+sed '

24751

+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

24752

+s/^/s,@/; s/!/@,|#_!!_#|/

24753

+:n

24754

+t n

24755

+s/'"$ac_delim"'$/,g/; t

24756

+s/$/\\/; p

24757

+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

24758

+' >>$CONFIG_STATUS <conf$$subs.sed

24759

+rm -f conf$$subs.sed

24760

+cat >>$CONFIG_STATUS <<_ACEOF

24761

+CEOF$ac_eof

24762

+_ACEOF

24763

24764

24765

+ac_delim='%!_!# '

24766

+for ac_last_try in false false false false false :; do

24767

+ cat >conf$$subs.sed <<_ACEOF

24768

+SED!$SED$ac_delim

24769

+GREP!$GREP$ac_delim

24770

+SORT!$SORT$ac_delim

24771

+CXX!$CXX$ac_delim

24772

+CXXFLAGS!$CXXFLAGS$ac_delim

24773

+ac_ct_CXX!$ac_ct_CXX$ac_delim

24774

+CXXDEPMODE!$CXXDEPMODE$ac_delim

24775

+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim

24776

+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim

24777

+CPP!$CPP$ac_delim

24778

+EGREP!$EGREP$ac_delim

24779

+MATH_LIBS!$MATH_LIBS$ac_delim

24780

+LIBGEN_LIBS!$LIBGEN_LIBS$ac_delim

24781

+ALLOCA!$ALLOCA$ac_delim

24782

+LIBOBJS!$LIBOBJS$ac_delim

24783

+subdirs!$subdirs$ac_delim

24784

+ENABLE_LTDL_TRUE!$ENABLE_LTDL_TRUE$ac_delim

24785

+ENABLE_LTDL_FALSE!$ENABLE_LTDL_FALSE$ac_delim

24786

+INCLTDL!$INCLTDL$ac_delim

24787

+LIBLTDL!$LIBLTDL$ac_delim

24788

+ECHO!$ECHO$ac_delim

24789

+AR!$AR$ac_delim

24790

+RANLIB!$RANLIB$ac_delim

24791

+CXXCPP!$CXXCPP$ac_delim

24792

+F77!$F77$ac_delim

24793

+FFLAGS!$FFLAGS$ac_delim

24794

+ac_ct_F77!$ac_ct_F77$ac_delim

24795

+LIBTOOL!$LIBTOOL$ac_delim

24796

+WITH_CODEGENS_TRUE!$WITH_CODEGENS_TRUE$ac_delim

24797

+WITH_CODEGENS_FALSE!$WITH_CODEGENS_FALSE$ac_delim

24798

+XMKMF!$XMKMF$ac_delim

24799

+X_CFLAGS!$X_CFLAGS$ac_delim

24800

+X_PRE_LIBS!$X_PRE_LIBS$ac_delim

24801

+X_LIBS!$X_LIBS$ac_delim

24802

+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim

24803

+WITH_X_TRUE!$WITH_X_TRUE$ac_delim

24804

+WITH_X_FALSE!$WITH_X_FALSE$ac_delim

24805

+SWIG!$SWIG$ac_delim

24806

+SWIG_VERSION!$SWIG_VERSION$ac_delim

24807

+WITH_SWIG_TRUE!$WITH_SWIG_TRUE$ac_delim

24808

+WITH_SWIG_FALSE!$WITH_SWIG_FALSE$ac_delim

24809

+SHARP!$SHARP$ac_delim

24810

+SHARP_INCLUDES!$SHARP_INCLUDES$ac_delim

24811

+SHARP_LIBS!$SHARP_LIBS$ac_delim

24812

+WITH_SHARP_TRUE!$WITH_SHARP_TRUE$ac_delim

24813

+WITH_SHARP_FALSE!$WITH_SHARP_FALSE$ac_delim

24814

+GUILE!$GUILE$ac_delim

24815

+GUILE_INCLUDES!$GUILE_INCLUDES$ac_delim

24816

+GUILE_LIBS!$GUILE_LIBS$ac_delim

24817

+WITH_GUILE_TRUE!$WITH_GUILE_TRUE$ac_delim

24818

+WITH_GUILE_FALSE!$WITH_GUILE_FALSE$ac_delim

24819

+IO!$IO$ac_delim

24820

+IO_INCLUDES!$IO_INCLUDES$ac_delim

24821

+IO_LIBS!$IO_LIBS$ac_delim

24822

+WITH_IO_TRUE!$WITH_IO_TRUE$ac_delim

24823

+WITH_IO_FALSE!$WITH_IO_FALSE$ac_delim

24824

+JAVA!$JAVA$ac_delim

24825

+JAVA_INCLUDES!$JAVA_INCLUDES$ac_delim

24826

+JAVA_LIBS!$JAVA_LIBS$ac_delim

24827

+WITH_JAVA_TRUE!$WITH_JAVA_TRUE$ac_delim

24828

+WITH_JAVA_FALSE!$WITH_JAVA_FALSE$ac_delim

24829

+LUA!$LUA$ac_delim

24830

+LUA_INCLUDES!$LUA_INCLUDES$ac_delim

24831

+LUA_LIBS!$LUA_LIBS$ac_delim

24832

+WITH_LUA_TRUE!$WITH_LUA_TRUE$ac_delim

24833

+WITH_LUA_FALSE!$WITH_LUA_FALSE$ac_delim

24834

+OCAML!$OCAML$ac_delim

24835

+OCAML_INCLUDES!$OCAML_INCLUDES$ac_delim

24836

+OCAML_LIBS!$OCAML_LIBS$ac_delim

24837

+WITH_OCAML_TRUE!$WITH_OCAML_TRUE$ac_delim

24838

+WITH_OCAML_FALSE!$WITH_OCAML_FALSE$ac_delim

24839

+PERL!$PERL$ac_delim

24840

+PERL_INCLUDES!$PERL_INCLUDES$ac_delim

24841

+PERL_LIBS!$PERL_LIBS$ac_delim

24842

+WITH_PERL_TRUE!$WITH_PERL_TRUE$ac_delim

24843

+WITH_PERL_FALSE!$WITH_PERL_FALSE$ac_delim

24844

+PHP!$PHP$ac_delim

24845

+PHP_INCLUDES!$PHP_INCLUDES$ac_delim

24846

+PHP_LIBS!$PHP_LIBS$ac_delim

24847

+WITH_PHP_TRUE!$WITH_PHP_TRUE$ac_delim

24848

+WITH_PHP_FALSE!$WITH_PHP_FALSE$ac_delim

24849

+PYTHON!$PYTHON$ac_delim

24850

+PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim

24851

+PYTHON_LIBS!$PYTHON_LIBS$ac_delim

24852

+WITH_PYTHON_TRUE!$WITH_PYTHON_TRUE$ac_delim

24853

+WITH_PYTHON_FALSE!$WITH_PYTHON_FALSE$ac_delim

24854

+RUBY!$RUBY$ac_delim

24855

+RUBY_INCLUDES!$RUBY_INCLUDES$ac_delim

24856

+RUBY_LIBS!$RUBY_LIBS$ac_delim

24857

+WITH_RUBY_TRUE!$WITH_RUBY_TRUE$ac_delim

24858

+WITH_RUBY_FALSE!$WITH_RUBY_FALSE$ac_delim

24859

+TCLSH!$TCLSH$ac_delim

24860

+TCL_INCLUDES!$TCL_INCLUDES$ac_delim

24861

+HAVE_TCL!$HAVE_TCL$ac_delim

24862

+WITH_TCL_TRUE!$WITH_TCL_TRUE$ac_delim

24863

+WITH_TCL_FALSE!$WITH_TCL_FALSE$ac_delim

24864

+TCL_VERSION!$TCL_VERSION$ac_delim

24865

_ACEOF

24866

24867

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then

24868

+ break

24869

+ elif $ac_last_try; then

24870

+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

24871

+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

24872

+ { (exit 1); exit 1; }; }

24873

+ else

24874

+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

24875

+ fi

24876

+done

24877

24878

+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

24879

+if test -n "$ac_eof"; then

24880

+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

24881

+ ac_eof=`expr $ac_eof + 1`

24882

+fi

24883

24884

+cat >>$CONFIG_STATUS <<_ACEOF

24885

+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof

24886

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

24887

+_ACEOF

24888

+sed '

24889

+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

24890

+s/^/s,@/; s/!/@,|#_!!_#|/

24891

+:n

24892

+t n

24893

+s/'"$ac_delim"'$/,g/; t

24894

+s/$/\\/; p

24895

+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

24896

+' >>$CONFIG_STATUS <conf$$subs.sed

24897

+rm -f conf$$subs.sed

24898

+cat >>$CONFIG_STATUS <<_ACEOF

24899

+CEOF$ac_eof

24900

+_ACEOF

24901

24902

24903

+ac_delim='%!_!# '

24904

+for ac_last_try in false false false false false :; do

24905

+ cat >conf$$subs.sed <<_ACEOF

24906

+TCL_MAJOR_VERSION!$TCL_MAJOR_VERSION$ac_delim

24907

+TCL_MINOR_VERSION!$TCL_MINOR_VERSION$ac_delim

24908

+TCL_PATCH_LEVEL!$TCL_PATCH_LEVEL$ac_delim

24909

+TCL_CFLAGS!$TCL_CFLAGS$ac_delim

24910

+TCL_DEFS!$TCL_DEFS$ac_delim

24911

+TCL_LIBS!$TCL_LIBS$ac_delim

24912

+TCL_SHLIB_SUFFIX!$TCL_SHLIB_SUFFIX$ac_delim

24913

+TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim

24914

+TCL_STUB_LIB_SPEC!$TCL_STUB_LIB_SPEC$ac_delim

24915

+WISH!$WISH$ac_delim

24916

+TK_INCLUDES!$TK_INCLUDES$ac_delim

24917

+HAVE_TK!$HAVE_TK$ac_delim

24918

+WITH_TK_TRUE!$WITH_TK_TRUE$ac_delim

24919

+WITH_TK_FALSE!$WITH_TK_FALSE$ac_delim

24920

+TK_VERSION!$TK_VERSION$ac_delim

24921

+TK_MAJOR_VERSION!$TK_MAJOR_VERSION$ac_delim

24922

+TK_MINOR_VERSION!$TK_MINOR_VERSION$ac_delim

24923

+TK_PATCH_LEVEL!$TK_PATCH_LEVEL$ac_delim

24924

+TK_DEFS!$TK_DEFS$ac_delim

24925

+TK_XINCLUDES!$TK_XINCLUDES$ac_delim

24926

+TK_LIB_SPEC!$TK_LIB_SPEC$ac_delim

24927

+TK_SRC_DIR!$TK_SRC_DIR$ac_delim

24928

+TK_CFLAGS!$TK_CFLAGS$ac_delim

24929

+TK_STUB_LIB_SPEC!$TK_STUB_LIB_SPEC$ac_delim

24930

+SOCKET_LIBS!$SOCKET_LIBS$ac_delim

24931

+EXPAT_CONFIG!$EXPAT_CONFIG$ac_delim

24932

+EXPAT_INCLUDES!$EXPAT_INCLUDES$ac_delim

24933

+EXPAT_LIBS!$EXPAT_LIBS$ac_delim

24934

+XPM_INCLUDES!$XPM_INCLUDES$ac_delim

24935

+XPM_LIBS!$XPM_LIBS$ac_delim

24936

+XAW_INCLUDES!$XAW_INCLUDES$ac_delim

24937

+XAW_LIBS!$XAW_LIBS$ac_delim

24938

+WITH_XAW_TRUE!$WITH_XAW_TRUE$ac_delim

24939

+WITH_XAW_FALSE!$WITH_XAW_FALSE$ac_delim

24940

+Z_INCLUDES!$Z_INCLUDES$ac_delim

24941

+Z_LIBS!$Z_LIBS$ac_delim

24942

+IPSEPCOLA_INCLUDES!$IPSEPCOLA_INCLUDES$ac_delim

24943

+IPSEPCOLA_LIBS!$IPSEPCOLA_LIBS$ac_delim

24944

+WITH_IPSEPCOLA_TRUE!$WITH_IPSEPCOLA_TRUE$ac_delim

24945

+WITH_IPSEPCOLA_FALSE!$WITH_IPSEPCOLA_FALSE$ac_delim

24946

+PKG_CONFIG!$PKG_CONFIG$ac_delim

24947

+PANGOCAIRO_CFLAGS!$PANGOCAIRO_CFLAGS$ac_delim

24948

+PANGOCAIRO_LIBS!$PANGOCAIRO_LIBS$ac_delim

24949

+WITH_PANGOCAIRO_TRUE!$WITH_PANGOCAIRO_TRUE$ac_delim

24950

+WITH_PANGOCAIRO_FALSE!$WITH_PANGOCAIRO_FALSE$ac_delim

24951

+GTK_CFLAGS!$GTK_CFLAGS$ac_delim

24952

+GTK_LIBS!$GTK_LIBS$ac_delim

24953

+WITH_GTK_TRUE!$WITH_GTK_TRUE$ac_delim

24954

+WITH_GTK_FALSE!$WITH_GTK_FALSE$ac_delim

24955

+GNOMEUI_CFLAGS!$GNOMEUI_CFLAGS$ac_delim

24956

+GNOMEUI_LIBS!$GNOMEUI_LIBS$ac_delim

24957

+WITH_GNOMEUI_TRUE!$WITH_GNOMEUI_TRUE$ac_delim

24958

+WITH_GNOMEUI_FALSE!$WITH_GNOMEUI_FALSE$ac_delim

24959

+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim

24960

+USE_NLS!$USE_NLS$ac_delim

24961

+MSGFMT!$MSGFMT$ac_delim

24962

+GMSGFMT!$GMSGFMT$ac_delim

24963

+XGETTEXT!$XGETTEXT$ac_delim

24964

+CATALOGS!$CATALOGS$ac_delim

24965

+CATOBJEXT!$CATOBJEXT$ac_delim

24966

+DATADIRNAME!$DATADIRNAME$ac_delim

24967

+GMOFILES!$GMOFILES$ac_delim

24968

+INSTOBJEXT!$INSTOBJEXT$ac_delim

24969

+INTLLIBS!$INTLLIBS$ac_delim

24970

+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim

24971

+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim

24972

+POFILES!$POFILES$ac_delim

24973

+POSUB!$POSUB$ac_delim

24974

+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim

24975

+MING_CONFIG!$MING_CONFIG$ac_delim

24976

+MAKESWF!$MAKESWF$ac_delim

24977

+MING_CFLAGS!$MING_CFLAGS$ac_delim

24978

+MING_LIBS!$MING_LIBS$ac_delim

24979

+WITH_MING_TRUE!$WITH_MING_TRUE$ac_delim

24980

+WITH_MING_FALSE!$WITH_MING_FALSE$ac_delim

24981

+GDLIB_CONFIG!$GDLIB_CONFIG$ac_delim

24982

+GD_INCLUDES!$GD_INCLUDES$ac_delim

24983

+GD_LIBS!$GD_LIBS$ac_delim

24984

+HAVE_LIBGD!$HAVE_LIBGD$ac_delim

24985

+WITH_LIBGD_TRUE!$WITH_LIBGD_TRUE$ac_delim

24986

+WITH_LIBGD_FALSE!$WITH_LIBGD_FALSE$ac_delim

24987

+WITH_MYLIBGD_TRUE!$WITH_MYLIBGD_TRUE$ac_delim

24988

+WITH_MYLIBGD_FALSE!$WITH_MYLIBGD_FALSE$ac_delim

24989

+LIBICONV!$LIBICONV$ac_delim

24990

+LTLIBICONV!$LTLIBICONV$ac_delim

24991

+ICONV_INCLUDES!$ICONV_INCLUDES$ac_delim

24992

+ICONV_LIBS!$ICONV_LIBS$ac_delim

24993

+FREETYPE_CONFIG!$FREETYPE_CONFIG$ac_delim

24994

+FT_INCLUDES!$FT_INCLUDES$ac_delim

24995

+FT_LIBS!$FT_LIBS$ac_delim

24996

+FONTCONFIG_CONFIG!$FONTCONFIG_CONFIG$ac_delim

24997

+FONTCONFIG_CFLAGS!$FONTCONFIG_CFLAGS$ac_delim

24998

+FONTCONFIG_LIBS!$FONTCONFIG_LIBS$ac_delim

24999

+FC_INCLUDES!$FC_INCLUDES$ac_delim

25000

+FC_LIBS!$FC_LIBS$ac_delim

25001

+LIBPNG_CONFIG!$LIBPNG_CONFIG$ac_delim

25002

+PNG_INCLUDES!$PNG_INCLUDES$ac_delim

25003

+_ACEOF

25004

25005

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then

25006

+ break

25007

+ elif $ac_last_try; then

25008

+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

25009

+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

25010

+ { (exit 1); exit 1; }; }

25011

+ else

25012

+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

25013

+ fi

25014

+done

25015

25016

+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

25017

+if test -n "$ac_eof"; then

25018

+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

25019

+ ac_eof=`expr $ac_eof + 1`

25020

+fi

25021

25022

+cat >>$CONFIG_STATUS <<_ACEOF

25023

+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof

25024

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

25025

+_ACEOF

25026

+sed '

25027

+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

25028

+s/^/s,@/; s/!/@,|#_!!_#|/

25029

+:n

25030

+t n

25031

+s/'"$ac_delim"'$/,g/; t

25032

+s/$/\\/; p

25033

+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

25034

+' >>$CONFIG_STATUS <conf$$subs.sed

25035

+rm -f conf$$subs.sed

25036

+cat >>$CONFIG_STATUS <<_ACEOF

25037

+CEOF$ac_eof

25038

+_ACEOF

25039

25040

25041

+ac_delim='%!_!# '

25042

+for ac_last_try in false false false false false :; do

25043

+ cat >conf$$subs.sed <<_ACEOF

25044

+PNG_LIBS!$PNG_LIBS$ac_delim

25045

+JPEG_INCLUDES!$JPEG_INCLUDES$ac_delim

25046

+JPEG_LIBS!$JPEG_LIBS$ac_delim

25047

+TCLINT_INCLUDES!$TCLINT_INCLUDES$ac_delim

25048

+TKINT_INCLUDES!$TKINT_INCLUDES$ac_delim

25049

+TCL_PKGINDEX!$TCL_PKGINDEX$ac_delim

25050

+TK_PKGINDEX!$TK_PKGINDEX$ac_delim

25051

+LTLIBOBJS!$LTLIBOBJS$ac_delim

25052

+_ACEOF

25053

25054

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then

25055

+ break

25056

+ elif $ac_last_try; then

25057

+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

25058

+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

25059

+ { (exit 1); exit 1; }; }

25060

+ else

25061

+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

25062

+ fi

25063

+done

25064

25065

+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

25066

+if test -n "$ac_eof"; then

25067

+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

25068

+ ac_eof=`expr $ac_eof + 1`

25069

+fi

25070

25071

+cat >>$CONFIG_STATUS <<_ACEOF

25072

+cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof

25073

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end

25074

+_ACEOF

25075

+sed '

25076

+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

25077

+s/^/s,@/; s/!/@,|#_!!_#|/

25078

+:n

25079

+t n

25080

+s/'"$ac_delim"'$/,g/; t

25081

+s/$/\\/; p

25082

+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

25083

+' >>$CONFIG_STATUS <conf$$subs.sed

25084

+rm -f conf$$subs.sed

25085

+cat >>$CONFIG_STATUS <<_ACEOF

25086

+:end

25087

+s/|#_!!_#|//g

25088

+CEOF$ac_eof

25089

+_ACEOF

25090

25091

25092

+# VPATH may cause trouble with some makes, so we remove $(srcdir),

25093

+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and

25094

+# trailing colons and then remove the whole line if VPATH becomes empty

25095

+# (actually we leave an empty line to preserve line numbers).

25096

+if test "x$srcdir" = x.; then

25097

+ ac_vpsub='/^[ ]*VPATH[ ]*=/{

25098

+s/:*\$(srcdir):*/:/

25099

+s/:*\${srcdir}:*/:/

25100

+s/:*@srcdir@:*/:/

25101

+s/^$[^=]*=[ ]*$:*/\1/

25102

+s/:*$//

25103

+s/^[^=]*=[ ]*$//

25104

+}'

25105

+fi

25106

25107

cat >>$CONFIG_STATUS <<\_ACEOF

25108

-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue

25109

- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

25110

- case $ac_file in

25111

- - | *:- | *:-:* ) # input from stdin

25112

- cat >$tmp/stdin

25113

- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

25114

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

25115

- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

25116

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

25117

- * ) ac_file_in=$ac_file.in ;;

25118

+fi # test -n "$CONFIG_FILES"

25119

25120

25121

+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS

25122

+do

25123

+ case $ac_tag in

25124

+ :[FHLC]) ac_mode=$ac_tag; continue;;

25125

+ esac

25126

+ case $ac_mode$ac_tag in

25127

+ :[FHL]*:*);;

25128

+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5

25129

+echo "$as_me: error: Invalid tag $ac_tag." >&2;}

25130

+ { (exit 1); exit 1; }; };;

25131

+ :[FH]-) ac_tag=-:-;;

25132

+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;

25133

+ esac

25134

+ ac_save_IFS=$IFS

25135

+ IFS=:

25136

+ set x $ac_tag

25137

+ IFS=$ac_save_IFS

25138

+ shift

25139

+ ac_file=$1

25140

+ shift

25141

25142

+ case $ac_mode in

25143

+ :L) ac_source=$1;;

25144

+ :[FH])

25145

+ ac_file_inputs=

25146

+ for ac_f

25147

+ do

25148

+ case $ac_f in

25149

+ -) ac_f="$tmp/stdin";;

25150

+ *) # Look for the file first in the build tree, then in the source tree

25151

+ # (if the path is not absolute). The absolute path cannot be DOS-style,

25152

+ # because $ac_f cannot contain `:'.

25153

+ test -f "$ac_f" ||

25154

+ case $ac_f in

25155

+ [\\/$]*) false;;

25156

+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;

25157

+ esac ||

25158

+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5

25159

+echo "$as_me: error: cannot find input file: $ac_f" >&2;}

25160

+ { (exit 1); exit 1; }; };;

25161

+ esac

25162

+ ac_file_inputs="$ac_file_inputs $ac_f"

25163

+ done

25164

25165

+ # Let's still pretend it is `configure' which instantiates (i.e., don't

25166

+ # use $as_me), people would be surprised to read:

25167

+ # /* config.h. Generated by config.status. */

25168

+ configure_input="Generated from "`IFS=:

25169

+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."

25170

+ if test x"$ac_file" != x-; then

25171

+ configure_input="$ac_file. $configure_input"

25172

+ { echo "$as_me:$LINENO: creating $ac_file" >&5

25173

+echo "$as_me: creating $ac_file" >&6;}

25174

+ fi

25175

25176

+ case $ac_tag in

25177

+ *:-:* | *:-) cat >"$tmp/stdin";;

25178

+ esac

25179

+ ;;

25180

esac

25181

25182

- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.

25183

- ac_dir=`(dirname "$ac_file") 2>/dev/null ||

25184

+ ac_dir=`$as_dirname -- "$ac_file" ||

25185

$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

25186

X"$ac_file" : 'X$//$[^/]' \| \

25187

X"$ac_file" : 'X$//$$' \| \

25188

- X"$ac_file" : 'X$/$' \| \

25189

- . : '$.$' 2>/dev/null ||

25190

+ X"$ac_file" : 'X$/$' \| . 2>/dev/null ||

25191

echo X"$ac_file" |

25192

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

25193

- /^X$\/\/$[^/].*/{ s//\1/; q; }

25194

- /^X$\/\/$$/{ s//\1/; q; }

25195

- /^X$\/$.*/{ s//\1/; q; }

25196

- s/.*/./; q'`

25197

- { if $as_mkdir_p; then

25198

- mkdir -p "$ac_dir"

25199

- else

25200

- as_dir="$ac_dir"

25201

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

25202

+ s//\1/

25203

+ q

25204

+ }

25205

+ /^X$\/\/$[^/].*/{

25206

+ s//\1/

25207

+ q

25208

+ }

25209

+ /^X$\/\/$$/{

25210

+ s//\1/

25211

+ q

25212

+ }

25213

+ /^X$\/$.*/{

25214

+ s//\1/

25215

+ q

25216

+ }

25217

+ s/.*/./; q'`

25218

+ { as_dir="$ac_dir"

25219

+ case $as_dir in #(

25220

+ -*) as_dir=./$as_dir;;

25221

+ esac

25222

+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

25223

as_dirs=

25224

- while test ! -d "$as_dir"; do

25225

- as_dirs="$as_dir $as_dirs"

25226

- as_dir=`(dirname "$as_dir") 2>/dev/null ||

25227

+ while :; do

25228

+ case $as_dir in #(

25229

+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

25230

+ *) as_qdir=$as_dir;;

25231

+ esac

25232

+ as_dirs="'$as_qdir' $as_dirs"

25233

+ as_dir=`$as_dirname -- "$as_dir" ||

25234

$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

25235

X"$as_dir" : 'X$//$[^/]' \| \

25236

X"$as_dir" : 'X$//$$' \| \

25237

- X"$as_dir" : 'X$/$' \| \

25238

- . : '$.$' 2>/dev/null ||

25239

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

25240

echo X"$as_dir" |

25241

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

25242

- /^X$\/\/$[^/].*/{ s//\1/; q; }

25243

- /^X$\/\/$$/{ s//\1/; q; }

25244

- /^X$\/$.*/{ s//\1/; q; }

25245

- s/.*/./; q'`

25246

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

25247

+ s//\1/

25248

+ q

25249

+ }

25250

+ /^X$\/\/$[^/].*/{

25251

+ s//\1/

25252

+ q

25253

+ }

25254

+ /^X$\/\/$$/{

25255

+ s//\1/

25256

+ q

25257

+ }

25258

+ /^X$\/$.*/{

25259

+ s//\1/

25260

+ q

25261

+ }

25262

+ s/.*/./; q'`

25263

+ test -d "$as_dir" && break

25264

done

25265

- test ! -n "$as_dirs" || mkdir $as_dirs

25266

- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5

25267

-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}

25268

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

25269

+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

25270

+echo "$as_me: error: cannot create directory $as_dir" >&2;}

25271

{ (exit 1); exit 1; }; }; }

25272

25273

ac_builddir=.

25274

25275

-if test "$ac_dir" != .; then

25276

+case "$ac_dir" in

25277

+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

25278

+*)

25279

ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

25280

- # A "../" for each directory in $ac_dir_suffix.

25281

- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`

25282

-else

25283

- ac_dir_suffix= ac_top_builddir=

25284

-fi

25285

+ # A ".." for each directory in $ac_dir_suffix.

25286

+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

25287

+ case $ac_top_builddir_sub in

25288

+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;

25289

+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

25290

+ esac ;;

25291

+esac

25292

+ac_abs_top_builddir=$ac_pwd

25293

+ac_abs_builddir=$ac_pwd$ac_dir_suffix

25294

+# for backward compatibility:

25295

+ac_top_builddir=$ac_top_build_prefix

25296

25297

case $srcdir in

25298

- .) # No --srcdir option. We are building in place.

25299

+ .) # We are building in place.

25300

ac_srcdir=.

25301

- if test -z "$ac_top_builddir"; then

25302

- ac_top_srcdir=.

25303

- else

25304

- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`

25305

- fi ;;

25306

- [\\/]* | ?:[\\/]* ) # Absolute path.

25307

+ ac_top_srcdir=$ac_top_builddir_sub

25308

+ ac_abs_top_srcdir=$ac_pwd ;;

25309

+ [\\/]* | ?:[\\/]* ) # Absolute name.

25310

ac_srcdir=$srcdir$ac_dir_suffix;

25311

- ac_top_srcdir=$srcdir ;;

25312

- *) # Relative path.

25313

- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix

25314

- ac_top_srcdir=$ac_top_builddir$srcdir ;;

25315

+ ac_top_srcdir=$srcdir

25316

+ ac_abs_top_srcdir=$srcdir ;;

25317

+ *) # Relative name.

25318

+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix

25319

+ ac_top_srcdir=$ac_top_build_prefix$srcdir

25320

+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;

25321

esac

25322

+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

25323

25324

-# Do not use `cd foo && pwd` to compute absolute paths, because

25325

-# the directories may not exist.

25326

-case `pwd` in

25327

-.) ac_abs_builddir="$ac_dir";;

25328

-*)

25329

- case "$ac_dir" in

25330

- .) ac_abs_builddir=`pwd`;;

25331

- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;

25332

- *) ac_abs_builddir=`pwd`/"$ac_dir";;

25333

- esac;;

25334

-esac

25335

-case $ac_abs_builddir in

25336

-.) ac_abs_top_builddir=${ac_top_builddir}.;;

25337

-*)

25338

- case ${ac_top_builddir}. in

25339

- .) ac_abs_top_builddir=$ac_abs_builddir;;

25340

- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;

25341

- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;

25342

- esac;;

25343

-esac

25344

-case $ac_abs_builddir in

25345

-.) ac_abs_srcdir=$ac_srcdir;;

25346

-*)

25347

- case $ac_srcdir in

25348

- .) ac_abs_srcdir=$ac_abs_builddir;;

25349

- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;

25350

- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;

25351

- esac;;

25352

-esac

25353

-case $ac_abs_builddir in

25354

-.) ac_abs_top_srcdir=$ac_top_srcdir;;

25355

-*)

25356

- case $ac_top_srcdir in

25357

- .) ac_abs_top_srcdir=$ac_abs_builddir;;

25358

- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;

25359

- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;

25360

- esac;;

25361

-esac

25362

25363

+ case $ac_mode in

25364

+ :F)

25365

+ #

25366

+ # CONFIG_FILE

25367

+ #

25368

25369

case $INSTALL in

25370

[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;

25371

- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;

25372

+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;

25373

esac

25374

+_ACEOF

25375

25376

- if test x"$ac_file" != x-; then

25377

- { echo "$as_me:$LINENO: creating $ac_file" >&5

25378

-echo "$as_me: creating $ac_file" >&6;}

25379

- rm -f "$ac_file"

25380

- fi

25381

- # Let's still pretend it is `configure' which instantiates (i.e., don't

25382

- # use $as_me), people would be surprised to read:

25383

- # /* config.h. Generated by config.status. */

25384

- if test x"$ac_file" = x-; then

25385

- configure_input=

25386

- else

25387

- configure_input="$ac_file. "

25388

- fi

25389

- configure_input=$configure_input"Generated from `echo $ac_file_in |

25390

- sed 's,.*/,,'` by configure."

25391

25392

- # First look for the input files in the build tree, otherwise in the

25393

- # src tree.

25394

- ac_file_inputs=`IFS=:

25395

- for f in $ac_file_in; do

25396

- case $f in

25397

- -) echo $tmp/stdin ;;

25398

- [\\/$]*)

25399

- # Absolute (can't be DOS-style, as IFS=:)

25400

- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

25401

-echo "$as_me: error: cannot find input file: $f" >&2;}

25402

- { (exit 1); exit 1; }; }

25403

- echo "$f";;

25404

- *) # Relative

25405

- if test -f "$f"; then

25406

- # Build tree

25407

- echo "$f"

25408

- elif test -f "$srcdir/$f"; then

25409

- # Source tree

25410

- echo "$srcdir/$f"

25411

- else

25412

- # /dev/null tree

25413

- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

25414

-echo "$as_me: error: cannot find input file: $f" >&2;}

25415

- { (exit 1); exit 1; }; }

25416

- fi;;

25417

- esac

25418

- done` || { (exit 1); exit 1; }

25419

+cat >>$CONFIG_STATUS <<\_ACEOF

25420

+# If the template does not know about datarootdir, expand it.

25421

+# FIXME: This hack should be removed a few years after 2.60.

25422

+ac_datarootdir_hack=; ac_datarootdir_seen=

25423

25424

+case `sed -n '/datarootdir/ {

25425

+ p

25426

+ q

25427

25428

+/@datadir@/p

25429

+/@docdir@/p

25430

+/@infodir@/p

25431

+/@localedir@/p

25432

+/@mandir@/p

25433

+' $ac_file_inputs` in

25434

+*datarootdir*) ac_datarootdir_seen=yes;;

25435

+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)

25436

+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

25437

+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

25438

_ACEOF

25439

cat >>$CONFIG_STATUS <<_ACEOF

25440

+ ac_datarootdir_hack='

25441

+ s&@datadir@&$datadir&g

25442

+ s&@docdir@&$docdir&g

25443

+ s&@infodir@&$infodir&g

25444

+ s&@localedir@&$localedir&g

25445

+ s&@mandir@&$mandir&g

25446

+ s&\\\${datarootdir}&$datarootdir&g' ;;

25447

+esac

25448

+_ACEOF

25449

25450

+# Neutralize VPATH when `$srcdir' = `.'.

25451

+# Shell code in configure.ac might set extrasub.

25452

+# FIXME: do we really want to maintain this feature?

25453

+cat >>$CONFIG_STATUS <<_ACEOF

25454

sed "$ac_vpsub

25455

$extrasub

25456

_ACEOF

25457

cat >>$CONFIG_STATUS <<\_ACEOF

25458

25459

/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

25460

-s,@configure_input@,$configure_input,;t t

25461

-s,@srcdir@,$ac_srcdir,;t t

25462

-s,@abs_srcdir@,$ac_abs_srcdir,;t t

25463

-s,@top_srcdir@,$ac_top_srcdir,;t t

25464

-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t

25465

-s,@builddir@,$ac_builddir,;t t

25466

-s,@abs_builddir@,$ac_abs_builddir,;t t

25467

-s,@top_builddir@,$ac_top_builddir,;t t

25468

-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t

25469

-s,@INSTALL@,$ac_INSTALL,;t t

25470

-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out

25471

- rm -f $tmp/stdin

25472

- if test x"$ac_file" != x-; then

25473

- mv $tmp/out $ac_file

25474

- else

25475

- cat $tmp/out

25476

- rm -f $tmp/out

25477

- fi

25478

+s&@configure_input@&$configure_input&;t t

25479

+s&@top_builddir@&$ac_top_builddir_sub&;t t

25480

+s&@srcdir@&$ac_srcdir&;t t

25481

+s&@abs_srcdir@&$ac_abs_srcdir&;t t

25482

+s&@top_srcdir@&$ac_top_srcdir&;t t

25483

+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t

25484

+s&@builddir@&$ac_builddir&;t t

25485

+s&@abs_builddir@&$ac_abs_builddir&;t t

25486

+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t

25487

+s&@INSTALL@&$ac_INSTALL&;t t

25488

+$ac_datarootdir_hack

25489

+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out

25490

25491

+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&

25492

+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

25493

+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

25494

+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'

25495

+which seems to be undefined. Please make sure it is defined." >&5

25496

+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

25497

+which seems to be undefined. Please make sure it is defined." >&2;}

25498

25499

-done

25500

-_ACEOF

25501

-cat >>$CONFIG_STATUS <<\_ACEOF

25502

25503

25504

-# CONFIG_HEADER section.

25505

25506

25507

-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where

25508

-# NAME is the cpp macro being defined and VALUE is the value it is being given.

25509

25510

-# ac_d sets the value in "#define NAME VALUE" lines.

25511

-ac_dA='s,^$[ ]*$#$[ ]*define[ ][ ]*$'

25512

-ac_dB='[ ].*$,\1#\2'

25513

-ac_dC=' '

25514

-ac_dD=',;t'

25515

-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".

25516

-ac_uA='s,^$[ ]*$#$[ ]*$undef$[ ][ ]*$'

25517

-ac_uB='$,\1#\2define\3'

25518

-ac_uC=' '

25519

-ac_uD=',;t'

25520

25521

-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue

25522

- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

25523

+ rm -f "$tmp/stdin"

25524

case $ac_file in

25525

- - | *:- | *:-:* ) # input from stdin

25526

- cat >$tmp/stdin

25527

- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

25528

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

25529

- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

25530

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

25531

- * ) ac_file_in=$ac_file.in ;;

25532

+ -) cat "$tmp/out"; rm -f "$tmp/out";;

25533

+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;

25534

esac

25535

25536

- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5

25537

-echo "$as_me: creating $ac_file" >&6;}

25538

25539

- # First look for the input files in the build tree, otherwise in the

25540

- # src tree.

25541

- ac_file_inputs=`IFS=:

25542

- for f in $ac_file_in; do

25543

- case $f in

25544

- -) echo $tmp/stdin ;;

25545

- [\\/$]*)

25546

- # Absolute (can't be DOS-style, as IFS=:)

25547

- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

25548

-echo "$as_me: error: cannot find input file: $f" >&2;}

25549

- { (exit 1); exit 1; }; }

25550

- # Do quote $f, to prevent DOS paths from being IFS'd.

25551

- echo "$f";;

25552

- *) # Relative

25553

- if test -f "$f"; then

25554

- # Build tree

25555

- echo "$f"

25556

- elif test -f "$srcdir/$f"; then

25557

- # Source tree

25558

- echo "$srcdir/$f"

25559

- else

25560

- # /dev/null tree

25561

- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

25562

-echo "$as_me: error: cannot find input file: $f" >&2;}

25563

- { (exit 1); exit 1; }; }

25564

- fi;;

25565

- esac

25566

- done` || { (exit 1); exit 1; }

25567

- # Remove the trailing spaces.

25568

- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in

25569

25570

+ ;;

25571

+ :H)

25572

+ #

25573

+ # CONFIG_HEADER

25574

+ #

25575

_ACEOF

25576

25577

-# Transform confdefs.h into two sed scripts, `conftest.defines' and

25578

-# `conftest.undefs', that substitutes the proper values into

25579

-# config.h.in to produce config.h. The first handles `#define'

25580

-# templates, and the second `#undef' templates.

25581

-# And first: Protect against being on the right side of a sed subst in

25582

-# config.status. Protect against being in an unquoted here document

25583

-# in config.status.

25584

-rm -f conftest.defines conftest.undefs

25585

-# Using a here document instead of a string reduces the quoting nightmare.

25586

-# Putting comments in sed scripts is not portable.

25587

25588

-# `end' is used to avoid that the second main sed command (meant for

25589

-# 0-ary CPP macros) applies to n-ary macro definitions.

25590

-# See the Autoconf documentation for `clear'.

25591

-cat >confdef2sed.sed <<\_ACEOF

25592

-s/[\\&,]/\\&/g

25593

-s,[\\$`],\\&,g

25594

-t clear

25595

-: clear

25596

-s,^[ ]*#[ ]*define[ ][ ]*$[^ (][^ (]*$$([^)]*)$[ ]*$.*$$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp

25597

-t end

25598

-s,^[ ]*#[ ]*define[ ][ ]*$[^ ][^ ]*$[ ]*$.*$$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp

25599

-: end

25600

-_ACEOF

25601

-# If some macros were called several times there might be several times

25602

-# the same #defines, which is useless. Nevertheless, we may not want to

25603

-# sort them, since we want the *last* AC-DEFINE to be honored.

25604

-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines

25605

-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs

25606

-rm -f confdef2sed.sed

25607

+# Transform confdefs.h into a sed script `conftest.defines', that

25608

+# substitutes the proper values into config.h.in to produce config.h.

25609

+rm -f conftest.defines conftest.tail

25610

+# First, append a space to every undef/define line, to ease matching.

25611

+echo 's/$/ /' >conftest.defines

25612

+# Then, protect against being on the right side of a sed subst, or in

25613

+# an unquoted here document, in config.status. If some macros were

25614

+# called several times there might be several #defines for the same

25615

+# symbol, which is useless. But do not sort them, since the last

25616

+# AC_DEFINE must be honored.

25617

+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*

25618

+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where

25619

+# NAME is the cpp macro being defined, VALUE is the value it is being given.

25620

+# PARAMS is the parameter list in the macro definition--in most cases, it's

25621

+# just an empty string.

25622

+ac_dA='s,^\$[ #]*\$[^ ]*\\([ ]*'

25623

+ac_dB='\\)[ (].*,\\1define\\2'

25624

+ac_dC=' '

25625

+ac_dD=' ,'

25626

25627

+uniq confdefs.h |

25628

+ sed -n '

25629

+ t rset

25630

+ :rset

25631

+ s/^[ ]*#[ ]*define[ ][ ]*//

25632

+ t ok

25633

+ d

25634

+ :ok

25635

+ s/[\\&,]/\\&/g

25636

+ s/^$'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p

25637

+ s/^$'"$ac_word_re"'$[ ]*$.*$/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p

25638

+ ' >>conftest.defines

25639

25640

-# This sed command replaces #undef with comments. This is necessary, for

25641

+# Remove the space that was appended to ease matching.

25642

+# Then replace #undef with comments. This is necessary, for

25643

# example, in the case of _POSIX_SOURCE, which is predefined and required

25644

# on some systems where configure will not decide to define it.

25645

-cat >>conftest.undefs <<\_ACEOF

25646

-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,

25647

+# (The regexp can be short, since the line contains either #define or #undef.)

25648

+echo 's/ $//

25649

+s,^[ #]*u.*,/* & */,' >>conftest.defines

25650

25651

+# Break up conftest.defines:

25652

+ac_max_sed_lines=50

25653

25654

+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"

25655

+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"

25656

+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"

25657

+# et cetera.

25658

+ac_in='$ac_file_inputs'

25659

+ac_out='"$tmp/out1"'

25660

+ac_nxt='"$tmp/out2"'

25661

25662

+while :

25663

+do

25664

+ # Write a here document:

25665

+ cat >>$CONFIG_STATUS <<_ACEOF

25666

+ # First, check the format of the line:

25667

+ cat >"\$tmp/defines.sed" <<\\CEOF

25668

+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def

25669

+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def

25670

25671

+:def

25672

_ACEOF

25673

25674

-# Break up conftest.defines because some shells have a limit on the size

25675

-# of here documents, and old seds have small limits too (100 cmds).

25676

-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS

25677

-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS

25678

-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS

25679

-echo ' :' >>$CONFIG_STATUS

25680

-rm -f conftest.tail

25681

-while grep . conftest.defines >/dev/null

25682

-do

25683

- # Write a limited-size here document to $tmp/defines.sed.

25684

- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS

25685

- # Speed up: don't consider the non `#define' lines.

25686

- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS

25687

- # Work around the forget-to-reset-the-flag bug.

25688

- echo 't clr' >>$CONFIG_STATUS

25689

- echo ': clr' >>$CONFIG_STATUS

25690

- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS

25691

+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS

25692

echo 'CEOF

25693

- sed -f $tmp/defines.sed $tmp/in >$tmp/out

25694

- rm -f $tmp/in

25695

- mv $tmp/out $tmp/in

25696

-' >>$CONFIG_STATUS

25697

- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail

25698

+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS

25699

+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in

25700

+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail

25701

+ grep . conftest.tail >/dev/null || break

25702

rm -f conftest.defines

25703

mv conftest.tail conftest.defines

25704

done

25705

-rm -f conftest.defines

25706

-echo ' fi # grep' >>$CONFIG_STATUS

25707

-echo >>$CONFIG_STATUS

25708

25709

-# Break up conftest.undefs because some shells have a limit on the size

25710

-# of here documents, and old seds have small limits too (100 cmds).

25711

-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS

25712

-rm -f conftest.tail

25713

-while grep . conftest.undefs >/dev/null

25714

-do

25715

- # Write a limited-size here document to $tmp/undefs.sed.

25716

- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS

25717

- # Speed up: don't consider the non `#undef'

25718

- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS

25719

- # Work around the forget-to-reset-the-flag bug.

25720

- echo 't clr' >>$CONFIG_STATUS

25721

- echo ': clr' >>$CONFIG_STATUS

25722

- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS

25723

- echo 'CEOF

25724

- sed -f $tmp/undefs.sed $tmp/in >$tmp/out

25725

- rm -f $tmp/in

25726

- mv $tmp/out $tmp/in

25727

-' >>$CONFIG_STATUS

25728

- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail

25729

- rm -f conftest.undefs

25730

- mv conftest.tail conftest.undefs

25731

-done

25732

-rm -f conftest.undefs

25733

+rm -f conftest.defines conftest.tail

25734

25735

+echo "ac_result=$ac_in" >>$CONFIG_STATUS

25736

cat >>$CONFIG_STATUS <<\_ACEOF

25737

- # Let's still pretend it is `configure' which instantiates (i.e., don't

25738

- # use $as_me), people would be surprised to read:

25739

- # /* config.h. Generated by config.status. */

25740

- if test x"$ac_file" = x-; then

25741

- echo "/* Generated by configure. */" >$tmp/config.h

25742

- else

25743

- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h

25744

- fi

25745

- cat $tmp/in >>$tmp/config.h

25746

- rm -f $tmp/in

25747

if test x"$ac_file" != x-; then

25748

- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then

25749

+ echo "/* $configure_input */" >"$tmp/config.h"

25750

+ cat "$ac_result" >>"$tmp/config.h"

25751

+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then

25752

{ echo "$as_me:$LINENO: $ac_file is unchanged" >&5

25753

echo "$as_me: $ac_file is unchanged" >&6;}

25754

else

25755

- ac_dir=`(dirname "$ac_file") 2>/dev/null ||

25756

-$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

25757

- X"$ac_file" : 'X$//$[^/]' \| \

25758

- X"$ac_file" : 'X$//$$' \| \

25759

- X"$ac_file" : 'X$/$' \| \

25760

- . : '$.$' 2>/dev/null ||

25761

-echo X"$ac_file" |

25762

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

25763

- /^X$\/\/$[^/].*/{ s//\1/; q; }

25764

- /^X$\/\/$$/{ s//\1/; q; }

25765

- /^X$\/$.*/{ s//\1/; q; }

25766

- s/.*/./; q'`

25767

- { if $as_mkdir_p; then

25768

- mkdir -p "$ac_dir"

25769

- else

25770

- as_dir="$ac_dir"

25771

- as_dirs=

25772

- while test ! -d "$as_dir"; do

25773

- as_dirs="$as_dir $as_dirs"

25774

- as_dir=`(dirname "$as_dir") 2>/dev/null ||

25775

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

25776

- X"$as_dir" : 'X$//$[^/]' \| \

25777

- X"$as_dir" : 'X$//$$' \| \

25778

- X"$as_dir" : 'X$/$' \| \

25779

- . : '$.$' 2>/dev/null ||

25780

-echo X"$as_dir" |

25781

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

25782

- /^X$\/\/$[^/].*/{ s//\1/; q; }

25783

- /^X$\/\/$$/{ s//\1/; q; }

25784

- /^X$\/$.*/{ s//\1/; q; }

25785

- s/.*/./; q'`

25786

- done

25787

- test ! -n "$as_dirs" || mkdir $as_dirs

25788

- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5

25789

-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}

25790

- { (exit 1); exit 1; }; }; }

25791

25792

rm -f $ac_file

25793

- mv $tmp/config.h $ac_file

25794

+ mv "$tmp/config.h" $ac_file

25795

25796

else

25797

- cat $tmp/config.h

25798

- rm -f $tmp/config.h

25799

+ echo "/* $configure_input */"

25800

+ cat "$ac_result"

25801

25802

+ rm -f "$tmp/out12"

25803

# Compute $ac_file's index in $config_headers.

25804

_am_stamp_count=1

25805

for _am_header in $config_headers :; do

25806

@@ -35713,135 +35915,39 @@

25807

_am_stamp_count=`expr $_am_stamp_count + 1` ;;

25808

esac

25809

done

25810

-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||

25811

+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||

25812

$as_expr X$ac_file : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

25813

X$ac_file : 'X$//$[^/]' \| \

25814

X$ac_file : 'X$//$$' \| \

25815

- X$ac_file : 'X$/$' \| \

25816

- . : '$.$' 2>/dev/null ||

25817

+ X$ac_file : 'X$/$' \| . 2>/dev/null ||

25818

echo X$ac_file |

25819

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

25820

- /^X$\/\/$[^/].*/{ s//\1/; q; }

25821

- /^X$\/\/$$/{ s//\1/; q; }

25822

- /^X$\/$.*/{ s//\1/; q; }

25823

- s/.*/./; q'`/stamp-h$_am_stamp_count

25824

-done

25825

-_ACEOF

25826

-cat >>$CONFIG_STATUS <<\_ACEOF

25827

25828

25829

-# CONFIG_COMMANDS section.

25830

25831

-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue

25832

- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`

25833

- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`

25834

- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||

25835

-$as_expr X"$ac_dest" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

25836

- X"$ac_dest" : 'X$//$[^/]' \| \

25837

- X"$ac_dest" : 'X$//$$' \| \

25838

- X"$ac_dest" : 'X$/$' \| \

25839

- . : '$.$' 2>/dev/null ||

25840

-echo X"$ac_dest" |

25841

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

25842

- /^X$\/\/$[^/].*/{ s//\1/; q; }

25843

- /^X$\/\/$$/{ s//\1/; q; }

25844

- /^X$\/$.*/{ s//\1/; q; }

25845

- s/.*/./; q'`

25846

- { if $as_mkdir_p; then

25847

- mkdir -p "$ac_dir"

25848

- else

25849

- as_dir="$ac_dir"

25850

- as_dirs=

25851

- while test ! -d "$as_dir"; do

25852

- as_dirs="$as_dir $as_dirs"

25853

- as_dir=`(dirname "$as_dir") 2>/dev/null ||

25854

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

25855

- X"$as_dir" : 'X$//$[^/]' \| \

25856

- X"$as_dir" : 'X$//$$' \| \

25857

- X"$as_dir" : 'X$/$' \| \

25858

- . : '$.$' 2>/dev/null ||

25859

-echo X"$as_dir" |

25860

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

25861

- /^X$\/\/$[^/].*/{ s//\1/; q; }

25862

- /^X$\/\/$$/{ s//\1/; q; }

25863

- /^X$\/$.*/{ s//\1/; q; }

25864

- s/.*/./; q'`

25865

- done

25866

- test ! -n "$as_dirs" || mkdir $as_dirs

25867

- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5

25868

-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}

25869

- { (exit 1); exit 1; }; }; }

25870

25871

- ac_builddir=.

25872

25873

-if test "$ac_dir" != .; then

25874

- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

25875

- # A "../" for each directory in $ac_dir_suffix.

25876

- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`

25877

-else

25878

- ac_dir_suffix= ac_top_builddir=

25879

-fi

25880

25881

-case $srcdir in

25882

- .) # No --srcdir option. We are building in place.

25883

- ac_srcdir=.

25884

- if test -z "$ac_top_builddir"; then

25885

- ac_top_srcdir=.

25886

- else

25887

- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`

25888

- fi ;;

25889

- [\\/]* | ?:[\\/]* ) # Absolute path.

25890

- ac_srcdir=$srcdir$ac_dir_suffix;

25891

- ac_top_srcdir=$srcdir ;;

25892

- *) # Relative path.

25893

- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix

25894

- ac_top_srcdir=$ac_top_builddir$srcdir ;;

25895

-esac

25896

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

25897

+ s//\1/

25898

+ q

25899

+ }

25900

+ /^X$\/\/$[^/].*/{

25901

+ s//\1/

25902

+ q

25903

+ }

25904

+ /^X$\/\/$$/{

25905

+ s//\1/

25906

+ q

25907

+ }

25908

+ /^X$\/$.*/{

25909

+ s//\1/

25910

+ q

25911

+ }

25912

+ s/.*/./; q'`/stamp-h$_am_stamp_count

25913

+ ;;

25914

25915

-# Do not use `cd foo && pwd` to compute absolute paths, because

25916

-# the directories may not exist.

25917

-case `pwd` in

25918

-.) ac_abs_builddir="$ac_dir";;

25919

-*)

25920

- case "$ac_dir" in

25921

- .) ac_abs_builddir=`pwd`;;

25922

- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;

25923

- *) ac_abs_builddir=`pwd`/"$ac_dir";;

25924

- esac;;

25925

-esac

25926

-case $ac_abs_builddir in

25927

-.) ac_abs_top_builddir=${ac_top_builddir}.;;

25928

-*)

25929

- case ${ac_top_builddir}. in

25930

- .) ac_abs_top_builddir=$ac_abs_builddir;;

25931

- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;

25932

- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;

25933

- esac;;

25934

-esac

25935

-case $ac_abs_builddir in

25936

-.) ac_abs_srcdir=$ac_srcdir;;

25937

-*)

25938

- case $ac_srcdir in

25939

- .) ac_abs_srcdir=$ac_abs_builddir;;

25940

- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;

25941

- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;

25942

- esac;;

25943

-esac

25944

-case $ac_abs_builddir in

25945

-.) ac_abs_top_srcdir=$ac_top_srcdir;;

25946

-*)

25947

- case $ac_top_srcdir in

25948

- .) ac_abs_top_srcdir=$ac_abs_builddir;;

25949

- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;

25950

- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;

25951

- esac;;

25952

-esac

25953

+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5

25954

+echo "$as_me: executing $ac_file commands" >&6;}

25955

+ ;;

25956

+ esac

25957

25958

25959

- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5

25960

-echo "$as_me: executing $ac_dest commands" >&6;}

25961

- case $ac_dest in

25962

- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do

25963

+ case $ac_file$ac_mode in

25964

+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do

25965

# Strip MF so we end up with the name of the file.

25966

mf=`echo "$mf" | sed -e 's/:.*$//'`

25967

# Check whether this is an Automake generated Makefile or not.

25968

@@ -35851,18 +35957,29 @@

25969

# each Makefile.in and add a new line on top of each file to say so.

25970

# So let's grep whole file.

25971

if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then

25972

- dirpart=`(dirname "$mf") 2>/dev/null ||

25973

+ dirpart=`$as_dirname -- "$mf" ||

25974

$as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

25975

X"$mf" : 'X$//$[^/]' \| \

25976

X"$mf" : 'X$//$$' \| \

25977

- X"$mf" : 'X$/$' \| \

25978

- . : '$.$' 2>/dev/null ||

25979

+ X"$mf" : 'X$/$' \| . 2>/dev/null ||

25980

echo X"$mf" |

25981

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

25982

- /^X$\/\/$[^/].*/{ s//\1/; q; }

25983

- /^X$\/\/$$/{ s//\1/; q; }

25984

- /^X$\/$.*/{ s//\1/; q; }

25985

- s/.*/./; q'`

25986

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

25987

+ s//\1/

25988

+ q

25989

+ }

25990

+ /^X$\/\/$[^/].*/{

25991

+ s//\1/

25992

+ q

25993

+ }

25994

+ /^X$\/\/$$/{

25995

+ s//\1/

25996

+ q

25997

+ }

25998

+ /^X$\/$.*/{

25999

+ s//\1/

26000

+ q

26001

+ }

26002

+ s/.*/./; q'`

26003

else

26004

continue

26005

26006

@@ -35884,56 +36001,82 @@

26007

sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

26008

# Make sure the directory exists.

26009

test -f "$dirpart/$file" && continue

26010

- fdir=`(dirname "$file") 2>/dev/null ||

26011

+ fdir=`$as_dirname -- "$file" ||

26012

$as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

26013

X"$file" : 'X$//$[^/]' \| \

26014

X"$file" : 'X$//$$' \| \

26015

- X"$file" : 'X$/$' \| \

26016

- . : '$.$' 2>/dev/null ||

26017

+ X"$file" : 'X$/$' \| . 2>/dev/null ||

26018

echo X"$file" |

26019

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

26020

- /^X$\/\/$[^/].*/{ s//\1/; q; }

26021

- /^X$\/\/$$/{ s//\1/; q; }

26022

- /^X$\/$.*/{ s//\1/; q; }

26023

- s/.*/./; q'`

26024

- { if $as_mkdir_p; then

26025

- mkdir -p $dirpart/$fdir

26026

- else

26027

- as_dir=$dirpart/$fdir

26028

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

26029

+ s//\1/

26030

+ q

26031

+ }

26032

+ /^X$\/\/$[^/].*/{

26033

+ s//\1/

26034

+ q

26035

+ }

26036

+ /^X$\/\/$$/{

26037

+ s//\1/

26038

+ q

26039

+ }

26040

+ /^X$\/$.*/{

26041

+ s//\1/

26042

+ q

26043

+ }

26044

+ s/.*/./; q'`

26045

+ { as_dir=$dirpart/$fdir

26046

+ case $as_dir in #(

26047

+ -*) as_dir=./$as_dir;;

26048

+ esac

26049

+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

26050

as_dirs=

26051

- while test ! -d "$as_dir"; do

26052

- as_dirs="$as_dir $as_dirs"

26053

- as_dir=`(dirname "$as_dir") 2>/dev/null ||

26054

+ while :; do

26055

+ case $as_dir in #(

26056

+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

26057

+ *) as_qdir=$as_dir;;

26058

+ esac

26059

+ as_dirs="'$as_qdir' $as_dirs"

26060

+ as_dir=`$as_dirname -- "$as_dir" ||

26061

$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

26062

X"$as_dir" : 'X$//$[^/]' \| \

26063

X"$as_dir" : 'X$//$$' \| \

26064

- X"$as_dir" : 'X$/$' \| \

26065

- . : '$.$' 2>/dev/null ||

26066

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

26067

echo X"$as_dir" |

26068

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

26069

- /^X$\/\/$[^/].*/{ s//\1/; q; }

26070

- /^X$\/\/$$/{ s//\1/; q; }

26071

- /^X$\/$.*/{ s//\1/; q; }

26072

- s/.*/./; q'`

26073

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

26074

+ s//\1/

26075

+ q

26076

+ }

26077

+ /^X$\/\/$[^/].*/{

26078

+ s//\1/

26079

+ q

26080

+ }

26081

+ /^X$\/\/$$/{

26082

+ s//\1/

26083

+ q

26084

+ }

26085

+ /^X$\/$.*/{

26086

+ s//\1/

26087

+ q

26088

+ }

26089

+ s/.*/./; q'`

26090

+ test -d "$as_dir" && break

26091

done

26092

- test ! -n "$as_dirs" || mkdir $as_dirs

26093

- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5

26094

-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}

26095

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

26096

+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

26097

+echo "$as_me: error: cannot create directory $as_dir" >&2;}

26098

{ (exit 1); exit 1; }; }; }

26099

26100

# echo "creating $dirpart/$file"

26101

echo '# dummy' > "$dirpart/$file"

26102

done

26103

done

26104

;;

26105

- default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)

26106

+ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)

26107

sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile

26108

esac ;;

26109

26110

esac

26111

-done

26112

-_ACEOF

26113

+done # for ac_tag

26114

26115

-cat >>$CONFIG_STATUS <<\_ACEOF

26116

26117

{ (exit 0); exit 0; }

26118

_ACEOF

26119

@@ -35970,7 +36113,10 @@

26120

# Remove --cache-file and --srcdir arguments so they do not pile up.

26121

ac_sub_configure_args=

26122

ac_prev=

26123

- for ac_arg in $ac_configure_args; do

26124

+ eval "set x $ac_configure_args"

26125

+ shift

26126

+ for ac_arg

26127

+ do

26128

if test -n "$ac_prev"; then

26129

ac_prev=

26130

continue

26131

@@ -35993,123 +36139,123 @@

26132

ac_prev=prefix ;;

26133

-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)

26134

;;

26135

- *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;

26136

+ *)

26137

+ case $ac_arg in

26138

+ *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

26139

+ esac

26140

+ ac_sub_configure_args="$ac_sub_configure_args '$ac_arg'" ;;

26141

esac

26142

done

26143

26144

# Always prepend --prefix to ensure using the same prefix

26145

# in subdir configurations.

26146

- ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"

26147

+ ac_arg="--prefix=$prefix"

26148

+ case $ac_arg in

26149

+ *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;

26150

+ esac

26151

+ ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"

26152

26153

+ # Pass --silent

26154

+ if test "$silent" = yes; then

26155

+ ac_sub_configure_args="--silent $ac_sub_configure_args"

26156

+ fi

26157

26158

ac_popdir=`pwd`

26159

for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue

26160

26161

# Do not complain, so a configure script can configure whichever

26162

# parts of a large source tree are present.

26163

- test -d $srcdir/$ac_dir || continue

26164

+ test -d "$srcdir/$ac_dir" || continue

26165

26166

- { echo "$as_me:$LINENO: configuring in $ac_dir" >&5

26167

-echo "$as_me: configuring in $ac_dir" >&6;}

26168

- { if $as_mkdir_p; then

26169

- mkdir -p "$ac_dir"

26170

- else

26171

- as_dir="$ac_dir"

26172

+ ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"

26173

+ echo "$as_me:$LINENO: $ac_msg" >&5

26174

+ echo "$ac_msg" >&6

26175

+ { as_dir="$ac_dir"

26176

+ case $as_dir in #(

26177

+ -*) as_dir=./$as_dir;;

26178

+ esac

26179

+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

26180

as_dirs=

26181

- while test ! -d "$as_dir"; do

26182

- as_dirs="$as_dir $as_dirs"

26183

- as_dir=`(dirname "$as_dir") 2>/dev/null ||

26184

+ while :; do

26185

+ case $as_dir in #(

26186

+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

26187

+ *) as_qdir=$as_dir;;

26188

+ esac

26189

+ as_dirs="'$as_qdir' $as_dirs"

26190

+ as_dir=`$as_dirname -- "$as_dir" ||

26191

$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

26192

X"$as_dir" : 'X$//$[^/]' \| \

26193

X"$as_dir" : 'X$//$$' \| \

26194

- X"$as_dir" : 'X$/$' \| \

26195

- . : '$.$' 2>/dev/null ||

26196

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

26197

echo X"$as_dir" |

26198

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

26199

- /^X$\/\/$[^/].*/{ s//\1/; q; }

26200

- /^X$\/\/$$/{ s//\1/; q; }

26201

- /^X$\/$.*/{ s//\1/; q; }

26202

- s/.*/./; q'`

26203

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

26204

+ s//\1/

26205

+ q

26206

+ }

26207

+ /^X$\/\/$[^/].*/{

26208

+ s//\1/

26209

+ q

26210

+ }

26211

+ /^X$\/\/$$/{

26212

+ s//\1/

26213

+ q

26214

+ }

26215

+ /^X$\/$.*/{

26216

+ s//\1/

26217

+ q

26218

+ }

26219

+ s/.*/./; q'`

26220

+ test -d "$as_dir" && break

26221

done

26222

- test ! -n "$as_dirs" || mkdir $as_dirs

26223

- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5

26224

-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}

26225

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

26226

+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

26227

+echo "$as_me: error: cannot create directory $as_dir" >&2;}

26228

{ (exit 1); exit 1; }; }; }

26229

26230

ac_builddir=.

26231

26232

-if test "$ac_dir" != .; then

26233

+case "$ac_dir" in

26234

+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

26235

+*)

26236

ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

26237

- # A "../" for each directory in $ac_dir_suffix.

26238

- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`

26239

-else

26240

- ac_dir_suffix= ac_top_builddir=

26241

-fi

26242

+ # A ".." for each directory in $ac_dir_suffix.

26243

+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

26244

+ case $ac_top_builddir_sub in

26245

+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;

26246

+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

26247

+ esac ;;

26248

+esac

26249

+ac_abs_top_builddir=$ac_pwd

26250

+ac_abs_builddir=$ac_pwd$ac_dir_suffix

26251

+# for backward compatibility:

26252

+ac_top_builddir=$ac_top_build_prefix

26253

26254

case $srcdir in

26255

- .) # No --srcdir option. We are building in place.

26256

+ .) # We are building in place.

26257

ac_srcdir=.

26258

- if test -z "$ac_top_builddir"; then

26259

- ac_top_srcdir=.

26260

- else

26261

- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`

26262

- fi ;;

26263

- [\\/]* | ?:[\\/]* ) # Absolute path.

26264

+ ac_top_srcdir=$ac_top_builddir_sub

26265

+ ac_abs_top_srcdir=$ac_pwd ;;

26266

+ [\\/]* | ?:[\\/]* ) # Absolute name.

26267

ac_srcdir=$srcdir$ac_dir_suffix;

26268

- ac_top_srcdir=$srcdir ;;

26269

- *) # Relative path.

26270

- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix

26271

- ac_top_srcdir=$ac_top_builddir$srcdir ;;

26272

-esac

26273

26274

-# Do not use `cd foo && pwd` to compute absolute paths, because

26275

-# the directories may not exist.

26276

-case `pwd` in

26277

-.) ac_abs_builddir="$ac_dir";;

26278

-*)

26279

- case "$ac_dir" in

26280

- .) ac_abs_builddir=`pwd`;;

26281

- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;

26282

- *) ac_abs_builddir=`pwd`/"$ac_dir";;

26283

- esac;;

26284

-esac

26285

-case $ac_abs_builddir in

26286

-.) ac_abs_top_builddir=${ac_top_builddir}.;;

26287

-*)

26288

- case ${ac_top_builddir}. in

26289

- .) ac_abs_top_builddir=$ac_abs_builddir;;

26290

- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;

26291

- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;

26292

- esac;;

26293

-esac

26294

-case $ac_abs_builddir in

26295

-.) ac_abs_srcdir=$ac_srcdir;;

26296

-*)

26297

- case $ac_srcdir in

26298

- .) ac_abs_srcdir=$ac_abs_builddir;;

26299

- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;

26300

- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;

26301

- esac;;

26302

-esac

26303

-case $ac_abs_builddir in

26304

-.) ac_abs_top_srcdir=$ac_top_srcdir;;

26305

-*)

26306

- case $ac_top_srcdir in

26307

- .) ac_abs_top_srcdir=$ac_abs_builddir;;

26308

- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;

26309

- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;

26310

- esac;;

26311

+ ac_top_srcdir=$srcdir

26312

+ ac_abs_top_srcdir=$srcdir ;;

26313

+ *) # Relative name.

26314

+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix

26315

+ ac_top_srcdir=$ac_top_build_prefix$srcdir

26316

+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;

26317

esac

26318

+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

26319

26320

26321

- cd $ac_dir

26322

+ cd "$ac_dir"

26323

26324

# Check for guested configure; otherwise get Cygnus style configure.

26325

- if test -f $ac_srcdir/configure.gnu; then

26326

- ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"

26327

- elif test -f $ac_srcdir/configure; then

26328

- ac_sub_configure="$SHELL '$ac_srcdir/configure'"

26329

- elif test -f $ac_srcdir/configure.in; then

26330

- ac_sub_configure=$ac_configure

26331

+ if test -f "$ac_srcdir/configure.gnu"; then

26332

+ ac_sub_configure=$ac_srcdir/configure.gnu

26333

+ elif test -f "$ac_srcdir/configure"; then

26334

+ ac_sub_configure=$ac_srcdir/configure

26335

+ elif test -f "$ac_srcdir/configure.in"; then

26336

+ # This should be Cygnus configure.

26337

+ ac_sub_configure=$ac_aux_dir/configure

26338

else

26339

{ echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5

26340

echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}

26341

@@ -36121,21 +36267,21 @@

26342

# Make the cache file name correct relative to the subdirectory.

26343

case $cache_file in

26344

[\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;

26345

- *) # Relative path.

26346

- ac_sub_cache_file=$ac_top_builddir$cache_file ;;

26347

+ *) # Relative name.

26348

+ ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;

26349

esac

26350

26351

- { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5

26352

-echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}

26353

+ { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5

26354

+echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}

26355

# The eval makes quoting arguments work.

26356

- eval $ac_sub_configure $ac_sub_configure_args \

26357

- --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||

26358

+ eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \

26359

+ --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||

26360

{ { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5

26361

echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}

26362

{ (exit 1); exit 1; }; }

26363

26364

26365

- cd $ac_popdir

26366

+ cd "$ac_popdir"

26367

done

26368

26369

Older »