~ubuntu-branches/ubuntu/lucid/vino/lucid

- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

129

- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

130

+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

131

+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

132

133

134

# We used to test for /lib/ld.so.1 and disable shared libraries on

135

@@ -2668,7 +2637,7 @@

136

dynamic_linker='GNU/Linux ld.so'

137

;;

138

139

-knetbsd*-gnu)

140

+netbsdelf*-gnu)

141

version_type=linux

142

need_lib_prefix=no

143

need_version=no

144

@@ -2677,7 +2646,7 @@

145

shlibpath_var=LD_LIBRARY_PATH

146

shlibpath_overrides_runpath=no

147

hardcode_into_libs=yes

148

- dynamic_linker='GNU ld.so'

149

+ dynamic_linker='NetBSD ld.elf_so'

150

;;

151

152

netbsd*)

153

@@ -3385,7 +3354,7 @@

154

lt_cv_deplibs_check_method=pass_all

155

;;

156

157

-freebsd* | kfreebsd*-gnu | dragonfly*)

158

+freebsd* | dragonfly*)

159

if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

160

case $host_cpu in

161

i*86 )

162

@@ -3439,11 +3408,11 @@

163

;;

164

165

# This must be Linux ELF.

166

-linux*)

167

+linux* | k*bsd*-gnu)

168

lt_cv_deplibs_check_method=pass_all

169

;;

170

171

-netbsd*)

172

+netbsd* | netbsdelf*-gnu)

173

if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

174

lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'

175

else

176

@@ -4191,7 +4160,7 @@

177

freebsd-elf*)

178

_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no

179

;;

180

- freebsd* | kfreebsd*-gnu | dragonfly*)

181

+ freebsd* | dragonfly*)

182

# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF

183

# conventions

184

_LT_AC_TAGVAR(ld_shlibs, $1)=yes

185

@@ -4350,7 +4319,7 @@

186

_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

187

_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:

188

;;

189

- linux*)

190

+ linux* | k*bsd*-gnu)

191

case $cc_basename in

192

KCC*)

193

# Kuck and Associates, Inc. (KAI) C++ Compiler

194

@@ -4452,7 +4421,7 @@

195

;;

196

esac

197

;;

198

- netbsd*)

199

+ netbsd* | netbsdelf*-gnu)

200

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

201

_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'

202

wlarc=

203

@@ -5363,9 +5332,6 @@

204

# Is the compiler the GNU C compiler?

205

with_gcc=$_LT_AC_TAGVAR(GCC, $1)

206

207

-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`

208

-gcc_ver=\`gcc -dumpversion\`

209

210

# An ERE matcher.

211

EGREP=$lt_EGREP

212

213

@@ -5499,11 +5465,11 @@

214

215

# Dependencies to place before the objects being linked to create a

216

# shared library.

217

-predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

218

+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)

219

220

# Dependencies to place after the objects being linked to create a

221

# shared library.

222

-postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

223

+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)

224

225

# Dependencies to place before the objects being linked to create a

226

# shared library.

227

@@ -5515,7 +5481,7 @@

228

229

# The library search path used internally by the compiler when linking

230

# a shared library.

231

-compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

232

+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)

233

234

# Method to check whether dependent libraries are shared objects.

235

deplibs_check_method=$lt_deplibs_check_method

236

@@ -5595,7 +5561,7 @@

237

link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)

238

239

# Compile-time system search path for libraries

240

-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

241

+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec

242

243

# Run-time system search path for libraries

244

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

245

@@ -5720,7 +5686,7 @@

246

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

247

lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/ {\"\2\", (lt_ptr) \&\2},/p'"

248

;;

249

-linux*)

250

+linux* | k*bsd*-gnu)

251

if test "$host_cpu" = ia64; then

252

symcode='[[ABCDGIRSTW]]'

253

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

254

@@ -5993,7 +5959,7 @@

255

;;

256

esac

257

;;

258

- freebsd* | kfreebsd*-gnu | dragonfly*)

259

+ freebsd* | dragonfly*)

260

# FreeBSD uses GNU C++

261

;;

262

hpux9* | hpux10* | hpux11*)

263

@@ -6036,7 +6002,7 @@

264

;;

265

esac

266

;;

267

- linux*)

268

+ linux* | k*bsd*-gnu)

269

case $cc_basename in

270

KCC*)

271

# KAI C++ Compiler

272

@@ -6079,7 +6045,7 @@

273

;;

274

esac

275

;;

276

- netbsd*)

277

+ netbsd* | netbsdelf*-gnu)

278

;;

279

osf3* | osf4* | osf5*)

280

case $cc_basename in

281

@@ -6290,7 +6256,7 @@

282

_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

283

;;

284

285

- linux*)

286

+ linux* | k*bsd*-gnu)

287

case $cc_basename in

288

icc* | ecc*)

289

_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

290

@@ -6431,6 +6397,9 @@

291

cygwin* | mingw*)

292

_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* $[[^ ]]*$/\1 DATA/;/^.* __nm__/s/^.* __nm__$[[^ ]]*$ [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'

293

;;

294

+ linux* | k*bsd*-gnu)

295

+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no

296

+ ;;

297

298

_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

299

;;

300

@@ -6601,7 +6570,7 @@

301

_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

302

;;

303

304

- linux*)

305

+ linux* | k*bsd*-gnu)

306

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

307

tmp_addflag=

308

case $cc_basename,$host_cpu in

309

@@ -6627,12 +6596,13 @@

310

$echo "local: *; };" >> $output_objdir/$libname.ver~

311

$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

312

313

+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no

314

else

315

_LT_AC_TAGVAR(ld_shlibs, $1)=no

316

317

;;

318

319

- netbsd*)

320

+ netbsd* | netbsdelf*-gnu)

321

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

322

_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

323

wlarc=

324

@@ -6962,7 +6932,7 @@

325

;;

326

327

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

328

- freebsd* | kfreebsd*-gnu | dragonfly*)

329

+ freebsd* | dragonfly*)

330

_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

331

_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

332

_LT_AC_TAGVAR(hardcode_direct, $1)=yes

333

@@ -7064,7 +7034,7 @@

334

_LT_AC_TAGVAR(link_all_deplibs, $1)=yes

335

;;

336

337

- netbsd*)

338

+ netbsd* | netbsdelf*-gnu)

339

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

340

_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

341

else

342

@@ -7431,7 +7401,6 @@

343

done

344

done

345

done

346

-IFS=$as_save_IFS

347

lt_ac_max=0

348

lt_ac_count=0

349

# Add /usr/xpg4/bin/sed as it is typically found on Solaris

350

@@ -7464,7 +7433,6 @@

351

done

352

])

353

SED=$lt_cv_path_SED

354

-AC_SUBST([SED])

355

AC_MSG_RESULT([$SED])

356

])

357

358

diff -Nur vino-2.16.0/configure vino-2.16.0.new/configure

359

--- vino-2.16.0/configure 2006-10-05 15:32:34.000000000 +0200

360

+++ vino-2.16.0.new/configure 2006-10-25 12:08:03.000000000 +0200

361

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

362

#! /bin/sh

363

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

364

-# Generated by GNU Autoconf 2.59 for vino 2.16.0.

365

+# Generated by GNU Autoconf 2.60a for vino 2.16.0.

366

367

# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=vino>.

368

369

370

371

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

372

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

373

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

374

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

375

@@ -18,11 +19,35 @@

376

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

377

# is contrary to our usage. Disable this feature.

378

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

379

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

380

- set -o posix

381

+ setopt NO_GLOB_SUBST

382

+else

383

+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac

384

385

+BIN_SH=xpg4; export BIN_SH # for Tru64

386

DUALCASE=1; export DUALCASE # for MKS sh

387

388

389

+# PATH needs CR

390

+# Avoid depending upon Character Ranges.

391

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

392

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

393

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

394

+as_cr_digits='0123456789'

395

+as_cr_alnum=$as_cr_Letters$as_cr_digits

396

397

+# The user is always right.

398

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

399

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

400

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

401

+ chmod +x conf$$.sh

402

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

403

+ PATH_SEPARATOR=';'

404

+ else

405

+ PATH_SEPARATOR=:

406

+ fi

407

+ rm -f conf$$.sh

408

+fi

409

410

# Support unset when possible.

411

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

412

as_unset=unset

413

@@ -31,8 +56,43 @@

414

415

416

417

+# IFS

418

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

419

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

420

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

421

+# splitting by setting IFS to empty value.)

422

+as_nl='

423

424

+IFS=" "" $as_nl"

425

426

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

427

+case $0 in

428

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

429

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

430

+for as_dir in $PATH

431

+do

432

+ IFS=$as_save_IFS

433

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

434

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

435

+done

436

+IFS=$as_save_IFS

437

438

+ ;;

439

+esac

440

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

441

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

442

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

443

+ as_myself=$0

444

+fi

445

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

446

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

447

+ { (exit 1); exit 1; }

448

+fi

449

450

# Work around bugs in pre-3.0 UWIN ksh.

451

-$as_unset ENV MAIL MAILPATH

452

+for as_var in ENV MAIL MAILPATH

453

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

454

+done

455

PS1='$ '

456

PS2='> '

457

PS4='+ '

458

@@ -46,18 +106,19 @@

459

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

460

eval $as_var=C; export $as_var

461

else

462

- $as_unset $as_var

463

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

464

465

done

466

467

# Required to use basename.

468

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

469

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

470

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

471

as_expr=expr

472

else

473

as_expr=false

474

475

476

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

477

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

478

as_basename=basename

479

else

480

as_basename=false

481

@@ -65,157 +126,386 @@

482

483

484

# Name of the executable.

485

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

486

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

487

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

488

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

489

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

490

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

491

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

492

echo X/"$0" |

493

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

494

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

495

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

496

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

497

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

498

+ s//\1/

499

+ q

500

+ }

501

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

502

+ s//\1/

503

+ q

504

+ }

505

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

506

+ s//\1/

507

+ q

508

+ }

509

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

510

511

+# CDPATH.

512

+$as_unset CDPATH

513

514

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

515

-# Avoid depending upon Character Ranges.

516

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

517

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

518

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

519

-as_cr_digits='0123456789'

520

-as_cr_alnum=$as_cr_Letters$as_cr_digits

521

522

-# The user is always right.

523

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

524

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

525

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

526

- chmod +x conf$$.sh

527

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

528

- PATH_SEPARATOR=';'

529

- else

530

- PATH_SEPARATOR=:

531

- fi

532

- rm -f conf$$.sh

533

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

534

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

535

+ as_have_required=yes

536

+else

537

+ as_have_required=no

538

+fi

539

540

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

541

+(as_func_return () {

542

+ (exit \$1)

543

544

+as_func_success () {

545

+ as_func_return 0

546

547

+as_func_failure () {

548

+ as_func_return 1

549

550

+as_func_ret_success () {

551

+ return 0

552

553

+as_func_ret_failure () {

554

+ return 1

555

556

557

+exitcode=0

558

+if as_func_success; then

559

+ :

560

+else

561

+ exitcode=1

562

+ echo as_func_success failed.

563

564

565

+if as_func_failure; then

566

+ exitcode=1

567

+ echo as_func_failure succeeded.

568

+fi

569

570

- as_lineno_1=$LINENO

571

- as_lineno_2=$LINENO

572

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

573

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

574

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

575

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

576

- # relative or not.

577

- case $0 in

578

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

579

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

580

-for as_dir in $PATH

581

-do

582

- IFS=$as_save_IFS

583

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

584

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

585

-done

586

+if as_func_ret_success; then

587

+ :

588

+else

589

+ exitcode=1

590

+ echo as_func_ret_success failed.

591

+fi

592

593

- ;;

594

- esac

595

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

596

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

597

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

598

- as_myself=$0

599

- fi

600

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

601

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

602

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

603

- fi

604

- case $CONFIG_SHELL in

605

- '')

606

+if as_func_ret_failure; then

607

+ exitcode=1

608

+ echo as_func_ret_failure succeeded.

609

+fi

610

611

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

612

+ :

613

+else

614

+ exitcode=1

615

+ echo positional parameters were not saved.

616

+fi

617

618

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

619

620

621

+ as_lineno_1=\$LINENO

622

+ as_lineno_2=\$LINENO

623

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

624

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

625

+") 2> /dev/null; then

626

+ :

627

+else

628

+ as_candidate_shells=

629

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

630

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

631

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

632

633

IFS=$as_save_IFS

634

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

635

- for as_base in sh bash ksh sh5; do

636

- case $as_dir in

637

+ case $as_dir in

638

/*)

639

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

640

+ for as_base in sh bash ksh sh5; do

641

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

642

+ done;;

643

+ esac

644

+done

645

+IFS=$as_save_IFS

646

647

648

+ for as_shell in $as_candidate_shells $SHELL; do

649

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

650

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

651

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

652

+# Be Bourne compatible

653

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

654

+ emulate sh

655

+ NULLCMD=:

656

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

657

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

658

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

659

+ setopt NO_GLOB_SUBST

660

+else

661

+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac

662

+fi

663

+BIN_SH=xpg4; export BIN_SH # for Tru64

664

+DUALCASE=1; export DUALCASE # for MKS sh

665

666

667

+_ASEOF

668

+}; then

669

+ CONFIG_SHELL=$as_shell

670

+ as_have_required=yes

671

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

672

+# Be Bourne compatible

673

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

674

+ emulate sh

675

+ NULLCMD=:

676

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

677

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

678

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

679

+ setopt NO_GLOB_SUBST

680

+else

681

+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac

682

+fi

683

+BIN_SH=xpg4; export BIN_SH # for Tru64

684

+DUALCASE=1; export DUALCASE # for MKS sh

685

686

687

+(as_func_return () {

688

+ (exit $1)

689

690

+as_func_success () {

691

+ as_func_return 0

692

693

+as_func_failure () {

694

+ as_func_return 1

695

696

+as_func_ret_success () {

697

+ return 0

698

699

+as_func_ret_failure () {

700

+ return 1

701

702

703

+exitcode=0

704

+if as_func_success; then

705

+ :

706

+else

707

+ exitcode=1

708

+ echo as_func_success failed.

709

+fi

710

711

+if as_func_failure; then

712

+ exitcode=1

713

+ echo as_func_failure succeeded.

714

+fi

715

716

+if as_func_ret_success; then

717

+ :

718

+else

719

+ exitcode=1

720

+ echo as_func_ret_success failed.

721

+fi

722

723

+if as_func_ret_failure; then

724

+ exitcode=1

725

+ echo as_func_ret_failure succeeded.

726

+fi

727

728

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

729

+ :

730

+else

731

+ exitcode=1

732

+ echo positional parameters were not saved.

733

+fi

734

735

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

736

737

738

as_lineno_1=$LINENO

739

as_lineno_2=$LINENO

740

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

741

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

742

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

743

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

744

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

745

- CONFIG_SHELL=$as_dir/$as_base

746

- export CONFIG_SHELL

747

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

748

- fi;;

749

- esac

750

- done

751

-done

752

-;;

753

- esac

754

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

755

756

+_ASEOF

757

+}; then

758

+ break

759

+fi

760

761

+fi

762

763

+ done

764

765

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

766

+ for as_var in BASH_ENV ENV

767

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

768

+ done

769

+ export CONFIG_SHELL

770

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

771

+fi

772

773

774

+ if test $as_have_required = no; then

775

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

776

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

777

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

778

+ echo shell if you do have one.

779

+ { (exit 1); exit 1; }

780

+fi

781

782

783

+fi

784

785

+fi

786

787

788

789

+(eval "as_func_return () {

790

+ (exit \$1)

791

792

+as_func_success () {

793

+ as_func_return 0

794

795

+as_func_failure () {

796

+ as_func_return 1

797

798

+as_func_ret_success () {

799

+ return 0

800

801

+as_func_ret_failure () {

802

+ return 1

803

804

805

+exitcode=0

806

+if as_func_success; then

807

+ :

808

+else

809

+ exitcode=1

810

+ echo as_func_success failed.

811

+fi

812

813

+if as_func_failure; then

814

+ exitcode=1

815

+ echo as_func_failure succeeded.

816

+fi

817

818

+if as_func_ret_success; then

819

+ :

820

+else

821

+ exitcode=1

822

+ echo as_func_ret_success failed.

823

+fi

824

825

+if as_func_ret_failure; then

826

+ exitcode=1

827

+ echo as_func_ret_failure succeeded.

828

+fi

829

830

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

831

+ :

832

+else

833

+ exitcode=1

834

+ echo positional parameters were not saved.

835

+fi

836

837

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

838

+ echo No shell found that supports shell functions.

839

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

840

+ echo including any error possibly output before this

841

+ echo message

842

843

844

845

846

+ as_lineno_1=$LINENO

847

+ as_lineno_2=$LINENO

848

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

849

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

850

851

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

852

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

853

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

854

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

855

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

856

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

857

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

858

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

859

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

860

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

861

+ # case at line end.

862

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

863

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

864

- sed '=' <$as_myself |

865

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

866

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

867

+ sed -n '

868

+ p

869

+ /[$]LINENO/=

870

+ ' <$as_myself |

871

sed '

872

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

873

+ t lineno

874

+ b

875

+ :lineno

876

877

- s,$,-,

878

- : loop

879

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

880

+ :loop

881

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

882

t loop

883

- s,-$,,

884

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

885

+ s/-\n.*//

886

' >$as_me.lineno &&

887

- chmod +x $as_me.lineno ||

888

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

889

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

890

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

891

892

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

893

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

894

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

895

- . ./$as_me.lineno

896

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

897

+ . "./$as_me.lineno"

898

# Exit status is that of the last command.

899

exit

900

}

901

902

903

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

904

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

905

-' ECHO_T=' ' ;;

906

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

907

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

908

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

909

+ as_dirname=dirname

910

+else

911

+ as_dirname=false

912

+fi

913

914

+ECHO_C= ECHO_N= ECHO_T=

915

+case `echo -n x` in

916

+-n*)

917

+ case `echo 'x\c'` in

918

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

919

+ *) ECHO_C='\c';;

920

+ esac;;

921

+*)

922

+ ECHO_N='-n';;

923

esac

924

925

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

926

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

927

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

928

as_expr=expr

929

else

930

as_expr=false

931

932

933

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

934

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

935

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

936

+else

937

+ rm -f conf$$.dir

938

+ mkdir conf$$.dir

939

+fi

940

echo >conf$$.file

941

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

942

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

943

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

944

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

945

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

946

+ as_ln_s='ln -s'

947

+ # ... but there are two gotchas:

948

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

949

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

950

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

951

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

952

as_ln_s='cp -p'

953

- else

954

- as_ln_s='ln -s'

955

- fi

956

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

957

as_ln_s=ln

958

else

959

as_ln_s='cp -p'

960

961

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

962

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

963

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

964

965

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

966

as_mkdir_p=:

967

@@ -224,7 +514,19 @@

968

as_mkdir_p=false

969

970

971

-as_executable_p="test -f"

972

+# Find out whether ``test -x'' works. Don't use a zero-byte file, as

973

+# systems may use methods other than mode bits to determine executability.

974

+cat >conf$$.file <<_ASEOF

975

+#! /bin/sh

976

+exit 0

977

+_ASEOF

978

+chmod +x conf$$.file

979

+if test -x conf$$.file >/dev/null 2>&1; then

980

+ as_executable_p="test -x"

981

+else

982

+ as_executable_p=:

983

+fi

984

+rm -f conf$$.file

985

986

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

987

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

988

@@ -233,15 +535,6 @@

989

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

990

991

992

-# IFS

993

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

994

-as_nl='

995

996

-IFS=" $as_nl"

997

998

-# CDPATH.

999

-$as_unset CDPATH

1000

1001

1002

1003

# Check that we are running under the correct shell.

1004

@@ -397,29 +690,26 @@

1005

1006

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

1007

1008

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

1009

1010

# Name of the host.

1011

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

1012

# so uname gets run too.

1013

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

1014

1015

-exec 6>&1

1016

1017

1018

# Initializations.

1019

1020

ac_default_prefix=/usr/local

1021

+ac_clean_files=

1022

ac_config_libobj_dir=.

1023

+LIBOBJS=

1024

cross_compiling=no

1025

subdirs=

1026

MFLAGS=

1027

MAKEFLAGS=

1028

SHELL=${CONFIG_SHELL-/bin/sh}

1029

1030

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

1031

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

1032

-# only ac_max_sed_lines should be used.

1033

-: ${ac_max_here_lines=38}

1034

1035

# Identity of this package.

1036

PACKAGE_NAME='vino'

1037

PACKAGE_TARNAME='vino'

1038

@@ -431,42 +721,257 @@

1039

# Factoring default headers for most tests.

1040

ac_includes_default="\

1041

#include <stdio.h>

1042

-#if HAVE_SYS_TYPES_H

1043

+#ifdef HAVE_SYS_TYPES_H

1044

# include <sys/types.h>

1045

#endif

1046

-#if HAVE_SYS_STAT_H

1047

+#ifdef HAVE_SYS_STAT_H

1048

# include <sys/stat.h>

1049

#endif

1050

-#if STDC_HEADERS

1051

+#ifdef STDC_HEADERS

1052

# include <stdlib.h>

1053

# include <stddef.h>

1054

#else

1055

-# if HAVE_STDLIB_H

1056

+# ifdef HAVE_STDLIB_H

1057

# include <stdlib.h>

1058

# endif

1059

#endif

1060

-#if HAVE_STRING_H

1061

-# if !STDC_HEADERS && HAVE_MEMORY_H

1062

+#ifdef HAVE_STRING_H

1063

+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H

1064

# include <memory.h>

1065

# endif

1066

# include <string.h>

1067

#endif

1068

-#if HAVE_STRINGS_H

1069

+#ifdef HAVE_STRINGS_H

1070

# include <strings.h>

1071

#endif

1072

-#if HAVE_INTTYPES_H

1073

+#ifdef HAVE_INTTYPES_H

1074

# include <inttypes.h>

1075

-#else

1076

-# if HAVE_STDINT_H

1077

-# include <stdint.h>

1078

-# endif

1079

#endif

1080

-#if HAVE_UNISTD_H

1081

+#ifdef HAVE_STDINT_H

1082

+# include <stdint.h>

1083

+#endif

1084

+#ifdef HAVE_UNISTD_H

1085

# include <unistd.h>

1086

#endif"

1087

1088

-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 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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT ACLOCAL_AMFLAGS GETTEXT_PACKAGE 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 CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS GCONFTOOL GLIB_GENMARSHAL USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS WARN_CFLAGS DISABLE_DEPRECATED_CFLAGS PKG_CONFIG ac_pt_PKG_CONFIG VINO_SERVER_CFLAGS VINO_SERVER_LIBS VINO_CAPPLET_CFLAGS VINO_CAPPLET_LIBS VINO_SESSION_CFLAGS VINO_SESSION_LIBS SESSION_SUPPORT_TRUE SESSION_SUPPORT_FALSE VINO_HTTP_CFLAGS HTTP_SERVER_TRUE HTTP_SERVER_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS ORBIT_IDL BONOBO_IDLDIR LIBGNUTLS_CONFIG LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS LIBGCRYPT_CONFIG LIBGCRYPT_CFLAGS LIBGCRYPT_LIBS XDAMAGE_LIBS XSHM_LIBS XTEST_LIBS AVAHI_CFLAGS AVAHI_LIBS LIBZ LIBJPEG VINO_DEBUG_CFLAGS GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE PERL REBUILD LIBOBJS LTLIBOBJS'

1089

+ac_subst_vars='SHELL

1090

+PATH_SEPARATOR

1091

+PACKAGE_NAME

1092

+PACKAGE_TARNAME

1093

+PACKAGE_VERSION

1094

+PACKAGE_STRING

1095

+PACKAGE_BUGREPORT

1096

+exec_prefix

1097

+prefix

1098

+program_transform_name

1099

+bindir

1100

+sbindir

1101

+libexecdir

1102

+datarootdir

1103

+datadir

1104

+sysconfdir

1105

+sharedstatedir

1106

+localstatedir

1107

+includedir

1108

+oldincludedir

1109

+docdir

1110

+infodir

1111

+htmldir

1112

+dvidir

1113

+pdfdir

1114

+psdir

1115

+libdir

1116

+localedir

1117

+mandir

1118

+DEFS

1119

+ECHO_C

1120

+ECHO_N

1121

+ECHO_T

1122

+LIBS

1123

+build_alias

1124

+host_alias

1125

+target_alias

1126

+INSTALL_PROGRAM

1127

+INSTALL_SCRIPT

1128

+INSTALL_DATA

1129

+CYGPATH_W

1130

+PACKAGE

1131

+VERSION

1132

+ACLOCAL

1133

+AUTOCONF

1134

+AUTOMAKE

1135

+AUTOHEADER

1136

+MAKEINFO

1137

+install_sh

1138

+STRIP

1139

+INSTALL_STRIP_PROGRAM

1140

+mkdir_p

1141

+AWK

1142

+SET_MAKE

1143

+am__leading_dot

1144

+AMTAR

1145

+am__tar

1146

+am__untar

1147

+MAINTAINER_MODE_TRUE

1148

+MAINTAINER_MODE_FALSE

1149

+MAINT

1150

+ACLOCAL_AMFLAGS

1151

+GETTEXT_PACKAGE

1152

+CC

1153

+CFLAGS

1154

+LDFLAGS

1155

+CPPFLAGS

1156

+ac_ct_CC

1157

+EXEEXT

1158

+OBJEXT

1159

+DEPDIR

1160

+am__include

1161

+am__quote

1162

+AMDEP_TRUE

1163

+AMDEP_FALSE

1164

+AMDEPBACKSLASH

1165

+CCDEPMODE

1166

+am__fastdepCC_TRUE

1167

+am__fastdepCC_FALSE

1168

+CPP

1169

+GREP

1170

+EGREP

1171

+build

1172

+build_cpu

1173

+build_vendor

1174

+build_os

1175

+host

1176

+host_cpu

1177

+host_vendor

1178

+host_os

1179

+LN_S

1180

+ECHO

1181

+AR

1182

+RANLIB

1183

+CXX

1184

+CXXFLAGS

1185

+ac_ct_CXX

1186

+CXXDEPMODE

1187

+am__fastdepCXX_TRUE

1188

+am__fastdepCXX_FALSE

1189

+CXXCPP

1190

+F77

1191

+FFLAGS

1192

+ac_ct_F77

1193

+LIBTOOL

1194

+INTLTOOL_DESKTOP_RULE

1195

+INTLTOOL_DIRECTORY_RULE

1196

+INTLTOOL_KEYS_RULE

1197

+INTLTOOL_PROP_RULE

1198

+INTLTOOL_OAF_RULE

1199

+INTLTOOL_PONG_RULE

1200

+INTLTOOL_SERVER_RULE

1201

+INTLTOOL_SHEET_RULE

1202

+INTLTOOL_SOUNDLIST_RULE

1203

+INTLTOOL_UI_RULE

1204

+INTLTOOL_XAM_RULE

1205

+INTLTOOL_KBD_RULE

1206

+INTLTOOL_XML_RULE

1207

+INTLTOOL_XML_NOMERGE_RULE

1208

+INTLTOOL_CAVES_RULE

1209

+INTLTOOL_SCHEMAS_RULE

1210

+INTLTOOL_THEME_RULE

1211

+INTLTOOL_SERVICE_RULE

1212

+INTLTOOL_EXTRACT

1213

+INTLTOOL_MERGE

1214

+INTLTOOL_UPDATE

1215

+INTLTOOL_PERL

1216

+INTLTOOL_ICONV

1217

+INTLTOOL_MSGFMT

1218

+INTLTOOL_MSGMERGE

1219

+INTLTOOL_XGETTEXT

1220

+ALL_LINGUAS

1221

+DATADIRNAME

1222

+GCONFTOOL

1223

+GLIB_GENMARSHAL

1224

+USE_NLS

1225

+MSGFMT

1226

+GMSGFMT

1227

+XGETTEXT

1228

+CATALOGS

1229

+CATOBJEXT

1230

+GMOFILES

1231

+INSTOBJEXT

1232

+INTLLIBS

1233

+PO_IN_DATADIR_TRUE

1234

+PO_IN_DATADIR_FALSE

1235

+POFILES

1236

+POSUB

1237

+MKINSTALLDIRS

1238

+WARN_CFLAGS

1239

+DISABLE_DEPRECATED_CFLAGS

1240

+PKG_CONFIG

1241

+VINO_SERVER_CFLAGS

1242

+VINO_SERVER_LIBS

1243

+VINO_CAPPLET_CFLAGS

1244

+VINO_CAPPLET_LIBS

1245

+VINO_SESSION_CFLAGS

1246

+VINO_SESSION_LIBS

1247

+SESSION_SUPPORT_TRUE

1248

+SESSION_SUPPORT_FALSE

1249

+VINO_HTTP_CFLAGS

1250

+HTTP_SERVER_TRUE

1251

+HTTP_SERVER_FALSE

1252

+XMKMF

1253

+X_CFLAGS

1254

+X_PRE_LIBS

1255

+X_LIBS

1256

+X_EXTRA_LIBS

1257

+ORBIT_IDL

1258

+BONOBO_IDLDIR

1259

+LIBGNUTLS_CONFIG

1260

+LIBGNUTLS_CFLAGS

1261

+LIBGNUTLS_LIBS

1262

+LIBGCRYPT_CONFIG

1263

+LIBGCRYPT_CFLAGS

1264

+LIBGCRYPT_LIBS

1265

+XDAMAGE_LIBS

1266

+XSHM_LIBS

1267

+XTEST_LIBS

1268

+AVAHI_CFLAGS

1269

+AVAHI_LIBS

1270

+LIBZ

1271

+LIBJPEG

1272

+VINO_DEBUG_CFLAGS

1273

+GCONF_SCHEMA_CONFIG_SOURCE

1274

+GCONF_SCHEMA_FILE_DIR

1275

+GCONF_SCHEMAS_INSTALL_TRUE

1276

+GCONF_SCHEMAS_INSTALL_FALSE

1277

+PERL

1278

+REBUILD

1279

+LIBOBJS

1280

+LTLIBOBJS'

1281

ac_subst_files=''

1282

+ ac_precious_vars='build_alias

1283

+host_alias

1284

+target_alias

1285

+CC

1286

+CFLAGS

1287

+LDFLAGS

1288

+CPPFLAGS

1289

+CPP

1290

+CXX

1291

+CXXFLAGS

1292

+CCC

1293

+CXXCPP

1294

+F77

1295

+FFLAGS

1296

+PKG_CONFIG

1297

+VINO_SERVER_CFLAGS

1298

+VINO_SERVER_LIBS

1299

+VINO_CAPPLET_CFLAGS

1300

+VINO_CAPPLET_LIBS

1301

+VINO_SESSION_CFLAGS

1302

+VINO_SESSION_LIBS

1303

+XMKMF

1304

+AVAHI_CFLAGS

1305

+AVAHI_LIBS'

1306

1307

1308

# Initialize some variables set by options.

1309

ac_init_help=

1310

@@ -493,34 +998,48 @@

1311

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

1312

# by default will actually change.

1313

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

1314

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

1315

bindir='${exec_prefix}/bin'

1316

sbindir='${exec_prefix}/sbin'

1317

libexecdir='${exec_prefix}/libexec'

1318

-datadir='${prefix}/share'

1319

+datarootdir='${prefix}/share'

1320

+datadir='${datarootdir}'

1321

sysconfdir='${prefix}/etc'

1322

sharedstatedir='${prefix}/com'

1323

localstatedir='${prefix}/var'

1324

-libdir='${exec_prefix}/lib'

1325

includedir='${prefix}/include'

1326

oldincludedir='/usr/include'

1327

-infodir='${prefix}/info'

1328

-mandir='${prefix}/man'

1329

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

1330

+infodir='${datarootdir}/info'

1331

+htmldir='${docdir}'

1332

+dvidir='${docdir}'

1333

+pdfdir='${docdir}'

1334

+psdir='${docdir}'

1335

+libdir='${exec_prefix}/lib'

1336

+localedir='${datarootdir}/locale'

1337

+mandir='${datarootdir}/man'

1338

1339

ac_prev=

1340

+ac_dashdash=

1341

for ac_option

1342

1343

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

1344

if test -n "$ac_prev"; then

1345

- eval "$ac_prev=\$ac_option"

1346

+ eval $ac_prev=\$ac_option

1347

ac_prev=

1348

continue

1349

1350

1351

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

1352

+ case $ac_option in

1353

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

1354

+ *) ac_optarg=yes ;;

1355

+ esac

1356

1357

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

1358

1359

- case $ac_option in

1360

+ case $ac_dashdash$ac_option in

1361

+ --)

1362

+ ac_dashdash=yes ;;

1363

1364

1365

ac_prev=bindir ;;

1366

@@ -542,12 +1061,18 @@

1367

--config-cache | -C)

1368

cache_file=config.cache ;;

1369

1370

1371

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

1372

ac_prev=datadir ;;

1373

1374

- | --da=*)

1375

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

1376

datadir=$ac_optarg ;;

1377

1378

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

1379

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

1380

+ ac_prev=datarootdir ;;

1381

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

1382

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

1383

+ datarootdir=$ac_optarg ;;

1384

1385

-disable-* | --disable-*)

1386

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

1387

# Reject names that are not valid shell variable names.

1388

@@ -555,7 +1080,17 @@

1389

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

1390

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

1391

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

1392

- eval "enable_$ac_feature=no" ;;

1393

+ eval enable_$ac_feature=no ;;

1394

1395

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

1396

+ ac_prev=docdir ;;

1397

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

1398

+ docdir=$ac_optarg ;;

1399

1400

1401

+ ac_prev=dvidir ;;

1402

1403

+ dvidir=$ac_optarg ;;

1404

1405

-enable-* | --enable-*)

1406

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

1407

@@ -564,11 +1099,7 @@

1408

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

1409

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

1410

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

1411

- case $ac_option in

1412

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

1413

- *) ac_optarg=yes ;;

1414

- esac

1415

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

1416

+ eval enable_$ac_feature=\$ac_optarg ;;

1417

1418

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

1419

1420

@@ -595,6 +1126,12 @@

1421

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

1422

host_alias=$ac_optarg ;;

1423

1424

1425

+ ac_prev=htmldir ;;

1426

1427

+ | --ht=*)

1428

+ htmldir=$ac_optarg ;;

1429

1430

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

1431

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

1432

ac_prev=includedir ;;

1433

@@ -619,13 +1156,16 @@

1434

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

1435

libexecdir=$ac_optarg ;;

1436

1437

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

1438

+ ac_prev=localedir ;;

1439

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

1440

+ localedir=$ac_optarg ;;

1441

1442

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

1443

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

1444

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

1445

1446

ac_prev=localstatedir ;;

1447

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

1448

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

1449

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

1450

1451

localstatedir=$ac_optarg ;;

1452

1453

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

1454

@@ -690,6 +1230,16 @@

1455

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

1456

program_transform_name=$ac_optarg ;;

1457

1458

1459

+ ac_prev=pdfdir ;;

1460

1461

+ pdfdir=$ac_optarg ;;

1462

1463

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

1464

+ ac_prev=psdir ;;

1465

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

1466

+ psdir=$ac_optarg ;;

1467

1468

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

1469

1470

silent=yes ;;

1471

@@ -746,11 +1296,7 @@

1472

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

1473

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

1474

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

1475

- case $ac_option in

1476

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

1477

- *) ac_optarg=yes ;;

1478

- esac

1479

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

1480

+ eval with_$ac_package=\$ac_optarg ;;

1481

1482

-without-* | --without-*)

1483

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

1484

@@ -759,7 +1305,7 @@

1485

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

1486

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

1487

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

1488

- eval "with_$ac_package=no" ;;

1489

+ eval with_$ac_package=no ;;

1490

1491

--x)

1492

# Obsolete; use --with-x.

1493

@@ -790,8 +1336,7 @@

1494

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

1495

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

1496

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

1497

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

1498

- eval "$ac_envvar='$ac_optarg'"

1499

+ eval $ac_envvar=\$ac_optarg

1500

export $ac_envvar ;;

1501

1502

1503

@@ -811,27 +1356,19 @@

1504

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

1505

1506

1507

-# Be sure to have absolute paths.

1508

-for ac_var in exec_prefix prefix

1509

-do

1510

- eval ac_val=$`echo $ac_var`

1511

- case $ac_val in

1512

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

1513

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

1514

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

1515

- esac

1516

-done

1517

1518

-# Be sure to have absolute paths.

1519

-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \

1520

- localstatedir libdir includedir oldincludedir infodir mandir

1521

+# Be sure to have absolute directory names.

1522

+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \

1523

+ datadir sysconfdir sharedstatedir localstatedir includedir \

1524

+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \

1525

+ libdir localedir mandir

1526

1527

- eval ac_val=$`echo $ac_var`

1528

+ eval ac_val=\$$ac_var

1529

case $ac_val in

1530

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

1531

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

1532

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

1533

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

1534

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

1535

esac

1536

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

1537

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

1538

done

1539

1540

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

1541

@@ -858,130 +1395,76 @@

1542

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

1543

1544

1545

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

1546

+ac_ls_di=`ls -di .` &&

1547

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

1548

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

1549

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

1550

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

1551

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

1552

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

1553

1554

1555

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

1556

if test -z "$srcdir"; then

1557

ac_srcdir_defaulted=yes

1558

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

1559

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

1560

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

1561

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

1562

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

1563

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

1564

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

1565

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

1566

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

1567

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

1568

echo X"$0" |

1569

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

1570

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

1571

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

1572

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

1573

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

1574

- srcdir=$ac_confdir

1575

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

1576

- srcdir=..

1577

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

1578

+ s//\1/

1579

+ q

1580

+ }

1581

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

1582

+ s//\1/

1583

+ q

1584

+ }

1585

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

1586

+ s//\1/

1587

+ q

1588

+ }

1589

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

1590

+ s//\1/

1591

+ q

1592

+ }

1593

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

1594

+ srcdir=$ac_confdir

1595

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

1596

+ srcdir=..

1597

1598

else

1599

ac_srcdir_defaulted=no

1600

1601

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

1602

- if test "$ac_srcdir_defaulted" = yes; then

1603

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

1604

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

1605

- else

1606

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

1607

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

1608

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

1609

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

1610

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

1611

- fi

1612

1613

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

1614

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

1615

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

1616

+ac_abs_confdir=`(

1617

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

1618

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

1619

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

1620

-ac_env_build_alias_set=${build_alias+set}

1621

-ac_env_build_alias_value=$build_alias

1622

-ac_cv_env_build_alias_set=${build_alias+set}

1623

-ac_cv_env_build_alias_value=$build_alias

1624

-ac_env_host_alias_set=${host_alias+set}

1625

-ac_env_host_alias_value=$host_alias

1626

-ac_cv_env_host_alias_set=${host_alias+set}

1627

-ac_cv_env_host_alias_value=$host_alias

1628

-ac_env_target_alias_set=${target_alias+set}

1629

-ac_env_target_alias_value=$target_alias

1630

-ac_cv_env_target_alias_set=${target_alias+set}

1631

-ac_cv_env_target_alias_value=$target_alias

1632

-ac_env_CC_set=${CC+set}

1633

-ac_env_CC_value=$CC

1634

-ac_cv_env_CC_set=${CC+set}

1635

-ac_cv_env_CC_value=$CC

1636

-ac_env_CFLAGS_set=${CFLAGS+set}

1637

-ac_env_CFLAGS_value=$CFLAGS

1638

-ac_cv_env_CFLAGS_set=${CFLAGS+set}

1639

-ac_cv_env_CFLAGS_value=$CFLAGS

1640

-ac_env_LDFLAGS_set=${LDFLAGS+set}

1641

-ac_env_LDFLAGS_value=$LDFLAGS

1642

-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}

1643

-ac_cv_env_LDFLAGS_value=$LDFLAGS

1644

-ac_env_CPPFLAGS_set=${CPPFLAGS+set}

1645

-ac_env_CPPFLAGS_value=$CPPFLAGS

1646

-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}

1647

-ac_cv_env_CPPFLAGS_value=$CPPFLAGS

1648

-ac_env_CPP_set=${CPP+set}

1649

-ac_env_CPP_value=$CPP

1650

-ac_cv_env_CPP_set=${CPP+set}

1651

-ac_cv_env_CPP_value=$CPP

1652

-ac_env_CXX_set=${CXX+set}

1653

-ac_env_CXX_value=$CXX

1654

-ac_cv_env_CXX_set=${CXX+set}

1655

-ac_cv_env_CXX_value=$CXX

1656

-ac_env_CXXFLAGS_set=${CXXFLAGS+set}

1657

-ac_env_CXXFLAGS_value=$CXXFLAGS

1658

-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}

1659

-ac_cv_env_CXXFLAGS_value=$CXXFLAGS

1660

-ac_env_CXXCPP_set=${CXXCPP+set}

1661

-ac_env_CXXCPP_value=$CXXCPP

1662

-ac_cv_env_CXXCPP_set=${CXXCPP+set}

1663

-ac_cv_env_CXXCPP_value=$CXXCPP

1664

-ac_env_F77_set=${F77+set}

1665

-ac_env_F77_value=$F77

1666

-ac_cv_env_F77_set=${F77+set}

1667

-ac_cv_env_F77_value=$F77

1668

-ac_env_FFLAGS_set=${FFLAGS+set}

1669

-ac_env_FFLAGS_value=$FFLAGS

1670

-ac_cv_env_FFLAGS_set=${FFLAGS+set}

1671

-ac_cv_env_FFLAGS_value=$FFLAGS

1672

-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}

1673

-ac_env_PKG_CONFIG_value=$PKG_CONFIG

1674

-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}

1675

-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG

1676

-ac_env_VINO_SERVER_CFLAGS_set=${VINO_SERVER_CFLAGS+set}

1677

-ac_env_VINO_SERVER_CFLAGS_value=$VINO_SERVER_CFLAGS

1678

-ac_cv_env_VINO_SERVER_CFLAGS_set=${VINO_SERVER_CFLAGS+set}

1679

-ac_cv_env_VINO_SERVER_CFLAGS_value=$VINO_SERVER_CFLAGS

1680

-ac_env_VINO_SERVER_LIBS_set=${VINO_SERVER_LIBS+set}

1681

-ac_env_VINO_SERVER_LIBS_value=$VINO_SERVER_LIBS

1682

-ac_cv_env_VINO_SERVER_LIBS_set=${VINO_SERVER_LIBS+set}

1683

-ac_cv_env_VINO_SERVER_LIBS_value=$VINO_SERVER_LIBS

1684

-ac_env_VINO_CAPPLET_CFLAGS_set=${VINO_CAPPLET_CFLAGS+set}

1685

-ac_env_VINO_CAPPLET_CFLAGS_value=$VINO_CAPPLET_CFLAGS

1686

-ac_cv_env_VINO_CAPPLET_CFLAGS_set=${VINO_CAPPLET_CFLAGS+set}

1687

-ac_cv_env_VINO_CAPPLET_CFLAGS_value=$VINO_CAPPLET_CFLAGS

1688

-ac_env_VINO_CAPPLET_LIBS_set=${VINO_CAPPLET_LIBS+set}

1689

-ac_env_VINO_CAPPLET_LIBS_value=$VINO_CAPPLET_LIBS

1690

-ac_cv_env_VINO_CAPPLET_LIBS_set=${VINO_CAPPLET_LIBS+set}

1691

-ac_cv_env_VINO_CAPPLET_LIBS_value=$VINO_CAPPLET_LIBS

1692

-ac_env_VINO_SESSION_CFLAGS_set=${VINO_SESSION_CFLAGS+set}

1693

-ac_env_VINO_SESSION_CFLAGS_value=$VINO_SESSION_CFLAGS

1694

-ac_cv_env_VINO_SESSION_CFLAGS_set=${VINO_SESSION_CFLAGS+set}

1695

-ac_cv_env_VINO_SESSION_CFLAGS_value=$VINO_SESSION_CFLAGS

1696

-ac_env_VINO_SESSION_LIBS_set=${VINO_SESSION_LIBS+set}

1697

-ac_env_VINO_SESSION_LIBS_value=$VINO_SESSION_LIBS

1698

-ac_cv_env_VINO_SESSION_LIBS_set=${VINO_SESSION_LIBS+set}

1699

-ac_cv_env_VINO_SESSION_LIBS_value=$VINO_SESSION_LIBS

1700

-ac_env_AVAHI_CFLAGS_set=${AVAHI_CFLAGS+set}

1701

-ac_env_AVAHI_CFLAGS_value=$AVAHI_CFLAGS

1702

-ac_cv_env_AVAHI_CFLAGS_set=${AVAHI_CFLAGS+set}

1703

-ac_cv_env_AVAHI_CFLAGS_value=$AVAHI_CFLAGS

1704

-ac_env_AVAHI_LIBS_set=${AVAHI_LIBS+set}

1705

-ac_env_AVAHI_LIBS_value=$AVAHI_LIBS

1706

-ac_cv_env_AVAHI_LIBS_set=${AVAHI_LIBS+set}

1707

-ac_cv_env_AVAHI_LIBS_value=$AVAHI_LIBS

1708

+ pwd)`

1709

+# When building in place, set srcdir=.

1710

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

1711

+ srcdir=.

1712

+fi

1713

+# Remove unnecessary trailing slashes from srcdir.

1714

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

1715

+# mess up M-x gdb in Emacs.

1716

+case $srcdir in

1717

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

1718

+esac

1719

+for ac_var in $ac_precious_vars; do

1720

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

1721

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

1722

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

1723

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

1724

+done

1725

1726

1727

# Report the --help message.

1728

@@ -1010,9 +1493,6 @@

1729

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

1730

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

1731

1732

-_ACEOF

1733

1734

- cat <<_ACEOF

1735

Installation directories:

1736

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

1737

[$ac_default_prefix]

1738

@@ -1030,15 +1510,22 @@

1739

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

1740

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

1741

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

1742

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

1743

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

1744

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

1745

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

1746

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

1747

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

1748

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

1749

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

1750

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

1751

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

1752

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

1753

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

1754

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

1755

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

1756

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

1757

+ --htmldir=DIR html documentation [DOCDIR]

1758

+ --dvidir=DIR dvi documentation [DOCDIR]

1759

+ --pdfdir=DIR pdf documentation [DOCDIR]

1760

+ --psdir=DIR ps documentation [DOCDIR]

1761

_ACEOF

1762

1763

cat <<\_ACEOF

1764

@@ -1071,10 +1558,8 @@

1765

(and sometimes confusing) to the casual installer

1766

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

1767

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

1768

- --enable-shared[=PKGS]

1769

- build shared libraries [default=yes]

1770

- --enable-static[=PKGS]

1771

- build static libraries [default=yes]

1772

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

1773

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

1774

--enable-fast-install[=PKGS]

1775

optimize for fast installation [default=yes]

1776

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

1777

@@ -1097,8 +1582,7 @@

1778

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

1779

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

1780

both]

1781

- --with-tags[=TAGS]

1782

- include additional configurations [automatic]

1783

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

1784

--with-x use the X Window System

1785

--with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)

1786

--with-libgcrypt-prefix=PFX

1787

@@ -1114,8 +1598,8 @@

1788

CFLAGS C compiler flags

1789

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

1790

nonstandard directory <lib dir>

1791

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

1792

- headers in a nonstandard directory <include dir>

1793

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

1794

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

1795

CPP C preprocessor

1796

CXX C++ compiler command

1797

CXXFLAGS C++ compiler flags

1798

@@ -1135,6 +1619,7 @@

1799

C compiler flags for VINO_SESSION, overriding pkg-config

1800

VINO_SESSION_LIBS

1801

linker flags for VINO_SESSION, overriding pkg-config

1802

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

1803

AVAHI_CFLAGS

1804

C compiler flags for AVAHI, overriding pkg-config

1805

AVAHI_LIBS linker flags for AVAHI, overriding pkg-config

1806

@@ -1144,120 +1629,86 @@

1807

1808

Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=vino>.

1809

_ACEOF

1810

+ac_status=$?

1811

1812

1813

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

1814

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

1815

- ac_popdir=`pwd`

1816

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

1817

- test -d $ac_dir || continue

1818

+ test -d "$ac_dir" || continue

1819

ac_builddir=.

1820

1821

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

1822

+case "$ac_dir" in

1823

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

1824

+*)

1825

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

1826

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

1827

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

1828

-else

1829

- ac_dir_suffix= ac_top_builddir=

1830

-fi

1831

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

1832

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

1833

+ case $ac_top_builddir_sub in

1834

+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;

1835

+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

1836

+ esac ;;

1837

+esac

1838

+ac_abs_top_builddir=$ac_pwd

1839

+ac_abs_builddir=$ac_pwd$ac_dir_suffix

1840

+# for backward compatibility:

1841

+ac_top_builddir=$ac_top_build_prefix

1842

1843

case $srcdir in

1844

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

1845

+ .) # We are building in place.

1846

ac_srcdir=.

1847

- if test -z "$ac_top_builddir"; then

1848

- ac_top_srcdir=.

1849

- else

1850

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

1851

- fi ;;

1852

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

1853

+ ac_top_srcdir=$ac_top_builddir_sub

1854

+ ac_abs_top_srcdir=$ac_pwd ;;

1855

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

1856

ac_srcdir=$srcdir$ac_dir_suffix;

1857

- ac_top_srcdir=$srcdir ;;

1858

- *) # Relative path.

1859

- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix

1860

- ac_top_srcdir=$ac_top_builddir$srcdir ;;

1861

-esac

1862

1863

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

1864

-# the directories may not exist.

1865

-case `pwd` in

1866

-.) ac_abs_builddir="$ac_dir";;

1867

-*)

1868

- case "$ac_dir" in

1869

- .) ac_abs_builddir=`pwd`;;

1870

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

1871

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

1872

- esac;;

1873

-esac

1874

-case $ac_abs_builddir in

1875

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

1876

-*)

1877

- case ${ac_top_builddir}. in

1878

- .) ac_abs_top_builddir=$ac_abs_builddir;;

1879

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

1880

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

1881

- esac;;

1882

-esac

1883

-case $ac_abs_builddir in

1884

-.) ac_abs_srcdir=$ac_srcdir;;

1885

-*)

1886

- case $ac_srcdir in

1887

- .) ac_abs_srcdir=$ac_abs_builddir;;

1888

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

1889

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

1890

- esac;;

1891

-esac

1892

-case $ac_abs_builddir in

1893

-.) ac_abs_top_srcdir=$ac_top_srcdir;;

1894

-*)

1895

- case $ac_top_srcdir in

1896

- .) ac_abs_top_srcdir=$ac_abs_builddir;;

1897

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

1898

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

1899

- esac;;

1900

+ ac_top_srcdir=$srcdir

1901

+ ac_abs_top_srcdir=$srcdir ;;

1902

+ *) # Relative name.

1903

+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix

1904

+ ac_top_srcdir=$ac_top_build_prefix$srcdir

1905

+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;

1906

esac

1907

+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

1908

1909

- cd $ac_dir

1910

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

1911

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

1912

- echo

1913

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

1914

- elif test -f $ac_srcdir/configure; then

1915

- echo

1916

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

1917

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

1918

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

1919

- echo

1920

- $ac_configure --help

1921

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

1922

+ # Check for guested configure.

1923

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

1924

+ echo &&

1925

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

1926

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

1927

+ echo &&

1928

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

1929

else

1930

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

1931

- fi

1932

- cd $ac_popdir

1933

+ fi || ac_status=$?

1934

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

1935

done

1936

1937

1938

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

1939

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

1940

if $ac_init_version; then

1941

cat <<\_ACEOF

1942

vino configure 2.16.0

1943

-generated by GNU Autoconf 2.59

1944

+generated by GNU Autoconf 2.60a

1945

1946

1947

1948

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

1949

This configure script is free software; the Free Software Foundation

1950

gives unlimited permission to copy, distribute and modify it.

1951

_ACEOF

1952

- exit 0

1953

+ exit

1954

1955

-exec 5>config.log

1956

-cat >&5 <<_ACEOF

1957

+cat >config.log <<_ACEOF

1958

This file contains any messages produced by compilers while

1959

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

1960

1961

It was created by vino $as_me 2.16.0, which was

1962

-generated by GNU Autoconf 2.59. Invocation command line was

1963

+generated by GNU Autoconf 2.60a. Invocation command line was

1964

1965

$ $0 $@

1966

1967

_ACEOF

1968

+exec 5>>config.log

1969

{

1970

cat <<_ASUNAME

1971

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

1972

@@ -1276,7 +1727,7 @@

1973

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

1974

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

1975

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

1976

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

1977

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

1978

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

1979

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

1980

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

1981

@@ -1290,6 +1741,7 @@

1982

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

1983

echo "PATH: $as_dir"

1984

done

1985

+IFS=$as_save_IFS

1986

1987

} >&5

1988

1989

@@ -1311,7 +1763,6 @@

1990

ac_configure_args=

1991

ac_configure_args0=

1992

ac_configure_args1=

1993

-ac_sep=

1994

ac_must_keep_next=false

1995

for ac_pass in 1 2

1996

1997

@@ -1322,7 +1773,7 @@

1998

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

1999

2000

continue ;;

2001

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

2002

+ *\'*)

2003

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

2004

esac

2005

case $ac_pass in

2006

@@ -1344,9 +1795,7 @@

2007

-* ) ac_must_keep_next=true ;;

2008

esac

2009

2010

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

2011

- # Get rid of the leading space.

2012

- ac_sep=" "

2013

+ ac_configure_args="$ac_configure_args '$ac_arg'"

2014

;;

2015

esac

2016

done

2017

@@ -1357,8 +1806,8 @@

2018

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

2019

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

2020

# would cause problems or look ugly.

2021

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

2022

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

2023

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

2024

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

2025

trap 'exit_status=$?

2026

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

2027

{

2028

@@ -1371,20 +1820,34 @@

2029

_ASBOX

2030

echo

2031

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

2032

2033

2034

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

2035

+ eval ac_val=\$$ac_var

2036

+ case $ac_val in #(

2037

+ *${as_nl}*)

2038

+ case $ac_var in #(

2039

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

2040

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

2041

+ esac

2042

+ case $ac_var in #(

2043

+ _ | IFS | as_nl) ;; #(

2044

+ *) $as_unset $ac_var ;;

2045

+ esac ;;

2046

+ esac

2047

+ done

2048

(set) 2>&1 |

2049

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

2050

- *ac_space=\ *)

2051

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

2052

+ *${as_nl}ac_space=\ *)

2053

sed -n \

2054

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

2055

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

2056

- ;;

2057

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

2058

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

2059

+ ;; #(

2060

2061

- sed -n \

2062

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

2063

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

2064

;;

2065

- esac;

2066

2067

+ esac |

2068

+ sort

2069

2070

echo

2071

2072

cat <<\_ASBOX

2073

@@ -1395,22 +1858,28 @@

2074

echo

2075

for ac_var in $ac_subst_vars

2076

2077

- eval ac_val=$`echo $ac_var`

2078

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

2079

+ eval ac_val=\$$ac_var

2080

+ case $ac_val in

2081

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

2082

+ esac

2083

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

2084

done | sort

2085

echo

2086

2087

if test -n "$ac_subst_files"; then

2088

cat <<\_ASBOX

2089

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

2090

-## Output files. ##

2091

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

2092

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

2093

+## File substitutions. ##

2094

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

2095

_ASBOX

2096

echo

2097

for ac_var in $ac_subst_files

2098

2099

- eval ac_val=$`echo $ac_var`

2100

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

2101

+ eval ac_val=\$$ac_var

2102

+ case $ac_val in

2103

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

2104

+ esac

2105

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

2106

done | sort

2107

echo

2108

2109

@@ -1422,26 +1891,24 @@

2110

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

2111

_ASBOX

2112

echo

2113

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

2114

+ cat confdefs.h

2115

echo

2116

2117

test "$ac_signal" != 0 &&

2118

echo "$as_me: caught signal $ac_signal"

2119

echo "$as_me: exit $exit_status"

2120

} >&5

2121

- rm -f core *.core &&

2122

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

2123

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

2124

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

2125

exit $exit_status

2126

- ' 0

2127

+' 0

2128

for ac_signal in 1 2 13 15; do

2129

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

2130

done

2131

ac_signal=0

2132

2133

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

2134

-rm -rf conftest* confdefs.h

2135

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

2136

-echo >confdefs.h

2137

+rm -f -r conftest* confdefs.h

2138

2139

# Predefined preprocessor variables.

2140

2141

@@ -1472,14 +1939,17 @@

2142

2143

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

2144

# Prefer explicitly selected file to automatically selected ones.

2145

-if test -z "$CONFIG_SITE"; then

2146

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

2147

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

2148

- else

2149

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

2150

- fi

2151

+if test -n "$CONFIG_SITE"; then

2152

+ set x "$CONFIG_SITE"

2153

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

2154

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

2155

+else

2156

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

2157

+ "$ac_default_prefix/etc/config.site"

2158

2159

-for ac_site_file in $CONFIG_SITE; do

2160

+shift

2161

+for ac_site_file

2162

+do

2163

if test -r "$ac_site_file"; then

2164

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

2165

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

2166

@@ -1495,8 +1965,8 @@

2167

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

2168

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

2169

case $cache_file in

2170

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

2171

- *) . ./$cache_file;;

2172

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

2173

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

2174

esac

2175

2176

else

2177

@@ -1508,12 +1978,11 @@

2178

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

2179

# value.

2180

ac_cache_corrupted=false

2181

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

2182

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

2183

+for ac_var in $ac_precious_vars; do

2184

eval ac_old_set=\$ac_cv_env_${ac_var}_set

2185

eval ac_new_set=\$ac_env_${ac_var}_set

2186

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

2187

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

2188

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

2189

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

2190

case $ac_old_set,$ac_new_set in

2191

set,)

2192

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

2193

@@ -1538,8 +2007,7 @@

2194

# Pass precious variables to config.status.

2195

if test "$ac_new_set" = set; then

2196

case $ac_new_val in

2197

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

2198

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

2199

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

2200

*) ac_arg=$ac_var=$ac_new_val ;;

2201

esac

2202

case " $ac_configure_args " in

2203

@@ -1556,12 +2024,6 @@

2204

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

2205

2206

2207

-ac_ext=c

2208

-ac_cpp='$CPP $CPPFLAGS'

2209

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

2210

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

2211

-ac_compiler_gnu=$ac_cv_c_compiler_gnu

2212

2213

2214

2215

2216

@@ -1586,35 +2048,46 @@

2217

2218

2219

2220

+ac_ext=c

2221

+ac_cpp='$CPP $CPPFLAGS'

2222

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

2223

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

2224

+ac_compiler_gnu=$ac_cv_c_compiler_gnu

2225

2226

2227

2228

2229

am__api_version="1.9"

2230

ac_aux_dir=

2231

-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do

2232

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

2233

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

2234

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

2235

ac_aux_dir=$ac_dir

2236

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

2237

break

2238

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

2239

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

2240

ac_aux_dir=$ac_dir

2241

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

2242

break

2243

- elif test -f $ac_dir/shtool; then

2244

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

2245

ac_aux_dir=$ac_dir

2246

ac_install_sh="$ac_aux_dir/shtool install -c"

2247

break

2248

2249

done

2250

if test -z "$ac_aux_dir"; then

2251

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

2252

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

2253

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

2254

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

2255

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

2256

2257

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

2258

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

2259

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

2260

2261

+# These three variables are undocumented and unsupported,

2262

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

2263

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

2264

+# whose full name contains unusual characters.

2265

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

2266

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

2267

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

2268

2269

2270

# Find a good install program. We prefer a C program (faster),

2271

# so one script is as good as another. But avoid the broken or

2272

@@ -1629,8 +2102,8 @@

2273

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

2274

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

2275

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

2276

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

2277

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

2278

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

2279

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

2280

if test -z "$INSTALL"; then

2281

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

2282

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

2283

@@ -1652,7 +2125,7 @@

2284

# by default.

2285

for ac_prog in ginstall scoinst install; do

2286

for ac_exec_ext in '' $ac_executable_extensions; do

2287

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

2288

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

2289

if test $ac_prog = install &&

2290

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

2291

# AIX install. It has an incompatible calling convention.

2292

@@ -1671,21 +2144,22 @@

2293

;;

2294

esac

2295

done

2296

+IFS=$as_save_IFS

2297

2298

2299

2300

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

2301

INSTALL=$ac_cv_path_install

2302

else

2303

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

2304

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

2305

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

2306

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

2307

# break other packages using the cache if that directory is

2308

- # removed, or if the path is relative.

2309

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

2310

INSTALL=$ac_install_sh

2311

2312

2313

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

2314

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

2315

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

2316

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

2317

2318

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

2319

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

2320

@@ -1695,8 +2169,8 @@

2321

2322

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

2323

2324

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

2325

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

2326

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

2327

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

2328

# Just in case

2329

sleep 1

2330

echo timestamp > conftest.file

2331

@@ -1738,20 +2212,20 @@

2332

Check your system clock" >&2;}

2333

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

2334

2335

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

2336

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

2337

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

2338

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

2339

test "$program_prefix" != NONE &&

2340

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

2341

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

2342

# Use a double $ so make ignores it.

2343

test "$program_suffix" != NONE &&

2344

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

2345

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

2346

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

2347

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

2348

cat <<\_ACEOF >conftest.sed

2349

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

2350

_ACEOF

2351

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

2352

-rm conftest.sed

2353

+rm -f conftest.sed

2354

2355

# expand $ac_aux_dir to an absolute path

2356

am_aux_dir=`cd $ac_aux_dir && pwd`

2357

@@ -1803,8 +2277,8 @@

2358

2359

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

2360

set dummy $ac_prog; ac_word=$2

2361

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

2362

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

2363

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

2364

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

2365

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

2366

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

2367

else

2368

@@ -1817,54 +2291,57 @@

2369

IFS=$as_save_IFS

2370

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

2371

for ac_exec_ext in '' $ac_executable_extensions; do

2372

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

2373

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

2374

ac_cv_prog_AWK="$ac_prog"

2375

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

2376

break 2

2377

2378

done

2379

done

2380

+IFS=$as_save_IFS

2381

2382

2383

2384

AWK=$ac_cv_prog_AWK

2385

if test -n "$AWK"; then

2386

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

2387

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

2388

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

2389

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

2390

else

2391

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

2392

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

2393

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

2394

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

2395

2396

2397

2398

test -n "$AWK" && break

2399

done

2400

2401

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

2402

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

2403

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

2404

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

2405

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

2406

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

2407

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

2408

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

2409

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

2410

else

2411

cat >conftest.make <<\_ACEOF

2412

+SHELL = /bin/sh

2413

all:

2414

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

2415

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

2416

_ACEOF

2417

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

2418

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

2419

-if test -n "$ac_maketemp"; then

2420

- eval ac_cv_prog_make_${ac_make}_set=yes

2421

-else

2422

- eval ac_cv_prog_make_${ac_make}_set=no

2423

-fi

2424

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

2425

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

2426

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

2427

+ *)

2428

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

2429

+esac

2430

rm -f conftest.make

2431

2432

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

2433

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

2434

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

2435

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

2436

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

2437

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

2438

SET_MAKE=

2439

else

2440

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

2441

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

2442

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

2443

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

2444

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

2445

2446

2447

@@ -1935,8 +2412,8 @@

2448

if test -n "$ac_tool_prefix"; then

2449

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

2450

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

2451

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

2452

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

2453

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

2454

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

2455

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

2456

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

2457

else

2458

@@ -1949,32 +2426,34 @@

2459

IFS=$as_save_IFS

2460

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

2461

for ac_exec_ext in '' $ac_executable_extensions; do

2462

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

2463

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

2464

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

2465

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

2466

break 2

2467

2468

done

2469

done

2470

+IFS=$as_save_IFS

2471

2472

2473

2474

STRIP=$ac_cv_prog_STRIP

2475

if test -n "$STRIP"; then

2476

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

2477

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

2478

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

2479

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

2480

else

2481

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

2482

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

2483

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

2484

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

2485

2486

2487

2488

2489

if test -z "$ac_cv_prog_STRIP"; then

2490

ac_ct_STRIP=$STRIP

2491

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

2492

set dummy strip; ac_word=$2

2493

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

2494

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

2495

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

2496

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

2497

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

2498

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

2499

else

2500

@@ -1987,27 +2466,41 @@

2501

IFS=$as_save_IFS

2502

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

2503

for ac_exec_ext in '' $ac_executable_extensions; do

2504

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

2505

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

2506

ac_cv_prog_ac_ct_STRIP="strip"

2507

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

2508

break 2

2509

2510

done

2511

done

2512

+IFS=$as_save_IFS

2513

2514

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

2515

2516

2517

ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

2518

if test -n "$ac_ct_STRIP"; then

2519

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

2520

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

2521

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

2522

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

2523

else

2524

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

2525

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

2526

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

2527

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

2528

2529

2530

- STRIP=$ac_ct_STRIP

2531

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

2532

+ STRIP=":"

2533

+ else

2534

+ case $cross_compiling:$ac_tool_warned in

2535

+yes:)

2536

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

2537

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

2538

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

2539

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

2540

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

2541

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

2542

+ac_tool_warned=yes ;;

2543

+esac

2544

+ STRIP=$ac_ct_STRIP

2545

+ fi

2546

else

2547

STRIP="$ac_cv_prog_STRIP"

2548

2549

@@ -2027,20 +2520,20 @@

2550

2551

2552

2553

- ac_config_headers="$ac_config_headers config.h"

2554

+ac_config_headers="$ac_config_headers config.h"

2555

2556

2557

-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5

2558

-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6

2559

- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.

2560

+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5

2561

+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }

2562

+ # Check whether --enable-maintainer-mode was given.

2563

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

2564

- enableval="$enable_maintainer_mode"

2565

- USE_MAINTAINER_MODE=$enableval

2566

+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval

2567

else

2568

USE_MAINTAINER_MODE=no

2569

-fi;

2570

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

2571

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

2572

+fi

2573

2574

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

2575

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

2576

2577

2578

if test $USE_MAINTAINER_MODE = yes; then

2579

@@ -2074,8 +2567,8 @@

2580

if test -n "$ac_tool_prefix"; then

2581

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

2582

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

2583

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

2584

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

2585

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

2586

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

2587

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

2588

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

2589

else

2590

@@ -2088,32 +2581,34 @@

2591

IFS=$as_save_IFS

2592

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

2593

for ac_exec_ext in '' $ac_executable_extensions; do

2594

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

2595

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

2596

ac_cv_prog_CC="${ac_tool_prefix}gcc"

2597

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

2598

break 2

2599

2600

done

2601

done

2602

+IFS=$as_save_IFS

2603

2604

2605

2606

CC=$ac_cv_prog_CC

2607

if test -n "$CC"; then

2608

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

2609

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

2610

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

2611

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

2612

else

2613

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

2614

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

2615

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

2616

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

2617

2618

2619

2620

2621

if test -z "$ac_cv_prog_CC"; then

2622

ac_ct_CC=$CC

2623

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

2624

set dummy gcc; ac_word=$2

2625

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

2626

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

2627

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

2628

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

2629

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

2630

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

2631

else

2632

@@ -2126,36 +2621,51 @@

2633

IFS=$as_save_IFS

2634

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

2635

for ac_exec_ext in '' $ac_executable_extensions; do

2636

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

2637

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

2638

ac_cv_prog_ac_ct_CC="gcc"

2639

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

2640

break 2

2641

2642

done

2643

done

2644

+IFS=$as_save_IFS

2645

2646

2647

2648

ac_ct_CC=$ac_cv_prog_ac_ct_CC

2649

if test -n "$ac_ct_CC"; then

2650

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

2651

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

2652

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

2653

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

2654

else

2655

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

2656

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

2657

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

2658

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

2659

2660

2661

- CC=$ac_ct_CC

2662

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

2663

+ CC=""

2664

+ else

2665

+ case $cross_compiling:$ac_tool_warned in

2666

+yes:)

2667

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

2668

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

2669

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

2670

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

2671

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

2672

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

2673

+ac_tool_warned=yes ;;

2674

+esac

2675

+ CC=$ac_ct_CC

2676

+ fi

2677

else

2678

CC="$ac_cv_prog_CC"

2679

2680

2681

if test -z "$CC"; then

2682

- if test -n "$ac_tool_prefix"; then

2683

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

2684

+ if test -n "$ac_tool_prefix"; then

2685

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

2686

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

2687

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

2688

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

2689

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

2690

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

2691

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

2692

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

2693

else

2694

@@ -2168,74 +2678,34 @@

2695

IFS=$as_save_IFS

2696

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

2697

for ac_exec_ext in '' $ac_executable_extensions; do

2698

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

2699

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

2700

ac_cv_prog_CC="${ac_tool_prefix}cc"

2701

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

2702

break 2

2703

2704

done

2705

done

2706

+IFS=$as_save_IFS

2707

2708

2709

2710

CC=$ac_cv_prog_CC

2711

if test -n "$CC"; then

2712

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

2713

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

2714

-else

2715

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

2716

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

2717

-fi

2718

2719

-fi

2720

-if test -z "$ac_cv_prog_CC"; then

2721

- ac_ct_CC=$CC

2722

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

2723

-set dummy cc; ac_word=$2

2724

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

2725

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

2726

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

2727

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

2728

-else

2729

- if test -n "$ac_ct_CC"; then

2730

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

2731

-else

2732

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

2733

-for as_dir in $PATH

2734

-do

2735

- IFS=$as_save_IFS

2736

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

2737

- for ac_exec_ext in '' $ac_executable_extensions; do

2738

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

2739

- ac_cv_prog_ac_ct_CC="cc"

2740

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

2741

- break 2

2742

- fi

2743

-done

2744

-done

2745

2746

-fi

2747

-fi

2748

-ac_ct_CC=$ac_cv_prog_ac_ct_CC

2749

-if test -n "$ac_ct_CC"; then

2750

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

2751

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

2752

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

2753

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

2754

else

2755

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

2756

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

2757

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

2758

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

2759

2760

2761

- CC=$ac_ct_CC

2762

-else

2763

- CC="$ac_cv_prog_CC"

2764

-fi

2765

2766

+ fi

2767

2768

if test -z "$CC"; then

2769

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

2770

set dummy cc; ac_word=$2

2771

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

2772

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

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_CC+set}" = set; then

2776

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

2777

else

2778

@@ -2249,7 +2719,7 @@

2779

IFS=$as_save_IFS

2780

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

2781

for ac_exec_ext in '' $ac_executable_extensions; do

2782

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

2783

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

2784

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

2785

ac_prog_rejected=yes

2786

continue

2787

@@ -2260,6 +2730,7 @@

2788

2789

done

2790

done

2791

+IFS=$as_save_IFS

2792

2793

if test $ac_prog_rejected = yes; then

2794

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

2795

@@ -2277,22 +2748,23 @@

2796

2797

CC=$ac_cv_prog_CC

2798

if test -n "$CC"; then

2799

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

2800

-echo "${ECHO_T}$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

2811

2812

if test -z "$CC"; then

2813

if test -n "$ac_tool_prefix"; then

2814

- for ac_prog in cl

2815

+ for ac_prog in cl.exe

2816

2817

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

2818

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

2819

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

2820

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

2821

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

2822

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

2823

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

2824

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

2825

else

2826

@@ -2305,36 +2777,38 @@

2827

IFS=$as_save_IFS

2828

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

2829

for ac_exec_ext in '' $ac_executable_extensions; do

2830

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

2831

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

2832

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

2833

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

2834

break 2

2835

2836

done

2837

done

2838

+IFS=$as_save_IFS

2839

2840

2841

2842

CC=$ac_cv_prog_CC

2843

if test -n "$CC"; then

2844

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

2845

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

2846

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

2847

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

2848

else

2849

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

2850

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

2851

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

2852

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

2853

2854

2855

2856

test -n "$CC" && break

2857

done

2858

2859

if test -z "$CC"; then

2860

ac_ct_CC=$CC

2861

- for ac_prog in cl

2862

+ for ac_prog in cl.exe

2863

2864

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

2865

set dummy $ac_prog; ac_word=$2

2866

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

2867

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

2868

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

2869

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

2870

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

2871

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

2872

else

2873

@@ -2347,29 +2821,45 @@

2874

IFS=$as_save_IFS

2875

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

2876

for ac_exec_ext in '' $ac_executable_extensions; do

2877

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

2878

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

2879

ac_cv_prog_ac_ct_CC="$ac_prog"

2880

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

2881

break 2

2882

2883

done

2884

done

2885

+IFS=$as_save_IFS

2886

2887

2888

2889

ac_ct_CC=$ac_cv_prog_ac_ct_CC

2890

if test -n "$ac_ct_CC"; then

2891

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

2892

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

2893

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

2894

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

2895

else

2896

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

2897

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

2898

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

2899

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

2900

2901

2902

2903

test -n "$ac_ct_CC" && break

2904

done

2905

2906

- CC=$ac_ct_CC

2907

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

2908

+ CC=""

2909

+ else

2910

+ case $cross_compiling:$ac_tool_warned in

2911

+yes:)

2912

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

2913

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

2914

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

2915

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

2916

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

2917

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

2918

+ac_tool_warned=yes ;;

2919

+esac

2920

+ CC=$ac_ct_CC

2921

+ fi

2922

2923

2924

2925

@@ -2382,21 +2872,35 @@

2926

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

2927

2928

# Provide some information about the compiler.

2929

-echo "$as_me:$LINENO:" \

2930

- "checking for C compiler version" >&5

2931

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

2932

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

2933

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

2934

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

2935

+{ (ac_try="$ac_compiler --version >&5"

2936

+case "(($ac_try" in

2937

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2938

+ *) ac_try_echo=$ac_try;;

2939

+esac

2940

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2941

+ (eval "$ac_compiler --version >&5") 2>&5

2942

ac_status=$?

2943

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2944

(exit $ac_status); }

2945

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

2946

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

2947

+{ (ac_try="$ac_compiler -v >&5"

2948

+case "(($ac_try" in

2949

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2950

+ *) ac_try_echo=$ac_try;;

2951

+esac

2952

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2953

+ (eval "$ac_compiler -v >&5") 2>&5

2954

ac_status=$?

2955

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2956

(exit $ac_status); }

2957

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

2958

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

2959

+{ (ac_try="$ac_compiler -V >&5"

2960

+case "(($ac_try" in

2961

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2962

+ *) ac_try_echo=$ac_try;;

2963

+esac

2964

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2965

+ (eval "$ac_compiler -V >&5") 2>&5

2966

ac_status=$?

2967

echo "$as_me:$LINENO: \$? = $ac_status" >&5

2968

(exit $ac_status); }

2969

@@ -2421,47 +2925,77 @@

2970

# Try to create an executable without -o first, disregard a.out.

2971

# It will help us diagnose broken compilers, and finding out an intuition

2972

# of exeext.

2973

-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

2974

-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6

2975

+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

2976

+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }

2977

ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

2978

-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5

2979

- (eval $ac_link_default) 2>&5

2980

2981

+# List of possible output files, starting from the most likely.

2982

+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)

2983

+# only as a last resort. b.out is created by i960 compilers.

2984

+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'

2985

2986

+# The IRIX 6 linker writes into existing files which may not be

2987

+# executable, retaining their permissions. Remove them first so a

2988

+# subsequent execution test works.

2989

+ac_rmfiles=

2990

+for ac_file in $ac_files

2991

+do

2992

+ case $ac_file in

2993

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

2994

+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;

2995

+ esac

2996

+done

2997

+rm -f $ac_rmfiles

2998

2999

+if { (ac_try="$ac_link_default"

3000

+case "(($ac_try" in

3001

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3002

+ *) ac_try_echo=$ac_try;;

3003

+esac

3004

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3005

+ (eval "$ac_link_default") 2>&5

3006

ac_status=$?

3007

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3008

(exit $ac_status); }; then

3009

- # Find the output, starting from the most likely. This scheme is

3010

-# not robust to junk in `.', hence go to wildcards (a.*) only as a last

3011

-# resort.

3012

3013

-# Be careful to initialize this variable, since it used to be cached.

3014

-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.

3015

-ac_cv_exeext=

3016

-# b.out is created by i960 compilers.

3017

-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out

3018

+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.

3019

+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'

3020

+# in a Makefile. We should not override ac_cv_exeext if it was cached,

3021

+# so that the user can short-circuit this test for compilers unknown to

3022

+# Autoconf.

3023

+for ac_file in $ac_files ''

3024

3025

test -f "$ac_file" || continue

3026

case $ac_file in

3027

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )

3028

- ;;

3029

- conftest.$ac_ext )

3030

- # This is the source file.

3031

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )

3032

;;

3033

[ab].out )

3034

# We found the default executable, but exeext='' is most

3035

# certainly right.

3036

break;;

3037

*.* )

3038

- ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

3039

- # FIXME: I believe we export ac_cv_exeext for Libtool,

3040

- # but it would be cool to find out if it's true. Does anybody

3041

- # maintain Libtool? --akim.

3042

- export ac_cv_exeext

3043

+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;

3044

+ then :; else

3045

+ ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

3046

+ fi

3047

+ # We set ac_cv_exeext here because the later test for it is not

3048

+ # safe: cross compilers may not add the suffix if given an `-o'

3049

+ # argument, so we may need to know it at that point already.

3050

+ # Even if this section looks crufty: it has the advantage of

3051

+ # actually working.

3052

break;;

3053

* )

3054

break;;

3055

esac

3056

done

3057

+test "$ac_cv_exeext" = no && ac_cv_exeext=

3058

3059

else

3060

+ ac_file=''

3061

+fi

3062

3063

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

3064

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

3065

+if test -z "$ac_file"; then

3066

echo "$as_me: failed program was:" >&5

3067

sed 's/^/| /' conftest.$ac_ext >&5

3068

3069

@@ -2473,19 +3007,21 @@

3070

3071

3072

ac_exeext=$ac_cv_exeext

3073

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

3074

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

3075

3076

-# Check the compiler produces executables we can run. If not, either

3077

+# Check that the compiler produces executables we can run. If not, either

3078

# the compiler is broken, or we cross compile.

3079

-echo "$as_me:$LINENO: checking whether the C compiler works" >&5

3080

-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6

3081

+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5

3082

+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }

3083

# FIXME: These cross compiler hacks should be removed for Autoconf 3.0

3084

# If not cross compiling, check that we can run a simple program.

3085

if test "$cross_compiling" != yes; then

3086

if { ac_try='./$ac_file'

3087

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3088

- (eval $ac_try) 2>&5

3089

+ { (case "(($ac_try" in

3090

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3091

+ *) ac_try_echo=$ac_try;;

3092

+esac

3093

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3094

+ (eval "$ac_try") 2>&5

3095

ac_status=$?

3096

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3097

(exit $ac_status); }; }; then

3098

@@ -2504,22 +3040,27 @@

3099

3100

3101

3102

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

3103

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

3104

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

3105

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

3106

3107

rm -f a.out a.exe conftest$ac_cv_exeext b.out

3108

ac_clean_files=$ac_clean_files_save

3109

-# Check the compiler produces executables we can run. If not, either

3110

+# Check that the compiler produces executables we can run. If not, either

3111

# the compiler is broken, or we cross compile.

3112

-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

3113

-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6

3114

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

3115

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

3116

3117

-echo "$as_me:$LINENO: checking for suffix of executables" >&5

3118

-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6

3119

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

3120

- (eval $ac_link) 2>&5

3121

+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

3122

+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }

3123

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

3124

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

3125

3126

+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5

3127

+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }

3128

+if { (ac_try="$ac_link"

3129

+case "(($ac_try" in

3130

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3131

+ *) ac_try_echo=$ac_try;;

3132

+esac

3133

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3134

+ (eval "$ac_link") 2>&5

3135

ac_status=$?

3136

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3137

(exit $ac_status); }; then

3138

@@ -2530,9 +3071,8 @@

3139

for ac_file in conftest.exe conftest conftest.*; do

3140

test -f "$ac_file" || continue

3141

case $ac_file in

3142

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;

3143

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

3144

*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

3145

- export ac_cv_exeext

3146

break;;

3147

* ) break;;

3148

esac

3149

@@ -2546,14 +3086,14 @@

3150

3151

3152

rm -f conftest$ac_cv_exeext

3153

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

3154

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

3155

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

3156

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

3157

3158

rm -f conftest.$ac_ext

3159

EXEEXT=$ac_cv_exeext

3160

ac_exeext=$EXEEXT

3161

-echo "$as_me:$LINENO: checking for suffix of object files" >&5

3162

-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6

3163

+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5

3164

+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }

3165

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

3166

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

3167

else

3168

@@ -2573,14 +3113,20 @@

3169

}

3170

_ACEOF

3171

rm -f conftest.o conftest.obj

3172

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3173

- (eval $ac_compile) 2>&5

3174

+if { (ac_try="$ac_compile"

3175

+case "(($ac_try" in

3176

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3177

+ *) ac_try_echo=$ac_try;;

3178

+esac

3179

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3180

+ (eval "$ac_compile") 2>&5

3181

ac_status=$?

3182

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3183

(exit $ac_status); }; then

3184

- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do

3185

+ for ac_file in conftest.o conftest.obj conftest.*; do

3186

+ test -f "$ac_file" || continue;

3187

case $ac_file in

3188

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;

3189

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;

3190

*) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`

3191

break;;

3192

esac

3193

@@ -2598,12 +3144,12 @@

3194

3195

rm -f conftest.$ac_cv_objext conftest.$ac_ext

3196

3197

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

3198

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

3199

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

3200

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

3201

OBJEXT=$ac_cv_objext

3202

ac_objext=$OBJEXT

3203

-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

3204

-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6

3205

+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

3206

+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }

3207

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

3208

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

3209

else

3210

@@ -2626,24 +3172,36 @@

3211

}

3212

_ACEOF

3213

rm -f conftest.$ac_objext

3214

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3215

- (eval $ac_compile) 2>conftest.er1

3216

+if { (ac_try="$ac_compile"

3217

+case "(($ac_try" in

3218

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3219

+ *) ac_try_echo=$ac_try;;

3220

+esac

3221

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3222

+ (eval "$ac_compile") 2>conftest.er1

3223

ac_status=$?

3224

grep -v '^ *+' conftest.er1 >conftest.err

3225

rm -f conftest.er1

3226

cat conftest.err >&5

3227

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3228

(exit $ac_status); } &&

3229

- { ac_try='test -z "$ac_c_werror_flag"

3230

- || test ! -s conftest.err'

3231

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3232

- (eval $ac_try) 2>&5

3233

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

3234

+ { (case "(($ac_try" in

3235

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3236

+ *) ac_try_echo=$ac_try;;

3237

+esac

3238

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3239

+ (eval "$ac_try") 2>&5

3240

ac_status=$?

3241

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3242

(exit $ac_status); }; } &&

3243

{ ac_try='test -s conftest.$ac_objext'

3244

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3245

- (eval $ac_try) 2>&5

3246

+ { (case "(($ac_try" in

3247

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3248

+ *) ac_try_echo=$ac_try;;

3249

+esac

3250

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3251

+ (eval "$ac_try") 2>&5

3252

ac_status=$?

3253

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3254

(exit $ac_status); }; }; then

3255

@@ -2652,24 +3210,28 @@

3256

echo "$as_me: failed program was:" >&5

3257

sed 's/^/| /' conftest.$ac_ext >&5

3258

3259

-ac_compiler_gnu=no

3260

+ ac_compiler_gnu=no

3261

3262

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3263

3264

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3265

ac_cv_c_compiler_gnu=$ac_compiler_gnu

3266

3267

3268

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

3269

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

3270

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

3271

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

3272

GCC=`test $ac_compiler_gnu = yes && echo yes`

3273

ac_test_CFLAGS=${CFLAGS+set}

3274

ac_save_CFLAGS=$CFLAGS

3275

-CFLAGS="-g"

3276

-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

3277

-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6

3278

+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

3279

+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }

3280

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

3281

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

3282

else

3283

- cat >conftest.$ac_ext <<_ACEOF

3284

+ ac_save_c_werror_flag=$ac_c_werror_flag

3285

+ ac_c_werror_flag=yes

3286

+ ac_cv_prog_cc_g=no

3287

+ CFLAGS="-g"

3288

+ cat >conftest.$ac_ext <<_ACEOF

3289

/* confdefs.h. */

3290

_ACEOF

3291

cat confdefs.h >>conftest.$ac_ext

3292

@@ -2685,24 +3247,147 @@

3293

}

3294

_ACEOF

3295

rm -f conftest.$ac_objext

3296

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3297

- (eval $ac_compile) 2>conftest.er1

3298

+if { (ac_try="$ac_compile"

3299

+case "(($ac_try" in

3300

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3301

+ *) ac_try_echo=$ac_try;;

3302

+esac

3303

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3304

+ (eval "$ac_compile") 2>conftest.er1

3305

+ ac_status=$?

3306

+ grep -v '^ *+' conftest.er1 >conftest.err

3307

+ rm -f conftest.er1

3308

+ cat conftest.err >&5

3309

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3310

+ (exit $ac_status); } &&

3311

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

3312

+ { (case "(($ac_try" in

3313

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3314

+ *) ac_try_echo=$ac_try;;

3315

+esac

3316

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3317

+ (eval "$ac_try") 2>&5

3318

+ ac_status=$?

3319

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3320

+ (exit $ac_status); }; } &&

3321

+ { ac_try='test -s conftest.$ac_objext'

3322

+ { (case "(($ac_try" in

3323

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3324

+ *) ac_try_echo=$ac_try;;

3325

+esac

3326

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3327

+ (eval "$ac_try") 2>&5

3328

+ ac_status=$?

3329

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3330

+ (exit $ac_status); }; }; then

3331

+ ac_cv_prog_cc_g=yes

3332

+else

3333

+ echo "$as_me: failed program was:" >&5

3334

+sed 's/^/| /' conftest.$ac_ext >&5

3335

3336

+ CFLAGS=""

3337

+ cat >conftest.$ac_ext <<_ACEOF

3338

+/* confdefs.h. */

3339

+_ACEOF

3340

+cat confdefs.h >>conftest.$ac_ext

3341

+cat >>conftest.$ac_ext <<_ACEOF

3342

+/* end confdefs.h. */

3343

3344

+int

3345

+main ()

3346

3347

3348

+ ;

3349

+ return 0;

3350

3351

+_ACEOF

3352

+rm -f conftest.$ac_objext

3353

+if { (ac_try="$ac_compile"

3354

+case "(($ac_try" in

3355

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3356

+ *) ac_try_echo=$ac_try;;

3357

+esac

3358

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3359

+ (eval "$ac_compile") 2>conftest.er1

3360

+ ac_status=$?

3361

+ grep -v '^ *+' conftest.er1 >conftest.err

3362

+ rm -f conftest.er1

3363

+ cat conftest.err >&5

3364

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3365

+ (exit $ac_status); } &&

3366

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

3367

+ { (case "(($ac_try" in

3368

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3369

+ *) ac_try_echo=$ac_try;;

3370

+esac

3371

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3372

+ (eval "$ac_try") 2>&5

3373

+ ac_status=$?

3374

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3375

+ (exit $ac_status); }; } &&

3376

+ { ac_try='test -s conftest.$ac_objext'

3377

+ { (case "(($ac_try" in

3378

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3379

+ *) ac_try_echo=$ac_try;;

3380

+esac

3381

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3382

+ (eval "$ac_try") 2>&5

3383

+ ac_status=$?

3384

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3385

+ (exit $ac_status); }; }; then

3386

+ :

3387

+else

3388

+ echo "$as_me: failed program was:" >&5

3389

+sed 's/^/| /' conftest.$ac_ext >&5

3390

3391

+ ac_c_werror_flag=$ac_save_c_werror_flag

3392

+ CFLAGS="-g"

3393

+ cat >conftest.$ac_ext <<_ACEOF

3394

+/* confdefs.h. */

3395

+_ACEOF

3396

+cat confdefs.h >>conftest.$ac_ext

3397

+cat >>conftest.$ac_ext <<_ACEOF

3398

+/* end confdefs.h. */

3399

3400

+int

3401

+main ()

3402

3403

3404

+ ;

3405

+ return 0;

3406

3407

+_ACEOF

3408

+rm -f conftest.$ac_objext

3409

+if { (ac_try="$ac_compile"

3410

+case "(($ac_try" in

3411

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3412

+ *) ac_try_echo=$ac_try;;

3413

+esac

3414

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3415

+ (eval "$ac_compile") 2>conftest.er1

3416

ac_status=$?

3417

grep -v '^ *+' conftest.er1 >conftest.err

3418

rm -f conftest.er1

3419

cat conftest.err >&5

3420

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3421

(exit $ac_status); } &&

3422

- { ac_try='test -z "$ac_c_werror_flag"

3423

- || test ! -s conftest.err'

3424

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3425

- (eval $ac_try) 2>&5

3426

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

3427

+ { (case "(($ac_try" in

3428

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3429

+ *) ac_try_echo=$ac_try;;

3430

+esac

3431

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3432

+ (eval "$ac_try") 2>&5

3433

ac_status=$?

3434

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3435

(exit $ac_status); }; } &&

3436

{ ac_try='test -s conftest.$ac_objext'

3437

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3438

- (eval $ac_try) 2>&5

3439

+ { (case "(($ac_try" in

3440

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3441

+ *) ac_try_echo=$ac_try;;

3442

+esac

3443

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3444

+ (eval "$ac_try") 2>&5

3445

ac_status=$?

3446

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3447

(exit $ac_status); }; }; then

3448

@@ -2711,12 +3396,20 @@

3449

echo "$as_me: failed program was:" >&5

3450

sed 's/^/| /' conftest.$ac_ext >&5

3451

3452

-ac_cv_prog_cc_g=no

3453

3454

3455

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3456

3457

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3458

+fi

3459

3460

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3461

+fi

3462

3463

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3464

+ ac_c_werror_flag=$ac_save_c_werror_flag

3465

3466

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

3467

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

3468

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

3469

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

3470

if test "$ac_test_CFLAGS" = set; then

3471

CFLAGS=$ac_save_CFLAGS

3472

elif test $ac_cv_prog_cc_g = yes; then

3473

@@ -2732,12 +3425,12 @@

3474

CFLAGS=

3475

3476

3477

-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5

3478

-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6

3479

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

3480

+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

3481

+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }

3482

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

3483

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

3484

else

3485

- ac_cv_prog_cc_stdc=no

3486

+ ac_cv_prog_cc_c89=no

3487

ac_save_CC=$CC

3488

cat >conftest.$ac_ext <<_ACEOF

3489

/* confdefs.h. */

3490

@@ -2771,12 +3464,17 @@

3491

/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has

3492

function prototypes and stuff, but not '\xHH' hex character constants.

3493

These don't provoke an error unfortunately, instead are silently treated

3494

- as 'x'. The following induces an error, until -std1 is added to get

3495

+ as 'x'. The following induces an error, until -std is added to get

3496

proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an

3497

array size at least. It's necessary to write '\x00'==0 to get something

3498

- that's true only with -std1. */

3499

+ that's true only with -std. */

3500

int osf4_cc_array ['\x00' == 0 ? 1 : -1];

3501

3502

+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters

3503

+ inside strings and character constants. */

3504

+#define FOO(x) 'x'

3505

+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];

3506

3507

int test (int i, double x);

3508

struct s1 {int (*f) (int a);};

3509

struct s2 {int (*f) (double a);};

3510

@@ -2791,205 +3489,74 @@

3511

return 0;

3512

}

3513

_ACEOF

3514

-# Don't try gcc -ansi; that turns off useful extensions and

3515

-# breaks some systems' header files.

3516

-# AIX -qlanglvl=ansi

3517

-# Ultrix and OSF/1 -std1

3518

-# HP-UX 10.20 and later -Ae

3519

-# HP-UX older versions -Aa -D_HPUX_SOURCE

3520

-# SVR4 -Xc -D__EXTENSIONS__

3521

-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

3522

+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \

3523

+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

3524

3525

CC="$ac_save_CC $ac_arg"

3526

rm -f conftest.$ac_objext

3527

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3528

- (eval $ac_compile) 2>conftest.er1

3529

+if { (ac_try="$ac_compile"

3530

+case "(($ac_try" in

3531

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3532

+ *) ac_try_echo=$ac_try;;

3533

+esac

3534

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3535

+ (eval "$ac_compile") 2>conftest.er1

3536

ac_status=$?

3537

grep -v '^ *+' conftest.er1 >conftest.err

3538

rm -f conftest.er1

3539

cat conftest.err >&5

3540

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3541

(exit $ac_status); } &&

3542

- { ac_try='test -z "$ac_c_werror_flag"

3543

- || test ! -s conftest.err'

3544

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3545

- (eval $ac_try) 2>&5

3546

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

3547

+ { (case "(($ac_try" in

3548

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3549

+ *) ac_try_echo=$ac_try;;

3550

+esac

3551

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3552

+ (eval "$ac_try") 2>&5

3553

ac_status=$?

3554

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3555

(exit $ac_status); }; } &&

3556

{ ac_try='test -s conftest.$ac_objext'

3557

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3558

- (eval $ac_try) 2>&5

3559

+ { (case "(($ac_try" in

3560

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3561

+ *) ac_try_echo=$ac_try;;

3562

+esac

3563

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3564

+ (eval "$ac_try") 2>&5

3565

ac_status=$?

3566

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3567

(exit $ac_status); }; }; then

3568

- ac_cv_prog_cc_stdc=$ac_arg

3569

-break

3570

+ ac_cv_prog_cc_c89=$ac_arg

3571

else

3572

echo "$as_me: failed program was:" >&5

3573

sed 's/^/| /' conftest.$ac_ext >&5

3574

3575

3576

3577

-rm -f conftest.err conftest.$ac_objext

3578

3579

+rm -f core conftest.err conftest.$ac_objext

3580

+ test "x$ac_cv_prog_cc_c89" != "xno" && break

3581

done

3582

-rm -f conftest.$ac_ext conftest.$ac_objext

3583

+rm -f conftest.$ac_ext

3584

CC=$ac_save_CC

3585

3586

3587

3588

-case "x$ac_cv_prog_cc_stdc" in

3589

- x|xno)

3590

- echo "$as_me:$LINENO: result: none needed" >&5

3591

-echo "${ECHO_T}none needed" >&6 ;;

3592

+# AC_CACHE_VAL

3593

+case "x$ac_cv_prog_cc_c89" in

3594

+ x)

3595

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

3596

+echo "${ECHO_T}none needed" >&6; } ;;

3597

+ xno)

3598

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

3599

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

3600

3601

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

3602

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

3603

- CC="$CC $ac_cv_prog_cc_stdc" ;;

3604

+ CC="$CC $ac_cv_prog_cc_c89"

3605

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

3606

+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;

3607

esac

3608

3609

-# Some people use a C++ compiler to compile C. Since we use `exit',

3610

-# in C++ we need to declare it. In case someone uses the same compiler

3611

-# for both compiling C and C++ we need to have the C++ compiler decide

3612

-# the declaration of exit, since it's the most demanding environment.

3613

-cat >conftest.$ac_ext <<_ACEOF

3614

-#ifndef __cplusplus

3615

- choke me

3616

-#endif

3617

-_ACEOF

3618

-rm -f conftest.$ac_objext

3619

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3620

- (eval $ac_compile) 2>conftest.er1

3621

- ac_status=$?

3622

- grep -v '^ *+' conftest.er1 >conftest.err

3623

- rm -f conftest.er1

3624

- cat conftest.err >&5

3625

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3626

- (exit $ac_status); } &&

3627

- { ac_try='test -z "$ac_c_werror_flag"

3628

- || test ! -s conftest.err'

3629

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3630

- (eval $ac_try) 2>&5

3631

- ac_status=$?

3632

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3633

- (exit $ac_status); }; } &&

3634

- { ac_try='test -s conftest.$ac_objext'

3635

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3636

- (eval $ac_try) 2>&5

3637

- ac_status=$?

3638

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3639

- (exit $ac_status); }; }; then

3640

- for ac_declaration in \

3641

- '' \

3642

- 'extern "C" void std::exit (int) throw (); using std::exit;' \

3643

- 'extern "C" void std::exit (int); using std::exit;' \

3644

- 'extern "C" void exit (int) throw ();' \

3645

- 'extern "C" void exit (int);' \

3646

- 'void exit (int);'

3647

-do

3648

- cat >conftest.$ac_ext <<_ACEOF

3649

-/* confdefs.h. */

3650

-_ACEOF

3651

-cat confdefs.h >>conftest.$ac_ext

3652

-cat >>conftest.$ac_ext <<_ACEOF

3653

-/* end confdefs.h. */

3654

-$ac_declaration

3655

-#include <stdlib.h>

3656

-int

3657

-main ()

3658

3659

-exit (42);

3660

- ;

3661

- return 0;

3662

3663

-_ACEOF

3664

-rm -f conftest.$ac_objext

3665

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3666

- (eval $ac_compile) 2>conftest.er1

3667

- ac_status=$?

3668

- grep -v '^ *+' conftest.er1 >conftest.err

3669

- rm -f conftest.er1

3670

- cat conftest.err >&5

3671

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3672

- (exit $ac_status); } &&

3673

- { ac_try='test -z "$ac_c_werror_flag"

3674

- || test ! -s conftest.err'

3675

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3676

- (eval $ac_try) 2>&5

3677

- ac_status=$?

3678

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3679

- (exit $ac_status); }; } &&

3680

- { ac_try='test -s conftest.$ac_objext'

3681

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3682

- (eval $ac_try) 2>&5

3683

- ac_status=$?

3684

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3685

- (exit $ac_status); }; }; then

3686

- :

3687

-else

3688

- echo "$as_me: failed program was:" >&5

3689

-sed 's/^/| /' conftest.$ac_ext >&5

3690

3691

-continue

3692

-fi

3693

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3694

- cat >conftest.$ac_ext <<_ACEOF

3695

-/* confdefs.h. */

3696

-_ACEOF

3697

-cat confdefs.h >>conftest.$ac_ext

3698

-cat >>conftest.$ac_ext <<_ACEOF

3699

-/* end confdefs.h. */

3700

-$ac_declaration

3701

-int

3702

-main ()

3703

3704

-exit (42);

3705

- ;

3706

- return 0;

3707

3708

-_ACEOF

3709

-rm -f conftest.$ac_objext

3710

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

3711

- (eval $ac_compile) 2>conftest.er1

3712

- ac_status=$?

3713

- grep -v '^ *+' conftest.er1 >conftest.err

3714

- rm -f conftest.er1

3715

- cat conftest.err >&5

3716

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3717

- (exit $ac_status); } &&

3718

- { ac_try='test -z "$ac_c_werror_flag"

3719

- || test ! -s conftest.err'

3720

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3721

- (eval $ac_try) 2>&5

3722

- ac_status=$?

3723

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3724

- (exit $ac_status); }; } &&

3725

- { ac_try='test -s conftest.$ac_objext'

3726

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3727

- (eval $ac_try) 2>&5

3728

- ac_status=$?

3729

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

3730

- (exit $ac_status); }; }; then

3731

- break

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

-done

3739

-rm -f conftest*

3740

-if test -n "$ac_declaration"; then

3741

- echo '#ifdef __cplusplus' >>confdefs.h

3742

- echo $ac_declaration >>confdefs.h

3743

- echo '#endif' >>confdefs.h

3744

-fi

3745

3746

-else

3747

- echo "$as_me: failed program was:" >&5

3748

-sed 's/^/| /' conftest.$ac_ext >&5

3749

3750

-fi

3751

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

3752

ac_ext=c

3753

ac_cpp='$CPP $CPPFLAGS'

3754

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

3755

@@ -2997,7 +3564,7 @@

3756

ac_compiler_gnu=$ac_cv_c_compiler_gnu

3757

DEPDIR="${am__leading_dot}deps"

3758

3759

- ac_config_commands="$ac_config_commands depfiles"

3760

+ac_config_commands="$ac_config_commands depfiles"

3761

3762

3763

am_make=${MAKE-make}

3764

@@ -3007,8 +3574,8 @@

3765

.PHONY: am__doit

3766

END

3767

# If we don't find an include directive, just comment out the code.

3768

-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5

3769

-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6

3770

+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5

3771

+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }

3772

am__include="#"

3773

am__quote=

3774

_am_result=none

3775

@@ -3035,15 +3602,15 @@

3776

3777

3778

3779

-echo "$as_me:$LINENO: result: $_am_result" >&5

3780

-echo "${ECHO_T}$_am_result" >&6

3781

+{ echo "$as_me:$LINENO: result: $_am_result" >&5

3782

+echo "${ECHO_T}$_am_result" >&6; }

3783

rm -f confinc confmf

3784

3785

-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.

3786

+# Check whether --enable-dependency-tracking was given.

3787

if test "${enable_dependency_tracking+set}" = set; then

3788

- enableval="$enable_dependency_tracking"

3789

+ enableval=$enable_dependency_tracking;

3790

+fi

3791

3792

-fi;

3793

if test "x$enable_dependency_tracking" != xno; then

3794

am_depcomp="$ac_aux_dir/depcomp"

3795

AMDEPBACKSLASH='\'

3796

@@ -3063,8 +3630,8 @@

3797

3798

depcc="$CC" am_compiler_list=

3799

3800

-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

3801

-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6

3802

+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

3803

+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

3804

if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then

3805

echo $ECHO_N "(cached) $ECHO_C" >&6

3806

else

3807

@@ -3153,8 +3720,8 @@

3808

3809

3810

3811

-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

3812

-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6

3813

+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

3814

+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }

3815

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

3816

3817

3818

@@ -3171,14 +3738,12 @@

3819

3820

3821

3822

3823

- echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5

3824

-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6

3825

-if test "${ac_cv_lib_cposix_strerror+set}" = set; then

3826

+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5

3827

+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }

3828

+if test "${ac_cv_search_strerror+set}" = set; then

3829

echo $ECHO_N "(cached) $ECHO_C" >&6

3830

else

3831

- ac_check_lib_save_LIBS=$LIBS

3832

-LIBS="-lcposix $LIBS"

3833

+ ac_func_search_save_LIBS=$LIBS

3834

cat >conftest.$ac_ext <<_ACEOF

3835

/* confdefs.h. */

3836

_ACEOF

3837

@@ -3186,69 +3751,99 @@

3838

cat >>conftest.$ac_ext <<_ACEOF

3839

/* end confdefs.h. */

3840

3841

-/* Override any gcc2 internal prototype to avoid an error. */

3842

+/* Override any GCC internal prototype to avoid an error.

3843

+ Use char because int might match the return type of a GCC

3844

+ builtin and then its argument prototype would still apply. */

3845

#ifdef __cplusplus

3846

extern "C"

3847

#endif

3848

-/* We use char because int might match the return type of a gcc2

3849

- builtin and then its argument prototype would still apply. */

3850

char strerror ();

3851

int

3852

main ()

3853

{

3854

-strerror ();

3855

+return strerror ();

3856

;

3857

return 0;

3858

}

3859

_ACEOF

3860

-rm -f conftest.$ac_objext conftest$ac_exeext

3861

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

3862

- (eval $ac_link) 2>conftest.er1

3863

+for ac_lib in '' cposix; do

3864

+ if test -z "$ac_lib"; then

3865

+ ac_res="none required"

3866

+ else

3867

+ ac_res=-l$ac_lib

3868

+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"

3869

+ fi

3870

+ rm -f conftest.$ac_objext conftest$ac_exeext

3871

+if { (ac_try="$ac_link"

3872

+case "(($ac_try" in

3873

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3874

+ *) ac_try_echo=$ac_try;;

3875

+esac

3876

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3877

+ (eval "$ac_link") 2>conftest.er1

3878

ac_status=$?

3879

grep -v '^ *+' conftest.er1 >conftest.err

3880

rm -f conftest.er1

3881

cat conftest.err >&5

3882

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3883

(exit $ac_status); } &&

3884

- { ac_try='test -z "$ac_c_werror_flag"

3885

- || test ! -s conftest.err'

3886

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3887

- (eval $ac_try) 2>&5

3888

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

3889

+ { (case "(($ac_try" in

3890

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3891

+ *) ac_try_echo=$ac_try;;

3892

+esac

3893

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3894

+ (eval "$ac_try") 2>&5

3895

ac_status=$?

3896

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3897

(exit $ac_status); }; } &&

3898

{ ac_try='test -s conftest$ac_exeext'

3899

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

3900

- (eval $ac_try) 2>&5

3901

+ { (case "(($ac_try" in

3902

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3903

+ *) ac_try_echo=$ac_try;;

3904

+esac

3905

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3906

+ (eval "$ac_try") 2>&5

3907

ac_status=$?

3908

echo "$as_me:$LINENO: \$? = $ac_status" >&5

3909

(exit $ac_status); }; }; then

3910

- ac_cv_lib_cposix_strerror=yes

3911

+ ac_cv_search_strerror=$ac_res

3912

else

3913

echo "$as_me: failed program was:" >&5

3914

sed 's/^/| /' conftest.$ac_ext >&5

3915

3916

-ac_cv_lib_cposix_strerror=no

3917

3918

3919

-rm -f conftest.err conftest.$ac_objext \

3920

- conftest$ac_exeext conftest.$ac_ext

3921

-LIBS=$ac_check_lib_save_LIBS

3922

3923

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

3924

+ conftest$ac_exeext

3925

+ if test "${ac_cv_search_strerror+set}" = set; then

3926

+ break

3927

+fi

3928

+done

3929

+if test "${ac_cv_search_strerror+set}" = set; then

3930

+ :

3931

+else

3932

+ ac_cv_search_strerror=no

3933

3934

-echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5

3935

-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6

3936

-if test $ac_cv_lib_cposix_strerror = yes; then

3937

- LIBS="$LIBS -lcposix"

3938

+rm conftest.$ac_ext

3939

+LIBS=$ac_func_search_save_LIBS

3940

3941

+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5

3942

+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }

3943

+ac_res=$ac_cv_search_strerror

3944

+if test "$ac_res" != no; then

3945

+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

3946

3947

3948

+fi

3949

3950

ac_ext=c

3951

ac_cpp='$CPP $CPPFLAGS'

3952

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

3953

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

3954

ac_compiler_gnu=$ac_cv_c_compiler_gnu

3955

-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5

3956

-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6

3957

+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5

3958

+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }

3959

# On Suns, sometimes $CPP names a directory.

3960

if test -n "$CPP" && test -d "$CPP"; then

3961

CPP=

3962

@@ -3282,8 +3877,13 @@

3963

#endif

3964

Syntax error

3965

_ACEOF

3966

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

3967

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

3968

+if { (ac_try="$ac_cpp conftest.$ac_ext"

3969

+case "(($ac_try" in

3970

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3971

+ *) ac_try_echo=$ac_try;;

3972

+esac

3973

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3974

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

3975

ac_status=$?

3976

grep -v '^ *+' conftest.er1 >conftest.err

3977

rm -f conftest.er1

3978

@@ -3308,9 +3908,10 @@

3979

# Broken: fails on valid input.

3980

continue

3981

3982

3983

rm -f conftest.err conftest.$ac_ext

3984

3985

- # OK, works on sane cases. Now check whether non-existent headers

3986

+ # OK, works on sane cases. Now check whether nonexistent headers

3987

# can be detected and how.

3988

cat >conftest.$ac_ext <<_ACEOF

3989

/* confdefs.h. */

3990

@@ -3320,8 +3921,13 @@

3991

/* end confdefs.h. */

3992

#include <ac_nonexistent.h>

3993

_ACEOF

3994

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

3995

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

3996

+if { (ac_try="$ac_cpp conftest.$ac_ext"

3997

+case "(($ac_try" in

3998

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3999

+ *) ac_try_echo=$ac_try;;

4000

+esac

4001

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4002

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

4003

ac_status=$?

4004

grep -v '^ *+' conftest.er1 >conftest.err

4005

rm -f conftest.er1

4006

@@ -3348,6 +3954,7 @@

4007

ac_preproc_ok=:

4008

break

4009

4010

4011

rm -f conftest.err conftest.$ac_ext

4012

4013

done

4014

@@ -3365,8 +3972,8 @@

4015

else

4016

ac_cv_prog_CPP=$CPP

4017

4018

-echo "$as_me:$LINENO: result: $CPP" >&5

4019

-echo "${ECHO_T}$CPP" >&6

4020

+{ echo "$as_me:$LINENO: result: $CPP" >&5

4021

+echo "${ECHO_T}$CPP" >&6; }

4022

ac_preproc_ok=false

4023

for ac_c_preproc_warn_flag in '' yes

4024

4025

@@ -3389,8 +3996,13 @@

4026

#endif

4027

Syntax error

4028

_ACEOF

4029

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

4030

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

4031

+if { (ac_try="$ac_cpp conftest.$ac_ext"

4032

+case "(($ac_try" in

4033

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4034

+ *) ac_try_echo=$ac_try;;

4035

+esac

4036

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4037

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

4038

ac_status=$?

4039

grep -v '^ *+' conftest.er1 >conftest.err

4040

rm -f conftest.er1

4041

@@ -3415,9 +4027,10 @@

4042

# Broken: fails on valid input.

4043

continue

4044

4045

4046

rm -f conftest.err conftest.$ac_ext

4047

4048

- # OK, works on sane cases. Now check whether non-existent headers

4049

+ # OK, works on sane cases. Now check whether nonexistent headers

4050

# can be detected and how.

4051

cat >conftest.$ac_ext <<_ACEOF

4052

/* confdefs.h. */

4053

@@ -3427,8 +4040,13 @@

4054

/* end confdefs.h. */

4055

#include <ac_nonexistent.h>

4056

_ACEOF

4057

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

4058

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

4059

+if { (ac_try="$ac_cpp conftest.$ac_ext"

4060

+case "(($ac_try" in

4061

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4062

+ *) ac_try_echo=$ac_try;;

4063

+esac

4064

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4065

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

4066

ac_status=$?

4067

grep -v '^ *+' conftest.er1 >conftest.err

4068

rm -f conftest.er1

4069

@@ -3455,6 +4073,7 @@

4070

ac_preproc_ok=:

4071

break

4072

4073

4074

rm -f conftest.err conftest.$ac_ext

4075

4076

done

4077

@@ -3477,23 +4096,170 @@

4078

ac_compiler_gnu=$ac_cv_c_compiler_gnu

4079

4080

4081

-echo "$as_me:$LINENO: checking for egrep" >&5

4082

-echo $ECHO_N "checking for egrep... $ECHO_C" >&6

4083

-if test "${ac_cv_prog_egrep+set}" = set; then

4084

+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5

4085

+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }

4086

+if test "${ac_cv_path_GREP+set}" = set; then

4087

+ echo $ECHO_N "(cached) $ECHO_C" >&6

4088

+else

4089

+ # Extract the first word of "grep ggrep" to use in msg output

4090

+if test -z "$GREP"; then

4091

+set dummy grep ggrep; ac_prog_name=$2

4092

+if test "${ac_cv_path_GREP+set}" = set; then

4093

+ echo $ECHO_N "(cached) $ECHO_C" >&6

4094

+else

4095

+ ac_path_GREP_found=false

4096

+# Loop through the user's path and test for each of PROGNAME-LIST

4097

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

4098

+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

4099

+do

4100

+ IFS=$as_save_IFS

4101

+ test -z "$as_dir" && as_dir=.

4102

+ for ac_prog in grep ggrep; do

4103

+ for ac_exec_ext in '' $ac_executable_extensions; do

4104

+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

4105

+ { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue

4106

+ # Check for GNU ac_path_GREP and select it if it is found.

4107

+ # Check for GNU $ac_path_GREP

4108

+case `"$ac_path_GREP" --version 2>&1` in

4109

+*GNU*)

4110

+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;

4111

+*)

4112

+ ac_count=0

4113

+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

4114

+ while :

4115

+ do

4116

+ cat "conftest.in" "conftest.in" >"conftest.tmp"

4117

+ mv "conftest.tmp" "conftest.in"

4118

+ cp "conftest.in" "conftest.nl"

4119

+ echo 'GREP' >> "conftest.nl"

4120

+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break

4121

+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

4122

+ ac_count=`expr $ac_count + 1`

4123

+ if test $ac_count -gt ${ac_path_GREP_max-0}; then

4124

+ # Best one so far, save it but keep looking for a better one

4125

+ ac_cv_path_GREP="$ac_path_GREP"

4126

+ ac_path_GREP_max=$ac_count

4127

+ fi

4128

+ # 10*(2^10) chars as input seems more than enough

4129

+ test $ac_count -gt 10 && break

4130

+ done

4131

+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

4132

+esac

4133

4134

4135

+ $ac_path_GREP_found && break 3

4136

+ done

4137

+done

4138

4139

+done

4140

+IFS=$as_save_IFS

4141

4142

4143

+fi

4144

4145

+GREP="$ac_cv_path_GREP"

4146

+if test -z "$GREP"; then

4147

+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

4148

+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

4149

+ { (exit 1); exit 1; }; }

4150

+fi

4151

4152

+else

4153

+ ac_cv_path_GREP=$GREP

4154

+fi

4155

4156

4157

+fi

4158

+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5

4159

+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }

4160

+ GREP="$ac_cv_path_GREP"

4161

4162

4163

+{ echo "$as_me:$LINENO: checking for egrep" >&5

4164

+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }

4165

+if test "${ac_cv_path_EGREP+set}" = set; then

4166

+ echo $ECHO_N "(cached) $ECHO_C" >&6

4167

+else

4168

+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1

4169

+ then ac_cv_path_EGREP="$GREP -E"

4170

+ else

4171

+ # Extract the first word of "egrep" to use in msg output

4172

+if test -z "$EGREP"; then

4173

+set dummy egrep; ac_prog_name=$2

4174

+if test "${ac_cv_path_EGREP+set}" = set; then

4175

echo $ECHO_N "(cached) $ECHO_C" >&6

4176

else

4177

- if echo a | (grep -E '(a|b)') >/dev/null 2>&1

4178

- then ac_cv_prog_egrep='grep -E'

4179

- else ac_cv_prog_egrep='egrep'

4180

+ ac_path_EGREP_found=false

4181

+# Loop through the user's path and test for each of PROGNAME-LIST

4182

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

4183

+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin

4184

+do

4185

+ IFS=$as_save_IFS

4186

+ test -z "$as_dir" && as_dir=.

4187

+ for ac_prog in egrep; do

4188

+ for ac_exec_ext in '' $ac_executable_extensions; do

4189

+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

4190

+ { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue

4191

+ # Check for GNU ac_path_EGREP and select it if it is found.

4192

+ # Check for GNU $ac_path_EGREP

4193

+case `"$ac_path_EGREP" --version 2>&1` in

4194

+*GNU*)

4195

+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;

4196

+*)

4197

+ ac_count=0

4198

+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

4199

+ while :

4200

+ do

4201

+ cat "conftest.in" "conftest.in" >"conftest.tmp"

4202

+ mv "conftest.tmp" "conftest.in"

4203

+ cp "conftest.in" "conftest.nl"

4204

+ echo 'EGREP' >> "conftest.nl"

4205

+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break

4206

+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

4207

+ ac_count=`expr $ac_count + 1`

4208

+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then

4209

+ # Best one so far, save it but keep looking for a better one

4210

+ ac_cv_path_EGREP="$ac_path_EGREP"

4211

+ ac_path_EGREP_max=$ac_count

4212

4213

+ # 10*(2^10) chars as input seems more than enough

4214

+ test $ac_count -gt 10 && break

4215

+ done

4216

+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

4217

+esac

4218

4219

4220

+ $ac_path_EGREP_found && break 3

4221

+ done

4222

+done

4223

4224

+done

4225

+IFS=$as_save_IFS

4226

4227

4228

+fi

4229

4230

+EGREP="$ac_cv_path_EGREP"

4231

+if test -z "$EGREP"; then

4232

+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

4233

+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

4234

+ { (exit 1); exit 1; }; }

4235

+fi

4236

4237

+else

4238

+ ac_cv_path_EGREP=$EGREP

4239

+fi

4240

4241

4242

+ fi

4243

4244

-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5

4245

-echo "${ECHO_T}$ac_cv_prog_egrep" >&6

4246

- EGREP=$ac_cv_prog_egrep

4247

+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5

4248

+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }

4249

+ EGREP="$ac_cv_path_EGREP"

4250

4251

4252

-echo "$as_me:$LINENO: checking for ANSI C header files" >&5

4253

-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6

4254

+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5

4255

+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }

4256

if test "${ac_cv_header_stdc+set}" = set; then

4257

echo $ECHO_N "(cached) $ECHO_C" >&6

4258

else

4259

@@ -3517,24 +4283,36 @@

4260

}

4261

_ACEOF

4262

rm -f conftest.$ac_objext

4263

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4264

- (eval $ac_compile) 2>conftest.er1

4265

+if { (ac_try="$ac_compile"

4266

+case "(($ac_try" in

4267

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4268

+ *) ac_try_echo=$ac_try;;

4269

+esac

4270

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4271

+ (eval "$ac_compile") 2>conftest.er1

4272

ac_status=$?

4273

grep -v '^ *+' conftest.er1 >conftest.err

4274

rm -f conftest.er1

4275

cat conftest.err >&5

4276

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4277

(exit $ac_status); } &&

4278

- { ac_try='test -z "$ac_c_werror_flag"

4279

- || test ! -s conftest.err'

4280

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4281

- (eval $ac_try) 2>&5

4282

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

4283

+ { (case "(($ac_try" in

4284

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4285

+ *) ac_try_echo=$ac_try;;

4286

+esac

4287

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4288

+ (eval "$ac_try") 2>&5

4289

ac_status=$?

4290

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4291

(exit $ac_status); }; } &&

4292

{ ac_try='test -s conftest.$ac_objext'

4293

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4294

- (eval $ac_try) 2>&5

4295

+ { (case "(($ac_try" in

4296

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4297

+ *) ac_try_echo=$ac_try;;

4298

+esac

4299

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4300

+ (eval "$ac_try") 2>&5

4301

ac_status=$?

4302

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4303

(exit $ac_status); }; }; then

4304

@@ -3543,9 +4321,10 @@

4305

echo "$as_me: failed program was:" >&5

4306

sed 's/^/| /' conftest.$ac_ext >&5

4307

4308

-ac_cv_header_stdc=no

4309

+ ac_cv_header_stdc=no

4310

4311

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

4312

4313

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4314

4315

if test $ac_cv_header_stdc = yes; then

4316

# SunOS 4.x string.h does not declare mem*, contrary to ANSI.

4317

@@ -3601,6 +4380,7 @@

4318

cat >>conftest.$ac_ext <<_ACEOF

4319

/* end confdefs.h. */

4320

#include <ctype.h>

4321

+#include <stdlib.h>

4322

#if ((' ' & 0x0FF) == 0x020)

4323

# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')

4324

# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))

4325

@@ -3620,18 +4400,27 @@

4326

for (i = 0; i < 256; i++)

4327

if (XOR (islower (i), ISLOWER (i))

4328

|| toupper (i) != TOUPPER (i))

4329

- exit(2);

4330

- exit (0);

4331

+ return 2;

4332

+ return 0;

4333

}

4334

_ACEOF

4335

rm -f conftest$ac_exeext

4336

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

4337

- (eval $ac_link) 2>&5

4338

+if { (ac_try="$ac_link"

4339

+case "(($ac_try" in

4340

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4341

+ *) ac_try_echo=$ac_try;;

4342

+esac

4343

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4344

+ (eval "$ac_link") 2>&5

4345

ac_status=$?

4346

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4347

(exit $ac_status); } && { ac_try='./conftest$ac_exeext'

4348

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4349

- (eval $ac_try) 2>&5

4350

+ { (case "(($ac_try" in

4351

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4352

+ *) ac_try_echo=$ac_try;;

4353

+esac

4354

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4355

+ (eval "$ac_try") 2>&5

4356

ac_status=$?

4357

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4358

(exit $ac_status); }; }; then

4359

@@ -3644,12 +4433,14 @@

4360

( exit $ac_status )

4361

ac_cv_header_stdc=no

4362

4363

-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

4364

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

4365

4366

4367

4368

4369

4370

-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

4371

-echo "${ECHO_T}$ac_cv_header_stdc" >&6

4372

+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

4373

+echo "${ECHO_T}$ac_cv_header_stdc" >&6; }

4374

if test $ac_cv_header_stdc = yes; then

4375

4376

cat >>confdefs.h <<\_ACEOF

4377

@@ -3658,69 +4449,113 @@

4378

4379

4380

4381

-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5

4382

-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6

4383

-if test "${ac_cv_c_bigendian+set}" = set; then

4384

+# On IRIX 5.3, sys/types and inttypes.h are conflicting.

4385

4386

4387

4388

4389

4390

4391

4392

4393

4394

+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

4395

+ inttypes.h stdint.h unistd.h

4396

+do

4397

+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

4398

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

4399

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

4400

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

4401

echo $ECHO_N "(cached) $ECHO_C" >&6

4402

else

4403

- # See if sys/param.h defines the BYTE_ORDER macro.

4404

-cat >conftest.$ac_ext <<_ACEOF

4405

+ cat >conftest.$ac_ext <<_ACEOF

4406

/* confdefs.h. */

4407

_ACEOF

4408

cat confdefs.h >>conftest.$ac_ext

4409

cat >>conftest.$ac_ext <<_ACEOF

4410

/* end confdefs.h. */

4411

-#include <sys/types.h>

4412

-#include <sys/param.h>

4413

4414

-int

4415

-main ()

4416

4417

-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN

4418

- bogus endian macros

4419

-#endif

4420

+$ac_includes_default

4421

4422

- ;

4423

- return 0;

4424

4425

+#include <$ac_header>

4426

_ACEOF

4427

rm -f conftest.$ac_objext

4428

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4429

- (eval $ac_compile) 2>conftest.er1

4430

+if { (ac_try="$ac_compile"

4431

+case "(($ac_try" in

4432

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4433

+ *) ac_try_echo=$ac_try;;

4434

+esac

4435

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4436

+ (eval "$ac_compile") 2>conftest.er1

4437

ac_status=$?

4438

grep -v '^ *+' conftest.er1 >conftest.err

4439

rm -f conftest.er1

4440

cat conftest.err >&5

4441

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4442

(exit $ac_status); } &&

4443

- { ac_try='test -z "$ac_c_werror_flag"

4444

- || test ! -s conftest.err'

4445

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4446

- (eval $ac_try) 2>&5

4447

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

4448

+ { (case "(($ac_try" in

4449

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4450

+ *) ac_try_echo=$ac_try;;

4451

+esac

4452

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4453

+ (eval "$ac_try") 2>&5

4454

ac_status=$?

4455

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4456

(exit $ac_status); }; } &&

4457

{ ac_try='test -s conftest.$ac_objext'

4458

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4459

- (eval $ac_try) 2>&5

4460

+ { (case "(($ac_try" in

4461

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4462

+ *) ac_try_echo=$ac_try;;

4463

+esac

4464

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4465

+ (eval "$ac_try") 2>&5

4466

ac_status=$?

4467

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4468

(exit $ac_status); }; }; then

4469

- # It does; now see whether it defined to BIG_ENDIAN or not.

4470

-cat >conftest.$ac_ext <<_ACEOF

4471

-/* confdefs.h. */

4472

-_ACEOF

4473

-cat confdefs.h >>conftest.$ac_ext

4474

-cat >>conftest.$ac_ext <<_ACEOF

4475

-/* end confdefs.h. */

4476

-#include <sys/types.h>

4477

-#include <sys/param.h>

4478

+ eval "$as_ac_Header=yes"

4479

+else

4480

+ echo "$as_me: failed program was:" >&5

4481

+sed 's/^/| /' conftest.$ac_ext >&5

4482

4483

-int

4484

-main ()

4485

4486

-#if BYTE_ORDER != BIG_ENDIAN

4487

- not big endian

4488

+ eval "$as_ac_Header=no"

4489

+fi

4490

4491

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4492

+fi

4493

+ac_res=`eval echo '${'$as_ac_Header'}'`

4494

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

4495

+echo "${ECHO_T}$ac_res" >&6; }

4496

+if test `eval echo '${'$as_ac_Header'}'` = yes; then

4497

+ cat >>confdefs.h <<_ACEOF

4498

+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

4499

+_ACEOF

4500

4501

+fi

4502

4503

+done

4504

4505

4506

+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5

4507

+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }

4508

+if test "${ac_cv_c_bigendian+set}" = set; then

4509

+ echo $ECHO_N "(cached) $ECHO_C" >&6

4510

+else

4511

+ # See if sys/param.h defines the BYTE_ORDER macro.

4512

+cat >conftest.$ac_ext <<_ACEOF

4513

+/* confdefs.h. */

4514

+_ACEOF

4515

+cat confdefs.h >>conftest.$ac_ext

4516

+cat >>conftest.$ac_ext <<_ACEOF

4517

+/* end confdefs.h. */

4518

+#include <sys/types.h>

4519

+#include <sys/param.h>

4520

4521

+int

4522

+main ()

4523

4524

+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \

4525

+ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)

4526

+ bogus endian macros

4527

#endif

4528

4529

;

4530

@@ -3728,24 +4563,91 @@

4531

}

4532

_ACEOF

4533

rm -f conftest.$ac_objext

4534

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4535

- (eval $ac_compile) 2>conftest.er1

4536

+if { (ac_try="$ac_compile"

4537

+case "(($ac_try" in

4538

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4539

+ *) ac_try_echo=$ac_try;;

4540

+esac

4541

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4542

+ (eval "$ac_compile") 2>conftest.er1

4543

+ ac_status=$?

4544

+ grep -v '^ *+' conftest.er1 >conftest.err

4545

+ rm -f conftest.er1

4546

+ cat conftest.err >&5

4547

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4548

+ (exit $ac_status); } &&

4549

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

4550

+ { (case "(($ac_try" in

4551

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4552

+ *) ac_try_echo=$ac_try;;

4553

+esac

4554

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4555

+ (eval "$ac_try") 2>&5

4556

+ ac_status=$?

4557

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4558

+ (exit $ac_status); }; } &&

4559

+ { ac_try='test -s conftest.$ac_objext'

4560

+ { (case "(($ac_try" in

4561

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4562

+ *) ac_try_echo=$ac_try;;

4563

+esac

4564

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4565

+ (eval "$ac_try") 2>&5

4566

+ ac_status=$?

4567

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4568

+ (exit $ac_status); }; }; then

4569

+ # It does; now see whether it defined to BIG_ENDIAN or not.

4570

+cat >conftest.$ac_ext <<_ACEOF

4571

+/* confdefs.h. */

4572

+_ACEOF

4573

+cat confdefs.h >>conftest.$ac_ext

4574

+cat >>conftest.$ac_ext <<_ACEOF

4575

+/* end confdefs.h. */

4576

+#include <sys/types.h>

4577

+#include <sys/param.h>

4578

4579

+int

4580

+main ()

4581

4582

+#if BYTE_ORDER != BIG_ENDIAN

4583

+ not big endian

4584

+#endif

4585

4586

+ ;

4587

+ return 0;

4588

4589

+_ACEOF

4590

+rm -f conftest.$ac_objext

4591

+if { (ac_try="$ac_compile"

4592

+case "(($ac_try" in

4593

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4594

+ *) ac_try_echo=$ac_try;;

4595

+esac

4596

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4597

+ (eval "$ac_compile") 2>conftest.er1

4598

ac_status=$?

4599

grep -v '^ *+' conftest.er1 >conftest.err

4600

rm -f conftest.er1

4601

cat conftest.err >&5

4602

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4603

(exit $ac_status); } &&

4604

- { ac_try='test -z "$ac_c_werror_flag"

4605

- || test ! -s conftest.err'

4606

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4607

- (eval $ac_try) 2>&5

4608

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

4609

+ { (case "(($ac_try" in

4610

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4611

+ *) ac_try_echo=$ac_try;;

4612

+esac

4613

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4614

+ (eval "$ac_try") 2>&5

4615

ac_status=$?

4616

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4617

(exit $ac_status); }; } &&

4618

{ ac_try='test -s conftest.$ac_objext'

4619

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4620

- (eval $ac_try) 2>&5

4621

+ { (case "(($ac_try" in

4622

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4623

+ *) ac_try_echo=$ac_try;;

4624

+esac

4625

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4626

+ (eval "$ac_try") 2>&5

4627

ac_status=$?

4628

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4629

(exit $ac_status); }; }; then

4630

@@ -3754,14 +4656,15 @@

4631

echo "$as_me: failed program was:" >&5

4632

sed 's/^/| /' conftest.$ac_ext >&5

4633

4634

-ac_cv_c_bigendian=no

4635

+ ac_cv_c_bigendian=no

4636

4637

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

4638

4639

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4640

else

4641

echo "$as_me: failed program was:" >&5

4642

sed 's/^/| /' conftest.$ac_ext >&5

4643

4644

-# It does not; compile a test program.

4645

+ # It does not; compile a test program.

4646

if test "$cross_compiling" = yes; then

4647

# try to guess the endianness by grepping values into an object file

4648

ac_cv_c_bigendian=unknown

4649

@@ -3771,11 +4674,11 @@

4650

cat confdefs.h >>conftest.$ac_ext

4651

cat >>conftest.$ac_ext <<_ACEOF

4652

/* end confdefs.h. */

4653

-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };

4654

-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };

4655

+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };

4656

+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };

4657

void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }

4658

-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };

4659

-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };

4660

+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };

4661

+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };

4662

void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }

4663

int

4664

main ()

4665

@@ -3786,24 +4689,36 @@

4666

}

4667

_ACEOF

4668

rm -f conftest.$ac_objext

4669

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

4670

- (eval $ac_compile) 2>conftest.er1

4671

+if { (ac_try="$ac_compile"

4672

+case "(($ac_try" in

4673

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4674

+ *) ac_try_echo=$ac_try;;

4675

+esac

4676

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4677

+ (eval "$ac_compile") 2>conftest.er1

4678

ac_status=$?

4679

grep -v '^ *+' conftest.er1 >conftest.err

4680

rm -f conftest.er1

4681

cat conftest.err >&5

4682

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4683

(exit $ac_status); } &&

4684

- { ac_try='test -z "$ac_c_werror_flag"

4685

- || test ! -s conftest.err'

4686

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4687

- (eval $ac_try) 2>&5

4688

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

4689

+ { (case "(($ac_try" in

4690

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4691

+ *) ac_try_echo=$ac_try;;

4692

+esac

4693

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4694

+ (eval "$ac_try") 2>&5

4695

ac_status=$?

4696

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4697

(exit $ac_status); }; } &&

4698

{ ac_try='test -s conftest.$ac_objext'

4699

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4700

- (eval $ac_try) 2>&5

4701

+ { (case "(($ac_try" in

4702

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4703

+ *) ac_try_echo=$ac_try;;

4704

+esac

4705

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4706

+ (eval "$ac_try") 2>&5

4707

ac_status=$?

4708

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4709

(exit $ac_status); }; }; then

4710

@@ -3822,8 +4737,10 @@

4711

echo "$as_me: failed program was:" >&5

4712

sed 's/^/| /' conftest.$ac_ext >&5

4713

4714

4715

4716

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

4717

4718

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4719

else

4720

cat >conftest.$ac_ext <<_ACEOF

4721

/* confdefs.h. */

4722

@@ -3831,27 +4748,41 @@

4723

cat confdefs.h >>conftest.$ac_ext

4724

cat >>conftest.$ac_ext <<_ACEOF

4725

/* end confdefs.h. */

4726

+$ac_includes_default

4727

int

4728

main ()

4729

{

4730

4731

/* Are we little or big endian? From Harbison&Steele. */

4732

union

4733

{

4734

- long l;

4735

- char c[sizeof (long)];

4736

+ long int l;

4737

+ char c[sizeof (long int)];

4738

} u;

4739

u.l = 1;

4740

- exit (u.c[sizeof (long) - 1] == 1);

4741

+ return u.c[sizeof (long int) - 1] == 1;

4742

4743

+ ;

4744

+ return 0;

4745

}

4746

_ACEOF

4747

rm -f conftest$ac_exeext

4748

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

4749

- (eval $ac_link) 2>&5

4750

+if { (ac_try="$ac_link"

4751

+case "(($ac_try" in

4752

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4753

+ *) ac_try_echo=$ac_try;;

4754

+esac

4755

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4756

+ (eval "$ac_link") 2>&5

4757

ac_status=$?

4758

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4759

(exit $ac_status); } && { ac_try='./conftest$ac_exeext'

4760

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

4761

- (eval $ac_try) 2>&5

4762

+ { (case "(($ac_try" in

4763

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4764

+ *) ac_try_echo=$ac_try;;

4765

+esac

4766

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4767

+ (eval "$ac_try") 2>&5

4768

ac_status=$?

4769

echo "$as_me:$LINENO: \$? = $ac_status" >&5

4770

(exit $ac_status); }; }; then

4771

@@ -3864,13 +4795,16 @@

4772

( exit $ac_status )

4773

ac_cv_c_bigendian=yes

4774

4775

-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

4776

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

4777

4778

4779

4780

4781

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

4782

4783

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4784

4785

-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5

4786

-echo "${ECHO_T}$ac_cv_c_bigendian" >&6

4787

+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5

4788

+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }

4789

case $ac_cv_c_bigendian in

4790

yes)

4791

4792

@@ -3889,10 +4823,9 @@

4793

esac

4794

4795

4796

-# Check whether --enable-shared or --disable-shared was given.

4797

+# Check whether --enable-shared was given.

4798

if test "${enable_shared+set}" = set; then

4799

- enableval="$enable_shared"

4800

- p=${PACKAGE-default}

4801

+ enableval=$enable_shared; p=${PACKAGE-default}

4802

case $enableval in

4803

yes) enable_shared=yes ;;

4804

no) enable_shared=no ;;

4805

@@ -3911,12 +4844,12 @@

4806

esac

4807

else

4808

enable_shared=yes

4809

-fi;

4810

+fi

4811

4812

4813

-# Check whether --enable-static or --disable-static was given.

4814

+# Check whether --enable-static was given.

4815

if test "${enable_static+set}" = set; then

4816

- enableval="$enable_static"

4817

- p=${PACKAGE-default}

4818

+ enableval=$enable_static; p=${PACKAGE-default}

4819

case $enableval in

4820

yes) enable_static=yes ;;

4821

no) enable_static=no ;;

4822

@@ -3935,12 +4868,12 @@

4823

esac

4824

else

4825

enable_static=yes

4826

-fi;

4827

+fi

4828

4829

4830

-# Check whether --enable-fast-install or --disable-fast-install was given.

4831

+# Check whether --enable-fast-install was given.

4832

if test "${enable_fast_install+set}" = set; then

4833

- enableval="$enable_fast_install"

4834

- p=${PACKAGE-default}

4835

+ enableval=$enable_fast_install; p=${PACKAGE-default}

4836

case $enableval in

4837

yes) enable_fast_install=yes ;;

4838

no) enable_fast_install=no ;;

4839

@@ -3959,64 +4892,94 @@

4840

esac

4841

else

4842

enable_fast_install=yes

4843

-fi;

4844

+fi

4845

4846

4847

# Make sure we can run config.sub.

4848

-$ac_config_sub sun4 >/dev/null 2>&1 ||

4849

- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5

4850

-echo "$as_me: error: cannot run $ac_config_sub" >&2;}

4851

+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||

4852

+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5

4853

+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}

4854

{ (exit 1); exit 1; }; }

4855

4856

-echo "$as_me:$LINENO: checking build system type" >&5

4857

-echo $ECHO_N "checking build system type... $ECHO_C" >&6

4858

+{ echo "$as_me:$LINENO: checking build system type" >&5

4859

+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }

4860

if test "${ac_cv_build+set}" = set; then

4861

echo $ECHO_N "(cached) $ECHO_C" >&6

4862

else

4863

- ac_cv_build_alias=$build_alias

4864

-test -z "$ac_cv_build_alias" &&

4865

- ac_cv_build_alias=`$ac_config_guess`

4866

-test -z "$ac_cv_build_alias" &&

4867

+ ac_build_alias=$build_alias

4868

+test "x$ac_build_alias" = x &&

4869

+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`

4870

+test "x$ac_build_alias" = x &&

4871

{ { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5

4872

echo "$as_me: error: cannot guess build type; you must specify one" >&2;}

4873

{ (exit 1); exit 1; }; }

4874

-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||

4875

- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5

4876

-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}

4877

+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||

4878

+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5

4879

+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}

4880

{ (exit 1); exit 1; }; }

4881

4882

4883

-echo "$as_me:$LINENO: result: $ac_cv_build" >&5

4884

-echo "${ECHO_T}$ac_cv_build" >&6

4885

+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5

4886

+echo "${ECHO_T}$ac_cv_build" >&6; }

4887

+case $ac_cv_build in

4888

+*-*-*) ;;

4889

+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5

4890

+echo "$as_me: error: invalid value of canonical build" >&2;}

4891

+ { (exit 1); exit 1; }; };;

4892

+esac

4893

build=$ac_cv_build

4894

-build_cpu=`echo $ac_cv_build | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'`

4895

-build_vendor=`echo $ac_cv_build | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`

4896

-build_os=`echo $ac_cv_build | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`

4897

+ac_save_IFS=$IFS; IFS='-'

4898

+set x $ac_cv_build

4899

+shift

4900

+build_cpu=$1

4901

+build_vendor=$2

4902

+shift; shift

4903

+# Remember, the first character of IFS is used to create $*,

4904

+# except with old shells:

4905

+build_os=$*

4906

+IFS=$ac_save_IFS

4907

+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac

4908

4909

4910

-echo "$as_me:$LINENO: checking host system type" >&5

4911

-echo $ECHO_N "checking host system type... $ECHO_C" >&6

4912

+{ echo "$as_me:$LINENO: checking host system type" >&5

4913

+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }

4914

if test "${ac_cv_host+set}" = set; then

4915

echo $ECHO_N "(cached) $ECHO_C" >&6

4916

else

4917

- ac_cv_host_alias=$host_alias

4918

-test -z "$ac_cv_host_alias" &&

4919

- ac_cv_host_alias=$ac_cv_build_alias

4920

-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||

4921

- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5

4922

-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}

4923

+ if test "x$host_alias" = x; then

4924

+ ac_cv_host=$ac_cv_build

4925

+else

4926

+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||

4927

+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5

4928

+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}

4929

{ (exit 1); exit 1; }; }

4930

+fi

4931

4932

4933

-echo "$as_me:$LINENO: result: $ac_cv_host" >&5

4934

-echo "${ECHO_T}$ac_cv_host" >&6

4935

+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5

4936

+echo "${ECHO_T}$ac_cv_host" >&6; }

4937

+case $ac_cv_host in

4938

+*-*-*) ;;

4939

+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5

4940

+echo "$as_me: error: invalid value of canonical host" >&2;}

4941

+ { (exit 1); exit 1; }; };;

4942

+esac

4943

host=$ac_cv_host

4944

-host_cpu=`echo $ac_cv_host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'`

4945

-host_vendor=`echo $ac_cv_host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`

4946

-host_os=`echo $ac_cv_host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`

4947

+ac_save_IFS=$IFS; IFS='-'

4948

+set x $ac_cv_host

4949

+shift

4950

+host_cpu=$1

4951

+host_vendor=$2

4952

+shift; shift

4953

+# Remember, the first character of IFS is used to create $*,

4954

+# except with old shells:

4955

+host_os=$*

4956

+IFS=$ac_save_IFS

4957

+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac

4958

4959

4960

-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5

4961

-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6

4962

+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5

4963

+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }

4964

if test "${lt_cv_path_SED+set}" = set; then

4965

echo $ECHO_N "(cached) $ECHO_C" >&6

4966

else

4967

@@ -4035,7 +4998,6 @@

4968

done

4969

done

4970

done

4971

-IFS=$as_save_IFS

4972

lt_ac_max=0

4973

lt_ac_count=0

4974

# Add /usr/xpg4/bin/sed as it is typically found on Solaris

4975

@@ -4070,23 +5032,22 @@

4976

4977

4978

SED=$lt_cv_path_SED

4979

4980

-echo "$as_me:$LINENO: result: $SED" >&5

4981

-echo "${ECHO_T}$SED" >&6

4982

+{ echo "$as_me:$LINENO: result: $SED" >&5

4983

+echo "${ECHO_T}$SED" >&6; }

4984

4985

4986

-# Check whether --with-gnu-ld or --without-gnu-ld was given.

4987

+# Check whether --with-gnu-ld was given.

4988

if test "${with_gnu_ld+set}" = set; then

4989

- withval="$with_gnu_ld"

4990

- test "$withval" = no || with_gnu_ld=yes

4991

+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

4992

else

4993

with_gnu_ld=no

4994

-fi;

4995

+fi

4996

4997

ac_prog=ld

4998

if test "$GCC" = yes; then

4999

# Check if gcc -print-prog-name=ld gives a path.

5000

- echo "$as_me:$LINENO: checking for ld used by $CC" >&5

5001

-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6

5002

+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

5003

+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

5004

case $host in

5005

*-*-mingw*)

5006

# gcc leaves a trailing carriage return which upsets mingw

5007

@@ -4115,11 +5076,11 @@

5008

;;

5009

esac

5010

elif test "$with_gnu_ld" = yes; then

5011

- echo "$as_me:$LINENO: checking for GNU ld" >&5

5012

-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6

5013

+ { echo "$as_me:$LINENO: checking for GNU ld" >&5

5014

+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

5015

else

5016

- echo "$as_me:$LINENO: checking for non-GNU ld" >&5

5017

-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6

5018

+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

5019

+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

5020

5021

if test "${lt_cv_path_LD+set}" = set; then

5022

echo $ECHO_N "(cached) $ECHO_C" >&6

5023

@@ -4152,17 +5113,17 @@

5024

5025

LD="$lt_cv_path_LD"

5026

if test -n "$LD"; then

5027

- echo "$as_me:$LINENO: result: $LD" >&5

5028

-echo "${ECHO_T}$LD" >&6

5029

+ { echo "$as_me:$LINENO: result: $LD" >&5

5030

+echo "${ECHO_T}$LD" >&6; }

5031

else

5032

- echo "$as_me:$LINENO: result: no" >&5

5033

-echo "${ECHO_T}no" >&6

5034

+ { echo "$as_me:$LINENO: result: no" >&5

5035

+echo "${ECHO_T}no" >&6; }

5036

5037

test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

5038

echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

5039

{ (exit 1); exit 1; }; }

5040

-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

5041

-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6

5042

+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

5043

+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

5044

if test "${lt_cv_prog_gnu_ld+set}" = set; then

5045

echo $ECHO_N "(cached) $ECHO_C" >&6

5046

else

5047

@@ -4176,20 +5137,20 @@

5048

;;

5049

esac

5050

5051

-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

5052

-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6

5053

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

5054

+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

5055

with_gnu_ld=$lt_cv_prog_gnu_ld

5056

5057

5058

-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5

5059

-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6

5060

+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5

5061

+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }

5062

if test "${lt_cv_ld_reload_flag+set}" = set; then

5063

echo $ECHO_N "(cached) $ECHO_C" >&6

5064

else

5065

lt_cv_ld_reload_flag='-r'

5066

5067

-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5

5068

-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6

5069

+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5

5070

+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }

5071

reload_flag=$lt_cv_ld_reload_flag

5072

case $reload_flag in

5073

"" | " "*) ;;

5074

@@ -4206,8 +5167,8 @@

5075

;;

5076

esac

5077

5078

-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5

5079

-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6

5080

+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5

5081

+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }

5082

if test "${lt_cv_path_NM+set}" = set; then

5083

echo $ECHO_N "(cached) $ECHO_C" >&6

5084

else

5085

@@ -4255,23 +5216,23 @@

5086

test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm

5087

5088

5089

-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5

5090

-echo "${ECHO_T}$lt_cv_path_NM" >&6

5091

+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5

5092

+echo "${ECHO_T}$lt_cv_path_NM" >&6; }

5093

NM="$lt_cv_path_NM"

5094

5095

-echo "$as_me:$LINENO: checking whether ln -s works" >&5

5096

-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6

5097

+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5

5098

+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }

5099

LN_S=$as_ln_s

5100

if test "$LN_S" = "ln -s"; then

5101

- echo "$as_me:$LINENO: result: yes" >&5

5102

-echo "${ECHO_T}yes" >&6

5103

+ { echo "$as_me:$LINENO: result: yes" >&5

5104

+echo "${ECHO_T}yes" >&6; }

5105

else

5106

- echo "$as_me:$LINENO: result: no, using $LN_S" >&5

5107

-echo "${ECHO_T}no, using $LN_S" >&6

5108

+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5

5109

+echo "${ECHO_T}no, using $LN_S" >&6; }

5110

5111

5112

-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5

5113

-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6

5114

+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5

5115

+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }

5116

if test "${lt_cv_deplibs_check_method+set}" = set; then

5117

echo $ECHO_N "(cached) $ECHO_C" >&6

5118

else

5119

@@ -4321,7 +5282,7 @@

5120

lt_cv_deplibs_check_method=pass_all

5121

;;

5122

5123

-freebsd* | kfreebsd*-gnu | dragonfly*)

5124

+freebsd* | dragonfly*)

5125

if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

5126

case $host_cpu in

5127

i*86 )

5128

@@ -4375,11 +5336,11 @@

5129

;;

5130

5131

# This must be Linux ELF.

5132

-linux*)

5133

+linux* | k*bsd*-gnu)

5134

lt_cv_deplibs_check_method=pass_all

5135

;;

5136

5137

-netbsd*)

5138

+netbsd* | netbsdelf*-gnu)

5139

if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

5140

lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'

5141

else

5142

@@ -4446,8 +5407,8 @@

5143

esac

5144

5145

5146

-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5

5147

-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6

5148

+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5

5149

+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }

5150

file_magic_cmd=$lt_cv_file_magic_cmd

5151

deplibs_check_method=$lt_cv_deplibs_check_method

5152

test -z "$deplibs_check_method" && deplibs_check_method=unknown

5153

@@ -4464,11 +5425,11 @@

5154

# Allow CC to be a program name with arguments.

5155

compiler=$CC

5156

5157

-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.

5158

+# Check whether --enable-libtool-lock was given.

5159

if test "${enable_libtool_lock+set}" = set; then

5160

- enableval="$enable_libtool_lock"

5161

+ enableval=$enable_libtool_lock;

5162

+fi

5163

5164

-fi;

5165

test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

5166

5167

# Some flags need to be propagated to the compiler or linker for good

5168

@@ -4495,7 +5456,7 @@

5169

;;

5170

*-*-irix6*)

5171

# Find out which ABI we are using.

5172

- echo '#line 4498 "configure"' > conftest.$ac_ext

5173

+ echo '#line 5459 "configure"' > conftest.$ac_ext

5174

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5175

(eval $ac_compile) 2>&5

5176

ac_status=$?

5177

@@ -4580,8 +5541,8 @@

5178

# On SCO OpenServer 5, we need -belf to get full-featured binaries.

5179

SAVE_CFLAGS="$CFLAGS"

5180

CFLAGS="$CFLAGS -belf"

5181

- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5

5182

-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6

5183

+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5

5184

+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }

5185

if test "${lt_cv_cc_needs_belf+set}" = set; then

5186

echo $ECHO_N "(cached) $ECHO_C" >&6

5187

else

5188

@@ -4607,24 +5568,36 @@

5189

}

5190

_ACEOF

5191

rm -f conftest.$ac_objext conftest$ac_exeext

5192

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

5193

- (eval $ac_link) 2>conftest.er1

5194

+if { (ac_try="$ac_link"

5195

+case "(($ac_try" in

5196

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5197

+ *) ac_try_echo=$ac_try;;

5198

+esac

5199

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5200

+ (eval "$ac_link") 2>conftest.er1

5201

ac_status=$?

5202

grep -v '^ *+' conftest.er1 >conftest.err

5203

rm -f conftest.er1

5204

cat conftest.err >&5

5205

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5206

(exit $ac_status); } &&

5207

- { ac_try='test -z "$ac_c_werror_flag"

5208

- || test ! -s conftest.err'

5209

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5210

- (eval $ac_try) 2>&5

5211

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

5212

+ { (case "(($ac_try" in

5213

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5214

+ *) ac_try_echo=$ac_try;;

5215

+esac

5216

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5217

+ (eval "$ac_try") 2>&5

5218

ac_status=$?

5219

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5220

(exit $ac_status); }; } &&

5221

{ ac_try='test -s conftest$ac_exeext'

5222

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5223

- (eval $ac_try) 2>&5

5224

+ { (case "(($ac_try" in

5225

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5226

+ *) ac_try_echo=$ac_try;;

5227

+esac

5228

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5229

+ (eval "$ac_try") 2>&5

5230

ac_status=$?

5231

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5232

(exit $ac_status); }; }; then

5233

@@ -4633,9 +5606,10 @@

5234

echo "$as_me: failed program was:" >&5

5235

sed 's/^/| /' conftest.$ac_ext >&5

5236

5237

-lt_cv_cc_needs_belf=no

5238

+ lt_cv_cc_needs_belf=no

5239

5240

-rm -f conftest.err conftest.$ac_objext \

5241

5242

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

5243

conftest$ac_exeext conftest.$ac_ext

5244

ac_ext=c

5245

ac_cpp='$CPP $CPPFLAGS'

5246

@@ -4644,8 +5618,8 @@

5247

ac_compiler_gnu=$ac_cv_c_compiler_gnu

5248

5249

5250

-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5

5251

-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6

5252

+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5

5253

+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }

5254

if test x"$lt_cv_cc_needs_belf" != x"yes"; then

5255

# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf

5256

CFLAGS="$SAVE_CFLAGS"

5257

@@ -4677,94 +5651,23 @@

5258

need_locks="$enable_libtool_lock"

5259

5260

5261

-# On IRIX 5.3, sys/types and inttypes.h are conflicting.

5262

5263

5264

5265

5266

5267

5268

5269

5270

5271

-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

5272

- inttypes.h stdint.h unistd.h

5273

-do

5274

-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

5275

-echo "$as_me:$LINENO: checking for $ac_header" >&5

5276

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

5277

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

5278

- echo $ECHO_N "(cached) $ECHO_C" >&6

5279

-else

5280

- cat >conftest.$ac_ext <<_ACEOF

5281

-/* confdefs.h. */

5282

-_ACEOF

5283

-cat confdefs.h >>conftest.$ac_ext

5284

-cat >>conftest.$ac_ext <<_ACEOF

5285

-/* end confdefs.h. */

5286

-$ac_includes_default

5287

5288

-#include <$ac_header>

5289

-_ACEOF

5290

-rm -f conftest.$ac_objext

5291

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5292

- (eval $ac_compile) 2>conftest.er1

5293

- ac_status=$?

5294

- grep -v '^ *+' conftest.er1 >conftest.err

5295

- rm -f conftest.er1

5296

- cat conftest.err >&5

5297

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5298

- (exit $ac_status); } &&

5299

- { ac_try='test -z "$ac_c_werror_flag"

5300

- || test ! -s conftest.err'

5301

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5302

- (eval $ac_try) 2>&5

5303

- ac_status=$?

5304

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5305

- (exit $ac_status); }; } &&

5306

- { ac_try='test -s conftest.$ac_objext'

5307

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5308

- (eval $ac_try) 2>&5

5309

- ac_status=$?

5310

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

5311

- (exit $ac_status); }; }; then

5312

- eval "$as_ac_Header=yes"

5313

-else

5314

- echo "$as_me: failed program was:" >&5

5315

-sed 's/^/| /' conftest.$ac_ext >&5

5316

5317

-eval "$as_ac_Header=no"

5318

-fi

5319

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5320

-fi

5321

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

5322

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

5323

-if test `eval echo '${'$as_ac_Header'}'` = yes; then

5324

- cat >>confdefs.h <<_ACEOF

5325

-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

5326

-_ACEOF

5327

5328

-fi

5329

5330

-done

5331

5332

5333

5334

for ac_header in dlfcn.h

5335

5336

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

5337

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

5338

- echo "$as_me:$LINENO: checking for $ac_header" >&5

5339

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

5340

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

5341

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

5342

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

5343

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

5344

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

5345

echo $ECHO_N "(cached) $ECHO_C" >&6

5346

5347

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

5348

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

5349

+ac_res=`eval echo '${'$as_ac_Header'}'`

5350

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

5351

+echo "${ECHO_T}$ac_res" >&6; }

5352

else

5353

# Is the header compilable?

5354

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

5355

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

5356

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

5357

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

5358

cat >conftest.$ac_ext <<_ACEOF

5359

/* confdefs.h. */

5360

_ACEOF

5361

@@ -4775,24 +5678,36 @@

5362

#include <$ac_header>

5363

_ACEOF

5364

rm -f conftest.$ac_objext

5365

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5366

- (eval $ac_compile) 2>conftest.er1

5367

+if { (ac_try="$ac_compile"

5368

+case "(($ac_try" in

5369

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5370

+ *) ac_try_echo=$ac_try;;

5371

+esac

5372

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5373

+ (eval "$ac_compile") 2>conftest.er1

5374

ac_status=$?

5375

grep -v '^ *+' conftest.er1 >conftest.err

5376

rm -f conftest.er1

5377

cat conftest.err >&5

5378

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5379

(exit $ac_status); } &&

5380

- { ac_try='test -z "$ac_c_werror_flag"

5381

- || test ! -s conftest.err'

5382

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5383

- (eval $ac_try) 2>&5

5384

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

5385

+ { (case "(($ac_try" in

5386

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5387

+ *) ac_try_echo=$ac_try;;

5388

+esac

5389

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5390

+ (eval "$ac_try") 2>&5

5391

ac_status=$?

5392

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5393

(exit $ac_status); }; } &&

5394

{ ac_try='test -s conftest.$ac_objext'

5395

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5396

- (eval $ac_try) 2>&5

5397

+ { (case "(($ac_try" in

5398

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5399

+ *) ac_try_echo=$ac_try;;

5400

+esac

5401

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5402

+ (eval "$ac_try") 2>&5

5403

ac_status=$?

5404

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5405

(exit $ac_status); }; }; then

5406

@@ -4801,15 +5716,16 @@

5407

echo "$as_me: failed program was:" >&5

5408

sed 's/^/| /' conftest.$ac_ext >&5

5409

5410

-ac_header_compiler=no

5411

+ ac_header_compiler=no

5412

5413

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5414

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

5415

-echo "${ECHO_T}$ac_header_compiler" >&6

5416

5417

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5418

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

5419

+echo "${ECHO_T}$ac_header_compiler" >&6; }

5420

5421

# Is the header present?

5422

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

5423

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

5424

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

5425

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

5426

cat >conftest.$ac_ext <<_ACEOF

5427

/* confdefs.h. */

5428

_ACEOF

5429

@@ -4818,8 +5734,13 @@

5430

/* end confdefs.h. */

5431

#include <$ac_header>

5432

_ACEOF

5433

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

5434

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

5435

+if { (ac_try="$ac_cpp conftest.$ac_ext"

5436

+case "(($ac_try" in

5437

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5438

+ *) ac_try_echo=$ac_try;;

5439

+esac

5440

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5441

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

5442

ac_status=$?

5443

grep -v '^ *+' conftest.er1 >conftest.err

5444

rm -f conftest.er1

5445

@@ -4843,9 +5764,10 @@

5446

5447

ac_header_preproc=no

5448

5449

5450

rm -f conftest.err conftest.$ac_ext

5451

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

5452

-echo "${ECHO_T}$ac_header_preproc" >&6

5453

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

5454

+echo "${ECHO_T}$ac_header_preproc" >&6; }

5455

5456

# So? What about this header?

5457

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

5458

@@ -4869,25 +5791,24 @@

5459

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

5460

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

5461

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

5462

- (

5463

- cat <<\_ASBOX

5464

+ ( cat <<\_ASBOX

5465

## ------------------------------------------------------------------- ##

5466

## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=vino ##

5467

## ------------------------------------------------------------------- ##

5468

_ASBOX

5469

- ) |

5470

- sed "s/^/$as_me: WARNING: /" >&2

5471

+ ) | sed "s/^/$as_me: WARNING: /" >&2

5472

;;

5473

esac

5474

-echo "$as_me:$LINENO: checking for $ac_header" >&5

5475

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

5476

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

5477

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

5478

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

5479

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

5480

echo $ECHO_N "(cached) $ECHO_C" >&6

5481

else

5482

eval "$as_ac_Header=\$ac_header_preproc"

5483

5484

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

5485

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

5486

+ac_res=`eval echo '${'$as_ac_Header'}'`

5487

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

5488

+echo "${ECHO_T}$ac_res" >&6; }

5489

5490

5491

if test `eval echo '${'$as_ac_Header'}'` = yes; then

5492

@@ -4899,18 +5820,22 @@

5493

5494

done

5495

5496

-ac_ext=cc

5497

+ac_ext=cpp

5498

ac_cpp='$CXXCPP $CPPFLAGS'

5499

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

5500

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

5501

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

5502

-if test -n "$ac_tool_prefix"; then

5503

- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC

5504

+if test -z "$CXX"; then

5505

+ if test -n "$CCC"; then

5506

+ CXX=$CCC

5507

+ else

5508

+ if test -n "$ac_tool_prefix"; then

5509

+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

5510

5511

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

5512

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

5513

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5514

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5515

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5516

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5517

if test "${ac_cv_prog_CXX+set}" = set; then

5518

echo $ECHO_N "(cached) $ECHO_C" >&6

5519

else

5520

@@ -4923,36 +5848,38 @@

5521

IFS=$as_save_IFS

5522

test -z "$as_dir" && as_dir=.

5523

for ac_exec_ext in '' $ac_executable_extensions; do

5524

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5525

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

5526

ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

5527

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5528

break 2

5529

5530

done

5531

done

5532

+IFS=$as_save_IFS

5533

5534

5535

5536

CXX=$ac_cv_prog_CXX

5537

if test -n "$CXX"; then

5538

- echo "$as_me:$LINENO: result: $CXX" >&5

5539

-echo "${ECHO_T}$CXX" >&6

5540

+ { echo "$as_me:$LINENO: result: $CXX" >&5

5541

+echo "${ECHO_T}$CXX" >&6; }

5542

else

5543

- echo "$as_me:$LINENO: result: no" >&5

5544

-echo "${ECHO_T}no" >&6

5545

+ { echo "$as_me:$LINENO: result: no" >&5

5546

+echo "${ECHO_T}no" >&6; }

5547

5548

5549

5550

test -n "$CXX" && break

5551

done

5552

5553

if test -z "$CXX"; then

5554

ac_ct_CXX=$CXX

5555

- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC

5556

+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC

5557

5558

# Extract the first word of "$ac_prog", so it can be a program name with args.

5559

set dummy $ac_prog; ac_word=$2

5560

-echo "$as_me:$LINENO: checking for $ac_word" >&5

5561

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

5562

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5563

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5564

if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then

5565

echo $ECHO_N "(cached) $ECHO_C" >&6

5566

else

5567

@@ -4965,55 +5892,85 @@

5568

IFS=$as_save_IFS

5569

test -z "$as_dir" && as_dir=.

5570

for ac_exec_ext in '' $ac_executable_extensions; do

5571

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

5572

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

5573

ac_cv_prog_ac_ct_CXX="$ac_prog"

5574

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5575

break 2

5576

5577

done

5578

done

5579

+IFS=$as_save_IFS

5580

5581

5582

5583

ac_ct_CXX=$ac_cv_prog_ac_ct_CXX

5584

if test -n "$ac_ct_CXX"; then

5585

- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

5586

-echo "${ECHO_T}$ac_ct_CXX" >&6

5587

+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

5588

+echo "${ECHO_T}$ac_ct_CXX" >&6; }

5589

else

5590

- echo "$as_me:$LINENO: result: no" >&5

5591

-echo "${ECHO_T}no" >&6

5592

+ { echo "$as_me:$LINENO: result: no" >&5

5593

+echo "${ECHO_T}no" >&6; }

5594

5595

5596

5597

test -n "$ac_ct_CXX" && break

5598

done

5599

-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"

5600

5601

- CXX=$ac_ct_CXX

5602

+ if test "x$ac_ct_CXX" = x; then

5603

+ CXX="g++"

5604

+ else

5605

+ case $cross_compiling:$ac_tool_warned in

5606

+yes:)

5607

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

5608

+whose name does not start with the host triplet. If you think this

5609

+configuration is useful to you, please write to autoconf@gnu.org." >&5

5610

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

5611

+whose name does not start with the host triplet. If you think this

5612

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

5613

+ac_tool_warned=yes ;;

5614

+esac

5615

+ CXX=$ac_ct_CXX

5616

+ fi

5617

5618

5619

5620

+ fi

5621

+fi

5622

# Provide some information about the compiler.

5623

-echo "$as_me:$LINENO:" \

5624

- "checking for C++ compiler version" >&5

5625

+echo "$as_me:$LINENO: checking for C++ compiler version" >&5

5626

ac_compiler=`set X $ac_compile; echo $2`

5627

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5

5628

- (eval $ac_compiler --version </dev/null >&5) 2>&5

5629

+{ (ac_try="$ac_compiler --version >&5"

5630

+case "(($ac_try" in

5631

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5632

+ *) ac_try_echo=$ac_try;;

5633

+esac

5634

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5635

+ (eval "$ac_compiler --version >&5") 2>&5

5636

ac_status=$?

5637

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5638

(exit $ac_status); }

5639

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5

5640

- (eval $ac_compiler -v </dev/null >&5) 2>&5

5641

+{ (ac_try="$ac_compiler -v >&5"

5642

+case "(($ac_try" in

5643

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5644

+ *) ac_try_echo=$ac_try;;

5645

+esac

5646

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5647

+ (eval "$ac_compiler -v >&5") 2>&5

5648

ac_status=$?

5649

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5650

(exit $ac_status); }

5651

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5

5652

- (eval $ac_compiler -V </dev/null >&5) 2>&5

5653

+{ (ac_try="$ac_compiler -V >&5"

5654

+case "(($ac_try" in

5655

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5656

+ *) ac_try_echo=$ac_try;;

5657

+esac

5658

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5659

+ (eval "$ac_compiler -V >&5") 2>&5

5660

ac_status=$?

5661

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5662

(exit $ac_status); }

5663

5664

-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

5665

-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6

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

if test "${ac_cv_cxx_compiler_gnu+set}" = set; then

5669

echo $ECHO_N "(cached) $ECHO_C" >&6

5670

else

5671

@@ -5036,24 +5993,36 @@

5672

}

5673

_ACEOF

5674

rm -f conftest.$ac_objext

5675

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5676

- (eval $ac_compile) 2>conftest.er1

5677

+if { (ac_try="$ac_compile"

5678

+case "(($ac_try" in

5679

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5680

+ *) ac_try_echo=$ac_try;;

5681

+esac

5682

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5683

+ (eval "$ac_compile") 2>conftest.er1

5684

ac_status=$?

5685

grep -v '^ *+' conftest.er1 >conftest.err

5686

rm -f conftest.er1

5687

cat conftest.err >&5

5688

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5689

(exit $ac_status); } &&

5690

- { ac_try='test -z "$ac_cxx_werror_flag"

5691

- || test ! -s conftest.err'

5692

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5693

- (eval $ac_try) 2>&5

5694

+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

5695

+ { (case "(($ac_try" in

5696

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5697

+ *) ac_try_echo=$ac_try;;

5698

+esac

5699

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5700

+ (eval "$ac_try") 2>&5

5701

ac_status=$?

5702

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5703

(exit $ac_status); }; } &&

5704

{ ac_try='test -s conftest.$ac_objext'

5705

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5706

- (eval $ac_try) 2>&5

5707

+ { (case "(($ac_try" in

5708

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5709

+ *) ac_try_echo=$ac_try;;

5710

+esac

5711

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5712

+ (eval "$ac_try") 2>&5

5713

ac_status=$?

5714

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5715

(exit $ac_status); }; }; then

5716

@@ -5062,24 +6031,28 @@

5717

echo "$as_me: failed program was:" >&5

5718

sed 's/^/| /' conftest.$ac_ext >&5

5719

5720

-ac_compiler_gnu=no

5721

+ ac_compiler_gnu=no

5722

5723

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5724

5725

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5726

ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

5727

5728

5729

-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

5730

-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6

5731

+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

5732

+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }

5733

GXX=`test $ac_compiler_gnu = yes && echo yes`

5734

ac_test_CXXFLAGS=${CXXFLAGS+set}

5735

ac_save_CXXFLAGS=$CXXFLAGS

5736

-CXXFLAGS="-g"

5737

-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

5738

-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6

5739

+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

5740

+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }

5741

if test "${ac_cv_prog_cxx_g+set}" = set; then

5742

echo $ECHO_N "(cached) $ECHO_C" >&6

5743

else

5744

- cat >conftest.$ac_ext <<_ACEOF

5745

+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag

5746

+ ac_cxx_werror_flag=yes

5747

+ ac_cv_prog_cxx_g=no

5748

+ CXXFLAGS="-g"

5749

+ cat >conftest.$ac_ext <<_ACEOF

5750

/* confdefs.h. */

5751

_ACEOF

5752

cat confdefs.h >>conftest.$ac_ext

5753

@@ -5095,24 +6068,36 @@

5754

}

5755

_ACEOF

5756

rm -f conftest.$ac_objext

5757

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5758

- (eval $ac_compile) 2>conftest.er1

5759

+if { (ac_try="$ac_compile"

5760

+case "(($ac_try" in

5761

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5762

+ *) ac_try_echo=$ac_try;;

5763

+esac

5764

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5765

+ (eval "$ac_compile") 2>conftest.er1

5766

ac_status=$?

5767

grep -v '^ *+' conftest.er1 >conftest.err

5768

rm -f conftest.er1

5769

cat conftest.err >&5

5770

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5771

(exit $ac_status); } &&

5772

- { ac_try='test -z "$ac_cxx_werror_flag"

5773

- || test ! -s conftest.err'

5774

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5775

- (eval $ac_try) 2>&5

5776

+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

5777

+ { (case "(($ac_try" in

5778

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5779

+ *) ac_try_echo=$ac_try;;

5780

+esac

5781

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5782

+ (eval "$ac_try") 2>&5

5783

ac_status=$?

5784

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5785

(exit $ac_status); }; } &&

5786

{ ac_try='test -s conftest.$ac_objext'

5787

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5788

- (eval $ac_try) 2>&5

5789

+ { (case "(($ac_try" in

5790

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5791

+ *) ac_try_echo=$ac_try;;

5792

+esac

5793

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5794

+ (eval "$ac_try") 2>&5

5795

ac_status=$?

5796

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5797

(exit $ac_status); }; }; then

5798

@@ -5121,70 +6106,53 @@

5799

echo "$as_me: failed program was:" >&5

5800

sed 's/^/| /' conftest.$ac_ext >&5

5801

5802

-ac_cv_prog_cxx_g=no

5803

-fi

5804

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5805

-fi

5806

-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

5807

-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6

5808

-if test "$ac_test_CXXFLAGS" = set; then

5809

- CXXFLAGS=$ac_save_CXXFLAGS

5810

-elif test $ac_cv_prog_cxx_g = yes; then

5811

- if test "$GXX" = yes; then

5812

- CXXFLAGS="-g -O2"

5813

- else

5814

- CXXFLAGS="-g"

5815

- fi

5816

-else

5817

- if test "$GXX" = yes; then

5818

- CXXFLAGS="-O2"

5819

- else

5820

- CXXFLAGS=

5821

- fi

5822

-fi

5823

-for ac_declaration in \

5824

- '' \

5825

- 'extern "C" void std::exit (int) throw (); using std::exit;' \

5826

- 'extern "C" void std::exit (int); using std::exit;' \

5827

- 'extern "C" void exit (int) throw ();' \

5828

- 'extern "C" void exit (int);' \

5829

- 'void exit (int);'

5830

-do

5831

- cat >conftest.$ac_ext <<_ACEOF

5832

+ CXXFLAGS=""

5833

+ cat >conftest.$ac_ext <<_ACEOF

5834

/* confdefs.h. */

5835

_ACEOF

5836

cat confdefs.h >>conftest.$ac_ext

5837

cat >>conftest.$ac_ext <<_ACEOF

5838

/* end confdefs.h. */

5839

-$ac_declaration

5840

-#include <stdlib.h>

5841

5842

int

5843

main ()

5844

{

5845

-exit (42);

5846

5847

;

5848

return 0;

5849

}

5850

_ACEOF

5851

rm -f conftest.$ac_objext

5852

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5853

- (eval $ac_compile) 2>conftest.er1

5854

+if { (ac_try="$ac_compile"

5855

+case "(($ac_try" in

5856

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5857

+ *) ac_try_echo=$ac_try;;

5858

+esac

5859

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5860

+ (eval "$ac_compile") 2>conftest.er1

5861

ac_status=$?

5862

grep -v '^ *+' conftest.er1 >conftest.err

5863

rm -f conftest.er1

5864

cat conftest.err >&5

5865

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5866

(exit $ac_status); } &&

5867

- { ac_try='test -z "$ac_cxx_werror_flag"

5868

- || test ! -s conftest.err'

5869

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5870

- (eval $ac_try) 2>&5

5871

+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

5872

+ { (case "(($ac_try" in

5873

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5874

+ *) ac_try_echo=$ac_try;;

5875

+esac

5876

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5877

+ (eval "$ac_try") 2>&5

5878

ac_status=$?

5879

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5880

(exit $ac_status); }; } &&

5881

{ ac_try='test -s conftest.$ac_objext'

5882

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5883

- (eval $ac_try) 2>&5

5884

+ { (case "(($ac_try" in

5885

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5886

+ *) ac_try_echo=$ac_try;;

5887

+esac

5888

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5889

+ (eval "$ac_try") 2>&5

5890

ac_status=$?

5891

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5892

(exit $ac_status); }; }; then

5893

@@ -5193,71 +6161,101 @@

5894

echo "$as_me: failed program was:" >&5

5895

sed 's/^/| /' conftest.$ac_ext >&5

5896

5897

-continue

5898

-fi

5899

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5900

- cat >conftest.$ac_ext <<_ACEOF

5901

+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag

5902

+ CXXFLAGS="-g"

5903

+ cat >conftest.$ac_ext <<_ACEOF

5904

/* confdefs.h. */

5905

_ACEOF

5906

cat confdefs.h >>conftest.$ac_ext

5907

cat >>conftest.$ac_ext <<_ACEOF

5908

/* end confdefs.h. */

5909

-$ac_declaration

5910

5911

int

5912

main ()

5913

{

5914

-exit (42);

5915

5916

;

5917

return 0;

5918

}

5919

_ACEOF

5920

rm -f conftest.$ac_objext

5921

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

5922

- (eval $ac_compile) 2>conftest.er1

5923

+if { (ac_try="$ac_compile"

5924

+case "(($ac_try" in

5925

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5926

+ *) ac_try_echo=$ac_try;;

5927

+esac

5928

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5929

+ (eval "$ac_compile") 2>conftest.er1

5930

ac_status=$?

5931

grep -v '^ *+' conftest.er1 >conftest.err

5932

rm -f conftest.er1

5933

cat conftest.err >&5

5934

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5935

(exit $ac_status); } &&

5936

- { ac_try='test -z "$ac_cxx_werror_flag"

5937

- || test ! -s conftest.err'

5938

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5939

- (eval $ac_try) 2>&5

5940

+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

5941

+ { (case "(($ac_try" in

5942

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5943

+ *) ac_try_echo=$ac_try;;

5944

+esac

5945

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5946

+ (eval "$ac_try") 2>&5

5947

ac_status=$?

5948

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5949

(exit $ac_status); }; } &&

5950

{ ac_try='test -s conftest.$ac_objext'

5951

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

5952

- (eval $ac_try) 2>&5

5953

+ { (case "(($ac_try" in

5954

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5955

+ *) ac_try_echo=$ac_try;;

5956

+esac

5957

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5958

+ (eval "$ac_try") 2>&5

5959

ac_status=$?

5960

echo "$as_me:$LINENO: \$? = $ac_status" >&5

5961

(exit $ac_status); }; }; then

5962

- break

5963

+ ac_cv_prog_cxx_g=yes

5964

else

5965

echo "$as_me: failed program was:" >&5

5966

sed 's/^/| /' conftest.$ac_ext >&5

5967

5968

-fi

5969

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

5970

-done

5971

-rm -f conftest*

5972

-if test -n "$ac_declaration"; then

5973

- echo '#ifdef __cplusplus' >>confdefs.h

5974

- echo $ac_declaration >>confdefs.h

5975

- echo '#endif' >>confdefs.h

5976

5977

5978

5979

-ac_ext=cc

5980

-ac_cpp='$CXXCPP $CPPFLAGS'

5981

-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

5982

-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

5983

-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

5984

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5985

+fi

5986

5987

-depcc="$CXX" am_compiler_list=

5988

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5989

+fi

5990

5991

-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

5992

-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6

5993

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5994

+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag

5995

+fi

5996

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

5997

+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }

5998

+if test "$ac_test_CXXFLAGS" = set; then

5999

+ CXXFLAGS=$ac_save_CXXFLAGS

6000

+elif test $ac_cv_prog_cxx_g = yes; then

6001

+ if test "$GXX" = yes; then

6002

+ CXXFLAGS="-g -O2"

6003

+ else

6004

+ CXXFLAGS="-g"

6005

+ fi

6006

+else

6007

+ if test "$GXX" = yes; then

6008

+ CXXFLAGS="-O2"

6009

+ else

6010

+ CXXFLAGS=

6011

+ fi

6012

+fi

6013

+ac_ext=cpp

6014

+ac_cpp='$CXXCPP $CPPFLAGS'

6015

+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

6016

+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

6017

+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

6018

6019

+depcc="$CXX" am_compiler_list=

6020

6021

+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

6022

+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

6023

if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then

6024

echo $ECHO_N "(cached) $ECHO_C" >&6

6025

else

6026

@@ -5346,8 +6344,8 @@

6027

6028

6029

6030

-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5

6031

-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6

6032

+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5

6033

+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }

6034

CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

6035

6036

6037

@@ -5368,13 +6366,13 @@

6038

if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

6039

( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

6040

(test "X$CXX" != "Xg++"))) ; then

6041

- ac_ext=cc

6042

+ ac_ext=cpp

6043

ac_cpp='$CXXCPP $CPPFLAGS'

6044

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

6045

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

6046

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

6047

-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5

6048

-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6

6049

+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5

6050

+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }

6051

if test -z "$CXXCPP"; then

6052

if test "${ac_cv_prog_CXXCPP+set}" = set; then

6053

echo $ECHO_N "(cached) $ECHO_C" >&6

6054

@@ -5404,8 +6402,13 @@

6055

#endif

6056

Syntax error

6057

_ACEOF

6058

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

6059

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

6060

+if { (ac_try="$ac_cpp conftest.$ac_ext"

6061

+case "(($ac_try" in

6062

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6063

+ *) ac_try_echo=$ac_try;;

6064

+esac

6065

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6066

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6067

ac_status=$?

6068

grep -v '^ *+' conftest.er1 >conftest.err

6069

rm -f conftest.er1

6070

@@ -5430,9 +6433,10 @@

6071

# Broken: fails on valid input.

6072

continue

6073

6074

6075

rm -f conftest.err conftest.$ac_ext

6076

6077

- # OK, works on sane cases. Now check whether non-existent headers

6078

+ # OK, works on sane cases. Now check whether nonexistent headers

6079

# can be detected and how.

6080

cat >conftest.$ac_ext <<_ACEOF

6081

/* confdefs.h. */

6082

@@ -5442,8 +6446,13 @@

6083

/* end confdefs.h. */

6084

#include <ac_nonexistent.h>

6085

_ACEOF

6086

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

6087

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

6088

+if { (ac_try="$ac_cpp conftest.$ac_ext"

6089

+case "(($ac_try" in

6090

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6091

+ *) ac_try_echo=$ac_try;;

6092

+esac

6093

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6094

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6095

ac_status=$?

6096

grep -v '^ *+' conftest.er1 >conftest.err

6097

rm -f conftest.er1

6098

@@ -5470,6 +6479,7 @@

6099

ac_preproc_ok=:

6100

break

6101

6102

6103

rm -f conftest.err conftest.$ac_ext

6104

6105

done

6106

@@ -5487,8 +6497,8 @@

6107

else

6108

ac_cv_prog_CXXCPP=$CXXCPP

6109

6110

-echo "$as_me:$LINENO: result: $CXXCPP" >&5

6111

-echo "${ECHO_T}$CXXCPP" >&6

6112

+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5

6113

+echo "${ECHO_T}$CXXCPP" >&6; }

6114

ac_preproc_ok=false

6115

for ac_cxx_preproc_warn_flag in '' yes

6116

6117

@@ -5511,8 +6521,13 @@

6118

#endif

6119

Syntax error

6120

_ACEOF

6121

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

6122

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

6123

+if { (ac_try="$ac_cpp conftest.$ac_ext"

6124

+case "(($ac_try" in

6125

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6126

+ *) ac_try_echo=$ac_try;;

6127

+esac

6128

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6129

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6130

ac_status=$?

6131

grep -v '^ *+' conftest.er1 >conftest.err

6132

rm -f conftest.er1

6133

@@ -5537,9 +6552,10 @@

6134

# Broken: fails on valid input.

6135

continue

6136

6137

6138

rm -f conftest.err conftest.$ac_ext

6139

6140

- # OK, works on sane cases. Now check whether non-existent headers

6141

+ # OK, works on sane cases. Now check whether nonexistent headers

6142

# can be detected and how.

6143

cat >conftest.$ac_ext <<_ACEOF

6144

/* confdefs.h. */

6145

@@ -5549,8 +6565,13 @@

6146

/* end confdefs.h. */

6147

#include <ac_nonexistent.h>

6148

_ACEOF

6149

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

6150

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

6151

+if { (ac_try="$ac_cpp conftest.$ac_ext"

6152

+case "(($ac_try" in

6153

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6154

+ *) ac_try_echo=$ac_try;;

6155

+esac

6156

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6157

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6158

ac_status=$?

6159

grep -v '^ *+' conftest.er1 >conftest.err

6160

rm -f conftest.er1

6161

@@ -5577,6 +6598,7 @@

6162

ac_preproc_ok=:

6163

break

6164

6165

6166

rm -f conftest.err conftest.$ac_ext

6167

6168

done

6169

@@ -5592,7 +6614,7 @@

6170

{ (exit 1); exit 1; }; }

6171

6172

6173

-ac_ext=cc

6174

+ac_ext=cpp

6175

ac_cpp='$CXXCPP $CPPFLAGS'

6176

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

6177

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

6178

@@ -5606,12 +6628,12 @@

6179

ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

6180

ac_compiler_gnu=$ac_cv_f77_compiler_gnu

6181

if test -n "$ac_tool_prefix"; then

6182

- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran

6183

+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn

6184

6185

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

6186

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

6187

-echo "$as_me:$LINENO: checking for $ac_word" >&5

6188

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

6189

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6190

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6191

if test "${ac_cv_prog_F77+set}" = set; then

6192

echo $ECHO_N "(cached) $ECHO_C" >&6

6193

else

6194

@@ -5624,36 +6646,38 @@

6195

IFS=$as_save_IFS

6196

test -z "$as_dir" && as_dir=.

6197

for ac_exec_ext in '' $ac_executable_extensions; do

6198

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

6199

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

6200

ac_cv_prog_F77="$ac_tool_prefix$ac_prog"

6201

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6202

break 2

6203

6204

done

6205

done

6206

+IFS=$as_save_IFS

6207

6208

6209

6210

F77=$ac_cv_prog_F77

6211

if test -n "$F77"; then

6212

- echo "$as_me:$LINENO: result: $F77" >&5

6213

-echo "${ECHO_T}$F77" >&6

6214

+ { echo "$as_me:$LINENO: result: $F77" >&5

6215

+echo "${ECHO_T}$F77" >&6; }

6216

else

6217

- echo "$as_me:$LINENO: result: no" >&5

6218

-echo "${ECHO_T}no" >&6

6219

+ { echo "$as_me:$LINENO: result: no" >&5

6220

+echo "${ECHO_T}no" >&6; }

6221

6222

6223

6224

test -n "$F77" && break

6225

done

6226

6227

if test -z "$F77"; then

6228

ac_ct_F77=$F77

6229

- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran

6230

+ for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn

6231

6232

# Extract the first word of "$ac_prog", so it can be a program name with args.

6233

set dummy $ac_prog; ac_word=$2

6234

-echo "$as_me:$LINENO: checking for $ac_word" >&5

6235

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

6236

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6237

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6238

if test "${ac_cv_prog_ac_ct_F77+set}" = set; then

6239

echo $ECHO_N "(cached) $ECHO_C" >&6

6240

else

6241

@@ -5666,48 +6690,78 @@

6242

IFS=$as_save_IFS

6243

test -z "$as_dir" && as_dir=.

6244

for ac_exec_ext in '' $ac_executable_extensions; do

6245

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

6246

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

6247

ac_cv_prog_ac_ct_F77="$ac_prog"

6248

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6249

break 2

6250

6251

done

6252

done

6253

+IFS=$as_save_IFS

6254

6255

6256

6257

ac_ct_F77=$ac_cv_prog_ac_ct_F77

6258

if test -n "$ac_ct_F77"; then

6259

- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5

6260

-echo "${ECHO_T}$ac_ct_F77" >&6

6261

+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5

6262

+echo "${ECHO_T}$ac_ct_F77" >&6; }

6263

else

6264

- echo "$as_me:$LINENO: result: no" >&5

6265

-echo "${ECHO_T}no" >&6

6266

+ { echo "$as_me:$LINENO: result: no" >&5

6267

+echo "${ECHO_T}no" >&6; }

6268

6269

6270

6271

test -n "$ac_ct_F77" && break

6272

done

6273

6274

- F77=$ac_ct_F77

6275

+ if test "x$ac_ct_F77" = x; then

6276

+ F77=""

6277

+ else

6278

+ case $cross_compiling:$ac_tool_warned in

6279

+yes:)

6280

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6281

+whose name does not start with the host triplet. If you think this

6282

+configuration is useful to you, please write to autoconf@gnu.org." >&5

6283

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6284

+whose name does not start with the host triplet. If you think this

6285

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6286

+ac_tool_warned=yes ;;

6287

+esac

6288

+ F77=$ac_ct_F77

6289

+ fi

6290

6291

6292

6293

# Provide some information about the compiler.

6294

-echo "$as_me:5696:" \

6295

- "checking for Fortran 77 compiler version" >&5

6296

+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5

6297

ac_compiler=`set X $ac_compile; echo $2`

6298

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5

6299

- (eval $ac_compiler --version </dev/null >&5) 2>&5

6300

+{ (ac_try="$ac_compiler --version >&5"

6301

+case "(($ac_try" in

6302

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6303

+ *) ac_try_echo=$ac_try;;

6304

+esac

6305

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6306

+ (eval "$ac_compiler --version >&5") 2>&5

6307

ac_status=$?

6308

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6309

(exit $ac_status); }

6310

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5

6311

- (eval $ac_compiler -v </dev/null >&5) 2>&5

6312

+{ (ac_try="$ac_compiler -v >&5"

6313

+case "(($ac_try" in

6314

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6315

+ *) ac_try_echo=$ac_try;;

6316

+esac

6317

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6318

+ (eval "$ac_compiler -v >&5") 2>&5

6319

ac_status=$?

6320

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6321

(exit $ac_status); }

6322

-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5

6323

- (eval $ac_compiler -V </dev/null >&5) 2>&5

6324

+{ (ac_try="$ac_compiler -V >&5"

6325

+case "(($ac_try" in

6326

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6327

+ *) ac_try_echo=$ac_try;;

6328

+esac

6329

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6330

+ (eval "$ac_compiler -V >&5") 2>&5

6331

ac_status=$?

6332

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6333

(exit $ac_status); }

6334

@@ -5717,8 +6771,8 @@

6335

# input file. (Note that this only needs to work for GNU compilers.)

6336

ac_save_ext=$ac_ext

6337

ac_ext=F

6338

-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5

6339

-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6

6340

+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5

6341

+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }

6342

if test "${ac_cv_f77_compiler_gnu+set}" = set; then

6343

echo $ECHO_N "(cached) $ECHO_C" >&6

6344

else

6345

@@ -5731,24 +6785,36 @@

6346

end

6347

_ACEOF

6348

rm -f conftest.$ac_objext

6349

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6350

- (eval $ac_compile) 2>conftest.er1

6351

+if { (ac_try="$ac_compile"

6352

+case "(($ac_try" in

6353

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6354

+ *) ac_try_echo=$ac_try;;

6355

+esac

6356

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6357

+ (eval "$ac_compile") 2>conftest.er1

6358

ac_status=$?

6359

grep -v '^ *+' conftest.er1 >conftest.err

6360

rm -f conftest.er1

6361

cat conftest.err >&5

6362

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6363

(exit $ac_status); } &&

6364

- { ac_try='test -z "$ac_f77_werror_flag"

6365

- || test ! -s conftest.err'

6366

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6367

- (eval $ac_try) 2>&5

6368

+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'

6369

+ { (case "(($ac_try" in

6370

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6371

+ *) ac_try_echo=$ac_try;;

6372

+esac

6373

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6374

+ (eval "$ac_try") 2>&5

6375

ac_status=$?

6376

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6377

(exit $ac_status); }; } &&

6378

{ ac_try='test -s conftest.$ac_objext'

6379

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6380

- (eval $ac_try) 2>&5

6381

+ { (case "(($ac_try" in

6382

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6383

+ *) ac_try_echo=$ac_try;;

6384

+esac

6385

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6386

+ (eval "$ac_try") 2>&5

6387

ac_status=$?

6388

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6389

(exit $ac_status); }; }; then

6390

@@ -5757,20 +6823,21 @@

6391

echo "$as_me: failed program was:" >&5

6392

sed 's/^/| /' conftest.$ac_ext >&5

6393

6394

-ac_compiler_gnu=no

6395

+ ac_compiler_gnu=no

6396

6397

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

6398

6399

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6400

ac_cv_f77_compiler_gnu=$ac_compiler_gnu

6401

6402

6403

-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5

6404

-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6

6405

+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5

6406

+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }

6407

ac_ext=$ac_save_ext

6408

ac_test_FFLAGS=${FFLAGS+set}

6409

ac_save_FFLAGS=$FFLAGS

6410

FFLAGS=

6411

-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5

6412

-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6

6413

+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5

6414

+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }

6415

if test "${ac_cv_prog_f77_g+set}" = set; then

6416

echo $ECHO_N "(cached) $ECHO_C" >&6

6417

else

6418

@@ -5781,24 +6848,36 @@

6419

end

6420

_ACEOF

6421

rm -f conftest.$ac_objext

6422

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6423

- (eval $ac_compile) 2>conftest.er1

6424

+if { (ac_try="$ac_compile"

6425

+case "(($ac_try" in

6426

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6427

+ *) ac_try_echo=$ac_try;;

6428

+esac

6429

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6430

+ (eval "$ac_compile") 2>conftest.er1

6431

ac_status=$?

6432

grep -v '^ *+' conftest.er1 >conftest.err

6433

rm -f conftest.er1

6434

cat conftest.err >&5

6435

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6436

(exit $ac_status); } &&

6437

- { ac_try='test -z "$ac_f77_werror_flag"

6438

- || test ! -s conftest.err'

6439

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6440

- (eval $ac_try) 2>&5

6441

+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'

6442

+ { (case "(($ac_try" in

6443

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6444

+ *) ac_try_echo=$ac_try;;

6445

+esac

6446

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6447

+ (eval "$ac_try") 2>&5

6448

ac_status=$?

6449

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6450

(exit $ac_status); }; } &&

6451

{ ac_try='test -s conftest.$ac_objext'

6452

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

6453

- (eval $ac_try) 2>&5

6454

+ { (case "(($ac_try" in

6455

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6456

+ *) ac_try_echo=$ac_try;;

6457

+esac

6458

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6459

+ (eval "$ac_try") 2>&5

6460

ac_status=$?

6461

echo "$as_me:$LINENO: \$? = $ac_status" >&5

6462

(exit $ac_status); }; }; then

6463

@@ -5807,13 +6886,14 @@

6464

echo "$as_me: failed program was:" >&5

6465

sed 's/^/| /' conftest.$ac_ext >&5

6466

6467

-ac_cv_prog_f77_g=no

6468

+ ac_cv_prog_f77_g=no

6469

6470

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

6471

6472

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6473

6474

6475

-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5

6476

-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6

6477

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5

6478

+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }

6479

if test "$ac_test_FFLAGS" = set; then

6480

FFLAGS=$ac_save_FFLAGS

6481

elif test $ac_cv_prog_f77_g = yes; then

6482

@@ -5842,8 +6922,8 @@

6483

# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!

6484

6485

# find the maximum length of command line arguments

6486

-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5

6487

-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6

6488

+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5

6489

+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }

6490

if test "${lt_cv_sys_max_cmd_len+set}" = set; then

6491

echo $ECHO_N "(cached) $ECHO_C" >&6

6492

else

6493

@@ -5951,19 +7031,19 @@

6494

6495

6496

if test -n $lt_cv_sys_max_cmd_len ; then

6497

- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5

6498

-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6

6499

+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5

6500

+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }

6501

else

6502

- echo "$as_me:$LINENO: result: none" >&5

6503

-echo "${ECHO_T}none" >&6

6504

+ { echo "$as_me:$LINENO: result: none" >&5

6505

+echo "${ECHO_T}none" >&6; }

6506

6507

6508

6509

6510

6511

# Check for command to grab the raw symbol name followed by C symbol from nm.

6512

-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

6513

-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6

6514

+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

6515

+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }

6516

if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then

6517

echo $ECHO_N "(cached) $ECHO_C" >&6

6518

else

6519

@@ -5998,7 +7078,7 @@

6520

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

6521

lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/ {\"\2\", (lt_ptr) \&\2},/p'"

6522

;;

6523

-linux*)

6524

+linux* | k*bsd*-gnu)

6525

if test "$host_cpu" = ia64; then

6526

symcode='[ABCDGIRSTW]'

6527

lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"

6528

@@ -6167,15 +7247,15 @@

6529

lt_cv_sys_global_symbol_to_cdecl=

6530

6531

if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then

6532

- echo "$as_me:$LINENO: result: failed" >&5

6533

-echo "${ECHO_T}failed" >&6

6534

+ { echo "$as_me:$LINENO: result: failed" >&5

6535

+echo "${ECHO_T}failed" >&6; }

6536

else

6537

- echo "$as_me:$LINENO: result: ok" >&5

6538

-echo "${ECHO_T}ok" >&6

6539

+ { echo "$as_me:$LINENO: result: ok" >&5

6540

+echo "${ECHO_T}ok" >&6; }

6541

6542

6543

-echo "$as_me:$LINENO: checking for objdir" >&5

6544

-echo $ECHO_N "checking for objdir... $ECHO_C" >&6

6545

+{ echo "$as_me:$LINENO: checking for objdir" >&5

6546

+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }

6547

if test "${lt_cv_objdir+set}" = set; then

6548

echo $ECHO_N "(cached) $ECHO_C" >&6

6549

else

6550

@@ -6189,8 +7269,8 @@

6551

6552

rmdir .libs 2>/dev/null

6553

6554

-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5

6555

-echo "${ECHO_T}$lt_cv_objdir" >&6

6556

+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5

6557

+echo "${ECHO_T}$lt_cv_objdir" >&6; }

6558

objdir=$lt_cv_objdir

6559

6560

6561

@@ -6241,8 +7321,8 @@

6562

if test -n "$ac_tool_prefix"; then

6563

# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.

6564

set dummy ${ac_tool_prefix}ar; ac_word=$2

6565

-echo "$as_me:$LINENO: checking for $ac_word" >&5

6566

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

6567

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6568

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6569

if test "${ac_cv_prog_AR+set}" = set; then

6570

echo $ECHO_N "(cached) $ECHO_C" >&6

6571

else

6572

@@ -6255,32 +7335,34 @@

6573

IFS=$as_save_IFS

6574

test -z "$as_dir" && as_dir=.

6575

for ac_exec_ext in '' $ac_executable_extensions; do

6576

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

6577

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

6578

ac_cv_prog_AR="${ac_tool_prefix}ar"

6579

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6580

break 2

6581

6582

done

6583

done

6584

+IFS=$as_save_IFS

6585

6586

6587

6588

AR=$ac_cv_prog_AR

6589

if test -n "$AR"; then

6590

- echo "$as_me:$LINENO: result: $AR" >&5

6591

-echo "${ECHO_T}$AR" >&6

6592

+ { echo "$as_me:$LINENO: result: $AR" >&5

6593

+echo "${ECHO_T}$AR" >&6; }

6594

else

6595

- echo "$as_me:$LINENO: result: no" >&5

6596

-echo "${ECHO_T}no" >&6

6597

+ { echo "$as_me:$LINENO: result: no" >&5

6598

+echo "${ECHO_T}no" >&6; }

6599

6600

6601

6602

6603

if test -z "$ac_cv_prog_AR"; then

6604

ac_ct_AR=$AR

6605

# Extract the first word of "ar", so it can be a program name with args.

6606

set dummy ar; ac_word=$2

6607

-echo "$as_me:$LINENO: checking for $ac_word" >&5

6608

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

6609

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6610

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6611

if test "${ac_cv_prog_ac_ct_AR+set}" = set; then

6612

echo $ECHO_N "(cached) $ECHO_C" >&6

6613

else

6614

@@ -6293,27 +7375,41 @@

6615

IFS=$as_save_IFS

6616

test -z "$as_dir" && as_dir=.

6617

for ac_exec_ext in '' $ac_executable_extensions; do

6618

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

6619

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

6620

ac_cv_prog_ac_ct_AR="ar"

6621

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6622

break 2

6623

6624

done

6625

done

6626

+IFS=$as_save_IFS

6627

6628

- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"

6629

6630

6631

ac_ct_AR=$ac_cv_prog_ac_ct_AR

6632

if test -n "$ac_ct_AR"; then

6633

- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5

6634

-echo "${ECHO_T}$ac_ct_AR" >&6

6635

+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5

6636

+echo "${ECHO_T}$ac_ct_AR" >&6; }

6637

else

6638

- echo "$as_me:$LINENO: result: no" >&5

6639

-echo "${ECHO_T}no" >&6

6640

+ { echo "$as_me:$LINENO: result: no" >&5

6641

+echo "${ECHO_T}no" >&6; }

6642

6643

6644

- AR=$ac_ct_AR

6645

+ if test "x$ac_ct_AR" = x; then

6646

+ AR="false"

6647

+ else

6648

+ case $cross_compiling:$ac_tool_warned in

6649

+yes:)

6650

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6651

+whose name does not start with the host triplet. If you think this

6652

+configuration is useful to you, please write to autoconf@gnu.org." >&5

6653

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6654

+whose name does not start with the host triplet. If you think this

6655

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6656

+ac_tool_warned=yes ;;

6657

+esac

6658

+ AR=$ac_ct_AR

6659

+ fi

6660

else

6661

AR="$ac_cv_prog_AR"

6662

6663

@@ -6321,8 +7417,8 @@

6664

if test -n "$ac_tool_prefix"; then

6665

# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.

6666

set dummy ${ac_tool_prefix}ranlib; ac_word=$2

6667

-echo "$as_me:$LINENO: checking for $ac_word" >&5

6668

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

6669

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6670

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6671

if test "${ac_cv_prog_RANLIB+set}" = set; then

6672

echo $ECHO_N "(cached) $ECHO_C" >&6

6673

else

6674

@@ -6335,32 +7431,34 @@

6675

IFS=$as_save_IFS

6676

test -z "$as_dir" && as_dir=.

6677

for ac_exec_ext in '' $ac_executable_extensions; do

6678

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

6679

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

6680

ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

6681

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6682

break 2

6683

6684

done

6685

done

6686

+IFS=$as_save_IFS

6687

6688

6689

6690

RANLIB=$ac_cv_prog_RANLIB

6691

if test -n "$RANLIB"; then

6692

- echo "$as_me:$LINENO: result: $RANLIB" >&5

6693

-echo "${ECHO_T}$RANLIB" >&6

6694

+ { echo "$as_me:$LINENO: result: $RANLIB" >&5

6695

+echo "${ECHO_T}$RANLIB" >&6; }

6696

else

6697

- echo "$as_me:$LINENO: result: no" >&5

6698

-echo "${ECHO_T}no" >&6

6699

+ { echo "$as_me:$LINENO: result: no" >&5

6700

+echo "${ECHO_T}no" >&6; }

6701

6702

6703

6704

6705

if test -z "$ac_cv_prog_RANLIB"; then

6706

ac_ct_RANLIB=$RANLIB

6707

# Extract the first word of "ranlib", so it can be a program name with args.

6708

set dummy ranlib; ac_word=$2

6709

-echo "$as_me:$LINENO: checking for $ac_word" >&5

6710

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

6711

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6712

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6713

if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then

6714

echo $ECHO_N "(cached) $ECHO_C" >&6

6715

else

6716

@@ -6373,27 +7471,41 @@

6717

IFS=$as_save_IFS

6718

test -z "$as_dir" && as_dir=.

6719

for ac_exec_ext in '' $ac_executable_extensions; do

6720

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

6721

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

6722

ac_cv_prog_ac_ct_RANLIB="ranlib"

6723

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6724

break 2

6725

6726

done

6727

done

6728

+IFS=$as_save_IFS

6729

6730

- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"

6731

6732

6733

ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB

6734

if test -n "$ac_ct_RANLIB"; then

6735

- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5

6736

-echo "${ECHO_T}$ac_ct_RANLIB" >&6

6737

+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5

6738

+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }

6739

else

6740

- echo "$as_me:$LINENO: result: no" >&5

6741

-echo "${ECHO_T}no" >&6

6742

+ { echo "$as_me:$LINENO: result: no" >&5

6743

+echo "${ECHO_T}no" >&6; }

6744

6745

6746

- RANLIB=$ac_ct_RANLIB

6747

+ if test "x$ac_ct_RANLIB" = x; then

6748

+ RANLIB=":"

6749

+ else

6750

+ case $cross_compiling:$ac_tool_warned in

6751

+yes:)

6752

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6753

+whose name does not start with the host triplet. If you think this

6754

+configuration is useful to you, please write to autoconf@gnu.org." >&5

6755

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6756

+whose name does not start with the host triplet. If you think this

6757

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6758

+ac_tool_warned=yes ;;

6759

+esac

6760

+ RANLIB=$ac_ct_RANLIB

6761

+ fi

6762

else

6763

RANLIB="$ac_cv_prog_RANLIB"

6764

6765

@@ -6401,8 +7513,8 @@

6766

if test -n "$ac_tool_prefix"; then

6767

# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

6768

set dummy ${ac_tool_prefix}strip; ac_word=$2

6769

-echo "$as_me:$LINENO: checking for $ac_word" >&5

6770

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

6771

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6772

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6773

if test "${ac_cv_prog_STRIP+set}" = set; then

6774

echo $ECHO_N "(cached) $ECHO_C" >&6

6775

else

6776

@@ -6415,32 +7527,34 @@

6777

IFS=$as_save_IFS

6778

test -z "$as_dir" && as_dir=.

6779

for ac_exec_ext in '' $ac_executable_extensions; do

6780

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

6781

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

6782

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

6783

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6784

break 2

6785

6786

done

6787

done

6788

+IFS=$as_save_IFS

6789

6790

6791

6792

STRIP=$ac_cv_prog_STRIP

6793

if test -n "$STRIP"; then

6794

- echo "$as_me:$LINENO: result: $STRIP" >&5

6795

-echo "${ECHO_T}$STRIP" >&6

6796

+ { echo "$as_me:$LINENO: result: $STRIP" >&5

6797

+echo "${ECHO_T}$STRIP" >&6; }

6798

else

6799

- echo "$as_me:$LINENO: result: no" >&5

6800

-echo "${ECHO_T}no" >&6

6801

+ { echo "$as_me:$LINENO: result: no" >&5

6802

+echo "${ECHO_T}no" >&6; }

6803

6804

6805

6806

6807

if test -z "$ac_cv_prog_STRIP"; then

6808

ac_ct_STRIP=$STRIP

6809

# Extract the first word of "strip", so it can be a program name with args.

6810

set dummy strip; ac_word=$2

6811

-echo "$as_me:$LINENO: checking for $ac_word" >&5

6812

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

6813

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6814

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6815

if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then

6816

echo $ECHO_N "(cached) $ECHO_C" >&6

6817

else

6818

@@ -6453,27 +7567,41 @@

6819

IFS=$as_save_IFS

6820

test -z "$as_dir" && as_dir=.

6821

for ac_exec_ext in '' $ac_executable_extensions; do

6822

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

6823

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

6824

ac_cv_prog_ac_ct_STRIP="strip"

6825

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6826

break 2

6827

6828

done

6829

done

6830

+IFS=$as_save_IFS

6831

6832

- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"

6833

6834

6835

ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

6836

if test -n "$ac_ct_STRIP"; then

6837

- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

6838

-echo "${ECHO_T}$ac_ct_STRIP" >&6

6839

+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

6840

+echo "${ECHO_T}$ac_ct_STRIP" >&6; }

6841

else

6842

- echo "$as_me:$LINENO: result: no" >&5

6843

-echo "${ECHO_T}no" >&6

6844

+ { echo "$as_me:$LINENO: result: no" >&5

6845

+echo "${ECHO_T}no" >&6; }

6846

6847

6848

- STRIP=$ac_ct_STRIP

6849

+ if test "x$ac_ct_STRIP" = x; then

6850

+ STRIP=":"

6851

+ else

6852

+ case $cross_compiling:$ac_tool_warned in

6853

+yes:)

6854

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6855

+whose name does not start with the host triplet. If you think this

6856

+configuration is useful to you, please write to autoconf@gnu.org." >&5

6857

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6858

+whose name does not start with the host triplet. If you think this

6859

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6860

+ac_tool_warned=yes ;;

6861

+esac

6862

+ STRIP=$ac_ct_STRIP

6863

+ fi

6864

else

6865

STRIP="$ac_cv_prog_STRIP"

6866

6867

@@ -6532,8 +7660,8 @@

6868

case $deplibs_check_method in

6869

file_magic*)

6870

if test "$file_magic_cmd" = '$MAGIC_CMD'; then

6871

- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5

6872

-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6

6873

+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5

6874

+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }

6875

if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

6876

echo $ECHO_N "(cached) $ECHO_C" >&6

6877

else

6878

@@ -6585,17 +7713,17 @@

6879

6880

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

6881

if test -n "$MAGIC_CMD"; then

6882

- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

6883

-echo "${ECHO_T}$MAGIC_CMD" >&6

6884

+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

6885

+echo "${ECHO_T}$MAGIC_CMD" >&6; }

6886

else

6887

- echo "$as_me:$LINENO: result: no" >&5

6888

-echo "${ECHO_T}no" >&6

6889

+ { echo "$as_me:$LINENO: result: no" >&5

6890

+echo "${ECHO_T}no" >&6; }

6891

6892

6893

if test -z "$lt_cv_path_MAGIC_CMD"; then

6894

if test -n "$ac_tool_prefix"; then

6895

- echo "$as_me:$LINENO: checking for file" >&5

6896

-echo $ECHO_N "checking for file... $ECHO_C" >&6

6897

+ { echo "$as_me:$LINENO: checking for file" >&5

6898

+echo $ECHO_N "checking for file... $ECHO_C" >&6; }

6899

if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

6900

echo $ECHO_N "(cached) $ECHO_C" >&6

6901

else

6902

@@ -6647,11 +7775,11 @@

6903

6904

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

6905

if test -n "$MAGIC_CMD"; then

6906

- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

6907

-echo "${ECHO_T}$MAGIC_CMD" >&6

6908

+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

6909

+echo "${ECHO_T}$MAGIC_CMD" >&6; }

6910

else

6911

- echo "$as_me:$LINENO: result: no" >&5

6912

-echo "${ECHO_T}no" >&6

6913

+ { echo "$as_me:$LINENO: result: no" >&5

6914

+echo "${ECHO_T}no" >&6; }

6915

6916

6917

else

6918

@@ -6666,21 +7794,21 @@

6919

enable_dlopen=no

6920

enable_win32_dll=no

6921

6922

-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.

6923

+# Check whether --enable-libtool-lock was given.

6924

if test "${enable_libtool_lock+set}" = set; then

6925

- enableval="$enable_libtool_lock"

6926

+ enableval=$enable_libtool_lock;

6927

+fi

6928

6929

-fi;

6930

test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

6931

6932

6933

-# Check whether --with-pic or --without-pic was given.

6934

+# Check whether --with-pic was given.

6935

if test "${with_pic+set}" = set; then

6936

- withval="$with_pic"

6937

- pic_mode="$withval"

6938

+ withval=$with_pic; pic_mode="$withval"

6939

else

6940

pic_mode=default

6941

-fi;

6942

+fi

6943

6944

test -z "$pic_mode" && pic_mode=default

6945

6946

# Use C for the default configuration in the libtool script

6947

@@ -6738,8 +7866,8 @@

6948

lt_prog_compiler_no_builtin_flag=' -fno-builtin'

6949

6950

6951

-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

6952

-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6

6953

+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

6954

+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }

6955

if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then

6956

echo $ECHO_N "(cached) $ECHO_C" >&6

6957

else

6958

@@ -6756,11 +7884,11 @@

6959

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

6960

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

6961

-e 's:$: $lt_compiler_flag:'`

6962

- (eval echo "\"\$as_me:6759: $lt_compile\"" >&5)

6963

+ (eval echo "\"\$as_me:7887: $lt_compile\"" >&5)

6964

(eval "$lt_compile" 2>conftest.err)

6965

ac_status=$?

6966

cat conftest.err >&5

6967

- echo "$as_me:6763: \$? = $ac_status" >&5

6968

+ echo "$as_me:7891: \$? = $ac_status" >&5

6969

if (exit $ac_status) && test -s "$ac_outfile"; then

6970

# The compiler can only warn and ignore the option if not recognized

6971

# So say no if there are warnings other than the usual output.

6972

@@ -6773,8 +7901,8 @@

6973

$rm conftest*

6974

6975

6976

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

6977

-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6

6978

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

6979

+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }

6980

6981

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

6982

lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"

6983

@@ -6788,8 +7916,8 @@

6984

lt_prog_compiler_pic=

6985

lt_prog_compiler_static=

6986

6987

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

6988

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

6989

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

6990

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

6991

6992

if test "$GCC" = yes; then

6993

lt_prog_compiler_wl='-Wl,'

6994

@@ -6918,7 +8046,7 @@

6995

lt_prog_compiler_static='-Bstatic'

6996

;;

6997

6998

- linux*)

6999

+ linux* | k*bsd*-gnu)

7000

case $cc_basename in

7001

icc* | ecc*)

7002

lt_prog_compiler_wl='-Wl,'

7003

@@ -6998,16 +8126,16 @@

7004

esac

7005

7006

7007

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5

7008

-echo "${ECHO_T}$lt_prog_compiler_pic" >&6

7009

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5

7010

+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }

7011

7012

7013

# Check to make sure the PIC flag actually works.

7014

7015

if test -n "$lt_prog_compiler_pic"; then

7016

7017

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

7018

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6

7019

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

7020

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }

7021

if test "${lt_prog_compiler_pic_works+set}" = set; then

7022

echo $ECHO_N "(cached) $ECHO_C" >&6

7023

else

7024

@@ -7024,11 +8152,11 @@

7025

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

7026

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

7027

-e 's:$: $lt_compiler_flag:'`

7028

- (eval echo "\"\$as_me:7027: $lt_compile\"" >&5)

7029

+ (eval echo "\"\$as_me:8155: $lt_compile\"" >&5)

7030

(eval "$lt_compile" 2>conftest.err)

7031

ac_status=$?

7032

cat conftest.err >&5

7033

- echo "$as_me:7031: \$? = $ac_status" >&5

7034

+ echo "$as_me:8159: \$? = $ac_status" >&5

7035

if (exit $ac_status) && test -s "$ac_outfile"; then

7036

# The compiler can only warn and ignore the option if not recognized

7037

# So say no if there are warnings other than the usual output.

7038

@@ -7041,8 +8169,8 @@

7039

$rm conftest*

7040

7041

7042

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5

7043

-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6

7044

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5

7045

+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }

7046

7047

if test x"$lt_prog_compiler_pic_works" = xyes; then

7048

case $lt_prog_compiler_pic in

7049

@@ -7069,8 +8197,8 @@

7050

# Check to make sure the static flag actually works.

7051

7052

wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"

7053

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

7054

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

7055

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

7056

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

7057

if test "${lt_prog_compiler_static_works+set}" = set; then

7058

echo $ECHO_N "(cached) $ECHO_C" >&6

7059

else

7060

@@ -7097,8 +8225,8 @@

7061

LDFLAGS="$save_LDFLAGS"

7062

7063

7064

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5

7065

-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6

7066

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5

7067

+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }

7068

7069

if test x"$lt_prog_compiler_static_works" = xyes; then

7070

7071

@@ -7107,8 +8235,8 @@

7072

7073

7074

7075

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

7076

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

7077

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

7078

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

7079

if test "${lt_cv_prog_compiler_c_o+set}" = set; then

7080

echo $ECHO_N "(cached) $ECHO_C" >&6

7081

else

7082

@@ -7128,11 +8256,11 @@

7083

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

7084

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

7085

-e 's:$: $lt_compiler_flag:'`

7086

- (eval echo "\"\$as_me:7131: $lt_compile\"" >&5)

7087

+ (eval echo "\"\$as_me:8259: $lt_compile\"" >&5)

7088

(eval "$lt_compile" 2>out/conftest.err)

7089

ac_status=$?

7090

cat out/conftest.err >&5

7091

- echo "$as_me:7135: \$? = $ac_status" >&5

7092

+ echo "$as_me:8263: \$? = $ac_status" >&5

7093

if (exit $ac_status) && test -s out/conftest2.$ac_objext

7094

then

7095

# The compiler can only warn and ignore the option if not recognized

7096

@@ -7154,23 +8282,23 @@

7097

$rm conftest*

7098

7099

7100

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

7101

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6

7102

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

7103

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }

7104

7105

7106

hard_links="nottested"

7107

if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then

7108

# do not overwrite the value of need_locks provided by the user

7109

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

7110

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

7111

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

7112

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

7113

hard_links=yes

7114

$rm conftest*

7115

ln conftest.a conftest.b 2>/dev/null && hard_links=no

7116

touch conftest.a

7117

ln conftest.a conftest.b 2>&5 || hard_links=no

7118

ln conftest.a conftest.b 2>/dev/null && hard_links=no

7119

- echo "$as_me:$LINENO: result: $hard_links" >&5

7120

-echo "${ECHO_T}$hard_links" >&6

7121

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

7122

+echo "${ECHO_T}$hard_links" >&6; }

7123

if test "$hard_links" = no; then

7124

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

7125

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

7126

@@ -7180,8 +8308,8 @@

7127

need_locks=no

7128

7129

7130

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

7131

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

7132

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

7133

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

7134

7135

runpath_var=

7136

allow_undefined_flag=

7137

@@ -7357,7 +8485,7 @@

7138

archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

7139

;;

7140

7141

- linux*)

7142

+ linux* | k*bsd*-gnu)

7143

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

7144

tmp_addflag=

7145

case $cc_basename,$host_cpu in

7146

@@ -7383,12 +8511,13 @@

7147

$echo "local: *; };" >> $output_objdir/$libname.ver~

7148

$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

7149

7150

+ link_all_deplibs=no

7151

else

7152

ld_shlibs=no

7153

7154

;;

7155

7156

- netbsd*)

7157

+ netbsd* | netbsdelf*-gnu)

7158

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

7159

archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

7160

wlarc=

7161

@@ -7596,24 +8725,36 @@

7162

}

7163

_ACEOF

7164

rm -f conftest.$ac_objext conftest$ac_exeext

7165

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7166

- (eval $ac_link) 2>conftest.er1

7167

+if { (ac_try="$ac_link"

7168

+case "(($ac_try" in

7169

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7170

+ *) ac_try_echo=$ac_try;;

7171

+esac

7172

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7173

+ (eval "$ac_link") 2>conftest.er1

7174

ac_status=$?

7175

grep -v '^ *+' conftest.er1 >conftest.err

7176

rm -f conftest.er1

7177

cat conftest.err >&5

7178

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7179

(exit $ac_status); } &&

7180

- { ac_try='test -z "$ac_c_werror_flag"

7181

- || test ! -s conftest.err'

7182

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7183

- (eval $ac_try) 2>&5

7184

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

7185

+ { (case "(($ac_try" in

7186

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7187

+ *) ac_try_echo=$ac_try;;

7188

+esac

7189

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7190

+ (eval "$ac_try") 2>&5

7191

ac_status=$?

7192

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7193

(exit $ac_status); }; } &&

7194

{ ac_try='test -s conftest$ac_exeext'

7195

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7196

- (eval $ac_try) 2>&5

7197

+ { (case "(($ac_try" in

7198

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7199

+ *) ac_try_echo=$ac_try;;

7200

+esac

7201

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7202

+ (eval "$ac_try") 2>&5

7203

ac_status=$?

7204

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7205

(exit $ac_status); }; }; then

7206

@@ -7627,8 +8768,10 @@

7207

echo "$as_me: failed program was:" >&5

7208

sed 's/^/| /' conftest.$ac_ext >&5

7209

7210

7211

7212

-rm -f conftest.err conftest.$ac_objext \

7213

7214

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7215

conftest$ac_exeext conftest.$ac_ext

7216

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

7217

7218

@@ -7657,24 +8800,36 @@

7219

}

7220

_ACEOF

7221

rm -f conftest.$ac_objext conftest$ac_exeext

7222

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7223

- (eval $ac_link) 2>conftest.er1

7224

+if { (ac_try="$ac_link"

7225

+case "(($ac_try" in

7226

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7227

+ *) ac_try_echo=$ac_try;;

7228

+esac

7229

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7230

+ (eval "$ac_link") 2>conftest.er1

7231

ac_status=$?

7232

grep -v '^ *+' conftest.er1 >conftest.err

7233

rm -f conftest.er1

7234

cat conftest.err >&5

7235

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7236

(exit $ac_status); } &&

7237

- { ac_try='test -z "$ac_c_werror_flag"

7238

- || test ! -s conftest.err'

7239

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7240

- (eval $ac_try) 2>&5

7241

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

7242

+ { (case "(($ac_try" in

7243

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7244

+ *) ac_try_echo=$ac_try;;

7245

+esac

7246

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7247

+ (eval "$ac_try") 2>&5

7248

ac_status=$?

7249

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7250

(exit $ac_status); }; } &&

7251

{ ac_try='test -s conftest$ac_exeext'

7252

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7253

- (eval $ac_try) 2>&5

7254

+ { (case "(($ac_try" in

7255

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7256

+ *) ac_try_echo=$ac_try;;

7257

+esac

7258

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7259

+ (eval "$ac_try") 2>&5

7260

ac_status=$?

7261

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7262

(exit $ac_status); }; }; then

7263

@@ -7688,8 +8843,10 @@

7264

echo "$as_me: failed program was:" >&5

7265

sed 's/^/| /' conftest.$ac_ext >&5

7266

7267

7268

7269

-rm -f conftest.err conftest.$ac_objext \

7270

7271

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7272

conftest$ac_exeext conftest.$ac_ext

7273

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

7274

7275

@@ -7820,7 +8977,7 @@

7276

;;

7277

7278

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

7279

- freebsd* | kfreebsd*-gnu | dragonfly*)

7280

+ freebsd* | dragonfly*)

7281

archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

7282

hardcode_libdir_flag_spec='-R$libdir'

7283

hardcode_direct=yes

7284

@@ -7922,7 +9079,7 @@

7285

link_all_deplibs=yes

7286

;;

7287

7288

- netbsd*)

7289

+ netbsd* | netbsdelf*-gnu)

7290

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

7291

archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

7292

else

7293

@@ -8138,8 +9295,8 @@

7294

esac

7295

7296

7297

-echo "$as_me:$LINENO: result: $ld_shlibs" >&5

7298

-echo "${ECHO_T}$ld_shlibs" >&6

7299

+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5

7300

+echo "${ECHO_T}$ld_shlibs" >&6; }

7301

test "$ld_shlibs" = no && can_build_shared=no

7302

7303

7304

@@ -8159,8 +9316,8 @@

7305

# Test whether the compiler implicitly links with -lc since on some

7306

# systems, -lgcc has to come before -lc. If gcc already passes -lc

7307

# to ld, don't add -lc before -lgcc.

7308

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

7309

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

7310

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

7311

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

7312

$rm conftest*

7313

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

7314

7315

@@ -8197,16 +9354,16 @@

7316

cat conftest.err 1>&5

7317

7318

$rm conftest*

7319

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5

7320

-echo "${ECHO_T}$archive_cmds_need_lc" >&6

7321

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5

7322

+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }

7323

;;

7324

esac

7325

7326

;;

7327

esac

7328

7329

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

7330

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

7331

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

7332

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

7333

library_names_spec=

7334

libname_spec='lib$name'

7335

soname_spec=

7336

@@ -8412,18 +9569,6 @@

7337

dynamic_linker=no

7338

;;

7339

7340

-kfreebsd*-gnu)

7341

- version_type=linux

7342

- need_lib_prefix=no

7343

- need_version=no

7344

- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

7345

- soname_spec='${libname}${release}${shared_ext}$major'

7346

- shlibpath_var=LD_LIBRARY_PATH

7347

- shlibpath_overrides_runpath=no

7348

- hardcode_into_libs=yes

7349

- dynamic_linker='GNU ld.so'

7350

- ;;

7351

7352

freebsd* | dragonfly*)

7353

# DragonFly does not have aout. When/if they implement a new

7354

# versioning mechanism, adjust this.

7355

@@ -8579,7 +9724,7 @@

7356

;;

7357

7358

# This must be Linux ELF.

7359

-linux*)

7360

+linux* | k*bsd*-gnu)

7361

version_type=linux

7362

need_lib_prefix=no

7363

need_version=no

7364

@@ -8593,31 +9738,10 @@

7365

# before this can be enabled.

7366

hardcode_into_libs=yes

7367

7368

- # find out which ABI we are using

7369

- libsuff=

7370

- case "$host_cpu" in

7371

- x86_64*|s390x*|powerpc64*)

7372

- echo '#line 8600 "configure"' > conftest.$ac_ext

7373

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

7374

- (eval $ac_compile) 2>&5

7375

- ac_status=$?

7376

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

7377

- (exit $ac_status); }; then

7378

- case `/usr/bin/file conftest.$ac_objext` in

7379

- *64-bit*)

7380

- libsuff=64

7381

- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

7382

- ;;

7383

- esac

7384

- fi

7385

- rm -rf conftest*

7386

- ;;

7387

- esac

7388

7389

# Append ld.so.conf contents to the search path

7390

if test -f /etc/ld.so.conf; then

7391

- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

7392

- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

7393

+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

7394

+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

7395

7396

7397

# We used to test for /lib/ld.so.1 and disable shared libraries on

7398

@@ -8629,7 +9753,7 @@

7399

dynamic_linker='GNU/Linux ld.so'

7400

;;

7401

7402

-knetbsd*-gnu)

7403

+netbsdelf*-gnu)

7404

version_type=linux

7405

need_lib_prefix=no

7406

need_version=no

7407

@@ -8638,7 +9762,7 @@

7408

shlibpath_var=LD_LIBRARY_PATH

7409

shlibpath_overrides_runpath=no

7410

hardcode_into_libs=yes

7411

- dynamic_linker='GNU ld.so'

7412

+ dynamic_linker='NetBSD ld.elf_so'

7413

;;

7414

7415

netbsd*)

7416

@@ -8814,8 +9938,8 @@

7417

dynamic_linker=no

7418

;;

7419

esac

7420

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

7421

-echo "${ECHO_T}$dynamic_linker" >&6

7422

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

7423

+echo "${ECHO_T}$dynamic_linker" >&6; }

7424

test "$dynamic_linker" = no && can_build_shared=no

7425

7426

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

7427

@@ -8823,8 +9947,8 @@

7428

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

7429

7430

7431

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

7432

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

7433

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

7434

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

7435

hardcode_action=

7436

if test -n "$hardcode_libdir_flag_spec" || \

7437

test -n "$runpath_var" || \

7438

@@ -8848,8 +9972,8 @@

7439

# directories.

7440

hardcode_action=unsupported

7441

7442

-echo "$as_me:$LINENO: result: $hardcode_action" >&5

7443

-echo "${ECHO_T}$hardcode_action" >&6

7444

+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5

7445

+echo "${ECHO_T}$hardcode_action" >&6; }

7446

7447

if test "$hardcode_action" = relink; then

7448

# Fast installation is not supported

7449

@@ -8862,29 +9986,29 @@

7450

7451

striplib=

7452

old_striplib=

7453

-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5

7454

-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6

7455

+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5

7456

+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }

7457

if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then

7458

test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"

7459

test -z "$striplib" && striplib="$STRIP --strip-unneeded"

7460

- echo "$as_me:$LINENO: result: yes" >&5

7461

-echo "${ECHO_T}yes" >&6

7462

+ { echo "$as_me:$LINENO: result: yes" >&5

7463

+echo "${ECHO_T}yes" >&6; }

7464

else

7465

# FIXME - insert some real tests, host_os isn't really good enough

7466

case $host_os in

7467

darwin*)

7468

if test -n "$STRIP" ; then

7469

striplib="$STRIP -x"

7470

- echo "$as_me:$LINENO: result: yes" >&5

7471

-echo "${ECHO_T}yes" >&6

7472

+ { echo "$as_me:$LINENO: result: yes" >&5

7473

+echo "${ECHO_T}yes" >&6; }

7474

else

7475

- echo "$as_me:$LINENO: result: no" >&5

7476

-echo "${ECHO_T}no" >&6

7477

+ { echo "$as_me:$LINENO: result: no" >&5

7478

+echo "${ECHO_T}no" >&6; }

7479

7480

;;

7481

7482

- echo "$as_me:$LINENO: result: no" >&5

7483

-echo "${ECHO_T}no" >&6

7484

+ { echo "$as_me:$LINENO: result: no" >&5

7485

+echo "${ECHO_T}no" >&6; }

7486

;;

7487

esac

7488

7489

@@ -8916,8 +10040,8 @@

7490

7491

darwin*)

7492

# if libdl is installed we need to link against it

7493

- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

7494

-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6

7495

+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

7496

+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

7497

if test "${ac_cv_lib_dl_dlopen+set}" = set; then

7498

echo $ECHO_N "(cached) $ECHO_C" >&6

7499

else

7500

@@ -8930,40 +10054,52 @@

7501

cat >>conftest.$ac_ext <<_ACEOF

7502

/* end confdefs.h. */

7503

7504

-/* Override any gcc2 internal prototype to avoid an error. */

7505

+/* Override any GCC internal prototype to avoid an error.

7506

+ Use char because int might match the return type of a GCC

7507

+ builtin and then its argument prototype would still apply. */

7508

#ifdef __cplusplus

7509

extern "C"

7510

#endif

7511

-/* We use char because int might match the return type of a gcc2

7512

- builtin and then its argument prototype would still apply. */

7513

char dlopen ();

7514

int

7515

main ()

7516

{

7517

-dlopen ();

7518

+return dlopen ();

7519

;

7520

return 0;

7521

}

7522

_ACEOF

7523

rm -f conftest.$ac_objext conftest$ac_exeext

7524

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7525

- (eval $ac_link) 2>conftest.er1

7526

+if { (ac_try="$ac_link"

7527

+case "(($ac_try" in

7528

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7529

+ *) ac_try_echo=$ac_try;;

7530

+esac

7531

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7532

+ (eval "$ac_link") 2>conftest.er1

7533

ac_status=$?

7534

grep -v '^ *+' conftest.er1 >conftest.err

7535

rm -f conftest.er1

7536

cat conftest.err >&5

7537

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7538

(exit $ac_status); } &&

7539

- { ac_try='test -z "$ac_c_werror_flag"

7540

- || test ! -s conftest.err'

7541

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7542

- (eval $ac_try) 2>&5

7543

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

7544

+ { (case "(($ac_try" in

7545

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7546

+ *) ac_try_echo=$ac_try;;

7547

+esac

7548

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7549

+ (eval "$ac_try") 2>&5

7550

ac_status=$?

7551

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7552

(exit $ac_status); }; } &&

7553

{ ac_try='test -s conftest$ac_exeext'

7554

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7555

- (eval $ac_try) 2>&5

7556

+ { (case "(($ac_try" in

7557

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7558

+ *) ac_try_echo=$ac_try;;

7559

+esac

7560

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7561

+ (eval "$ac_try") 2>&5

7562

ac_status=$?

7563

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7564

(exit $ac_status); }; }; then

7565

@@ -8972,14 +10108,15 @@

7566

echo "$as_me: failed program was:" >&5

7567

sed 's/^/| /' conftest.$ac_ext >&5

7568

7569

-ac_cv_lib_dl_dlopen=no

7570

+ ac_cv_lib_dl_dlopen=no

7571

7572

-rm -f conftest.err conftest.$ac_objext \

7573

7574

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7575

conftest$ac_exeext conftest.$ac_ext

7576

LIBS=$ac_check_lib_save_LIBS

7577

7578

-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

7579

-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6

7580

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

7581

+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

7582

if test $ac_cv_lib_dl_dlopen = yes; then

7583

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

7584

else

7585

@@ -8993,8 +10130,8 @@

7586

;;

7587

7588

7589

- echo "$as_me:$LINENO: checking for shl_load" >&5

7590

-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6

7591

+ { echo "$as_me:$LINENO: checking for shl_load" >&5

7592

+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }

7593

if test "${ac_cv_func_shl_load+set}" = set; then

7594

echo $ECHO_N "(cached) $ECHO_C" >&6

7595

else

7596

@@ -9021,53 +10158,59 @@

7597

7598

#undef shl_load

7599

7600

-/* Override any gcc2 internal prototype to avoid an error. */

7601

+/* Override any GCC internal prototype to avoid an error.

7602

+ Use char because int might match the return type of a GCC

7603

+ builtin and then its argument prototype would still apply. */

7604

#ifdef __cplusplus

7605

extern "C"

7606

7607

#endif

7608

-/* We use char because int might match the return type of a gcc2

7609

- builtin and then its argument prototype would still apply. */

7610

char shl_load ();

7611

/* The GNU C library defines this for functions which it implements

7612

to always fail with ENOSYS. Some functions are actually named

7613

something starting with __ and the normal name is an alias. */

7614

-#if defined (__stub_shl_load) || defined (__stub___shl_load)

7615

+#if defined __stub_shl_load || defined __stub___shl_load

7616

choke me

7617

-#else

7618

-char (*f) () = shl_load;

7619

-#endif

7620

-#ifdef __cplusplus

7621

7622

#endif

7623

7624

int

7625

main ()

7626

{

7627

-return f != shl_load;

7628

+return shl_load ();

7629

;

7630

return 0;

7631

}

7632

_ACEOF

7633

rm -f conftest.$ac_objext conftest$ac_exeext

7634

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7635

- (eval $ac_link) 2>conftest.er1

7636

+if { (ac_try="$ac_link"

7637

+case "(($ac_try" in

7638

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7639

+ *) ac_try_echo=$ac_try;;

7640

+esac

7641

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7642

+ (eval "$ac_link") 2>conftest.er1

7643

ac_status=$?

7644

grep -v '^ *+' conftest.er1 >conftest.err

7645

rm -f conftest.er1

7646

cat conftest.err >&5

7647

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7648

(exit $ac_status); } &&

7649

- { ac_try='test -z "$ac_c_werror_flag"

7650

- || test ! -s conftest.err'

7651

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7652

- (eval $ac_try) 2>&5

7653

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

7654

+ { (case "(($ac_try" in

7655

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7656

+ *) ac_try_echo=$ac_try;;

7657

+esac

7658

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7659

+ (eval "$ac_try") 2>&5

7660

ac_status=$?

7661

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7662

(exit $ac_status); }; } &&

7663

{ ac_try='test -s conftest$ac_exeext'

7664

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7665

- (eval $ac_try) 2>&5

7666

+ { (case "(($ac_try" in

7667

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7668

+ *) ac_try_echo=$ac_try;;

7669

+esac

7670

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7671

+ (eval "$ac_try") 2>&5

7672

ac_status=$?

7673

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7674

(exit $ac_status); }; }; then

7675

@@ -9076,18 +10219,19 @@

7676

echo "$as_me: failed program was:" >&5

7677

sed 's/^/| /' conftest.$ac_ext >&5

7678

7679

-ac_cv_func_shl_load=no

7680

+ ac_cv_func_shl_load=no

7681

7682

-rm -f conftest.err conftest.$ac_objext \

7683

7684

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7685

conftest$ac_exeext conftest.$ac_ext

7686

7687

-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

7688

-echo "${ECHO_T}$ac_cv_func_shl_load" >&6

7689

+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

7690

+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }

7691

if test $ac_cv_func_shl_load = yes; then

7692

lt_cv_dlopen="shl_load"

7693

else

7694

- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

7695

-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6

7696

+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

7697

+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }

7698

if test "${ac_cv_lib_dld_shl_load+set}" = set; then

7699

echo $ECHO_N "(cached) $ECHO_C" >&6

7700

else

7701

@@ -9100,40 +10244,52 @@

7702

cat >>conftest.$ac_ext <<_ACEOF

7703

/* end confdefs.h. */

7704

7705

-/* Override any gcc2 internal prototype to avoid an error. */

7706

+/* Override any GCC internal prototype to avoid an error.

7707

+ Use char because int might match the return type of a GCC

7708

+ builtin and then its argument prototype would still apply. */

7709

#ifdef __cplusplus

7710

extern "C"

7711

#endif

7712

-/* We use char because int might match the return type of a gcc2

7713

- builtin and then its argument prototype would still apply. */

7714

char shl_load ();

7715

int

7716

main ()

7717

{

7718

-shl_load ();

7719

+return shl_load ();

7720

;

7721

return 0;

7722

}

7723

_ACEOF

7724

rm -f conftest.$ac_objext conftest$ac_exeext

7725

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7726

- (eval $ac_link) 2>conftest.er1

7727

+if { (ac_try="$ac_link"

7728

+case "(($ac_try" in

7729

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7730

+ *) ac_try_echo=$ac_try;;

7731

+esac

7732

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7733

+ (eval "$ac_link") 2>conftest.er1

7734

ac_status=$?

7735

grep -v '^ *+' conftest.er1 >conftest.err

7736

rm -f conftest.er1

7737

cat conftest.err >&5

7738

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7739

(exit $ac_status); } &&

7740

- { ac_try='test -z "$ac_c_werror_flag"

7741

- || test ! -s conftest.err'

7742

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7743

- (eval $ac_try) 2>&5

7744

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

7745

+ { (case "(($ac_try" in

7746

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7747

+ *) ac_try_echo=$ac_try;;

7748

+esac

7749

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7750

+ (eval "$ac_try") 2>&5

7751

ac_status=$?

7752

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7753

(exit $ac_status); }; } &&

7754

{ ac_try='test -s conftest$ac_exeext'

7755

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7756

- (eval $ac_try) 2>&5

7757

+ { (case "(($ac_try" in

7758

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7759

+ *) ac_try_echo=$ac_try;;

7760

+esac

7761

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7762

+ (eval "$ac_try") 2>&5

7763

ac_status=$?

7764

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7765

(exit $ac_status); }; }; then

7766

@@ -9142,19 +10298,20 @@

7767

echo "$as_me: failed program was:" >&5

7768

sed 's/^/| /' conftest.$ac_ext >&5

7769

7770

-ac_cv_lib_dld_shl_load=no

7771

+ ac_cv_lib_dld_shl_load=no

7772

7773

-rm -f conftest.err conftest.$ac_objext \

7774

7775

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7776

conftest$ac_exeext conftest.$ac_ext

7777

LIBS=$ac_check_lib_save_LIBS

7778

7779

-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5

7780

-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6

7781

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5

7782

+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }

7783

if test $ac_cv_lib_dld_shl_load = yes; then

7784

lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"

7785

else

7786

- echo "$as_me:$LINENO: checking for dlopen" >&5

7787

-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6

7788

+ { echo "$as_me:$LINENO: checking for dlopen" >&5

7789

+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }

7790

if test "${ac_cv_func_dlopen+set}" = set; then

7791

echo $ECHO_N "(cached) $ECHO_C" >&6

7792

else

7793

@@ -9181,53 +10338,59 @@

7794

7795

#undef dlopen

7796

7797

-/* Override any gcc2 internal prototype to avoid an error. */

7798

+/* Override any GCC internal prototype to avoid an error.

7799

+ Use char because int might match the return type of a GCC

7800

+ builtin and then its argument prototype would still apply. */

7801

#ifdef __cplusplus

7802

extern "C"

7803

7804

#endif

7805

-/* We use char because int might match the return type of a gcc2

7806

- builtin and then its argument prototype would still apply. */

7807

char dlopen ();

7808

/* The GNU C library defines this for functions which it implements

7809

to always fail with ENOSYS. Some functions are actually named

7810

something starting with __ and the normal name is an alias. */

7811

-#if defined (__stub_dlopen) || defined (__stub___dlopen)

7812

+#if defined __stub_dlopen || defined __stub___dlopen

7813

choke me

7814

-#else

7815

-char (*f) () = dlopen;

7816

-#endif

7817

-#ifdef __cplusplus

7818

7819

#endif

7820

7821

int

7822

main ()

7823

{

7824

-return f != dlopen;

7825

+return dlopen ();

7826

;

7827

return 0;

7828

}

7829

_ACEOF

7830

rm -f conftest.$ac_objext conftest$ac_exeext

7831

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7832

- (eval $ac_link) 2>conftest.er1

7833

+if { (ac_try="$ac_link"

7834

+case "(($ac_try" in

7835

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7836

+ *) ac_try_echo=$ac_try;;

7837

+esac

7838

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7839

+ (eval "$ac_link") 2>conftest.er1

7840

ac_status=$?

7841

grep -v '^ *+' conftest.er1 >conftest.err

7842

rm -f conftest.er1

7843

cat conftest.err >&5

7844

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7845

(exit $ac_status); } &&

7846

- { ac_try='test -z "$ac_c_werror_flag"

7847

- || test ! -s conftest.err'

7848

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7849

- (eval $ac_try) 2>&5

7850

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

7851

+ { (case "(($ac_try" in

7852

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7853

+ *) ac_try_echo=$ac_try;;

7854

+esac

7855

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7856

+ (eval "$ac_try") 2>&5

7857

ac_status=$?

7858

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7859

(exit $ac_status); }; } &&

7860

{ ac_try='test -s conftest$ac_exeext'

7861

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7862

- (eval $ac_try) 2>&5

7863

+ { (case "(($ac_try" in

7864

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7865

+ *) ac_try_echo=$ac_try;;

7866

+esac

7867

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7868

+ (eval "$ac_try") 2>&5

7869

ac_status=$?

7870

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7871

(exit $ac_status); }; }; then

7872

@@ -9236,18 +10399,19 @@

7873

echo "$as_me: failed program was:" >&5

7874

sed 's/^/| /' conftest.$ac_ext >&5

7875

7876

-ac_cv_func_dlopen=no

7877

+ ac_cv_func_dlopen=no

7878

7879

-rm -f conftest.err conftest.$ac_objext \

7880

7881

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7882

conftest$ac_exeext conftest.$ac_ext

7883

7884

-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

7885

-echo "${ECHO_T}$ac_cv_func_dlopen" >&6

7886

+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

7887

+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }

7888

if test $ac_cv_func_dlopen = yes; then

7889

lt_cv_dlopen="dlopen"

7890

else

7891

- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

7892

-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6

7893

+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

7894

+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

7895

if test "${ac_cv_lib_dl_dlopen+set}" = set; then

7896

echo $ECHO_N "(cached) $ECHO_C" >&6

7897

else

7898

@@ -9260,40 +10424,52 @@

7899

cat >>conftest.$ac_ext <<_ACEOF

7900

/* end confdefs.h. */

7901

7902

-/* Override any gcc2 internal prototype to avoid an error. */

7903

+/* Override any GCC internal prototype to avoid an error.

7904

+ Use char because int might match the return type of a GCC

7905

+ builtin and then its argument prototype would still apply. */

7906

#ifdef __cplusplus

7907

extern "C"

7908

#endif

7909

-/* We use char because int might match the return type of a gcc2

7910

- builtin and then its argument prototype would still apply. */

7911

char dlopen ();

7912

int

7913

main ()

7914

{

7915

-dlopen ();

7916

+return dlopen ();

7917

;

7918

return 0;

7919

}

7920

_ACEOF

7921

rm -f conftest.$ac_objext conftest$ac_exeext

7922

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

7923

- (eval $ac_link) 2>conftest.er1

7924

+if { (ac_try="$ac_link"

7925

+case "(($ac_try" in

7926

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7927

+ *) ac_try_echo=$ac_try;;

7928

+esac

7929

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7930

+ (eval "$ac_link") 2>conftest.er1

7931

ac_status=$?

7932

grep -v '^ *+' conftest.er1 >conftest.err

7933

rm -f conftest.er1

7934

cat conftest.err >&5

7935

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7936

(exit $ac_status); } &&

7937

- { ac_try='test -z "$ac_c_werror_flag"

7938

- || test ! -s conftest.err'

7939

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7940

- (eval $ac_try) 2>&5

7941

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

7942

+ { (case "(($ac_try" in

7943

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7944

+ *) ac_try_echo=$ac_try;;

7945

+esac

7946

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7947

+ (eval "$ac_try") 2>&5

7948

ac_status=$?

7949

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7950

(exit $ac_status); }; } &&

7951

{ ac_try='test -s conftest$ac_exeext'

7952

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

7953

- (eval $ac_try) 2>&5

7954

+ { (case "(($ac_try" in

7955

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7956

+ *) ac_try_echo=$ac_try;;

7957

+esac

7958

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7959

+ (eval "$ac_try") 2>&5

7960

ac_status=$?

7961

echo "$as_me:$LINENO: \$? = $ac_status" >&5

7962

(exit $ac_status); }; }; then

7963

@@ -9302,19 +10478,20 @@

7964

echo "$as_me: failed program was:" >&5

7965

sed 's/^/| /' conftest.$ac_ext >&5

7966

7967

-ac_cv_lib_dl_dlopen=no

7968

+ ac_cv_lib_dl_dlopen=no

7969

7970

-rm -f conftest.err conftest.$ac_objext \

7971

7972

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7973

conftest$ac_exeext conftest.$ac_ext

7974

LIBS=$ac_check_lib_save_LIBS

7975

7976

-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

7977

-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6

7978

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

7979

+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

7980

if test $ac_cv_lib_dl_dlopen = yes; then

7981

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

7982

else

7983

- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5

7984

-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6

7985

+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5

7986

+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }

7987

if test "${ac_cv_lib_svld_dlopen+set}" = set; then

7988

echo $ECHO_N "(cached) $ECHO_C" >&6

7989

else

7990

@@ -9327,40 +10504,52 @@

7991

cat >>conftest.$ac_ext <<_ACEOF

7992

/* end confdefs.h. */

7993

7994

-/* Override any gcc2 internal prototype to avoid an error. */

7995

+/* Override any GCC internal prototype to avoid an error.

7996

+ Use char because int might match the return type of a GCC

7997

+ builtin and then its argument prototype would still apply. */

7998

#ifdef __cplusplus

7999

extern "C"

8000

#endif

8001

-/* We use char because int might match the return type of a gcc2

8002

- builtin and then its argument prototype would still apply. */

8003

char dlopen ();

8004

int

8005

main ()

8006

{

8007

-dlopen ();

8008

+return dlopen ();

8009

;

8010

return 0;

8011

}

8012

_ACEOF

8013

rm -f conftest.$ac_objext conftest$ac_exeext

8014

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8015

- (eval $ac_link) 2>conftest.er1

8016

+if { (ac_try="$ac_link"

8017

+case "(($ac_try" in

8018

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8019

+ *) ac_try_echo=$ac_try;;

8020

+esac

8021

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8022

+ (eval "$ac_link") 2>conftest.er1

8023

ac_status=$?

8024

grep -v '^ *+' conftest.er1 >conftest.err

8025

rm -f conftest.er1

8026

cat conftest.err >&5

8027

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8028

(exit $ac_status); } &&

8029

- { ac_try='test -z "$ac_c_werror_flag"

8030

- || test ! -s conftest.err'

8031

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8032

- (eval $ac_try) 2>&5

8033

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

8034

+ { (case "(($ac_try" in

8035

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8036

+ *) ac_try_echo=$ac_try;;

8037

+esac

8038

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8039

+ (eval "$ac_try") 2>&5

8040

ac_status=$?

8041

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8042

(exit $ac_status); }; } &&

8043

{ ac_try='test -s conftest$ac_exeext'

8044

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8045

- (eval $ac_try) 2>&5

8046

+ { (case "(($ac_try" in

8047

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8048

+ *) ac_try_echo=$ac_try;;

8049

+esac

8050

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8051

+ (eval "$ac_try") 2>&5

8052

ac_status=$?

8053

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8054

(exit $ac_status); }; }; then

8055

@@ -9369,19 +10558,20 @@

8056

echo "$as_me: failed program was:" >&5

8057

sed 's/^/| /' conftest.$ac_ext >&5

8058

8059

-ac_cv_lib_svld_dlopen=no

8060

+ ac_cv_lib_svld_dlopen=no

8061

8062

-rm -f conftest.err conftest.$ac_objext \

8063

8064

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8065

conftest$ac_exeext conftest.$ac_ext

8066

LIBS=$ac_check_lib_save_LIBS

8067

8068

-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5

8069

-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6

8070

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5

8071

+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }

8072

if test $ac_cv_lib_svld_dlopen = yes; then

8073

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"

8074

else

8075

- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5

8076

-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6

8077

+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5

8078

+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }

8079

if test "${ac_cv_lib_dld_dld_link+set}" = set; then

8080

echo $ECHO_N "(cached) $ECHO_C" >&6

8081

else

8082

@@ -9394,40 +10584,52 @@

8083

cat >>conftest.$ac_ext <<_ACEOF

8084

/* end confdefs.h. */

8085

8086

-/* Override any gcc2 internal prototype to avoid an error. */

8087

+/* Override any GCC internal prototype to avoid an error.

8088

+ Use char because int might match the return type of a GCC

8089

+ builtin and then its argument prototype would still apply. */

8090

#ifdef __cplusplus

8091

extern "C"

8092

#endif

8093

-/* We use char because int might match the return type of a gcc2

8094

- builtin and then its argument prototype would still apply. */

8095

char dld_link ();

8096

int

8097

main ()

8098

{

8099

-dld_link ();

8100

+return dld_link ();

8101

;

8102

return 0;

8103

}

8104

_ACEOF

8105

rm -f conftest.$ac_objext conftest$ac_exeext

8106

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8107

- (eval $ac_link) 2>conftest.er1

8108

+if { (ac_try="$ac_link"

8109

+case "(($ac_try" in

8110

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8111

+ *) ac_try_echo=$ac_try;;

8112

+esac

8113

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8114

+ (eval "$ac_link") 2>conftest.er1

8115

ac_status=$?

8116

grep -v '^ *+' conftest.er1 >conftest.err

8117

rm -f conftest.er1

8118

cat conftest.err >&5

8119

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8120

(exit $ac_status); } &&

8121

- { ac_try='test -z "$ac_c_werror_flag"

8122

- || test ! -s conftest.err'

8123

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8124

- (eval $ac_try) 2>&5

8125

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

8126

+ { (case "(($ac_try" in

8127

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8128

+ *) ac_try_echo=$ac_try;;

8129

+esac

8130

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8131

+ (eval "$ac_try") 2>&5

8132

ac_status=$?

8133

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8134

(exit $ac_status); }; } &&

8135

{ ac_try='test -s conftest$ac_exeext'

8136

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8137

- (eval $ac_try) 2>&5

8138

+ { (case "(($ac_try" in

8139

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8140

+ *) ac_try_echo=$ac_try;;

8141

+esac

8142

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8143

+ (eval "$ac_try") 2>&5

8144

ac_status=$?

8145

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8146

(exit $ac_status); }; }; then

8147

@@ -9436,14 +10638,15 @@

8148

echo "$as_me: failed program was:" >&5

8149

sed 's/^/| /' conftest.$ac_ext >&5

8150

8151

-ac_cv_lib_dld_dld_link=no

8152

+ ac_cv_lib_dld_dld_link=no

8153

8154

-rm -f conftest.err conftest.$ac_objext \

8155

8156

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8157

conftest$ac_exeext conftest.$ac_ext

8158

LIBS=$ac_check_lib_save_LIBS

8159

8160

-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5

8161

-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6

8162

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5

8163

+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }

8164

if test $ac_cv_lib_dld_dld_link = yes; then

8165

lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"

8166

8167

@@ -9483,8 +10686,8 @@

8168

save_LIBS="$LIBS"

8169

LIBS="$lt_cv_dlopen_libs $LIBS"

8170

8171

- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5

8172

-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6

8173

+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5

8174

+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }

8175

if test "${lt_cv_dlopen_self+set}" = set; then

8176

echo $ECHO_N "(cached) $ECHO_C" >&6

8177

else

8178

@@ -9494,7 +10697,7 @@

8179

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

8180

lt_status=$lt_dlunknown

8181

cat > conftest.$ac_ext <<EOF

8182

-#line 9497 "configure"

8183

+#line 10700 "configure"

8184

#include "confdefs.h"

8185

8186

#if HAVE_DLFCN_H

8187

@@ -9578,13 +10781,13 @@

8188

8189

8190

8191

-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5

8192

-echo "${ECHO_T}$lt_cv_dlopen_self" >&6

8193

+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5

8194

+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }

8195

8196

if test "x$lt_cv_dlopen_self" = xyes; then

8197

wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"

8198

- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5

8199

-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6

8200

+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5

8201

+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }

8202

if test "${lt_cv_dlopen_self_static+set}" = set; then

8203

echo $ECHO_N "(cached) $ECHO_C" >&6

8204

else

8205

@@ -9594,7 +10797,7 @@

8206

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

8207

lt_status=$lt_dlunknown

8208

cat > conftest.$ac_ext <<EOF

8209

-#line 9597 "configure"

8210

+#line 10800 "configure"

8211

#include "confdefs.h"

8212

8213

#if HAVE_DLFCN_H

8214

@@ -9678,8 +10881,8 @@

8215

8216

8217

8218

-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5

8219

-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6

8220

+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5

8221

+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }

8222

8223

8224

CPPFLAGS="$save_CPPFLAGS"

8225

@@ -9701,13 +10904,13 @@

8226

8227

8228

# Report which library types will actually be built

8229

-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

8230

-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6

8231

-echo "$as_me:$LINENO: result: $can_build_shared" >&5

8232

-echo "${ECHO_T}$can_build_shared" >&6

8233

+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

8234

+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }

8235

+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5

8236

+echo "${ECHO_T}$can_build_shared" >&6; }

8237

8238

-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

8239

-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6

8240

+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

8241

+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }

8242

test "$can_build_shared" = "no" && enable_shared=no

8243

8244

# On AIX, shared libraries and static libraries use the same namespace, and

8245

@@ -9727,15 +10930,15 @@

8246

8247

;;

8248

esac

8249

-echo "$as_me:$LINENO: result: $enable_shared" >&5

8250

-echo "${ECHO_T}$enable_shared" >&6

8251

+{ echo "$as_me:$LINENO: result: $enable_shared" >&5

8252

+echo "${ECHO_T}$enable_shared" >&6; }

8253

8254

-echo "$as_me:$LINENO: checking whether to build static libraries" >&5

8255

-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6

8256

+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5

8257

+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }

8258

# Make sure either enable_shared or enable_static is yes.

8259

test "$enable_shared" = yes || enable_static=yes

8260

-echo "$as_me:$LINENO: result: $enable_static" >&5

8261

-echo "${ECHO_T}$enable_static" >&6

8262

+{ echo "$as_me:$LINENO: result: $enable_static" >&5

8263

+echo "${ECHO_T}$enable_static" >&6; }

8264

8265

# The else clause should only fire when bootstrapping the

8266

# libtool distribution, otherwise you forgot to ship ltmain.sh

8267

@@ -9925,9 +11128,6 @@

8268

# Is the compiler the GNU C compiler?

8269

with_gcc=$GCC

8270

8271

-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`

8272

-gcc_ver=\`gcc -dumpversion\`

8273

8274

# An ERE matcher.

8275

EGREP=$lt_EGREP

8276

8277

@@ -10061,11 +11261,11 @@

8278

8279

# Dependencies to place before the objects being linked to create a

8280

# shared library.

8281

-predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

8282

+predep_objects=$lt_predep_objects

8283

8284

# Dependencies to place after the objects being linked to create a

8285

# shared library.

8286

-postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

8287

+postdep_objects=$lt_postdep_objects

8288

8289

# Dependencies to place before the objects being linked to create a

8290

# shared library.

8291

@@ -10077,7 +11277,7 @@

8292

8293

# The library search path used internally by the compiler when linking

8294

# a shared library.

8295

-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

8296

+compiler_lib_search_path=$lt_compiler_lib_search_path

8297

8298

# Method to check whether dependent libraries are shared objects.

8299

deplibs_check_method=$lt_deplibs_check_method

8300

@@ -10157,7 +11357,7 @@

8301

link_all_deplibs=$link_all_deplibs

8302

8303

# Compile-time system search path for libraries

8304

-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

8305

+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec

8306

8307

# Run-time system search path for libraries

8308

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

8309

@@ -10230,11 +11430,11 @@

8310

CC="$lt_save_CC"

8311

8312

8313

-# Check whether --with-tags or --without-tags was given.

8314

+# Check whether --with-tags was given.

8315

if test "${with_tags+set}" = set; then

8316

- withval="$with_tags"

8317

- tagnames="$withval"

8318

-fi;

8319

+ withval=$with_tags; tagnames="$withval"

8320

+fi

8321

8322

8323

if test -f "$ltmain" && test -n "$tagnames"; then

8324

if test ! -f "${ofile}"; then

8325

@@ -10288,7 +11488,7 @@

8326

if test -n "$CXX" && ( test "X$CXX" != "Xno" &&

8327

( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||

8328

(test "X$CXX" != "Xg++"))) ; then

8329

- ac_ext=cc

8330

+ ac_ext=cpp

8331

ac_cpp='$CXXCPP $CPPFLAGS'

8332

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

8333

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

8334

@@ -10407,18 +11607,18 @@

8335

# Set up default GNU C++ configuration

8336

8337

8338

-# Check whether --with-gnu-ld or --without-gnu-ld was given.

8339

+# Check whether --with-gnu-ld was given.

8340

if test "${with_gnu_ld+set}" = set; then

8341

- withval="$with_gnu_ld"

8342

- test "$withval" = no || with_gnu_ld=yes

8343

+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

8344

else

8345

with_gnu_ld=no

8346

-fi;

8347

+fi

8348

8349

ac_prog=ld

8350

if test "$GCC" = yes; then

8351

# Check if gcc -print-prog-name=ld gives a path.

8352

- echo "$as_me:$LINENO: checking for ld used by $CC" >&5

8353

-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6

8354

+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

8355

+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

8356

case $host in

8357

*-*-mingw*)

8358

# gcc leaves a trailing carriage return which upsets mingw

8359

@@ -10447,11 +11647,11 @@

8360

;;

8361

esac

8362

elif test "$with_gnu_ld" = yes; then

8363

- echo "$as_me:$LINENO: checking for GNU ld" >&5

8364

-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6

8365

+ { echo "$as_me:$LINENO: checking for GNU ld" >&5

8366

+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

8367

else

8368

- echo "$as_me:$LINENO: checking for non-GNU ld" >&5

8369

-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6

8370

+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

8371

+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

8372

8373

if test "${lt_cv_path_LD+set}" = set; then

8374

echo $ECHO_N "(cached) $ECHO_C" >&6

8375

@@ -10484,17 +11684,17 @@

8376

8377

LD="$lt_cv_path_LD"

8378

if test -n "$LD"; then

8379

- echo "$as_me:$LINENO: result: $LD" >&5

8380

-echo "${ECHO_T}$LD" >&6

8381

+ { echo "$as_me:$LINENO: result: $LD" >&5

8382

+echo "${ECHO_T}$LD" >&6; }

8383

else

8384

- echo "$as_me:$LINENO: result: no" >&5

8385

-echo "${ECHO_T}no" >&6

8386

+ { echo "$as_me:$LINENO: result: no" >&5

8387

+echo "${ECHO_T}no" >&6; }

8388

8389

test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

8390

echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

8391

{ (exit 1); exit 1; }; }

8392

-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

8393

-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6

8394

+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

8395

+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

8396

if test "${lt_cv_prog_gnu_ld+set}" = set; then

8397

echo $ECHO_N "(cached) $ECHO_C" >&6

8398

else

8399

@@ -10508,8 +11708,8 @@

8400

;;

8401

esac

8402

8403

-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

8404

-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6

8405

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

8406

+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

8407

with_gnu_ld=$lt_cv_prog_gnu_ld

8408

8409

8410

@@ -10559,8 +11759,8 @@

8411

8412

8413

# PORTME: fill in a description of your system's C++ link characteristics

8414

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8415

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

8416

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8417

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

8418

ld_shlibs_CXX=yes

8419

case $host_os in

8420

aix3*)

8421

@@ -10672,24 +11872,36 @@

8422

}

8423

_ACEOF

8424

rm -f conftest.$ac_objext conftest$ac_exeext

8425

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8426

- (eval $ac_link) 2>conftest.er1

8427

+if { (ac_try="$ac_link"

8428

+case "(($ac_try" in

8429

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8430

+ *) ac_try_echo=$ac_try;;

8431

+esac

8432

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8433

+ (eval "$ac_link") 2>conftest.er1

8434

ac_status=$?

8435

grep -v '^ *+' conftest.er1 >conftest.err

8436

rm -f conftest.er1

8437

cat conftest.err >&5

8438

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8439

(exit $ac_status); } &&

8440

- { ac_try='test -z "$ac_cxx_werror_flag"

8441

- || test ! -s conftest.err'

8442

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8443

- (eval $ac_try) 2>&5

8444

+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

8445

+ { (case "(($ac_try" in

8446

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8447

+ *) ac_try_echo=$ac_try;;

8448

+esac

8449

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8450

+ (eval "$ac_try") 2>&5

8451

ac_status=$?

8452

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8453

(exit $ac_status); }; } &&

8454

{ ac_try='test -s conftest$ac_exeext'

8455

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8456

- (eval $ac_try) 2>&5

8457

+ { (case "(($ac_try" in

8458

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8459

+ *) ac_try_echo=$ac_try;;

8460

+esac

8461

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8462

+ (eval "$ac_try") 2>&5

8463

ac_status=$?

8464

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8465

(exit $ac_status); }; }; then

8466

@@ -10703,8 +11915,10 @@

8467

echo "$as_me: failed program was:" >&5

8468

sed 's/^/| /' conftest.$ac_ext >&5

8469

8470

8471

8472

-rm -f conftest.err conftest.$ac_objext \

8473

8474

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8475

conftest$ac_exeext conftest.$ac_ext

8476

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8477

8478

@@ -10734,24 +11948,36 @@

8479

}

8480

_ACEOF

8481

rm -f conftest.$ac_objext conftest$ac_exeext

8482

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8483

- (eval $ac_link) 2>conftest.er1

8484

+if { (ac_try="$ac_link"

8485

+case "(($ac_try" in

8486

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8487

+ *) ac_try_echo=$ac_try;;

8488

+esac

8489

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8490

+ (eval "$ac_link") 2>conftest.er1

8491

ac_status=$?

8492

grep -v '^ *+' conftest.er1 >conftest.err

8493

rm -f conftest.er1

8494

cat conftest.err >&5

8495

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8496

(exit $ac_status); } &&

8497

- { ac_try='test -z "$ac_cxx_werror_flag"

8498

- || test ! -s conftest.err'

8499

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8500

- (eval $ac_try) 2>&5

8501

+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'

8502

+ { (case "(($ac_try" in

8503

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8504

+ *) ac_try_echo=$ac_try;;

8505

+esac

8506

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8507

+ (eval "$ac_try") 2>&5

8508

ac_status=$?

8509

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8510

(exit $ac_status); }; } &&

8511

{ ac_try='test -s conftest$ac_exeext'

8512

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

8513

- (eval $ac_try) 2>&5

8514

+ { (case "(($ac_try" in

8515

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8516

+ *) ac_try_echo=$ac_try;;

8517

+esac

8518

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8519

+ (eval "$ac_try") 2>&5

8520

ac_status=$?

8521

echo "$as_me:$LINENO: \$? = $ac_status" >&5

8522

(exit $ac_status); }; }; then

8523

@@ -10765,8 +11991,10 @@

8524

echo "$as_me: failed program was:" >&5

8525

sed 's/^/| /' conftest.$ac_ext >&5

8526

8527

8528

8529

-rm -f conftest.err conftest.$ac_objext \

8530

8531

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8532

conftest$ac_exeext conftest.$ac_ext

8533

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8534

8535

@@ -10914,7 +12142,7 @@

8536

freebsd-elf*)

8537

archive_cmds_need_lc_CXX=no

8538

;;

8539

- freebsd* | kfreebsd*-gnu | dragonfly*)

8540

+ freebsd* | dragonfly*)

8541

# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF

8542

# conventions

8543

ld_shlibs_CXX=yes

8544

@@ -11073,7 +12301,7 @@

8545

hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'

8546

hardcode_libdir_separator_CXX=:

8547

;;

8548

- linux*)

8549

+ linux* | k*bsd*-gnu)

8550

case $cc_basename in

8551

KCC*)

8552

# Kuck and Associates, Inc. (KAI) C++ Compiler

8553

@@ -11175,7 +12403,7 @@

8554

;;

8555

esac

8556

;;

8557

- netbsd*)

8558

+ netbsd* | netbsdelf*-gnu)

8559

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

8560

archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'

8561

wlarc=

8562

@@ -11497,8 +12725,8 @@

8563

ld_shlibs_CXX=no

8564

;;

8565

esac

8566

-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

8567

-echo "${ECHO_T}$ld_shlibs_CXX" >&6

8568

+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

8569

+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

8570

test "$ld_shlibs_CXX" = no && can_build_shared=no

8571

8572

GCC_CXX="$GXX"

8573

@@ -11637,8 +12865,8 @@

8574

lt_prog_compiler_pic_CXX=

8575

lt_prog_compiler_static_CXX=

8576

8577

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

8578

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

8579

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

8580

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

8581

8582

# C++ specific cases for pic, static, wl, etc.

8583

if test "$GXX" = yes; then

8584

@@ -11742,7 +12970,7 @@

8585

;;

8586

esac

8587

;;

8588

- freebsd* | kfreebsd*-gnu | dragonfly*)

8589

+ freebsd* | dragonfly*)

8590

# FreeBSD uses GNU C++

8591

;;

8592

hpux9* | hpux10* | hpux11*)

8593

@@ -11785,7 +13013,7 @@

8594

;;

8595

esac

8596

;;

8597

- linux*)

8598

+ linux* | k*bsd*-gnu)

8599

case $cc_basename in

8600

KCC*)

8601

# KAI C++ Compiler

8602

@@ -11828,7 +13056,7 @@

8603

;;

8604

esac

8605

;;

8606

- netbsd*)

8607

+ netbsd* | netbsdelf*-gnu)

8608

;;

8609

osf3* | osf4* | osf5*)

8610

case $cc_basename in

8611

@@ -11911,16 +13139,16 @@

8612

esac

8613

8614

8615

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5

8616

-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6

8617

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5

8618

+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }

8619

8620

8621

# Check to make sure the PIC flag actually works.

8622

8623

if test -n "$lt_prog_compiler_pic_CXX"; then

8624

8625

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

8626

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6

8627

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

8628

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }

8629

if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then

8630

echo $ECHO_N "(cached) $ECHO_C" >&6

8631

else

8632

@@ -11937,11 +13165,11 @@

8633

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

8634

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

8635

-e 's:$: $lt_compiler_flag:'`

8636

- (eval echo "\"\$as_me:11940: $lt_compile\"" >&5)

8637

+ (eval echo "\"\$as_me:13168: $lt_compile\"" >&5)

8638

(eval "$lt_compile" 2>conftest.err)

8639

ac_status=$?

8640

cat conftest.err >&5

8641

- echo "$as_me:11944: \$? = $ac_status" >&5

8642

+ echo "$as_me:13172: \$? = $ac_status" >&5

8643

if (exit $ac_status) && test -s "$ac_outfile"; then

8644

# The compiler can only warn and ignore the option if not recognized

8645

# So say no if there are warnings other than the usual output.

8646

@@ -11954,8 +13182,8 @@

8647

$rm conftest*

8648

8649

8650

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5

8651

-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6

8652

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5

8653

+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }

8654

8655

if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then

8656

case $lt_prog_compiler_pic_CXX in

8657

@@ -11982,8 +13210,8 @@

8658

# Check to make sure the static flag actually works.

8659

8660

wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"

8661

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

8662

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

8663

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

8664

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

8665

if test "${lt_prog_compiler_static_works_CXX+set}" = set; then

8666

echo $ECHO_N "(cached) $ECHO_C" >&6

8667

else

8668

@@ -12010,8 +13238,8 @@

8669

LDFLAGS="$save_LDFLAGS"

8670

8671

8672

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5

8673

-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6

8674

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5

8675

+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }

8676

8677

if test x"$lt_prog_compiler_static_works_CXX" = xyes; then

8678

8679

@@ -12020,8 +13248,8 @@

8680

8681

8682

8683

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

8684

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

8685

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

8686

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

8687

if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then

8688

echo $ECHO_N "(cached) $ECHO_C" >&6

8689

else

8690

@@ -12041,11 +13269,11 @@

8691

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

8692

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

8693

-e 's:$: $lt_compiler_flag:'`

8694

- (eval echo "\"\$as_me:12044: $lt_compile\"" >&5)

8695

+ (eval echo "\"\$as_me:13272: $lt_compile\"" >&5)

8696

(eval "$lt_compile" 2>out/conftest.err)

8697

ac_status=$?

8698

cat out/conftest.err >&5

8699

- echo "$as_me:12048: \$? = $ac_status" >&5

8700

+ echo "$as_me:13276: \$? = $ac_status" >&5

8701

if (exit $ac_status) && test -s out/conftest2.$ac_objext

8702

then

8703

# The compiler can only warn and ignore the option if not recognized

8704

@@ -12067,23 +13295,23 @@

8705

$rm conftest*

8706

8707

8708

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

8709

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6

8710

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

8711

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }

8712

8713

8714

hard_links="nottested"

8715

if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then

8716

# do not overwrite the value of need_locks provided by the user

8717

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

8718

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

8719

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

8720

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

8721

hard_links=yes

8722

$rm conftest*

8723

ln conftest.a conftest.b 2>/dev/null && hard_links=no

8724

touch conftest.a

8725

ln conftest.a conftest.b 2>&5 || hard_links=no

8726

ln conftest.a conftest.b 2>/dev/null && hard_links=no

8727

- echo "$as_me:$LINENO: result: $hard_links" >&5

8728

-echo "${ECHO_T}$hard_links" >&6

8729

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

8730

+echo "${ECHO_T}$hard_links" >&6; }

8731

if test "$hard_links" = no; then

8732

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

8733

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

8734

@@ -12093,8 +13321,8 @@

8735

need_locks=no

8736

8737

8738

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8739

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

8740

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8741

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

8742

8743

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

8744

case $host_os in

8745

@@ -12113,13 +13341,16 @@

8746

cygwin* | mingw*)

8747

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/;/^.* __nm__/s/^.* __nm__$[^ ]*$ [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'

8748

;;

8749

+ linux* | k*bsd*-gnu)

8750

+ link_all_deplibs_CXX=no

8751

+ ;;

8752

8753

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

8754

;;

8755

esac

8756

8757

-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

8758

-echo "${ECHO_T}$ld_shlibs_CXX" >&6

8759

+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

8760

+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

8761

test "$ld_shlibs_CXX" = no && can_build_shared=no

8762

8763

8764

@@ -12139,8 +13370,8 @@

8765

# Test whether the compiler implicitly links with -lc since on some

8766

# systems, -lgcc has to come before -lc. If gcc already passes -lc

8767

# to ld, don't add -lc before -lgcc.

8768

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

8769

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

8770

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

8771

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

8772

$rm conftest*

8773

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

8774

8775

@@ -12177,16 +13408,16 @@

8776

cat conftest.err 1>&5

8777

8778

$rm conftest*

8779

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5

8780

-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6

8781

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5

8782

+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }

8783

;;

8784

esac

8785

8786

;;

8787

esac

8788

8789

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

8790

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

8791

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

8792

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

8793

library_names_spec=

8794

libname_spec='lib$name'

8795

soname_spec=

8796

@@ -12392,18 +13623,6 @@

8797

dynamic_linker=no

8798

;;

8799

8800

-kfreebsd*-gnu)

8801

- version_type=linux

8802

- need_lib_prefix=no

8803

- need_version=no

8804

- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

8805

- soname_spec='${libname}${release}${shared_ext}$major'

8806

- shlibpath_var=LD_LIBRARY_PATH

8807

- shlibpath_overrides_runpath=no

8808

- hardcode_into_libs=yes

8809

- dynamic_linker='GNU ld.so'

8810

- ;;

8811

8812

freebsd* | dragonfly*)

8813

# DragonFly does not have aout. When/if they implement a new

8814

# versioning mechanism, adjust this.

8815

@@ -12559,7 +13778,7 @@

8816

;;

8817

8818

# This must be Linux ELF.

8819

-linux*)

8820

+linux* | k*bsd*-gnu)

8821

version_type=linux

8822

need_lib_prefix=no

8823

need_version=no

8824

@@ -12573,31 +13792,10 @@

8825

# before this can be enabled.

8826

hardcode_into_libs=yes

8827

8828

- # find out which ABI we are using

8829

- libsuff=

8830

- case "$host_cpu" in

8831

- x86_64*|s390x*|powerpc64*)

8832

- echo '#line 12580 "configure"' > conftest.$ac_ext

8833

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

8834

- (eval $ac_compile) 2>&5

8835

- ac_status=$?

8836

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

8837

- (exit $ac_status); }; then

8838

- case `/usr/bin/file conftest.$ac_objext` in

8839

- *64-bit*)

8840

- libsuff=64

8841

- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

8842

- ;;

8843

- esac

8844

- fi

8845

- rm -rf conftest*

8846

- ;;

8847

- esac

8848

8849

# Append ld.so.conf contents to the search path

8850

if test -f /etc/ld.so.conf; then

8851

8852

- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

8853

8854

+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

8855

8856

8857

# We used to test for /lib/ld.so.1 and disable shared libraries on

8858

@@ -12609,7 +13807,7 @@

8859

dynamic_linker='GNU/Linux ld.so'

8860

;;

8861

8862

-knetbsd*-gnu)

8863

+netbsdelf*-gnu)

8864

version_type=linux

8865

need_lib_prefix=no

8866

need_version=no

8867

@@ -12618,7 +13816,7 @@

8868

shlibpath_var=LD_LIBRARY_PATH

8869

shlibpath_overrides_runpath=no

8870

hardcode_into_libs=yes

8871

- dynamic_linker='GNU ld.so'

8872

+ dynamic_linker='NetBSD ld.elf_so'

8873

;;

8874

8875

netbsd*)

8876

@@ -12794,8 +13992,8 @@

8877

dynamic_linker=no

8878

;;

8879

esac

8880

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

8881

-echo "${ECHO_T}$dynamic_linker" >&6

8882

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

8883

+echo "${ECHO_T}$dynamic_linker" >&6; }

8884

test "$dynamic_linker" = no && can_build_shared=no

8885

8886

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

8887

@@ -12803,8 +14001,8 @@

8888

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

8889

8890

8891

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

8892

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

8893

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

8894

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

8895

hardcode_action_CXX=

8896

if test -n "$hardcode_libdir_flag_spec_CXX" || \

8897

test -n "$runpath_var_CXX" || \

8898

@@ -12828,8 +14026,8 @@

8899

# directories.

8900

hardcode_action_CXX=unsupported

8901

8902

-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5

8903

-echo "${ECHO_T}$hardcode_action_CXX" >&6

8904

+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5

8905

+echo "${ECHO_T}$hardcode_action_CXX" >&6; }

8906

8907

if test "$hardcode_action_CXX" = relink; then

8908

# Fast installation is not supported

8909

@@ -12981,9 +14179,6 @@

8910

# Is the compiler the GNU C compiler?

8911

with_gcc=$GCC_CXX

8912

8913

-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`

8914

-gcc_ver=\`gcc -dumpversion\`

8915

8916

# An ERE matcher.

8917

EGREP=$lt_EGREP

8918

8919

@@ -13117,11 +14312,11 @@

8920

8921

# Dependencies to place before the objects being linked to create a

8922

# shared library.

8923

-predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

8924

+predep_objects=$lt_predep_objects_CXX

8925

8926

# Dependencies to place after the objects being linked to create a

8927

# shared library.

8928

-postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

8929

+postdep_objects=$lt_postdep_objects_CXX

8930

8931

# Dependencies to place before the objects being linked to create a

8932

# shared library.

8933

@@ -13133,7 +14328,7 @@

8934

8935

# The library search path used internally by the compiler when linking

8936

# a shared library.

8937

-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

8938

+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX

8939

8940

# Method to check whether dependent libraries are shared objects.

8941

deplibs_check_method=$lt_deplibs_check_method

8942

@@ -13213,7 +14408,7 @@

8943

link_all_deplibs=$link_all_deplibs_CXX

8944

8945

# Compile-time system search path for libraries

8946

-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

8947

+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec

8948

8949

# Run-time system search path for libraries

8950

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

8951

@@ -13357,13 +14552,13 @@

8952

cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

8953

8954

8955

-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

8956

-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6

8957

-echo "$as_me:$LINENO: result: $can_build_shared" >&5

8958

-echo "${ECHO_T}$can_build_shared" >&6

8959

+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

8960

+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }

8961

+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5

8962

+echo "${ECHO_T}$can_build_shared" >&6; }

8963

8964

-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

8965

-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6

8966

+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

8967

+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }

8968

test "$can_build_shared" = "no" && enable_shared=no

8969

8970

# On AIX, shared libraries and static libraries use the same namespace, and

8971

@@ -13382,15 +14577,15 @@

8972

8973

;;

8974

esac

8975

-echo "$as_me:$LINENO: result: $enable_shared" >&5

8976

-echo "${ECHO_T}$enable_shared" >&6

8977

+{ echo "$as_me:$LINENO: result: $enable_shared" >&5

8978

+echo "${ECHO_T}$enable_shared" >&6; }

8979

8980

-echo "$as_me:$LINENO: checking whether to build static libraries" >&5

8981

-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6

8982

+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5

8983

+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }

8984

# Make sure either enable_shared or enable_static is yes.

8985

test "$enable_shared" = yes || enable_static=yes

8986

-echo "$as_me:$LINENO: result: $enable_static" >&5

8987

-echo "${ECHO_T}$enable_static" >&6

8988

+{ echo "$as_me:$LINENO: result: $enable_static" >&5

8989

+echo "${ECHO_T}$enable_static" >&6; }

8990

8991

GCC_F77="$G77"

8992

LD_F77="$LD"

8993

@@ -13399,8 +14594,8 @@

8994

lt_prog_compiler_pic_F77=

8995

lt_prog_compiler_static_F77=

8996

8997

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

8998

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

8999

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

9000

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

9001

9002

if test "$GCC" = yes; then

9003

lt_prog_compiler_wl_F77='-Wl,'

9004

@@ -13529,7 +14724,7 @@

9005

lt_prog_compiler_static_F77='-Bstatic'

9006

;;

9007

9008

- linux*)

9009

+ linux* | k*bsd*-gnu)

9010

case $cc_basename in

9011

icc* | ecc*)

9012

lt_prog_compiler_wl_F77='-Wl,'

9013

@@ -13609,16 +14804,16 @@

9014

esac

9015

9016

9017

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5

9018

-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6

9019

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5

9020

+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }

9021

9022

9023

# Check to make sure the PIC flag actually works.

9024

9025

if test -n "$lt_prog_compiler_pic_F77"; then

9026

9027

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5

9028

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6

9029

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5

9030

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }

9031

if test "${lt_prog_compiler_pic_works_F77+set}" = set; then

9032

echo $ECHO_N "(cached) $ECHO_C" >&6

9033

else

9034

@@ -13635,11 +14830,11 @@

9035

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9036

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9037

-e 's:$: $lt_compiler_flag:'`

9038

- (eval echo "\"\$as_me:13638: $lt_compile\"" >&5)

9039

+ (eval echo "\"\$as_me:14833: $lt_compile\"" >&5)

9040

(eval "$lt_compile" 2>conftest.err)

9041

ac_status=$?

9042

cat conftest.err >&5

9043

- echo "$as_me:13642: \$? = $ac_status" >&5

9044

+ echo "$as_me:14837: \$? = $ac_status" >&5

9045

if (exit $ac_status) && test -s "$ac_outfile"; then

9046

# The compiler can only warn and ignore the option if not recognized

9047

# So say no if there are warnings other than the usual output.

9048

@@ -13652,8 +14847,8 @@

9049

$rm conftest*

9050

9051

9052

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5

9053

-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6

9054

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5

9055

+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }

9056

9057

if test x"$lt_prog_compiler_pic_works_F77" = xyes; then

9058

case $lt_prog_compiler_pic_F77 in

9059

@@ -13680,8 +14875,8 @@

9060

# Check to make sure the static flag actually works.

9061

9062

wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"

9063

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9064

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

9065

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9066

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

9067

if test "${lt_prog_compiler_static_works_F77+set}" = set; then

9068

echo $ECHO_N "(cached) $ECHO_C" >&6

9069

else

9070

@@ -13708,8 +14903,8 @@

9071

LDFLAGS="$save_LDFLAGS"

9072

9073

9074

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5

9075

-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6

9076

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5

9077

+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }

9078

9079

if test x"$lt_prog_compiler_static_works_F77" = xyes; then

9080

9081

@@ -13718,8 +14913,8 @@

9082

9083

9084

9085

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9086

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

9087

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9088

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

9089

if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then

9090

echo $ECHO_N "(cached) $ECHO_C" >&6

9091

else

9092

@@ -13739,11 +14934,11 @@

9093

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9094

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9095

-e 's:$: $lt_compiler_flag:'`

9096

- (eval echo "\"\$as_me:13742: $lt_compile\"" >&5)

9097

+ (eval echo "\"\$as_me:14937: $lt_compile\"" >&5)

9098

(eval "$lt_compile" 2>out/conftest.err)

9099

ac_status=$?

9100

cat out/conftest.err >&5

9101

- echo "$as_me:13746: \$? = $ac_status" >&5

9102

+ echo "$as_me:14941: \$? = $ac_status" >&5

9103

if (exit $ac_status) && test -s out/conftest2.$ac_objext

9104

then

9105

# The compiler can only warn and ignore the option if not recognized

9106

@@ -13765,23 +14960,23 @@

9107

$rm conftest*

9108

9109

9110

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5

9111

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6

9112

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5

9113

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }

9114

9115

9116

hard_links="nottested"

9117

if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then

9118

# do not overwrite the value of need_locks provided by the user

9119

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9120

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

9121

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9122

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

9123

hard_links=yes

9124

$rm conftest*

9125

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9126

touch conftest.a

9127

ln conftest.a conftest.b 2>&5 || hard_links=no

9128

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9129

- echo "$as_me:$LINENO: result: $hard_links" >&5

9130

-echo "${ECHO_T}$hard_links" >&6

9131

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

9132

+echo "${ECHO_T}$hard_links" >&6; }

9133

if test "$hard_links" = no; then

9134

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

9135

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

9136

@@ -13791,8 +14986,8 @@

9137

need_locks=no

9138

9139

9140

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9141

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

9142

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9143

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

9144

9145

runpath_var=

9146

allow_undefined_flag_F77=

9147

@@ -13968,7 +15163,7 @@

9148

archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

9149

;;

9150

9151

- linux*)

9152

+ linux* | k*bsd*-gnu)

9153

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

9154

tmp_addflag=

9155

case $cc_basename,$host_cpu in

9156

@@ -13994,12 +15189,13 @@

9157

$echo "local: *; };" >> $output_objdir/$libname.ver~

9158

$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

9159

9160

+ link_all_deplibs_F77=no

9161

else

9162

ld_shlibs_F77=no

9163

9164

;;

9165

9166

- netbsd*)

9167

+ netbsd* | netbsdelf*-gnu)

9168

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

9169

archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

9170

wlarc=

9171

@@ -14197,24 +15393,36 @@

9172

end

9173

_ACEOF

9174

rm -f conftest.$ac_objext conftest$ac_exeext

9175

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

9176

- (eval $ac_link) 2>conftest.er1

9177

+if { (ac_try="$ac_link"

9178

+case "(($ac_try" in

9179

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9180

+ *) ac_try_echo=$ac_try;;

9181

+esac

9182

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9183

+ (eval "$ac_link") 2>conftest.er1

9184

ac_status=$?

9185

grep -v '^ *+' conftest.er1 >conftest.err

9186

rm -f conftest.er1

9187

cat conftest.err >&5

9188

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9189

(exit $ac_status); } &&

9190

- { ac_try='test -z "$ac_f77_werror_flag"

9191

- || test ! -s conftest.err'

9192

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9193

- (eval $ac_try) 2>&5

9194

+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'

9195

+ { (case "(($ac_try" in

9196

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9197

+ *) ac_try_echo=$ac_try;;

9198

+esac

9199

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9200

+ (eval "$ac_try") 2>&5

9201

ac_status=$?

9202

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9203

(exit $ac_status); }; } &&

9204

{ ac_try='test -s conftest$ac_exeext'

9205

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9206

- (eval $ac_try) 2>&5

9207

+ { (case "(($ac_try" in

9208

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9209

+ *) ac_try_echo=$ac_try;;

9210

+esac

9211

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9212

+ (eval "$ac_try") 2>&5

9213

ac_status=$?

9214

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9215

(exit $ac_status); }; }; then

9216

@@ -14228,8 +15436,10 @@

9217

echo "$as_me: failed program was:" >&5

9218

sed 's/^/| /' conftest.$ac_ext >&5

9219

9220

9221

9222

-rm -f conftest.err conftest.$ac_objext \

9223

9224

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9225

conftest$ac_exeext conftest.$ac_ext

9226

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

9227

9228

@@ -14248,24 +15458,36 @@

9229

end

9230

_ACEOF

9231

rm -f conftest.$ac_objext conftest$ac_exeext

9232

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

9233

- (eval $ac_link) 2>conftest.er1

9234

+if { (ac_try="$ac_link"

9235

+case "(($ac_try" in

9236

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9237

+ *) ac_try_echo=$ac_try;;

9238

+esac

9239

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9240

+ (eval "$ac_link") 2>conftest.er1

9241

ac_status=$?

9242

grep -v '^ *+' conftest.er1 >conftest.err

9243

rm -f conftest.er1

9244

cat conftest.err >&5

9245

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9246

(exit $ac_status); } &&

9247

- { ac_try='test -z "$ac_f77_werror_flag"

9248

- || test ! -s conftest.err'

9249

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9250

- (eval $ac_try) 2>&5

9251

+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'

9252

+ { (case "(($ac_try" in

9253

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9254

+ *) ac_try_echo=$ac_try;;

9255

+esac

9256

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9257

+ (eval "$ac_try") 2>&5

9258

ac_status=$?

9259

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9260

(exit $ac_status); }; } &&

9261

{ ac_try='test -s conftest$ac_exeext'

9262

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9263

- (eval $ac_try) 2>&5

9264

+ { (case "(($ac_try" in

9265

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9266

+ *) ac_try_echo=$ac_try;;

9267

+esac

9268

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9269

+ (eval "$ac_try") 2>&5

9270

ac_status=$?

9271

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9272

(exit $ac_status); }; }; then

9273

@@ -14279,8 +15501,10 @@

9274

echo "$as_me: failed program was:" >&5

9275

sed 's/^/| /' conftest.$ac_ext >&5

9276

9277

9278

9279

-rm -f conftest.err conftest.$ac_objext \

9280

9281

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9282

conftest$ac_exeext conftest.$ac_ext

9283

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

9284

9285

@@ -14411,7 +15635,7 @@

9286

;;

9287

9288

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

9289

- freebsd* | kfreebsd*-gnu | dragonfly*)

9290

+ freebsd* | dragonfly*)

9291

archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

9292

hardcode_libdir_flag_spec_F77='-R$libdir'

9293

hardcode_direct_F77=yes

9294

@@ -14513,7 +15737,7 @@

9295

link_all_deplibs_F77=yes

9296

;;

9297

9298

- netbsd*)

9299

+ netbsd* | netbsdelf*-gnu)

9300

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

9301

archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

9302

else

9303

@@ -14729,8 +15953,8 @@

9304

esac

9305

9306

9307

-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5

9308

-echo "${ECHO_T}$ld_shlibs_F77" >&6

9309

+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5

9310

+echo "${ECHO_T}$ld_shlibs_F77" >&6; }

9311

test "$ld_shlibs_F77" = no && can_build_shared=no

9312

9313

9314

@@ -14750,8 +15974,8 @@

9315

# Test whether the compiler implicitly links with -lc since on some

9316

# systems, -lgcc has to come before -lc. If gcc already passes -lc

9317

# to ld, don't add -lc before -lgcc.

9318

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

9319

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

9320

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

9321

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

9322

$rm conftest*

9323

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

9324

9325

@@ -14788,16 +16012,16 @@

9326

cat conftest.err 1>&5

9327

9328

$rm conftest*

9329

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5

9330

-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6

9331

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5

9332

+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }

9333

;;

9334

esac

9335

9336

;;

9337

esac

9338

9339

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

9340

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

9341

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

9342

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

9343

library_names_spec=

9344

libname_spec='lib$name'

9345

soname_spec=

9346

@@ -15003,18 +16227,6 @@

9347

dynamic_linker=no

9348

;;

9349

9350

-kfreebsd*-gnu)

9351

- version_type=linux

9352

- need_lib_prefix=no

9353

- need_version=no

9354

- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

9355

- soname_spec='${libname}${release}${shared_ext}$major'

9356

- shlibpath_var=LD_LIBRARY_PATH

9357

- shlibpath_overrides_runpath=no

9358

- hardcode_into_libs=yes

9359

- dynamic_linker='GNU ld.so'

9360

- ;;

9361

9362

freebsd* | dragonfly*)

9363

# DragonFly does not have aout. When/if they implement a new

9364

# versioning mechanism, adjust this.

9365

@@ -15170,7 +16382,7 @@

9366

;;

9367

9368

# This must be Linux ELF.

9369

-linux*)

9370

+linux* | k*bsd*-gnu)

9371

version_type=linux

9372

need_lib_prefix=no

9373

need_version=no

9374

@@ -15184,31 +16396,10 @@

9375

# before this can be enabled.

9376

hardcode_into_libs=yes

9377

9378

- # find out which ABI we are using

9379

- libsuff=

9380

- case "$host_cpu" in

9381

- x86_64*|s390x*|powerpc64*)

9382

- echo '#line 15191 "configure"' > conftest.$ac_ext

9383

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

9384

- (eval $ac_compile) 2>&5

9385

- ac_status=$?

9386

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9387

- (exit $ac_status); }; then

9388

- case `/usr/bin/file conftest.$ac_objext` in

9389

- *64-bit*)

9390

- libsuff=64

9391

- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

9392

- ;;

9393

- esac

9394

- fi

9395

- rm -rf conftest*

9396

- ;;

9397

- esac

9398

9399

# Append ld.so.conf contents to the search path

9400

if test -f /etc/ld.so.conf; then

9401

9402

- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

9403

9404

+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

9405

9406

9407

# We used to test for /lib/ld.so.1 and disable shared libraries on

9408

@@ -15220,7 +16411,7 @@

9409

dynamic_linker='GNU/Linux ld.so'

9410

;;

9411

9412

-knetbsd*-gnu)

9413

+netbsdelf*-gnu)

9414

version_type=linux

9415

need_lib_prefix=no

9416

need_version=no

9417

@@ -15229,7 +16420,7 @@

9418

shlibpath_var=LD_LIBRARY_PATH

9419

shlibpath_overrides_runpath=no

9420

hardcode_into_libs=yes

9421

- dynamic_linker='GNU ld.so'

9422

+ dynamic_linker='NetBSD ld.elf_so'

9423

;;

9424

9425

netbsd*)

9426

@@ -15405,8 +16596,8 @@

9427

dynamic_linker=no

9428

;;

9429

esac

9430

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

9431

-echo "${ECHO_T}$dynamic_linker" >&6

9432

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

9433

+echo "${ECHO_T}$dynamic_linker" >&6; }

9434

test "$dynamic_linker" = no && can_build_shared=no

9435

9436

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

9437

@@ -15414,8 +16605,8 @@

9438

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

9439

9440

9441

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

9442

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

9443

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

9444

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

9445

hardcode_action_F77=

9446

if test -n "$hardcode_libdir_flag_spec_F77" || \

9447

test -n "$runpath_var_F77" || \

9448

@@ -15439,8 +16630,8 @@

9449

# directories.

9450

hardcode_action_F77=unsupported

9451

9452

-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5

9453

-echo "${ECHO_T}$hardcode_action_F77" >&6

9454

+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5

9455

+echo "${ECHO_T}$hardcode_action_F77" >&6; }

9456

9457

if test "$hardcode_action_F77" = relink; then

9458

# Fast installation is not supported

9459

@@ -15592,9 +16783,6 @@

9460

# Is the compiler the GNU C compiler?

9461

with_gcc=$GCC_F77

9462

9463

-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`

9464

-gcc_ver=\`gcc -dumpversion\`

9465

9466

# An ERE matcher.

9467

EGREP=$lt_EGREP

9468

9469

@@ -15728,11 +16916,11 @@

9470

9471

# Dependencies to place before the objects being linked to create a

9472

# shared library.

9473

-predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

9474

+predep_objects=$lt_predep_objects_F77

9475

9476

# Dependencies to place after the objects being linked to create a

9477

# shared library.

9478

-postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

9479

+postdep_objects=$lt_postdep_objects_F77

9480

9481

# Dependencies to place before the objects being linked to create a

9482

# shared library.

9483

@@ -15744,7 +16932,7 @@

9484

9485

# The library search path used internally by the compiler when linking

9486

# a shared library.

9487

-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

9488

+compiler_lib_search_path=$lt_compiler_lib_search_path_F77

9489

9490

# Method to check whether dependent libraries are shared objects.

9491

deplibs_check_method=$lt_deplibs_check_method

9492

@@ -15824,7 +17012,7 @@

9493

link_all_deplibs=$link_all_deplibs_F77

9494

9495

# Compile-time system search path for libraries

9496

-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

9497

+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec

9498

9499

# Run-time system search path for libraries

9500

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

9501

@@ -15880,7 +17068,6 @@

9502

if test -n "$GCJ" && test "X$GCJ" != "Xno"; then

9503

9504

9505

9506

# Source file extension for Java test sources.

9507

ac_ext=java

9508

9509

@@ -15948,8 +17135,8 @@

9510

lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'

9511

9512

9513

-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

9514

-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6

9515

+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

9516

+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }

9517

if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then

9518

echo $ECHO_N "(cached) $ECHO_C" >&6

9519

else

9520

@@ -15966,11 +17153,11 @@

9521

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9522

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9523

-e 's:$: $lt_compiler_flag:'`

9524

- (eval echo "\"\$as_me:15969: $lt_compile\"" >&5)

9525

+ (eval echo "\"\$as_me:17156: $lt_compile\"" >&5)

9526

(eval "$lt_compile" 2>conftest.err)

9527

ac_status=$?

9528

cat conftest.err >&5

9529

- echo "$as_me:15973: \$? = $ac_status" >&5

9530

+ echo "$as_me:17160: \$? = $ac_status" >&5

9531

if (exit $ac_status) && test -s "$ac_outfile"; then

9532

# The compiler can only warn and ignore the option if not recognized

9533

# So say no if there are warnings other than the usual output.

9534

@@ -15983,8 +17170,8 @@

9535

$rm conftest*

9536

9537

9538

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

9539

-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6

9540

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

9541

+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }

9542

9543

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

9544

lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"

9545

@@ -15998,8 +17185,8 @@

9546

lt_prog_compiler_pic_GCJ=

9547

lt_prog_compiler_static_GCJ=

9548

9549

-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

9550

-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6

9551

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

9552

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

9553

9554

if test "$GCC" = yes; then

9555

lt_prog_compiler_wl_GCJ='-Wl,'

9556

@@ -16128,7 +17315,7 @@

9557

lt_prog_compiler_static_GCJ='-Bstatic'

9558

;;

9559

9560

- linux*)

9561

+ linux* | k*bsd*-gnu)

9562

case $cc_basename in

9563

icc* | ecc*)

9564

lt_prog_compiler_wl_GCJ='-Wl,'

9565

@@ -16208,16 +17395,16 @@

9566

esac

9567

9568

9569

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5

9570

-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6

9571

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5

9572

+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }

9573

9574

9575

# Check to make sure the PIC flag actually works.

9576

9577

if test -n "$lt_prog_compiler_pic_GCJ"; then

9578

9579

-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5

9580

-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6

9581

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5

9582

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }

9583

if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then

9584

echo $ECHO_N "(cached) $ECHO_C" >&6

9585

else

9586

@@ -16234,11 +17421,11 @@

9587

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9588

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9589

-e 's:$: $lt_compiler_flag:'`

9590

- (eval echo "\"\$as_me:16237: $lt_compile\"" >&5)

9591

+ (eval echo "\"\$as_me:17424: $lt_compile\"" >&5)

9592

(eval "$lt_compile" 2>conftest.err)

9593

ac_status=$?

9594

cat conftest.err >&5

9595

- echo "$as_me:16241: \$? = $ac_status" >&5

9596

+ echo "$as_me:17428: \$? = $ac_status" >&5

9597

if (exit $ac_status) && test -s "$ac_outfile"; then

9598

# The compiler can only warn and ignore the option if not recognized

9599

# So say no if there are warnings other than the usual output.

9600

@@ -16251,8 +17438,8 @@

9601

$rm conftest*

9602

9603

9604

-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5

9605

-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6

9606

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5

9607

+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }

9608

9609

if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then

9610

case $lt_prog_compiler_pic_GCJ in

9611

@@ -16279,8 +17466,8 @@

9612

# Check to make sure the static flag actually works.

9613

9614

wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"

9615

-echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9616

-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6

9617

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9618

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

9619

if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then

9620

echo $ECHO_N "(cached) $ECHO_C" >&6

9621

else

9622

@@ -16307,8 +17494,8 @@

9623

LDFLAGS="$save_LDFLAGS"

9624

9625

9626

-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5

9627

-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6

9628

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5

9629

+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }

9630

9631

if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then

9632

9633

@@ -16317,8 +17504,8 @@

9634

9635

9636

9637

-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9638

-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6

9639

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9640

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

9641

if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then

9642

echo $ECHO_N "(cached) $ECHO_C" >&6

9643

else

9644

@@ -16338,11 +17525,11 @@

9645

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9646

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9647

-e 's:$: $lt_compiler_flag:'`

9648

- (eval echo "\"\$as_me:16341: $lt_compile\"" >&5)

9649

+ (eval echo "\"\$as_me:17528: $lt_compile\"" >&5)

9650

(eval "$lt_compile" 2>out/conftest.err)

9651

ac_status=$?

9652

cat out/conftest.err >&5

9653

- echo "$as_me:16345: \$? = $ac_status" >&5

9654

+ echo "$as_me:17532: \$? = $ac_status" >&5

9655

if (exit $ac_status) && test -s out/conftest2.$ac_objext

9656

then

9657

# The compiler can only warn and ignore the option if not recognized

9658

@@ -16364,23 +17551,23 @@

9659

$rm conftest*

9660

9661

9662

-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5

9663

-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6

9664

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5

9665

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }

9666

9667

9668

hard_links="nottested"

9669

if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then

9670

# do not overwrite the value of need_locks provided by the user

9671

- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9672

-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6

9673

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9674

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

9675

hard_links=yes

9676

$rm conftest*

9677

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9678

touch conftest.a

9679

ln conftest.a conftest.b 2>&5 || hard_links=no

9680

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9681

- echo "$as_me:$LINENO: result: $hard_links" >&5

9682

-echo "${ECHO_T}$hard_links" >&6

9683

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

9684

+echo "${ECHO_T}$hard_links" >&6; }

9685

if test "$hard_links" = no; then

9686

{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

9687

echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

9688

@@ -16390,8 +17577,8 @@

9689

need_locks=no

9690

9691

9692

-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9693

-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6

9694

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9695

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

9696

9697

runpath_var=

9698

allow_undefined_flag_GCJ=

9699

@@ -16567,7 +17754,7 @@

9700

archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

9701

;;

9702

9703

- linux*)

9704

+ linux* | k*bsd*-gnu)

9705

if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

9706

tmp_addflag=

9707

case $cc_basename,$host_cpu in

9708

@@ -16593,12 +17780,13 @@

9709

$echo "local: *; };" >> $output_objdir/$libname.ver~

9710

$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

9711

9712

+ link_all_deplibs_GCJ=no

9713

else

9714

ld_shlibs_GCJ=no

9715

9716

;;

9717

9718

- netbsd*)

9719

+ netbsd* | netbsdelf*-gnu)

9720

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

9721

archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

9722

wlarc=

9723

@@ -16806,24 +17994,36 @@

9724

}

9725

_ACEOF

9726

rm -f conftest.$ac_objext conftest$ac_exeext

9727

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

9728

- (eval $ac_link) 2>conftest.er1

9729

+if { (ac_try="$ac_link"

9730

+case "(($ac_try" in

9731

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9732

+ *) ac_try_echo=$ac_try;;

9733

+esac

9734

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9735

+ (eval "$ac_link") 2>conftest.er1

9736

ac_status=$?

9737

grep -v '^ *+' conftest.er1 >conftest.err

9738

rm -f conftest.er1

9739

cat conftest.err >&5

9740

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9741

(exit $ac_status); } &&

9742

- { ac_try='test -z "$ac_c_werror_flag"

9743

- || test ! -s conftest.err'

9744

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9745

- (eval $ac_try) 2>&5

9746

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

9747

+ { (case "(($ac_try" in

9748

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9749

+ *) ac_try_echo=$ac_try;;

9750

+esac

9751

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9752

+ (eval "$ac_try") 2>&5

9753

ac_status=$?

9754

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9755

(exit $ac_status); }; } &&

9756

{ ac_try='test -s conftest$ac_exeext'

9757

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9758

- (eval $ac_try) 2>&5

9759

+ { (case "(($ac_try" in

9760

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9761

+ *) ac_try_echo=$ac_try;;

9762

+esac

9763

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9764

+ (eval "$ac_try") 2>&5

9765

ac_status=$?

9766

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9767

(exit $ac_status); }; }; then

9768

@@ -16837,8 +18037,10 @@

9769

echo "$as_me: failed program was:" >&5

9770

sed 's/^/| /' conftest.$ac_ext >&5

9771

9772

9773

9774

-rm -f conftest.err conftest.$ac_objext \

9775

9776

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9777

conftest$ac_exeext conftest.$ac_ext

9778

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

9779

9780

@@ -16867,24 +18069,36 @@

9781

}

9782

_ACEOF

9783

rm -f conftest.$ac_objext conftest$ac_exeext

9784

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

9785

- (eval $ac_link) 2>conftest.er1

9786

+if { (ac_try="$ac_link"

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_link") 2>conftest.er1

9793

ac_status=$?

9794

grep -v '^ *+' conftest.er1 >conftest.err

9795

rm -f conftest.er1

9796

cat conftest.err >&5

9797

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9798

(exit $ac_status); } &&

9799

- { ac_try='test -z "$ac_c_werror_flag"

9800

- || test ! -s conftest.err'

9801

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9802

- (eval $ac_try) 2>&5

9803

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

9804

+ { (case "(($ac_try" in

9805

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9806

+ *) ac_try_echo=$ac_try;;

9807

+esac

9808

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9809

+ (eval "$ac_try") 2>&5

9810

ac_status=$?

9811

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9812

(exit $ac_status); }; } &&

9813

{ ac_try='test -s conftest$ac_exeext'

9814

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

9815

- (eval $ac_try) 2>&5

9816

+ { (case "(($ac_try" in

9817

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9818

+ *) ac_try_echo=$ac_try;;

9819

+esac

9820

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9821

+ (eval "$ac_try") 2>&5

9822

ac_status=$?

9823

echo "$as_me:$LINENO: \$? = $ac_status" >&5

9824

(exit $ac_status); }; }; then

9825

@@ -16898,8 +18112,10 @@

9826

echo "$as_me: failed program was:" >&5

9827

sed 's/^/| /' conftest.$ac_ext >&5

9828

9829

9830

9831

-rm -f conftest.err conftest.$ac_objext \

9832

9833

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9834

conftest$ac_exeext conftest.$ac_ext

9835

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

9836

9837

@@ -17030,7 +18246,7 @@

9838

;;

9839

9840

# FreeBSD 3 and greater uses gcc -shared to do shared libraries.

9841

- freebsd* | kfreebsd*-gnu | dragonfly*)

9842

+ freebsd* | dragonfly*)

9843

archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

9844

hardcode_libdir_flag_spec_GCJ='-R$libdir'

9845

hardcode_direct_GCJ=yes

9846

@@ -17132,7 +18348,7 @@

9847

link_all_deplibs_GCJ=yes

9848

;;

9849

9850

- netbsd*)

9851

+ netbsd* | netbsdelf*-gnu)

9852

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

9853

archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

9854

else

9855

@@ -17348,8 +18564,8 @@

9856

esac

9857

9858

9859

-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5

9860

-echo "${ECHO_T}$ld_shlibs_GCJ" >&6

9861

+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5

9862

+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }

9863

test "$ld_shlibs_GCJ" = no && can_build_shared=no

9864

9865

9866

@@ -17369,8 +18585,8 @@

9867

# Test whether the compiler implicitly links with -lc since on some

9868

# systems, -lgcc has to come before -lc. If gcc already passes -lc

9869

# to ld, don't add -lc before -lgcc.

9870

- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

9871

-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6

9872

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

9873

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

9874

$rm conftest*

9875

printf "$lt_simple_compile_test_code" > conftest.$ac_ext

9876

9877

@@ -17407,16 +18623,16 @@

9878

cat conftest.err 1>&5

9879

9880

$rm conftest*

9881

- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5

9882

-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6

9883

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5

9884

+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }

9885

;;

9886

esac

9887

9888

;;

9889

esac

9890

9891

-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

9892

-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6

9893

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

9894

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

9895

library_names_spec=

9896

libname_spec='lib$name'

9897

soname_spec=

9898

@@ -17622,18 +18838,6 @@

9899

dynamic_linker=no

9900

;;

9901

9902

-kfreebsd*-gnu)

9903

- version_type=linux

9904

- need_lib_prefix=no

9905

- need_version=no

9906

- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

9907

- soname_spec='${libname}${release}${shared_ext}$major'

9908

- shlibpath_var=LD_LIBRARY_PATH

9909

- shlibpath_overrides_runpath=no

9910

- hardcode_into_libs=yes

9911

- dynamic_linker='GNU ld.so'

9912

- ;;

9913

9914

freebsd* | dragonfly*)

9915

# DragonFly does not have aout. When/if they implement a new

9916

# versioning mechanism, adjust this.

9917

@@ -17789,7 +18993,7 @@

9918

;;

9919

9920

# This must be Linux ELF.

9921

-linux*)

9922

+linux* | k*bsd*-gnu)

9923

version_type=linux

9924

need_lib_prefix=no

9925

need_version=no

9926

@@ -17803,31 +19007,10 @@

9927

# before this can be enabled.

9928

hardcode_into_libs=yes

9929

9930

- # find out which ABI we are using

9931

- libsuff=

9932

- case "$host_cpu" in

9933

- x86_64*|s390x*|powerpc64*)

9934

- echo '#line 17810 "configure"' > conftest.$ac_ext

9935

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

9936

- (eval $ac_compile) 2>&5

9937

- ac_status=$?

9938

- echo "$as_me:$LINENO: \$? = $ac_status" >&5

9939

- (exit $ac_status); }; then

9940

- case `/usr/bin/file conftest.$ac_objext` in

9941

- *64-bit*)

9942

- libsuff=64

9943

- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

9944

- ;;

9945

- esac

9946

- fi

9947

- rm -rf conftest*

9948

- ;;

9949

- esac

9950

9951

# Append ld.so.conf contents to the search path

9952

if test -f /etc/ld.so.conf; then

9953

9954

- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

9955

9956

+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

9957

9958

9959

# We used to test for /lib/ld.so.1 and disable shared libraries on

9960

@@ -17839,7 +19022,7 @@

9961

dynamic_linker='GNU/Linux ld.so'

9962

;;

9963

9964

-knetbsd*-gnu)

9965

+netbsdelf*-gnu)

9966

version_type=linux

9967

need_lib_prefix=no

9968

need_version=no

9969

@@ -17848,7 +19031,7 @@

9970

shlibpath_var=LD_LIBRARY_PATH

9971

shlibpath_overrides_runpath=no

9972

hardcode_into_libs=yes

9973

- dynamic_linker='GNU ld.so'

9974

+ dynamic_linker='NetBSD ld.elf_so'

9975

;;

9976

9977

netbsd*)

9978

@@ -18024,8 +19207,8 @@

9979

dynamic_linker=no

9980

;;

9981

esac

9982

-echo "$as_me:$LINENO: result: $dynamic_linker" >&5

9983

-echo "${ECHO_T}$dynamic_linker" >&6

9984

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

9985

+echo "${ECHO_T}$dynamic_linker" >&6; }

9986

test "$dynamic_linker" = no && can_build_shared=no

9987

9988

variables_saved_for_relink="PATH $shlibpath_var $runpath_var"

9989

@@ -18033,8 +19216,8 @@

9990

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

9991

9992

9993

-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

9994

-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6

9995

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

9996

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

9997

hardcode_action_GCJ=

9998

if test -n "$hardcode_libdir_flag_spec_GCJ" || \

9999

test -n "$runpath_var_GCJ" || \

10000

@@ -18058,8 +19241,8 @@

10001

# directories.

10002

hardcode_action_GCJ=unsupported

10003

10004

-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5

10005

-echo "${ECHO_T}$hardcode_action_GCJ" >&6

10006

+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5

10007

+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }

10008

10009

if test "$hardcode_action_GCJ" = relink; then

10010

# Fast installation is not supported

10011

@@ -18211,9 +19394,6 @@

10012

# Is the compiler the GNU C compiler?

10013

with_gcc=$GCC_GCJ

10014

10015

-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`

10016

-gcc_ver=\`gcc -dumpversion\`

10017

10018

# An ERE matcher.

10019

EGREP=$lt_EGREP

10020

10021

@@ -18347,11 +19527,11 @@

10022

10023

# Dependencies to place before the objects being linked to create a

10024

# shared library.

10025

-predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

10026

+predep_objects=$lt_predep_objects_GCJ

10027

10028

# Dependencies to place after the objects being linked to create a

10029

# shared library.

10030

-postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

10031

+postdep_objects=$lt_postdep_objects_GCJ

10032

10033

# Dependencies to place before the objects being linked to create a

10034

# shared library.

10035

@@ -18363,7 +19543,7 @@

10036

10037

# The library search path used internally by the compiler when linking

10038

# a shared library.

10039

-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

10040

+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ

10041

10042

# Method to check whether dependent libraries are shared objects.

10043

deplibs_check_method=$lt_deplibs_check_method

10044

@@ -18443,7 +19623,7 @@

10045

link_all_deplibs=$link_all_deplibs_GCJ

10046

10047

# Compile-time system search path for libraries

10048

-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

10049

+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec

10050

10051

# Run-time system search path for libraries

10052

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

10053

@@ -18498,7 +19678,6 @@

10054

RC)

10055

10056

10057

10058

# Source file extension for RC test sources.

10059

ac_ext=rc

10060

10061

@@ -18695,9 +19874,6 @@

10062

# Is the compiler the GNU C compiler?

10063

with_gcc=$GCC_RC

10064

10065

-gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`

10066

-gcc_ver=\`gcc -dumpversion\`

10067

10068

# An ERE matcher.

10069

EGREP=$lt_EGREP

10070

10071

@@ -18831,11 +20007,11 @@

10072

10073

# Dependencies to place before the objects being linked to create a

10074

# shared library.

10075

-predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

10076

+predep_objects=$lt_predep_objects_RC

10077

10078

# Dependencies to place after the objects being linked to create a

10079

# shared library.

10080

-postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

10081

+postdep_objects=$lt_postdep_objects_RC

10082

10083

# Dependencies to place before the objects being linked to create a

10084

# shared library.

10085

@@ -18847,7 +20023,7 @@

10086

10087

# The library search path used internally by the compiler when linking

10088

# a shared library.

10089

-compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

10090

+compiler_lib_search_path=$lt_compiler_lib_search_path_RC

10091

10092

# Method to check whether dependent libraries are shared objects.

10093

deplibs_check_method=$lt_deplibs_check_method

10094

@@ -18927,7 +20103,7 @@

10095

link_all_deplibs=$link_all_deplibs_RC

10096

10097

# Compile-time system search path for libraries

10098

-sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

10099

+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec

10100

10101

# Run-time system search path for libraries

10102

sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec

10103

@@ -19044,15 +20220,15 @@

10104

esac

10105

10106

if test -n "0.35.0"; then

10107

- echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5

10108

-echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6

10109

+ { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5

10110

+echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }

10111

10112

INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`

10113

INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`

10114

INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`

10115

10116

- echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5

10117

-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6

10118

+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5

10119

+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }

10120

test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||

10121

{ { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5

10122

echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}

10123

@@ -19107,8 +20283,8 @@

10124

10125

# Extract the first word of "perl", so it can be a program name with args.

10126

set dummy perl; ac_word=$2

10127

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10128

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10129

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10130

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10131

if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then

10132

echo $ECHO_N "(cached) $ECHO_C" >&6

10133

else

10134

@@ -19123,27 +20299,28 @@

10135

IFS=$as_save_IFS

10136

test -z "$as_dir" && as_dir=.

10137

for ac_exec_ext in '' $ac_executable_extensions; do

10138

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10139

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

10140

ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"

10141

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10142

break 2

10143

10144

done

10145

done

10146

+IFS=$as_save_IFS

10147

10148

;;

10149

esac

10150

10151

INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL

10152

10153

if test -n "$INTLTOOL_PERL"; then

10154

- echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5

10155

-echo "${ECHO_T}$INTLTOOL_PERL" >&6

10156

+ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5

10157

+echo "${ECHO_T}$INTLTOOL_PERL" >&6; }

10158

else

10159

- echo "$as_me:$LINENO: result: no" >&5

10160

-echo "${ECHO_T}no" >&6

10161

+ { echo "$as_me:$LINENO: result: no" >&5

10162

+echo "${ECHO_T}no" >&6; }

10163

10164

10165

10166

if test -z "$INTLTOOL_PERL"; then

10167

{ { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5

10168

echo "$as_me: error: perl not found; required for intltool" >&2;}

10169

@@ -19155,11 +20332,11 @@

10170

{ (exit 1); exit 1; }; }

10171

10172

if test "x" != "xno-xml"; then

10173

- echo "$as_me:$LINENO: checking for XML::Parser" >&5

10174

-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6

10175

+ { echo "$as_me:$LINENO: checking for XML::Parser" >&5

10176

+echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }

10177

if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then

10178

- echo "$as_me:$LINENO: result: ok" >&5

10179

-echo "${ECHO_T}ok" >&6

10180

+ { echo "$as_me:$LINENO: result: ok" >&5

10181

+echo "${ECHO_T}ok" >&6; }

10182

else

10183

{ { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5

10184

echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}

10185

@@ -19169,8 +20346,8 @@

10186

10187

# Extract the first word of "iconv", so it can be a program name with args.

10188

set dummy iconv; ac_word=$2

10189

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10190

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10191

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10192

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10193

if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then

10194

echo $ECHO_N "(cached) $ECHO_C" >&6

10195

else

10196

@@ -19185,32 +20362,33 @@

10197

IFS=$as_save_IFS

10198

test -z "$as_dir" && as_dir=.

10199

for ac_exec_ext in '' $ac_executable_extensions; do

10200

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10201

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

10202

ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"

10203

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10204

break 2

10205

10206

done

10207

done

10208

+IFS=$as_save_IFS

10209

10210

test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"

10211

;;

10212

esac

10213

10214

INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV

10215

10216

if test -n "$INTLTOOL_ICONV"; then

10217

- echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5

10218

-echo "${ECHO_T}$INTLTOOL_ICONV" >&6

10219

+ { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5

10220

+echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }

10221

else

10222

- echo "$as_me:$LINENO: result: no" >&5

10223

-echo "${ECHO_T}no" >&6

10224

+ { echo "$as_me:$LINENO: result: no" >&5

10225

+echo "${ECHO_T}no" >&6; }

10226

10227

10228

10229

# Extract the first word of "msgfmt", so it can be a program name with args.

10230

set dummy msgfmt; ac_word=$2

10231

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10232

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10233

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10234

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10235

if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then

10236

echo $ECHO_N "(cached) $ECHO_C" >&6

10237

else

10238

@@ -19225,32 +20403,33 @@

10239

IFS=$as_save_IFS

10240

test -z "$as_dir" && as_dir=.

10241

for ac_exec_ext in '' $ac_executable_extensions; do

10242

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10243

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

10244

ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"

10245

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10246

break 2

10247

10248

done

10249

done

10250

+IFS=$as_save_IFS

10251

10252

test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"

10253

;;

10254

esac

10255

10256

INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT

10257

10258

if test -n "$INTLTOOL_MSGFMT"; then

10259

- echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5

10260

-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6

10261

+ { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5

10262

+echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }

10263

else

10264

- echo "$as_me:$LINENO: result: no" >&5

10265

-echo "${ECHO_T}no" >&6

10266

+ { echo "$as_me:$LINENO: result: no" >&5

10267

+echo "${ECHO_T}no" >&6; }

10268

10269

10270

10271

# Extract the first word of "msgmerge", so it can be a program name with args.

10272

set dummy msgmerge; ac_word=$2

10273

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10274

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10275

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10276

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10277

if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then

10278

echo $ECHO_N "(cached) $ECHO_C" >&6

10279

else

10280

@@ -19265,32 +20444,33 @@

10281

IFS=$as_save_IFS

10282

test -z "$as_dir" && as_dir=.

10283

for ac_exec_ext in '' $ac_executable_extensions; do

10284

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10285

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

10286

ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"

10287

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10288

break 2

10289

10290

done

10291

done

10292

+IFS=$as_save_IFS

10293

10294

test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"

10295

;;

10296

esac

10297

10298

INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE

10299

10300

if test -n "$INTLTOOL_MSGMERGE"; then

10301

- echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5

10302

-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6

10303

+ { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5

10304

+echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }

10305

else

10306

- echo "$as_me:$LINENO: result: no" >&5

10307

-echo "${ECHO_T}no" >&6

10308

+ { echo "$as_me:$LINENO: result: no" >&5

10309

+echo "${ECHO_T}no" >&6; }

10310

10311

10312

10313

# Extract the first word of "xgettext", so it can be a program name with args.

10314

set dummy xgettext; ac_word=$2

10315

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10316

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10317

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10318

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10319

if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then

10320

echo $ECHO_N "(cached) $ECHO_C" >&6

10321

else

10322

@@ -19305,43 +20485,219 @@

10323

IFS=$as_save_IFS

10324

test -z "$as_dir" && as_dir=.

10325

for ac_exec_ext in '' $ac_executable_extensions; do

10326

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10327

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

10328

ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"

10329

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10330

break 2

10331

10332

done

10333

done

10334

+IFS=$as_save_IFS

10335

10336

test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"

10337

;;

10338

esac

10339

10340

INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT

10341

10342

if test -n "$INTLTOOL_XGETTEXT"; then

10343

- echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5

10344

-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6

10345

+ { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5

10346

+echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&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

10355

10356

# Substitute ALL_LINGUAS so we can use it in po/Makefile

10357

10358

10359

+# Set DATADIRNAME correctly if it is not set yet

10360

+# (copied from glib-gettext.m4)

10361

+if test -z "$DATADIRNAME"; then

10362

+ cat >conftest.$ac_ext <<_ACEOF

10363

+/* confdefs.h. */

10364

+_ACEOF

10365

+cat confdefs.h >>conftest.$ac_ext

10366

+cat >>conftest.$ac_ext <<_ACEOF

10367

+/* end confdefs.h. */

10368

10369

+int

10370

+main ()

10371

10372

+extern int _nl_msg_cat_cntr;

10373

+ return _nl_msg_cat_cntr

10374

+ ;

10375

+ return 0;

10376

10377

+_ACEOF

10378

+rm -f conftest.$ac_objext conftest$ac_exeext

10379

+if { (ac_try="$ac_link"

10380

+case "(($ac_try" in

10381

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10382

+ *) ac_try_echo=$ac_try;;

10383

+esac

10384

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10385

+ (eval "$ac_link") 2>conftest.er1

10386

+ ac_status=$?

10387

+ grep -v '^ *+' conftest.er1 >conftest.err

10388

+ rm -f conftest.er1

10389

+ cat conftest.err >&5

10390

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10391

+ (exit $ac_status); } &&

10392

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

10393

+ { (case "(($ac_try" in

10394

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10395

+ *) ac_try_echo=$ac_try;;

10396

+esac

10397

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10398

+ (eval "$ac_try") 2>&5

10399

+ ac_status=$?

10400

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10401

+ (exit $ac_status); }; } &&

10402

+ { ac_try='test -s conftest$ac_exeext'

10403

+ { (case "(($ac_try" in

10404

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10405

+ *) ac_try_echo=$ac_try;;

10406

+esac

10407

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10408

+ (eval "$ac_try") 2>&5

10409

+ ac_status=$?

10410

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10411

+ (exit $ac_status); }; }; then

10412

+ DATADIRNAME=share

10413

+else

10414

+ echo "$as_me: failed program was:" >&5

10415

+sed 's/^/| /' conftest.$ac_ext >&5

10416

10417

+ case $host in

10418

+ *-*-solaris*)

10419

+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

10420

+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }

10421

+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then

10422

+ echo $ECHO_N "(cached) $ECHO_C" >&6

10423

+else

10424

+ cat >conftest.$ac_ext <<_ACEOF

10425

+/* confdefs.h. */

10426

+_ACEOF

10427

+cat confdefs.h >>conftest.$ac_ext

10428

+cat >>conftest.$ac_ext <<_ACEOF

10429

+/* end confdefs.h. */

10430

+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.

10431

+ For example, HP-UX 11i <limits.h> declares gettimeofday. */

10432

+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset

10433

10434

+/* System header to define __stub macros and hopefully few prototypes,

10435

+ which can conflict with char bind_textdomain_codeset (); below.

10436

+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

10437

+ <limits.h> exists even on freestanding compilers. */

10438

10439

+#ifdef __STDC__

10440

+# include <limits.h>

10441

+#else

10442

+# include <assert.h>

10443

+#endif

10444

10445

+#undef bind_textdomain_codeset

10446

10447

+/* Override any GCC internal prototype to avoid an error.

10448

+ Use char because int might match the return type of a GCC

10449

+ builtin and then its argument prototype would still apply. */

10450

+#ifdef __cplusplus

10451

+extern "C"

10452

+#endif

10453

+char bind_textdomain_codeset ();

10454

+/* The GNU C library defines this for functions which it implements

10455

+ to always fail with ENOSYS. Some functions are actually named

10456

+ something starting with __ and the normal name is an alias. */

10457

+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset

10458

+choke me

10459

+#endif

10460

10461

+int

10462

+main ()

10463

10464

+return bind_textdomain_codeset ();

10465

+ ;

10466

+ return 0;

10467

10468

+_ACEOF

10469

+rm -f conftest.$ac_objext conftest$ac_exeext

10470

+if { (ac_try="$ac_link"

10471

+case "(($ac_try" in

10472

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10473

+ *) ac_try_echo=$ac_try;;

10474

+esac

10475

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10476

+ (eval "$ac_link") 2>conftest.er1

10477

+ ac_status=$?

10478

+ grep -v '^ *+' conftest.er1 >conftest.err

10479

+ rm -f conftest.er1

10480

+ cat conftest.err >&5

10481

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10482

+ (exit $ac_status); } &&

10483

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

10484

+ { (case "(($ac_try" in

10485

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10486

+ *) ac_try_echo=$ac_try;;

10487

+esac

10488

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10489

+ (eval "$ac_try") 2>&5

10490

+ ac_status=$?

10491

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10492

+ (exit $ac_status); }; } &&

10493

+ { ac_try='test -s conftest$ac_exeext'

10494

+ { (case "(($ac_try" in

10495

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10496

+ *) ac_try_echo=$ac_try;;

10497

+esac

10498

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10499

+ (eval "$ac_try") 2>&5

10500

+ ac_status=$?

10501

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10502

+ (exit $ac_status); }; }; then

10503

+ ac_cv_func_bind_textdomain_codeset=yes

10504

+else

10505

+ echo "$as_me: failed program was:" >&5

10506

+sed 's/^/| /' conftest.$ac_ext >&5

10507

10508

+ ac_cv_func_bind_textdomain_codeset=no

10509

+fi

10510

10511

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10512

+ conftest$ac_exeext conftest.$ac_ext

10513

+fi

10514

+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

10515

+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }

10516

+if test $ac_cv_func_bind_textdomain_codeset = yes; then

10517

+ DATADIRNAME=share

10518

+else

10519

+ DATADIRNAME=lib

10520

+fi

10521

10522

+ ;;

10523

+ *)

10524

+ DATADIRNAME=lib

10525

+ ;;

10526

+ esac

10527

+fi

10528

10529

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10530

+ conftest$ac_exeext conftest.$ac_ext

10531

+fi

10532

10533

10534

10535

10536

10537

- ac_config_commands="$ac_config_commands intltool"

10538

+ac_config_commands="$ac_config_commands intltool"

10539

10540

10541

10542

# Extract the first word of "gconftool-2", so it can be a program name with args.

10543

set dummy gconftool-2; ac_word=$2

10544

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10545

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10546

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10547

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10548

if test "${ac_cv_path_GCONFTOOL+set}" = set; then

10549

echo $ECHO_N "(cached) $ECHO_C" >&6

10550

else

10551

@@ -19356,31 +20712,32 @@

10552

IFS=$as_save_IFS

10553

test -z "$as_dir" && as_dir=.

10554

for ac_exec_ext in '' $ac_executable_extensions; do

10555

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10556

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

10557

ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"

10558

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10559

break 2

10560

10561

done

10562

done

10563

+IFS=$as_save_IFS

10564

10565

;;

10566

esac

10567

10568

GCONFTOOL=$ac_cv_path_GCONFTOOL

10569

10570

if test -n "$GCONFTOOL"; then

10571

- echo "$as_me:$LINENO: result: $GCONFTOOL" >&5

10572

-echo "${ECHO_T}$GCONFTOOL" >&6

10573

+ { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5

10574

+echo "${ECHO_T}$GCONFTOOL" >&6; }

10575

else

10576

- echo "$as_me:$LINENO: result: no" >&5

10577

-echo "${ECHO_T}no" >&6

10578

+ { echo "$as_me:$LINENO: result: no" >&5

10579

+echo "${ECHO_T}no" >&6; }

10580

10581

10582

10583

# Extract the first word of "glib-genmarshal", so it can be a program name with args.

10584

set dummy glib-genmarshal; ac_word=$2

10585

-echo "$as_me:$LINENO: checking for $ac_word" >&5

10586

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

10587

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10588

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10589

if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then

10590

echo $ECHO_N "(cached) $ECHO_C" >&6

10591

else

10592

@@ -19395,45 +20752,47 @@

10593

IFS=$as_save_IFS

10594

test -z "$as_dir" && as_dir=.

10595

for ac_exec_ext in '' $ac_executable_extensions; do

10596

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

10597

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

10598

ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"

10599

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10600

break 2

10601

10602

done

10603

done

10604

+IFS=$as_save_IFS

10605

10606

;;

10607

esac

10608

10609

GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL

10610

10611

if test -n "$GLIB_GENMARSHAL"; then

10612

- echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5

10613

-echo "${ECHO_T}$GLIB_GENMARSHAL" >&6

10614

+ { echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5

10615

+echo "${ECHO_T}$GLIB_GENMARSHAL" >&6; }

10616

else

10617

- echo "$as_me:$LINENO: result: no" >&5

10618

-echo "${ECHO_T}no" >&6

10619

+ { echo "$as_me:$LINENO: result: no" >&5

10620

+echo "${ECHO_T}no" >&6; }

10621

10622

10623

10624

10625

10626

10627

for ac_header in locale.h

10628

10629

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

10630

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

10631

- echo "$as_me:$LINENO: checking for $ac_header" >&5

10632

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

10633

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

10634

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

10635

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

10636

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

10637

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

10638

echo $ECHO_N "(cached) $ECHO_C" >&6

10639

10640

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

10641

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

10642

+ac_res=`eval echo '${'$as_ac_Header'}'`

10643

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

10644

+echo "${ECHO_T}$ac_res" >&6; }

10645

else

10646

# Is the header compilable?

10647

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

10648

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

10649

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

10650

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

10651

cat >conftest.$ac_ext <<_ACEOF

10652

/* confdefs.h. */

10653

_ACEOF

10654

@@ -19444,24 +20803,36 @@

10655

#include <$ac_header>

10656

_ACEOF

10657

rm -f conftest.$ac_objext

10658

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

10659

- (eval $ac_compile) 2>conftest.er1

10660

+if { (ac_try="$ac_compile"

10661

+case "(($ac_try" in

10662

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10663

+ *) ac_try_echo=$ac_try;;

10664

+esac

10665

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10666

+ (eval "$ac_compile") 2>conftest.er1

10667

ac_status=$?

10668

grep -v '^ *+' conftest.er1 >conftest.err

10669

rm -f conftest.er1

10670

cat conftest.err >&5

10671

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10672

(exit $ac_status); } &&

10673

- { ac_try='test -z "$ac_c_werror_flag"

10674

- || test ! -s conftest.err'

10675

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10676

- (eval $ac_try) 2>&5

10677

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

10678

+ { (case "(($ac_try" in

10679

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10680

+ *) ac_try_echo=$ac_try;;

10681

+esac

10682

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10683

+ (eval "$ac_try") 2>&5

10684

ac_status=$?

10685

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10686

(exit $ac_status); }; } &&

10687

{ ac_try='test -s conftest.$ac_objext'

10688

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10689

- (eval $ac_try) 2>&5

10690

+ { (case "(($ac_try" in

10691

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10692

+ *) ac_try_echo=$ac_try;;

10693

+esac

10694

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10695

+ (eval "$ac_try") 2>&5

10696

ac_status=$?

10697

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10698

(exit $ac_status); }; }; then

10699

@@ -19470,15 +20841,16 @@

10700

echo "$as_me: failed program was:" >&5

10701

sed 's/^/| /' conftest.$ac_ext >&5

10702

10703

-ac_header_compiler=no

10704

+ ac_header_compiler=no

10705

10706

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

10707

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

10708

-echo "${ECHO_T}$ac_header_compiler" >&6

10709

10710

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

10711

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

10712

+echo "${ECHO_T}$ac_header_compiler" >&6; }

10713

10714

# Is the header present?

10715

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

10716

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

10717

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

10718

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

10719

cat >conftest.$ac_ext <<_ACEOF

10720

/* confdefs.h. */

10721

_ACEOF

10722

@@ -19487,8 +20859,13 @@

10723

/* end confdefs.h. */

10724

#include <$ac_header>

10725

_ACEOF

10726

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

10727

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

10728

+if { (ac_try="$ac_cpp conftest.$ac_ext"

10729

+case "(($ac_try" in

10730

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10731

+ *) ac_try_echo=$ac_try;;

10732

+esac

10733

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10734

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

10735

ac_status=$?

10736

grep -v '^ *+' conftest.er1 >conftest.err

10737

rm -f conftest.er1

10738

@@ -19512,9 +20889,10 @@

10739

10740

ac_header_preproc=no

10741

10742

10743

rm -f conftest.err conftest.$ac_ext

10744

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

10745

-echo "${ECHO_T}$ac_header_preproc" >&6

10746

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

10747

+echo "${ECHO_T}$ac_header_preproc" >&6; }

10748

10749

# So? What about this header?

10750

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

10751

@@ -19538,25 +20916,24 @@

10752

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

10753

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

10754

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

10755

- (

10756

- cat <<\_ASBOX

10757

+ ( cat <<\_ASBOX

10758

## ------------------------------------------------------------------- ##

10759

## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=vino ##

10760

## ------------------------------------------------------------------- ##

10761

_ASBOX

10762

- ) |

10763

- sed "s/^/$as_me: WARNING: /" >&2

10764

+ ) | sed "s/^/$as_me: WARNING: /" >&2

10765

;;

10766

esac

10767

-echo "$as_me:$LINENO: checking for $ac_header" >&5

10768

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

10769

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

10770

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

10771

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

10772

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

10773

echo $ECHO_N "(cached) $ECHO_C" >&6

10774

else

10775

eval "$as_ac_Header=\$ac_header_preproc"

10776

10777

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

10778

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

10779

+ac_res=`eval echo '${'$as_ac_Header'}'`

10780

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

10781

+echo "${ECHO_T}$ac_res" >&6; }

10782

10783

10784

if test `eval echo '${'$as_ac_Header'}'` = yes; then

10785

@@ -19569,8 +20946,8 @@

10786

done

10787

10788

if test $ac_cv_header_locale_h = yes; then

10789

- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5

10790

-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6

10791

+ { echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5

10792

+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6; }

10793

if test "${am_cv_val_LC_MESSAGES+set}" = set; then

10794

echo $ECHO_N "(cached) $ECHO_C" >&6

10795

else

10796

@@ -19590,24 +20967,36 @@

10797

}

10798

_ACEOF

10799

rm -f conftest.$ac_objext conftest$ac_exeext

10800

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

10801

- (eval $ac_link) 2>conftest.er1

10802

+if { (ac_try="$ac_link"

10803

+case "(($ac_try" in

10804

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10805

+ *) ac_try_echo=$ac_try;;

10806

+esac

10807

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10808

+ (eval "$ac_link") 2>conftest.er1

10809

ac_status=$?

10810

grep -v '^ *+' conftest.er1 >conftest.err

10811

rm -f conftest.er1

10812

cat conftest.err >&5

10813

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10814

(exit $ac_status); } &&

10815

- { ac_try='test -z "$ac_c_werror_flag"

10816

- || test ! -s conftest.err'

10817

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10818

- (eval $ac_try) 2>&5

10819

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

10820

+ { (case "(($ac_try" in

10821

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10822

+ *) ac_try_echo=$ac_try;;

10823

+esac

10824

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10825

+ (eval "$ac_try") 2>&5

10826

ac_status=$?

10827

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10828

(exit $ac_status); }; } &&

10829

{ ac_try='test -s conftest$ac_exeext'

10830

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10831

- (eval $ac_try) 2>&5

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_try") 2>&5

10838

ac_status=$?

10839

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10840

(exit $ac_status); }; }; then

10841

@@ -19616,13 +21005,14 @@

10842

echo "$as_me: failed program was:" >&5

10843

sed 's/^/| /' conftest.$ac_ext >&5

10844

10845

-am_cv_val_LC_MESSAGES=no

10846

+ am_cv_val_LC_MESSAGES=no

10847

10848

-rm -f conftest.err conftest.$ac_objext \

10849

10850

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10851

conftest$ac_exeext conftest.$ac_ext

10852

10853

-echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5

10854

-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6

10855

+{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5

10856

+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6; }

10857

if test $am_cv_val_LC_MESSAGES = yes; then

10858

10859

cat >>confdefs.h <<\_ACEOF

10860

@@ -19641,17 +21031,17 @@

10861

INTLLIBS=

10862

10863

if test "${ac_cv_header_libintl_h+set}" = set; then

10864

- echo "$as_me:$LINENO: checking for libintl.h" >&5

10865

-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6

10866

+ { echo "$as_me:$LINENO: checking for libintl.h" >&5

10867

+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }

10868

if test "${ac_cv_header_libintl_h+set}" = set; then

10869

echo $ECHO_N "(cached) $ECHO_C" >&6

10870

10871

-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

10872

-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6

10873

+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

10874

+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }

10875

else

10876

# Is the header compilable?

10877

-echo "$as_me:$LINENO: checking libintl.h usability" >&5

10878

-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6

10879

+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5

10880

+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }

10881

cat >conftest.$ac_ext <<_ACEOF

10882

/* confdefs.h. */

10883

_ACEOF

10884

@@ -19662,24 +21052,36 @@

10885

#include <libintl.h>

10886

_ACEOF

10887

rm -f conftest.$ac_objext

10888

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

10889

- (eval $ac_compile) 2>conftest.er1

10890

+if { (ac_try="$ac_compile"

10891

+case "(($ac_try" in

10892

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10893

+ *) ac_try_echo=$ac_try;;

10894

+esac

10895

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10896

+ (eval "$ac_compile") 2>conftest.er1

10897

ac_status=$?

10898

grep -v '^ *+' conftest.er1 >conftest.err

10899

rm -f conftest.er1

10900

cat conftest.err >&5

10901

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10902

(exit $ac_status); } &&

10903

- { ac_try='test -z "$ac_c_werror_flag"

10904

- || test ! -s conftest.err'

10905

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10906

- (eval $ac_try) 2>&5

10907

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

10908

+ { (case "(($ac_try" in

10909

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10910

+ *) ac_try_echo=$ac_try;;

10911

+esac

10912

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10913

+ (eval "$ac_try") 2>&5

10914

ac_status=$?

10915

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10916

(exit $ac_status); }; } &&

10917

{ ac_try='test -s conftest.$ac_objext'

10918

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

10919

- (eval $ac_try) 2>&5

10920

+ { (case "(($ac_try" in

10921

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10922

+ *) ac_try_echo=$ac_try;;

10923

+esac

10924

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10925

+ (eval "$ac_try") 2>&5

10926

ac_status=$?

10927

echo "$as_me:$LINENO: \$? = $ac_status" >&5

10928

(exit $ac_status); }; }; then

10929

@@ -19688,15 +21090,16 @@

10930

echo "$as_me: failed program was:" >&5

10931

sed 's/^/| /' conftest.$ac_ext >&5

10932

10933

-ac_header_compiler=no

10934

+ ac_header_compiler=no

10935

10936

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

10937

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

10938

-echo "${ECHO_T}$ac_header_compiler" >&6

10939

10940

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

10941

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

10942

+echo "${ECHO_T}$ac_header_compiler" >&6; }

10943

10944

# Is the header present?

10945

-echo "$as_me:$LINENO: checking libintl.h presence" >&5

10946

-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6

10947

+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5

10948

+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }

10949

cat >conftest.$ac_ext <<_ACEOF

10950

/* confdefs.h. */

10951

_ACEOF

10952

@@ -19705,8 +21108,13 @@

10953

/* end confdefs.h. */

10954

#include <libintl.h>

10955

_ACEOF

10956

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

10957

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

10958

+if { (ac_try="$ac_cpp conftest.$ac_ext"

10959

+case "(($ac_try" in

10960

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10961

+ *) ac_try_echo=$ac_try;;

10962

+esac

10963

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

10964

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

10965

ac_status=$?

10966

grep -v '^ *+' conftest.er1 >conftest.err

10967

rm -f conftest.er1

10968

@@ -19730,9 +21138,10 @@

10969

10970

ac_header_preproc=no

10971

10972

10973

rm -f conftest.err conftest.$ac_ext

10974

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

10975

-echo "${ECHO_T}$ac_header_preproc" >&6

10976

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

10977

+echo "${ECHO_T}$ac_header_preproc" >&6; }

10978

10979

# So? What about this header?

10980

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

10981

@@ -19756,25 +21165,23 @@

10982

echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}

10983

{ echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5

10984

echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}

10985

- (

10986

- cat <<\_ASBOX

10987

+ ( cat <<\_ASBOX

10988

## ------------------------------------------------------------------- ##

10989

## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=vino ##

10990

## ------------------------------------------------------------------- ##

10991

_ASBOX

10992

- ) |

10993

- sed "s/^/$as_me: WARNING: /" >&2

10994

+ ) | sed "s/^/$as_me: WARNING: /" >&2

10995

;;

10996

esac

10997

-echo "$as_me:$LINENO: checking for libintl.h" >&5

10998

-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6

10999

+{ echo "$as_me:$LINENO: checking for libintl.h" >&5

11000

+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; }

11001

if test "${ac_cv_header_libintl_h+set}" = set; then

11002

echo $ECHO_N "(cached) $ECHO_C" >&6

11003

else

11004

ac_cv_header_libintl_h=$ac_header_preproc

11005

11006

-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

11007

-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6

11008

+{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

11009

+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; }

11010

11011

11012

if test $ac_cv_header_libintl_h = yes; then

11013

@@ -19784,8 +21191,8 @@

11014

11015

# First check in libc

11016

11017

- echo "$as_me:$LINENO: checking for ngettext in libc" >&5

11018

-echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6

11019

+ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5

11020

+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }

11021

if test "${gt_cv_func_ngettext_libc+set}" = set; then

11022

echo $ECHO_N "(cached) $ECHO_C" >&6

11023

else

11024

@@ -19807,24 +21214,36 @@

11025

}

11026

_ACEOF

11027

rm -f conftest.$ac_objext conftest$ac_exeext

11028

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11029

- (eval $ac_link) 2>conftest.er1

11030

+if { (ac_try="$ac_link"

11031

+case "(($ac_try" in

11032

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11033

+ *) ac_try_echo=$ac_try;;

11034

+esac

11035

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11036

+ (eval "$ac_link") 2>conftest.er1

11037

ac_status=$?

11038

grep -v '^ *+' conftest.er1 >conftest.err

11039

rm -f conftest.er1

11040

cat conftest.err >&5

11041

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11042

(exit $ac_status); } &&

11043

- { ac_try='test -z "$ac_c_werror_flag"

11044

- || test ! -s conftest.err'

11045

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11046

- (eval $ac_try) 2>&5

11047

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

11048

+ { (case "(($ac_try" in

11049

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11050

+ *) ac_try_echo=$ac_try;;

11051

+esac

11052

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11053

+ (eval "$ac_try") 2>&5

11054

ac_status=$?

11055

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11056

(exit $ac_status); }; } &&

11057

{ ac_try='test -s conftest$ac_exeext'

11058

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11059

- (eval $ac_try) 2>&5

11060

+ { (case "(($ac_try" in

11061

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11062

+ *) ac_try_echo=$ac_try;;

11063

+esac

11064

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11065

+ (eval "$ac_try") 2>&5

11066

ac_status=$?

11067

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11068

(exit $ac_status); }; }; then

11069

@@ -19833,18 +21252,19 @@

11070

echo "$as_me: failed program was:" >&5

11071

sed 's/^/| /' conftest.$ac_ext >&5

11072

11073

-gt_cv_func_ngettext_libc=no

11074

+ gt_cv_func_ngettext_libc=no

11075

11076

-rm -f conftest.err conftest.$ac_objext \

11077

11078

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11079

conftest$ac_exeext conftest.$ac_ext

11080

11081

11082

-echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5

11083

-echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6

11084

+{ echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5

11085

+echo "${ECHO_T}$gt_cv_func_ngettext_libc" >&6; }

11086

11087

if test "$gt_cv_func_ngettext_libc" = "yes" ; then

11088

- echo "$as_me:$LINENO: checking for dgettext in libc" >&5

11089

-echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6

11090

+ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5

11091

+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }

11092

if test "${gt_cv_func_dgettext_libc+set}" = set; then

11093

echo $ECHO_N "(cached) $ECHO_C" >&6

11094

else

11095

@@ -19866,24 +21286,36 @@

11096

}

11097

_ACEOF

11098

rm -f conftest.$ac_objext conftest$ac_exeext

11099

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11100

- (eval $ac_link) 2>conftest.er1

11101

+if { (ac_try="$ac_link"

11102

+case "(($ac_try" in

11103

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11104

+ *) ac_try_echo=$ac_try;;

11105

+esac

11106

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11107

+ (eval "$ac_link") 2>conftest.er1

11108

ac_status=$?

11109

grep -v '^ *+' conftest.er1 >conftest.err

11110

rm -f conftest.er1

11111

cat conftest.err >&5

11112

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11113

(exit $ac_status); } &&

11114

- { ac_try='test -z "$ac_c_werror_flag"

11115

- || test ! -s conftest.err'

11116

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11117

- (eval $ac_try) 2>&5

11118

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

11119

+ { (case "(($ac_try" in

11120

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11121

+ *) ac_try_echo=$ac_try;;

11122

+esac

11123

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11124

+ (eval "$ac_try") 2>&5

11125

ac_status=$?

11126

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11127

(exit $ac_status); }; } &&

11128

{ ac_try='test -s conftest$ac_exeext'

11129

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11130

- (eval $ac_try) 2>&5

11131

+ { (case "(($ac_try" in

11132

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11133

+ *) ac_try_echo=$ac_try;;

11134

+esac

11135

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11136

+ (eval "$ac_try") 2>&5

11137

ac_status=$?

11138

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11139

(exit $ac_status); }; }; then

11140

@@ -19892,14 +21324,15 @@

11141

echo "$as_me: failed program was:" >&5

11142

sed 's/^/| /' conftest.$ac_ext >&5

11143

11144

-gt_cv_func_dgettext_libc=no

11145

+ gt_cv_func_dgettext_libc=no

11146

11147

-rm -f conftest.err conftest.$ac_objext \

11148

11149

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11150

conftest$ac_exeext conftest.$ac_ext

11151

11152

11153

-echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5

11154

-echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6

11155

+{ echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5

11156

+echo "${ECHO_T}$gt_cv_func_dgettext_libc" >&6; }

11157

11158

11159

if test "$gt_cv_func_ngettext_libc" = "yes" ; then

11160

@@ -19907,9 +21340,9 @@

11161

for ac_func in bind_textdomain_codeset

11162

11163

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

11164

-echo "$as_me:$LINENO: checking for $ac_func" >&5

11165

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

11166

-if eval "test \"\${$as_ac_var+set}\" = set"; then

11167

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

11168

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

11169

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

11170

echo $ECHO_N "(cached) $ECHO_C" >&6

11171

else

11172

cat >conftest.$ac_ext <<_ACEOF

11173

@@ -19935,53 +21368,59 @@

11174

11175

#undef $ac_func

11176

11177

-/* Override any gcc2 internal prototype to avoid an error. */

11178

+/* Override any GCC internal prototype to avoid an error.

11179

+ Use char because int might match the return type of a GCC

11180

+ builtin and then its argument prototype would still apply. */

11181

#ifdef __cplusplus

11182

extern "C"

11183

11184

#endif

11185

-/* We use char because int might match the return type of a gcc2

11186

- builtin and then its argument prototype would still apply. */

11187

char $ac_func ();

11188

/* The GNU C library defines this for functions which it implements

11189

to always fail with ENOSYS. Some functions are actually named

11190

something starting with __ and the normal name is an alias. */

11191

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

11192

+#if defined __stub_$ac_func || defined __stub___$ac_func

11193

choke me

11194

-#else

11195

-char (*f) () = $ac_func;

11196

-#endif

11197

-#ifdef __cplusplus

11198

11199

#endif

11200

11201

int

11202

main ()

11203

{

11204

-return f != $ac_func;

11205

+return $ac_func ();

11206

;

11207

return 0;

11208

}

11209

_ACEOF

11210

rm -f conftest.$ac_objext conftest$ac_exeext

11211

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11212

- (eval $ac_link) 2>conftest.er1

11213

+if { (ac_try="$ac_link"

11214

+case "(($ac_try" in

11215

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11216

+ *) ac_try_echo=$ac_try;;

11217

+esac

11218

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11219

+ (eval "$ac_link") 2>conftest.er1

11220

ac_status=$?

11221

grep -v '^ *+' conftest.er1 >conftest.err

11222

rm -f conftest.er1

11223

cat conftest.err >&5

11224

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11225

(exit $ac_status); } &&

11226

- { ac_try='test -z "$ac_c_werror_flag"

11227

- || test ! -s conftest.err'

11228

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11229

- (eval $ac_try) 2>&5

11230

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

11231

+ { (case "(($ac_try" in

11232

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11233

+ *) ac_try_echo=$ac_try;;

11234

+esac

11235

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11236

+ (eval "$ac_try") 2>&5

11237

ac_status=$?

11238

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11239

(exit $ac_status); }; } &&

11240

{ ac_try='test -s conftest$ac_exeext'

11241

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11242

- (eval $ac_try) 2>&5

11243

+ { (case "(($ac_try" in

11244

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11245

+ *) ac_try_echo=$ac_try;;

11246

+esac

11247

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11248

+ (eval "$ac_try") 2>&5

11249

ac_status=$?

11250

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11251

(exit $ac_status); }; }; then

11252

@@ -19990,13 +21429,15 @@

11253

echo "$as_me: failed program was:" >&5

11254

sed 's/^/| /' conftest.$ac_ext >&5

11255

11256

-eval "$as_ac_var=no"

11257

+ eval "$as_ac_var=no"

11258

11259

-rm -f conftest.err conftest.$ac_objext \

11260

11261

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11262

conftest$ac_exeext conftest.$ac_ext

11263

11264

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

11265

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

11266

+ac_res=`eval echo '${'$as_ac_var'}'`

11267

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

11268

+echo "${ECHO_T}$ac_res" >&6; }

11269

if test `eval echo '${'$as_ac_var'}'` = yes; then

11270

cat >>confdefs.h <<_ACEOF

11271

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

11272

@@ -20014,8 +21455,8 @@

11273

|| test "$gt_cv_func_ngettext_libc" != "yes" \

11274

|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then

11275

11276

- echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5

11277

-echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6

11278

+ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5

11279

+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }

11280

if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then

11281

echo $ECHO_N "(cached) $ECHO_C" >&6

11282

else

11283

@@ -20028,40 +21469,52 @@

11284

cat >>conftest.$ac_ext <<_ACEOF

11285

/* end confdefs.h. */

11286

11287

-/* Override any gcc2 internal prototype to avoid an error. */

11288

+/* Override any GCC internal prototype to avoid an error.

11289

+ Use char because int might match the return type of a GCC

11290

+ builtin and then its argument prototype would still apply. */

11291

#ifdef __cplusplus

11292

extern "C"

11293

#endif

11294

-/* We use char because int might match the return type of a gcc2

11295

- builtin and then its argument prototype would still apply. */

11296

char bindtextdomain ();

11297

int

11298

main ()

11299

{

11300

-bindtextdomain ();

11301

+return bindtextdomain ();

11302

;

11303

return 0;

11304

}

11305

_ACEOF

11306

rm -f conftest.$ac_objext conftest$ac_exeext

11307

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11308

- (eval $ac_link) 2>conftest.er1

11309

+if { (ac_try="$ac_link"

11310

+case "(($ac_try" in

11311

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11312

+ *) ac_try_echo=$ac_try;;

11313

+esac

11314

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11315

+ (eval "$ac_link") 2>conftest.er1

11316

ac_status=$?

11317

grep -v '^ *+' conftest.er1 >conftest.err

11318

rm -f conftest.er1

11319

cat conftest.err >&5

11320

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11321

(exit $ac_status); } &&

11322

- { ac_try='test -z "$ac_c_werror_flag"

11323

- || test ! -s conftest.err'

11324

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11325

- (eval $ac_try) 2>&5

11326

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

11327

+ { (case "(($ac_try" in

11328

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11329

+ *) ac_try_echo=$ac_try;;

11330

+esac

11331

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11332

+ (eval "$ac_try") 2>&5

11333

ac_status=$?

11334

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11335

(exit $ac_status); }; } &&

11336

{ ac_try='test -s conftest$ac_exeext'

11337

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11338

- (eval $ac_try) 2>&5

11339

+ { (case "(($ac_try" in

11340

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11341

+ *) ac_try_echo=$ac_try;;

11342

+esac

11343

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11344

+ (eval "$ac_try") 2>&5

11345

ac_status=$?

11346

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11347

(exit $ac_status); }; }; then

11348

@@ -20070,17 +21523,18 @@

11349

echo "$as_me: failed program was:" >&5

11350

sed 's/^/| /' conftest.$ac_ext >&5

11351

11352

-ac_cv_lib_intl_bindtextdomain=no

11353

+ ac_cv_lib_intl_bindtextdomain=no

11354

11355

-rm -f conftest.err conftest.$ac_objext \

11356

11357

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11358

conftest$ac_exeext conftest.$ac_ext

11359

LIBS=$ac_check_lib_save_LIBS

11360

11361

-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5

11362

-echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6

11363

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5

11364

+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6; }

11365

if test $ac_cv_lib_intl_bindtextdomain = yes; then

11366

- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

11367

-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6

11368

+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

11369

+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }

11370

if test "${ac_cv_lib_intl_ngettext+set}" = set; then

11371

echo $ECHO_N "(cached) $ECHO_C" >&6

11372

else

11373

@@ -20093,40 +21547,52 @@

11374

cat >>conftest.$ac_ext <<_ACEOF

11375

/* end confdefs.h. */

11376

11377

-/* Override any gcc2 internal prototype to avoid an error. */

11378

+/* Override any GCC internal prototype to avoid an error.

11379

+ Use char because int might match the return type of a GCC

11380

+ builtin and then its argument prototype would still apply. */

11381

#ifdef __cplusplus

11382

extern "C"

11383

#endif

11384

-/* We use char because int might match the return type of a gcc2

11385

- builtin and then its argument prototype would still apply. */

11386

char ngettext ();

11387

int

11388

main ()

11389

{

11390

-ngettext ();

11391

+return ngettext ();

11392

;

11393

return 0;

11394

}

11395

_ACEOF

11396

rm -f conftest.$ac_objext conftest$ac_exeext

11397

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11398

- (eval $ac_link) 2>conftest.er1

11399

+if { (ac_try="$ac_link"

11400

+case "(($ac_try" in

11401

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11402

+ *) ac_try_echo=$ac_try;;

11403

+esac

11404

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11405

+ (eval "$ac_link") 2>conftest.er1

11406

ac_status=$?

11407

grep -v '^ *+' conftest.er1 >conftest.err

11408

rm -f conftest.er1

11409

cat conftest.err >&5

11410

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11411

(exit $ac_status); } &&

11412

- { ac_try='test -z "$ac_c_werror_flag"

11413

- || test ! -s conftest.err'

11414

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11415

- (eval $ac_try) 2>&5

11416

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

11417

+ { (case "(($ac_try" in

11418

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11419

+ *) ac_try_echo=$ac_try;;

11420

+esac

11421

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11422

+ (eval "$ac_try") 2>&5

11423

ac_status=$?

11424

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11425

(exit $ac_status); }; } &&

11426

{ ac_try='test -s conftest$ac_exeext'

11427

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11428

- (eval $ac_try) 2>&5

11429

+ { (case "(($ac_try" in

11430

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11431

+ *) ac_try_echo=$ac_try;;

11432

+esac

11433

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11434

+ (eval "$ac_try") 2>&5

11435

ac_status=$?

11436

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11437

(exit $ac_status); }; }; then

11438

@@ -20135,17 +21601,18 @@

11439

echo "$as_me: failed program was:" >&5

11440

sed 's/^/| /' conftest.$ac_ext >&5

11441

11442

-ac_cv_lib_intl_ngettext=no

11443

+ ac_cv_lib_intl_ngettext=no

11444

11445

-rm -f conftest.err conftest.$ac_objext \

11446

11447

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11448

conftest$ac_exeext conftest.$ac_ext

11449

LIBS=$ac_check_lib_save_LIBS

11450

11451

-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

11452

-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6

11453

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

11454

+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }

11455

if test $ac_cv_lib_intl_ngettext = yes; then

11456

- echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5

11457

-echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6

11458

+ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5

11459

+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }

11460

if test "${ac_cv_lib_intl_dgettext+set}" = set; then

11461

echo $ECHO_N "(cached) $ECHO_C" >&6

11462

else

11463

@@ -20158,40 +21625,52 @@

11464

cat >>conftest.$ac_ext <<_ACEOF

11465

/* end confdefs.h. */

11466

11467

-/* Override any gcc2 internal prototype to avoid an error. */

11468

+/* Override any GCC internal prototype to avoid an error.

11469

+ Use char because int might match the return type of a GCC

11470

+ builtin and then its argument prototype would still apply. */

11471

#ifdef __cplusplus

11472

extern "C"

11473

#endif

11474

-/* We use char because int might match the return type of a gcc2

11475

- builtin and then its argument prototype would still apply. */

11476

char dgettext ();

11477

int

11478

main ()

11479

{

11480

-dgettext ();

11481

+return dgettext ();

11482

;

11483

return 0;

11484

}

11485

_ACEOF

11486

rm -f conftest.$ac_objext conftest$ac_exeext

11487

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11488

- (eval $ac_link) 2>conftest.er1

11489

+if { (ac_try="$ac_link"

11490

+case "(($ac_try" in

11491

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11492

+ *) ac_try_echo=$ac_try;;

11493

+esac

11494

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11495

+ (eval "$ac_link") 2>conftest.er1

11496

ac_status=$?

11497

grep -v '^ *+' conftest.er1 >conftest.err

11498

rm -f conftest.er1

11499

cat conftest.err >&5

11500

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11501

(exit $ac_status); } &&

11502

- { ac_try='test -z "$ac_c_werror_flag"

11503

- || test ! -s conftest.err'

11504

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11505

- (eval $ac_try) 2>&5

11506

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

11507

+ { (case "(($ac_try" in

11508

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11509

+ *) ac_try_echo=$ac_try;;

11510

+esac

11511

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11512

+ (eval "$ac_try") 2>&5

11513

ac_status=$?

11514

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11515

(exit $ac_status); }; } &&

11516

{ ac_try='test -s conftest$ac_exeext'

11517

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11518

- (eval $ac_try) 2>&5

11519

+ { (case "(($ac_try" in

11520

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11521

+ *) ac_try_echo=$ac_try;;

11522

+esac

11523

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11524

+ (eval "$ac_try") 2>&5

11525

ac_status=$?

11526

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11527

(exit $ac_status); }; }; then

11528

@@ -20200,14 +21679,15 @@

11529

echo "$as_me: failed program was:" >&5

11530

sed 's/^/| /' conftest.$ac_ext >&5

11531

11532

-ac_cv_lib_intl_dgettext=no

11533

+ ac_cv_lib_intl_dgettext=no

11534

11535

-rm -f conftest.err conftest.$ac_objext \

11536

11537

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11538

conftest$ac_exeext conftest.$ac_ext

11539

LIBS=$ac_check_lib_save_LIBS

11540

11541

-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5

11542

-echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6

11543

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5

11544

+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; }

11545

if test $ac_cv_lib_intl_dgettext = yes; then

11546

gt_cv_func_dgettext_libintl=yes

11547

11548

@@ -20218,12 +21698,12 @@

11549

11550

11551

if test "$gt_cv_func_dgettext_libintl" != "yes" ; then

11552

- echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5

11553

-echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6

11554

- echo "$as_me:$LINENO: result: " >&5

11555

-echo "${ECHO_T}" >&6

11556

- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

11557

-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6

11558

+ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5

11559

+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }

11560

+ { echo "$as_me:$LINENO: result: " >&5

11561

+echo "${ECHO_T}" >&6; }

11562

+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

11563

+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }

11564

if test "${ac_cv_lib_intl_ngettext+set}" = set; then

11565

echo $ECHO_N "(cached) $ECHO_C" >&6

11566

else

11567

@@ -20236,40 +21716,52 @@

11568

cat >>conftest.$ac_ext <<_ACEOF

11569

/* end confdefs.h. */

11570

11571

-/* Override any gcc2 internal prototype to avoid an error. */

11572

+/* Override any GCC internal prototype to avoid an error.

11573

+ Use char because int might match the return type of a GCC

11574

+ builtin and then its argument prototype would still apply. */

11575

#ifdef __cplusplus

11576

extern "C"

11577

#endif

11578

-/* We use char because int might match the return type of a gcc2

11579

- builtin and then its argument prototype would still apply. */

11580

char ngettext ();

11581

int

11582

main ()

11583

{

11584

-ngettext ();

11585

+return ngettext ();

11586

;

11587

return 0;

11588

}

11589

_ACEOF

11590

rm -f conftest.$ac_objext conftest$ac_exeext

11591

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11592

- (eval $ac_link) 2>conftest.er1

11593

+if { (ac_try="$ac_link"

11594

+case "(($ac_try" in

11595

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11596

+ *) ac_try_echo=$ac_try;;

11597

+esac

11598

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11599

+ (eval "$ac_link") 2>conftest.er1

11600

ac_status=$?

11601

grep -v '^ *+' conftest.er1 >conftest.err

11602

rm -f conftest.er1

11603

cat conftest.err >&5

11604

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11605

(exit $ac_status); } &&

11606

- { ac_try='test -z "$ac_c_werror_flag"

11607

- || test ! -s conftest.err'

11608

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11609

- (eval $ac_try) 2>&5

11610

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

11611

+ { (case "(($ac_try" in

11612

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11613

+ *) ac_try_echo=$ac_try;;

11614

+esac

11615

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11616

+ (eval "$ac_try") 2>&5

11617

ac_status=$?

11618

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11619

(exit $ac_status); }; } &&

11620

{ ac_try='test -s conftest$ac_exeext'

11621

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11622

- (eval $ac_try) 2>&5

11623

+ { (case "(($ac_try" in

11624

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11625

+ *) ac_try_echo=$ac_try;;

11626

+esac

11627

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11628

+ (eval "$ac_try") 2>&5

11629

ac_status=$?

11630

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11631

(exit $ac_status); }; }; then

11632

@@ -20278,17 +21770,18 @@

11633

echo "$as_me: failed program was:" >&5

11634

sed 's/^/| /' conftest.$ac_ext >&5

11635

11636

-ac_cv_lib_intl_ngettext=no

11637

+ ac_cv_lib_intl_ngettext=no

11638

11639

-rm -f conftest.err conftest.$ac_objext \

11640

11641

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11642

conftest$ac_exeext conftest.$ac_ext

11643

LIBS=$ac_check_lib_save_LIBS

11644

11645

-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

11646

-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6

11647

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

11648

+echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6; }

11649

if test $ac_cv_lib_intl_ngettext = yes; then

11650

- echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5

11651

-echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6

11652

+ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5

11653

+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }

11654

if test "${ac_cv_lib_intl_dcgettext+set}" = set; then

11655

echo $ECHO_N "(cached) $ECHO_C" >&6

11656

else

11657

@@ -20301,40 +21794,52 @@

11658

cat >>conftest.$ac_ext <<_ACEOF

11659

/* end confdefs.h. */

11660

11661

-/* Override any gcc2 internal prototype to avoid an error. */

11662

+/* Override any GCC internal prototype to avoid an error.

11663

+ Use char because int might match the return type of a GCC

11664

+ builtin and then its argument prototype would still apply. */

11665

#ifdef __cplusplus

11666

extern "C"

11667

#endif

11668

-/* We use char because int might match the return type of a gcc2

11669

- builtin and then its argument prototype would still apply. */

11670

char dcgettext ();

11671

int

11672

main ()

11673

{

11674

-dcgettext ();

11675

+return dcgettext ();

11676

;

11677

return 0;

11678

}

11679

_ACEOF

11680

rm -f conftest.$ac_objext conftest$ac_exeext

11681

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11682

- (eval $ac_link) 2>conftest.er1

11683

+if { (ac_try="$ac_link"

11684

+case "(($ac_try" in

11685

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11686

+ *) ac_try_echo=$ac_try;;

11687

+esac

11688

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11689

+ (eval "$ac_link") 2>conftest.er1

11690

ac_status=$?

11691

grep -v '^ *+' conftest.er1 >conftest.err

11692

rm -f conftest.er1

11693

cat conftest.err >&5

11694

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11695

(exit $ac_status); } &&

11696

- { ac_try='test -z "$ac_c_werror_flag"

11697

- || test ! -s conftest.err'

11698

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11699

- (eval $ac_try) 2>&5

11700

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

11701

+ { (case "(($ac_try" in

11702

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11703

+ *) ac_try_echo=$ac_try;;

11704

+esac

11705

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11706

+ (eval "$ac_try") 2>&5

11707

ac_status=$?

11708

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11709

(exit $ac_status); }; } &&

11710

{ ac_try='test -s conftest$ac_exeext'

11711

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11712

- (eval $ac_try) 2>&5

11713

+ { (case "(($ac_try" in

11714

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11715

+ *) ac_try_echo=$ac_try;;

11716

+esac

11717

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11718

+ (eval "$ac_try") 2>&5

11719

ac_status=$?

11720

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11721

(exit $ac_status); }; }; then

11722

@@ -20343,14 +21848,15 @@

11723

echo "$as_me: failed program was:" >&5

11724

sed 's/^/| /' conftest.$ac_ext >&5

11725

11726

-ac_cv_lib_intl_dcgettext=no

11727

+ ac_cv_lib_intl_dcgettext=no

11728

11729

-rm -f conftest.err conftest.$ac_objext \

11730

11731

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11732

conftest$ac_exeext conftest.$ac_ext

11733

LIBS=$ac_check_lib_save_LIBS

11734

11735

-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5

11736

-echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6

11737

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5

11738

+echo "${ECHO_T}$ac_cv_lib_intl_dcgettext" >&6; }

11739

if test $ac_cv_lib_intl_dcgettext = yes; then

11740

gt_cv_func_dgettext_libintl=yes

11741

libintl_extra_libs=-liconv

11742

@@ -20377,9 +21883,9 @@

11743

for ac_func in bind_textdomain_codeset

11744

11745

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

11746

-echo "$as_me:$LINENO: checking for $ac_func" >&5

11747

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

11748

-if eval "test \"\${$as_ac_var+set}\" = set"; then

11749

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

11750

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

11751

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

11752

echo $ECHO_N "(cached) $ECHO_C" >&6

11753

else

11754

cat >conftest.$ac_ext <<_ACEOF

11755

@@ -20405,53 +21911,59 @@

11756

11757

#undef $ac_func

11758

11759

-/* Override any gcc2 internal prototype to avoid an error. */

11760

+/* Override any GCC internal prototype to avoid an error.

11761

+ Use char because int might match the return type of a GCC

11762

+ builtin and then its argument prototype would still apply. */

11763

#ifdef __cplusplus

11764

extern "C"

11765

11766

#endif

11767

-/* We use char because int might match the return type of a gcc2

11768

- builtin and then its argument prototype would still apply. */

11769

char $ac_func ();

11770

/* The GNU C library defines this for functions which it implements

11771

to always fail with ENOSYS. Some functions are actually named

11772

something starting with __ and the normal name is an alias. */

11773

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

11774

+#if defined __stub_$ac_func || defined __stub___$ac_func

11775

choke me

11776

-#else

11777

-char (*f) () = $ac_func;

11778

-#endif

11779

-#ifdef __cplusplus

11780

11781

#endif

11782

11783

int

11784

main ()

11785

{

11786

-return f != $ac_func;

11787

+return $ac_func ();

11788

;

11789

return 0;

11790

}

11791

_ACEOF

11792

rm -f conftest.$ac_objext conftest$ac_exeext

11793

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11794

- (eval $ac_link) 2>conftest.er1

11795

+if { (ac_try="$ac_link"

11796

+case "(($ac_try" in

11797

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11798

+ *) ac_try_echo=$ac_try;;

11799

+esac

11800

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11801

+ (eval "$ac_link") 2>conftest.er1

11802

ac_status=$?

11803

grep -v '^ *+' conftest.er1 >conftest.err

11804

rm -f conftest.er1

11805

cat conftest.err >&5

11806

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11807

(exit $ac_status); } &&

11808

- { ac_try='test -z "$ac_c_werror_flag"

11809

- || test ! -s conftest.err'

11810

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11811

- (eval $ac_try) 2>&5

11812

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

11813

+ { (case "(($ac_try" in

11814

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11815

+ *) ac_try_echo=$ac_try;;

11816

+esac

11817

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11818

+ (eval "$ac_try") 2>&5

11819

ac_status=$?

11820

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11821

(exit $ac_status); }; } &&

11822

{ ac_try='test -s conftest$ac_exeext'

11823

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11824

- (eval $ac_try) 2>&5

11825

+ { (case "(($ac_try" in

11826

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11827

+ *) ac_try_echo=$ac_try;;

11828

+esac

11829

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11830

+ (eval "$ac_try") 2>&5

11831

ac_status=$?

11832

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11833

(exit $ac_status); }; }; then

11834

@@ -20460,13 +21972,15 @@

11835

echo "$as_me: failed program was:" >&5

11836

sed 's/^/| /' conftest.$ac_ext >&5

11837

11838

-eval "$as_ac_var=no"

11839

+ eval "$as_ac_var=no"

11840

11841

-rm -f conftest.err conftest.$ac_objext \

11842

11843

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11844

conftest$ac_exeext conftest.$ac_ext

11845

11846

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

11847

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

11848

+ac_res=`eval echo '${'$as_ac_var'}'`

11849

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

11850

+echo "${ECHO_T}$ac_res" >&6; }

11851

if test `eval echo '${'$as_ac_var'}'` = yes; then

11852

cat >>confdefs.h <<_ACEOF

11853

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

11854

@@ -20505,8 +22019,8 @@

11855

11856

# Extract the first word of "msgfmt", so it can be a program name with args.

11857

set dummy msgfmt; ac_word=$2

11858

-echo "$as_me:$LINENO: checking for $ac_word" >&5

11859

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

11860

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11861

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11862

if test "${ac_cv_path_MSGFMT+set}" = set; then

11863

echo $ECHO_N "(cached) $ECHO_C" >&6

11864

else

11865

@@ -20532,11 +22046,11 @@

11866

11867

MSGFMT="$ac_cv_path_MSGFMT"

11868

if test "$MSGFMT" != "no"; then

11869

- echo "$as_me:$LINENO: result: $MSGFMT" >&5

11870

-echo "${ECHO_T}$MSGFMT" >&6

11871

+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5

11872

+echo "${ECHO_T}$MSGFMT" >&6; }

11873

else

11874

- echo "$as_me:$LINENO: result: no" >&5

11875

-echo "${ECHO_T}no" >&6

11876

+ { echo "$as_me:$LINENO: result: no" >&5

11877

+echo "${ECHO_T}no" >&6; }

11878

11879

if test "$MSGFMT" != "no"; then

11880

glib_save_LIBS="$LIBS"

11881

@@ -20545,9 +22059,9 @@

11882

for ac_func in dcgettext

11883

11884

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

11885

-echo "$as_me:$LINENO: checking for $ac_func" >&5

11886

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

11887

-if eval "test \"\${$as_ac_var+set}\" = set"; then

11888

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

11889

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

11890

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

11891

echo $ECHO_N "(cached) $ECHO_C" >&6

11892

else

11893

cat >conftest.$ac_ext <<_ACEOF

11894

@@ -20573,53 +22087,59 @@

11895

11896

#undef $ac_func

11897

11898

-/* Override any gcc2 internal prototype to avoid an error. */

11899

+/* Override any GCC internal prototype to avoid an error.

11900

+ Use char because int might match the return type of a GCC

11901

+ builtin and then its argument prototype would still apply. */

11902

#ifdef __cplusplus

11903

extern "C"

11904

11905

#endif

11906

-/* We use char because int might match the return type of a gcc2

11907

- builtin and then its argument prototype would still apply. */

11908

char $ac_func ();

11909

/* The GNU C library defines this for functions which it implements

11910

to always fail with ENOSYS. Some functions are actually named

11911

something starting with __ and the normal name is an alias. */

11912

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

11913

+#if defined __stub_$ac_func || defined __stub___$ac_func

11914

choke me

11915

-#else

11916

-char (*f) () = $ac_func;

11917

-#endif

11918

-#ifdef __cplusplus

11919

11920

#endif

11921

11922

int

11923

main ()

11924

{

11925

-return f != $ac_func;

11926

+return $ac_func ();

11927

;

11928

return 0;

11929

}

11930

_ACEOF

11931

rm -f conftest.$ac_objext conftest$ac_exeext

11932

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

11933

- (eval $ac_link) 2>conftest.er1

11934

+if { (ac_try="$ac_link"

11935

+case "(($ac_try" in

11936

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11937

+ *) ac_try_echo=$ac_try;;

11938

+esac

11939

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11940

+ (eval "$ac_link") 2>conftest.er1

11941

ac_status=$?

11942

grep -v '^ *+' conftest.er1 >conftest.err

11943

rm -f conftest.er1

11944

cat conftest.err >&5

11945

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11946

(exit $ac_status); } &&

11947

- { ac_try='test -z "$ac_c_werror_flag"

11948

- || test ! -s conftest.err'

11949

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11950

- (eval $ac_try) 2>&5

11951

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

11952

+ { (case "(($ac_try" in

11953

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11954

+ *) ac_try_echo=$ac_try;;

11955

+esac

11956

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11957

+ (eval "$ac_try") 2>&5

11958

ac_status=$?

11959

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11960

(exit $ac_status); }; } &&

11961

{ ac_try='test -s conftest$ac_exeext'

11962

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

11963

- (eval $ac_try) 2>&5

11964

+ { (case "(($ac_try" in

11965

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11966

+ *) ac_try_echo=$ac_try;;

11967

+esac

11968

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11969

+ (eval "$ac_try") 2>&5

11970

ac_status=$?

11971

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11972

(exit $ac_status); }; }; then

11973

@@ -20628,13 +22148,15 @@

11974

echo "$as_me: failed program was:" >&5

11975

sed 's/^/| /' conftest.$ac_ext >&5

11976

11977

-eval "$as_ac_var=no"

11978

+ eval "$as_ac_var=no"

11979

11980

-rm -f conftest.err conftest.$ac_objext \

11981

11982

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11983

conftest$ac_exeext conftest.$ac_ext

11984

11985

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

11986

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

11987

+ac_res=`eval echo '${'$as_ac_var'}'`

11988

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

11989

+echo "${ECHO_T}$ac_res" >&6; }

11990

if test `eval echo '${'$as_ac_var'}'` = yes; then

11991

cat >>confdefs.h <<_ACEOF

11992

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

11993

@@ -20645,8 +22167,8 @@

11994

11995

# Extract the first word of "gmsgfmt", so it can be a program name with args.

11996

set dummy gmsgfmt; ac_word=$2

11997

-echo "$as_me:$LINENO: checking for $ac_word" >&5

11998

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

11999

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

12000

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

12001

if test "${ac_cv_path_GMSGFMT+set}" = set; then

12002

echo $ECHO_N "(cached) $ECHO_C" >&6

12003

else

12004

@@ -20661,32 +22183,33 @@

12005

IFS=$as_save_IFS

12006

test -z "$as_dir" && as_dir=.

12007

for ac_exec_ext in '' $ac_executable_extensions; do

12008

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

12009

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

12010

ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"

12011

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

12012

break 2

12013

12014

done

12015

done

12016

+IFS=$as_save_IFS

12017

12018

test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"

12019

;;

12020

esac

12021

12022

GMSGFMT=$ac_cv_path_GMSGFMT

12023

12024

if test -n "$GMSGFMT"; then

12025

- echo "$as_me:$LINENO: result: $GMSGFMT" >&5

12026

-echo "${ECHO_T}$GMSGFMT" >&6

12027

+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5

12028

+echo "${ECHO_T}$GMSGFMT" >&6; }

12029

else

12030

- echo "$as_me:$LINENO: result: no" >&5

12031

-echo "${ECHO_T}no" >&6

12032

+ { echo "$as_me:$LINENO: result: no" >&5

12033

+echo "${ECHO_T}no" >&6; }

12034

12035

12036

12037

# Extract the first word of "xgettext", so it can be a program name with args.

12038

set dummy xgettext; ac_word=$2

12039

-echo "$as_me:$LINENO: checking for $ac_word" >&5

12040

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

12041

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

12042

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

12043

if test "${ac_cv_path_XGETTEXT+set}" = set; then

12044

echo $ECHO_N "(cached) $ECHO_C" >&6

12045

else

12046

@@ -20712,11 +22235,11 @@

12047

12048

XGETTEXT="$ac_cv_path_XGETTEXT"

12049

if test "$XGETTEXT" != ":"; then

12050

- echo "$as_me:$LINENO: result: $XGETTEXT" >&5

12051

-echo "${ECHO_T}$XGETTEXT" >&6

12052

+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5

12053

+echo "${ECHO_T}$XGETTEXT" >&6; }

12054

else

12055

- echo "$as_me:$LINENO: result: no" >&5

12056

-echo "${ECHO_T}no" >&6

12057

+ { echo "$as_me:$LINENO: result: no" >&5

12058

+echo "${ECHO_T}no" >&6; }

12059

12060

12061

cat >conftest.$ac_ext <<_ACEOF

12062

@@ -20736,24 +22259,36 @@

12063

}

12064

_ACEOF

12065

rm -f conftest.$ac_objext conftest$ac_exeext

12066

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12067

- (eval $ac_link) 2>conftest.er1

12068

+if { (ac_try="$ac_link"

12069

+case "(($ac_try" in

12070

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12071

+ *) ac_try_echo=$ac_try;;

12072

+esac

12073

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12074

+ (eval "$ac_link") 2>conftest.er1

12075

ac_status=$?

12076

grep -v '^ *+' conftest.er1 >conftest.err

12077

rm -f conftest.er1

12078

cat conftest.err >&5

12079

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12080

(exit $ac_status); } &&

12081

- { ac_try='test -z "$ac_c_werror_flag"

12082

- || test ! -s conftest.err'

12083

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12084

- (eval $ac_try) 2>&5

12085

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

12086

+ { (case "(($ac_try" in

12087

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12088

+ *) ac_try_echo=$ac_try;;

12089

+esac

12090

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12091

+ (eval "$ac_try") 2>&5

12092

ac_status=$?

12093

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12094

(exit $ac_status); }; } &&

12095

{ ac_try='test -s conftest$ac_exeext'

12096

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12097

- (eval $ac_try) 2>&5

12098

+ { (case "(($ac_try" in

12099

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12100

+ *) ac_try_echo=$ac_try;;

12101

+esac

12102

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12103

+ (eval "$ac_try") 2>&5

12104

ac_status=$?

12105

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12106

(exit $ac_status); }; }; then

12107

@@ -20763,10 +22298,10 @@

12108

echo "$as_me: failed program was:" >&5

12109

sed 's/^/| /' conftest.$ac_ext >&5

12110

12111

-case $host in

12112

+ case $host in

12113

*-*-solaris*)

12114

- echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

12115

-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6

12116

+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

12117

+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }

12118

if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then

12119

echo $ECHO_N "(cached) $ECHO_C" >&6

12120

else

12121

@@ -20793,53 +22328,59 @@

12122

12123

#undef bind_textdomain_codeset

12124

12125

-/* Override any gcc2 internal prototype to avoid an error. */

12126

+/* Override any GCC internal prototype to avoid an error.

12127

+ Use char because int might match the return type of a GCC

12128

+ builtin and then its argument prototype would still apply. */

12129

#ifdef __cplusplus

12130

extern "C"

12131

12132

#endif

12133

-/* We use char because int might match the return type of a gcc2

12134

- builtin and then its argument prototype would still apply. */

12135

char bind_textdomain_codeset ();

12136

/* The GNU C library defines this for functions which it implements

12137

to always fail with ENOSYS. Some functions are actually named

12138

something starting with __ and the normal name is an alias. */

12139

-#if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset)

12140

+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset

12141

choke me

12142

-#else

12143

-char (*f) () = bind_textdomain_codeset;

12144

-#endif

12145

-#ifdef __cplusplus

12146

12147

#endif

12148

12149

int

12150

main ()

12151

{

12152

-return f != bind_textdomain_codeset;

12153

+return bind_textdomain_codeset ();

12154

;

12155

return 0;

12156

}

12157

_ACEOF

12158

rm -f conftest.$ac_objext conftest$ac_exeext

12159

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12160

- (eval $ac_link) 2>conftest.er1

12161

+if { (ac_try="$ac_link"

12162

+case "(($ac_try" in

12163

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12164

+ *) ac_try_echo=$ac_try;;

12165

+esac

12166

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12167

+ (eval "$ac_link") 2>conftest.er1

12168

ac_status=$?

12169

grep -v '^ *+' conftest.er1 >conftest.err

12170

rm -f conftest.er1

12171

cat conftest.err >&5

12172

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12173

(exit $ac_status); } &&

12174

- { ac_try='test -z "$ac_c_werror_flag"

12175

- || test ! -s conftest.err'

12176

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12177

- (eval $ac_try) 2>&5

12178

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

12179

+ { (case "(($ac_try" in

12180

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12181

+ *) ac_try_echo=$ac_try;;

12182

+esac

12183

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12184

+ (eval "$ac_try") 2>&5

12185

ac_status=$?

12186

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12187

(exit $ac_status); }; } &&

12188

{ ac_try='test -s conftest$ac_exeext'

12189

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12190

- (eval $ac_try) 2>&5

12191

+ { (case "(($ac_try" in

12192

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12193

+ *) ac_try_echo=$ac_try;;

12194

+esac

12195

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12196

+ (eval "$ac_try") 2>&5

12197

ac_status=$?

12198

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12199

(exit $ac_status); }; }; then

12200

@@ -20848,13 +22389,14 @@

12201

echo "$as_me: failed program was:" >&5

12202

sed 's/^/| /' conftest.$ac_ext >&5

12203

12204

-ac_cv_func_bind_textdomain_codeset=no

12205

+ ac_cv_func_bind_textdomain_codeset=no

12206

12207

-rm -f conftest.err conftest.$ac_objext \

12208

12209

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12210

conftest$ac_exeext conftest.$ac_ext

12211

12212

-echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

12213

-echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6

12214

+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

12215

+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }

12216

if test $ac_cv_func_bind_textdomain_codeset = yes; then

12217

CATOBJEXT=.gmo

12218

DATADIRNAME=share

12219

@@ -20870,7 +22412,8 @@

12220

;;

12221

esac

12222

12223

-rm -f conftest.err conftest.$ac_objext \

12224

12225

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12226

conftest$ac_exeext conftest.$ac_ext

12227

LIBS="$glib_save_LIBS"

12228

INSTOBJEXT=.mo

12229

@@ -20895,8 +22438,8 @@

12230

if $XGETTEXT --omit-header /dev/null 2> /dev/null; then

12231

: ;

12232

else

12233

- echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5

12234

-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6

12235

+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5

12236

+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }

12237

XGETTEXT=":"

12238

12239

12240

@@ -20904,7 +22447,7 @@

12241

# We need to process the po/ directory.

12242

POSUB=po

12243

12244

- ac_config_commands="$ac_config_commands default-1"

12245

+ ac_config_commands="$ac_config_commands default-1"

12246

12247

12248

for lang in $ALL_LINGUAS; do

12249

@@ -20928,8 +22471,8 @@

12250

if test "x$ALL_LINGUAS" = "x"; then

12251

LINGUAS=

12252

else

12253

- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5

12254

-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6

12255

+ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5

12256

+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }

12257

NEW_LINGUAS=

12258

for presentlang in $ALL_LINGUAS; do

12259

useit=no

12260

@@ -20953,8 +22496,8 @@

12261

12262

done

12263

LINGUAS=$NEW_LINGUAS

12264

- echo "$as_me:$LINENO: result: $LINGUAS" >&5

12265

-echo "${ECHO_T}$LINGUAS" >&6

12266

+ { echo "$as_me:$LINENO: result: $LINGUAS" >&5

12267

+echo "${ECHO_T}$LINGUAS" >&6; }

12268

12269

12270

if test -n "$LINGUAS"; then

12271

@@ -20988,13 +22531,13 @@

12272

12273

12274

12275

- # Check whether --enable-compile-warnings or --disable-compile-warnings was given.

12276

+ # Check whether --enable-compile-warnings was given.

12277

if test "${enable_compile_warnings+set}" = set; then

12278

- enableval="$enable_compile_warnings"

12279

12280

+ enableval=$enable_compile_warnings;

12281

else

12282

enable_compile_warnings="yes"

12283

-fi;

12284

+fi

12285

12286

12287

warnCFLAGS=

12288

if test "x$GCC" != xyes; then

12289

@@ -21020,8 +22563,8 @@

12290

for option in -Wno-sign-compare; do

12291

SAVE_CFLAGS="$CFLAGS"

12292

CFLAGS="$CFLAGS $option"

12293

- echo "$as_me:$LINENO: checking whether gcc understands $option" >&5

12294

-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6

12295

+ { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5

12296

+echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }

12297

cat >conftest.$ac_ext <<_ACEOF

12298

/* confdefs.h. */

12299

_ACEOF

12300

@@ -21038,24 +22581,36 @@

12301

}

12302

_ACEOF

12303

rm -f conftest.$ac_objext

12304

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

12305

- (eval $ac_compile) 2>conftest.er1

12306

+if { (ac_try="$ac_compile"

12307

+case "(($ac_try" in

12308

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12309

+ *) ac_try_echo=$ac_try;;

12310

+esac

12311

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12312

+ (eval "$ac_compile") 2>conftest.er1

12313

ac_status=$?

12314

grep -v '^ *+' conftest.er1 >conftest.err

12315

rm -f conftest.er1

12316

cat conftest.err >&5

12317

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12318

(exit $ac_status); } &&

12319

- { ac_try='test -z "$ac_c_werror_flag"

12320

- || test ! -s conftest.err'

12321

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12322

- (eval $ac_try) 2>&5

12323

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

12324

+ { (case "(($ac_try" in

12325

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12326

+ *) ac_try_echo=$ac_try;;

12327

+esac

12328

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12329

+ (eval "$ac_try") 2>&5

12330

ac_status=$?

12331

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12332

(exit $ac_status); }; } &&

12333

{ ac_try='test -s conftest.$ac_objext'

12334

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12335

- (eval $ac_try) 2>&5

12336

+ { (case "(($ac_try" in

12337

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12338

+ *) ac_try_echo=$ac_try;;

12339

+esac

12340

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12341

+ (eval "$ac_try") 2>&5

12342

ac_status=$?

12343

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12344

(exit $ac_status); }; }; then

12345

@@ -21064,12 +22619,13 @@

12346

echo "$as_me: failed program was:" >&5

12347

sed 's/^/| /' conftest.$ac_ext >&5

12348

12349

-has_option=no

12350

+ has_option=no

12351

12352

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

12353

12354

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12355

CFLAGS="$SAVE_CFLAGS"

12356

- echo "$as_me:$LINENO: result: $has_option" >&5

12357

-echo "${ECHO_T}$has_option" >&6

12358

+ { echo "$as_me:$LINENO: result: $has_option" >&5

12359

+echo "${ECHO_T}$has_option" >&6; }

12360

if test $has_option = yes; then

12361

warning_flags="$warning_flags $option"

12362

12363

@@ -21088,21 +22644,21 @@

12364

;;

12365

esac

12366

CFLAGS="$realsave_CFLAGS"

12367

- echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5

12368

-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6

12369

- echo "$as_me:$LINENO: result: $warning_flags" >&5

12370

-echo "${ECHO_T}$warning_flags" >&6

12371

+ { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5

12372

+echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }

12373

+ { echo "$as_me:$LINENO: result: $warning_flags" >&5

12374

+echo "${ECHO_T}$warning_flags" >&6; }

12375

12376

- # Check whether --enable-iso-c or --disable-iso-c was given.

12377

+ # Check whether --enable-iso-c was given.

12378

if test "${enable_iso_c+set}" = set; then

12379

- enableval="$enable_iso_c"

12380

12381

+ enableval=$enable_iso_c;

12382

else

12383

enable_iso_c=no

12384

-fi;

12385

+fi

12386

12387

- echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5

12388

-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6

12389

12390

+ { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5

12391

+echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }

12392

complCFLAGS=

12393

if test "x$enable_iso_c" != "xno"; then

12394

if test "x$GCC" = "xyes"; then

12395

@@ -21116,20 +22672,20 @@

12396

esac

12397

12398

12399

- echo "$as_me:$LINENO: result: $complCFLAGS" >&5

12400

-echo "${ECHO_T}$complCFLAGS" >&6

12401

+ { echo "$as_me:$LINENO: result: $complCFLAGS" >&5

12402

+echo "${ECHO_T}$complCFLAGS" >&6; }

12403

12404

WARN_CFLAGS="$warning_flags $complCFLAGS"

12405

12406

12407

12408

-# Check whether --enable-deprecations or --disable-deprecations was given.

12409

+# Check whether --enable-deprecations was given.

12410

if test "${enable_deprecations+set}" = set; then

12411

- enableval="$enable_deprecations"

12412

12413

+ enableval=$enable_deprecations;

12414

else

12415

enable_deprecations=yes

12416

-fi;

12417

+fi

12418

12419

12420

if test "x$enable_deprecations" = "xyes"; then

12421

DISABLE_DEPRECATED_CFLAGS="\

12422

@@ -21147,8 +22703,8 @@

12423

if test -n "$ac_tool_prefix"; then

12424

# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

12425

set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

12426

-echo "$as_me:$LINENO: checking for $ac_word" >&5

12427

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

12428

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

12429

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

12430

if test "${ac_cv_path_PKG_CONFIG+set}" = set; then

12431

echo $ECHO_N "(cached) $ECHO_C" >&6

12432

else

12433

@@ -21163,34 +22719,35 @@

12434

IFS=$as_save_IFS

12435

test -z "$as_dir" && as_dir=.

12436

for ac_exec_ext in '' $ac_executable_extensions; do

12437

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

12438

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

12439

ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

12440

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

12441

break 2

12442

12443

done

12444

done

12445

+IFS=$as_save_IFS

12446

12447

;;

12448

esac

12449

12450

PKG_CONFIG=$ac_cv_path_PKG_CONFIG

12451

12452

if test -n "$PKG_CONFIG"; then

12453

- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5

12454

-echo "${ECHO_T}$PKG_CONFIG" >&6

12455

+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5

12456

+echo "${ECHO_T}$PKG_CONFIG" >&6; }

12457

else

12458

- echo "$as_me:$LINENO: result: no" >&5

12459

-echo "${ECHO_T}no" >&6

12460

+ { echo "$as_me:$LINENO: result: no" >&5

12461

+echo "${ECHO_T}no" >&6; }

12462

12463

12464

12465

12466

if test -z "$ac_cv_path_PKG_CONFIG"; then

12467

ac_pt_PKG_CONFIG=$PKG_CONFIG

12468

# Extract the first word of "pkg-config", so it can be a program name with args.

12469

set dummy pkg-config; ac_word=$2

12470

-echo "$as_me:$LINENO: checking for $ac_word" >&5

12471

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

12472

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

12473

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

12474

if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then

12475

echo $ECHO_N "(cached) $ECHO_C" >&6

12476

else

12477

@@ -21205,28 +22762,42 @@

12478

IFS=$as_save_IFS

12479

test -z "$as_dir" && as_dir=.

12480

for ac_exec_ext in '' $ac_executable_extensions; do

12481

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

12482

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

12483

ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

12484

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

12485

break 2

12486

12487

done

12488

done

12489

+IFS=$as_save_IFS

12490

12491

;;

12492

esac

12493

12494

ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

12495

12496

if test -n "$ac_pt_PKG_CONFIG"; then

12497

- echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5

12498

-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6

12499

+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5

12500

+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }

12501

else

12502

- echo "$as_me:$LINENO: result: no" >&5

12503

-echo "${ECHO_T}no" >&6

12504

+ { echo "$as_me:$LINENO: result: no" >&5

12505

+echo "${ECHO_T}no" >&6; }

12506

12507

12508

- PKG_CONFIG=$ac_pt_PKG_CONFIG

12509

+ if test "x$ac_pt_PKG_CONFIG" = x; then

12510

+ PKG_CONFIG=""

12511

+ else

12512

+ case $cross_compiling:$ac_tool_warned in

12513

+yes:)

12514

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

12515

+whose name does not start with the host triplet. If you think this

12516

+configuration is useful to you, please write to autoconf@gnu.org." >&5

12517

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

12518

+whose name does not start with the host triplet. If you think this

12519

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

12520

+ac_tool_warned=yes ;;

12521

+esac

12522

+ PKG_CONFIG=$ac_pt_PKG_CONFIG

12523

+ fi

12524

else

12525

PKG_CONFIG="$ac_cv_path_PKG_CONFIG"

12526

12527

@@ -21234,22 +22805,22 @@

12528

12529

if test -n "$PKG_CONFIG"; then

12530

_pkg_min_version=0.9.0

12531

- echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5

12532

-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6

12533

+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5

12534

+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }

12535

if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

12536

- echo "$as_me:$LINENO: result: yes" >&5

12537

-echo "${ECHO_T}yes" >&6

12538

+ { echo "$as_me:$LINENO: result: yes" >&5

12539

+echo "${ECHO_T}yes" >&6; }

12540

else

12541

- echo "$as_me:$LINENO: result: no" >&5

12542

-echo "${ECHO_T}no" >&6

12543

+ { echo "$as_me:$LINENO: result: no" >&5

12544

+echo "${ECHO_T}no" >&6; }

12545

PKG_CONFIG=""

12546

12547

12548

12549

12550

pkg_failed=no

12551

-echo "$as_me:$LINENO: checking for VINO_SERVER" >&5

12552

-echo $ECHO_N "checking for VINO_SERVER... $ECHO_C" >&6

12553

+{ echo "$as_me:$LINENO: checking for VINO_SERVER" >&5

12554

+echo $ECHO_N "checking for VINO_SERVER... $ECHO_C" >&6; }

12555

12556

if test -n "$PKG_CONFIG"; then

12557

if test -n "$VINO_SERVER_CFLAGS"; then

12558

@@ -21353,15 +22924,15 @@

12559

else

12560

VINO_SERVER_CFLAGS=$pkg_cv_VINO_SERVER_CFLAGS

12561

VINO_SERVER_LIBS=$pkg_cv_VINO_SERVER_LIBS

12562

- echo "$as_me:$LINENO: result: yes" >&5

12563

-echo "${ECHO_T}yes" >&6

12564

+ { echo "$as_me:$LINENO: result: yes" >&5

12565

+echo "${ECHO_T}yes" >&6; }

12566

12567

12568

12569

12570

pkg_failed=no

12571

-echo "$as_me:$LINENO: checking for VINO_CAPPLET" >&5

12572

-echo $ECHO_N "checking for VINO_CAPPLET... $ECHO_C" >&6

12573

+{ echo "$as_me:$LINENO: checking for VINO_CAPPLET" >&5

12574

+echo $ECHO_N "checking for VINO_CAPPLET... $ECHO_C" >&6; }

12575

12576

if test -n "$PKG_CONFIG"; then

12577

if test -n "$VINO_CAPPLET_CFLAGS"; then

12578

@@ -21465,23 +23036,23 @@

12579

else

12580

VINO_CAPPLET_CFLAGS=$pkg_cv_VINO_CAPPLET_CFLAGS

12581

VINO_CAPPLET_LIBS=$pkg_cv_VINO_CAPPLET_LIBS

12582

- echo "$as_me:$LINENO: result: yes" >&5

12583

-echo "${ECHO_T}yes" >&6

12584

+ { echo "$as_me:$LINENO: result: yes" >&5

12585

+echo "${ECHO_T}yes" >&6; }

12586

12587

12588

12589

-# Check whether --enable-session_support or --disable-session_support was given.

12590

+# Check whether --enable-session_support was given.

12591

if test "${enable_session_support+set}" = set; then

12592

- enableval="$enable_session_support"

12593

12594

+ enableval=$enable_session_support;

12595

else

12596

enable_session_support=no

12597

-fi;

12598

+fi

12599

12600

if test "$enable_session_support" = "yes"; then

12601

12602

pkg_failed=no

12603

-echo "$as_me:$LINENO: checking for VINO_SESSION" >&5

12604

-echo $ECHO_N "checking for VINO_SESSION... $ECHO_C" >&6

12605

+{ echo "$as_me:$LINENO: checking for VINO_SESSION" >&5

12606

+echo $ECHO_N "checking for VINO_SESSION... $ECHO_C" >&6; }

12607

12608

if test -n "$PKG_CONFIG"; then

12609

if test -n "$VINO_SESSION_CFLAGS"; then

12610

@@ -21585,8 +23156,8 @@

12611

else

12612

VINO_SESSION_CFLAGS=$pkg_cv_VINO_SESSION_CFLAGS

12613

VINO_SESSION_LIBS=$pkg_cv_VINO_SESSION_LIBS

12614

- echo "$as_me:$LINENO: result: yes" >&5

12615

-echo "${ECHO_T}yes" >&6

12616

+ { echo "$as_me:$LINENO: result: yes" >&5

12617

+echo "${ECHO_T}yes" >&6; }

12618

12619

12620

12621

@@ -21601,13 +23172,13 @@

12622

12623

12624

12625

-# Check whether --enable-http_server or --disable-http_server was given.

12626

+# Check whether --enable-http_server was given.

12627

if test "${enable_http_server+set}" = set; then

12628

- enableval="$enable_http_server"

12629

12630

+ enableval=$enable_http_server;

12631

else

12632

enable_http_server=no

12633

-fi;

12634

+fi

12635

12636

if test "$enable_http_server" = "yes"; then

12637

VINO_HTTP_CFLAGS="-DVINO_ENABLE_HTTP_SERVER"

12638

else

12639

@@ -21644,44 +23215,49 @@

12640

esac

12641

12642

if test $pango_omitted_x_deps = yes ; then

12643

- echo "$as_me:$LINENO: checking for X" >&5

12644

-echo $ECHO_N "checking for X... $ECHO_C" >&6

12645

+ { echo "$as_me:$LINENO: checking for X" >&5

12646

+echo $ECHO_N "checking for X... $ECHO_C" >&6; }

12647

12648

12649

-# Check whether --with-x or --without-x was given.

12650

+# Check whether --with-x was given.

12651

if test "${with_x+set}" = set; then

12652

- withval="$with_x"

12653

+ withval=$with_x;

12654

+fi

12655

12656

-fi;

12657

# $have_x is `yes', `no', `disabled', or empty when we do not yet know.

12658

if test "x$with_x" = xno; then

12659

# The user explicitly disabled X.

12660

have_x=disabled

12661

else

12662

- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then

12663

- # Both variables are already set.

12664

- have_x=yes

12665

- else

12666

- if test "${ac_cv_have_x+set}" = set; then

12667

+ case $x_includes,$x_libraries in #(

12668

+ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5

12669

+echo "$as_me: error: Cannot use X directory names containing '" >&2;}

12670

+ { (exit 1); exit 1; }; };; #(

12671

+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then

12672

echo $ECHO_N "(cached) $ECHO_C" >&6

12673

else

12674

# One or both of the vars are not set, and there is no cached value.

12675

ac_x_includes=no ac_x_libraries=no

12676

-rm -fr conftest.dir

12677

+rm -f -r conftest.dir

12678

if mkdir conftest.dir; then

12679

cd conftest.dir

12680

- # Make sure to not put "make" in the Imakefile rules, since we grep it out.

12681

cat >Imakefile <<'_ACEOF'

12682

-acfindx:

12683

- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'

12684

+incroot:

12685

+ @echo incroot='${INCROOT}'

12686

+usrlibdir:

12687

+ @echo usrlibdir='${USRLIBDIR}'

12688

+libdir:

12689

+ @echo libdir='${LIBDIR}'

12690

_ACEOF

12691

- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then

12692

+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then

12693

# GNU make sometimes prints "make[1]: Entering...", which would confuse us.

12694

- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`

12695

+ for ac_var in incroot usrlibdir libdir; do

12696

+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"

12697

+ done

12698

# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.

12699

for ac_extension in a so sl; do

12700

- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&

12701

- test -f $ac_im_libdir/libX11.$ac_extension; then

12702

+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&

12703

+ test -f "$ac_im_libdir/libX11.$ac_extension"; then

12704

ac_im_usrlibdir=$ac_im_libdir; break

12705

12706

done

12707

@@ -21689,7 +23265,7 @@

12708

# bogus both because they are the default anyway, and because

12709

# using them would break gcc on systems where it needs fixed includes.

12710

case $ac_im_incroot in

12711

- /usr/include) ;;

12712

+ /usr/include) ac_x_includes= ;;

12713

*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;

12714

esac

12715

case $ac_im_usrlibdir in

12716

@@ -21698,7 +23274,7 @@

12717

esac

12718

12719

cd ..

12720

- rm -fr conftest.dir

12721

+ rm -f -r conftest.dir

12722

12723

12724

# Standard set of common directories for X headers.

12725

@@ -21749,8 +23325,13 @@

12726

/* end confdefs.h. */

12727

#include <X11/Xlib.h>

12728

_ACEOF

12729

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

12730

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

12731

+if { (ac_try="$ac_cpp conftest.$ac_ext"

12732

+case "(($ac_try" in

12733

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12734

+ *) ac_try_echo=$ac_try;;

12735

+esac

12736

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12737

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

12738

ac_status=$?

12739

grep -v '^ *+' conftest.er1 >conftest.err

12740

rm -f conftest.er1

12741

@@ -21780,6 +23361,7 @@

12742

12743

done

12744

12745

12746

rm -f conftest.err conftest.$ac_ext

12747

fi # $ac_x_includes = no

12748

12749

@@ -21805,24 +23387,36 @@

12750

}

12751

_ACEOF

12752

rm -f conftest.$ac_objext conftest$ac_exeext

12753

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12754

- (eval $ac_link) 2>conftest.er1

12755

+if { (ac_try="$ac_link"

12756

+case "(($ac_try" in

12757

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12758

+ *) ac_try_echo=$ac_try;;

12759

+esac

12760

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12761

+ (eval "$ac_link") 2>conftest.er1

12762

ac_status=$?

12763

grep -v '^ *+' conftest.er1 >conftest.err

12764

rm -f conftest.er1

12765

cat conftest.err >&5

12766

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12767

(exit $ac_status); } &&

12768

- { ac_try='test -z "$ac_c_werror_flag"

12769

- || test ! -s conftest.err'

12770

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12771

- (eval $ac_try) 2>&5

12772

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

12773

+ { (case "(($ac_try" in

12774

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12775

+ *) ac_try_echo=$ac_try;;

12776

+esac

12777

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12778

+ (eval "$ac_try") 2>&5

12779

ac_status=$?

12780

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12781

(exit $ac_status); }; } &&

12782

{ ac_try='test -s conftest$ac_exeext'

12783

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12784

- (eval $ac_try) 2>&5

12785

+ { (case "(($ac_try" in

12786

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12787

+ *) ac_try_echo=$ac_try;;

12788

+esac

12789

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12790

+ (eval "$ac_try") 2>&5

12791

ac_status=$?

12792

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12793

(exit $ac_status); }; }; then

12794

@@ -21833,49 +23427,54 @@

12795

echo "$as_me: failed program was:" >&5

12796

sed 's/^/| /' conftest.$ac_ext >&5

12797

12798

-LIBS=$ac_save_LIBS

12799

+ LIBS=$ac_save_LIBS

12800

for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`

12801

12802

# Don't even attempt the hair of trying to link an X program!

12803

for ac_extension in a so sl; do

12804

- if test -r $ac_dir/libXt.$ac_extension; then

12805

+ if test -r "$ac_dir/libX11.$ac_extension"; then

12806

ac_x_libraries=$ac_dir

12807

break 2

12808

12809

done

12810

done

12811

12812

-rm -f conftest.err conftest.$ac_objext \

12813

12814

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12815

conftest$ac_exeext conftest.$ac_ext

12816

fi # $ac_x_libraries = no

12817

12818

-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then

12819

- # Didn't find X anywhere. Cache the known absence of X.

12820

- ac_cv_have_x="have_x=no"

12821

-else

12822

- # Record where we found X for the cache.

12823

- ac_cv_have_x="have_x=yes \

12824

- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"

12825

-fi

12826

+case $ac_x_includes,$ac_x_libraries in #(

12827

+ no,* | *,no | *\'*)

12828

+ # Didn't find X, or a directory has "'" in its name.

12829

+ ac_cv_have_x="have_x=no";; #(

12830

+ *)

12831

+ # Record where we found X for the cache.

12832

+ ac_cv_have_x="have_x=yes\

12833

+ ac_x_includes='$ac_x_includes'\

12834

+ ac_x_libraries='$ac_x_libraries'"

12835

+esac

12836

12837

12838

- fi

12839

+;; #(

12840

+ *) have_x=yes;;

12841

+ esac

12842

eval "$ac_cv_have_x"

12843

fi # $with_x != no

12844

12845

if test "$have_x" != yes; then

12846

- echo "$as_me:$LINENO: result: $have_x" >&5

12847

-echo "${ECHO_T}$have_x" >&6

12848

+ { echo "$as_me:$LINENO: result: $have_x" >&5

12849

+echo "${ECHO_T}$have_x" >&6; }

12850

no_x=yes

12851

else

12852

# If each of the values was on the command line, it overrides each guess.

12853

test "x$x_includes" = xNONE && x_includes=$ac_x_includes

12854

test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries

12855

# Update the cache value to reflect the command line values.

12856

- ac_cv_have_x="have_x=yes \

12857

- ac_x_includes=$x_includes ac_x_libraries=$x_libraries"

12858

- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5

12859

-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6

12860

+ ac_cv_have_x="have_x=yes\

12861

+ ac_x_includes='$x_includes'\

12862

+ ac_x_libraries='$x_libraries'"

12863

+ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5

12864

+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }

12865

12866

12867

if test "$no_x" = yes; then

12868

@@ -21896,12 +23495,12 @@

12869

X_LIBS="$X_LIBS -L$x_libraries"

12870

# For Solaris; some versions of Sun CC require a space after -R and

12871

# others require no space. Words are not sufficient . . . .

12872

- case `(uname -sr) 2>/dev/null` in

12873

- "SunOS 5"*)

12874

- echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5

12875

-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6

12876

- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"

12877

- cat >conftest.$ac_ext <<_ACEOF

12878

+ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5

12879

+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }

12880

+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"

12881

+ ac_xsave_c_werror_flag=$ac_c_werror_flag

12882

+ ac_c_werror_flag=yes

12883

+ cat >conftest.$ac_ext <<_ACEOF

12884

/* confdefs.h. */

12885

_ACEOF

12886

cat confdefs.h >>conftest.$ac_ext

12887

@@ -21917,43 +23516,48 @@

12888

}

12889

_ACEOF

12890

rm -f conftest.$ac_objext conftest$ac_exeext

12891

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12892

- (eval $ac_link) 2>conftest.er1

12893

+if { (ac_try="$ac_link"

12894

+case "(($ac_try" in

12895

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12896

+ *) ac_try_echo=$ac_try;;

12897

+esac

12898

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12899

+ (eval "$ac_link") 2>conftest.er1

12900

ac_status=$?

12901

grep -v '^ *+' conftest.er1 >conftest.err

12902

rm -f conftest.er1

12903

cat conftest.err >&5

12904

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12905

(exit $ac_status); } &&

12906

- { ac_try='test -z "$ac_c_werror_flag"

12907

- || test ! -s conftest.err'

12908

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12909

- (eval $ac_try) 2>&5

12910

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

12911

+ { (case "(($ac_try" in

12912

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12913

+ *) ac_try_echo=$ac_try;;

12914

+esac

12915

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12916

+ (eval "$ac_try") 2>&5

12917

ac_status=$?

12918

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12919

(exit $ac_status); }; } &&

12920

{ ac_try='test -s conftest$ac_exeext'

12921

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12922

- (eval $ac_try) 2>&5

12923

+ { (case "(($ac_try" in

12924

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12925

+ *) ac_try_echo=$ac_try;;

12926

+esac

12927

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12928

+ (eval "$ac_try") 2>&5

12929

ac_status=$?

12930

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12931

(exit $ac_status); }; }; then

12932

- ac_R_nospace=yes

12933

+ { echo "$as_me:$LINENO: result: no" >&5

12934

+echo "${ECHO_T}no" >&6; }

12935

+ X_LIBS="$X_LIBS -R$x_libraries"

12936

else

12937

echo "$as_me: failed program was:" >&5

12938

sed 's/^/| /' conftest.$ac_ext >&5

12939

12940

-ac_R_nospace=no

12941

-fi

12942

-rm -f conftest.err conftest.$ac_objext \

12943

- conftest$ac_exeext conftest.$ac_ext

12944

- if test $ac_R_nospace = yes; then

12945

- echo "$as_me:$LINENO: result: no" >&5

12946

-echo "${ECHO_T}no" >&6

12947

- X_LIBS="$X_LIBS -R$x_libraries"

12948

- else

12949

LIBS="$ac_xsave_LIBS -R $x_libraries"

12950

- cat >conftest.$ac_ext <<_ACEOF

12951

+ cat >conftest.$ac_ext <<_ACEOF

12952

/* confdefs.h. */

12953

_ACEOF

12954

cat confdefs.h >>conftest.$ac_ext

12955

@@ -21969,47 +23573,58 @@

12956

}

12957

_ACEOF

12958

rm -f conftest.$ac_objext conftest$ac_exeext

12959

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

12960

- (eval $ac_link) 2>conftest.er1

12961

+if { (ac_try="$ac_link"

12962

+case "(($ac_try" in

12963

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12964

+ *) ac_try_echo=$ac_try;;

12965

+esac

12966

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12967

+ (eval "$ac_link") 2>conftest.er1

12968

ac_status=$?

12969

grep -v '^ *+' conftest.er1 >conftest.err

12970

rm -f conftest.er1

12971

cat conftest.err >&5

12972

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12973

(exit $ac_status); } &&

12974

- { ac_try='test -z "$ac_c_werror_flag"

12975

- || test ! -s conftest.err'

12976

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12977

- (eval $ac_try) 2>&5

12978

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

12979

+ { (case "(($ac_try" in

12980

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12981

+ *) ac_try_echo=$ac_try;;

12982

+esac

12983

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12984

+ (eval "$ac_try") 2>&5

12985

ac_status=$?

12986

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12987

(exit $ac_status); }; } &&

12988

{ ac_try='test -s conftest$ac_exeext'

12989

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

12990

- (eval $ac_try) 2>&5

12991

+ { (case "(($ac_try" in

12992

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12993

+ *) ac_try_echo=$ac_try;;

12994

+esac

12995

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12996

+ (eval "$ac_try") 2>&5

12997

ac_status=$?

12998

echo "$as_me:$LINENO: \$? = $ac_status" >&5

12999

(exit $ac_status); }; }; then

13000

- ac_R_space=yes

13001

+ { echo "$as_me:$LINENO: result: yes" >&5

13002

+echo "${ECHO_T}yes" >&6; }

13003

+ X_LIBS="$X_LIBS -R $x_libraries"

13004

else

13005

echo "$as_me: failed program was:" >&5

13006

sed 's/^/| /' conftest.$ac_ext >&5

13007

13008

-ac_R_space=no

13009

+ { echo "$as_me:$LINENO: result: neither works" >&5

13010

+echo "${ECHO_T}neither works" >&6; }

13011

13012

-rm -f conftest.err conftest.$ac_objext \

13013

13014

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13015

conftest$ac_exeext conftest.$ac_ext

13016

- if test $ac_R_space = yes; then

13017

- echo "$as_me:$LINENO: result: yes" >&5

13018

-echo "${ECHO_T}yes" >&6

13019

- X_LIBS="$X_LIBS -R $x_libraries"

13020

- else

13021

- echo "$as_me:$LINENO: result: neither works" >&5

13022

-echo "${ECHO_T}neither works" >&6

13023

- fi

13024

- fi

13025

- LIBS=$ac_xsave_LIBS

13026

- esac

13027

+fi

13028

13029

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13030

+ conftest$ac_exeext conftest.$ac_ext

13031

+ ac_c_werror_flag=$ac_xsave_c_werror_flag

13032

+ LIBS=$ac_xsave_LIBS

13033

13034

13035

# Check for system-dependent libraries X programs must link with.

13036

@@ -22030,40 +23645,52 @@

13037

cat >>conftest.$ac_ext <<_ACEOF

13038

/* end confdefs.h. */

13039

13040

-/* Override any gcc2 internal prototype to avoid an error. */

13041

+/* Override any GCC internal prototype to avoid an error.

13042

+ Use char because int might match the return type of a GCC

13043

+ builtin and then its argument prototype would still apply. */

13044

#ifdef __cplusplus

13045

extern "C"

13046

#endif

13047

-/* We use char because int might match the return type of a gcc2

13048

- builtin and then its argument prototype would still apply. */

13049

char XOpenDisplay ();

13050

int

13051

main ()

13052

{

13053

-XOpenDisplay ();

13054

+return XOpenDisplay ();

13055

;

13056

return 0;

13057

}

13058

_ACEOF

13059

rm -f conftest.$ac_objext conftest$ac_exeext

13060

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13061

- (eval $ac_link) 2>conftest.er1

13062

+if { (ac_try="$ac_link"

13063

+case "(($ac_try" in

13064

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13065

+ *) ac_try_echo=$ac_try;;

13066

+esac

13067

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13068

+ (eval "$ac_link") 2>conftest.er1

13069

ac_status=$?

13070

grep -v '^ *+' conftest.er1 >conftest.err

13071

rm -f conftest.er1

13072

cat conftest.err >&5

13073

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13074

(exit $ac_status); } &&

13075

- { ac_try='test -z "$ac_c_werror_flag"

13076

- || test ! -s conftest.err'

13077

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13078

- (eval $ac_try) 2>&5

13079

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13080

+ { (case "(($ac_try" in

13081

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13082

+ *) ac_try_echo=$ac_try;;

13083

+esac

13084

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13085

+ (eval "$ac_try") 2>&5

13086

ac_status=$?

13087

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13088

(exit $ac_status); }; } &&

13089

{ ac_try='test -s conftest$ac_exeext'

13090

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13091

- (eval $ac_try) 2>&5

13092

+ { (case "(($ac_try" in

13093

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13094

+ *) ac_try_echo=$ac_try;;

13095

+esac

13096

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13097

+ (eval "$ac_try") 2>&5

13098

ac_status=$?

13099

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13100

(exit $ac_status); }; }; then

13101

@@ -22072,8 +23699,8 @@

13102

echo "$as_me: failed program was:" >&5

13103

sed 's/^/| /' conftest.$ac_ext >&5

13104

13105

-echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5

13106

-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6

13107

+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5

13108

+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }

13109

if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then

13110

echo $ECHO_N "(cached) $ECHO_C" >&6

13111

else

13112

@@ -22086,40 +23713,52 @@

13113

cat >>conftest.$ac_ext <<_ACEOF

13114

/* end confdefs.h. */

13115

13116

-/* Override any gcc2 internal prototype to avoid an error. */

13117

+/* Override any GCC internal prototype to avoid an error.

13118

+ Use char because int might match the return type of a GCC

13119

+ builtin and then its argument prototype would still apply. */

13120

#ifdef __cplusplus

13121

extern "C"

13122

#endif

13123

-/* We use char because int might match the return type of a gcc2

13124

- builtin and then its argument prototype would still apply. */

13125

char dnet_ntoa ();

13126

int

13127

main ()

13128

{

13129

-dnet_ntoa ();

13130

+return dnet_ntoa ();

13131

;

13132

return 0;

13133

}

13134

_ACEOF

13135

rm -f conftest.$ac_objext conftest$ac_exeext

13136

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13137

- (eval $ac_link) 2>conftest.er1

13138

+if { (ac_try="$ac_link"

13139

+case "(($ac_try" in

13140

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13141

+ *) ac_try_echo=$ac_try;;

13142

+esac

13143

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13144

+ (eval "$ac_link") 2>conftest.er1

13145

ac_status=$?

13146

grep -v '^ *+' conftest.er1 >conftest.err

13147

rm -f conftest.er1

13148

cat conftest.err >&5

13149

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13150

(exit $ac_status); } &&

13151

- { ac_try='test -z "$ac_c_werror_flag"

13152

- || test ! -s conftest.err'

13153

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13154

- (eval $ac_try) 2>&5

13155

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13156

+ { (case "(($ac_try" in

13157

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13158

+ *) ac_try_echo=$ac_try;;

13159

+esac

13160

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13161

+ (eval "$ac_try") 2>&5

13162

ac_status=$?

13163

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13164

(exit $ac_status); }; } &&

13165

{ ac_try='test -s conftest$ac_exeext'

13166

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13167

- (eval $ac_try) 2>&5

13168

+ { (case "(($ac_try" in

13169

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13170

+ *) ac_try_echo=$ac_try;;

13171

+esac

13172

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13173

+ (eval "$ac_try") 2>&5

13174

ac_status=$?

13175

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13176

(exit $ac_status); }; }; then

13177

@@ -22128,21 +23767,22 @@

13178

echo "$as_me: failed program was:" >&5

13179

sed 's/^/| /' conftest.$ac_ext >&5

13180

13181

-ac_cv_lib_dnet_dnet_ntoa=no

13182

+ ac_cv_lib_dnet_dnet_ntoa=no

13183

13184

-rm -f conftest.err conftest.$ac_objext \

13185

13186

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13187

conftest$ac_exeext conftest.$ac_ext

13188

LIBS=$ac_check_lib_save_LIBS

13189

13190

-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5

13191

-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6

13192

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5

13193

+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }

13194

if test $ac_cv_lib_dnet_dnet_ntoa = yes; then

13195

X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"

13196

13197

13198

if test $ac_cv_lib_dnet_dnet_ntoa = no; then

13199

- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5

13200

-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6

13201

+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5

13202

+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }

13203

if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then

13204

echo $ECHO_N "(cached) $ECHO_C" >&6

13205

else

13206

@@ -22155,40 +23795,52 @@

13207

cat >>conftest.$ac_ext <<_ACEOF

13208

/* end confdefs.h. */

13209

13210

-/* Override any gcc2 internal prototype to avoid an error. */

13211

+/* Override any GCC internal prototype to avoid an error.

13212

+ Use char because int might match the return type of a GCC

13213

+ builtin and then its argument prototype would still apply. */

13214

#ifdef __cplusplus

13215

extern "C"

13216

#endif

13217

-/* We use char because int might match the return type of a gcc2

13218

- builtin and then its argument prototype would still apply. */

13219

char dnet_ntoa ();

13220

int

13221

main ()

13222

{

13223

-dnet_ntoa ();

13224

+return dnet_ntoa ();

13225

;

13226

return 0;

13227

}

13228

_ACEOF

13229

rm -f conftest.$ac_objext conftest$ac_exeext

13230

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13231

- (eval $ac_link) 2>conftest.er1

13232

+if { (ac_try="$ac_link"

13233

+case "(($ac_try" in

13234

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13235

+ *) ac_try_echo=$ac_try;;

13236

+esac

13237

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13238

+ (eval "$ac_link") 2>conftest.er1

13239

ac_status=$?

13240

grep -v '^ *+' conftest.er1 >conftest.err

13241

rm -f conftest.er1

13242

cat conftest.err >&5

13243

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13244

(exit $ac_status); } &&

13245

- { ac_try='test -z "$ac_c_werror_flag"

13246

- || test ! -s conftest.err'

13247

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13248

- (eval $ac_try) 2>&5

13249

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13250

+ { (case "(($ac_try" in

13251

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13252

+ *) ac_try_echo=$ac_try;;

13253

+esac

13254

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13255

+ (eval "$ac_try") 2>&5

13256

ac_status=$?

13257

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13258

(exit $ac_status); }; } &&

13259

{ ac_try='test -s conftest$ac_exeext'

13260

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13261

- (eval $ac_try) 2>&5

13262

+ { (case "(($ac_try" in

13263

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13264

+ *) ac_try_echo=$ac_try;;

13265

+esac

13266

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13267

+ (eval "$ac_try") 2>&5

13268

ac_status=$?

13269

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13270

(exit $ac_status); }; }; then

13271

@@ -22197,21 +23849,23 @@

13272

echo "$as_me: failed program was:" >&5

13273

sed 's/^/| /' conftest.$ac_ext >&5

13274

13275

-ac_cv_lib_dnet_stub_dnet_ntoa=no

13276

+ ac_cv_lib_dnet_stub_dnet_ntoa=no

13277

13278

-rm -f conftest.err conftest.$ac_objext \

13279

13280

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13281

conftest$ac_exeext conftest.$ac_ext

13282

LIBS=$ac_check_lib_save_LIBS

13283

13284

-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5

13285

-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6

13286

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5

13287

+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }

13288

if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then

13289

X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"

13290

13291

13292

13293

13294

-rm -f conftest.err conftest.$ac_objext \

13295

13296

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13297

conftest$ac_exeext conftest.$ac_ext

13298

LIBS="$ac_xsave_LIBS"

13299

13300

@@ -22223,8 +23877,8 @@

13301

# on Irix 5.2, according to T.E. Dickey.

13302

# The functions gethostbyname, getservbyname, and inet_addr are

13303

# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.

13304

- echo "$as_me:$LINENO: checking for gethostbyname" >&5

13305

-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6

13306

+ { echo "$as_me:$LINENO: checking for gethostbyname" >&5

13307

+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }

13308

if test "${ac_cv_func_gethostbyname+set}" = set; then

13309

echo $ECHO_N "(cached) $ECHO_C" >&6

13310

else

13311

@@ -22251,53 +23905,59 @@

13312

13313

#undef gethostbyname

13314

13315

-/* Override any gcc2 internal prototype to avoid an error. */

13316

+/* Override any GCC internal prototype to avoid an error.

13317

+ Use char because int might match the return type of a GCC

13318

+ builtin and then its argument prototype would still apply. */

13319

#ifdef __cplusplus

13320

extern "C"

13321

13322

#endif

13323

-/* We use char because int might match the return type of a gcc2

13324

- builtin and then its argument prototype would still apply. */

13325

char gethostbyname ();

13326

/* The GNU C library defines this for functions which it implements

13327

to always fail with ENOSYS. Some functions are actually named

13328

something starting with __ and the normal name is an alias. */

13329

-#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)

13330

+#if defined __stub_gethostbyname || defined __stub___gethostbyname

13331

choke me

13332

-#else

13333

-char (*f) () = gethostbyname;

13334

-#endif

13335

-#ifdef __cplusplus

13336

13337

#endif

13338

13339

int

13340

main ()

13341

{

13342

-return f != gethostbyname;

13343

+return gethostbyname ();

13344

;

13345

return 0;

13346

}

13347

_ACEOF

13348

rm -f conftest.$ac_objext conftest$ac_exeext

13349

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13350

- (eval $ac_link) 2>conftest.er1

13351

+if { (ac_try="$ac_link"

13352

+case "(($ac_try" in

13353

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13354

+ *) ac_try_echo=$ac_try;;

13355

+esac

13356

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13357

+ (eval "$ac_link") 2>conftest.er1

13358

ac_status=$?

13359

grep -v '^ *+' conftest.er1 >conftest.err

13360

rm -f conftest.er1

13361

cat conftest.err >&5

13362

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13363

(exit $ac_status); } &&

13364

- { ac_try='test -z "$ac_c_werror_flag"

13365

- || test ! -s conftest.err'

13366

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13367

- (eval $ac_try) 2>&5

13368

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13369

+ { (case "(($ac_try" in

13370

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13371

+ *) ac_try_echo=$ac_try;;

13372

+esac

13373

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13374

+ (eval "$ac_try") 2>&5

13375

ac_status=$?

13376

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13377

(exit $ac_status); }; } &&

13378

{ ac_try='test -s conftest$ac_exeext'

13379

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13380

- (eval $ac_try) 2>&5

13381

+ { (case "(($ac_try" in

13382

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13383

+ *) ac_try_echo=$ac_try;;

13384

+esac

13385

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13386

+ (eval "$ac_try") 2>&5

13387

ac_status=$?

13388

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13389

(exit $ac_status); }; }; then

13390

@@ -22306,17 +23966,18 @@

13391

echo "$as_me: failed program was:" >&5

13392

sed 's/^/| /' conftest.$ac_ext >&5

13393

13394

-ac_cv_func_gethostbyname=no

13395

+ ac_cv_func_gethostbyname=no

13396

13397

-rm -f conftest.err conftest.$ac_objext \

13398

13399

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13400

conftest$ac_exeext conftest.$ac_ext

13401

13402

-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5

13403

-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6

13404

+{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5

13405

+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }

13406

13407

if test $ac_cv_func_gethostbyname = no; then

13408

- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5

13409

-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6

13410

+ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5

13411

+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }

13412

if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then

13413

echo $ECHO_N "(cached) $ECHO_C" >&6

13414

else

13415

@@ -22329,40 +23990,52 @@

13416

cat >>conftest.$ac_ext <<_ACEOF

13417

/* end confdefs.h. */

13418

13419

-/* Override any gcc2 internal prototype to avoid an error. */

13420

+/* Override any GCC internal prototype to avoid an error.

13421

+ Use char because int might match the return type of a GCC

13422

+ builtin and then its argument prototype would still apply. */

13423

#ifdef __cplusplus

13424

extern "C"

13425

#endif

13426

-/* We use char because int might match the return type of a gcc2

13427

- builtin and then its argument prototype would still apply. */

13428

char gethostbyname ();

13429

int

13430

main ()

13431

{

13432

-gethostbyname ();

13433

+return gethostbyname ();

13434

;

13435

return 0;

13436

}

13437

_ACEOF

13438

rm -f conftest.$ac_objext conftest$ac_exeext

13439

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13440

- (eval $ac_link) 2>conftest.er1

13441

+if { (ac_try="$ac_link"

13442

+case "(($ac_try" in

13443

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13444

+ *) ac_try_echo=$ac_try;;

13445

+esac

13446

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13447

+ (eval "$ac_link") 2>conftest.er1

13448

ac_status=$?

13449

grep -v '^ *+' conftest.er1 >conftest.err

13450

rm -f conftest.er1

13451

cat conftest.err >&5

13452

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13453

(exit $ac_status); } &&

13454

- { ac_try='test -z "$ac_c_werror_flag"

13455

- || test ! -s conftest.err'

13456

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13457

- (eval $ac_try) 2>&5

13458

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13459

+ { (case "(($ac_try" in

13460

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13461

+ *) ac_try_echo=$ac_try;;

13462

+esac

13463

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13464

+ (eval "$ac_try") 2>&5

13465

ac_status=$?

13466

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13467

(exit $ac_status); }; } &&

13468

{ ac_try='test -s conftest$ac_exeext'

13469

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13470

- (eval $ac_try) 2>&5

13471

+ { (case "(($ac_try" in

13472

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13473

+ *) ac_try_echo=$ac_try;;

13474

+esac

13475

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13476

+ (eval "$ac_try") 2>&5

13477

ac_status=$?

13478

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13479

(exit $ac_status); }; }; then

13480

@@ -22371,21 +24044,22 @@

13481

echo "$as_me: failed program was:" >&5

13482

sed 's/^/| /' conftest.$ac_ext >&5

13483

13484

-ac_cv_lib_nsl_gethostbyname=no

13485

+ ac_cv_lib_nsl_gethostbyname=no

13486

13487

-rm -f conftest.err conftest.$ac_objext \

13488

13489

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13490

conftest$ac_exeext conftest.$ac_ext

13491

LIBS=$ac_check_lib_save_LIBS

13492

13493

-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5

13494

-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6

13495

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5

13496

+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }

13497

if test $ac_cv_lib_nsl_gethostbyname = yes; then

13498

X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"

13499

13500

13501

if test $ac_cv_lib_nsl_gethostbyname = no; then

13502

- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5

13503

-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6

13504

+ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5

13505

+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }

13506

if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then

13507

echo $ECHO_N "(cached) $ECHO_C" >&6

13508

else

13509

@@ -22398,40 +24072,52 @@

13510

cat >>conftest.$ac_ext <<_ACEOF

13511

/* end confdefs.h. */

13512

13513

-/* Override any gcc2 internal prototype to avoid an error. */

13514

+/* Override any GCC internal prototype to avoid an error.

13515

+ Use char because int might match the return type of a GCC

13516

+ builtin and then its argument prototype would still apply. */

13517

#ifdef __cplusplus

13518

extern "C"

13519

#endif

13520

-/* We use char because int might match the return type of a gcc2

13521

- builtin and then its argument prototype would still apply. */

13522

char gethostbyname ();

13523

int

13524

main ()

13525

{

13526

-gethostbyname ();

13527

+return gethostbyname ();

13528

;

13529

return 0;

13530

}

13531

_ACEOF

13532

rm -f conftest.$ac_objext conftest$ac_exeext

13533

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13534

- (eval $ac_link) 2>conftest.er1

13535

+if { (ac_try="$ac_link"

13536

+case "(($ac_try" in

13537

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13538

+ *) ac_try_echo=$ac_try;;

13539

+esac

13540

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13541

+ (eval "$ac_link") 2>conftest.er1

13542

ac_status=$?

13543

grep -v '^ *+' conftest.er1 >conftest.err

13544

rm -f conftest.er1

13545

cat conftest.err >&5

13546

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13547

(exit $ac_status); } &&

13548

- { ac_try='test -z "$ac_c_werror_flag"

13549

- || test ! -s conftest.err'

13550

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13551

- (eval $ac_try) 2>&5

13552

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13553

+ { (case "(($ac_try" in

13554

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13555

+ *) ac_try_echo=$ac_try;;

13556

+esac

13557

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13558

+ (eval "$ac_try") 2>&5

13559

ac_status=$?

13560

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13561

(exit $ac_status); }; } &&

13562

{ ac_try='test -s conftest$ac_exeext'

13563

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13564

- (eval $ac_try) 2>&5

13565

+ { (case "(($ac_try" in

13566

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13567

+ *) ac_try_echo=$ac_try;;

13568

+esac

13569

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13570

+ (eval "$ac_try") 2>&5

13571

ac_status=$?

13572

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13573

(exit $ac_status); }; }; then

13574

@@ -22440,14 +24126,15 @@

13575

echo "$as_me: failed program was:" >&5

13576

sed 's/^/| /' conftest.$ac_ext >&5

13577

13578

-ac_cv_lib_bsd_gethostbyname=no

13579

+ ac_cv_lib_bsd_gethostbyname=no

13580

13581

-rm -f conftest.err conftest.$ac_objext \

13582

13583

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13584

conftest$ac_exeext conftest.$ac_ext

13585

LIBS=$ac_check_lib_save_LIBS

13586

13587

-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5

13588

-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6

13589

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5

13590

+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }

13591

if test $ac_cv_lib_bsd_gethostbyname = yes; then

13592

X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"

13593

13594

@@ -22462,8 +24149,8 @@

13595

# variants that don't use the name server (or something). -lsocket

13596

# must be given before -lnsl if both are needed. We assume that

13597

# if connect needs -lnsl, so does gethostbyname.

13598

- echo "$as_me:$LINENO: checking for connect" >&5

13599

-echo $ECHO_N "checking for connect... $ECHO_C" >&6

13600

+ { echo "$as_me:$LINENO: checking for connect" >&5

13601

+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }

13602

if test "${ac_cv_func_connect+set}" = set; then

13603

echo $ECHO_N "(cached) $ECHO_C" >&6

13604

else

13605

@@ -22490,53 +24177,59 @@

13606

13607

#undef connect

13608

13609

-/* Override any gcc2 internal prototype to avoid an error. */

13610

+/* Override any GCC internal prototype to avoid an error.

13611

+ Use char because int might match the return type of a GCC

13612

+ builtin and then its argument prototype would still apply. */

13613

#ifdef __cplusplus

13614

extern "C"

13615

13616

#endif

13617

-/* We use char because int might match the return type of a gcc2

13618

- builtin and then its argument prototype would still apply. */

13619

char connect ();

13620

/* The GNU C library defines this for functions which it implements

13621

to always fail with ENOSYS. Some functions are actually named

13622

something starting with __ and the normal name is an alias. */

13623

-#if defined (__stub_connect) || defined (__stub___connect)

13624

+#if defined __stub_connect || defined __stub___connect

13625

choke me

13626

-#else

13627

-char (*f) () = connect;

13628

-#endif

13629

-#ifdef __cplusplus

13630

13631

#endif

13632

13633

int

13634

main ()

13635

{

13636

-return f != connect;

13637

+return connect ();

13638

;

13639

return 0;

13640

}

13641

_ACEOF

13642

rm -f conftest.$ac_objext conftest$ac_exeext

13643

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13644

- (eval $ac_link) 2>conftest.er1

13645

+if { (ac_try="$ac_link"

13646

+case "(($ac_try" in

13647

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13648

+ *) ac_try_echo=$ac_try;;

13649

+esac

13650

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13651

+ (eval "$ac_link") 2>conftest.er1

13652

ac_status=$?

13653

grep -v '^ *+' conftest.er1 >conftest.err

13654

rm -f conftest.er1

13655

cat conftest.err >&5

13656

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13657

(exit $ac_status); } &&

13658

- { ac_try='test -z "$ac_c_werror_flag"

13659

- || test ! -s conftest.err'

13660

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13661

- (eval $ac_try) 2>&5

13662

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13663

+ { (case "(($ac_try" in

13664

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13665

+ *) ac_try_echo=$ac_try;;

13666

+esac

13667

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13668

+ (eval "$ac_try") 2>&5

13669

ac_status=$?

13670

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13671

(exit $ac_status); }; } &&

13672

{ ac_try='test -s conftest$ac_exeext'

13673

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13674

- (eval $ac_try) 2>&5

13675

+ { (case "(($ac_try" in

13676

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13677

+ *) ac_try_echo=$ac_try;;

13678

+esac

13679

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13680

+ (eval "$ac_try") 2>&5

13681

ac_status=$?

13682

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13683

(exit $ac_status); }; }; then

13684

@@ -22545,17 +24238,18 @@

13685

echo "$as_me: failed program was:" >&5

13686

sed 's/^/| /' conftest.$ac_ext >&5

13687

13688

-ac_cv_func_connect=no

13689

+ ac_cv_func_connect=no

13690

13691

-rm -f conftest.err conftest.$ac_objext \

13692

13693

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13694

conftest$ac_exeext conftest.$ac_ext

13695

13696

-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5

13697

-echo "${ECHO_T}$ac_cv_func_connect" >&6

13698

+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5

13699

+echo "${ECHO_T}$ac_cv_func_connect" >&6; }

13700

13701

if test $ac_cv_func_connect = no; then

13702

- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5

13703

-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6

13704

+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5

13705

+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }

13706

if test "${ac_cv_lib_socket_connect+set}" = set; then

13707

echo $ECHO_N "(cached) $ECHO_C" >&6

13708

else

13709

@@ -22568,40 +24262,52 @@

13710

cat >>conftest.$ac_ext <<_ACEOF

13711

/* end confdefs.h. */

13712

13713

-/* Override any gcc2 internal prototype to avoid an error. */

13714

+/* Override any GCC internal prototype to avoid an error.

13715

+ Use char because int might match the return type of a GCC

13716

+ builtin and then its argument prototype would still apply. */

13717

#ifdef __cplusplus

13718

extern "C"

13719

#endif

13720

-/* We use char because int might match the return type of a gcc2

13721

- builtin and then its argument prototype would still apply. */

13722

char connect ();

13723

int

13724

main ()

13725

{

13726

-connect ();

13727

+return connect ();

13728

;

13729

return 0;

13730

}

13731

_ACEOF

13732

rm -f conftest.$ac_objext conftest$ac_exeext

13733

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13734

- (eval $ac_link) 2>conftest.er1

13735

+if { (ac_try="$ac_link"

13736

+case "(($ac_try" in

13737

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13738

+ *) ac_try_echo=$ac_try;;

13739

+esac

13740

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13741

+ (eval "$ac_link") 2>conftest.er1

13742

ac_status=$?

13743

grep -v '^ *+' conftest.er1 >conftest.err

13744

rm -f conftest.er1

13745

cat conftest.err >&5

13746

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13747

(exit $ac_status); } &&

13748

- { ac_try='test -z "$ac_c_werror_flag"

13749

- || test ! -s conftest.err'

13750

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13751

- (eval $ac_try) 2>&5

13752

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13753

+ { (case "(($ac_try" in

13754

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13755

+ *) ac_try_echo=$ac_try;;

13756

+esac

13757

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13758

+ (eval "$ac_try") 2>&5

13759

ac_status=$?

13760

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13761

(exit $ac_status); }; } &&

13762

{ ac_try='test -s conftest$ac_exeext'

13763

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13764

- (eval $ac_try) 2>&5

13765

+ { (case "(($ac_try" in

13766

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13767

+ *) ac_try_echo=$ac_try;;

13768

+esac

13769

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13770

+ (eval "$ac_try") 2>&5

13771

ac_status=$?

13772

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13773

(exit $ac_status); }; }; then

13774

@@ -22610,14 +24316,15 @@

13775

echo "$as_me: failed program was:" >&5

13776

sed 's/^/| /' conftest.$ac_ext >&5

13777

13778

-ac_cv_lib_socket_connect=no

13779

+ ac_cv_lib_socket_connect=no

13780

13781

-rm -f conftest.err conftest.$ac_objext \

13782

13783

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13784

conftest$ac_exeext conftest.$ac_ext

13785

LIBS=$ac_check_lib_save_LIBS

13786

13787

-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5

13788

-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6

13789

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5

13790

+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }

13791

if test $ac_cv_lib_socket_connect = yes; then

13792

X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"

13793

13794

@@ -22625,8 +24332,8 @@

13795

13796

13797

# Guillermo Gomez says -lposix is necessary on A/UX.

13798

- echo "$as_me:$LINENO: checking for remove" >&5

13799

-echo $ECHO_N "checking for remove... $ECHO_C" >&6

13800

+ { echo "$as_me:$LINENO: checking for remove" >&5

13801

+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }

13802

if test "${ac_cv_func_remove+set}" = set; then

13803

echo $ECHO_N "(cached) $ECHO_C" >&6

13804

else

13805

@@ -22653,53 +24360,59 @@

13806

13807

#undef remove

13808

13809

-/* Override any gcc2 internal prototype to avoid an error. */

13810

+/* Override any GCC internal prototype to avoid an error.

13811

+ Use char because int might match the return type of a GCC

13812

+ builtin and then its argument prototype would still apply. */

13813

#ifdef __cplusplus

13814

extern "C"

13815

13816

#endif

13817

-/* We use char because int might match the return type of a gcc2

13818

- builtin and then its argument prototype would still apply. */

13819

char remove ();

13820

/* The GNU C library defines this for functions which it implements

13821

to always fail with ENOSYS. Some functions are actually named

13822

something starting with __ and the normal name is an alias. */

13823

-#if defined (__stub_remove) || defined (__stub___remove)

13824

+#if defined __stub_remove || defined __stub___remove

13825

choke me

13826

-#else

13827

-char (*f) () = remove;

13828

-#endif

13829

-#ifdef __cplusplus

13830

13831

#endif

13832

13833

int

13834

main ()

13835

{

13836

-return f != remove;

13837

+return remove ();

13838

;

13839

return 0;

13840

}

13841

_ACEOF

13842

rm -f conftest.$ac_objext conftest$ac_exeext

13843

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13844

- (eval $ac_link) 2>conftest.er1

13845

+if { (ac_try="$ac_link"

13846

+case "(($ac_try" in

13847

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13848

+ *) ac_try_echo=$ac_try;;

13849

+esac

13850

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13851

+ (eval "$ac_link") 2>conftest.er1

13852

ac_status=$?

13853

grep -v '^ *+' conftest.er1 >conftest.err

13854

rm -f conftest.er1

13855

cat conftest.err >&5

13856

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13857

(exit $ac_status); } &&

13858

- { ac_try='test -z "$ac_c_werror_flag"

13859

- || test ! -s conftest.err'

13860

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13861

- (eval $ac_try) 2>&5

13862

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13863

+ { (case "(($ac_try" in

13864

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13865

+ *) ac_try_echo=$ac_try;;

13866

+esac

13867

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13868

+ (eval "$ac_try") 2>&5

13869

ac_status=$?

13870

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13871

(exit $ac_status); }; } &&

13872

{ ac_try='test -s conftest$ac_exeext'

13873

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13874

- (eval $ac_try) 2>&5

13875

+ { (case "(($ac_try" in

13876

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13877

+ *) ac_try_echo=$ac_try;;

13878

+esac

13879

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13880

+ (eval "$ac_try") 2>&5

13881

ac_status=$?

13882

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13883

(exit $ac_status); }; }; then

13884

@@ -22708,17 +24421,18 @@

13885

echo "$as_me: failed program was:" >&5

13886

sed 's/^/| /' conftest.$ac_ext >&5

13887

13888

-ac_cv_func_remove=no

13889

+ ac_cv_func_remove=no

13890

13891

-rm -f conftest.err conftest.$ac_objext \

13892

13893

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13894

conftest$ac_exeext conftest.$ac_ext

13895

13896

-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5

13897

-echo "${ECHO_T}$ac_cv_func_remove" >&6

13898

+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5

13899

+echo "${ECHO_T}$ac_cv_func_remove" >&6; }

13900

13901

if test $ac_cv_func_remove = no; then

13902

- echo "$as_me:$LINENO: checking for remove in -lposix" >&5

13903

-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6

13904

+ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5

13905

+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }

13906

if test "${ac_cv_lib_posix_remove+set}" = set; then

13907

echo $ECHO_N "(cached) $ECHO_C" >&6

13908

else

13909

@@ -22731,40 +24445,52 @@

13910

cat >>conftest.$ac_ext <<_ACEOF

13911

/* end confdefs.h. */

13912

13913

-/* Override any gcc2 internal prototype to avoid an error. */

13914

+/* Override any GCC internal prototype to avoid an error.

13915

+ Use char because int might match the return type of a GCC

13916

+ builtin and then its argument prototype would still apply. */

13917

#ifdef __cplusplus

13918

extern "C"

13919

#endif

13920

-/* We use char because int might match the return type of a gcc2

13921

- builtin and then its argument prototype would still apply. */

13922

char remove ();

13923

int

13924

main ()

13925

{

13926

-remove ();

13927

+return remove ();

13928

;

13929

return 0;

13930

}

13931

_ACEOF

13932

rm -f conftest.$ac_objext conftest$ac_exeext

13933

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

13934

- (eval $ac_link) 2>conftest.er1

13935

+if { (ac_try="$ac_link"

13936

+case "(($ac_try" in

13937

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13938

+ *) ac_try_echo=$ac_try;;

13939

+esac

13940

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13941

+ (eval "$ac_link") 2>conftest.er1

13942

ac_status=$?

13943

grep -v '^ *+' conftest.er1 >conftest.err

13944

rm -f conftest.er1

13945

cat conftest.err >&5

13946

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13947

(exit $ac_status); } &&

13948

- { ac_try='test -z "$ac_c_werror_flag"

13949

- || test ! -s conftest.err'

13950

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13951

- (eval $ac_try) 2>&5

13952

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

13953

+ { (case "(($ac_try" in

13954

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13955

+ *) ac_try_echo=$ac_try;;

13956

+esac

13957

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13958

+ (eval "$ac_try") 2>&5

13959

ac_status=$?

13960

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13961

(exit $ac_status); }; } &&

13962

{ ac_try='test -s conftest$ac_exeext'

13963

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

13964

- (eval $ac_try) 2>&5

13965

+ { (case "(($ac_try" in

13966

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13967

+ *) ac_try_echo=$ac_try;;

13968

+esac

13969

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13970

+ (eval "$ac_try") 2>&5

13971

ac_status=$?

13972

echo "$as_me:$LINENO: \$? = $ac_status" >&5

13973

(exit $ac_status); }; }; then

13974

@@ -22773,14 +24499,15 @@

13975

echo "$as_me: failed program was:" >&5

13976

sed 's/^/| /' conftest.$ac_ext >&5

13977

13978

-ac_cv_lib_posix_remove=no

13979

+ ac_cv_lib_posix_remove=no

13980

13981

-rm -f conftest.err conftest.$ac_objext \

13982

13983

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13984

conftest$ac_exeext conftest.$ac_ext

13985

LIBS=$ac_check_lib_save_LIBS

13986

13987

-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5

13988

-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6

13989

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5

13990

+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }

13991

if test $ac_cv_lib_posix_remove = yes; then

13992

X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"

13993

13994

@@ -22788,8 +24515,8 @@

13995

13996

13997

# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

13998

- echo "$as_me:$LINENO: checking for shmat" >&5

13999

-echo $ECHO_N "checking for shmat... $ECHO_C" >&6

14000

+ { echo "$as_me:$LINENO: checking for shmat" >&5

14001

+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }

14002

if test "${ac_cv_func_shmat+set}" = set; then

14003

echo $ECHO_N "(cached) $ECHO_C" >&6

14004

else

14005

@@ -22816,53 +24543,59 @@

14006

14007

#undef shmat

14008

14009

-/* Override any gcc2 internal prototype to avoid an error. */

14010

+/* Override any GCC internal prototype to avoid an error.

14011

+ Use char because int might match the return type of a GCC

14012

+ builtin and then its argument prototype would still apply. */

14013

#ifdef __cplusplus

14014

extern "C"

14015

14016

#endif

14017

-/* We use char because int might match the return type of a gcc2

14018

- builtin and then its argument prototype would still apply. */

14019

char shmat ();

14020

/* The GNU C library defines this for functions which it implements

14021

to always fail with ENOSYS. Some functions are actually named

14022

something starting with __ and the normal name is an alias. */

14023

-#if defined (__stub_shmat) || defined (__stub___shmat)

14024

+#if defined __stub_shmat || defined __stub___shmat

14025

choke me

14026

-#else

14027

-char (*f) () = shmat;

14028

-#endif

14029

-#ifdef __cplusplus

14030

14031

#endif

14032

14033

int

14034

main ()

14035

{

14036

-return f != shmat;

14037

+return shmat ();

14038

;

14039

return 0;

14040

}

14041

_ACEOF

14042

rm -f conftest.$ac_objext conftest$ac_exeext

14043

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

14044

- (eval $ac_link) 2>conftest.er1

14045

+if { (ac_try="$ac_link"

14046

+case "(($ac_try" in

14047

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14048

+ *) ac_try_echo=$ac_try;;

14049

+esac

14050

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14051

+ (eval "$ac_link") 2>conftest.er1

14052

ac_status=$?

14053

grep -v '^ *+' conftest.er1 >conftest.err

14054

rm -f conftest.er1

14055

cat conftest.err >&5

14056

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14057

(exit $ac_status); } &&

14058

- { ac_try='test -z "$ac_c_werror_flag"

14059

- || test ! -s conftest.err'

14060

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14061

- (eval $ac_try) 2>&5

14062

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

14063

+ { (case "(($ac_try" in

14064

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14065

+ *) ac_try_echo=$ac_try;;

14066

+esac

14067

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14068

+ (eval "$ac_try") 2>&5

14069

ac_status=$?

14070

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14071

(exit $ac_status); }; } &&

14072

{ ac_try='test -s conftest$ac_exeext'

14073

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14074

- (eval $ac_try) 2>&5

14075

+ { (case "(($ac_try" in

14076

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14077

+ *) ac_try_echo=$ac_try;;

14078

+esac

14079

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14080

+ (eval "$ac_try") 2>&5

14081

ac_status=$?

14082

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14083

(exit $ac_status); }; }; then

14084

@@ -22871,17 +24604,18 @@

14085

echo "$as_me: failed program was:" >&5

14086

sed 's/^/| /' conftest.$ac_ext >&5

14087

14088

-ac_cv_func_shmat=no

14089

+ ac_cv_func_shmat=no

14090

14091

-rm -f conftest.err conftest.$ac_objext \

14092

14093

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14094

conftest$ac_exeext conftest.$ac_ext

14095

14096

-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5

14097

-echo "${ECHO_T}$ac_cv_func_shmat" >&6

14098

+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5

14099

+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }

14100

14101

if test $ac_cv_func_shmat = no; then

14102

- echo "$as_me:$LINENO: checking for shmat in -lipc" >&5

14103

-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6

14104

+ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5

14105

+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }

14106

if test "${ac_cv_lib_ipc_shmat+set}" = set; then

14107

echo $ECHO_N "(cached) $ECHO_C" >&6

14108

else

14109

@@ -22894,40 +24628,52 @@

14110

cat >>conftest.$ac_ext <<_ACEOF

14111

/* end confdefs.h. */

14112

14113

-/* Override any gcc2 internal prototype to avoid an error. */

14114

+/* Override any GCC internal prototype to avoid an error.

14115

+ Use char because int might match the return type of a GCC

14116

+ builtin and then its argument prototype would still apply. */

14117

#ifdef __cplusplus

14118

extern "C"

14119

#endif

14120

-/* We use char because int might match the return type of a gcc2

14121

- builtin and then its argument prototype would still apply. */

14122

char shmat ();

14123

int

14124

main ()

14125

{

14126

-shmat ();

14127

+return shmat ();

14128

;

14129

return 0;

14130

}

14131

_ACEOF

14132

rm -f conftest.$ac_objext conftest$ac_exeext

14133

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

14134

- (eval $ac_link) 2>conftest.er1

14135

+if { (ac_try="$ac_link"

14136

+case "(($ac_try" in

14137

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14138

+ *) ac_try_echo=$ac_try;;

14139

+esac

14140

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14141

+ (eval "$ac_link") 2>conftest.er1

14142

ac_status=$?

14143

grep -v '^ *+' conftest.er1 >conftest.err

14144

rm -f conftest.er1

14145

cat conftest.err >&5

14146

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14147

(exit $ac_status); } &&

14148

- { ac_try='test -z "$ac_c_werror_flag"

14149

- || test ! -s conftest.err'

14150

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14151

- (eval $ac_try) 2>&5

14152

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

14153

+ { (case "(($ac_try" in

14154

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14155

+ *) ac_try_echo=$ac_try;;

14156

+esac

14157

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14158

+ (eval "$ac_try") 2>&5

14159

ac_status=$?

14160

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14161

(exit $ac_status); }; } &&

14162

{ ac_try='test -s conftest$ac_exeext'

14163

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14164

- (eval $ac_try) 2>&5

14165

+ { (case "(($ac_try" in

14166

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14167

+ *) ac_try_echo=$ac_try;;

14168

+esac

14169

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14170

+ (eval "$ac_try") 2>&5

14171

ac_status=$?

14172

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14173

(exit $ac_status); }; }; then

14174

@@ -22936,14 +24682,15 @@

14175

echo "$as_me: failed program was:" >&5

14176

sed 's/^/| /' conftest.$ac_ext >&5

14177

14178

-ac_cv_lib_ipc_shmat=no

14179

+ ac_cv_lib_ipc_shmat=no

14180

14181

-rm -f conftest.err conftest.$ac_objext \

14182

14183

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14184

conftest$ac_exeext conftest.$ac_ext

14185

LIBS=$ac_check_lib_save_LIBS

14186

14187

-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5

14188

-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6

14189

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5

14190

+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }

14191

if test $ac_cv_lib_ipc_shmat = yes; then

14192

X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"

14193

14194

@@ -22960,8 +24707,8 @@

14195

# These have to be linked with before -lX11, unlike the other

14196

# libraries we check for below, so use a different variable.

14197

# John Interrante, Karl Berry

14198

- echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5

14199

-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6

14200

+ { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5

14201

+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }

14202

if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then

14203

echo $ECHO_N "(cached) $ECHO_C" >&6

14204

else

14205

@@ -22974,40 +24721,52 @@

14206

cat >>conftest.$ac_ext <<_ACEOF

14207

/* end confdefs.h. */

14208

14209

-/* Override any gcc2 internal prototype to avoid an error. */

14210

+/* Override any GCC internal prototype to avoid an error.

14211

+ Use char because int might match the return type of a GCC

14212

+ builtin and then its argument prototype would still apply. */

14213

#ifdef __cplusplus

14214

extern "C"

14215

#endif

14216

-/* We use char because int might match the return type of a gcc2

14217

- builtin and then its argument prototype would still apply. */

14218

char IceConnectionNumber ();

14219

int

14220

main ()

14221

{

14222

-IceConnectionNumber ();

14223

+return IceConnectionNumber ();

14224

;

14225

return 0;

14226

}

14227

_ACEOF

14228

rm -f conftest.$ac_objext conftest$ac_exeext

14229

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

14230

- (eval $ac_link) 2>conftest.er1

14231

+if { (ac_try="$ac_link"

14232

+case "(($ac_try" in

14233

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14234

+ *) ac_try_echo=$ac_try;;

14235

+esac

14236

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14237

+ (eval "$ac_link") 2>conftest.er1

14238

ac_status=$?

14239

grep -v '^ *+' conftest.er1 >conftest.err

14240

rm -f conftest.er1

14241

cat conftest.err >&5

14242

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14243

(exit $ac_status); } &&

14244

- { ac_try='test -z "$ac_c_werror_flag"

14245

- || test ! -s conftest.err'

14246

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14247

- (eval $ac_try) 2>&5

14248

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

14249

+ { (case "(($ac_try" in

14250

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14251

+ *) ac_try_echo=$ac_try;;

14252

+esac

14253

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14254

+ (eval "$ac_try") 2>&5

14255

ac_status=$?

14256

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14257

(exit $ac_status); }; } &&

14258

{ ac_try='test -s conftest$ac_exeext'

14259

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14260

- (eval $ac_try) 2>&5

14261

+ { (case "(($ac_try" in

14262

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14263

+ *) ac_try_echo=$ac_try;;

14264

+esac

14265

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14266

+ (eval "$ac_try") 2>&5

14267

ac_status=$?

14268

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14269

(exit $ac_status); }; }; then

14270

@@ -23016,14 +24775,15 @@

14271

echo "$as_me: failed program was:" >&5

14272

sed 's/^/| /' conftest.$ac_ext >&5

14273

14274

-ac_cv_lib_ICE_IceConnectionNumber=no

14275

+ ac_cv_lib_ICE_IceConnectionNumber=no

14276

14277

-rm -f conftest.err conftest.$ac_objext \

14278

14279

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14280

conftest$ac_exeext conftest.$ac_ext

14281

LIBS=$ac_check_lib_save_LIBS

14282

14283

-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5

14284

-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6

14285

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5

14286

+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }

14287

if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then

14288

X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"

14289

14290

@@ -23057,22 +24817,22 @@

14291

14292

# Check for gnutls

14293

14294

-# Check whether --enable-gnutls or --disable-gnutls was given.

14295

+# Check whether --enable-gnutls was given.

14296

if test "${enable_gnutls+set}" = set; then

14297

- enableval="$enable_gnutls"

14298

14299

+ enableval=$enable_gnutls;

14300

else

14301

enable_gnutls=yes

14302

-fi;

14303

+fi

14304

14305

if test "$enable_gnutls" = "yes"; then

14306

14307

-# Check whether --with-libgnutls-prefix or --without-libgnutls-prefix was given.

14308

+# Check whether --with-libgnutls-prefix was given.

14309

if test "${with_libgnutls_prefix+set}" = set; then

14310

- withval="$with_libgnutls_prefix"

14311

- libgnutls_config_prefix="$withval"

14312

+ withval=$with_libgnutls_prefix; libgnutls_config_prefix="$withval"

14313

else

14314

libgnutls_config_prefix=""

14315

-fi;

14316

+fi

14317

14318

14319

if test x$libgnutls_config_prefix != x ; then

14320

if test x${LIBGNUTLS_CONFIG+set} != xset ; then

14321

@@ -23082,8 +24842,8 @@

14322

14323

# Extract the first word of "libgnutls-config", so it can be a program name with args.

14324

set dummy libgnutls-config; ac_word=$2

14325

-echo "$as_me:$LINENO: checking for $ac_word" >&5

14326

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

14327

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

14328

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

14329

if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then

14330

echo $ECHO_N "(cached) $ECHO_C" >&6

14331

else

14332

@@ -23098,31 +24858,32 @@

14333

IFS=$as_save_IFS

14334

test -z "$as_dir" && as_dir=.

14335

for ac_exec_ext in '' $ac_executable_extensions; do

14336

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

14337

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

14338

ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"

14339

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

14340

break 2

14341

14342

done

14343

done

14344

+IFS=$as_save_IFS

14345

14346

test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no"

14347

;;

14348

esac

14349

14350

LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG

14351

14352

if test -n "$LIBGNUTLS_CONFIG"; then

14353

- echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5

14354

-echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6

14355

+ { echo "$as_me:$LINENO: result: $LIBGNUTLS_CONFIG" >&5

14356

+echo "${ECHO_T}$LIBGNUTLS_CONFIG" >&6; }

14357

else

14358

- echo "$as_me:$LINENO: result: no" >&5

14359

-echo "${ECHO_T}no" >&6

14360

+ { echo "$as_me:$LINENO: result: no" >&5

14361

+echo "${ECHO_T}no" >&6; }

14362

14363

14364

14365

min_libgnutls_version=1.0.0

14366

- echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5

14367

-echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6

14368

+ { echo "$as_me:$LINENO: checking for libgnutls - version >= $min_libgnutls_version" >&5

14369

+echo $ECHO_N "checking for libgnutls - version >= $min_libgnutls_version... $ECHO_C" >&6; }

14370

no_libgnutls=""

14371

if test "$LIBGNUTLS_CONFIG" = "no" ; then

14372

no_libgnutls=yes

14373

@@ -23203,13 +24964,22 @@

14374

14375

_ACEOF

14376

rm -f conftest$ac_exeext

14377

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

14378

- (eval $ac_link) 2>&5

14379

+if { (ac_try="$ac_link"

14380

+case "(($ac_try" in

14381

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14382

+ *) ac_try_echo=$ac_try;;

14383

+esac

14384

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14385

+ (eval "$ac_link") 2>&5

14386

ac_status=$?

14387

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14388

(exit $ac_status); } && { ac_try='./conftest$ac_exeext'

14389

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14390

- (eval $ac_try) 2>&5

14391

+ { (case "(($ac_try" in

14392

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14393

+ *) ac_try_echo=$ac_try;;

14394

+esac

14395

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14396

+ (eval "$ac_try") 2>&5

14397

ac_status=$?

14398

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14399

(exit $ac_status); }; }; then

14400

@@ -23222,15 +24992,17 @@

14401

( exit $ac_status )

14402

no_libgnutls=yes

14403

14404

-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

14405

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

14406

14407

14408

14409

CFLAGS="$ac_save_CFLAGS"

14410

LIBS="$ac_save_LIBS"

14411

14412

14413

if test "x$no_libgnutls" = x ; then

14414

- echo "$as_me:$LINENO: result: yes" >&5

14415

-echo "${ECHO_T}yes" >&6

14416

+ { echo "$as_me:$LINENO: result: yes" >&5

14417

+echo "${ECHO_T}yes" >&6; }

14418

14419

cat >>confdefs.h <<\_ACEOF

14420

#define HAVE_GNUTLS 1

14421

@@ -23240,8 +25012,8 @@

14422

if test -f conf.libgnutlstest ; then

14423

14424

else

14425

- echo "$as_me:$LINENO: result: no" >&5

14426

-echo "${ECHO_T}no" >&6

14427

+ { echo "$as_me:$LINENO: result: no" >&5

14428

+echo "${ECHO_T}no" >&6; }

14429

14430

if test "$LIBGNUTLS_CONFIG" = "no" ; then

14431

echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"

14432

@@ -23276,24 +25048,36 @@

14433

}

14434

_ACEOF

14435

rm -f conftest.$ac_objext conftest$ac_exeext

14436

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

14437

- (eval $ac_link) 2>conftest.er1

14438

+if { (ac_try="$ac_link"

14439

+case "(($ac_try" in

14440

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14441

+ *) ac_try_echo=$ac_try;;

14442

+esac

14443

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14444

+ (eval "$ac_link") 2>conftest.er1

14445

ac_status=$?

14446

grep -v '^ *+' conftest.er1 >conftest.err

14447

rm -f conftest.er1

14448

cat conftest.err >&5

14449

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14450

(exit $ac_status); } &&

14451

- { ac_try='test -z "$ac_c_werror_flag"

14452

- || test ! -s conftest.err'

14453

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14454

- (eval $ac_try) 2>&5

14455

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

14456

+ { (case "(($ac_try" in

14457

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14458

+ *) ac_try_echo=$ac_try;;

14459

+esac

14460

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14461

+ (eval "$ac_try") 2>&5

14462

ac_status=$?

14463

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14464

(exit $ac_status); }; } &&

14465

{ ac_try='test -s conftest$ac_exeext'

14466

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14467

- (eval $ac_try) 2>&5

14468

+ { (case "(($ac_try" in

14469

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14470

+ *) ac_try_echo=$ac_try;;

14471

+esac

14472

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14473

+ (eval "$ac_try") 2>&5

14474

ac_status=$?

14475

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14476

(exit $ac_status); }; }; then

14477

@@ -23311,12 +25095,13 @@

14478

echo "$as_me: failed program was:" >&5

14479

sed 's/^/| /' conftest.$ac_ext >&5

14480

14481

- echo "*** The test program failed to compile or link. See the file config.log for the"

14482

+ echo "*** The test program failed to compile or link. See the file config.log for the"

14483

echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"

14484

echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"

14485

echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG"

14486

14487

-rm -f conftest.err conftest.$ac_objext \

14488

14489

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14490

conftest$ac_exeext conftest.$ac_ext

14491

CFLAGS="$ac_save_CFLAGS"

14492

LIBS="$ac_save_LIBS"

14493

@@ -23344,22 +25129,22 @@

14494

14495

# Check for gcrypt

14496

14497

-# Check whether --enable-gcrypt or --disable-gcrypt was given.

14498

+# Check whether --enable-gcrypt was given.

14499

if test "${enable_gcrypt+set}" = set; then

14500

- enableval="$enable_gcrypt"

14501

14502

+ enableval=$enable_gcrypt;

14503

else

14504

enable_gcrypt=yes

14505

-fi;

14506

+fi

14507

14508

if test "$enable_gcrypt" = "yes"; then

14509

14510

-# Check whether --with-libgcrypt-prefix or --without-libgcrypt-prefix was given.

14511

+# Check whether --with-libgcrypt-prefix was given.

14512

if test "${with_libgcrypt_prefix+set}" = set; then

14513

- withval="$with_libgcrypt_prefix"

14514

- libgcrypt_config_prefix="$withval"

14515

+ withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval"

14516

else

14517

libgcrypt_config_prefix=""

14518

-fi;

14519

+fi

14520

14521

if test x$libgcrypt_config_prefix != x ; then

14522

if test x${LIBGCRYPT_CONFIG+set} != xset ; then

14523

LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config

14524

@@ -23368,8 +25153,8 @@

14525

14526

# Extract the first word of "libgcrypt-config", so it can be a program name with args.

14527

set dummy libgcrypt-config; ac_word=$2

14528

-echo "$as_me:$LINENO: checking for $ac_word" >&5

14529

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

14530

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

14531

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

14532

if test "${ac_cv_path_LIBGCRYPT_CONFIG+set}" = set; then

14533

echo $ECHO_N "(cached) $ECHO_C" >&6

14534

else

14535

@@ -23384,28 +25169,29 @@

14536

IFS=$as_save_IFS

14537

test -z "$as_dir" && as_dir=.

14538

for ac_exec_ext in '' $ac_executable_extensions; do

14539

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

14540

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

14541

ac_cv_path_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext"

14542

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

14543

break 2

14544

14545

done

14546

done

14547

+IFS=$as_save_IFS

14548

14549

test -z "$ac_cv_path_LIBGCRYPT_CONFIG" && ac_cv_path_LIBGCRYPT_CONFIG="no"

14550

;;

14551

esac

14552

14553

LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG

14554

14555

if test -n "$LIBGCRYPT_CONFIG"; then

14556

- echo "$as_me:$LINENO: result: $LIBGCRYPT_CONFIG" >&5

14557

-echo "${ECHO_T}$LIBGCRYPT_CONFIG" >&6

14558

+ { echo "$as_me:$LINENO: result: $LIBGCRYPT_CONFIG" >&5

14559

+echo "${ECHO_T}$LIBGCRYPT_CONFIG" >&6; }

14560

else

14561

- echo "$as_me:$LINENO: result: no" >&5

14562

-echo "${ECHO_T}no" >&6

14563

+ { echo "$as_me:$LINENO: result: no" >&5

14564

+echo "${ECHO_T}no" >&6; }

14565

14566

14567

14568

tmp=1.1.90

14569

if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then

14570

req_libgcrypt_api=`echo "$tmp" | sed 's/$.*$:$.*$/\1/'`

14571

@@ -23415,8 +25201,8 @@

14572

min_libgcrypt_version="$tmp"

14573

14574

14575

- echo "$as_me:$LINENO: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5

14576

-echo $ECHO_N "checking for LIBGCRYPT - version >= $min_libgcrypt_version... $ECHO_C" >&6

14577

+ { echo "$as_me:$LINENO: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5

14578

+echo $ECHO_N "checking for LIBGCRYPT - version >= $min_libgcrypt_version... $ECHO_C" >&6; }

14579

ok=no

14580

if test "$LIBGCRYPT_CONFIG" != "no" ; then

14581

req_major=`echo $min_libgcrypt_version | \

14582

@@ -23449,11 +25235,11 @@

14583

14584

14585

if test $ok = yes; then

14586

- echo "$as_me:$LINENO: result: yes" >&5

14587

-echo "${ECHO_T}yes" >&6

14588

+ { echo "$as_me:$LINENO: result: yes" >&5

14589

+echo "${ECHO_T}yes" >&6; }

14590

else

14591

- echo "$as_me:$LINENO: result: no" >&5

14592

-echo "${ECHO_T}no" >&6

14593

+ { echo "$as_me:$LINENO: result: no" >&5

14594

+echo "${ECHO_T}no" >&6; }

14595

14596

if test $ok = yes; then

14597

# If we have a recent libgcrypt, we should also check that the

14598

@@ -23461,15 +25247,15 @@

14599

if test "$req_libgcrypt_api" -gt 0 ; then

14600

tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`

14601

if test "$tmp" -gt 0 ; then

14602

- echo "$as_me:$LINENO: checking LIBGCRYPT API version" >&5

14603

-echo $ECHO_N "checking LIBGCRYPT API version... $ECHO_C" >&6

14604

+ { echo "$as_me:$LINENO: checking LIBGCRYPT API version" >&5

14605

+echo $ECHO_N "checking LIBGCRYPT API version... $ECHO_C" >&6; }

14606

if test "$req_libgcrypt_api" -eq "$tmp" ; then

14607

- echo "$as_me:$LINENO: result: okay" >&5

14608

-echo "${ECHO_T}okay" >&6

14609

+ { echo "$as_me:$LINENO: result: okay" >&5

14610

+echo "${ECHO_T}okay" >&6; }

14611

else

14612

ok=no

14613

- echo "$as_me:$LINENO: result: does not match (want=$req_libgcrypt_api got=$tmp)" >&5

14614

-echo "${ECHO_T}does not match (want=$req_libgcrypt_api got=$tmp)" >&6

14615

+ { echo "$as_me:$LINENO: result: does not match (want=$req_libgcrypt_api got=$tmp)" >&5

14616

+echo "${ECHO_T}does not match (want=$req_libgcrypt_api got=$tmp)" >&6; }

14617

14618

14619

14620

@@ -23505,8 +25291,8 @@

14621

# Check for XDAMAGE extension

14622

14623

XSHM_LIBS=

14624

-echo "$as_me:$LINENO: checking for X11/extensions/Xdamage.h" >&5

14625

-echo $ECHO_N "checking for X11/extensions/Xdamage.h... $ECHO_C" >&6

14626

+{ echo "$as_me:$LINENO: checking for X11/extensions/Xdamage.h" >&5

14627

+echo $ECHO_N "checking for X11/extensions/Xdamage.h... $ECHO_C" >&6; }

14628

if test "${ac_cv_header_X11_extensions_Xdamage_h+set}" = set; then

14629

echo $ECHO_N "(cached) $ECHO_C" >&6

14630

else

14631

@@ -23521,24 +25307,36 @@

14632

#include <X11/extensions/Xdamage.h>

14633

_ACEOF

14634

rm -f conftest.$ac_objext

14635

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

14636

- (eval $ac_compile) 2>conftest.er1

14637

+if { (ac_try="$ac_compile"

14638

+case "(($ac_try" in

14639

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14640

+ *) ac_try_echo=$ac_try;;

14641

+esac

14642

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14643

+ (eval "$ac_compile") 2>conftest.er1

14644

ac_status=$?

14645

grep -v '^ *+' conftest.er1 >conftest.err

14646

rm -f conftest.er1

14647

cat conftest.err >&5

14648

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14649

(exit $ac_status); } &&

14650

- { ac_try='test -z "$ac_c_werror_flag"

14651

- || test ! -s conftest.err'

14652

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14653

- (eval $ac_try) 2>&5

14654

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

14655

+ { (case "(($ac_try" in

14656

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14657

+ *) ac_try_echo=$ac_try;;

14658

+esac

14659

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14660

+ (eval "$ac_try") 2>&5

14661

ac_status=$?

14662

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14663

(exit $ac_status); }; } &&

14664

{ ac_try='test -s conftest.$ac_objext'

14665

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14666

- (eval $ac_try) 2>&5

14667

+ { (case "(($ac_try" in

14668

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14669

+ *) ac_try_echo=$ac_try;;

14670

+esac

14671

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14672

+ (eval "$ac_try") 2>&5

14673

ac_status=$?

14674

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14675

(exit $ac_status); }; }; then

14676

@@ -23547,16 +25345,17 @@

14677

echo "$as_me: failed program was:" >&5

14678

sed 's/^/| /' conftest.$ac_ext >&5

14679

14680

-ac_cv_header_X11_extensions_Xdamage_h=no

14681

+ ac_cv_header_X11_extensions_Xdamage_h=no

14682

14683

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

14684

14685

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

14686

14687

-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xdamage_h" >&5

14688

-echo "${ECHO_T}$ac_cv_header_X11_extensions_Xdamage_h" >&6

14689

+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xdamage_h" >&5

14690

+echo "${ECHO_T}$ac_cv_header_X11_extensions_Xdamage_h" >&6; }

14691

if test $ac_cv_header_X11_extensions_Xdamage_h = yes; then

14692

14693

- echo "$as_me:$LINENO: checking for XDamageQueryExtension in -lXdamage" >&5

14694

-echo $ECHO_N "checking for XDamageQueryExtension in -lXdamage... $ECHO_C" >&6

14695

+ { echo "$as_me:$LINENO: checking for XDamageQueryExtension in -lXdamage" >&5

14696

+echo $ECHO_N "checking for XDamageQueryExtension in -lXdamage... $ECHO_C" >&6; }

14697

if test "${ac_cv_lib_Xdamage_XDamageQueryExtension+set}" = set; then

14698

echo $ECHO_N "(cached) $ECHO_C" >&6

14699

else

14700

@@ -23569,40 +25368,52 @@

14701

cat >>conftest.$ac_ext <<_ACEOF

14702

/* end confdefs.h. */

14703

14704

-/* Override any gcc2 internal prototype to avoid an error. */

14705

+/* Override any GCC internal prototype to avoid an error.

14706

+ Use char because int might match the return type of a GCC

14707

+ builtin and then its argument prototype would still apply. */

14708

#ifdef __cplusplus

14709

extern "C"

14710

#endif

14711

-/* We use char because int might match the return type of a gcc2

14712

- builtin and then its argument prototype would still apply. */

14713

char XDamageQueryExtension ();

14714

int

14715

main ()

14716

{

14717

-XDamageQueryExtension ();

14718

+return XDamageQueryExtension ();

14719

;

14720

return 0;

14721

}

14722

_ACEOF

14723

rm -f conftest.$ac_objext conftest$ac_exeext

14724

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

14725

- (eval $ac_link) 2>conftest.er1

14726

+if { (ac_try="$ac_link"

14727

+case "(($ac_try" in

14728

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14729

+ *) ac_try_echo=$ac_try;;

14730

+esac

14731

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14732

+ (eval "$ac_link") 2>conftest.er1

14733

ac_status=$?

14734

grep -v '^ *+' conftest.er1 >conftest.err

14735

rm -f conftest.er1

14736

cat conftest.err >&5

14737

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14738

(exit $ac_status); } &&

14739

- { ac_try='test -z "$ac_c_werror_flag"

14740

- || test ! -s conftest.err'

14741

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14742

- (eval $ac_try) 2>&5

14743

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

14744

+ { (case "(($ac_try" in

14745

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14746

+ *) ac_try_echo=$ac_try;;

14747

+esac

14748

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14749

+ (eval "$ac_try") 2>&5

14750

ac_status=$?

14751

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14752

(exit $ac_status); }; } &&

14753

{ ac_try='test -s conftest$ac_exeext'

14754

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14755

- (eval $ac_try) 2>&5

14756

+ { (case "(($ac_try" in

14757

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14758

+ *) ac_try_echo=$ac_try;;

14759

+esac

14760

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14761

+ (eval "$ac_try") 2>&5

14762

ac_status=$?

14763

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14764

(exit $ac_status); }; }; then

14765

@@ -23611,14 +25422,15 @@

14766

echo "$as_me: failed program was:" >&5

14767

sed 's/^/| /' conftest.$ac_ext >&5

14768

14769

-ac_cv_lib_Xdamage_XDamageQueryExtension=no

14770

+ ac_cv_lib_Xdamage_XDamageQueryExtension=no

14771

14772

-rm -f conftest.err conftest.$ac_objext \

14773

14774

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14775

conftest$ac_exeext conftest.$ac_ext

14776

LIBS=$ac_check_lib_save_LIBS

14777

14778

-echo "$as_me:$LINENO: result: $ac_cv_lib_Xdamage_XDamageQueryExtension" >&5

14779

-echo "${ECHO_T}$ac_cv_lib_Xdamage_XDamageQueryExtension" >&6

14780

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xdamage_XDamageQueryExtension" >&5

14781

+echo "${ECHO_T}$ac_cv_lib_Xdamage_XDamageQueryExtension" >&6; }

14782

if test $ac_cv_lib_Xdamage_XDamageQueryExtension = yes; then

14783

14784

14785

@@ -23639,8 +25451,8 @@

14786

# Check for MIT-SHM extension

14787

14788

XSHM_LIBS=

14789

-echo "$as_me:$LINENO: checking for X11/extensions/XShm.h" >&5

14790

-echo $ECHO_N "checking for X11/extensions/XShm.h... $ECHO_C" >&6

14791

+{ echo "$as_me:$LINENO: checking for X11/extensions/XShm.h" >&5

14792

+echo $ECHO_N "checking for X11/extensions/XShm.h... $ECHO_C" >&6; }

14793

if test "${ac_cv_header_X11_extensions_XShm_h+set}" = set; then

14794

echo $ECHO_N "(cached) $ECHO_C" >&6

14795

else

14796

@@ -23655,24 +25467,36 @@

14797

#include <X11/extensions/XShm.h>

14798

_ACEOF

14799

rm -f conftest.$ac_objext

14800

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

14801

- (eval $ac_compile) 2>conftest.er1

14802

+if { (ac_try="$ac_compile"

14803

+case "(($ac_try" in

14804

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14805

+ *) ac_try_echo=$ac_try;;

14806

+esac

14807

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14808

+ (eval "$ac_compile") 2>conftest.er1

14809

ac_status=$?

14810

grep -v '^ *+' conftest.er1 >conftest.err

14811

rm -f conftest.er1

14812

cat conftest.err >&5

14813

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14814

(exit $ac_status); } &&

14815

- { ac_try='test -z "$ac_c_werror_flag"

14816

- || test ! -s conftest.err'

14817

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14818

- (eval $ac_try) 2>&5

14819

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

14820

+ { (case "(($ac_try" in

14821

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14822

+ *) ac_try_echo=$ac_try;;

14823

+esac

14824

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14825

+ (eval "$ac_try") 2>&5

14826

ac_status=$?

14827

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14828

(exit $ac_status); }; } &&

14829

{ ac_try='test -s conftest.$ac_objext'

14830

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14831

- (eval $ac_try) 2>&5

14832

+ { (case "(($ac_try" in

14833

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14834

+ *) ac_try_echo=$ac_try;;

14835

+esac

14836

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14837

+ (eval "$ac_try") 2>&5

14838

ac_status=$?

14839

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14840

(exit $ac_status); }; }; then

14841

@@ -23681,16 +25505,17 @@

14842

echo "$as_me: failed program was:" >&5

14843

sed 's/^/| /' conftest.$ac_ext >&5

14844

14845

-ac_cv_header_X11_extensions_XShm_h=no

14846

+ ac_cv_header_X11_extensions_XShm_h=no

14847

14848

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

14849

14850

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

14851

14852

-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XShm_h" >&5

14853

-echo "${ECHO_T}$ac_cv_header_X11_extensions_XShm_h" >&6

14854

+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XShm_h" >&5

14855

+echo "${ECHO_T}$ac_cv_header_X11_extensions_XShm_h" >&6; }

14856

if test $ac_cv_header_X11_extensions_XShm_h = yes; then

14857

14858

- echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5

14859

-echo $ECHO_N "checking for XShmQueryExtension in -lXext... $ECHO_C" >&6

14860

+ { echo "$as_me:$LINENO: checking for XShmQueryExtension in -lXext" >&5

14861

+echo $ECHO_N "checking for XShmQueryExtension in -lXext... $ECHO_C" >&6; }

14862

if test "${ac_cv_lib_Xext_XShmQueryExtension+set}" = set; then

14863

echo $ECHO_N "(cached) $ECHO_C" >&6

14864

else

14865

@@ -23703,40 +25528,52 @@

14866

cat >>conftest.$ac_ext <<_ACEOF

14867

/* end confdefs.h. */

14868

14869

-/* Override any gcc2 internal prototype to avoid an error. */

14870

+/* Override any GCC internal prototype to avoid an error.

14871

+ Use char because int might match the return type of a GCC

14872

+ builtin and then its argument prototype would still apply. */

14873

#ifdef __cplusplus

14874

extern "C"

14875

#endif

14876

-/* We use char because int might match the return type of a gcc2

14877

- builtin and then its argument prototype would still apply. */

14878

char XShmQueryExtension ();

14879

int

14880

main ()

14881

{

14882

-XShmQueryExtension ();

14883

+return XShmQueryExtension ();

14884

;

14885

return 0;

14886

}

14887

_ACEOF

14888

rm -f conftest.$ac_objext conftest$ac_exeext

14889

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

14890

- (eval $ac_link) 2>conftest.er1

14891

+if { (ac_try="$ac_link"

14892

+case "(($ac_try" in

14893

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14894

+ *) ac_try_echo=$ac_try;;

14895

+esac

14896

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14897

+ (eval "$ac_link") 2>conftest.er1

14898

ac_status=$?

14899

grep -v '^ *+' conftest.er1 >conftest.err

14900

rm -f conftest.er1

14901

cat conftest.err >&5

14902

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14903

(exit $ac_status); } &&

14904

- { ac_try='test -z "$ac_c_werror_flag"

14905

- || test ! -s conftest.err'

14906

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14907

- (eval $ac_try) 2>&5

14908

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

14909

+ { (case "(($ac_try" in

14910

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14911

+ *) ac_try_echo=$ac_try;;

14912

+esac

14913

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14914

+ (eval "$ac_try") 2>&5

14915

ac_status=$?

14916

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14917

(exit $ac_status); }; } &&

14918

{ ac_try='test -s conftest$ac_exeext'

14919

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14920

- (eval $ac_try) 2>&5

14921

+ { (case "(($ac_try" in

14922

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14923

+ *) ac_try_echo=$ac_try;;

14924

+esac

14925

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14926

+ (eval "$ac_try") 2>&5

14927

ac_status=$?

14928

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14929

(exit $ac_status); }; }; then

14930

@@ -23745,14 +25582,15 @@

14931

echo "$as_me: failed program was:" >&5

14932

sed 's/^/| /' conftest.$ac_ext >&5

14933

14934

-ac_cv_lib_Xext_XShmQueryExtension=no

14935

+ ac_cv_lib_Xext_XShmQueryExtension=no

14936

14937

-rm -f conftest.err conftest.$ac_objext \

14938

14939

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14940

conftest$ac_exeext conftest.$ac_ext

14941

LIBS=$ac_check_lib_save_LIBS

14942

14943

-echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5

14944

-echo "${ECHO_T}$ac_cv_lib_Xext_XShmQueryExtension" >&6

14945

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5

14946

+echo "${ECHO_T}$ac_cv_lib_Xext_XShmQueryExtension" >&6; }

14947

if test $ac_cv_lib_Xext_XShmQueryExtension = yes; then

14948

14949

14950

@@ -23774,17 +25612,17 @@

14951

14952

XTEST_LIBS=

14953

if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then

14954

- echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5

14955

-echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6

14956

+ { echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5

14957

+echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6; }

14958

if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then

14959

echo $ECHO_N "(cached) $ECHO_C" >&6

14960

14961

-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5

14962

-echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6

14963

+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5

14964

+echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6; }

14965

else

14966

# Is the header compilable?

14967

-echo "$as_me:$LINENO: checking X11/extensions/XTest.h usability" >&5

14968

-echo $ECHO_N "checking X11/extensions/XTest.h usability... $ECHO_C" >&6

14969

+{ echo "$as_me:$LINENO: checking X11/extensions/XTest.h usability" >&5

14970

+echo $ECHO_N "checking X11/extensions/XTest.h usability... $ECHO_C" >&6; }

14971

cat >conftest.$ac_ext <<_ACEOF

14972

/* confdefs.h. */

14973

_ACEOF

14974

@@ -23795,24 +25633,36 @@

14975

#include <X11/extensions/XTest.h>

14976

_ACEOF

14977

rm -f conftest.$ac_objext

14978

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

14979

- (eval $ac_compile) 2>conftest.er1

14980

+if { (ac_try="$ac_compile"

14981

+case "(($ac_try" in

14982

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14983

+ *) ac_try_echo=$ac_try;;

14984

+esac

14985

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

14986

+ (eval "$ac_compile") 2>conftest.er1

14987

ac_status=$?

14988

grep -v '^ *+' conftest.er1 >conftest.err

14989

rm -f conftest.er1

14990

cat conftest.err >&5

14991

echo "$as_me:$LINENO: \$? = $ac_status" >&5

14992

(exit $ac_status); } &&

14993

- { ac_try='test -z "$ac_c_werror_flag"

14994

- || test ! -s conftest.err'

14995

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

14996

- (eval $ac_try) 2>&5

14997

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

14998

+ { (case "(($ac_try" in

14999

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15000

+ *) ac_try_echo=$ac_try;;

15001

+esac

15002

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15003

+ (eval "$ac_try") 2>&5

15004

ac_status=$?

15005

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15006

(exit $ac_status); }; } &&

15007

{ ac_try='test -s conftest.$ac_objext'

15008

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15009

- (eval $ac_try) 2>&5

15010

+ { (case "(($ac_try" in

15011

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15012

+ *) ac_try_echo=$ac_try;;

15013

+esac

15014

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15015

+ (eval "$ac_try") 2>&5

15016

ac_status=$?

15017

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15018

(exit $ac_status); }; }; then

15019

@@ -23821,15 +25671,16 @@

15020

echo "$as_me: failed program was:" >&5

15021

sed 's/^/| /' conftest.$ac_ext >&5

15022

15023

-ac_header_compiler=no

15024

+ ac_header_compiler=no

15025

15026

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

15027

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15028

-echo "${ECHO_T}$ac_header_compiler" >&6

15029

15030

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

15031

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15032

+echo "${ECHO_T}$ac_header_compiler" >&6; }

15033

15034

# Is the header present?

15035

-echo "$as_me:$LINENO: checking X11/extensions/XTest.h presence" >&5

15036

-echo $ECHO_N "checking X11/extensions/XTest.h presence... $ECHO_C" >&6

15037

+{ echo "$as_me:$LINENO: checking X11/extensions/XTest.h presence" >&5

15038

+echo $ECHO_N "checking X11/extensions/XTest.h presence... $ECHO_C" >&6; }

15039

cat >conftest.$ac_ext <<_ACEOF

15040

/* confdefs.h. */

15041

_ACEOF

15042

@@ -23838,8 +25689,13 @@

15043

/* end confdefs.h. */

15044

#include <X11/extensions/XTest.h>

15045

_ACEOF

15046

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

15047

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

15048

+if { (ac_try="$ac_cpp conftest.$ac_ext"

15049

+case "(($ac_try" in

15050

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15051

+ *) ac_try_echo=$ac_try;;

15052

+esac

15053

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15054

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

15055

ac_status=$?

15056

grep -v '^ *+' conftest.er1 >conftest.err

15057

rm -f conftest.er1

15058

@@ -23863,9 +25719,10 @@

15059

15060

ac_header_preproc=no

15061

15062

15063

rm -f conftest.err conftest.$ac_ext

15064

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15065

-echo "${ECHO_T}$ac_header_preproc" >&6

15066

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15067

+echo "${ECHO_T}$ac_header_preproc" >&6; }

15068

15069

# So? What about this header?

15070

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

15071

@@ -23889,31 +25746,29 @@

15072

echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&2;}

15073

{ echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&5

15074

echo "$as_me: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&2;}

15075

- (

15076

- cat <<\_ASBOX

15077

+ ( cat <<\_ASBOX

15078

## ------------------------------------------------------------------- ##

15079

## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=vino ##

15080

## ------------------------------------------------------------------- ##

15081

_ASBOX

15082

- ) |

15083

- sed "s/^/$as_me: WARNING: /" >&2

15084

+ ) | sed "s/^/$as_me: WARNING: /" >&2

15085

;;

15086

esac

15087

-echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5

15088

-echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6

15089

+{ echo "$as_me:$LINENO: checking for X11/extensions/XTest.h" >&5

15090

+echo $ECHO_N "checking for X11/extensions/XTest.h... $ECHO_C" >&6; }

15091

if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then

15092

echo $ECHO_N "(cached) $ECHO_C" >&6

15093

else

15094

ac_cv_header_X11_extensions_XTest_h=$ac_header_preproc

15095

15096

-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5

15097

-echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6

15098

+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_XTest_h" >&5

15099

+echo "${ECHO_T}$ac_cv_header_X11_extensions_XTest_h" >&6; }

15100

15101

15102

if test $ac_cv_header_X11_extensions_XTest_h = yes; then

15103

15104

- echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5

15105

-echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6

15106

+ { echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5

15107

+echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6; }

15108

if test "${ac_cv_lib_Xtst_XTestQueryExtension+set}" = set; then

15109

echo $ECHO_N "(cached) $ECHO_C" >&6

15110

else

15111

@@ -23926,40 +25781,52 @@

15112

cat >>conftest.$ac_ext <<_ACEOF

15113

/* end confdefs.h. */

15114

15115

-/* Override any gcc2 internal prototype to avoid an error. */

15116

+/* Override any GCC internal prototype to avoid an error.

15117

+ Use char because int might match the return type of a GCC

15118

+ builtin and then its argument prototype would still apply. */

15119

#ifdef __cplusplus

15120

extern "C"

15121

#endif

15122

-/* We use char because int might match the return type of a gcc2

15123

- builtin and then its argument prototype would still apply. */

15124

char XTestQueryExtension ();

15125

int

15126

main ()

15127

{

15128

-XTestQueryExtension ();

15129

+return XTestQueryExtension ();

15130

;

15131

return 0;

15132

}

15133

_ACEOF

15134

rm -f conftest.$ac_objext conftest$ac_exeext

15135

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

15136

- (eval $ac_link) 2>conftest.er1

15137

+if { (ac_try="$ac_link"

15138

+case "(($ac_try" in

15139

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15140

+ *) ac_try_echo=$ac_try;;

15141

+esac

15142

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15143

+ (eval "$ac_link") 2>conftest.er1

15144

ac_status=$?

15145

grep -v '^ *+' conftest.er1 >conftest.err

15146

rm -f conftest.er1

15147

cat conftest.err >&5

15148

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15149

(exit $ac_status); } &&

15150

- { ac_try='test -z "$ac_c_werror_flag"

15151

- || test ! -s conftest.err'

15152

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15153

- (eval $ac_try) 2>&5

15154

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

15155

+ { (case "(($ac_try" in

15156

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15157

+ *) ac_try_echo=$ac_try;;

15158

+esac

15159

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15160

+ (eval "$ac_try") 2>&5

15161

ac_status=$?

15162

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15163

(exit $ac_status); }; } &&

15164

{ ac_try='test -s conftest$ac_exeext'

15165

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15166

- (eval $ac_try) 2>&5

15167

+ { (case "(($ac_try" in

15168

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15169

+ *) ac_try_echo=$ac_try;;

15170

+esac

15171

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15172

+ (eval "$ac_try") 2>&5

15173

ac_status=$?

15174

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15175

(exit $ac_status); }; }; then

15176

@@ -23968,14 +25835,15 @@

15177

echo "$as_me: failed program was:" >&5

15178

sed 's/^/| /' conftest.$ac_ext >&5

15179

15180

-ac_cv_lib_Xtst_XTestQueryExtension=no

15181

+ ac_cv_lib_Xtst_XTestQueryExtension=no

15182

15183

-rm -f conftest.err conftest.$ac_objext \

15184

15185

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15186

conftest$ac_exeext conftest.$ac_ext

15187

LIBS=$ac_check_lib_save_LIBS

15188

15189

-echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestQueryExtension" >&5

15190

-echo "${ECHO_T}$ac_cv_lib_Xtst_XTestQueryExtension" >&6

15191

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestQueryExtension" >&5

15192

+echo "${ECHO_T}$ac_cv_lib_Xtst_XTestQueryExtension" >&6; }

15193

if test $ac_cv_lib_Xtst_XTestQueryExtension = yes; then

15194

15195

15196

@@ -23995,10 +25863,9 @@

15197

15198

# Check for Avahi

15199

15200

-# Check whether --enable-avahi or --disable-avahi was given.

15201

+# Check whether --enable-avahi was given.

15202

if test "${enable_avahi+set}" = set; then

15203

- enableval="$enable_avahi"

15204

- case "${enableval}" in

15205

+ enableval=$enable_avahi; case "${enableval}" in

15206

yes) VINO_ENABLE_MDNS=yes ;;

15207

no) VINO_ENABLE_MDNS=no ;;

15208

*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-avahi" >&5

15209

@@ -24007,15 +25874,16 @@

15210

esac

15211

else

15212

VINO_ENABLE_MDNS=no

15213

-fi;

15214

+fi

15215

15216

15217

AVAHI_CFLAGS=

15218

AVAHI_LIBS=

15219

if test "x$VINO_ENABLE_MDNS" = "xyes" ; then

15220

15221

pkg_failed=no

15222

-echo "$as_me:$LINENO: checking for AVAHI" >&5

15223

-echo $ECHO_N "checking for AVAHI... $ECHO_C" >&6

15224

+{ echo "$as_me:$LINENO: checking for AVAHI" >&5

15225

+echo $ECHO_N "checking for AVAHI... $ECHO_C" >&6; }

15226

15227

if test -n "$PKG_CONFIG"; then

15228

if test -n "$AVAHI_CFLAGS"; then

15229

@@ -24119,8 +25987,8 @@

15230

else

15231

AVAHI_CFLAGS=$pkg_cv_AVAHI_CFLAGS

15232

AVAHI_LIBS=$pkg_cv_AVAHI_LIBS

15233

- echo "$as_me:$LINENO: result: yes" >&5

15234

-echo "${ECHO_T}yes" >&6

15235

+ { echo "$as_me:$LINENO: result: yes" >&5

15236

+echo "${ECHO_T}yes" >&6; }

15237

15238

15239

AVAHI_CFLAGS="$AVAHI_CFLAGS -DVINO_HAVE_AVAHI"

15240

@@ -24130,26 +25998,26 @@

15241

15242

15243

15244

-# Check whether --with-jpeg or --without-jpeg was given.

15245

+# Check whether --with-jpeg was given.

15246

if test "${with_jpeg+set}" = set; then

15247

- withval="$with_jpeg"

15248

15249

+ withval=$with_jpeg;

15250

else

15251

with_jpeg=yes

15252

-fi;

15253

+fi

15254

15255

if test "x$with_jpeg" = "xyes"; then

15256

if test "${ac_cv_header_jpeglib_h+set}" = set; then

15257

- echo "$as_me:$LINENO: checking for jpeglib.h" >&5

15258

-echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6

15259

+ { echo "$as_me:$LINENO: checking for jpeglib.h" >&5

15260

+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; }

15261

if test "${ac_cv_header_jpeglib_h+set}" = set; then

15262

echo $ECHO_N "(cached) $ECHO_C" >&6

15263

15264

-echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5

15265

-echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6

15266

+{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5

15267

+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }

15268

else

15269

# Is the header compilable?

15270

-echo "$as_me:$LINENO: checking jpeglib.h usability" >&5

15271

-echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6

15272

+{ echo "$as_me:$LINENO: checking jpeglib.h usability" >&5

15273

+echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6; }

15274

cat >conftest.$ac_ext <<_ACEOF

15275

/* confdefs.h. */

15276

_ACEOF

15277

@@ -24160,24 +26028,36 @@

15278

#include <jpeglib.h>

15279

_ACEOF

15280

rm -f conftest.$ac_objext

15281

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

15282

- (eval $ac_compile) 2>conftest.er1

15283

+if { (ac_try="$ac_compile"

15284

+case "(($ac_try" in

15285

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15286

+ *) ac_try_echo=$ac_try;;

15287

+esac

15288

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15289

+ (eval "$ac_compile") 2>conftest.er1

15290

ac_status=$?

15291

grep -v '^ *+' conftest.er1 >conftest.err

15292

rm -f conftest.er1

15293

cat conftest.err >&5

15294

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15295

(exit $ac_status); } &&

15296

- { ac_try='test -z "$ac_c_werror_flag"

15297

- || test ! -s conftest.err'

15298

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15299

- (eval $ac_try) 2>&5

15300

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

15301

+ { (case "(($ac_try" in

15302

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15303

+ *) ac_try_echo=$ac_try;;

15304

+esac

15305

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15306

+ (eval "$ac_try") 2>&5

15307

ac_status=$?

15308

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15309

(exit $ac_status); }; } &&

15310

{ ac_try='test -s conftest.$ac_objext'

15311

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15312

- (eval $ac_try) 2>&5

15313

+ { (case "(($ac_try" in

15314

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15315

+ *) ac_try_echo=$ac_try;;

15316

+esac

15317

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15318

+ (eval "$ac_try") 2>&5

15319

ac_status=$?

15320

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15321

(exit $ac_status); }; }; then

15322

@@ -24186,15 +26066,16 @@

15323

echo "$as_me: failed program was:" >&5

15324

sed 's/^/| /' conftest.$ac_ext >&5

15325

15326

-ac_header_compiler=no

15327

+ ac_header_compiler=no

15328

15329

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

15330

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15331

-echo "${ECHO_T}$ac_header_compiler" >&6

15332

15333

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

15334

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15335

+echo "${ECHO_T}$ac_header_compiler" >&6; }

15336

15337

# Is the header present?

15338

-echo "$as_me:$LINENO: checking jpeglib.h presence" >&5

15339

-echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6

15340

+{ echo "$as_me:$LINENO: checking jpeglib.h presence" >&5

15341

+echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6; }

15342

cat >conftest.$ac_ext <<_ACEOF

15343

/* confdefs.h. */

15344

_ACEOF

15345

@@ -24203,8 +26084,13 @@

15346

/* end confdefs.h. */

15347

#include <jpeglib.h>

15348

_ACEOF

15349

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

15350

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

15351

+if { (ac_try="$ac_cpp conftest.$ac_ext"

15352

+case "(($ac_try" in

15353

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15354

+ *) ac_try_echo=$ac_try;;

15355

+esac

15356

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15357

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

15358

ac_status=$?

15359

grep -v '^ *+' conftest.er1 >conftest.err

15360

rm -f conftest.er1

15361

@@ -24228,9 +26114,10 @@

15362

15363

ac_header_preproc=no

15364

15365

15366

rm -f conftest.err conftest.$ac_ext

15367

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15368

-echo "${ECHO_T}$ac_header_preproc" >&6

15369

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15370

+echo "${ECHO_T}$ac_header_preproc" >&6; }

15371

15372

# So? What about this header?

15373

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

15374

@@ -24254,25 +26141,23 @@

15375

echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;}

15376

{ echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5

15377

echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;}

15378

- (

15379

- cat <<\_ASBOX

15380

+ ( cat <<\_ASBOX

15381

## ------------------------------------------------------------------- ##

15382

## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=vino ##

15383

## ------------------------------------------------------------------- ##

15384

_ASBOX

15385

- ) |

15386

- sed "s/^/$as_me: WARNING: /" >&2

15387

+ ) | sed "s/^/$as_me: WARNING: /" >&2

15388

;;

15389

esac

15390

-echo "$as_me:$LINENO: checking for jpeglib.h" >&5

15391

-echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6

15392

+{ echo "$as_me:$LINENO: checking for jpeglib.h" >&5

15393

+echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; }

15394

if test "${ac_cv_header_jpeglib_h+set}" = set; then

15395

echo $ECHO_N "(cached) $ECHO_C" >&6

15396

else

15397

ac_cv_header_jpeglib_h=$ac_header_preproc

15398

15399

-echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5

15400

-echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6

15401

+{ echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5

15402

+echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; }

15403

15404

15405

if test $ac_cv_header_jpeglib_h = yes; then

15406

@@ -24283,34 +26168,34 @@

15407

15408

15409

15410

-# Check whether --with-zlib or --without-zlib was given.

15411

+# Check whether --with-zlib was given.

15412

if test "${with_zlib+set}" = set; then

15413

- withval="$with_zlib"

15414

15415

+ withval=$with_zlib;

15416

else

15417

with_zlib=yes

15418

-fi;

15419

+fi

15420

15421

-# Check whether --with-libz or --without-libz was given.

15422

-if test "${with_libz+set}" = set; then

15423

- withval="$with_libz"

15424

15425

+# Check whether --with-libz was given.

15426

+if test "${with_libz+set}" = set; then

15427

+ withval=$with_libz;

15428

else

15429

with_libz=yes

15430

-fi;

15431

+fi

15432

15433

if test "x$with_zlib" = "xyes" -a "x$with_libz" = "xyes"; then

15434

if test "${ac_cv_header_zlib_h+set}" = set; then

15435

- echo "$as_me:$LINENO: checking for zlib.h" >&5

15436

-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6

15437

+ { echo "$as_me:$LINENO: checking for zlib.h" >&5

15438

+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }

15439

if test "${ac_cv_header_zlib_h+set}" = set; then

15440

echo $ECHO_N "(cached) $ECHO_C" >&6

15441

15442

-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5

15443

-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6

15444

+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5

15445

+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }

15446

else

15447

# Is the header compilable?

15448

-echo "$as_me:$LINENO: checking zlib.h usability" >&5

15449

-echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6

15450

+{ echo "$as_me:$LINENO: checking zlib.h usability" >&5

15451

+echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6; }

15452

cat >conftest.$ac_ext <<_ACEOF

15453

/* confdefs.h. */

15454

_ACEOF

15455

@@ -24321,24 +26206,36 @@

15456

#include <zlib.h>

15457

_ACEOF

15458

rm -f conftest.$ac_objext

15459

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

15460

- (eval $ac_compile) 2>conftest.er1

15461

+if { (ac_try="$ac_compile"

15462

+case "(($ac_try" in

15463

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15464

+ *) ac_try_echo=$ac_try;;

15465

+esac

15466

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15467

+ (eval "$ac_compile") 2>conftest.er1

15468

ac_status=$?

15469

grep -v '^ *+' conftest.er1 >conftest.err

15470

rm -f conftest.er1

15471

cat conftest.err >&5

15472

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15473

(exit $ac_status); } &&

15474

- { ac_try='test -z "$ac_c_werror_flag"

15475

- || test ! -s conftest.err'

15476

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15477

- (eval $ac_try) 2>&5

15478

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

15479

+ { (case "(($ac_try" in

15480

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15481

+ *) ac_try_echo=$ac_try;;

15482

+esac

15483

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15484

+ (eval "$ac_try") 2>&5

15485

ac_status=$?

15486

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15487

(exit $ac_status); }; } &&

15488

{ ac_try='test -s conftest.$ac_objext'

15489

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15490

- (eval $ac_try) 2>&5

15491

+ { (case "(($ac_try" in

15492

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15493

+ *) ac_try_echo=$ac_try;;

15494

+esac

15495

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15496

+ (eval "$ac_try") 2>&5

15497

ac_status=$?

15498

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15499

(exit $ac_status); }; }; then

15500

@@ -24347,15 +26244,16 @@

15501

echo "$as_me: failed program was:" >&5

15502

sed 's/^/| /' conftest.$ac_ext >&5

15503

15504

-ac_header_compiler=no

15505

+ ac_header_compiler=no

15506

15507

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

15508

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15509

-echo "${ECHO_T}$ac_header_compiler" >&6

15510

15511

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

15512

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15513

+echo "${ECHO_T}$ac_header_compiler" >&6; }

15514

15515

# Is the header present?

15516

-echo "$as_me:$LINENO: checking zlib.h presence" >&5

15517

-echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6

15518

+{ echo "$as_me:$LINENO: checking zlib.h presence" >&5

15519

+echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6; }

15520

cat >conftest.$ac_ext <<_ACEOF

15521

/* confdefs.h. */

15522

_ACEOF

15523

@@ -24364,8 +26262,13 @@

15524

/* end confdefs.h. */

15525

#include <zlib.h>

15526

_ACEOF

15527

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

15528

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

15529

+if { (ac_try="$ac_cpp conftest.$ac_ext"

15530

+case "(($ac_try" in

15531

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15532

+ *) ac_try_echo=$ac_try;;

15533

+esac

15534

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15535

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

15536

ac_status=$?

15537

grep -v '^ *+' conftest.er1 >conftest.err

15538

rm -f conftest.er1

15539

@@ -24389,9 +26292,10 @@

15540

15541

ac_header_preproc=no

15542

15543

15544

rm -f conftest.err conftest.$ac_ext

15545

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15546

-echo "${ECHO_T}$ac_header_preproc" >&6

15547

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15548

+echo "${ECHO_T}$ac_header_preproc" >&6; }

15549

15550

# So? What about this header?

15551

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

15552

@@ -24415,25 +26319,23 @@

15553

echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}

15554

{ echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5

15555

echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}

15556

- (

15557

- cat <<\_ASBOX

15558

+ ( cat <<\_ASBOX

15559

## ------------------------------------------------------------------- ##

15560

## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=vino ##

15561

## ------------------------------------------------------------------- ##

15562

_ASBOX

15563

- ) |

15564

- sed "s/^/$as_me: WARNING: /" >&2

15565

+ ) | sed "s/^/$as_me: WARNING: /" >&2

15566

;;

15567

esac

15568

-echo "$as_me:$LINENO: checking for zlib.h" >&5

15569

-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6

15570

+{ echo "$as_me:$LINENO: checking for zlib.h" >&5

15571

+echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6; }

15572

if test "${ac_cv_header_zlib_h+set}" = set; then

15573

echo $ECHO_N "(cached) $ECHO_C" >&6

15574

else

15575

ac_cv_header_zlib_h=$ac_header_preproc

15576

15577

-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5

15578

-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6

15579

+{ echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5

15580

+echo "${ECHO_T}$ac_cv_header_zlib_h" >&6; }

15581

15582

15583

if test $ac_cv_header_zlib_h = yes; then

15584

@@ -24445,8 +26347,8 @@

15585

15586

if test ! -z "$HAVE_ZLIB_H"; then

15587

15588

-echo "$as_me:$LINENO: checking for deflate in -lz" >&5

15589

-echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6

15590

+{ echo "$as_me:$LINENO: checking for deflate in -lz" >&5

15591

+echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6; }

15592

if test "${ac_cv_lib_z_deflate+set}" = set; then

15593

echo $ECHO_N "(cached) $ECHO_C" >&6

15594

else

15595

@@ -24459,40 +26361,52 @@

15596

cat >>conftest.$ac_ext <<_ACEOF

15597

/* end confdefs.h. */

15598

15599

-/* Override any gcc2 internal prototype to avoid an error. */

15600

+/* Override any GCC internal prototype to avoid an error.

15601

+ Use char because int might match the return type of a GCC

15602

+ builtin and then its argument prototype would still apply. */

15603

#ifdef __cplusplus

15604

extern "C"

15605

#endif

15606

-/* We use char because int might match the return type of a gcc2

15607

- builtin and then its argument prototype would still apply. */

15608

char deflate ();

15609

int

15610

main ()

15611

{

15612

-deflate ();

15613

+return deflate ();

15614

;

15615

return 0;

15616

}

15617

_ACEOF

15618

rm -f conftest.$ac_objext conftest$ac_exeext

15619

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

15620

- (eval $ac_link) 2>conftest.er1

15621

+if { (ac_try="$ac_link"

15622

+case "(($ac_try" in

15623

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15624

+ *) ac_try_echo=$ac_try;;

15625

+esac

15626

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15627

+ (eval "$ac_link") 2>conftest.er1

15628

ac_status=$?

15629

grep -v '^ *+' conftest.er1 >conftest.err

15630

rm -f conftest.er1

15631

cat conftest.err >&5

15632

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15633

(exit $ac_status); } &&

15634

- { ac_try='test -z "$ac_c_werror_flag"

15635

- || test ! -s conftest.err'

15636

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15637

- (eval $ac_try) 2>&5

15638

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

15639

+ { (case "(($ac_try" in

15640

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15641

+ *) ac_try_echo=$ac_try;;

15642

+esac

15643

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15644

+ (eval "$ac_try") 2>&5

15645

ac_status=$?

15646

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15647

(exit $ac_status); }; } &&

15648

{ ac_try='test -s conftest$ac_exeext'

15649

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15650

- (eval $ac_try) 2>&5

15651

+ { (case "(($ac_try" in

15652

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15653

+ *) ac_try_echo=$ac_try;;

15654

+esac

15655

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15656

+ (eval "$ac_try") 2>&5

15657

ac_status=$?

15658

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15659

(exit $ac_status); }; }; then

15660

@@ -24501,14 +26415,15 @@

15661

echo "$as_me: failed program was:" >&5

15662

sed 's/^/| /' conftest.$ac_ext >&5

15663

15664

-ac_cv_lib_z_deflate=no

15665

+ ac_cv_lib_z_deflate=no

15666

15667

-rm -f conftest.err conftest.$ac_objext \

15668

15669

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15670

conftest$ac_exeext conftest.$ac_ext

15671

LIBS=$ac_check_lib_save_LIBS

15672

15673

-echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5

15674

-echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6

15675

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5

15676

+echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6; }

15677

if test $ac_cv_lib_z_deflate = yes; then

15678

cat >>confdefs.h <<_ACEOF

15679

#define HAVE_LIBZ 1

15680

@@ -24522,8 +26437,8 @@

15681

15682

if test ! -z "$HAVE_JPEGLIB_H" -a ! -z "$HAVE_ZLIB_H"; then

15683

15684

-echo "$as_me:$LINENO: checking for jpeg_CreateCompress in -ljpeg" >&5

15685

-echo $ECHO_N "checking for jpeg_CreateCompress in -ljpeg... $ECHO_C" >&6

15686

+{ echo "$as_me:$LINENO: checking for jpeg_CreateCompress in -ljpeg" >&5

15687

+echo $ECHO_N "checking for jpeg_CreateCompress in -ljpeg... $ECHO_C" >&6; }

15688

if test "${ac_cv_lib_jpeg_jpeg_CreateCompress+set}" = set; then

15689

echo $ECHO_N "(cached) $ECHO_C" >&6

15690

else

15691

@@ -24536,40 +26451,52 @@

15692

cat >>conftest.$ac_ext <<_ACEOF

15693

/* end confdefs.h. */

15694

15695

-/* Override any gcc2 internal prototype to avoid an error. */

15696

+/* Override any GCC internal prototype to avoid an error.

15697

+ Use char because int might match the return type of a GCC

15698

+ builtin and then its argument prototype would still apply. */

15699

#ifdef __cplusplus

15700

extern "C"

15701

#endif

15702

-/* We use char because int might match the return type of a gcc2

15703

- builtin and then its argument prototype would still apply. */

15704

char jpeg_CreateCompress ();

15705

int

15706

main ()

15707

{

15708

-jpeg_CreateCompress ();

15709

+return jpeg_CreateCompress ();

15710

;

15711

return 0;

15712

}

15713

_ACEOF

15714

rm -f conftest.$ac_objext conftest$ac_exeext

15715

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

15716

- (eval $ac_link) 2>conftest.er1

15717

+if { (ac_try="$ac_link"

15718

+case "(($ac_try" in

15719

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15720

+ *) ac_try_echo=$ac_try;;

15721

+esac

15722

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15723

+ (eval "$ac_link") 2>conftest.er1

15724

ac_status=$?

15725

grep -v '^ *+' conftest.er1 >conftest.err

15726

rm -f conftest.er1

15727

cat conftest.err >&5

15728

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15729

(exit $ac_status); } &&

15730

- { ac_try='test -z "$ac_c_werror_flag"

15731

- || test ! -s conftest.err'

15732

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15733

- (eval $ac_try) 2>&5

15734

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

15735

+ { (case "(($ac_try" in

15736

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15737

+ *) ac_try_echo=$ac_try;;

15738

+esac

15739

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15740

+ (eval "$ac_try") 2>&5

15741

ac_status=$?

15742

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15743

(exit $ac_status); }; } &&

15744

{ ac_try='test -s conftest$ac_exeext'

15745

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15746

- (eval $ac_try) 2>&5

15747

+ { (case "(($ac_try" in

15748

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15749

+ *) ac_try_echo=$ac_try;;

15750

+esac

15751

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15752

+ (eval "$ac_try") 2>&5

15753

ac_status=$?

15754

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15755

(exit $ac_status); }; }; then

15756

@@ -24578,14 +26505,15 @@

15757

echo "$as_me: failed program was:" >&5

15758

sed 's/^/| /' conftest.$ac_ext >&5

15759

15760

-ac_cv_lib_jpeg_jpeg_CreateCompress=no

15761

+ ac_cv_lib_jpeg_jpeg_CreateCompress=no

15762

15763

-rm -f conftest.err conftest.$ac_objext \

15764

15765

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

15766

conftest$ac_exeext conftest.$ac_ext

15767

LIBS=$ac_check_lib_save_LIBS

15768

15769

-echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_CreateCompress" >&5

15770

-echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_CreateCompress" >&6

15771

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_CreateCompress" >&5

15772

+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_CreateCompress" >&6; }

15773

if test $ac_cv_lib_jpeg_jpeg_CreateCompress = yes; then

15774

cat >>confdefs.h <<_ACEOF

15775

#define HAVE_LIBJPEG 1

15776

@@ -24609,18 +26537,19 @@

15777

for ac_header in netinet/in.h sys/time.h fcntl.h unistd.h sys/socket.h

15778

15779

as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

15780

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

15781

- echo "$as_me:$LINENO: checking for $ac_header" >&5

15782

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

15783

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

15784

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

15785

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

15786

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

15787

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

15788

echo $ECHO_N "(cached) $ECHO_C" >&6

15789

15790

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

15791

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

15792

+ac_res=`eval echo '${'$as_ac_Header'}'`

15793

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

15794

+echo "${ECHO_T}$ac_res" >&6; }

15795

else

15796

# Is the header compilable?

15797

-echo "$as_me:$LINENO: checking $ac_header usability" >&5

15798

-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6

15799

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

15800

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

15801

cat >conftest.$ac_ext <<_ACEOF

15802

/* confdefs.h. */

15803

_ACEOF

15804

@@ -24631,24 +26560,36 @@

15805

#include <$ac_header>

15806

_ACEOF

15807

rm -f conftest.$ac_objext

15808

-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

15809

- (eval $ac_compile) 2>conftest.er1

15810

+if { (ac_try="$ac_compile"

15811

+case "(($ac_try" in

15812

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15813

+ *) ac_try_echo=$ac_try;;

15814

+esac

15815

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15816

+ (eval "$ac_compile") 2>conftest.er1

15817

ac_status=$?

15818

grep -v '^ *+' conftest.er1 >conftest.err

15819

rm -f conftest.er1

15820

cat conftest.err >&5

15821

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15822

(exit $ac_status); } &&

15823

- { ac_try='test -z "$ac_c_werror_flag"

15824

- || test ! -s conftest.err'

15825

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15826

- (eval $ac_try) 2>&5

15827

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

15828

+ { (case "(($ac_try" in

15829

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15830

+ *) ac_try_echo=$ac_try;;

15831

+esac

15832

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15833

+ (eval "$ac_try") 2>&5

15834

ac_status=$?

15835

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15836

(exit $ac_status); }; } &&

15837

{ ac_try='test -s conftest.$ac_objext'

15838

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

15839

- (eval $ac_try) 2>&5

15840

+ { (case "(($ac_try" in

15841

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15842

+ *) ac_try_echo=$ac_try;;

15843

+esac

15844

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15845

+ (eval "$ac_try") 2>&5

15846

ac_status=$?

15847

echo "$as_me:$LINENO: \$? = $ac_status" >&5

15848

(exit $ac_status); }; }; then

15849

@@ -24657,15 +26598,16 @@

15850

echo "$as_me: failed program was:" >&5

15851

sed 's/^/| /' conftest.$ac_ext >&5

15852

15853

-ac_header_compiler=no

15854

+ ac_header_compiler=no

15855

15856

-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext

15857

-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15858

-echo "${ECHO_T}$ac_header_compiler" >&6

15859

15860

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

15861

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

15862

+echo "${ECHO_T}$ac_header_compiler" >&6; }

15863

15864

# Is the header present?

15865

-echo "$as_me:$LINENO: checking $ac_header presence" >&5

15866

-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6

15867

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

15868

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

15869

cat >conftest.$ac_ext <<_ACEOF

15870

/* confdefs.h. */

15871

_ACEOF

15872

@@ -24674,8 +26616,13 @@

15873

/* end confdefs.h. */

15874

#include <$ac_header>

15875

_ACEOF

15876

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

15877

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

15878

+if { (ac_try="$ac_cpp conftest.$ac_ext"

15879

+case "(($ac_try" in

15880

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15881

+ *) ac_try_echo=$ac_try;;

15882

+esac

15883

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15884

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

15885

ac_status=$?

15886

grep -v '^ *+' conftest.er1 >conftest.err

15887

rm -f conftest.er1

15888

@@ -24699,9 +26646,10 @@

15889

15890

ac_header_preproc=no

15891

15892

15893

rm -f conftest.err conftest.$ac_ext

15894

-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15895

-echo "${ECHO_T}$ac_header_preproc" >&6

15896

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

15897

+echo "${ECHO_T}$ac_header_preproc" >&6; }

15898

15899

# So? What about this header?

15900

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

15901

@@ -24725,25 +26673,24 @@

15902

echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

15903

{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

15904

echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

15905

- (

15906

- cat <<\_ASBOX

15907

+ ( cat <<\_ASBOX

15908

## ------------------------------------------------------------------- ##

15909

## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=vino ##

15910

## ------------------------------------------------------------------- ##

15911

_ASBOX

15912

- ) |

15913

- sed "s/^/$as_me: WARNING: /" >&2

15914

+ ) | sed "s/^/$as_me: WARNING: /" >&2

15915

;;

15916

esac

15917

-echo "$as_me:$LINENO: checking for $ac_header" >&5

15918

-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6

15919

-if eval "test \"\${$as_ac_Header+set}\" = set"; then

15920

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

15921

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

15922

+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

15923

echo $ECHO_N "(cached) $ECHO_C" >&6

15924

else

15925

eval "$as_ac_Header=\$ac_header_preproc"

15926

15927

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5

15928

-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6

15929

+ac_res=`eval echo '${'$as_ac_Header'}'`

15930

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

15931

+echo "${ECHO_T}$ac_res" >&6; }

15932

15933

15934

if test `eval echo '${'$as_ac_Header'}'` = yes; then

15935

@@ -24759,9 +26706,9 @@

15936

for ac_func in gettimeofday

15937

15938

as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

15939

-echo "$as_me:$LINENO: checking for $ac_func" >&5

15940

-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

15941

-if eval "test \"\${$as_ac_var+set}\" = set"; then

15942

+{ echo "$as_me:$LINENO: checking for $ac_func" >&5

15943

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }

15944

+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

15945

echo $ECHO_N "(cached) $ECHO_C" >&6

15946

else

15947

cat >conftest.$ac_ext <<_ACEOF

15948

@@ -24787,53 +26734,59 @@

15949

15950

#undef $ac_func

15951

15952

-/* Override any gcc2 internal prototype to avoid an error. */

15953

+/* Override any GCC internal prototype to avoid an error.

15954

+ Use char because int might match the return type of a GCC

15955

+ builtin and then its argument prototype would still apply. */

15956

#ifdef __cplusplus

15957

extern "C"

15958

15959

#endif

15960

-/* We use char because int might match the return type of a gcc2

15961

- builtin and then its argument prototype would still apply. */

15962

char $ac_func ();

15963

/* The GNU C library defines this for functions which it implements

15964

to always fail with ENOSYS. Some functions are actually named

15965

something starting with __ and the normal name is an alias. */

15966

-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

15967

+#if defined __stub_$ac_func || defined __stub___$ac_func

15968

choke me

15969

-#else

15970

-char (*f) () = $ac_func;

15971

-#endif

15972

-#ifdef __cplusplus

15973

15974

#endif

15975

15976

int

15977

main ()

15978

{

15979

-return f != $ac_func;

15980

+return $ac_func ();

15981

;

15982

return 0;

15983

}

15984

_ACEOF

15985

rm -f conftest.$ac_objext conftest$ac_exeext

15986

-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

15987

- (eval $ac_link) 2>conftest.er1

15988

+if { (ac_try="$ac_link"

15989

+case "(($ac_try" in

15990

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15991

+ *) ac_try_echo=$ac_try;;

15992

+esac

15993

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

15994

+ (eval "$ac_link") 2>conftest.er1

15995

ac_status=$?

15996

grep -v '^ *+' conftest.er1 >conftest.err

15997

rm -f conftest.er1

15998

cat conftest.err >&5

15999

echo "$as_me:$LINENO: \$? = $ac_status" >&5

16000

(exit $ac_status); } &&

16001

- { ac_try='test -z "$ac_c_werror_flag"

16002

- || test ! -s conftest.err'

16003

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

16004

- (eval $ac_try) 2>&5

16005

+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

16006

+ { (case "(($ac_try" in

16007

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

16008

+ *) ac_try_echo=$ac_try;;

16009

+esac

16010

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

16011

+ (eval "$ac_try") 2>&5

16012

ac_status=$?

16013

echo "$as_me:$LINENO: \$? = $ac_status" >&5

16014

(exit $ac_status); }; } &&

16015

{ ac_try='test -s conftest$ac_exeext'

16016

- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

16017

- (eval $ac_try) 2>&5

16018

+ { (case "(($ac_try" in

16019

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

16020

+ *) ac_try_echo=$ac_try;;

16021

+esac

16022

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

16023

+ (eval "$ac_try") 2>&5

16024

ac_status=$?

16025

echo "$as_me:$LINENO: \$? = $ac_status" >&5

16026

(exit $ac_status); }; }; then

16027

@@ -24842,13 +26795,15 @@

16028

echo "$as_me: failed program was:" >&5

16029

sed 's/^/| /' conftest.$ac_ext >&5

16030

16031

-eval "$as_ac_var=no"

16032

+ eval "$as_ac_var=no"

16033

16034

-rm -f conftest.err conftest.$ac_objext \

16035

16036

+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

16037

conftest$ac_exeext conftest.$ac_ext

16038

16039

-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

16040

-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

16041

+ac_res=`eval echo '${'$as_ac_var'}'`

16042

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

16043

+echo "${ECHO_T}$ac_res" >&6; }

16044

if test `eval echo '${'$as_ac_var'}'` = yes; then

16045

cat >>confdefs.h <<_ACEOF

16046

#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

16047

@@ -24860,13 +26815,13 @@

16048

16049

16050

16051

-# Check whether --enable-debug or --disable-debug was given.

16052

+# Check whether --enable-debug was given.

16053

if test "${enable_debug+set}" = set; then

16054

- enableval="$enable_debug"

16055

16056

+ enableval=$enable_debug;

16057

else

16058

enable_debug=minimum

16059

-fi;

16060

+fi

16061

16062

if test "$enable_debug" = "yes"; then

16063

VINO_DEBUG_CFLAGS="-DG_ENABLE_DEBUG"

16064

else

16065

@@ -24886,41 +26841,41 @@

16066

16067

16068

16069

-# Check whether --with-gconf-source or --without-gconf-source was given.

16070

+# Check whether --with-gconf-source was given.

16071

if test "${with_gconf_source+set}" = set; then

16072

- withval="$with_gconf_source"

16073

- GCONF_SCHEMA_CONFIG_SOURCE="$withval"

16074

-fi;

16075

+ withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"

16076

+fi

16077

16078

16079

16080

- echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5

16081

-echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6

16082

+ { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5

16083

+echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }

16084

16085

if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then

16086

GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'

16087

16088

16089

16090

-# Check whether --with-gconf-schema-file-dir or --without-gconf-schema-file-dir was given.

16091

+# Check whether --with-gconf-schema-file-dir was given.

16092

if test "${with_gconf_schema_file_dir+set}" = set; then

16093

- withval="$with_gconf_schema_file_dir"

16094

- GCONF_SCHEMA_FILE_DIR="$withval"

16095

-fi;

16096

+ withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"

16097

+fi

16098

16099

16100

16101

- echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5

16102

-echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6

16103

+ { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5

16104

+echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }

16105

16106

- # Check whether --enable-schemas-install or --disable-schemas-install was given.

16107

+ # Check whether --enable-schemas-install was given.

16108

if test "${enable_schemas_install+set}" = set; then

16109

- enableval="$enable_schemas_install"

16110

- case ${enableval} in

16111

+ enableval=$enable_schemas_install; case ${enableval} in

16112

yes|no) ;;

16113

*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5

16114

echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}

16115

{ (exit 1); exit 1; }; } ;;

16116

esac

16117

-fi;

16118

+fi

16119

16120

16121

16122

if test "$enable_schemas_install" != no; then

16123

@@ -24937,8 +26892,8 @@

16124

16125

# Extract the first word of "$ac_prog", so it can be a program name with args.

16126

set dummy $ac_prog; ac_word=$2

16127

-echo "$as_me:$LINENO: checking for $ac_word" >&5

16128

-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6

16129

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

16130

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

16131

if test "${ac_cv_path_PERL+set}" = set; then

16132

echo $ECHO_N "(cached) $ECHO_C" >&6

16133

else

16134

@@ -24953,37 +26908,38 @@

16135

IFS=$as_save_IFS

16136

test -z "$as_dir" && as_dir=.

16137

for ac_exec_ext in '' $ac_executable_extensions; do

16138

- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then

16139

+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

16140

ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"

16141

echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

16142

break 2

16143

16144

done

16145

done

16146

+IFS=$as_save_IFS

16147

16148

;;

16149

esac

16150

16151

PERL=$ac_cv_path_PERL

16152

16153

if test -n "$PERL"; then

16154

- echo "$as_me:$LINENO: result: $PERL" >&5

16155

-echo "${ECHO_T}$PERL" >&6

16156

+ { echo "$as_me:$LINENO: result: $PERL" >&5

16157

+echo "${ECHO_T}$PERL" >&6; }

16158

else

16159

- echo "$as_me:$LINENO: result: no" >&5

16160

-echo "${ECHO_T}no" >&6

16161

+ { echo "$as_me:$LINENO: result: no" >&5

16162

+echo "${ECHO_T}no" >&6; }

16163

16164

16165

16166

test -n "$PERL" && break

16167

done

16168

16169

-# Check whether --enable-rebuilds or --disable-rebuilds was given.

16170

+# Check whether --enable-rebuilds was given.

16171

if test "${enable_rebuilds+set}" = set; then

16172

- enableval="$enable_rebuilds"

16173

16174

+ enableval=$enable_rebuilds;

16175

else

16176

enable_rebuilds=yes

16177

-fi;

16178

+fi

16179

16180

REBUILD=\#

16181

if test "x$enable_rebuilds" = "xyes" && \

16182

test -n "$PERL" && \

16183

@@ -24992,10 +26948,11 @@

16184

16185

16186

16187

- ac_config_files="$ac_config_files Makefile server/Makefile server/libvncserver/Makefile server/libvncserver/rfb/Makefile capplet/Makefile session/Makefile icons/Makefile docs/Makefile po/Makefile.in"

16188

+ac_config_files="$ac_config_files Makefile server/Makefile server/libvncserver/Makefile server/libvncserver/rfb/Makefile capplet/Makefile session/Makefile icons/Makefile docs/Makefile po/Makefile.in"

16189

16190

16191

- ac_config_files="$ac_config_files capplet/vino-preferences.desktop.in"

16192

+ac_config_files="$ac_config_files capplet/vino-preferences.desktop.in"

16193

16194

cat >confcache <<\_ACEOF

16195

# This file is a shell script that caches the results of configure

16196

# tests run on this system so they can be shared between configure

16197

@@ -25014,39 +26971,58 @@

16198

16199

# The following way of writing the cache mishandles newlines in values,

16200

# but we know of no workaround that is simple, portable, and efficient.

16201

-# So, don't put newlines in cache variables' values.

16202

+# So, we kill variables containing newlines.

16203

# Ultrix sh set writes to stderr and can't be redirected directly,

16204

# and sets the high bit in the cache file unless we assign to the vars.

16205

16206

16207

+ for ac_var in `(set) 2>&1 | sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'`; do

16208

+ eval ac_val=\$$ac_var

16209

+ case $ac_val in #(

16210

+ *${as_nl}*)

16211

+ case $ac_var in #(

16212

+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5

16213

+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;

16214

+ esac

16215

+ case $ac_var in #(

16216

+ _ | IFS | as_nl) ;; #(

16217

+ *) $as_unset $ac_var ;;

16218

+ esac ;;

16219

+ esac

16220

+ done

16221

16222

(set) 2>&1 |

16223

- case `(ac_space=' '; set | grep ac_space) 2>&1` in

16224

- *ac_space=\ *)

16225

+ case $as_nl`(ac_space=' '; set) 2>&1` in #(

16226

+ *${as_nl}ac_space=\ *)

16227

# `set' does not quote correctly, so add quotes (double-quote

16228

# substitution turns \\\\ into \\, and sed turns \\ into \).

16229

sed -n \

16230

"s/'/'\\\\''/g;

16231

s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"

16232

- ;;

16233

+ ;; #(

16234

16235

# `set' quotes correctly as required by POSIX, so do not add quotes.

16236

- sed -n \

16237

- "s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p"

16238

+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"

16239

;;

16240

- esac;

16241

-} |

16242

+ esac |

16243

+ sort

16244

+) |

16245

sed '

16246

+ /^ac_cv_env_/b end

16247

t clear

16248

- : clear

16249

+ :clear

16250

s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/

16251

t end

16252

- /^ac_cv_env/!s/^$[^=]*$=$.*$$/\1=${\1=\2}/

16253

- : end' >>confcache

16254

-if diff $cache_file confcache >/dev/null 2>&1; then :; else

16255

- if test -w $cache_file; then

16256

- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"

16257

+ s/^$[^=]*$=$.*$$/\1=${\1=\2}/

16258

+ :end' >>confcache

16259

+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else

16260

+ if test -w "$cache_file"; then

16261

+ test "x$cache_file" != "x/dev/null" &&

16262

+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5

16263

+echo "$as_me: updating cache $cache_file" >&6;}

16264

cat confcache >$cache_file

16265

else

16266

- echo "not updating unwritable cache $cache_file"

16267

+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5

16268

+echo "$as_me: not updating unwritable cache $cache_file" >&6;}

16269

16270

16271

rm -f confcache

16272

@@ -25055,32 +27031,18 @@

16273

# Let make expand exec_prefix.

16274

test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'

16275

16276

-# VPATH may cause trouble with some makes, so we remove $(srcdir),

16277

-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and

16278

-# trailing colons and then remove the whole line if VPATH becomes empty

16279

-# (actually we leave an empty line to preserve line numbers).

16280

-if test "x$srcdir" = x.; then

16281

- ac_vpsub='/^[ ]*VPATH[ ]*=/{

16282

-s/:*\$(srcdir):*/:/;

16283

-s/:*\${srcdir}:*/:/;

16284

-s/:*@srcdir@:*/:/;

16285

-s/^$[^=]*=[ ]*$:*/\1/;

16286

-s/:*$//;

16287

-s/^[^=]*=[ ]*$//;

16288

-}'

16289

-fi

16290

16291

DEFS=-DHAVE_CONFIG_H

16292

16293

ac_libobjs=

16294

ac_ltlibobjs=

16295

for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue

16296

# 1. Remove the extension, and $U if already installed.

16297

- ac_i=`echo "$ac_i" |

16298

- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`

16299

- # 2. Add them.

16300

- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"

16301

- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'

16302

+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'

16303

+ ac_i=`echo "$ac_i" | sed "$ac_script"`

16304

+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR

16305

+ # will be set to the directory where LIBOBJS objects are built.

16306

+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"

16307

+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'

16308

done

16309

LIBOBJS=$ac_libobjs

16310

16311

@@ -25116,7 +27078,7 @@

16312

{ (exit 1); exit 1; }; }

16313

16314

16315

- ac_config_commands="$ac_config_commands po/stamp-it"

16316

+ ac_config_commands="$ac_config_commands po/stamp-it"

16317

16318

16319

if test -z "${SESSION_SUPPORT_TRUE}" && test -z "${SESSION_SUPPORT_FALSE}"; then

16320

@@ -25171,11 +27133,35 @@

16321

# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

16322

# is contrary to our usage. Disable this feature.

16323

alias -g '${1+"$@"}'='"$@"'

16324

-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then

16325

- set -o posix

16326

+ setopt NO_GLOB_SUBST

16327

+else

16328

+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac

16329

16330

+BIN_SH=xpg4; export BIN_SH # for Tru64

16331

DUALCASE=1; export DUALCASE # for MKS sh

16332

16333

16334

+# PATH needs CR

16335

+# Avoid depending upon Character Ranges.

16336

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

16337

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

16338

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

16339

+as_cr_digits='0123456789'

16340

+as_cr_alnum=$as_cr_Letters$as_cr_digits

16341

16342

+# The user is always right.

16343

+if test "${PATH_SEPARATOR+set}" != set; then

16344

+ echo "#! /bin/sh" >conf$$.sh

16345

+ echo "exit 0" >>conf$$.sh

16346

+ chmod +x conf$$.sh

16347

+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

16348

+ PATH_SEPARATOR=';'

16349

+ else

16350

+ PATH_SEPARATOR=:

16351

+ fi

16352

+ rm -f conf$$.sh

16353

+fi

16354

16355

# Support unset when possible.

16356

if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

16357

as_unset=unset

16358

@@ -25184,8 +27170,43 @@

16359

16360

16361

16362

+# IFS

16363

+# We need space, tab and new line, in precisely that order. Quoting is

16364

+# there to prevent editors from complaining about space-tab.

16365

+# (If _AS_PATH_WALK were called with IFS unset, it would disable word

16366

+# splitting by setting IFS to empty value.)

16367

+as_nl='

16368

16369

+IFS=" "" $as_nl"

16370

16371

+# Find who we are. Look in the path if we contain no directory separator.

16372

+case $0 in

16373

+ *[\\/]* ) as_myself=$0 ;;

16374

+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

16375

+for as_dir in $PATH

16376

+do

16377

+ IFS=$as_save_IFS

16378

+ test -z "$as_dir" && as_dir=.

16379

+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

16380

+done

16381

+IFS=$as_save_IFS

16382

16383

+ ;;

16384

+esac

16385

+# We did not find ourselves, most probably we were run as `sh COMMAND'

16386

+# in which case we are not to be found in the path.

16387

+if test "x$as_myself" = x; then

16388

+ as_myself=$0

16389

+fi

16390

+if test ! -f "$as_myself"; then

16391

+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

16392

+ { (exit 1); exit 1; }

16393

+fi

16394

16395

# Work around bugs in pre-3.0 UWIN ksh.

16396

-$as_unset ENV MAIL MAILPATH

16397

+for as_var in ENV MAIL MAILPATH

16398

+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

16399

+done

16400

PS1='$ '

16401

PS2='> '

16402

PS4='+ '

16403

@@ -25199,18 +27220,19 @@

16404

if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

16405

eval $as_var=C; export $as_var

16406

else

16407

- $as_unset $as_var

16408

+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

16409

16410

done

16411

16412

# Required to use basename.

16413

-if expr a : '$a$' >/dev/null 2>&1; then

16414

+if expr a : '$a$' >/dev/null 2>&1 &&

16415

+ test "X`expr 00001 : '.*$...$'`" = X001; then

16416

as_expr=expr

16417

else

16418

as_expr=false

16419

16420

16421

-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then

16422

+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then

16423

as_basename=basename

16424

else

16425

as_basename=false

16426

@@ -25218,159 +27240,120 @@

16427

16428

16429

# Name of the executable.

16430

-as_me=`$as_basename "$0" ||

16431

+as_me=`$as_basename -- "$0" ||

16432

$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

16433

X"$0" : 'X$//$$' \| \

16434

- X"$0" : 'X$/$$' \| \

16435

- . : '$.$' 2>/dev/null ||

16436

+ X"$0" : 'X$/$' \| . 2>/dev/null ||

16437

echo X/"$0" |

16438

- sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; }

16439

- /^X\/$\/\/$$/{ s//\1/; q; }

16440

- /^X\/$\/$.*/{ s//\1/; q; }

16441

- s/.*/./; q'`

16442

16443

16444

-# PATH needs CR, and LINENO needs CR and PATH.

16445

-# Avoid depending upon Character Ranges.

16446

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

16447

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

16448

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

16449

-as_cr_digits='0123456789'

16450

-as_cr_alnum=$as_cr_Letters$as_cr_digits

16451

+ sed '/^.*\/$[^/][^/]*$\/*$/{

16452

+ s//\1/

16453

+ q

16454

+ }

16455

+ /^X\/$\/\/$$/{

16456

+ s//\1/

16457

+ q

16458

+ }

16459

+ /^X\/$\/$.*/{

16460

+ s//\1/

16461

+ q

16462

+ }

16463

+ s/.*/./; q'`

16464

16465

-# The user is always right.

16466

-if test "${PATH_SEPARATOR+set}" != set; then

16467

- echo "#! /bin/sh" >conf$$.sh

16468

- echo "exit 0" >>conf$$.sh

16469

- chmod +x conf$$.sh

16470

- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

16471

- PATH_SEPARATOR=';'

16472

- else

16473

- PATH_SEPARATOR=:

16474

- fi

16475

- rm -f conf$$.sh

16476

-fi

16477

+# CDPATH.

16478

+$as_unset CDPATH

16479

16480

16481

- as_lineno_1=$LINENO

16482

- as_lineno_2=$LINENO

16483

- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

16484

- test "x$as_lineno_1" != "x$as_lineno_2" &&

16485

- test "x$as_lineno_3" = "x$as_lineno_2" || {

16486

- # Find who we are. Look in the path if we contain no path at all

16487

- # relative or not.

16488

- case $0 in

16489

- *[\\/]* ) as_myself=$0 ;;

16490

- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

16491

-for as_dir in $PATH

16492

-do

16493

- IFS=$as_save_IFS

16494

- test -z "$as_dir" && as_dir=.

16495

- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

16496

-done

16497

16498

- ;;

16499

- esac

16500

- # We did not find ourselves, most probably we were run as `sh COMMAND'

16501

- # in which case we are not to be found in the path.

16502

- if test "x$as_myself" = x; then

16503

- as_myself=$0

16504

- fi

16505

- if test ! -f "$as_myself"; then

16506

- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5

16507

-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}

16508

- { (exit 1); exit 1; }; }

16509

- fi

16510

- case $CONFIG_SHELL in

16511

- '')

16512

- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

16513

-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH

16514

-do

16515

- IFS=$as_save_IFS

16516

- test -z "$as_dir" && as_dir=.

16517

- for as_base in sh bash ksh sh5; do

16518

- case $as_dir in

16519

- /*)

16520

- if ("$as_dir/$as_base" -c '

16521

as_lineno_1=$LINENO

16522

as_lineno_2=$LINENO

16523

- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

16524

test "x$as_lineno_1" != "x$as_lineno_2" &&

16525

- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then

16526

- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }

16527

- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }

16528

- CONFIG_SHELL=$as_dir/$as_base

16529

- export CONFIG_SHELL

16530

- exec "$CONFIG_SHELL" "$0" ${1+"$@"}

16531

- fi;;

16532

- esac

16533

- done

16534

-done

16535

-;;

16536

- esac

16537

+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {

16538

16539

# Create $as_me.lineno as a copy of $as_myself, but with $LINENO

16540

# uniformly replaced by the line number. The first 'sed' inserts a

16541

- # line-number line before each line; the second 'sed' does the real

16542

- # work. The second script uses 'N' to pair each line-number line

16543

- # with the numbered line, and appends trailing '-' during

16544

- # substitution so that $LINENO is not a special case at line end.

16545

+ # line-number line after each line using $LINENO; the second 'sed'

16546

+ # does the real work. The second script uses 'N' to pair each

16547

+ # line-number line with the line containing $LINENO, and appends

16548

+ # trailing '-' during substitution so that $LINENO is not a special

16549

+ # case at line end.

16550

# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

16551

- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)

16552

- sed '=' <$as_myself |

16553

+ # scripts with optimization help from Paolo Bonzini. Blame Lee

16554

+ # E. McMahon (1931-1989) for sed's syntax. :-)

16555

+ sed -n '

16556

+ p

16557

+ /[$]LINENO/=

16558

+ ' <$as_myself |

16559

sed '

16560

+ s/[$]LINENO.*/&-/

16561

+ t lineno

16562

+ b

16563

+ :lineno

16564

16565

- s,$,-,

16566

- : loop

16567

- s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3,

16568

+ :loop

16569

+ s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/

16570

t loop

16571

- s,-$,,

16572

- s,^['$as_cr_digits']*\n,,

16573

+ s/-\n.*//

16574

' >$as_me.lineno &&

16575

- chmod +x $as_me.lineno ||

16576

- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5

16577

-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}

16578

+ chmod +x "$as_me.lineno" ||

16579

+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

16580

{ (exit 1); exit 1; }; }

16581

16582

# Don't try to exec as it changes $[0], causing all sort of problems

16583

# (the dirname of $[0] is not the place where we might find the

16584

- # original and so on. Autoconf is especially sensible to this).

16585

- . ./$as_me.lineno

16586

+ # original and so on. Autoconf is especially sensitive to this).

16587

+ . "./$as_me.lineno"

16588

# Exit status is that of the last command.

16589

exit

16590

}

16591

16592

16593

-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in

16594

- *c*,-n*) ECHO_N= ECHO_C='

16595

-' ECHO_T=' ' ;;

16596

- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;

16597

- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;

16598

+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

16599

+ as_dirname=dirname

16600

+else

16601

+ as_dirname=false

16602

+fi

16603

16604

+ECHO_C= ECHO_N= ECHO_T=

16605

+case `echo -n x` in

16606

+-n*)

16607

+ case `echo 'x\c'` in

16608

+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.

16609

+ *) ECHO_C='\c';;

16610

+ esac;;

16611

+*)

16612

+ ECHO_N='-n';;

16613

esac

16614

16615

-if expr a : '$a$' >/dev/null 2>&1; then

16616

+if expr a : '$a$' >/dev/null 2>&1 &&

16617

+ test "X`expr 00001 : '.*$...$'`" = X001; then

16618

as_expr=expr

16619

else

16620

as_expr=false

16621

16622

16623

rm -f conf$$ conf$$.exe conf$$.file

16624

+if test -d conf$$.dir; then

16625

+ rm -f conf$$.dir/conf$$.file

16626

+else

16627

+ rm -f conf$$.dir

16628

+ mkdir conf$$.dir

16629

+fi

16630

echo >conf$$.file

16631

if ln -s conf$$.file conf$$ 2>/dev/null; then

16632

- # We could just check for DJGPP; but this test a) works b) is more generic

16633

- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).

16634

- if test -f conf$$.exe; then

16635

- # Don't use ln at all; we don't have any links

16636

+ as_ln_s='ln -s'

16637

+ # ... but there are two gotchas:

16638

+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

16639

+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

16640

+ # In both cases, we have to default to `cp -p'.

16641

+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

16642

as_ln_s='cp -p'

16643

- else

16644

- as_ln_s='ln -s'

16645

- fi

16646

elif ln conf$$.file conf$$ 2>/dev/null; then

16647

as_ln_s=ln

16648

else

16649

as_ln_s='cp -p'

16650

16651

-rm -f conf$$ conf$$.exe conf$$.file

16652

+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

16653

+rmdir conf$$.dir 2>/dev/null

16654

16655

if mkdir -p . 2>/dev/null; then

16656

as_mkdir_p=:

16657

@@ -25379,7 +27362,19 @@

16658

as_mkdir_p=false

16659

16660

16661

-as_executable_p="test -f"

16662

+# Find out whether ``test -x'' works. Don't use a zero-byte file, as

16663

+# systems may use methods other than mode bits to determine executability.

16664

+cat >conf$$.file <<_ASEOF

16665

+#! /bin/sh

16666

+exit 0

16667

+_ASEOF

16668

+chmod +x conf$$.file

16669

+if test -x conf$$.file >/dev/null 2>&1; then

16670

+ as_executable_p="test -x"

16671

+else

16672

+ as_executable_p=:

16673

+fi

16674

+rm -f conf$$.file

16675

16676

# Sed expression to map a string onto a valid CPP name.

16677

as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

16678

@@ -25388,31 +27383,14 @@

16679

as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"

16680

16681

16682

-# IFS

16683

-# We need space, tab and new line, in precisely that order.

16684

-as_nl='

16685

16686

-IFS=" $as_nl"

16687

16688

-# CDPATH.

16689

-$as_unset CDPATH

16690

16691

exec 6>&1

16692

16693

-# Open the log real soon, to keep \$[0] and so on meaningful, and to

16694

+# Save the log message, to keep $[0] and so on meaningful, and to

16695

# report actual input values of CONFIG_FILES etc. instead of their

16696

-# values after options handling. Logging --version etc. is OK.

16697

-exec 5>>config.log

16698

16699

- echo

16700

- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX

16701

-## Running $as_me. ##

16702

-_ASBOX

16703

-} >&5

16704

-cat >&5 <<_CSEOF

16705

16706

+# values after options handling.

16707

+ac_log="

16708

This file was extended by vino $as_me 2.16.0, which was

16709

-generated by GNU Autoconf 2.59. Invocation command line was

16710

+generated by GNU Autoconf 2.60a. Invocation command line was

16711

16712

CONFIG_FILES = $CONFIG_FILES

16713

CONFIG_HEADERS = $CONFIG_HEADERS

16714

@@ -25420,30 +27398,20 @@

16715

CONFIG_COMMANDS = $CONFIG_COMMANDS

16716

$ $0 $@

16717

16718

-_CSEOF

16719

-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5

16720

-echo >&5

16721

+on `(hostname || uname -n) 2>/dev/null | sed 1q`

16722

16723

16724

_ACEOF

16725

16726

+cat >>$CONFIG_STATUS <<_ACEOF

16727

# Files that config.status was made for.

16728

-if test -n "$ac_config_files"; then

16729

- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS

16730

-fi

16731

16732

-if test -n "$ac_config_headers"; then

16733

- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS

16734

-fi

16735

+config_files="$ac_config_files"

16736

+config_headers="$ac_config_headers"

16737

+config_commands="$ac_config_commands"

16738

16739

-if test -n "$ac_config_links"; then

16740

- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS

16741

-fi

16742

16743

-if test -n "$ac_config_commands"; then

16744

- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS

16745

-fi

16746

+_ACEOF

16747

16748

cat >>$CONFIG_STATUS <<\_ACEOF

16749

16750

ac_cs_usage="\

16751

\`$as_me' instantiates files from templates according to the

16752

current configuration.

16753

@@ -25451,7 +27419,7 @@

16754

Usage: $0 [OPTIONS] [FILE]...

16755

16756

-h, --help print this help, then exit

16757

- -V, --version print version number, then exit

16758

+ -V, --version print version number and configuration settings, then exit

16759

-q, --quiet do not print progress messages

16760

-d, --debug don't remove temporary files

16761

--recheck update $as_me by reconfiguring in the same conditions

16762

@@ -25470,19 +27438,21 @@

16763

$config_commands

16764

16765

Report bugs to <bug-autoconf@gnu.org>."

16766

-_ACEOF

16767

16768

+_ACEOF

16769

cat >>$CONFIG_STATUS <<_ACEOF

16770

ac_cs_version="\\

16771

vino config.status 2.16.0

16772

-configured by $0, generated by GNU Autoconf 2.59,

16773

- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

16774

+configured by $0, generated by GNU Autoconf 2.60a,

16775

+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

16776

16777

16778

16779

This config.status script is free software; the Free Software Foundation

16780

gives unlimited permission to copy, distribute and modify it."

16781

-srcdir=$srcdir

16782

-INSTALL="$INSTALL"

16783

16784

+ac_pwd='$ac_pwd'

16785

+srcdir='$srcdir'

16786

+INSTALL='$INSTALL'

16787

_ACEOF

16788

16789

cat >>$CONFIG_STATUS <<\_ACEOF

16790

@@ -25493,39 +27463,24 @@

16791

16792

case $1 in

16793

--*=*)

16794

- ac_option=`expr "x$1" : 'x$[^=]*$='`

16795

- ac_optarg=`expr "x$1" : 'x[^=]*=$.*$'`

16796

+ ac_option=`expr "X$1" : 'X$[^=]*$='`

16797

+ ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'`

16798

ac_shift=:

16799

;;

16800

- -*)

16801

+ *)

16802

ac_option=$1

16803

ac_optarg=$2

16804

ac_shift=shift

16805

;;

16806

- *) # This is not an option, so the user has probably given explicit

16807

- # arguments.

16808

- ac_option=$1

16809

- ac_need_defaults=false;;

16810

esac

16811

16812

case $ac_option in

16813

# Handling of the options.

16814

-_ACEOF

16815

-cat >>$CONFIG_STATUS <<\_ACEOF

16816

16817

ac_cs_recheck=: ;;

16818

- --version | --vers* | -V )

16819

- echo "$ac_cs_version"; exit 0 ;;

16820

- --he | --h)

16821

- # Conflict between --help and --header

16822

- { { echo "$as_me:$LINENO: error: ambiguous option: $1

16823

-Try \`$0 --help' for more information." >&5

16824

-echo "$as_me: error: ambiguous option: $1

16825

-Try \`$0 --help' for more information." >&2;}

16826

- { (exit 1); exit 1; }; };;

16827

- --help | --hel | -h )

16828

- echo "$ac_cs_usage"; exit 0 ;;

16829

- --debug | --d* | -d )

16830

+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )

16831

+ echo "$ac_cs_version"; exit ;;

16832

+ --debug | --debu | --deb | --de | --d | -d )

16833

debug=: ;;

16834

--file | --fil | --fi | --f )

16835

$ac_shift

16836

@@ -25535,18 +27490,24 @@

16837

$ac_shift

16838

CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"

16839

ac_need_defaults=false;;

16840

+ --he | --h)

16841

+ # Conflict between --help and --header

16842

+ { echo "$as_me: error: ambiguous option: $1

16843

+Try \`$0 --help' for more information." >&2

16844

+ { (exit 1); exit 1; }; };;

16845

+ --help | --hel | -h )

16846

+ echo "$ac_cs_usage"; exit ;;

16847

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

16848

| -silent | --silent | --silen | --sile | --sil | --si | --s)

16849

ac_cs_silent=: ;;

16850

16851

# This is an error.

16852

- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1

16853

-Try \`$0 --help' for more information." >&5

16854

-echo "$as_me: error: unrecognized option: $1

16855

-Try \`$0 --help' for more information." >&2;}

16856

+ -*) { echo "$as_me: error: unrecognized option: $1

16857

+Try \`$0 --help' for more information." >&2

16858

{ (exit 1); exit 1; }; } ;;

16859

16860

- *) ac_config_targets="$ac_config_targets $1" ;;

16861

+ *) ac_config_targets="$ac_config_targets $1"

16862

+ ac_need_defaults=false ;;

16863

16864

esac

16865

shift

16866

@@ -25562,17 +27523,28 @@

16867

_ACEOF

16868

cat >>$CONFIG_STATUS <<_ACEOF

16869

if \$ac_cs_recheck; then

16870

- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6

16871

- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

16872

+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6

16873

+ CONFIG_SHELL=$SHELL

16874

+ export CONFIG_SHELL

16875

+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

16876

16877

16878

_ACEOF

16879

+cat >>$CONFIG_STATUS <<\_ACEOF

16880

+exec 5>>config.log

16881

16882

+ echo

16883

+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX

16884

+## Running $as_me. ##

16885

+_ASBOX

16886

+ echo "$ac_log"

16887

+} >&5

16888

16889

+_ACEOF

16890

cat >>$CONFIG_STATUS <<_ACEOF

16891

16892

-# INIT-COMMANDS section.

16893

+# INIT-COMMANDS

16894

16895

16896

AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"

16897

INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'

16898

prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"

16899

@@ -25583,34 +27555,35 @@

16900

16901

_ACEOF

16902

16903

16904

16905

cat >>$CONFIG_STATUS <<\_ACEOF

16906

16907

+# Handling of arguments.

16908

for ac_config_target in $ac_config_targets

16909

16910

- case "$ac_config_target" in

16911

- # Handling of arguments.

16912

- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;

16913

- "server/Makefile" ) CONFIG_FILES="$CONFIG_FILES server/Makefile" ;;

16914

- "server/libvncserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES server/libvncserver/Makefile" ;;

16915

- "server/libvncserver/rfb/Makefile" ) CONFIG_FILES="$CONFIG_FILES server/libvncserver/rfb/Makefile" ;;

16916

- "capplet/Makefile" ) CONFIG_FILES="$CONFIG_FILES capplet/Makefile" ;;

16917

- "session/Makefile" ) CONFIG_FILES="$CONFIG_FILES session/Makefile" ;;

16918

- "icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;

16919

- "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;

16920

- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;

16921

- "capplet/vino-preferences.desktop.in" ) CONFIG_FILES="$CONFIG_FILES capplet/vino-preferences.desktop.in" ;;

16922

- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;

16923

- "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;

16924

- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;

16925

- "po/stamp-it" ) CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;

16926

- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

16927

+ case $ac_config_target in

16928

+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

16929

+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;

16930

+ "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;

16931

+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;

16932

+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

16933

+ "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;;

16934

+ "server/libvncserver/Makefile") CONFIG_FILES="$CONFIG_FILES server/libvncserver/Makefile" ;;

16935

+ "server/libvncserver/rfb/Makefile") CONFIG_FILES="$CONFIG_FILES server/libvncserver/rfb/Makefile" ;;

16936

+ "capplet/Makefile") CONFIG_FILES="$CONFIG_FILES capplet/Makefile" ;;

16937

+ "session/Makefile") CONFIG_FILES="$CONFIG_FILES session/Makefile" ;;

16938

+ "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;

16939

+ "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;

16940

+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;

16941

+ "capplet/vino-preferences.desktop.in") CONFIG_FILES="$CONFIG_FILES capplet/vino-preferences.desktop.in" ;;

16942

+ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;

16943

16944

*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

16945

echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

16946

{ (exit 1); exit 1; }; };;

16947

esac

16948

done

16949

16950

16951

# If the user did not use the arguments to specify the items to instantiate,

16952

# then the envvar interface is used. Set only those that are not.

16953

# We use the long form for the default assignment because of an extremely

16954

@@ -25622,691 +27595,678 @@

16955

16956

16957

# Have a temporary directory for convenience. Make it in the build tree

16958

-# simply because there is no reason to put it here, and in addition,

16959

+# simply because there is no reason against having it here, and in addition,

16960

# creating and moving files from /tmp can sometimes cause problems.

16961

-# Create a temporary directory, and hook for its removal unless debugging.

16962

+# Hook for its removal unless debugging.

16963

+# Note that there is a small window in which the directory will not be cleaned:

16964

+# after its creation but before its name has been assigned to `$tmp'.

16965

$debug ||

16966

{

16967

- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0

16968

+ tmp=

16969

+ trap 'exit_status=$?

16970

+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status

16971

+' 0

16972

trap '{ (exit 1); exit 1; }' 1 2 13 15

16973

}

16974

16975

# Create a (secure) tmp directory for tmp files.

16976

16977

{

16978

- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&

16979

+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&

16980

test -n "$tmp" && test -d "$tmp"

16981

} ||

16982

{

16983

- tmp=./confstat$$-$RANDOM

16984

- (umask 077 && mkdir $tmp)

16985

+ tmp=./conf$$-$RANDOM

16986

+ (umask 077 && mkdir "$tmp")

16987

} ||

16988

{

16989

echo "$me: cannot create a temporary directory in ." >&2

16990

{ (exit 1); exit 1; }

16991

}

16992

16993

-_ACEOF

16994

16995

-cat >>$CONFIG_STATUS <<_ACEOF

16996

16997

16998

-# CONFIG_FILES section.

16999

+# Set up the sed scripts for CONFIG_FILES section.

17000

17001

17002

# No need to generate the scripts if there are no CONFIG_FILES.

17003

# This happens for instance when ./config.status config.h

17004

-if test -n "\$CONFIG_FILES"; then

17005

- # Protect against being on the right side of a sed subst in config.status.

17006

- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;

17007

- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF

17008

-s,@SHELL@,$SHELL,;t t

17009

-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t

17010

-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t

17011

-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t

17012

-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t

17013

-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t

17014

-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t

17015

-s,@exec_prefix@,$exec_prefix,;t t

17016

-s,@prefix@,$prefix,;t t

17017

-s,@program_transform_name@,$program_transform_name,;t t

17018

-s,@bindir@,$bindir,;t t

17019

-s,@sbindir@,$sbindir,;t t

17020

-s,@libexecdir@,$libexecdir,;t t

17021

-s,@datadir@,$datadir,;t t

17022

-s,@sysconfdir@,$sysconfdir,;t t

17023

-s,@sharedstatedir@,$sharedstatedir,;t t

17024

-s,@localstatedir@,$localstatedir,;t t

17025

-s,@libdir@,$libdir,;t t

17026

-s,@includedir@,$includedir,;t t

17027

-s,@oldincludedir@,$oldincludedir,;t t

17028

-s,@infodir@,$infodir,;t t

17029

-s,@mandir@,$mandir,;t t

17030

-s,@build_alias@,$build_alias,;t t

17031

-s,@host_alias@,$host_alias,;t t

17032

-s,@target_alias@,$target_alias,;t t

17033

-s,@DEFS@,$DEFS,;t t

17034

-s,@ECHO_C@,$ECHO_C,;t t

17035

-s,@ECHO_N@,$ECHO_N,;t t

17036

-s,@ECHO_T@,$ECHO_T,;t t

17037

-s,@LIBS@,$LIBS,;t t

17038

-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t

17039

-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t

17040

-s,@INSTALL_DATA@,$INSTALL_DATA,;t t

17041

-s,@CYGPATH_W@,$CYGPATH_W,;t t

17042

-s,@PACKAGE@,$PACKAGE,;t t

17043

-s,@VERSION@,$VERSION,;t t

17044

-s,@ACLOCAL@,$ACLOCAL,;t t

17045

-s,@AUTOCONF@,$AUTOCONF,;t t

17046

-s,@AUTOMAKE@,$AUTOMAKE,;t t

17047

-s,@AUTOHEADER@,$AUTOHEADER,;t t

17048

-s,@MAKEINFO@,$MAKEINFO,;t t

17049

-s,@install_sh@,$install_sh,;t t

17050

-s,@STRIP@,$STRIP,;t t

17051

-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t

17052

-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t

17053

-s,@mkdir_p@,$mkdir_p,;t t

17054

-s,@AWK@,$AWK,;t t

17055

-s,@SET_MAKE@,$SET_MAKE,;t t

17056

-s,@am__leading_dot@,$am__leading_dot,;t t

17057

-s,@AMTAR@,$AMTAR,;t t

17058

-s,@am__tar@,$am__tar,;t t

17059

-s,@am__untar@,$am__untar,;t t

17060

-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t

17061

-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t

17062

-s,@MAINT@,$MAINT,;t t

17063

-s,@ACLOCAL_AMFLAGS@,$ACLOCAL_AMFLAGS,;t t

17064

-s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t

17065

-s,@CC@,$CC,;t t

17066

-s,@CFLAGS@,$CFLAGS,;t t

17067

-s,@LDFLAGS@,$LDFLAGS,;t t

17068

-s,@CPPFLAGS@,$CPPFLAGS,;t t

17069

-s,@ac_ct_CC@,$ac_ct_CC,;t t

17070

-s,@EXEEXT@,$EXEEXT,;t t

17071

-s,@OBJEXT@,$OBJEXT,;t t

17072

-s,@DEPDIR@,$DEPDIR,;t t

17073

-s,@am__include@,$am__include,;t t

17074

-s,@am__quote@,$am__quote,;t t

17075

-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t

17076

-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t

17077

-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t

17078

-s,@CCDEPMODE@,$CCDEPMODE,;t t

17079

-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t

17080

-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t

17081

-s,@CPP@,$CPP,;t t

17082

-s,@EGREP@,$EGREP,;t t

17083

-s,@build@,$build,;t t

17084

-s,@build_cpu@,$build_cpu,;t t

17085

-s,@build_vendor@,$build_vendor,;t t

17086

-s,@build_os@,$build_os,;t t

17087

-s,@host@,$host,;t t

17088

-s,@host_cpu@,$host_cpu,;t t

17089

-s,@host_vendor@,$host_vendor,;t t

17090

-s,@host_os@,$host_os,;t t

17091

-s,@SED@,$SED,;t t

17092

-s,@LN_S@,$LN_S,;t t

17093

-s,@ECHO@,$ECHO,;t t

17094

-s,@AR@,$AR,;t t

17095

-s,@ac_ct_AR@,$ac_ct_AR,;t t

17096

-s,@RANLIB@,$RANLIB,;t t

17097

-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t

17098

-s,@CXX@,$CXX,;t t

17099

-s,@CXXFLAGS@,$CXXFLAGS,;t t

17100

-s,@ac_ct_CXX@,$ac_ct_CXX,;t t

17101

-s,@CXXDEPMODE@,$CXXDEPMODE,;t t

17102

-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t

17103

-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t

17104

-s,@CXXCPP@,$CXXCPP,;t t

17105

-s,@F77@,$F77,;t t

17106

-s,@FFLAGS@,$FFLAGS,;t t

17107

-s,@ac_ct_F77@,$ac_ct_F77,;t t

17108

-s,@LIBTOOL@,$LIBTOOL,;t t

17109

-s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t

17110

-s,@INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t

17111

-s,@INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t

17112

-s,@INTLTOOL_PROP_RULE@,$INTLTOOL_PROP_RULE,;t t

17113

-s,@INTLTOOL_OAF_RULE@,$INTLTOOL_OAF_RULE,;t t

17114

-s,@INTLTOOL_PONG_RULE@,$INTLTOOL_PONG_RULE,;t t

17115

-s,@INTLTOOL_SERVER_RULE@,$INTLTOOL_SERVER_RULE,;t t

17116

-s,@INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t

17117

-s,@INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t

17118

-s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t

17119

-s,@INTLTOOL_XAM_RULE@,$INTLTOOL_XAM_RULE,;t t

17120

-s,@INTLTOOL_KBD_RULE@,$INTLTOOL_KBD_RULE,;t t

17121

-s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t

17122

-s,@INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_XML_NOMERGE_RULE,;t t

17123

-s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t

17124

-s,@INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t

17125

-s,@INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t

17126

-s,@INTLTOOL_SERVICE_RULE@,$INTLTOOL_SERVICE_RULE,;t t

17127

-s,@INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t

17128

-s,@INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t

17129

-s,@INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t

17130

-s,@INTLTOOL_PERL@,$INTLTOOL_PERL,;t t

17131

-s,@INTLTOOL_ICONV@,$INTLTOOL_ICONV,;t t

17132

-s,@INTLTOOL_MSGFMT@,$INTLTOOL_MSGFMT,;t t

17133

-s,@INTLTOOL_MSGMERGE@,$INTLTOOL_MSGMERGE,;t t

17134

-s,@INTLTOOL_XGETTEXT@,$INTLTOOL_XGETTEXT,;t t

17135

-s,@ALL_LINGUAS@,$ALL_LINGUAS,;t t

17136

-s,@GCONFTOOL@,$GCONFTOOL,;t t

17137

-s,@GLIB_GENMARSHAL@,$GLIB_GENMARSHAL,;t t

17138

-s,@USE_NLS@,$USE_NLS,;t t

17139

-s,@MSGFMT@,$MSGFMT,;t t

17140

-s,@GMSGFMT@,$GMSGFMT,;t t

17141

-s,@XGETTEXT@,$XGETTEXT,;t t

17142

-s,@CATALOGS@,$CATALOGS,;t t

17143

-s,@CATOBJEXT@,$CATOBJEXT,;t t

17144

-s,@DATADIRNAME@,$DATADIRNAME,;t t

17145

-s,@GMOFILES@,$GMOFILES,;t t

17146

-s,@INSTOBJEXT@,$INSTOBJEXT,;t t

17147

-s,@INTLLIBS@,$INTLLIBS,;t t

17148

-s,@PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t

17149

-s,@PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t

17150

-s,@POFILES@,$POFILES,;t t

17151

-s,@POSUB@,$POSUB,;t t

17152

-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t

17153

-s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t

17154

-s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t

17155

-s,@PKG_CONFIG@,$PKG_CONFIG,;t t

17156

-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t

17157

-s,@VINO_SERVER_CFLAGS@,$VINO_SERVER_CFLAGS,;t t

17158

-s,@VINO_SERVER_LIBS@,$VINO_SERVER_LIBS,;t t

17159

-s,@VINO_CAPPLET_CFLAGS@,$VINO_CAPPLET_CFLAGS,;t t

17160

-s,@VINO_CAPPLET_LIBS@,$VINO_CAPPLET_LIBS,;t t

17161

-s,@VINO_SESSION_CFLAGS@,$VINO_SESSION_CFLAGS,;t t

17162

-s,@VINO_SESSION_LIBS@,$VINO_SESSION_LIBS,;t t

17163

-s,@SESSION_SUPPORT_TRUE@,$SESSION_SUPPORT_TRUE,;t t

17164

-s,@SESSION_SUPPORT_FALSE@,$SESSION_SUPPORT_FALSE,;t t

17165

-s,@VINO_HTTP_CFLAGS@,$VINO_HTTP_CFLAGS,;t t

17166

-s,@HTTP_SERVER_TRUE@,$HTTP_SERVER_TRUE,;t t

17167

-s,@HTTP_SERVER_FALSE@,$HTTP_SERVER_FALSE,;t t

17168

-s,@X_CFLAGS@,$X_CFLAGS,;t t

17169

-s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t

17170

-s,@X_LIBS@,$X_LIBS,;t t

17171

-s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t

17172

-s,@ORBIT_IDL@,$ORBIT_IDL,;t t

17173

-s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t

17174

-s,@LIBGNUTLS_CONFIG@,$LIBGNUTLS_CONFIG,;t t

17175

-s,@LIBGNUTLS_CFLAGS@,$LIBGNUTLS_CFLAGS,;t t

17176

-s,@LIBGNUTLS_LIBS@,$LIBGNUTLS_LIBS,;t t

17177

-s,@LIBGCRYPT_CONFIG@,$LIBGCRYPT_CONFIG,;t t

17178

-s,@LIBGCRYPT_CFLAGS@,$LIBGCRYPT_CFLAGS,;t t

17179

-s,@LIBGCRYPT_LIBS@,$LIBGCRYPT_LIBS,;t t

17180

-s,@XDAMAGE_LIBS@,$XDAMAGE_LIBS,;t t

17181

-s,@XSHM_LIBS@,$XSHM_LIBS,;t t

17182

-s,@XTEST_LIBS@,$XTEST_LIBS,;t t

17183

-s,@AVAHI_CFLAGS@,$AVAHI_CFLAGS,;t t

17184

-s,@AVAHI_LIBS@,$AVAHI_LIBS,;t t

17185

-s,@LIBZ@,$LIBZ,;t t

17186

-s,@LIBJPEG@,$LIBJPEG,;t t

17187

-s,@VINO_DEBUG_CFLAGS@,$VINO_DEBUG_CFLAGS,;t t

17188

-s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t

17189

-s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t

17190

-s,@GCONF_SCHEMAS_INSTALL_TRUE@,$GCONF_SCHEMAS_INSTALL_TRUE,;t t

17191

-s,@GCONF_SCHEMAS_INSTALL_FALSE@,$GCONF_SCHEMAS_INSTALL_FALSE,;t t

17192

-s,@PERL@,$PERL,;t t

17193

-s,@REBUILD@,$REBUILD,;t t

17194

-s,@LIBOBJS@,$LIBOBJS,;t t

17195

-s,@LTLIBOBJS@,$LTLIBOBJS,;t t

17196

-CEOF

17197

17198

-_ACEOF

17199

17200

- cat >>$CONFIG_STATUS <<\_ACEOF

17201

- # Split the substitutions into bite-sized pieces for seds with

17202

- # small command number limits, like on Digital OSF/1 and HP-UX.

17203

- ac_max_sed_lines=48

17204

- ac_sed_frag=1 # Number of current file.

17205

- ac_beg=1 # First line for current file.

17206

- ac_end=$ac_max_sed_lines # Line after last line for current file.

17207

- ac_more_lines=:

17208

- ac_sed_cmds=

17209

- while $ac_more_lines; do

17210

- if test $ac_beg -gt 1; then

17211

- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag

17212

- else

17213

- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag

17214

- fi

17215

- if test ! -s $tmp/subs.frag; then

17216

- ac_more_lines=false

17217

- else

17218

- # The purpose of the label and of the branching condition is to

17219

- # speed up the sed processing (if there are no `@' at all, there

17220

- # is no need to browse any of the substitutions).

17221

- # These are the two extra sed commands mentioned above.

17222

- (echo ':t

17223

- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed

17224

- if test -z "$ac_sed_cmds"; then

17225

- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"

17226

- else

17227

- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"

17228

- fi

17229

- ac_sed_frag=`expr $ac_sed_frag + 1`

17230

- ac_beg=$ac_end

17231

- ac_end=`expr $ac_end + $ac_max_sed_lines`

17232

- fi

17233

- done

17234

- if test -z "$ac_sed_cmds"; then

17235

- ac_sed_cmds=cat

17236

+if test -n "$CONFIG_FILES"; then

17237

17238

+_ACEOF

17239

17240

17241

17242

+ac_delim='%!_!# '

17243

+for ac_last_try in false false false false false :; do

17244

+ cat >conf$$subs.sed <<_ACEOF

17245

+SHELL!$SHELL$ac_delim

17246

+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim

17247

+PACKAGE_NAME!$PACKAGE_NAME$ac_delim

17248

+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim

17249

+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim

17250

+PACKAGE_STRING!$PACKAGE_STRING$ac_delim

17251

+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim

17252

+exec_prefix!$exec_prefix$ac_delim

17253

+prefix!$prefix$ac_delim

17254

+program_transform_name!$program_transform_name$ac_delim

17255

+bindir!$bindir$ac_delim

17256

+sbindir!$sbindir$ac_delim

17257

+libexecdir!$libexecdir$ac_delim

17258

+datarootdir!$datarootdir$ac_delim

17259

+datadir!$datadir$ac_delim

17260

+sysconfdir!$sysconfdir$ac_delim

17261

+sharedstatedir!$sharedstatedir$ac_delim

17262

+localstatedir!$localstatedir$ac_delim

17263

+includedir!$includedir$ac_delim

17264

+oldincludedir!$oldincludedir$ac_delim

17265

+docdir!$docdir$ac_delim

17266

+infodir!$infodir$ac_delim

17267

+htmldir!$htmldir$ac_delim

17268

+dvidir!$dvidir$ac_delim

17269

+pdfdir!$pdfdir$ac_delim

17270

+psdir!$psdir$ac_delim

17271

+libdir!$libdir$ac_delim

17272

+localedir!$localedir$ac_delim

17273

+mandir!$mandir$ac_delim

17274

+DEFS!$DEFS$ac_delim

17275

+ECHO_C!$ECHO_C$ac_delim

17276

+ECHO_N!$ECHO_N$ac_delim

17277

+ECHO_T!$ECHO_T$ac_delim

17278

+LIBS!$LIBS$ac_delim

17279

+build_alias!$build_alias$ac_delim

17280

+host_alias!$host_alias$ac_delim

17281

+target_alias!$target_alias$ac_delim

17282

+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim

17283

+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim

17284

+INSTALL_DATA!$INSTALL_DATA$ac_delim

17285

+CYGPATH_W!$CYGPATH_W$ac_delim

17286

+PACKAGE!$PACKAGE$ac_delim

17287

+VERSION!$VERSION$ac_delim

17288

+ACLOCAL!$ACLOCAL$ac_delim

17289

+AUTOCONF!$AUTOCONF$ac_delim

17290

+AUTOMAKE!$AUTOMAKE$ac_delim

17291

+AUTOHEADER!$AUTOHEADER$ac_delim

17292

+MAKEINFO!$MAKEINFO$ac_delim

17293

+install_sh!$install_sh$ac_delim

17294

+STRIP!$STRIP$ac_delim

17295

+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim

17296

+mkdir_p!$mkdir_p$ac_delim

17297

+AWK!$AWK$ac_delim

17298

+SET_MAKE!$SET_MAKE$ac_delim

17299

+am__leading_dot!$am__leading_dot$ac_delim

17300

+AMTAR!$AMTAR$ac_delim

17301

+am__tar!$am__tar$ac_delim

17302

+am__untar!$am__untar$ac_delim

17303

+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim

17304

+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim

17305

+MAINT!$MAINT$ac_delim

17306

+ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim

17307

+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim

17308

+CC!$CC$ac_delim

17309

+CFLAGS!$CFLAGS$ac_delim

17310

+LDFLAGS!$LDFLAGS$ac_delim

17311

+CPPFLAGS!$CPPFLAGS$ac_delim

17312

+ac_ct_CC!$ac_ct_CC$ac_delim

17313

+EXEEXT!$EXEEXT$ac_delim

17314

+OBJEXT!$OBJEXT$ac_delim

17315

+DEPDIR!$DEPDIR$ac_delim

17316

+am__include!$am__include$ac_delim

17317

+am__quote!$am__quote$ac_delim

17318

+AMDEP_TRUE!$AMDEP_TRUE$ac_delim

17319

+AMDEP_FALSE!$AMDEP_FALSE$ac_delim

17320

+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim

17321

+CCDEPMODE!$CCDEPMODE$ac_delim

17322

+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim

17323

+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim

17324

+CPP!$CPP$ac_delim

17325

+GREP!$GREP$ac_delim

17326

+EGREP!$EGREP$ac_delim

17327

+build!$build$ac_delim

17328

+build_cpu!$build_cpu$ac_delim

17329

+build_vendor!$build_vendor$ac_delim

17330

+build_os!$build_os$ac_delim

17331

+host!$host$ac_delim

17332

+host_cpu!$host_cpu$ac_delim

17333

+host_vendor!$host_vendor$ac_delim

17334

+host_os!$host_os$ac_delim

17335

+LN_S!$LN_S$ac_delim

17336

+ECHO!$ECHO$ac_delim

17337

+AR!$AR$ac_delim

17338

+RANLIB!$RANLIB$ac_delim

17339

+CXX!$CXX$ac_delim

17340

+CXXFLAGS!$CXXFLAGS$ac_delim

17341

+ac_ct_CXX!$ac_ct_CXX$ac_delim

17342

+_ACEOF

17343

17344

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then

17345

+ break

17346

+ elif $ac_last_try; then

17347

+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

17348

+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

17349

+ { (exit 1); exit 1; }; }

17350

+ else

17351

+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

17352

17353

-fi # test -n "$CONFIG_FILES"

17354

+done

17355

17356

+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

17357

+if test -n "$ac_eof"; then

17358

+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

17359

+ ac_eof=`expr $ac_eof + 1`

17360

+fi

17361

17362

+cat >>$CONFIG_STATUS <<_ACEOF

17363

+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof

17364

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

17365

+_ACEOF

17366

+sed '

17367

+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

17368

+s/^/s,@/; s/!/@,|#_!!_#|/

17369

+:n

17370

+t n

17371

+s/'"$ac_delim"'$/,g/; t

17372

+s/$/\\/; p

17373

+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

17374

+' >>$CONFIG_STATUS <conf$$subs.sed

17375

+rm -f conf$$subs.sed

17376

+cat >>$CONFIG_STATUS <<_ACEOF

17377

+CEOF$ac_eof

17378

+_ACEOF

17379

17380

17381

+ac_delim='%!_!# '

17382

+for ac_last_try in false false false false false :; do

17383

+ cat >conf$$subs.sed <<_ACEOF

17384

+CXXDEPMODE!$CXXDEPMODE$ac_delim

17385

+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim

17386

+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim

17387

+CXXCPP!$CXXCPP$ac_delim

17388

+F77!$F77$ac_delim

17389

+FFLAGS!$FFLAGS$ac_delim

17390

+ac_ct_F77!$ac_ct_F77$ac_delim

17391

+LIBTOOL!$LIBTOOL$ac_delim

17392

+INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim

17393

+INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim

17394

+INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim

17395

+INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim

17396

+INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim

17397

+INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim

17398

+INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim

17399

+INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim

17400

+INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim

17401

+INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim

17402

+INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim

17403

+INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim

17404

+INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim

17405

+INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim

17406

+INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim

17407

+INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim

17408

+INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim

17409

+INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim

17410

+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim

17411

+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim

17412

+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim

17413

+INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim

17414

+INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim

17415

+INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim

17416

+INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim

17417

+INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim

17418

+ALL_LINGUAS!$ALL_LINGUAS$ac_delim

17419

+DATADIRNAME!$DATADIRNAME$ac_delim

17420

+GCONFTOOL!$GCONFTOOL$ac_delim

17421

+GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim

17422

+USE_NLS!$USE_NLS$ac_delim

17423

+MSGFMT!$MSGFMT$ac_delim

17424

+GMSGFMT!$GMSGFMT$ac_delim

17425

+XGETTEXT!$XGETTEXT$ac_delim

17426

+CATALOGS!$CATALOGS$ac_delim

17427

+CATOBJEXT!$CATOBJEXT$ac_delim

17428

+GMOFILES!$GMOFILES$ac_delim

17429

+INSTOBJEXT!$INSTOBJEXT$ac_delim

17430

+INTLLIBS!$INTLLIBS$ac_delim

17431

+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim

17432

+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim

17433

+POFILES!$POFILES$ac_delim

17434

+POSUB!$POSUB$ac_delim

17435

+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim

17436

+WARN_CFLAGS!$WARN_CFLAGS$ac_delim

17437

+DISABLE_DEPRECATED_CFLAGS!$DISABLE_DEPRECATED_CFLAGS$ac_delim

17438

+PKG_CONFIG!$PKG_CONFIG$ac_delim

17439

+VINO_SERVER_CFLAGS!$VINO_SERVER_CFLAGS$ac_delim

17440

+VINO_SERVER_LIBS!$VINO_SERVER_LIBS$ac_delim

17441

+VINO_CAPPLET_CFLAGS!$VINO_CAPPLET_CFLAGS$ac_delim

17442

+VINO_CAPPLET_LIBS!$VINO_CAPPLET_LIBS$ac_delim

17443

+VINO_SESSION_CFLAGS!$VINO_SESSION_CFLAGS$ac_delim

17444

+VINO_SESSION_LIBS!$VINO_SESSION_LIBS$ac_delim

17445

+SESSION_SUPPORT_TRUE!$SESSION_SUPPORT_TRUE$ac_delim

17446

+SESSION_SUPPORT_FALSE!$SESSION_SUPPORT_FALSE$ac_delim

17447

+VINO_HTTP_CFLAGS!$VINO_HTTP_CFLAGS$ac_delim

17448

+HTTP_SERVER_TRUE!$HTTP_SERVER_TRUE$ac_delim

17449

+HTTP_SERVER_FALSE!$HTTP_SERVER_FALSE$ac_delim

17450

+XMKMF!$XMKMF$ac_delim

17451

+X_CFLAGS!$X_CFLAGS$ac_delim

17452

+X_PRE_LIBS!$X_PRE_LIBS$ac_delim

17453

+X_LIBS!$X_LIBS$ac_delim

17454

+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim

17455

+ORBIT_IDL!$ORBIT_IDL$ac_delim

17456

+BONOBO_IDLDIR!$BONOBO_IDLDIR$ac_delim

17457

+LIBGNUTLS_CONFIG!$LIBGNUTLS_CONFIG$ac_delim

17458

+LIBGNUTLS_CFLAGS!$LIBGNUTLS_CFLAGS$ac_delim

17459

+LIBGNUTLS_LIBS!$LIBGNUTLS_LIBS$ac_delim

17460

+LIBGCRYPT_CONFIG!$LIBGCRYPT_CONFIG$ac_delim

17461

+LIBGCRYPT_CFLAGS!$LIBGCRYPT_CFLAGS$ac_delim

17462

+LIBGCRYPT_LIBS!$LIBGCRYPT_LIBS$ac_delim

17463

+XDAMAGE_LIBS!$XDAMAGE_LIBS$ac_delim

17464

+XSHM_LIBS!$XSHM_LIBS$ac_delim

17465

+XTEST_LIBS!$XTEST_LIBS$ac_delim

17466

+AVAHI_CFLAGS!$AVAHI_CFLAGS$ac_delim

17467

+AVAHI_LIBS!$AVAHI_LIBS$ac_delim

17468

+LIBZ!$LIBZ$ac_delim

17469

+LIBJPEG!$LIBJPEG$ac_delim

17470

+VINO_DEBUG_CFLAGS!$VINO_DEBUG_CFLAGS$ac_delim

17471

+GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim

17472

+GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim

17473

+GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim

17474

+GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim

17475

+PERL!$PERL$ac_delim

17476

+REBUILD!$REBUILD$ac_delim

17477

+LIBOBJS!$LIBOBJS$ac_delim

17478

+LTLIBOBJS!$LTLIBOBJS$ac_delim

17479

_ACEOF

17480

17481

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then

17482

+ break

17483

+ elif $ac_last_try; then

17484

+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

17485

+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

17486

+ { (exit 1); exit 1; }; }

17487

+ else

17488

+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

17489

+ fi

17490

+done

17491

17492

+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

17493

+if test -n "$ac_eof"; then

17494

+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

17495

+ ac_eof=`expr $ac_eof + 1`

17496

+fi

17497

17498

+cat >>$CONFIG_STATUS <<_ACEOF

17499

+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof

17500

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end

17501

+_ACEOF

17502

+sed '

17503

+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

17504

+s/^/s,@/; s/!/@,|#_!!_#|/

17505

+:n

17506

+t n

17507

+s/'"$ac_delim"'$/,g/; t

17508

+s/$/\\/; p

17509

+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

17510

+' >>$CONFIG_STATUS <conf$$subs.sed

17511

+rm -f conf$$subs.sed

17512

+cat >>$CONFIG_STATUS <<_ACEOF

17513

+:end

17514

+s/|#_!!_#|//g

17515

+CEOF$ac_eof

17516

+_ACEOF

17517

17518

17519

+# VPATH may cause trouble with some makes, so we remove $(srcdir),

17520

+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and

17521

+# trailing colons and then remove the whole line if VPATH becomes empty

17522

+# (actually we leave an empty line to preserve line numbers).

17523

+if test "x$srcdir" = x.; then

17524

+ ac_vpsub='/^[ ]*VPATH[ ]*=/{

17525

+s/:*\$(srcdir):*/:/

17526

+s/:*\${srcdir}:*/:/

17527

+s/:*@srcdir@:*/:/

17528

+s/^$[^=]*=[ ]*$:*/\1/

17529

+s/:*$//

17530

+s/^[^=]*=[ ]*$//

17531

+}'

17532

+fi

17533

17534

cat >>$CONFIG_STATUS <<\_ACEOF

17535

-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue

17536

- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

17537

- case $ac_file in

17538

- - | *:- | *:-:* ) # input from stdin

17539

- cat >$tmp/stdin

17540

- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

17541

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

17542

- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

17543

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

17544

- * ) ac_file_in=$ac_file.in ;;

17545

+fi # test -n "$CONFIG_FILES"

17546

17547

17548

+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS

17549

+do

17550

+ case $ac_tag in

17551

+ :[FHLC]) ac_mode=$ac_tag; continue;;

17552

+ esac

17553

+ case $ac_mode$ac_tag in

17554

+ :[FHL]*:*);;

17555

+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5

17556

+echo "$as_me: error: Invalid tag $ac_tag." >&2;}

17557

+ { (exit 1); exit 1; }; };;

17558

+ :[FH]-) ac_tag=-:-;;

17559

+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;

17560

+ esac

17561

+ ac_save_IFS=$IFS

17562

+ IFS=:

17563

+ set x $ac_tag

17564

+ IFS=$ac_save_IFS

17565

+ shift

17566

+ ac_file=$1

17567

+ shift

17568

17569

+ case $ac_mode in

17570

+ :L) ac_source=$1;;

17571

+ :[FH])

17572

+ ac_file_inputs=

17573

+ for ac_f

17574

+ do

17575

+ case $ac_f in

17576

+ -) ac_f="$tmp/stdin";;

17577

+ *) # Look for the file first in the build tree, then in the source tree

17578

+ # (if the path is not absolute). The absolute path cannot be DOS-style,

17579

+ # because $ac_f cannot contain `:'.

17580

+ test -f "$ac_f" ||

17581

+ case $ac_f in

17582

+ [\\/$]*) false;;

17583

+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;

17584

+ esac ||

17585

+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5

17586

+echo "$as_me: error: cannot find input file: $ac_f" >&2;}

17587

+ { (exit 1); exit 1; }; };;

17588

+ esac

17589

+ ac_file_inputs="$ac_file_inputs $ac_f"

17590

+ done

17591

17592

+ # Let's still pretend it is `configure' which instantiates (i.e., don't

17593

+ # use $as_me), people would be surprised to read:

17594

+ # /* config.h. Generated by config.status. */

17595

+ configure_input="Generated from "`IFS=:

17596

+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."

17597

+ if test x"$ac_file" != x-; then

17598

+ configure_input="$ac_file. $configure_input"

17599

+ { echo "$as_me:$LINENO: creating $ac_file" >&5

17600

+echo "$as_me: creating $ac_file" >&6;}

17601

+ fi

17602

17603

+ case $ac_tag in

17604

+ *:-:* | *:-) cat >"$tmp/stdin";;

17605

+ esac

17606

+ ;;

17607

esac

17608

17609

- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.

17610

- ac_dir=`(dirname "$ac_file") 2>/dev/null ||

17611

+ ac_dir=`$as_dirname -- "$ac_file" ||

17612

$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

17613

X"$ac_file" : 'X$//$[^/]' \| \

17614

X"$ac_file" : 'X$//$$' \| \

17615

- X"$ac_file" : 'X$/$' \| \

17616

- . : '$.$' 2>/dev/null ||

17617

+ X"$ac_file" : 'X$/$' \| . 2>/dev/null ||

17618

echo X"$ac_file" |

17619

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

17620

- /^X$\/\/$[^/].*/{ s//\1/; q; }

17621

- /^X$\/\/$$/{ s//\1/; q; }

17622

- /^X$\/$.*/{ s//\1/; q; }

17623

- s/.*/./; q'`

17624

- { if $as_mkdir_p; then

17625

- mkdir -p "$ac_dir"

17626

- else

17627

- as_dir="$ac_dir"

17628

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

17629

+ s//\1/

17630

+ q

17631

+ }

17632

+ /^X$\/\/$[^/].*/{

17633

+ s//\1/

17634

+ q

17635

+ }

17636

+ /^X$\/\/$$/{

17637

+ s//\1/

17638

+ q

17639

+ }

17640

+ /^X$\/$.*/{

17641

+ s//\1/

17642

+ q

17643

+ }

17644

+ s/.*/./; q'`

17645

+ { as_dir="$ac_dir"

17646

+ case $as_dir in #(

17647

+ -*) as_dir=./$as_dir;;

17648

+ esac

17649

+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

17650

as_dirs=

17651

- while test ! -d "$as_dir"; do

17652

- as_dirs="$as_dir $as_dirs"

17653

- as_dir=`(dirname "$as_dir") 2>/dev/null ||

17654

+ while :; do

17655

+ case $as_dir in #(

17656

+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

17657

+ *) as_qdir=$as_dir;;

17658

+ esac

17659

+ as_dirs="'$as_qdir' $as_dirs"

17660

+ as_dir=`$as_dirname -- "$as_dir" ||

17661

$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

17662

X"$as_dir" : 'X$//$[^/]' \| \

17663

X"$as_dir" : 'X$//$$' \| \

17664

- X"$as_dir" : 'X$/$' \| \

17665

- . : '$.$' 2>/dev/null ||

17666

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

17667

echo X"$as_dir" |

17668

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

17669

- /^X$\/\/$[^/].*/{ s//\1/; q; }

17670

- /^X$\/\/$$/{ s//\1/; q; }

17671

- /^X$\/$.*/{ s//\1/; q; }

17672

- s/.*/./; q'`

17673

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

17674

+ s//\1/

17675

+ q

17676

+ }

17677

+ /^X$\/\/$[^/].*/{

17678

+ s//\1/

17679

+ q

17680

+ }

17681

+ /^X$\/\/$$/{

17682

+ s//\1/

17683

+ q

17684

+ }

17685

+ /^X$\/$.*/{

17686

+ s//\1/

17687

+ q

17688

+ }

17689

+ s/.*/./; q'`

17690

+ test -d "$as_dir" && break

17691

done

17692

- test ! -n "$as_dirs" || mkdir $as_dirs

17693

- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5

17694

-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}

17695

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

17696

+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

17697

+echo "$as_me: error: cannot create directory $as_dir" >&2;}

17698

{ (exit 1); exit 1; }; }; }

17699

17700

ac_builddir=.

17701

17702

-if test "$ac_dir" != .; then

17703

+case "$ac_dir" in

17704

+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

17705

+*)

17706

ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

17707

- # A "../" for each directory in $ac_dir_suffix.

17708

- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`

17709

-else

17710

- ac_dir_suffix= ac_top_builddir=

17711

-fi

17712

+ # A ".." for each directory in $ac_dir_suffix.

17713

+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

17714

+ case $ac_top_builddir_sub in

17715

+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;

17716

+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

17717

+ esac ;;

17718

+esac

17719

+ac_abs_top_builddir=$ac_pwd

17720

+ac_abs_builddir=$ac_pwd$ac_dir_suffix

17721

+# for backward compatibility:

17722

+ac_top_builddir=$ac_top_build_prefix

17723

17724

case $srcdir in

17725

- .) # No --srcdir option. We are building in place.

17726

+ .) # We are building in place.

17727

ac_srcdir=.

17728

- if test -z "$ac_top_builddir"; then

17729

- ac_top_srcdir=.

17730

- else

17731

- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`

17732

- fi ;;

17733

- [\\/]* | ?:[\\/]* ) # Absolute path.

17734

+ ac_top_srcdir=$ac_top_builddir_sub

17735

+ ac_abs_top_srcdir=$ac_pwd ;;

17736

+ [\\/]* | ?:[\\/]* ) # Absolute name.

17737

ac_srcdir=$srcdir$ac_dir_suffix;

17738

- ac_top_srcdir=$srcdir ;;

17739

- *) # Relative path.

17740

- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix

17741

- ac_top_srcdir=$ac_top_builddir$srcdir ;;

17742

+ ac_top_srcdir=$srcdir

17743

+ ac_abs_top_srcdir=$srcdir ;;

17744

+ *) # Relative name.

17745

+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix

17746

+ ac_top_srcdir=$ac_top_build_prefix$srcdir

17747

+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;

17748

esac

17749

+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

17750

17751

-# Do not use `cd foo && pwd` to compute absolute paths, because

17752

-# the directories may not exist.

17753

-case `pwd` in

17754

-.) ac_abs_builddir="$ac_dir";;

17755

-*)

17756

- case "$ac_dir" in

17757

- .) ac_abs_builddir=`pwd`;;

17758

- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;

17759

- *) ac_abs_builddir=`pwd`/"$ac_dir";;

17760

- esac;;

17761

-esac

17762

-case $ac_abs_builddir in

17763

-.) ac_abs_top_builddir=${ac_top_builddir}.;;

17764

-*)

17765

- case ${ac_top_builddir}. in

17766

- .) ac_abs_top_builddir=$ac_abs_builddir;;

17767

- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;

17768

- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;

17769

- esac;;

17770

-esac

17771

-case $ac_abs_builddir in

17772

-.) ac_abs_srcdir=$ac_srcdir;;

17773

-*)

17774

- case $ac_srcdir in

17775

- .) ac_abs_srcdir=$ac_abs_builddir;;

17776

- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;

17777

- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;

17778

- esac;;

17779

-esac

17780

-case $ac_abs_builddir in

17781

-.) ac_abs_top_srcdir=$ac_top_srcdir;;

17782

-*)

17783

- case $ac_top_srcdir in

17784

- .) ac_abs_top_srcdir=$ac_abs_builddir;;

17785

- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;

17786

- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;

17787

- esac;;

17788

-esac

17789

17790

+ case $ac_mode in

17791

+ :F)

17792

+ #

17793

+ # CONFIG_FILE

17794

+ #

17795

17796

case $INSTALL in

17797

[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;

17798

- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;

17799

+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;

17800

esac

17801

+_ACEOF

17802

17803

- if test x"$ac_file" != x-; then

17804

- { echo "$as_me:$LINENO: creating $ac_file" >&5

17805

-echo "$as_me: creating $ac_file" >&6;}

17806

- rm -f "$ac_file"

17807

- fi

17808

- # Let's still pretend it is `configure' which instantiates (i.e., don't

17809

- # use $as_me), people would be surprised to read:

17810

- # /* config.h. Generated by config.status. */

17811

- if test x"$ac_file" = x-; then

17812

- configure_input=

17813

- else

17814

- configure_input="$ac_file. "

17815

- fi

17816

- configure_input=$configure_input"Generated from `echo $ac_file_in |

17817

- sed 's,.*/,,'` by configure."

17818

17819

- # First look for the input files in the build tree, otherwise in the

17820

- # src tree.

17821

- ac_file_inputs=`IFS=:

17822

- for f in $ac_file_in; do

17823

- case $f in

17824

- -) echo $tmp/stdin ;;

17825

- [\\/$]*)

17826

- # Absolute (can't be DOS-style, as IFS=:)

17827

- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

17828

-echo "$as_me: error: cannot find input file: $f" >&2;}

17829

- { (exit 1); exit 1; }; }

17830

- echo "$f";;

17831

- *) # Relative

17832

- if test -f "$f"; then

17833

- # Build tree

17834

- echo "$f"

17835

- elif test -f "$srcdir/$f"; then

17836

- # Source tree

17837

- echo "$srcdir/$f"

17838

- else

17839

- # /dev/null tree

17840

- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

17841

-echo "$as_me: error: cannot find input file: $f" >&2;}

17842

- { (exit 1); exit 1; }; }

17843

- fi;;

17844

- esac

17845

- done` || { (exit 1); exit 1; }

17846

+cat >>$CONFIG_STATUS <<\_ACEOF

17847

+# If the template does not know about datarootdir, expand it.

17848

+# FIXME: This hack should be removed a few years after 2.60.

17849

+ac_datarootdir_hack=; ac_datarootdir_seen=

17850

17851

+case `sed -n '/datarootdir/ {

17852

+ p

17853

+ q

17854

17855

+/@datadir@/p

17856

+/@docdir@/p

17857

+/@infodir@/p

17858

+/@localedir@/p

17859

+/@mandir@/p

17860

+' $ac_file_inputs` in

17861

+*datarootdir*) ac_datarootdir_seen=yes;;

17862

+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)

17863

+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

17864

+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

17865

_ACEOF

17866

cat >>$CONFIG_STATUS <<_ACEOF

17867

+ ac_datarootdir_hack='

17868

+ s&@datadir@&$datadir&g

17869

+ s&@docdir@&$docdir&g

17870

+ s&@infodir@&$infodir&g

17871

+ s&@localedir@&$localedir&g

17872

+ s&@mandir@&$mandir&g

17873

+ s&\\\${datarootdir}&$datarootdir&g' ;;

17874

+esac

17875

+_ACEOF

17876

17877

+# Neutralize VPATH when `$srcdir' = `.'.

17878

+# Shell code in configure.ac might set extrasub.

17879

+# FIXME: do we really want to maintain this feature?

17880

+cat >>$CONFIG_STATUS <<_ACEOF

17881

sed "$ac_vpsub

17882

$extrasub

17883

_ACEOF

17884

cat >>$CONFIG_STATUS <<\_ACEOF

17885

17886

/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

17887

-s,@configure_input@,$configure_input,;t t

17888

-s,@srcdir@,$ac_srcdir,;t t

17889

-s,@abs_srcdir@,$ac_abs_srcdir,;t t

17890

-s,@top_srcdir@,$ac_top_srcdir,;t t

17891

-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t

17892

-s,@builddir@,$ac_builddir,;t t

17893

-s,@abs_builddir@,$ac_abs_builddir,;t t

17894

-s,@top_builddir@,$ac_top_builddir,;t t

17895

-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t

17896

-s,@INSTALL@,$ac_INSTALL,;t t

17897

-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out

17898

- rm -f $tmp/stdin

17899

- if test x"$ac_file" != x-; then

17900

- mv $tmp/out $ac_file

17901

- else

17902

- cat $tmp/out

17903

- rm -f $tmp/out

17904

- fi

17905

17906

-done

17907

-_ACEOF

17908

-cat >>$CONFIG_STATUS <<\_ACEOF

17909

17910

17911

-# CONFIG_HEADER section.

17912

17913

17914

-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where

17915

-# NAME is the cpp macro being defined and VALUE is the value it is being given.

17916

17917

-# ac_d sets the value in "#define NAME VALUE" lines.

17918

-ac_dA='s,^$[ ]*$#$[ ]*define[ ][ ]*$'

17919

-ac_dB='[ ].*$,\1#\2'

17920

-ac_dC=' '

17921

-ac_dD=',;t'

17922

-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".

17923

-ac_uA='s,^$[ ]*$#$[ ]*$undef$[ ][ ]*$'

17924

-ac_uB='$,\1#\2define\3'

17925

-ac_uC=' '

17926

-ac_uD=',;t'

17927

+s&@configure_input@&$configure_input&;t t

17928

+s&@top_builddir@&$ac_top_builddir_sub&;t t

17929

+s&@srcdir@&$ac_srcdir&;t t

17930

+s&@abs_srcdir@&$ac_abs_srcdir&;t t

17931

+s&@top_srcdir@&$ac_top_srcdir&;t t

17932

+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t

17933

+s&@builddir@&$ac_builddir&;t t

17934

+s&@abs_builddir@&$ac_abs_builddir&;t t

17935

+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t

17936

+s&@INSTALL@&$ac_INSTALL&;t t

17937

+$ac_datarootdir_hack

17938

+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out

17939

17940

+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&

17941

+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

17942

+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

17943

+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'

17944

+which seems to be undefined. Please make sure it is defined." >&5

17945

+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

17946

+which seems to be undefined. Please make sure it is defined." >&2;}

17947

17948

-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue

17949

- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".

17950

+ rm -f "$tmp/stdin"

17951

case $ac_file in

17952

- - | *:- | *:-:* ) # input from stdin

17953

- cat >$tmp/stdin

17954

- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

17955

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

17956

- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`

17957

- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;

17958

- * ) ac_file_in=$ac_file.in ;;

17959

+ -) cat "$tmp/out"; rm -f "$tmp/out";;

17960

+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;

17961

esac

17962

17963

- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5

17964

-echo "$as_me: creating $ac_file" >&6;}

17965

17966

- # First look for the input files in the build tree, otherwise in the

17967

- # src tree.

17968

- ac_file_inputs=`IFS=:

17969

- for f in $ac_file_in; do

17970

- case $f in

17971

- -) echo $tmp/stdin ;;

17972

- [\\/$]*)

17973

- # Absolute (can't be DOS-style, as IFS=:)

17974

- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

17975

-echo "$as_me: error: cannot find input file: $f" >&2;}

17976

- { (exit 1); exit 1; }; }

17977

- # Do quote $f, to prevent DOS paths from being IFS'd.

17978

- echo "$f";;

17979

- *) # Relative

17980

- if test -f "$f"; then

17981

- # Build tree

17982

- echo "$f"

17983

- elif test -f "$srcdir/$f"; then

17984

- # Source tree

17985

- echo "$srcdir/$f"

17986

- else

17987

- # /dev/null tree

17988

- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5

17989

-echo "$as_me: error: cannot find input file: $f" >&2;}

17990

- { (exit 1); exit 1; }; }

17991

- fi;;

17992

- esac

17993

- done` || { (exit 1); exit 1; }

17994

- # Remove the trailing spaces.

17995

- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in

17996

17997

+ ;;

17998

+ :H)

17999

+ #

18000

+ # CONFIG_HEADER

18001

+ #

18002

_ACEOF

18003

18004

-# Transform confdefs.h into two sed scripts, `conftest.defines' and

18005

-# `conftest.undefs', that substitutes the proper values into

18006

-# config.h.in to produce config.h. The first handles `#define'

18007

-# templates, and the second `#undef' templates.

18008

-# And first: Protect against being on the right side of a sed subst in

18009

-# config.status. Protect against being in an unquoted here document

18010

-# in config.status.

18011

-rm -f conftest.defines conftest.undefs

18012

-# Using a here document instead of a string reduces the quoting nightmare.

18013

-# Putting comments in sed scripts is not portable.

18014

18015

-# `end' is used to avoid that the second main sed command (meant for

18016

-# 0-ary CPP macros) applies to n-ary macro definitions.

18017

-# See the Autoconf documentation for `clear'.

18018

-cat >confdef2sed.sed <<\_ACEOF

18019

-s/[\\&,]/\\&/g

18020

-s,[\\$`],\\&,g

18021

-t clear

18022

-: clear

18023

-s,^[ ]*#[ ]*define[ ][ ]*$[^ (][^ (]*$$([^)]*)$[ ]*$.*$$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp

18024

-t end

18025

-s,^[ ]*#[ ]*define[ ][ ]*$[^ ][^ ]*$[ ]*$.*$$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp

18026

-: end

18027

-_ACEOF

18028

-# If some macros were called several times there might be several times

18029

-# the same #defines, which is useless. Nevertheless, we may not want to

18030

-# sort them, since we want the *last* AC-DEFINE to be honored.

18031

-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines

18032

-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs

18033

-rm -f confdef2sed.sed

18034

+# Transform confdefs.h into a sed script `conftest.defines', that

18035

+# substitutes the proper values into config.h.in to produce config.h.

18036

+rm -f conftest.defines conftest.tail

18037

+# First, append a space to every undef/define line, to ease matching.

18038

+echo 's/$/ /' >conftest.defines

18039

+# Then, protect against being on the right side of a sed subst, or in

18040

+# an unquoted here document, in config.status. If some macros were

18041

+# called several times there might be several #defines for the same

18042

+# symbol, which is useless. But do not sort them, since the last

18043

+# AC_DEFINE must be honored.

18044

+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*

18045

+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where

18046

+# NAME is the cpp macro being defined, VALUE is the value it is being given.

18047

+# PARAMS is the parameter list in the macro definition--in most cases, it's

18048

+# just an empty string.

18049

+ac_dA='s,^\$[ #]*\$[^ ]*\\([ ]*'

18050

+ac_dB='\\)[ (].*,\\1define\\2'

18051

+ac_dC=' '

18052

+ac_dD=' ,'

18053

18054

+uniq confdefs.h |

18055

+ sed -n '

18056

+ t rset

18057

+ :rset

18058

+ s/^[ ]*#[ ]*define[ ][ ]*//

18059

+ t ok

18060

+ d

18061

+ :ok

18062

+ s/[\\&,]/\\&/g

18063

+ s/^$'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p

18064

+ s/^$'"$ac_word_re"'$[ ]*$.*$/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p

18065

+ ' >>conftest.defines

18066

18067

-# This sed command replaces #undef with comments. This is necessary, for

18068

+# Remove the space that was appended to ease matching.

18069

+# Then replace #undef with comments. This is necessary, for

18070

# example, in the case of _POSIX_SOURCE, which is predefined and required

18071

# on some systems where configure will not decide to define it.

18072

-cat >>conftest.undefs <<\_ACEOF

18073

-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,

18074

-_ACEOF

18075

+# (The regexp can be short, since the line contains either #define or #undef.)

18076

+echo 's/ $//

18077

+s,^[ #]*u.*,/* & */,' >>conftest.defines

18078

18079

+# Break up conftest.defines:

18080

+ac_max_sed_lines=50

18081

18082

+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"

18083

+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"

18084

+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"

18085

+# et cetera.

18086

+ac_in='$ac_file_inputs'

18087

+ac_out='"$tmp/out1"'

18088

+ac_nxt='"$tmp/out2"'

18089

18090

-# Break up conftest.defines because some shells have a limit on the size

18091

-# of here documents, and old seds have small limits too (100 cmds).

18092

-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS

18093

-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS

18094

-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS

18095

-echo ' :' >>$CONFIG_STATUS

18096

-rm -f conftest.tail

18097

-while grep . conftest.defines >/dev/null

18098

+while :

18099

18100

- # Write a limited-size here document to $tmp/defines.sed.

18101

- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS

18102

- # Speed up: don't consider the non `#define' lines.

18103

- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS

18104

- # Work around the forget-to-reset-the-flag bug.

18105

- echo 't clr' >>$CONFIG_STATUS

18106

- echo ': clr' >>$CONFIG_STATUS

18107

- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS

18108

+ # Write a here document:

18109

+ cat >>$CONFIG_STATUS <<_ACEOF

18110

+ # First, check the format of the line:

18111

+ cat >"\$tmp/defines.sed" <<\\CEOF

18112

+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def

18113

+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def

18114

18115

+:def

18116

+_ACEOF

18117

+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS

18118

echo 'CEOF

18119

- sed -f $tmp/defines.sed $tmp/in >$tmp/out

18120

- rm -f $tmp/in

18121

- mv $tmp/out $tmp/in

18122

-' >>$CONFIG_STATUS

18123

- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail

18124

+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS

18125

+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in

18126

+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail

18127

+ grep . conftest.tail >/dev/null || break

18128

rm -f conftest.defines

18129

mv conftest.tail conftest.defines

18130

done

18131

-rm -f conftest.defines

18132

-echo ' fi # grep' >>$CONFIG_STATUS

18133

-echo >>$CONFIG_STATUS

18134

18135

-# Break up conftest.undefs because some shells have a limit on the size

18136

-# of here documents, and old seds have small limits too (100 cmds).

18137

-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS

18138

-rm -f conftest.tail

18139

-while grep . conftest.undefs >/dev/null

18140

-do

18141

- # Write a limited-size here document to $tmp/undefs.sed.

18142

- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS

18143

- # Speed up: don't consider the non `#undef'

18144

- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS

18145

- # Work around the forget-to-reset-the-flag bug.

18146

- echo 't clr' >>$CONFIG_STATUS

18147

- echo ': clr' >>$CONFIG_STATUS

18148

- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS

18149

- echo 'CEOF

18150

- sed -f $tmp/undefs.sed $tmp/in >$tmp/out

18151

- rm -f $tmp/in

18152

- mv $tmp/out $tmp/in

18153

-' >>$CONFIG_STATUS

18154

- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail

18155

- rm -f conftest.undefs

18156

- mv conftest.tail conftest.undefs

18157

-done

18158

-rm -f conftest.undefs

18159

+rm -f conftest.defines conftest.tail

18160

18161

+echo "ac_result=$ac_in" >>$CONFIG_STATUS

18162

cat >>$CONFIG_STATUS <<\_ACEOF

18163

- # Let's still pretend it is `configure' which instantiates (i.e., don't

18164

- # use $as_me), people would be surprised to read:

18165

- # /* config.h. Generated by config.status. */

18166

- if test x"$ac_file" = x-; then

18167

- echo "/* Generated by configure. */" >$tmp/config.h

18168

- else

18169

- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h

18170

- fi

18171

- cat $tmp/in >>$tmp/config.h

18172

- rm -f $tmp/in

18173

if test x"$ac_file" != x-; then

18174

- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then

18175

+ echo "/* $configure_input */" >"$tmp/config.h"

18176

+ cat "$ac_result" >>"$tmp/config.h"

18177

+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then

18178

{ echo "$as_me:$LINENO: $ac_file is unchanged" >&5

18179

echo "$as_me: $ac_file is unchanged" >&6;}

18180

else

18181

- ac_dir=`(dirname "$ac_file") 2>/dev/null ||

18182

-$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

18183

- X"$ac_file" : 'X$//$[^/]' \| \

18184

- X"$ac_file" : 'X$//$$' \| \

18185

- X"$ac_file" : 'X$/$' \| \

18186

- . : '$.$' 2>/dev/null ||

18187

-echo X"$ac_file" |

18188

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

18189

- /^X$\/\/$[^/].*/{ s//\1/; q; }

18190

- /^X$\/\/$$/{ s//\1/; q; }

18191

- /^X$\/$.*/{ s//\1/; q; }

18192

- s/.*/./; q'`

18193

- { if $as_mkdir_p; then

18194

- mkdir -p "$ac_dir"

18195

- else

18196

- as_dir="$ac_dir"

18197

- as_dirs=

18198

- while test ! -d "$as_dir"; do

18199

- as_dirs="$as_dir $as_dirs"

18200

- as_dir=`(dirname "$as_dir") 2>/dev/null ||

18201

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

18202

- X"$as_dir" : 'X$//$[^/]' \| \

18203

- X"$as_dir" : 'X$//$$' \| \

18204

- X"$as_dir" : 'X$/$' \| \

18205

- . : '$.$' 2>/dev/null ||

18206

-echo X"$as_dir" |

18207

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

18208

- /^X$\/\/$[^/].*/{ s//\1/; q; }

18209

- /^X$\/\/$$/{ s//\1/; q; }

18210

- /^X$\/$.*/{ s//\1/; q; }

18211

- s/.*/./; q'`

18212

- done

18213

- test ! -n "$as_dirs" || mkdir $as_dirs

18214

- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5

18215

-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}

18216

- { (exit 1); exit 1; }; }; }

18217

18218

rm -f $ac_file

18219

- mv $tmp/config.h $ac_file

18220

+ mv "$tmp/config.h" $ac_file

18221

18222

else

18223

- cat $tmp/config.h

18224

- rm -f $tmp/config.h

18225

+ echo "/* $configure_input */"

18226

+ cat "$ac_result"

18227

18228

+ rm -f "$tmp/out12"

18229

# Compute $ac_file's index in $config_headers.

18230

_am_stamp_count=1

18231

for _am_header in $config_headers :; do

18232

@@ -26317,135 +28277,39 @@

18233

_am_stamp_count=`expr $_am_stamp_count + 1` ;;

18234

esac

18235

done

18236

-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||

18237

+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||

18238

$as_expr X$ac_file : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

18239

X$ac_file : 'X$//$[^/]' \| \

18240

X$ac_file : 'X$//$$' \| \

18241

- X$ac_file : 'X$/$' \| \

18242

- . : '$.$' 2>/dev/null ||

18243

+ X$ac_file : 'X$/$' \| . 2>/dev/null ||

18244

echo X$ac_file |

18245

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

18246

- /^X$\/\/$[^/].*/{ s//\1/; q; }

18247

- /^X$\/\/$$/{ s//\1/; q; }

18248

- /^X$\/$.*/{ s//\1/; q; }

18249

- s/.*/./; q'`/stamp-h$_am_stamp_count

18250

-done

18251

-_ACEOF

18252

-cat >>$CONFIG_STATUS <<\_ACEOF

18253

18254

18255

-# CONFIG_COMMANDS section.

18256

18257

-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue

18258

- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`

18259

- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`

18260

- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||

18261

-$as_expr X"$ac_dest" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

18262

- X"$ac_dest" : 'X$//$[^/]' \| \

18263

- X"$ac_dest" : 'X$//$$' \| \

18264

- X"$ac_dest" : 'X$/$' \| \

18265

- . : '$.$' 2>/dev/null ||

18266

-echo X"$ac_dest" |

18267

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

18268

- /^X$\/\/$[^/].*/{ s//\1/; q; }

18269

- /^X$\/\/$$/{ s//\1/; q; }

18270

- /^X$\/$.*/{ s//\1/; q; }

18271

- s/.*/./; q'`

18272

- { if $as_mkdir_p; then

18273

- mkdir -p "$ac_dir"

18274

- else

18275

- as_dir="$ac_dir"

18276

- as_dirs=

18277

- while test ! -d "$as_dir"; do

18278

- as_dirs="$as_dir $as_dirs"

18279

- as_dir=`(dirname "$as_dir") 2>/dev/null ||

18280

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

18281

- X"$as_dir" : 'X$//$[^/]' \| \

18282

- X"$as_dir" : 'X$//$$' \| \

18283

- X"$as_dir" : 'X$/$' \| \

18284

- . : '$.$' 2>/dev/null ||

18285

-echo X"$as_dir" |

18286

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

18287

- /^X$\/\/$[^/].*/{ s//\1/; q; }

18288

- /^X$\/\/$$/{ s//\1/; q; }

18289

- /^X$\/$.*/{ s//\1/; q; }

18290

- s/.*/./; q'`

18291

- done

18292

- test ! -n "$as_dirs" || mkdir $as_dirs

18293

- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5

18294

-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}

18295

- { (exit 1); exit 1; }; }; }

18296

18297

- ac_builddir=.

18298

18299

-if test "$ac_dir" != .; then

18300

- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

18301

- # A "../" for each directory in $ac_dir_suffix.

18302

- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`

18303

-else

18304

- ac_dir_suffix= ac_top_builddir=

18305

-fi

18306

18307

-case $srcdir in

18308

- .) # No --srcdir option. We are building in place.

18309

- ac_srcdir=.

18310

- if test -z "$ac_top_builddir"; then

18311

- ac_top_srcdir=.

18312

- else

18313

- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`

18314

- fi ;;

18315

- [\\/]* | ?:[\\/]* ) # Absolute path.

18316

- ac_srcdir=$srcdir$ac_dir_suffix;

18317

- ac_top_srcdir=$srcdir ;;

18318

- *) # Relative path.

18319

- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix

18320

- ac_top_srcdir=$ac_top_builddir$srcdir ;;

18321

-esac

18322

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

18323

+ s//\1/

18324

+ q

18325

+ }

18326

+ /^X$\/\/$[^/].*/{

18327

+ s//\1/

18328

+ q

18329

+ }

18330

+ /^X$\/\/$$/{

18331

+ s//\1/

18332

+ q

18333

+ }

18334

+ /^X$\/$.*/{

18335

+ s//\1/

18336

+ q

18337

+ }

18338

+ s/.*/./; q'`/stamp-h$_am_stamp_count

18339

+ ;;

18340

18341

-# Do not use `cd foo && pwd` to compute absolute paths, because

18342

-# the directories may not exist.

18343

-case `pwd` in

18344

-.) ac_abs_builddir="$ac_dir";;

18345

-*)

18346

- case "$ac_dir" in

18347

- .) ac_abs_builddir=`pwd`;;

18348

- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;

18349

- *) ac_abs_builddir=`pwd`/"$ac_dir";;

18350

- esac;;

18351

-esac

18352

-case $ac_abs_builddir in

18353

-.) ac_abs_top_builddir=${ac_top_builddir}.;;

18354

-*)

18355

- case ${ac_top_builddir}. in

18356

- .) ac_abs_top_builddir=$ac_abs_builddir;;

18357

- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;

18358

- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;

18359

- esac;;

18360

-esac

18361

-case $ac_abs_builddir in

18362

-.) ac_abs_srcdir=$ac_srcdir;;

18363

-*)

18364

- case $ac_srcdir in

18365

- .) ac_abs_srcdir=$ac_abs_builddir;;

18366

- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;

18367

- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;

18368

- esac;;

18369

-esac

18370

-case $ac_abs_builddir in

18371

-.) ac_abs_top_srcdir=$ac_top_srcdir;;

18372

-*)

18373

- case $ac_top_srcdir in

18374

- .) ac_abs_top_srcdir=$ac_abs_builddir;;

18375

- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;

18376

- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;

18377

- esac;;

18378

-esac

18379

+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5

18380

+echo "$as_me: executing $ac_file commands" >&6;}

18381

+ ;;

18382

+ esac

18383

18384

18385

- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5

18386

-echo "$as_me: executing $ac_dest commands" >&6;}

18387

- case $ac_dest in

18388

- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do

18389

+ case $ac_file$ac_mode in

18390

+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do

18391

# Strip MF so we end up with the name of the file.

18392

mf=`echo "$mf" | sed -e 's/:.*$//'`

18393

# Check whether this is an Automake generated Makefile or not.

18394

@@ -26455,18 +28319,29 @@

18395

# each Makefile.in and add a new line on top of each file to say so.

18396

# So let's grep whole file.

18397

if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then

18398

- dirpart=`(dirname "$mf") 2>/dev/null ||

18399

+ dirpart=`$as_dirname -- "$mf" ||

18400

$as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

18401

X"$mf" : 'X$//$[^/]' \| \

18402

X"$mf" : 'X$//$$' \| \

18403

- X"$mf" : 'X$/$' \| \

18404

- . : '$.$' 2>/dev/null ||

18405

+ X"$mf" : 'X$/$' \| . 2>/dev/null ||

18406

echo X"$mf" |

18407

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

18408

- /^X$\/\/$[^/].*/{ s//\1/; q; }

18409

- /^X$\/\/$$/{ s//\1/; q; }

18410

- /^X$\/$.*/{ s//\1/; q; }

18411

- s/.*/./; q'`

18412

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

18413

+ s//\1/

18414

+ q

18415

+ }

18416

+ /^X$\/\/$[^/].*/{

18417

+ s//\1/

18418

+ q

18419

+ }

18420

+ /^X$\/\/$$/{

18421

+ s//\1/

18422

+ q

18423

+ }

18424

+ /^X$\/$.*/{

18425

+ s//\1/

18426

+ q

18427

+ }

18428

+ s/.*/./; q'`

18429

else

18430

continue

18431

18432

@@ -26488,49 +28363,76 @@

18433

sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

18434

# Make sure the directory exists.

18435

test -f "$dirpart/$file" && continue

18436

- fdir=`(dirname "$file") 2>/dev/null ||

18437

+ fdir=`$as_dirname -- "$file" ||

18438

$as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

18439

X"$file" : 'X$//$[^/]' \| \

18440

X"$file" : 'X$//$$' \| \

18441

- X"$file" : 'X$/$' \| \

18442

- . : '$.$' 2>/dev/null ||

18443

+ X"$file" : 'X$/$' \| . 2>/dev/null ||

18444

echo X"$file" |

18445

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

18446

- /^X$\/\/$[^/].*/{ s//\1/; q; }

18447

- /^X$\/\/$$/{ s//\1/; q; }

18448

- /^X$\/$.*/{ s//\1/; q; }

18449

- s/.*/./; q'`

18450

- { if $as_mkdir_p; then

18451

- mkdir -p $dirpart/$fdir

18452

- else

18453

- as_dir=$dirpart/$fdir

18454

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

18455

+ s//\1/

18456

+ q

18457

+ }

18458

+ /^X$\/\/$[^/].*/{

18459

+ s//\1/

18460

+ q

18461

+ }

18462

+ /^X$\/\/$$/{

18463

+ s//\1/

18464

+ q

18465

+ }

18466

+ /^X$\/$.*/{

18467

+ s//\1/

18468

+ q

18469

+ }

18470

+ s/.*/./; q'`

18471

+ { as_dir=$dirpart/$fdir

18472

+ case $as_dir in #(

18473

+ -*) as_dir=./$as_dir;;

18474

+ esac

18475

+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

18476

as_dirs=

18477

- while test ! -d "$as_dir"; do

18478

- as_dirs="$as_dir $as_dirs"

18479

- as_dir=`(dirname "$as_dir") 2>/dev/null ||

18480

+ while :; do

18481

+ case $as_dir in #(

18482

+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

18483

+ *) as_qdir=$as_dir;;

18484

+ esac

18485

+ as_dirs="'$as_qdir' $as_dirs"

18486

+ as_dir=`$as_dirname -- "$as_dir" ||

18487

$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

18488

X"$as_dir" : 'X$//$[^/]' \| \

18489

X"$as_dir" : 'X$//$$' \| \

18490

- X"$as_dir" : 'X$/$' \| \

18491

- . : '$.$' 2>/dev/null ||

18492

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

18493

echo X"$as_dir" |

18494

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }

18495

- /^X$\/\/$[^/].*/{ s//\1/; q; }

18496

- /^X$\/\/$$/{ s//\1/; q; }

18497

- /^X$\/$.*/{ s//\1/; q; }

18498

- s/.*/./; q'`

18499

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

18500

+ s//\1/

18501

+ q

18502

+ }

18503

+ /^X$\/\/$[^/].*/{

18504

+ s//\1/

18505

+ q

18506

+ }

18507

+ /^X$\/\/$$/{

18508

+ s//\1/

18509

+ q

18510

+ }

18511

+ /^X$\/$.*/{

18512

+ s//\1/

18513

+ q

18514

+ }

18515

+ s/.*/./; q'`

18516

+ test -d "$as_dir" && break

18517

done

18518

- test ! -n "$as_dirs" || mkdir $as_dirs

18519

- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5

18520

-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}

18521

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

18522

+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

18523

+echo "$as_me: error: cannot create directory $as_dir" >&2;}

18524

{ (exit 1); exit 1; }; }; }

18525

18526

# echo "creating $dirpart/$file"

18527

echo '# dummy' > "$dirpart/$file"

18528

done

18529

done

18530

;;

18531

- intltool )

18532

+ "intltool":C)

18533

18534

for file in intltool-extract intltool-merge intltool-update; do

18535

sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \

18536

@@ -26551,10 +28453,10 @@

18537

done

18538

18539

;;

18540

- default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)

18541

+ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)

18542

sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile

18543

esac ;;

18544

- po/stamp-it )

18545

+ "po/stamp-it":C)

18546

rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"

18547

>"po/stamp-it.tmp"

18548

sed '/^#/d

18549

@@ -26577,11 +28479,10 @@

18550

rm -f "po/Makefile.tmp"

18551

mv "po/stamp-it.tmp" "po/stamp-it"

18552

;;

18553

18554

esac

18555

-done

18556

-_ACEOF

18557

+done # for ac_tag

18558

18559

-cat >>$CONFIG_STATUS <<\_ACEOF

18560

18561

{ (exit 0); exit 0; }

18562

_ACEOF

18563

diff -Nur vino-2.16.0/ltmain.sh vino-2.16.0.new/ltmain.sh

18564

--- vino-2.16.0/ltmain.sh 2006-07-13 09:12:13.000000000 +0200

18565

+++ vino-2.16.0.new/ltmain.sh 2006-03-11 19:49:04.000000000 +0100

18566

@@ -43,19 +43,13 @@

18567

18568

PROGRAM=ltmain.sh

18569

PACKAGE=libtool

18570

-VERSION=1.5.22

18571

+VERSION="1.5.22 Debian 1.5.22-4"

18572

TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"

18573

18574

-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).

18575

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

18576

- emulate sh

18577

- NULLCMD=:

18578

- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

18579

- # is contrary to our usage. Disable this feature.

18580

- alias -g '${1+"$@"}'='"$@"'

18581

+# See if we are running on zsh, and set the options which allow our

18582

+# commands through without removal of \ escapes.

18583

+if test -n "${ZSH_VERSION+set}" ; then

18584

setopt NO_GLOB_SUBST

18585

-else

18586

- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac

18587

18588

18589

# Check that we have a working $echo.

18590

@@ -111,14 +105,12 @@

18591

# These must not be set unconditionally because not all systems understand

18592

# e.g. LANG=C (notably SCO).

18593

# We save the old values to restore during execute mode.

18594

-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES

18595

-do

18596

- eval "if test \"\${$lt_var+set}\" = set; then

18597

- save_$lt_var=\$$lt_var

18598

- $lt_var=C

18599

- export $lt_var

18600

- fi"

18601

-done

18602

+if test "${LC_ALL+set}" = set; then

18603

+ save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL

18604

+fi

18605

+if test "${LANG+set}" = set; then

18606

+ save_LANG="$LANG"; LANG=C; export LANG

18607

+fi

18608

18609

# Make sure IFS has a sensible default

18610

lt_nl='

18611

@@ -144,8 +136,6 @@

18612

preserve_args=

18613

lo2o="s/\\.lo\$/.${objext}/"

18614

o2lo="s/\\.${objext}\$/.lo/"

18615

-extracted_archives=

18616

-extracted_serial=0

18617

18618

#####################################

18619

# Shell function definitions:

18620

@@ -337,17 +327,7 @@

18621

*) my_xabs=`pwd`"/$my_xlib" ;;

18622

esac

18623

my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`

18624

- my_xlib_u=$my_xlib

18625

- while :; do

18626

- case " $extracted_archives " in

18627

- *" $my_xlib_u "*)

18628

- extracted_serial=`expr $extracted_serial + 1`

18629

- my_xlib_u=lt$extracted_serial-$my_xlib ;;

18630

- *) break ;;

18631

- esac

18632

- done

18633

- extracted_archives="$extracted_archives $my_xlib_u"

18634

- my_xdir="$my_gentop/$my_xlib_u"

18635

+ my_xdir="$my_gentop/$my_xlib"

18636

18637

$show "${rm}r $my_xdir"

18638

$run ${rm}r "$my_xdir"

18639

@@ -778,7 +758,6 @@

18640

*.f90) xform=f90 ;;

18641

*.for) xform=for ;;

18642

*.java) xform=java ;;

18643

- *.obj) xform=obj ;;

18644

esac

18645

18646

libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`

18647

@@ -1159,9 +1138,8 @@

18648

for arg

18649

18650

case $arg in

18651

- -all-static | -static | -static-libtool-libs)

18652

- case $arg in

18653

- -all-static)

18654

+ -all-static | -static)

18655

+ if test "X$arg" = "X-all-static"; then

18656

if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then

18657

$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2

18658

18659

@@ -1169,20 +1147,12 @@

18660

dlopen_self=$dlopen_self_static

18661

18662

prefer_static_libs=yes

18663

- ;;

18664

- -static)

18665

+ else

18666

if test -z "$pic_flag" && test -n "$link_static_flag"; then

18667

dlopen_self=$dlopen_self_static

18668

18669

prefer_static_libs=built

18670

- ;;

18671

- -static-libtool-libs)

18672

- if test -z "$pic_flag" && test -n "$link_static_flag"; then

18673

- dlopen_self=$dlopen_self_static

18674

- fi

18675

- prefer_static_libs=yes

18676

- ;;

18677

- esac

18678

+ fi

18679

build_libtool_libs=no

18680

build_old_libs=yes

18681

break

18682

@@ -1742,7 +1712,7 @@

18683

continue

18684

;;

18685

18686

- -static | -static-libtool-libs)

18687

+ -static)

18688

# The effects of -static are defined in a previous loop.

18689

# We used to do the same as -all-static on platforms that

18690

# didn't have a PIC flag, but the assumption that the effects

18691

@@ -2112,7 +2082,10 @@

18692

case $pass in

18693

dlopen) libs="$dlfiles" ;;

18694

dlpreopen) libs="$dlprefiles" ;;

18695

- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;

18696

+ link)

18697

+ libs="$deplibs %DEPLIBS%"

18698

+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"

18699

+ ;;

18700

esac

18701

18702

if test "$pass" = dlopen; then

18703

@@ -2520,9 +2493,7 @@

18704

18705

if test "$linkmode,$pass" = "prog,link"; then

18706

if test -n "$library_names" &&

18707

- { { test "$prefer_static_libs" = no ||

18708

- test "$prefer_static_libs,$installed" = "built,yes"; } ||

18709

- test -z "$old_library"; }; then

18710

+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then

18711

# We need to hardcode the library path

18712

if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then

18713

# Make sure the rpath contains only unique directories.

18714

@@ -3218,7 +3189,7 @@

18715

# which has an extra 1 added just for fun

18716

18717

case $version_type in

18718

- darwin|linux|osf|windows|none)

18719

+ darwin|linux|osf|windows)

18720

current=`expr $number_major + $number_minor`

18721

age="$number_minor"

18722

revision="$number_revision"

18723

@@ -3233,6 +3204,11 @@

18724

age="$number_minor"

18725

revision="$number_minor"

18726

;;

18727

+ *)

18728

+ $echo "$modename: unknown library version type \`$version_type'" 1>&2

18729

+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2

18730

+ exit $EXIT_FAILURE

18731

+ ;;

18732

esac

18733

;;

18734

no)

18735

@@ -3442,11 +3418,11 @@

18736

18737

18738

# Eliminate all temporary directories.

18739

-# for path in $notinst_path; do

18740

-# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`

18741

-# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`

18742

-# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`

18743

-# done

18744

+ for path in $notinst_path; do

18745

+ lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`

18746

+ deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`

18747

+ dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`

18748

+ done

18749

18750

if test -n "$xrpath"; then

18751

# If the user specified any rpath flags, then add them.

18752

@@ -3547,12 +3523,13 @@

18753

int main() { return 0; }

18754

EOF

18755

$rm conftest

18756

- if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then

18757

+ $LTCC $LTCFLAGS -o conftest conftest.c $deplibs

18758

+ if test "$?" -eq 0 ; then

18759

ldd_output=`ldd conftest`

18760

for i in $deplibs; do

18761

name=`expr $i : '-l$.*$'`

18762

# If $name is empty we are operating on a -L argument.

18763

- if test "$name" != "" && test "$name" != "0"; then

18764

+ if test "$name" != "" && test "$name" -ne "0"; then

18765

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

18766

case " $predeps $postdeps " in

18767

*" $i "*)

18768

@@ -3591,7 +3568,9 @@

18769

# If $name is empty we are operating on a -L argument.

18770

if test "$name" != "" && test "$name" != "0"; then

18771

$rm conftest

18772

- if $LTCC $LTCFLAGS -o conftest conftest.c $i; then

18773

+ $LTCC $LTCFLAGS -o conftest conftest.c $i

18774

+ # Did it work?

18775

+ if test "$?" -eq 0 ; then

18776

ldd_output=`ldd conftest`

18777

if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then

18778

case " $predeps $postdeps " in

18779

@@ -3623,7 +3602,7 @@

18780

droppeddeps=yes

18781

$echo

18782

$echo "*** Warning! Library $i is needed by this library but I was not able to"

18783

- $echo "*** make it link in! You will probably need to install it or some"

18784

+ $echo "*** make it link in! You will probably need to install it or some"

18785

$echo "*** library that it depends on before this library will be fully"

18786

$echo "*** functional. Installing it before continuing would be even better."

18787

18788

@@ -4268,14 +4247,12 @@

18789

reload_conv_objs=

18790

gentop=

18791

# reload_cmds runs $LD directly, so let us get rid of

18792

- # -Wl from whole_archive_flag_spec and hope we can get by with

18793

- # turning comma into space..

18794

+ # -Wl from whole_archive_flag_spec

18795

wl=

18796

18797

if test -n "$convenience"; then

18798

if test -n "$whole_archive_flag_spec"; then

18799

- eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"

18800

- reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`

18801

+ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"

18802

else

18803

gentop="$output_objdir/${obj}x"

18804

generated="$generated $gentop"

18805

@@ -4723,16 +4700,16 @@

18806

case $host in

18807

*cygwin* | *mingw* )

18808

if test -f "$output_objdir/${outputname}.def" ; then

18809

- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`

18810

- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`

18811

+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`

18812

+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`

18813

else

18814

- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`

18815

- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`

18816

+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`

18817

+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`

18818

18819

;;

18820

* )

18821

- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`

18822

- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`

18823

+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`

18824

+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`

18825

;;

18826

esac

18827

;;

18828

@@ -4747,13 +4724,13 @@

18829

# really was required.

18830

18831

# Nullify the symbol file.

18832

- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`

18833

- finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`

18834

+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`

18835

+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`

18836

18837

18838

if test "$need_relink" = no || test "$build_libtool_libs" != yes; then

18839

# Replace the output file specification.

18840

- compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`

18841

+ compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`

18842

link_command="$compile_command$compile_rpath"

18843

18844

# We have no uninstalled library dependencies, so finalize right now.

18845

@@ -4840,7 +4817,7 @@

18846

if test "$fast_install" != no; then

18847

link_command="$finalize_var$compile_command$finalize_rpath"

18848

if test "$fast_install" = yes; then

18849

- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`

18850

+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`

18851

else

18852

# fast_install is set to needless

18853

relink_command=

18854

@@ -4877,7 +4854,7 @@

18855

18856

done

18857

relink_command="(cd `pwd`; $relink_command)"

18858

- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`

18859

+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`

18860

18861

18862

# Quote $echo for shipping.

18863

@@ -5284,18 +5261,6 @@

18864

Xsed='${SED} -e 1s/^X//'

18865

sed_quote_subst='$sed_quote_subst'

18866

18867

-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).

18868

-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then

18869

- emulate sh

18870

- NULLCMD=:

18871

- # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which

18872

- # is contrary to our usage. Disable this feature.

18873

- alias -g '\${1+\"\$@\"}'='\"\$@\"'

18874

- setopt NO_GLOB_SUBST

18875

-else

18876

- case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac

18877

-fi

18878

18879

# The HP-UX ksh and POSIX shell print the target directory to stdout

18880

# if CDPATH is set.

18881

(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

18882

@@ -5438,7 +5403,7 @@

18883

;;

18884

esac

18885

$echo >> $output "\

18886

- \$echo \"\$0: cannot exec \$program \$*\"

18887

+ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"

18888

exit $EXIT_FAILURE

18889

18890

else

18891

@@ -5624,7 +5589,7 @@

18892

done

18893

# Quote the link command for shipping.

18894

relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"

18895

- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`

18896

+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`

18897

if test "$hardcode_automatic" = yes ; then

18898

relink_command=

18899

18900

@@ -5969,9 +5934,9 @@

18901

18902

if test -n "$inst_prefix_dir"; then

18903

# Stick the inst_prefix_dir data into the link command.

18904

- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`

18905

+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`

18906

else

18907

- relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`

18908

+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`

18909

18910

18911

$echo "$modename: warning: relinking \`$file'" 1>&2

18912

@@ -6180,7 +6145,7 @@

18913

file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`

18914

outputname="$tmpdir/$file"

18915

# Replace the output file specification.

18916

- relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`

18917

+ relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`

18918

18919

$show "$relink_command"

18920

if $run eval "$relink_command"; then :

18921

@@ -6456,15 +6421,12 @@

18922

18923

18924

# Restore saved environment variables

18925

- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES

18926

- do

18927

- eval "if test \"\${save_$lt_var+set}\" = set; then

18928

- $lt_var=\$save_$lt_var; export $lt_var

18929

- else

18930

- $lt_unset $lt_var

18931

- fi"

18932

- done

18933

18934

+ if test "${save_LC_ALL+set}" = set; then

18935

+ LC_ALL="$save_LC_ALL"; export LC_ALL

18936

+ fi

18937

+ if test "${save_LANG+set}" = set; then

18938

+ LANG="$save_LANG"; export LANG

18939

+ fi

18940

18941

# Now prepare to actually exec the command.

18942

exec_cmd="\$cmd$args"

18943

@@ -6821,9 +6783,9 @@

18944

-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols

18945

-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)

18946

-export-symbols SYMFILE

18947

- try to export only the symbols listed in SYMFILE

18948

+ try to export only the symbols listed in SYMFILE

18949

-export-symbols-regex REGEX

18950

- try to export only the symbols matching REGEX

18951

+ try to export only the symbols matching REGEX

18952

-LLIBDIR search LIBDIR for required installed libraries

18953

-lNAME OUTPUT-FILE requires the installed library libNAME

18954

-module build a library that can dlopened

18955

@@ -6837,11 +6799,9 @@

18956

-release RELEASE specify package release information

18957

-rpath LIBDIR the created library will eventually be installed in LIBDIR

18958

-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries

18959

- -static do not do any dynamic linking of uninstalled libtool libraries

18960

- -static-libtool-libs

18961

- do not do any dynamic linking of libtool libraries

18962

+ -static do not do any dynamic linking of libtool libraries

18963

-version-info CURRENT[:REVISION[:AGE]]

18964

- specify library version info [each variable defaults to 0]

18965

+ specify library version info [each variable defaults to 0]

18966

18967

All other options (arguments beginning with \`-') are ignored.

18968

Older »