~ubuntu-branches/ubuntu/karmic/empathy/karmic : revision 69

1

=== modified file 'Makefile.in'

2

--- Makefile.in 2009-09-17 14:07:29 +0000

3

+++ Makefile.in 2009-09-17 14:14:17 +0000

4

@@ -1,8 +1,9 @@

5

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

6

+# Makefile.in generated by automake 1.11 from Makefile.am.

7

# @configure_input@

8

9

10

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

11

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

12

+# Inc.

13

# This Makefile.in is free software; the Free Software Foundation

14

# gives unlimited permission to copy and/or distribute it,

15

# with or without modifications, as long as this notice is preserved.

16

@@ -15,8 +16,9 @@

17

@SET_MAKE@

18

VPATH = @srcdir@

19

pkgdatadir = $(datadir)/@PACKAGE@

20

+pkgincludedir = $(includedir)/@PACKAGE@

21

pkglibdir = $(libdir)/@PACKAGE@

22

-pkgincludedir = $(includedir)/@PACKAGE@

23

+pkglibexecdir = $(libexecdir)/@PACKAGE@

24

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

25

install_sh_DATA = $(install_sh) -c -m 644

26

install_sh_PROGRAM = $(install_sh) -c

27

@@ -59,6 +61,7 @@

28

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

29

CONFIG_HEADER = config.h

30

CONFIG_CLEAN_FILES = shave shave-libtool

31

+CONFIG_CLEAN_VPATH_FILES =

32

SOURCES =

33

DIST_SOURCES =

34

RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

35

@@ -70,6 +73,9 @@

36

ps-recursive uninstall-recursive

37

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

38

distclean-recursive maintainer-clean-recursive

39

+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

40

+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

41

+ distdir dist dist-all distcheck

42

ETAGS = etags

43

CTAGS = ctags

44

DIST_SUBDIRS = tools extensions po data libempathy libempathy-gtk src \

45

@@ -78,9 +84,34 @@

46

distdir = $(PACKAGE)-$(VERSION)

47

top_distdir = $(distdir)

48

am__remove_distdir = \

49

- { test ! -d $(distdir) \

50

- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \

51

- && rm -fr $(distdir); }; }

52

+ { test ! -d "$(distdir)" \

53

+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \

54

+ && rm -fr "$(distdir)"; }; }

55

+am__relativize = \

56

+ dir0=`pwd`; \

57

+ sed_first='s,^$[^/]*$/.*$$,\1,'; \

58

+ sed_rest='s,^[^/]*/*,,'; \

59

+ sed_last='s,^.*/$[^/]*$$$,\1,'; \

60

+ sed_butlast='s,/*[^/]*$$,,'; \

61

+ while test -n "$$dir1"; do \

62

+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \

63

+ if test "$$first" != "."; then \

64

+ if test "$$first" = ".."; then \

65

+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

66

+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

67

+ else \

68

+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

69

+ if test "$$first2" = "$$first"; then \

70

+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

71

+ else \

72

+ dir2="../$$dir2"; \

73

+ fi; \

74

+ dir0="$$dir0"/"$$first"; \

75

+ fi; \

76

+ fi; \

77

+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

78

+ done; \

79

+ reldir="$$dir2"

80

DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2

81

GZIP_ENV = --best

82

distcleancheck_listfiles = find . -type f -print

83

@@ -150,6 +181,8 @@

84

GTKDOC_CHECK = @GTKDOC_CHECK@

85

HELP_DIR = @HELP_DIR@

86

HTML_DIR = @HTML_DIR@

87

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

88

+INDICATE_LIBS = @INDICATE_LIBS@

89

INSTALL = @INSTALL@

90

INSTALL_DATA = @INSTALL_DATA@

91

INSTALL_PROGRAM = @INSTALL_PROGRAM@

92

@@ -210,6 +243,7 @@

93

PACKAGE_NAME = @PACKAGE_NAME@

94

PACKAGE_STRING = @PACKAGE_STRING@

95

PACKAGE_TARNAME = @PACKAGE_TARNAME@

96

+PACKAGE_URL = @PACKAGE_URL@

97

PACKAGE_VERSION = @PACKAGE_VERSION@

98

PATH_SEPARATOR = @PATH_SEPARATOR@

99

PKG_CONFIG = @PKG_CONFIG@

100

@@ -332,15 +366,15 @@

101

@for dep in $?; do \

102

case '$(am__configure_deps)' in \

103

*$$dep*) \

104

- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \

105

- cd $(srcdir) && $(AUTOMAKE) --gnu \

106

+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \

107

+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \

108

&& exit 0; \

109

exit 1;; \

110

esac; \

111

done; \

112

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \

113

- cd $(top_srcdir) && \

114

- $(AUTOMAKE) --gnu Makefile

115

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \

116

+ $(am__cd) $(top_srcdir) && \

117

+ $(AUTOMAKE) --gnu Makefile

118

.PRECIOUS: Makefile

119

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

120

@case '$?' in \

121

@@ -356,9 +390,10 @@

122

$(SHELL) ./config.status --recheck

123

124

$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)

125

- cd $(srcdir) && $(AUTOCONF)

126

+ $(am__cd) $(srcdir) && $(AUTOCONF)

127

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

128

- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

129

+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)

130

+$(am__aclocal_m4_deps):

131

132

config.h: stamp-h1

133

@if test ! -f $@; then \

134

@@ -370,7 +405,7 @@

135

@rm -f stamp-h1

136

cd $(top_builddir) && $(SHELL) ./config.status config.h

137

$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)

138

- cd $(top_srcdir) && $(AUTOHEADER)

139

+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))

140

rm -f stamp-h1

141

touch $@

142

143

@@ -414,7 +449,7 @@

144

else \

145

local_target="$$target"; \

146

fi; \

147

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

148

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

149

|| eval $$failcom; \

150

done; \

151

if test "$$dot_seen" = "no"; then \

152

@@ -448,16 +483,16 @@

153

else \

154

local_target="$$target"; \

155

fi; \

156

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

157

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

158

|| eval $$failcom; \

159

done && test -z "$$fail"

160

tags-recursive:

161

list='$(SUBDIRS)'; for subdir in $$list; do \

162

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

163

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

164

done

165

ctags-recursive:

166

list='$(SUBDIRS)'; for subdir in $$list; do \

167

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

168

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

169

done

170

171

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

172

@@ -472,7 +507,7 @@

173

174

TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \

175

$(TAGS_FILES) $(LISP)

176

- tags=; \

177

+ set x; \

178

here=`pwd`; \

179

if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

180

include_option=--etags-include; \

181

@@ -484,7 +519,7 @@

182

list='$(SUBDIRS)'; for subdir in $$list; do \

183

if test "$$subdir" = .; then :; else \

184

test ! -f $$subdir/TAGS || \

185

- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

186

+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

187

fi; \

188

done; \

189

list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \

190

@@ -493,36 +528,41 @@

191

done | \

192

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

193

END { if (nonempty) { for (i in files) print i; }; }'`; \

194

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

195

+ shift; \

196

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

197

test -n "$$unique" || unique=$$empty_fix; \

198

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

199

- $$tags $$unique; \

200

+ if test $$# -gt 0; then \

201

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

202

+ "$$@" $$unique; \

203

+ else \

204

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

205

+ $$unique; \

206

+ fi; \

207

fi

208

ctags: CTAGS

209

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \

210

$(TAGS_FILES) $(LISP)

211

- tags=; \

212

list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \

213

unique=`for i in $$list; do \

214

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

215

done | \

216

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

217

END { if (nonempty) { for (i in files) print i; }; }'`; \

218

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

219

+ test -z "$(CTAGS_ARGS)$$unique" \

220

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

221

- $$tags $$unique

222

+ $$unique

223

224

GTAGS:

225

here=`$(am__cd) $(top_builddir) && pwd` \

226

- && cd $(top_srcdir) \

227

- && gtags -i $(GTAGS_ARGS) $$here

228

+ && $(am__cd) $(top_srcdir) \

229

+ && gtags -i $(GTAGS_ARGS) "$$here"

230

231

distclean-tags:

232

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

233

234

distdir: $(DISTFILES)

235

$(am__remove_distdir)

236

- test -d $(distdir) || mkdir $(distdir)

237

+ test -d "$(distdir)" || mkdir "$(distdir)"

238

@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

239

topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

240

list='$(DISTFILES)'; \

241

@@ -538,38 +578,54 @@

242

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

243

if test -d $$d/$$file; then \

244

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

245

+ if test -d "$(distdir)/$$file"; then \

246

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

247

+ fi; \

248

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

249

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

250

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

251

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

252

fi; \

253

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

254

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

255

else \

256

- test -f $(distdir)/$$file \

257

- || cp -p $$d/$$file $(distdir)/$$file \

258

+ test -f "$(distdir)/$$file" \

259

+ || cp -p $$d/$$file "$(distdir)/$$file" \

260

|| exit 1; \

261

fi; \

262

done

263

- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

264

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

265

if test "$$subdir" = .; then :; else \

266

test -d "$(distdir)/$$subdir" \

267

|| $(MKDIR_P) "$(distdir)/$$subdir" \

268

|| exit 1; \

269

- distdir=`$(am__cd) $(distdir) && pwd`; \

270

- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

271

- (cd $$subdir && \

272

+ fi; \

273

+ done

274

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

275

+ if test "$$subdir" = .; then :; else \

276

+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

277

+ $(am__relativize); \

278

+ new_distdir=$$reldir; \

279

+ dir1=$$subdir; dir2="$(top_distdir)"; \

280

+ $(am__relativize); \

281

+ new_top_distdir=$$reldir; \

282

+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

283

+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

284

+ ($(am__cd) $$subdir && \

285

$(MAKE) $(AM_MAKEFLAGS) \

286

- top_distdir="$$top_distdir" \

287

- distdir="$$distdir/$$subdir" \

288

+ top_distdir="$$new_top_distdir" \

289

+ distdir="$$new_distdir" \

290

am__remove_distdir=: \

291

am__skip_length_check=: \

292

+ am__skip_mode_fix=: \

293

distdir) \

294

|| exit 1; \

295

fi; \

296

done

297

- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \

298

+ -test -n "$(am__skip_mode_fix)" \

299

+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \

300

! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \

301

! -type d ! -perm -400 -exec chmod a+r {} \; -o \

302

! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \

303

- || chmod -R a+r $(distdir)

304

+ || chmod -R a+r "$(distdir)"

305

dist-gzip: distdir

306

tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz

307

$(am__remove_distdir)

308

@@ -581,6 +637,10 @@

309

tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma

310

$(am__remove_distdir)

311

312

+dist-xz: distdir

313

+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz

314

+ $(am__remove_distdir)

315

+

316

dist-tarZ: distdir

317

tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z

318

$(am__remove_distdir)

319

@@ -610,6 +670,8 @@

320

bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\

321

*.tar.lzma*) \

322

unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\

323

+ *.tar.xz*) \

324

+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\

325

*.tar.Z*) \

326

uncompress -c $(distdir).tar.Z | $(am__untar) ;;\

327

*.shar.gz*) \

328

@@ -621,9 +683,11 @@

329

mkdir $(distdir)/_build

330

mkdir $(distdir)/_inst

331

chmod a-w $(distdir)

332

+ test -d $(distdir)/_build || exit 0; \

333

dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \

334

&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \

335

- && cd $(distdir)/_build \

336

+ && am__cwd=`pwd` \

337

+ && $(am__cd) $(distdir)/_build \

338

&& ../configure --srcdir=.. --prefix="$$dc_install_base" \

339

$(DISTCHECK_CONFIGURE_FLAGS) \

340

&& $(MAKE) $(AM_MAKEFLAGS) \

341

@@ -645,13 +709,15 @@

342

&& rm -rf "$$dc_destdir" \

343

&& $(MAKE) $(AM_MAKEFLAGS) dist \

344

&& rm -rf $(DIST_ARCHIVES) \

345

- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck

346

+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \

347

+ && cd "$$am__cwd" \

348

+ || exit 1

349

$(am__remove_distdir)

350

@(echo "$(distdir) archives ready for distribution: "; \

351

list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \

352

sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'

353

distuninstallcheck:

354

- @cd $(distuninstallcheck_dir) \

355

+ @$(am__cd) '$(distuninstallcheck_dir)' \

356

&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \

357

|| { echo "ERROR: files left after uninstall:" ; \

358

if test -n "$(DESTDIR)"; then \

359

@@ -693,6 +759,7 @@

360

361

distclean-generic:

362

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

363

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

364

-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)

365

366

maintainer-clean-generic:

367

@@ -714,6 +781,8 @@

368

369

html: html-recursive

370

371

+html-am:

372

+

373

info: info-recursive

374

375

info-am:

376

@@ -722,18 +791,28 @@

377

378

install-dvi: install-dvi-recursive

379

380

+install-dvi-am:

381

+

382

install-exec-am:

383

384

install-html: install-html-recursive

385

386

+install-html-am:

387

+

388

install-info: install-info-recursive

389

390

+install-info-am:

391

+

392

install-man:

393

394

install-pdf: install-pdf-recursive

395

396

+install-pdf-am:

397

+

398

install-ps: install-ps-recursive

399

400

+install-ps-am:

401

+

402

installcheck-am:

403

404

maintainer-clean: maintainer-clean-recursive

405

@@ -756,24 +835,25 @@

406

407

uninstall-am:

408

409

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

410

- install-strip

411

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \

412

+ ctags-recursive install-am install-strip tags-recursive

413

414

.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

415

all all-am am--refresh check check-am clean clean-generic \

416

clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \

417

- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \

418

- distclean distclean-generic distclean-hdr distclean-libtool \

419

- distclean-local distclean-tags distcleancheck distdir \

420

- distuninstallcheck dvi dvi-am html html-am info info-am \

421

- install install-am install-data install-data-am install-dvi \

422

- install-dvi-am install-exec install-exec-am install-html \

423

- install-html-am install-info install-info-am install-man \

424

- install-pdf install-pdf-am install-ps install-ps-am \

425

- install-strip installcheck installcheck-am installdirs \

426

- installdirs-am maintainer-clean maintainer-clean-generic \

427

- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \

428

- ps ps-am tags tags-recursive uninstall uninstall-am

429

+ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \

430

+ distcheck distclean distclean-generic distclean-hdr \

431

+ distclean-libtool distclean-local distclean-tags \

432

+ distcleancheck distdir distuninstallcheck dvi dvi-am html \

433

+ html-am info info-am install install-am install-data \

434

+ install-data-am install-dvi install-dvi-am install-exec \

435

+ install-exec-am install-html install-html-am install-info \

436

+ install-info-am install-man install-pdf install-pdf-am \

437

+ install-ps install-ps-am install-strip installcheck \

438

+ installcheck-am installdirs installdirs-am maintainer-clean \

439

+ maintainer-clean-generic mostlyclean mostlyclean-generic \

440

+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \

441

+ uninstall uninstall-am

442

443

444

distclean-local:

445

@@ -796,6 +876,7 @@

446

fi

447

448

.PHONY: ChangeLog

449

+

450

# Tell versions [3.59,3.63) of GNU make to not export all variables.

451

# Otherwise a system limit (for SysV at least) may be exceeded.

452

.NOEXPORT:

453

454

=== modified file 'aclocal.m4'

455

--- aclocal.m4 2009-09-17 14:07:29 +0000

456

+++ aclocal.m4 2009-09-17 14:14:14 +0000

457

@@ -1,7 +1,7 @@

458

-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-

459

+# generated automatically by aclocal 1.11 -*- Autoconf -*-

460

461

462

-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

463

+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

464

# This file is free software; the Free Software Foundation

465

# gives unlimited permission to copy and/or distribute it,

466

# with or without modifications, as long as this notice is preserved.

467

@@ -13,8 +13,8 @@

468

469

m4_ifndef([AC_AUTOCONF_VERSION],

470

[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

471

-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,

472

-[m4_warning([this file was generated for autoconf 2.63.

473

+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,

474

+[m4_warning([this file was generated for autoconf 2.64.

475

You have another version of autoconf. It may work, but is not guaranteed to.

476

If you have problems, you may need to regenerate the build system entirely.

477

To do so, use the procedure documented by the package, typically `autoreconf'.])])

478

@@ -55,10 +55,11 @@

479

AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])

480

481

AC_ARG_ENABLE(schemas-install,

482

- [ --disable-schemas-install Disable the schemas installation],

483

+ AC_HELP_STRING([--disable-schemas-install],

484

+ [Disable the schemas installation]),

485

[case ${enableval} in

486

yes|no) ;;

487

- *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;

488

+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;

489

esac])

490

AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])

491

])

492

@@ -750,7 +751,7 @@

493

AC_REQUIRE([AM_MAINTAINER_MODE])

494

495

if test $USE_MAINTAINER_MODE = yes; then

496

- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"

497

+ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"

498

else

499

DISABLE_DEPRECATED=""

500

fi

501

@@ -959,10 +960,10 @@

502

# generated from the m4 files accompanying Automake X.Y.

503

# (This private macro should not be called outside this file.)

504

AC_DEFUN([AM_AUTOMAKE_VERSION],

505

-[am__api_version='1.10'

506

+[am__api_version='1.11'

507

dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

508

dnl require some minimum version. Point them to the right macro.

509

-m4_if([$1], [1.10.2], [],

510

+m4_if([$1], [1.11], [],

511

[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

512

])

513

514

@@ -978,7 +979,7 @@

515

# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

516

# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

517

AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

518

-[AM_AUTOMAKE_VERSION([1.10.2])dnl

519

+[AM_AUTOMAKE_VERSION([1.11])dnl

520

m4_ifndef([AC_AUTOCONF_VERSION],

521

[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

522

_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

523

@@ -1038,14 +1039,14 @@

524

525

# AM_CONDITIONAL -*- Autoconf -*-

526

527

528

529

# Free Software Foundation, Inc.

530

#

531

# This file is free software; the Free Software Foundation

532

# gives unlimited permission to copy and/or distribute it,

533

# with or without modifications, as long as this notice is preserved.

534

535

-# serial 8

536

+# serial 9

537

538

# AM_CONDITIONAL(NAME, SHELL-CONDITION)

539

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

540

@@ -1058,6 +1059,7 @@

541

AC_SUBST([$1_FALSE])dnl

542

_AM_SUBST_NOTMAKE([$1_TRUE])dnl

543

_AM_SUBST_NOTMAKE([$1_FALSE])dnl

544

+m4_define([_AM_COND_VALUE_$1], [$2])dnl

545

if $2; then

546

$1_TRUE=

547

$1_FALSE='#'

548

@@ -1071,14 +1073,14 @@

549

Usually this means the macro was only invoked conditionally.]])

550

fi])])

551

552

553

554

# Free Software Foundation, Inc.

555

#

556

# This file is free software; the Free Software Foundation

557

# gives unlimited permission to copy and/or distribute it,

558

# with or without modifications, as long as this notice is preserved.

559

560

-# serial 9

561

+# serial 10

562

563

# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be

564

# written in clear, in which case automake, when reading aclocal.m4,

565

@@ -1135,6 +1137,16 @@

566

if test "$am_compiler_list" = ""; then

567

am_compiler_list=`sed -n ['s/^#*$[a-zA-Z0-9]*$)$/\1/p'] < ./depcomp`

568

fi

569

+ am__universal=false

570

+ m4_case([$1], [CC],

571

+ [case " $depcc " in #(

572

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

573

+ esac],

574

+ [CXX],

575

+ [case " $depcc " in #(

576

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

577

+ esac])

578

+

579

for depmode in $am_compiler_list; do

580

# Setup a source with many dependencies, because some compilers

581

# like to wrap large dependency lists on column 80 (with \), and

582

@@ -1152,7 +1164,17 @@

583

done

584

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

585

586

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

587

+ # mode. It turns out that the SunPro C++ compiler does not properly

588

+ # handle `-M -o', and we need to detect this. Also, some Intel

589

+ # versions had trouble with output in subdirs

590

+ am__obj=sub/conftest.${OBJEXT-o}

591

+ am__minus_obj="-o $am__obj"

592

case $depmode in

593

+ gcc)

594

+ # This depmode causes a compiler race in universal mode.

595

+ test "$am__universal" = false || continue

596

+ ;;

597

nosideeffect)

598

# after this tag, mechanisms are not by side-effect, so they'll

599

# only be used when explicitly requested

600

@@ -1162,19 +1184,23 @@

601

break

602

fi

603

;;

604

+ msvisualcpp | msvcmsys)

605

+ # This compiler won't grok `-c -o', but also, the minuso test has

606

+ # not run yet. These depmodes are late enough in the game, and

607

+ # so weak that their functioning should not be impacted.

608

+ am__obj=conftest.${OBJEXT-o}

609

+ am__minus_obj=

610

+ ;;

611

none) break ;;

612

esac

613

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

614

- # mode. It turns out that the SunPro C++ compiler does not properly

615

- # handle `-M -o', and we need to detect this.

616

if depmode=$depmode \

617

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

618

+ source=sub/conftest.c object=$am__obj \

619

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

620

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

621

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

622

>/dev/null 2>conftest.err &&

623

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

624

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

625

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

626

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

627

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

628

# icc doesn't choke on unknown options, it will just issue warnings

629

# or remarks (even with -Werror). So we grep stderr for any message

630

@@ -1312,13 +1338,13 @@

631

# Do all the work for Automake. -*- Autoconf -*-

632

633

634

-# 2005, 2006, 2008 Free Software Foundation, Inc.

635

+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.

636

#

637

# This file is free software; the Free Software Foundation

638

# gives unlimited permission to copy and/or distribute it,

639

# with or without modifications, as long as this notice is preserved.

640

641

-# serial 13

642

+# serial 16

643

644

# This macro actually does too much. Some checks are only needed if

645

# your package does certain things. But this isn't really a big deal.

646

@@ -1335,7 +1361,7 @@

647

# arguments mandatory, and then we can depend on a new Autoconf

648

# release and drop the old call support.

649

AC_DEFUN([AM_INIT_AUTOMAKE],

650

-[AC_PREREQ([2.60])dnl

651

+[AC_PREREQ([2.62])dnl

652

dnl Autoconf wants to disallow AM_ names. We explicitly allow

653

dnl the ones we care about.

654

m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl

655

@@ -1386,8 +1412,8 @@

656

AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})

657

AM_MISSING_PROG(AUTOHEADER, autoheader)

658

AM_MISSING_PROG(MAKEINFO, makeinfo)

659

-AM_PROG_INSTALL_SH

660

-AM_PROG_INSTALL_STRIP

661

+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl

662

+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl

663

AC_REQUIRE([AM_PROG_MKDIR_P])dnl

664

# We need awk for the "check" target. The system "awk" is bad on

665

# some platforms.

666

@@ -1395,23 +1421,36 @@

667

AC_REQUIRE([AC_PROG_MAKE_SET])dnl

668

AC_REQUIRE([AM_SET_LEADING_DOT])dnl

669

_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],

670

- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],

671

- [_AM_PROG_TAR([v7])])])

672

+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],

673

+ [_AM_PROG_TAR([v7])])])

674

_AM_IF_OPTION([no-dependencies],,

675

[AC_PROVIDE_IFELSE([AC_PROG_CC],

676

- [_AM_DEPENDENCIES(CC)],

677

- [define([AC_PROG_CC],

678

- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl

679

+ [_AM_DEPENDENCIES(CC)],

680

+ [define([AC_PROG_CC],

681

+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl

682

AC_PROVIDE_IFELSE([AC_PROG_CXX],

683

- [_AM_DEPENDENCIES(CXX)],

684

- [define([AC_PROG_CXX],

685

- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

686

+ [_AM_DEPENDENCIES(CXX)],

687

+ [define([AC_PROG_CXX],

688

+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

689

AC_PROVIDE_IFELSE([AC_PROG_OBJC],

690

- [_AM_DEPENDENCIES(OBJC)],

691

- [define([AC_PROG_OBJC],

692

- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

693

-])

694

-])

695

+ [_AM_DEPENDENCIES(OBJC)],

696

+ [define([AC_PROG_OBJC],

697

+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

698

+])

699

+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl

700

+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the

701

+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro

702

+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.

703

+AC_CONFIG_COMMANDS_PRE(dnl

704

+[m4_provide_if([_AM_COMPILER_EXEEXT],

705

+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl

706

+])

707

+

708

+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not

709

+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further

710

+dnl mangled by Autoconf and run in a shell conditional statement.

711

+m4_define([_AC_COMPILER_EXEEXT],

712

+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])

713

714

715

# When config.status generates a header, we must update the stamp-h file.

716

@@ -1435,7 +1474,7 @@

717

done

718

echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

719

720

721

722

#

723

# This file is free software; the Free Software Foundation

724

# gives unlimited permission to copy and/or distribute it,

725

@@ -1446,7 +1485,14 @@

726

# Define $install_sh.

727

AC_DEFUN([AM_PROG_INSTALL_SH],

728

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

729

-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}

730

+if test x"${install_sh}" != xset; then

731

+ case $am_aux_dir in

732

+ *\ * | *\ *)

733

+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

734

+ *)

735

+ install_sh="\${SHELL} $am_aux_dir/install-sh"

736

+ esac

737

+fi

738

AC_SUBST(install_sh)])

739

740

741

@@ -1473,27 +1519,38 @@

742

# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-

743

# From Jim Meyering

744

745

746

747

# Free Software Foundation, Inc.

748

#

749

# This file is free software; the Free Software Foundation

750

# gives unlimited permission to copy and/or distribute it,

751

# with or without modifications, as long as this notice is preserved.

752

753

-# serial 4

754

+# serial 5

755

756

+# AM_MAINTAINER_MODE([DEFAULT-MODE])

757

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

758

+# Control maintainer-specific portions of Makefiles.

759

+# Default is to disable them, unless `enable' is passed literally.

760

+# For symmetry, `disable' may be passed as well. Anyway, the user

761

+# can override the default with the --enable/--disable switch.

762

AC_DEFUN([AM_MAINTAINER_MODE],

763

-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])

764

- dnl maintainer-mode is disabled by default

765

- AC_ARG_ENABLE(maintainer-mode,

766

-[ --enable-maintainer-mode enable make rules and dependencies not useful

767

+[m4_case(m4_default([$1], [disable]),

768

+ [enable], [m4_define([am_maintainer_other], [disable])],

769

+ [disable], [m4_define([am_maintainer_other], [enable])],

770

+ [m4_define([am_maintainer_other], [enable])

771

+ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])

772

+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])

773

+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed

774

+ AC_ARG_ENABLE([maintainer-mode],

775

+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful

776

(and sometimes confusing) to the casual installer],

777

- USE_MAINTAINER_MODE=$enableval,

778

- USE_MAINTAINER_MODE=no)

779

+ [USE_MAINTAINER_MODE=$enableval],

780

+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))

781

AC_MSG_RESULT([$USE_MAINTAINER_MODE])

782

- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])

783

+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])

784

MAINT=$MAINTAINER_MODE_TRUE

785

- AC_SUBST(MAINT)dnl

786

+ AC_SUBST([MAINT])dnl

787

]

788

)

789

790

@@ -1501,13 +1558,13 @@

791

792

# Check to see how 'make' treats includes. -*- Autoconf -*-

793

794

795

796

#

797

# This file is free software; the Free Software Foundation

798

# gives unlimited permission to copy and/or distribute it,

799

# with or without modifications, as long as this notice is preserved.

800

801

-# serial 3

802

+# serial 4

803

804

# AM_MAKE_INCLUDE()

805

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

806

@@ -1516,7 +1573,7 @@

807

[am_make=${MAKE-make}

808

cat > confinc << 'END'

809

am__doit:

810

- @echo done

811

+ @echo this is the am__doit target

812

.PHONY: am__doit

813

END

814

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

815

@@ -1526,24 +1583,24 @@

816

_am_result=none

817

# First try GNU make style include.

818

echo "include confinc" > confmf

819

-# We grep out `Entering directory' and `Leaving directory'

820

-# messages which can occur if `w' ends up in MAKEFLAGS.

821

-# In particular we don't look at `^make:' because GNU make might

822

-# be invoked under some other name (usually "gmake"), in which

823

-# case it prints its new name instead of `make'.

824

-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then

825

- am__include=include

826

- am__quote=

827

- _am_result=GNU

828

-fi

829

+# Ignore all kinds of additional output from `make'.

830

+case `$am_make -s -f confmf 2> /dev/null` in #(

831

+*the\ am__doit\ target*)

832

+ am__include=include

833

+ am__quote=

834

+ _am_result=GNU

835

+ ;;

836

+esac

837

# Now try BSD make style include.

838

if test "$am__include" = "#"; then

839

echo '.include "confinc"' > confmf

840

- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then

841

- am__include=.include

842

- am__quote="\""

843

- _am_result=BSD

844

- fi

845

+ case `$am_make -s -f confmf 2> /dev/null` in #(

846

+ *the\ am__doit\ target*)

847

+ am__include=.include

848

+ am__quote="\""

849

+ _am_result=BSD

850

+ ;;

851

+ esac

852

fi

853

AC_SUBST([am__include])

854

AC_SUBST([am__quote])

855

@@ -1553,14 +1610,14 @@

856

857

# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-

858

859

860

861

# Free Software Foundation, Inc.

862

#

863

# This file is free software; the Free Software Foundation

864

# gives unlimited permission to copy and/or distribute it,

865

# with or without modifications, as long as this notice is preserved.

866

867

-# serial 5

868

+# serial 6

869

870

# AM_MISSING_PROG(NAME, PROGRAM)

871

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

872

@@ -1577,7 +1634,14 @@

873

AC_DEFUN([AM_MISSING_HAS_RUN],

874

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

875

AC_REQUIRE_AUX_FILE([missing])dnl

876

-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"

877

+if test x"${MISSING+set}" != xset; then

878

+ case $am_aux_dir in

879

+ *\ * | *\ *)

880

+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;

881

+ *)

882

+ MISSING="\${SHELL} $am_aux_dir/missing" ;;

883

+ esac

884

+fi

885

# Use eval to expand $SHELL

886

if eval "$MISSING --run true"; then

887

am_missing_run="$MISSING --run "

888

@@ -1646,7 +1710,7 @@

889

AC_DEFUN([_AM_IF_OPTION],

890

[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])

891

892

893

894

# Free Software Foundation, Inc.

895

#

896

# This file is free software; the Free Software Foundation

897

@@ -1677,13 +1741,11 @@

898

# numbers and dots only.

899

AC_DEFUN([AM_PATH_PYTHON],

900

[

901

- dnl Find a Python interpreter. Python versions prior to 1.5 are not

902

- dnl supported because the default installation locations changed from

903

- dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages

904

- dnl in 1.5.

905

+ dnl Find a Python interpreter. Python versions prior to 2.0 are not

906

+ dnl supported. (2.0 was released on October 16, 2000).

907

m4_define_default([_AM_PYTHON_INTERPRETER_LIST],

908

- [python python2 python2.5 python2.4 python2.3 python2.2 dnl

909

-python2.1 python2.0 python1.6 python1.5])

910

+ [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl

911

+python2.1 python2.0])

912

913

m4_if([$1],[],[

914

dnl No version check is needed.

915

@@ -1730,7 +1792,7 @@

916

dnl library.

917

918

AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],

919

- [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])

920

+ [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])

921

AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])

922

923

dnl Use the values of $prefix and $exec_prefix for the corresponding

924

@@ -1745,7 +1807,7 @@

925

dnl to know which OS platform Python thinks this is.

926

927

AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],

928

- [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])

929

+ [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])

930

AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])

931

932

933

@@ -1762,12 +1824,19 @@

934

[am_cv_python_pythondir],

935

[if test "x$prefix" = xNONE

936

then

937

- py_prefix_arg=

938

+ am_py_prefix=$ac_default_prefix

939

else

940

- py_prefix_arg=",prefix='$prefix'"

941

+ am_py_prefix=$prefix

942

fi

943

- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null ||

944

- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])

945

+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||

946

+ echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`

947

+ case $am_cv_python_pythondir in

948

+ $am_py_prefix*)

949

+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`

950

+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`

951

+ ;;

952

+ esac

953

+ ])

954

AC_SUBST([pythondir], [$am_cv_python_pythondir])

955

956

dnl pkgpythondir -- $PACKAGE directory under pythondir. Was

957

@@ -1785,12 +1854,19 @@

958

[am_cv_python_pyexecdir],

959

[if test "x$exec_prefix" = xNONE

960

then

961

- py_exec_prefix_arg=$py_prefix_arg

962

+ am_py_exec_prefix=$am_py_prefix

963

else

964

- py_exec_prefix_arg=",prefix='$exec_prefix'"

965

+ am_py_exec_prefix=$exec_prefix

966

fi

967

- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null ||

968

- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])

969

+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||

970

+ echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`

971

+ case $am_cv_python_pyexecdir in

972

+ $am_py_exec_prefix*)

973

+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`

974

+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`

975

+ ;;

976

+ esac

977

+ ])

978

AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])

979

980

dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)

981

@@ -1810,15 +1886,16 @@

982

# Run ACTION-IF-FALSE otherwise.

983

# This test uses sys.hexversion instead of the string equivalent (first

984

# word of sys.version), in order to cope with versions such as 2.2c1.

985

-# hexversion has been introduced in Python 1.5.2; it's probably not

986

-# worth to support older versions (1.5.1 was released on October 31, 1998).

987

+# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).

988

AC_DEFUN([AM_PYTHON_CHECK_VERSION],

989

- [prog="import sys, string

990

+ [prog="import sys

991

# split strings by '.' and convert to numeric. Append some zeros

992

# because we need at least 4 digits for the hex conversion.

993

-minver = map(int, string.split('$2', '.')) + [[0, 0, 0]]

994

+# map returns an iterator in Python 3.0 and a list in 2.x

995

+minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]

996

minverhex = 0

997

-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]]

998

+# xrange is not present in Python 3.0 and range returns an iterator

999

+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]

1000

sys.exit(sys.hexversion < minverhex)"

1001

AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])

1002

1003

@@ -1841,14 +1918,14 @@

1004

1005

# Check to make sure that the build environment is sane. -*- Autoconf -*-

1006

1007

1008

1009

# Free Software Foundation, Inc.

1010

#

1011

# This file is free software; the Free Software Foundation

1012

# gives unlimited permission to copy and/or distribute it,

1013

# with or without modifications, as long as this notice is preserved.

1014

1015

-# serial 4

1016

+# serial 5

1017

1018

# AM_SANITY_CHECK

1019

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

1020

@@ -1857,16 +1934,29 @@

1021

# Just in case

1022

sleep 1

1023

echo timestamp > conftest.file

1024

+# Reject unsafe characters in $srcdir or the absolute working directory

1025

+# name. Accept space and tab only in the latter.

1026

+am_lf='

1027

+'

1028

+case `pwd` in

1029

+ *[[\\\"\#\$\&\'\`$am_lf]]*)

1030

+ AC_MSG_ERROR([unsafe absolute working directory name]);;

1031

+esac

1032

+case $srcdir in

1033

+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)

1034

+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;

1035

+esac

1036

+

1037

# Do `set' in a subshell so we don't clobber the current shell's

1038

# arguments. Must try -L first in case configure is actually a

1039

# symlink; some systems play weird games with the mod time of symlinks

1040

# (eg FreeBSD returns the mod time of the symlink's containing

1041

# directory).

1042

if (

1043

- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`

1044

+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

1045

if test "$[*]" = "X"; then

1046

# -L didn't work.

1047

- set X `ls -t $srcdir/configure conftest.file`

1048

+ set X `ls -t "$srcdir/configure" conftest.file`

1049

fi

1050

rm -f conftest.file

1051

if test "$[*]" != "X $srcdir/configure conftest.file" \

1052

@@ -1919,18 +2009,25 @@

1053

INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

1054

AC_SUBST([INSTALL_STRIP_PROGRAM])])

1055

1056

1057

1058

#

1059

# This file is free software; the Free Software Foundation

1060

# gives unlimited permission to copy and/or distribute it,

1061

# with or without modifications, as long as this notice is preserved.

1062

1063

+# serial 2

1064

+

1065

# _AM_SUBST_NOTMAKE(VARIABLE)

1066

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

1067

# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.

1068

# This macro is traced by Automake.

1069

AC_DEFUN([_AM_SUBST_NOTMAKE])

1070

1071

+# AM_SUBST_NOTMAKE(VARIABLE)

1072

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

1073

+# Public sister of _AM_SUBST_NOTMAKE.

1074

+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

1075

+

1076

# Check how to create a tarball. -*- Autoconf -*-

1077

1078

1079

1080

=== modified file 'config.guess'

1081

--- config.guess 2009-09-17 14:07:29 +0000

1082

+++ config.guess 2009-09-17 14:14:15 +0000

1083

@@ -4,7 +4,7 @@

1084

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

1085

# Free Software Foundation, Inc.

1086

1087

-timestamp='2008-01-23'

1088

+timestamp='2009-04-27'

1089

1090

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

1091

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

1092

@@ -324,6 +324,9 @@

1093

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

1094

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

1095

esac ;;

1096

+ s390x:SunOS:*:*)

1097

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

1098

+ exit ;;

1099

sun4H:SunOS:5.*:*)

1100

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

1101

exit ;;

1102

@@ -331,7 +334,20 @@

1103

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

1104

exit ;;

1105

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

1106

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

1107

+ eval $set_cc_for_build

1108

+ SUN_ARCH="i386"

1109

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

1110

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

1111

+ # This test works for both compilers.

1112

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

1113

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

1114

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

1115

+ grep IS_64BIT_ARCH >/dev/null

1116

+ then

1117

+ SUN_ARCH="x86_64"

1118

+ fi

1119

+ fi

1120

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

1121

exit ;;

1122

sun4*:SunOS:6*:*)

1123

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

1124

@@ -796,7 +812,7 @@

1125

x86)

1126

echo i586-pc-interix${UNAME_RELEASE}

1127

exit ;;

1128

- EM64T | authenticamd)

1129

+ EM64T | authenticamd | genuineintel)

1130

echo x86_64-unknown-interix${UNAME_RELEASE}

1131

exit ;;

1132

IA64)

1133

@@ -935,6 +951,9 @@

1134

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

1135

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

1136

exit ;;

1137

+ padre:Linux:*:*)

1138

+ echo sparc-unknown-linux-gnu

1139

+ exit ;;

1140

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

1141

# Look for CPU level

1142

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

1143

@@ -985,9 +1004,6 @@

1144

a.out-i386-linux)

1145

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

1146

exit ;;

1147

- coff-i386)

1148

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

1149

- exit ;;

1150

"")

1151

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

1152

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

1153

@@ -1102,8 +1118,11 @@

1154

pc:*:*:*)

1155

# Left here for compatibility:

1156

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

1157

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

1158

- echo i386-pc-msdosdjgpp

1159

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

1160

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

1161

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

1162

+ # this is a cross-build.

1163

+ echo i586-pc-msdosdjgpp

1164

exit ;;

1165

Intel:Mach:3*:*)

1166

echo i386-pc-mach3

1167

@@ -1141,6 +1160,16 @@

1168

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

1169

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

1170

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

1171

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

1172

+ OS_REL='.3'

1173

+ test -r /etc/.relid \

1174

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

1175

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

1176

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

1177

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

1178

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

1179

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

1180

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

1181

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

1182

echo m68k-unknown-lynxos${UNAME_RELEASE}

1183

exit ;;

1184

@@ -1216,6 +1245,9 @@

1185

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

1186

echo i586-pc-beos

1187

exit ;;

1188

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

1189

+ echo i586-pc-haiku

1190

+ exit ;;

1191

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

1192

echo sx4-nec-superux${UNAME_RELEASE}

1193

exit ;;

1194

@@ -1324,6 +1356,9 @@

1195

i*86:rdos:*:*)

1196

echo ${UNAME_MACHINE}-pc-rdos

1197

exit ;;

1198

+ i*86:AROS:*:*)

1199

+ echo ${UNAME_MACHINE}-pc-aros

1200

+ exit ;;

1201

esac

1202

1203

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

1204

1205

=== modified file 'config.h.in'

1206

--- config.h.in 2009-09-17 14:07:29 +0000

1207

+++ config.h.in 2009-09-17 14:14:15 +0000

1208

@@ -39,6 +39,9 @@

1209

/* Define if you have libchamplain */

1210

#undef HAVE_LIBCHAMPLAIN

1211

1212

+/* Define if you have libindicate */

1213

+#undef HAVE_LIBINDICATE

1214

+

1215

/* Define to 1 if you have the <locale.h> header file. */

1216

#undef HAVE_LOCALE_H

1217

1218

@@ -94,6 +97,9 @@

1219

/* Define to the one symbol short name of this package. */

1220

#undef PACKAGE_TARNAME

1221

1222

+/* Define to the home page for this package. */

1223

+#undef PACKAGE_URL

1224

+

1225

/* Define to the version of this package. */

1226

#undef PACKAGE_VERSION

1227

1228

1229

=== modified file 'config.sub'

1230

--- config.sub 2009-09-17 14:07:29 +0000

1231

+++ config.sub 2009-09-17 14:14:15 +0000

1232

@@ -4,7 +4,7 @@

1233

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

1234

# Free Software Foundation, Inc.

1235

1236

-timestamp='2008-01-16'

1237

+timestamp='2009-04-17'

1238

1239

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

1240

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

1241

@@ -122,6 +122,7 @@

1242

case $maybe_os in

1243

1244

1245

+ kopensolaris*-gnu* | \

1246

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

1247

os=-$maybe_os

1248

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

1249

@@ -249,13 +250,16 @@

1250

1251

| i370 | i860 | i960 | ia64 \

1252

| ip2k | iq2000 \

1253

+ | lm32 \

1254

| m32c | m32r | m32rle | m68000 | m68k | m88k \

1255

- | maxq | mb | microblaze | mcore | mep \

1256

+ | maxq | mb | microblaze | mcore | mep | metag \

1257

1258

| mips16 \

1259

| mips64 | mips64el \

1260

+ | mips64octeon | mips64octeonel \

1261

+ | mips64orion | mips64orionel \

1262

+ | mips64r5900 | mips64r5900el \

1263

| mips64vr | mips64vrel \

1264

- | mips64orion | mips64orionel \

1265

| mips64vr4100 | mips64vr4100el \

1266

| mips64vr4300 | mips64vr4300el \

1267

| mips64vr5000 | mips64vr5000el \

1268

@@ -268,6 +272,7 @@

1269

| mipsisa64sr71k | mipsisa64sr71kel \

1270

| mipstx39 | mipstx39el \

1271

| mn10200 | mn10300 \

1272

+ | moxie \

1273

| mt \

1274

| msp430 \

1275

| nios | nios2 \

1276

@@ -277,7 +282,7 @@

1277

1278

| pyramid \

1279

| score \

1280

- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

1281

+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

1282

| sh64 | sh64le \

1283

1284

| sparcv8 | sparcv9 | sparcv9b | sparcv9v \

1285

@@ -286,7 +291,7 @@

1286

| v850 | v850e \

1287

| we32k \

1288

1289

- | z8k)

1290

+ | z8k | z80)

1291

basic_machine=$basic_machine-unknown

1292

;;

1293

m6811 | m68hc11 | m6812 | m68hc12)

1294

@@ -329,14 +334,17 @@

1295

1296

| i*86-* | i860-* | i960-* | ia64-* \

1297

| ip2k-* | iq2000-* \

1298

+ | lm32-* \

1299

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

1300

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

1301

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

1302

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

1303

1304

| mips16-* \

1305

| mips64-* | mips64el-* \

1306

+ | mips64octeon-* | mips64octeonel-* \

1307

+ | mips64orion-* | mips64orionel-* \

1308

+ | mips64r5900-* | mips64r5900el-* \

1309

| mips64vr-* | mips64vrel-* \

1310

- | mips64orion-* | mips64orionel-* \

1311

| mips64vr4100-* | mips64vr4100el-* \

1312

| mips64vr4300-* | mips64vr4300el-* \

1313

| mips64vr5000-* | mips64vr5000el-* \

1314

@@ -358,20 +366,20 @@

1315

1316

| pyramid-* \

1317

| romp-* | rs6000-* \

1318

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

1319

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

1320

1321

1322

| sparclite-* \

1323

1324

| tahoe-* | thumb-* \

1325

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

1326

1327

| tron-* \

1328

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

1329

| we32k-* \

1330

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

1331

| xstormy16-* | xtensa*-* \

1332

| ymp-* \

1333

- | z8k-*)

1334

+ | z8k-* | z80-*)

1335

;;

1336

# Recognize the basic CPU types without company name, with glob match.

1337

xtensa*)

1338

@@ -439,6 +447,10 @@

1339

basic_machine=m68k-apollo

1340

os=-bsd

1341

;;

1342

+ aros)

1343

+ basic_machine=i386-pc

1344

+ os=-aros

1345

+ ;;

1346

aux)

1347

basic_machine=m68k-apple

1348

os=-aux

1349

@@ -459,6 +471,10 @@

1350

basic_machine=c90-cray

1351

os=-unicos

1352

;;

1353

+ cegcc)

1354

+ basic_machine=arm-unknown

1355

+ os=-cegcc

1356

+ ;;

1357

convex-c1)

1358

basic_machine=c1-convex

1359

os=-bsd

1360

@@ -526,6 +542,10 @@

1361

basic_machine=m88k-motorola

1362

os=-sysv3

1363

;;

1364

+ dicos)

1365

+ basic_machine=i686-pc

1366

+ os=-dicos

1367

+ ;;

1368

djgpp)

1369

basic_machine=i586-pc

1370

os=-msdosdjgpp

1371

@@ -1128,6 +1148,10 @@

1372

basic_machine=z8k-unknown

1373

os=-sim

1374

;;

1375

+ z80-*-coff)

1376

+ basic_machine=z80-unknown

1377

+ os=-sim

1378

+ ;;

1379

none)

1380

basic_machine=none-none

1381

os=-none

1382

@@ -1166,7 +1190,7 @@

1383

we32k)

1384

basic_machine=we32k-att

1385

;;

1386

- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)

1387

1388

basic_machine=sh-unknown

1389

;;

1390

sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)

1391

@@ -1238,8 +1262,9 @@

1392

1393

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

1394

1395

+ | -kopensolaris* \

1396

1397

- | -aos* \

1398

+ | -aos* | -aros* \

1399

1400

1401

1402

@@ -1248,7 +1273,7 @@

1403

1404

1405

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

1406

- | -chorusos* | -chorusrdb* \

1407

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

1408

1409

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

1410

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

1411

@@ -1388,6 +1413,9 @@

1412

-zvmoe)

1413

os=-zvmoe

1414

;;

1415

+ -dicos*)

1416

+ os=-dicos

1417

+ ;;

1418

-none)

1419

;;

1420

*)

1421

1422

=== modified file 'configure'

1423

--- configure 2009-09-17 14:07:29 +0000

1424

+++ configure 2009-09-17 14:14:15 +0000

1425

@@ -1,11 +1,13 @@

1426

#! /bin/sh

1427

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

1428

-# Generated by GNU Autoconf 2.63 for Empathy 2.27.92.

1429

+# Generated by GNU Autoconf 2.64 for Empathy 2.27.92.

1430

#

1431

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

1432

#

1433

1434

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

1435

+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software

1436

+# Foundation, Inc.

1437

+#

1438

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

1439

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

1440

#

1441

@@ -13,13 +15,13 @@

1442

1443

1444

#

1445

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

1446

-## M4sh Initialization. ##

1447

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

1448

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

1449

+## M4sh Initialization. ##

1450

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

1451

1452

# Be more Bourne compatible

1453

DUALCASE=1; export DUALCASE # for MKS sh

1454

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

1455

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

1456

emulate sh

1457

NULLCMD=:

1458

# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

1459

@@ -27,23 +29,15 @@

1460

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

1461

setopt NO_GLOB_SUBST

1462

else

1463

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

1464

- *posix*) set -o posix ;;

1465

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

1466

+ *posix*) :

1467

+ set -o posix ;; #(

1468

+ *) :

1469

+ ;;

1470

esac

1471

-

1472

fi

1473

1474

1475

-

1476

-

1477

-# PATH needs CR

1478

-# Avoid depending upon Character Ranges.

1479

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

1480

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

1481

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

1482

-as_cr_digits='0123456789'

1483

-as_cr_alnum=$as_cr_Letters$as_cr_digits

1484

-

1485

as_nl='

1486

'

1487

export as_nl

1488

@@ -51,7 +45,13 @@

1489

as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

1490

as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

1491

as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

1492

-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

1493

+# Prefer a ksh shell builtin over an external printf program on Solaris,

1494

+# but without wasting forks for bash or zsh.

1495

+if test -z "$BASH_VERSION$ZSH_VERSION" \

1496

+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then

1497

+ as_echo='print -r --'

1498

+ as_echo_n='print -rn --'

1499

+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

1500

as_echo='printf %s\n'

1501

as_echo_n='printf %s'

1502

else

1503

@@ -62,7 +62,7 @@

1504

as_echo_body='eval expr "X$1" : "X\$.*\$"'

1505

as_echo_n_body='eval

1506

arg=$1;

1507

- case $arg in

1508

+ case $arg in #(

1509

*"$as_nl"*)

1510

expr "X$arg" : "X\$.*\$$as_nl";

1511

arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;

1512

@@ -85,13 +85,6 @@

1513

}

1514

fi

1515

1516

-# Support unset when possible.

1517

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

1518

- as_unset=unset

1519

-else

1520

- as_unset=false

1521

-fi

1522

-

1523

1524

# IFS

1525

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

1526

@@ -101,15 +94,15 @@

1527

IFS=" "" $as_nl"

1528

1529

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

1530

-case $0 in

1531

+case $0 in #((

1532

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

1533

*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

1534

for as_dir in $PATH

1535

do

1536

IFS=$as_save_IFS

1537

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

1538

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

1539

-done

1540

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

1541

+ done

1542

IFS=$as_save_IFS

1543

1544

;;

1545

@@ -121,12 +114,16 @@

1546

fi

1547

if test ! -f "$as_myself"; then

1548

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

1549

- { (exit 1); exit 1; }

1550

+ exit 1

1551

fi

1552

1553

-# Work around bugs in pre-3.0 UWIN ksh.

1554

-for as_var in ENV MAIL MAILPATH

1555

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

1556

+# Unset variables that we do not need and which cause bugs (e.g. in

1557

+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"

1558

+# suppresses any "Segmentation fault" message there. '((' could

1559

+# trigger a bug in pdksh 5.2.14.

1560

+for as_var in BASH_ENV ENV MAIL MAILPATH

1561

+do eval test x\${$as_var+set} = xset \

1562

+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :

1563

done

1564

PS1='$ '

1565

PS2='> '

1566

@@ -138,330 +135,301 @@

1567

LANGUAGE=C

1568

export LANGUAGE

1569

1570

-# Required to use basename.

1571

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

1572

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

1573

- as_expr=expr

1574

-else

1575

- as_expr=false

1576

-fi

1577

-

1578

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

1579

- as_basename=basename

1580

-else

1581

- as_basename=false

1582

-fi

1583

-

1584

-

1585

-# Name of the executable.

1586

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

1587

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

1588

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

1589

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

1590

-$as_echo X/"$0" |

1591

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

1592

- s//\1/

1593

- q

1594

- }

1595

- /^X\/$\/\/$$/{

1596

- s//\1/

1597

- q

1598

- }

1599

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

1600

- s//\1/

1601

- q

1602

- }

1603

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

1604

-

1605

# CDPATH.

1606

-$as_unset CDPATH

1607

-

1608

+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

1609

1610

if test "x$CONFIG_SHELL" = x; then

1611

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

1612

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

1613

+ emulate sh

1614

+ NULLCMD=:

1615

+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which

1616

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

1617

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

1618

+ setopt NO_GLOB_SUBST

1619

+else

1620

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

1621

+ *posix*) :

1622

+ set -o posix ;; #(

1623

+ *) :

1624

+ ;;

1625

+esac

1626

+fi

1627

+"

1628

+ as_required="as_fn_return () { (exit \$1); }

1629

+as_fn_success () { as_fn_return 0; }

1630

+as_fn_failure () { as_fn_return 1; }

1631

+as_fn_ret_success () { return 0; }

1632

+as_fn_ret_failure () { return 1; }

1633

+

1634

+exitcode=0

1635

+as_fn_success || { exitcode=1; echo as_fn_success failed.; }

1636

+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }

1637

+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }

1638

+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }

1639

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

1640

+

1641

+else

1642

+ exitcode=1; echo positional parameters were not saved.

1643

+fi

1644

+test x\$exitcode = x0 || exit 1"

1645

+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO

1646

+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO

1647

+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&

1648

+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1

1649

+test \$(( 1 + 1 )) = 2 || exit 1"

1650

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

1651

as_have_required=yes

1652

else

1653

as_have_required=no

1654

fi

1655

-

1656

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

1657

-(as_func_return () {

1658

- (exit \$1)

1659

-}

1660

-as_func_success () {

1661

- as_func_return 0

1662

-}

1663

-as_func_failure () {

1664

- as_func_return 1

1665

-}

1666

-as_func_ret_success () {

1667

- return 0

1668

-}

1669

-as_func_ret_failure () {

1670

- return 1

1671

-}

1672

-

1673

-exitcode=0

1674

-if as_func_success; then

1675

- :

1676

-else

1677

- exitcode=1

1678

- echo as_func_success failed.

1679

-fi

1680

-

1681

-if as_func_failure; then

1682

- exitcode=1

1683

- echo as_func_failure succeeded.

1684

-fi

1685

-

1686

-if as_func_ret_success; then

1687

- :

1688

-else

1689

- exitcode=1

1690

- echo as_func_ret_success failed.

1691

-fi

1692

-

1693

-if as_func_ret_failure; then

1694

- exitcode=1

1695

- echo as_func_ret_failure succeeded.

1696

-fi

1697

-

1698

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

1699

- :

1700

-else

1701

- exitcode=1

1702

- echo positional parameters were not saved.

1703

-fi

1704

-

1705

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

1706

-

1707

-(

1708

- as_lineno_1=\$LINENO

1709

- as_lineno_2=\$LINENO

1710

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

1711

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

1712

-") 2> /dev/null; then

1713

- :

1714

-else

1715

- as_candidate_shells=

1716

- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

1717

+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :

1718

+

1719

+else

1720

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

1721

+as_found=false

1722

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

1723

do

1724

IFS=$as_save_IFS

1725

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

1726

- case $as_dir in

1727

+ as_found=:

1728

+ case $as_dir in #(

1729

/*)

1730

for as_base in sh bash ksh sh5; do

1731

- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"

1732

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

1733

+ as_shell=$as_dir/$as_base

1734

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

1735

+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :

1736

+ CONFIG_SHELL=$as_shell as_have_required=yes

1737

+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :

1738

+ break 2

1739

+fi

1740

+fi

1741

done;;

1742

esac

1743

+ as_found=false

1744

done

1745

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

1746

+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :

1747

+ CONFIG_SHELL=$SHELL as_have_required=yes

1748

+fi; }

1749

IFS=$as_save_IFS

1750

1751

1752

- for as_shell in $as_candidate_shells $SHELL; do

1753

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

1754

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

1755

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

1756

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

1757

- emulate sh

1758

- NULLCMD=:

1759

- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

1760

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

1761

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

1762

- setopt NO_GLOB_SUBST

1763

-else

1764

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

1765

- *posix*) set -o posix ;;

1766

-esac

1767

-

1768

-fi

1769

-

1770

-

1771

-:

1772

-_ASEOF

1773

-}; then

1774

- CONFIG_SHELL=$as_shell

1775

- as_have_required=yes

1776

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

1777

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

1778

- emulate sh

1779

- NULLCMD=:

1780

- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

1781

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

1782

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

1783

- setopt NO_GLOB_SUBST

1784

-else

1785

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

1786

- *posix*) set -o posix ;;

1787

-esac

1788

-

1789

-fi

1790

-

1791

-

1792

-:

1793

-(as_func_return () {

1794

- (exit $1)

1795

-}

1796

-as_func_success () {

1797

- as_func_return 0

1798

-}

1799

-as_func_failure () {

1800

- as_func_return 1

1801

-}

1802

-as_func_ret_success () {

1803

- return 0

1804

-}

1805

-as_func_ret_failure () {

1806

- return 1

1807

-}

1808

-

1809

-exitcode=0

1810

-if as_func_success; then

1811

- :

1812

-else

1813

- exitcode=1

1814

- echo as_func_success failed.

1815

-fi

1816

-

1817

-if as_func_failure; then

1818

- exitcode=1

1819

- echo as_func_failure succeeded.

1820

-fi

1821

-

1822

-if as_func_ret_success; then

1823

- :

1824

-else

1825

- exitcode=1

1826

- echo as_func_ret_success failed.

1827

-fi

1828

-

1829

-if as_func_ret_failure; then

1830

- exitcode=1

1831

- echo as_func_ret_failure succeeded.

1832

-fi

1833

-

1834

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

1835

- :

1836

-else

1837

- exitcode=1

1838

- echo positional parameters were not saved.

1839

-fi

1840

-

1841

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

1842

-

1843

-(

1844

- as_lineno_1=$LINENO

1845

- as_lineno_2=$LINENO

1846

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

1847

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

1848

-

1849

-_ASEOF

1850

-}; then

1851

- break

1852

-fi

1853

-

1854

-fi

1855

-

1856

- done

1857

-

1858

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

1859

- for as_var in BASH_ENV ENV

1860

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

1861

- done

1862

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

1863

+ # We cannot yet assume a decent shell, so we have to provide a

1864

+ # neutralization value for shells without unset; and this also

1865

+ # works around shells that cannot unset nonexistent variables.

1866

+ BASH_ENV=/dev/null

1867

+ ENV=/dev/null

1868

+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV

1869

export CONFIG_SHELL

1870

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

1871

fi

1872

1873

-

1874

- if test $as_have_required = no; then

1875

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

1876

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

1877

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

1878

- echo shell if you do have one.

1879

- { (exit 1); exit 1; }

1880

-fi

1881

-

1882

-

1883

-fi

1884

-

1885

-fi

1886

-

1887

-

1888

-

1889

-(eval "as_func_return () {

1890

- (exit \$1)

1891

-}

1892

-as_func_success () {

1893

- as_func_return 0

1894

-}

1895

-as_func_failure () {

1896

- as_func_return 1

1897

-}

1898

-as_func_ret_success () {

1899

- return 0

1900

-}

1901

-as_func_ret_failure () {

1902

- return 1

1903

-}

1904

-

1905

-exitcode=0

1906

-if as_func_success; then

1907

- :

1908

-else

1909

- exitcode=1

1910

- echo as_func_success failed.

1911

-fi

1912

-

1913

-if as_func_failure; then

1914

- exitcode=1

1915

- echo as_func_failure succeeded.

1916

-fi

1917

-

1918

-if as_func_ret_success; then

1919

- :

1920

-else

1921

- exitcode=1

1922

- echo as_func_ret_success failed.

1923

-fi

1924

-

1925

-if as_func_ret_failure; then

1926

- exitcode=1

1927

- echo as_func_ret_failure succeeded.

1928

-fi

1929

-

1930

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

1931

- :

1932

-else

1933

- exitcode=1

1934

- echo positional parameters were not saved.

1935

-fi

1936

-

1937

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

1938

- echo No shell found that supports shell functions.

1939

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

1940

- echo including any error possibly output before this message.

1941

- echo This can help us improve future autoconf versions.

1942

- echo Configuration will now proceed without shell functions.

1943

-}

1944

-

1945

-

1946

-

1947

- as_lineno_1=$LINENO

1948

- as_lineno_2=$LINENO

1949

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

1950

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

1951

-

1952

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

1953

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

1954

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

1955

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

1956

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

1957

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

1958

- # case at line end.

1959

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

1960

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

1961

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

1962

+ if test x$as_have_required = xno; then :

1963

+ $as_echo "$0: This script requires a shell more modern than all"

1964

+ $as_echo "$0: the shells that I found on your system."

1965

+ if test x${ZSH_VERSION+set} = xset ; then

1966

+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"

1967

+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."

1968

+ else

1969

+ $as_echo "$0: Please tell bug-autoconf@gnu.org and

1970

+$0: http://bugzilla.gnome.org/browse.cgi?product=empathy

1971

+$0: about your system, including any error possibly output

1972

+$0: before this message. Then install a modern shell, or

1973

+$0: manually run the script under such a shell if you do

1974

+$0: have one."

1975

+ fi

1976

+ exit 1

1977

+fi

1978

+fi

1979

+fi

1980

+SHELL=${CONFIG_SHELL-/bin/sh}

1981

+export SHELL

1982

+# Unset more variables known to interfere with behavior of common tools.

1983

+CLICOLOR_FORCE= GREP_OPTIONS=

1984

+unset CLICOLOR_FORCE GREP_OPTIONS

1985

+

1986

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

1987

+## M4sh Shell Functions. ##

1988

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

1989

+# as_fn_unset VAR

1990

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

1991

+# Portably unset VAR.

1992

+as_fn_unset ()

1993

+{

1994

+ { eval $1=; unset $1;}

1995

+}

1996

+as_unset=as_fn_unset

1997

+

1998

+# as_fn_set_status STATUS

1999

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

2000

+# Set $? to STATUS, without forking.

2001

+as_fn_set_status ()

2002

+{

2003

+ return $1

2004

+} # as_fn_set_status

2005

+

2006

+# as_fn_exit STATUS

2007

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

2008

+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.

2009

+as_fn_exit ()

2010

+{

2011

+ set +e

2012

+ as_fn_set_status $1

2013

+ exit $1

2014

+} # as_fn_exit

2015

+

2016

+# as_fn_mkdir_p

2017

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

2018

+# Create "$as_dir" as a directory, including parents if necessary.

2019

+as_fn_mkdir_p ()

2020

+{

2021

+

2022

+ case $as_dir in #(

2023

+ -*) as_dir=./$as_dir;;

2024

+ esac

2025

+ test -d "$as_dir" || eval $as_mkdir_p || {

2026

+ as_dirs=

2027

+ while :; do

2028

+ case $as_dir in #(

2029

+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

2030

+ *) as_qdir=$as_dir;;

2031

+ esac

2032

+ as_dirs="'$as_qdir' $as_dirs"

2033

+ as_dir=`$as_dirname -- "$as_dir" ||

2034

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

2035

+ X"$as_dir" : 'X$//$[^/]' \| \

2036

+ X"$as_dir" : 'X$//$$' \| \

2037

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

2038

+$as_echo X"$as_dir" |

2039

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

2040

+ s//\1/

2041

+ q

2042

+ }

2043

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

2044

+ s//\1/

2045

+ q

2046

+ }

2047

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

2048

+ s//\1/

2049

+ q

2050

+ }

2051

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

2052

+ s//\1/

2053

+ q

2054

+ }

2055

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

2056

+ test -d "$as_dir" && break

2057

+ done

2058

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

2059

+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"

2060

+

2061

+

2062

+} # as_fn_mkdir_p

2063

+# as_fn_append VAR VALUE

2064

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

2065

+# Append the text in VALUE to the end of the definition contained in VAR. Take

2066

+# advantage of any shell optimizations that allow amortized linear growth over

2067

+# repeated appends, instead of the typical quadratic growth present in naive

2068

+# implementations.

2069

+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :

2070

+ eval 'as_fn_append ()

2071

+ {

2072

+ eval $1+=\$2

2073

+ }'

2074

+else

2075

+ as_fn_append ()

2076

+ {

2077

+ eval $1=\$$1\$2

2078

+ }

2079

+fi # as_fn_append

2080

+

2081

+# as_fn_arith ARG...

2082

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

2083

+# Perform arithmetic evaluation on the ARGs, and store the result in the

2084

+# global $as_val. Take advantage of shells that can avoid forks. The arguments

2085

+# must be portable across $(()) and expr.

2086

+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :

2087

+ eval 'as_fn_arith ()

2088

+ {

2089

+ as_val=$(( $* ))

2090

+ }'

2091

+else

2092

+ as_fn_arith ()

2093

+ {

2094

+ as_val=`expr "$@" || test $? -eq 1`

2095

+ }

2096

+fi # as_fn_arith

2097

+

2098

+

2099

+# as_fn_error ERROR [LINENO LOG_FD]

2100

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

2101

+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

2102

+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

2103

+# script with status $?, using 1 if that was 0.

2104

+as_fn_error ()

2105

+{

2106

+ as_status=$?; test $as_status -eq 0 && as_status=1

2107

+ if test "$3"; then

2108

+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

2109

+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3

2110

+ fi

2111

+ $as_echo "$as_me: error: $1" >&2

2112

+ as_fn_exit $as_status

2113

+} # as_fn_error

2114

+

2115

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

2116

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

2117

+ as_expr=expr

2118

+else

2119

+ as_expr=false

2120

+fi

2121

+

2122

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

2123

+ as_basename=basename

2124

+else

2125

+ as_basename=false

2126

+fi

2127

+

2128

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

2129

+ as_dirname=dirname

2130

+else

2131

+ as_dirname=false

2132

+fi

2133

+

2134

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

2135

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

2136

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

2137

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

2138

+$as_echo X/"$0" |

2139

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

2140

+ s//\1/

2141

+ q

2142

+ }

2143

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

2144

+ s//\1/

2145

+ q

2146

+ }

2147

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

2148

+ s//\1/

2149

+ q

2150

+ }

2151

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

2152

+

2153

+# Avoid depending upon Character Ranges.

2154

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

2155

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

2156

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

2157

+as_cr_digits='0123456789'

2158

+as_cr_alnum=$as_cr_Letters$as_cr_digits

2159

+

2160

+

2161

+ as_lineno_1=$LINENO as_lineno_1a=$LINENO

2162

+ as_lineno_2=$LINENO as_lineno_2a=$LINENO

2163

+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&

2164

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

2165

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

2166

sed -n '

2167

p

2168

/[$]LINENO/=

2169

@@ -478,8 +446,7 @@

2170

s/-\n.*//

2171

' >$as_me.lineno &&

2172

chmod +x "$as_me.lineno" ||

2173

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

2174

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

2175

+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }

2176

2177

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

2178

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

2179

@@ -489,29 +456,18 @@

2180

exit

2181

}

2182

2183

-

2184

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

2185

- as_dirname=dirname

2186

-else

2187

- as_dirname=false

2188

-fi

2189

-

2190

ECHO_C= ECHO_N= ECHO_T=

2191

-case `echo -n x` in

2192

+case `echo -n x` in #(((((

2193

-n*)

2194

- case `echo 'x\c'` in

2195

+ case `echo 'xy\c'` in

2196

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

2197

- *) ECHO_C='\c';;

2198

+ xy) ECHO_C='\c';;

2199

+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null

2200

+ ECHO_T=' ';;

2201

esac;;

2202

*)

2203

ECHO_N='-n';;

2204

esac

2205

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

2206

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

2207

- as_expr=expr

2208

-else

2209

- as_expr=false

2210

-fi

2211

2212

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

2213

if test -d conf$$.dir; then

2214

@@ -541,7 +497,7 @@

2215

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

2216

2217

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

2218

- as_mkdir_p=:

2219

+ as_mkdir_p='mkdir -p "$as_dir"'

2220

else

2221

test -d ./-p && rmdir ./-p

2222

as_mkdir_p=false

2223

@@ -560,10 +516,10 @@

2224

if test -d "$1"; then

2225

test -d "$1/.";

2226

else

2227

- case $1 in

2228

+ case $1 in #(

2229

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

2230

esac;

2231

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

2232

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

2233

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

2234

'\'' sh

2235

'

2236

@@ -578,7 +534,6 @@

2237

2238

2239

2240

-

2241

# Check that we are running under the correct shell.

2242

SHELL=${CONFIG_SHELL-/bin/sh}

2243

2244

@@ -745,7 +700,6 @@

2245

subdirs=

2246

MFLAGS=

2247

MAKEFLAGS=

2248

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

2249

2250

# Identity of this package.

2251

PACKAGE_NAME='Empathy'

2252

@@ -753,6 +707,7 @@

2253

PACKAGE_VERSION='2.27.92'

2254

PACKAGE_STRING='Empathy 2.27.92'

2255

PACKAGE_BUGREPORT='http://bugzilla.gnome.org/browse.cgi?product=empathy'

2256

+PACKAGE_URL=''

2257

2258

ac_unique_file="configure.ac"

2259

# Factoring default headers for most tests.

2260

@@ -791,7 +746,9 @@

2261

# include <unistd.h>

2262

#endif"

2263

2264

-ac_subst_vars='LTLIBOBJS

2265

+ac_subst_vars='am__EXEEXT_FALSE

2266

+am__EXEEXT_TRUE

2267

+LTLIBOBJS

2268

LIBOBJS

2269

Q

2270

V

2271

@@ -813,6 +770,10 @@

2272

HAVE_TESTS_TRUE

2273

CHECK_LIBS

2274

CHECK_CFLAGS

2275

+HAVE_LIBINDICATE_FALSE

2276

+HAVE_LIBINDICATE_TRUE

2277

+INDICATE_LIBS

2278

+INDICATE_CFLAGS

2279

HAVE_NOTHERE_FALSE

2280

HAVE_NOTHERE_TRUE

2281

NOTHERE_LIBS

2282

@@ -1050,6 +1011,7 @@

2283

program_transform_name

2284

prefix

2285

exec_prefix

2286

+PACKAGE_URL

2287

PACKAGE_BUGREPORT

2288

PACKAGE_STRING

2289

PACKAGE_VERSION

2290

@@ -1090,6 +1052,7 @@

2291

enable_location

2292

enable_megaphone

2293

enable_nothere

2294

+enable_libindicate

2295

enable_tests

2296

enable_python

2297

enable_coding_style_checks

2298

@@ -1132,6 +1095,8 @@

2299

MEGAPHONE_LIBS

2300

NOTHERE_CFLAGS

2301

NOTHERE_LIBS

2302

+INDICATE_CFLAGS

2303

+INDICATE_LIBS

2304

CHECK_CFLAGS

2305

CHECK_LIBS

2306

PYTHON_BINDING_CFLAGS

2307

@@ -1244,8 +1209,7 @@

2308

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

2309

# Reject names that are not valid shell variable names.

2310

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

2311

- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2

2312

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

2313

+ as_fn_error "invalid feature name: $ac_useropt"

2314

ac_useropt_orig=$ac_useropt

2315

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

2316

case $ac_user_opts in

2317

@@ -1271,8 +1235,7 @@

2318

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

2319

# Reject names that are not valid shell variable names.

2320

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

2321

- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2

2322

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

2323

+ as_fn_error "invalid feature name: $ac_useropt"

2324

ac_useropt_orig=$ac_useropt

2325

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

2326

case $ac_user_opts in

2327

@@ -1476,8 +1439,7 @@

2328

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

2329

# Reject names that are not valid shell variable names.

2330

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

2331

- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2

2332

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

2333

+ as_fn_error "invalid package name: $ac_useropt"

2334

ac_useropt_orig=$ac_useropt

2335

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

2336

case $ac_user_opts in

2337

@@ -1493,8 +1455,7 @@

2338

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

2339

# Reject names that are not valid shell variable names.

2340

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

2341

- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2

2342

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

2343

+ as_fn_error "invalid package name: $ac_useropt"

2344

ac_useropt_orig=$ac_useropt

2345

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

2346

case $ac_user_opts in

2347

@@ -1524,17 +1485,17 @@

2348

2349

x_libraries=$ac_optarg ;;

2350

2351

- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option

2352

-Try \`$0 --help' for more information." >&2

2353

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

2354

+ -*) as_fn_error "unrecognized option: \`$ac_option'

2355

+Try \`$0 --help' for more information."

2356

;;

2357

2358

*=*)

2359

ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`

2360

# Reject names that are not valid shell variable names.

2361

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

2362

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

2363

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

2364

+ case $ac_envvar in #(

2365

+ '' | [0-9]* | *[!_$as_cr_alnum]* )

2366

+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;

2367

+ esac

2368

eval $ac_envvar=\$ac_optarg

2369

export $ac_envvar ;;

2370

2371

@@ -1551,15 +1512,13 @@

2372

2373

if test -n "$ac_prev"; then

2374

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

2375

- { $as_echo "$as_me: error: missing argument to $ac_option" >&2

2376

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

2377

+ as_fn_error "missing argument to $ac_option"

2378

fi

2379

2380

if test -n "$ac_unrecognized_opts"; then

2381

case $enable_option_checking in

2382

no) ;;

2383

- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2

2384

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

2385

+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;

2386

*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;

2387

esac

2388

fi

2389

@@ -1582,8 +1541,7 @@

2390

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

2391

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

2392

esac

2393

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

2394

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

2395

+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"

2396

done

2397

2398

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

2399

@@ -1613,11 +1571,9 @@

2400

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

2401

ac_ls_di=`ls -di .` &&

2402

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

2403

- { $as_echo "$as_me: error: working directory cannot be determined" >&2

2404

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

2405

+ as_fn_error "working directory cannot be determined"

2406

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

2407

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

2408

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

2409

+ as_fn_error "pwd does not report name of working directory"

2410

2411

2412

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

2413

@@ -1656,13 +1612,11 @@

2414

fi

2415

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

2416

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

2417

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

2418

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

2419

+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"

2420

fi

2421

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

2422

ac_abs_confdir=`(

2423

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

2424

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

2425

+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"

2426

pwd)`

2427

# When building in place, set srcdir=.

2428

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

2429

@@ -1783,7 +1737,8 @@

2430

--disable-nls do not use Native Language Support

2431

--enable-gtk-doc use gtk-doc to build documentation [default=no]

2432

--disable-scrollkeeper do not make updates to the scrollkeeper database

2433

- --disable-schemas-install Disable the schemas installation

2434

+ --disable-schemas-install

2435

+ Disable the schemas installation

2436

--enable-valgrind enable valgrind checking and run-time detection

2437

--disable-debug compile without debug code

2438

--enable-webkit=[no/yes/auto]

2439

@@ -1798,6 +1753,8 @@

2440

build megaphone applet

2441

--enable-nothere=[no/yes/auto]

2442

build nothere applet

2443

+ --enable-libindicate=[no/yes/auto]

2444

+ build libindicate support

2445

--enable-tests=[no/yes/auto]

2446

build tests

2447

--enable-python=[no/yes/auto]

2448

@@ -1890,6 +1847,10 @@

2449

C compiler flags for NOTHERE, overriding pkg-config

2450

NOTHERE_LIBS

2451

linker flags for NOTHERE, overriding pkg-config

2452

+ INDICATE_CFLAGS

2453

+ C compiler flags for INDICATE, overriding pkg-config

2454

+ INDICATE_LIBS

2455

+ linker flags for INDICATE, overriding pkg-config

2456

CHECK_CFLAGS

2457

C compiler flags for CHECK, overriding pkg-config

2458

CHECK_LIBS linker flags for CHECK, overriding pkg-config

2459

@@ -1965,10 +1926,9 @@

2460

if $ac_init_version; then

2461

cat <<\_ACEOF

2462

Empathy configure 2.27.92

2463

-generated by GNU Autoconf 2.63

2464

+generated by GNU Autoconf 2.64

2465

2466

2467

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

2468

2469

This configure script is free software; the Free Software Foundation

2470

gives unlimited permission to copy, distribute and modify it.

2471

2472

@@ -1979,12 +1939,370 @@

2473

_ACEOF

2474

exit

2475

fi

2476

+

2477

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

2478

+## Autoconf initialization. ##

2479

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

2480

+

2481

+# ac_fn_c_try_compile LINENO

2482

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

2483

+# Try to compile conftest.$ac_ext, and return whether this succeeded.

2484

+ac_fn_c_try_compile ()

2485

+{

2486

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

2487

+ rm -f conftest.$ac_objext

2488

+ if { { ac_try="$ac_compile"

2489

+case "(($ac_try" in

2490

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2491

+ *) ac_try_echo=$ac_try;;

2492

+esac

2493

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

2494

+$as_echo "$ac_try_echo"; } >&5

2495

+ (eval "$ac_compile") 2>conftest.err

2496

+ ac_status=$?

2497

+ if test -s conftest.err; then

2498

+ grep -v '^ *+' conftest.err >conftest.er1

2499

+ cat conftest.er1 >&5

2500

+ mv -f conftest.er1 conftest.err

2501

+ fi

2502

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

2503

+ test $ac_status = 0; } && {

2504

+ test -z "$ac_c_werror_flag" ||

2505

+ test ! -s conftest.err

2506

+ } && test -s conftest.$ac_objext; then :

2507

+ ac_retval=0

2508

+else

2509

+ $as_echo "$as_me: failed program was:" >&5

2510

+sed 's/^/| /' conftest.$ac_ext >&5

2511

+

2512

+ ac_retval=1

2513

+fi

2514

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

2515

+ return $ac_retval

2516

+

2517

+} # ac_fn_c_try_compile

2518

+

2519

+# ac_fn_c_try_link LINENO

2520

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

2521

+# Try to link conftest.$ac_ext, and return whether this succeeded.

2522

+ac_fn_c_try_link ()

2523

+{

2524

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

2525

+ rm -f conftest.$ac_objext conftest$ac_exeext

2526

+ if { { ac_try="$ac_link"

2527

+case "(($ac_try" in

2528

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2529

+ *) ac_try_echo=$ac_try;;

2530

+esac

2531

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

2532

+$as_echo "$ac_try_echo"; } >&5

2533

+ (eval "$ac_link") 2>conftest.err

2534

+ ac_status=$?

2535

+ if test -s conftest.err; then

2536

+ grep -v '^ *+' conftest.err >conftest.er1

2537

+ cat conftest.er1 >&5

2538

+ mv -f conftest.er1 conftest.err

2539

+ fi

2540

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

2541

+ test $ac_status = 0; } && {

2542

+ test -z "$ac_c_werror_flag" ||

2543

+ test ! -s conftest.err

2544

+ } && test -s conftest$ac_exeext && {

2545

+ test "$cross_compiling" = yes ||

2546

+ $as_test_x conftest$ac_exeext

2547

+ }; then :

2548

+ ac_retval=0

2549

+else

2550

+ $as_echo "$as_me: failed program was:" >&5

2551

+sed 's/^/| /' conftest.$ac_ext >&5

2552

+

2553

+ ac_retval=1

2554

+fi

2555

+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information

2556

+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would

2557

+ # interfere with the next link command; also delete a directory that is

2558

+ # left behind by Apple's compiler. We do this before executing the actions.

2559

+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo

2560

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

2561

+ return $ac_retval

2562

+

2563

+} # ac_fn_c_try_link

2564

+

2565

+# ac_fn_c_try_cpp LINENO

2566

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

2567

+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.

2568

+ac_fn_c_try_cpp ()

2569

+{

2570

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

2571

+ if { { ac_try="$ac_cpp conftest.$ac_ext"

2572

+case "(($ac_try" in

2573

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2574

+ *) ac_try_echo=$ac_try;;

2575

+esac

2576

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

2577

+$as_echo "$ac_try_echo"; } >&5

2578

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err

2579

+ ac_status=$?

2580

+ if test -s conftest.err; then

2581

+ grep -v '^ *+' conftest.err >conftest.er1

2582

+ cat conftest.er1 >&5

2583

+ mv -f conftest.er1 conftest.err

2584

+ fi

2585

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

2586

+ test $ac_status = 0; } >/dev/null && {

2587

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

2588

+ test ! -s conftest.err

2589

+ }; then :

2590

+ ac_retval=0

2591

+else

2592

+ $as_echo "$as_me: failed program was:" >&5

2593

+sed 's/^/| /' conftest.$ac_ext >&5

2594

+

2595

+ ac_retval=1

2596

+fi

2597

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

2598

+ return $ac_retval

2599

+

2600

+} # ac_fn_c_try_cpp

2601

+

2602

+# ac_fn_c_try_run LINENO

2603

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

2604

+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes

2605

+# that executables *can* be run.

2606

+ac_fn_c_try_run ()

2607

+{

2608

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

2609

+ if { { ac_try="$ac_link"

2610

+case "(($ac_try" in

2611

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2612

+ *) ac_try_echo=$ac_try;;

2613

+esac

2614

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

2615

+$as_echo "$ac_try_echo"; } >&5

2616

+ (eval "$ac_link") 2>&5

2617

+ ac_status=$?

2618

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

2619

+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'

2620

+ { { case "(($ac_try" in

2621

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2622

+ *) ac_try_echo=$ac_try;;

2623

+esac

2624

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

2625

+$as_echo "$ac_try_echo"; } >&5

2626

+ (eval "$ac_try") 2>&5

2627

+ ac_status=$?

2628

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

2629

+ test $ac_status = 0; }; }; then :

2630

+ ac_retval=0

2631

+else

2632

+ $as_echo "$as_me: program exited with status $ac_status" >&5

2633

+ $as_echo "$as_me: failed program was:" >&5

2634

+sed 's/^/| /' conftest.$ac_ext >&5

2635

+

2636

+ ac_retval=$ac_status

2637

+fi

2638

+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo

2639

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

2640

+ return $ac_retval

2641

+

2642

+} # ac_fn_c_try_run

2643

+

2644

+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES

2645

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

2646

+# Tests whether HEADER exists and can be compiled using the include files in

2647

+# INCLUDES, setting the cache variable VAR accordingly.

2648

+ac_fn_c_check_header_compile ()

2649

+{

2650

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

2651

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

2652

+$as_echo_n "checking for $2... " >&6; }

2653

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

2654

+ $as_echo_n "(cached) " >&6

2655

+else

2656

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2657

+/* end confdefs.h. */

2658

+$4

2659

+#include <$2>

2660

+_ACEOF

2661

+if ac_fn_c_try_compile "$LINENO"; then :

2662

+ eval "$3=yes"

2663

+else

2664

+ eval "$3=no"

2665

+fi

2666

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

2667

+fi

2668

+eval ac_res=\$$3

2669

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

2670

+$as_echo "$ac_res" >&6; }

2671

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

2672

+

2673

+} # ac_fn_c_check_header_compile

2674

+

2675

+# ac_fn_c_check_func LINENO FUNC VAR

2676

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

2677

+# Tests whether FUNC exists, setting the cache variable VAR accordingly

2678

+ac_fn_c_check_func ()

2679

+{

2680

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

2681

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

2682

+$as_echo_n "checking for $2... " >&6; }

2683

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

2684

+ $as_echo_n "(cached) " >&6

2685

+else

2686

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2687

+/* end confdefs.h. */

2688

+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.

2689

+ For example, HP-UX 11i <limits.h> declares gettimeofday. */

2690

+#define $2 innocuous_$2

2691

+

2692

+/* System header to define __stub macros and hopefully few prototypes,

2693

+ which can conflict with char $2 (); below.

2694

+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

2695

+ <limits.h> exists even on freestanding compilers. */

2696

+

2697

+#ifdef __STDC__

2698

+# include <limits.h>

2699

+#else

2700

+# include <assert.h>

2701

+#endif

2702

+

2703

+#undef $2

2704

+

2705

+/* Override any GCC internal prototype to avoid an error.

2706

+ Use char because int might match the return type of a GCC

2707

+ builtin and then its argument prototype would still apply. */

2708

+#ifdef __cplusplus

2709

+extern "C"

2710

+#endif

2711

+char $2 ();

2712

+/* The GNU C library defines this for functions which it implements

2713

+ to always fail with ENOSYS. Some functions are actually named

2714

+ something starting with __ and the normal name is an alias. */

2715

+#if defined __stub_$2 || defined __stub___$2

2716

+choke me

2717

+#endif

2718

+

2719

+int

2720

+main ()

2721

+{

2722

+return $2 ();

2723

+ ;

2724

+ return 0;

2725

+}

2726

+_ACEOF

2727

+if ac_fn_c_try_link "$LINENO"; then :

2728

+ eval "$3=yes"

2729

+else

2730

+ eval "$3=no"

2731

+fi

2732

+rm -f core conftest.err conftest.$ac_objext \

2733

+ conftest$ac_exeext conftest.$ac_ext

2734

+fi

2735

+eval ac_res=\$$3

2736

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

2737

+$as_echo "$ac_res" >&6; }

2738

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

2739

+

2740

+} # ac_fn_c_check_func

2741

+

2742

+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES

2743

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

2744

+# Tests whether HEADER exists, giving a warning if it cannot be compiled using

2745

+# the include files in INCLUDES and setting the cache variable VAR

2746

+# accordingly.

2747

+ac_fn_c_check_header_mongrel ()

2748

+{

2749

+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

2750

+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

2751

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

2752

+$as_echo_n "checking for $2... " >&6; }

2753

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

2754

+ $as_echo_n "(cached) " >&6

2755

+fi

2756

+eval ac_res=\$$3

2757

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

2758

+$as_echo "$ac_res" >&6; }

2759

+else

2760

+ # Is the header compilable?

2761

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5

2762

+$as_echo_n "checking $2 usability... " >&6; }

2763

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2764

+/* end confdefs.h. */

2765

+$4

2766

+#include <$2>

2767

+_ACEOF

2768

+if ac_fn_c_try_compile "$LINENO"; then :

2769

+ ac_header_compiler=yes

2770

+else

2771

+ ac_header_compiler=no

2772

+fi

2773

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

2774

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5

2775

+$as_echo "$ac_header_compiler" >&6; }

2776

+

2777

+# Is the header present?

2778

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5

2779

+$as_echo_n "checking $2 presence... " >&6; }

2780

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2781

+/* end confdefs.h. */

2782

+#include <$2>

2783

+_ACEOF

2784

+if ac_fn_c_try_cpp "$LINENO"; then :

2785

+ ac_header_preproc=yes

2786

+else

2787

+ ac_header_preproc=no

2788

+fi

2789

+rm -f conftest.err conftest.$ac_ext

2790

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5

2791

+$as_echo "$ac_header_preproc" >&6; }

2792

+

2793

+# So? What about this header?

2794

+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((

2795

+ yes:no: )

2796

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5

2797

+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}

2798

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

2799

+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

2800

+ ;;

2801

+ no:yes:* )

2802

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5

2803

+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}

2804

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5

2805

+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}

2806

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5

2807

+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}

2808

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5

2809

+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}

2810

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

2811

+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

2812

+( cat <<\_ASBOX

2813

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

2814

+## Report this to http://bugzilla.gnome.org/browse.cgi?product=empathy ##

2815

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

2816

+_ASBOX

2817

+ ) | sed "s/^/$as_me: WARNING: /" >&2

2818

+ ;;

2819

+esac

2820

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

2821

+$as_echo_n "checking for $2... " >&6; }

2822

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

2823

+ $as_echo_n "(cached) " >&6

2824

+else

2825

+ eval "$3=\$ac_header_compiler"

2826

+fi

2827

+eval ac_res=\$$3

2828

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

2829

+$as_echo "$ac_res" >&6; }

2830

+fi

2831

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

2832

+

2833

+} # ac_fn_c_check_header_mongrel

2834

cat >config.log <<_ACEOF

2835

This file contains any messages produced by compilers while

2836

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

2837

2838

It was created by Empathy $as_me 2.27.92, which was

2839

-generated by GNU Autoconf 2.63. Invocation command line was

2840

+generated by GNU Autoconf 2.64. Invocation command line was

2841

2842

$ $0 $@

2843

2844

@@ -2020,8 +2338,8 @@

2845

do

2846

IFS=$as_save_IFS

2847

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

2848

- $as_echo "PATH: $as_dir"

2849

-done

2850

+ $as_echo "PATH: $as_dir"

2851

+ done

2852

IFS=$as_save_IFS

2853

2854

} >&5

2855

@@ -2058,9 +2376,9 @@

2856

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

2857

esac

2858

case $ac_pass in

2859

- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;

2860

+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;

2861

2)

2862

- ac_configure_args1="$ac_configure_args1 '$ac_arg'"

2863

+ as_fn_append ac_configure_args1 " '$ac_arg'"

2864

if test $ac_must_keep_next = true; then

2865

ac_must_keep_next=false # Got value, back to normal.

2866

else

2867

@@ -2076,13 +2394,13 @@

2868

-* ) ac_must_keep_next=true ;;

2869

esac

2870

fi

2871

- ac_configure_args="$ac_configure_args '$ac_arg'"

2872

+ as_fn_append ac_configure_args " '$ac_arg'"

2873

;;

2874

esac

2875

done

2876

done

2877

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

2878

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

2879

+{ ac_configure_args0=; unset ac_configure_args0;}

2880

+{ ac_configure_args1=; unset ac_configure_args1;}

2881

2882

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

2883

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

2884

@@ -2107,13 +2425,13 @@

2885

case $ac_val in #(

2886

*${as_nl}*)

2887

case $ac_var in #(

2888

- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5

2889

+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5

2890

$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;

2891

esac

2892

case $ac_var in #(

2893

_ | IFS | as_nl) ;; #(

2894

BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

2895

- *) $as_unset $ac_var ;;

2896

+ *) { eval $ac_var=; unset $ac_var;} ;;

2897

esac ;;

2898

esac

2899

done

2900

@@ -2185,39 +2503,41 @@

2901

exit $exit_status

2902

' 0

2903

for ac_signal in 1 2 13 15; do

2904

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

2905

+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal

2906

done

2907

ac_signal=0

2908

2909

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

2910

rm -f -r conftest* confdefs.h

2911

2912

+$as_echo "/* confdefs.h */" > confdefs.h

2913

+

2914

# Predefined preprocessor variables.

2915

2916

cat >>confdefs.h <<_ACEOF

2917

#define PACKAGE_NAME "$PACKAGE_NAME"

2918

_ACEOF

2919

2920

-

2921

cat >>confdefs.h <<_ACEOF

2922

#define PACKAGE_TARNAME "$PACKAGE_TARNAME"

2923

_ACEOF

2924

2925

-

2926

cat >>confdefs.h <<_ACEOF

2927

#define PACKAGE_VERSION "$PACKAGE_VERSION"

2928

_ACEOF

2929

2930

-

2931

cat >>confdefs.h <<_ACEOF

2932

#define PACKAGE_STRING "$PACKAGE_STRING"

2933

_ACEOF

2934

2935

-

2936

cat >>confdefs.h <<_ACEOF

2937

#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"

2938

_ACEOF

2939

2940

+cat >>confdefs.h <<_ACEOF

2941

+#define PACKAGE_URL "$PACKAGE_URL"

2942

+_ACEOF

2943

+

2944

2945

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

2946

# Prefer an explicitly selected file to automatically selected ones.

2947

@@ -2236,7 +2556,7 @@

2948

do

2949

test "x$ac_site_file" = xNONE && continue

2950

if test -r "$ac_site_file"; then

2951

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

2952

+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5

2953

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

2954

sed 's/^/| /' "$ac_site_file" >&5

2955

. "$ac_site_file"

2956

@@ -2247,7 +2567,7 @@

2957

# Some versions of bash will fail to source /dev/null (special

2958

# files actually), so we avoid doing that.

2959

if test -f "$cache_file"; then

2960

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

2961

+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5

2962

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

2963

case $cache_file in

2964

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

2965

@@ -2255,7 +2575,7 @@

2966

esac

2967

fi

2968

else

2969

- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5

2970

+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5

2971

$as_echo "$as_me: creating cache $cache_file" >&6;}

2972

>$cache_file

2973

fi

2974

@@ -2270,11 +2590,11 @@

2975

eval ac_new_val=\$ac_env_${ac_var}_value

2976

case $ac_old_set,$ac_new_set in

2977

set,)

2978

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

2979

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

2980

$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}

2981

ac_cache_corrupted=: ;;

2982

,set)

2983

- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5

2984

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5

2985

$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}

2986

ac_cache_corrupted=: ;;

2987

,);;

2988

@@ -2284,17 +2604,17 @@

2989

ac_old_val_w=`echo x $ac_old_val`

2990

ac_new_val_w=`echo x $ac_new_val`

2991

if test "$ac_old_val_w" != "$ac_new_val_w"; then

2992

- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5

2993

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5

2994

$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

2995

ac_cache_corrupted=:

2996

else

2997

- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5

2998

+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5

2999

$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}

3000

eval $ac_var=\$ac_old_val

3001

fi

3002

- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5

3003

+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5

3004

$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}

3005

- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5

3006

+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5

3007

$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}

3008

fi;;

3009

esac

3010

@@ -2306,43 +2626,20 @@

3011

esac

3012

case " $ac_configure_args " in

3013

*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.

3014

- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;

3015

+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;

3016

esac

3017

fi

3018

done

3019

if $ac_cache_corrupted; then

3020

- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

3021

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

3022

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

3023

- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5

3024

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5

3025

$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}

3026

- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5

3027

-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}

3028

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

3029

+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5

3030

fi

3031

-

3032

-

3033

-

3034

-

3035

-

3036

-

3037

-

3038

-

3039

-

3040

-

3041

-

3042

-

3043

-

3044

-

3045

-

3046

-

3047

-

3048

-

3049

-

3050

-

3051

-

3052

-

3053

-

3054

-

3055

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

3056

+## Main body of script. ##

3057

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

3058

3059

ac_ext=c

3060

ac_cpp='$CPP $CPPFLAGS'

3061

@@ -2390,18 +2687,21 @@

3062

WEBKIT_REQUIRED=1.1.7

3063

KEYRING_REQUIRED=2.22

3064

NETWORK_MANAGER_REQUIRED=0.7.0

3065

+INDICATE_REQUIRED=0.2.0

3066

+INDICATE_GTK_REQUIRED=0.2.0

3067

3068

# Use --enable-maintainer-mode to disabled deprecated symbols

3069

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

3070

+

3071

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

3072

$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }

3073

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

3074

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

3075

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

3076

enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval

3077

else

3078

USE_MAINTAINER_MODE=no

3079

fi

3080

3081

- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5

3082

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5

3083

$as_echo "$USE_MAINTAINER_MODE" >&6; }

3084

if test $USE_MAINTAINER_MODE = yes; then

3085

MAINTAINER_MODE_TRUE=

3086

@@ -2418,7 +2718,7 @@

3087

3088

3089

if test $USE_MAINTAINER_MODE = yes; then

3090

- DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED"

3091

+ DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"

3092

else

3093

DISABLE_DEPRECATED=""

3094

fi

3095

@@ -2436,24 +2736,16 @@

3096

3097

ac_aux_dir=

3098

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

3099

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

3100

- ac_aux_dir=$ac_dir

3101

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

3102

- break

3103

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

3104

- ac_aux_dir=$ac_dir

3105

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

3106

- break

3107

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

3108

- ac_aux_dir=$ac_dir

3109

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

3110

- break

3111

- fi

3112

+ for ac_t in install-sh install.sh shtool; do

3113

+ if test -f "$ac_dir/$ac_t"; then

3114

+ ac_aux_dir=$ac_dir

3115

+ ac_install_sh="$ac_aux_dir/$ac_t -c"

3116

+ break 2

3117

+ fi

3118

+ done

3119

done

3120

if test -z "$ac_aux_dir"; then

3121

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

3122

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

3123

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

3124

+ as_fn_error "cannot find install-sh, install.sh, or shtool in . \"$srcdir\"/." "$LINENO" 5

3125

fi

3126

3127

# These three variables are undocumented and unsupported,

3128

@@ -2477,7 +2769,7 @@

3129

3130

3131

3132

-am__api_version='1.10'

3133

+am__api_version='1.11'

3134

3135

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

3136

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

3137

@@ -2493,10 +2785,10 @@

3138

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

3139

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

3140

# Reject install programs that cannot install multiple files.

3141

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

3142

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

3143

$as_echo_n "checking for a BSD-compatible install... " >&6; }

3144

if test -z "$INSTALL"; then

3145

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

3146

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

3147

$as_echo_n "(cached) " >&6

3148

else

3149

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3150

@@ -2504,11 +2796,11 @@

3151

do

3152

IFS=$as_save_IFS

3153

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

3154

- # Account for people who put trailing slashes in PATH elements.

3155

-case $as_dir/ in

3156

- ./ | .// | /cC/* | \

3157

+ # Account for people who put trailing slashes in PATH elements.

3158

+case $as_dir/ in #((

3159

+ ./ | .// | /[cC]/* | \

3160

/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \

3161

- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \

3162

+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \

3163

/usr/ucb/* ) ;;

3164

*)

3165

# OSF1 and SCO ODT 3.0 have their own names for install.

3166

@@ -2545,7 +2837,7 @@

3167

;;

3168

esac

3169

3170

-done

3171

+ done

3172

IFS=$as_save_IFS

3173

3174

rm -rf conftest.one conftest.two conftest.dir

3175

@@ -2561,7 +2853,7 @@

3176

INSTALL=$ac_install_sh

3177

fi

3178

fi

3179

-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5

3180

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5

3181

$as_echo "$INSTALL" >&6; }

3182

3183

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

3184

@@ -2572,21 +2864,34 @@

3185

3186

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

3187

3188

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

3189

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5

3190

$as_echo_n "checking whether build environment is sane... " >&6; }

3191

# Just in case

3192

sleep 1

3193

echo timestamp > conftest.file

3194

+# Reject unsafe characters in $srcdir or the absolute working directory

3195

+# name. Accept space and tab only in the latter.

3196

+am_lf='

3197

+'

3198

+case `pwd` in

3199

+ *[\\\"\#\$\&\'\`$am_lf]*)

3200

+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;

3201

+esac

3202

+case $srcdir in

3203

+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)

3204

+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;

3205

+esac

3206

+

3207

# Do `set' in a subshell so we don't clobber the current shell's

3208

# arguments. Must try -L first in case configure is actually a

3209

# symlink; some systems play weird games with the mod time of symlinks

3210

# (eg FreeBSD returns the mod time of the symlink's containing

3211

# directory).

3212

if (

3213

- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`

3214

+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

3215

if test "$*" = "X"; then

3216

# -L didn't work.

3217

- set X `ls -t $srcdir/configure conftest.file`

3218

+ set X `ls -t "$srcdir/configure" conftest.file`

3219

fi

3220

rm -f conftest.file

3221

if test "$*" != "X $srcdir/configure conftest.file" \

3222

@@ -2596,11 +2901,8 @@

3223

# if, for instance, CONFIG_SHELL is bash and it inherits a

3224

# broken ls alias from the environment. This has actually

3225

# happened. Such a system could not be considered "sane".

3226

- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken

3227

-alias in your environment" >&5

3228

-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken

3229

-alias in your environment" >&2;}

3230

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

3231

+ as_fn_error "ls -t appears to fail. Make sure there is not a broken

3232

+alias in your environment" "$LINENO" 5

3233

fi

3234

3235

test "$2" = conftest.file

3236

@@ -2609,13 +2911,10 @@

3237

# Ok.

3238

:

3239

else

3240

- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!

3241

-Check your system clock" >&5

3242

-$as_echo "$as_me: error: newly created file is older than distributed files!

3243

-Check your system clock" >&2;}

3244

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

3245

+ as_fn_error "newly created file is older than distributed files!

3246

+Check your system clock" "$LINENO" 5

3247

fi

3248

-{ $as_echo "$as_me:$LINENO: result: yes" >&5

3249

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

3250

$as_echo "yes" >&6; }

3251

test "$program_prefix" != NONE &&

3252

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

3253

@@ -2630,20 +2929,136 @@

3254

# expand $ac_aux_dir to an absolute path

3255

am_aux_dir=`cd $ac_aux_dir && pwd`

3256

3257

-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"

3258

+if test x"${MISSING+set}" != xset; then

3259

+ case $am_aux_dir in

3260

+ *\ * | *\ *)

3261

+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;

3262

+ *)

3263

+ MISSING="\${SHELL} $am_aux_dir/missing" ;;

3264

+ esac

3265

+fi

3266

# Use eval to expand $SHELL

3267

if eval "$MISSING --run true"; then

3268

am_missing_run="$MISSING --run "

3269

else

3270

am_missing_run=

3271

- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5

3272

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5

3273

$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

3274

fi

3275

3276

-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5

3277

+if test x"${install_sh}" != xset; then

3278

+ case $am_aux_dir in

3279

+ *\ * | *\ *)

3280

+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

3281

+ *)

3282

+ install_sh="\${SHELL} $am_aux_dir/install-sh"

3283

+ esac

3284

+fi

3285

+

3286

+# Installed binaries are usually stripped using `strip' when the user

3287

+# run `make install-strip'. However `strip' might not be the right

3288

+# tool to use in cross-compilation environments, therefore Automake

3289

+# will honor the `STRIP' environment variable to overrule this program.

3290

+if test "$cross_compiling" != no; then

3291

+ if test -n "$ac_tool_prefix"; then

3292

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

3293

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

3294

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3295

+$as_echo_n "checking for $ac_word... " >&6; }

3296

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

3297

+ $as_echo_n "(cached) " >&6

3298

+else

3299

+ if test -n "$STRIP"; then

3300

+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

3301

+else

3302

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3303

+for as_dir in $PATH

3304

+do

3305

+ IFS=$as_save_IFS

3306

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

3307

+ for ac_exec_ext in '' $ac_executable_extensions; do

3308

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

3309

+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"

3310

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3311

+ break 2

3312

+ fi

3313

+done

3314

+ done

3315

+IFS=$as_save_IFS

3316

+

3317

+fi

3318

+fi

3319

+STRIP=$ac_cv_prog_STRIP

3320

+if test -n "$STRIP"; then

3321

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5

3322

+$as_echo "$STRIP" >&6; }

3323

+else

3324

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3325

+$as_echo "no" >&6; }

3326

+fi

3327

+

3328

+

3329

+fi

3330

+if test -z "$ac_cv_prog_STRIP"; then

3331

+ ac_ct_STRIP=$STRIP

3332

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

3333

+set dummy strip; ac_word=$2

3334

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3335

+$as_echo_n "checking for $ac_word... " >&6; }

3336

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

3337

+ $as_echo_n "(cached) " >&6

3338

+else

3339

+ if test -n "$ac_ct_STRIP"; then

3340

+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

3341

+else

3342

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3343

+for as_dir in $PATH

3344

+do

3345

+ IFS=$as_save_IFS

3346

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

3347

+ for ac_exec_ext in '' $ac_executable_extensions; do

3348

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

3349

+ ac_cv_prog_ac_ct_STRIP="strip"

3350

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3351

+ break 2

3352

+ fi

3353

+done

3354

+ done

3355

+IFS=$as_save_IFS

3356

+

3357

+fi

3358

+fi

3359

+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

3360

+if test -n "$ac_ct_STRIP"; then

3361

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5

3362

+$as_echo "$ac_ct_STRIP" >&6; }

3363

+else

3364

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3365

+$as_echo "no" >&6; }

3366

+fi

3367

+

3368

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

3369

+ STRIP=":"

3370

+ else

3371

+ case $cross_compiling:$ac_tool_warned in

3372

+yes:)

3373

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

3374

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

3375

+ac_tool_warned=yes ;;

3376

+esac

3377

+ STRIP=$ac_ct_STRIP

3378

+ fi

3379

+else

3380

+ STRIP="$ac_cv_prog_STRIP"

3381

+fi

3382

+

3383

+fi

3384

+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

3385

+

3386

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5

3387

$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }

3388

if test -z "$MKDIR_P"; then

3389

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

3390

+ if test "${ac_cv_path_mkdir+set}" = set; then :

3391

$as_echo_n "(cached) " >&6

3392

else

3393

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3394

@@ -2651,7 +3066,7 @@

3395

do

3396

IFS=$as_save_IFS

3397

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

3398

- for ac_prog in mkdir gmkdir; do

3399

+ for ac_prog in mkdir gmkdir; do

3400

for ac_exec_ext in '' $ac_executable_extensions; do

3401

{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue

3402

case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(

3403

@@ -2663,7 +3078,7 @@

3404

esac

3405

done

3406

done

3407

-done

3408

+ done

3409

IFS=$as_save_IFS

3410

3411

fi

3412

@@ -2679,7 +3094,7 @@

3413

MKDIR_P="$ac_install_sh -d"

3414

fi

3415

fi

3416

-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5

3417

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5

3418

$as_echo "$MKDIR_P" >&6; }

3419

3420

mkdir_p="$MKDIR_P"

3421

@@ -2692,9 +3107,9 @@

3422

do

3423

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

3424

set dummy $ac_prog; ac_word=$2

3425

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

3426

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3427

$as_echo_n "checking for $ac_word... " >&6; }

3428

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

3429

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

3430

$as_echo_n "(cached) " >&6

3431

else

3432

if test -n "$AWK"; then

3433

@@ -2705,24 +3120,24 @@

3434

do

3435

IFS=$as_save_IFS

3436

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

3437

- for ac_exec_ext in '' $ac_executable_extensions; do

3438

+ for ac_exec_ext in '' $ac_executable_extensions; do

3439

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

3440

ac_cv_prog_AWK="$ac_prog"

3441

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

3442

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3443

break 2

3444

fi

3445

done

3446

-done

3447

+ done

3448

IFS=$as_save_IFS

3449

3450

fi

3451

fi

3452

AWK=$ac_cv_prog_AWK

3453

if test -n "$AWK"; then

3454

- { $as_echo "$as_me:$LINENO: result: $AWK" >&5

3455

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5

3456

$as_echo "$AWK" >&6; }

3457

else

3458

- { $as_echo "$as_me:$LINENO: result: no" >&5

3459

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3460

$as_echo "no" >&6; }

3461

fi

3462

3463

@@ -2730,11 +3145,11 @@

3464

test -n "$AWK" && break

3465

done

3466

3467

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

3468

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

3469

$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }

3470

set x ${MAKE-make}

3471

ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

3472

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

3473

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

3474

$as_echo_n "(cached) " >&6

3475

else

3476

cat >conftest.make <<\_ACEOF

3477

@@ -2752,11 +3167,11 @@

3478

rm -f conftest.make

3479

fi

3480

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

3481

- { $as_echo "$as_me:$LINENO: result: yes" >&5

3482

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

3483

$as_echo "yes" >&6; }

3484

SET_MAKE=

3485

else

3486

- { $as_echo "$as_me:$LINENO: result: no" >&5

3487

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3488

$as_echo "no" >&6; }

3489

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

3490

fi

3491

@@ -2776,9 +3191,7 @@

3492

am__isrc=' -I$(srcdir)'

3493

# test to see if srcdir already configured

3494

if test -f $srcdir/config.status; then

3495

- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5

3496

-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}

3497

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

3498

+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5

3499

fi

3500

fi

3501

3502

@@ -2813,108 +3226,6 @@

3503

3504

MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}

3505

3506

-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}

3507

-

3508

-# Installed binaries are usually stripped using `strip' when the user

3509

-# run `make install-strip'. However `strip' might not be the right

3510

-# tool to use in cross-compilation environments, therefore Automake

3511

-# will honor the `STRIP' environment variable to overrule this program.

3512

-if test "$cross_compiling" != no; then

3513

- if test -n "$ac_tool_prefix"; then

3514

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

3515

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

3516

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

3517

-$as_echo_n "checking for $ac_word... " >&6; }

3518

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

3519

- $as_echo_n "(cached) " >&6

3520

-else

3521

- if test -n "$STRIP"; then

3522

- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

3523

-else

3524

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3525

-for as_dir in $PATH

3526

-do

3527

- IFS=$as_save_IFS

3528

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

3529

- for ac_exec_ext in '' $ac_executable_extensions; do

3530

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

3531

- ac_cv_prog_STRIP="${ac_tool_prefix}strip"

3532

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

3533

- break 2

3534

- fi

3535

-done

3536

-done

3537

-IFS=$as_save_IFS

3538

-

3539

-fi

3540

-fi

3541

-STRIP=$ac_cv_prog_STRIP

3542

-if test -n "$STRIP"; then

3543

- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5

3544

-$as_echo "$STRIP" >&6; }

3545

-else

3546

- { $as_echo "$as_me:$LINENO: result: no" >&5

3547

-$as_echo "no" >&6; }

3548

-fi

3549

-

3550

-

3551

-fi

3552

-if test -z "$ac_cv_prog_STRIP"; then

3553

- ac_ct_STRIP=$STRIP

3554

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

3555

-set dummy strip; ac_word=$2

3556

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

3557

-$as_echo_n "checking for $ac_word... " >&6; }

3558

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

3559

- $as_echo_n "(cached) " >&6

3560

-else

3561

- if test -n "$ac_ct_STRIP"; then

3562

- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

3563

-else

3564

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3565

-for as_dir in $PATH

3566

-do

3567

- IFS=$as_save_IFS

3568

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

3569

- for ac_exec_ext in '' $ac_executable_extensions; do

3570

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

3571

- ac_cv_prog_ac_ct_STRIP="strip"

3572

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

3573

- break 2

3574

- fi

3575

-done

3576

-done

3577

-IFS=$as_save_IFS

3578

-

3579

-fi

3580

-fi

3581

-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

3582

-if test -n "$ac_ct_STRIP"; then

3583

- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

3584

-$as_echo "$ac_ct_STRIP" >&6; }

3585

-else

3586

- { $as_echo "$as_me:$LINENO: result: no" >&5

3587

-$as_echo "no" >&6; }

3588

-fi

3589

-

3590

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

3591

- STRIP=":"

3592

- else

3593

- case $cross_compiling:$ac_tool_warned in

3594

-yes:)

3595

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

3596

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

3597

-ac_tool_warned=yes ;;

3598

-esac

3599

- STRIP=$ac_ct_STRIP

3600

- fi

3601

-else

3602

- STRIP="$ac_cv_prog_STRIP"

3603

-fi

3604

-

3605

-fi

3606

-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

3607

-

3608

# We need awk for the "check" target. The system "awk" is bad on

3609

# some platforms.

3610

# Always define AMTAR for backward compatibility.

3611

@@ -2935,44 +3246,44 @@

3612

am_make=${MAKE-make}

3613

cat > confinc << 'END'

3614

am__doit:

3615

- @echo done

3616

+ @echo this is the am__doit target

3617

.PHONY: am__doit

3618

END

3619

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

3620

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

3621

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5

3622

$as_echo_n "checking for style of include used by $am_make... " >&6; }

3623

am__include="#"

3624

am__quote=

3625

_am_result=none

3626

# First try GNU make style include.

3627

echo "include confinc" > confmf

3628

-# We grep out `Entering directory' and `Leaving directory'

3629

-# messages which can occur if `w' ends up in MAKEFLAGS.

3630

-# In particular we don't look at `^make:' because GNU make might

3631

-# be invoked under some other name (usually "gmake"), in which

3632

-# case it prints its new name instead of `make'.

3633

-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then

3634

- am__include=include

3635

- am__quote=

3636

- _am_result=GNU

3637

-fi

3638

+# Ignore all kinds of additional output from `make'.

3639

+case `$am_make -s -f confmf 2> /dev/null` in #(

3640

+*the\ am__doit\ target*)

3641

+ am__include=include

3642

+ am__quote=

3643

+ _am_result=GNU

3644

+ ;;

3645

+esac

3646

# Now try BSD make style include.

3647

if test "$am__include" = "#"; then

3648

echo '.include "confinc"' > confmf

3649

- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then

3650

- am__include=.include

3651

- am__quote="\""

3652

- _am_result=BSD

3653

- fi

3654

+ case `$am_make -s -f confmf 2> /dev/null` in #(

3655

+ *the\ am__doit\ target*)

3656

+ am__include=.include

3657

+ am__quote="\""

3658

+ _am_result=BSD

3659

+ ;;

3660

+ esac

3661

fi

3662

3663

3664

-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5

3665

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5

3666

$as_echo "$_am_result" >&6; }

3667

rm -f confinc confmf

3668

3669

# Check whether --enable-dependency-tracking was given.

3670

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

3671

+if test "${enable_dependency_tracking+set}" = set; then :

3672

enableval=$enable_dependency_tracking;

3673

fi

3674

3675

@@ -2997,9 +3308,9 @@

3676

if test -n "$ac_tool_prefix"; then

3677

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

3678

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

3679

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

3680

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3681

$as_echo_n "checking for $ac_word... " >&6; }

3682

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

3683

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

3684

$as_echo_n "(cached) " >&6

3685

else

3686

if test -n "$CC"; then

3687

@@ -3010,24 +3321,24 @@

3688

do

3689

IFS=$as_save_IFS

3690

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

3691

- for ac_exec_ext in '' $ac_executable_extensions; do

3692

+ for ac_exec_ext in '' $ac_executable_extensions; do

3693

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

3694

ac_cv_prog_CC="${ac_tool_prefix}gcc"

3695

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

3696

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3697

break 2

3698

fi

3699

done

3700

-done

3701

+ done

3702

IFS=$as_save_IFS

3703

3704

fi

3705

fi

3706

CC=$ac_cv_prog_CC

3707

if test -n "$CC"; then

3708

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

3709

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

3710

$as_echo "$CC" >&6; }

3711

else

3712

- { $as_echo "$as_me:$LINENO: result: no" >&5

3713

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3714

$as_echo "no" >&6; }

3715

fi

3716

3717

@@ -3037,9 +3348,9 @@

3718

ac_ct_CC=$CC

3719

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

3720

set dummy gcc; ac_word=$2

3721

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

3722

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3723

$as_echo_n "checking for $ac_word... " >&6; }

3724

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

3725

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

3726

$as_echo_n "(cached) " >&6

3727

else

3728

if test -n "$ac_ct_CC"; then

3729

@@ -3050,24 +3361,24 @@

3730

do

3731

IFS=$as_save_IFS

3732

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

3733

- for ac_exec_ext in '' $ac_executable_extensions; do

3734

+ for ac_exec_ext in '' $ac_executable_extensions; do

3735

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

3736

ac_cv_prog_ac_ct_CC="gcc"

3737

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

3738

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3739

break 2

3740

fi

3741

done

3742

-done

3743

+ done

3744

IFS=$as_save_IFS

3745

3746

fi

3747

fi

3748

ac_ct_CC=$ac_cv_prog_ac_ct_CC

3749

if test -n "$ac_ct_CC"; then

3750

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

3751

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

3752

$as_echo "$ac_ct_CC" >&6; }

3753

else

3754

- { $as_echo "$as_me:$LINENO: result: no" >&5

3755

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3756

$as_echo "no" >&6; }

3757

fi

3758

3759

@@ -3076,7 +3387,7 @@

3760

else

3761

case $cross_compiling:$ac_tool_warned in

3762

yes:)

3763

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

3764

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

3765

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

3766

ac_tool_warned=yes ;;

3767

esac

3768

@@ -3090,9 +3401,9 @@

3769

if test -n "$ac_tool_prefix"; then

3770

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

3771

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

3772

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

3773

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3774

$as_echo_n "checking for $ac_word... " >&6; }

3775

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

3776

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

3777

$as_echo_n "(cached) " >&6

3778

else

3779

if test -n "$CC"; then

3780

@@ -3103,24 +3414,24 @@

3781

do

3782

IFS=$as_save_IFS

3783

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

3784

- for ac_exec_ext in '' $ac_executable_extensions; do

3785

+ for ac_exec_ext in '' $ac_executable_extensions; do

3786

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

3787

ac_cv_prog_CC="${ac_tool_prefix}cc"

3788

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

3789

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3790

break 2

3791

fi

3792

done

3793

-done

3794

+ done

3795

IFS=$as_save_IFS

3796

3797

fi

3798

fi

3799

CC=$ac_cv_prog_CC

3800

if test -n "$CC"; then

3801

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

3802

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

3803

$as_echo "$CC" >&6; }

3804

else

3805

- { $as_echo "$as_me:$LINENO: result: no" >&5

3806

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3807

$as_echo "no" >&6; }

3808

fi

3809

3810

@@ -3130,9 +3441,9 @@

3811

if test -z "$CC"; then

3812

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

3813

set dummy cc; ac_word=$2

3814

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

3815

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3816

$as_echo_n "checking for $ac_word... " >&6; }

3817

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

3818

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

3819

$as_echo_n "(cached) " >&6

3820

else

3821

if test -n "$CC"; then

3822

@@ -3144,18 +3455,18 @@

3823

do

3824

IFS=$as_save_IFS

3825

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

3826

- for ac_exec_ext in '' $ac_executable_extensions; do

3827

+ for ac_exec_ext in '' $ac_executable_extensions; do

3828

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

3829

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

3830

ac_prog_rejected=yes

3831

continue

3832

fi

3833

ac_cv_prog_CC="cc"

3834

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

3835

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3836

break 2

3837

fi

3838

done

3839

-done

3840

+ done

3841

IFS=$as_save_IFS

3842

3843

if test $ac_prog_rejected = yes; then

3844

@@ -3174,10 +3485,10 @@

3845

fi

3846

CC=$ac_cv_prog_CC

3847

if test -n "$CC"; then

3848

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

3849

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

3850

$as_echo "$CC" >&6; }

3851

else

3852

- { $as_echo "$as_me:$LINENO: result: no" >&5

3853

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3854

$as_echo "no" >&6; }

3855

fi

3856

3857

@@ -3189,9 +3500,9 @@

3858

do

3859

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

3860

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

3861

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

3862

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3863

$as_echo_n "checking for $ac_word... " >&6; }

3864

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

3865

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

3866

$as_echo_n "(cached) " >&6

3867

else

3868

if test -n "$CC"; then

3869

@@ -3202,24 +3513,24 @@

3870

do

3871

IFS=$as_save_IFS

3872

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

3873

- for ac_exec_ext in '' $ac_executable_extensions; do

3874

+ for ac_exec_ext in '' $ac_executable_extensions; do

3875

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

3876

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

3877

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

3878

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3879

break 2

3880

fi

3881

done

3882

-done

3883

+ done

3884

IFS=$as_save_IFS

3885

3886

fi

3887

fi

3888

CC=$ac_cv_prog_CC

3889

if test -n "$CC"; then

3890

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

3891

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

3892

$as_echo "$CC" >&6; }

3893

else

3894

- { $as_echo "$as_me:$LINENO: result: no" >&5

3895

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3896

$as_echo "no" >&6; }

3897

fi

3898

3899

@@ -3233,9 +3544,9 @@

3900

do

3901

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

3902

set dummy $ac_prog; ac_word=$2

3903

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

3904

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3905

$as_echo_n "checking for $ac_word... " >&6; }

3906

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

3907

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

3908

$as_echo_n "(cached) " >&6

3909

else

3910

if test -n "$ac_ct_CC"; then

3911

@@ -3246,24 +3557,24 @@

3912

do

3913

IFS=$as_save_IFS

3914

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

3915

- for ac_exec_ext in '' $ac_executable_extensions; do

3916

+ for ac_exec_ext in '' $ac_executable_extensions; do

3917

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

3918

ac_cv_prog_ac_ct_CC="$ac_prog"

3919

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

3920

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3921

break 2

3922

fi

3923

done

3924

-done

3925

+ done

3926

IFS=$as_save_IFS

3927

3928

fi

3929

fi

3930

ac_ct_CC=$ac_cv_prog_ac_ct_CC

3931

if test -n "$ac_ct_CC"; then

3932

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

3933

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

3934

$as_echo "$ac_ct_CC" >&6; }

3935

else

3936

- { $as_echo "$as_me:$LINENO: result: no" >&5

3937

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3938

$as_echo "no" >&6; }

3939

fi

3940

3941

@@ -3276,7 +3587,7 @@

3942

else

3943

case $cross_compiling:$ac_tool_warned in

3944

yes:)

3945

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

3946

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

3947

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

3948

ac_tool_warned=yes ;;

3949

esac

3950

@@ -3287,73 +3598,55 @@

3951

fi

3952

3953

3954

-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

3955

+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

3956

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

3957

-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH

3958

-See \`config.log' for more details." >&5

3959

-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH

3960

-See \`config.log' for more details." >&2;}

3961

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

3962

+as_fn_error "no acceptable C compiler found in \$PATH

3963

+See \`config.log' for more details." "$LINENO" 5; }

3964

3965

# Provide some information about the compiler.

3966

-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5

3967

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

3968

set X $ac_compile

3969

ac_compiler=$2

3970

-{ (ac_try="$ac_compiler --version >&5"

3971

-case "(($ac_try" in

3972

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3973

- *) ac_try_echo=$ac_try;;

3974

-esac

3975

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3976

-$as_echo "$ac_try_echo") >&5

3977

- (eval "$ac_compiler --version >&5") 2>&5

3978

- ac_status=$?

3979

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3980

- (exit $ac_status); }

3981

-{ (ac_try="$ac_compiler -v >&5"

3982

-case "(($ac_try" in

3983

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3984

- *) ac_try_echo=$ac_try;;

3985

-esac

3986

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3987

-$as_echo "$ac_try_echo") >&5

3988

- (eval "$ac_compiler -v >&5") 2>&5

3989

- ac_status=$?

3990

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3991

- (exit $ac_status); }

3992

-{ (ac_try="$ac_compiler -V >&5"

3993

-case "(($ac_try" in

3994

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3995

- *) ac_try_echo=$ac_try;;

3996

-esac

3997

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3998

-$as_echo "$ac_try_echo") >&5

3999

- (eval "$ac_compiler -V >&5") 2>&5

4000

- ac_status=$?

4001

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4002

- (exit $ac_status); }

4003

+for ac_option in --version -v -V -qversion; do

4004

+ { { ac_try="$ac_compiler $ac_option >&5"

4005

+case "(($ac_try" in

4006

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4007

+ *) ac_try_echo=$ac_try;;

4008

+esac

4009

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

4010

+$as_echo "$ac_try_echo"; } >&5

4011

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

4012

+ ac_status=$?

4013

+ if test -s conftest.err; then

4014

+ sed '10a\

4015

+... rest of stderr output deleted ...

4016

+ 10q' conftest.err >conftest.er1

4017

+ cat conftest.er1 >&5

4018

+ rm -f conftest.er1 conftest.err

4019

+ fi

4020

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

4021

+ test $ac_status = 0; }

4022

+done

4023

4024

-cat >conftest.$ac_ext <<_ACEOF

4025

-/* confdefs.h. */

4026

-_ACEOF

4027

-cat confdefs.h >>conftest.$ac_ext

4028

-cat >>conftest.$ac_ext <<_ACEOF

4029

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4030

/* end confdefs.h. */

4031

-

4032

+#include <stdio.h>

4033

int

4034

main ()

4035

{

4036

+FILE *f = fopen ("conftest.out", "w");

4037

+ return ferror (f) || fclose (f) != 0;

4038

4039

;

4040

return 0;

4041

}

4042

_ACEOF

4043

ac_clean_files_save=$ac_clean_files

4044

-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"

4045

+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"

4046

# Try to create an executable without -o first, disregard a.out.

4047

# It will help us diagnose broken compilers, and finding out an intuition

4048

# of exeext.

4049

-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

4050

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5

4051

$as_echo_n "checking for C compiler default output file name... " >&6; }

4052

ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

4053

4054

@@ -3370,17 +3663,17 @@

4055

done

4056

rm -f $ac_rmfiles

4057

4058

-if { (ac_try="$ac_link_default"

4059

+if { { ac_try="$ac_link_default"

4060

case "(($ac_try" in

4061

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4062

*) ac_try_echo=$ac_try;;

4063

esac

4064

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4065

-$as_echo "$ac_try_echo") >&5

4066

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

4067

+$as_echo "$ac_try_echo"; } >&5

4068

(eval "$ac_link_default") 2>&5

4069

ac_status=$?

4070

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4071

- (exit $ac_status); }; then

4072

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

4073

+ test $ac_status = 0; }; then :

4074

# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.

4075

# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'

4076

# in a Makefile. We should not override ac_cv_exeext if it was cached,

4077

@@ -3397,7 +3690,7 @@

4078

# certainly right.

4079

break;;

4080

*.* )

4081

- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;

4082

+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;

4083

then :; else

4084

ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

4085

fi

4086

@@ -3416,84 +3709,75 @@

4087

else

4088

ac_file=''

4089

fi

4090

-

4091

-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5

4092

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5

4093

$as_echo "$ac_file" >&6; }

4094

-if test -z "$ac_file"; then

4095

+if test -z "$ac_file"; then :

4096

$as_echo "$as_me: failed program was:" >&5

4097

sed 's/^/| /' conftest.$ac_ext >&5

4098

4099

-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

4100

+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

4101

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

4102

-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables

4103

-See \`config.log' for more details." >&5

4104

-$as_echo "$as_me: error: C compiler cannot create executables

4105

-See \`config.log' for more details." >&2;}

4106

- { (exit 77); exit 77; }; }; }

4107

+{ as_fn_set_status 77

4108

+as_fn_error "C compiler cannot create executables

4109

+See \`config.log' for more details." "$LINENO" 5; }; }

4110

fi

4111

-

4112

ac_exeext=$ac_cv_exeext

4113

4114

# Check that the compiler produces executables we can run. If not, either

4115

# the compiler is broken, or we cross compile.

4116

-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5

4117

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5

4118

$as_echo_n "checking whether the C compiler works... " >&6; }

4119

-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0

4120

# If not cross compiling, check that we can run a simple program.

4121

if test "$cross_compiling" != yes; then

4122

if { ac_try='./$ac_file'

4123

- { (case "(($ac_try" in

4124

+ { { case "(($ac_try" in

4125

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4126

*) ac_try_echo=$ac_try;;

4127

esac

4128

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4129

-$as_echo "$ac_try_echo") >&5

4130

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

4131

+$as_echo "$ac_try_echo"; } >&5

4132

(eval "$ac_try") 2>&5

4133

ac_status=$?

4134

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4135

- (exit $ac_status); }; }; then

4136

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

4137

+ test $ac_status = 0; }; }; then

4138

cross_compiling=no

4139

else

4140

if test "$cross_compiling" = maybe; then

4141

cross_compiling=yes

4142

else

4143

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

4144

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

4145

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

4146

-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.

4147

-If you meant to cross compile, use \`--host'.

4148

-See \`config.log' for more details." >&5

4149

-$as_echo "$as_me: error: cannot run C compiled programs.

4150

-If you meant to cross compile, use \`--host'.

4151

-See \`config.log' for more details." >&2;}

4152

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

4153

+as_fn_error "cannot run C compiled programs.

4154

+If you meant to cross compile, use \`--host'.

4155

+See \`config.log' for more details." "$LINENO" 5; }

4156

fi

4157

fi

4158

fi

4159

-{ $as_echo "$as_me:$LINENO: result: yes" >&5

4160

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

4161

$as_echo "yes" >&6; }

4162

4163

-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out

4164

+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out

4165

ac_clean_files=$ac_clean_files_save

4166

# Check that the compiler produces executables we can run. If not, either

4167

# the compiler is broken, or we cross compile.

4168

-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

4169

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5

4170

$as_echo_n "checking whether we are cross compiling... " >&6; }

4171

-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5

4172

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5

4173

$as_echo "$cross_compiling" >&6; }

4174

4175

-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5

4176

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5

4177

$as_echo_n "checking for suffix of executables... " >&6; }

4178

-if { (ac_try="$ac_link"

4179

+if { { ac_try="$ac_link"

4180

case "(($ac_try" in

4181

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4182

*) ac_try_echo=$ac_try;;

4183

esac

4184

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4185

-$as_echo "$ac_try_echo") >&5

4186

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

4187

+$as_echo "$ac_try_echo"; } >&5

4188

(eval "$ac_link") 2>&5

4189

ac_status=$?

4190

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4191

- (exit $ac_status); }; then

4192

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

4193

+ test $ac_status = 0; }; then :

4194

# If both `conftest.exe' and `conftest' are `present' (well, observable)

4195

# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will

4196

# work properly (i.e., refer to `conftest.exe'), while it won't with

4197

@@ -3508,32 +3792,24 @@

4198

esac

4199

done

4200

else

4201

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

4202

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

4203

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

4204

-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link

4205

-See \`config.log' for more details." >&5

4206

-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link

4207

-See \`config.log' for more details." >&2;}

4208

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

4209

+as_fn_error "cannot compute suffix of executables: cannot compile and link

4210

+See \`config.log' for more details." "$LINENO" 5; }

4211

fi

4212

-

4213

rm -f conftest$ac_cv_exeext

4214

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5

4215

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5

4216

$as_echo "$ac_cv_exeext" >&6; }

4217

4218

rm -f conftest.$ac_ext

4219

EXEEXT=$ac_cv_exeext

4220

ac_exeext=$EXEEXT

4221

-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5

4222

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5

4223

$as_echo_n "checking for suffix of object files... " >&6; }

4224

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

4225

+if test "${ac_cv_objext+set}" = set; then :

4226

$as_echo_n "(cached) " >&6

4227

else

4228

- cat >conftest.$ac_ext <<_ACEOF

4229

-/* confdefs.h. */

4230

-_ACEOF

4231

-cat confdefs.h >>conftest.$ac_ext

4232

-cat >>conftest.$ac_ext <<_ACEOF

4233

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4234

/* end confdefs.h. */

4235

4236

int

4237

@@ -3545,17 +3821,17 @@

4238

}

4239

_ACEOF

4240

rm -f conftest.o conftest.obj

4241

-if { (ac_try="$ac_compile"

4242

+if { { ac_try="$ac_compile"

4243

case "(($ac_try" in

4244

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4245

*) ac_try_echo=$ac_try;;

4246

esac

4247

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4248

-$as_echo "$ac_try_echo") >&5

4249

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

4250

+$as_echo "$ac_try_echo"; } >&5

4251

(eval "$ac_compile") 2>&5

4252

ac_status=$?

4253

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4254

- (exit $ac_status); }; then

4255

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

4256

+ test $ac_status = 0; }; then :

4257

for ac_file in conftest.o conftest.obj conftest.*; do

4258

test -f "$ac_file" || continue;

4259

case $ac_file in

4260

@@ -3568,31 +3844,23 @@

4261

$as_echo "$as_me: failed program was:" >&5

4262

sed 's/^/| /' conftest.$ac_ext >&5

4263

4264

-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

4265

+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

4266

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

4267

-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile

4268

-See \`config.log' for more details." >&5

4269

-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile

4270

-See \`config.log' for more details." >&2;}

4271

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

4272

+as_fn_error "cannot compute suffix of object files: cannot compile

4273

+See \`config.log' for more details." "$LINENO" 5; }

4274

fi

4275

-

4276

rm -f conftest.$ac_cv_objext conftest.$ac_ext

4277

fi

4278

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5

4279

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5

4280

$as_echo "$ac_cv_objext" >&6; }

4281

OBJEXT=$ac_cv_objext

4282

ac_objext=$OBJEXT

4283

-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

4284

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5

4285

$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }

4286

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

4287

+if test "${ac_cv_c_compiler_gnu+set}" = set; then :

4288

$as_echo_n "(cached) " >&6

4289

else

4290

- cat >conftest.$ac_ext <<_ACEOF

4291

-/* confdefs.h. */

4292

-_ACEOF

4293

-cat confdefs.h >>conftest.$ac_ext

4294

-cat >>conftest.$ac_ext <<_ACEOF

4295

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4296

/* end confdefs.h. */

4297

4298

int

4299

@@ -3606,37 +3874,16 @@

4300

return 0;

4301

}

4302

_ACEOF

4303

-rm -f conftest.$ac_objext

4304

-if { (ac_try="$ac_compile"

4305

-case "(($ac_try" in

4306

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4307

- *) ac_try_echo=$ac_try;;

4308

-esac

4309

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4310

-$as_echo "$ac_try_echo") >&5

4311

- (eval "$ac_compile") 2>conftest.er1

4312

- ac_status=$?

4313

- grep -v '^ *+' conftest.er1 >conftest.err

4314

- rm -f conftest.er1

4315

- cat conftest.err >&5

4316

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4317

- (exit $ac_status); } && {

4318

- test -z "$ac_c_werror_flag" ||

4319

- test ! -s conftest.err

4320

- } && test -s conftest.$ac_objext; then

4321

+if ac_fn_c_try_compile "$LINENO"; then :

4322

ac_compiler_gnu=yes

4323

else

4324

- $as_echo "$as_me: failed program was:" >&5

4325

-sed 's/^/| /' conftest.$ac_ext >&5

4326

-

4327

- ac_compiler_gnu=no

4328

+ ac_compiler_gnu=no

4329

fi

4330

-

4331

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4332

ac_cv_c_compiler_gnu=$ac_compiler_gnu

4333

4334

fi

4335

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

4336

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5

4337

$as_echo "$ac_cv_c_compiler_gnu" >&6; }

4338

if test $ac_compiler_gnu = yes; then

4339

GCC=yes

4340

@@ -3645,20 +3892,16 @@

4341

fi

4342

ac_test_CFLAGS=${CFLAGS+set}

4343

ac_save_CFLAGS=$CFLAGS

4344

-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

4345

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5

4346

$as_echo_n "checking whether $CC accepts -g... " >&6; }

4347

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

4348

+if test "${ac_cv_prog_cc_g+set}" = set; then :

4349

$as_echo_n "(cached) " >&6

4350

else

4351

ac_save_c_werror_flag=$ac_c_werror_flag

4352

ac_c_werror_flag=yes

4353

ac_cv_prog_cc_g=no

4354

CFLAGS="-g"

4355

- cat >conftest.$ac_ext <<_ACEOF

4356

-/* confdefs.h. */

4357

-_ACEOF

4358

-cat confdefs.h >>conftest.$ac_ext

4359

-cat >>conftest.$ac_ext <<_ACEOF

4360

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4361

/* end confdefs.h. */

4362

4363

int

4364

@@ -3669,35 +3912,11 @@

4365

return 0;

4366

}

4367

_ACEOF

4368

-rm -f conftest.$ac_objext

4369

-if { (ac_try="$ac_compile"

4370

-case "(($ac_try" in

4371

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4372

- *) ac_try_echo=$ac_try;;

4373

-esac

4374

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4375

-$as_echo "$ac_try_echo") >&5

4376

- (eval "$ac_compile") 2>conftest.er1

4377

- ac_status=$?

4378

- grep -v '^ *+' conftest.er1 >conftest.err

4379

- rm -f conftest.er1

4380

- cat conftest.err >&5

4381

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4382

- (exit $ac_status); } && {

4383

- test -z "$ac_c_werror_flag" ||

4384

- test ! -s conftest.err

4385

- } && test -s conftest.$ac_objext; then

4386

+if ac_fn_c_try_compile "$LINENO"; then :

4387

ac_cv_prog_cc_g=yes

4388

else

4389

- $as_echo "$as_me: failed program was:" >&5

4390

-sed 's/^/| /' conftest.$ac_ext >&5

4391

-

4392

- CFLAGS=""

4393

- cat >conftest.$ac_ext <<_ACEOF

4394

-/* confdefs.h. */

4395

-_ACEOF

4396

-cat confdefs.h >>conftest.$ac_ext

4397

-cat >>conftest.$ac_ext <<_ACEOF

4398

+ CFLAGS=""

4399

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4400

/* end confdefs.h. */

4401

4402

int

4403

@@ -3708,36 +3927,12 @@

4404

return 0;

4405

}

4406

_ACEOF

4407

-rm -f conftest.$ac_objext

4408

-if { (ac_try="$ac_compile"

4409

-case "(($ac_try" in

4410

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4411

- *) ac_try_echo=$ac_try;;

4412

-esac

4413

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4414

-$as_echo "$ac_try_echo") >&5

4415

- (eval "$ac_compile") 2>conftest.er1

4416

- ac_status=$?

4417

- grep -v '^ *+' conftest.er1 >conftest.err

4418

- rm -f conftest.er1

4419

- cat conftest.err >&5

4420

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4421

- (exit $ac_status); } && {

4422

- test -z "$ac_c_werror_flag" ||

4423

- test ! -s conftest.err

4424

- } && test -s conftest.$ac_objext; then

4425

- :

4426

+if ac_fn_c_try_compile "$LINENO"; then :

4427

+

4428

else

4429

- $as_echo "$as_me: failed program was:" >&5

4430

-sed 's/^/| /' conftest.$ac_ext >&5

4431

-

4432

- ac_c_werror_flag=$ac_save_c_werror_flag

4433

+ ac_c_werror_flag=$ac_save_c_werror_flag

4434

CFLAGS="-g"

4435

- cat >conftest.$ac_ext <<_ACEOF

4436

-/* confdefs.h. */

4437

-_ACEOF

4438

-cat confdefs.h >>conftest.$ac_ext

4439

-cat >>conftest.$ac_ext <<_ACEOF

4440

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4441

/* end confdefs.h. */

4442

4443

int

4444

@@ -3748,42 +3943,17 @@

4445

return 0;

4446

}

4447

_ACEOF

4448

-rm -f conftest.$ac_objext

4449

-if { (ac_try="$ac_compile"

4450

-case "(($ac_try" in

4451

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4452

- *) ac_try_echo=$ac_try;;

4453

-esac

4454

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4455

-$as_echo "$ac_try_echo") >&5

4456

- (eval "$ac_compile") 2>conftest.er1

4457

- ac_status=$?

4458

- grep -v '^ *+' conftest.er1 >conftest.err

4459

- rm -f conftest.er1

4460

- cat conftest.err >&5

4461

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4462

- (exit $ac_status); } && {

4463

- test -z "$ac_c_werror_flag" ||

4464

- test ! -s conftest.err

4465

- } && test -s conftest.$ac_objext; then

4466

+if ac_fn_c_try_compile "$LINENO"; then :

4467

ac_cv_prog_cc_g=yes

4468

-else

4469

- $as_echo "$as_me: failed program was:" >&5

4470

-sed 's/^/| /' conftest.$ac_ext >&5

4471

-

4472

-

4473

-fi

4474

-

4475

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4476

-fi

4477

-

4478

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4479

-fi

4480

-

4481

+fi

4482

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4483

+fi

4484

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4485

+fi

4486

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

4487

ac_c_werror_flag=$ac_save_c_werror_flag

4488

fi

4489

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

4490

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5

4491

$as_echo "$ac_cv_prog_cc_g" >&6; }

4492

if test "$ac_test_CFLAGS" = set; then

4493

CFLAGS=$ac_save_CFLAGS

4494

@@ -3800,18 +3970,14 @@

4495

CFLAGS=

4496

fi

4497

fi

4498

-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

4499

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5

4500

$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }

4501

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

4502

+if test "${ac_cv_prog_cc_c89+set}" = set; then :

4503

$as_echo_n "(cached) " >&6

4504

else

4505

ac_cv_prog_cc_c89=no

4506

ac_save_CC=$CC

4507

-cat >conftest.$ac_ext <<_ACEOF

4508

-/* confdefs.h. */

4509

-_ACEOF

4510

-cat confdefs.h >>conftest.$ac_ext

4511

-cat >>conftest.$ac_ext <<_ACEOF

4512

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4513

/* end confdefs.h. */

4514

#include <stdarg.h>

4515

#include <stdio.h>

4516

@@ -3868,32 +4034,9 @@

4517

-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

4518

do

4519

CC="$ac_save_CC $ac_arg"

4520

- rm -f conftest.$ac_objext

4521

-if { (ac_try="$ac_compile"

4522

-case "(($ac_try" in

4523

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4524

- *) ac_try_echo=$ac_try;;

4525

-esac

4526

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4527

-$as_echo "$ac_try_echo") >&5

4528

- (eval "$ac_compile") 2>conftest.er1

4529

- ac_status=$?

4530

- grep -v '^ *+' conftest.er1 >conftest.err

4531

- rm -f conftest.er1

4532

- cat conftest.err >&5

4533

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4534

- (exit $ac_status); } && {

4535

- test -z "$ac_c_werror_flag" ||

4536

- test ! -s conftest.err

4537

- } && test -s conftest.$ac_objext; then

4538

+ if ac_fn_c_try_compile "$LINENO"; then :

4539

ac_cv_prog_cc_c89=$ac_arg

4540

-else

4541

- $as_echo "$as_me: failed program was:" >&5

4542

-sed 's/^/| /' conftest.$ac_ext >&5

4543

-

4544

-

4545

fi

4546

-

4547

rm -f core conftest.err conftest.$ac_objext

4548

test "x$ac_cv_prog_cc_c89" != "xno" && break

4549

done

4550

@@ -3904,17 +4047,19 @@

4551

# AC_CACHE_VAL

4552

case "x$ac_cv_prog_cc_c89" in

4553

x)

4554

- { $as_echo "$as_me:$LINENO: result: none needed" >&5

4555

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5

4556

$as_echo "none needed" >&6; } ;;

4557

xno)

4558

- { $as_echo "$as_me:$LINENO: result: unsupported" >&5

4559

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5

4560

$as_echo "unsupported" >&6; } ;;

4561

*)

4562

CC="$CC $ac_cv_prog_cc_c89"

4563

- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

4564

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5

4565

$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;

4566

esac

4567

+if test "x$ac_cv_prog_cc_c89" != xno; then :

4568

4569

+fi

4570

4571

ac_ext=c

4572

ac_cpp='$CPP $CPPFLAGS'

4573

@@ -3924,9 +4069,9 @@

4574

4575

depcc="$CC" am_compiler_list=

4576

4577

-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

4578

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

4579

$as_echo_n "checking dependency style of $depcc... " >&6; }

4580

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

4581

+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :

4582

$as_echo_n "(cached) " >&6

4583

else

4584

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

4585

@@ -3952,6 +4097,11 @@

4586

if test "$am_compiler_list" = ""; then

4587

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

4588

fi

4589

+ am__universal=false

4590

+ case " $depcc " in #(

4591

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

4592

+ esac

4593

+

4594

for depmode in $am_compiler_list; do

4595

# Setup a source with many dependencies, because some compilers

4596

# like to wrap large dependency lists on column 80 (with \), and

4597

@@ -3969,7 +4119,17 @@

4598

done

4599

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

4600

4601

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

4602

+ # mode. It turns out that the SunPro C++ compiler does not properly

4603

+ # handle `-M -o', and we need to detect this. Also, some Intel

4604

+ # versions had trouble with output in subdirs

4605

+ am__obj=sub/conftest.${OBJEXT-o}

4606

+ am__minus_obj="-o $am__obj"

4607

case $depmode in

4608

+ gcc)

4609

+ # This depmode causes a compiler race in universal mode.

4610

+ test "$am__universal" = false || continue

4611

+ ;;

4612

nosideeffect)

4613

# after this tag, mechanisms are not by side-effect, so they'll

4614

# only be used when explicitly requested

4615

@@ -3979,19 +4139,23 @@

4616

break

4617

fi

4618

;;

4619

+ msvisualcpp | msvcmsys)

4620

+ # This compiler won't grok `-c -o', but also, the minuso test has

4621

+ # not run yet. These depmodes are late enough in the game, and

4622

+ # so weak that their functioning should not be impacted.

4623

+ am__obj=conftest.${OBJEXT-o}

4624

+ am__minus_obj=

4625

+ ;;

4626

none) break ;;

4627

esac

4628

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

4629

- # mode. It turns out that the SunPro C++ compiler does not properly

4630

- # handle `-M -o', and we need to detect this.

4631

if depmode=$depmode \

4632

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

4633

+ source=sub/conftest.c object=$am__obj \

4634

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

4635

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

4636

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

4637

>/dev/null 2>conftest.err &&

4638

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

4639

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

4640

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

4641

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

4642

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

4643

# icc doesn't choke on unknown options, it will just issue warnings

4644

# or remarks (even with -Werror). So we grep stderr for any message

4645

@@ -4015,7 +4179,7 @@

4646

fi

4647

4648

fi

4649

-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

4650

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5

4651

$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }

4652

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

4653

4654

@@ -4031,17 +4195,13 @@

4655

4656

4657

4658

-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5

4659

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5

4660

$as_echo_n "checking for library containing strerror... " >&6; }

4661

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

4662

+if test "${ac_cv_search_strerror+set}" = set; then :

4663

$as_echo_n "(cached) " >&6

4664

else

4665

ac_func_search_save_LIBS=$LIBS

4666

-cat >conftest.$ac_ext <<_ACEOF

4667

-/* confdefs.h. */

4668

-_ACEOF

4669

-cat confdefs.h >>conftest.$ac_ext

4670

-cat >>conftest.$ac_ext <<_ACEOF

4671

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

4672

/* end confdefs.h. */

4673

4674

/* Override any GCC internal prototype to avoid an error.

4675

@@ -4066,54 +4226,27 @@

4676

ac_res=-l$ac_lib

4677

LIBS="-l$ac_lib $ac_func_search_save_LIBS"

4678

fi

4679

- rm -f conftest.$ac_objext conftest$ac_exeext

4680

-if { (ac_try="$ac_link"

4681

-case "(($ac_try" in

4682

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4683

- *) ac_try_echo=$ac_try;;

4684

-esac

4685

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4686

-$as_echo "$ac_try_echo") >&5

4687

- (eval "$ac_link") 2>conftest.er1

4688

- ac_status=$?

4689

- grep -v '^ *+' conftest.er1 >conftest.err

4690

- rm -f conftest.er1

4691

- cat conftest.err >&5

4692

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4693

- (exit $ac_status); } && {

4694

- test -z "$ac_c_werror_flag" ||

4695

- test ! -s conftest.err

4696

- } && test -s conftest$ac_exeext && {

4697

- test "$cross_compiling" = yes ||

4698

- $as_test_x conftest$ac_exeext

4699

- }; then

4700

+ if ac_fn_c_try_link "$LINENO"; then :

4701

ac_cv_search_strerror=$ac_res

4702

-else

4703

- $as_echo "$as_me: failed program was:" >&5

4704

-sed 's/^/| /' conftest.$ac_ext >&5

4705

-

4706

-

4707

fi

4708

-

4709

-rm -rf conftest.dSYM

4710

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4711

- conftest$ac_exeext

4712

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

4713

+rm -f core conftest.err conftest.$ac_objext \

4714

+ conftest$ac_exeext

4715

+ if test "${ac_cv_search_strerror+set}" = set; then :

4716

break

4717

fi

4718

done

4719

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

4720

- :

4721

+if test "${ac_cv_search_strerror+set}" = set; then :

4722

+

4723

else

4724

ac_cv_search_strerror=no

4725

fi

4726

rm conftest.$ac_ext

4727

LIBS=$ac_func_search_save_LIBS

4728

fi

4729

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5

4730

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5

4731

$as_echo "$ac_cv_search_strerror" >&6; }

4732

ac_res=$ac_cv_search_strerror

4733

-if test "$ac_res" != no; then

4734

+if test "$ac_res" != no; then :

4735

test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

4736

4737

fi

4738

@@ -4126,9 +4259,9 @@

4739

if test -n "$ac_tool_prefix"; then

4740

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

4741

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

4742

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

4743

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4744

$as_echo_n "checking for $ac_word... " >&6; }

4745

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

4746

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

4747

$as_echo_n "(cached) " >&6

4748

else

4749

if test -n "$CC"; then

4750

@@ -4139,24 +4272,24 @@

4751

do

4752

IFS=$as_save_IFS

4753

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

4754

- for ac_exec_ext in '' $ac_executable_extensions; do

4755

+ for ac_exec_ext in '' $ac_executable_extensions; do

4756

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

4757

ac_cv_prog_CC="${ac_tool_prefix}gcc"

4758

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

4759

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4760

break 2

4761

fi

4762

done

4763

-done

4764

+ done

4765

IFS=$as_save_IFS

4766

4767

fi

4768

fi

4769

CC=$ac_cv_prog_CC

4770

if test -n "$CC"; then

4771

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

4772

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

4773

$as_echo "$CC" >&6; }

4774

else

4775

- { $as_echo "$as_me:$LINENO: result: no" >&5

4776

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4777

$as_echo "no" >&6; }

4778

fi

4779

4780

@@ -4166,9 +4299,9 @@

4781

ac_ct_CC=$CC

4782

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

4783

set dummy gcc; ac_word=$2

4784

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

4785

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4786

$as_echo_n "checking for $ac_word... " >&6; }

4787

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

4788

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

4789

$as_echo_n "(cached) " >&6

4790

else

4791

if test -n "$ac_ct_CC"; then

4792

@@ -4179,24 +4312,24 @@

4793

do

4794

IFS=$as_save_IFS

4795

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

4796

- for ac_exec_ext in '' $ac_executable_extensions; do

4797

+ for ac_exec_ext in '' $ac_executable_extensions; do

4798

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

4799

ac_cv_prog_ac_ct_CC="gcc"

4800

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

4801

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4802

break 2

4803

fi

4804

done

4805

-done

4806

+ done

4807

IFS=$as_save_IFS

4808

4809

fi

4810

fi

4811

ac_ct_CC=$ac_cv_prog_ac_ct_CC

4812

if test -n "$ac_ct_CC"; then

4813

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

4814

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

4815

$as_echo "$ac_ct_CC" >&6; }

4816

else

4817

- { $as_echo "$as_me:$LINENO: result: no" >&5

4818

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4819

$as_echo "no" >&6; }

4820

fi

4821

4822

@@ -4205,7 +4338,7 @@

4823

else

4824

case $cross_compiling:$ac_tool_warned in

4825

yes:)

4826

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

4827

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

4828

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4829

ac_tool_warned=yes ;;

4830

esac

4831

@@ -4219,9 +4352,9 @@

4832

if test -n "$ac_tool_prefix"; then

4833

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

4834

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

4835

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

4836

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4837

$as_echo_n "checking for $ac_word... " >&6; }

4838

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

4839

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

4840

$as_echo_n "(cached) " >&6

4841

else

4842

if test -n "$CC"; then

4843

@@ -4232,24 +4365,24 @@

4844

do

4845

IFS=$as_save_IFS

4846

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

4847

- for ac_exec_ext in '' $ac_executable_extensions; do

4848

+ for ac_exec_ext in '' $ac_executable_extensions; do

4849

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

4850

ac_cv_prog_CC="${ac_tool_prefix}cc"

4851

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

4852

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4853

break 2

4854

fi

4855

done

4856

-done

4857

+ done

4858

IFS=$as_save_IFS

4859

4860

fi

4861

fi

4862

CC=$ac_cv_prog_CC

4863

if test -n "$CC"; then

4864

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

4865

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

4866

$as_echo "$CC" >&6; }

4867

else

4868

- { $as_echo "$as_me:$LINENO: result: no" >&5

4869

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4870

$as_echo "no" >&6; }

4871

fi

4872

4873

@@ -4259,9 +4392,9 @@

4874

if test -z "$CC"; then

4875

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

4876

set dummy cc; ac_word=$2

4877

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

4878

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4879

$as_echo_n "checking for $ac_word... " >&6; }

4880

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

4881

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

4882

$as_echo_n "(cached) " >&6

4883

else

4884

if test -n "$CC"; then

4885

@@ -4273,18 +4406,18 @@

4886

do

4887

IFS=$as_save_IFS

4888

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

4889

- for ac_exec_ext in '' $ac_executable_extensions; do

4890

+ for ac_exec_ext in '' $ac_executable_extensions; do

4891

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

4892

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

4893

ac_prog_rejected=yes

4894

continue

4895

fi

4896

ac_cv_prog_CC="cc"

4897

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

4898

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4899

break 2

4900

fi

4901

done

4902

-done

4903

+ done

4904

IFS=$as_save_IFS

4905

4906

if test $ac_prog_rejected = yes; then

4907

@@ -4303,10 +4436,10 @@

4908

fi

4909

CC=$ac_cv_prog_CC

4910

if test -n "$CC"; then

4911

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

4912

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

4913

$as_echo "$CC" >&6; }

4914

else

4915

- { $as_echo "$as_me:$LINENO: result: no" >&5

4916

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4917

$as_echo "no" >&6; }

4918

fi

4919

4920

@@ -4318,9 +4451,9 @@

4921

do

4922

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

4923

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

4924

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

4925

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4926

$as_echo_n "checking for $ac_word... " >&6; }

4927

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

4928

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

4929

$as_echo_n "(cached) " >&6

4930

else

4931

if test -n "$CC"; then

4932

@@ -4331,24 +4464,24 @@

4933

do

4934

IFS=$as_save_IFS

4935

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

4936

- for ac_exec_ext in '' $ac_executable_extensions; do

4937

+ for ac_exec_ext in '' $ac_executable_extensions; do

4938

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

4939

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

4940

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

4941

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4942

break 2

4943

fi

4944

done

4945

-done

4946

+ done

4947

IFS=$as_save_IFS

4948

4949

fi

4950

fi

4951

CC=$ac_cv_prog_CC

4952

if test -n "$CC"; then

4953

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

4954

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

4955

$as_echo "$CC" >&6; }

4956

else

4957

- { $as_echo "$as_me:$LINENO: result: no" >&5

4958

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4959

$as_echo "no" >&6; }

4960

fi

4961

4962

@@ -4362,9 +4495,9 @@

4963

do

4964

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

4965

set dummy $ac_prog; ac_word=$2

4966

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

4967

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4968

$as_echo_n "checking for $ac_word... " >&6; }

4969

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

4970

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

4971

$as_echo_n "(cached) " >&6

4972

else

4973

if test -n "$ac_ct_CC"; then

4974

@@ -4375,24 +4508,24 @@

4975

do

4976

IFS=$as_save_IFS

4977

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

4978

- for ac_exec_ext in '' $ac_executable_extensions; do

4979

+ for ac_exec_ext in '' $ac_executable_extensions; do

4980

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

4981

ac_cv_prog_ac_ct_CC="$ac_prog"

4982

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

4983

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4984

break 2

4985

fi

4986

done

4987

-done

4988

+ done

4989

IFS=$as_save_IFS

4990

4991

fi

4992

fi

4993

ac_ct_CC=$ac_cv_prog_ac_ct_CC

4994

if test -n "$ac_ct_CC"; then

4995

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

4996

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

4997

$as_echo "$ac_ct_CC" >&6; }

4998

else

4999

- { $as_echo "$as_me:$LINENO: result: no" >&5

5000

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5001

$as_echo "no" >&6; }

5002

fi

5003

5004

@@ -4405,7 +4538,7 @@

5005

else

5006

case $cross_compiling:$ac_tool_warned in

5007

yes:)

5008

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

5009

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

5010

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

5011

ac_tool_warned=yes ;;

5012

esac

5013

@@ -4416,62 +4549,42 @@

5014

fi

5015

5016

5017

-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

5018

+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

5019

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

5020

-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH

5021

-See \`config.log' for more details." >&5

5022

-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH

5023

-See \`config.log' for more details." >&2;}

5024

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

5025

+as_fn_error "no acceptable C compiler found in \$PATH

5026

+See \`config.log' for more details." "$LINENO" 5; }

5027

5028

# Provide some information about the compiler.

5029

-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5

5030

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

5031

set X $ac_compile

5032

ac_compiler=$2

5033

-{ (ac_try="$ac_compiler --version >&5"

5034

-case "(($ac_try" in

5035

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5036

- *) ac_try_echo=$ac_try;;

5037

-esac

5038

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5039

-$as_echo "$ac_try_echo") >&5

5040

- (eval "$ac_compiler --version >&5") 2>&5

5041

- ac_status=$?

5042

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5043

- (exit $ac_status); }

5044

-{ (ac_try="$ac_compiler -v >&5"

5045

-case "(($ac_try" in

5046

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5047

- *) ac_try_echo=$ac_try;;

5048

-esac

5049

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5050

-$as_echo "$ac_try_echo") >&5

5051

- (eval "$ac_compiler -v >&5") 2>&5

5052

- ac_status=$?

5053

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5054

- (exit $ac_status); }

5055

-{ (ac_try="$ac_compiler -V >&5"

5056

-case "(($ac_try" in

5057

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5058

- *) ac_try_echo=$ac_try;;

5059

-esac

5060

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5061

-$as_echo "$ac_try_echo") >&5

5062

- (eval "$ac_compiler -V >&5") 2>&5

5063

- ac_status=$?

5064

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5065

- (exit $ac_status); }

5066

+for ac_option in --version -v -V -qversion; do

5067

+ { { ac_try="$ac_compiler $ac_option >&5"

5068

+case "(($ac_try" in

5069

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5070

+ *) ac_try_echo=$ac_try;;

5071

+esac

5072

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

5073

+$as_echo "$ac_try_echo"; } >&5

5074

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

5075

+ ac_status=$?

5076

+ if test -s conftest.err; then

5077

+ sed '10a\

5078

+... rest of stderr output deleted ...

5079

+ 10q' conftest.err >conftest.er1

5080

+ cat conftest.er1 >&5

5081

+ rm -f conftest.er1 conftest.err

5082

+ fi

5083

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

5084

+ test $ac_status = 0; }

5085

+done

5086

5087

-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

5088

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5

5089

$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }

5090

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

5091

+if test "${ac_cv_c_compiler_gnu+set}" = set; then :

5092

$as_echo_n "(cached) " >&6

5093

else

5094

- cat >conftest.$ac_ext <<_ACEOF

5095

-/* confdefs.h. */

5096

-_ACEOF

5097

-cat confdefs.h >>conftest.$ac_ext

5098

-cat >>conftest.$ac_ext <<_ACEOF

5099

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5100

/* end confdefs.h. */

5101

5102

int

5103

@@ -4485,37 +4598,16 @@

5104

return 0;

5105

}

5106

_ACEOF

5107

-rm -f conftest.$ac_objext

5108

-if { (ac_try="$ac_compile"

5109

-case "(($ac_try" in

5110

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5111

- *) ac_try_echo=$ac_try;;

5112

-esac

5113

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5114

-$as_echo "$ac_try_echo") >&5

5115

- (eval "$ac_compile") 2>conftest.er1

5116

- ac_status=$?

5117

- grep -v '^ *+' conftest.er1 >conftest.err

5118

- rm -f conftest.er1

5119

- cat conftest.err >&5

5120

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5121

- (exit $ac_status); } && {

5122

- test -z "$ac_c_werror_flag" ||

5123

- test ! -s conftest.err

5124

- } && test -s conftest.$ac_objext; then

5125

+if ac_fn_c_try_compile "$LINENO"; then :

5126

ac_compiler_gnu=yes

5127

else

5128

- $as_echo "$as_me: failed program was:" >&5

5129

-sed 's/^/| /' conftest.$ac_ext >&5

5130

-

5131

- ac_compiler_gnu=no

5132

+ ac_compiler_gnu=no

5133

fi

5134

-

5135

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5136

ac_cv_c_compiler_gnu=$ac_compiler_gnu

5137

5138

fi

5139

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

5140

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5

5141

$as_echo "$ac_cv_c_compiler_gnu" >&6; }

5142

if test $ac_compiler_gnu = yes; then

5143

GCC=yes

5144

@@ -4524,20 +4616,16 @@

5145

fi

5146

ac_test_CFLAGS=${CFLAGS+set}

5147

ac_save_CFLAGS=$CFLAGS

5148

-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

5149

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5

5150

$as_echo_n "checking whether $CC accepts -g... " >&6; }

5151

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

5152

+if test "${ac_cv_prog_cc_g+set}" = set; then :

5153

$as_echo_n "(cached) " >&6

5154

else

5155

ac_save_c_werror_flag=$ac_c_werror_flag

5156

ac_c_werror_flag=yes

5157

ac_cv_prog_cc_g=no

5158

CFLAGS="-g"

5159

- cat >conftest.$ac_ext <<_ACEOF

5160

-/* confdefs.h. */

5161

-_ACEOF

5162

-cat confdefs.h >>conftest.$ac_ext

5163

-cat >>conftest.$ac_ext <<_ACEOF

5164

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5165

/* end confdefs.h. */

5166

5167

int

5168

@@ -4548,35 +4636,11 @@

5169

return 0;

5170

}

5171

_ACEOF

5172

-rm -f conftest.$ac_objext

5173

-if { (ac_try="$ac_compile"

5174

-case "(($ac_try" in

5175

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5176

- *) ac_try_echo=$ac_try;;

5177

-esac

5178

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5179

-$as_echo "$ac_try_echo") >&5

5180

- (eval "$ac_compile") 2>conftest.er1

5181

- ac_status=$?

5182

- grep -v '^ *+' conftest.er1 >conftest.err

5183

- rm -f conftest.er1

5184

- cat conftest.err >&5

5185

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5186

- (exit $ac_status); } && {

5187

- test -z "$ac_c_werror_flag" ||

5188

- test ! -s conftest.err

5189

- } && test -s conftest.$ac_objext; then

5190

+if ac_fn_c_try_compile "$LINENO"; then :

5191

ac_cv_prog_cc_g=yes

5192

else

5193

- $as_echo "$as_me: failed program was:" >&5

5194

-sed 's/^/| /' conftest.$ac_ext >&5

5195

-

5196

- CFLAGS=""

5197

- cat >conftest.$ac_ext <<_ACEOF

5198

-/* confdefs.h. */

5199

-_ACEOF

5200

-cat confdefs.h >>conftest.$ac_ext

5201

-cat >>conftest.$ac_ext <<_ACEOF

5202

+ CFLAGS=""

5203

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5204

/* end confdefs.h. */

5205

5206

int

5207

@@ -4587,36 +4651,12 @@

5208

return 0;

5209

}

5210

_ACEOF

5211

-rm -f conftest.$ac_objext

5212

-if { (ac_try="$ac_compile"

5213

-case "(($ac_try" in

5214

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5215

- *) ac_try_echo=$ac_try;;

5216

-esac

5217

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5218

-$as_echo "$ac_try_echo") >&5

5219

- (eval "$ac_compile") 2>conftest.er1

5220

- ac_status=$?

5221

- grep -v '^ *+' conftest.er1 >conftest.err

5222

- rm -f conftest.er1

5223

- cat conftest.err >&5

5224

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5225

- (exit $ac_status); } && {

5226

- test -z "$ac_c_werror_flag" ||

5227

- test ! -s conftest.err

5228

- } && test -s conftest.$ac_objext; then

5229

- :

5230

+if ac_fn_c_try_compile "$LINENO"; then :

5231

+

5232

else

5233

- $as_echo "$as_me: failed program was:" >&5

5234

-sed 's/^/| /' conftest.$ac_ext >&5

5235

-

5236

- ac_c_werror_flag=$ac_save_c_werror_flag

5237

+ ac_c_werror_flag=$ac_save_c_werror_flag

5238

CFLAGS="-g"

5239

- cat >conftest.$ac_ext <<_ACEOF

5240

-/* confdefs.h. */

5241

-_ACEOF

5242

-cat confdefs.h >>conftest.$ac_ext

5243

-cat >>conftest.$ac_ext <<_ACEOF

5244

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5245

/* end confdefs.h. */

5246

5247

int

5248

@@ -4627,42 +4667,17 @@

5249

return 0;

5250

}

5251

_ACEOF

5252

-rm -f conftest.$ac_objext

5253

-if { (ac_try="$ac_compile"

5254

-case "(($ac_try" in

5255

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5256

- *) ac_try_echo=$ac_try;;

5257

-esac

5258

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5259

-$as_echo "$ac_try_echo") >&5

5260

- (eval "$ac_compile") 2>conftest.er1

5261

- ac_status=$?

5262

- grep -v '^ *+' conftest.er1 >conftest.err

5263

- rm -f conftest.er1

5264

- cat conftest.err >&5

5265

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5266

- (exit $ac_status); } && {

5267

- test -z "$ac_c_werror_flag" ||

5268

- test ! -s conftest.err

5269

- } && test -s conftest.$ac_objext; then

5270

+if ac_fn_c_try_compile "$LINENO"; then :

5271

ac_cv_prog_cc_g=yes

5272

-else

5273

- $as_echo "$as_me: failed program was:" >&5

5274

-sed 's/^/| /' conftest.$ac_ext >&5

5275

-

5276

-

5277

-fi

5278

-

5279

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5280

-fi

5281

-

5282

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5283

-fi

5284

-

5285

+fi

5286

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5287

+fi

5288

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5289

+fi

5290

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5291

ac_c_werror_flag=$ac_save_c_werror_flag

5292

fi

5293

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

5294

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5

5295

$as_echo "$ac_cv_prog_cc_g" >&6; }

5296

if test "$ac_test_CFLAGS" = set; then

5297

CFLAGS=$ac_save_CFLAGS

5298

@@ -4679,18 +4694,14 @@

5299

CFLAGS=

5300

fi

5301

fi

5302

-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

5303

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5

5304

$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }

5305

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

5306

+if test "${ac_cv_prog_cc_c89+set}" = set; then :

5307

$as_echo_n "(cached) " >&6

5308

else

5309

ac_cv_prog_cc_c89=no

5310

ac_save_CC=$CC

5311

-cat >conftest.$ac_ext <<_ACEOF

5312

-/* confdefs.h. */

5313

-_ACEOF

5314

-cat confdefs.h >>conftest.$ac_ext

5315

-cat >>conftest.$ac_ext <<_ACEOF

5316

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5317

/* end confdefs.h. */

5318

#include <stdarg.h>

5319

#include <stdio.h>

5320

@@ -4747,32 +4758,9 @@

5321

-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

5322

do

5323

CC="$ac_save_CC $ac_arg"

5324

- rm -f conftest.$ac_objext

5325

-if { (ac_try="$ac_compile"

5326

-case "(($ac_try" in

5327

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5328

- *) ac_try_echo=$ac_try;;

5329

-esac

5330

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5331

-$as_echo "$ac_try_echo") >&5

5332

- (eval "$ac_compile") 2>conftest.er1

5333

- ac_status=$?

5334

- grep -v '^ *+' conftest.er1 >conftest.err

5335

- rm -f conftest.er1

5336

- cat conftest.err >&5

5337

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5338

- (exit $ac_status); } && {

5339

- test -z "$ac_c_werror_flag" ||

5340

- test ! -s conftest.err

5341

- } && test -s conftest.$ac_objext; then

5342

+ if ac_fn_c_try_compile "$LINENO"; then :

5343

ac_cv_prog_cc_c89=$ac_arg

5344

-else

5345

- $as_echo "$as_me: failed program was:" >&5

5346

-sed 's/^/| /' conftest.$ac_ext >&5

5347

-

5348

-

5349

fi

5350

-

5351

rm -f core conftest.err conftest.$ac_objext

5352

test "x$ac_cv_prog_cc_c89" != "xno" && break

5353

done

5354

@@ -4783,17 +4771,19 @@

5355

# AC_CACHE_VAL

5356

case "x$ac_cv_prog_cc_c89" in

5357

x)

5358

- { $as_echo "$as_me:$LINENO: result: none needed" >&5

5359

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5

5360

$as_echo "none needed" >&6; } ;;

5361

xno)

5362

- { $as_echo "$as_me:$LINENO: result: unsupported" >&5

5363

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5

5364

$as_echo "unsupported" >&6; } ;;

5365

*)

5366

CC="$CC $ac_cv_prog_cc_c89"

5367

- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

5368

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5

5369

$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;

5370

esac

5371

+if test "x$ac_cv_prog_cc_c89" != xno; then :

5372

5373

+fi

5374

5375

ac_ext=c

5376

ac_cpp='$CPP $CPPFLAGS'

5377

@@ -4803,9 +4793,9 @@

5378

5379

depcc="$CC" am_compiler_list=

5380

5381

-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

5382

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

5383

$as_echo_n "checking dependency style of $depcc... " >&6; }

5384

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

5385

+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :

5386

$as_echo_n "(cached) " >&6

5387

else

5388

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

5389

@@ -4831,6 +4821,11 @@

5390

if test "$am_compiler_list" = ""; then

5391

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

5392

fi

5393

+ am__universal=false

5394

+ case " $depcc " in #(

5395

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

5396

+ esac

5397

+

5398

for depmode in $am_compiler_list; do

5399

# Setup a source with many dependencies, because some compilers

5400

# like to wrap large dependency lists on column 80 (with \), and

5401

@@ -4848,7 +4843,17 @@

5402

done

5403

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

5404

5405

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

5406

+ # mode. It turns out that the SunPro C++ compiler does not properly

5407

+ # handle `-M -o', and we need to detect this. Also, some Intel

5408

+ # versions had trouble with output in subdirs

5409

+ am__obj=sub/conftest.${OBJEXT-o}

5410

+ am__minus_obj="-o $am__obj"

5411

case $depmode in

5412

+ gcc)

5413

+ # This depmode causes a compiler race in universal mode.

5414

+ test "$am__universal" = false || continue

5415

+ ;;

5416

nosideeffect)

5417

# after this tag, mechanisms are not by side-effect, so they'll

5418

# only be used when explicitly requested

5419

@@ -4858,19 +4863,23 @@

5420

break

5421

fi

5422

;;

5423

+ msvisualcpp | msvcmsys)

5424

+ # This compiler won't grok `-c -o', but also, the minuso test has

5425

+ # not run yet. These depmodes are late enough in the game, and

5426

+ # so weak that their functioning should not be impacted.

5427

+ am__obj=conftest.${OBJEXT-o}

5428

+ am__minus_obj=

5429

+ ;;

5430

none) break ;;

5431

esac

5432

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

5433

- # mode. It turns out that the SunPro C++ compiler does not properly

5434

- # handle `-M -o', and we need to detect this.

5435

if depmode=$depmode \

5436

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

5437

+ source=sub/conftest.c object=$am__obj \

5438

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

5439

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

5440

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

5441

>/dev/null 2>conftest.err &&

5442

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

5443

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

5444

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

5445

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

5446

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

5447

# icc doesn't choke on unknown options, it will just issue warnings

5448

# or remarks (even with -Werror). So we grep stderr for any message

5449

@@ -4894,7 +4903,7 @@

5450

fi

5451

5452

fi

5453

-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

5454

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5

5455

$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }

5456

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

5457

5458

@@ -4914,14 +4923,14 @@

5459

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

5460

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

5461

ac_compiler_gnu=$ac_cv_c_compiler_gnu

5462

-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5

5463

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5

5464

$as_echo_n "checking how to run the C preprocessor... " >&6; }

5465

# On Suns, sometimes $CPP names a directory.

5466

if test -n "$CPP" && test -d "$CPP"; then

5467

CPP=

5468

fi

5469

if test -z "$CPP"; then

5470

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

5471

+ if test "${ac_cv_prog_CPP+set}" = set; then :

5472

$as_echo_n "(cached) " >&6

5473

else

5474

# Double quotes because CPP needs to be expanded

5475

@@ -4936,11 +4945,7 @@

5476

# <limits.h> exists even on freestanding compilers.

5477

# On the NeXT, cc -E runs the code through the compiler's parser,

5478

# not just through cpp. "Syntax error" is here to catch this case.

5479

- cat >conftest.$ac_ext <<_ACEOF

5480

-/* confdefs.h. */

5481

-_ACEOF

5482

-cat confdefs.h >>conftest.$ac_ext

5483

-cat >>conftest.$ac_ext <<_ACEOF

5484

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5485

/* end confdefs.h. */

5486

#ifdef __STDC__

5487

# include <limits.h>

5488

@@ -4949,78 +4954,34 @@

5489

#endif

5490

Syntax error

5491

_ACEOF

5492

-if { (ac_try="$ac_cpp conftest.$ac_ext"

5493

-case "(($ac_try" in

5494

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5495

- *) ac_try_echo=$ac_try;;

5496

-esac

5497

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5498

-$as_echo "$ac_try_echo") >&5

5499

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

5500

- ac_status=$?

5501

- grep -v '^ *+' conftest.er1 >conftest.err

5502

- rm -f conftest.er1

5503

- cat conftest.err >&5

5504

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5505

- (exit $ac_status); } >/dev/null && {

5506

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

5507

- test ! -s conftest.err

5508

- }; then

5509

- :

5510

+if ac_fn_c_try_cpp "$LINENO"; then :

5511

+

5512

else

5513

- $as_echo "$as_me: failed program was:" >&5

5514

-sed 's/^/| /' conftest.$ac_ext >&5

5515

-

5516

# Broken: fails on valid input.

5517

continue

5518

fi

5519

-

5520

rm -f conftest.err conftest.$ac_ext

5521

5522

# OK, works on sane cases. Now check whether nonexistent headers

5523

# can be detected and how.

5524

- cat >conftest.$ac_ext <<_ACEOF

5525

-/* confdefs.h. */

5526

-_ACEOF

5527

-cat confdefs.h >>conftest.$ac_ext

5528

-cat >>conftest.$ac_ext <<_ACEOF

5529

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5530

/* end confdefs.h. */

5531

#include <ac_nonexistent.h>

5532

_ACEOF

5533

-if { (ac_try="$ac_cpp conftest.$ac_ext"

5534

-case "(($ac_try" in

5535

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5536

- *) ac_try_echo=$ac_try;;

5537

-esac

5538

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5539

-$as_echo "$ac_try_echo") >&5

5540

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

5541

- ac_status=$?

5542

- grep -v '^ *+' conftest.er1 >conftest.err

5543

- rm -f conftest.er1

5544

- cat conftest.err >&5

5545

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5546

- (exit $ac_status); } >/dev/null && {

5547

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

5548

- test ! -s conftest.err

5549

- }; then

5550

+if ac_fn_c_try_cpp "$LINENO"; then :

5551

# Broken: success on invalid input.

5552

continue

5553

else

5554

- $as_echo "$as_me: failed program was:" >&5

5555

-sed 's/^/| /' conftest.$ac_ext >&5

5556

-

5557

# Passes both tests.

5558

ac_preproc_ok=:

5559

break

5560

fi

5561

-

5562

rm -f conftest.err conftest.$ac_ext

5563

5564

done

5565

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

5566

rm -f conftest.err conftest.$ac_ext

5567

-if $ac_preproc_ok; then

5568

+if $ac_preproc_ok; then :

5569

break

5570

fi

5571

5572

@@ -5032,7 +4993,7 @@

5573

else

5574

ac_cv_prog_CPP=$CPP

5575

fi

5576

-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5

5577

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5

5578

$as_echo "$CPP" >&6; }

5579

ac_preproc_ok=false

5580

for ac_c_preproc_warn_flag in '' yes

5581

@@ -5043,11 +5004,7 @@

5582

# <limits.h> exists even on freestanding compilers.

5583

# On the NeXT, cc -E runs the code through the compiler's parser,

5584

# not just through cpp. "Syntax error" is here to catch this case.

5585

- cat >conftest.$ac_ext <<_ACEOF

5586

-/* confdefs.h. */

5587

-_ACEOF

5588

-cat confdefs.h >>conftest.$ac_ext

5589

-cat >>conftest.$ac_ext <<_ACEOF

5590

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5591

/* end confdefs.h. */

5592

#ifdef __STDC__

5593

# include <limits.h>

5594

@@ -5056,87 +5013,40 @@

5595

#endif

5596

Syntax error

5597

_ACEOF

5598

-if { (ac_try="$ac_cpp conftest.$ac_ext"

5599

-case "(($ac_try" in

5600

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5601

- *) ac_try_echo=$ac_try;;

5602

-esac

5603

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5604

-$as_echo "$ac_try_echo") >&5

5605

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

5606

- ac_status=$?

5607

- grep -v '^ *+' conftest.er1 >conftest.err

5608

- rm -f conftest.er1

5609

- cat conftest.err >&5

5610

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5611

- (exit $ac_status); } >/dev/null && {

5612

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

5613

- test ! -s conftest.err

5614

- }; then

5615

- :

5616

+if ac_fn_c_try_cpp "$LINENO"; then :

5617

+

5618

else

5619

- $as_echo "$as_me: failed program was:" >&5

5620

-sed 's/^/| /' conftest.$ac_ext >&5

5621

-

5622

# Broken: fails on valid input.

5623

continue

5624

fi

5625

-

5626

rm -f conftest.err conftest.$ac_ext

5627

5628

# OK, works on sane cases. Now check whether nonexistent headers

5629

# can be detected and how.

5630

- cat >conftest.$ac_ext <<_ACEOF

5631

-/* confdefs.h. */

5632

-_ACEOF

5633

-cat confdefs.h >>conftest.$ac_ext

5634

-cat >>conftest.$ac_ext <<_ACEOF

5635

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5636

/* end confdefs.h. */

5637

#include <ac_nonexistent.h>

5638

_ACEOF

5639

-if { (ac_try="$ac_cpp conftest.$ac_ext"

5640

-case "(($ac_try" in

5641

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5642

- *) ac_try_echo=$ac_try;;

5643

-esac

5644

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5645

-$as_echo "$ac_try_echo") >&5

5646

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

5647

- ac_status=$?

5648

- grep -v '^ *+' conftest.er1 >conftest.err

5649

- rm -f conftest.er1

5650

- cat conftest.err >&5

5651

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5652

- (exit $ac_status); } >/dev/null && {

5653

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

5654

- test ! -s conftest.err

5655

- }; then

5656

+if ac_fn_c_try_cpp "$LINENO"; then :

5657

# Broken: success on invalid input.

5658

continue

5659

else

5660

- $as_echo "$as_me: failed program was:" >&5

5661

-sed 's/^/| /' conftest.$ac_ext >&5

5662

-

5663

# Passes both tests.

5664

ac_preproc_ok=:

5665

break

5666

fi

5667

-

5668

rm -f conftest.err conftest.$ac_ext

5669

5670

done

5671

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

5672

rm -f conftest.err conftest.$ac_ext

5673

-if $ac_preproc_ok; then

5674

- :

5675

+if $ac_preproc_ok; then :

5676

+

5677

else

5678

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

5679

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

5680

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

5681

-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check

5682

-See \`config.log' for more details." >&5

5683

-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check

5684

-See \`config.log' for more details." >&2;}

5685

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

5686

+as_fn_error "C preprocessor \"$CPP\" fails sanity check

5687

+See \`config.log' for more details." "$LINENO" 5; }

5688

fi

5689

5690

ac_ext=c

5691

@@ -5146,9 +5056,9 @@

5692

ac_compiler_gnu=$ac_cv_c_compiler_gnu

5693

5694

5695

-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5

5696

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5

5697

$as_echo_n "checking for grep that handles long lines and -e... " >&6; }

5698

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

5699

+if test "${ac_cv_path_GREP+set}" = set; then :

5700

$as_echo_n "(cached) " >&6

5701

else

5702

if test -z "$GREP"; then

5703

@@ -5159,7 +5069,7 @@

5704

do

5705

IFS=$as_save_IFS

5706

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

5707

- for ac_prog in grep ggrep; do

5708

+ for ac_prog in grep ggrep; do

5709

for ac_exec_ext in '' $ac_executable_extensions; do

5710

ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

5711

{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

5712

@@ -5179,7 +5089,7 @@

5713

$as_echo 'GREP' >> "conftest.nl"

5714

"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break

5715

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

5716

- ac_count=`expr $ac_count + 1`

5717

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

5718

if test $ac_count -gt ${ac_path_GREP_max-0}; then

5719

# Best one so far, save it but keep looking for a better one

5720

ac_cv_path_GREP="$ac_path_GREP"

5721

@@ -5194,26 +5104,24 @@

5722

$ac_path_GREP_found && break 3

5723

done

5724

done

5725

-done

5726

+ done

5727

IFS=$as_save_IFS

5728

if test -z "$ac_cv_path_GREP"; then

5729

- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

5730

-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

5731

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

5732

+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

5733

fi

5734

else

5735

ac_cv_path_GREP=$GREP

5736

fi

5737

5738

fi

5739

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5

5740

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5

5741

$as_echo "$ac_cv_path_GREP" >&6; }

5742

GREP="$ac_cv_path_GREP"

5743

5744

5745

-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5

5746

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5

5747

$as_echo_n "checking for egrep... " >&6; }

5748

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

5749

+if test "${ac_cv_path_EGREP+set}" = set; then :

5750

$as_echo_n "(cached) " >&6

5751

else

5752

if echo a | $GREP -E '(a|b)' >/dev/null 2>&1

5753

@@ -5227,7 +5135,7 @@

5754

do

5755

IFS=$as_save_IFS

5756

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

5757

- for ac_prog in egrep; do

5758

+ for ac_prog in egrep; do

5759

for ac_exec_ext in '' $ac_executable_extensions; do

5760

ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

5761

{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

5762

@@ -5247,7 +5155,7 @@

5763

$as_echo 'EGREP' >> "conftest.nl"

5764

"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break

5765

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

5766

- ac_count=`expr $ac_count + 1`

5767

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

5768

if test $ac_count -gt ${ac_path_EGREP_max-0}; then

5769

# Best one so far, save it but keep looking for a better one

5770

ac_cv_path_EGREP="$ac_path_EGREP"

5771

@@ -5262,12 +5170,10 @@

5772

$ac_path_EGREP_found && break 3

5773

done

5774

done

5775

-done

5776

+ done

5777

IFS=$as_save_IFS

5778

if test -z "$ac_cv_path_EGREP"; then

5779

- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

5780

-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

5781

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

5782

+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

5783

fi

5784

else

5785

ac_cv_path_EGREP=$EGREP

5786

@@ -5275,21 +5181,17 @@

5787

5788

fi

5789

fi

5790

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5

5791

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5

5792

$as_echo "$ac_cv_path_EGREP" >&6; }

5793

EGREP="$ac_cv_path_EGREP"

5794

5795

5796

-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5

5797

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5

5798

$as_echo_n "checking for ANSI C header files... " >&6; }

5799

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

5800

+if test "${ac_cv_header_stdc+set}" = set; then :

5801

$as_echo_n "(cached) " >&6

5802

else

5803

- cat >conftest.$ac_ext <<_ACEOF

5804

-/* confdefs.h. */

5805

-_ACEOF

5806

-cat confdefs.h >>conftest.$ac_ext

5807

-cat >>conftest.$ac_ext <<_ACEOF

5808

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5809

/* end confdefs.h. */

5810

#include <stdlib.h>

5811

#include <stdarg.h>

5812

@@ -5304,48 +5206,23 @@

5813

return 0;

5814

}

5815

_ACEOF

5816

-rm -f conftest.$ac_objext

5817

-if { (ac_try="$ac_compile"

5818

-case "(($ac_try" in

5819

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5820

- *) ac_try_echo=$ac_try;;

5821

-esac

5822

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5823

-$as_echo "$ac_try_echo") >&5

5824

- (eval "$ac_compile") 2>conftest.er1

5825

- ac_status=$?

5826

- grep -v '^ *+' conftest.er1 >conftest.err

5827

- rm -f conftest.er1

5828

- cat conftest.err >&5

5829

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5830

- (exit $ac_status); } && {

5831

- test -z "$ac_c_werror_flag" ||

5832

- test ! -s conftest.err

5833

- } && test -s conftest.$ac_objext; then

5834

+if ac_fn_c_try_compile "$LINENO"; then :

5835

ac_cv_header_stdc=yes

5836

else

5837

- $as_echo "$as_me: failed program was:" >&5

5838

-sed 's/^/| /' conftest.$ac_ext >&5

5839

-

5840

- ac_cv_header_stdc=no

5841

+ ac_cv_header_stdc=no

5842

fi

5843

-

5844

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5845

5846

if test $ac_cv_header_stdc = yes; then

5847

# SunOS 4.x string.h does not declare mem*, contrary to ANSI.

5848

- cat >conftest.$ac_ext <<_ACEOF

5849

-/* confdefs.h. */

5850

-_ACEOF

5851

-cat confdefs.h >>conftest.$ac_ext

5852

-cat >>conftest.$ac_ext <<_ACEOF

5853

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5854

/* end confdefs.h. */

5855

#include <string.h>

5856

5857

_ACEOF

5858

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

5859

- $EGREP "memchr" >/dev/null 2>&1; then

5860

- :

5861

+ $EGREP "memchr" >/dev/null 2>&1; then :

5862

+

5863

else

5864

ac_cv_header_stdc=no

5865

fi

5866

@@ -5355,18 +5232,14 @@

5867

5868

if test $ac_cv_header_stdc = yes; then

5869

# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.

5870

- cat >conftest.$ac_ext <<_ACEOF

5871

-/* confdefs.h. */

5872

-_ACEOF

5873

-cat confdefs.h >>conftest.$ac_ext

5874

-cat >>conftest.$ac_ext <<_ACEOF

5875

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5876

/* end confdefs.h. */

5877

#include <stdlib.h>

5878

5879

_ACEOF

5880

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

5881

- $EGREP "free" >/dev/null 2>&1; then

5882

- :

5883

+ $EGREP "free" >/dev/null 2>&1; then :

5884

+

5885

else

5886

ac_cv_header_stdc=no

5887

fi

5888

@@ -5376,14 +5249,10 @@

5889

5890

if test $ac_cv_header_stdc = yes; then

5891

# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.

5892

- if test "$cross_compiling" = yes; then

5893

+ if test "$cross_compiling" = yes; then :

5894

:

5895

else

5896

- cat >conftest.$ac_ext <<_ACEOF

5897

-/* confdefs.h. */

5898

-_ACEOF

5899

-cat confdefs.h >>conftest.$ac_ext

5900

-cat >>conftest.$ac_ext <<_ACEOF

5901

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5902

/* end confdefs.h. */

5903

#include <ctype.h>

5904

#include <stdlib.h>

5905

@@ -5410,57 +5279,28 @@

5906

return 0;

5907

}

5908

_ACEOF

5909

-rm -f conftest$ac_exeext

5910

-if { (ac_try="$ac_link"

5911

-case "(($ac_try" in

5912

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5913

- *) ac_try_echo=$ac_try;;

5914

-esac

5915

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5916

-$as_echo "$ac_try_echo") >&5

5917

- (eval "$ac_link") 2>&5

5918

- ac_status=$?

5919

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5920

- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

5921

- { (case "(($ac_try" in

5922

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5923

- *) ac_try_echo=$ac_try;;

5924

-esac

5925

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5926

-$as_echo "$ac_try_echo") >&5

5927

- (eval "$ac_try") 2>&5

5928

- ac_status=$?

5929

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5930

- (exit $ac_status); }; }; then

5931

- :

5932

+if ac_fn_c_try_run "$LINENO"; then :

5933

+

5934

else

5935

- $as_echo "$as_me: program exited with status $ac_status" >&5

5936

-$as_echo "$as_me: failed program was:" >&5

5937

-sed 's/^/| /' conftest.$ac_ext >&5

5938

-

5939

-( exit $ac_status )

5940

-ac_cv_header_stdc=no

5941

-fi

5942

-rm -rf conftest.dSYM

5943

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

5944

-fi

5945

-

5946

-

5947

-fi

5948

-fi

5949

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

5950

+ ac_cv_header_stdc=no

5951

+fi

5952

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

5953

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

5954

+fi

5955

+

5956

+fi

5957

+fi

5958

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5

5959

$as_echo "$ac_cv_header_stdc" >&6; }

5960

if test $ac_cv_header_stdc = yes; then

5961

5962

-cat >>confdefs.h <<\_ACEOF

5963

-#define STDC_HEADERS 1

5964

-_ACEOF

5965

+$as_echo "#define STDC_HEADERS 1" >>confdefs.h

5966

5967

fi

5968

5969

case `pwd` in

5970

*\ * | *\ *)

5971

- { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5

5972

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5

5973

$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;

5974

esac

5975

5976

@@ -5485,35 +5325,27 @@

5977

5978

# Make sure we can run config.sub.

5979

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

5980

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

5981

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

5982

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

5983

+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5

5984

5985

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

5986

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5

5987

$as_echo_n "checking build system type... " >&6; }

5988

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

5989

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

5990

$as_echo_n "(cached) " >&6

5991

else

5992

ac_build_alias=$build_alias

5993

test "x$ac_build_alias" = x &&

5994

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

5995

test "x$ac_build_alias" = x &&

5996

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

5997

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

5998

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

5999

+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5

6000

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

6001

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

6002

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

6003

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

6004

+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5

6005

6006

fi

6007

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5

6008

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5

6009

$as_echo "$ac_cv_build" >&6; }

6010

case $ac_cv_build in

6011

*-*-*) ;;

6012

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

6013

-$as_echo "$as_me: error: invalid value of canonical build" >&2;}

6014

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

6015

+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;

6016

esac

6017

build=$ac_cv_build

6018

ac_save_IFS=$IFS; IFS='-'

6019

@@ -5529,28 +5361,24 @@

6020

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

6021

6022

6023

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

6024

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5

6025

$as_echo_n "checking host system type... " >&6; }

6026

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

6027

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

6028

$as_echo_n "(cached) " >&6

6029

else

6030

if test "x$host_alias" = x; then

6031

ac_cv_host=$ac_cv_build

6032

else

6033

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

6034

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

6035

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

6036

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

6037

+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5

6038

fi

6039

6040

fi

6041

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5

6042

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5

6043

$as_echo "$ac_cv_host" >&6; }

6044

case $ac_cv_host in

6045

*-*-*) ;;

6046

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

6047

-$as_echo "$as_me: error: invalid value of canonical host" >&2;}

6048

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

6049

+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;

6050

esac

6051

host=$ac_cv_host

6052

ac_save_IFS=$IFS; IFS='-'

6053

@@ -5566,9 +5394,9 @@

6054

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

6055

6056

6057

-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5

6058

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5

6059

$as_echo_n "checking for a sed that does not truncate output... " >&6; }

6060

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

6061

+if test "${ac_cv_path_SED+set}" = set; then :

6062

$as_echo_n "(cached) " >&6

6063

else

6064

ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/

6065

@@ -5576,7 +5404,7 @@

6066

ac_script="$ac_script$as_nl$ac_script"

6067

done

6068

echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed

6069

- $as_unset ac_script || ac_script=

6070

+ { ac_script=; unset ac_script;}

6071

if test -z "$SED"; then

6072

ac_path_SED_found=false

6073

# Loop through the user's path and test for each of PROGNAME-LIST

6074

@@ -5585,7 +5413,7 @@

6075

do

6076

IFS=$as_save_IFS

6077

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

6078

- for ac_prog in sed gsed; do

6079

+ for ac_prog in sed gsed; do

6080

for ac_exec_ext in '' $ac_executable_extensions; do

6081

ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"

6082

{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue

6083

@@ -5605,7 +5433,7 @@

6084

$as_echo '' >> "conftest.nl"

6085

"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break

6086

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

6087

- ac_count=`expr $ac_count + 1`

6088

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

6089

if test $ac_count -gt ${ac_path_SED_max-0}; then

6090

# Best one so far, save it but keep looking for a better one

6091

ac_cv_path_SED="$ac_path_SED"

6092

@@ -5620,19 +5448,17 @@

6093

$ac_path_SED_found && break 3

6094

done

6095

done

6096

-done

6097

+ done

6098

IFS=$as_save_IFS

6099

if test -z "$ac_cv_path_SED"; then

6100

- { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5

6101

-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}

6102

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

6103

+ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5

6104

fi

6105

else

6106

ac_cv_path_SED=$SED

6107

fi

6108

6109

fi

6110

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5

6111

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5

6112

$as_echo "$ac_cv_path_SED" >&6; }

6113

SED="$ac_cv_path_SED"

6114

rm -f conftest.sed

6115

@@ -5650,9 +5476,9 @@

6116

6117

6118

6119

-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5

6120

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5

6121

$as_echo_n "checking for fgrep... " >&6; }

6122

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

6123

+if test "${ac_cv_path_FGREP+set}" = set; then :

6124

$as_echo_n "(cached) " >&6

6125

else

6126

if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1

6127

@@ -5666,7 +5492,7 @@

6128

do

6129

IFS=$as_save_IFS

6130

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

6131

- for ac_prog in fgrep; do

6132

+ for ac_prog in fgrep; do

6133

for ac_exec_ext in '' $ac_executable_extensions; do

6134

ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"

6135

{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue

6136

@@ -5686,7 +5512,7 @@

6137

$as_echo 'FGREP' >> "conftest.nl"

6138

"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break

6139

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

6140

- ac_count=`expr $ac_count + 1`

6141

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

6142

if test $ac_count -gt ${ac_path_FGREP_max-0}; then

6143

# Best one so far, save it but keep looking for a better one

6144

ac_cv_path_FGREP="$ac_path_FGREP"

6145

@@ -5701,12 +5527,10 @@

6146

$ac_path_FGREP_found && break 3

6147

done

6148

done

6149

-done

6150

+ done

6151

IFS=$as_save_IFS

6152

if test -z "$ac_cv_path_FGREP"; then

6153

- { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

6154

-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

6155

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

6156

+ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

6157

fi

6158

else

6159

ac_cv_path_FGREP=$FGREP

6160

@@ -5714,7 +5538,7 @@

6161

6162

fi

6163

fi

6164

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5

6165

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5

6166

$as_echo "$ac_cv_path_FGREP" >&6; }

6167

FGREP="$ac_cv_path_FGREP"

6168

6169

@@ -5740,7 +5564,7 @@

6170

6171

6172

# Check whether --with-gnu-ld was given.

6173

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

6174

+if test "${with_gnu_ld+set}" = set; then :

6175

withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes

6176

else

6177

with_gnu_ld=no

6178

@@ -5749,7 +5573,7 @@

6179

ac_prog=ld

6180

if test "$GCC" = yes; then

6181

# Check if gcc -print-prog-name=ld gives a path.

6182

- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5

6183

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5

6184

$as_echo_n "checking for ld used by $CC... " >&6; }

6185

case $host in

6186

*-*-mingw*)

6187

@@ -5779,13 +5603,13 @@

6188

;;

6189

esac

6190

elif test "$with_gnu_ld" = yes; then

6191

- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5

6192

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5

6193

$as_echo_n "checking for GNU ld... " >&6; }

6194

else

6195

- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5

6196

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5

6197

$as_echo_n "checking for non-GNU ld... " >&6; }

6198

fi

6199

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

6200

+if test "${lt_cv_path_LD+set}" = set; then :

6201

$as_echo_n "(cached) " >&6

6202

else

6203

if test -z "$LD"; then

6204

@@ -5816,18 +5640,16 @@

6205

6206

LD="$lt_cv_path_LD"

6207

if test -n "$LD"; then

6208

- { $as_echo "$as_me:$LINENO: result: $LD" >&5

6209

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5

6210

$as_echo "$LD" >&6; }

6211

else

6212

- { $as_echo "$as_me:$LINENO: result: no" >&5

6213

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6214

$as_echo "no" >&6; }

6215

fi

6216

-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

6217

-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

6218

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

6219

-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

6220

+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5

6221

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

6222

$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

6223

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

6224

+if test "${lt_cv_prog_gnu_ld+set}" = set; then :

6225

$as_echo_n "(cached) " >&6

6226

else

6227

# I'd rather use --version here, but apparently some GNU lds only accept -v.

6228

@@ -5840,7 +5662,7 @@

6229

;;

6230

esac

6231

fi

6232

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

6233

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5

6234

$as_echo "$lt_cv_prog_gnu_ld" >&6; }

6235

with_gnu_ld=$lt_cv_prog_gnu_ld

6236

6237

@@ -5852,9 +5674,9 @@

6238

6239

6240

6241

-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5

6242

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5

6243

$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }

6244

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

6245

+if test "${lt_cv_path_NM+set}" = set; then :

6246

$as_echo_n "(cached) " >&6

6247

else

6248

if test -n "$NM"; then

6249

@@ -5901,7 +5723,7 @@

6250

: ${lt_cv_path_NM=no}

6251

fi

6252

fi

6253

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5

6254

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5

6255

$as_echo "$lt_cv_path_NM" >&6; }

6256

if test "$lt_cv_path_NM" != "no"; then

6257

NM="$lt_cv_path_NM"

6258

@@ -5912,9 +5734,9 @@

6259

do

6260

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

6261

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

6262

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

6263

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6264

$as_echo_n "checking for $ac_word... " >&6; }

6265

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

6266

+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :

6267

$as_echo_n "(cached) " >&6

6268

else

6269

if test -n "$DUMPBIN"; then

6270

@@ -5925,24 +5747,24 @@

6271

do

6272

IFS=$as_save_IFS

6273

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

6274

- for ac_exec_ext in '' $ac_executable_extensions; do

6275

+ for ac_exec_ext in '' $ac_executable_extensions; do

6276

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

6277

ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"

6278

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

6279

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6280

break 2

6281

fi

6282

done

6283

-done

6284

+ done

6285

IFS=$as_save_IFS

6286

6287

fi

6288

fi

6289

DUMPBIN=$ac_cv_prog_DUMPBIN

6290

if test -n "$DUMPBIN"; then

6291

- { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5

6292

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5

6293

$as_echo "$DUMPBIN" >&6; }

6294

else

6295

- { $as_echo "$as_me:$LINENO: result: no" >&5

6296

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6297

$as_echo "no" >&6; }

6298

fi

6299

6300

@@ -5956,9 +5778,9 @@

6301

do

6302

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

6303

set dummy $ac_prog; ac_word=$2

6304

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

6305

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6306

$as_echo_n "checking for $ac_word... " >&6; }

6307

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

6308

+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :

6309

$as_echo_n "(cached) " >&6

6310

else

6311

if test -n "$ac_ct_DUMPBIN"; then

6312

@@ -5969,24 +5791,24 @@

6313

do

6314

IFS=$as_save_IFS

6315

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

6316

- for ac_exec_ext in '' $ac_executable_extensions; do

6317

+ for ac_exec_ext in '' $ac_executable_extensions; do

6318

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

6319

ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"

6320

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

6321

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6322

break 2

6323

fi

6324

done

6325

-done

6326

+ done

6327

IFS=$as_save_IFS

6328

6329

fi

6330

fi

6331

ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN

6332

if test -n "$ac_ct_DUMPBIN"; then

6333

- { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5

6334

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5

6335

$as_echo "$ac_ct_DUMPBIN" >&6; }

6336

else

6337

- { $as_echo "$as_me:$LINENO: result: no" >&5

6338

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6339

$as_echo "no" >&6; }

6340

fi

6341

6342

@@ -5999,7 +5821,7 @@

6343

else

6344

case $cross_compiling:$ac_tool_warned in

6345

yes:)

6346

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

6347

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

6348

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6349

ac_tool_warned=yes ;;

6350

esac

6351

@@ -6019,44 +5841,44 @@

6352

6353

6354

6355

-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5

6356

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5

6357

$as_echo_n "checking the name lister ($NM) interface... " >&6; }

6358

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

6359

+if test "${lt_cv_nm_interface+set}" = set; then :

6360

$as_echo_n "(cached) " >&6

6361

else

6362

lt_cv_nm_interface="BSD nm"

6363

echo "int some_variable = 0;" > conftest.$ac_ext

6364

- (eval echo "\"\$as_me:6029: $ac_compile\"" >&5)

6365

+ (eval echo "\"\$as_me:5851: $ac_compile\"" >&5)

6366

(eval "$ac_compile" 2>conftest.err)

6367

cat conftest.err >&5

6368

- (eval echo "\"\$as_me:6032: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

6369

+ (eval echo "\"\$as_me:5854: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

6370

(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

6371

cat conftest.err >&5

6372

- (eval echo "\"\$as_me:6035: output\"" >&5)

6373

+ (eval echo "\"\$as_me:5857: output\"" >&5)

6374

cat conftest.out >&5

6375

if $GREP 'External.*some_variable' conftest.out > /dev/null; then

6376

lt_cv_nm_interface="MS dumpbin"

6377

fi

6378

rm -f conftest*

6379

fi

6380

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5

6381

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5

6382

$as_echo "$lt_cv_nm_interface" >&6; }

6383

6384

-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5

6385

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5

6386

$as_echo_n "checking whether ln -s works... " >&6; }

6387

LN_S=$as_ln_s

6388

if test "$LN_S" = "ln -s"; then

6389

- { $as_echo "$as_me:$LINENO: result: yes" >&5

6390

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

6391

$as_echo "yes" >&6; }

6392

else

6393

- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5

6394

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5

6395

$as_echo "no, using $LN_S" >&6; }

6396

fi

6397

6398

# find the maximum length of command line arguments

6399

-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5

6400

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5

6401

$as_echo_n "checking the maximum length of command line arguments... " >&6; }

6402

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

6403

+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :

6404

$as_echo_n "(cached) " >&6

6405

else

6406

i=0

6407

@@ -6174,10 +5996,10 @@

6408

fi

6409

6410

if test -n $lt_cv_sys_max_cmd_len ; then

6411

- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5

6412

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5

6413

$as_echo "$lt_cv_sys_max_cmd_len" >&6; }

6414

else

6415

- { $as_echo "$as_me:$LINENO: result: none" >&5

6416

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5

6417

$as_echo "none" >&6; }

6418

fi

6419

max_cmd_len=$lt_cv_sys_max_cmd_len

6420

@@ -6191,7 +6013,7 @@

6421

: ${MV="mv -f"}

6422

: ${RM="rm -f"}

6423

6424

-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5

6425

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5

6426

$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }

6427

# Try some XSI features

6428

xsi_shell=no

6429

@@ -6201,17 +6023,17 @@

6430

&& eval 'test $(( 1 + 1 )) -eq 2 \

6431

&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \

6432

&& xsi_shell=yes

6433

-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5

6434

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5

6435

$as_echo "$xsi_shell" >&6; }

6436

6437

6438

-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5

6439

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5

6440

$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }

6441

lt_shell_append=no

6442

( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \

6443

>/dev/null 2>&1 \

6444

&& lt_shell_append=yes

6445

-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5

6446

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5

6447

$as_echo "$lt_shell_append" >&6; }

6448

6449

6450

@@ -6246,14 +6068,14 @@

6451

6452

6453

6454

-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5

6455

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5

6456

$as_echo_n "checking for $LD option to reload object files... " >&6; }

6457

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

6458

+if test "${lt_cv_ld_reload_flag+set}" = set; then :

6459

$as_echo_n "(cached) " >&6

6460

else

6461

lt_cv_ld_reload_flag='-r'

6462

fi

6463

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5

6464

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5

6465

$as_echo "$lt_cv_ld_reload_flag" >&6; }

6466

reload_flag=$lt_cv_ld_reload_flag

6467

case $reload_flag in

6468

@@ -6282,9 +6104,9 @@

6469

if test -n "$ac_tool_prefix"; then

6470

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

6471

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

6472

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

6473

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6474

$as_echo_n "checking for $ac_word... " >&6; }

6475

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

6476

+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :

6477

$as_echo_n "(cached) " >&6

6478

else

6479

if test -n "$OBJDUMP"; then

6480

@@ -6295,24 +6117,24 @@

6481

do

6482

IFS=$as_save_IFS

6483

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

6484

- for ac_exec_ext in '' $ac_executable_extensions; do

6485

+ for ac_exec_ext in '' $ac_executable_extensions; do

6486

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

6487

ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"

6488

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

6489

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6490

break 2

6491

fi

6492

done

6493

-done

6494

+ done

6495

IFS=$as_save_IFS

6496

6497

fi

6498

fi

6499

OBJDUMP=$ac_cv_prog_OBJDUMP

6500

if test -n "$OBJDUMP"; then

6501

- { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5

6502

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5

6503

$as_echo "$OBJDUMP" >&6; }

6504

else

6505

- { $as_echo "$as_me:$LINENO: result: no" >&5

6506

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6507

$as_echo "no" >&6; }

6508

fi

6509

6510

@@ -6322,9 +6144,9 @@

6511

ac_ct_OBJDUMP=$OBJDUMP

6512

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

6513

set dummy objdump; ac_word=$2

6514

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

6515

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6516

$as_echo_n "checking for $ac_word... " >&6; }

6517

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

6518

+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :

6519

$as_echo_n "(cached) " >&6

6520

else

6521

if test -n "$ac_ct_OBJDUMP"; then

6522

@@ -6335,24 +6157,24 @@

6523

do

6524

IFS=$as_save_IFS

6525

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

6526

- for ac_exec_ext in '' $ac_executable_extensions; do

6527

+ for ac_exec_ext in '' $ac_executable_extensions; do

6528

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

6529

ac_cv_prog_ac_ct_OBJDUMP="objdump"

6530

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

6531

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6532

break 2

6533

fi

6534

done

6535

-done

6536

+ done

6537

IFS=$as_save_IFS

6538

6539

fi

6540

fi

6541

ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP

6542

if test -n "$ac_ct_OBJDUMP"; then

6543

- { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5

6544

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5

6545

$as_echo "$ac_ct_OBJDUMP" >&6; }

6546

else

6547

- { $as_echo "$as_me:$LINENO: result: no" >&5

6548

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6549

$as_echo "no" >&6; }

6550

fi

6551

6552

@@ -6361,7 +6183,7 @@

6553

else

6554

case $cross_compiling:$ac_tool_warned in

6555

yes:)

6556

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

6557

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

6558

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6559

ac_tool_warned=yes ;;

6560

esac

6561

@@ -6381,9 +6203,9 @@

6562

6563

6564

6565

-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5

6566

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5

6567

$as_echo_n "checking how to recognize dependent libraries... " >&6; }

6568

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

6569

+if test "${lt_cv_deplibs_check_method+set}" = set; then :

6570

$as_echo_n "(cached) " >&6

6571

else

6572

lt_cv_file_magic_cmd='$MAGIC_CMD'

6573

@@ -6577,7 +6399,7 @@

6574

esac

6575

6576

fi

6577

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5

6578

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5

6579

$as_echo "$lt_cv_deplibs_check_method" >&6; }

6580

file_magic_cmd=$lt_cv_file_magic_cmd

6581

deplibs_check_method=$lt_cv_deplibs_check_method

6582

@@ -6597,9 +6419,9 @@

6583

if test -n "$ac_tool_prefix"; then

6584

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

6585

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

6586

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

6587

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6588

$as_echo_n "checking for $ac_word... " >&6; }

6589

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

6590

+if test "${ac_cv_prog_AR+set}" = set; then :

6591

$as_echo_n "(cached) " >&6

6592

else

6593

if test -n "$AR"; then

6594

@@ -6610,24 +6432,24 @@

6595

do

6596

IFS=$as_save_IFS

6597

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

6598

- for ac_exec_ext in '' $ac_executable_extensions; do

6599

+ for ac_exec_ext in '' $ac_executable_extensions; do

6600

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

6601

ac_cv_prog_AR="${ac_tool_prefix}ar"

6602

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

6603

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6604

break 2

6605

fi

6606

done

6607

-done

6608

+ done

6609

IFS=$as_save_IFS

6610

6611

fi

6612

fi

6613

AR=$ac_cv_prog_AR

6614

if test -n "$AR"; then

6615

- { $as_echo "$as_me:$LINENO: result: $AR" >&5

6616

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5

6617

$as_echo "$AR" >&6; }

6618

else

6619

- { $as_echo "$as_me:$LINENO: result: no" >&5

6620

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6621

$as_echo "no" >&6; }

6622

fi

6623

6624

@@ -6637,9 +6459,9 @@

6625

ac_ct_AR=$AR

6626

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

6627

set dummy ar; ac_word=$2

6628

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

6629

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6630

$as_echo_n "checking for $ac_word... " >&6; }

6631

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

6632

+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :

6633

$as_echo_n "(cached) " >&6

6634

else

6635

if test -n "$ac_ct_AR"; then

6636

@@ -6650,24 +6472,24 @@

6637

do

6638

IFS=$as_save_IFS

6639

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

6640

- for ac_exec_ext in '' $ac_executable_extensions; do

6641

+ for ac_exec_ext in '' $ac_executable_extensions; do

6642

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

6643

ac_cv_prog_ac_ct_AR="ar"

6644

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

6645

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6646

break 2

6647

fi

6648

done

6649

-done

6650

+ done

6651

IFS=$as_save_IFS

6652

6653

fi

6654

fi

6655

ac_ct_AR=$ac_cv_prog_ac_ct_AR

6656

if test -n "$ac_ct_AR"; then

6657

- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5

6658

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5

6659

$as_echo "$ac_ct_AR" >&6; }

6660

else

6661

- { $as_echo "$as_me:$LINENO: result: no" >&5

6662

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6663

$as_echo "no" >&6; }

6664

fi

6665

6666

@@ -6676,7 +6498,7 @@

6667

else

6668

case $cross_compiling:$ac_tool_warned in

6669

yes:)

6670

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

6671

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

6672

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6673

ac_tool_warned=yes ;;

6674

esac

6675

@@ -6702,9 +6524,9 @@

6676

if test -n "$ac_tool_prefix"; then

6677

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

6678

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

6679

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

6680

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6681

$as_echo_n "checking for $ac_word... " >&6; }

6682

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

6683

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

6684

$as_echo_n "(cached) " >&6

6685

else

6686

if test -n "$STRIP"; then

6687

@@ -6715,24 +6537,24 @@

6688

do

6689

IFS=$as_save_IFS

6690

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

6691

- for ac_exec_ext in '' $ac_executable_extensions; do

6692

+ for ac_exec_ext in '' $ac_executable_extensions; do

6693

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

6694

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

6695

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

6696

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6697

break 2

6698

fi

6699

done

6700

-done

6701

+ done

6702

IFS=$as_save_IFS

6703

6704

fi

6705

fi

6706

STRIP=$ac_cv_prog_STRIP

6707

if test -n "$STRIP"; then

6708

- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5

6709

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5

6710

$as_echo "$STRIP" >&6; }

6711

else

6712

- { $as_echo "$as_me:$LINENO: result: no" >&5

6713

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6714

$as_echo "no" >&6; }

6715

fi

6716

6717

@@ -6742,9 +6564,9 @@

6718

ac_ct_STRIP=$STRIP

6719

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

6720

set dummy strip; ac_word=$2

6721

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

6722

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6723

$as_echo_n "checking for $ac_word... " >&6; }

6724

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

6725

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

6726

$as_echo_n "(cached) " >&6

6727

else

6728

if test -n "$ac_ct_STRIP"; then

6729

@@ -6755,24 +6577,24 @@

6730

do

6731

IFS=$as_save_IFS

6732

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

6733

- for ac_exec_ext in '' $ac_executable_extensions; do

6734

+ for ac_exec_ext in '' $ac_executable_extensions; do

6735

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

6736

ac_cv_prog_ac_ct_STRIP="strip"

6737

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

6738

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6739

break 2

6740

fi

6741

done

6742

-done

6743

+ done

6744

IFS=$as_save_IFS

6745

6746

fi

6747

fi

6748

ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

6749

if test -n "$ac_ct_STRIP"; then

6750

- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

6751

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5

6752

$as_echo "$ac_ct_STRIP" >&6; }

6753

else

6754

- { $as_echo "$as_me:$LINENO: result: no" >&5

6755

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6756

$as_echo "no" >&6; }

6757

fi

6758

6759

@@ -6781,7 +6603,7 @@

6760

else

6761

case $cross_compiling:$ac_tool_warned in

6762

yes:)

6763

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

6764

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

6765

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6766

ac_tool_warned=yes ;;

6767

esac

6768

@@ -6801,9 +6623,9 @@

6769

if test -n "$ac_tool_prefix"; then

6770

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

6771

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

6772

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

6773

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6774

$as_echo_n "checking for $ac_word... " >&6; }

6775

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

6776

+if test "${ac_cv_prog_RANLIB+set}" = set; then :

6777

$as_echo_n "(cached) " >&6

6778

else

6779

if test -n "$RANLIB"; then

6780

@@ -6814,24 +6636,24 @@

6781

do

6782

IFS=$as_save_IFS

6783

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

6784

- for ac_exec_ext in '' $ac_executable_extensions; do

6785

+ for ac_exec_ext in '' $ac_executable_extensions; do

6786

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

6787

ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

6788

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

6789

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6790

break 2

6791

fi

6792

done

6793

-done

6794

+ done

6795

IFS=$as_save_IFS

6796

6797

fi

6798

fi

6799

RANLIB=$ac_cv_prog_RANLIB

6800

if test -n "$RANLIB"; then

6801

- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5

6802

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5

6803

$as_echo "$RANLIB" >&6; }

6804

else

6805

- { $as_echo "$as_me:$LINENO: result: no" >&5

6806

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6807

$as_echo "no" >&6; }

6808

fi

6809

6810

@@ -6841,9 +6663,9 @@

6811

ac_ct_RANLIB=$RANLIB

6812

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

6813

set dummy ranlib; ac_word=$2

6814

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

6815

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6816

$as_echo_n "checking for $ac_word... " >&6; }

6817

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

6818

+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :

6819

$as_echo_n "(cached) " >&6

6820

else

6821

if test -n "$ac_ct_RANLIB"; then

6822

@@ -6854,24 +6676,24 @@

6823

do

6824

IFS=$as_save_IFS

6825

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

6826

- for ac_exec_ext in '' $ac_executable_extensions; do

6827

+ for ac_exec_ext in '' $ac_executable_extensions; do

6828

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

6829

ac_cv_prog_ac_ct_RANLIB="ranlib"

6830

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

6831

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6832

break 2

6833

fi

6834

done

6835

-done

6836

+ done

6837

IFS=$as_save_IFS

6838

6839

fi

6840

fi

6841

ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB

6842

if test -n "$ac_ct_RANLIB"; then

6843

- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5

6844

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5

6845

$as_echo "$ac_ct_RANLIB" >&6; }

6846

else

6847

- { $as_echo "$as_me:$LINENO: result: no" >&5

6848

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6849

$as_echo "no" >&6; }

6850

fi

6851

6852

@@ -6880,7 +6702,7 @@

6853

else

6854

case $cross_compiling:$ac_tool_warned in

6855

yes:)

6856

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

6857

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

6858

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6859

ac_tool_warned=yes ;;

6860

esac

6861

@@ -6958,9 +6780,9 @@

6862

6863

6864

# Check for command to grab the raw symbol name followed by C symbol from nm.

6865

-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

6866

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5

6867

$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }

6868

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

6869

+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :

6870

$as_echo_n "(cached) " >&6

6871

else

6872

6873

@@ -7076,18 +6898,18 @@

6874

int main(){nm_test_var='a';nm_test_func();return(0);}

6875

_LT_EOF

6876

6877

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6878

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

6879

(eval $ac_compile) 2>&5

6880

ac_status=$?

6881

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6882

- (exit $ac_status); }; then

6883

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6884

+ test $ac_status = 0; }; then

6885

# Now try to grab the symbols.

6886

nlist=conftest.nm

6887

- if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5

6888

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5

6889

(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5

6890

ac_status=$?

6891

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6892

- (exit $ac_status); } && test -s "$nlist"; then

6893

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6894

+ test $ac_status = 0; } && test -s "$nlist"; then

6895

# Try sorting and uniquifying the output.

6896

if sort "$nlist" | uniq > "$nlist"T; then

6897

mv -f "$nlist"T "$nlist"

6898

@@ -7140,11 +6962,11 @@

6899

lt_save_CFLAGS="$CFLAGS"

6900

LIBS="conftstm.$ac_objext"

6901

CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"

6902

- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

6903

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5

6904

(eval $ac_link) 2>&5

6905

ac_status=$?

6906

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6907

- (exit $ac_status); } && test -s conftest${ac_exeext}; then

6908

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6909

+ test $ac_status = 0; } && test -s conftest${ac_exeext}; then

6910

pipe_works=yes

6911

fi

6912

LIBS="$lt_save_LIBS"

6913

@@ -7178,10 +7000,10 @@

6914

lt_cv_sys_global_symbol_to_cdecl=

6915

fi

6916

if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then

6917

- { $as_echo "$as_me:$LINENO: result: failed" >&5

6918

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5

6919

$as_echo "failed" >&6; }

6920

else

6921

- { $as_echo "$as_me:$LINENO: result: ok" >&5

6922

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5

6923

$as_echo "ok" >&6; }

6924

fi

6925

6926

@@ -7207,7 +7029,7 @@

6927

6928

6929

# Check whether --enable-libtool-lock was given.

6930

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

6931

+if test "${enable_libtool_lock+set}" = set; then :

6932

enableval=$enable_libtool_lock;

6933

fi

6934

6935

@@ -7219,11 +7041,11 @@

6936

ia64-*-hpux*)

6937

# Find out which ABI we are using.

6938

echo 'int i;' > conftest.$ac_ext

6939

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6940

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

6941

(eval $ac_compile) 2>&5

6942

ac_status=$?

6943

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6944

- (exit $ac_status); }; then

6945

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6946

+ test $ac_status = 0; }; then

6947

case `/usr/bin/file conftest.$ac_objext` in

6948

*ELF-32*)

6949

HPUX_IA64_MODE="32"

6950

@@ -7237,12 +7059,12 @@

6951

;;

6952

*-*-irix6*)

6953

# Find out which ABI we are using.

6954

- echo '#line 7240 "configure"' > conftest.$ac_ext

6955

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6956

+ echo '#line 7062 "configure"' > conftest.$ac_ext

6957

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

6958

(eval $ac_compile) 2>&5

6959

ac_status=$?

6960

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6961

- (exit $ac_status); }; then

6962

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6963

+ test $ac_status = 0; }; then

6964

if test "$lt_cv_prog_gnu_ld" = yes; then

6965

case `/usr/bin/file conftest.$ac_objext` in

6966

*32-bit*)

6967

@@ -7276,11 +7098,11 @@

6968

s390*-*linux*|s390*-*tpf*|sparc*-*linux*)

6969

# Find out which ABI we are using.

6970

echo 'int i;' > conftest.$ac_ext

6971

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6972

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

6973

(eval $ac_compile) 2>&5

6974

ac_status=$?

6975

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6976

- (exit $ac_status); }; then

6977

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6978

+ test $ac_status = 0; }; then

6979

case `/usr/bin/file conftest.o` in

6980

*32-bit*)

6981

case $host in

6982

@@ -7329,9 +7151,9 @@

6983

# On SCO OpenServer 5, we need -belf to get full-featured binaries.

6984

SAVE_CFLAGS="$CFLAGS"

6985

CFLAGS="$CFLAGS -belf"

6986

- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5

6987

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5

6988

$as_echo_n "checking whether the C compiler needs -belf... " >&6; }

6989

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

6990

+if test "${lt_cv_cc_needs_belf+set}" = set; then :

6991

$as_echo_n "(cached) " >&6

6992

else

6993

ac_ext=c

6994

@@ -7340,11 +7162,7 @@

6995

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

6996

ac_compiler_gnu=$ac_cv_c_compiler_gnu

6997

6998

- cat >conftest.$ac_ext <<_ACEOF

6999

-/* confdefs.h. */

7000

-_ACEOF

7001

-cat confdefs.h >>conftest.$ac_ext

7002

-cat >>conftest.$ac_ext <<_ACEOF

7003

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7004

/* end confdefs.h. */

7005

7006

int

7007

@@ -7355,38 +7173,13 @@

7008

return 0;

7009

}

7010

_ACEOF

7011

-rm -f conftest.$ac_objext conftest$ac_exeext

7012

-if { (ac_try="$ac_link"

7013

-case "(($ac_try" in

7014

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7015

- *) ac_try_echo=$ac_try;;

7016

-esac

7017

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7018

-$as_echo "$ac_try_echo") >&5

7019

- (eval "$ac_link") 2>conftest.er1

7020

- ac_status=$?

7021

- grep -v '^ *+' conftest.er1 >conftest.err

7022

- rm -f conftest.er1

7023

- cat conftest.err >&5

7024

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7025

- (exit $ac_status); } && {

7026

- test -z "$ac_c_werror_flag" ||

7027

- test ! -s conftest.err

7028

- } && test -s conftest$ac_exeext && {

7029

- test "$cross_compiling" = yes ||

7030

- $as_test_x conftest$ac_exeext

7031

- }; then

7032

+if ac_fn_c_try_link "$LINENO"; then :

7033

lt_cv_cc_needs_belf=yes

7034

else

7035

- $as_echo "$as_me: failed program was:" >&5

7036

-sed 's/^/| /' conftest.$ac_ext >&5

7037

-

7038

- lt_cv_cc_needs_belf=no

7039

+ lt_cv_cc_needs_belf=no

7040

fi

7041

-

7042

-rm -rf conftest.dSYM

7043

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7044

- conftest$ac_exeext conftest.$ac_ext

7045

+rm -f core conftest.err conftest.$ac_objext \

7046

+ conftest$ac_exeext conftest.$ac_ext

7047

ac_ext=c

7048

ac_cpp='$CPP $CPPFLAGS'

7049

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

7050

@@ -7394,7 +7187,7 @@

7051

ac_compiler_gnu=$ac_cv_c_compiler_gnu

7052

7053

fi

7054

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5

7055

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5

7056

$as_echo "$lt_cv_cc_needs_belf" >&6; }

7057

if test x"$lt_cv_cc_needs_belf" != x"yes"; then

7058

# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf

7059

@@ -7404,11 +7197,11 @@

7060

sparc*-*solaris*)

7061

# Find out which ABI we are using.

7062

echo 'int i;' > conftest.$ac_ext

7063

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

7064

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

7065

(eval $ac_compile) 2>&5

7066

ac_status=$?

7067

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7068

- (exit $ac_status); }; then

7069

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

7070

+ test $ac_status = 0; }; then

7071

case `/usr/bin/file conftest.o` in

7072

*64-bit*)

7073

case $lt_cv_prog_gnu_ld in

7074

@@ -7434,9 +7227,9 @@

7075

if test -n "$ac_tool_prefix"; then

7076

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

7077

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

7078

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

7079

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7080

$as_echo_n "checking for $ac_word... " >&6; }

7081

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

7082

+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :

7083

$as_echo_n "(cached) " >&6

7084

else

7085

if test -n "$DSYMUTIL"; then

7086

@@ -7447,24 +7240,24 @@

7087

do

7088

IFS=$as_save_IFS

7089

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

7090

- for ac_exec_ext in '' $ac_executable_extensions; do

7091

+ for ac_exec_ext in '' $ac_executable_extensions; do

7092

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

7093

ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"

7094

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

7095

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7096

break 2

7097

fi

7098

done

7099

-done

7100

+ done

7101

IFS=$as_save_IFS

7102

7103

fi

7104

fi

7105

DSYMUTIL=$ac_cv_prog_DSYMUTIL

7106

if test -n "$DSYMUTIL"; then

7107

- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5

7108

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5

7109

$as_echo "$DSYMUTIL" >&6; }

7110

else

7111

- { $as_echo "$as_me:$LINENO: result: no" >&5

7112

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7113

$as_echo "no" >&6; }

7114

fi

7115

7116

@@ -7474,9 +7267,9 @@

7117

ac_ct_DSYMUTIL=$DSYMUTIL

7118

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

7119

set dummy dsymutil; ac_word=$2

7120

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

7121

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7122

$as_echo_n "checking for $ac_word... " >&6; }

7123

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

7124

+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :

7125

$as_echo_n "(cached) " >&6

7126

else

7127

if test -n "$ac_ct_DSYMUTIL"; then

7128

@@ -7487,24 +7280,24 @@

7129

do

7130

IFS=$as_save_IFS

7131

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

7132

- for ac_exec_ext in '' $ac_executable_extensions; do

7133

+ for ac_exec_ext in '' $ac_executable_extensions; do

7134

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

7135

ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"

7136

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

7137

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7138

break 2

7139

fi

7140

done

7141

-done

7142

+ done

7143

IFS=$as_save_IFS

7144

7145

fi

7146

fi

7147

ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL

7148

if test -n "$ac_ct_DSYMUTIL"; then

7149

- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5

7150

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5

7151

$as_echo "$ac_ct_DSYMUTIL" >&6; }

7152

else

7153

- { $as_echo "$as_me:$LINENO: result: no" >&5

7154

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7155

$as_echo "no" >&6; }

7156

fi

7157

7158

@@ -7513,7 +7306,7 @@

7159

else

7160

case $cross_compiling:$ac_tool_warned in

7161

yes:)

7162

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

7163

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

7164

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

7165

ac_tool_warned=yes ;;

7166

esac

7167

@@ -7526,9 +7319,9 @@

7168

if test -n "$ac_tool_prefix"; then

7169

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

7170

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

7171

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

7172

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7173

$as_echo_n "checking for $ac_word... " >&6; }

7174

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

7175

+if test "${ac_cv_prog_NMEDIT+set}" = set; then :

7176

$as_echo_n "(cached) " >&6

7177

else

7178

if test -n "$NMEDIT"; then

7179

@@ -7539,24 +7332,24 @@

7180

do

7181

IFS=$as_save_IFS

7182

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

7183

- for ac_exec_ext in '' $ac_executable_extensions; do

7184

+ for ac_exec_ext in '' $ac_executable_extensions; do

7185

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

7186

ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"

7187

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

7188

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7189

break 2

7190

fi

7191

done

7192

-done

7193

+ done

7194

IFS=$as_save_IFS

7195

7196

fi

7197

fi

7198

NMEDIT=$ac_cv_prog_NMEDIT

7199

if test -n "$NMEDIT"; then

7200

- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5

7201

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5

7202

$as_echo "$NMEDIT" >&6; }

7203

else

7204

- { $as_echo "$as_me:$LINENO: result: no" >&5

7205

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7206

$as_echo "no" >&6; }

7207

fi

7208

7209

@@ -7566,9 +7359,9 @@

7210

ac_ct_NMEDIT=$NMEDIT

7211

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

7212

set dummy nmedit; ac_word=$2

7213

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

7214

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7215

$as_echo_n "checking for $ac_word... " >&6; }

7216

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

7217

+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :

7218

$as_echo_n "(cached) " >&6

7219

else

7220

if test -n "$ac_ct_NMEDIT"; then

7221

@@ -7579,24 +7372,24 @@

7222

do

7223

IFS=$as_save_IFS

7224

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

7225

- for ac_exec_ext in '' $ac_executable_extensions; do

7226

+ for ac_exec_ext in '' $ac_executable_extensions; do

7227

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

7228

ac_cv_prog_ac_ct_NMEDIT="nmedit"

7229

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

7230

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7231

break 2

7232

fi

7233

done

7234

-done

7235

+ done

7236

IFS=$as_save_IFS

7237

7238

fi

7239

fi

7240

ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT

7241

if test -n "$ac_ct_NMEDIT"; then

7242

- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5

7243

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5

7244

$as_echo "$ac_ct_NMEDIT" >&6; }

7245

else

7246

- { $as_echo "$as_me:$LINENO: result: no" >&5

7247

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7248

$as_echo "no" >&6; }

7249

fi

7250

7251

@@ -7605,7 +7398,7 @@

7252

else

7253

case $cross_compiling:$ac_tool_warned in

7254

yes:)

7255

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

7256

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

7257

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

7258

ac_tool_warned=yes ;;

7259

esac

7260

@@ -7618,9 +7411,9 @@

7261

if test -n "$ac_tool_prefix"; then

7262

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

7263

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

7264

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

7265

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7266

$as_echo_n "checking for $ac_word... " >&6; }

7267

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

7268

+if test "${ac_cv_prog_LIPO+set}" = set; then :

7269

$as_echo_n "(cached) " >&6

7270

else

7271

if test -n "$LIPO"; then

7272

@@ -7631,24 +7424,24 @@

7273

do

7274

IFS=$as_save_IFS

7275

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

7276

- for ac_exec_ext in '' $ac_executable_extensions; do

7277

+ for ac_exec_ext in '' $ac_executable_extensions; do

7278

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

7279

ac_cv_prog_LIPO="${ac_tool_prefix}lipo"

7280

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

7281

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7282

break 2

7283

fi

7284

done

7285

-done

7286

+ done

7287

IFS=$as_save_IFS

7288

7289

fi

7290

fi

7291

LIPO=$ac_cv_prog_LIPO

7292

if test -n "$LIPO"; then

7293

- { $as_echo "$as_me:$LINENO: result: $LIPO" >&5

7294

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5

7295

$as_echo "$LIPO" >&6; }

7296

else

7297

- { $as_echo "$as_me:$LINENO: result: no" >&5

7298

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7299

$as_echo "no" >&6; }

7300

fi

7301

7302

@@ -7658,9 +7451,9 @@

7303

ac_ct_LIPO=$LIPO

7304

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

7305

set dummy lipo; ac_word=$2

7306

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

7307

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7308

$as_echo_n "checking for $ac_word... " >&6; }

7309

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

7310

+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :

7311

$as_echo_n "(cached) " >&6

7312

else

7313

if test -n "$ac_ct_LIPO"; then

7314

@@ -7671,24 +7464,24 @@

7315

do

7316

IFS=$as_save_IFS

7317

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

7318

- for ac_exec_ext in '' $ac_executable_extensions; do

7319

+ for ac_exec_ext in '' $ac_executable_extensions; do

7320

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

7321

ac_cv_prog_ac_ct_LIPO="lipo"

7322

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

7323

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7324

break 2

7325

fi

7326

done

7327

-done

7328

+ done

7329

IFS=$as_save_IFS

7330

7331

fi

7332

fi

7333

ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO

7334

if test -n "$ac_ct_LIPO"; then

7335

- { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5

7336

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5

7337

$as_echo "$ac_ct_LIPO" >&6; }

7338

else

7339

- { $as_echo "$as_me:$LINENO: result: no" >&5

7340

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7341

$as_echo "no" >&6; }

7342

fi

7343

7344

@@ -7697,7 +7490,7 @@

7345

else

7346

case $cross_compiling:$ac_tool_warned in

7347

yes:)

7348

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

7349

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

7350

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

7351

ac_tool_warned=yes ;;

7352

esac

7353

@@ -7710,9 +7503,9 @@

7354

if test -n "$ac_tool_prefix"; then

7355

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

7356

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

7357

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

7358

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7359

$as_echo_n "checking for $ac_word... " >&6; }

7360

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

7361

+if test "${ac_cv_prog_OTOOL+set}" = set; then :

7362

$as_echo_n "(cached) " >&6

7363

else

7364

if test -n "$OTOOL"; then

7365

@@ -7723,24 +7516,24 @@

7366

do

7367

IFS=$as_save_IFS

7368

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

7369

- for ac_exec_ext in '' $ac_executable_extensions; do

7370

+ for ac_exec_ext in '' $ac_executable_extensions; do

7371

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

7372

ac_cv_prog_OTOOL="${ac_tool_prefix}otool"

7373

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

7374

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7375

break 2

7376

fi

7377

done

7378

-done

7379

+ done

7380

IFS=$as_save_IFS

7381

7382

fi

7383

fi

7384

OTOOL=$ac_cv_prog_OTOOL

7385

if test -n "$OTOOL"; then

7386

- { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5

7387

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5

7388

$as_echo "$OTOOL" >&6; }

7389

else

7390

- { $as_echo "$as_me:$LINENO: result: no" >&5

7391

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7392

$as_echo "no" >&6; }

7393

fi

7394

7395

@@ -7750,9 +7543,9 @@

7396

ac_ct_OTOOL=$OTOOL

7397

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

7398

set dummy otool; ac_word=$2

7399

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

7400

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7401

$as_echo_n "checking for $ac_word... " >&6; }

7402

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

7403

+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :

7404

$as_echo_n "(cached) " >&6

7405

else

7406

if test -n "$ac_ct_OTOOL"; then

7407

@@ -7763,24 +7556,24 @@

7408

do

7409

IFS=$as_save_IFS

7410

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

7411

- for ac_exec_ext in '' $ac_executable_extensions; do

7412

+ for ac_exec_ext in '' $ac_executable_extensions; do

7413

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

7414

ac_cv_prog_ac_ct_OTOOL="otool"

7415

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

7416

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7417

break 2

7418

fi

7419

done

7420

-done

7421

+ done

7422

IFS=$as_save_IFS

7423

7424

fi

7425

fi

7426

ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL

7427

if test -n "$ac_ct_OTOOL"; then

7428

- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5

7429

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5

7430

$as_echo "$ac_ct_OTOOL" >&6; }

7431

else

7432

- { $as_echo "$as_me:$LINENO: result: no" >&5

7433

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7434

$as_echo "no" >&6; }

7435

fi

7436

7437

@@ -7789,7 +7582,7 @@

7438

else

7439

case $cross_compiling:$ac_tool_warned in

7440

yes:)

7441

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

7442

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

7443

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

7444

ac_tool_warned=yes ;;

7445

esac

7446

@@ -7802,9 +7595,9 @@

7447

if test -n "$ac_tool_prefix"; then

7448

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

7449

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

7450

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

7451

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7452

$as_echo_n "checking for $ac_word... " >&6; }

7453

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

7454

+if test "${ac_cv_prog_OTOOL64+set}" = set; then :

7455

$as_echo_n "(cached) " >&6

7456

else

7457

if test -n "$OTOOL64"; then

7458

@@ -7815,24 +7608,24 @@

7459

do

7460

IFS=$as_save_IFS

7461

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

7462

- for ac_exec_ext in '' $ac_executable_extensions; do

7463

+ for ac_exec_ext in '' $ac_executable_extensions; do

7464

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

7465

ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"

7466

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

7467

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7468

break 2

7469

fi

7470

done

7471

-done

7472

+ done

7473

IFS=$as_save_IFS

7474

7475

fi

7476

fi

7477

OTOOL64=$ac_cv_prog_OTOOL64

7478

if test -n "$OTOOL64"; then

7479

- { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5

7480

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5

7481

$as_echo "$OTOOL64" >&6; }

7482

else

7483

- { $as_echo "$as_me:$LINENO: result: no" >&5

7484

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7485

$as_echo "no" >&6; }

7486

fi

7487

7488

@@ -7842,9 +7635,9 @@

7489

ac_ct_OTOOL64=$OTOOL64

7490

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

7491

set dummy otool64; ac_word=$2

7492

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

7493

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7494

$as_echo_n "checking for $ac_word... " >&6; }

7495

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

7496

+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :

7497

$as_echo_n "(cached) " >&6

7498

else

7499

if test -n "$ac_ct_OTOOL64"; then

7500

@@ -7855,24 +7648,24 @@

7501

do

7502

IFS=$as_save_IFS

7503

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

7504

- for ac_exec_ext in '' $ac_executable_extensions; do

7505

+ for ac_exec_ext in '' $ac_executable_extensions; do

7506

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

7507

ac_cv_prog_ac_ct_OTOOL64="otool64"

7508

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

7509

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7510

break 2

7511

fi

7512

done

7513

-done

7514

+ done

7515

IFS=$as_save_IFS

7516

7517

fi

7518

fi

7519

ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64

7520

if test -n "$ac_ct_OTOOL64"; then

7521

- { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5

7522

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5

7523

$as_echo "$ac_ct_OTOOL64" >&6; }

7524

else

7525

- { $as_echo "$as_me:$LINENO: result: no" >&5

7526

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7527

$as_echo "no" >&6; }

7528

fi

7529

7530

@@ -7881,7 +7674,7 @@

7531

else

7532

case $cross_compiling:$ac_tool_warned in

7533

yes:)

7534

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

7535

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

7536

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

7537

ac_tool_warned=yes ;;

7538

esac

7539

@@ -7917,9 +7710,9 @@

7540

7541

7542

7543

- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5

7544

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5

7545

$as_echo_n "checking for -single_module linker flag... " >&6; }

7546

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

7547

+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :

7548

$as_echo_n "(cached) " >&6

7549

else

7550

lt_cv_apple_cc_single_mod=no

7551

@@ -7944,22 +7737,18 @@

7552

rm -f conftest.*

7553

fi

7554

fi

7555

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5

7556

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5

7557

$as_echo "$lt_cv_apple_cc_single_mod" >&6; }

7558

- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5

7559

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5

7560

$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }

7561

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

7562

+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :

7563

$as_echo_n "(cached) " >&6

7564

else

7565

lt_cv_ld_exported_symbols_list=no

7566

save_LDFLAGS=$LDFLAGS

7567

echo "_main" > conftest.sym

7568

LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"

7569

- cat >conftest.$ac_ext <<_ACEOF

7570

-/* confdefs.h. */

7571

-_ACEOF

7572

-cat confdefs.h >>conftest.$ac_ext

7573

-cat >>conftest.$ac_ext <<_ACEOF

7574

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7575

/* end confdefs.h. */

7576

7577

int

7578

@@ -7970,42 +7759,17 @@

7579

return 0;

7580

}

7581

_ACEOF

7582

-rm -f conftest.$ac_objext conftest$ac_exeext

7583

-if { (ac_try="$ac_link"

7584

-case "(($ac_try" in

7585

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7586

- *) ac_try_echo=$ac_try;;

7587

-esac

7588

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7589

-$as_echo "$ac_try_echo") >&5

7590

- (eval "$ac_link") 2>conftest.er1

7591

- ac_status=$?

7592

- grep -v '^ *+' conftest.er1 >conftest.err

7593

- rm -f conftest.er1

7594

- cat conftest.err >&5

7595

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7596

- (exit $ac_status); } && {

7597

- test -z "$ac_c_werror_flag" ||

7598

- test ! -s conftest.err

7599

- } && test -s conftest$ac_exeext && {

7600

- test "$cross_compiling" = yes ||

7601

- $as_test_x conftest$ac_exeext

7602

- }; then

7603

+if ac_fn_c_try_link "$LINENO"; then :

7604

lt_cv_ld_exported_symbols_list=yes

7605

else

7606

- $as_echo "$as_me: failed program was:" >&5

7607

-sed 's/^/| /' conftest.$ac_ext >&5

7608

-

7609

- lt_cv_ld_exported_symbols_list=no

7610

+ lt_cv_ld_exported_symbols_list=no

7611

fi

7612

-

7613

-rm -rf conftest.dSYM

7614

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7615

- conftest$ac_exeext conftest.$ac_ext

7616

+rm -f core conftest.err conftest.$ac_objext \

7617

+ conftest$ac_exeext conftest.$ac_ext

7618

LDFLAGS="$save_LDFLAGS"

7619

7620

fi

7621

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5

7622

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5

7623

$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }

7624

case $host_os in

7625

rhapsody* | darwin1.[012])

7626

@@ -8043,69 +7807,14 @@

7627

esac

7628

7629

# On IRIX 5.3, sys/types and inttypes.h are conflicting.

7630

-

7631

-

7632

-

7633

-

7634

-

7635

-

7636

-

7637

-

7638

-

7639

for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

7640

inttypes.h stdint.h unistd.h

7641

-do

7642

-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

7643

-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

7644

-$as_echo_n "checking for $ac_header... " >&6; }

7645

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

7646

- $as_echo_n "(cached) " >&6

7647

-else

7648

- cat >conftest.$ac_ext <<_ACEOF

7649

-/* confdefs.h. */

7650

-_ACEOF

7651

-cat confdefs.h >>conftest.$ac_ext

7652

-cat >>conftest.$ac_ext <<_ACEOF

7653

-/* end confdefs.h. */

7654

-$ac_includes_default

7655

-

7656

-#include <$ac_header>

7657

-_ACEOF

7658

-rm -f conftest.$ac_objext

7659

-if { (ac_try="$ac_compile"

7660

-case "(($ac_try" in

7661

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7662

- *) ac_try_echo=$ac_try;;

7663

-esac

7664

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7665

-$as_echo "$ac_try_echo") >&5

7666

- (eval "$ac_compile") 2>conftest.er1

7667

- ac_status=$?

7668

- grep -v '^ *+' conftest.er1 >conftest.err

7669

- rm -f conftest.er1

7670

- cat conftest.err >&5

7671

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7672

- (exit $ac_status); } && {

7673

- test -z "$ac_c_werror_flag" ||

7674

- test ! -s conftest.err

7675

- } && test -s conftest.$ac_objext; then

7676

- eval "$as_ac_Header=yes"

7677

-else

7678

- $as_echo "$as_me: failed program was:" >&5

7679

-sed 's/^/| /' conftest.$ac_ext >&5

7680

-

7681

- eval "$as_ac_Header=no"

7682

-fi

7683

-

7684

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7685

-fi

7686

-ac_res=`eval 'as_val=${'$as_ac_Header'}

7687

- $as_echo "$as_val"'`

7688

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

7689

-$as_echo "$ac_res" >&6; }

7690

-as_val=`eval 'as_val=${'$as_ac_Header'}

7691

- $as_echo "$as_val"'`

7692

- if test "x$as_val" = x""yes; then

7693

+do :

7694

+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

7695

+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default

7696

+"

7697

+eval as_val=\$$as_ac_Header

7698

+ if test "x$as_val" = x""yes; then :

7699

cat >>confdefs.h <<_ACEOF

7700

#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

7701

_ACEOF

7702

@@ -8115,62 +7824,13 @@

7703

done

7704

7705

7706

-

7707

for ac_header in dlfcn.h

7708

-do

7709

-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

7710

-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

7711

-$as_echo_n "checking for $ac_header... " >&6; }

7712

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

7713

- $as_echo_n "(cached) " >&6

7714

-else

7715

- cat >conftest.$ac_ext <<_ACEOF

7716

-/* confdefs.h. */

7717

-_ACEOF

7718

-cat confdefs.h >>conftest.$ac_ext

7719

-cat >>conftest.$ac_ext <<_ACEOF

7720

-/* end confdefs.h. */

7721

-$ac_includes_default

7722

-

7723

-#include <$ac_header>

7724

-_ACEOF

7725

-rm -f conftest.$ac_objext

7726

-if { (ac_try="$ac_compile"

7727

-case "(($ac_try" in

7728

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7729

- *) ac_try_echo=$ac_try;;

7730

-esac

7731

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7732

-$as_echo "$ac_try_echo") >&5

7733

- (eval "$ac_compile") 2>conftest.er1

7734

- ac_status=$?

7735

- grep -v '^ *+' conftest.er1 >conftest.err

7736

- rm -f conftest.er1

7737

- cat conftest.err >&5

7738

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7739

- (exit $ac_status); } && {

7740

- test -z "$ac_c_werror_flag" ||

7741

- test ! -s conftest.err

7742

- } && test -s conftest.$ac_objext; then

7743

- eval "$as_ac_Header=yes"

7744

-else

7745

- $as_echo "$as_me: failed program was:" >&5

7746

-sed 's/^/| /' conftest.$ac_ext >&5

7747

-

7748

- eval "$as_ac_Header=no"

7749

-fi

7750

-

7751

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7752

-fi

7753

-ac_res=`eval 'as_val=${'$as_ac_Header'}

7754

- $as_echo "$as_val"'`

7755

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

7756

-$as_echo "$ac_res" >&6; }

7757

-as_val=`eval 'as_val=${'$as_ac_Header'}

7758

- $as_echo "$as_val"'`

7759

- if test "x$as_val" = x""yes; then

7760

+do :

7761

+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default

7762

+"

7763

+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :

7764

cat >>confdefs.h <<_ACEOF

7765

-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

7766

+#define HAVE_DLFCN_H 1

7767

_ACEOF

7768

7769

fi

7770

@@ -8190,7 +7850,7 @@

7771

7772

7773

# Check whether --enable-shared was given.

7774

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

7775

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

7776

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

7777

case $enableval in

7778

yes) enable_shared=yes ;;

7779

@@ -8221,7 +7881,7 @@

7780

7781

7782

# Check whether --enable-static was given.

7783

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

7784

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

7785

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

7786

case $enableval in

7787

yes) enable_static=yes ;;

7788

@@ -8253,7 +7913,7 @@

7789

7790

7791

# Check whether --with-pic was given.

7792

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

7793

+if test "${with_pic+set}" = set; then :

7794

withval=$with_pic; pic_mode="$withval"

7795

else

7796

pic_mode=default

7797

@@ -8269,7 +7929,7 @@

7798

7799

7800

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

7801

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

7802

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

7803

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

7804

case $enableval in

7805

yes) enable_fast_install=yes ;;

7806

@@ -8350,9 +8010,9 @@

7807

setopt NO_GLOB_SUBST

7808

fi

7809

7810

-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5

7811

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5

7812

$as_echo_n "checking for objdir... " >&6; }

7813

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

7814

+if test "${lt_cv_objdir+set}" = set; then :

7815

$as_echo_n "(cached) " >&6

7816

else

7817

rm -f .libs 2>/dev/null

7818

@@ -8365,7 +8025,7 @@

7819

fi

7820

rmdir .libs 2>/dev/null

7821

fi

7822

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5

7823

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5

7824

$as_echo "$lt_cv_objdir" >&6; }

7825

objdir=$lt_cv_objdir

7826

7827

@@ -8458,9 +8118,9 @@

7828

case $deplibs_check_method in

7829

file_magic*)

7830

if test "$file_magic_cmd" = '$MAGIC_CMD'; then

7831

- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5

7832

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5

7833

$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }

7834

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

7835

+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :

7836

$as_echo_n "(cached) " >&6

7837

else

7838

case $MAGIC_CMD in

7839

@@ -8511,10 +8171,10 @@

7840

7841

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

7842

if test -n "$MAGIC_CMD"; then

7843

- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

7844

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5

7845

$as_echo "$MAGIC_CMD" >&6; }

7846

else

7847

- { $as_echo "$as_me:$LINENO: result: no" >&5

7848

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7849

$as_echo "no" >&6; }

7850

fi

7851

7852

@@ -8524,9 +8184,9 @@

7853

7854

if test -z "$lt_cv_path_MAGIC_CMD"; then

7855

if test -n "$ac_tool_prefix"; then

7856

- { $as_echo "$as_me:$LINENO: checking for file" >&5

7857

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5

7858

$as_echo_n "checking for file... " >&6; }

7859

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

7860

+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :

7861

$as_echo_n "(cached) " >&6

7862

else

7863

case $MAGIC_CMD in

7864

@@ -8577,10 +8237,10 @@

7865

7866

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

7867

if test -n "$MAGIC_CMD"; then

7868

- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

7869

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5

7870

$as_echo "$MAGIC_CMD" >&6; }

7871

else

7872

- { $as_echo "$as_me:$LINENO: result: no" >&5

7873

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7874

$as_echo "no" >&6; }

7875

fi

7876

7877

@@ -8661,9 +8321,9 @@

7878

if test "$GCC" = yes; then

7879

lt_prog_compiler_no_builtin_flag=' -fno-builtin'

7880

7881

- { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

7882

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

7883

$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }

7884

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

7885

+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :

7886

$as_echo_n "(cached) " >&6

7887

else

7888

lt_cv_prog_compiler_rtti_exceptions=no

7889

@@ -8679,11 +8339,11 @@

7890

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

7891

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

7892

-e 's:$: $lt_compiler_flag:'`

7893

- (eval echo "\"\$as_me:8682: $lt_compile\"" >&5)

7894

+ (eval echo "\"\$as_me:8342: $lt_compile\"" >&5)

7895

(eval "$lt_compile" 2>conftest.err)

7896

ac_status=$?

7897

cat conftest.err >&5

7898

- echo "$as_me:8686: \$? = $ac_status" >&5

7899

+ echo "$as_me:8346: \$? = $ac_status" >&5

7900

if (exit $ac_status) && test -s "$ac_outfile"; then

7901

# The compiler can only warn and ignore the option if not recognized

7902

# So say no if there are warnings other than the usual output.

7903

@@ -8696,7 +8356,7 @@

7904

$RM conftest*

7905

7906

fi

7907

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

7908

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

7909

$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }

7910

7911

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

7912

@@ -8716,7 +8376,7 @@

7913

lt_prog_compiler_pic=

7914

lt_prog_compiler_static=

7915

7916

-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

7917

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5

7918

$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

7919

7920

if test "$GCC" = yes; then

7921

@@ -8988,7 +8648,7 @@

7922

lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"

7923

;;

7924

esac

7925

-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5

7926

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5

7927

$as_echo "$lt_prog_compiler_pic" >&6; }

7928

7929

7930

@@ -9000,9 +8660,9 @@

7931

# Check to make sure the PIC flag actually works.

7932

#

7933

if test -n "$lt_prog_compiler_pic"; then

7934

- { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

7935

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

7936

$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }

7937

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

7938

+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :

7939

$as_echo_n "(cached) " >&6

7940

else

7941

lt_cv_prog_compiler_pic_works=no

7942

@@ -9018,11 +8678,11 @@

7943

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

7944

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

7945

-e 's:$: $lt_compiler_flag:'`

7946

- (eval echo "\"\$as_me:9021: $lt_compile\"" >&5)

7947

+ (eval echo "\"\$as_me:8681: $lt_compile\"" >&5)

7948

(eval "$lt_compile" 2>conftest.err)

7949

ac_status=$?

7950

cat conftest.err >&5

7951

- echo "$as_me:9025: \$? = $ac_status" >&5

7952

+ echo "$as_me:8685: \$? = $ac_status" >&5

7953

if (exit $ac_status) && test -s "$ac_outfile"; then

7954

# The compiler can only warn and ignore the option if not recognized

7955

# So say no if there are warnings other than the usual output.

7956

@@ -9035,7 +8695,7 @@

7957

$RM conftest*

7958

7959

fi

7960

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5

7961

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5

7962

$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }

7963

7964

if test x"$lt_cv_prog_compiler_pic_works" = xyes; then

7965

@@ -9059,9 +8719,9 @@

7966

# Check to make sure the static flag actually works.

7967

#

7968

wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"

7969

-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

7970

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5

7971

$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

7972

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

7973

+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :

7974

$as_echo_n "(cached) " >&6

7975

else

7976

lt_cv_prog_compiler_static_works=no

7977

@@ -9087,7 +8747,7 @@

7978

LDFLAGS="$save_LDFLAGS"

7979

7980

fi

7981

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5

7982

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5

7983

$as_echo "$lt_cv_prog_compiler_static_works" >&6; }

7984

7985

if test x"$lt_cv_prog_compiler_static_works" = xyes; then

7986

@@ -9102,9 +8762,9 @@

7987

7988

7989

7990

- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

7991

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

7992

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

7993

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

7994

+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

7995

$as_echo_n "(cached) " >&6

7996

else

7997

lt_cv_prog_compiler_c_o=no

7998

@@ -9123,11 +8783,11 @@

7999

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

8000

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

8001

-e 's:$: $lt_compiler_flag:'`

8002

- (eval echo "\"\$as_me:9126: $lt_compile\"" >&5)

8003

+ (eval echo "\"\$as_me:8786: $lt_compile\"" >&5)

8004

(eval "$lt_compile" 2>out/conftest.err)

8005

ac_status=$?

8006

cat out/conftest.err >&5

8007

- echo "$as_me:9130: \$? = $ac_status" >&5

8008

+ echo "$as_me:8790: \$? = $ac_status" >&5

8009

if (exit $ac_status) && test -s out/conftest2.$ac_objext

8010

then

8011

# The compiler can only warn and ignore the option if not recognized

8012

@@ -9149,7 +8809,7 @@

8013

$RM conftest*

8014

8015

fi

8016

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

8017

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5

8018

$as_echo "$lt_cv_prog_compiler_c_o" >&6; }

8019

8020

8021

@@ -9157,9 +8817,9 @@

8022

8023

8024

8025

- { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

8026

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5

8027

$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

8028

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

8029

+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :

8030

$as_echo_n "(cached) " >&6

8031

else

8032

lt_cv_prog_compiler_c_o=no

8033

@@ -9178,11 +8838,11 @@

8034

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

8035

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

8036

-e 's:$: $lt_compiler_flag:'`

8037

- (eval echo "\"\$as_me:9181: $lt_compile\"" >&5)

8038

+ (eval echo "\"\$as_me:8841: $lt_compile\"" >&5)

8039

(eval "$lt_compile" 2>out/conftest.err)

8040

ac_status=$?

8041

cat out/conftest.err >&5

8042

- echo "$as_me:9185: \$? = $ac_status" >&5

8043

+ echo "$as_me:8845: \$? = $ac_status" >&5

8044

if (exit $ac_status) && test -s out/conftest2.$ac_objext

8045

then

8046

# The compiler can only warn and ignore the option if not recognized

8047

@@ -9204,7 +8864,7 @@

8048

$RM conftest*

8049

8050

fi

8051

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

8052

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5

8053

$as_echo "$lt_cv_prog_compiler_c_o" >&6; }

8054

8055

8056

@@ -9213,7 +8873,7 @@

8057

hard_links="nottested"

8058

if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then

8059

# do not overwrite the value of need_locks provided by the user

8060

- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

8061

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5

8062

$as_echo_n "checking if we can lock with hard links... " >&6; }

8063

hard_links=yes

8064

$RM conftest*

8065

@@ -9221,10 +8881,10 @@

8066

touch conftest.a

8067

ln conftest.a conftest.b 2>&5 || hard_links=no

8068

ln conftest.a conftest.b 2>/dev/null && hard_links=no

8069

- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5

8070

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5

8071

$as_echo "$hard_links" >&6; }

8072

if test "$hard_links" = no; then

8073

- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

8074

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

8075

$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

8076

need_locks=warn

8077

fi

8078

@@ -9237,7 +8897,7 @@

8079

8080

8081

8082

- { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8083

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8084

$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

8085

8086

runpath_var=

8087

@@ -9297,6 +8957,9 @@

8088

openbsd*)

8089

with_gnu_ld=no

8090

;;

8091

+ linux* | k*bsd*-gnu)

8092

+ link_all_deplibs=no

8093

+ ;;

8094

esac

8095

8096

ld_shlibs=yes

8097

@@ -9680,11 +9343,7 @@

8098

allow_undefined_flag='-berok'

8099

# Determine the default libpath from the value encoded in an

8100

# empty executable.

8101

- cat >conftest.$ac_ext <<_ACEOF

8102

-/* confdefs.h. */

8103

-_ACEOF

8104

-cat confdefs.h >>conftest.$ac_ext

8105

-cat >>conftest.$ac_ext <<_ACEOF

8106

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8107

/* end confdefs.h. */

8108

8109

int

8110

@@ -9695,27 +9354,7 @@

8111

return 0;

8112

}

8113

_ACEOF

8114

-rm -f conftest.$ac_objext conftest$ac_exeext

8115

-if { (ac_try="$ac_link"

8116

-case "(($ac_try" in

8117

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8118

- *) ac_try_echo=$ac_try;;

8119

-esac

8120

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8121

-$as_echo "$ac_try_echo") >&5

8122

- (eval "$ac_link") 2>conftest.er1

8123

- ac_status=$?

8124

- grep -v '^ *+' conftest.er1 >conftest.err

8125

- rm -f conftest.er1

8126

- cat conftest.err >&5

8127

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8128

- (exit $ac_status); } && {

8129

- test -z "$ac_c_werror_flag" ||

8130

- test ! -s conftest.err

8131

- } && test -s conftest$ac_exeext && {

8132

- test "$cross_compiling" = yes ||

8133

- $as_test_x conftest$ac_exeext

8134

- }; then

8135

+if ac_fn_c_try_link "$LINENO"; then :

8136

8137

lt_aix_libpath_sed='

8138

/Import File Strings/,/^$/ {

8139

@@ -9729,16 +9368,9 @@

8140

if test -z "$aix_libpath"; then

8141

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

8142

fi

8143

-else

8144

- $as_echo "$as_me: failed program was:" >&5

8145

-sed 's/^/| /' conftest.$ac_ext >&5

8146

-

8147

-

8148

fi

8149

-

8150

-rm -rf conftest.dSYM

8151

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8152

- conftest$ac_exeext conftest.$ac_ext

8153

+rm -f core conftest.err conftest.$ac_objext \

8154

+ conftest$ac_exeext conftest.$ac_ext

8155

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8156

8157

hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"

8158

@@ -9751,11 +9383,7 @@

8159

else

8160

# Determine the default libpath from the value encoded in an

8161

# empty executable.

8162

- cat >conftest.$ac_ext <<_ACEOF

8163

-/* confdefs.h. */

8164

-_ACEOF

8165

-cat confdefs.h >>conftest.$ac_ext

8166

-cat >>conftest.$ac_ext <<_ACEOF

8167

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8168

/* end confdefs.h. */

8169

8170

int

8171

@@ -9766,27 +9394,7 @@

8172

return 0;

8173

}

8174

_ACEOF

8175

-rm -f conftest.$ac_objext conftest$ac_exeext

8176

-if { (ac_try="$ac_link"

8177

-case "(($ac_try" in

8178

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8179

- *) ac_try_echo=$ac_try;;

8180

-esac

8181

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8182

-$as_echo "$ac_try_echo") >&5

8183

- (eval "$ac_link") 2>conftest.er1

8184

- ac_status=$?

8185

- grep -v '^ *+' conftest.er1 >conftest.err

8186

- rm -f conftest.er1

8187

- cat conftest.err >&5

8188

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8189

- (exit $ac_status); } && {

8190

- test -z "$ac_c_werror_flag" ||

8191

- test ! -s conftest.err

8192

- } && test -s conftest$ac_exeext && {

8193

- test "$cross_compiling" = yes ||

8194

- $as_test_x conftest$ac_exeext

8195

- }; then

8196

+if ac_fn_c_try_link "$LINENO"; then :

8197

8198

lt_aix_libpath_sed='

8199

/Import File Strings/,/^$/ {

8200

@@ -9800,16 +9408,9 @@

8201

if test -z "$aix_libpath"; then

8202

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

8203

fi

8204

-else

8205

- $as_echo "$as_me: failed program was:" >&5

8206

-sed 's/^/| /' conftest.$ac_ext >&5

8207

-

8208

-

8209

fi

8210

-

8211

-rm -rf conftest.dSYM

8212

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8213

- conftest$ac_exeext conftest.$ac_ext

8214

+rm -f core conftest.err conftest.$ac_objext \

8215

+ conftest$ac_exeext conftest.$ac_ext

8216

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8217

8218

hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"

8219

@@ -10021,42 +9622,16 @@

8220

# implicitly export all symbols.

8221

save_LDFLAGS="$LDFLAGS"

8222

LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"

8223

- cat >conftest.$ac_ext <<_ACEOF

8224

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8225

+/* end confdefs.h. */

8226

int foo(void) {}

8227

_ACEOF

8228

-rm -f conftest.$ac_objext conftest$ac_exeext

8229

-if { (ac_try="$ac_link"

8230

-case "(($ac_try" in

8231

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8232

- *) ac_try_echo=$ac_try;;

8233

-esac

8234

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8235

-$as_echo "$ac_try_echo") >&5

8236

- (eval "$ac_link") 2>conftest.er1

8237

- ac_status=$?

8238

- grep -v '^ *+' conftest.er1 >conftest.err

8239

- rm -f conftest.er1

8240

- cat conftest.err >&5

8241

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8242

- (exit $ac_status); } && {

8243

- test -z "$ac_c_werror_flag" ||

8244

- test ! -s conftest.err

8245

- } && test -s conftest$ac_exeext && {

8246

- test "$cross_compiling" = yes ||

8247

- $as_test_x conftest$ac_exeext

8248

- }; then

8249

+if ac_fn_c_try_link "$LINENO"; then :

8250

archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'

8251

8252

-else

8253

- $as_echo "$as_me: failed program was:" >&5

8254

-sed 's/^/| /' conftest.$ac_ext >&5

8255

-

8256

-

8257

fi

8258

-

8259

-rm -rf conftest.dSYM

8260

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8261

- conftest$ac_exeext conftest.$ac_ext

8262

+rm -f core conftest.err conftest.$ac_objext \

8263

+ conftest$ac_exeext conftest.$ac_ext

8264

LDFLAGS="$save_LDFLAGS"

8265

else

8266

archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'

8267

@@ -10312,7 +9887,7 @@

8268

fi

8269

fi

8270

8271

-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5

8272

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5

8273

$as_echo "$ld_shlibs" >&6; }

8274

test "$ld_shlibs" = no && can_build_shared=no

8275

8276

@@ -10349,16 +9924,16 @@

8277

# Test whether the compiler implicitly links with -lc since on some

8278

# systems, -lgcc has to come before -lc. If gcc already passes -lc

8279

# to ld, don't add -lc before -lgcc.

8280

- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

8281

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5

8282

$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

8283

$RM conftest*

8284

echo "$lt_simple_compile_test_code" > conftest.$ac_ext

8285

8286

- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

8287

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

8288

(eval $ac_compile) 2>&5

8289

ac_status=$?

8290

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8291

- (exit $ac_status); } 2>conftest.err; then

8292

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

8293

+ test $ac_status = 0; } 2>conftest.err; then

8294

soname=conftest

8295

lib=conftest

8296

libobjs=conftest.$ac_objext

8297

@@ -10372,11 +9947,11 @@

8298

libname=conftest

8299

lt_save_allow_undefined_flag=$allow_undefined_flag

8300

allow_undefined_flag=

8301

- if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5

8302

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5

8303

(eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5

8304

ac_status=$?

8305

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8306

- (exit $ac_status); }

8307

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

8308

+ test $ac_status = 0; }

8309

then

8310

archive_cmds_need_lc=no

8311

else

8312

@@ -10387,7 +9962,7 @@

8313

cat conftest.err 1>&5

8314

fi

8315

$RM conftest*

8316

- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5

8317

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5

8318

$as_echo "$archive_cmds_need_lc" >&6; }

8319

;;

8320

esac

8321

@@ -10551,7 +10126,7 @@

8322

8323

8324

8325

- { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

8326

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5

8327

$as_echo_n "checking dynamic linker characteristics... " >&6; }

8328

8329

if test "$GCC" = yes; then

8330

@@ -10973,11 +10548,7 @@

8331

save_libdir=$libdir

8332

eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \

8333

LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""

8334

- cat >conftest.$ac_ext <<_ACEOF

8335

-/* confdefs.h. */

8336

-_ACEOF

8337

-cat confdefs.h >>conftest.$ac_ext

8338

-cat >>conftest.$ac_ext <<_ACEOF

8339

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8340

/* end confdefs.h. */

8341

8342

int

8343

@@ -10988,41 +10559,13 @@

8344

return 0;

8345

}

8346

_ACEOF

8347

-rm -f conftest.$ac_objext conftest$ac_exeext

8348

-if { (ac_try="$ac_link"

8349

-case "(($ac_try" in

8350

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8351

- *) ac_try_echo=$ac_try;;

8352

-esac

8353

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8354

-$as_echo "$ac_try_echo") >&5

8355

- (eval "$ac_link") 2>conftest.er1

8356

- ac_status=$?

8357

- grep -v '^ *+' conftest.er1 >conftest.err

8358

- rm -f conftest.er1

8359

- cat conftest.err >&5

8360

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8361

- (exit $ac_status); } && {

8362

- test -z "$ac_c_werror_flag" ||

8363

- test ! -s conftest.err

8364

- } && test -s conftest$ac_exeext && {

8365

- test "$cross_compiling" = yes ||

8366

- $as_test_x conftest$ac_exeext

8367

- }; then

8368

- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then

8369

+if ac_fn_c_try_link "$LINENO"; then :

8370

+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :

8371

shlibpath_overrides_runpath=yes

8372

fi

8373

-

8374

-else

8375

- $as_echo "$as_me: failed program was:" >&5

8376

-sed 's/^/| /' conftest.$ac_ext >&5

8377

-

8378

-

8379

fi

8380

-

8381

-rm -rf conftest.dSYM

8382

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8383

- conftest$ac_exeext conftest.$ac_ext

8384

+rm -f core conftest.err conftest.$ac_objext \

8385

+ conftest$ac_exeext conftest.$ac_ext

8386

LDFLAGS=$save_LDFLAGS

8387

libdir=$save_libdir

8388

8389

@@ -11246,7 +10789,7 @@

8390

dynamic_linker=no

8391

;;

8392

esac

8393

-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5

8394

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5

8395

$as_echo "$dynamic_linker" >&6; }

8396

test "$dynamic_linker" = no && can_build_shared=no

8397

8398

@@ -11348,7 +10891,7 @@

8399

8400

8401

8402

- { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

8403

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5

8404

$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

8405

hardcode_action=

8406

if test -n "$hardcode_libdir_flag_spec" ||

8407

@@ -11373,7 +10916,7 @@

8408

# directories.

8409

hardcode_action=unsupported

8410

fi

8411

-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5

8412

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5

8413

$as_echo "$hardcode_action" >&6; }

8414

8415

if test "$hardcode_action" = relink ||

8416

@@ -11418,18 +10961,14 @@

8417

8418

darwin*)

8419

# if libdl is installed we need to link against it

8420

- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

8421

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5

8422

$as_echo_n "checking for dlopen in -ldl... " >&6; }

8423

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

8424

+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :

8425

$as_echo_n "(cached) " >&6

8426

else

8427

ac_check_lib_save_LIBS=$LIBS

8428

LIBS="-ldl $LIBS"

8429

-cat >conftest.$ac_ext <<_ACEOF

8430

-/* confdefs.h. */

8431

-_ACEOF

8432

-cat confdefs.h >>conftest.$ac_ext

8433

-cat >>conftest.$ac_ext <<_ACEOF

8434

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8435

/* end confdefs.h. */

8436

8437

/* Override any GCC internal prototype to avoid an error.

8438

@@ -11447,43 +10986,18 @@

8439

return 0;

8440

}

8441

_ACEOF

8442

-rm -f conftest.$ac_objext conftest$ac_exeext

8443

-if { (ac_try="$ac_link"

8444

-case "(($ac_try" in

8445

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8446

- *) ac_try_echo=$ac_try;;

8447

-esac

8448

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8449

-$as_echo "$ac_try_echo") >&5

8450

- (eval "$ac_link") 2>conftest.er1

8451

- ac_status=$?

8452

- grep -v '^ *+' conftest.er1 >conftest.err

8453

- rm -f conftest.er1

8454

- cat conftest.err >&5

8455

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8456

- (exit $ac_status); } && {

8457

- test -z "$ac_c_werror_flag" ||

8458

- test ! -s conftest.err

8459

- } && test -s conftest$ac_exeext && {

8460

- test "$cross_compiling" = yes ||

8461

- $as_test_x conftest$ac_exeext

8462

- }; then

8463

+if ac_fn_c_try_link "$LINENO"; then :

8464

ac_cv_lib_dl_dlopen=yes

8465

else

8466

- $as_echo "$as_me: failed program was:" >&5

8467

-sed 's/^/| /' conftest.$ac_ext >&5

8468

-

8469

- ac_cv_lib_dl_dlopen=no

8470

+ ac_cv_lib_dl_dlopen=no

8471

fi

8472

-

8473

-rm -rf conftest.dSYM

8474

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8475

- conftest$ac_exeext conftest.$ac_ext

8476

+rm -f core conftest.err conftest.$ac_objext \

8477

+ conftest$ac_exeext conftest.$ac_ext

8478

LIBS=$ac_check_lib_save_LIBS

8479

fi

8480

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

8481

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5

8482

$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

8483

-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then

8484

+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :

8485

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

8486

else

8487

8488

@@ -11496,106 +11010,18 @@

8489

;;

8490

8491

*)

8492

- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5

8493

-$as_echo_n "checking for shl_load... " >&6; }

8494

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

8495

- $as_echo_n "(cached) " >&6

8496

-else

8497

- cat >conftest.$ac_ext <<_ACEOF

8498

-/* confdefs.h. */

8499

-_ACEOF

8500

-cat confdefs.h >>conftest.$ac_ext

8501

-cat >>conftest.$ac_ext <<_ACEOF

8502

-/* end confdefs.h. */

8503

-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.

8504

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

8505

-#define shl_load innocuous_shl_load

8506

-

8507

-/* System header to define __stub macros and hopefully few prototypes,

8508

- which can conflict with char shl_load (); below.

8509

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

8510

- <limits.h> exists even on freestanding compilers. */

8511

-

8512

-#ifdef __STDC__

8513

-# include <limits.h>

8514

-#else

8515

-# include <assert.h>

8516

-#endif

8517

-

8518

-#undef shl_load

8519

-

8520

-/* Override any GCC internal prototype to avoid an error.

8521

- Use char because int might match the return type of a GCC

8522

- builtin and then its argument prototype would still apply. */

8523

-#ifdef __cplusplus

8524

-extern "C"

8525

-#endif

8526

-char shl_load ();

8527

-/* The GNU C library defines this for functions which it implements

8528

- to always fail with ENOSYS. Some functions are actually named

8529

- something starting with __ and the normal name is an alias. */

8530

-#if defined __stub_shl_load || defined __stub___shl_load

8531

-choke me

8532

-#endif

8533

-

8534

-int

8535

-main ()

8536

-{

8537

-return shl_load ();

8538

- ;

8539

- return 0;

8540

-}

8541

-_ACEOF

8542

-rm -f conftest.$ac_objext conftest$ac_exeext

8543

-if { (ac_try="$ac_link"

8544

-case "(($ac_try" in

8545

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8546

- *) ac_try_echo=$ac_try;;

8547

-esac

8548

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8549

-$as_echo "$ac_try_echo") >&5

8550

- (eval "$ac_link") 2>conftest.er1

8551

- ac_status=$?

8552

- grep -v '^ *+' conftest.er1 >conftest.err

8553

- rm -f conftest.er1

8554

- cat conftest.err >&5

8555

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8556

- (exit $ac_status); } && {

8557

- test -z "$ac_c_werror_flag" ||

8558

- test ! -s conftest.err

8559

- } && test -s conftest$ac_exeext && {

8560

- test "$cross_compiling" = yes ||

8561

- $as_test_x conftest$ac_exeext

8562

- }; then

8563

- ac_cv_func_shl_load=yes

8564

-else

8565

- $as_echo "$as_me: failed program was:" >&5

8566

-sed 's/^/| /' conftest.$ac_ext >&5

8567

-

8568

- ac_cv_func_shl_load=no

8569

-fi

8570

-

8571

-rm -rf conftest.dSYM

8572

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8573

- conftest$ac_exeext conftest.$ac_ext

8574

-fi

8575

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

8576

-$as_echo "$ac_cv_func_shl_load" >&6; }

8577

-if test "x$ac_cv_func_shl_load" = x""yes; then

8578

+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"

8579

+if test "x$ac_cv_func_shl_load" = x""yes; then :

8580

lt_cv_dlopen="shl_load"

8581

else

8582

- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

8583

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5

8584

$as_echo_n "checking for shl_load in -ldld... " >&6; }

8585

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

8586

+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :

8587

$as_echo_n "(cached) " >&6

8588

else

8589

ac_check_lib_save_LIBS=$LIBS

8590

LIBS="-ldld $LIBS"

8591

-cat >conftest.$ac_ext <<_ACEOF

8592

-/* confdefs.h. */

8593

-_ACEOF

8594

-cat confdefs.h >>conftest.$ac_ext

8595

-cat >>conftest.$ac_ext <<_ACEOF

8596

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8597

/* end confdefs.h. */

8598

8599

/* Override any GCC internal prototype to avoid an error.

8600

@@ -11613,145 +11039,32 @@

8601

return 0;

8602

}

8603

_ACEOF

8604

-rm -f conftest.$ac_objext conftest$ac_exeext

8605

-if { (ac_try="$ac_link"

8606

-case "(($ac_try" in

8607

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8608

- *) ac_try_echo=$ac_try;;

8609

-esac

8610

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8611

-$as_echo "$ac_try_echo") >&5

8612

- (eval "$ac_link") 2>conftest.er1

8613

- ac_status=$?

8614

- grep -v '^ *+' conftest.er1 >conftest.err

8615

- rm -f conftest.er1

8616

- cat conftest.err >&5

8617

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8618

- (exit $ac_status); } && {

8619

- test -z "$ac_c_werror_flag" ||

8620

- test ! -s conftest.err

8621

- } && test -s conftest$ac_exeext && {

8622

- test "$cross_compiling" = yes ||

8623

- $as_test_x conftest$ac_exeext

8624

- }; then

8625

+if ac_fn_c_try_link "$LINENO"; then :

8626

ac_cv_lib_dld_shl_load=yes

8627

else

8628

- $as_echo "$as_me: failed program was:" >&5

8629

-sed 's/^/| /' conftest.$ac_ext >&5

8630

-

8631

- ac_cv_lib_dld_shl_load=no

8632

+ ac_cv_lib_dld_shl_load=no

8633

fi

8634

-

8635

-rm -rf conftest.dSYM

8636

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8637

- conftest$ac_exeext conftest.$ac_ext

8638

+rm -f core conftest.err conftest.$ac_objext \

8639

+ conftest$ac_exeext conftest.$ac_ext

8640

LIBS=$ac_check_lib_save_LIBS

8641

fi

8642

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5

8643

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5

8644

$as_echo "$ac_cv_lib_dld_shl_load" >&6; }

8645

-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then

8646

+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :

8647

lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"

8648

else

8649

- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5

8650

-$as_echo_n "checking for dlopen... " >&6; }

8651

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

8652

- $as_echo_n "(cached) " >&6

8653

-else

8654

- cat >conftest.$ac_ext <<_ACEOF

8655

-/* confdefs.h. */

8656

-_ACEOF

8657

-cat confdefs.h >>conftest.$ac_ext

8658

-cat >>conftest.$ac_ext <<_ACEOF

8659

-/* end confdefs.h. */

8660

-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.

8661

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

8662

-#define dlopen innocuous_dlopen

8663

-

8664

-/* System header to define __stub macros and hopefully few prototypes,

8665

- which can conflict with char dlopen (); below.

8666

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

8667

- <limits.h> exists even on freestanding compilers. */

8668

-

8669

-#ifdef __STDC__

8670

-# include <limits.h>

8671

-#else

8672

-# include <assert.h>

8673

-#endif

8674

-

8675

-#undef dlopen

8676

-

8677

-/* Override any GCC internal prototype to avoid an error.

8678

- Use char because int might match the return type of a GCC

8679

- builtin and then its argument prototype would still apply. */

8680

-#ifdef __cplusplus

8681

-extern "C"

8682

-#endif

8683

-char dlopen ();

8684

-/* The GNU C library defines this for functions which it implements

8685

- to always fail with ENOSYS. Some functions are actually named

8686

- something starting with __ and the normal name is an alias. */

8687

-#if defined __stub_dlopen || defined __stub___dlopen

8688

-choke me

8689

-#endif

8690

-

8691

-int

8692

-main ()

8693

-{

8694

-return dlopen ();

8695

- ;

8696

- return 0;

8697

-}

8698

-_ACEOF

8699

-rm -f conftest.$ac_objext conftest$ac_exeext

8700

-if { (ac_try="$ac_link"

8701

-case "(($ac_try" in

8702

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8703

- *) ac_try_echo=$ac_try;;

8704

-esac

8705

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8706

-$as_echo "$ac_try_echo") >&5

8707

- (eval "$ac_link") 2>conftest.er1

8708

- ac_status=$?

8709

- grep -v '^ *+' conftest.er1 >conftest.err

8710

- rm -f conftest.er1

8711

- cat conftest.err >&5

8712

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8713

- (exit $ac_status); } && {

8714

- test -z "$ac_c_werror_flag" ||

8715

- test ! -s conftest.err

8716

- } && test -s conftest$ac_exeext && {

8717

- test "$cross_compiling" = yes ||

8718

- $as_test_x conftest$ac_exeext

8719

- }; then

8720

- ac_cv_func_dlopen=yes

8721

-else

8722

- $as_echo "$as_me: failed program was:" >&5

8723

-sed 's/^/| /' conftest.$ac_ext >&5

8724

-

8725

- ac_cv_func_dlopen=no

8726

-fi

8727

-

8728

-rm -rf conftest.dSYM

8729

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8730

- conftest$ac_exeext conftest.$ac_ext

8731

-fi

8732

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

8733

-$as_echo "$ac_cv_func_dlopen" >&6; }

8734

-if test "x$ac_cv_func_dlopen" = x""yes; then

8735

+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"

8736

+if test "x$ac_cv_func_dlopen" = x""yes; then :

8737

lt_cv_dlopen="dlopen"

8738

else

8739

- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

8740

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5

8741

$as_echo_n "checking for dlopen in -ldl... " >&6; }

8742

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

8743

+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :

8744

$as_echo_n "(cached) " >&6

8745

else

8746

ac_check_lib_save_LIBS=$LIBS

8747

LIBS="-ldl $LIBS"

8748

-cat >conftest.$ac_ext <<_ACEOF

8749

-/* confdefs.h. */

8750

-_ACEOF

8751

-cat confdefs.h >>conftest.$ac_ext

8752

-cat >>conftest.$ac_ext <<_ACEOF

8753

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8754

/* end confdefs.h. */

8755

8756

/* Override any GCC internal prototype to avoid an error.

8757

@@ -11769,57 +11082,28 @@

8758

return 0;

8759

}

8760

_ACEOF

8761

-rm -f conftest.$ac_objext conftest$ac_exeext

8762

-if { (ac_try="$ac_link"

8763

-case "(($ac_try" in

8764

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8765

- *) ac_try_echo=$ac_try;;

8766

-esac

8767

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8768

-$as_echo "$ac_try_echo") >&5

8769

- (eval "$ac_link") 2>conftest.er1

8770

- ac_status=$?

8771

- grep -v '^ *+' conftest.er1 >conftest.err

8772

- rm -f conftest.er1

8773

- cat conftest.err >&5

8774

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8775

- (exit $ac_status); } && {

8776

- test -z "$ac_c_werror_flag" ||

8777

- test ! -s conftest.err

8778

- } && test -s conftest$ac_exeext && {

8779

- test "$cross_compiling" = yes ||

8780

- $as_test_x conftest$ac_exeext

8781

- }; then

8782

+if ac_fn_c_try_link "$LINENO"; then :

8783

ac_cv_lib_dl_dlopen=yes

8784

else

8785

- $as_echo "$as_me: failed program was:" >&5

8786

-sed 's/^/| /' conftest.$ac_ext >&5

8787

-

8788

- ac_cv_lib_dl_dlopen=no

8789

+ ac_cv_lib_dl_dlopen=no

8790

fi

8791

-

8792

-rm -rf conftest.dSYM

8793

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8794

- conftest$ac_exeext conftest.$ac_ext

8795

+rm -f core conftest.err conftest.$ac_objext \

8796

+ conftest$ac_exeext conftest.$ac_ext

8797

LIBS=$ac_check_lib_save_LIBS

8798

fi

8799

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

8800

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5

8801

$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

8802

-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then

8803

+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :

8804

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

8805

else

8806

- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5

8807

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5

8808

$as_echo_n "checking for dlopen in -lsvld... " >&6; }

8809

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

8810

+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :

8811

$as_echo_n "(cached) " >&6

8812

else

8813

ac_check_lib_save_LIBS=$LIBS

8814

LIBS="-lsvld $LIBS"

8815

-cat >conftest.$ac_ext <<_ACEOF

8816

-/* confdefs.h. */

8817

-_ACEOF

8818

-cat confdefs.h >>conftest.$ac_ext

8819

-cat >>conftest.$ac_ext <<_ACEOF

8820

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8821

/* end confdefs.h. */

8822

8823

/* Override any GCC internal prototype to avoid an error.

8824

@@ -11837,57 +11121,28 @@

8825

return 0;

8826

}

8827

_ACEOF

8828

-rm -f conftest.$ac_objext conftest$ac_exeext

8829

-if { (ac_try="$ac_link"

8830

-case "(($ac_try" in

8831

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8832

- *) ac_try_echo=$ac_try;;

8833

-esac

8834

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8835

-$as_echo "$ac_try_echo") >&5

8836

- (eval "$ac_link") 2>conftest.er1

8837

- ac_status=$?

8838

- grep -v '^ *+' conftest.er1 >conftest.err

8839

- rm -f conftest.er1

8840

- cat conftest.err >&5

8841

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8842

- (exit $ac_status); } && {

8843

- test -z "$ac_c_werror_flag" ||

8844

- test ! -s conftest.err

8845

- } && test -s conftest$ac_exeext && {

8846

- test "$cross_compiling" = yes ||

8847

- $as_test_x conftest$ac_exeext

8848

- }; then

8849

+if ac_fn_c_try_link "$LINENO"; then :

8850

ac_cv_lib_svld_dlopen=yes

8851

else

8852

- $as_echo "$as_me: failed program was:" >&5

8853

-sed 's/^/| /' conftest.$ac_ext >&5

8854

-

8855

- ac_cv_lib_svld_dlopen=no

8856

+ ac_cv_lib_svld_dlopen=no

8857

fi

8858

-

8859

-rm -rf conftest.dSYM

8860

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8861

- conftest$ac_exeext conftest.$ac_ext

8862

+rm -f core conftest.err conftest.$ac_objext \

8863

+ conftest$ac_exeext conftest.$ac_ext

8864

LIBS=$ac_check_lib_save_LIBS

8865

fi

8866

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5

8867

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5

8868

$as_echo "$ac_cv_lib_svld_dlopen" >&6; }

8869

-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then

8870

+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :

8871

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"

8872

else

8873

- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5

8874

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5

8875

$as_echo_n "checking for dld_link in -ldld... " >&6; }

8876

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

8877

+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :

8878

$as_echo_n "(cached) " >&6

8879

else

8880

ac_check_lib_save_LIBS=$LIBS

8881

LIBS="-ldld $LIBS"

8882

-cat >conftest.$ac_ext <<_ACEOF

8883

-/* confdefs.h. */

8884

-_ACEOF

8885

-cat confdefs.h >>conftest.$ac_ext

8886

-cat >>conftest.$ac_ext <<_ACEOF

8887

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8888

/* end confdefs.h. */

8889

8890

/* Override any GCC internal prototype to avoid an error.

8891

@@ -11905,43 +11160,18 @@

8892

return 0;

8893

}

8894

_ACEOF

8895

-rm -f conftest.$ac_objext conftest$ac_exeext

8896

-if { (ac_try="$ac_link"

8897

-case "(($ac_try" in

8898

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8899

- *) ac_try_echo=$ac_try;;

8900

-esac

8901

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8902

-$as_echo "$ac_try_echo") >&5

8903

- (eval "$ac_link") 2>conftest.er1

8904

- ac_status=$?

8905

- grep -v '^ *+' conftest.er1 >conftest.err

8906

- rm -f conftest.er1

8907

- cat conftest.err >&5

8908

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8909

- (exit $ac_status); } && {

8910

- test -z "$ac_c_werror_flag" ||

8911

- test ! -s conftest.err

8912

- } && test -s conftest$ac_exeext && {

8913

- test "$cross_compiling" = yes ||

8914

- $as_test_x conftest$ac_exeext

8915

- }; then

8916

+if ac_fn_c_try_link "$LINENO"; then :

8917

ac_cv_lib_dld_dld_link=yes

8918

else

8919

- $as_echo "$as_me: failed program was:" >&5

8920

-sed 's/^/| /' conftest.$ac_ext >&5

8921

-

8922

- ac_cv_lib_dld_dld_link=no

8923

+ ac_cv_lib_dld_dld_link=no

8924

fi

8925

-

8926

-rm -rf conftest.dSYM

8927

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8928

- conftest$ac_exeext conftest.$ac_ext

8929

+rm -f core conftest.err conftest.$ac_objext \

8930

+ conftest$ac_exeext conftest.$ac_ext

8931

LIBS=$ac_check_lib_save_LIBS

8932

fi

8933

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5

8934

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5

8935

$as_echo "$ac_cv_lib_dld_dld_link" >&6; }

8936

-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then

8937

+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :

8938

lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"

8939

fi

8940

8941

@@ -11980,9 +11210,9 @@

8942

save_LIBS="$LIBS"

8943

LIBS="$lt_cv_dlopen_libs $LIBS"

8944

8945

- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5

8946

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5

8947

$as_echo_n "checking whether a program can dlopen itself... " >&6; }

8948

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

8949

+if test "${lt_cv_dlopen_self+set}" = set; then :

8950

$as_echo_n "(cached) " >&6

8951

else

8952

if test "$cross_compiling" = yes; then :

8953

@@ -11991,7 +11221,7 @@

8954

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

8955

lt_status=$lt_dlunknown

8956

cat > conftest.$ac_ext <<_LT_EOF

8957

-#line 11994 "configure"

8958

+#line 11224 "configure"

8959

#include "confdefs.h"

8960

8961

#if HAVE_DLFCN_H

8962

@@ -12050,11 +11280,11 @@

8963

return status;

8964

}

8965

_LT_EOF

8966

- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8967

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5

8968

(eval $ac_link) 2>&5

8969

ac_status=$?

8970

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8971

- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then

8972

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

8973

+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then

8974

(./conftest; exit; ) >&5 2>/dev/null

8975

lt_status=$?

8976

case x$lt_status in

8977

@@ -12071,14 +11301,14 @@

8978

8979

8980

fi

8981

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5

8982

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5

8983

$as_echo "$lt_cv_dlopen_self" >&6; }

8984

8985

if test "x$lt_cv_dlopen_self" = xyes; then

8986

wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"

8987

- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5

8988

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5

8989

$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }

8990

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

8991

+if test "${lt_cv_dlopen_self_static+set}" = set; then :

8992

$as_echo_n "(cached) " >&6

8993

else

8994

if test "$cross_compiling" = yes; then :

8995

@@ -12087,7 +11317,7 @@

8996

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

8997

lt_status=$lt_dlunknown

8998

cat > conftest.$ac_ext <<_LT_EOF

8999

-#line 12090 "configure"

9000

+#line 11320 "configure"

9001

#include "confdefs.h"

9002

9003

#if HAVE_DLFCN_H

9004

@@ -12146,11 +11376,11 @@

9005

return status;

9006

}

9007

_LT_EOF

9008

- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

9009

+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5

9010

(eval $ac_link) 2>&5

9011

ac_status=$?

9012

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9013

- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then

9014

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

9015

+ test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then

9016

(./conftest; exit; ) >&5 2>/dev/null

9017

lt_status=$?

9018

case x$lt_status in

9019

@@ -12167,7 +11397,7 @@

9020

9021

9022

fi

9023

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5

9024

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5

9025

$as_echo "$lt_cv_dlopen_self_static" >&6; }

9026

fi

9027

9028

@@ -12206,12 +11436,12 @@

9029

9030

striplib=

9031

old_striplib=

9032

-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5

9033

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5

9034

$as_echo_n "checking whether stripping libraries is possible... " >&6; }

9035

if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then

9036

test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"

9037

test -z "$striplib" && striplib="$STRIP --strip-unneeded"

9038

- { $as_echo "$as_me:$LINENO: result: yes" >&5

9039

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

9040

$as_echo "yes" >&6; }

9041

else

9042

# FIXME - insert some real tests, host_os isn't really good enough

9043

@@ -12220,15 +11450,15 @@

9044

if test -n "$STRIP" ; then

9045

striplib="$STRIP -x"

9046

old_striplib="$STRIP -S"

9047

- { $as_echo "$as_me:$LINENO: result: yes" >&5

9048

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

9049

$as_echo "yes" >&6; }

9050

else

9051

- { $as_echo "$as_me:$LINENO: result: no" >&5

9052

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9053

$as_echo "no" >&6; }

9054

fi

9055

;;

9056

*)

9057

- { $as_echo "$as_me:$LINENO: result: no" >&5

9058

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9059

$as_echo "no" >&6; }

9060

;;

9061

esac

9062

@@ -12246,12 +11476,12 @@

9063

9064

9065

# Report which library types will actually be built

9066

- { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

9067

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5

9068

$as_echo_n "checking if libtool supports shared libraries... " >&6; }

9069

- { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5

9070

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5

9071

$as_echo "$can_build_shared" >&6; }

9072

9073

- { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

9074

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5

9075

$as_echo_n "checking whether to build shared libraries... " >&6; }

9076

test "$can_build_shared" = "no" && enable_shared=no

9077

9078

@@ -12272,14 +11502,14 @@

9079

fi

9080

;;

9081

esac

9082

- { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5

9083

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5

9084

$as_echo "$enable_shared" >&6; }

9085

9086

- { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5

9087

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5

9088

$as_echo_n "checking whether to build static libraries... " >&6; }

9089

# Make sure either enable_shared or enable_static is yes.

9090

test "$enable_shared" = yes || enable_static=yes

9091

- { $as_echo "$as_me:$LINENO: result: $enable_static" >&5

9092

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5

9093

$as_echo "$enable_static" >&6; }

9094

9095

9096

@@ -12321,7 +11551,7 @@

9097

esac

9098

9099

# Check whether --enable-glibtest was given.

9100

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

9101

+if test "${enable_glibtest+set}" = set; then :

9102

enableval=$enable_glibtest;

9103

else

9104

enable_glibtest=yes

9105

@@ -12356,9 +11586,9 @@

9106

if test -n "$ac_tool_prefix"; then

9107

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

9108

set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

9109

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

9110

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9111

$as_echo_n "checking for $ac_word... " >&6; }

9112

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

9113

+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :

9114

$as_echo_n "(cached) " >&6

9115

else

9116

case $PKG_CONFIG in

9117

@@ -12371,14 +11601,14 @@

9118

do

9119

IFS=$as_save_IFS

9120

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

9121

- for ac_exec_ext in '' $ac_executable_extensions; do

9122

+ for ac_exec_ext in '' $ac_executable_extensions; do

9123

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

9124

ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

9125

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

9126

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9127

break 2

9128

fi

9129

done

9130

-done

9131

+ done

9132

IFS=$as_save_IFS

9133

9134

;;

9135

@@ -12386,10 +11616,10 @@

9136

fi

9137

PKG_CONFIG=$ac_cv_path_PKG_CONFIG

9138

if test -n "$PKG_CONFIG"; then

9139

- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5

9140

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5

9141

$as_echo "$PKG_CONFIG" >&6; }

9142

else

9143

- { $as_echo "$as_me:$LINENO: result: no" >&5

9144

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9145

$as_echo "no" >&6; }

9146

fi

9147

9148

@@ -12399,9 +11629,9 @@

9149

ac_pt_PKG_CONFIG=$PKG_CONFIG

9150

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

9151

set dummy pkg-config; ac_word=$2

9152

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

9153

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9154

$as_echo_n "checking for $ac_word... " >&6; }

9155

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

9156

+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :

9157

$as_echo_n "(cached) " >&6

9158

else

9159

case $ac_pt_PKG_CONFIG in

9160

@@ -12414,14 +11644,14 @@

9161

do

9162

IFS=$as_save_IFS

9163

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

9164

- for ac_exec_ext in '' $ac_executable_extensions; do

9165

+ for ac_exec_ext in '' $ac_executable_extensions; do

9166

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

9167

ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

9168

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

9169

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9170

break 2

9171

fi

9172

done

9173

-done

9174

+ done

9175

IFS=$as_save_IFS

9176

9177

;;

9178

@@ -12429,10 +11659,10 @@

9179

fi

9180

ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

9181

if test -n "$ac_pt_PKG_CONFIG"; then

9182

- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5

9183

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5

9184

$as_echo "$ac_pt_PKG_CONFIG" >&6; }

9185

else

9186

- { $as_echo "$as_me:$LINENO: result: no" >&5

9187

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9188

$as_echo "no" >&6; }

9189

fi

9190

9191

@@ -12441,7 +11671,7 @@

9192

else

9193

case $cross_compiling:$ac_tool_warned in

9194

yes:)

9195

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

9196

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

9197

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

9198

ac_tool_warned=yes ;;

9199

esac

9200

@@ -12454,13 +11684,13 @@

9201

fi

9202

if test -n "$PKG_CONFIG"; then

9203

_pkg_min_version=0.16

9204

- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5

9205

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5

9206

$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }

9207

if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

9208

- { $as_echo "$as_me:$LINENO: result: yes" >&5

9209

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

9210

$as_echo "yes" >&6; }

9211

else

9212

- { $as_echo "$as_me:$LINENO: result: no" >&5

9213

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9214

$as_echo "no" >&6; }

9215

PKG_CONFIG=""

9216

fi

9217

@@ -12475,7 +11705,7 @@

9218

fi

9219

9220

min_glib_version=2.0.0

9221

- { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5

9222

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5

9223

$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }

9224

9225

if test x$PKG_CONFIG != xno ; then

9226

@@ -12511,14 +11741,10 @@

9227

CFLAGS="$CFLAGS $GLIB_CFLAGS"

9228

LIBS="$GLIB_LIBS $LIBS"

9229

rm -f conf.glibtest

9230

- if test "$cross_compiling" = yes; then

9231

+ if test "$cross_compiling" = yes; then :

9232

echo $ac_n "cross compiling; assumed OK... $ac_c"

9233

else

9234

- cat >conftest.$ac_ext <<_ACEOF

9235

-/* confdefs.h. */

9236

-_ACEOF

9237

-cat confdefs.h >>conftest.$ac_ext

9238

-cat >>conftest.$ac_ext <<_ACEOF

9239

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9240

/* end confdefs.h. */

9241

9242

#include <glib.h>

9243

@@ -12594,52 +11820,25 @@

9244

}

9245

9246

_ACEOF

9247

-rm -f conftest$ac_exeext

9248

-if { (ac_try="$ac_link"

9249

-case "(($ac_try" in

9250

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9251

- *) ac_try_echo=$ac_try;;

9252

-esac

9253

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9254

-$as_echo "$ac_try_echo") >&5

9255

- (eval "$ac_link") 2>&5

9256

- ac_status=$?

9257

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9258

- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

9259

- { (case "(($ac_try" in

9260

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9261

- *) ac_try_echo=$ac_try;;

9262

-esac

9263

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9264

-$as_echo "$ac_try_echo") >&5

9265

- (eval "$ac_try") 2>&5

9266

- ac_status=$?

9267

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9268

- (exit $ac_status); }; }; then

9269

- :

9270

+if ac_fn_c_try_run "$LINENO"; then :

9271

+

9272

else

9273

- $as_echo "$as_me: program exited with status $ac_status" >&5

9274

-$as_echo "$as_me: failed program was:" >&5

9275

-sed 's/^/| /' conftest.$ac_ext >&5

9276

-

9277

-( exit $ac_status )

9278

-no_glib=yes

9279

-fi

9280

-rm -rf conftest.dSYM

9281

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

9282

-fi

9283

-

9284

+ no_glib=yes

9285

+fi

9286

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

9287

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

9288

+fi

9289

9290

CFLAGS="$ac_save_CFLAGS"

9291

LIBS="$ac_save_LIBS"

9292

fi

9293

fi

9294

if test "x$no_glib" = x ; then

9295

- { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5

9296

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5

9297

$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }

9298

:

9299

else

9300

- { $as_echo "$as_me:$LINENO: result: no" >&5

9301

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9302

$as_echo "no" >&6; }

9303

if test "$PKG_CONFIG" = "no" ; then

9304

echo "*** A new enough version of pkg-config was not found."

9305

@@ -12653,11 +11852,7 @@

9306

ac_save_LIBS="$LIBS"

9307

CFLAGS="$CFLAGS $GLIB_CFLAGS"

9308

LIBS="$LIBS $GLIB_LIBS"

9309

- cat >conftest.$ac_ext <<_ACEOF

9310

-/* confdefs.h. */

9311

-_ACEOF

9312

-cat confdefs.h >>conftest.$ac_ext

9313

-cat >>conftest.$ac_ext <<_ACEOF

9314

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9315

/* end confdefs.h. */

9316

9317

#include <glib.h>

9318

@@ -12671,27 +11866,7 @@

9319

return 0;

9320

}

9321

_ACEOF

9322

-rm -f conftest.$ac_objext conftest$ac_exeext

9323

-if { (ac_try="$ac_link"

9324

-case "(($ac_try" in

9325

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9326

- *) ac_try_echo=$ac_try;;

9327

-esac

9328

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9329

-$as_echo "$ac_try_echo") >&5

9330

- (eval "$ac_link") 2>conftest.er1

9331

- ac_status=$?

9332

- grep -v '^ *+' conftest.er1 >conftest.err

9333

- rm -f conftest.er1

9334

- cat conftest.err >&5

9335

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9336

- (exit $ac_status); } && {

9337

- test -z "$ac_c_werror_flag" ||

9338

- test ! -s conftest.err

9339

- } && test -s conftest$ac_exeext && {

9340

- test "$cross_compiling" = yes ||

9341

- $as_test_x conftest$ac_exeext

9342

- }; then

9343

+if ac_fn_c_try_link "$LINENO"; then :

9344

echo "*** The test program compiled, but did not run. This usually means"

9345

echo "*** that the run-time linker is not finding GLIB or finding the wrong"

9346

echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"

9347

@@ -12702,16 +11877,11 @@

9348

echo "*** If you have an old version installed, it is best to remove it, although"

9349

echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"

9350

else

9351

- $as_echo "$as_me: failed program was:" >&5

9352

-sed 's/^/| /' conftest.$ac_ext >&5

9353

-

9354

- echo "*** The test program failed to compile or link. See the file config.log for the"

9355

+ echo "*** The test program failed to compile or link. See the file config.log for the"

9356

echo "*** exact error that occured. This usually means GLIB is incorrectly installed."

9357

fi

9358

-

9359

-rm -rf conftest.dSYM

9360

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9361

- conftest$ac_exeext conftest.$ac_ext

9362

+rm -f core conftest.err conftest.$ac_objext \

9363

+ conftest$ac_exeext conftest.$ac_ext

9364

CFLAGS="$ac_save_CFLAGS"

9365

LIBS="$ac_save_LIBS"

9366

fi

9367

@@ -12730,12 +11900,12 @@

9368

9369

rm -f conf.glibtest

9370

9371

-{ $as_echo "$as_me:$LINENO: checking for X" >&5

9372

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5

9373

$as_echo_n "checking for X... " >&6; }

9374

9375

9376

# Check whether --with-x was given.

9377

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

9378

+if test "${with_x+set}" = set; then :

9379

withval=$with_x;

9380

fi

9381

9382

@@ -12745,10 +11915,8 @@

9383

have_x=disabled

9384

else

9385

case $x_includes,$x_libraries in #(

9386

- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5

9387

-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}

9388

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

9389

- *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then

9390

+ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(

9391

+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :

9392

$as_echo_n "(cached) " >&6

9393

else

9394

# One or both of the vars are not set, and there is no cached value.

9395

@@ -12796,21 +11964,25 @@

9396

# Check X11 before X11Rn because it is often a symlink to the current release.

9397

ac_x_header_dirs='

9398

/usr/X11/include

9399

+/usr/X11R7/include

9400

/usr/X11R6/include

9401

/usr/X11R5/include

9402

/usr/X11R4/include

9403

9404

/usr/include/X11

9405

+/usr/include/X11R7

9406

/usr/include/X11R6

9407

/usr/include/X11R5

9408

/usr/include/X11R4

9409

9410

/usr/local/X11/include

9411

+/usr/local/X11R7/include

9412

/usr/local/X11R6/include

9413

/usr/local/X11R5/include

9414

/usr/local/X11R4/include

9415

9416

/usr/local/include/X11

9417

+/usr/local/include/X11R7

9418

/usr/local/include/X11R6

9419

/usr/local/include/X11R5

9420

/usr/local/include/X11R4

9421

@@ -12832,37 +12004,14 @@

9422

if test "$ac_x_includes" = no; then

9423

# Guess where to find include files, by looking for Xlib.h.

9424

# First, try using that file with no special directory specified.

9425

- cat >conftest.$ac_ext <<_ACEOF

9426

-/* confdefs.h. */

9427

-_ACEOF

9428

-cat confdefs.h >>conftest.$ac_ext

9429

-cat >>conftest.$ac_ext <<_ACEOF

9430

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9431

/* end confdefs.h. */

9432

#include <X11/Xlib.h>

9433

_ACEOF

9434

-if { (ac_try="$ac_cpp conftest.$ac_ext"

9435

-case "(($ac_try" in

9436

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9437

- *) ac_try_echo=$ac_try;;

9438

-esac

9439

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9440

-$as_echo "$ac_try_echo") >&5

9441

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

9442

- ac_status=$?

9443

- grep -v '^ *+' conftest.er1 >conftest.err

9444

- rm -f conftest.er1

9445

- cat conftest.err >&5

9446

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9447

- (exit $ac_status); } >/dev/null && {

9448

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

9449

- test ! -s conftest.err

9450

- }; then

9451

+if ac_fn_c_try_cpp "$LINENO"; then :

9452

# We can compile using X headers with no special include directory.

9453

ac_x_includes=

9454

else

9455

- $as_echo "$as_me: failed program was:" >&5

9456

-sed 's/^/| /' conftest.$ac_ext >&5

9457

-

9458

for ac_dir in $ac_x_header_dirs; do

9459

if test -r "$ac_dir/X11/Xlib.h"; then

9460

ac_x_includes=$ac_dir

9461

@@ -12870,7 +12019,6 @@

9462

fi

9463

done

9464

fi

9465

-

9466

rm -f conftest.err conftest.$ac_ext

9467

fi # $ac_x_includes = no

9468

9469

@@ -12880,11 +12028,7 @@

9470

# Don't add to $LIBS permanently.

9471

ac_save_LIBS=$LIBS

9472

LIBS="-lX11 $LIBS"

9473

- cat >conftest.$ac_ext <<_ACEOF

9474

-/* confdefs.h. */

9475

-_ACEOF

9476

-cat confdefs.h >>conftest.$ac_ext

9477

-cat >>conftest.$ac_ext <<_ACEOF

9478

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9479

/* end confdefs.h. */

9480

#include <X11/Xlib.h>

9481

int

9482

@@ -12895,35 +12039,12 @@

9483

return 0;

9484

}

9485

_ACEOF

9486

-rm -f conftest.$ac_objext conftest$ac_exeext

9487

-if { (ac_try="$ac_link"

9488

-case "(($ac_try" in

9489

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9490

- *) ac_try_echo=$ac_try;;

9491

-esac

9492

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9493

-$as_echo "$ac_try_echo") >&5

9494

- (eval "$ac_link") 2>conftest.er1

9495

- ac_status=$?

9496

- grep -v '^ *+' conftest.er1 >conftest.err

9497

- rm -f conftest.er1

9498

- cat conftest.err >&5

9499

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9500

- (exit $ac_status); } && {

9501

- test -z "$ac_c_werror_flag" ||

9502

- test ! -s conftest.err

9503

- } && test -s conftest$ac_exeext && {

9504

- test "$cross_compiling" = yes ||

9505

- $as_test_x conftest$ac_exeext

9506

- }; then

9507

+if ac_fn_c_try_link "$LINENO"; then :

9508

LIBS=$ac_save_LIBS

9509

# We can link X programs with no special library path.

9510

ac_x_libraries=

9511

else

9512

- $as_echo "$as_me: failed program was:" >&5

9513

-sed 's/^/| /' conftest.$ac_ext >&5

9514

-

9515

- LIBS=$ac_save_LIBS

9516

+ LIBS=$ac_save_LIBS

9517

for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`

9518

do

9519

# Don't even attempt the hair of trying to link an X program!

9520

@@ -12935,10 +12056,8 @@

9521

done

9522

done

9523

fi

9524

-

9525

-rm -rf conftest.dSYM

9526

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9527

- conftest$ac_exeext conftest.$ac_ext

9528

+rm -f core conftest.err conftest.$ac_objext \

9529

+ conftest$ac_exeext conftest.$ac_ext

9530

fi # $ac_x_libraries = no

9531

9532

case $ac_x_includes,$ac_x_libraries in #(

9533

@@ -12959,7 +12078,7 @@

9534

fi # $with_x != no

9535

9536

if test "$have_x" != yes; then

9537

- { $as_echo "$as_me:$LINENO: result: $have_x" >&5

9538

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5

9539

$as_echo "$have_x" >&6; }

9540

no_x=yes

9541

else

9542

@@ -12970,16 +12089,14 @@

9543

ac_cv_have_x="have_x=yes\

9544

ac_x_includes='$x_includes'\

9545

ac_x_libraries='$x_libraries'"

9546

- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5

9547

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5

9548

$as_echo "libraries $x_libraries, headers $x_includes" >&6; }

9549

fi

9550

9551

if test "$no_x" = yes; then

9552

# Not all programs may use this symbol, but it does not hurt to define it.

9553

9554

-cat >>confdefs.h <<\_ACEOF

9555

-#define X_DISPLAY_MISSING 1

9556

-_ACEOF

9557

+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h

9558

9559

X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=

9560

else

9561

@@ -12992,16 +12109,12 @@

9562

X_LIBS="$X_LIBS -L$x_libraries"

9563

# For Solaris; some versions of Sun CC require a space after -R and

9564

# others require no space. Words are not sufficient . . . .

9565

- { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5

9566

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5

9567

$as_echo_n "checking whether -R must be followed by a space... " >&6; }

9568

ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"

9569

ac_xsave_c_werror_flag=$ac_c_werror_flag

9570

ac_c_werror_flag=yes

9571

- cat >conftest.$ac_ext <<_ACEOF

9572

-/* confdefs.h. */

9573

-_ACEOF

9574

-cat confdefs.h >>conftest.$ac_ext

9575

-cat >>conftest.$ac_ext <<_ACEOF

9576

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9577

/* end confdefs.h. */

9578

9579

int

9580

@@ -13012,40 +12125,13 @@

9581

return 0;

9582

}

9583

_ACEOF

9584

-rm -f conftest.$ac_objext conftest$ac_exeext

9585

-if { (ac_try="$ac_link"

9586

-case "(($ac_try" in

9587

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9588

- *) ac_try_echo=$ac_try;;

9589

-esac

9590

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9591

-$as_echo "$ac_try_echo") >&5

9592

- (eval "$ac_link") 2>conftest.er1

9593

- ac_status=$?

9594

- grep -v '^ *+' conftest.er1 >conftest.err

9595

- rm -f conftest.er1

9596

- cat conftest.err >&5

9597

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9598

- (exit $ac_status); } && {

9599

- test -z "$ac_c_werror_flag" ||

9600

- test ! -s conftest.err

9601

- } && test -s conftest$ac_exeext && {

9602

- test "$cross_compiling" = yes ||

9603

- $as_test_x conftest$ac_exeext

9604

- }; then

9605

- { $as_echo "$as_me:$LINENO: result: no" >&5

9606

+if ac_fn_c_try_link "$LINENO"; then :

9607

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9608

$as_echo "no" >&6; }

9609

X_LIBS="$X_LIBS -R$x_libraries"

9610

else

9611

- $as_echo "$as_me: failed program was:" >&5

9612

-sed 's/^/| /' conftest.$ac_ext >&5

9613

-

9614

- LIBS="$ac_xsave_LIBS -R $x_libraries"

9615

- cat >conftest.$ac_ext <<_ACEOF

9616

-/* confdefs.h. */

9617

-_ACEOF

9618

-cat confdefs.h >>conftest.$ac_ext

9619

-cat >>conftest.$ac_ext <<_ACEOF

9620

+ LIBS="$ac_xsave_LIBS -R $x_libraries"

9621

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9622

/* end confdefs.h. */

9623

9624

int

9625

@@ -13056,46 +12142,19 @@

9626

return 0;

9627

}

9628

_ACEOF

9629

-rm -f conftest.$ac_objext conftest$ac_exeext

9630

-if { (ac_try="$ac_link"

9631

-case "(($ac_try" in

9632

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9633

- *) ac_try_echo=$ac_try;;

9634

-esac

9635

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9636

-$as_echo "$ac_try_echo") >&5

9637

- (eval "$ac_link") 2>conftest.er1

9638

- ac_status=$?

9639

- grep -v '^ *+' conftest.er1 >conftest.err

9640

- rm -f conftest.er1

9641

- cat conftest.err >&5

9642

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9643

- (exit $ac_status); } && {

9644

- test -z "$ac_c_werror_flag" ||

9645

- test ! -s conftest.err

9646

- } && test -s conftest$ac_exeext && {

9647

- test "$cross_compiling" = yes ||

9648

- $as_test_x conftest$ac_exeext

9649

- }; then

9650

- { $as_echo "$as_me:$LINENO: result: yes" >&5

9651

+if ac_fn_c_try_link "$LINENO"; then :

9652

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

9653

$as_echo "yes" >&6; }

9654

X_LIBS="$X_LIBS -R $x_libraries"

9655

else

9656

- $as_echo "$as_me: failed program was:" >&5

9657

-sed 's/^/| /' conftest.$ac_ext >&5

9658

-

9659

- { $as_echo "$as_me:$LINENO: result: neither works" >&5

9660

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5

9661

$as_echo "neither works" >&6; }

9662

fi

9663

-

9664

-rm -rf conftest.dSYM

9665

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9666

- conftest$ac_exeext conftest.$ac_ext

9667

+rm -f core conftest.err conftest.$ac_objext \

9668

+ conftest$ac_exeext conftest.$ac_ext

9669

fi

9670

-

9671

-rm -rf conftest.dSYM

9672

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9673

- conftest$ac_exeext conftest.$ac_ext

9674

+rm -f core conftest.err conftest.$ac_objext \

9675

+ conftest$ac_exeext conftest.$ac_ext

9676

ac_c_werror_flag=$ac_xsave_c_werror_flag

9677

LIBS=$ac_xsave_LIBS

9678

fi

9679

@@ -13111,11 +12170,7 @@

9680

# libraries were built with DECnet support. And Karl Berry says

9681

# the Alpha needs dnet_stub (dnet does not exist).

9682

ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"

9683

- cat >conftest.$ac_ext <<_ACEOF

9684

-/* confdefs.h. */

9685

-_ACEOF

9686

-cat confdefs.h >>conftest.$ac_ext

9687

-cat >>conftest.$ac_ext <<_ACEOF

9688

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9689

/* end confdefs.h. */

9690

9691

/* Override any GCC internal prototype to avoid an error.

9692

@@ -13133,44 +12188,17 @@

9693

return 0;

9694

}

9695

_ACEOF

9696

-rm -f conftest.$ac_objext conftest$ac_exeext

9697

-if { (ac_try="$ac_link"

9698

-case "(($ac_try" in

9699

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9700

- *) ac_try_echo=$ac_try;;

9701

-esac

9702

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9703

-$as_echo "$ac_try_echo") >&5

9704

- (eval "$ac_link") 2>conftest.er1

9705

- ac_status=$?

9706

- grep -v '^ *+' conftest.er1 >conftest.err

9707

- rm -f conftest.er1

9708

- cat conftest.err >&5

9709

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9710

- (exit $ac_status); } && {

9711

- test -z "$ac_c_werror_flag" ||

9712

- test ! -s conftest.err

9713

- } && test -s conftest$ac_exeext && {

9714

- test "$cross_compiling" = yes ||

9715

- $as_test_x conftest$ac_exeext

9716

- }; then

9717

- :

9718

+if ac_fn_c_try_link "$LINENO"; then :

9719

+

9720

else

9721

- $as_echo "$as_me: failed program was:" >&5

9722

-sed 's/^/| /' conftest.$ac_ext >&5

9723

-

9724

- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5

9725

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5

9726

$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }

9727

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

9728

+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :

9729

$as_echo_n "(cached) " >&6

9730

else

9731

ac_check_lib_save_LIBS=$LIBS

9732

LIBS="-ldnet $LIBS"

9733

-cat >conftest.$ac_ext <<_ACEOF

9734

-/* confdefs.h. */

9735

-_ACEOF

9736

-cat confdefs.h >>conftest.$ac_ext

9737

-cat >>conftest.$ac_ext <<_ACEOF

9738

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9739

/* end confdefs.h. */

9740

9741

/* Override any GCC internal prototype to avoid an error.

9742

@@ -13188,59 +12216,30 @@

9743

return 0;

9744

}

9745

_ACEOF

9746

-rm -f conftest.$ac_objext conftest$ac_exeext

9747

-if { (ac_try="$ac_link"

9748

-case "(($ac_try" in

9749

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9750

- *) ac_try_echo=$ac_try;;

9751

-esac

9752

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9753

-$as_echo "$ac_try_echo") >&5

9754

- (eval "$ac_link") 2>conftest.er1

9755

- ac_status=$?

9756

- grep -v '^ *+' conftest.er1 >conftest.err

9757

- rm -f conftest.er1

9758

- cat conftest.err >&5

9759

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9760

- (exit $ac_status); } && {

9761

- test -z "$ac_c_werror_flag" ||

9762

- test ! -s conftest.err

9763

- } && test -s conftest$ac_exeext && {

9764

- test "$cross_compiling" = yes ||

9765

- $as_test_x conftest$ac_exeext

9766

- }; then

9767

+if ac_fn_c_try_link "$LINENO"; then :

9768

ac_cv_lib_dnet_dnet_ntoa=yes

9769

else

9770

- $as_echo "$as_me: failed program was:" >&5

9771

-sed 's/^/| /' conftest.$ac_ext >&5

9772

-

9773

- ac_cv_lib_dnet_dnet_ntoa=no

9774

+ ac_cv_lib_dnet_dnet_ntoa=no

9775

fi

9776

-

9777

-rm -rf conftest.dSYM

9778

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9779

- conftest$ac_exeext conftest.$ac_ext

9780

+rm -f core conftest.err conftest.$ac_objext \

9781

+ conftest$ac_exeext conftest.$ac_ext

9782

LIBS=$ac_check_lib_save_LIBS

9783

fi

9784

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5

9785

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5

9786

$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }

9787

-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then

9788

+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :

9789

X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"

9790

fi

9791

9792

if test $ac_cv_lib_dnet_dnet_ntoa = no; then

9793

- { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5

9794

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5

9795

$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }

9796

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

9797

+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :

9798

$as_echo_n "(cached) " >&6

9799

else

9800

ac_check_lib_save_LIBS=$LIBS

9801

LIBS="-ldnet_stub $LIBS"

9802

-cat >conftest.$ac_ext <<_ACEOF

9803

-/* confdefs.h. */

9804

-_ACEOF

9805

-cat confdefs.h >>conftest.$ac_ext

9806

-cat >>conftest.$ac_ext <<_ACEOF

9807

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9808

/* end confdefs.h. */

9809

9810

/* Override any GCC internal prototype to avoid an error.

9811

@@ -13258,52 +12257,25 @@

9812

return 0;

9813

}

9814

_ACEOF

9815

-rm -f conftest.$ac_objext conftest$ac_exeext

9816

-if { (ac_try="$ac_link"

9817

-case "(($ac_try" in

9818

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9819

- *) ac_try_echo=$ac_try;;

9820

-esac

9821

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9822

-$as_echo "$ac_try_echo") >&5

9823

- (eval "$ac_link") 2>conftest.er1

9824

- ac_status=$?

9825

- grep -v '^ *+' conftest.er1 >conftest.err

9826

- rm -f conftest.er1

9827

- cat conftest.err >&5

9828

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9829

- (exit $ac_status); } && {

9830

- test -z "$ac_c_werror_flag" ||

9831

- test ! -s conftest.err

9832

- } && test -s conftest$ac_exeext && {

9833

- test "$cross_compiling" = yes ||

9834

- $as_test_x conftest$ac_exeext

9835

- }; then

9836

+if ac_fn_c_try_link "$LINENO"; then :

9837

ac_cv_lib_dnet_stub_dnet_ntoa=yes

9838

else

9839

- $as_echo "$as_me: failed program was:" >&5

9840

-sed 's/^/| /' conftest.$ac_ext >&5

9841

-

9842

- ac_cv_lib_dnet_stub_dnet_ntoa=no

9843

+ ac_cv_lib_dnet_stub_dnet_ntoa=no

9844

fi

9845

-

9846

-rm -rf conftest.dSYM

9847

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9848

- conftest$ac_exeext conftest.$ac_ext

9849

+rm -f core conftest.err conftest.$ac_objext \

9850

+ conftest$ac_exeext conftest.$ac_ext

9851

LIBS=$ac_check_lib_save_LIBS

9852

fi

9853

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5

9854

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5

9855

$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }

9856

-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then

9857

+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :

9858

X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"

9859

fi

9860

9861

fi

9862

fi

9863

-

9864

-rm -rf conftest.dSYM

9865

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9866

- conftest$ac_exeext conftest.$ac_ext

9867

+rm -f core conftest.err conftest.$ac_objext \

9868

+ conftest$ac_exeext conftest.$ac_ext

9869

LIBS="$ac_xsave_LIBS"

9870

9871

# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,

9872

@@ -13314,105 +12286,20 @@

9873

# on Irix 5.2, according to T.E. Dickey.

9874

# The functions gethostbyname, getservbyname, and inet_addr are

9875

# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.

9876

- { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5

9877

-$as_echo_n "checking for gethostbyname... " >&6; }

9878

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

9879

- $as_echo_n "(cached) " >&6

9880

-else

9881

- cat >conftest.$ac_ext <<_ACEOF

9882

-/* confdefs.h. */

9883

-_ACEOF

9884

-cat confdefs.h >>conftest.$ac_ext

9885

-cat >>conftest.$ac_ext <<_ACEOF

9886

-/* end confdefs.h. */

9887

-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.

9888

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

9889

-#define gethostbyname innocuous_gethostbyname

9890

-

9891

-/* System header to define __stub macros and hopefully few prototypes,

9892

- which can conflict with char gethostbyname (); below.

9893

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

9894

- <limits.h> exists even on freestanding compilers. */

9895

-

9896

-#ifdef __STDC__

9897

-# include <limits.h>

9898

-#else

9899

-# include <assert.h>

9900

-#endif

9901

-

9902

-#undef gethostbyname

9903

-

9904

-/* Override any GCC internal prototype to avoid an error.

9905

- Use char because int might match the return type of a GCC

9906

- builtin and then its argument prototype would still apply. */

9907

-#ifdef __cplusplus

9908

-extern "C"

9909

-#endif

9910

-char gethostbyname ();

9911

-/* The GNU C library defines this for functions which it implements

9912

- to always fail with ENOSYS. Some functions are actually named

9913

- something starting with __ and the normal name is an alias. */

9914

-#if defined __stub_gethostbyname || defined __stub___gethostbyname

9915

-choke me

9916

-#endif

9917

-

9918

-int

9919

-main ()

9920

-{

9921

-return gethostbyname ();

9922

- ;

9923

- return 0;

9924

-}

9925

-_ACEOF

9926

-rm -f conftest.$ac_objext conftest$ac_exeext

9927

-if { (ac_try="$ac_link"

9928

-case "(($ac_try" in

9929

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9930

- *) ac_try_echo=$ac_try;;

9931

-esac

9932

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9933

-$as_echo "$ac_try_echo") >&5

9934

- (eval "$ac_link") 2>conftest.er1

9935

- ac_status=$?

9936

- grep -v '^ *+' conftest.er1 >conftest.err

9937

- rm -f conftest.er1

9938

- cat conftest.err >&5

9939

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9940

- (exit $ac_status); } && {

9941

- test -z "$ac_c_werror_flag" ||

9942

- test ! -s conftest.err

9943

- } && test -s conftest$ac_exeext && {

9944

- test "$cross_compiling" = yes ||

9945

- $as_test_x conftest$ac_exeext

9946

- }; then

9947

- ac_cv_func_gethostbyname=yes

9948

-else

9949

- $as_echo "$as_me: failed program was:" >&5

9950

-sed 's/^/| /' conftest.$ac_ext >&5

9951

-

9952

- ac_cv_func_gethostbyname=no

9953

-fi

9954

-

9955

-rm -rf conftest.dSYM

9956

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9957

- conftest$ac_exeext conftest.$ac_ext

9958

-fi

9959

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5

9960

-$as_echo "$ac_cv_func_gethostbyname" >&6; }

9961

+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"

9962

+if test "x$ac_cv_func_gethostbyname" = x""yes; then :

9963

+

9964

+fi

9965

9966

if test $ac_cv_func_gethostbyname = no; then

9967

- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5

9968

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5

9969

$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }

9970

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

9971

+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :

9972

$as_echo_n "(cached) " >&6

9973

else

9974

ac_check_lib_save_LIBS=$LIBS

9975

LIBS="-lnsl $LIBS"

9976

-cat >conftest.$ac_ext <<_ACEOF

9977

-/* confdefs.h. */

9978

-_ACEOF

9979

-cat confdefs.h >>conftest.$ac_ext

9980

-cat >>conftest.$ac_ext <<_ACEOF

9981

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9982

/* end confdefs.h. */

9983

9984

/* Override any GCC internal prototype to avoid an error.

9985

@@ -13430,59 +12317,30 @@

9986

return 0;

9987

}

9988

_ACEOF

9989

-rm -f conftest.$ac_objext conftest$ac_exeext

9990

-if { (ac_try="$ac_link"

9991

-case "(($ac_try" in

9992

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9993

- *) ac_try_echo=$ac_try;;

9994

-esac

9995

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9996

-$as_echo "$ac_try_echo") >&5

9997

- (eval "$ac_link") 2>conftest.er1

9998

- ac_status=$?

9999

- grep -v '^ *+' conftest.er1 >conftest.err

10000

- rm -f conftest.er1

10001

- cat conftest.err >&5

10002

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10003

- (exit $ac_status); } && {

10004

- test -z "$ac_c_werror_flag" ||

10005

- test ! -s conftest.err

10006

- } && test -s conftest$ac_exeext && {

10007

- test "$cross_compiling" = yes ||

10008

- $as_test_x conftest$ac_exeext

10009

- }; then

10010

+if ac_fn_c_try_link "$LINENO"; then :

10011

ac_cv_lib_nsl_gethostbyname=yes

10012

else

10013

- $as_echo "$as_me: failed program was:" >&5

10014

-sed 's/^/| /' conftest.$ac_ext >&5

10015

-

10016

- ac_cv_lib_nsl_gethostbyname=no

10017

+ ac_cv_lib_nsl_gethostbyname=no

10018

fi

10019

-

10020

-rm -rf conftest.dSYM

10021

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10022

- conftest$ac_exeext conftest.$ac_ext

10023

+rm -f core conftest.err conftest.$ac_objext \

10024

+ conftest$ac_exeext conftest.$ac_ext

10025

LIBS=$ac_check_lib_save_LIBS

10026

fi

10027

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5

10028

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5

10029

$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }

10030

-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then

10031

+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :

10032

X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"

10033

fi

10034

10035

if test $ac_cv_lib_nsl_gethostbyname = no; then

10036

- { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5

10037

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5

10038

$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }

10039

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

10040

+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :

10041

$as_echo_n "(cached) " >&6

10042

else

10043

ac_check_lib_save_LIBS=$LIBS

10044

LIBS="-lbsd $LIBS"

10045

-cat >conftest.$ac_ext <<_ACEOF

10046

-/* confdefs.h. */

10047

-_ACEOF

10048

-cat confdefs.h >>conftest.$ac_ext

10049

-cat >>conftest.$ac_ext <<_ACEOF

10050

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

10051

/* end confdefs.h. */

10052

10053

/* Override any GCC internal prototype to avoid an error.

10054

@@ -13500,43 +12358,18 @@

10055

return 0;

10056

}

10057

_ACEOF

10058

-rm -f conftest.$ac_objext conftest$ac_exeext

10059

-if { (ac_try="$ac_link"

10060

-case "(($ac_try" in

10061

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10062

- *) ac_try_echo=$ac_try;;

10063

-esac

10064

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10065

-$as_echo "$ac_try_echo") >&5

10066

- (eval "$ac_link") 2>conftest.er1

10067

- ac_status=$?

10068

- grep -v '^ *+' conftest.er1 >conftest.err

10069

- rm -f conftest.er1

10070

- cat conftest.err >&5

10071

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10072

- (exit $ac_status); } && {

10073

- test -z "$ac_c_werror_flag" ||

10074

- test ! -s conftest.err

10075

- } && test -s conftest$ac_exeext && {

10076

- test "$cross_compiling" = yes ||

10077

- $as_test_x conftest$ac_exeext

10078

- }; then

10079

+if ac_fn_c_try_link "$LINENO"; then :

10080

ac_cv_lib_bsd_gethostbyname=yes

10081

else

10082

- $as_echo "$as_me: failed program was:" >&5

10083

-sed 's/^/| /' conftest.$ac_ext >&5

10084

-

10085

- ac_cv_lib_bsd_gethostbyname=no

10086

+ ac_cv_lib_bsd_gethostbyname=no

10087

fi

10088

-

10089

-rm -rf conftest.dSYM

10090

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10091

- conftest$ac_exeext conftest.$ac_ext

10092

+rm -f core conftest.err conftest.$ac_objext \

10093

+ conftest$ac_exeext conftest.$ac_ext

10094

LIBS=$ac_check_lib_save_LIBS

10095

fi

10096

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5

10097

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5

10098

$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }

10099

-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then

10100

+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :

10101

X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"

10102

fi

10103

10104

@@ -13550,105 +12383,20 @@

10105

# variants that don't use the name server (or something). -lsocket

10106

# must be given before -lnsl if both are needed. We assume that

10107

# if connect needs -lnsl, so does gethostbyname.

10108

- { $as_echo "$as_me:$LINENO: checking for connect" >&5

10109

-$as_echo_n "checking for connect... " >&6; }

10110

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

10111

- $as_echo_n "(cached) " >&6

10112

-else

10113

- cat >conftest.$ac_ext <<_ACEOF

10114

-/* confdefs.h. */

10115

-_ACEOF

10116

-cat confdefs.h >>conftest.$ac_ext

10117

-cat >>conftest.$ac_ext <<_ACEOF

10118

-/* end confdefs.h. */

10119

-/* Define connect to an innocuous variant, in case <limits.h> declares connect.

10120

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

10121

-#define connect innocuous_connect

10122

-

10123

-/* System header to define __stub macros and hopefully few prototypes,

10124

- which can conflict with char connect (); below.

10125

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

10126

- <limits.h> exists even on freestanding compilers. */

10127

-

10128

-#ifdef __STDC__

10129

-# include <limits.h>

10130

-#else

10131

-# include <assert.h>

10132

-#endif

10133

-

10134

-#undef connect

10135

-

10136

-/* Override any GCC internal prototype to avoid an error.

10137

- Use char because int might match the return type of a GCC

10138

- builtin and then its argument prototype would still apply. */

10139

-#ifdef __cplusplus

10140

-extern "C"

10141

-#endif

10142

-char connect ();

10143

-/* The GNU C library defines this for functions which it implements

10144

- to always fail with ENOSYS. Some functions are actually named

10145

- something starting with __ and the normal name is an alias. */

10146

-#if defined __stub_connect || defined __stub___connect

10147

-choke me

10148

-#endif

10149

-

10150

-int

10151

-main ()

10152

-{

10153

-return connect ();

10154

- ;

10155

- return 0;

10156

-}

10157

-_ACEOF

10158

-rm -f conftest.$ac_objext conftest$ac_exeext

10159

-if { (ac_try="$ac_link"

10160

-case "(($ac_try" in

10161

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10162

- *) ac_try_echo=$ac_try;;

10163

-esac

10164

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10165

-$as_echo "$ac_try_echo") >&5

10166

- (eval "$ac_link") 2>conftest.er1

10167

- ac_status=$?

10168

- grep -v '^ *+' conftest.er1 >conftest.err

10169

- rm -f conftest.er1

10170

- cat conftest.err >&5

10171

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10172

- (exit $ac_status); } && {

10173

- test -z "$ac_c_werror_flag" ||

10174

- test ! -s conftest.err

10175

- } && test -s conftest$ac_exeext && {

10176

- test "$cross_compiling" = yes ||

10177

- $as_test_x conftest$ac_exeext

10178

- }; then

10179

- ac_cv_func_connect=yes

10180

-else

10181

- $as_echo "$as_me: failed program was:" >&5

10182

-sed 's/^/| /' conftest.$ac_ext >&5

10183

-

10184

- ac_cv_func_connect=no

10185

-fi

10186

-

10187

-rm -rf conftest.dSYM

10188

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10189

- conftest$ac_exeext conftest.$ac_ext

10190

-fi

10191

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5

10192

-$as_echo "$ac_cv_func_connect" >&6; }

10193

+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"

10194

+if test "x$ac_cv_func_connect" = x""yes; then :

10195

+

10196

+fi

10197

10198

if test $ac_cv_func_connect = no; then

10199

- { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5

10200

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5

10201

$as_echo_n "checking for connect in -lsocket... " >&6; }

10202

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

10203

+if test "${ac_cv_lib_socket_connect+set}" = set; then :

10204

$as_echo_n "(cached) " >&6

10205

else

10206

ac_check_lib_save_LIBS=$LIBS

10207

LIBS="-lsocket $X_EXTRA_LIBS $LIBS"

10208

-cat >conftest.$ac_ext <<_ACEOF

10209

-/* confdefs.h. */

10210

-_ACEOF

10211

-cat confdefs.h >>conftest.$ac_ext

10212

-cat >>conftest.$ac_ext <<_ACEOF

10213

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

10214

/* end confdefs.h. */

10215

10216

/* Override any GCC internal prototype to avoid an error.

10217

@@ -13666,148 +12414,38 @@

10218

return 0;

10219

}

10220

_ACEOF

10221

-rm -f conftest.$ac_objext conftest$ac_exeext

10222

-if { (ac_try="$ac_link"

10223

-case "(($ac_try" in

10224

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10225

- *) ac_try_echo=$ac_try;;

10226

-esac

10227

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10228

-$as_echo "$ac_try_echo") >&5

10229

- (eval "$ac_link") 2>conftest.er1

10230

- ac_status=$?

10231

- grep -v '^ *+' conftest.er1 >conftest.err

10232

- rm -f conftest.er1

10233

- cat conftest.err >&5

10234

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10235

- (exit $ac_status); } && {

10236

- test -z "$ac_c_werror_flag" ||

10237

- test ! -s conftest.err

10238

- } && test -s conftest$ac_exeext && {

10239

- test "$cross_compiling" = yes ||

10240

- $as_test_x conftest$ac_exeext

10241

- }; then

10242

+if ac_fn_c_try_link "$LINENO"; then :

10243

ac_cv_lib_socket_connect=yes

10244

else

10245

- $as_echo "$as_me: failed program was:" >&5

10246

-sed 's/^/| /' conftest.$ac_ext >&5

10247

-

10248

- ac_cv_lib_socket_connect=no

10249

+ ac_cv_lib_socket_connect=no

10250

fi

10251

-

10252

-rm -rf conftest.dSYM

10253

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10254

- conftest$ac_exeext conftest.$ac_ext

10255

+rm -f core conftest.err conftest.$ac_objext \

10256

+ conftest$ac_exeext conftest.$ac_ext

10257

LIBS=$ac_check_lib_save_LIBS

10258

fi

10259

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5

10260

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5

10261

$as_echo "$ac_cv_lib_socket_connect" >&6; }

10262

-if test "x$ac_cv_lib_socket_connect" = x""yes; then

10263

+if test "x$ac_cv_lib_socket_connect" = x""yes; then :

10264

X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"

10265

fi

10266

10267

fi

10268

10269

# Guillermo Gomez says -lposix is necessary on A/UX.

10270

- { $as_echo "$as_me:$LINENO: checking for remove" >&5

10271

-$as_echo_n "checking for remove... " >&6; }

10272

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

10273

- $as_echo_n "(cached) " >&6

10274

-else

10275

- cat >conftest.$ac_ext <<_ACEOF

10276

-/* confdefs.h. */

10277

-_ACEOF

10278

-cat confdefs.h >>conftest.$ac_ext

10279

-cat >>conftest.$ac_ext <<_ACEOF

10280

-/* end confdefs.h. */

10281

-/* Define remove to an innocuous variant, in case <limits.h> declares remove.

10282

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

10283

-#define remove innocuous_remove

10284

-

10285

-/* System header to define __stub macros and hopefully few prototypes,

10286

- which can conflict with char remove (); below.

10287

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

10288

- <limits.h> exists even on freestanding compilers. */

10289

-

10290

-#ifdef __STDC__

10291

-# include <limits.h>

10292

-#else

10293

-# include <assert.h>

10294

-#endif

10295

-

10296

-#undef remove

10297

-

10298

-/* Override any GCC internal prototype to avoid an error.

10299

- Use char because int might match the return type of a GCC

10300

- builtin and then its argument prototype would still apply. */

10301

-#ifdef __cplusplus

10302

-extern "C"

10303

-#endif

10304

-char remove ();

10305

-/* The GNU C library defines this for functions which it implements

10306

- to always fail with ENOSYS. Some functions are actually named

10307

- something starting with __ and the normal name is an alias. */

10308

-#if defined __stub_remove || defined __stub___remove

10309

-choke me

10310

-#endif

10311

-

10312

-int

10313

-main ()

10314

-{

10315

-return remove ();

10316

- ;

10317

- return 0;

10318

-}

10319

-_ACEOF

10320

-rm -f conftest.$ac_objext conftest$ac_exeext

10321

-if { (ac_try="$ac_link"

10322

-case "(($ac_try" in

10323

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10324

- *) ac_try_echo=$ac_try;;

10325

-esac

10326

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10327

-$as_echo "$ac_try_echo") >&5

10328

- (eval "$ac_link") 2>conftest.er1

10329

- ac_status=$?

10330

- grep -v '^ *+' conftest.er1 >conftest.err

10331

- rm -f conftest.er1

10332

- cat conftest.err >&5

10333

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10334

- (exit $ac_status); } && {

10335

- test -z "$ac_c_werror_flag" ||

10336

- test ! -s conftest.err

10337

- } && test -s conftest$ac_exeext && {

10338

- test "$cross_compiling" = yes ||

10339

- $as_test_x conftest$ac_exeext

10340

- }; then

10341

- ac_cv_func_remove=yes

10342

-else

10343

- $as_echo "$as_me: failed program was:" >&5

10344

-sed 's/^/| /' conftest.$ac_ext >&5

10345

-

10346

- ac_cv_func_remove=no

10347

-fi

10348

-

10349

-rm -rf conftest.dSYM

10350

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10351

- conftest$ac_exeext conftest.$ac_ext

10352

-fi

10353

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5

10354

-$as_echo "$ac_cv_func_remove" >&6; }

10355

+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"

10356

+if test "x$ac_cv_func_remove" = x""yes; then :

10357

+

10358

+fi

10359

10360

if test $ac_cv_func_remove = no; then

10361

- { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5

10362

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5

10363

$as_echo_n "checking for remove in -lposix... " >&6; }

10364

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

10365

+if test "${ac_cv_lib_posix_remove+set}" = set; then :

10366

$as_echo_n "(cached) " >&6

10367

else

10368

ac_check_lib_save_LIBS=$LIBS

10369

LIBS="-lposix $LIBS"

10370

-cat >conftest.$ac_ext <<_ACEOF

10371

-/* confdefs.h. */

10372

-_ACEOF

10373

-cat confdefs.h >>conftest.$ac_ext

10374

-cat >>conftest.$ac_ext <<_ACEOF

10375

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

10376

/* end confdefs.h. */

10377

10378

/* Override any GCC internal prototype to avoid an error.

10379

@@ -13825,148 +12463,38 @@

10380

return 0;

10381

}

10382

_ACEOF

10383

-rm -f conftest.$ac_objext conftest$ac_exeext

10384

-if { (ac_try="$ac_link"

10385

-case "(($ac_try" in

10386

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10387

- *) ac_try_echo=$ac_try;;

10388

-esac

10389

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10390

-$as_echo "$ac_try_echo") >&5

10391

- (eval "$ac_link") 2>conftest.er1

10392

- ac_status=$?

10393

- grep -v '^ *+' conftest.er1 >conftest.err

10394

- rm -f conftest.er1

10395

- cat conftest.err >&5

10396

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10397

- (exit $ac_status); } && {

10398

- test -z "$ac_c_werror_flag" ||

10399

- test ! -s conftest.err

10400

- } && test -s conftest$ac_exeext && {

10401

- test "$cross_compiling" = yes ||

10402

- $as_test_x conftest$ac_exeext

10403

- }; then

10404

+if ac_fn_c_try_link "$LINENO"; then :

10405

ac_cv_lib_posix_remove=yes

10406

else

10407

- $as_echo "$as_me: failed program was:" >&5

10408

-sed 's/^/| /' conftest.$ac_ext >&5

10409

-

10410

- ac_cv_lib_posix_remove=no

10411

+ ac_cv_lib_posix_remove=no

10412

fi

10413

-

10414

-rm -rf conftest.dSYM

10415

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10416

- conftest$ac_exeext conftest.$ac_ext

10417

+rm -f core conftest.err conftest.$ac_objext \

10418

+ conftest$ac_exeext conftest.$ac_ext

10419

LIBS=$ac_check_lib_save_LIBS

10420

fi

10421

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5

10422

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5

10423

$as_echo "$ac_cv_lib_posix_remove" >&6; }

10424

-if test "x$ac_cv_lib_posix_remove" = x""yes; then

10425

+if test "x$ac_cv_lib_posix_remove" = x""yes; then :

10426

X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"

10427

fi

10428

10429

fi

10430

10431

# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.

10432

- { $as_echo "$as_me:$LINENO: checking for shmat" >&5

10433

-$as_echo_n "checking for shmat... " >&6; }

10434

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

10435

- $as_echo_n "(cached) " >&6

10436

-else

10437

- cat >conftest.$ac_ext <<_ACEOF

10438

-/* confdefs.h. */

10439

-_ACEOF

10440

-cat confdefs.h >>conftest.$ac_ext

10441

-cat >>conftest.$ac_ext <<_ACEOF

10442

-/* end confdefs.h. */

10443

-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.

10444

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

10445

-#define shmat innocuous_shmat

10446

-

10447

-/* System header to define __stub macros and hopefully few prototypes,

10448

- which can conflict with char shmat (); below.

10449

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

10450

- <limits.h> exists even on freestanding compilers. */

10451

-

10452

-#ifdef __STDC__

10453

-# include <limits.h>

10454

-#else

10455

-# include <assert.h>

10456

-#endif

10457

-

10458

-#undef shmat

10459

-

10460

-/* Override any GCC internal prototype to avoid an error.

10461

- Use char because int might match the return type of a GCC

10462

- builtin and then its argument prototype would still apply. */

10463

-#ifdef __cplusplus

10464

-extern "C"

10465

-#endif

10466

-char shmat ();

10467

-/* The GNU C library defines this for functions which it implements

10468

- to always fail with ENOSYS. Some functions are actually named

10469

- something starting with __ and the normal name is an alias. */

10470

-#if defined __stub_shmat || defined __stub___shmat

10471

-choke me

10472

-#endif

10473

-

10474

-int

10475

-main ()

10476

-{

10477

-return shmat ();

10478

- ;

10479

- return 0;

10480

-}

10481

-_ACEOF

10482

-rm -f conftest.$ac_objext conftest$ac_exeext

10483

-if { (ac_try="$ac_link"

10484

-case "(($ac_try" in

10485

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10486

- *) ac_try_echo=$ac_try;;

10487

-esac

10488

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10489

-$as_echo "$ac_try_echo") >&5

10490

- (eval "$ac_link") 2>conftest.er1

10491

- ac_status=$?

10492

- grep -v '^ *+' conftest.er1 >conftest.err

10493

- rm -f conftest.er1

10494

- cat conftest.err >&5

10495

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10496

- (exit $ac_status); } && {

10497

- test -z "$ac_c_werror_flag" ||

10498

- test ! -s conftest.err

10499

- } && test -s conftest$ac_exeext && {

10500

- test "$cross_compiling" = yes ||

10501

- $as_test_x conftest$ac_exeext

10502

- }; then

10503

- ac_cv_func_shmat=yes

10504

-else

10505

- $as_echo "$as_me: failed program was:" >&5

10506

-sed 's/^/| /' conftest.$ac_ext >&5

10507

-

10508

- ac_cv_func_shmat=no

10509

-fi

10510

-

10511

-rm -rf conftest.dSYM

10512

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10513

- conftest$ac_exeext conftest.$ac_ext

10514

-fi

10515

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5

10516

-$as_echo "$ac_cv_func_shmat" >&6; }

10517

+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"

10518

+if test "x$ac_cv_func_shmat" = x""yes; then :

10519

+

10520

+fi

10521

10522

if test $ac_cv_func_shmat = no; then

10523

- { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5

10524

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5

10525

$as_echo_n "checking for shmat in -lipc... " >&6; }

10526

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

10527

+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :

10528

$as_echo_n "(cached) " >&6

10529

else

10530

ac_check_lib_save_LIBS=$LIBS

10531

LIBS="-lipc $LIBS"

10532

-cat >conftest.$ac_ext <<_ACEOF

10533

-/* confdefs.h. */

10534

-_ACEOF

10535

-cat confdefs.h >>conftest.$ac_ext

10536

-cat >>conftest.$ac_ext <<_ACEOF

10537

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

10538

/* end confdefs.h. */

10539

10540

/* Override any GCC internal prototype to avoid an error.

10541

@@ -13984,43 +12512,18 @@

10542

return 0;

10543

}

10544

_ACEOF

10545

-rm -f conftest.$ac_objext conftest$ac_exeext

10546

-if { (ac_try="$ac_link"

10547

-case "(($ac_try" in

10548

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10549

- *) ac_try_echo=$ac_try;;

10550

-esac

10551

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10552

-$as_echo "$ac_try_echo") >&5

10553

- (eval "$ac_link") 2>conftest.er1

10554

- ac_status=$?

10555

- grep -v '^ *+' conftest.er1 >conftest.err

10556

- rm -f conftest.er1

10557

- cat conftest.err >&5

10558

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10559

- (exit $ac_status); } && {

10560

- test -z "$ac_c_werror_flag" ||

10561

- test ! -s conftest.err

10562

- } && test -s conftest$ac_exeext && {

10563

- test "$cross_compiling" = yes ||

10564

- $as_test_x conftest$ac_exeext

10565

- }; then

10566

+if ac_fn_c_try_link "$LINENO"; then :

10567

ac_cv_lib_ipc_shmat=yes

10568

else

10569

- $as_echo "$as_me: failed program was:" >&5

10570

-sed 's/^/| /' conftest.$ac_ext >&5

10571

-

10572

- ac_cv_lib_ipc_shmat=no

10573

+ ac_cv_lib_ipc_shmat=no

10574

fi

10575

-

10576

-rm -rf conftest.dSYM

10577

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10578

- conftest$ac_exeext conftest.$ac_ext

10579

+rm -f core conftest.err conftest.$ac_objext \

10580

+ conftest$ac_exeext conftest.$ac_ext

10581

LIBS=$ac_check_lib_save_LIBS

10582

fi

10583

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5

10584

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5

10585

$as_echo "$ac_cv_lib_ipc_shmat" >&6; }

10586

-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then

10587

+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :

10588

X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"

10589

fi

10590

10591

@@ -14036,18 +12539,14 @@

10592

# These have to be linked with before -lX11, unlike the other

10593

# libraries we check for below, so use a different variable.

10594

# John Interrante, Karl Berry

10595

- { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5

10596

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5

10597

$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }

10598

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

10599

+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :

10600

$as_echo_n "(cached) " >&6

10601

else

10602

ac_check_lib_save_LIBS=$LIBS

10603

LIBS="-lICE $X_EXTRA_LIBS $LIBS"

10604

-cat >conftest.$ac_ext <<_ACEOF

10605

-/* confdefs.h. */

10606

-_ACEOF

10607

-cat confdefs.h >>conftest.$ac_ext

10608

-cat >>conftest.$ac_ext <<_ACEOF

10609

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

10610

/* end confdefs.h. */

10611

10612

/* Override any GCC internal prototype to avoid an error.

10613

@@ -14065,43 +12564,18 @@

10614

return 0;

10615

}

10616

_ACEOF

10617

-rm -f conftest.$ac_objext conftest$ac_exeext

10618

-if { (ac_try="$ac_link"

10619

-case "(($ac_try" in

10620

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10621

- *) ac_try_echo=$ac_try;;

10622

-esac

10623

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10624

-$as_echo "$ac_try_echo") >&5

10625

- (eval "$ac_link") 2>conftest.er1

10626

- ac_status=$?

10627

- grep -v '^ *+' conftest.er1 >conftest.err

10628

- rm -f conftest.er1

10629

- cat conftest.err >&5

10630

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10631

- (exit $ac_status); } && {

10632

- test -z "$ac_c_werror_flag" ||

10633

- test ! -s conftest.err

10634

- } && test -s conftest$ac_exeext && {

10635

- test "$cross_compiling" = yes ||

10636

- $as_test_x conftest$ac_exeext

10637

- }; then

10638

+if ac_fn_c_try_link "$LINENO"; then :

10639

ac_cv_lib_ICE_IceConnectionNumber=yes

10640

else

10641

- $as_echo "$as_me: failed program was:" >&5

10642

-sed 's/^/| /' conftest.$ac_ext >&5

10643

-

10644

- ac_cv_lib_ICE_IceConnectionNumber=no

10645

+ ac_cv_lib_ICE_IceConnectionNumber=no

10646

fi

10647

-

10648

-rm -rf conftest.dSYM

10649

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10650

- conftest$ac_exeext conftest.$ac_ext

10651

+rm -f core conftest.err conftest.$ac_objext \

10652

+ conftest$ac_exeext conftest.$ac_ext

10653

LIBS=$ac_check_lib_save_LIBS

10654

fi

10655

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5

10656

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5

10657

$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }

10658

-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then

10659

+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :

10660

X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"

10661

fi

10662

10663

@@ -14110,16 +12584,16 @@

10664

fi

10665

10666

10667

- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5

10668

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5

10669

$as_echo_n "checking whether NLS is requested... " >&6; }

10670

# Check whether --enable-nls was given.

10671

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

10672

+if test "${enable_nls+set}" = set; then :

10673

enableval=$enable_nls; USE_NLS=$enableval

10674

else

10675

USE_NLS=yes

10676

fi

10677

10678

- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5

10679

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5

10680

$as_echo "$USE_NLS" >&6; }

10681

10682

10683

@@ -14127,35 +12601,31 @@

10684

10685

case "$am__api_version" in

10686

1.01234)

10687

- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5

10688

-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}

10689

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

10690

+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5

10691

;;

10692

*)

10693

;;

10694

esac

10695

10696

if test -n "0.35.0"; then

10697

- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5

10698

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5

10699

$as_echo_n "checking for intltool >= 0.35.0... " >&6; }

10700

10701

INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`

10702

INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`

10703

INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`

10704

10705

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5

10706

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5

10707

$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }

10708

test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||

10709

- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5

10710

-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}

10711

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

10712

+ as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5

10713

fi

10714

10715

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

10716

set dummy intltool-update; ac_word=$2

10717

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

10718

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10719

$as_echo_n "checking for $ac_word... " >&6; }

10720

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

10721

+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :

10722

$as_echo_n "(cached) " >&6

10723

else

10724

case $INTLTOOL_UPDATE in

10725

@@ -14168,14 +12638,14 @@

10726

do

10727

IFS=$as_save_IFS

10728

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

10729

- for ac_exec_ext in '' $ac_executable_extensions; do

10730

+ for ac_exec_ext in '' $ac_executable_extensions; do

10731

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

10732

ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"

10733

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

10734

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10735

break 2

10736

fi

10737

done

10738

-done

10739

+ done

10740

IFS=$as_save_IFS

10741

10742

;;

10743

@@ -14183,19 +12653,19 @@

10744

fi

10745

INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE

10746

if test -n "$INTLTOOL_UPDATE"; then

10747

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5

10748

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5

10749

$as_echo "$INTLTOOL_UPDATE" >&6; }

10750

else

10751

- { $as_echo "$as_me:$LINENO: result: no" >&5

10752

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10753

$as_echo "no" >&6; }

10754

fi

10755

10756

10757

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

10758

set dummy intltool-merge; ac_word=$2

10759

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

10760

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10761

$as_echo_n "checking for $ac_word... " >&6; }

10762

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

10763

+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :

10764

$as_echo_n "(cached) " >&6

10765

else

10766

case $INTLTOOL_MERGE in

10767

@@ -14208,14 +12678,14 @@

10768

do

10769

IFS=$as_save_IFS

10770

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

10771

- for ac_exec_ext in '' $ac_executable_extensions; do

10772

+ for ac_exec_ext in '' $ac_executable_extensions; do

10773

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

10774

ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"

10775

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

10776

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10777

break 2

10778

fi

10779

done

10780

-done

10781

+ done

10782

IFS=$as_save_IFS

10783

10784

;;

10785

@@ -14223,19 +12693,19 @@

10786

fi

10787

INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE

10788

if test -n "$INTLTOOL_MERGE"; then

10789

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5

10790

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5

10791

$as_echo "$INTLTOOL_MERGE" >&6; }

10792

else

10793

- { $as_echo "$as_me:$LINENO: result: no" >&5

10794

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10795

$as_echo "no" >&6; }

10796

fi

10797

10798

10799

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

10800

set dummy intltool-extract; ac_word=$2

10801

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

10802

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10803

$as_echo_n "checking for $ac_word... " >&6; }

10804

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

10805

+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :

10806

$as_echo_n "(cached) " >&6

10807

else

10808

case $INTLTOOL_EXTRACT in

10809

@@ -14248,14 +12718,14 @@

10810

do

10811

IFS=$as_save_IFS

10812

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

10813

- for ac_exec_ext in '' $ac_executable_extensions; do

10814

+ for ac_exec_ext in '' $ac_executable_extensions; do

10815

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

10816

ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"

10817

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

10818

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10819

break 2

10820

fi

10821

done

10822

-done

10823

+ done

10824

IFS=$as_save_IFS

10825

10826

;;

10827

@@ -14263,18 +12733,16 @@

10828

fi

10829

INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT

10830

if test -n "$INTLTOOL_EXTRACT"; then

10831

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5

10832

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5

10833

$as_echo "$INTLTOOL_EXTRACT" >&6; }

10834

else

10835

- { $as_echo "$as_me:$LINENO: result: no" >&5

10836

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10837

$as_echo "no" >&6; }

10838

fi

10839

10840

10841

if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then

10842

- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5

10843

-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}

10844

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

10845

+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5

10846

fi

10847

10848

INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'

10849

@@ -14396,9 +12864,9 @@

10850

# Check the gettext tools to make sure they are GNU

10851

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

10852

set dummy xgettext; ac_word=$2

10853

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

10854

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10855

$as_echo_n "checking for $ac_word... " >&6; }

10856

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

10857

+if test "${ac_cv_path_XGETTEXT+set}" = set; then :

10858

$as_echo_n "(cached) " >&6

10859

else

10860

case $XGETTEXT in

10861

@@ -14411,14 +12879,14 @@

10862

do

10863

IFS=$as_save_IFS

10864

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

10865

- for ac_exec_ext in '' $ac_executable_extensions; do

10866

+ for ac_exec_ext in '' $ac_executable_extensions; do

10867

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

10868

ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"

10869

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

10870

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10871

break 2

10872

fi

10873

done

10874

-done

10875

+ done

10876

IFS=$as_save_IFS

10877

10878

;;

10879

@@ -14426,19 +12894,19 @@

10880

fi

10881

XGETTEXT=$ac_cv_path_XGETTEXT

10882

if test -n "$XGETTEXT"; then

10883

- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5

10884

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5

10885

$as_echo "$XGETTEXT" >&6; }

10886

else

10887

- { $as_echo "$as_me:$LINENO: result: no" >&5

10888

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10889

$as_echo "no" >&6; }

10890

fi

10891

10892

10893

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

10894

set dummy msgmerge; ac_word=$2

10895

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

10896

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10897

$as_echo_n "checking for $ac_word... " >&6; }

10898

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

10899

+if test "${ac_cv_path_MSGMERGE+set}" = set; then :

10900

$as_echo_n "(cached) " >&6

10901

else

10902

case $MSGMERGE in

10903

@@ -14451,14 +12919,14 @@

10904

do

10905

IFS=$as_save_IFS

10906

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

10907

- for ac_exec_ext in '' $ac_executable_extensions; do

10908

+ for ac_exec_ext in '' $ac_executable_extensions; do

10909

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

10910

ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"

10911

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

10912

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10913

break 2

10914

fi

10915

done

10916

-done

10917

+ done

10918

IFS=$as_save_IFS

10919

10920

;;

10921

@@ -14466,19 +12934,19 @@

10922

fi

10923

MSGMERGE=$ac_cv_path_MSGMERGE

10924

if test -n "$MSGMERGE"; then

10925

- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5

10926

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5

10927

$as_echo "$MSGMERGE" >&6; }

10928

else

10929

- { $as_echo "$as_me:$LINENO: result: no" >&5

10930

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10931

$as_echo "no" >&6; }

10932

fi

10933

10934

10935

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

10936

set dummy msgfmt; ac_word=$2

10937

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

10938

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10939

$as_echo_n "checking for $ac_word... " >&6; }

10940

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

10941

+if test "${ac_cv_path_MSGFMT+set}" = set; then :

10942

$as_echo_n "(cached) " >&6

10943

else

10944

case $MSGFMT in

10945

@@ -14491,14 +12959,14 @@

10946

do

10947

IFS=$as_save_IFS

10948

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

10949

- for ac_exec_ext in '' $ac_executable_extensions; do

10950

+ for ac_exec_ext in '' $ac_executable_extensions; do

10951

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

10952

ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"

10953

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

10954

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10955

break 2

10956

fi

10957

done

10958

-done

10959

+ done

10960

IFS=$as_save_IFS

10961

10962

;;

10963

@@ -14506,19 +12974,19 @@

10964

fi

10965

MSGFMT=$ac_cv_path_MSGFMT

10966

if test -n "$MSGFMT"; then

10967

- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5

10968

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5

10969

$as_echo "$MSGFMT" >&6; }

10970

else

10971

- { $as_echo "$as_me:$LINENO: result: no" >&5

10972

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10973

$as_echo "no" >&6; }

10974

fi

10975

10976

10977

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

10978

set dummy gmsgfmt; ac_word=$2

10979

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

10980

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

10981

$as_echo_n "checking for $ac_word... " >&6; }

10982

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

10983

+if test "${ac_cv_path_GMSGFMT+set}" = set; then :

10984

$as_echo_n "(cached) " >&6

10985

else

10986

case $GMSGFMT in

10987

@@ -14531,14 +12999,14 @@

10988

do

10989

IFS=$as_save_IFS

10990

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

10991

- for ac_exec_ext in '' $ac_executable_extensions; do

10992

+ for ac_exec_ext in '' $ac_executable_extensions; do

10993

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

10994

ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"

10995

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

10996

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

10997

break 2

10998

fi

10999

done

11000

-done

11001

+ done

11002

IFS=$as_save_IFS

11003

11004

test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"

11005

@@ -14547,33 +13015,29 @@

11006

fi

11007

GMSGFMT=$ac_cv_path_GMSGFMT

11008

if test -n "$GMSGFMT"; then

11009

- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5

11010

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5

11011

$as_echo "$GMSGFMT" >&6; }

11012

else

11013

- { $as_echo "$as_me:$LINENO: result: no" >&5

11014

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11015

$as_echo "no" >&6; }

11016

fi

11017

11018

11019

if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then

11020

- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5

11021

-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}

11022

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

11023

+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5

11024

fi

11025

xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"

11026

mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"

11027

mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"

11028

if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then

11029

- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5

11030

-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}

11031

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

11032

+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5

11033

fi

11034

11035

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

11036

set dummy perl; ac_word=$2

11037

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

11038

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11039

$as_echo_n "checking for $ac_word... " >&6; }

11040

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

11041

+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :

11042

$as_echo_n "(cached) " >&6

11043

else

11044

case $INTLTOOL_PERL in

11045

@@ -14586,14 +13050,14 @@

11046

do

11047

IFS=$as_save_IFS

11048

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

11049

- for ac_exec_ext in '' $ac_executable_extensions; do

11050

+ for ac_exec_ext in '' $ac_executable_extensions; do

11051

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

11052

ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"

11053

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

11054

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11055

break 2

11056

fi

11057

done

11058

-done

11059

+ done

11060

IFS=$as_save_IFS

11061

11062

;;

11063

@@ -14601,41 +13065,35 @@

11064

fi

11065

INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL

11066

if test -n "$INTLTOOL_PERL"; then

11067

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5

11068

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5

11069

$as_echo "$INTLTOOL_PERL" >&6; }

11070

else

11071

- { $as_echo "$as_me:$LINENO: result: no" >&5

11072

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11073

$as_echo "no" >&6; }

11074

fi

11075

11076

11077

if test -z "$INTLTOOL_PERL"; then

11078

- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5

11079

-$as_echo "$as_me: error: perl not found" >&2;}

11080

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

11081

+ as_fn_error "perl not found" "$LINENO" 5

11082

fi

11083

-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5

11084

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5

11085

$as_echo_n "checking for perl >= 5.8.1... " >&6; }

11086

$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1

11087

if test $? -ne 0; then

11088

- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5

11089

-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}

11090

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

11091

+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5

11092

else

11093

IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"

11094

- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5

11095

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5

11096

$as_echo "$IT_PERL_VERSION" >&6; }

11097

fi

11098

if test "x" != "xno-xml"; then

11099

- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5

11100

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5

11101

$as_echo_n "checking for XML::Parser... " >&6; }

11102

if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then

11103

- { $as_echo "$as_me:$LINENO: result: ok" >&5

11104

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5

11105

$as_echo "ok" >&6; }

11106

else

11107

- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5

11108

-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}

11109

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

11110

+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5

11111

fi

11112

fi

11113

11114

@@ -14645,11 +13103,7 @@

11115

# Set DATADIRNAME correctly if it is not set yet

11116

# (copied from glib-gettext.m4)

11117

if test -z "$DATADIRNAME"; then

11118

- cat >conftest.$ac_ext <<_ACEOF

11119

-/* confdefs.h. */

11120

-_ACEOF

11121

-cat confdefs.h >>conftest.$ac_ext

11122

-cat >>conftest.$ac_ext <<_ACEOF

11123

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11124

/* end confdefs.h. */

11125

11126

int

11127

@@ -14661,120 +13115,13 @@

11128

return 0;

11129

}

11130

_ACEOF

11131

-rm -f conftest.$ac_objext conftest$ac_exeext

11132

-if { (ac_try="$ac_link"

11133

-case "(($ac_try" in

11134

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11135

- *) ac_try_echo=$ac_try;;

11136

-esac

11137

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11138

-$as_echo "$ac_try_echo") >&5

11139

- (eval "$ac_link") 2>conftest.er1

11140

- ac_status=$?

11141

- grep -v '^ *+' conftest.er1 >conftest.err

11142

- rm -f conftest.er1

11143

- cat conftest.err >&5

11144

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11145

- (exit $ac_status); } && {

11146

- test -z "$ac_c_werror_flag" ||

11147

- test ! -s conftest.err

11148

- } && test -s conftest$ac_exeext && {

11149

- test "$cross_compiling" = yes ||

11150

- $as_test_x conftest$ac_exeext

11151

- }; then

11152

+if ac_fn_c_try_link "$LINENO"; then :

11153

DATADIRNAME=share

11154

else

11155

- $as_echo "$as_me: failed program was:" >&5

11156

-sed 's/^/| /' conftest.$ac_ext >&5

11157

-

11158

- case $host in

11159

+ case $host in

11160

*-*-solaris*)

11161

- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

11162

-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }

11163

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

11164

- $as_echo_n "(cached) " >&6

11165

-else

11166

- cat >conftest.$ac_ext <<_ACEOF

11167

-/* confdefs.h. */

11168

-_ACEOF

11169

-cat confdefs.h >>conftest.$ac_ext

11170

-cat >>conftest.$ac_ext <<_ACEOF

11171

-/* end confdefs.h. */

11172

-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.

11173

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

11174

-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset

11175

-

11176

-/* System header to define __stub macros and hopefully few prototypes,

11177

- which can conflict with char bind_textdomain_codeset (); below.

11178

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

11179

- <limits.h> exists even on freestanding compilers. */

11180

-

11181

-#ifdef __STDC__

11182

-# include <limits.h>

11183

-#else

11184

-# include <assert.h>

11185

-#endif

11186

-

11187

-#undef bind_textdomain_codeset

11188

-

11189

-/* Override any GCC internal prototype to avoid an error.

11190

- Use char because int might match the return type of a GCC

11191

- builtin and then its argument prototype would still apply. */

11192

-#ifdef __cplusplus

11193

-extern "C"

11194

-#endif

11195

-char bind_textdomain_codeset ();

11196

-/* The GNU C library defines this for functions which it implements

11197

- to always fail with ENOSYS. Some functions are actually named

11198

- something starting with __ and the normal name is an alias. */

11199

-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset

11200

-choke me

11201

-#endif

11202

-

11203

-int

11204

-main ()

11205

-{

11206

-return bind_textdomain_codeset ();

11207

- ;

11208

- return 0;

11209

-}

11210

-_ACEOF

11211

-rm -f conftest.$ac_objext conftest$ac_exeext

11212

-if { (ac_try="$ac_link"

11213

-case "(($ac_try" in

11214

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11215

- *) ac_try_echo=$ac_try;;

11216

-esac

11217

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11218

-$as_echo "$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

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11225

- (exit $ac_status); } && {

11226

- test -z "$ac_c_werror_flag" ||

11227

- test ! -s conftest.err

11228

- } && test -s conftest$ac_exeext && {

11229

- test "$cross_compiling" = yes ||

11230

- $as_test_x conftest$ac_exeext

11231

- }; then

11232

- ac_cv_func_bind_textdomain_codeset=yes

11233

-else

11234

- $as_echo "$as_me: failed program was:" >&5

11235

-sed 's/^/| /' conftest.$ac_ext >&5

11236

-

11237

- ac_cv_func_bind_textdomain_codeset=no

11238

-fi

11239

-

11240

-rm -rf conftest.dSYM

11241

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11242

- conftest$ac_exeext conftest.$ac_ext

11243

-fi

11244

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

11245

-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }

11246

-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then

11247

+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"

11248

+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :

11249

DATADIRNAME=share

11250

else

11251

DATADIRNAME=lib

11252

@@ -14786,10 +13133,8 @@

11253

;;

11254

esac

11255

fi

11256

-

11257

-rm -rf conftest.dSYM

11258

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11259

- conftest$ac_exeext conftest.$ac_ext

11260

+rm -f core conftest.err conftest.$ac_objext \

11261

+ conftest$ac_exeext conftest.$ac_ext

11262

fi

11263

11264

11265

@@ -14799,7 +13144,7 @@

11266

11267

11268

# Check whether --with-html-dir was given.

11269

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

11270

+if test "${with_html_dir+set}" = set; then :

11271

withval=$with_html_dir;

11272

else

11273

with_html_dir='${datadir}/gtk-doc/html'

11274

@@ -14809,7 +13154,7 @@

11275

11276

11277

# Check whether --enable-gtk-doc was given.

11278

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

11279

+if test "${enable_gtk_doc+set}" = set; then :

11280

enableval=$enable_gtk_doc;

11281

else

11282

enable_gtk_doc=no

11283

@@ -14818,31 +13163,29 @@

11284

11285

if test x$enable_gtk_doc = xyes; then

11286

if test -n "$PKG_CONFIG" && \

11287

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.3\"") >&5

11288

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.3\""; } >&5

11289

($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.3") 2>&5

11290

ac_status=$?

11291

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11292

- (exit $ac_status); }; then

11293

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

11294

+ test $ac_status = 0; }; then

11295

:

11296

else

11297

- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.3 installed to build gtk-doc" >&5

11298

-$as_echo "$as_me: error: You need to have gtk-doc >= 1.3 installed to build gtk-doc" >&2;}

11299

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

11300

+ as_fn_error "You need to have gtk-doc >= 1.3 installed to build gtk-doc" "$LINENO" 5

11301

fi

11302

fi

11303

11304

- { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5

11305

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5

11306

$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }

11307

- { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5

11308

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5

11309

$as_echo "$enable_gtk_doc" >&6; }

11310

11311

for ac_prog in gtkdoc-check

11312

do

11313

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

11314

set dummy $ac_prog; ac_word=$2

11315

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

11316

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11317

$as_echo_n "checking for $ac_word... " >&6; }

11318

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

11319

+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :

11320

$as_echo_n "(cached) " >&6

11321

else

11322

case $GTKDOC_CHECK in

11323

@@ -14855,14 +13198,14 @@

11324

do

11325

IFS=$as_save_IFS

11326

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

11327

- for ac_exec_ext in '' $ac_executable_extensions; do

11328

+ for ac_exec_ext in '' $ac_executable_extensions; do

11329

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

11330

ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"

11331

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

11332

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11333

break 2

11334

fi

11335

done

11336

-done

11337

+ done

11338

IFS=$as_save_IFS

11339

11340

;;

11341

@@ -14870,10 +13213,10 @@

11342

fi

11343

GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK

11344

if test -n "$GTKDOC_CHECK"; then

11345

- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5

11346

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5

11347

$as_echo "$GTKDOC_CHECK" >&6; }

11348

else

11349

- { $as_echo "$as_me:$LINENO: result: no" >&5

11350

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11351

$as_echo "no" >&6; }

11352

fi

11353

11354

@@ -14902,35 +13245,33 @@

11355

11356

gdu_cv_version_required=0.17.3

11357

11358

-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5

11359

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5

11360

$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }

11361

if test -n "$PKG_CONFIG" && \

11362

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5

11363

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5

11364

($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5

11365

ac_status=$?

11366

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11367

- (exit $ac_status); }; then

11368

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

11369

+ test $ac_status = 0; }; then

11370

gdu_cv_have_gdu=yes

11371

else

11372

gdu_cv_have_gdu=no

11373

fi

11374

11375

if test "$gdu_cv_have_gdu" = "yes"; then

11376

- { $as_echo "$as_me:$LINENO: result: yes" >&5

11377

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

11378

$as_echo "yes" >&6; }

11379

:

11380

else

11381

- { $as_echo "$as_me:$LINENO: result: no" >&5

11382

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11383

$as_echo "no" >&6; }

11384

- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5

11385

-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}

11386

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

11387

+ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5

11388

fi

11389

11390

11391

11392

# Check whether --with-help-dir was given.

11393

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

11394

+if test "${with_help_dir+set}" = set; then :

11395

withval=$with_help_dir;

11396

else

11397

with_help_dir='${datadir}/gnome/help'

11398

@@ -14941,7 +13282,7 @@

11399

11400

11401

# Check whether --with-omf-dir was given.

11402

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

11403

+if test "${with_omf_dir+set}" = set; then :

11404

withval=$with_omf_dir;

11405

else

11406

with_omf_dir='${datadir}/omf'

11407

@@ -14952,7 +13293,7 @@

11408

11409

11410

# Check whether --with-help-formats was given.

11411

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

11412

+if test "${with_help_formats+set}" = set; then :

11413

withval=$with_help_formats;

11414

else

11415

with_help_formats=''

11416

@@ -14962,7 +13303,7 @@

11417

11418

11419

# Check whether --enable-scrollkeeper was given.

11420

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

11421

+if test "${enable_scrollkeeper+set}" = set; then :

11422

enableval=$enable_scrollkeeper;

11423

else

11424

enable_scrollkeeper=yes

11425

@@ -14999,7 +13340,7 @@

11426

11427

11428

# Check whether --with-compile-warnings was given.

11429

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

11430

+if test "${with_compile_warnings+set}" = set; then :

11431

withval=$with_compile_warnings; enable_compile_warnings="$withval"

11432

else

11433

enable_compile_warnings="$default_compile_warnings"

11434

@@ -15027,13 +13368,9 @@

11435

for option in -Wno-sign-compare -Wno-pointer-sign -Wformat; do

11436

SAVE_CFLAGS="$CFLAGS"

11437

CFLAGS="$CFLAGS $option"

11438

- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5

11439

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5

11440

$as_echo_n "checking whether gcc understands $option... " >&6; }

11441

- cat >conftest.$ac_ext <<_ACEOF

11442

-/* confdefs.h. */

11443

-_ACEOF

11444

-cat confdefs.h >>conftest.$ac_ext

11445

-cat >>conftest.$ac_ext <<_ACEOF

11446

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11447

/* end confdefs.h. */

11448

11449

int

11450

@@ -15044,35 +13381,14 @@

11451

return 0;

11452

}

11453

_ACEOF

11454

-rm -f conftest.$ac_objext

11455

-if { (ac_try="$ac_compile"

11456

-case "(($ac_try" in

11457

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11458

- *) ac_try_echo=$ac_try;;

11459

-esac

11460

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11461

-$as_echo "$ac_try_echo") >&5

11462

- (eval "$ac_compile") 2>conftest.er1

11463

- ac_status=$?

11464

- grep -v '^ *+' conftest.er1 >conftest.err

11465

- rm -f conftest.er1

11466

- cat conftest.err >&5

11467

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11468

- (exit $ac_status); } && {

11469

- test -z "$ac_c_werror_flag" ||

11470

- test ! -s conftest.err

11471

- } && test -s conftest.$ac_objext; then

11472

+if ac_fn_c_try_compile "$LINENO"; then :

11473

has_option=yes

11474

else

11475

- $as_echo "$as_me: failed program was:" >&5

11476

-sed 's/^/| /' conftest.$ac_ext >&5

11477

-

11478

- has_option=no

11479

+ has_option=no

11480

fi

11481

-

11482

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

11483

CFLAGS="$SAVE_CFLAGS"

11484

- { $as_echo "$as_me:$LINENO: result: $has_option" >&5

11485

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5

11486

$as_echo "$has_option" >&6; }

11487

if test $has_option = yes; then

11488

warning_flags="$warning_flags $option"

11489

@@ -15086,15 +13402,13 @@

11490

fi

11491

;;

11492

*)

11493

- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5

11494

-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}

11495

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

11496

+ as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5

11497

;;

11498

esac

11499

CFLAGS="$realsave_CFLAGS"

11500

- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5

11501

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5

11502

$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }

11503

- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5

11504

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5

11505

$as_echo "$warning_flags" >&6; }

11506

11507

WARN_CFLAGS="$warning_flags"

11508

@@ -15102,9 +13416,9 @@

11509

11510

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

11511

set dummy dbus-binding-tool; ac_word=$2

11512

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

11513

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11514

$as_echo_n "checking for $ac_word... " >&6; }

11515

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

11516

+if test "${ac_cv_path_DBUS_BINDING_TOOL+set}" = set; then :

11517

$as_echo_n "(cached) " >&6

11518

else

11519

case $DBUS_BINDING_TOOL in

11520

@@ -15117,14 +13431,14 @@

11521

do

11522

IFS=$as_save_IFS

11523

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

11524

- for ac_exec_ext in '' $ac_executable_extensions; do

11525

+ for ac_exec_ext in '' $ac_executable_extensions; do

11526

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

11527

ac_cv_path_DBUS_BINDING_TOOL="$as_dir/$ac_word$ac_exec_ext"

11528

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

11529

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11530

break 2

11531

fi

11532

done

11533

-done

11534

+ done

11535

IFS=$as_save_IFS

11536

11537

;;

11538

@@ -15132,19 +13446,19 @@

11539

fi

11540

DBUS_BINDING_TOOL=$ac_cv_path_DBUS_BINDING_TOOL

11541

if test -n "$DBUS_BINDING_TOOL"; then

11542

- { $as_echo "$as_me:$LINENO: result: $DBUS_BINDING_TOOL" >&5

11543

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_BINDING_TOOL" >&5

11544

$as_echo "$DBUS_BINDING_TOOL" >&6; }

11545

else

11546

- { $as_echo "$as_me:$LINENO: result: no" >&5

11547

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11548

$as_echo "no" >&6; }

11549

fi

11550

11551

11552

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

11553

set dummy gconftool-2; ac_word=$2

11554

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

11555

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11556

$as_echo_n "checking for $ac_word... " >&6; }

11557

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

11558

+if test "${ac_cv_path_GCONFTOOL+set}" = set; then :

11559

$as_echo_n "(cached) " >&6

11560

else

11561

case $GCONFTOOL in

11562

@@ -15157,14 +13471,14 @@

11563

do

11564

IFS=$as_save_IFS

11565

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

11566

- for ac_exec_ext in '' $ac_executable_extensions; do

11567

+ for ac_exec_ext in '' $ac_executable_extensions; do

11568

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

11569

ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"

11570

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

11571

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11572

break 2

11573

fi

11574

done

11575

-done

11576

+ done

11577

IFS=$as_save_IFS

11578

11579

;;

11580

@@ -15172,10 +13486,10 @@

11581

fi

11582

GCONFTOOL=$ac_cv_path_GCONFTOOL

11583

if test -n "$GCONFTOOL"; then

11584

- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5

11585

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5

11586

$as_echo "$GCONFTOOL" >&6; }

11587

else

11588

- { $as_echo "$as_me:$LINENO: result: no" >&5

11589

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11590

$as_echo "no" >&6; }

11591

fi

11592

11593

@@ -15189,13 +13503,13 @@

11594

11595

11596

# Check whether --with-gconf-source was given.

11597

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

11598

+if test "${with_gconf_source+set}" = set; then :

11599

withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"

11600

fi

11601

11602

11603

11604

- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5

11605

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5

11606

$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }

11607

11608

if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then

11609

@@ -15204,22 +13518,20 @@

11610

11611

11612

# Check whether --with-gconf-schema-file-dir was given.

11613

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

11614

+if test "${with_gconf_schema_file_dir+set}" = set; then :

11615

withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"

11616

fi

11617

11618

11619

11620

- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5

11621

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5

11622

$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }

11623

11624

# Check whether --enable-schemas-install was given.

11625

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

11626

+if test "${enable_schemas_install+set}" = set; then :

11627

enableval=$enable_schemas_install; case ${enableval} in

11628

yes|no) ;;

11629

- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5

11630

-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}

11631

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

11632

+ *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;

11633

esac

11634

fi

11635

11636

@@ -15239,9 +13551,9 @@

11637

do

11638

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

11639

set dummy $ac_prog; ac_word=$2

11640

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

11641

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11642

$as_echo_n "checking for $ac_word... " >&6; }

11643

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

11644

+if test "${ac_cv_prog_XSLTPROC+set}" = set; then :

11645

$as_echo_n "(cached) " >&6

11646

else

11647

if test -n "$XSLTPROC"; then

11648

@@ -15252,24 +13564,24 @@

11649

do

11650

IFS=$as_save_IFS

11651

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

11652

- for ac_exec_ext in '' $ac_executable_extensions; do

11653

+ for ac_exec_ext in '' $ac_executable_extensions; do

11654

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

11655

ac_cv_prog_XSLTPROC="$ac_prog"

11656

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

11657

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11658

break 2

11659

fi

11660

done

11661

-done

11662

+ done

11663

IFS=$as_save_IFS

11664

11665

fi

11666

fi

11667

XSLTPROC=$ac_cv_prog_XSLTPROC

11668

if test -n "$XSLTPROC"; then

11669

- { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5

11670

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5

11671

$as_echo "$XSLTPROC" >&6; }

11672

else

11673

- { $as_echo "$as_me:$LINENO: result: no" >&5

11674

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11675

$as_echo "no" >&6; }

11676

fi

11677

11678

@@ -15278,9 +13590,7 @@

11679

done

11680

11681

if test -z "$XSLTPROC"; then

11682

- { { $as_echo "$as_me:$LINENO: error: xsltproc (from libxslt) is required" >&5

11683

-$as_echo "$as_me: error: xsltproc (from libxslt) is required" >&2;}

11684

- { (exit 1); exit 1; }; }

11685

+ as_fn_error "xsltproc (from libxslt) is required" "$LINENO" 5

11686

fi

11687

11688

11689

@@ -15288,58 +13598,58 @@

11690

11691

if test -n "$PYTHON"; then

11692

# If the user set $PYTHON, use it and don't search something else.

11693

- { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3" >&5

11694

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3" >&5

11695

$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; }

11696

- prog="import sys, string

11697

+ prog="import sys

11698

# split strings by '.' and convert to numeric. Append some zeros

11699

# because we need at least 4 digits for the hex conversion.

11700

-minver = map(int, string.split('2.3', '.')) + [0, 0, 0]

11701

+# map returns an iterator in Python 3.0 and a list in 2.x

11702

+minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0]

11703

minverhex = 0

11704

-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]

11705

+# xrange is not present in Python 3.0 and range returns an iterator

11706

+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]

11707

sys.exit(sys.hexversion < minverhex)"

11708

if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5

11709

($PYTHON -c "$prog") >&5 2>&5

11710

ac_status=$?

11711

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11712

- (exit $ac_status); }; then

11713

- { $as_echo "$as_me:$LINENO: result: yes" >&5

11714

+ (exit $ac_status); }; then :

11715

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

11716

$as_echo "yes" >&6; }

11717

else

11718

- { { $as_echo "$as_me:$LINENO: error: too old" >&5

11719

-$as_echo "$as_me: error: too old" >&2;}

11720

- { (exit 1); exit 1; }; }

11721

+ as_fn_error "too old" "$LINENO" 5

11722

fi

11723

-

11724

am_display_PYTHON=$PYTHON

11725

else

11726

# Otherwise, try each interpreter until we find one that satisfies

11727

# VERSION.

11728

- { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.3" >&5

11729

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3" >&5

11730

$as_echo_n "checking for a Python interpreter with version >= 2.3... " >&6; }

11731

-if test "${am_cv_pathless_PYTHON+set}" = set; then

11732

+if test "${am_cv_pathless_PYTHON+set}" = set; then :

11733

$as_echo_n "(cached) " >&6

11734

else

11735

11736

- for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do

11737

+ for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do

11738

test "$am_cv_pathless_PYTHON" = none && break

11739

- prog="import sys, string

11740

+ prog="import sys

11741

# split strings by '.' and convert to numeric. Append some zeros

11742

# because we need at least 4 digits for the hex conversion.

11743

-minver = map(int, string.split('2.3', '.')) + [0, 0, 0]

11744

+# map returns an iterator in Python 3.0 and a list in 2.x

11745

+minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0]

11746

minverhex = 0

11747

-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]

11748

+# xrange is not present in Python 3.0 and range returns an iterator

11749

+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]

11750

sys.exit(sys.hexversion < minverhex)"

11751

if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5

11752

($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5

11753

ac_status=$?

11754

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11755

- (exit $ac_status); }; then

11756

+ (exit $ac_status); }; then :

11757

break

11758

fi

11759

-

11760

done

11761

fi

11762

-{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5

11763

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5

11764

$as_echo "$am_cv_pathless_PYTHON" >&6; }

11765

# Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.

11766

if test "$am_cv_pathless_PYTHON" = none; then

11767

@@ -15347,9 +13657,9 @@

11768

else

11769

# Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.

11770

set dummy $am_cv_pathless_PYTHON; ac_word=$2

11771

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

11772

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11773

$as_echo_n "checking for $ac_word... " >&6; }

11774

-if test "${ac_cv_path_PYTHON+set}" = set; then

11775

+if test "${ac_cv_path_PYTHON+set}" = set; then :

11776

$as_echo_n "(cached) " >&6

11777

else

11778

case $PYTHON in

11779

@@ -15362,14 +13672,14 @@

11780

do

11781

IFS=$as_save_IFS

11782

test -z "$as_dir" && as_dir=.

11783

- for ac_exec_ext in '' $ac_executable_extensions; do

11784

+ for ac_exec_ext in '' $ac_executable_extensions; do

11785

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11786

ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"

11787

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11788

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11789

break 2

11790

fi

11791

done

11792

-done

11793

+ done

11794

IFS=$as_save_IFS

11795

11796

;;

11797

@@ -15377,10 +13687,10 @@

11798

fi

11799

PYTHON=$ac_cv_path_PYTHON

11800

if test -n "$PYTHON"; then

11801

- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5

11802

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5

11803

$as_echo "$PYTHON" >&6; }

11804

else

11805

- { $as_echo "$as_me:$LINENO: result: no" >&5

11806

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11807

$as_echo "no" >&6; }

11808

fi

11809

11810

@@ -15391,20 +13701,18 @@

11811

11812

11813

if test "$PYTHON" = :; then

11814

- { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5

11815

-$as_echo "$as_me: error: no suitable Python interpreter found" >&2;}

11816

- { (exit 1); exit 1; }; }

11817

+ as_fn_error "no suitable Python interpreter found" "$LINENO" 5

11818

else

11819

11820

11821

- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5

11822

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5

11823

$as_echo_n "checking for $am_display_PYTHON version... " >&6; }

11824

-if test "${am_cv_python_version+set}" = set; then

11825

+if test "${am_cv_python_version+set}" = set; then :

11826

$as_echo_n "(cached) " >&6

11827

else

11828

- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`

11829

+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`

11830

fi

11831

-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5

11832

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5

11833

$as_echo "$am_cv_python_version" >&6; }

11834

PYTHON_VERSION=$am_cv_python_version

11835

11836

@@ -15416,35 +13724,42 @@

11837

11838

11839

11840

- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5

11841

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5

11842

$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }

11843

-if test "${am_cv_python_platform+set}" = set; then

11844

+if test "${am_cv_python_platform+set}" = set; then :

11845

$as_echo_n "(cached) " >&6

11846

else

11847

- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`

11848

+ am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`

11849

fi

11850

-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5

11851

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5

11852

$as_echo "$am_cv_python_platform" >&6; }

11853

PYTHON_PLATFORM=$am_cv_python_platform

11854

11855

11856

11857

11858

- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5

11859

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5

11860

$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }

11861

-if test "${am_cv_python_pythondir+set}" = set; then

11862

+if test "${am_cv_python_pythondir+set}" = set; then :

11863

$as_echo_n "(cached) " >&6

11864

else

11865

if test "x$prefix" = xNONE

11866

then

11867

- py_prefix_arg=

11868

+ am_py_prefix=$ac_default_prefix

11869

else

11870

- py_prefix_arg=",prefix='$prefix'"

11871

+ am_py_prefix=$prefix

11872

fi

11873

- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null ||

11874

+ am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||

11875

echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`

11876

+ case $am_cv_python_pythondir in

11877

+ $am_py_prefix*)

11878

+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`

11879

+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`

11880

+ ;;

11881

+ esac

11882

+

11883

fi

11884

-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5

11885

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5

11886

$as_echo "$am_cv_python_pythondir" >&6; }

11887

pythondir=$am_cv_python_pythondir

11888

11889

@@ -15453,21 +13768,28 @@

11890

pkgpythondir=\${pythondir}/$PACKAGE

11891

11892

11893

- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5

11894

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5

11895

$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }

11896

-if test "${am_cv_python_pyexecdir+set}" = set; then

11897

+if test "${am_cv_python_pyexecdir+set}" = set; then :

11898

$as_echo_n "(cached) " >&6

11899

else

11900

if test "x$exec_prefix" = xNONE

11901

then

11902

- py_exec_prefix_arg=$py_prefix_arg

11903

+ am_py_exec_prefix=$am_py_prefix

11904

else

11905

- py_exec_prefix_arg=",prefix='$exec_prefix'"

11906

+ am_py_exec_prefix=$exec_prefix

11907

fi

11908

- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null ||

11909

+ am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||

11910

echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`

11911

+ case $am_cv_python_pyexecdir in

11912

+ $am_py_exec_prefix*)

11913

+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`

11914

+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`

11915

+ ;;

11916

+ esac

11917

+

11918

fi

11919

-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5

11920

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5

11921

$as_echo "$am_cv_python_pyexecdir" >&6; }

11922

pyexecdir=$am_cv_python_pyexecdir

11923

11924

@@ -15483,13 +13805,11 @@

11925

11926

11927

# Check whether --enable-valgrind was given.

11928

-if test "${enable_valgrind+set}" = set; then

11929

+if test "${enable_valgrind+set}" = set; then :

11930

enableval=$enable_valgrind;

11931

case "${enableval}" in

11932

yes|no) enable="${enableval}" ;;

11933

- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-valgrind" >&5

11934

-$as_echo "$as_me: error: bad value ${enableval} for --enable-valgrind" >&2;}

11935

- { (exit 1); exit 1; }; } ;;

11936

+ *) as_fn_error "bad value ${enableval} for --enable-valgrind" "$LINENO" 5 ;;

11937

esac

11938

11939

else

11940

@@ -15507,7 +13827,7 @@

11941

11942

11943

pkg_failed=no

11944

-{ $as_echo "$as_me:$LINENO: checking for VALGRIND" >&5

11945

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALGRIND" >&5

11946

$as_echo_n "checking for VALGRIND... " >&6; }

11947

11948

if test -n "$PKG_CONFIG"; then

11949

@@ -15515,11 +13835,11 @@

11950

pkg_cv_VALGRIND_CFLAGS="$VALGRIND_CFLAGS"

11951

else

11952

if test -n "$PKG_CONFIG" && \

11953

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"valgrind > \"\$valgrind_req\"\"") >&5

11954

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind > \"\$valgrind_req\"\""; } >&5

11955

($PKG_CONFIG --exists --print-errors "valgrind > "$valgrind_req"") 2>&5

11956

ac_status=$?

11957

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11958

- (exit $ac_status); }; then

11959

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

11960

+ test $ac_status = 0; }; then

11961

pkg_cv_VALGRIND_CFLAGS=`$PKG_CONFIG --cflags "valgrind > "$valgrind_req"" 2>/dev/null`

11962

else

11963

pkg_failed=yes

11964

@@ -15533,11 +13853,11 @@

11965

pkg_cv_VALGRIND_LIBS="$VALGRIND_LIBS"

11966

else

11967

if test -n "$PKG_CONFIG" && \

11968

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"valgrind > \"\$valgrind_req\"\"") >&5

11969

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind > \"\$valgrind_req\"\""; } >&5

11970

($PKG_CONFIG --exists --print-errors "valgrind > "$valgrind_req"") 2>&5

11971

ac_status=$?

11972

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11973

- (exit $ac_status); }; then

11974

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

11975

+ test $ac_status = 0; }; then

11976

pkg_cv_VALGRIND_LIBS=`$PKG_CONFIG --libs "valgrind > "$valgrind_req"" 2>/dev/null`

11977

else

11978

pkg_failed=yes

11979

@@ -15564,7 +13884,7 @@

11980

# Put the nasty error message in config.log where it belongs

11981

echo "$VALGRIND_PKG_ERRORS" >&5

11982

11983

- { $as_echo "$as_me:$LINENO: result: no" >&5

11984

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11985

$as_echo "no" >&6; }

11986

have_valgrind_runtime="no"

11987

elif test $pkg_failed = untried; then

11988

@@ -15572,16 +13892,16 @@

11989

else

11990

VALGRIND_CFLAGS=$pkg_cv_VALGRIND_CFLAGS

11991

VALGRIND_LIBS=$pkg_cv_VALGRIND_LIBS

11992

- { $as_echo "$as_me:$LINENO: result: yes" >&5

11993

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

11994

$as_echo "yes" >&6; }

11995

have_valgrind_runtime="yes"

11996

fi

11997

11998

# Extract the first word of "valgrind", so it can be a program name with args.

11999

set dummy valgrind; ac_word=$2

12000

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

12001

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

12002

$as_echo_n "checking for $ac_word... " >&6; }

12003

-if test "${ac_cv_path_VALGRIND_PATH+set}" = set; then

12004

+if test "${ac_cv_path_VALGRIND_PATH+set}" = set; then :

12005

$as_echo_n "(cached) " >&6

12006

else

12007

case $VALGRIND_PATH in

12008

@@ -15594,14 +13914,14 @@

12009

do

12010

IFS=$as_save_IFS

12011

test -z "$as_dir" && as_dir=.

12012

- for ac_exec_ext in '' $ac_executable_extensions; do

12013

+ for ac_exec_ext in '' $ac_executable_extensions; do

12014

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

12015

ac_cv_path_VALGRIND_PATH="$as_dir/$ac_word$ac_exec_ext"

12016

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

12017

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

12018

break 2

12019

fi

12020

done

12021

-done

12022

+ done

12023

IFS=$as_save_IFS

12024

12025

;;

12026

@@ -15609,10 +13929,10 @@

12027

fi

12028

VALGRIND_PATH=$ac_cv_path_VALGRIND_PATH

12029

if test -n "$VALGRIND_PATH"; then

12030

- { $as_echo "$as_me:$LINENO: result: $VALGRIND_PATH" >&5

12031

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VALGRIND_PATH" >&5

12032

$as_echo "$VALGRIND_PATH" >&6; }

12033

else

12034

- { $as_echo "$as_me:$LINENO: result: no" >&5

12035

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

12036

$as_echo "no" >&6; }

12037

fi

12038

12039

@@ -15625,11 +13945,9 @@

12040

test -n "$VALGRIND_PATH" ;

12041

then

12042

12043

-cat >>confdefs.h <<\_ACEOF

12044

-#define HAVE_VALGRIND 1

12045

-_ACEOF

12046

+$as_echo "#define HAVE_VALGRIND 1" >>confdefs.h

12047

12048

- { $as_echo "$as_me:$LINENO: using compile-time instrumentation for valgrind" >&5

12049

+ { $as_echo "$as_me:${as_lineno-$LINENO}: using compile-time instrumentation for valgrind" >&5

12050

$as_echo "$as_me: using compile-time instrumentation for valgrind" >&6;}

12051

fi

12052

12053

@@ -15653,7 +13971,7 @@

12054

12055

12056

pkg_failed=no

12057

-{ $as_echo "$as_me:$LINENO: checking for LIBEMPATHY" >&5

12058

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEMPATHY" >&5

12059

$as_echo_n "checking for LIBEMPATHY... " >&6; }

12060

12061

if test -n "$PKG_CONFIG"; then

12062

@@ -15661,7 +13979,7 @@

12063

pkg_cv_LIBEMPATHY_CFLAGS="$LIBEMPATHY_CFLAGS"

12064

else

12065

if test -n "$PKG_CONFIG" && \

12066

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

12067

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

12068

glib-2.0 >= \$GLIB_REQUIRED

12069

gobject-2.0

12070

gio-2.0 >= \$GLIB_REQUIRED

12071

@@ -15671,7 +13989,7 @@

12072

telepathy-farsight

12073

farsight2-0.10

12074

gstreamer-0.10

12075

-\"") >&5

12076

+\""; } >&5

12077

($PKG_CONFIG --exists --print-errors "

12078

glib-2.0 >= $GLIB_REQUIRED

12079

gobject-2.0

12080

@@ -15684,8 +14002,8 @@

12081

gstreamer-0.10

12082

") 2>&5

12083

ac_status=$?

12084

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12085

- (exit $ac_status); }; then

12086

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12087

+ test $ac_status = 0; }; then

12088

pkg_cv_LIBEMPATHY_CFLAGS=`$PKG_CONFIG --cflags "

12089

glib-2.0 >= $GLIB_REQUIRED

12090

gobject-2.0

12091

@@ -15709,7 +14027,7 @@

12092

pkg_cv_LIBEMPATHY_LIBS="$LIBEMPATHY_LIBS"

12093

else

12094

if test -n "$PKG_CONFIG" && \

12095

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

12096

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

12097

glib-2.0 >= \$GLIB_REQUIRED

12098

gobject-2.0

12099

gio-2.0 >= \$GLIB_REQUIRED

12100

@@ -15719,7 +14037,7 @@

12101

telepathy-farsight

12102

farsight2-0.10

12103

gstreamer-0.10

12104

-\"") >&5

12105

+\""; } >&5

12106

($PKG_CONFIG --exists --print-errors "

12107

glib-2.0 >= $GLIB_REQUIRED

12108

gobject-2.0

12109

@@ -15732,8 +14050,8 @@

12110

gstreamer-0.10

12111

") 2>&5

12112

ac_status=$?

12113

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12114

- (exit $ac_status); }; then

12115

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12116

+ test $ac_status = 0; }; then

12117

pkg_cv_LIBEMPATHY_LIBS=`$PKG_CONFIG --libs "

12118

glib-2.0 >= $GLIB_REQUIRED

12119

gobject-2.0

12120

@@ -15790,84 +14108,51 @@

12121

# Put the nasty error message in config.log where it belongs

12122

echo "$LIBEMPATHY_PKG_ERRORS" >&5

12123

12124

- { { $as_echo "$as_me:$LINENO: error: Package requirements (

12125

- glib-2.0 >= $GLIB_REQUIRED

12126

- gobject-2.0

12127

- gio-2.0 >= $GLIB_REQUIRED

12128

- gio-unix-2.0 >= $GLIB_REQUIRED

12129

- libxml-2.0

12130

- telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

12131

- telepathy-farsight

12132

- farsight2-0.10

12133

- gstreamer-0.10

12134

-) were not met:

12135

-

12136

-$LIBEMPATHY_PKG_ERRORS

12137

-

12138

-Consider adjusting the PKG_CONFIG_PATH environment variable if you

12139

-installed software in a non-standard prefix.

12140

-

12141

-Alternatively, you may set the environment variables LIBEMPATHY_CFLAGS

12142

-and LIBEMPATHY_LIBS to avoid the need to call pkg-config.

12143

-See the pkg-config man page for more details.

12144

-" >&5

12145

-$as_echo "$as_me: error: Package requirements (

12146

- glib-2.0 >= $GLIB_REQUIRED

12147

- gobject-2.0

12148

- gio-2.0 >= $GLIB_REQUIRED

12149

- gio-unix-2.0 >= $GLIB_REQUIRED

12150

- libxml-2.0

12151

- telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

12152

- telepathy-farsight

12153

- farsight2-0.10

12154

- gstreamer-0.10

12155

-) were not met:

12156

-

12157

-$LIBEMPATHY_PKG_ERRORS

12158

-

12159

-Consider adjusting the PKG_CONFIG_PATH environment variable if you

12160

-installed software in a non-standard prefix.

12161

-

12162

-Alternatively, you may set the environment variables LIBEMPATHY_CFLAGS

12163

-and LIBEMPATHY_LIBS to avoid the need to call pkg-config.

12164

-See the pkg-config man page for more details.

12165

-" >&2;}

12166

- { (exit 1); exit 1; }; }

12167

+ as_fn_error "Package requirements (

12168

+ glib-2.0 >= $GLIB_REQUIRED

12169

+ gobject-2.0

12170

+ gio-2.0 >= $GLIB_REQUIRED

12171

+ gio-unix-2.0 >= $GLIB_REQUIRED

12172

+ libxml-2.0

12173

+ telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

12174

+ telepathy-farsight

12175

+ farsight2-0.10

12176

+ gstreamer-0.10

12177

+) were not met:

12178

+

12179

+$LIBEMPATHY_PKG_ERRORS

12180

+

12181

+Consider adjusting the PKG_CONFIG_PATH environment variable if you

12182

+installed software in a non-standard prefix.

12183

+

12184

+Alternatively, you may set the environment variables LIBEMPATHY_CFLAGS

12185

+and LIBEMPATHY_LIBS to avoid the need to call pkg-config.

12186

+See the pkg-config man page for more details.

12187

+" "$LINENO" 5

12188

elif test $pkg_failed = untried; then

12189

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

12190

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

12191

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

12192

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

12193

-is in your PATH or set the PKG_CONFIG environment variable to the full

12194

-path to pkg-config.

12195

-

12196

-Alternatively, you may set the environment variables LIBEMPATHY_CFLAGS

12197

-and LIBEMPATHY_LIBS to avoid the need to call pkg-config.

12198

-See the pkg-config man page for more details.

12199

-

12200

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12201

-See \`config.log' for more details." >&5

12202

-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

12203

-is in your PATH or set the PKG_CONFIG environment variable to the full

12204

-path to pkg-config.

12205

-

12206

-Alternatively, you may set the environment variables LIBEMPATHY_CFLAGS

12207

-and LIBEMPATHY_LIBS to avoid the need to call pkg-config.

12208

-See the pkg-config man page for more details.

12209

-

12210

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12211

-See \`config.log' for more details." >&2;}

12212

- { (exit 1); exit 1; }; }; }

12213

+as_fn_error "The pkg-config script could not be found or is too old. Make sure it

12214

+is in your PATH or set the PKG_CONFIG environment variable to the full

12215

+path to pkg-config.

12216

+

12217

+Alternatively, you may set the environment variables LIBEMPATHY_CFLAGS

12218

+and LIBEMPATHY_LIBS to avoid the need to call pkg-config.

12219

+See the pkg-config man page for more details.

12220

+

12221

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12222

+See \`config.log' for more details." "$LINENO" 5; }

12223

else

12224

LIBEMPATHY_CFLAGS=$pkg_cv_LIBEMPATHY_CFLAGS

12225

LIBEMPATHY_LIBS=$pkg_cv_LIBEMPATHY_LIBS

12226

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12227

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

12228

$as_echo "yes" >&6; }

12229

:

12230

fi

12231

12232

12233

pkg_failed=no

12234

-{ $as_echo "$as_me:$LINENO: checking for LIBEMPATHYGTK" >&5

12235

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEMPATHYGTK" >&5

12236

$as_echo_n "checking for LIBEMPATHYGTK... " >&6; }

12237

12238

if test -n "$PKG_CONFIG"; then

12239

@@ -15875,7 +14160,7 @@

12240

pkg_cv_LIBEMPATHYGTK_CFLAGS="$LIBEMPATHYGTK_CFLAGS"

12241

else

12242

if test -n "$PKG_CONFIG" && \

12243

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

12244

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

12245

glib-2.0 >= \$GLIB_REQUIRED

12246

gobject-2.0

12247

gio-2.0 >= \$GLIB_REQUIRED

12248

@@ -15887,7 +14172,7 @@

12249

farsight2-0.10

12250

gstreamer-0.10

12251

gstreamer-interfaces-0.10

12252

-\"") >&5

12253

+\""; } >&5

12254

($PKG_CONFIG --exists --print-errors "

12255

glib-2.0 >= $GLIB_REQUIRED

12256

gobject-2.0

12257

@@ -15902,8 +14187,8 @@

12258

gstreamer-interfaces-0.10

12259

") 2>&5

12260

ac_status=$?

12261

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12262

- (exit $ac_status); }; then

12263

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12264

+ test $ac_status = 0; }; then

12265

pkg_cv_LIBEMPATHYGTK_CFLAGS=`$PKG_CONFIG --cflags "

12266

glib-2.0 >= $GLIB_REQUIRED

12267

gobject-2.0

12268

@@ -15929,7 +14214,7 @@

12269

pkg_cv_LIBEMPATHYGTK_LIBS="$LIBEMPATHYGTK_LIBS"

12270

else

12271

if test -n "$PKG_CONFIG" && \

12272

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

12273

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

12274

glib-2.0 >= \$GLIB_REQUIRED

12275

gobject-2.0

12276

gio-2.0 >= \$GLIB_REQUIRED

12277

@@ -15941,7 +14226,7 @@

12278

farsight2-0.10

12279

gstreamer-0.10

12280

gstreamer-interfaces-0.10

12281

-\"") >&5

12282

+\""; } >&5

12283

($PKG_CONFIG --exists --print-errors "

12284

glib-2.0 >= $GLIB_REQUIRED

12285

gobject-2.0

12286

@@ -15956,8 +14241,8 @@

12287

gstreamer-interfaces-0.10

12288

") 2>&5

12289

ac_status=$?

12290

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12291

- (exit $ac_status); }; then

12292

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12293

+ test $ac_status = 0; }; then

12294

pkg_cv_LIBEMPATHYGTK_LIBS=`$PKG_CONFIG --libs "

12295

glib-2.0 >= $GLIB_REQUIRED

12296

gobject-2.0

12297

@@ -16020,88 +14305,53 @@

12298

# Put the nasty error message in config.log where it belongs

12299

echo "$LIBEMPATHYGTK_PKG_ERRORS" >&5

12300

12301

- { { $as_echo "$as_me:$LINENO: error: Package requirements (

12302

- glib-2.0 >= $GLIB_REQUIRED

12303

- gobject-2.0

12304

- gio-2.0 >= $GLIB_REQUIRED

12305

- gconf-2.0 >= $GCONF_REQUIRED

12306

- x11

12307

- gtk+-2.0 >= $GTK_REQUIRED

12308

- libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED

12309

- telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

12310

- farsight2-0.10

12311

- gstreamer-0.10

12312

- gstreamer-interfaces-0.10

12313

-) were not met:

12314

-

12315

-$LIBEMPATHYGTK_PKG_ERRORS

12316

-

12317

-Consider adjusting the PKG_CONFIG_PATH environment variable if you

12318

-installed software in a non-standard prefix.

12319

-

12320

-Alternatively, you may set the environment variables LIBEMPATHYGTK_CFLAGS

12321

-and LIBEMPATHYGTK_LIBS to avoid the need to call pkg-config.

12322

-See the pkg-config man page for more details.

12323

-" >&5

12324

-$as_echo "$as_me: error: Package requirements (

12325

- glib-2.0 >= $GLIB_REQUIRED

12326

- gobject-2.0

12327

- gio-2.0 >= $GLIB_REQUIRED

12328

- gconf-2.0 >= $GCONF_REQUIRED

12329

- x11

12330

- gtk+-2.0 >= $GTK_REQUIRED

12331

- libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED

12332

- telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

12333

- farsight2-0.10

12334

- gstreamer-0.10

12335

- gstreamer-interfaces-0.10

12336

-) were not met:

12337

-

12338

-$LIBEMPATHYGTK_PKG_ERRORS

12339

-

12340

-Consider adjusting the PKG_CONFIG_PATH environment variable if you

12341

-installed software in a non-standard prefix.

12342

-

12343

-Alternatively, you may set the environment variables LIBEMPATHYGTK_CFLAGS

12344

-and LIBEMPATHYGTK_LIBS to avoid the need to call pkg-config.

12345

-See the pkg-config man page for more details.

12346

-" >&2;}

12347

- { (exit 1); exit 1; }; }

12348

+ as_fn_error "Package requirements (

12349

+ glib-2.0 >= $GLIB_REQUIRED

12350

+ gobject-2.0

12351

+ gio-2.0 >= $GLIB_REQUIRED

12352

+ gconf-2.0 >= $GCONF_REQUIRED

12353

+ x11

12354

+ gtk+-2.0 >= $GTK_REQUIRED

12355

+ libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED

12356

+ telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

12357

+ farsight2-0.10

12358

+ gstreamer-0.10

12359

+ gstreamer-interfaces-0.10

12360

+) were not met:

12361

+

12362

+$LIBEMPATHYGTK_PKG_ERRORS

12363

+

12364

+Consider adjusting the PKG_CONFIG_PATH environment variable if you

12365

+installed software in a non-standard prefix.

12366

+

12367

+Alternatively, you may set the environment variables LIBEMPATHYGTK_CFLAGS

12368

+and LIBEMPATHYGTK_LIBS to avoid the need to call pkg-config.

12369

+See the pkg-config man page for more details.

12370

+" "$LINENO" 5

12371

elif test $pkg_failed = untried; then

12372

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

12373

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

12374

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

12375

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

12376

-is in your PATH or set the PKG_CONFIG environment variable to the full

12377

-path to pkg-config.

12378

-

12379

-Alternatively, you may set the environment variables LIBEMPATHYGTK_CFLAGS

12380

-and LIBEMPATHYGTK_LIBS to avoid the need to call pkg-config.

12381

-See the pkg-config man page for more details.

12382

-

12383

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12384

-See \`config.log' for more details." >&5

12385

-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

12386

-is in your PATH or set the PKG_CONFIG environment variable to the full

12387

-path to pkg-config.

12388

-

12389

-Alternatively, you may set the environment variables LIBEMPATHYGTK_CFLAGS

12390

-and LIBEMPATHYGTK_LIBS to avoid the need to call pkg-config.

12391

-See the pkg-config man page for more details.

12392

-

12393

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12394

-See \`config.log' for more details." >&2;}

12395

- { (exit 1); exit 1; }; }; }

12396

+as_fn_error "The pkg-config script could not be found or is too old. Make sure it

12397

+is in your PATH or set the PKG_CONFIG environment variable to the full

12398

+path to pkg-config.

12399

+

12400

+Alternatively, you may set the environment variables LIBEMPATHYGTK_CFLAGS

12401

+and LIBEMPATHYGTK_LIBS to avoid the need to call pkg-config.

12402

+See the pkg-config man page for more details.

12403

+

12404

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12405

+See \`config.log' for more details." "$LINENO" 5; }

12406

else

12407

LIBEMPATHYGTK_CFLAGS=$pkg_cv_LIBEMPATHYGTK_CFLAGS

12408

LIBEMPATHYGTK_LIBS=$pkg_cv_LIBEMPATHYGTK_LIBS

12409

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12410

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

12411

$as_echo "yes" >&6; }

12412

:

12413

fi

12414

12415

12416

pkg_failed=no

12417

-{ $as_echo "$as_me:$LINENO: checking for EMPATHY" >&5

12418

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EMPATHY" >&5

12419

$as_echo_n "checking for EMPATHY... " >&6; }

12420

12421

if test -n "$PKG_CONFIG"; then

12422

@@ -16109,7 +14359,7 @@

12423

pkg_cv_EMPATHY_CFLAGS="$EMPATHY_CFLAGS"

12424

else

12425

if test -n "$PKG_CONFIG" && \

12426

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

12427

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

12428

glib-2.0 >= \$GLIB_REQUIRED

12429

gobject-2.0

12430

gio-2.0 >= \$GLIB_REQUIRED

12431

@@ -16122,7 +14372,7 @@

12432

gstreamer-0.10

12433

unique-1.0

12434

gnome-keyring-1 >= \$KEYRING_REQUIRED

12435

-\"") >&5

12436

+\""; } >&5

12437

($PKG_CONFIG --exists --print-errors "

12438

glib-2.0 >= $GLIB_REQUIRED

12439

gobject-2.0

12440

@@ -16138,8 +14388,8 @@

12441

gnome-keyring-1 >= $KEYRING_REQUIRED

12442

") 2>&5

12443

ac_status=$?

12444

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12445

- (exit $ac_status); }; then

12446

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12447

+ test $ac_status = 0; }; then

12448

pkg_cv_EMPATHY_CFLAGS=`$PKG_CONFIG --cflags "

12449

glib-2.0 >= $GLIB_REQUIRED

12450

gobject-2.0

12451

@@ -16166,7 +14416,7 @@

12452

pkg_cv_EMPATHY_LIBS="$EMPATHY_LIBS"

12453

else

12454

if test -n "$PKG_CONFIG" && \

12455

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

12456

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

12457

glib-2.0 >= \$GLIB_REQUIRED

12458

gobject-2.0

12459

gio-2.0 >= \$GLIB_REQUIRED

12460

@@ -16179,7 +14429,7 @@

12461

gstreamer-0.10

12462

unique-1.0

12463

gnome-keyring-1 >= \$KEYRING_REQUIRED

12464

-\"") >&5

12465

+\""; } >&5

12466

($PKG_CONFIG --exists --print-errors "

12467

glib-2.0 >= $GLIB_REQUIRED

12468

gobject-2.0

12469

@@ -16195,8 +14445,8 @@

12470

gnome-keyring-1 >= $KEYRING_REQUIRED

12471

") 2>&5

12472

ac_status=$?

12473

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12474

- (exit $ac_status); }; then

12475

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12476

+ test $ac_status = 0; }; then

12477

pkg_cv_EMPATHY_LIBS=`$PKG_CONFIG --libs "

12478

glib-2.0 >= $GLIB_REQUIRED

12479

gobject-2.0

12480

@@ -16262,90 +14512,54 @@

12481

# Put the nasty error message in config.log where it belongs

12482

echo "$EMPATHY_PKG_ERRORS" >&5

12483

12484

- { { $as_echo "$as_me:$LINENO: error: Package requirements (

12485

- glib-2.0 >= $GLIB_REQUIRED

12486

- gobject-2.0

12487

- gio-2.0 >= $GLIB_REQUIRED

12488

- gdk-x11-2.0

12489

- gtk+-2.0 >= $GTK_REQUIRED

12490

- libebook-1.2

12491

- dbus-glib-1

12492

- telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

12493

- telepathy-farsight

12494

- gstreamer-0.10

12495

- unique-1.0

12496

- gnome-keyring-1 >= $KEYRING_REQUIRED

12497

-) were not met:

12498

-

12499

-$EMPATHY_PKG_ERRORS

12500

-

12501

-Consider adjusting the PKG_CONFIG_PATH environment variable if you

12502

-installed software in a non-standard prefix.

12503

-

12504

-Alternatively, you may set the environment variables EMPATHY_CFLAGS

12505

-and EMPATHY_LIBS to avoid the need to call pkg-config.

12506

-See the pkg-config man page for more details.

12507

-" >&5

12508

-$as_echo "$as_me: error: Package requirements (

12509

- glib-2.0 >= $GLIB_REQUIRED

12510

- gobject-2.0

12511

- gio-2.0 >= $GLIB_REQUIRED

12512

- gdk-x11-2.0

12513

- gtk+-2.0 >= $GTK_REQUIRED

12514

- libebook-1.2

12515

- dbus-glib-1

12516

- telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

12517

- telepathy-farsight

12518

- gstreamer-0.10

12519

- unique-1.0

12520

- gnome-keyring-1 >= $KEYRING_REQUIRED

12521

-) were not met:

12522

-

12523

-$EMPATHY_PKG_ERRORS

12524

-

12525

-Consider adjusting the PKG_CONFIG_PATH environment variable if you

12526

-installed software in a non-standard prefix.

12527

-

12528

-Alternatively, you may set the environment variables EMPATHY_CFLAGS

12529

-and EMPATHY_LIBS to avoid the need to call pkg-config.

12530

-See the pkg-config man page for more details.

12531

-" >&2;}

12532

- { (exit 1); exit 1; }; }

12533

+ as_fn_error "Package requirements (

12534

+ glib-2.0 >= $GLIB_REQUIRED

12535

+ gobject-2.0

12536

+ gio-2.0 >= $GLIB_REQUIRED

12537

+ gdk-x11-2.0

12538

+ gtk+-2.0 >= $GTK_REQUIRED

12539

+ libebook-1.2

12540

+ dbus-glib-1

12541

+ telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

12542

+ telepathy-farsight

12543

+ gstreamer-0.10

12544

+ unique-1.0

12545

+ gnome-keyring-1 >= $KEYRING_REQUIRED

12546

+) were not met:

12547

+

12548

+$EMPATHY_PKG_ERRORS

12549

+

12550

+Consider adjusting the PKG_CONFIG_PATH environment variable if you

12551

+installed software in a non-standard prefix.

12552

+

12553

+Alternatively, you may set the environment variables EMPATHY_CFLAGS

12554

+and EMPATHY_LIBS to avoid the need to call pkg-config.

12555

+See the pkg-config man page for more details.

12556

+" "$LINENO" 5

12557

elif test $pkg_failed = untried; then

12558

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

12559

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

12560

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

12561

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

12562

-is in your PATH or set the PKG_CONFIG environment variable to the full

12563

-path to pkg-config.

12564

-

12565

-Alternatively, you may set the environment variables EMPATHY_CFLAGS

12566

-and EMPATHY_LIBS to avoid the need to call pkg-config.

12567

-See the pkg-config man page for more details.

12568

-

12569

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12570

-See \`config.log' for more details." >&5

12571

-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

12572

-is in your PATH or set the PKG_CONFIG environment variable to the full

12573

-path to pkg-config.

12574

-

12575

-Alternatively, you may set the environment variables EMPATHY_CFLAGS

12576

-and EMPATHY_LIBS to avoid the need to call pkg-config.

12577

-See the pkg-config man page for more details.

12578

-

12579

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12580

-See \`config.log' for more details." >&2;}

12581

- { (exit 1); exit 1; }; }; }

12582

+as_fn_error "The pkg-config script could not be found or is too old. Make sure it

12583

+is in your PATH or set the PKG_CONFIG environment variable to the full

12584

+path to pkg-config.

12585

+

12586

+Alternatively, you may set the environment variables EMPATHY_CFLAGS

12587

+and EMPATHY_LIBS to avoid the need to call pkg-config.

12588

+See the pkg-config man page for more details.

12589

+

12590

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12591

+See \`config.log' for more details." "$LINENO" 5; }

12592

else

12593

EMPATHY_CFLAGS=$pkg_cv_EMPATHY_CFLAGS

12594

EMPATHY_LIBS=$pkg_cv_EMPATHY_LIBS

12595

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12596

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

12597

$as_echo "yes" >&6; }

12598

:

12599

fi

12600

12601

12602

pkg_failed=no

12603

-{ $as_echo "$as_me:$LINENO: checking for LIBNOTIFY" >&5

12604

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5

12605

$as_echo_n "checking for LIBNOTIFY... " >&6; }

12606

12607

if test -n "$PKG_CONFIG"; then

12608

@@ -16353,11 +14567,11 @@

12609

pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"

12610

else

12611

if test -n "$PKG_CONFIG" && \

12612

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5

12613

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5

12614

($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5

12615

ac_status=$?

12616

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12617

- (exit $ac_status); }; then

12618

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12619

+ test $ac_status = 0; }; then

12620

pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`

12621

else

12622

pkg_failed=yes

12623

@@ -16371,11 +14585,11 @@

12624

pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"

12625

else

12626

if test -n "$PKG_CONFIG" && \

12627

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\"") >&5

12628

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED\""; } >&5

12629

($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED") 2>&5

12630

ac_status=$?

12631

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12632

- (exit $ac_status); }; then

12633

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12634

+ test $ac_status = 0; }; then

12635

pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED" 2>/dev/null`

12636

else

12637

pkg_failed=yes

12638

@@ -16402,57 +14616,34 @@

12639

# Put the nasty error message in config.log where it belongs

12640

echo "$LIBNOTIFY_PKG_ERRORS" >&5

12641

12642

- { { $as_echo "$as_me:$LINENO: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met:

12643

-

12644

-$LIBNOTIFY_PKG_ERRORS

12645

-

12646

-Consider adjusting the PKG_CONFIG_PATH environment variable if you

12647

-installed software in a non-standard prefix.

12648

-

12649

-Alternatively, you may set the environment variables LIBNOTIFY_CFLAGS

12650

-and LIBNOTIFY_LIBS to avoid the need to call pkg-config.

12651

-See the pkg-config man page for more details.

12652

-" >&5

12653

-$as_echo "$as_me: error: Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met:

12654

-

12655

-$LIBNOTIFY_PKG_ERRORS

12656

-

12657

-Consider adjusting the PKG_CONFIG_PATH environment variable if you

12658

-installed software in a non-standard prefix.

12659

-

12660

-Alternatively, you may set the environment variables LIBNOTIFY_CFLAGS

12661

-and LIBNOTIFY_LIBS to avoid the need to call pkg-config.

12662

-See the pkg-config man page for more details.

12663

-" >&2;}

12664

- { (exit 1); exit 1; }; }

12665

+ as_fn_error "Package requirements (libnotify >= $LIBNOTIFY_REQUIRED) were not met:

12666

+

12667

+$LIBNOTIFY_PKG_ERRORS

12668

+

12669

+Consider adjusting the PKG_CONFIG_PATH environment variable if you

12670

+installed software in a non-standard prefix.

12671

+

12672

+Alternatively, you may set the environment variables LIBNOTIFY_CFLAGS

12673

+and LIBNOTIFY_LIBS to avoid the need to call pkg-config.

12674

+See the pkg-config man page for more details.

12675

+" "$LINENO" 5

12676

elif test $pkg_failed = untried; then

12677

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

12678

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

12679

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

12680

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

12681

-is in your PATH or set the PKG_CONFIG environment variable to the full

12682

-path to pkg-config.

12683

-

12684

-Alternatively, you may set the environment variables LIBNOTIFY_CFLAGS

12685

-and LIBNOTIFY_LIBS to avoid the need to call pkg-config.

12686

-See the pkg-config man page for more details.

12687

-

12688

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12689

-See \`config.log' for more details." >&5

12690

-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

12691

-is in your PATH or set the PKG_CONFIG environment variable to the full

12692

-path to pkg-config.

12693

-

12694

-Alternatively, you may set the environment variables LIBNOTIFY_CFLAGS

12695

-and LIBNOTIFY_LIBS to avoid the need to call pkg-config.

12696

-See the pkg-config man page for more details.

12697

-

12698

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12699

-See \`config.log' for more details." >&2;}

12700

- { (exit 1); exit 1; }; }; }

12701

+as_fn_error "The pkg-config script could not be found or is too old. Make sure it

12702

+is in your PATH or set the PKG_CONFIG environment variable to the full

12703

+path to pkg-config.

12704

+

12705

+Alternatively, you may set the environment variables LIBNOTIFY_CFLAGS

12706

+and LIBNOTIFY_LIBS to avoid the need to call pkg-config.

12707

+See the pkg-config man page for more details.

12708

+

12709

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

12710

+See \`config.log' for more details." "$LINENO" 5; }

12711

else

12712

LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS

12713

LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS

12714

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12715

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

12716

$as_echo "yes" >&6; }

12717

:

12718

fi

12719

@@ -16462,7 +14653,7 @@

12720

# -----------------------------------------------------------

12721

12722

# Check whether --enable-debug was given.

12723

-if test "${enable_debug+set}" = set; then

12724

+if test "${enable_debug+set}" = set; then :

12725

enableval=$enable_debug; enable_debug=$enableval

12726

else

12727

enable_debug=yes

12728

@@ -16471,9 +14662,7 @@

12729

12730

if test x$enable_debug = xyes; then

12731

12732

-cat >>confdefs.h <<\_ACEOF

12733

-#define ENABLE_DEBUG /**/

12734

-_ACEOF

12735

+$as_echo "#define ENABLE_DEBUG /**/" >>confdefs.h

12736

12737

fi

12738

12739

@@ -16490,151 +14679,12 @@

12740

12741

12742

12743

-

12744

-for ac_header in locale.h

12745

-do

12746

-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

12747

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

12748

- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

12749

-$as_echo_n "checking for $ac_header... " >&6; }

12750

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

12751

- $as_echo_n "(cached) " >&6

12752

-fi

12753

-ac_res=`eval 'as_val=${'$as_ac_Header'}

12754

- $as_echo "$as_val"'`

12755

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

12756

-$as_echo "$ac_res" >&6; }

12757

-else

12758

- # Is the header compilable?

12759

-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5

12760

-$as_echo_n "checking $ac_header usability... " >&6; }

12761

-cat >conftest.$ac_ext <<_ACEOF

12762

-/* confdefs.h. */

12763

-_ACEOF

12764

-cat confdefs.h >>conftest.$ac_ext

12765

-cat >>conftest.$ac_ext <<_ACEOF

12766

-/* end confdefs.h. */

12767

-$ac_includes_default

12768

-#include <$ac_header>

12769

-_ACEOF

12770

-rm -f conftest.$ac_objext

12771

-if { (ac_try="$ac_compile"

12772

-case "(($ac_try" in

12773

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12774

- *) ac_try_echo=$ac_try;;

12775

-esac

12776

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

12777

-$as_echo "$ac_try_echo") >&5

12778

- (eval "$ac_compile") 2>conftest.er1

12779

- ac_status=$?

12780

- grep -v '^ *+' conftest.er1 >conftest.err

12781

- rm -f conftest.er1

12782

- cat conftest.err >&5

12783

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12784

- (exit $ac_status); } && {

12785

- test -z "$ac_c_werror_flag" ||

12786

- test ! -s conftest.err

12787

- } && test -s conftest.$ac_objext; then

12788

- ac_header_compiler=yes

12789

-else

12790

- $as_echo "$as_me: failed program was:" >&5

12791

-sed 's/^/| /' conftest.$ac_ext >&5

12792

-

12793

- ac_header_compiler=no

12794

-fi

12795

-

12796

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12797

-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

12798

-$as_echo "$ac_header_compiler" >&6; }

12799

-

12800

-# Is the header present?

12801

-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5

12802

-$as_echo_n "checking $ac_header presence... " >&6; }

12803

-cat >conftest.$ac_ext <<_ACEOF

12804

-/* confdefs.h. */

12805

-_ACEOF

12806

-cat confdefs.h >>conftest.$ac_ext

12807

-cat >>conftest.$ac_ext <<_ACEOF

12808

-/* end confdefs.h. */

12809

-#include <$ac_header>

12810

-_ACEOF

12811

-if { (ac_try="$ac_cpp conftest.$ac_ext"

12812

-case "(($ac_try" in

12813

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12814

- *) ac_try_echo=$ac_try;;

12815

-esac

12816

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

12817

-$as_echo "$ac_try_echo") >&5

12818

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

12819

- ac_status=$?

12820

- grep -v '^ *+' conftest.er1 >conftest.err

12821

- rm -f conftest.er1

12822

- cat conftest.err >&5

12823

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12824

- (exit $ac_status); } >/dev/null && {

12825

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

12826

- test ! -s conftest.err

12827

- }; then

12828

- ac_header_preproc=yes

12829

-else

12830

- $as_echo "$as_me: failed program was:" >&5

12831

-sed 's/^/| /' conftest.$ac_ext >&5

12832

-

12833

- ac_header_preproc=no

12834

-fi

12835

-

12836

-rm -f conftest.err conftest.$ac_ext

12837

-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

12838

-$as_echo "$ac_header_preproc" >&6; }

12839

-

12840

-# So? What about this header?

12841

-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

12842

- yes:no: )

12843

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

12844

-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

12845

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

12846

-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

12847

- ac_header_preproc=yes

12848

- ;;

12849

- no:yes:* )

12850

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

12851

-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

12852

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5

12853

-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}

12854

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5

12855

-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}

12856

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5

12857

-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}

12858

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

12859

-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

12860

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

12861

-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

12862

- ( cat <<\_ASBOX

12863

-## ------------------------------------------------------------------- ##

12864

-## Report this to http://bugzilla.gnome.org/browse.cgi?product=empathy ##

12865

-## ------------------------------------------------------------------- ##

12866

-_ASBOX

12867

- ) | sed "s/^/$as_me: WARNING: /" >&2

12868

- ;;

12869

-esac

12870

-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

12871

-$as_echo_n "checking for $ac_header... " >&6; }

12872

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

12873

- $as_echo_n "(cached) " >&6

12874

-else

12875

- eval "$as_ac_Header=\$ac_header_preproc"

12876

-fi

12877

-ac_res=`eval 'as_val=${'$as_ac_Header'}

12878

- $as_echo "$as_val"'`

12879

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

12880

-$as_echo "$ac_res" >&6; }

12881

-

12882

-fi

12883

-as_val=`eval 'as_val=${'$as_ac_Header'}

12884

- $as_echo "$as_val"'`

12885

- if test "x$as_val" = x""yes; then

12886

+ for ac_header in locale.h

12887

+do :

12888

+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"

12889

+if test "x$ac_cv_header_locale_h" = x""yes; then :

12890

cat >>confdefs.h <<_ACEOF

12891

-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

12892

+#define HAVE_LOCALE_H 1

12893

_ACEOF

12894

12895

fi

12896

@@ -16642,16 +14692,12 @@

12897

done

12898

12899

if test $ac_cv_header_locale_h = yes; then

12900

- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5

12901

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5

12902

$as_echo_n "checking for LC_MESSAGES... " >&6; }

12903

-if test "${am_cv_val_LC_MESSAGES+set}" = set; then

12904

+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :

12905

$as_echo_n "(cached) " >&6

12906

else

12907

- cat >conftest.$ac_ext <<_ACEOF

12908

-/* confdefs.h. */

12909

-_ACEOF

12910

-cat confdefs.h >>conftest.$ac_ext

12911

-cat >>conftest.$ac_ext <<_ACEOF

12912

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

12913

/* end confdefs.h. */

12914

#include <locale.h>

12915

int

12916

@@ -16662,46 +14708,19 @@

12917

return 0;

12918

}

12919

_ACEOF

12920

-rm -f conftest.$ac_objext conftest$ac_exeext

12921

-if { (ac_try="$ac_link"

12922

-case "(($ac_try" in

12923

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12924

- *) ac_try_echo=$ac_try;;

12925

-esac

12926

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

12927

-$as_echo "$ac_try_echo") >&5

12928

- (eval "$ac_link") 2>conftest.er1

12929

- ac_status=$?

12930

- grep -v '^ *+' conftest.er1 >conftest.err

12931

- rm -f conftest.er1

12932

- cat conftest.err >&5

12933

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12934

- (exit $ac_status); } && {

12935

- test -z "$ac_c_werror_flag" ||

12936

- test ! -s conftest.err

12937

- } && test -s conftest$ac_exeext && {

12938

- test "$cross_compiling" = yes ||

12939

- $as_test_x conftest$ac_exeext

12940

- }; then

12941

+if ac_fn_c_try_link "$LINENO"; then :

12942

am_cv_val_LC_MESSAGES=yes

12943

else

12944

- $as_echo "$as_me: failed program was:" >&5

12945

-sed 's/^/| /' conftest.$ac_ext >&5

12946

-

12947

- am_cv_val_LC_MESSAGES=no

12948

-fi

12949

-

12950

-rm -rf conftest.dSYM

12951

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12952

- conftest$ac_exeext conftest.$ac_ext

12953

-fi

12954

-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5

12955

+ am_cv_val_LC_MESSAGES=no

12956

+fi

12957

+rm -f core conftest.err conftest.$ac_objext \

12958

+ conftest$ac_exeext conftest.$ac_ext

12959

+fi

12960

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5

12961

$as_echo "$am_cv_val_LC_MESSAGES" >&6; }

12962

if test $am_cv_val_LC_MESSAGES = yes; then

12963

12964

-cat >>confdefs.h <<\_ACEOF

12965

-#define HAVE_LC_MESSAGES 1

12966

-_ACEOF

12967

+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h

12968

12969

fi

12970

fi

12971

@@ -16714,155 +14733,20 @@

12972

XGETTEXT=:

12973

INTLLIBS=

12974

12975

- if test "${ac_cv_header_libintl_h+set}" = set; then

12976

- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5

12977

-$as_echo_n "checking for libintl.h... " >&6; }

12978

-if test "${ac_cv_header_libintl_h+set}" = set; then

12979

- $as_echo_n "(cached) " >&6

12980

-fi

12981

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

12982

-$as_echo "$ac_cv_header_libintl_h" >&6; }

12983

-else

12984

- # Is the header compilable?

12985

-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5

12986

-$as_echo_n "checking libintl.h usability... " >&6; }

12987

-cat >conftest.$ac_ext <<_ACEOF

12988

-/* confdefs.h. */

12989

-_ACEOF

12990

-cat confdefs.h >>conftest.$ac_ext

12991

-cat >>conftest.$ac_ext <<_ACEOF

12992

-/* end confdefs.h. */

12993

-$ac_includes_default

12994

-#include <libintl.h>

12995

-_ACEOF

12996

-rm -f conftest.$ac_objext

12997

-if { (ac_try="$ac_compile"

12998

-case "(($ac_try" in

12999

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13000

- *) ac_try_echo=$ac_try;;

13001

-esac

13002

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13003

-$as_echo "$ac_try_echo") >&5

13004

- (eval "$ac_compile") 2>conftest.er1

13005

- ac_status=$?

13006

- grep -v '^ *+' conftest.er1 >conftest.err

13007

- rm -f conftest.er1

13008

- cat conftest.err >&5

13009

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13010

- (exit $ac_status); } && {

13011

- test -z "$ac_c_werror_flag" ||

13012

- test ! -s conftest.err

13013

- } && test -s conftest.$ac_objext; then

13014

- ac_header_compiler=yes

13015

-else

13016

- $as_echo "$as_me: failed program was:" >&5

13017

-sed 's/^/| /' conftest.$ac_ext >&5

13018

-

13019

- ac_header_compiler=no

13020

-fi

13021

-

13022

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

13023

-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

13024

-$as_echo "$ac_header_compiler" >&6; }

13025

-

13026

-# Is the header present?

13027

-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5

13028

-$as_echo_n "checking libintl.h presence... " >&6; }

13029

-cat >conftest.$ac_ext <<_ACEOF

13030

-/* confdefs.h. */

13031

-_ACEOF

13032

-cat confdefs.h >>conftest.$ac_ext

13033

-cat >>conftest.$ac_ext <<_ACEOF

13034

-/* end confdefs.h. */

13035

-#include <libintl.h>

13036

-_ACEOF

13037

-if { (ac_try="$ac_cpp conftest.$ac_ext"

13038

-case "(($ac_try" in

13039

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13040

- *) ac_try_echo=$ac_try;;

13041

-esac

13042

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13043

-$as_echo "$ac_try_echo") >&5

13044

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

13045

- ac_status=$?

13046

- grep -v '^ *+' conftest.er1 >conftest.err

13047

- rm -f conftest.er1

13048

- cat conftest.err >&5

13049

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13050

- (exit $ac_status); } >/dev/null && {

13051

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

13052

- test ! -s conftest.err

13053

- }; then

13054

- ac_header_preproc=yes

13055

-else

13056

- $as_echo "$as_me: failed program was:" >&5

13057

-sed 's/^/| /' conftest.$ac_ext >&5

13058

-

13059

- ac_header_preproc=no

13060

-fi

13061

-

13062

-rm -f conftest.err conftest.$ac_ext

13063

-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

13064

-$as_echo "$ac_header_preproc" >&6; }

13065

-

13066

-# So? What about this header?

13067

-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

13068

- yes:no: )

13069

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5

13070

-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

13071

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5

13072

-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}

13073

- ac_header_preproc=yes

13074

- ;;

13075

- no:yes:* )

13076

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5

13077

-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}

13078

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5

13079

-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}

13080

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5

13081

-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}

13082

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5

13083

-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}

13084

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5

13085

-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}

13086

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5

13087

-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}

13088

- ( cat <<\_ASBOX

13089

-## ------------------------------------------------------------------- ##

13090

-## Report this to http://bugzilla.gnome.org/browse.cgi?product=empathy ##

13091

-## ------------------------------------------------------------------- ##

13092

-_ASBOX

13093

- ) | sed "s/^/$as_me: WARNING: /" >&2

13094

- ;;

13095

-esac

13096

-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5

13097

-$as_echo_n "checking for libintl.h... " >&6; }

13098

-if test "${ac_cv_header_libintl_h+set}" = set; then

13099

- $as_echo_n "(cached) " >&6

13100

-else

13101

- ac_cv_header_libintl_h=$ac_header_preproc

13102

-fi

13103

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

13104

-$as_echo "$ac_cv_header_libintl_h" >&6; }

13105

-

13106

-fi

13107

-if test "x$ac_cv_header_libintl_h" = x""yes; then

13108

+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"

13109

+if test "x$ac_cv_header_libintl_h" = x""yes; then :

13110

gt_cv_func_dgettext_libintl="no"

13111

libintl_extra_libs=""

13112

13113

#

13114

# First check in libc

13115

#

13116

- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5

13117

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5

13118

$as_echo_n "checking for ngettext in libc... " >&6; }

13119

-if test "${gt_cv_func_ngettext_libc+set}" = set; then

13120

+if test "${gt_cv_func_ngettext_libc+set}" = set; then :

13121

$as_echo_n "(cached) " >&6

13122

else

13123

- cat >conftest.$ac_ext <<_ACEOF

13124

-/* confdefs.h. */

13125

-_ACEOF

13126

-cat confdefs.h >>conftest.$ac_ext

13127

-cat >>conftest.$ac_ext <<_ACEOF

13128

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13129

/* end confdefs.h. */

13130

13131

#include <libintl.h>

13132

@@ -16875,54 +14759,25 @@

13133

return 0;

13134

}

13135

_ACEOF

13136

-rm -f conftest.$ac_objext conftest$ac_exeext

13137

-if { (ac_try="$ac_link"

13138

-case "(($ac_try" in

13139

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13140

- *) ac_try_echo=$ac_try;;

13141

-esac

13142

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13143

-$as_echo "$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

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13150

- (exit $ac_status); } && {

13151

- test -z "$ac_c_werror_flag" ||

13152

- test ! -s conftest.err

13153

- } && test -s conftest$ac_exeext && {

13154

- test "$cross_compiling" = yes ||

13155

- $as_test_x conftest$ac_exeext

13156

- }; then

13157

+if ac_fn_c_try_link "$LINENO"; then :

13158

gt_cv_func_ngettext_libc=yes

13159

else

13160

- $as_echo "$as_me: failed program was:" >&5

13161

-sed 's/^/| /' conftest.$ac_ext >&5

13162

-

13163

- gt_cv_func_ngettext_libc=no

13164

-fi

13165

-

13166

-rm -rf conftest.dSYM

13167

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13168

- conftest$ac_exeext conftest.$ac_ext

13169

-

13170

-fi

13171

-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5

13172

+ gt_cv_func_ngettext_libc=no

13173

+fi

13174

+rm -f core conftest.err conftest.$ac_objext \

13175

+ conftest$ac_exeext conftest.$ac_ext

13176

+

13177

+fi

13178

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5

13179

$as_echo "$gt_cv_func_ngettext_libc" >&6; }

13180

13181

if test "$gt_cv_func_ngettext_libc" = "yes" ; then

13182

- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5

13183

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5

13184

$as_echo_n "checking for dgettext in libc... " >&6; }

13185

-if test "${gt_cv_func_dgettext_libc+set}" = set; then

13186

+if test "${gt_cv_func_dgettext_libc+set}" = set; then :

13187

$as_echo_n "(cached) " >&6

13188

else

13189

- cat >conftest.$ac_ext <<_ACEOF

13190

-/* confdefs.h. */

13191

-_ACEOF

13192

-cat confdefs.h >>conftest.$ac_ext

13193

-cat >>conftest.$ac_ext <<_ACEOF

13194

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13195

/* end confdefs.h. */

13196

13197

#include <libintl.h>

13198

@@ -16935,141 +14790,26 @@

13199

return 0;

13200

}

13201

_ACEOF

13202

-rm -f conftest.$ac_objext conftest$ac_exeext

13203

-if { (ac_try="$ac_link"

13204

-case "(($ac_try" in

13205

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13206

- *) ac_try_echo=$ac_try;;

13207

-esac

13208

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13209

-$as_echo "$ac_try_echo") >&5

13210

- (eval "$ac_link") 2>conftest.er1

13211

- ac_status=$?

13212

- grep -v '^ *+' conftest.er1 >conftest.err

13213

- rm -f conftest.er1

13214

- cat conftest.err >&5

13215

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13216

- (exit $ac_status); } && {

13217

- test -z "$ac_c_werror_flag" ||

13218

- test ! -s conftest.err

13219

- } && test -s conftest$ac_exeext && {

13220

- test "$cross_compiling" = yes ||

13221

- $as_test_x conftest$ac_exeext

13222

- }; then

13223

+if ac_fn_c_try_link "$LINENO"; then :

13224

gt_cv_func_dgettext_libc=yes

13225

else

13226

- $as_echo "$as_me: failed program was:" >&5

13227

-sed 's/^/| /' conftest.$ac_ext >&5

13228

-

13229

- gt_cv_func_dgettext_libc=no

13230

-fi

13231

-

13232

-rm -rf conftest.dSYM

13233

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13234

- conftest$ac_exeext conftest.$ac_ext

13235

-

13236

-fi

13237

-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5

13238

+ gt_cv_func_dgettext_libc=no

13239

+fi

13240

+rm -f core conftest.err conftest.$ac_objext \

13241

+ conftest$ac_exeext conftest.$ac_ext

13242

+

13243

+fi

13244

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5

13245

$as_echo "$gt_cv_func_dgettext_libc" >&6; }

13246

fi

13247

13248

if test "$gt_cv_func_ngettext_libc" = "yes" ; then

13249

-

13250

-for ac_func in bind_textdomain_codeset

13251

-do

13252

-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

13253

-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

13254

-$as_echo_n "checking for $ac_func... " >&6; }

13255

-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

13256

- $as_echo_n "(cached) " >&6

13257

-else

13258

- cat >conftest.$ac_ext <<_ACEOF

13259

-/* confdefs.h. */

13260

-_ACEOF

13261

-cat confdefs.h >>conftest.$ac_ext

13262

-cat >>conftest.$ac_ext <<_ACEOF

13263

-/* end confdefs.h. */

13264

-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

13265

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

13266

-#define $ac_func innocuous_$ac_func

13267

-

13268

-/* System header to define __stub macros and hopefully few prototypes,

13269

- which can conflict with char $ac_func (); below.

13270

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

13271

- <limits.h> exists even on freestanding compilers. */

13272

-

13273

-#ifdef __STDC__

13274

-# include <limits.h>

13275

-#else

13276

-# include <assert.h>

13277

-#endif

13278

-

13279

-#undef $ac_func

13280

-

13281

-/* Override any GCC internal prototype to avoid an error.

13282

- Use char because int might match the return type of a GCC

13283

- builtin and then its argument prototype would still apply. */

13284

-#ifdef __cplusplus

13285

-extern "C"

13286

-#endif

13287

-char $ac_func ();

13288

-/* The GNU C library defines this for functions which it implements

13289

- to always fail with ENOSYS. Some functions are actually named

13290

- something starting with __ and the normal name is an alias. */

13291

-#if defined __stub_$ac_func || defined __stub___$ac_func

13292

-choke me

13293

-#endif

13294

-

13295

-int

13296

-main ()

13297

-{

13298

-return $ac_func ();

13299

- ;

13300

- return 0;

13301

-}

13302

-_ACEOF

13303

-rm -f conftest.$ac_objext conftest$ac_exeext

13304

-if { (ac_try="$ac_link"

13305

-case "(($ac_try" in

13306

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13307

- *) ac_try_echo=$ac_try;;

13308

-esac

13309

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13310

-$as_echo "$ac_try_echo") >&5

13311

- (eval "$ac_link") 2>conftest.er1

13312

- ac_status=$?

13313

- grep -v '^ *+' conftest.er1 >conftest.err

13314

- rm -f conftest.er1

13315

- cat conftest.err >&5

13316

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13317

- (exit $ac_status); } && {

13318

- test -z "$ac_c_werror_flag" ||

13319

- test ! -s conftest.err

13320

- } && test -s conftest$ac_exeext && {

13321

- test "$cross_compiling" = yes ||

13322

- $as_test_x conftest$ac_exeext

13323

- }; then

13324

- eval "$as_ac_var=yes"

13325

-else

13326

- $as_echo "$as_me: failed program was:" >&5

13327

-sed 's/^/| /' conftest.$ac_ext >&5

13328

-

13329

- eval "$as_ac_var=no"

13330

-fi

13331

-

13332

-rm -rf conftest.dSYM

13333

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13334

- conftest$ac_exeext conftest.$ac_ext

13335

-fi

13336

-ac_res=`eval 'as_val=${'$as_ac_var'}

13337

- $as_echo "$as_val"'`

13338

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

13339

-$as_echo "$ac_res" >&6; }

13340

-as_val=`eval 'as_val=${'$as_ac_var'}

13341

- $as_echo "$as_val"'`

13342

- if test "x$as_val" = x""yes; then

13343

+ for ac_func in bind_textdomain_codeset

13344

+do :

13345

+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"

13346

+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :

13347

cat >>confdefs.h <<_ACEOF

13348

-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

13349

+#define HAVE_BIND_TEXTDOMAIN_CODESET 1

13350

_ACEOF

13351

13352

fi

13353

@@ -17084,18 +14824,14 @@

13354

|| test "$gt_cv_func_ngettext_libc" != "yes" \

13355

|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then

13356

13357

- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5

13358

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5

13359

$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }

13360

-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then

13361

+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :

13362

$as_echo_n "(cached) " >&6

13363

else

13364

ac_check_lib_save_LIBS=$LIBS

13365

LIBS="-lintl $LIBS"

13366

-cat >conftest.$ac_ext <<_ACEOF

13367

-/* confdefs.h. */

13368

-_ACEOF

13369

-cat confdefs.h >>conftest.$ac_ext

13370

-cat >>conftest.$ac_ext <<_ACEOF

13371

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13372

/* end confdefs.h. */

13373

13374

/* Override any GCC internal prototype to avoid an error.

13375

@@ -17113,55 +14849,26 @@

13376

return 0;

13377

}

13378

_ACEOF

13379

-rm -f conftest.$ac_objext conftest$ac_exeext

13380

-if { (ac_try="$ac_link"

13381

-case "(($ac_try" in

13382

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13383

- *) ac_try_echo=$ac_try;;

13384

-esac

13385

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13386

-$as_echo "$ac_try_echo") >&5

13387

- (eval "$ac_link") 2>conftest.er1

13388

- ac_status=$?

13389

- grep -v '^ *+' conftest.er1 >conftest.err

13390

- rm -f conftest.er1

13391

- cat conftest.err >&5

13392

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13393

- (exit $ac_status); } && {

13394

- test -z "$ac_c_werror_flag" ||

13395

- test ! -s conftest.err

13396

- } && test -s conftest$ac_exeext && {

13397

- test "$cross_compiling" = yes ||

13398

- $as_test_x conftest$ac_exeext

13399

- }; then

13400

+if ac_fn_c_try_link "$LINENO"; then :

13401

ac_cv_lib_intl_bindtextdomain=yes

13402

else

13403

- $as_echo "$as_me: failed program was:" >&5

13404

-sed 's/^/| /' conftest.$ac_ext >&5

13405

-

13406

- ac_cv_lib_intl_bindtextdomain=no

13407

+ ac_cv_lib_intl_bindtextdomain=no

13408

fi

13409

-

13410

-rm -rf conftest.dSYM

13411

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13412

- conftest$ac_exeext conftest.$ac_ext

13413

+rm -f core conftest.err conftest.$ac_objext \

13414

+ conftest$ac_exeext conftest.$ac_ext

13415

LIBS=$ac_check_lib_save_LIBS

13416

fi

13417

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5

13418

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5

13419

$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }

13420

-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then

13421

- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

13422

+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :

13423

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5

13424

$as_echo_n "checking for ngettext in -lintl... " >&6; }

13425

-if test "${ac_cv_lib_intl_ngettext+set}" = set; then

13426

+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :

13427

$as_echo_n "(cached) " >&6

13428

else

13429

ac_check_lib_save_LIBS=$LIBS

13430

LIBS="-lintl $LIBS"

13431

-cat >conftest.$ac_ext <<_ACEOF

13432

-/* confdefs.h. */

13433

-_ACEOF

13434

-cat confdefs.h >>conftest.$ac_ext

13435

-cat >>conftest.$ac_ext <<_ACEOF

13436

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13437

/* end confdefs.h. */

13438

13439

/* Override any GCC internal prototype to avoid an error.

13440

@@ -17179,55 +14886,26 @@

13441

return 0;

13442

}

13443

_ACEOF

13444

-rm -f conftest.$ac_objext conftest$ac_exeext

13445

-if { (ac_try="$ac_link"

13446

-case "(($ac_try" in

13447

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13448

- *) ac_try_echo=$ac_try;;

13449

-esac

13450

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13451

-$as_echo "$ac_try_echo") >&5

13452

- (eval "$ac_link") 2>conftest.er1

13453

- ac_status=$?

13454

- grep -v '^ *+' conftest.er1 >conftest.err

13455

- rm -f conftest.er1

13456

- cat conftest.err >&5

13457

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13458

- (exit $ac_status); } && {

13459

- test -z "$ac_c_werror_flag" ||

13460

- test ! -s conftest.err

13461

- } && test -s conftest$ac_exeext && {

13462

- test "$cross_compiling" = yes ||

13463

- $as_test_x conftest$ac_exeext

13464

- }; then

13465

+if ac_fn_c_try_link "$LINENO"; then :

13466

ac_cv_lib_intl_ngettext=yes

13467

else

13468

- $as_echo "$as_me: failed program was:" >&5

13469

-sed 's/^/| /' conftest.$ac_ext >&5

13470

-

13471

- ac_cv_lib_intl_ngettext=no

13472

+ ac_cv_lib_intl_ngettext=no

13473

fi

13474

-

13475

-rm -rf conftest.dSYM

13476

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13477

- conftest$ac_exeext conftest.$ac_ext

13478

+rm -f core conftest.err conftest.$ac_objext \

13479

+ conftest$ac_exeext conftest.$ac_ext

13480

LIBS=$ac_check_lib_save_LIBS

13481

fi

13482

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

13483

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5

13484

$as_echo "$ac_cv_lib_intl_ngettext" >&6; }

13485

-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then

13486

- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5

13487

+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :

13488

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5

13489

$as_echo_n "checking for dgettext in -lintl... " >&6; }

13490

-if test "${ac_cv_lib_intl_dgettext+set}" = set; then

13491

+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :

13492

$as_echo_n "(cached) " >&6

13493

else

13494

ac_check_lib_save_LIBS=$LIBS

13495

LIBS="-lintl $LIBS"

13496

-cat >conftest.$ac_ext <<_ACEOF

13497

-/* confdefs.h. */

13498

-_ACEOF

13499

-cat confdefs.h >>conftest.$ac_ext

13500

-cat >>conftest.$ac_ext <<_ACEOF

13501

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13502

/* end confdefs.h. */

13503

13504

/* Override any GCC internal prototype to avoid an error.

13505

@@ -17245,43 +14923,18 @@

13506

return 0;

13507

}

13508

_ACEOF

13509

-rm -f conftest.$ac_objext conftest$ac_exeext

13510

-if { (ac_try="$ac_link"

13511

-case "(($ac_try" in

13512

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13513

- *) ac_try_echo=$ac_try;;

13514

-esac

13515

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13516

-$as_echo "$ac_try_echo") >&5

13517

- (eval "$ac_link") 2>conftest.er1

13518

- ac_status=$?

13519

- grep -v '^ *+' conftest.er1 >conftest.err

13520

- rm -f conftest.er1

13521

- cat conftest.err >&5

13522

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13523

- (exit $ac_status); } && {

13524

- test -z "$ac_c_werror_flag" ||

13525

- test ! -s conftest.err

13526

- } && test -s conftest$ac_exeext && {

13527

- test "$cross_compiling" = yes ||

13528

- $as_test_x conftest$ac_exeext

13529

- }; then

13530

+if ac_fn_c_try_link "$LINENO"; then :

13531

ac_cv_lib_intl_dgettext=yes

13532

else

13533

- $as_echo "$as_me: failed program was:" >&5

13534

-sed 's/^/| /' conftest.$ac_ext >&5

13535

-

13536

- ac_cv_lib_intl_dgettext=no

13537

+ ac_cv_lib_intl_dgettext=no

13538

fi

13539

-

13540

-rm -rf conftest.dSYM

13541

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13542

- conftest$ac_exeext conftest.$ac_ext

13543

+rm -f core conftest.err conftest.$ac_objext \

13544

+ conftest$ac_exeext conftest.$ac_ext

13545

LIBS=$ac_check_lib_save_LIBS

13546

fi

13547

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5

13548

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5

13549

$as_echo "$ac_cv_lib_intl_dgettext" >&6; }

13550

-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then

13551

+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :

13552

gt_cv_func_dgettext_libintl=yes

13553

fi

13554

13555

@@ -17291,22 +14944,18 @@

13556

13557

13558

if test "$gt_cv_func_dgettext_libintl" != "yes" ; then

13559

- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5

13560

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5

13561

$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }

13562

- { $as_echo "$as_me:$LINENO: result: " >&5

13563

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5

13564

$as_echo "" >&6; }

13565

- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

13566

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5

13567

$as_echo_n "checking for ngettext in -lintl... " >&6; }

13568

-if test "${ac_cv_lib_intl_ngettext+set}" = set; then

13569

+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :

13570

$as_echo_n "(cached) " >&6

13571

else

13572

ac_check_lib_save_LIBS=$LIBS

13573

LIBS="-lintl -liconv $LIBS"

13574

-cat >conftest.$ac_ext <<_ACEOF

13575

-/* confdefs.h. */

13576

-_ACEOF

13577

-cat confdefs.h >>conftest.$ac_ext

13578

-cat >>conftest.$ac_ext <<_ACEOF

13579

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13580

/* end confdefs.h. */

13581

13582

/* Override any GCC internal prototype to avoid an error.

13583

@@ -17324,55 +14973,26 @@

13584

return 0;

13585

}

13586

_ACEOF

13587

-rm -f conftest.$ac_objext conftest$ac_exeext

13588

-if { (ac_try="$ac_link"

13589

-case "(($ac_try" in

13590

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13591

- *) ac_try_echo=$ac_try;;

13592

-esac

13593

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13594

-$as_echo "$ac_try_echo") >&5

13595

- (eval "$ac_link") 2>conftest.er1

13596

- ac_status=$?

13597

- grep -v '^ *+' conftest.er1 >conftest.err

13598

- rm -f conftest.er1

13599

- cat conftest.err >&5

13600

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13601

- (exit $ac_status); } && {

13602

- test -z "$ac_c_werror_flag" ||

13603

- test ! -s conftest.err

13604

- } && test -s conftest$ac_exeext && {

13605

- test "$cross_compiling" = yes ||

13606

- $as_test_x conftest$ac_exeext

13607

- }; then

13608

+if ac_fn_c_try_link "$LINENO"; then :

13609

ac_cv_lib_intl_ngettext=yes

13610

else

13611

- $as_echo "$as_me: failed program was:" >&5

13612

-sed 's/^/| /' conftest.$ac_ext >&5

13613

-

13614

- ac_cv_lib_intl_ngettext=no

13615

+ ac_cv_lib_intl_ngettext=no

13616

fi

13617

-

13618

-rm -rf conftest.dSYM

13619

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13620

- conftest$ac_exeext conftest.$ac_ext

13621

+rm -f core conftest.err conftest.$ac_objext \

13622

+ conftest$ac_exeext conftest.$ac_ext

13623

LIBS=$ac_check_lib_save_LIBS

13624

fi

13625

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

13626

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5

13627

$as_echo "$ac_cv_lib_intl_ngettext" >&6; }

13628

-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then

13629

- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5

13630

+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :

13631

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5

13632

$as_echo_n "checking for dcgettext in -lintl... " >&6; }

13633

-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then

13634

+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :

13635

$as_echo_n "(cached) " >&6

13636

else

13637

ac_check_lib_save_LIBS=$LIBS

13638

LIBS="-lintl -liconv $LIBS"

13639

-cat >conftest.$ac_ext <<_ACEOF

13640

-/* confdefs.h. */

13641

-_ACEOF

13642

-cat confdefs.h >>conftest.$ac_ext

13643

-cat >>conftest.$ac_ext <<_ACEOF

13644

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

13645

/* end confdefs.h. */

13646

13647

/* Override any GCC internal prototype to avoid an error.

13648

@@ -17390,43 +15010,18 @@

13649

return 0;

13650

}

13651

_ACEOF

13652

-rm -f conftest.$ac_objext conftest$ac_exeext

13653

-if { (ac_try="$ac_link"

13654

-case "(($ac_try" in

13655

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13656

- *) ac_try_echo=$ac_try;;

13657

-esac

13658

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13659

-$as_echo "$ac_try_echo") >&5

13660

- (eval "$ac_link") 2>conftest.er1

13661

- ac_status=$?

13662

- grep -v '^ *+' conftest.er1 >conftest.err

13663

- rm -f conftest.er1

13664

- cat conftest.err >&5

13665

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13666

- (exit $ac_status); } && {

13667

- test -z "$ac_c_werror_flag" ||

13668

- test ! -s conftest.err

13669

- } && test -s conftest$ac_exeext && {

13670

- test "$cross_compiling" = yes ||

13671

- $as_test_x conftest$ac_exeext

13672

- }; then

13673

+if ac_fn_c_try_link "$LINENO"; then :

13674

ac_cv_lib_intl_dcgettext=yes

13675

else

13676

- $as_echo "$as_me: failed program was:" >&5

13677

-sed 's/^/| /' conftest.$ac_ext >&5

13678

-

13679

- ac_cv_lib_intl_dcgettext=no

13680

+ ac_cv_lib_intl_dcgettext=no

13681

fi

13682

-

13683

-rm -rf conftest.dSYM

13684

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13685

- conftest$ac_exeext conftest.$ac_ext

13686

+rm -f core conftest.err conftest.$ac_objext \

13687

+ conftest$ac_exeext conftest.$ac_ext

13688

LIBS=$ac_check_lib_save_LIBS

13689

fi

13690

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5

13691

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5

13692

$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }

13693

-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then

13694

+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :

13695

gt_cv_func_dgettext_libintl=yes

13696

libintl_extra_libs=-liconv

13697

else

13698

@@ -17448,102 +15043,12 @@

13699

glib_save_LIBS="$LIBS"

13700

LIBS="$LIBS -lintl $libintl_extra_libs"

13701

unset ac_cv_func_bind_textdomain_codeset

13702

-

13703

-for ac_func in bind_textdomain_codeset

13704

-do

13705

-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

13706

-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

13707

-$as_echo_n "checking for $ac_func... " >&6; }

13708

-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

13709

- $as_echo_n "(cached) " >&6

13710

-else

13711

- cat >conftest.$ac_ext <<_ACEOF

13712

-/* confdefs.h. */

13713

-_ACEOF

13714

-cat confdefs.h >>conftest.$ac_ext

13715

-cat >>conftest.$ac_ext <<_ACEOF

13716

-/* end confdefs.h. */

13717

-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

13718

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

13719

-#define $ac_func innocuous_$ac_func

13720

-

13721

-/* System header to define __stub macros and hopefully few prototypes,

13722

- which can conflict with char $ac_func (); below.

13723

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

13724

- <limits.h> exists even on freestanding compilers. */

13725

-

13726

-#ifdef __STDC__

13727

-# include <limits.h>

13728

-#else

13729

-# include <assert.h>

13730

-#endif

13731

-

13732

-#undef $ac_func

13733

-

13734

-/* Override any GCC internal prototype to avoid an error.

13735

- Use char because int might match the return type of a GCC

13736

- builtin and then its argument prototype would still apply. */

13737

-#ifdef __cplusplus

13738

-extern "C"

13739

-#endif

13740

-char $ac_func ();

13741

-/* The GNU C library defines this for functions which it implements

13742

- to always fail with ENOSYS. Some functions are actually named

13743

- something starting with __ and the normal name is an alias. */

13744

-#if defined __stub_$ac_func || defined __stub___$ac_func

13745

-choke me

13746

-#endif

13747

-

13748

-int

13749

-main ()

13750

-{

13751

-return $ac_func ();

13752

- ;

13753

- return 0;

13754

-}

13755

-_ACEOF

13756

-rm -f conftest.$ac_objext conftest$ac_exeext

13757

-if { (ac_try="$ac_link"

13758

-case "(($ac_try" in

13759

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13760

- *) ac_try_echo=$ac_try;;

13761

-esac

13762

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13763

-$as_echo "$ac_try_echo") >&5

13764

- (eval "$ac_link") 2>conftest.er1

13765

- ac_status=$?

13766

- grep -v '^ *+' conftest.er1 >conftest.err

13767

- rm -f conftest.er1

13768

- cat conftest.err >&5

13769

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13770

- (exit $ac_status); } && {

13771

- test -z "$ac_c_werror_flag" ||

13772

- test ! -s conftest.err

13773

- } && test -s conftest$ac_exeext && {

13774

- test "$cross_compiling" = yes ||

13775

- $as_test_x conftest$ac_exeext

13776

- }; then

13777

- eval "$as_ac_var=yes"

13778

-else

13779

- $as_echo "$as_me: failed program was:" >&5

13780

-sed 's/^/| /' conftest.$ac_ext >&5

13781

-

13782

- eval "$as_ac_var=no"

13783

-fi

13784

-

13785

-rm -rf conftest.dSYM

13786

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13787

- conftest$ac_exeext conftest.$ac_ext

13788

-fi

13789

-ac_res=`eval 'as_val=${'$as_ac_var'}

13790

- $as_echo "$as_val"'`

13791

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

13792

-$as_echo "$ac_res" >&6; }

13793

-as_val=`eval 'as_val=${'$as_ac_var'}

13794

- $as_echo "$as_val"'`

13795

- if test "x$as_val" = x""yes; then

13796

+ for ac_func in bind_textdomain_codeset

13797

+do :

13798

+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"

13799

+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :

13800

cat >>confdefs.h <<_ACEOF

13801

-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

13802

+#define HAVE_BIND_TEXTDOMAIN_CODESET 1

13803

_ACEOF

13804

13805

fi

13806

@@ -17573,15 +15078,13 @@

13807

13808

if test "$gt_cv_have_gettext" = "yes"; then

13809

13810

-cat >>confdefs.h <<\_ACEOF

13811

-#define HAVE_GETTEXT 1

13812

-_ACEOF

13813

+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h

13814

13815

# Extract the first word of "msgfmt", so it can be a program name with args.

13816

set dummy msgfmt; ac_word=$2

13817

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

13818

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

13819

$as_echo_n "checking for $ac_word... " >&6; }

13820

-if test "${ac_cv_path_MSGFMT+set}" = set; then

13821

+if test "${ac_cv_path_MSGFMT+set}" = set; then :

13822

$as_echo_n "(cached) " >&6

13823

else

13824

case "$MSGFMT" in

13825

@@ -17606,118 +15109,28 @@

13826

fi

13827

MSGFMT="$ac_cv_path_MSGFMT"

13828

if test "$MSGFMT" != "no"; then

13829

- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5

13830

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5

13831

$as_echo "$MSGFMT" >&6; }

13832

else

13833

- { $as_echo "$as_me:$LINENO: result: no" >&5

13834

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

13835

$as_echo "no" >&6; }

13836

fi

13837

if test "$MSGFMT" != "no"; then

13838

glib_save_LIBS="$LIBS"

13839

LIBS="$LIBS $INTLLIBS"

13840

-

13841

-for ac_func in dcgettext

13842

-do

13843

-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

13844

-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

13845

-$as_echo_n "checking for $ac_func... " >&6; }

13846

-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

13847

- $as_echo_n "(cached) " >&6

13848

-else

13849

- cat >conftest.$ac_ext <<_ACEOF

13850

-/* confdefs.h. */

13851

-_ACEOF

13852

-cat confdefs.h >>conftest.$ac_ext

13853

-cat >>conftest.$ac_ext <<_ACEOF

13854

-/* end confdefs.h. */

13855

-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

13856

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

13857

-#define $ac_func innocuous_$ac_func

13858

-

13859

-/* System header to define __stub macros and hopefully few prototypes,

13860

- which can conflict with char $ac_func (); below.

13861

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

13862

- <limits.h> exists even on freestanding compilers. */

13863

-

13864

-#ifdef __STDC__

13865

-# include <limits.h>

13866

-#else

13867

-# include <assert.h>

13868

-#endif

13869

-

13870

-#undef $ac_func

13871

-

13872

-/* Override any GCC internal prototype to avoid an error.

13873

- Use char because int might match the return type of a GCC

13874

- builtin and then its argument prototype would still apply. */

13875

-#ifdef __cplusplus

13876

-extern "C"

13877

-#endif

13878

-char $ac_func ();

13879

-/* The GNU C library defines this for functions which it implements

13880

- to always fail with ENOSYS. Some functions are actually named

13881

- something starting with __ and the normal name is an alias. */

13882

-#if defined __stub_$ac_func || defined __stub___$ac_func

13883

-choke me

13884

-#endif

13885

-

13886

-int

13887

-main ()

13888

-{

13889

-return $ac_func ();

13890

- ;

13891

- return 0;

13892

-}

13893

-_ACEOF

13894

-rm -f conftest.$ac_objext conftest$ac_exeext

13895

-if { (ac_try="$ac_link"

13896

-case "(($ac_try" in

13897

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13898

- *) ac_try_echo=$ac_try;;

13899

-esac

13900

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13901

-$as_echo "$ac_try_echo") >&5

13902

- (eval "$ac_link") 2>conftest.er1

13903

- ac_status=$?

13904

- grep -v '^ *+' conftest.er1 >conftest.err

13905

- rm -f conftest.er1

13906

- cat conftest.err >&5

13907

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13908

- (exit $ac_status); } && {

13909

- test -z "$ac_c_werror_flag" ||

13910

- test ! -s conftest.err

13911

- } && test -s conftest$ac_exeext && {

13912

- test "$cross_compiling" = yes ||

13913

- $as_test_x conftest$ac_exeext

13914

- }; then

13915

- eval "$as_ac_var=yes"

13916

-else

13917

- $as_echo "$as_me: failed program was:" >&5

13918

-sed 's/^/| /' conftest.$ac_ext >&5

13919

-

13920

- eval "$as_ac_var=no"

13921

-fi

13922

-

13923

-rm -rf conftest.dSYM

13924

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

13925

- conftest$ac_exeext conftest.$ac_ext

13926

-fi

13927

-ac_res=`eval 'as_val=${'$as_ac_var'}

13928

- $as_echo "$as_val"'`

13929

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

13930

-$as_echo "$ac_res" >&6; }

13931

-as_val=`eval 'as_val=${'$as_ac_var'}

13932

- $as_echo "$as_val"'`

13933

- if test "x$as_val" = x""yes; then

13934

+ for ac_func in dcgettext

13935

+do :

13936

+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"

13937

+if test "x$ac_cv_func_dcgettext" = x""yes; then :

13938

cat >>confdefs.h <<_ACEOF

13939

-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

13940

+#define HAVE_DCGETTEXT 1

13941

_ACEOF

13942

13943

fi

13944

done

13945

13946

MSGFMT_OPTS=

13947

- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5

13948

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5

13949

$as_echo_n "checking if msgfmt accepts -c... " >&6; }

13950

cat >conftest.foo <<_ACEOF

13951

13952

@@ -17732,14 +15145,14 @@

13953

"Content-Transfer-Encoding: 8bit\n"

13954

13955

_ACEOF

13956

-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5

13957

+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5

13958

($MSGFMT -c -o /dev/null conftest.foo) 2>&5

13959

ac_status=$?

13960

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13961

- (exit $ac_status); }; then

13962

- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5

13963

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

13964

+ test $ac_status = 0; }; then

13965

+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

13966

$as_echo "yes" >&6; }

13967

-else { $as_echo "$as_me:$LINENO: result: no" >&5

13968

+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

13969

$as_echo "no" >&6; }

13970

echo "$as_me: failed input was:" >&5

13971

sed 's/^/| /' conftest.foo >&5

13972

@@ -17747,9 +15160,9 @@

13973

13974

# Extract the first word of "gmsgfmt", so it can be a program name with args.

13975

set dummy gmsgfmt; ac_word=$2

13976

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

13977

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

13978

$as_echo_n "checking for $ac_word... " >&6; }

13979

-if test "${ac_cv_path_GMSGFMT+set}" = set; then

13980

+if test "${ac_cv_path_GMSGFMT+set}" = set; then :

13981

$as_echo_n "(cached) " >&6

13982

else

13983

case $GMSGFMT in

13984

@@ -17762,14 +15175,14 @@

13985

do

13986

IFS=$as_save_IFS

13987

test -z "$as_dir" && as_dir=.

13988

- for ac_exec_ext in '' $ac_executable_extensions; do

13989

+ for ac_exec_ext in '' $ac_executable_extensions; do

13990

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

13991

ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"

13992

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

13993

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

13994

break 2

13995

fi

13996

done

13997

-done

13998

+ done

13999

IFS=$as_save_IFS

14000

14001

test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"

14002

@@ -17778,19 +15191,19 @@

14003

fi

14004

GMSGFMT=$ac_cv_path_GMSGFMT

14005

if test -n "$GMSGFMT"; then

14006

- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5

14007

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5

14008

$as_echo "$GMSGFMT" >&6; }

14009

else

14010

- { $as_echo "$as_me:$LINENO: result: no" >&5

14011

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

14012

$as_echo "no" >&6; }

14013

fi

14014

14015

14016

# Extract the first word of "xgettext", so it can be a program name with args.

14017

set dummy xgettext; ac_word=$2

14018

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

14019

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

14020

$as_echo_n "checking for $ac_word... " >&6; }

14021

-if test "${ac_cv_path_XGETTEXT+set}" = set; then

14022

+if test "${ac_cv_path_XGETTEXT+set}" = set; then :

14023

$as_echo_n "(cached) " >&6

14024

else

14025

case "$XGETTEXT" in

14026

@@ -17815,18 +15228,14 @@

14027

fi

14028

XGETTEXT="$ac_cv_path_XGETTEXT"

14029

if test "$XGETTEXT" != ":"; then

14030

- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5

14031

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5

14032

$as_echo "$XGETTEXT" >&6; }

14033

else

14034

- { $as_echo "$as_me:$LINENO: result: no" >&5

14035

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

14036

$as_echo "no" >&6; }

14037

fi

14038

14039

- cat >conftest.$ac_ext <<_ACEOF

14040

-/* confdefs.h. */

14041

-_ACEOF

14042

-cat confdefs.h >>conftest.$ac_ext

14043

-cat >>conftest.$ac_ext <<_ACEOF

14044

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

14045

/* end confdefs.h. */

14046

14047

int

14048

@@ -17838,121 +15247,14 @@

14049

return 0;

14050

}

14051

_ACEOF

14052

-rm -f conftest.$ac_objext conftest$ac_exeext

14053

-if { (ac_try="$ac_link"

14054

-case "(($ac_try" in

14055

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14056

- *) ac_try_echo=$ac_try;;

14057

-esac

14058

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

14059

-$as_echo "$ac_try_echo") >&5

14060

- (eval "$ac_link") 2>conftest.er1

14061

- ac_status=$?

14062

- grep -v '^ *+' conftest.er1 >conftest.err

14063

- rm -f conftest.er1

14064

- cat conftest.err >&5

14065

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14066

- (exit $ac_status); } && {

14067

- test -z "$ac_c_werror_flag" ||

14068

- test ! -s conftest.err

14069

- } && test -s conftest$ac_exeext && {

14070

- test "$cross_compiling" = yes ||

14071

- $as_test_x conftest$ac_exeext

14072

- }; then

14073

+if ac_fn_c_try_link "$LINENO"; then :

14074

CATOBJEXT=.gmo

14075

DATADIRNAME=share

14076

else

14077

- $as_echo "$as_me: failed program was:" >&5

14078

-sed 's/^/| /' conftest.$ac_ext >&5

14079

-

14080

- case $host in

14081

+ case $host in

14082

*-*-solaris*)

14083

- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

14084

-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }

14085

-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then

14086

- $as_echo_n "(cached) " >&6

14087

-else

14088

- cat >conftest.$ac_ext <<_ACEOF

14089

-/* confdefs.h. */

14090

-_ACEOF

14091

-cat confdefs.h >>conftest.$ac_ext

14092

-cat >>conftest.$ac_ext <<_ACEOF

14093

-/* end confdefs.h. */

14094

-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.

14095

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

14096

-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset

14097

-

14098

-/* System header to define __stub macros and hopefully few prototypes,

14099

- which can conflict with char bind_textdomain_codeset (); below.

14100

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

14101

- <limits.h> exists even on freestanding compilers. */

14102

-

14103

-#ifdef __STDC__

14104

-# include <limits.h>

14105

-#else

14106

-# include <assert.h>

14107

-#endif

14108

-

14109

-#undef bind_textdomain_codeset

14110

-

14111

-/* Override any GCC internal prototype to avoid an error.

14112

- Use char because int might match the return type of a GCC

14113

- builtin and then its argument prototype would still apply. */

14114

-#ifdef __cplusplus

14115

-extern "C"

14116

-#endif

14117

-char bind_textdomain_codeset ();

14118

-/* The GNU C library defines this for functions which it implements

14119

- to always fail with ENOSYS. Some functions are actually named

14120

- something starting with __ and the normal name is an alias. */

14121

-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset

14122

-choke me

14123

-#endif

14124

-

14125

-int

14126

-main ()

14127

-{

14128

-return bind_textdomain_codeset ();

14129

- ;

14130

- return 0;

14131

-}

14132

-_ACEOF

14133

-rm -f conftest.$ac_objext conftest$ac_exeext

14134

-if { (ac_try="$ac_link"

14135

-case "(($ac_try" in

14136

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

14137

- *) ac_try_echo=$ac_try;;

14138

-esac

14139

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

14140

-$as_echo "$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

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14147

- (exit $ac_status); } && {

14148

- test -z "$ac_c_werror_flag" ||

14149

- test ! -s conftest.err

14150

- } && test -s conftest$ac_exeext && {

14151

- test "$cross_compiling" = yes ||

14152

- $as_test_x conftest$ac_exeext

14153

- }; then

14154

- ac_cv_func_bind_textdomain_codeset=yes

14155

-else

14156

- $as_echo "$as_me: failed program was:" >&5

14157

-sed 's/^/| /' conftest.$ac_ext >&5

14158

-

14159

- ac_cv_func_bind_textdomain_codeset=no

14160

-fi

14161

-

14162

-rm -rf conftest.dSYM

14163

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14164

- conftest$ac_exeext conftest.$ac_ext

14165

-fi

14166

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

14167

-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }

14168

-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then

14169

+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"

14170

+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :

14171

CATOBJEXT=.gmo

14172

DATADIRNAME=share

14173

else

14174

@@ -17967,10 +15269,8 @@

14175

;;

14176

esac

14177

fi

14178

-

14179

-rm -rf conftest.dSYM

14180

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

14181

- conftest$ac_exeext conftest.$ac_ext

14182

+rm -f core conftest.err conftest.$ac_objext \

14183

+ conftest$ac_exeext conftest.$ac_ext

14184

LIBS="$glib_save_LIBS"

14185

INSTOBJEXT=.mo

14186

else

14187

@@ -17984,9 +15284,7 @@

14188

14189

if test "$gt_cv_have_gettext" = "yes" ; then

14190

14191

-cat >>confdefs.h <<\_ACEOF

14192

-#define ENABLE_NLS 1

14193

-_ACEOF

14194

+$as_echo "#define ENABLE_NLS 1" >>confdefs.h

14195

14196

fi

14197

14198

@@ -17994,7 +15292,7 @@

14199

if $XGETTEXT --omit-header /dev/null 2> /dev/null; then

14200

: ;

14201

else

14202

- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5

14203

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5

14204

$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }

14205

XGETTEXT=":"

14206

fi

14207

@@ -18027,7 +15325,7 @@

14208

if test "x$ALL_LINGUAS" = "x"; then

14209

LINGUAS=

14210

else

14211

- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5

14212

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5

14213

$as_echo_n "checking for catalogs to be installed... " >&6; }

14214

NEW_LINGUAS=

14215

for presentlang in $ALL_LINGUAS; do

14216

@@ -18052,7 +15350,7 @@

14217

fi

14218

done

14219

LINGUAS=$NEW_LINGUAS

14220

- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5

14221

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5

14222

$as_echo "$LINGUAS" >&6; }

14223

fi

14224

14225

@@ -18090,7 +15388,7 @@

14226

# -----------------------------------------------------------

14227

14228

# Check whether --with-connectivity was given.

14229

-if test "${with_connectivity+set}" = set; then

14230

+if test "${with_connectivity+set}" = set; then :

14231

withval=$with_connectivity;

14232

else

14233

with_connectivity=auto

14234

@@ -18105,7 +15403,7 @@

14235

14236

14237

pkg_failed=no

14238

-{ $as_echo "$as_me:$LINENO: checking for CONNMAN" >&5

14239

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CONNMAN" >&5

14240

$as_echo_n "checking for CONNMAN... " >&6; }

14241

14242

if test -n "$PKG_CONFIG"; then

14243

@@ -18113,15 +15411,15 @@

14244

pkg_cv_CONNMAN_CFLAGS="$CONNMAN_CFLAGS"

14245

else

14246

if test -n "$PKG_CONFIG" && \

14247

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14248

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14249

dbus-glib-1

14250

- \"") >&5

14251

+ \""; } >&5

14252

($PKG_CONFIG --exists --print-errors "

14253

dbus-glib-1

14254

") 2>&5

14255

ac_status=$?

14256

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14257

- (exit $ac_status); }; then

14258

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14259

+ test $ac_status = 0; }; then

14260

pkg_cv_CONNMAN_CFLAGS=`$PKG_CONFIG --cflags "

14261

dbus-glib-1

14262

" 2>/dev/null`

14263

@@ -18137,15 +15435,15 @@

14264

pkg_cv_CONNMAN_LIBS="$CONNMAN_LIBS"

14265

else

14266

if test -n "$PKG_CONFIG" && \

14267

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14268

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14269

dbus-glib-1

14270

- \"") >&5

14271

+ \""; } >&5

14272

($PKG_CONFIG --exists --print-errors "

14273

dbus-glib-1

14274

") 2>&5

14275

ac_status=$?

14276

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14277

- (exit $ac_status); }; then

14278

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14279

+ test $ac_status = 0; }; then

14280

pkg_cv_CONNMAN_LIBS=`$PKG_CONFIG --libs "

14281

dbus-glib-1

14282

" 2>/dev/null`

14283

@@ -18178,7 +15476,7 @@

14284

# Put the nasty error message in config.log where it belongs

14285

echo "$CONNMAN_PKG_ERRORS" >&5

14286

14287

- { $as_echo "$as_me:$LINENO: result: no" >&5

14288

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

14289

$as_echo "no" >&6; }

14290

have_connman="no"

14291

elif test $pkg_failed = untried; then

14292

@@ -18186,16 +15484,14 @@

14293

else

14294

CONNMAN_CFLAGS=$pkg_cv_CONNMAN_CFLAGS

14295

CONNMAN_LIBS=$pkg_cv_CONNMAN_LIBS

14296

- { $as_echo "$as_me:$LINENO: result: yes" >&5

14297

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

14298

$as_echo "yes" >&6; }

14299

have_connman="yes"

14300

fi

14301

14302

if test "x$have_connman" = "xyes"; then

14303

14304

-cat >>confdefs.h <<\_ACEOF

14305

-#define HAVE_CONNMAN 1

14306

-_ACEOF

14307

+$as_echo "#define HAVE_CONNMAN 1" >>confdefs.h

14308

14309

have_nm=no

14310

fi

14311

@@ -18204,7 +15500,7 @@

14312

14313

14314

pkg_failed=no

14315

-{ $as_echo "$as_me:$LINENO: checking for NETWORK_MANAGER" >&5

14316

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORK_MANAGER" >&5

14317

$as_echo_n "checking for NETWORK_MANAGER... " >&6; }

14318

14319

if test -n "$PKG_CONFIG"; then

14320

@@ -18212,15 +15508,15 @@

14321

pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"

14322

else

14323

if test -n "$PKG_CONFIG" && \

14324

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14325

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14326

libnm_glib >= \$NETWORK_MANAGER_REQUIRED

14327

- \"") >&5

14328

+ \""; } >&5

14329

($PKG_CONFIG --exists --print-errors "

14330

libnm_glib >= $NETWORK_MANAGER_REQUIRED

14331

") 2>&5

14332

ac_status=$?

14333

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14334

- (exit $ac_status); }; then

14335

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14336

+ test $ac_status = 0; }; then

14337

pkg_cv_NETWORK_MANAGER_CFLAGS=`$PKG_CONFIG --cflags "

14338

libnm_glib >= $NETWORK_MANAGER_REQUIRED

14339

" 2>/dev/null`

14340

@@ -18236,15 +15532,15 @@

14341

pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"

14342

else

14343

if test -n "$PKG_CONFIG" && \

14344

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14345

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14346

libnm_glib >= \$NETWORK_MANAGER_REQUIRED

14347

- \"") >&5

14348

+ \""; } >&5

14349

($PKG_CONFIG --exists --print-errors "

14350

libnm_glib >= $NETWORK_MANAGER_REQUIRED

14351

") 2>&5

14352

ac_status=$?

14353

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14354

- (exit $ac_status); }; then

14355

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14356

+ test $ac_status = 0; }; then

14357

pkg_cv_NETWORK_MANAGER_LIBS=`$PKG_CONFIG --libs "

14358

libnm_glib >= $NETWORK_MANAGER_REQUIRED

14359

" 2>/dev/null`

14360

@@ -18277,7 +15573,7 @@

14361

# Put the nasty error message in config.log where it belongs

14362

echo "$NETWORK_MANAGER_PKG_ERRORS" >&5

14363

14364

- { $as_echo "$as_me:$LINENO: result: no" >&5

14365

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

14366

$as_echo "no" >&6; }

14367

have_nm="no"

14368

elif test $pkg_failed = untried; then

14369

@@ -18285,31 +15581,25 @@

14370

else

14371

NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS

14372

NETWORK_MANAGER_LIBS=$pkg_cv_NETWORK_MANAGER_LIBS

14373

- { $as_echo "$as_me:$LINENO: result: yes" >&5

14374

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

14375

$as_echo "yes" >&6; }

14376

have_nm="yes"

14377

fi

14378

14379

if test "x$have_nm" = "xyes"; then

14380

14381

-cat >>confdefs.h <<\_ACEOF

14382

-#define HAVE_NM 1

14383

-_ACEOF

14384

+$as_echo "#define HAVE_NM 1" >>confdefs.h

14385

14386

have_connman=no

14387

fi

14388

fi

14389

14390

if test "x$with_connectivity" = "xconnman" -a "x$have_connman" != "xyes"; then

14391

- { { $as_echo "$as_me:$LINENO: error: Couldn't find connman dependencies." >&5

14392

-$as_echo "$as_me: error: Couldn't find connman dependencies." >&2;}

14393

- { (exit 1); exit 1; }; }

14394

+ as_fn_error "Couldn't find connman dependencies." "$LINENO" 5

14395

fi

14396

14397

if test "x$with_connectivity" = "xnm" -a "x$have_nm" != "xyes"; then

14398

- { { $as_echo "$as_me:$LINENO: error: Couldn't find libnm-glib dependencies." >&5

14399

-$as_echo "$as_me: error: Couldn't find libnm-glib dependencies." >&2;}

14400

- { (exit 1); exit 1; }; }

14401

+ as_fn_error "Couldn't find libnm-glib dependencies." "$LINENO" 5

14402

fi

14403

14404

if test "x$have_nm" = "xyes"; then

14405

@@ -18333,7 +15623,7 @@

14406

# Webkit

14407

# -----------------------------------------------------------

14408

# Check whether --enable-webkit was given.

14409

-if test "${enable_webkit+set}" = set; then

14410

+if test "${enable_webkit+set}" = set; then :

14411

enableval=$enable_webkit;

14412

else

14413

enable_webkit=auto

14414

@@ -18343,7 +15633,7 @@

14415

if test "x$enable_webkit" != "xno"; then

14416

14417

pkg_failed=no

14418

-{ $as_echo "$as_me:$LINENO: checking for WEBKIT" >&5

14419

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5

14420

$as_echo_n "checking for WEBKIT... " >&6; }

14421

14422

if test -n "$PKG_CONFIG"; then

14423

@@ -18351,15 +15641,15 @@

14424

pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"

14425

else

14426

if test -n "$PKG_CONFIG" && \

14427

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14428

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14429

webkit-1.0 >= \$WEBKIT_REQUIRED

14430

- \"") >&5

14431

+ \""; } >&5

14432

($PKG_CONFIG --exists --print-errors "

14433

webkit-1.0 >= $WEBKIT_REQUIRED

14434

") 2>&5

14435

ac_status=$?

14436

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14437

- (exit $ac_status); }; then

14438

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14439

+ test $ac_status = 0; }; then

14440

pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "

14441

webkit-1.0 >= $WEBKIT_REQUIRED

14442

" 2>/dev/null`

14443

@@ -18375,15 +15665,15 @@

14444

pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"

14445

else

14446

if test -n "$PKG_CONFIG" && \

14447

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14448

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14449

webkit-1.0 >= \$WEBKIT_REQUIRED

14450

- \"") >&5

14451

+ \""; } >&5

14452

($PKG_CONFIG --exists --print-errors "

14453

webkit-1.0 >= $WEBKIT_REQUIRED

14454

") 2>&5

14455

ac_status=$?

14456

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14457

- (exit $ac_status); }; then

14458

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14459

+ test $ac_status = 0; }; then

14460

pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "

14461

webkit-1.0 >= $WEBKIT_REQUIRED

14462

" 2>/dev/null`

14463

@@ -18416,7 +15706,7 @@

14464

# Put the nasty error message in config.log where it belongs

14465

echo "$WEBKIT_PKG_ERRORS" >&5

14466

14467

- { $as_echo "$as_me:$LINENO: result: no" >&5

14468

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

14469

$as_echo "no" >&6; }

14470

have_webkit="no"

14471

elif test $pkg_failed = untried; then

14472

@@ -18424,16 +15714,14 @@

14473

else

14474

WEBKIT_CFLAGS=$pkg_cv_WEBKIT_CFLAGS

14475

WEBKIT_LIBS=$pkg_cv_WEBKIT_LIBS

14476

- { $as_echo "$as_me:$LINENO: result: yes" >&5

14477

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

14478

$as_echo "yes" >&6; }

14479

have_webkit="yes"

14480

fi

14481

14482

if test "x$have_webkit" = "xyes"; then

14483

14484

-cat >>confdefs.h <<\_ACEOF

14485

-#define HAVE_WEBKIT 1

14486

-_ACEOF

14487

+$as_echo "#define HAVE_WEBKIT 1" >>confdefs.h

14488

14489

fi

14490

else

14491

@@ -18441,9 +15729,7 @@

14492

fi

14493

14494

if test "x$enable_webkit" = "xyes" -a "x$have_webkit" != "xyes"; then

14495

- { { $as_echo "$as_me:$LINENO: error: Couldn't find webkit dependencies." >&5

14496

-$as_echo "$as_me: error: Couldn't find webkit dependencies." >&2;}

14497

- { (exit 1); exit 1; }; }

14498

+ as_fn_error "Couldn't find webkit dependencies." "$LINENO" 5

14499

fi

14500

if test "x$have_webkit" = "xyes"; then

14501

HAVE_WEBKIT_TRUE=

14502

@@ -18458,7 +15744,7 @@

14503

# spellchecking checks: enchant and iso-codes

14504

# -----------------------------------------------------------

14505

# Check whether --enable-spell was given.

14506

-if test "${enable_spell+set}" = set; then

14507

+if test "${enable_spell+set}" = set; then :

14508

enableval=$enable_spell;

14509

else

14510

enable_spell=auto

14511

@@ -18468,7 +15754,7 @@

14512

if test "x$enable_spell" != "xno"; then

14513

14514

pkg_failed=no

14515

-{ $as_echo "$as_me:$LINENO: checking for ENCHANT" >&5

14516

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCHANT" >&5

14517

$as_echo_n "checking for ENCHANT... " >&6; }

14518

14519

if test -n "$PKG_CONFIG"; then

14520

@@ -18476,17 +15762,17 @@

14521

pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"

14522

else

14523

if test -n "$PKG_CONFIG" && \

14524

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14525

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14526

enchant >= \$ENCHANT_REQUIRED,

14527

iso-codes >= \$ISO_CODES_REQUIRED

14528

- \"") >&5

14529

+ \""; } >&5

14530

($PKG_CONFIG --exists --print-errors "

14531

enchant >= $ENCHANT_REQUIRED,

14532

iso-codes >= $ISO_CODES_REQUIRED

14533

") 2>&5

14534

ac_status=$?

14535

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14536

- (exit $ac_status); }; then

14537

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14538

+ test $ac_status = 0; }; then

14539

pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "

14540

enchant >= $ENCHANT_REQUIRED,

14541

iso-codes >= $ISO_CODES_REQUIRED

14542

@@ -18503,17 +15789,17 @@

14543

pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"

14544

else

14545

if test -n "$PKG_CONFIG" && \

14546

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14547

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14548

enchant >= \$ENCHANT_REQUIRED,

14549

iso-codes >= \$ISO_CODES_REQUIRED

14550

- \"") >&5

14551

+ \""; } >&5

14552

($PKG_CONFIG --exists --print-errors "

14553

enchant >= $ENCHANT_REQUIRED,

14554

iso-codes >= $ISO_CODES_REQUIRED

14555

") 2>&5

14556

ac_status=$?

14557

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14558

- (exit $ac_status); }; then

14559

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14560

+ test $ac_status = 0; }; then

14561

pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "

14562

enchant >= $ENCHANT_REQUIRED,

14563

iso-codes >= $ISO_CODES_REQUIRED

14564

@@ -18549,7 +15835,7 @@

14565

# Put the nasty error message in config.log where it belongs

14566

echo "$ENCHANT_PKG_ERRORS" >&5

14567

14568

- { $as_echo "$as_me:$LINENO: result: no" >&5

14569

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

14570

$as_echo "no" >&6; }

14571

have_enchant="no"

14572

elif test $pkg_failed = untried; then

14573

@@ -18557,13 +15843,13 @@

14574

else

14575

ENCHANT_CFLAGS=$pkg_cv_ENCHANT_CFLAGS

14576

ENCHANT_LIBS=$pkg_cv_ENCHANT_LIBS

14577

- { $as_echo "$as_me:$LINENO: result: yes" >&5

14578

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

14579

$as_echo "yes" >&6; }

14580

have_enchant="yes"

14581

fi

14582

14583

if test "x$have_enchant" = "xyes"; then

14584

- { $as_echo "$as_me:$LINENO: checking whether iso-codes has iso-639 and iso-3166 domains" >&5

14585

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iso-codes has iso-639 and iso-3166 domains" >&5

14586

$as_echo_n "checking whether iso-codes has iso-639 and iso-3166 domains... " >&6; }

14587

if $PKG_CONFIG --variable=domains iso-codes | grep 639 > /dev/null && \

14588

$PKG_CONFIG --variable=domains iso-codes | grep 3166 > /dev/null ; then

14589

@@ -18573,16 +15859,14 @@

14590

_ACEOF

14591

14592

14593

-cat >>confdefs.h <<\_ACEOF

14594

-#define HAVE_ENCHANT /**/

14595

-_ACEOF

14596

+$as_echo "#define HAVE_ENCHANT /**/" >>confdefs.h

14597

14598

result=yes

14599

else

14600

result=no

14601

have_enchant="no"

14602

fi

14603

- { $as_echo "$as_me:$LINENO: result: $result" >&5

14604

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5

14605

$as_echo "$result" >&6; }

14606

fi

14607

else

14608

@@ -18590,9 +15874,7 @@

14609

fi

14610

14611

if test "x$enable_spell" = "xyes" -a "x$have_enchant" != "xyes"; then

14612

- { { $as_echo "$as_me:$LINENO: error: Couldn't find spell dependencies." >&5

14613

-$as_echo "$as_me: error: Couldn't find spell dependencies." >&2;}

14614

- { (exit 1); exit 1; }; }

14615

+ as_fn_error "Couldn't find spell dependencies." "$LINENO" 5

14616

fi

14617

14618

if test "x$have_enchant" = "xyes"; then

14619

@@ -18608,7 +15890,7 @@

14620

# Map view checks: libchamplain

14621

# -----------------------------------------------------------

14622

# Check whether --enable-map was given.

14623

-if test "${enable_map+set}" = set; then

14624

+if test "${enable_map+set}" = set; then :

14625

enableval=$enable_map;

14626

else

14627

enable_map=auto

14628

@@ -18618,7 +15900,7 @@

14629

if test "x$enable_map" != "xno"; then

14630

14631

pkg_failed=no

14632

-{ $as_echo "$as_me:$LINENO: checking for LIBCHAMPLAIN" >&5

14633

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN" >&5

14634

$as_echo_n "checking for LIBCHAMPLAIN... " >&6; }

14635

14636

if test -n "$PKG_CONFIG"; then

14637

@@ -18626,19 +15908,19 @@

14638

pkg_cv_LIBCHAMPLAIN_CFLAGS="$LIBCHAMPLAIN_CFLAGS"

14639

else

14640

if test -n "$PKG_CONFIG" && \

14641

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14642

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14643

champlain-0.3 >= \$LIBCHAMPLAIN_REQUIRED,

14644

champlain-gtk-0.3 >= \$LIBCHAMPLAIN_GTK_REQUIRED

14645

clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED

14646

- \"") >&5

14647

+ \""; } >&5

14648

($PKG_CONFIG --exists --print-errors "

14649

champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,

14650

champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED

14651

clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED

14652

") 2>&5

14653

ac_status=$?

14654

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14655

- (exit $ac_status); }; then

14656

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14657

+ test $ac_status = 0; }; then

14658

pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "

14659

champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,

14660

champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED

14661

@@ -18656,19 +15938,19 @@

14662

pkg_cv_LIBCHAMPLAIN_LIBS="$LIBCHAMPLAIN_LIBS"

14663

else

14664

if test -n "$PKG_CONFIG" && \

14665

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14666

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14667

champlain-0.3 >= \$LIBCHAMPLAIN_REQUIRED,

14668

champlain-gtk-0.3 >= \$LIBCHAMPLAIN_GTK_REQUIRED

14669

clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED

14670

- \"") >&5

14671

+ \""; } >&5

14672

($PKG_CONFIG --exists --print-errors "

14673

champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,

14674

champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED

14675

clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED

14676

") 2>&5

14677

ac_status=$?

14678

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14679

- (exit $ac_status); }; then

14680

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14681

+ test $ac_status = 0; }; then

14682

pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "

14683

champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,

14684

champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED

14685

@@ -18707,7 +15989,7 @@

14686

# Put the nasty error message in config.log where it belongs

14687

echo "$LIBCHAMPLAIN_PKG_ERRORS" >&5

14688

14689

- { $as_echo "$as_me:$LINENO: result: no" >&5

14690

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

14691

$as_echo "no" >&6; }

14692

have_libchamplain="no"

14693

elif test $pkg_failed = untried; then

14694

@@ -18715,16 +15997,14 @@

14695

else

14696

LIBCHAMPLAIN_CFLAGS=$pkg_cv_LIBCHAMPLAIN_CFLAGS

14697

LIBCHAMPLAIN_LIBS=$pkg_cv_LIBCHAMPLAIN_LIBS

14698

- { $as_echo "$as_me:$LINENO: result: yes" >&5

14699

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

14700

$as_echo "yes" >&6; }

14701

have_libchamplain="yes"

14702

fi

14703

14704

if test "x$have_libchamplain" = "xyes"; then

14705

14706

-cat >>confdefs.h <<\_ACEOF

14707

-#define HAVE_LIBCHAMPLAIN 1

14708

-_ACEOF

14709

+$as_echo "#define HAVE_LIBCHAMPLAIN 1" >>confdefs.h

14710

14711

fi

14712

else

14713

@@ -18732,9 +16012,7 @@

14714

fi

14715

14716

if test "x$enable_map" = "xyes" -a "x$have_libchamplain" != "xyes"; then

14717

- { { $as_echo "$as_me:$LINENO: error: Couldn't find map view dependencies." >&5

14718

-$as_echo "$as_me: error: Couldn't find map view dependencies." >&2;}

14719

- { (exit 1); exit 1; }; }

14720

+ as_fn_error "Couldn't find map view dependencies." "$LINENO" 5

14721

fi

14722

14723

if test "x$have_libchamplain" = "xyes"; then

14724

@@ -18750,7 +16028,7 @@

14725

# location checks: geoclue

14726

# -----------------------------------------------------------

14727

# Check whether --enable-location was given.

14728

-if test "${enable_location+set}" = set; then

14729

+if test "${enable_location+set}" = set; then :

14730

enableval=$enable_location;

14731

else

14732

enable_location=auto

14733

@@ -18760,7 +16038,7 @@

14734

if test "x$enable_location" != "xno"; then

14735

14736

pkg_failed=no

14737

-{ $as_echo "$as_me:$LINENO: checking for GEOCLUE" >&5

14738

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEOCLUE" >&5

14739

$as_echo_n "checking for GEOCLUE... " >&6; }

14740

14741

if test -n "$PKG_CONFIG"; then

14742

@@ -18768,15 +16046,15 @@

14743

pkg_cv_GEOCLUE_CFLAGS="$GEOCLUE_CFLAGS"

14744

else

14745

if test -n "$PKG_CONFIG" && \

14746

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14747

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14748

geoclue >= \$GEOCLUE_REQUIRED

14749

- \"") >&5

14750

+ \""; } >&5

14751

($PKG_CONFIG --exists --print-errors "

14752

geoclue >= $GEOCLUE_REQUIRED

14753

") 2>&5

14754

ac_status=$?

14755

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14756

- (exit $ac_status); }; then

14757

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14758

+ test $ac_status = 0; }; then

14759

pkg_cv_GEOCLUE_CFLAGS=`$PKG_CONFIG --cflags "

14760

geoclue >= $GEOCLUE_REQUIRED

14761

" 2>/dev/null`

14762

@@ -18792,15 +16070,15 @@

14763

pkg_cv_GEOCLUE_LIBS="$GEOCLUE_LIBS"

14764

else

14765

if test -n "$PKG_CONFIG" && \

14766

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14767

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14768

geoclue >= \$GEOCLUE_REQUIRED

14769

- \"") >&5

14770

+ \""; } >&5

14771

($PKG_CONFIG --exists --print-errors "

14772

geoclue >= $GEOCLUE_REQUIRED

14773

") 2>&5

14774

ac_status=$?

14775

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14776

- (exit $ac_status); }; then

14777

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14778

+ test $ac_status = 0; }; then

14779

pkg_cv_GEOCLUE_LIBS=`$PKG_CONFIG --libs "

14780

geoclue >= $GEOCLUE_REQUIRED

14781

" 2>/dev/null`

14782

@@ -18833,7 +16111,7 @@

14783

# Put the nasty error message in config.log where it belongs

14784

echo "$GEOCLUE_PKG_ERRORS" >&5

14785

14786

- { $as_echo "$as_me:$LINENO: result: no" >&5

14787

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

14788

$as_echo "no" >&6; }

14789

have_geoclue="no"

14790

elif test $pkg_failed = untried; then

14791

@@ -18841,16 +16119,14 @@

14792

else

14793

GEOCLUE_CFLAGS=$pkg_cv_GEOCLUE_CFLAGS

14794

GEOCLUE_LIBS=$pkg_cv_GEOCLUE_LIBS

14795

- { $as_echo "$as_me:$LINENO: result: yes" >&5

14796

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

14797

$as_echo "yes" >&6; }

14798

have_geoclue="yes"

14799

fi

14800

14801

if test "x$have_geoclue" = "xyes"; then

14802

14803

-cat >>confdefs.h <<\_ACEOF

14804

-#define HAVE_GEOCLUE 1

14805

-_ACEOF

14806

+$as_echo "#define HAVE_GEOCLUE 1" >>confdefs.h

14807

14808

fi

14809

else

14810

@@ -18858,9 +16134,7 @@

14811

fi

14812

14813

if test "x$enable_location" = "xyes" -a "x$have_geoclue" != "xyes"; then

14814

- { { $as_echo "$as_me:$LINENO: error: Couldn't find location dependencies." >&5

14815

-$as_echo "$as_me: error: Couldn't find location dependencies." >&2;}

14816

- { (exit 1); exit 1; }; }

14817

+ as_fn_error "Couldn't find location dependencies." "$LINENO" 5

14818

fi

14819

14820

if test "x$have_geoclue" = "xyes"; then

14821

@@ -18878,7 +16152,7 @@

14822

# Megaphone

14823

# -----------------------------------------------------------

14824

# Check whether --enable-megaphone was given.

14825

-if test "${enable_megaphone+set}" = set; then

14826

+if test "${enable_megaphone+set}" = set; then :

14827

enableval=$enable_megaphone;

14828

else

14829

enable_megaphone=auto

14830

@@ -18888,7 +16162,7 @@

14831

if test "x$enable_megaphone" != "xno"; then

14832

14833

pkg_failed=no

14834

-{ $as_echo "$as_me:$LINENO: checking for MEGAPHONE" >&5

14835

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEGAPHONE" >&5

14836

$as_echo_n "checking for MEGAPHONE... " >&6; }

14837

14838

if test -n "$PKG_CONFIG"; then

14839

@@ -18896,13 +16170,13 @@

14840

pkg_cv_MEGAPHONE_CFLAGS="$MEGAPHONE_CFLAGS"

14841

else

14842

if test -n "$PKG_CONFIG" && \

14843

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14844

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14845

libpanelapplet-2.0 >= \$LIBPANELAPPLET_REQUIRED

14846

glib-2.0 >= \$GLIB_REQUIRED

14847

gtk+-2.0 >= \$GTK_REQUIRED

14848

gconf-2.0 >= \$GCONF_REQUIRED

14849

telepathy-glib >= \$TELEPATHY_GLIB_REQUIRED

14850

- \"") >&5

14851

+ \""; } >&5

14852

($PKG_CONFIG --exists --print-errors "

14853

libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED

14854

glib-2.0 >= $GLIB_REQUIRED

14855

@@ -18911,8 +16185,8 @@

14856

telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

14857

") 2>&5

14858

ac_status=$?

14859

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14860

- (exit $ac_status); }; then

14861

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14862

+ test $ac_status = 0; }; then

14863

pkg_cv_MEGAPHONE_CFLAGS=`$PKG_CONFIG --cflags "

14864

libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED

14865

glib-2.0 >= $GLIB_REQUIRED

14866

@@ -18932,13 +16206,13 @@

14867

pkg_cv_MEGAPHONE_LIBS="$MEGAPHONE_LIBS"

14868

else

14869

if test -n "$PKG_CONFIG" && \

14870

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14871

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14872

libpanelapplet-2.0 >= \$LIBPANELAPPLET_REQUIRED

14873

glib-2.0 >= \$GLIB_REQUIRED

14874

gtk+-2.0 >= \$GTK_REQUIRED

14875

gconf-2.0 >= \$GCONF_REQUIRED

14876

telepathy-glib >= \$TELEPATHY_GLIB_REQUIRED

14877

- \"") >&5

14878

+ \""; } >&5

14879

($PKG_CONFIG --exists --print-errors "

14880

libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED

14881

glib-2.0 >= $GLIB_REQUIRED

14882

@@ -18947,8 +16221,8 @@

14883

telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

14884

") 2>&5

14885

ac_status=$?

14886

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14887

- (exit $ac_status); }; then

14888

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14889

+ test $ac_status = 0; }; then

14890

pkg_cv_MEGAPHONE_LIBS=`$PKG_CONFIG --libs "

14891

libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED

14892

glib-2.0 >= $GLIB_REQUIRED

14893

@@ -18993,7 +16267,7 @@

14894

# Put the nasty error message in config.log where it belongs

14895

echo "$MEGAPHONE_PKG_ERRORS" >&5

14896

14897

- { $as_echo "$as_me:$LINENO: result: no" >&5

14898

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

14899

$as_echo "no" >&6; }

14900

have_megaphone="no"

14901

elif test $pkg_failed = untried; then

14902

@@ -19001,7 +16275,7 @@

14903

else

14904

MEGAPHONE_CFLAGS=$pkg_cv_MEGAPHONE_CFLAGS

14905

MEGAPHONE_LIBS=$pkg_cv_MEGAPHONE_LIBS

14906

- { $as_echo "$as_me:$LINENO: result: yes" >&5

14907

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

14908

$as_echo "yes" >&6; }

14909

have_megaphone="yes"

14910

fi

14911

@@ -19010,9 +16284,7 @@

14912

fi

14913

14914

if test "x$enable_megaphone" = "xyes" -a "x$have_megaphone" != "xyes"; then

14915

- { { $as_echo "$as_me:$LINENO: error: Couldn't find megaphone dependencies." >&5

14916

-$as_echo "$as_me: error: Couldn't find megaphone dependencies." >&2;}

14917

- { (exit 1); exit 1; }; }

14918

+ as_fn_error "Couldn't find megaphone dependencies." "$LINENO" 5

14919

fi

14920

14921

if test "x$have_megaphone" = "xyes"; then

14922

@@ -19028,7 +16300,7 @@

14923

# Nothere

14924

# -----------------------------------------------------------

14925

# Check whether --enable-nothere was given.

14926

-if test "${enable_nothere+set}" = set; then

14927

+if test "${enable_nothere+set}" = set; then :

14928

enableval=$enable_nothere;

14929

else

14930

enable_nothere=auto

14931

@@ -19038,7 +16310,7 @@

14932

if test "x$enable_nothere" != "xno"; then

14933

14934

pkg_failed=no

14935

-{ $as_echo "$as_me:$LINENO: checking for NOTHERE" >&5

14936

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTHERE" >&5

14937

$as_echo_n "checking for NOTHERE... " >&6; }

14938

14939

if test -n "$PKG_CONFIG"; then

14940

@@ -19046,13 +16318,13 @@

14941

pkg_cv_NOTHERE_CFLAGS="$NOTHERE_CFLAGS"

14942

else

14943

if test -n "$PKG_CONFIG" && \

14944

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14945

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14946

libpanelapplet-2.0 >= \$LIBPANELAPPLET_REQUIRED

14947

glib-2.0 >= \$GLIB_REQUIRED

14948

gtk+-2.0 >= \$GTK_REQUIRED

14949

gconf-2.0 >= \$GCONF_REQUIRED

14950

telepathy-glib >= \$TELEPATHY_GLIB_REQUIRED

14951

- \"") >&5

14952

+ \""; } >&5

14953

($PKG_CONFIG --exists --print-errors "

14954

libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED

14955

glib-2.0 >= $GLIB_REQUIRED

14956

@@ -19061,8 +16333,8 @@

14957

telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

14958

") 2>&5

14959

ac_status=$?

14960

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14961

- (exit $ac_status); }; then

14962

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14963

+ test $ac_status = 0; }; then

14964

pkg_cv_NOTHERE_CFLAGS=`$PKG_CONFIG --cflags "

14965

libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED

14966

glib-2.0 >= $GLIB_REQUIRED

14967

@@ -19082,13 +16354,13 @@

14968

pkg_cv_NOTHERE_LIBS="$NOTHERE_LIBS"

14969

else

14970

if test -n "$PKG_CONFIG" && \

14971

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

14972

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

14973

libpanelapplet-2.0 >= \$LIBPANELAPPLET_REQUIRED

14974

glib-2.0 >= \$GLIB_REQUIRED

14975

gtk+-2.0 >= \$GTK_REQUIRED

14976

gconf-2.0 >= \$GCONF_REQUIRED

14977

telepathy-glib >= \$TELEPATHY_GLIB_REQUIRED

14978

- \"") >&5

14979

+ \""; } >&5

14980

($PKG_CONFIG --exists --print-errors "

14981

libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED

14982

glib-2.0 >= $GLIB_REQUIRED

14983

@@ -19097,8 +16369,8 @@

14984

telepathy-glib >= $TELEPATHY_GLIB_REQUIRED

14985

") 2>&5

14986

ac_status=$?

14987

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

14988

- (exit $ac_status); }; then

14989

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

14990

+ test $ac_status = 0; }; then

14991

pkg_cv_NOTHERE_LIBS=`$PKG_CONFIG --libs "

14992

libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED

14993

glib-2.0 >= $GLIB_REQUIRED

14994

@@ -19143,7 +16415,7 @@

14995

# Put the nasty error message in config.log where it belongs

14996

echo "$NOTHERE_PKG_ERRORS" >&5

14997

14998

- { $as_echo "$as_me:$LINENO: result: no" >&5

14999

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

15000

$as_echo "no" >&6; }

15001

have_nothere="no"

15002

elif test $pkg_failed = untried; then

15003

@@ -19151,7 +16423,7 @@

15004

else

15005

NOTHERE_CFLAGS=$pkg_cv_NOTHERE_CFLAGS

15006

NOTHERE_LIBS=$pkg_cv_NOTHERE_LIBS

15007

- { $as_echo "$as_me:$LINENO: result: yes" >&5

15008

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

15009

$as_echo "yes" >&6; }

15010

have_nothere="yes"

15011

fi

15012

@@ -19160,9 +16432,7 @@

15013

fi

15014

15015

if test "x$enable_nothere" = "xyes" -a "x$have_nothere" != "xyes"; then

15016

- { { $as_echo "$as_me:$LINENO: error: Couldn't find nothere dependencies." >&5

15017

-$as_echo "$as_me: error: Couldn't find nothere dependencies." >&2;}

15018

- { (exit 1); exit 1; }; }

15019

+ as_fn_error "Couldn't find nothere dependencies." "$LINENO" 5

15020

fi

15021

15022

if test "x$have_nothere" = "xyes"; then

15023

@@ -19175,10 +16445,140 @@

15024

15025

15026

# -----------------------------------------------------------

15027

+# libindicate

15028

+# -----------------------------------------------------------

15029

+# Check whether --enable-libindicate was given.

15030

+if test "${enable_libindicate+set}" = set; then :

15031

+ enableval=$enable_libindicate;

15032

+else

15033

+ enable_libindicate=auto

15034

+fi

15035

+

15036

+

15037

+if test "x$enable_libindicate" != "xno"; then

15038

+

15039

+pkg_failed=no

15040

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATE" >&5

15041

+$as_echo_n "checking for INDICATE... " >&6; }

15042

+

15043

+if test -n "$PKG_CONFIG"; then

15044

+ if test -n "$INDICATE_CFLAGS"; then

15045

+ pkg_cv_INDICATE_CFLAGS="$INDICATE_CFLAGS"

15046

+ else

15047

+ if test -n "$PKG_CONFIG" && \

15048

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

15049

+ indicate >= \$INDICATE_REQUIRED,

15050

+ indicate-gtk >= \$INDICATE_GTK_REQUIRED

15051

+ \""; } >&5

15052

+ ($PKG_CONFIG --exists --print-errors "

15053

+ indicate >= $INDICATE_REQUIRED,

15054

+ indicate-gtk >= $INDICATE_GTK_REQUIRED

15055

+ ") 2>&5

15056

+ ac_status=$?

15057

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

15058

+ test $ac_status = 0; }; then

15059

+ pkg_cv_INDICATE_CFLAGS=`$PKG_CONFIG --cflags "

15060

+ indicate >= $INDICATE_REQUIRED,

15061

+ indicate-gtk >= $INDICATE_GTK_REQUIRED

15062

+ " 2>/dev/null`

15063

+else

15064

+ pkg_failed=yes

15065

+fi

15066

+ fi

15067

+else

15068

+ pkg_failed=untried

15069

+fi

15070

+if test -n "$PKG_CONFIG"; then

15071

+ if test -n "$INDICATE_LIBS"; then

15072

+ pkg_cv_INDICATE_LIBS="$INDICATE_LIBS"

15073

+ else

15074

+ if test -n "$PKG_CONFIG" && \

15075

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

15076

+ indicate >= \$INDICATE_REQUIRED,

15077

+ indicate-gtk >= \$INDICATE_GTK_REQUIRED

15078

+ \""; } >&5

15079

+ ($PKG_CONFIG --exists --print-errors "

15080

+ indicate >= $INDICATE_REQUIRED,

15081

+ indicate-gtk >= $INDICATE_GTK_REQUIRED

15082

+ ") 2>&5

15083

+ ac_status=$?

15084

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

15085

+ test $ac_status = 0; }; then

15086

+ pkg_cv_INDICATE_LIBS=`$PKG_CONFIG --libs "

15087

+ indicate >= $INDICATE_REQUIRED,

15088

+ indicate-gtk >= $INDICATE_GTK_REQUIRED

15089

+ " 2>/dev/null`

15090

+else

15091

+ pkg_failed=yes

15092

+fi

15093

+ fi

15094

+else

15095

+ pkg_failed=untried

15096

+fi

15097

+

15098

+

15099

+

15100

+if test $pkg_failed = yes; then

15101

+

15102

+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

15103

+ _pkg_short_errors_supported=yes

15104

+else

15105

+ _pkg_short_errors_supported=no

15106

+fi

15107

+ if test $_pkg_short_errors_supported = yes; then

15108

+ INDICATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "

15109

+ indicate >= $INDICATE_REQUIRED,

15110

+ indicate-gtk >= $INDICATE_GTK_REQUIRED

15111

+ "`

15112

+ else

15113

+ INDICATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "

15114

+ indicate >= $INDICATE_REQUIRED,

15115

+ indicate-gtk >= $INDICATE_GTK_REQUIRED

15116

+ "`

15117

+ fi

15118

+ # Put the nasty error message in config.log where it belongs

15119

+ echo "$INDICATE_PKG_ERRORS" >&5

15120

+

15121

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

15122

+$as_echo "no" >&6; }

15123

+ have_libindicate="no"

15124

+elif test $pkg_failed = untried; then

15125

+ have_libindicate="no"

15126

+else

15127

+ INDICATE_CFLAGS=$pkg_cv_INDICATE_CFLAGS

15128

+ INDICATE_LIBS=$pkg_cv_INDICATE_LIBS

15129

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

15130

+$as_echo "yes" >&6; }

15131

+ have_libindicate="yes"

15132

+fi

15133

+

15134

+ if test "x$have_libindicate" = "xyes"; then

15135

+

15136

+$as_echo "#define HAVE_LIBINDICATE 1" >>confdefs.h

15137

+

15138

+ fi

15139

+else

15140

+ have_libindicate=no

15141

+fi

15142

+

15143

+if test "x$enable_libindicate" = "xyes" -a "x$have_libindicate" != "xyes"; then

15144

+ as_fn_error "Couldn't find libindicate." "$LINENO" 5

15145

+fi

15146

+

15147

+ if test "x$have_libindicate" = "xyes"; then

15148

+ HAVE_LIBINDICATE_TRUE=

15149

+ HAVE_LIBINDICATE_FALSE='#'

15150

+else

15151

+ HAVE_LIBINDICATE_TRUE='#'

15152

+ HAVE_LIBINDICATE_FALSE=

15153

+fi

15154

+

15155

+

15156

+# -----------------------------------------------------------

15157

# Tests

15158

# -----------------------------------------------------------

15159

# Check whether --enable-tests was given.

15160

-if test "${enable_tests+set}" = set; then

15161

+if test "${enable_tests+set}" = set; then :

15162

enableval=$enable_tests;

15163

else

15164

enable_tests=auto

15165

@@ -19188,7 +16588,7 @@

15166

if test "x$enable_tests" != "xno"; then

15167

15168

pkg_failed=no

15169

-{ $as_echo "$as_me:$LINENO: checking for CHECK" >&5

15170

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5

15171

$as_echo_n "checking for CHECK... " >&6; }

15172

15173

if test -n "$PKG_CONFIG"; then

15174

@@ -19196,15 +16596,15 @@

15175

pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"

15176

else

15177

if test -n "$PKG_CONFIG" && \

15178

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

15179

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

15180

check >= 0.9.4

15181

- \"") >&5

15182

+ \""; } >&5

15183

($PKG_CONFIG --exists --print-errors "

15184

check >= 0.9.4

15185

") 2>&5

15186

ac_status=$?

15187

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

15188

- (exit $ac_status); }; then

15189

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

15190

+ test $ac_status = 0; }; then

15191

pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "

15192

check >= 0.9.4

15193

" 2>/dev/null`

15194

@@ -19220,15 +16620,15 @@

15195

pkg_cv_CHECK_LIBS="$CHECK_LIBS"

15196

else

15197

if test -n "$PKG_CONFIG" && \

15198

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

15199

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

15200

check >= 0.9.4

15201

- \"") >&5

15202

+ \""; } >&5

15203

($PKG_CONFIG --exists --print-errors "

15204

check >= 0.9.4

15205

") 2>&5

15206

ac_status=$?

15207

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

15208

- (exit $ac_status); }; then

15209

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

15210

+ test $ac_status = 0; }; then

15211

pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "

15212

check >= 0.9.4

15213

" 2>/dev/null`

15214

@@ -19261,7 +16661,7 @@

15215

# Put the nasty error message in config.log where it belongs

15216

echo "$CHECK_PKG_ERRORS" >&5

15217

15218

- { $as_echo "$as_me:$LINENO: result: no" >&5

15219

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

15220

$as_echo "no" >&6; }

15221

have_check="no"

15222

elif test $pkg_failed = untried; then

15223

@@ -19269,7 +16669,7 @@

15224

else

15225

CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS

15226

CHECK_LIBS=$pkg_cv_CHECK_LIBS

15227

- { $as_echo "$as_me:$LINENO: result: yes" >&5

15228

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

15229

$as_echo "yes" >&6; }

15230

have_check="yes"

15231

fi

15232

@@ -19278,9 +16678,7 @@

15233

fi

15234

15235

if test "x$enable_tests" = "xyes" -a "x$have_check" != "xyes"; then

15236

- { { $as_echo "$as_me:$LINENO: error: Couldn't find check dependencies." >&5

15237

-$as_echo "$as_me: error: Couldn't find check dependencies." >&2;}

15238

- { (exit 1); exit 1; }; }

15239

+ as_fn_error "Couldn't find check dependencies." "$LINENO" 5

15240

fi

15241

15242

if test "x$have_check" = "xyes"; then

15243

@@ -19296,7 +16694,7 @@

15244

# Python Bindings

15245

# -----------------------------------------------------------

15246

# Check whether --enable-python was given.

15247

-if test "${enable_python+set}" = set; then

15248

+if test "${enable_python+set}" = set; then :

15249

enableval=$enable_python;

15250

else

15251

enable_python=auto

15252

@@ -19306,7 +16704,7 @@

15253

if test "x$enable_python" != "xno"; then

15254

15255

pkg_failed=no

15256

-{ $as_echo "$as_me:$LINENO: checking for PYTHON_BINDING" >&5

15257

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYTHON_BINDING" >&5

15258

$as_echo_n "checking for PYTHON_BINDING... " >&6; }

15259

15260

if test -n "$PKG_CONFIG"; then

15261

@@ -19314,7 +16712,7 @@

15262

pkg_cv_PYTHON_BINDING_CFLAGS="$PYTHON_BINDING_CFLAGS"

15263

else

15264

if test -n "$PKG_CONFIG" && \

15265

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

15266

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

15267

pygtk-2.0,

15268

glib-2.0 >= \$GLIB_REQUIRED

15269

gobject-2.0

15270

@@ -19324,7 +16722,7 @@

15271

gstreamer-0.10

15272

gstreamer-interfaces-0.10

15273

telepathy-farsight

15274

- \"") >&5

15275

+ \""; } >&5

15276

($PKG_CONFIG --exists --print-errors "

15277

pygtk-2.0,

15278

glib-2.0 >= $GLIB_REQUIRED

15279

@@ -19337,8 +16735,8 @@

15280

telepathy-farsight

15281

") 2>&5

15282

ac_status=$?

15283

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

15284

- (exit $ac_status); }; then

15285

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

15286

+ test $ac_status = 0; }; then

15287

pkg_cv_PYTHON_BINDING_CFLAGS=`$PKG_CONFIG --cflags "

15288

pygtk-2.0,

15289

glib-2.0 >= $GLIB_REQUIRED

15290

@@ -19362,7 +16760,7 @@

15291

pkg_cv_PYTHON_BINDING_LIBS="$PYTHON_BINDING_LIBS"

15292

else

15293

if test -n "$PKG_CONFIG" && \

15294

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

15295

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"

15296

pygtk-2.0,

15297

glib-2.0 >= \$GLIB_REQUIRED

15298

gobject-2.0

15299

@@ -19372,7 +16770,7 @@

15300

gstreamer-0.10

15301

gstreamer-interfaces-0.10

15302

telepathy-farsight

15303

- \"") >&5

15304

+ \""; } >&5

15305

($PKG_CONFIG --exists --print-errors "

15306

pygtk-2.0,

15307

glib-2.0 >= $GLIB_REQUIRED

15308

@@ -19385,8 +16783,8 @@

15309

telepathy-farsight

15310

") 2>&5

15311

ac_status=$?

15312

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

15313

- (exit $ac_status); }; then

15314

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

15315

+ test $ac_status = 0; }; then

15316

pkg_cv_PYTHON_BINDING_LIBS=`$PKG_CONFIG --libs "

15317

pygtk-2.0,

15318

glib-2.0 >= $GLIB_REQUIRED

15319

@@ -19443,7 +16841,7 @@

15320

# Put the nasty error message in config.log where it belongs

15321

echo "$PYTHON_BINDING_PKG_ERRORS" >&5

15322

15323

- { $as_echo "$as_me:$LINENO: result: no" >&5

15324

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

15325

$as_echo "no" >&6; }

15326

have_python="no"

15327

elif test $pkg_failed = untried; then

15328

@@ -19451,13 +16849,13 @@

15329

else

15330

PYTHON_BINDING_CFLAGS=$pkg_cv_PYTHON_BINDING_CFLAGS

15331

PYTHON_BINDING_LIBS=$pkg_cv_PYTHON_BINDING_LIBS

15332

- { $as_echo "$as_me:$LINENO: result: yes" >&5

15333

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

15334

$as_echo "yes" >&6; }

15335

have_python="yes"

15336

fi

15337

if test "x$have_python" = "xyes" ; then

15338

15339

-{ $as_echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5

15340

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5

15341

$as_echo_n "checking for headers required to compile python extensions... " >&6; }

15342

py_prefix=`$PYTHON -c "import sys; print sys.prefix"`

15343

py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`

15344

@@ -19472,43 +16870,19 @@

15345

15346

save_CPPFLAGS="$CPPFLAGS"

15347

CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"

15348

-cat >conftest.$ac_ext <<_ACEOF

15349

-/* confdefs.h. */

15350

-_ACEOF

15351

-cat confdefs.h >>conftest.$ac_ext

15352

-cat >>conftest.$ac_ext <<_ACEOF

15353

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

15354

/* end confdefs.h. */

15355

#include <Python.h>

15356

_ACEOF

15357

-if { (ac_try="$ac_cpp conftest.$ac_ext"

15358

-case "(($ac_try" in

15359

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

15360

- *) ac_try_echo=$ac_try;;

15361

-esac

15362

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

15363

-$as_echo "$ac_try_echo") >&5

15364

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

15365

- ac_status=$?

15366

- grep -v '^ *+' conftest.er1 >conftest.err

15367

- rm -f conftest.er1

15368

- cat conftest.err >&5

15369

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

15370

- (exit $ac_status); } >/dev/null && {

15371

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

15372

- test ! -s conftest.err

15373

- }; then

15374

- { $as_echo "$as_me:$LINENO: result: found" >&5

15375

+if ac_fn_c_try_cpp "$LINENO"; then :

15376

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5

15377

$as_echo "found" >&6; }

15378

15379

else

15380

- $as_echo "$as_me: failed program was:" >&5

15381

-sed 's/^/| /' conftest.$ac_ext >&5

15382

-

15383

- { $as_echo "$as_me:$LINENO: result: not found" >&5

15384

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5

15385

$as_echo "not found" >&6; }

15386

have_python="no"

15387

fi

15388

-

15389

rm -f conftest.err conftest.$ac_ext

15390

CPPFLAGS="$save_CPPFLAGS"

15391

15392

@@ -19516,9 +16890,9 @@

15393

do

15394

# Extract the first word of "$ac_prog", so it can be a program name with args.

15395

set dummy $ac_prog; ac_word=$2

15396

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

15397

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

15398

$as_echo_n "checking for $ac_word... " >&6; }

15399

-if test "${ac_cv_prog_PYGOBJECTCODEGEN+set}" = set; then

15400

+if test "${ac_cv_prog_PYGOBJECTCODEGEN+set}" = set; then :

15401

$as_echo_n "(cached) " >&6

15402

else

15403

if test -n "$PYGOBJECTCODEGEN"; then

15404

@@ -19529,24 +16903,24 @@

15405

do

15406

IFS=$as_save_IFS

15407

test -z "$as_dir" && as_dir=.

15408

- for ac_exec_ext in '' $ac_executable_extensions; do

15409

+ for ac_exec_ext in '' $ac_executable_extensions; do

15410

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

15411

ac_cv_prog_PYGOBJECTCODEGEN="$ac_prog"

15412

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

15413

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

15414

break 2

15415

fi

15416

done

15417

-done

15418

+ done

15419

IFS=$as_save_IFS

15420

15421

fi

15422

fi

15423

PYGOBJECTCODEGEN=$ac_cv_prog_PYGOBJECTCODEGEN

15424

if test -n "$PYGOBJECTCODEGEN"; then

15425

- { $as_echo "$as_me:$LINENO: result: $PYGOBJECTCODEGEN" >&5

15426

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGOBJECTCODEGEN" >&5

15427

$as_echo "$PYGOBJECTCODEGEN" >&6; }

15428

else

15429

- { $as_echo "$as_me:$LINENO: result: no" >&5

15430

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

15431

$as_echo "no" >&6; }

15432

fi

15433

15434

@@ -19560,9 +16934,7 @@

15435

fi

15436

15437

if test "x$enable_python" = "xyes" -a "x$have_python" != "xyes"; then

15438

- { { $as_echo "$as_me:$LINENO: error: Couldn't find python." >&5

15439

-$as_echo "$as_me: error: Couldn't find python." >&2;}

15440

- { (exit 1); exit 1; }; }

15441

+ as_fn_error "Couldn't find python." "$LINENO" 5

15442

fi

15443

15444

if test "x$have_python" = "xyes"; then

15445

@@ -19578,7 +16950,7 @@

15446

# Coding style checks

15447

# -----------------------------------------------------------

15448

# Check whether --enable-coding-style-checks was given.

15449

-if test "${enable_coding_style_checks+set}" = set; then

15450

+if test "${enable_coding_style_checks+set}" = set; then :

15451

enableval=$enable_coding_style_checks; ENABLE_CODING_STYLE_CHECKS=$enableval

15452

else

15453

ENABLE_CODING_STYLE_CHECKS=yes

15454

@@ -19591,7 +16963,7 @@

15455

15456

15457

# Check whether --enable-shave was given.

15458

-if test "${enable_shave+set}" = set; then

15459

+if test "${enable_shave+set}" = set; then :

15460

enableval=$enable_shave;

15461

else

15462

enable_shave=no

15463

@@ -19611,9 +16983,9 @@

15464

15465

# Extract the first word of "sed", so it can be a program name with args.

15466

set dummy sed; ac_word=$2

15467

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

15468

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

15469

$as_echo_n "checking for $ac_word... " >&6; }

15470

-if test "${ac_cv_prog_SED+set}" = set; then

15471

+if test "${ac_cv_prog_SED+set}" = set; then :

15472

$as_echo_n "(cached) " >&6

15473

else

15474

if test -n "$SED"; then

15475

@@ -19624,14 +16996,14 @@

15476

do

15477

IFS=$as_save_IFS

15478

test -z "$as_dir" && as_dir=.

15479

- for ac_exec_ext in '' $ac_executable_extensions; do

15480

+ for ac_exec_ext in '' $ac_executable_extensions; do

15481

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

15482

ac_cv_prog_SED="sed"

15483

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

15484

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

15485

break 2

15486

fi

15487

done

15488

-done

15489

+ done

15490

IFS=$as_save_IFS

15491

15492

test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false"

15493

@@ -19639,10 +17011,10 @@

15494

fi

15495

SED=$ac_cv_prog_SED

15496

if test -n "$SED"; then

15497

- { $as_echo "$as_me:$LINENO: result: $SED" >&5

15498

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5

15499

$as_echo "$SED" >&6; }

15500

else

15501

- { $as_echo "$as_me:$LINENO: result: no" >&5

15502

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

15503

$as_echo "no" >&6; }

15504

fi

15505

15506

@@ -19706,13 +17078,13 @@

15507

case $ac_val in #(

15508

*${as_nl}*)

15509

case $ac_var in #(

15510

- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5

15511

+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5

15512

$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;

15513

esac

15514

case $ac_var in #(

15515

_ | IFS | as_nl) ;; #(

15516

BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

15517

- *) $as_unset $ac_var ;;

15518

+ *) { eval $ac_var=; unset $ac_var;} ;;

15519

esac ;;

15520

esac

15521

done

15522

@@ -19720,8 +17092,8 @@

15523

(set) 2>&1 |

15524

case $as_nl`(ac_space=' '; set) 2>&1` in #(

15525

*${as_nl}ac_space=\ *)

15526

- # `set' does not quote correctly, so add quotes (double-quote

15527

- # substitution turns \\\\ into \\, and sed turns \\ into \).

15528

+ # `set' does not quote correctly, so add quotes: double-quote

15529

+ # substitution turns \\\\ into \\, and sed turns \\ into \.

15530

sed -n \

15531

"s/'/'\\\\''/g;

15532

s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"

15533

@@ -19744,11 +17116,11 @@

15534

if diff "$cache_file" confcache >/dev/null 2>&1; then :; else

15535

if test -w "$cache_file"; then

15536

test "x$cache_file" != "x/dev/null" &&

15537

- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5

15538

+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5

15539

$as_echo "$as_me: updating cache $cache_file" >&6;}

15540

cat confcache >$cache_file

15541

else

15542

- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5

15543

+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5

15544

$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}

15545

fi

15546

fi

15547

@@ -19768,8 +17140,8 @@

15548

ac_i=`$as_echo "$ac_i" | sed "$ac_script"`

15549

# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR

15550

# will be set to the directory where LIBOBJS objects are built.

15551

- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"

15552

- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'

15553

+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"

15554

+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'

15555

done

15556

LIBOBJS=$ac_libobjs

15557

15558

@@ -19777,157 +17149,110 @@

15559

15560

15561

if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then

15562

- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.

15563

-Usually this means the macro was only invoked conditionally." >&5

15564

-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.

15565

-Usually this means the macro was only invoked conditionally." >&2;}

15566

- { (exit 1); exit 1; }; }

15567

-fi

15568

+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.

15569

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15570

+fi

15571

+ if test -n "$EXEEXT"; then

15572

+ am__EXEEXT_TRUE=

15573

+ am__EXEEXT_FALSE='#'

15574

+else

15575

+ am__EXEEXT_TRUE='#'

15576

+ am__EXEEXT_FALSE=

15577

+fi

15578

+

15579

if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then

15580

- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.

15581

-Usually this means the macro was only invoked conditionally." >&5

15582

-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.

15583

-Usually this means the macro was only invoked conditionally." >&2;}

15584

- { (exit 1); exit 1; }; }

15585

-fi

15586

-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then

15587

- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.

15588

-Usually this means the macro was only invoked conditionally." >&5

15589

-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.

15590

-Usually this means the macro was only invoked conditionally." >&2;}

15591

- { (exit 1); exit 1; }; }

15592

-fi

15593

-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then

15594

- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.

15595

-Usually this means the macro was only invoked conditionally." >&5

15596

-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.

15597

-Usually this means the macro was only invoked conditionally." >&2;}

15598

- { (exit 1); exit 1; }; }

15599

+ as_fn_error "conditional \"AMDEP\" was never defined.

15600

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15601

+fi

15602

+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then

15603

+ as_fn_error "conditional \"am__fastdepCC\" was never defined.

15604

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15605

+fi

15606

+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then

15607

+ as_fn_error "conditional \"am__fastdepCC\" was never defined.

15608

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15609

fi

15610

15611

ac_config_commands="$ac_config_commands po/stamp-it"

15612

15613

15614

if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then

15615

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.

15616

-Usually this means the macro was only invoked conditionally." >&5

15617

-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.

15618

-Usually this means the macro was only invoked conditionally." >&2;}

15619

- { (exit 1); exit 1; }; }

15620

+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.

15621

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15622

fi

15623

if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then

15624

- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.

15625

-Usually this means the macro was only invoked conditionally." >&5

15626

-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.

15627

-Usually this means the macro was only invoked conditionally." >&2;}

15628

- { (exit 1); exit 1; }; }

15629

+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.

15630

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15631

fi

15632

if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then

15633

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.

15634

-Usually this means the macro was only invoked conditionally." >&5

15635

-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.

15636

-Usually this means the macro was only invoked conditionally." >&2;}

15637

- { (exit 1); exit 1; }; }

15638

+ as_fn_error "conditional \"ENABLE_SK\" was never defined.

15639

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15640

fi

15641

if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then

15642

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.

15643

-Usually this means the macro was only invoked conditionally." >&5

15644

-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.

15645

-Usually this means the macro was only invoked conditionally." >&2;}

15646

- { (exit 1); exit 1; }; }

15647

+ as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.

15648

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15649

fi

15650

if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then

15651

- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.

15652

-Usually this means the macro was only invoked conditionally." >&5

15653

-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.

15654

-Usually this means the macro was only invoked conditionally." >&2;}

15655

- { (exit 1); exit 1; }; }

15656

+ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.

15657

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15658

fi

15659

if test -z "${HAVE_VALGRIND_TRUE}" && test -z "${HAVE_VALGRIND_FALSE}"; then

15660

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_VALGRIND\" was never defined.

15661

-Usually this means the macro was only invoked conditionally." >&5

15662

-$as_echo "$as_me: error: conditional \"HAVE_VALGRIND\" was never defined.

15663

-Usually this means the macro was only invoked conditionally." >&2;}

15664

- { (exit 1); exit 1; }; }

15665

+ as_fn_error "conditional \"HAVE_VALGRIND\" was never defined.

15666

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15667

fi

15668

if test -z "${HAVE_NM_TRUE}" && test -z "${HAVE_NM_FALSE}"; then

15669

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_NM\" was never defined.

15670

-Usually this means the macro was only invoked conditionally." >&5

15671

-$as_echo "$as_me: error: conditional \"HAVE_NM\" was never defined.

15672

-Usually this means the macro was only invoked conditionally." >&2;}

15673

- { (exit 1); exit 1; }; }

15674

+ as_fn_error "conditional \"HAVE_NM\" was never defined.

15675

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15676

fi

15677

if test -z "${HAVE_CONNMAN_TRUE}" && test -z "${HAVE_CONNMAN_FALSE}"; then

15678

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CONNMAN\" was never defined.

15679

-Usually this means the macro was only invoked conditionally." >&5

15680

-$as_echo "$as_me: error: conditional \"HAVE_CONNMAN\" was never defined.

15681

-Usually this means the macro was only invoked conditionally." >&2;}

15682

- { (exit 1); exit 1; }; }

15683

+ as_fn_error "conditional \"HAVE_CONNMAN\" was never defined.

15684

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15685

fi

15686

if test -z "${HAVE_WEBKIT_TRUE}" && test -z "${HAVE_WEBKIT_FALSE}"; then

15687

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_WEBKIT\" was never defined.

15688

-Usually this means the macro was only invoked conditionally." >&5

15689

-$as_echo "$as_me: error: conditional \"HAVE_WEBKIT\" was never defined.

15690

-Usually this means the macro was only invoked conditionally." >&2;}

15691

- { (exit 1); exit 1; }; }

15692

+ as_fn_error "conditional \"HAVE_WEBKIT\" was never defined.

15693

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15694

fi

15695

if test -z "${HAVE_ENCHANT_TRUE}" && test -z "${HAVE_ENCHANT_FALSE}"; then

15696

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_ENCHANT\" was never defined.

15697

-Usually this means the macro was only invoked conditionally." >&5

15698

-$as_echo "$as_me: error: conditional \"HAVE_ENCHANT\" was never defined.

15699

-Usually this means the macro was only invoked conditionally." >&2;}

15700

- { (exit 1); exit 1; }; }

15701

+ as_fn_error "conditional \"HAVE_ENCHANT\" was never defined.

15702

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15703

fi

15704

if test -z "${HAVE_LIBCHAMPLAIN_TRUE}" && test -z "${HAVE_LIBCHAMPLAIN_FALSE}"; then

15705

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBCHAMPLAIN\" was never defined.

15706

-Usually this means the macro was only invoked conditionally." >&5

15707

-$as_echo "$as_me: error: conditional \"HAVE_LIBCHAMPLAIN\" was never defined.

15708

-Usually this means the macro was only invoked conditionally." >&2;}

15709

- { (exit 1); exit 1; }; }

15710

+ as_fn_error "conditional \"HAVE_LIBCHAMPLAIN\" was never defined.

15711

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15712

fi

15713

if test -z "${HAVE_GEOCLUE_TRUE}" && test -z "${HAVE_GEOCLUE_FALSE}"; then

15714

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GEOCLUE\" was never defined.

15715

-Usually this means the macro was only invoked conditionally." >&5

15716

-$as_echo "$as_me: error: conditional \"HAVE_GEOCLUE\" was never defined.

15717

-Usually this means the macro was only invoked conditionally." >&2;}

15718

- { (exit 1); exit 1; }; }

15719

+ as_fn_error "conditional \"HAVE_GEOCLUE\" was never defined.

15720

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15721

fi

15722

if test -z "${HAVE_MEGAPHONE_TRUE}" && test -z "${HAVE_MEGAPHONE_FALSE}"; then

15723

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_MEGAPHONE\" was never defined.

15724

-Usually this means the macro was only invoked conditionally." >&5

15725

-$as_echo "$as_me: error: conditional \"HAVE_MEGAPHONE\" was never defined.

15726

-Usually this means the macro was only invoked conditionally." >&2;}

15727

- { (exit 1); exit 1; }; }

15728

+ as_fn_error "conditional \"HAVE_MEGAPHONE\" was never defined.

15729

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15730

fi

15731

if test -z "${HAVE_NOTHERE_TRUE}" && test -z "${HAVE_NOTHERE_FALSE}"; then

15732

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_NOTHERE\" was never defined.

15733

-Usually this means the macro was only invoked conditionally." >&5

15734

-$as_echo "$as_me: error: conditional \"HAVE_NOTHERE\" was never defined.

15735

-Usually this means the macro was only invoked conditionally." >&2;}

15736

- { (exit 1); exit 1; }; }

15737

+ as_fn_error "conditional \"HAVE_NOTHERE\" was never defined.

15738

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15739

+fi

15740

+if test -z "${HAVE_LIBINDICATE_TRUE}" && test -z "${HAVE_LIBINDICATE_FALSE}"; then

15741

+ as_fn_error "conditional \"HAVE_LIBINDICATE\" was never defined.

15742

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15743

fi

15744

if test -z "${HAVE_TESTS_TRUE}" && test -z "${HAVE_TESTS_FALSE}"; then

15745

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_TESTS\" was never defined.

15746

-Usually this means the macro was only invoked conditionally." >&5

15747

-$as_echo "$as_me: error: conditional \"HAVE_TESTS\" was never defined.

15748

-Usually this means the macro was only invoked conditionally." >&2;}

15749

- { (exit 1); exit 1; }; }

15750

+ as_fn_error "conditional \"HAVE_TESTS\" was never defined.

15751

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15752

fi

15753

if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then

15754

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_PYTHON\" was never defined.

15755

-Usually this means the macro was only invoked conditionally." >&5

15756

-$as_echo "$as_me: error: conditional \"HAVE_PYTHON\" was never defined.

15757

-Usually this means the macro was only invoked conditionally." >&2;}

15758

- { (exit 1); exit 1; }; }

15759

+ as_fn_error "conditional \"HAVE_PYTHON\" was never defined.

15760

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

15761

fi

15762

15763

: ${CONFIG_STATUS=./config.status}

15764

ac_write_fail=0

15765

ac_clean_files_save=$ac_clean_files

15766

ac_clean_files="$ac_clean_files $CONFIG_STATUS"

15767

-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5

15768

+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5

15769

$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}

15770

-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

15771

+as_write_fail=0

15772

+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1

15773

#! $SHELL

15774

# Generated by $as_me.

15775

# Run this file to recreate the current configuration.

15776

@@ -19937,17 +17262,18 @@

15777

debug=false

15778

ac_cs_recheck=false

15779

ac_cs_silent=false

15780

+

15781

SHELL=\${CONFIG_SHELL-$SHELL}

15782

-_ACEOF

15783

-

15784

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

15785

-## --------------------- ##

15786

-## M4sh Initialization. ##

15787

-## --------------------- ##

15788

+export SHELL

15789

+_ASEOF

15790

+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1

15791

+## -------------------- ##

15792

+## M4sh Initialization. ##

15793

+## -------------------- ##

15794

15795

# Be more Bourne compatible

15796

DUALCASE=1; export DUALCASE # for MKS sh

15797

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

15798

+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :

15799

emulate sh

15800

NULLCMD=:

15801

# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

15802

@@ -19955,23 +17281,15 @@

15803

alias -g '${1+"$@"}'='"$@"'

15804

setopt NO_GLOB_SUBST

15805

else

15806

- case `(set -o) 2>/dev/null` in

15807

- *posix*) set -o posix ;;

15808

+ case `(set -o) 2>/dev/null` in #(

15809

+ *posix*) :

15810

+ set -o posix ;; #(

15811

+ *) :

15812

+ ;;

15813

esac

15814

-

15815

fi

15816

15817

15818

-

15819

-

15820

-# PATH needs CR

15821

-# Avoid depending upon Character Ranges.

15822

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

15823

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

15824

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

15825

-as_cr_digits='0123456789'

15826

-as_cr_alnum=$as_cr_Letters$as_cr_digits

15827

-

15828

as_nl='

15829

'

15830

export as_nl

15831

@@ -19979,7 +17297,13 @@

15832

as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

15833

as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

15834

as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

15835

-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

15836

+# Prefer a ksh shell builtin over an external printf program on Solaris,

15837

+# but without wasting forks for bash or zsh.

15838

+if test -z "$BASH_VERSION$ZSH_VERSION" \

15839

+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then

15840

+ as_echo='print -r --'

15841

+ as_echo_n='print -rn --'

15842

+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

15843

as_echo='printf %s\n'

15844

as_echo_n='printf %s'

15845

else

15846

@@ -19990,7 +17314,7 @@

15847

as_echo_body='eval expr "X$1" : "X\$.*\$"'

15848

as_echo_n_body='eval

15849

arg=$1;

15850

- case $arg in

15851

+ case $arg in #(

15852

*"$as_nl"*)

15853

expr "X$arg" : "X\$.*\$$as_nl";

15854

arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;

15855

@@ -20013,13 +17337,6 @@

15856

}

15857

fi

15858

15859

-# Support unset when possible.

15860

-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

15861

- as_unset=unset

15862

-else

15863

- as_unset=false

15864

-fi

15865

-

15866

15867

# IFS

15868

# We need space, tab and new line, in precisely that order. Quoting is

15869

@@ -20029,15 +17346,15 @@

15870

IFS=" "" $as_nl"

15871

15872

# Find who we are. Look in the path if we contain no directory separator.

15873

-case $0 in

15874

+case $0 in #((

15875

*[\\/]* ) as_myself=$0 ;;

15876

*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

15877

for as_dir in $PATH

15878

do

15879

IFS=$as_save_IFS

15880

test -z "$as_dir" && as_dir=.

15881

- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

15882

-done

15883

+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

15884

+ done

15885

IFS=$as_save_IFS

15886

15887

;;

15888

@@ -20049,12 +17366,16 @@

15889

fi

15890

if test ! -f "$as_myself"; then

15891

$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

15892

- { (exit 1); exit 1; }

15893

+ exit 1

15894

fi

15895

15896

-# Work around bugs in pre-3.0 UWIN ksh.

15897

-for as_var in ENV MAIL MAILPATH

15898

-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

15899

+# Unset variables that we do not need and which cause bugs (e.g. in

15900

+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"

15901

+# suppresses any "Segmentation fault" message there. '((' could

15902

+# trigger a bug in pdksh 5.2.14.

15903

+for as_var in BASH_ENV ENV MAIL MAILPATH

15904

+do eval test x\${$as_var+set} = xset \

15905

+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :

15906

done

15907

PS1='$ '

15908

PS2='> '

15909

@@ -20066,7 +17387,89 @@

15910

LANGUAGE=C

15911

export LANGUAGE

15912

15913

-# Required to use basename.

15914

+# CDPATH.

15915

+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

15916

+

15917

+

15918

+# as_fn_error ERROR [LINENO LOG_FD]

15919

+# ---------------------------------

15920

+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

15921

+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

15922

+# script with status $?, using 1 if that was 0.

15923

+as_fn_error ()

15924

+{

15925

+ as_status=$?; test $as_status -eq 0 && as_status=1

15926

+ if test "$3"; then

15927

+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

15928

+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3

15929

+ fi

15930

+ $as_echo "$as_me: error: $1" >&2

15931

+ as_fn_exit $as_status

15932

+} # as_fn_error

15933

+

15934

+

15935

+# as_fn_set_status STATUS

15936

+# -----------------------

15937

+# Set $? to STATUS, without forking.

15938

+as_fn_set_status ()

15939

+{

15940

+ return $1

15941

+} # as_fn_set_status

15942

+

15943

+# as_fn_exit STATUS

15944

+# -----------------

15945

+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.

15946

+as_fn_exit ()

15947

+{

15948

+ set +e

15949

+ as_fn_set_status $1

15950

+ exit $1

15951

+} # as_fn_exit

15952

+

15953

+# as_fn_unset VAR

15954

+# ---------------

15955

+# Portably unset VAR.

15956

+as_fn_unset ()

15957

+{

15958

+ { eval $1=; unset $1;}

15959

+}

15960

+as_unset=as_fn_unset

15961

+# as_fn_append VAR VALUE

15962

+# ----------------------

15963

+# Append the text in VALUE to the end of the definition contained in VAR. Take

15964

+# advantage of any shell optimizations that allow amortized linear growth over

15965

+# repeated appends, instead of the typical quadratic growth present in naive

15966

+# implementations.

15967

+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :

15968

+ eval 'as_fn_append ()

15969

+ {

15970

+ eval $1+=\$2

15971

+ }'

15972

+else

15973

+ as_fn_append ()

15974

+ {

15975

+ eval $1=\$$1\$2

15976

+ }

15977

+fi # as_fn_append

15978

+

15979

+# as_fn_arith ARG...

15980

+# ------------------

15981

+# Perform arithmetic evaluation on the ARGs, and store the result in the

15982

+# global $as_val. Take advantage of shells that can avoid forks. The arguments

15983

+# must be portable across $(()) and expr.

15984

+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :

15985

+ eval 'as_fn_arith ()

15986

+ {

15987

+ as_val=$(( $* ))

15988

+ }'

15989

+else

15990

+ as_fn_arith ()

15991

+ {

15992

+ as_val=`expr "$@" || test $? -eq 1`

15993

+ }

15994

+fi # as_fn_arith

15995

+

15996

+

15997

if expr a : '$a$' >/dev/null 2>&1 &&

15998

test "X`expr 00001 : '.*$...$'`" = X001; then

15999

as_expr=expr

16000

@@ -20080,8 +17483,12 @@

16001

as_basename=false

16002

fi

16003

16004

+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

16005

+ as_dirname=dirname

16006

+else

16007

+ as_dirname=false

16008

+fi

16009

16010

-# Name of the executable.

16011

as_me=`$as_basename -- "$0" ||

16012

$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

16013

X"$0" : 'X$//$$' \| \

16014

@@ -20101,76 +17508,25 @@

16015

}

16016

s/.*/./; q'`

16017

16018

-# CDPATH.

16019

-$as_unset CDPATH

16020

-

16021

-

16022

-

16023

- as_lineno_1=$LINENO

16024

- as_lineno_2=$LINENO

16025

- test "x$as_lineno_1" != "x$as_lineno_2" &&

16026

- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {

16027

-

16028

- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO

16029

- # uniformly replaced by the line number. The first 'sed' inserts a

16030

- # line-number line after each line using $LINENO; the second 'sed'

16031

- # does the real work. The second script uses 'N' to pair each

16032

- # line-number line with the line containing $LINENO, and appends

16033

- # trailing '-' during substitution so that $LINENO is not a special

16034

- # case at line end.

16035

- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

16036

- # scripts with optimization help from Paolo Bonzini. Blame Lee

16037

- # E. McMahon (1931-1989) for sed's syntax. :-)

16038

- sed -n '

16039

- p

16040

- /[$]LINENO/=

16041

- ' <$as_myself |

16042

- sed '

16043

- s/[$]LINENO.*/&-/

16044

- t lineno

16045

- b

16046

- :lineno

16047

- N

16048

- :loop

16049

- s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/

16050

- t loop

16051

- s/-\n.*//

16052

- ' >$as_me.lineno &&

16053

- chmod +x "$as_me.lineno" ||

16054

- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

16055

- { (exit 1); exit 1; }; }

16056

-

16057

- # Don't try to exec as it changes $[0], causing all sort of problems

16058

- # (the dirname of $[0] is not the place where we might find the

16059

- # original and so on. Autoconf is especially sensitive to this).

16060

- . "./$as_me.lineno"

16061

- # Exit status is that of the last command.

16062

- exit

16063

-}

16064

-

16065

-

16066

-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

16067

- as_dirname=dirname

16068

-else

16069

- as_dirname=false

16070

-fi

16071

+# Avoid depending upon Character Ranges.

16072

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

16073

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

16074

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

16075

+as_cr_digits='0123456789'

16076

+as_cr_alnum=$as_cr_Letters$as_cr_digits

16077

16078

ECHO_C= ECHO_N= ECHO_T=

16079

-case `echo -n x` in

16080

+case `echo -n x` in #(((((

16081

-n*)

16082

- case `echo 'x\c'` in

16083

+ case `echo 'xy\c'` in

16084

*c*) ECHO_T=' ';; # ECHO_T is single tab character.

16085

- *) ECHO_C='\c';;

16086

+ xy) ECHO_C='\c';;

16087

+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null

16088

+ ECHO_T=' ';;

16089

esac;;

16090

*)

16091

ECHO_N='-n';;

16092

esac

16093

-if expr a : '$a$' >/dev/null 2>&1 &&

16094

- test "X`expr 00001 : '.*$...$'`" = X001; then

16095

- as_expr=expr

16096

-else

16097

- as_expr=false

16098

-fi

16099

16100

rm -f conf$$ conf$$.exe conf$$.file

16101

if test -d conf$$.dir; then

16102

@@ -20199,8 +17555,56 @@

16103

rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

16104

rmdir conf$$.dir 2>/dev/null

16105

16106

+

16107

+# as_fn_mkdir_p

16108

+# -------------

16109

+# Create "$as_dir" as a directory, including parents if necessary.

16110

+as_fn_mkdir_p ()

16111

+{

16112

+

16113

+ case $as_dir in #(

16114

+ -*) as_dir=./$as_dir;;

16115

+ esac

16116

+ test -d "$as_dir" || eval $as_mkdir_p || {

16117

+ as_dirs=

16118

+ while :; do

16119

+ case $as_dir in #(

16120

+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

16121

+ *) as_qdir=$as_dir;;

16122

+ esac

16123

+ as_dirs="'$as_qdir' $as_dirs"

16124

+ as_dir=`$as_dirname -- "$as_dir" ||

16125

+$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

16126

+ X"$as_dir" : 'X$//$[^/]' \| \

16127

+ X"$as_dir" : 'X$//$$' \| \

16128

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

16129

+$as_echo X"$as_dir" |

16130

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

16131

+ s//\1/

16132

+ q

16133

+ }

16134

+ /^X$\/\/$[^/].*/{

16135

+ s//\1/

16136

+ q

16137

+ }

16138

+ /^X$\/\/$$/{

16139

+ s//\1/

16140

+ q

16141

+ }

16142

+ /^X$\/$.*/{

16143

+ s//\1/

16144

+ q

16145

+ }

16146

+ s/.*/./; q'`

16147

+ test -d "$as_dir" && break

16148

+ done

16149

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

16150

+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"

16151

+

16152

+

16153

+} # as_fn_mkdir_p

16154

if mkdir -p . 2>/dev/null; then

16155

- as_mkdir_p=:

16156

+ as_mkdir_p='mkdir -p "$as_dir"'

16157

else

16158

test -d ./-p && rmdir ./-p

16159

as_mkdir_p=false

16160

@@ -20219,10 +17623,10 @@

16161

if test -d "$1"; then

16162

test -d "$1/.";

16163

else

16164

- case $1 in

16165

+ case $1 in #(

16166

-*)set "./$1";;

16167

esac;

16168

- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

16169

+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((

16170

???[sx]*):;;*)false;;esac;fi

16171

'\'' sh

16172

'

16173

@@ -20237,13 +17641,19 @@

16174

16175

16176

exec 6>&1

16177

+## ----------------------------------- ##

16178

+## Main body of $CONFIG_STATUS script. ##

16179

+## ----------------------------------- ##

16180

+_ASEOF

16181

+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1

16182

16183

-# Save the log message, to keep $[0] and so on meaningful, and to

16184

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

16185

+# Save the log message, to keep $0 and so on meaningful, and to

16186

# report actual input values of CONFIG_FILES etc. instead of their

16187

# values after options handling.

16188

ac_log="

16189

This file was extended by Empathy $as_me 2.27.92, which was

16190

-generated by GNU Autoconf 2.63. Invocation command line was

16191

+generated by GNU Autoconf 2.64. Invocation command line was

16192

16193

CONFIG_FILES = $CONFIG_FILES

16194

CONFIG_HEADERS = $CONFIG_HEADERS

16195

@@ -20275,10 +17685,11 @@

16196

16197

cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

16198

ac_cs_usage="\

16199

-\`$as_me' instantiates files from templates according to the

16200

-current configuration.

16201

+\`$as_me' instantiates files and other configuration actions

16202

+from templates according to the current configuration. Unless the files

16203

+and actions are specified as TAGs, all are instantiated by default.

16204

16205

-Usage: $0 [OPTION]... [FILE]...

16206

+Usage: $0 [OPTION]... [TAG]...

16207

16208

-h, --help print this help, then exit

16209

-V, --version print version number and configuration settings, then exit

16210

@@ -20300,16 +17711,16 @@

16211

Configuration commands:

16212

$config_commands

16213

16214

-Report bugs to <bug-autoconf@gnu.org>."

16215

+Report bugs to <http://bugzilla.gnome.org/browse.cgi?product=empathy>."

16216

16217

_ACEOF

16218

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

16219

ac_cs_version="\\

16220

Empathy config.status 2.27.92

16221

-configured by $0, generated by GNU Autoconf 2.63,

16222

+configured by $0, generated by GNU Autoconf 2.64,

16223

with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

16224

16225

16226

16227

This config.status script is free software; the Free Software Foundation

16228

gives unlimited permission to copy, distribute and modify it."

16229

16230

@@ -20352,20 +17763,19 @@

16231

case $ac_optarg in

16232

*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

16233

esac

16234

- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"

16235

+ as_fn_append CONFIG_FILES " '$ac_optarg'"

16236

ac_need_defaults=false;;

16237

--header | --heade | --head | --hea )

16238

$ac_shift

16239

case $ac_optarg in

16240

*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

16241

esac

16242

- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"

16243

+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"

16244

ac_need_defaults=false;;

16245

--he | --h)

16246

# Conflict between --help and --header

16247

- { $as_echo "$as_me: error: ambiguous option: $1

16248

-Try \`$0 --help' for more information." >&2

16249

- { (exit 1); exit 1; }; };;

16250

+ as_fn_error "ambiguous option: \`$1'

16251

+Try \`$0 --help' for more information.";;

16252

--help | --hel | -h )

16253

$as_echo "$ac_cs_usage"; exit ;;

16254

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

16255

@@ -20373,11 +17783,10 @@

16256

ac_cs_silent=: ;;

16257

16258

# This is an error.

16259

- -*) { $as_echo "$as_me: error: unrecognized option: $1

16260

-Try \`$0 --help' for more information." >&2

16261

- { (exit 1); exit 1; }; } ;;

16262

+ -*) as_fn_error "unrecognized option: \`$1'

16263

+Try \`$0 --help' for more information." ;;

16264

16265

- *) ac_config_targets="$ac_config_targets $1"

16266

+ *) as_fn_append ac_config_targets " $1"

16267

ac_need_defaults=false ;;

16268

16269

esac

16270

@@ -20721,9 +18130,7 @@

16271

"shave-libtool") CONFIG_FILES="$CONFIG_FILES shave-libtool" ;;

16272

"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;

16273

16274

- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

16275

-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

16276

- { (exit 1); exit 1; }; };;

16277

+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

16278

esac

16279

done

16280

16281

@@ -20750,7 +18157,7 @@

16282

trap 'exit_status=$?

16283

{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status

16284

' 0

16285

- trap '{ (exit 1); exit 1; }' 1 2 13 15

16286

+ trap 'as_fn_exit 1' 1 2 13 15

16287

}

16288

# Create a (secure) tmp directory for tmp files.

16289

16290

@@ -20761,11 +18168,7 @@

16291

{

16292

tmp=./conf$$-$RANDOM

16293

(umask 077 && mkdir "$tmp")

16294

-} ||

16295

-{

16296

- $as_echo "$as_me: cannot create a temporary directory in ." >&2

16297

- { (exit 1); exit 1; }

16298

-}

16299

+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5

16300

16301

# Set up the scripts for CONFIG_FILES section.

16302

# No need to generate them if there are no CONFIG_FILES.

16303

@@ -20773,10 +18176,16 @@

16304

if test -n "$CONFIG_FILES"; then

16305

16306

16307

-ac_cr='

b"'"

16308

+ac_cr=`echo X | tr X '\015'`

16309

+# On cygwin, bash can eat \r inside `` if the user requested igncr.

16310

+# But we know of no other shell where ac_cr would be empty at this

16311

+# point, so we can use a bashism as a fallback.

16312

+if test "x$ac_cr" = x; then

16313

+ eval ac_cr=\$\'\\r\'

16314

+fi

16315

ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`

16316

if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then

16317

- ac_cs_awk_cr='\\r'

16318

+ ac_cs_awk_cr='\r'

16319

else

16320

ac_cs_awk_cr=$ac_cr

16321

fi

16322

@@ -20790,24 +18199,18 @@

16323

echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&

16324

echo "_ACEOF"

16325

} >conf$$subs.sh ||

16326

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

16327

-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

16328

- { (exit 1); exit 1; }; }

16329

+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

16330

ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`

16331

ac_delim='%!_!# '

16332

for ac_last_try in false false false false false :; do

16333

. ./conf$$subs.sh ||

16334

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

16335

-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

16336

- { (exit 1); exit 1; }; }

16337

+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

16338

16339

ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`

16340

if test $ac_delim_n = $ac_delim_num; then

16341

break

16342

elif $ac_last_try; then

16343

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

16344

-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

16345

- { (exit 1); exit 1; }; }

16346

+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

16347

else

16348

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

16349

fi

16350

@@ -20896,9 +18299,7 @@

16351

else

16352

cat

16353

fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \

16354

- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5

16355

-$as_echo "$as_me: error: could not setup config files machinery" >&2;}

16356

- { (exit 1); exit 1; }; }

16357

+ || as_fn_error "could not setup config files machinery" "$LINENO" 5

16358

_ACEOF

16359

16360

# VPATH may cause trouble with some makes, so we remove $(srcdir),

16361

@@ -20939,9 +18340,7 @@

16362

if test -z "$ac_t"; then

16363

break

16364

elif $ac_last_try; then

16365

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5

16366

-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}

16367

- { (exit 1); exit 1; }; }

16368

+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5

16369

else

16370

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

16371

fi

16372

@@ -21026,9 +18425,7 @@

16373

_ACAWK

16374

_ACEOF

16375

cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

16376

- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5

16377

-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}

16378

- { (exit 1); exit 1; }; }

16379

+ as_fn_error "could not setup config headers machinery" "$LINENO" 5

16380

fi # test -n "$CONFIG_HEADERS"

16381

16382

16383

@@ -21041,9 +18438,7 @@

16384

esac

16385

case $ac_mode$ac_tag in

16386

:[FHL]*:*);;

16387

- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5

16388

-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}

16389

- { (exit 1); exit 1; }; };;

16390

+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;

16391

:[FH]-) ac_tag=-:-;;

16392

:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;

16393

esac

16394

@@ -21071,12 +18466,10 @@

16395

[\\/$]*) false;;

16396

*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;

16397

esac ||

16398

- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5

16399

-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}

16400

- { (exit 1); exit 1; }; };;

16401

+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;

16402

esac

16403

case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac

16404

- ac_file_inputs="$ac_file_inputs '$ac_f'"

16405

+ as_fn_append ac_file_inputs " '$ac_f'"

16406

done

16407

16408

# Let's still pretend it is `configure' which instantiates (i.e., don't

16409

@@ -21087,7 +18480,7 @@

16410

`' by configure.'

16411

if test x"$ac_file" != x-; then

16412

configure_input="$ac_file. $configure_input"

16413

- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5

16414

+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5

16415

$as_echo "$as_me: creating $ac_file" >&6;}

16416

fi

16417

# Neutralize special characters interpreted by sed in replacement strings.

16418

@@ -21100,9 +18493,7 @@

16419

16420

case $ac_tag in

16421

*:-:* | *:-) cat >"$tmp/stdin" \

16422

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

16423

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

16424

- { (exit 1); exit 1; }; } ;;

16425

+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;

16426

esac

16427

;;

16428

esac

16429

@@ -21130,47 +18521,7 @@

16430

q

16431

}

16432

s/.*/./; q'`

16433

- { as_dir="$ac_dir"

16434

- case $as_dir in #(

16435

- -*) as_dir=./$as_dir;;

16436

- esac

16437

- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

16438

- as_dirs=

16439

- while :; do

16440

- case $as_dir in #(

16441

- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

16442

- *) as_qdir=$as_dir;;

16443

- esac

16444

- as_dirs="'$as_qdir' $as_dirs"

16445

- as_dir=`$as_dirname -- "$as_dir" ||

16446

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

16447

- X"$as_dir" : 'X$//$[^/]' \| \

16448

- X"$as_dir" : 'X$//$$' \| \

16449

- X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

16450

-$as_echo X"$as_dir" |

16451

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

16452

- s//\1/

16453

- q

16454

- }

16455

- /^X$\/\/$[^/].*/{

16456

- s//\1/

16457

- q

16458

- }

16459

- /^X$\/\/$$/{

16460

- s//\1/

16461

- q

16462

- }

16463

- /^X$\/$.*/{

16464

- s//\1/

16465

- q

16466

- }

16467

- s/.*/./; q'`

16468

- test -d "$as_dir" && break

16469

- done

16470

- test -z "$as_dirs" || eval "mkdir $as_dirs"

16471

- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

16472

-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}

16473

- { (exit 1); exit 1; }; }; }

16474

+ as_dir="$ac_dir"; as_fn_mkdir_p

16475

ac_builddir=.

16476

16477

case "$ac_dir" in

16478

@@ -21227,7 +18578,6 @@

16479

# If the template does not know about datarootdir, expand it.

16480

# FIXME: This hack should be removed a few years after 2.60.

16481

ac_datarootdir_hack=; ac_datarootdir_seen=

16482

-

16483

ac_sed_dataroot='

16484

/datarootdir/ {

16485

p

16486

@@ -21237,12 +18587,11 @@

16487

/@docdir@/p

16488

/@infodir@/p

16489

/@localedir@/p

16490

-/@mandir@/p

16491

-'

16492

+/@mandir@/p'

16493

case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in

16494

*datarootdir*) ac_datarootdir_seen=yes;;

16495

*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)

16496

- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

16497

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

16498

$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

16499

_ACEOF

16500

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

16501

@@ -21252,7 +18601,7 @@

16502

s&@infodir@&$infodir&g

16503

s&@localedir@&$localedir&g

16504

s&@mandir@&$mandir&g

16505

- s&\\\${datarootdir}&$datarootdir&g' ;;

16506

+ s&\\\${datarootdir}&$datarootdir&g' ;;

16507

esac

16508

_ACEOF

16509

16510

@@ -21281,14 +18630,12 @@

16511

$ac_datarootdir_hack

16512

"

16513

eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \

16514

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

16515

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

16516

- { (exit 1); exit 1; }; }

16517

+ || as_fn_error "could not create $ac_file" "$LINENO" 5

16518

16519

test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&

16520

{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

16521

{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

16522

- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'

16523

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'

16524

which seems to be undefined. Please make sure it is defined." >&5

16525

$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

16526

which seems to be undefined. Please make sure it is defined." >&2;}

16527

@@ -21298,9 +18645,7 @@

16528

-) cat "$tmp/out" && rm -f "$tmp/out";;

16529

*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;

16530

esac \

16531

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

16532

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

16533

- { (exit 1); exit 1; }; }

16534

+ || as_fn_error "could not create $ac_file" "$LINENO" 5

16535

;;

16536

:H)

16537

#

16538

@@ -21311,25 +18656,19 @@

16539

$as_echo "/* $configure_input */" \

16540

&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"

16541

} >"$tmp/config.h" \

16542

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

16543

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

16544

- { (exit 1); exit 1; }; }

16545

+ || as_fn_error "could not create $ac_file" "$LINENO" 5

16546

if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then

16547

- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5

16548

+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5

16549

$as_echo "$as_me: $ac_file is unchanged" >&6;}

16550

else

16551

rm -f "$ac_file"

16552

mv "$tmp/config.h" "$ac_file" \

16553

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

16554

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

16555

- { (exit 1); exit 1; }; }

16556

+ || as_fn_error "could not create $ac_file" "$LINENO" 5

16557

fi

16558

else

16559

$as_echo "/* $configure_input */" \

16560

&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \

16561

- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5

16562

-$as_echo "$as_me: error: could not create -" >&2;}

16563

- { (exit 1); exit 1; }; }

16564

+ || as_fn_error "could not create -" "$LINENO" 5

16565

fi

16566

# Compute "$ac_file"'s index in $config_headers.

16567

_am_arg="$ac_file"

16568

@@ -21367,7 +18706,7 @@

16569

s/.*/./; q'`/stamp-h$_am_stamp_count

16570

;;

16571

16572

- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5

16573

+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5

16574

$as_echo "$as_me: executing $ac_file commands" >&6;}

16575

;;

16576

esac

16577

@@ -21462,47 +18801,7 @@

16578

q

16579

}

16580

s/.*/./; q'`

16581

- { as_dir=$dirpart/$fdir

16582

- case $as_dir in #(

16583

- -*) as_dir=./$as_dir;;

16584

- esac

16585

- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

16586

- as_dirs=

16587

- while :; do

16588

- case $as_dir in #(

16589

- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

16590

- *) as_qdir=$as_dir;;

16591

- esac

16592

- as_dirs="'$as_qdir' $as_dirs"

16593

- as_dir=`$as_dirname -- "$as_dir" ||

16594

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

16595

- X"$as_dir" : 'X$//$[^/]' \| \

16596

- X"$as_dir" : 'X$//$$' \| \

16597

- X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

16598

-$as_echo X"$as_dir" |

16599

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

16600

- s//\1/

16601

- q

16602

- }

16603

- /^X$\/\/$[^/].*/{

16604

- s//\1/

16605

- q

16606

- }

16607

- /^X$\/\/$$/{

16608

- s//\1/

16609

- q

16610

- }

16611

- /^X$\/$.*/{

16612

- s//\1/

16613

- q

16614

- }

16615

- s/.*/./; q'`

16616

- test -d "$as_dir" && break

16617

- done

16618

- test -z "$as_dirs" || eval "mkdir $as_dirs"

16619

- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

16620

-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}

16621

- { (exit 1); exit 1; }; }; }

16622

+ as_dir=$dirpart/$fdir; as_fn_mkdir_p

16623

# echo "creating $dirpart/$file"

16624

echo '# dummy' > "$dirpart/$file"

16625

done

16626

@@ -22149,9 +19448,7 @@

16627

esac ;;

16628

"po/stamp-it":C)

16629

if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then

16630

- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5

16631

-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}

16632

- { (exit 1); exit 1; }; }

16633

+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5

16634

fi

16635

rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"

16636

>"po/stamp-it.tmp"

16637

@@ -22174,15 +19471,12 @@

16638

done # for ac_tag

16639

16640

16641

-{ (exit 0); exit 0; }

16642

+as_fn_exit 0

16643

_ACEOF

16644

-chmod +x $CONFIG_STATUS

16645

ac_clean_files=$ac_clean_files_save

16646

16647

test $ac_write_fail = 0 ||

16648

- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5

16649

-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}

16650

- { (exit 1); exit 1; }; }

16651

+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5

16652

16653

16654

# configure is writing to config.log, and then calls config.status.

16655

@@ -22203,10 +19497,10 @@

16656

exec 5>>config.log

16657

# Use ||, not &&, to avoid exiting from the if with $? = 1, which

16658

# would make configure fail if this is the last instruction.

16659

- $ac_cs_success || { (exit 1); exit 1; }

16660

+ $ac_cs_success || as_fn_exit $?

16661

fi

16662

if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then

16663

- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

16664

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

16665

$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}

16666

fi

16667

16668

@@ -22214,26 +19508,27 @@

16669

echo "

16670

Configure summary:

16671

16672

- Compiler....................: ${CC}

16673

- Compiler Flags..............: ${CFLAGS}

16674

- Prefix......................: ${prefix}

16675

- Shaved build................: ${enable_shave}

16676

- Tests.......................: ${have_check}

16677

- Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS}

16678

+ Compiler...............................: ${CC}

16679

+ Compiler Flags.........................: ${CFLAGS}

16680

+ Prefix.................................: ${prefix}

16681

+ Shaved build...........................: ${enable_shave}

16682

+ Tests..................................: ${have_check}

16683

+ Coding style checks....................: ${ENABLE_CODING_STYLE_CHECKS}

16684

16685

Features:

16686

- Spell checking (enchant)....: ${have_enchant}

16687

- Display maps (libchamplain).: ${have_libchamplain}

16688

- Location awareness (Geoclue): ${have_geoclue}

16689

- Adium themes (Webkit).......: ${have_webkit}

16690

+ Spell checking (enchant)...............: ${have_enchant}

16691

+ Display maps (libchamplain)............: ${have_libchamplain}

16692

+ Location awareness (Geoclue)...........: ${have_geoclue}

16693

+ Adium themes (Webkit)..................: ${have_webkit}

16694

+ Message indicator support (libindicate): ${have_libindicate}

16695

16696

Connectivity:

16697

- NetworkManager integration..: ${have_nm}

16698

- ConnMan integration.........: ${have_connman}

16699

+ NetworkManager integration.............: ${have_nm}

16700

+ ConnMan integration....................: ${have_connman}

16701

16702

Extras:

16703

- Documentation...............: ${enable_gtk_doc}

16704

- Python bindings.............: ${have_python}

16705

- Megaphone applet............: ${have_megaphone}

16706

- Nothere applet..............: ${have_nothere}

16707

+ Documentation..........................: ${enable_gtk_doc}

16708

+ Python bindings........................: ${have_python}

16709

+ Megaphone applet.......................: ${have_megaphone}

16710

+ Nothere applet.........................: ${have_nothere}

16711

"

16712

16713

=== modified file 'data/Makefile.in'

16714

--- data/Makefile.in 2009-09-17 14:07:29 +0000

16715

+++ data/Makefile.in 2009-09-17 14:14:15 +0000

16716

@@ -1,8 +1,9 @@

16717

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

16718

+# Makefile.in generated by automake 1.11 from Makefile.am.

16719

# @configure_input@

16720

16721

16722

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

16723

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

16724

+# Inc.

16725

# This Makefile.in is free software; the Free Software Foundation

16726

# gives unlimited permission to copy and/or distribute it,

16727

# with or without modifications, as long as this notice is preserved.

16728

@@ -16,8 +17,9 @@

16729

16730

VPATH = @srcdir@

16731

pkgdatadir = $(datadir)/@PACKAGE@

16732

+pkgincludedir = $(includedir)/@PACKAGE@

16733

pkglibdir = $(libdir)/@PACKAGE@

16734

-pkgincludedir = $(includedir)/@PACKAGE@

16735

+pkglibexecdir = $(libexecdir)/@PACKAGE@

16736

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

16737

install_sh_DATA = $(install_sh) -c -m 644

16738

install_sh_PROGRAM = $(install_sh) -c

16739

@@ -50,6 +52,7 @@

16740

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

16741

CONFIG_HEADER = $(top_builddir)/config.h

16742

CONFIG_CLEAN_FILES = empathy.desktop.in

16743

+CONFIG_CLEAN_VPATH_FILES =

16744

SOURCES =

16745

DIST_SOURCES =

16746

RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

16747

@@ -64,25 +67,62 @@

16748

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

16749

*) f=$$p;; \

16750

esac;

16751

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

16752

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

16753

+am__install_max = 40

16754

+am__nobase_strip_setup = \

16755

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

16756

+am__nobase_strip = \

16757

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

16758

+am__nobase_list = $(am__nobase_strip_setup); \

16759

+ for p in $$list; do echo "$$p $$p"; done | \

16760

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

16761

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

16762

+ if (++n[$$2] == $(am__install_max)) \

16763

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

16764

+ END { for (dir in files) print dir, files[dir] }'

16765

+am__base_list = \

16766

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

16767

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

16768

am__installdirs = "$(DESTDIR)$(clientfiledir)" \

16769

"$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(htmldir)" \

16770

"$(DESTDIR)$(schemasdir)" "$(DESTDIR)$(servicefiledir)" \

16771

"$(DESTDIR)$(streamingprefsdir)"

16772

-clientfileDATA_INSTALL = $(INSTALL_DATA)

16773

-desktopDATA_INSTALL = $(INSTALL_DATA)

16774

-htmlDATA_INSTALL = $(INSTALL_DATA)

16775

-schemasDATA_INSTALL = $(INSTALL_DATA)

16776

-servicefileDATA_INSTALL = $(INSTALL_DATA)

16777

-streamingprefsDATA_INSTALL = $(INSTALL_DATA)

16778

DATA = $(clientfile_DATA) $(desktop_DATA) $(html_DATA) $(schemas_DATA) \

16779

$(servicefile_DATA) $(streamingprefs_DATA)

16780

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

16781

distclean-recursive maintainer-clean-recursive

16782

+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

16783

+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

16784

+ distdir

16785

ETAGS = etags

16786

CTAGS = ctags

16787

DIST_SUBDIRS = $(SUBDIRS)

16788

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

16789

+am__relativize = \

16790

+ dir0=`pwd`; \

16791

+ sed_first='s,^$[^/]*$/.*$$,\1,'; \

16792

+ sed_rest='s,^[^/]*/*,,'; \

16793

+ sed_last='s,^.*/$[^/]*$$$,\1,'; \

16794

+ sed_butlast='s,/*[^/]*$$,,'; \

16795

+ while test -n "$$dir1"; do \

16796

+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \

16797

+ if test "$$first" != "."; then \

16798

+ if test "$$first" = ".."; then \

16799

+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

16800

+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

16801

+ else \

16802

+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

16803

+ if test "$$first2" = "$$first"; then \

16804

+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

16805

+ else \

16806

+ dir2="../$$dir2"; \

16807

+ fi; \

16808

+ dir0="$$dir0"/"$$first"; \

16809

+ fi; \

16810

+ fi; \

16811

+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

16812

+ done; \

16813

+ reldir="$$dir2"

16814

ACLOCAL = @ACLOCAL@

16815

ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@

16816

ALL_LINGUAS = @ALL_LINGUAS@

16817

@@ -145,6 +185,8 @@

16818

GTKDOC_CHECK = @GTKDOC_CHECK@

16819

HELP_DIR = @HELP_DIR@

16820

HTML_DIR = @HTML_DIR@

16821

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

16822

+INDICATE_LIBS = @INDICATE_LIBS@

16823

INSTALL = @INSTALL@

16824

INSTALL_DATA = @INSTALL_DATA@

16825

INSTALL_PROGRAM = @INSTALL_PROGRAM@

16826

@@ -205,6 +247,7 @@

16827

PACKAGE_NAME = @PACKAGE_NAME@

16828

PACKAGE_STRING = @PACKAGE_STRING@

16829

PACKAGE_TARNAME = @PACKAGE_TARNAME@

16830

+PACKAGE_URL = @PACKAGE_URL@

16831

PACKAGE_VERSION = @PACKAGE_VERSION@

16832

PATH_SEPARATOR = @PATH_SEPARATOR@

16833

PKG_CONFIG = @PKG_CONFIG@

16834

@@ -345,9 +388,9 @@

16835

exit 1;; \

16836

esac; \

16837

done; \

16838

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \

16839

- cd $(top_srcdir) && \

16840

- $(AUTOMAKE) --gnu data/Makefile

16841

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \

16842

+ $(am__cd) $(top_srcdir) && \

16843

+ $(AUTOMAKE) --gnu data/Makefile

16844

.PRECIOUS: Makefile

16845

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

16846

@case '$?' in \

16847

@@ -365,6 +408,7 @@

16848

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

16849

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

16850

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

16851

+$(am__aclocal_m4_deps):

16852

empathy.desktop.in: $(top_builddir)/config.status $(srcdir)/empathy.desktop.in.in

16853

cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@

16854

16855

@@ -376,105 +420,123 @@

16856

install-clientfileDATA: $(clientfile_DATA)

16857

@$(NORMAL_INSTALL)

16858

test -z "$(clientfiledir)" || $(MKDIR_P) "$(DESTDIR)$(clientfiledir)"

16859

- @list='$(clientfile_DATA)'; for p in $$list; do \

16860

+ @list='$(clientfile_DATA)'; test -n "$(clientfiledir)" || list=; \

16861

+ for p in $$list; do \

16862

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

16863

- f=$(am__strip_dir) \

16864

- echo " $(clientfileDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(clientfiledir)/$$f'"; \

16865

- $(clientfileDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(clientfiledir)/$$f"; \

16866

+ echo "$$d$$p"; \

16867

+ done | $(am__base_list) | \

16868

+ while read files; do \

16869

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(clientfiledir)'"; \

16870

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(clientfiledir)" || exit $$?; \

16871

done

16872

16873

uninstall-clientfileDATA:

16874

@$(NORMAL_UNINSTALL)

16875

- @list='$(clientfile_DATA)'; for p in $$list; do \

16876

- f=$(am__strip_dir) \

16877

- echo " rm -f '$(DESTDIR)$(clientfiledir)/$$f'"; \

16878

- rm -f "$(DESTDIR)$(clientfiledir)/$$f"; \

16879

- done

16880

+ @list='$(clientfile_DATA)'; test -n "$(clientfiledir)" || list=; \

16881

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

16882

+ test -n "$$files" || exit 0; \

16883

+ echo " ( cd '$(DESTDIR)$(clientfiledir)' && rm -f" $$files ")"; \

16884

+ cd "$(DESTDIR)$(clientfiledir)" && rm -f $$files

16885

install-desktopDATA: $(desktop_DATA)

16886

@$(NORMAL_INSTALL)

16887

test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"

16888

- @list='$(desktop_DATA)'; for p in $$list; do \

16889

+ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \

16890

+ for p in $$list; do \

16891

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

16892

- f=$(am__strip_dir) \

16893

- echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \

16894

- $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \

16895

+ echo "$$d$$p"; \

16896

+ done | $(am__base_list) | \

16897

+ while read files; do \

16898

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \

16899

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \

16900

done

16901

16902

uninstall-desktopDATA:

16903

@$(NORMAL_UNINSTALL)

16904

- @list='$(desktop_DATA)'; for p in $$list; do \

16905

- f=$(am__strip_dir) \

16906

- echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \

16907

- rm -f "$(DESTDIR)$(desktopdir)/$$f"; \

16908

- done

16909

+ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \

16910

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

16911

+ test -n "$$files" || exit 0; \

16912

+ echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \

16913

+ cd "$(DESTDIR)$(desktopdir)" && rm -f $$files

16914

install-htmlDATA: $(html_DATA)

16915

@$(NORMAL_INSTALL)

16916

test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"

16917

- @list='$(html_DATA)'; for p in $$list; do \

16918

+ @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \

16919

+ for p in $$list; do \

16920

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

16921

- f=$(am__strip_dir) \

16922

- echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \

16923

- $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \

16924

+ echo "$$d$$p"; \

16925

+ done | $(am__base_list) | \

16926

+ while read files; do \

16927

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \

16928

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \

16929

done

16930

16931

uninstall-htmlDATA:

16932

@$(NORMAL_UNINSTALL)

16933

- @list='$(html_DATA)'; for p in $$list; do \

16934

- f=$(am__strip_dir) \

16935

- echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \

16936

- rm -f "$(DESTDIR)$(htmldir)/$$f"; \

16937

- done

16938

+ @list='$(html_DATA)'; test -n "$(htmldir)" || list=; \

16939

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

16940

+ test -n "$$files" || exit 0; \

16941

+ echo " ( cd '$(DESTDIR)$(htmldir)' && rm -f" $$files ")"; \

16942

+ cd "$(DESTDIR)$(htmldir)" && rm -f $$files

16943

install-schemasDATA: $(schemas_DATA)

16944

@$(NORMAL_INSTALL)

16945

test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"

16946

- @list='$(schemas_DATA)'; for p in $$list; do \

16947

+ @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \

16948

+ for p in $$list; do \

16949

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

16950

- f=$(am__strip_dir) \

16951

- echo " $(schemasDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemasdir)/$$f'"; \

16952

- $(schemasDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemasdir)/$$f"; \

16953

+ echo "$$d$$p"; \

16954

+ done | $(am__base_list) | \

16955

+ while read files; do \

16956

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemasdir)'"; \

16957

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(schemasdir)" || exit $$?; \

16958

done

16959

16960

uninstall-schemasDATA:

16961

@$(NORMAL_UNINSTALL)

16962

- @list='$(schemas_DATA)'; for p in $$list; do \

16963

- f=$(am__strip_dir) \

16964

- echo " rm -f '$(DESTDIR)$(schemasdir)/$$f'"; \

16965

- rm -f "$(DESTDIR)$(schemasdir)/$$f"; \

16966

- done

16967

+ @list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \

16968

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

16969

+ test -n "$$files" || exit 0; \

16970

+ echo " ( cd '$(DESTDIR)$(schemasdir)' && rm -f" $$files ")"; \

16971

+ cd "$(DESTDIR)$(schemasdir)" && rm -f $$files

16972

install-servicefileDATA: $(servicefile_DATA)

16973

@$(NORMAL_INSTALL)

16974

test -z "$(servicefiledir)" || $(MKDIR_P) "$(DESTDIR)$(servicefiledir)"

16975

- @list='$(servicefile_DATA)'; for p in $$list; do \

16976

+ @list='$(servicefile_DATA)'; test -n "$(servicefiledir)" || list=; \

16977

+ for p in $$list; do \

16978

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

16979

- f=$(am__strip_dir) \

16980

- echo " $(servicefileDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicefiledir)/$$f'"; \

16981

- $(servicefileDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicefiledir)/$$f"; \

16982

+ echo "$$d$$p"; \

16983

+ done | $(am__base_list) | \

16984

+ while read files; do \

16985

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(servicefiledir)'"; \

16986

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(servicefiledir)" || exit $$?; \

16987

done

16988

16989

uninstall-servicefileDATA:

16990

@$(NORMAL_UNINSTALL)

16991

- @list='$(servicefile_DATA)'; for p in $$list; do \

16992

- f=$(am__strip_dir) \

16993

- echo " rm -f '$(DESTDIR)$(servicefiledir)/$$f'"; \

16994

- rm -f "$(DESTDIR)$(servicefiledir)/$$f"; \

16995

- done

16996

+ @list='$(servicefile_DATA)'; test -n "$(servicefiledir)" || list=; \

16997

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

16998

+ test -n "$$files" || exit 0; \

16999

+ echo " ( cd '$(DESTDIR)$(servicefiledir)' && rm -f" $$files ")"; \

17000

+ cd "$(DESTDIR)$(servicefiledir)" && rm -f $$files

17001

install-streamingprefsDATA: $(streamingprefs_DATA)

17002

@$(NORMAL_INSTALL)

17003

test -z "$(streamingprefsdir)" || $(MKDIR_P) "$(DESTDIR)$(streamingprefsdir)"

17004

- @list='$(streamingprefs_DATA)'; for p in $$list; do \

17005

+ @list='$(streamingprefs_DATA)'; test -n "$(streamingprefsdir)" || list=; \

17006

+ for p in $$list; do \

17007

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

17008

- f=$(am__strip_dir) \

17009

- echo " $(streamingprefsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(streamingprefsdir)/$$f'"; \

17010

- $(streamingprefsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(streamingprefsdir)/$$f"; \

17011

+ echo "$$d$$p"; \

17012

+ done | $(am__base_list) | \

17013

+ while read files; do \

17014

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(streamingprefsdir)'"; \

17015

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(streamingprefsdir)" || exit $$?; \

17016

done

17017

17018

uninstall-streamingprefsDATA:

17019

@$(NORMAL_UNINSTALL)

17020

- @list='$(streamingprefs_DATA)'; for p in $$list; do \

17021

- f=$(am__strip_dir) \

17022

- echo " rm -f '$(DESTDIR)$(streamingprefsdir)/$$f'"; \

17023

- rm -f "$(DESTDIR)$(streamingprefsdir)/$$f"; \

17024

- done

17025

+ @list='$(streamingprefs_DATA)'; test -n "$(streamingprefsdir)" || list=; \

17026

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

17027

+ test -n "$$files" || exit 0; \

17028

+ echo " ( cd '$(DESTDIR)$(streamingprefsdir)' && rm -f" $$files ")"; \

17029

+ cd "$(DESTDIR)$(streamingprefsdir)" && rm -f $$files

17030

17031

# This directory's subdirectories are mostly independent; you can cd

17032

# into them and run `make' without going through this Makefile.

17033

@@ -500,7 +562,7 @@

17034

else \

17035

local_target="$$target"; \

17036

fi; \

17037

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

17038

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

17039

|| eval $$failcom; \

17040

done; \

17041

if test "$$dot_seen" = "no"; then \

17042

@@ -534,16 +596,16 @@

17043

else \

17044

local_target="$$target"; \

17045

fi; \

17046

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

17047

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

17048

|| eval $$failcom; \

17049

done && test -z "$$fail"

17050

tags-recursive:

17051

list='$(SUBDIRS)'; for subdir in $$list; do \

17052

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

17053

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

17054

done

17055

ctags-recursive:

17056

list='$(SUBDIRS)'; for subdir in $$list; do \

17057

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

17058

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

17059

done

17060

17061

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

17062

@@ -558,7 +620,7 @@

17063

17064

TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

17065

$(TAGS_FILES) $(LISP)

17066

- tags=; \

17067

+ set x; \

17068

here=`pwd`; \

17069

if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

17070

include_option=--etags-include; \

17071

@@ -570,7 +632,7 @@

17072

list='$(SUBDIRS)'; for subdir in $$list; do \

17073

if test "$$subdir" = .; then :; else \

17074

test ! -f $$subdir/TAGS || \

17075

- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

17076

+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

17077

fi; \

17078

done; \

17079

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

17080

@@ -579,29 +641,34 @@

17081

done | \

17082

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

17083

END { if (nonempty) { for (i in files) print i; }; }'`; \

17084

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

17085

+ shift; \

17086

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

17087

test -n "$$unique" || unique=$$empty_fix; \

17088

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

17089

- $$tags $$unique; \

17090

+ if test $$# -gt 0; then \

17091

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

17092

+ "$$@" $$unique; \

17093

+ else \

17094

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

17095

+ $$unique; \

17096

+ fi; \

17097

fi

17098

ctags: CTAGS

17099

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

17100

$(TAGS_FILES) $(LISP)

17101

- tags=; \

17102

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

17103

unique=`for i in $$list; do \

17104

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

17105

done | \

17106

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

17107

END { if (nonempty) { for (i in files) print i; }; }'`; \

17108

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

17109

+ test -z "$(CTAGS_ARGS)$$unique" \

17110

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

17111

- $$tags $$unique

17112

+ $$unique

17113

17114

GTAGS:

17115

here=`$(am__cd) $(top_builddir) && pwd` \

17116

- && cd $(top_srcdir) \

17117

- && gtags -i $(GTAGS_ARGS) $$here

17118

+ && $(am__cd) $(top_srcdir) \

17119

+ && gtags -i $(GTAGS_ARGS) "$$here"

17120

17121

distclean-tags:

17122

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

17123

@@ -622,29 +689,44 @@

17124

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

17125

if test -d $$d/$$file; then \

17126

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

17127

+ if test -d "$(distdir)/$$file"; then \

17128

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

17129

+ fi; \

17130

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

17131

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

17132

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

17133

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

17134

fi; \

17135

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

17136

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

17137

else \

17138

- test -f $(distdir)/$$file \

17139

- || cp -p $$d/$$file $(distdir)/$$file \

17140

+ test -f "$(distdir)/$$file" \

17141

+ || cp -p $$d/$$file "$(distdir)/$$file" \

17142

|| exit 1; \

17143

fi; \

17144

done

17145

- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

17146

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

17147

if test "$$subdir" = .; then :; else \

17148

test -d "$(distdir)/$$subdir" \

17149

|| $(MKDIR_P) "$(distdir)/$$subdir" \

17150

|| exit 1; \

17151

- distdir=`$(am__cd) $(distdir) && pwd`; \

17152

- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

17153

- (cd $$subdir && \

17154

+ fi; \

17155

+ done

17156

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

17157

+ if test "$$subdir" = .; then :; else \

17158

+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

17159

+ $(am__relativize); \

17160

+ new_distdir=$$reldir; \

17161

+ dir1=$$subdir; dir2="$(top_distdir)"; \

17162

+ $(am__relativize); \

17163

+ new_top_distdir=$$reldir; \

17164

+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

17165

+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

17166

+ ($(am__cd) $$subdir && \

17167

$(MAKE) $(AM_MAKEFLAGS) \

17168

- top_distdir="$$top_distdir" \

17169

- distdir="$$distdir/$$subdir" \

17170

+ top_distdir="$$new_top_distdir" \

17171

+ distdir="$$new_distdir" \

17172

am__remove_distdir=: \

17173

am__skip_length_check=: \

17174

+ am__skip_mode_fix=: \

17175

distdir) \

17176

|| exit 1; \

17177

fi; \

17178

@@ -677,6 +759,7 @@

17179

17180

distclean-generic:

17181

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

17182

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

17183

-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)

17184

17185

maintainer-clean-generic:

17186

@@ -696,6 +779,8 @@

17187

17188

html: html-recursive

17189

17190

+html-am:

17191

+

17192

info: info-recursive

17193

17194

info-am:

17195

@@ -706,18 +791,28 @@

17196

17197

install-dvi: install-dvi-recursive

17198

17199

+install-dvi-am:

17200

+

17201

install-exec-am:

17202

17203

install-html: install-html-recursive

17204

17205

+install-html-am:

17206

+

17207

install-info: install-info-recursive

17208

17209

+install-info-am:

17210

+

17211

install-man:

17212

17213

install-pdf: install-pdf-recursive

17214

17215

+install-pdf-am:

17216

+

17217

install-ps: install-ps-recursive

17218

17219

+install-ps-am:

17220

+

17221

installcheck-am:

17222

17223

maintainer-clean: maintainer-clean-recursive

17224

@@ -740,8 +835,8 @@

17225

uninstall-htmlDATA uninstall-schemasDATA \

17226

uninstall-servicefileDATA uninstall-streamingprefsDATA

17227

17228

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

17229

- install-strip

17230

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \

17231

+ install-am install-strip tags-recursive

17232

17233

.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

17234

all all-am check check-am clean clean-generic clean-libtool \

17235

@@ -775,6 +870,7 @@

17236

@GCONF_SCHEMAS_INSTALL_TRUE@ done \

17237

@GCONF_SCHEMAS_INSTALL_TRUE@ fi

17238

@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:

17239

+

17240

# Tell versions [3.59,3.63) of GNU make to not export all variables.

17241

# Otherwise a system limit (for SysV at least) may be exceeded.

17242

.NOEXPORT:

17243

17244

=== modified file 'data/icons/Makefile.in'

17245

--- data/icons/Makefile.in 2009-09-17 14:07:29 +0000

17246

+++ data/icons/Makefile.in 2009-09-17 14:14:15 +0000

17247

@@ -1,8 +1,9 @@

17248

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

17249

+# Makefile.in generated by automake 1.11 from Makefile.am.

17250

# @configure_input@

17251

17252

17253

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

17254

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

17255

+# Inc.

17256

# This Makefile.in is free software; the Free Software Foundation

17257

# gives unlimited permission to copy and/or distribute it,

17258

# with or without modifications, as long as this notice is preserved.

17259

@@ -15,8 +16,9 @@

17260

@SET_MAKE@

17261

VPATH = @srcdir@

17262

pkgdatadir = $(datadir)/@PACKAGE@

17263

+pkgincludedir = $(includedir)/@PACKAGE@

17264

pkglibdir = $(libdir)/@PACKAGE@

17265

-pkgincludedir = $(includedir)/@PACKAGE@

17266

+pkglibexecdir = $(libexecdir)/@PACKAGE@

17267

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

17268

install_sh_DATA = $(install_sh) -c -m 644

17269

install_sh_PROGRAM = $(install_sh) -c

17270

@@ -48,6 +50,7 @@

17271

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

17272

CONFIG_HEADER = $(top_builddir)/config.h

17273

CONFIG_CLEAN_FILES =

17274

+CONFIG_CLEAN_VPATH_FILES =

17275

SOURCES =

17276

DIST_SOURCES =

17277

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

17278

@@ -113,6 +116,8 @@

17279

GTKDOC_CHECK = @GTKDOC_CHECK@

17280

HELP_DIR = @HELP_DIR@

17281

HTML_DIR = @HTML_DIR@

17282

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

17283

+INDICATE_LIBS = @INDICATE_LIBS@

17284

INSTALL = @INSTALL@

17285

INSTALL_DATA = @INSTALL_DATA@

17286

INSTALL_PROGRAM = @INSTALL_PROGRAM@

17287

@@ -173,6 +178,7 @@

17288

PACKAGE_NAME = @PACKAGE_NAME@

17289

PACKAGE_STRING = @PACKAGE_STRING@

17290

PACKAGE_TARNAME = @PACKAGE_TARNAME@

17291

+PACKAGE_URL = @PACKAGE_URL@

17292

PACKAGE_VERSION = @PACKAGE_VERSION@

17293

PATH_SEPARATOR = @PATH_SEPARATOR@

17294

PKG_CONFIG = @PKG_CONFIG@

17295

@@ -427,9 +433,9 @@

17296

exit 1;; \

17297

esac; \

17298

done; \

17299

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \

17300

- cd $(top_srcdir) && \

17301

- $(AUTOMAKE) --gnu data/icons/Makefile

17302

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \

17303

+ $(am__cd) $(top_srcdir) && \

17304

+ $(AUTOMAKE) --gnu data/icons/Makefile

17305

.PRECIOUS: Makefile

17306

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

17307

@case '$?' in \

17308

@@ -447,6 +453,7 @@

17309

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

17310

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

17311

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

17312

+$(am__aclocal_m4_deps):

17313

17314

mostlyclean-libtool:

17315

-rm -f *.lo

17316

@@ -476,13 +483,17 @@

17317

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

17318

if test -d $$d/$$file; then \

17319

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

17320

+ if test -d "$(distdir)/$$file"; then \

17321

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

17322

+ fi; \

17323

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

17324

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

17325

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

17326

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

17327

fi; \

17328

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

17329

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

17330

else \

17331

- test -f $(distdir)/$$file \

17332

- || cp -p $$d/$$file $(distdir)/$$file \

17333

+ test -f "$(distdir)/$$file" \

17334

+ || cp -p $$d/$$file "$(distdir)/$$file" \

17335

|| exit 1; \

17336

fi; \

17337

done

17338

@@ -510,6 +521,7 @@

17339

17340

distclean-generic:

17341

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

17342

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

17343

17344

maintainer-clean-generic:

17345

@echo "This command is intended for maintainers to use"

17346

@@ -528,6 +540,8 @@

17347

17348

html: html-am

17349

17350

+html-am:

17351

+

17352

info: info-am

17353

17354

info-am:

17355

@@ -536,18 +550,28 @@

17356

17357

install-dvi: install-dvi-am

17358

17359

+install-dvi-am:

17360

+

17361

install-exec-am:

17362

17363

install-html: install-html-am

17364

17365

+install-html-am:

17366

+

17367

install-info: install-info-am

17368

17369

+install-info-am:

17370

+

17371

install-man:

17372

17373

install-pdf: install-pdf-am

17374

17375

+install-pdf-am:

17376

+

17377

install-ps: install-ps-am

17378

17379

+install-ps-am:

17380

+

17381

installcheck-am:

17382

17383

maintainer-clean: maintainer-clean-am

17384

@@ -639,6 +663,7 @@

17385

install-data-local: install-icons update-icon-cache

17386

17387

uninstall-local: uninstall-icons update-icon-cache

17388

+

17389

# Tell versions [3.59,3.63) of GNU make to not export all variables.

17390

# Otherwise a system limit (for SysV at least) may be exceeded.

17391

.NOEXPORT:

17392

17393

=== modified file 'depcomp'

17394

--- depcomp 2009-09-17 14:07:29 +0000

17395

+++ depcomp 2009-09-17 14:14:17 +0000

17396

@@ -1,10 +1,10 @@

17397

#! /bin/sh

17398

# depcomp - compile a program generating dependencies as side-effects

17399

17400

-scriptversion=2007-03-29.01

17401

+scriptversion=2009-04-28.21; # UTC

17402

17403

17404

-# Foundation, Inc.

17405

17406

+# Software Foundation, Inc.

17407

17408

# This program is free software; you can redistribute it and/or modify

17409

# it under the terms of the GNU General Public License as published by

17410

@@ -17,9 +17,7 @@

17411

# GNU General Public License for more details.

17412

17413

# You should have received a copy of the GNU General Public License

17414

-# along with this program; if not, write to the Free Software

17415

-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

17416

-# 02110-1301, USA.

17417

+# along with this program. If not, see <http://www.gnu.org/licenses/>.

17418

17419

# As a special exception to the GNU General Public License, if you

17420

# distribute this file as part of a program that contains a

17421

@@ -87,6 +85,15 @@

17422

depmode=dashmstdout

17423

fi

17424

17425

+cygpath_u="cygpath -u -f -"

17426

+if test "$depmode" = msvcmsys; then

17427

+ # This is just like msvisualcpp but w/o cygpath translation.

17428

+ # Just convert the backslash-escaped backslashes to single forward

17429

+ # slashes to satisfy depend.m4

17430

+ cygpath_u="sed s,\\\\\\\\,/,g"

17431

+ depmode=msvisualcpp

17432

+fi

17433

+

17434

case "$depmode" in

17435

gcc3)

17436

## gcc 3 implements dependency tracking that does exactly what

17437

@@ -192,14 +199,14 @@

17438

' < "$tmpdepfile" \

17439

| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \

17440

tr '

17441

-' ' ' >> $depfile

17442

- echo >> $depfile

17443

+' ' ' >> "$depfile"

17444

+ echo >> "$depfile"

17445

17446

# The second pass generates a dummy entry for each header file.

17447

tr ' ' '

17448

' < "$tmpdepfile" \

17449

| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \

17450

- >> $depfile

17451

+ >> "$depfile"

17452

else

17453

# The sourcefile does not contain any dependencies, so just

17454

# store a dummy comment line, to avoid errors with the Makefile

17455

@@ -328,7 +335,12 @@

17456

if test -f "$tmpdepfile"; then

17457

sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"

17458

# Add `dependent.h:' lines.

17459

- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"

17460

+ sed -ne '2,${

17461

+ s/^ *//

17462

+ s/ \\*$//

17463

+ s/$/:/

17464

+ p

17465

+ }' "$tmpdepfile" >> "$depfile"

17466

else

17467

echo "#dummy" > "$depfile"

17468

fi

17469

@@ -404,7 +416,7 @@

17470

17471

# Remove the call to Libtool.

17472

if test "$libtool" = yes; then

17473

- while test $1 != '--mode=compile'; do

17474

+ while test "X$1" != 'X--mode=compile'; do

17475

shift

17476

done

17477

shift

17478

@@ -455,32 +467,39 @@

17479

"$@" || exit $?

17480

# Remove any Libtool call

17481

if test "$libtool" = yes; then

17482

- while test $1 != '--mode=compile'; do

17483

+ while test "X$1" != 'X--mode=compile'; do

17484

shift

17485

done

17486

shift

17487

fi

17488

# X makedepend

17489

shift

17490

- cleared=no

17491

- for arg in "$@"; do

17492

+ cleared=no eat=no

17493

+ for arg

17494

+ do

17495

case $cleared in

17496

no)

17497

set ""; shift

17498

cleared=yes ;;

17499

esac

17500

+ if test $eat = yes; then

17501

+ eat=no

17502

+ continue

17503

+ fi

17504

case "$arg" in

17505

-D*|-I*)

17506

set fnord "$@" "$arg"; shift ;;

17507

# Strip any option that makedepend may not understand. Remove

17508

# the object too, otherwise makedepend will parse it as a source file.

17509

+ -arch)

17510

+ eat=yes ;;

17511

-*|$object)

17512

;;

17513

*)

17514

set fnord "$@" "$arg"; shift ;;

17515

esac

17516

done

17517

- obj_suffix="`echo $object | sed 's/^.*\././'`"

17518

+ obj_suffix=`echo "$object" | sed 's/^.*\././'`

17519

touch "$tmpdepfile"

17520

${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"

17521

rm -f "$depfile"

17522

@@ -500,7 +519,7 @@

17523

17524

# Remove the call to Libtool.

17525

if test "$libtool" = yes; then

17526

- while test $1 != '--mode=compile'; do

17527

+ while test "X$1" != 'X--mode=compile'; do

17528

shift

17529

done

17530

shift

17531

@@ -538,13 +557,27 @@

17532

17533

msvisualcpp)

17534

# Important note: in order to support this mode, a compiler *must*

17535

- # always write the preprocessed file to stdout, regardless of -o,

17536

- # because we must use -o when running libtool.

17537

+ # always write the preprocessed file to stdout.

17538

"$@" || exit $?

17539

+

17540

+ # Remove the call to Libtool.

17541

+ if test "$libtool" = yes; then

17542

+ while test "X$1" != 'X--mode=compile'; do

17543

+ shift

17544

+ done

17545

+ shift

17546

+ fi

17547

+

17548

IFS=" "

17549

for arg

17550

do

17551

case "$arg" in

17552

+ -o)

17553

+ shift

17554

+ ;;

17555

+ $object)

17556

+ shift

17557

+ ;;

17558

"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")

17559

set fnord "$@"

17560

shift

17561

@@ -557,16 +590,23 @@

17562

;;

17563

esac

17564

done

17565

- "$@" -E |

17566

- sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"

17567

+ "$@" -E 2>/dev/null |

17568

+ sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"

17569

rm -f "$depfile"

17570

echo "$object : \\" > "$depfile"

17571

- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s:: \1 \\:p' >> "$depfile"

17572

+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s:: \1 \\:p' >> "$depfile"

17573

echo " " >> "$depfile"

17574

- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::\1\::p' >> "$depfile"

17575

+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"

17576

rm -f "$tmpdepfile"

17577

;;

17578

17579

+msvcmsys)

17580

+ # This case exists only to let depend.m4 do its work. It works by

17581

+ # looking at the text of this script. This case will never be run,

17582

+ # since it is checked for above.

17583

+ exit 1

17584

+ ;;

17585

+

17586

none)

17587

exec "$@"

17588

;;

17589

@@ -585,5 +625,6 @@

17590

# eval: (add-hook 'write-file-hooks 'time-stamp)

17591

# time-stamp-start: "scriptversion="

17592

# time-stamp-format: "%:y-%02m-%02d.%02H"

17593

-# time-stamp-end: "$"

17594

+# time-stamp-time-zone: "UTC"

17595

+# time-stamp-end: "; # UTC"

17596

# End:

17597

17598

=== modified file 'docs/Makefile.in'

17599

--- docs/Makefile.in 2009-09-17 14:07:29 +0000

17600

+++ docs/Makefile.in 2009-09-17 14:14:16 +0000

17601

@@ -1,8 +1,9 @@

17602

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

17603

+# Makefile.in generated by automake 1.11 from Makefile.am.

17604

# @configure_input@

17605

17606

17607

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

17608

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

17609

+# Inc.

17610

# This Makefile.in is free software; the Free Software Foundation

17611

# gives unlimited permission to copy and/or distribute it,

17612

# with or without modifications, as long as this notice is preserved.

17613

@@ -15,8 +16,9 @@

17614

@SET_MAKE@

17615

VPATH = @srcdir@

17616

pkgdatadir = $(datadir)/@PACKAGE@

17617

+pkgincludedir = $(includedir)/@PACKAGE@

17618

pkglibdir = $(libdir)/@PACKAGE@

17619

-pkgincludedir = $(includedir)/@PACKAGE@

17620

+pkglibexecdir = $(libexecdir)/@PACKAGE@

17621

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

17622

install_sh_DATA = $(install_sh) -c -m 644

17623

install_sh_PROGRAM = $(install_sh) -c

17624

@@ -48,6 +50,7 @@

17625

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

17626

CONFIG_HEADER = $(top_builddir)/config.h

17627

CONFIG_CLEAN_FILES =

17628

+CONFIG_CLEAN_VPATH_FILES =

17629

SOURCES =

17630

DIST_SOURCES =

17631

RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

17632

@@ -59,10 +62,38 @@

17633

ps-recursive uninstall-recursive

17634

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

17635

distclean-recursive maintainer-clean-recursive

17636

+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

17637

+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

17638

+ distdir

17639

ETAGS = etags

17640

CTAGS = ctags

17641

DIST_SUBDIRS = $(SUBDIRS)

17642

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

17643

+am__relativize = \

17644

+ dir0=`pwd`; \

17645

+ sed_first='s,^$[^/]*$/.*$$,\1,'; \

17646

+ sed_rest='s,^[^/]*/*,,'; \

17647

+ sed_last='s,^.*/$[^/]*$$$,\1,'; \

17648

+ sed_butlast='s,/*[^/]*$$,,'; \

17649

+ while test -n "$$dir1"; do \

17650

+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \

17651

+ if test "$$first" != "."; then \

17652

+ if test "$$first" = ".."; then \

17653

+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

17654

+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

17655

+ else \

17656

+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

17657

+ if test "$$first2" = "$$first"; then \

17658

+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

17659

+ else \

17660

+ dir2="../$$dir2"; \

17661

+ fi; \

17662

+ dir0="$$dir0"/"$$first"; \

17663

+ fi; \

17664

+ fi; \

17665

+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

17666

+ done; \

17667

+ reldir="$$dir2"

17668

ACLOCAL = @ACLOCAL@

17669

ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@

17670

ALL_LINGUAS = @ALL_LINGUAS@

17671

@@ -125,6 +156,8 @@

17672

GTKDOC_CHECK = @GTKDOC_CHECK@

17673

HELP_DIR = @HELP_DIR@

17674

HTML_DIR = @HTML_DIR@

17675

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

17676

+INDICATE_LIBS = @INDICATE_LIBS@

17677

INSTALL = @INSTALL@

17678

INSTALL_DATA = @INSTALL_DATA@

17679

INSTALL_PROGRAM = @INSTALL_PROGRAM@

17680

@@ -185,6 +218,7 @@

17681

PACKAGE_NAME = @PACKAGE_NAME@

17682

PACKAGE_STRING = @PACKAGE_STRING@

17683

PACKAGE_TARNAME = @PACKAGE_TARNAME@

17684

+PACKAGE_URL = @PACKAGE_URL@

17685

PACKAGE_VERSION = @PACKAGE_VERSION@

17686

PATH_SEPARATOR = @PATH_SEPARATOR@

17687

PKG_CONFIG = @PKG_CONFIG@

17688

@@ -293,9 +327,9 @@

17689

exit 1;; \

17690

esac; \

17691

done; \

17692

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \

17693

- cd $(top_srcdir) && \

17694

- $(AUTOMAKE) --gnu docs/Makefile

17695

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \

17696

+ $(am__cd) $(top_srcdir) && \

17697

+ $(AUTOMAKE) --gnu docs/Makefile

17698

.PRECIOUS: Makefile

17699

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

17700

@case '$?' in \

17701

@@ -313,6 +347,7 @@

17702

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

17703

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

17704

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

17705

+$(am__aclocal_m4_deps):

17706

17707

mostlyclean-libtool:

17708

-rm -f *.lo

17709

@@ -344,7 +379,7 @@

17710

else \

17711

local_target="$$target"; \

17712

fi; \

17713

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

17714

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

17715

|| eval $$failcom; \

17716

done; \

17717

if test "$$dot_seen" = "no"; then \

17718

@@ -378,16 +413,16 @@

17719

else \

17720

local_target="$$target"; \

17721

fi; \

17722

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

17723

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

17724

|| eval $$failcom; \

17725

done && test -z "$$fail"

17726

tags-recursive:

17727

list='$(SUBDIRS)'; for subdir in $$list; do \

17728

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

17729

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

17730

done

17731

ctags-recursive:

17732

list='$(SUBDIRS)'; for subdir in $$list; do \

17733

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

17734

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

17735

done

17736

17737

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

17738

@@ -402,7 +437,7 @@

17739

17740

TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

17741

$(TAGS_FILES) $(LISP)

17742

- tags=; \

17743

+ set x; \

17744

here=`pwd`; \

17745

if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

17746

include_option=--etags-include; \

17747

@@ -414,7 +449,7 @@

17748

list='$(SUBDIRS)'; for subdir in $$list; do \

17749

if test "$$subdir" = .; then :; else \

17750

test ! -f $$subdir/TAGS || \

17751

- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

17752

+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

17753

fi; \

17754

done; \

17755

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

17756

@@ -423,29 +458,34 @@

17757

done | \

17758

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

17759

END { if (nonempty) { for (i in files) print i; }; }'`; \

17760

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

17761

+ shift; \

17762

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

17763

test -n "$$unique" || unique=$$empty_fix; \

17764

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

17765

- $$tags $$unique; \

17766

+ if test $$# -gt 0; then \

17767

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

17768

+ "$$@" $$unique; \

17769

+ else \

17770

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

17771

+ $$unique; \

17772

+ fi; \

17773

fi

17774

ctags: CTAGS

17775

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

17776

$(TAGS_FILES) $(LISP)

17777

- tags=; \

17778

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

17779

unique=`for i in $$list; do \

17780

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

17781

done | \

17782

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

17783

END { if (nonempty) { for (i in files) print i; }; }'`; \

17784

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

17785

+ test -z "$(CTAGS_ARGS)$$unique" \

17786

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

17787

- $$tags $$unique

17788

+ $$unique

17789

17790

GTAGS:

17791

here=`$(am__cd) $(top_builddir) && pwd` \

17792

- && cd $(top_srcdir) \

17793

- && gtags -i $(GTAGS_ARGS) $$here

17794

+ && $(am__cd) $(top_srcdir) \

17795

+ && gtags -i $(GTAGS_ARGS) "$$here"

17796

17797

distclean-tags:

17798

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

17799

@@ -466,29 +506,44 @@

17800

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

17801

if test -d $$d/$$file; then \

17802

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

17803

+ if test -d "$(distdir)/$$file"; then \

17804

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

17805

+ fi; \

17806

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

17807

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

17808

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

17809

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

17810

fi; \

17811

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

17812

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

17813

else \

17814

- test -f $(distdir)/$$file \

17815

- || cp -p $$d/$$file $(distdir)/$$file \

17816

+ test -f "$(distdir)/$$file" \

17817

+ || cp -p $$d/$$file "$(distdir)/$$file" \

17818

|| exit 1; \

17819

fi; \

17820

done

17821

- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

17822

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

17823

if test "$$subdir" = .; then :; else \

17824

test -d "$(distdir)/$$subdir" \

17825

|| $(MKDIR_P) "$(distdir)/$$subdir" \

17826

|| exit 1; \

17827

- distdir=`$(am__cd) $(distdir) && pwd`; \

17828

- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

17829

- (cd $$subdir && \

17830

+ fi; \

17831

+ done

17832

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

17833

+ if test "$$subdir" = .; then :; else \

17834

+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

17835

+ $(am__relativize); \

17836

+ new_distdir=$$reldir; \

17837

+ dir1=$$subdir; dir2="$(top_distdir)"; \

17838

+ $(am__relativize); \

17839

+ new_top_distdir=$$reldir; \

17840

+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

17841

+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

17842

+ ($(am__cd) $$subdir && \

17843

$(MAKE) $(AM_MAKEFLAGS) \

17844

- top_distdir="$$top_distdir" \

17845

- distdir="$$distdir/$$subdir" \

17846

+ top_distdir="$$new_top_distdir" \

17847

+ distdir="$$new_distdir" \

17848

am__remove_distdir=: \

17849

am__skip_length_check=: \

17850

+ am__skip_mode_fix=: \

17851

distdir) \

17852

|| exit 1; \

17853

fi; \

17854

@@ -518,6 +573,7 @@

17855

17856

distclean-generic:

17857

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

17858

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

17859

17860

maintainer-clean-generic:

17861

@echo "This command is intended for maintainers to use"

17862

@@ -536,6 +592,8 @@

17863

17864

html: html-recursive

17865

17866

+html-am:

17867

+

17868

info: info-recursive

17869

17870

info-am:

17871

@@ -544,18 +602,28 @@

17872

17873

install-dvi: install-dvi-recursive

17874

17875

+install-dvi-am:

17876

+

17877

install-exec-am:

17878

17879

install-html: install-html-recursive

17880

17881

+install-html-am:

17882

+

17883

install-info: install-info-recursive

17884

17885

+install-info-am:

17886

+

17887

install-man:

17888

17889

install-pdf: install-pdf-recursive

17890

17891

+install-pdf-am:

17892

+

17893

install-ps: install-ps-recursive

17894

17895

+install-ps-am:

17896

+

17897

installcheck-am:

17898

17899

maintainer-clean: maintainer-clean-recursive

17900

@@ -576,8 +644,8 @@

17901

17902

uninstall-am:

17903

17904

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

17905

- install-strip

17906

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \

17907

+ install-am install-strip tags-recursive

17908

17909

.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

17910

all all-am check check-am clean clean-generic clean-libtool \

17911

@@ -593,6 +661,7 @@

17912

mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \

17913

uninstall uninstall-am

17914

17915

+

17916

# Tell versions [3.59,3.63) of GNU make to not export all variables.

17917

# Otherwise a system limit (for SysV at least) may be exceeded.

17918

.NOEXPORT:

17919

17920

=== modified file 'docs/libempathy-gtk/Makefile.in'

17921

--- docs/libempathy-gtk/Makefile.in 2009-09-17 14:07:29 +0000

17922

+++ docs/libempathy-gtk/Makefile.in 2009-09-17 14:14:16 +0000

17923

@@ -1,8 +1,9 @@

17924

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

17925

+# Makefile.in generated by automake 1.11 from Makefile.am.

17926

# @configure_input@

17927

17928

17929

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

17930

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

17931

+# Inc.

17932

# This Makefile.in is free software; the Free Software Foundation

17933

# gives unlimited permission to copy and/or distribute it,

17934

# with or without modifications, as long as this notice is preserved.

17935

@@ -21,8 +22,9 @@

17936

####################################

17937

VPATH = @srcdir@

17938

pkgdatadir = $(datadir)/@PACKAGE@

17939

+pkgincludedir = $(includedir)/@PACKAGE@

17940

pkglibdir = $(libdir)/@PACKAGE@

17941

-pkgincludedir = $(includedir)/@PACKAGE@

17942

+pkglibexecdir = $(libexecdir)/@PACKAGE@

17943

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

17944

install_sh_DATA = $(install_sh) -c -m 644

17945

install_sh_PROGRAM = $(install_sh) -c

17946

@@ -55,6 +57,7 @@

17947

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

17948

CONFIG_HEADER = $(top_builddir)/config.h

17949

CONFIG_CLEAN_FILES = version.xml

17950

+CONFIG_CLEAN_VPATH_FILES =

17951

SOURCES =

17952

DIST_SOURCES =

17953

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

17954

@@ -120,6 +123,8 @@

17955

GTKDOC_CHECK = @GTKDOC_CHECK@

17956

HELP_DIR = @HELP_DIR@

17957

HTML_DIR = @HTML_DIR@

17958

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

17959

+INDICATE_LIBS = @INDICATE_LIBS@

17960

INSTALL = @INSTALL@

17961

INSTALL_DATA = @INSTALL_DATA@

17962

INSTALL_PROGRAM = @INSTALL_PROGRAM@

17963

@@ -180,6 +185,7 @@

17964

PACKAGE_NAME = @PACKAGE_NAME@

17965

PACKAGE_STRING = @PACKAGE_STRING@

17966

PACKAGE_TARNAME = @PACKAGE_TARNAME@

17967

+PACKAGE_URL = @PACKAGE_URL@

17968

PACKAGE_VERSION = @PACKAGE_VERSION@

17969

PATH_SEPARATOR = @PATH_SEPARATOR@

17970

PKG_CONFIG = @PKG_CONFIG@

17971

@@ -374,9 +380,9 @@

17972

exit 1;; \

17973

esac; \

17974

done; \

17975

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/libempathy-gtk/Makefile'; \

17976

- cd $(top_srcdir) && \

17977

- $(AUTOMAKE) --gnu docs/libempathy-gtk/Makefile

17978

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/libempathy-gtk/Makefile'; \

17979

+ $(am__cd) $(top_srcdir) && \

17980

+ $(AUTOMAKE) --gnu docs/libempathy-gtk/Makefile

17981

.PRECIOUS: Makefile

17982

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

17983

@case '$?' in \

17984

@@ -394,6 +400,7 @@

17985

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

17986

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

17987

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

17988

+$(am__aclocal_m4_deps):

17989

version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in

17990

cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@

17991

17992

@@ -425,13 +432,17 @@

17993

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

17994

if test -d $$d/$$file; then \

17995

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

17996

+ if test -d "$(distdir)/$$file"; then \

17997

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

17998

+ fi; \

17999

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

18000

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

18001

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

18002

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

18003

fi; \

18004

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

18005

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

18006

else \

18007

- test -f $(distdir)/$$file \

18008

- || cp -p $$d/$$file $(distdir)/$$file \

18009

+ test -f "$(distdir)/$$file" \

18010

+ || cp -p $$d/$$file "$(distdir)/$$file" \

18011

|| exit 1; \

18012

fi; \

18013

done

18014

@@ -463,6 +474,7 @@

18015

18016

distclean-generic:

18017

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

18018

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

18019

18020

maintainer-clean-generic:

18021

@echo "This command is intended for maintainers to use"

18022

@@ -481,6 +493,8 @@

18023

18024

html: html-am

18025

18026

+html-am:

18027

+

18028

info: info-am

18029

18030

info-am:

18031

@@ -489,18 +503,28 @@

18032

18033

install-dvi: install-dvi-am

18034

18035

+install-dvi-am:

18036

+

18037

install-exec-am:

18038

18039

install-html: install-html-am

18040

18041

+install-html-am:

18042

+

18043

install-info: install-info-am

18044

18045

+install-info-am:

18046

+

18047

install-man:

18048

18049

install-pdf: install-pdf-am

18050

18051

+install-pdf-am:

18052

+

18053

install-ps: install-ps-am

18054

18055

+install-ps-am:

18056

+

18057

installcheck-am:

18058

18059

maintainer-clean: maintainer-clean-am

18060

@@ -679,6 +703,7 @@

18061

gtkdoc-rebase --online --relative --html-dir=$(distdir)/html

18062

18063

.PHONY : dist-hook-local docs

18064

+

18065

# Tell versions [3.59,3.63) of GNU make to not export all variables.

18066

# Otherwise a system limit (for SysV at least) may be exceeded.

18067

.NOEXPORT:

18068

18069

=== modified file 'docs/libempathy/Makefile.in'

18070

--- docs/libempathy/Makefile.in 2009-09-17 14:07:29 +0000

18071

+++ docs/libempathy/Makefile.in 2009-09-17 14:14:16 +0000

18072

@@ -1,8 +1,9 @@

18073

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

18074

+# Makefile.in generated by automake 1.11 from Makefile.am.

18075

# @configure_input@

18076

18077

18078

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

18079

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

18080

+# Inc.

18081

# This Makefile.in is free software; the Free Software Foundation

18082

# gives unlimited permission to copy and/or distribute it,

18083

# with or without modifications, as long as this notice is preserved.

18084

@@ -21,8 +22,9 @@

18085

####################################

18086

VPATH = @srcdir@

18087

pkgdatadir = $(datadir)/@PACKAGE@

18088

+pkgincludedir = $(includedir)/@PACKAGE@

18089

pkglibdir = $(libdir)/@PACKAGE@

18090

-pkgincludedir = $(includedir)/@PACKAGE@

18091

+pkglibexecdir = $(libexecdir)/@PACKAGE@

18092

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

18093

install_sh_DATA = $(install_sh) -c -m 644

18094

install_sh_PROGRAM = $(install_sh) -c

18095

@@ -55,6 +57,7 @@

18096

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

18097

CONFIG_HEADER = $(top_builddir)/config.h

18098

CONFIG_CLEAN_FILES = version.xml

18099

+CONFIG_CLEAN_VPATH_FILES =

18100

SOURCES =

18101

DIST_SOURCES =

18102

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

18103

@@ -120,6 +123,8 @@

18104

GTKDOC_CHECK = @GTKDOC_CHECK@

18105

HELP_DIR = @HELP_DIR@

18106

HTML_DIR = @HTML_DIR@

18107

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

18108

+INDICATE_LIBS = @INDICATE_LIBS@

18109

INSTALL = @INSTALL@

18110

INSTALL_DATA = @INSTALL_DATA@

18111

INSTALL_PROGRAM = @INSTALL_PROGRAM@

18112

@@ -180,6 +185,7 @@

18113

PACKAGE_NAME = @PACKAGE_NAME@

18114

PACKAGE_STRING = @PACKAGE_STRING@

18115

PACKAGE_TARNAME = @PACKAGE_TARNAME@

18116

+PACKAGE_URL = @PACKAGE_URL@

18117

PACKAGE_VERSION = @PACKAGE_VERSION@

18118

PATH_SEPARATOR = @PATH_SEPARATOR@

18119

PKG_CONFIG = @PKG_CONFIG@

18120

@@ -373,9 +379,9 @@

18121

exit 1;; \

18122

esac; \

18123

done; \

18124

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/libempathy/Makefile'; \

18125

- cd $(top_srcdir) && \

18126

- $(AUTOMAKE) --gnu docs/libempathy/Makefile

18127

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/libempathy/Makefile'; \

18128

+ $(am__cd) $(top_srcdir) && \

18129

+ $(AUTOMAKE) --gnu docs/libempathy/Makefile

18130

.PRECIOUS: Makefile

18131

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

18132

@case '$?' in \

18133

@@ -393,6 +399,7 @@

18134

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

18135

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

18136

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

18137

+$(am__aclocal_m4_deps):

18138

version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in

18139

cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@

18140

18141

@@ -424,13 +431,17 @@

18142

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

18143

if test -d $$d/$$file; then \

18144

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

18145

+ if test -d "$(distdir)/$$file"; then \

18146

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

18147

+ fi; \

18148

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

18149

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

18150

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

18151

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

18152

fi; \

18153

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

18154

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

18155

else \

18156

- test -f $(distdir)/$$file \

18157

- || cp -p $$d/$$file $(distdir)/$$file \

18158

+ test -f "$(distdir)/$$file" \

18159

+ || cp -p $$d/$$file "$(distdir)/$$file" \

18160

|| exit 1; \

18161

fi; \

18162

done

18163

@@ -462,6 +473,7 @@

18164

18165

distclean-generic:

18166

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

18167

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

18168

18169

maintainer-clean-generic:

18170

@echo "This command is intended for maintainers to use"

18171

@@ -480,6 +492,8 @@

18172

18173

html: html-am

18174

18175

+html-am:

18176

+

18177

info: info-am

18178

18179

info-am:

18180

@@ -488,18 +502,28 @@

18181

18182

install-dvi: install-dvi-am

18183

18184

+install-dvi-am:

18185

+

18186

install-exec-am:

18187

18188

install-html: install-html-am

18189

18190

+install-html-am:

18191

+

18192

install-info: install-info-am

18193

18194

+install-info-am:

18195

+

18196

install-man:

18197

18198

install-pdf: install-pdf-am

18199

18200

+install-pdf-am:

18201

+

18202

install-ps: install-ps-am

18203

18204

+install-ps-am:

18205

+

18206

installcheck-am:

18207

18208

maintainer-clean: maintainer-clean-am

18209

@@ -678,6 +702,7 @@

18210

gtkdoc-rebase --online --relative --html-dir=$(distdir)/html

18211

18212

.PHONY : dist-hook-local docs

18213

+

18214

# Tell versions [3.59,3.63) of GNU make to not export all variables.

18215

# Otherwise a system limit (for SysV at least) may be exceeded.

18216

.NOEXPORT:

18217

18218

=== modified file 'extensions/Makefile.in'

18219

--- extensions/Makefile.in 2009-09-17 14:07:29 +0000

18220

+++ extensions/Makefile.in 2009-09-17 14:14:16 +0000

18221

@@ -1,8 +1,9 @@

18222

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

18223

+# Makefile.in generated by automake 1.11 from Makefile.am.

18224

# @configure_input@

18225

18226

18227

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

18228

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

18229

+# Inc.

18230

# This Makefile.in is free software; the Free Software Foundation

18231

# gives unlimited permission to copy and/or distribute it,

18232

# with or without modifications, as long as this notice is preserved.

18233

@@ -16,8 +17,9 @@

18234

18235

VPATH = @srcdir@

18236

pkgdatadir = $(datadir)/@PACKAGE@

18237

+pkgincludedir = $(includedir)/@PACKAGE@

18238

pkglibdir = $(libdir)/@PACKAGE@

18239

-pkgincludedir = $(includedir)/@PACKAGE@

18240

+pkglibexecdir = $(libexecdir)/@PACKAGE@

18241

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

18242

install_sh_DATA = $(install_sh) -c -m 644

18243

install_sh_PROGRAM = $(install_sh) -c

18244

@@ -50,6 +52,7 @@

18245

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

18246

CONFIG_HEADER = $(top_builddir)/config.h

18247

CONFIG_CLEAN_FILES =

18248

+CONFIG_CLEAN_VPATH_FILES =

18249

LTLIBRARIES = $(noinst_LTLIBRARIES)

18250

libemp_extensions_la_DEPENDENCIES =

18251

am_libemp_extensions_la_OBJECTS = extensions.lo extensions-cli.lo

18252

@@ -59,6 +62,7 @@

18253

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

18254

depcomp = $(SHELL) $(top_srcdir)/depcomp

18255

am__depfiles_maybe = depfiles

18256

+am__mv = mv -f

18257

COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

18258

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

18259

LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

18260

@@ -136,6 +140,8 @@

18261

GTKDOC_CHECK = @GTKDOC_CHECK@

18262

HELP_DIR = @HELP_DIR@

18263

HTML_DIR = @HTML_DIR@

18264

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

18265

+INDICATE_LIBS = @INDICATE_LIBS@

18266

INSTALL = @INSTALL@

18267

INSTALL_DATA = @INSTALL_DATA@

18268

INSTALL_PROGRAM = @INSTALL_PROGRAM@

18269

@@ -196,6 +202,7 @@

18270

PACKAGE_NAME = @PACKAGE_NAME@

18271

PACKAGE_STRING = @PACKAGE_STRING@

18272

PACKAGE_TARNAME = @PACKAGE_TARNAME@

18273

+PACKAGE_URL = @PACKAGE_URL@

18274

PACKAGE_VERSION = @PACKAGE_VERSION@

18275

PATH_SEPARATOR = @PATH_SEPARATOR@

18276

PKG_CONFIG = @PKG_CONFIG@

18277

@@ -358,9 +365,9 @@

18278

exit 1;; \

18279

esac; \

18280

done; \

18281

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Makefile'; \

18282

- cd $(top_srcdir) && \

18283

- $(AUTOMAKE) --gnu extensions/Makefile

18284

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extensions/Makefile'; \

18285

+ $(am__cd) $(top_srcdir) && \

18286

+ $(AUTOMAKE) --gnu extensions/Makefile

18287

.PRECIOUS: Makefile

18288

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

18289

@case '$?' in \

18290

@@ -378,6 +385,7 @@

18291

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

18292

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

18293

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

18294

+$(am__aclocal_m4_deps):

18295

18296

clean-noinstLTLIBRARIES:

18297

-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)

18298

@@ -403,38 +411,38 @@

18299

18300

.c.o:

18301

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

18302

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

18303

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

18304

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

18305

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

18306

@am__fastdepCC_FALSE@ $(COMPILE) -c $<

18307

18308

.c.obj:

18309

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

18310

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

18311

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

18312

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

18313

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

18314

@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

18315

18316

.c.lo:

18317

@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

18318

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

18319

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

18320

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

18321

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

18322

@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<

18323

18324

signals-marshal.lo: _gen/signals-marshal.c

18325

-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT signals-marshal.lo -MD -MP -MF $(DEPDIR)/signals-marshal.Tpo -c -o signals-marshal.lo `test -f '_gen/signals-marshal.c' || echo '$(srcdir)/'`_gen/signals-marshal.c

18326

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/signals-marshal.Tpo $(DEPDIR)/signals-marshal.Plo

18327

+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT signals-marshal.lo -MD -MP -MF $(DEPDIR)/signals-marshal.Tpo -c -o signals-marshal.lo `test -f '_gen/signals-marshal.c' || echo '$(srcdir)/'`_gen/signals-marshal.c

18328

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/signals-marshal.Tpo $(DEPDIR)/signals-marshal.Plo

18329

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/signals-marshal.c' object='signals-marshal.lo' libtool=yes @AMDEPBACKSLASH@

18330

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

18331

-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o signals-marshal.lo `test -f '_gen/signals-marshal.c' || echo '$(srcdir)/'`_gen/signals-marshal.c

18332

+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o signals-marshal.lo `test -f '_gen/signals-marshal.c' || echo '$(srcdir)/'`_gen/signals-marshal.c

18333

18334

svc-misc.lo: _gen/svc-misc.c

18335

-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT svc-misc.lo -MD -MP -MF $(DEPDIR)/svc-misc.Tpo -c -o svc-misc.lo `test -f '_gen/svc-misc.c' || echo '$(srcdir)/'`_gen/svc-misc.c

18336

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/svc-misc.Tpo $(DEPDIR)/svc-misc.Plo

18337

+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT svc-misc.lo -MD -MP -MF $(DEPDIR)/svc-misc.Tpo -c -o svc-misc.lo `test -f '_gen/svc-misc.c' || echo '$(srcdir)/'`_gen/svc-misc.c

18338

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/svc-misc.Tpo $(DEPDIR)/svc-misc.Plo

18339

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='_gen/svc-misc.c' object='svc-misc.lo' libtool=yes @AMDEPBACKSLASH@

18340

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

18341

-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o svc-misc.lo `test -f '_gen/svc-misc.c' || echo '$(srcdir)/'`_gen/svc-misc.c

18342

+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o svc-misc.lo `test -f '_gen/svc-misc.c' || echo '$(srcdir)/'`_gen/svc-misc.c

18343

18344

mostlyclean-libtool:

18345

-rm -f *.lo

18346

@@ -454,7 +462,7 @@

18347

18348

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

18349

$(TAGS_FILES) $(LISP)

18350

- tags=; \

18351

+ set x; \

18352

here=`pwd`; \

18353

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

18354

unique=`for i in $$list; do \

18355

@@ -462,29 +470,34 @@

18356

done | \

18357

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

18358

END { if (nonempty) { for (i in files) print i; }; }'`; \

18359

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

18360

+ shift; \

18361

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

18362

test -n "$$unique" || unique=$$empty_fix; \

18363

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

18364

- $$tags $$unique; \

18365

+ if test $$# -gt 0; then \

18366

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

18367

+ "$$@" $$unique; \

18368

+ else \

18369

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

18370

+ $$unique; \

18371

+ fi; \

18372

fi

18373

ctags: CTAGS

18374

CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

18375

$(TAGS_FILES) $(LISP)

18376

- tags=; \

18377

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

18378

unique=`for i in $$list; do \

18379

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

18380

done | \

18381

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

18382

END { if (nonempty) { for (i in files) print i; }; }'`; \

18383

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

18384

+ test -z "$(CTAGS_ARGS)$$unique" \

18385

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

18386

- $$tags $$unique

18387

+ $$unique

18388

18389

GTAGS:

18390

here=`$(am__cd) $(top_builddir) && pwd` \

18391

- && cd $(top_srcdir) \

18392

- && gtags -i $(GTAGS_ARGS) $$here

18393

+ && $(am__cd) $(top_srcdir) \

18394

+ && gtags -i $(GTAGS_ARGS) "$$here"

18395

18396

distclean-tags:

18397

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

18398

@@ -505,13 +518,17 @@

18399

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

18400

if test -d $$d/$$file; then \

18401

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

18402

+ if test -d "$(distdir)/$$file"; then \

18403

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

18404

+ fi; \

18405

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

18406

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

18407

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

18408

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

18409

fi; \

18410

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

18411

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

18412

else \

18413

- test -f $(distdir)/$$file \

18414

- || cp -p $$d/$$file $(distdir)/$$file \

18415

+ test -f "$(distdir)/$$file" \

18416

+ || cp -p $$d/$$file "$(distdir)/$$file" \

18417

|| exit 1; \

18418

fi; \

18419

done

18420

@@ -542,6 +559,7 @@

18421

18422

distclean-generic:

18423

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

18424

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

18425

18426

maintainer-clean-generic:

18427

@echo "This command is intended for maintainers to use"

18428

@@ -564,6 +582,8 @@

18429

18430

html: html-am

18431

18432

+html-am:

18433

+

18434

info: info-am

18435

18436

info-am:

18437

@@ -572,18 +592,28 @@

18438

18439

install-dvi: install-dvi-am

18440

18441

+install-dvi-am:

18442

+

18443

install-exec-am:

18444

18445

install-html: install-html-am

18446

18447

+install-html-am:

18448

+

18449

install-info: install-info-am

18450

18451

+install-info-am:

18452

+

18453

install-man:

18454

18455

install-pdf: install-pdf-am

18456

18457

+install-pdf-am:

18458

+

18459

install-ps: install-ps-am

18460

18461

+install-ps-am:

18462

+

18463

installcheck-am:

18464

18465

maintainer-clean: maintainer-clean-am

18466

@@ -606,7 +636,7 @@

18467

18468

uninstall-am:

18469

18470

-.MAKE: install-am install-strip

18471

+.MAKE: all check install install-am install-strip

18472

18473

.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \

18474

clean-libtool clean-noinstLTLIBRARIES ctags distclean \

18475

@@ -696,6 +726,7 @@

18476

--not-implemented-func='tp_dbus_g_method_return_not_implemented' \

18477

--allow-unstable \

18478

$< Emp_Svc_

18479

+

18480

# Tell versions [3.59,3.63) of GNU make to not export all variables.

18481

# Otherwise a system limit (for SysV at least) may be exceeded.

18482

.NOEXPORT:

18483

18484

=== modified file 'help/Makefile.in'

18485

--- help/Makefile.in 2009-09-17 14:07:29 +0000

18486

+++ help/Makefile.in 2009-09-17 14:14:16 +0000

18487

@@ -1,8 +1,9 @@

18488

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

18489

+# Makefile.in generated by automake 1.11 from Makefile.am.

18490

# @configure_input@

18491

18492

18493

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

18494

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

18495

+# Inc.

18496

# This Makefile.in is free software; the Free Software Foundation

18497

# gives unlimited permission to copy and/or distribute it,

18498

# with or without modifications, as long as this notice is preserved.

18499

@@ -39,8 +40,9 @@

18500

################################################################################

18501

VPATH = @srcdir@

18502

pkgdatadir = $(datadir)/@PACKAGE@

18503

+pkgincludedir = $(includedir)/@PACKAGE@

18504

pkglibdir = $(libdir)/@PACKAGE@

18505

-pkgincludedir = $(includedir)/@PACKAGE@

18506

+pkglibexecdir = $(libexecdir)/@PACKAGE@

18507

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

18508

install_sh_DATA = $(install_sh) -c -m 644

18509

install_sh_PROGRAM = $(install_sh) -c

18510

@@ -73,6 +75,7 @@

18511

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

18512

CONFIG_HEADER = $(top_builddir)/config.h

18513

CONFIG_CLEAN_FILES =

18514

+CONFIG_CLEAN_VPATH_FILES =

18515

SOURCES =

18516

DIST_SOURCES =

18517

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

18518

@@ -138,6 +141,8 @@

18519

GTKDOC_CHECK = @GTKDOC_CHECK@

18520

HELP_DIR = @HELP_DIR@

18521

HTML_DIR = @HTML_DIR@

18522

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

18523

+INDICATE_LIBS = @INDICATE_LIBS@

18524

INSTALL = @INSTALL@

18525

INSTALL_DATA = @INSTALL_DATA@

18526

INSTALL_PROGRAM = @INSTALL_PROGRAM@

18527

@@ -198,6 +203,7 @@

18528

PACKAGE_NAME = @PACKAGE_NAME@

18529

PACKAGE_STRING = @PACKAGE_STRING@

18530

PACKAGE_TARNAME = @PACKAGE_TARNAME@

18531

+PACKAGE_URL = @PACKAGE_URL@

18532

PACKAGE_VERSION = @PACKAGE_VERSION@

18533

PATH_SEPARATOR = @PATH_SEPARATOR@

18534

PKG_CONFIG = @PKG_CONFIG@

18535

@@ -474,9 +480,9 @@

18536

exit 1;; \

18537

esac; \

18538

done; \

18539

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \

18540

- cd $(top_srcdir) && \

18541

- $(AUTOMAKE) --gnu help/Makefile

18542

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \

18543

+ $(am__cd) $(top_srcdir) && \

18544

+ $(AUTOMAKE) --gnu help/Makefile

18545

.PRECIOUS: Makefile

18546

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

18547

@case '$?' in \

18548

@@ -494,6 +500,7 @@

18549

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

18550

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

18551

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

18552

+$(am__aclocal_m4_deps):

18553

18554

mostlyclean-libtool:

18555

-rm -f *.lo

18556

@@ -523,13 +530,17 @@

18557

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

18558

if test -d $$d/$$file; then \

18559

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

18560

+ if test -d "$(distdir)/$$file"; then \

18561

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

18562

+ fi; \

18563

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

18564

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

18565

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

18566

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

18567

fi; \

18568

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

18569

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

18570

else \

18571

- test -f $(distdir)/$$file \

18572

- || cp -p $$d/$$file $(distdir)/$$file \

18573

+ test -f "$(distdir)/$$file" \

18574

+ || cp -p $$d/$$file "$(distdir)/$$file" \

18575

|| exit 1; \

18576

fi; \

18577

done

18578

@@ -560,6 +571,7 @@

18579

18580

distclean-generic:

18581

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

18582

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

18583

18584

maintainer-clean-generic:

18585

@echo "This command is intended for maintainers to use"

18586

@@ -578,6 +590,8 @@

18587

18588

html: html-am

18589

18590

+html-am:

18591

+

18592

info: info-am

18593

18594

info-am:

18595

@@ -586,18 +600,28 @@

18596

18597

install-dvi: install-dvi-am

18598

18599

+install-dvi-am:

18600

+

18601

install-exec-am:

18602

18603

install-html: install-html-am

18604

18605

+install-html-am:

18606

+

18607

install-info: install-info-am

18608

18609

+install-info-am:

18610

+

18611

install-man:

18612

18613

install-pdf: install-pdf-am

18614

18615

+install-pdf-am:

18616

+

18617

install-ps: install-ps-am

18618

18619

+install-ps-am:

18620

+

18621

installcheck-am:

18622

18623

maintainer-clean: maintainer-clean-am

18624

@@ -1039,6 +1063,7 @@

18625

rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \

18626

done

18627

dist-hook: doc-dist-hook

18628

+

18629

# Tell versions [3.59,3.63) of GNU make to not export all variables.

18630

# Otherwise a system limit (for SysV at least) may be exceeded.

18631

.NOEXPORT:

18632

18633

=== modified file 'install-sh'

18634

--- install-sh 2009-09-17 14:07:29 +0000

18635

+++ install-sh 2009-09-17 14:14:15 +0000

18636

@@ -1,7 +1,7 @@

18637

#!/bin/sh

18638

# install - install a program, script, or datafile

18639

18640

-scriptversion=2006-12-25.00

18641

+scriptversion=2009-04-28.21; # UTC

18642

18643

# This originates from X11R5 (mit/util/scripts/install.sh), which was

18644

# later released in X11R6 (xc/config/util/install.sh) with the

18645

@@ -515,5 +515,6 @@

18646

# eval: (add-hook 'write-file-hooks 'time-stamp)

18647

# time-stamp-start: "scriptversion="

18648

# time-stamp-format: "%:y-%02m-%02d.%02H"

18649

-# time-stamp-end: "$"

18650

+# time-stamp-time-zone: "UTC"

18651

+# time-stamp-end: "; # UTC"

18652

# End:

18653

18654

=== modified file 'libempathy-gtk/Makefile.in'

18655

--- libempathy-gtk/Makefile.in 2009-09-17 14:07:29 +0000

18656

+++ libempathy-gtk/Makefile.in 2009-09-17 14:14:16 +0000

18657

@@ -1,8 +1,9 @@

18658

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

18659

+# Makefile.in generated by automake 1.11 from Makefile.am.

18660

# @configure_input@

18661

18662

18663

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

18664

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

18665

+# Inc.

18666

# This Makefile.in is free software; the Free Software Foundation

18667

# gives unlimited permission to copy and/or distribute it,

18668

# with or without modifications, as long as this notice is preserved.

18669

@@ -18,8 +19,9 @@

18670

18671

VPATH = @srcdir@

18672

pkgdatadir = $(datadir)/@PACKAGE@

18673

+pkgincludedir = $(includedir)/@PACKAGE@

18674

pkglibdir = $(libdir)/@PACKAGE@

18675

-pkgincludedir = $(includedir)/@PACKAGE@

18676

+pkglibexecdir = $(libexecdir)/@PACKAGE@

18677

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

18678

install_sh_DATA = $(install_sh) -c -m 644

18679

install_sh_PROGRAM = $(install_sh) -c

18680

@@ -79,15 +81,30 @@

18681

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

18682

CONFIG_HEADER = $(top_builddir)/config.h

18683

CONFIG_CLEAN_FILES = libempathy-gtk.pc

18684

+CONFIG_CLEAN_VPATH_FILES =

18685

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

18686

am__vpath_adj = case $$p in \

18687

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

18688

*) f=$$p;; \

18689

esac;

18690

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

18691

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

18692

+am__install_max = 40

18693

+am__nobase_strip_setup = \

18694

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

18695

+am__nobase_strip = \

18696

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

18697

+am__nobase_list = $(am__nobase_strip_setup); \

18698

+ for p in $$list; do echo "$$p $$p"; done | \

18699

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

18700

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

18701

+ if (++n[$$2] == $(am__install_max)) \

18702

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

18703

+ END { for (dir in files) print dir, files[dir] }'

18704

+am__base_list = \

18705

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

18706

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

18707

am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \

18708

"$(DESTDIR)$(uidir)" "$(DESTDIR)$(libempathy_gtk_includedir)"

18709

-libLTLIBRARIES_INSTALL = $(INSTALL)

18710

LTLIBRARIES = $(lib_LTLIBRARIES)

18711

am__DEPENDENCIES_1 =

18712

libempathy_gtk_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \

18713

@@ -152,6 +169,7 @@

18714

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

18715

depcomp = $(SHELL) $(top_srcdir)/depcomp

18716

am__depfiles_maybe = depfiles

18717

+am__mv = mv -f

18718

COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

18719

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

18720

LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

18721

@@ -164,8 +182,6 @@

18722

SOURCES = $(libempathy_gtk_la_SOURCES) \

18723

$(nodist_libempathy_gtk_la_SOURCES)

18724

DIST_SOURCES = $(am__libempathy_gtk_la_SOURCES_DIST)

18725

-pkgconfigDATA_INSTALL = $(INSTALL_DATA)

18726

-uiDATA_INSTALL = $(INSTALL_DATA)

18727

DATA = $(pkgconfig_DATA) $(ui_DATA)

18728

am__libempathy_gtk_include_HEADERS_DIST = empathy-account-chooser.h \

18729

empathy-account-widget.h empathy-account-widget-irc.h \

18730

@@ -187,7 +203,6 @@

18731

empathy-theme-manager.h empathy-kludge-label.h \

18732

empathy-ui-utils.h empathy-location-manager.h empathy-plist.h \

18733

empathy-theme-adium.h empathy-gtk-enum-types.h

18734

-libempathy_gtk_includeHEADERS_INSTALL = $(INSTALL_HEADER)

18735

HEADERS = $(libempathy_gtk_include_HEADERS)

18736

ETAGS = etags

18737

CTAGS = ctags

18738

@@ -254,6 +269,8 @@

18739

GTKDOC_CHECK = @GTKDOC_CHECK@

18740

HELP_DIR = @HELP_DIR@

18741

HTML_DIR = @HTML_DIR@

18742

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

18743

+INDICATE_LIBS = @INDICATE_LIBS@

18744

INSTALL = @INSTALL@

18745

INSTALL_DATA = @INSTALL_DATA@

18746

INSTALL_PROGRAM = @INSTALL_PROGRAM@

18747

@@ -314,6 +331,7 @@

18748

PACKAGE_NAME = @PACKAGE_NAME@

18749

PACKAGE_STRING = @PACKAGE_STRING@

18750

PACKAGE_TARNAME = @PACKAGE_TARNAME@

18751

+PACKAGE_URL = @PACKAGE_URL@

18752

PACKAGE_VERSION = @PACKAGE_VERSION@

18753

PATH_SEPARATOR = @PATH_SEPARATOR@

18754

PKG_CONFIG = @PKG_CONFIG@

18755

@@ -540,9 +558,9 @@

18756

exit 1;; \

18757

esac; \

18758

done; \

18759

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libempathy-gtk/Makefile'; \

18760

- cd $(top_srcdir) && \

18761

- $(AUTOMAKE) --gnu libempathy-gtk/Makefile

18762

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libempathy-gtk/Makefile'; \

18763

+ $(am__cd) $(top_srcdir) && \

18764

+ $(AUTOMAKE) --gnu libempathy-gtk/Makefile

18765

.PRECIOUS: Makefile

18766

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

18767

@case '$?' in \

18768

@@ -560,25 +578,30 @@

18769

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

18770

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

18771

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

18772

+$(am__aclocal_m4_deps):

18773

libempathy-gtk.pc: $(top_builddir)/config.status $(srcdir)/libempathy-gtk.pc.in

18774

cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@

18775

install-libLTLIBRARIES: $(lib_LTLIBRARIES)

18776

@$(NORMAL_INSTALL)

18777

test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"

18778

- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \

18779

+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \

18780

+ list2=; for p in $$list; do \

18781

if test -f $$p; then \

18782

- f=$(am__strip_dir) \

18783

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \

18784

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \

18785

+ list2="$$list2 $$p"; \

18786

else :; fi; \

18787

- done

18788

+ done; \

18789

+ test -z "$$list2" || { \

18790

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \

18791

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \

18792

+ }

18793

18794

uninstall-libLTLIBRARIES:

18795

@$(NORMAL_UNINSTALL)

18796

- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \

18797

- p=$(am__strip_dir) \

18798

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \

18799

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \

18800

+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \

18801

+ for p in $$list; do \

18802

+ $(am__strip_dir) \

18803

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \

18804

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \

18805

done

18806

18807

clean-libLTLIBRARIES:

18808

@@ -646,21 +669,21 @@

18809

18810

.c.o:

18811

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

18812

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

18813

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

18814

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

18815

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

18816

@am__fastdepCC_FALSE@ $(COMPILE) -c $<

18817

18818

.c.obj:

18819

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

18820

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

18821

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

18822

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

18823

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

18824

@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

18825

18826

.c.lo:

18827

@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

18828

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

18829

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

18830

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

18831

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

18832

@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<

18833

@@ -673,54 +696,63 @@

18834

install-pkgconfigDATA: $(pkgconfig_DATA)

18835

@$(NORMAL_INSTALL)

18836

test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"

18837

- @list='$(pkgconfig_DATA)'; for p in $$list; do \

18838

+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \

18839

+ for p in $$list; do \

18840

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

18841

- f=$(am__strip_dir) \

18842

- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \

18843

- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \

18844

+ echo "$$d$$p"; \

18845

+ done | $(am__base_list) | \

18846

+ while read files; do \

18847

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \

18848

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \

18849

done

18850

18851

uninstall-pkgconfigDATA:

18852

@$(NORMAL_UNINSTALL)

18853

- @list='$(pkgconfig_DATA)'; for p in $$list; do \

18854

- f=$(am__strip_dir) \

18855

- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \

18856

- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \

18857

- done

18858

+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \

18859

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

18860

+ test -n "$$files" || exit 0; \

18861

+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \

18862

+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files

18863

install-uiDATA: $(ui_DATA)

18864

@$(NORMAL_INSTALL)

18865

test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"

18866

- @list='$(ui_DATA)'; for p in $$list; do \

18867

+ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \

18868

+ for p in $$list; do \

18869

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

18870

- f=$(am__strip_dir) \

18871

- echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \

18872

- $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \

18873

+ echo "$$d$$p"; \

18874

+ done | $(am__base_list) | \

18875

+ while read files; do \

18876

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \

18877

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \

18878

done

18879

18880

uninstall-uiDATA:

18881

@$(NORMAL_UNINSTALL)

18882

- @list='$(ui_DATA)'; for p in $$list; do \

18883

- f=$(am__strip_dir) \

18884

- echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \

18885

- rm -f "$(DESTDIR)$(uidir)/$$f"; \

18886

- done

18887

+ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \

18888

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

18889

+ test -n "$$files" || exit 0; \

18890

+ echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \

18891

+ cd "$(DESTDIR)$(uidir)" && rm -f $$files

18892

install-libempathy_gtk_includeHEADERS: $(libempathy_gtk_include_HEADERS)

18893

@$(NORMAL_INSTALL)

18894

test -z "$(libempathy_gtk_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libempathy_gtk_includedir)"

18895

- @list='$(libempathy_gtk_include_HEADERS)'; for p in $$list; do \

18896

+ @list='$(libempathy_gtk_include_HEADERS)'; test -n "$(libempathy_gtk_includedir)" || list=; \

18897

+ for p in $$list; do \

18898

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

18899

- f=$(am__strip_dir) \

18900

- echo " $(libempathy_gtk_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libempathy_gtk_includedir)/$$f'"; \

18901

- $(libempathy_gtk_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libempathy_gtk_includedir)/$$f"; \

18902

+ echo "$$d$$p"; \

18903

+ done | $(am__base_list) | \

18904

+ while read files; do \

18905

+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libempathy_gtk_includedir)'"; \

18906

+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libempathy_gtk_includedir)" || exit $$?; \

18907

done

18908

18909

uninstall-libempathy_gtk_includeHEADERS:

18910

@$(NORMAL_UNINSTALL)

18911

- @list='$(libempathy_gtk_include_HEADERS)'; for p in $$list; do \

18912

- f=$(am__strip_dir) \

18913

- echo " rm -f '$(DESTDIR)$(libempathy_gtk_includedir)/$$f'"; \

18914

- rm -f "$(DESTDIR)$(libempathy_gtk_includedir)/$$f"; \

18915

- done

18916

+ @list='$(libempathy_gtk_include_HEADERS)'; test -n "$(libempathy_gtk_includedir)" || list=; \

18917

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

18918

+ test -n "$$files" || exit 0; \

18919

+ echo " ( cd '$(DESTDIR)$(libempathy_gtk_includedir)' && rm -f" $$files ")"; \

18920

+ cd "$(DESTDIR)$(libempathy_gtk_includedir)" && rm -f $$files

18921

18922

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

18923

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

18924

@@ -734,7 +766,7 @@

18925

18926

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

18927

$(TAGS_FILES) $(LISP)

18928

- tags=; \

18929

+ set x; \

18930

here=`pwd`; \

18931

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

18932

unique=`for i in $$list; do \

18933

@@ -742,29 +774,34 @@

18934

done | \

18935

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

18936

END { if (nonempty) { for (i in files) print i; }; }'`; \

18937

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

18938

+ shift; \

18939

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

18940

test -n "$$unique" || unique=$$empty_fix; \

18941

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

18942

- $$tags $$unique; \

18943

+ if test $$# -gt 0; then \

18944

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

18945

+ "$$@" $$unique; \

18946

+ else \

18947

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

18948

+ $$unique; \

18949

+ fi; \

18950

fi

18951

ctags: CTAGS

18952

CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

18953

$(TAGS_FILES) $(LISP)

18954

- tags=; \

18955

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

18956

unique=`for i in $$list; do \

18957

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

18958

done | \

18959

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

18960

END { if (nonempty) { for (i in files) print i; }; }'`; \

18961

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

18962

+ test -z "$(CTAGS_ARGS)$$unique" \

18963

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

18964

- $$tags $$unique

18965

+ $$unique

18966

18967

GTAGS:

18968

here=`$(am__cd) $(top_builddir) && pwd` \

18969

- && cd $(top_srcdir) \

18970

- && gtags -i $(GTAGS_ARGS) $$here

18971

+ && $(am__cd) $(top_srcdir) \

18972

+ && gtags -i $(GTAGS_ARGS) "$$here"

18973

18974

distclean-tags:

18975

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

18976

@@ -785,13 +822,17 @@

18977

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

18978

if test -d $$d/$$file; then \

18979

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

18980

+ if test -d "$(distdir)/$$file"; then \

18981

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

18982

+ fi; \

18983

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

18984

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

18985

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

18986

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

18987

fi; \

18988

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

18989

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

18990

else \

18991

- test -f $(distdir)/$$file \

18992

- || cp -p $$d/$$file $(distdir)/$$file \

18993

+ test -f "$(distdir)/$$file" \

18994

+ || cp -p $$d/$$file "$(distdir)/$$file" \

18995

|| exit 1; \

18996

fi; \

18997

done

18998

@@ -826,6 +867,7 @@

18999

19000

distclean-generic:

19001

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

19002

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

19003

19004

maintainer-clean-generic:

19005

@echo "This command is intended for maintainers to use"

19006

@@ -848,6 +890,8 @@

19007

19008

html: html-am

19009

19010

+html-am:

19011

+

19012

info: info-am

19013

19014

info-am:

19015

@@ -857,18 +901,28 @@

19016

19017

install-dvi: install-dvi-am

19018

19019

+install-dvi-am:

19020

+

19021

install-exec-am: install-libLTLIBRARIES

19022

19023

install-html: install-html-am

19024

19025

+install-html-am:

19026

+

19027

install-info: install-info-am

19028

19029

+install-info-am:

19030

+

19031

install-man:

19032

19033

install-pdf: install-pdf-am

19034

19035

+install-pdf-am:

19036

+

19037

install-ps: install-ps-am

19038

19039

+install-ps-am:

19040

+

19041

installcheck-am:

19042

19043

maintainer-clean: maintainer-clean-am

19044

@@ -893,7 +947,7 @@

19045

uninstall-libempathy_gtk_includeHEADERS \

19046

uninstall-pkgconfigDATA uninstall-uiDATA

19047

19048

-.MAKE: install-am install-strip

19049

+.MAKE: all check check-am install install-am install-strip

19050

19051

.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \

19052

clean-generic clean-libLTLIBRARIES clean-libtool ctags \

19053

@@ -991,6 +1045,7 @@

19054

$(libempathy_gtk_headers) ) > xgen-gtc \

19055

&& cp xgen-gtc $(@F) \

19056

&& rm -f xgen-gtc

19057

+

19058

# Tell versions [3.59,3.63) of GNU make to not export all variables.

19059

# Otherwise a system limit (for SysV at least) may be exceeded.

19060

.NOEXPORT:

19061

19062

=== modified file 'libempathy/Makefile.in'

19063

--- libempathy/Makefile.in 2009-09-17 14:07:29 +0000

19064

+++ libempathy/Makefile.in 2009-09-17 14:14:16 +0000

19065

@@ -1,8 +1,9 @@

19066

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

19067

+# Makefile.in generated by automake 1.11 from Makefile.am.

19068

# @configure_input@

19069

19070

19071

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

19072

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

19073

+# Inc.

19074

# This Makefile.in is free software; the Free Software Foundation

19075

# gives unlimited permission to copy and/or distribute it,

19076

# with or without modifications, as long as this notice is preserved.

19077

@@ -18,8 +19,9 @@

19078

19079

VPATH = @srcdir@

19080

pkgdatadir = $(datadir)/@PACKAGE@

19081

+pkgincludedir = $(includedir)/@PACKAGE@

19082

pkglibdir = $(libdir)/@PACKAGE@

19083

-pkgincludedir = $(includedir)/@PACKAGE@

19084

+pkglibexecdir = $(libexecdir)/@PACKAGE@

19085

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

19086

install_sh_DATA = $(install_sh) -c -m 644

19087

install_sh_PROGRAM = $(install_sh) -c

19088

@@ -54,17 +56,32 @@

19089

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

19090

CONFIG_HEADER = $(top_builddir)/config.h

19091

CONFIG_CLEAN_FILES = libempathy.pc

19092

+CONFIG_CLEAN_VPATH_FILES =

19093

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

19094

am__vpath_adj = case $$p in \

19095

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

19096

*) f=$$p;; \

19097

esac;

19098

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

19099

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

19100

+am__install_max = 40

19101

+am__nobase_strip_setup = \

19102

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

19103

+am__nobase_strip = \

19104

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

19105

+am__nobase_list = $(am__nobase_strip_setup); \

19106

+ for p in $$list; do echo "$$p $$p"; done | \

19107

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

19108

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

19109

+ if (++n[$$2] == $(am__install_max)) \

19110

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

19111

+ END { for (dir in files) print dir, files[dir] }'

19112

+am__base_list = \

19113

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

19114

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

19115

am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(dtddir)" \

19116

"$(DESTDIR)$(ircnetworksdir)" "$(DESTDIR)$(pkgconfigdir)" \

19117

"$(DESTDIR)$(stylesheetdir)" \

19118

"$(DESTDIR)$(libempathy_includedir)"

19119

-libLTLIBRARIES_INSTALL = $(INSTALL)

19120

LTLIBRARIES = $(lib_LTLIBRARIES)

19121

am__DEPENDENCIES_1 =

19122

libempathy_la_DEPENDENCIES = \

19123

@@ -100,6 +117,7 @@

19124

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

19125

depcomp = $(SHELL) $(top_srcdir)/depcomp

19126

am__depfiles_maybe = depfiles

19127

+am__mv = mv -f

19128

COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

19129

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

19130

LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

19131

@@ -111,13 +129,8 @@

19132

$(LDFLAGS) -o $@

19133

SOURCES = $(libempathy_la_SOURCES) $(nodist_libempathy_la_SOURCES)

19134

DIST_SOURCES = $(libempathy_la_SOURCES)

19135

-dtdDATA_INSTALL = $(INSTALL_DATA)

19136

-ircnetworksDATA_INSTALL = $(INSTALL_DATA)

19137

-pkgconfigDATA_INSTALL = $(INSTALL_DATA)

19138

-stylesheetDATA_INSTALL = $(INSTALL_DATA)

19139

DATA = $(dtd_DATA) $(ircnetworks_DATA) $(pkgconfig_DATA) \

19140

$(stylesheet_DATA)

19141

-libempathy_includeHEADERS_INSTALL = $(INSTALL_HEADER)

19142

HEADERS = $(libempathy_include_HEADERS)

19143

ETAGS = etags

19144

CTAGS = ctags

19145

@@ -184,6 +197,8 @@

19146

GTKDOC_CHECK = @GTKDOC_CHECK@

19147

HELP_DIR = @HELP_DIR@

19148

HTML_DIR = @HTML_DIR@

19149

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

19150

+INDICATE_LIBS = @INDICATE_LIBS@

19151

INSTALL = @INSTALL@

19152

INSTALL_DATA = @INSTALL_DATA@

19153

INSTALL_PROGRAM = @INSTALL_PROGRAM@

19154

@@ -244,6 +259,7 @@

19155

PACKAGE_NAME = @PACKAGE_NAME@

19156

PACKAGE_STRING = @PACKAGE_STRING@

19157

PACKAGE_TARNAME = @PACKAGE_TARNAME@

19158

+PACKAGE_URL = @PACKAGE_URL@

19159

PACKAGE_VERSION = @PACKAGE_VERSION@

19160

PATH_SEPARATOR = @PATH_SEPARATOR@

19161

PKG_CONFIG = @PKG_CONFIG@

19162

@@ -512,9 +528,9 @@

19163

exit 1;; \

19164

esac; \

19165

done; \

19166

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libempathy/Makefile'; \

19167

- cd $(top_srcdir) && \

19168

- $(AUTOMAKE) --gnu libempathy/Makefile

19169

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libempathy/Makefile'; \

19170

+ $(am__cd) $(top_srcdir) && \

19171

+ $(AUTOMAKE) --gnu libempathy/Makefile

19172

.PRECIOUS: Makefile

19173

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

19174

@case '$?' in \

19175

@@ -532,25 +548,30 @@

19176

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

19177

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

19178

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

19179

+$(am__aclocal_m4_deps):

19180

libempathy.pc: $(top_builddir)/config.status $(srcdir)/libempathy.pc.in

19181

cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@

19182

install-libLTLIBRARIES: $(lib_LTLIBRARIES)

19183

@$(NORMAL_INSTALL)

19184

test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"

19185

- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \

19186

+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \

19187

+ list2=; for p in $$list; do \

19188

if test -f $$p; then \

19189

- f=$(am__strip_dir) \

19190

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \

19191

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \

19192

+ list2="$$list2 $$p"; \

19193

else :; fi; \

19194

- done

19195

+ done; \

19196

+ test -z "$$list2" || { \

19197

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \

19198

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \

19199

+ }

19200

19201

uninstall-libLTLIBRARIES:

19202

@$(NORMAL_UNINSTALL)

19203

- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \

19204

- p=$(am__strip_dir) \

19205

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \

19206

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \

19207

+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \

19208

+ for p in $$list; do \

19209

+ $(am__strip_dir) \

19210

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \

19211

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \

19212

done

19213

19214

clean-libLTLIBRARIES:

19215

@@ -614,21 +635,21 @@

19216

19217

.c.o:

19218

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

19219

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

19220

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

19221

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

19222

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19223

@am__fastdepCC_FALSE@ $(COMPILE) -c $<

19224

19225

.c.obj:

19226

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

19227

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

19228

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

19229

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

19230

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19231

@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

19232

19233

.c.lo:

19234

@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

19235

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

19236

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

19237

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

19238

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

19239

@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<

19240

@@ -641,88 +662,103 @@

19241

install-dtdDATA: $(dtd_DATA)

19242

@$(NORMAL_INSTALL)

19243

test -z "$(dtddir)" || $(MKDIR_P) "$(DESTDIR)$(dtddir)"

19244

- @list='$(dtd_DATA)'; for p in $$list; do \

19245

+ @list='$(dtd_DATA)'; test -n "$(dtddir)" || list=; \

19246

+ for p in $$list; do \

19247

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

19248

- f=$(am__strip_dir) \

19249

- echo " $(dtdDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dtddir)/$$f'"; \

19250

- $(dtdDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dtddir)/$$f"; \

19251

+ echo "$$d$$p"; \

19252

+ done | $(am__base_list) | \

19253

+ while read files; do \

19254

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dtddir)'"; \

19255

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(dtddir)" || exit $$?; \

19256

done

19257

19258

uninstall-dtdDATA:

19259

@$(NORMAL_UNINSTALL)

19260

- @list='$(dtd_DATA)'; for p in $$list; do \

19261

- f=$(am__strip_dir) \

19262

- echo " rm -f '$(DESTDIR)$(dtddir)/$$f'"; \

19263

- rm -f "$(DESTDIR)$(dtddir)/$$f"; \

19264

- done

19265

+ @list='$(dtd_DATA)'; test -n "$(dtddir)" || list=; \

19266

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

19267

+ test -n "$$files" || exit 0; \

19268

+ echo " ( cd '$(DESTDIR)$(dtddir)' && rm -f" $$files ")"; \

19269

+ cd "$(DESTDIR)$(dtddir)" && rm -f $$files

19270

install-ircnetworksDATA: $(ircnetworks_DATA)

19271

@$(NORMAL_INSTALL)

19272

test -z "$(ircnetworksdir)" || $(MKDIR_P) "$(DESTDIR)$(ircnetworksdir)"

19273

- @list='$(ircnetworks_DATA)'; for p in $$list; do \

19274

+ @list='$(ircnetworks_DATA)'; test -n "$(ircnetworksdir)" || list=; \

19275

+ for p in $$list; do \

19276

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

19277

- f=$(am__strip_dir) \

19278

- echo " $(ircnetworksDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ircnetworksdir)/$$f'"; \

19279

- $(ircnetworksDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ircnetworksdir)/$$f"; \

19280

+ echo "$$d$$p"; \

19281

+ done | $(am__base_list) | \

19282

+ while read files; do \

19283

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ircnetworksdir)'"; \

19284

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(ircnetworksdir)" || exit $$?; \

19285

done

19286

19287

uninstall-ircnetworksDATA:

19288

@$(NORMAL_UNINSTALL)

19289

- @list='$(ircnetworks_DATA)'; for p in $$list; do \

19290

- f=$(am__strip_dir) \

19291

- echo " rm -f '$(DESTDIR)$(ircnetworksdir)/$$f'"; \

19292

- rm -f "$(DESTDIR)$(ircnetworksdir)/$$f"; \

19293

- done

19294

+ @list='$(ircnetworks_DATA)'; test -n "$(ircnetworksdir)" || list=; \

19295

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

19296

+ test -n "$$files" || exit 0; \

19297

+ echo " ( cd '$(DESTDIR)$(ircnetworksdir)' && rm -f" $$files ")"; \

19298

+ cd "$(DESTDIR)$(ircnetworksdir)" && rm -f $$files

19299

install-pkgconfigDATA: $(pkgconfig_DATA)

19300

@$(NORMAL_INSTALL)

19301

test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"

19302

- @list='$(pkgconfig_DATA)'; for p in $$list; do \

19303

+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \

19304

+ for p in $$list; do \

19305

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

19306

- f=$(am__strip_dir) \

19307

- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \

19308

- $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \

19309

+ echo "$$d$$p"; \

19310

+ done | $(am__base_list) | \

19311

+ while read files; do \

19312

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \

19313

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \

19314

done

19315

19316

uninstall-pkgconfigDATA:

19317

@$(NORMAL_UNINSTALL)

19318

- @list='$(pkgconfig_DATA)'; for p in $$list; do \

19319

- f=$(am__strip_dir) \

19320

- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \

19321

- rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \

19322

- done

19323

+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \

19324

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

19325

+ test -n "$$files" || exit 0; \

19326

+ echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \

19327

+ cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files

19328

install-stylesheetDATA: $(stylesheet_DATA)

19329

@$(NORMAL_INSTALL)

19330

test -z "$(stylesheetdir)" || $(MKDIR_P) "$(DESTDIR)$(stylesheetdir)"

19331

- @list='$(stylesheet_DATA)'; for p in $$list; do \

19332

+ @list='$(stylesheet_DATA)'; test -n "$(stylesheetdir)" || list=; \

19333

+ for p in $$list; do \

19334

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

19335

- f=$(am__strip_dir) \

19336

- echo " $(stylesheetDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(stylesheetdir)/$$f'"; \

19337

- $(stylesheetDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(stylesheetdir)/$$f"; \

19338

+ echo "$$d$$p"; \

19339

+ done | $(am__base_list) | \

19340

+ while read files; do \

19341

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(stylesheetdir)'"; \

19342

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(stylesheetdir)" || exit $$?; \

19343

done

19344

19345

uninstall-stylesheetDATA:

19346

@$(NORMAL_UNINSTALL)

19347

- @list='$(stylesheet_DATA)'; for p in $$list; do \

19348

- f=$(am__strip_dir) \

19349

- echo " rm -f '$(DESTDIR)$(stylesheetdir)/$$f'"; \

19350

- rm -f "$(DESTDIR)$(stylesheetdir)/$$f"; \

19351

- done

19352

+ @list='$(stylesheet_DATA)'; test -n "$(stylesheetdir)" || list=; \

19353

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

19354

+ test -n "$$files" || exit 0; \

19355

+ echo " ( cd '$(DESTDIR)$(stylesheetdir)' && rm -f" $$files ")"; \

19356

+ cd "$(DESTDIR)$(stylesheetdir)" && rm -f $$files

19357

install-libempathy_includeHEADERS: $(libempathy_include_HEADERS)

19358

@$(NORMAL_INSTALL)

19359

test -z "$(libempathy_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libempathy_includedir)"

19360

- @list='$(libempathy_include_HEADERS)'; for p in $$list; do \

19361

+ @list='$(libempathy_include_HEADERS)'; test -n "$(libempathy_includedir)" || list=; \

19362

+ for p in $$list; do \

19363

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

19364

- f=$(am__strip_dir) \

19365

- echo " $(libempathy_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libempathy_includedir)/$$f'"; \

19366

- $(libempathy_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libempathy_includedir)/$$f"; \

19367

+ echo "$$d$$p"; \

19368

+ done | $(am__base_list) | \

19369

+ while read files; do \

19370

+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libempathy_includedir)'"; \

19371

+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libempathy_includedir)" || exit $$?; \

19372

done

19373

19374

uninstall-libempathy_includeHEADERS:

19375

@$(NORMAL_UNINSTALL)

19376

- @list='$(libempathy_include_HEADERS)'; for p in $$list; do \

19377

- f=$(am__strip_dir) \

19378

- echo " rm -f '$(DESTDIR)$(libempathy_includedir)/$$f'"; \

19379

- rm -f "$(DESTDIR)$(libempathy_includedir)/$$f"; \

19380

- done

19381

+ @list='$(libempathy_include_HEADERS)'; test -n "$(libempathy_includedir)" || list=; \

19382

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

19383

+ test -n "$$files" || exit 0; \

19384

+ echo " ( cd '$(DESTDIR)$(libempathy_includedir)' && rm -f" $$files ")"; \

19385

+ cd "$(DESTDIR)$(libempathy_includedir)" && rm -f $$files

19386

19387

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

19388

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

19389

@@ -736,7 +772,7 @@

19390

19391

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

19392

$(TAGS_FILES) $(LISP)

19393

- tags=; \

19394

+ set x; \

19395

here=`pwd`; \

19396

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

19397

unique=`for i in $$list; do \

19398

@@ -744,29 +780,34 @@

19399

done | \

19400

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

19401

END { if (nonempty) { for (i in files) print i; }; }'`; \

19402

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

19403

+ shift; \

19404

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

19405

test -n "$$unique" || unique=$$empty_fix; \

19406

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

19407

- $$tags $$unique; \

19408

+ if test $$# -gt 0; then \

19409

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

19410

+ "$$@" $$unique; \

19411

+ else \

19412

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

19413

+ $$unique; \

19414

+ fi; \

19415

fi

19416

ctags: CTAGS

19417

CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

19418

$(TAGS_FILES) $(LISP)

19419

- tags=; \

19420

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

19421

unique=`for i in $$list; do \

19422

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

19423

done | \

19424

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

19425

END { if (nonempty) { for (i in files) print i; }; }'`; \

19426

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

19427

+ test -z "$(CTAGS_ARGS)$$unique" \

19428

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

19429

- $$tags $$unique

19430

+ $$unique

19431

19432

GTAGS:

19433

here=`$(am__cd) $(top_builddir) && pwd` \

19434

- && cd $(top_srcdir) \

19435

- && gtags -i $(GTAGS_ARGS) $$here

19436

+ && $(am__cd) $(top_srcdir) \

19437

+ && gtags -i $(GTAGS_ARGS) "$$here"

19438

19439

distclean-tags:

19440

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

19441

@@ -787,13 +828,17 @@

19442

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

19443

if test -d $$d/$$file; then \

19444

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

19445

+ if test -d "$(distdir)/$$file"; then \

19446

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

19447

+ fi; \

19448

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

19449

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

19450

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

19451

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

19452

fi; \

19453

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

19454

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

19455

else \

19456

- test -f $(distdir)/$$file \

19457

- || cp -p $$d/$$file $(distdir)/$$file \

19458

+ test -f "$(distdir)/$$file" \

19459

+ || cp -p $$d/$$file "$(distdir)/$$file" \

19460

|| exit 1; \

19461

fi; \

19462

done

19463

@@ -828,6 +873,7 @@

19464

19465

distclean-generic:

19466

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

19467

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

19468

19469

maintainer-clean-generic:

19470

@echo "This command is intended for maintainers to use"

19471

@@ -850,6 +896,8 @@

19472

19473

html: html-am

19474

19475

+html-am:

19476

+

19477

info: info-am

19478

19479

info-am:

19480

@@ -860,18 +908,28 @@

19481

19482

install-dvi: install-dvi-am

19483

19484

+install-dvi-am:

19485

+

19486

install-exec-am: install-libLTLIBRARIES

19487

19488

install-html: install-html-am

19489

19490

+install-html-am:

19491

+

19492

install-info: install-info-am

19493

19494

+install-info-am:

19495

+

19496

install-man:

19497

19498

install-pdf: install-pdf-am

19499

19500

+install-pdf-am:

19501

+

19502

install-ps: install-ps-am

19503

19504

+install-ps-am:

19505

+

19506

installcheck-am:

19507

19508

maintainer-clean: maintainer-clean-am

19509

@@ -896,7 +954,7 @@

19510

uninstall-libLTLIBRARIES uninstall-libempathy_includeHEADERS \

19511

uninstall-pkgconfigDATA uninstall-stylesheetDATA

19512

19513

-.MAKE: install-am install-strip

19514

+.MAKE: all check check-am install install-am install-strip

19515

19516

.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \

19517

clean-generic clean-libLTLIBRARIES clean-libtool ctags \

19518

@@ -995,6 +1053,7 @@

19519

$(libempathy_headers) ) > xgen-gtc \

19520

&& cp xgen-gtc $(@F) \

19521

&& rm -f xgen-gtc

19522

+

19523

# Tell versions [3.59,3.63) of GNU make to not export all variables.

19524

# Otherwise a system limit (for SysV at least) may be exceeded.

19525

.NOEXPORT:

19526

19527

=== modified file 'ltmain.sh'

19528

--- ltmain.sh 2009-09-17 14:07:29 +0000

19529

+++ ltmain.sh 2009-09-17 14:14:11 +0000

19530

@@ -65,7 +65,7 @@

19531

# compiler: $LTCC

19532

# compiler flags: $LTCFLAGS

19533

# linker: $LD (gnu? $with_gnu_ld)

19534

-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1

19535

+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4

19536

# automake: $automake_version

19537

# autoconf: $autoconf_version

19538

#

19539

@@ -73,7 +73,7 @@

19540

19541

PROGRAM=ltmain.sh

19542

PACKAGE=libtool

19543

-VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"

19544

+VERSION="2.2.6 Debian-2.2.6a-4"

19545

TIMESTAMP=""

19546

package_revision=1.3012

19547

19548

@@ -5347,19 +5347,19 @@

19549

# It is a libtool convenience library, so add in its objects.

19550

convenience="$convenience $ladir/$objdir/$old_library"

19551

old_convenience="$old_convenience $ladir/$objdir/$old_library"

19552

+ tmp_libs=

19553

+ for deplib in $dependency_libs; do

19554

+ deplibs="$deplib $deplibs"

19555

+ if $opt_duplicate_deps ; then

19556

+ case "$tmp_libs " in

19557

+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

19558

+ esac

19559

+ fi

19560

+ tmp_libs="$tmp_libs $deplib"

19561

+ done

19562

elif test "$linkmode" != prog && test "$linkmode" != lib; then

19563

func_fatal_error "\`$lib' is not a convenience library"

19564

fi

19565

- tmp_libs=

19566

- for deplib in $dependency_libs; do

19567

- deplibs="$deplib $deplibs"

19568

- if $opt_duplicate_deps ; then

19569

- case "$tmp_libs " in

19570

- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;

19571

- esac

19572

- fi

19573

- tmp_libs="$tmp_libs $deplib"

19574

- done

19575

continue

19576

fi # $pass = conv

19577

19578

@@ -5896,6 +5896,7 @@

19579

if test "$link_all_deplibs" != no; then

19580

# Add the search paths of all dependency libraries

19581

for deplib in $dependency_libs; do

19582

+ path=

19583

case $deplib in

19584

-L*) path="$deplib" ;;

19585

*.la)

19586

19587

=== modified file 'm4/libtool.m4'

19588

--- m4/libtool.m4 2009-09-17 14:07:29 +0000

19589

+++ m4/libtool.m4 2009-09-17 14:14:11 +0000

19590

@@ -4261,6 +4261,9 @@

19591

openbsd*)

19592

with_gnu_ld=no

19593

;;

19594

+ linux* | k*bsd*-gnu)

19595

+ _LT_TAGVAR(link_all_deplibs, $1)=no

19596

+ ;;

19597

esac

19598

19599

_LT_TAGVAR(ld_shlibs, $1)=yes

19600

19601

=== modified file 'megaphone/Makefile.in'

19602

--- megaphone/Makefile.in 2009-09-17 14:07:29 +0000

19603

+++ megaphone/Makefile.in 2009-09-17 14:14:16 +0000

19604

@@ -1,8 +1,9 @@

19605

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

19606

+# Makefile.in generated by automake 1.11 from Makefile.am.

19607

# @configure_input@

19608

19609

19610

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

19611

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

19612

+# Inc.

19613

# This Makefile.in is free software; the Free Software Foundation

19614

# gives unlimited permission to copy and/or distribute it,

19615

# with or without modifications, as long as this notice is preserved.

19616

@@ -15,8 +16,9 @@

19617

@SET_MAKE@

19618

VPATH = @srcdir@

19619

pkgdatadir = $(datadir)/@PACKAGE@

19620

+pkgincludedir = $(includedir)/@PACKAGE@

19621

pkglibdir = $(libdir)/@PACKAGE@

19622

-pkgincludedir = $(includedir)/@PACKAGE@

19623

+pkglibexecdir = $(libexecdir)/@PACKAGE@

19624

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

19625

install_sh_DATA = $(install_sh) -c -m 644

19626

install_sh_PROGRAM = $(install_sh) -c

19627

@@ -48,6 +50,7 @@

19628

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

19629

CONFIG_HEADER = $(top_builddir)/config.h

19630

CONFIG_CLEAN_FILES =

19631

+CONFIG_CLEAN_VPATH_FILES =

19632

SOURCES =

19633

DIST_SOURCES =

19634

RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

19635

@@ -59,10 +62,38 @@

19636

ps-recursive uninstall-recursive

19637

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

19638

distclean-recursive maintainer-clean-recursive

19639

+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

19640

+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

19641

+ distdir

19642

ETAGS = etags

19643

CTAGS = ctags

19644

DIST_SUBDIRS = $(SUBDIRS)

19645

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

19646

+am__relativize = \

19647

+ dir0=`pwd`; \

19648

+ sed_first='s,^$[^/]*$/.*$$,\1,'; \

19649

+ sed_rest='s,^[^/]*/*,,'; \

19650

+ sed_last='s,^.*/$[^/]*$$$,\1,'; \

19651

+ sed_butlast='s,/*[^/]*$$,,'; \

19652

+ while test -n "$$dir1"; do \

19653

+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \

19654

+ if test "$$first" != "."; then \

19655

+ if test "$$first" = ".."; then \

19656

+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

19657

+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

19658

+ else \

19659

+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

19660

+ if test "$$first2" = "$$first"; then \

19661

+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

19662

+ else \

19663

+ dir2="../$$dir2"; \

19664

+ fi; \

19665

+ dir0="$$dir0"/"$$first"; \

19666

+ fi; \

19667

+ fi; \

19668

+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

19669

+ done; \

19670

+ reldir="$$dir2"

19671

ACLOCAL = @ACLOCAL@

19672

ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@

19673

ALL_LINGUAS = @ALL_LINGUAS@

19674

@@ -125,6 +156,8 @@

19675

GTKDOC_CHECK = @GTKDOC_CHECK@

19676

HELP_DIR = @HELP_DIR@

19677

HTML_DIR = @HTML_DIR@

19678

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

19679

+INDICATE_LIBS = @INDICATE_LIBS@

19680

INSTALL = @INSTALL@

19681

INSTALL_DATA = @INSTALL_DATA@

19682

INSTALL_PROGRAM = @INSTALL_PROGRAM@

19683

@@ -185,6 +218,7 @@

19684

PACKAGE_NAME = @PACKAGE_NAME@

19685

PACKAGE_STRING = @PACKAGE_STRING@

19686

PACKAGE_TARNAME = @PACKAGE_TARNAME@

19687

+PACKAGE_URL = @PACKAGE_URL@

19688

PACKAGE_VERSION = @PACKAGE_VERSION@

19689

PATH_SEPARATOR = @PATH_SEPARATOR@

19690

PKG_CONFIG = @PKG_CONFIG@

19691

@@ -293,9 +327,9 @@

19692

exit 1;; \

19693

esac; \

19694

done; \

19695

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu megaphone/Makefile'; \

19696

- cd $(top_srcdir) && \

19697

- $(AUTOMAKE) --gnu megaphone/Makefile

19698

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu megaphone/Makefile'; \

19699

+ $(am__cd) $(top_srcdir) && \

19700

+ $(AUTOMAKE) --gnu megaphone/Makefile

19701

.PRECIOUS: Makefile

19702

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

19703

@case '$?' in \

19704

@@ -313,6 +347,7 @@

19705

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

19706

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

19707

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

19708

+$(am__aclocal_m4_deps):

19709

19710

mostlyclean-libtool:

19711

-rm -f *.lo

19712

@@ -344,7 +379,7 @@

19713

else \

19714

local_target="$$target"; \

19715

fi; \

19716

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

19717

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

19718

|| eval $$failcom; \

19719

done; \

19720

if test "$$dot_seen" = "no"; then \

19721

@@ -378,16 +413,16 @@

19722

else \

19723

local_target="$$target"; \

19724

fi; \

19725

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

19726

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

19727

|| eval $$failcom; \

19728

done && test -z "$$fail"

19729

tags-recursive:

19730

list='$(SUBDIRS)'; for subdir in $$list; do \

19731

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

19732

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

19733

done

19734

ctags-recursive:

19735

list='$(SUBDIRS)'; for subdir in $$list; do \

19736

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

19737

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

19738

done

19739

19740

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

19741

@@ -402,7 +437,7 @@

19742

19743

TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

19744

$(TAGS_FILES) $(LISP)

19745

- tags=; \

19746

+ set x; \

19747

here=`pwd`; \

19748

if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

19749

include_option=--etags-include; \

19750

@@ -414,7 +449,7 @@

19751

list='$(SUBDIRS)'; for subdir in $$list; do \

19752

if test "$$subdir" = .; then :; else \

19753

test ! -f $$subdir/TAGS || \

19754

- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

19755

+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

19756

fi; \

19757

done; \

19758

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

19759

@@ -423,29 +458,34 @@

19760

done | \

19761

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

19762

END { if (nonempty) { for (i in files) print i; }; }'`; \

19763

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

19764

+ shift; \

19765

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

19766

test -n "$$unique" || unique=$$empty_fix; \

19767

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

19768

- $$tags $$unique; \

19769

+ if test $$# -gt 0; then \

19770

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

19771

+ "$$@" $$unique; \

19772

+ else \

19773

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

19774

+ $$unique; \

19775

+ fi; \

19776

fi

19777

ctags: CTAGS

19778

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

19779

$(TAGS_FILES) $(LISP)

19780

- tags=; \

19781

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

19782

unique=`for i in $$list; do \

19783

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

19784

done | \

19785

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

19786

END { if (nonempty) { for (i in files) print i; }; }'`; \

19787

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

19788

+ test -z "$(CTAGS_ARGS)$$unique" \

19789

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

19790

- $$tags $$unique

19791

+ $$unique

19792

19793

GTAGS:

19794

here=`$(am__cd) $(top_builddir) && pwd` \

19795

- && cd $(top_srcdir) \

19796

- && gtags -i $(GTAGS_ARGS) $$here

19797

+ && $(am__cd) $(top_srcdir) \

19798

+ && gtags -i $(GTAGS_ARGS) "$$here"

19799

19800

distclean-tags:

19801

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

19802

@@ -466,29 +506,44 @@

19803

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

19804

if test -d $$d/$$file; then \

19805

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

19806

+ if test -d "$(distdir)/$$file"; then \

19807

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

19808

+ fi; \

19809

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

19810

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

19811

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

19812

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

19813

fi; \

19814

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

19815

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

19816

else \

19817

- test -f $(distdir)/$$file \

19818

- || cp -p $$d/$$file $(distdir)/$$file \

19819

+ test -f "$(distdir)/$$file" \

19820

+ || cp -p $$d/$$file "$(distdir)/$$file" \

19821

|| exit 1; \

19822

fi; \

19823

done

19824

- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

19825

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

19826

if test "$$subdir" = .; then :; else \

19827

test -d "$(distdir)/$$subdir" \

19828

|| $(MKDIR_P) "$(distdir)/$$subdir" \

19829

|| exit 1; \

19830

- distdir=`$(am__cd) $(distdir) && pwd`; \

19831

- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

19832

- (cd $$subdir && \

19833

+ fi; \

19834

+ done

19835

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

19836

+ if test "$$subdir" = .; then :; else \

19837

+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

19838

+ $(am__relativize); \

19839

+ new_distdir=$$reldir; \

19840

+ dir1=$$subdir; dir2="$(top_distdir)"; \

19841

+ $(am__relativize); \

19842

+ new_top_distdir=$$reldir; \

19843

+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

19844

+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

19845

+ ($(am__cd) $$subdir && \

19846

$(MAKE) $(AM_MAKEFLAGS) \

19847

- top_distdir="$$top_distdir" \

19848

- distdir="$$distdir/$$subdir" \

19849

+ top_distdir="$$new_top_distdir" \

19850

+ distdir="$$new_distdir" \

19851

am__remove_distdir=: \

19852

am__skip_length_check=: \

19853

+ am__skip_mode_fix=: \

19854

distdir) \

19855

|| exit 1; \

19856

fi; \

19857

@@ -518,6 +573,7 @@

19858

19859

distclean-generic:

19860

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

19861

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

19862

19863

maintainer-clean-generic:

19864

@echo "This command is intended for maintainers to use"

19865

@@ -536,6 +592,8 @@

19866

19867

html: html-recursive

19868

19869

+html-am:

19870

+

19871

info: info-recursive

19872

19873

info-am:

19874

@@ -544,18 +602,28 @@

19875

19876

install-dvi: install-dvi-recursive

19877

19878

+install-dvi-am:

19879

+

19880

install-exec-am:

19881

19882

install-html: install-html-recursive

19883

19884

+install-html-am:

19885

+

19886

install-info: install-info-recursive

19887

19888

+install-info-am:

19889

+

19890

install-man:

19891

19892

install-pdf: install-pdf-recursive

19893

19894

+install-pdf-am:

19895

+

19896

install-ps: install-ps-recursive

19897

19898

+install-ps-am:

19899

+

19900

installcheck-am:

19901

19902

maintainer-clean: maintainer-clean-recursive

19903

@@ -576,8 +644,8 @@

19904

19905

uninstall-am:

19906

19907

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

19908

- install-strip

19909

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \

19910

+ install-am install-strip tags-recursive

19911

19912

.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

19913

all all-am check check-am clean clean-generic clean-libtool \

19914

@@ -593,6 +661,7 @@

19915

mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \

19916

uninstall uninstall-am

19917

19918

+

19919

# Tell versions [3.59,3.63) of GNU make to not export all variables.

19920

# Otherwise a system limit (for SysV at least) may be exceeded.

19921

.NOEXPORT:

19922

19923

=== modified file 'megaphone/data/Makefile.in'

19924

--- megaphone/data/Makefile.in 2009-09-17 14:07:29 +0000

19925

+++ megaphone/data/Makefile.in 2009-09-17 14:14:16 +0000

19926

@@ -1,8 +1,9 @@

19927

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

19928

+# Makefile.in generated by automake 1.11 from Makefile.am.

19929

# @configure_input@

19930

19931

19932

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

19933

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

19934

+# Inc.

19935

# This Makefile.in is free software; the Free Software Foundation

19936

# gives unlimited permission to copy and/or distribute it,

19937

# with or without modifications, as long as this notice is preserved.

19938

@@ -16,8 +17,9 @@

19939

19940

VPATH = @srcdir@

19941

pkgdatadir = $(datadir)/@PACKAGE@

19942

+pkgincludedir = $(includedir)/@PACKAGE@

19943

pkglibdir = $(libdir)/@PACKAGE@

19944

-pkgincludedir = $(includedir)/@PACKAGE@

19945

+pkglibexecdir = $(libexecdir)/@PACKAGE@

19946

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

19947

install_sh_DATA = $(install_sh) -c -m 644

19948

install_sh_PROGRAM = $(install_sh) -c

19949

@@ -50,6 +52,7 @@

19950

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

19951

CONFIG_HEADER = $(top_builddir)/config.h

19952

CONFIG_CLEAN_FILES =

19953

+CONFIG_CLEAN_VPATH_FILES =

19954

SOURCES =

19955

DIST_SOURCES =

19956

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

19957

@@ -57,12 +60,24 @@

19958

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

19959

*) f=$$p;; \

19960

esac;

19961

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

19962

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

19963

+am__install_max = 40

19964

+am__nobase_strip_setup = \

19965

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

19966

+am__nobase_strip = \

19967

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

19968

+am__nobase_list = $(am__nobase_strip_setup); \

19969

+ for p in $$list; do echo "$$p $$p"; done | \

19970

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

19971

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

19972

+ if (++n[$$2] == $(am__install_max)) \

19973

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

19974

+ END { for (dir in files) print dir, files[dir] }'

19975

+am__base_list = \

19976

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

19977

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

19978

am__installdirs = "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(schemadir)" \

19979

"$(DESTDIR)$(serverdir)"

19980

-resourcesDATA_INSTALL = $(INSTALL_DATA)

19981

-schemaDATA_INSTALL = $(INSTALL_DATA)

19982

-serverDATA_INSTALL = $(INSTALL_DATA)

19983

DATA = $(resources_DATA) $(schema_DATA) $(server_DATA)

19984

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

19985

ACLOCAL = @ACLOCAL@

19986

@@ -127,6 +142,8 @@

19987

GTKDOC_CHECK = @GTKDOC_CHECK@

19988

HELP_DIR = @HELP_DIR@

19989

HTML_DIR = @HTML_DIR@

19990

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

19991

+INDICATE_LIBS = @INDICATE_LIBS@

19992

INSTALL = @INSTALL@

19993

INSTALL_DATA = @INSTALL_DATA@

19994

INSTALL_PROGRAM = @INSTALL_PROGRAM@

19995

@@ -187,6 +204,7 @@

19996

PACKAGE_NAME = @PACKAGE_NAME@

19997

PACKAGE_STRING = @PACKAGE_STRING@

19998

PACKAGE_TARNAME = @PACKAGE_TARNAME@

19999

+PACKAGE_URL = @PACKAGE_URL@

20000

PACKAGE_VERSION = @PACKAGE_VERSION@

20001

PATH_SEPARATOR = @PATH_SEPARATOR@

20002

PKG_CONFIG = @PKG_CONFIG@

20003

@@ -322,9 +340,9 @@

20004

exit 1;; \

20005

esac; \

20006

done; \

20007

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu megaphone/data/Makefile'; \

20008

- cd $(top_srcdir) && \

20009

- $(AUTOMAKE) --gnu megaphone/data/Makefile

20010

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu megaphone/data/Makefile'; \

20011

+ $(am__cd) $(top_srcdir) && \

20012

+ $(AUTOMAKE) --gnu megaphone/data/Makefile

20013

.PRECIOUS: Makefile

20014

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

20015

@case '$?' in \

20016

@@ -342,6 +360,7 @@

20017

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

20018

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

20019

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

20020

+$(am__aclocal_m4_deps):

20021

20022

mostlyclean-libtool:

20023

-rm -f *.lo

20024

@@ -351,54 +370,63 @@

20025

install-resourcesDATA: $(resources_DATA)

20026

@$(NORMAL_INSTALL)

20027

test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"

20028

- @list='$(resources_DATA)'; for p in $$list; do \

20029

+ @list='$(resources_DATA)'; test -n "$(resourcesdir)" || list=; \

20030

+ for p in $$list; do \

20031

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

20032

- f=$(am__strip_dir) \

20033

- echo " $(resourcesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(resourcesdir)/$$f'"; \

20034

- $(resourcesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(resourcesdir)/$$f"; \

20035

+ echo "$$d$$p"; \

20036

+ done | $(am__base_list) | \

20037

+ while read files; do \

20038

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resourcesdir)'"; \

20039

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(resourcesdir)" || exit $$?; \

20040

done

20041

20042

uninstall-resourcesDATA:

20043

@$(NORMAL_UNINSTALL)

20044

- @list='$(resources_DATA)'; for p in $$list; do \

20045

- f=$(am__strip_dir) \

20046

- echo " rm -f '$(DESTDIR)$(resourcesdir)/$$f'"; \

20047

- rm -f "$(DESTDIR)$(resourcesdir)/$$f"; \

20048

- done

20049

+ @list='$(resources_DATA)'; test -n "$(resourcesdir)" || list=; \

20050

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

20051

+ test -n "$$files" || exit 0; \

20052

+ echo " ( cd '$(DESTDIR)$(resourcesdir)' && rm -f" $$files ")"; \

20053

+ cd "$(DESTDIR)$(resourcesdir)" && rm -f $$files

20054

install-schemaDATA: $(schema_DATA)

20055

@$(NORMAL_INSTALL)

20056

test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"

20057

- @list='$(schema_DATA)'; for p in $$list; do \

20058

+ @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \

20059

+ for p in $$list; do \

20060

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

20061

- f=$(am__strip_dir) \

20062

- echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \

20063

- $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \

20064

+ echo "$$d$$p"; \

20065

+ done | $(am__base_list) | \

20066

+ while read files; do \

20067

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \

20068

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \

20069

done

20070

20071

uninstall-schemaDATA:

20072

@$(NORMAL_UNINSTALL)

20073

- @list='$(schema_DATA)'; for p in $$list; do \

20074

- f=$(am__strip_dir) \

20075

- echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \

20076

- rm -f "$(DESTDIR)$(schemadir)/$$f"; \

20077

- done

20078

+ @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \

20079

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

20080

+ test -n "$$files" || exit 0; \

20081

+ echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \

20082

+ cd "$(DESTDIR)$(schemadir)" && rm -f $$files

20083

install-serverDATA: $(server_DATA)

20084

@$(NORMAL_INSTALL)

20085

test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"

20086

- @list='$(server_DATA)'; for p in $$list; do \

20087

+ @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \

20088

+ for p in $$list; do \

20089

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

20090

- f=$(am__strip_dir) \

20091

- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \

20092

- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \

20093

+ echo "$$d$$p"; \

20094

+ done | $(am__base_list) | \

20095

+ while read files; do \

20096

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(serverdir)'"; \

20097

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(serverdir)" || exit $$?; \

20098

done

20099

20100

uninstall-serverDATA:

20101

@$(NORMAL_UNINSTALL)

20102

- @list='$(server_DATA)'; for p in $$list; do \

20103

- f=$(am__strip_dir) \

20104

- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \

20105

- rm -f "$(DESTDIR)$(serverdir)/$$f"; \

20106

- done

20107

+ @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \

20108

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

20109

+ test -n "$$files" || exit 0; \

20110

+ echo " ( cd '$(DESTDIR)$(serverdir)' && rm -f" $$files ")"; \

20111

+ cd "$(DESTDIR)$(serverdir)" && rm -f $$files

20112

tags: TAGS

20113

TAGS:

20114

20115

@@ -422,13 +450,17 @@

20116

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

20117

if test -d $$d/$$file; then \

20118

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

20119

+ if test -d "$(distdir)/$$file"; then \

20120

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

20121

+ fi; \

20122

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

20123

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

20124

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

20125

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

20126

fi; \

20127

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

20128

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

20129

else \

20130

- test -f $(distdir)/$$file \

20131

- || cp -p $$d/$$file $(distdir)/$$file \

20132

+ test -f "$(distdir)/$$file" \

20133

+ || cp -p $$d/$$file "$(distdir)/$$file" \

20134

|| exit 1; \

20135

fi; \

20136

done

20137

@@ -459,6 +491,7 @@

20138

20139

distclean-generic:

20140

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

20141

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

20142

-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)

20143

20144

maintainer-clean-generic:

20145

@@ -478,6 +511,8 @@

20146

20147

html: html-am

20148

20149

+html-am:

20150

+

20151

info: info-am

20152

20153

info-am:

20154

@@ -487,18 +522,28 @@

20155

20156

install-dvi: install-dvi-am

20157

20158

+install-dvi-am:

20159

+

20160

install-exec-am:

20161

20162

install-html: install-html-am

20163

20164

+install-html-am:

20165

+

20166

install-info: install-info-am

20167

20168

+install-info-am:

20169

+

20170

install-man:

20171

20172

install-pdf: install-pdf-am

20173

20174

+install-pdf-am:

20175

+

20176

install-ps: install-ps-am

20177

20178

+install-ps-am:

20179

+

20180

installcheck-am:

20181

20182

maintainer-clean: maintainer-clean-am

20183

@@ -543,6 +588,7 @@

20184

20185

$(server_in_files): $(server_in_files:.server.in=.server.in.in)

20186

$(QUIET_GEN)sed -e "s|\@LIBEXECDIR\@|$(megaphonebindir)|" $< > $@

20187

+

20188

# Tell versions [3.59,3.63) of GNU make to not export all variables.

20189

# Otherwise a system limit (for SysV at least) may be exceeded.

20190

.NOEXPORT:

20191

20192

=== modified file 'megaphone/src/Makefile.in'

20193

--- megaphone/src/Makefile.in 2009-09-17 14:07:29 +0000

20194

+++ megaphone/src/Makefile.in 2009-09-17 14:14:16 +0000

20195

@@ -1,8 +1,9 @@

20196

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

20197

+# Makefile.in generated by automake 1.11 from Makefile.am.

20198

# @configure_input@

20199

20200

20201

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

20202

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

20203

+# Inc.

20204

# This Makefile.in is free software; the Free Software Foundation

20205

# gives unlimited permission to copy and/or distribute it,

20206

# with or without modifications, as long as this notice is preserved.

20207

@@ -16,8 +17,9 @@

20208

20209

VPATH = @srcdir@

20210

pkgdatadir = $(datadir)/@PACKAGE@

20211

+pkgincludedir = $(includedir)/@PACKAGE@

20212

pkglibdir = $(libdir)/@PACKAGE@

20213

-pkgincludedir = $(includedir)/@PACKAGE@

20214

+pkglibexecdir = $(libexecdir)/@PACKAGE@

20215

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

20216

install_sh_DATA = $(install_sh) -c -m 644

20217

install_sh_PROGRAM = $(install_sh) -c

20218

@@ -50,8 +52,8 @@

20219

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

20220

CONFIG_HEADER = $(top_builddir)/config.h

20221

CONFIG_CLEAN_FILES =

20222

+CONFIG_CLEAN_VPATH_FILES =

20223

am__installdirs = "$(DESTDIR)$(libexecdir)"

20224

-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

20225

PROGRAMS = $(libexec_PROGRAMS)

20226

am_megaphone_applet_OBJECTS = megaphone-applet.$(OBJEXT)

20227

megaphone_applet_OBJECTS = $(am_megaphone_applet_OBJECTS)

20228

@@ -64,6 +66,7 @@

20229

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

20230

depcomp = $(SHELL) $(top_srcdir)/depcomp

20231

am__depfiles_maybe = depfiles

20232

+am__mv = mv -f

20233

COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

20234

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

20235

LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

20236

@@ -140,6 +143,8 @@

20237

GTKDOC_CHECK = @GTKDOC_CHECK@

20238

HELP_DIR = @HELP_DIR@

20239

HTML_DIR = @HTML_DIR@

20240

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

20241

+INDICATE_LIBS = @INDICATE_LIBS@

20242

INSTALL = @INSTALL@

20243

INSTALL_DATA = @INSTALL_DATA@

20244

INSTALL_PROGRAM = @INSTALL_PROGRAM@

20245

@@ -200,6 +205,7 @@

20246

PACKAGE_NAME = @PACKAGE_NAME@

20247

PACKAGE_STRING = @PACKAGE_STRING@

20248

PACKAGE_TARNAME = @PACKAGE_TARNAME@

20249

+PACKAGE_URL = @PACKAGE_URL@

20250

PACKAGE_VERSION = @PACKAGE_VERSION@

20251

PATH_SEPARATOR = @PATH_SEPARATOR@

20252

PKG_CONFIG = @PKG_CONFIG@

20253

@@ -325,9 +331,9 @@

20254

exit 1;; \

20255

esac; \

20256

done; \

20257

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu megaphone/src/Makefile'; \

20258

- cd $(top_srcdir) && \

20259

- $(AUTOMAKE) --gnu megaphone/src/Makefile

20260

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu megaphone/src/Makefile'; \

20261

+ $(am__cd) $(top_srcdir) && \

20262

+ $(AUTOMAKE) --gnu megaphone/src/Makefile

20263

.PRECIOUS: Makefile

20264

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

20265

@case '$?' in \

20266

@@ -345,34 +351,50 @@

20267

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

20268

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

20269

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

20270

+$(am__aclocal_m4_deps):

20271

install-libexecPROGRAMS: $(libexec_PROGRAMS)

20272

@$(NORMAL_INSTALL)

20273

test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"

20274

- @list='$(libexec_PROGRAMS)'; for p in $$list; do \

20275

- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

20276

- if test -f $$p \

20277

- || test -f $$p1 \

20278

- ; then \

20279

- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

20280

- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \

20281

- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \

20282

- else :; fi; \

20283

- done

20284

+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \

20285

+ for p in $$list; do echo "$$p $$p"; done | \

20286

+ sed 's/$(EXEEXT)$$//' | \

20287

+ while read p p1; do if test -f $$p || test -f $$p1; \

20288

+ then echo "$$p"; echo "$$p"; else :; fi; \

20289

+ done | \

20290

+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \

20291

+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \

20292

+ sed 'N;N;N;s,\n, ,g' | \

20293

+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \

20294

+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

20295

+ if ($$2 == $$4) files[d] = files[d] " " $$1; \

20296

+ else { print "f", $$3 "/" $$4, $$1; } } \

20297

+ END { for (d in files) print "f", d, files[d] }' | \

20298

+ while read type dir files; do \

20299

+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

20300

+ test -z "$$files" || { \

20301

+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \

20302

+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \

20303

+ } \

20304

+ ; done

20305

20306

uninstall-libexecPROGRAMS:

20307

@$(NORMAL_UNINSTALL)

20308

- @list='$(libexec_PROGRAMS)'; for p in $$list; do \

20309

- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \

20310

- echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \

20311

- rm -f "$(DESTDIR)$(libexecdir)/$$f"; \

20312

- done

20313

+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \

20314

+ files=`for p in $$list; do echo "$$p"; done | \

20315

+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \

20316

+ -e 's/$$/$(EXEEXT)/' `; \

20317

+ test -n "$$list" || exit 0; \

20318

+ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \

20319

+ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files

20320

20321

clean-libexecPROGRAMS:

20322

- @list='$(libexec_PROGRAMS)'; for p in $$list; do \

20323

- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

20324

- echo " rm -f $$p $$f"; \

20325

- rm -f $$p $$f ; \

20326

- done

20327

+ @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \

20328

+ echo " rm -f" $$list; \

20329

+ rm -f $$list || exit $$?; \

20330

+ test -n "$(EXEEXT)" || exit 0; \

20331

+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \

20332

+ echo " rm -f" $$list; \

20333

+ rm -f $$list

20334

megaphone-applet$(EXEEXT): $(megaphone_applet_OBJECTS) $(megaphone_applet_DEPENDENCIES)

20335

@rm -f megaphone-applet$(EXEEXT)

20336

$(megaphone_applet_LINK) $(megaphone_applet_OBJECTS) $(megaphone_applet_LDADD) $(LIBS)

20337

@@ -387,21 +409,21 @@

20338

20339

.c.o:

20340

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

20341

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

20342

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

20343

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

20344

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20345

@am__fastdepCC_FALSE@ $(COMPILE) -c $<

20346

20347

.c.obj:

20348

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

20349

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

20350

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

20351

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

20352

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20353

@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

20354

20355

.c.lo:

20356

@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

20357

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

20358

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

20359

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

20360

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

20361

@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<

20362

@@ -424,7 +446,7 @@

20363

20364

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

20365

$(TAGS_FILES) $(LISP)

20366

- tags=; \

20367

+ set x; \

20368

here=`pwd`; \

20369

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

20370

unique=`for i in $$list; do \

20371

@@ -432,29 +454,34 @@

20372

done | \

20373

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

20374

END { if (nonempty) { for (i in files) print i; }; }'`; \

20375

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

20376

+ shift; \

20377

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

20378

test -n "$$unique" || unique=$$empty_fix; \

20379

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

20380

- $$tags $$unique; \

20381

+ if test $$# -gt 0; then \

20382

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

20383

+ "$$@" $$unique; \

20384

+ else \

20385

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

20386

+ $$unique; \

20387

+ fi; \

20388

fi

20389

ctags: CTAGS

20390

CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

20391

$(TAGS_FILES) $(LISP)

20392

- tags=; \

20393

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

20394

unique=`for i in $$list; do \

20395

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

20396

done | \

20397

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

20398

END { if (nonempty) { for (i in files) print i; }; }'`; \

20399

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

20400

+ test -z "$(CTAGS_ARGS)$$unique" \

20401

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

20402

- $$tags $$unique

20403

+ $$unique

20404

20405

GTAGS:

20406

here=`$(am__cd) $(top_builddir) && pwd` \

20407

- && cd $(top_srcdir) \

20408

- && gtags -i $(GTAGS_ARGS) $$here

20409

+ && $(am__cd) $(top_srcdir) \

20410

+ && gtags -i $(GTAGS_ARGS) "$$here"

20411

20412

distclean-tags:

20413

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

20414

@@ -475,13 +502,17 @@

20415

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

20416

if test -d $$d/$$file; then \

20417

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

20418

+ if test -d "$(distdir)/$$file"; then \

20419

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

20420

+ fi; \

20421

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

20422

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

20423

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

20424

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

20425

fi; \

20426

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

20427

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

20428

else \

20429

- test -f $(distdir)/$$file \

20430

- || cp -p $$d/$$file $(distdir)/$$file \

20431

+ test -f "$(distdir)/$$file" \

20432

+ || cp -p $$d/$$file "$(distdir)/$$file" \

20433

|| exit 1; \

20434

fi; \

20435

done

20436

@@ -512,6 +543,7 @@

20437

20438

distclean-generic:

20439

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

20440

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

20441

20442

maintainer-clean-generic:

20443

@echo "This command is intended for maintainers to use"

20444

@@ -533,6 +565,8 @@

20445

20446

html: html-am

20447

20448

+html-am:

20449

+

20450

info: info-am

20451

20452

info-am:

20453

@@ -541,18 +575,28 @@

20454

20455

install-dvi: install-dvi-am

20456

20457

+install-dvi-am:

20458

+

20459

install-exec-am: install-libexecPROGRAMS

20460

20461

install-html: install-html-am

20462

20463

+install-html-am:

20464

+

20465

install-info: install-info-am

20466

20467

+install-info-am:

20468

+

20469

install-man:

20470

20471

install-pdf: install-pdf-am

20472

20473

+install-pdf-am:

20474

+

20475

install-ps: install-ps-am

20476

20477

+install-ps-am:

20478

+

20479

installcheck-am:

20480

20481

maintainer-clean: maintainer-clean-am

20482

@@ -591,6 +635,7 @@

20483

mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \

20484

tags uninstall uninstall-am uninstall-libexecPROGRAMS

20485

20486

+

20487

# Tell versions [3.59,3.63) of GNU make to not export all variables.

20488

# Otherwise a system limit (for SysV at least) may be exceeded.

20489

.NOEXPORT:

20490

20491

=== modified file 'missing'

20492

--- missing 2009-09-17 14:07:29 +0000

20493

+++ missing 2009-09-17 14:14:15 +0000

20494

@@ -1,10 +1,10 @@

20495

#! /bin/sh

20496

# Common stub for a few missing GNU programs while installing.

20497

20498

-scriptversion=2006-05-10.23

20499

+scriptversion=2009-04-28.21; # UTC

20500

20501

20502

-# Free Software Foundation, Inc.

20503

20504

+# 2008, 2009 Free Software Foundation, Inc.

20505

# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.

20506

20507

# This program is free software; you can redistribute it and/or modify

20508

@@ -18,9 +18,7 @@

20509

# GNU General Public License for more details.

20510

20511

# You should have received a copy of the GNU General Public License

20512

-# along with this program; if not, write to the Free Software

20513

-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

20514

-# 02110-1301, USA.

20515

+# along with this program. If not, see <http://www.gnu.org/licenses/>.

20516

20517

# As a special exception to the GNU General Public License, if you

20518

# distribute this file as part of a program that contains a

20519

@@ -89,6 +87,9 @@

20520

tar try tar, gnutar, gtar, then tar without non-portable flags

20521

yacc create \`y.tab.[ch]', if possible, from existing .[ch]

20522

20523

+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and

20524

+\`g' are ignored when checking the name.

20525

+

20526

Send bug reports to <bug-automake@gnu.org>."

20527

exit $?

20528

;;

20529

@@ -106,15 +107,22 @@

20530

20531

esac

20532

20533

+# normalize program name to check for.

20534

+program=`echo "$1" | sed '

20535

+ s/^gnu-//; t

20536

+ s/^gnu//; t

20537

+ s/^g//; t'`

20538

+

20539

# Now exit if we have it, but it failed. Also exit now if we

20540

# don't have it and --version was passed (most likely to detect

20541

-# the program).

20542

+# the program). This is about non-GNU programs, so use $1 not

20543

+# $program.

20544

case $1 in

20545

- lex|yacc)

20546

+ lex*|yacc*)

20547

# Not GNU programs, they don't have --version.

20548

;;

20549

20550

- tar)

20551

+ tar*)

20552

if test -n "$run"; then

20553

echo 1>&2 "ERROR: \`tar' requires --run"

20554

exit 1

20555

@@ -138,7 +146,7 @@

20556

20557

# If it does not exist, or fails to run (possibly an outdated version),

20558

# try to emulate it.

20559

-case $1 in

20560

+case $program in

20561

aclocal*)

20562

echo 1>&2 "\

20563

WARNING: \`$1' is $msg. You should only need it if

20564

@@ -148,7 +156,7 @@

20565

touch aclocal.m4

20566

;;

20567

20568

- autoconf)

20569

+ autoconf*)

20570

echo 1>&2 "\

20571

WARNING: \`$1' is $msg. You should only need it if

20572

you modified \`${configure_ac}'. You might want to install the

20573

@@ -157,7 +165,7 @@

20574

touch configure

20575

;;

20576

20577

- autoheader)

20578

+ autoheader*)

20579

echo 1>&2 "\

20580

WARNING: \`$1' is $msg. You should only need it if

20581

you modified \`acconfig.h' or \`${configure_ac}'. You might want

20582

@@ -187,7 +195,7 @@

20583

while read f; do touch "$f"; done

20584

;;

20585

20586

- autom4te)

20587

+ autom4te*)

20588

echo 1>&2 "\

20589

WARNING: \`$1' is needed, but is $msg.

20590

You might have modified some files without having the

20591

@@ -210,7 +218,7 @@

20592

fi

20593

;;

20594

20595

- bison|yacc)

20596

+ bison*|yacc*)

20597

echo 1>&2 "\

20598

WARNING: \`$1' $msg. You should only need it if

20599

you modified a \`.y' file. You may need the \`Bison' package

20600

@@ -240,7 +248,7 @@

20601

fi

20602

;;

20603

20604

- lex|flex)

20605

+ lex*|flex*)

20606

echo 1>&2 "\

20607

WARNING: \`$1' is $msg. You should only need it if

20608

you modified a \`.l' file. You may need the \`Flex' package

20609

@@ -263,7 +271,7 @@

20610

fi

20611

;;

20612

20613

- help2man)

20614

+ help2man*)

20615

echo 1>&2 "\

20616

WARNING: \`$1' is $msg. You should only need it if

20617

you modified a dependency of a manual page. You may need the

20618

@@ -277,11 +285,11 @@

20619

else

20620

test -z "$file" || exec >$file

20621

echo ".ab help2man is required to generate this page"

20622

- exit 1

20623

+ exit $?

20624

fi

20625

;;

20626

20627

- makeinfo)

20628

+ makeinfo*)

20629

echo 1>&2 "\

20630

WARNING: \`$1' is $msg. You should only need it if

20631

you modified a \`.texi' or \`.texinfo' file, or any other file

20632

@@ -310,7 +318,7 @@

20633

touch $file

20634

;;

20635

20636

- tar)

20637

+ tar*)

20638

shift

20639

20640

# We have already tried tar in the generic part.

20641

@@ -363,5 +371,6 @@

20642

# eval: (add-hook 'write-file-hooks 'time-stamp)

20643

# time-stamp-start: "scriptversion="

20644

# time-stamp-format: "%:y-%02m-%02d.%02H"

20645

-# time-stamp-end: "$"

20646

+# time-stamp-time-zone: "UTC"

20647

+# time-stamp-end: "; # UTC"

20648

# End:

20649

20650

=== modified file 'mkinstalldirs'

20651

--- mkinstalldirs 2009-09-17 14:07:29 +0000

20652

+++ mkinstalldirs 2009-09-17 14:14:17 +0000

20653

@@ -1,7 +1,7 @@

20654

#! /bin/sh

20655

# mkinstalldirs --- make directory hierarchy

20656

20657

-scriptversion=2006-05-11.19

20658

+scriptversion=2009-04-28.21; # UTC

20659

20660

# Original author: Noah Friedman <friedman@prep.ai.mit.edu>

20661

# Created: 1993-05-16

20662

@@ -157,5 +157,6 @@

20663

# eval: (add-hook 'write-file-hooks 'time-stamp)

20664

# time-stamp-start: "scriptversion="

20665

# time-stamp-format: "%:y-%02m-%02d.%02H"

20666

-# time-stamp-end: "$"

20667

+# time-stamp-time-zone: "UTC"

20668

+# time-stamp-end: "; # UTC"

20669

# End:

20670

20671

=== modified file 'nothere/Makefile.in'

20672

--- nothere/Makefile.in 2009-09-17 14:07:29 +0000

20673

+++ nothere/Makefile.in 2009-09-17 14:14:16 +0000

20674

@@ -1,8 +1,9 @@

20675

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

20676

+# Makefile.in generated by automake 1.11 from Makefile.am.

20677

# @configure_input@

20678

20679

20680

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

20681

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

20682

+# Inc.

20683

# This Makefile.in is free software; the Free Software Foundation

20684

# gives unlimited permission to copy and/or distribute it,

20685

# with or without modifications, as long as this notice is preserved.

20686

@@ -15,8 +16,9 @@

20687

@SET_MAKE@

20688

VPATH = @srcdir@

20689

pkgdatadir = $(datadir)/@PACKAGE@

20690

+pkgincludedir = $(includedir)/@PACKAGE@

20691

pkglibdir = $(libdir)/@PACKAGE@

20692

-pkgincludedir = $(includedir)/@PACKAGE@

20693

+pkglibexecdir = $(libexecdir)/@PACKAGE@

20694

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

20695

install_sh_DATA = $(install_sh) -c -m 644

20696

install_sh_PROGRAM = $(install_sh) -c

20697

@@ -48,6 +50,7 @@

20698

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

20699

CONFIG_HEADER = $(top_builddir)/config.h

20700

CONFIG_CLEAN_FILES =

20701

+CONFIG_CLEAN_VPATH_FILES =

20702

SOURCES =

20703

DIST_SOURCES =

20704

RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

20705

@@ -59,10 +62,38 @@

20706

ps-recursive uninstall-recursive

20707

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

20708

distclean-recursive maintainer-clean-recursive

20709

+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

20710

+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

20711

+ distdir

20712

ETAGS = etags

20713

CTAGS = ctags

20714

DIST_SUBDIRS = $(SUBDIRS)

20715

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

20716

+am__relativize = \

20717

+ dir0=`pwd`; \

20718

+ sed_first='s,^$[^/]*$/.*$$,\1,'; \

20719

+ sed_rest='s,^[^/]*/*,,'; \

20720

+ sed_last='s,^.*/$[^/]*$$$,\1,'; \

20721

+ sed_butlast='s,/*[^/]*$$,,'; \

20722

+ while test -n "$$dir1"; do \

20723

+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \

20724

+ if test "$$first" != "."; then \

20725

+ if test "$$first" = ".."; then \

20726

+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

20727

+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

20728

+ else \

20729

+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

20730

+ if test "$$first2" = "$$first"; then \

20731

+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

20732

+ else \

20733

+ dir2="../$$dir2"; \

20734

+ fi; \

20735

+ dir0="$$dir0"/"$$first"; \

20736

+ fi; \

20737

+ fi; \

20738

+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

20739

+ done; \

20740

+ reldir="$$dir2"

20741

ACLOCAL = @ACLOCAL@

20742

ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@

20743

ALL_LINGUAS = @ALL_LINGUAS@

20744

@@ -125,6 +156,8 @@

20745

GTKDOC_CHECK = @GTKDOC_CHECK@

20746

HELP_DIR = @HELP_DIR@

20747

HTML_DIR = @HTML_DIR@

20748

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

20749

+INDICATE_LIBS = @INDICATE_LIBS@

20750

INSTALL = @INSTALL@

20751

INSTALL_DATA = @INSTALL_DATA@

20752

INSTALL_PROGRAM = @INSTALL_PROGRAM@

20753

@@ -185,6 +218,7 @@

20754

PACKAGE_NAME = @PACKAGE_NAME@

20755

PACKAGE_STRING = @PACKAGE_STRING@

20756

PACKAGE_TARNAME = @PACKAGE_TARNAME@

20757

+PACKAGE_URL = @PACKAGE_URL@

20758

PACKAGE_VERSION = @PACKAGE_VERSION@

20759

PATH_SEPARATOR = @PATH_SEPARATOR@

20760

PKG_CONFIG = @PKG_CONFIG@

20761

@@ -293,9 +327,9 @@

20762

exit 1;; \

20763

esac; \

20764

done; \

20765

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu nothere/Makefile'; \

20766

- cd $(top_srcdir) && \

20767

- $(AUTOMAKE) --gnu nothere/Makefile

20768

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu nothere/Makefile'; \

20769

+ $(am__cd) $(top_srcdir) && \

20770

+ $(AUTOMAKE) --gnu nothere/Makefile

20771

.PRECIOUS: Makefile

20772

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

20773

@case '$?' in \

20774

@@ -313,6 +347,7 @@

20775

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

20776

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

20777

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

20778

+$(am__aclocal_m4_deps):

20779

20780

mostlyclean-libtool:

20781

-rm -f *.lo

20782

@@ -344,7 +379,7 @@

20783

else \

20784

local_target="$$target"; \

20785

fi; \

20786

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

20787

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

20788

|| eval $$failcom; \

20789

done; \

20790

if test "$$dot_seen" = "no"; then \

20791

@@ -378,16 +413,16 @@

20792

else \

20793

local_target="$$target"; \

20794

fi; \

20795

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

20796

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

20797

|| eval $$failcom; \

20798

done && test -z "$$fail"

20799

tags-recursive:

20800

list='$(SUBDIRS)'; for subdir in $$list; do \

20801

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

20802

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

20803

done

20804

ctags-recursive:

20805

list='$(SUBDIRS)'; for subdir in $$list; do \

20806

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

20807

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

20808

done

20809

20810

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

20811

@@ -402,7 +437,7 @@

20812

20813

TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

20814

$(TAGS_FILES) $(LISP)

20815

- tags=; \

20816

+ set x; \

20817

here=`pwd`; \

20818

if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

20819

include_option=--etags-include; \

20820

@@ -414,7 +449,7 @@

20821

list='$(SUBDIRS)'; for subdir in $$list; do \

20822

if test "$$subdir" = .; then :; else \

20823

test ! -f $$subdir/TAGS || \

20824

- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

20825

+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

20826

fi; \

20827

done; \

20828

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

20829

@@ -423,29 +458,34 @@

20830

done | \

20831

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

20832

END { if (nonempty) { for (i in files) print i; }; }'`; \

20833

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

20834

+ shift; \

20835

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

20836

test -n "$$unique" || unique=$$empty_fix; \

20837

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

20838

- $$tags $$unique; \

20839

+ if test $$# -gt 0; then \

20840

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

20841

+ "$$@" $$unique; \

20842

+ else \

20843

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

20844

+ $$unique; \

20845

+ fi; \

20846

fi

20847

ctags: CTAGS

20848

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

20849

$(TAGS_FILES) $(LISP)

20850

- tags=; \

20851

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

20852

unique=`for i in $$list; do \

20853

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

20854

done | \

20855

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

20856

END { if (nonempty) { for (i in files) print i; }; }'`; \

20857

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

20858

+ test -z "$(CTAGS_ARGS)$$unique" \

20859

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

20860

- $$tags $$unique

20861

+ $$unique

20862

20863

GTAGS:

20864

here=`$(am__cd) $(top_builddir) && pwd` \

20865

- && cd $(top_srcdir) \

20866

- && gtags -i $(GTAGS_ARGS) $$here

20867

+ && $(am__cd) $(top_srcdir) \

20868

+ && gtags -i $(GTAGS_ARGS) "$$here"

20869

20870

distclean-tags:

20871

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

20872

@@ -466,29 +506,44 @@

20873

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

20874

if test -d $$d/$$file; then \

20875

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

20876

+ if test -d "$(distdir)/$$file"; then \

20877

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

20878

+ fi; \

20879

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

20880

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

20881

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

20882

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

20883

fi; \

20884

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

20885

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

20886

else \

20887

- test -f $(distdir)/$$file \

20888

- || cp -p $$d/$$file $(distdir)/$$file \

20889

+ test -f "$(distdir)/$$file" \

20890

+ || cp -p $$d/$$file "$(distdir)/$$file" \

20891

|| exit 1; \

20892

fi; \

20893

done

20894

- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

20895

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

20896

if test "$$subdir" = .; then :; else \

20897

test -d "$(distdir)/$$subdir" \

20898

|| $(MKDIR_P) "$(distdir)/$$subdir" \

20899

|| exit 1; \

20900

- distdir=`$(am__cd) $(distdir) && pwd`; \

20901

- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

20902

- (cd $$subdir && \

20903

+ fi; \

20904

+ done

20905

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

20906

+ if test "$$subdir" = .; then :; else \

20907

+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

20908

+ $(am__relativize); \

20909

+ new_distdir=$$reldir; \

20910

+ dir1=$$subdir; dir2="$(top_distdir)"; \

20911

+ $(am__relativize); \

20912

+ new_top_distdir=$$reldir; \

20913

+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

20914

+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

20915

+ ($(am__cd) $$subdir && \

20916

$(MAKE) $(AM_MAKEFLAGS) \

20917

- top_distdir="$$top_distdir" \

20918

- distdir="$$distdir/$$subdir" \

20919

+ top_distdir="$$new_top_distdir" \

20920

+ distdir="$$new_distdir" \

20921

am__remove_distdir=: \

20922

am__skip_length_check=: \

20923

+ am__skip_mode_fix=: \

20924

distdir) \

20925

|| exit 1; \

20926

fi; \

20927

@@ -518,6 +573,7 @@

20928

20929

distclean-generic:

20930

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

20931

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

20932

20933

maintainer-clean-generic:

20934

@echo "This command is intended for maintainers to use"

20935

@@ -536,6 +592,8 @@

20936

20937

html: html-recursive

20938

20939

+html-am:

20940

+

20941

info: info-recursive

20942

20943

info-am:

20944

@@ -544,18 +602,28 @@

20945

20946

install-dvi: install-dvi-recursive

20947

20948

+install-dvi-am:

20949

+

20950

install-exec-am:

20951

20952

install-html: install-html-recursive

20953

20954

+install-html-am:

20955

+

20956

install-info: install-info-recursive

20957

20958

+install-info-am:

20959

+

20960

install-man:

20961

20962

install-pdf: install-pdf-recursive

20963

20964

+install-pdf-am:

20965

+

20966

install-ps: install-ps-recursive

20967

20968

+install-ps-am:

20969

+

20970

installcheck-am:

20971

20972

maintainer-clean: maintainer-clean-recursive

20973

@@ -576,8 +644,8 @@

20974

20975

uninstall-am:

20976

20977

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

20978

- install-strip

20979

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \

20980

+ install-am install-strip tags-recursive

20981

20982

.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

20983

all all-am check check-am clean clean-generic clean-libtool \

20984

@@ -593,6 +661,7 @@

20985

mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \

20986

uninstall uninstall-am

20987

20988

+

20989

# Tell versions [3.59,3.63) of GNU make to not export all variables.

20990

# Otherwise a system limit (for SysV at least) may be exceeded.

20991

.NOEXPORT:

20992

20993

=== modified file 'nothere/data/Makefile.in'

20994

--- nothere/data/Makefile.in 2009-09-17 14:07:29 +0000

20995

+++ nothere/data/Makefile.in 2009-09-17 14:14:16 +0000

20996

@@ -1,8 +1,9 @@

20997

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

20998

+# Makefile.in generated by automake 1.11 from Makefile.am.

20999

# @configure_input@

21000

21001

21002

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

21003

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

21004

+# Inc.

21005

# This Makefile.in is free software; the Free Software Foundation

21006

# gives unlimited permission to copy and/or distribute it,

21007

# with or without modifications, as long as this notice is preserved.

21008

@@ -16,8 +17,9 @@

21009

21010

VPATH = @srcdir@

21011

pkgdatadir = $(datadir)/@PACKAGE@

21012

+pkgincludedir = $(includedir)/@PACKAGE@

21013

pkglibdir = $(libdir)/@PACKAGE@

21014

-pkgincludedir = $(includedir)/@PACKAGE@

21015

+pkglibexecdir = $(libexecdir)/@PACKAGE@

21016

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

21017

install_sh_DATA = $(install_sh) -c -m 644

21018

install_sh_PROGRAM = $(install_sh) -c

21019

@@ -50,6 +52,7 @@

21020

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

21021

CONFIG_HEADER = $(top_builddir)/config.h

21022

CONFIG_CLEAN_FILES =

21023

+CONFIG_CLEAN_VPATH_FILES =

21024

SOURCES =

21025

DIST_SOURCES =

21026

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

21027

@@ -57,10 +60,23 @@

21028

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

21029

*) f=$$p;; \

21030

esac;

21031

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

21032

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

21033

+am__install_max = 40

21034

+am__nobase_strip_setup = \

21035

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

21036

+am__nobase_strip = \

21037

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

21038

+am__nobase_list = $(am__nobase_strip_setup); \

21039

+ for p in $$list; do echo "$$p $$p"; done | \

21040

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

21041

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

21042

+ if (++n[$$2] == $(am__install_max)) \

21043

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

21044

+ END { for (dir in files) print dir, files[dir] }'

21045

+am__base_list = \

21046

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

21047

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

21048

am__installdirs = "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(serverdir)"

21049

-resourcesDATA_INSTALL = $(INSTALL_DATA)

21050

-serverDATA_INSTALL = $(INSTALL_DATA)

21051

DATA = $(resources_DATA) $(server_DATA)

21052

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

21053

ACLOCAL = @ACLOCAL@

21054

@@ -125,6 +141,8 @@

21055

GTKDOC_CHECK = @GTKDOC_CHECK@

21056

HELP_DIR = @HELP_DIR@

21057

HTML_DIR = @HTML_DIR@

21058

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

21059

+INDICATE_LIBS = @INDICATE_LIBS@

21060

INSTALL = @INSTALL@

21061

INSTALL_DATA = @INSTALL_DATA@

21062

INSTALL_PROGRAM = @INSTALL_PROGRAM@

21063

@@ -185,6 +203,7 @@

21064

PACKAGE_NAME = @PACKAGE_NAME@

21065

PACKAGE_STRING = @PACKAGE_STRING@

21066

PACKAGE_TARNAME = @PACKAGE_TARNAME@

21067

+PACKAGE_URL = @PACKAGE_URL@

21068

PACKAGE_VERSION = @PACKAGE_VERSION@

21069

PATH_SEPARATOR = @PATH_SEPARATOR@

21070

PKG_CONFIG = @PKG_CONFIG@

21071

@@ -319,9 +338,9 @@

21072

exit 1;; \

21073

esac; \

21074

done; \

21075

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu nothere/data/Makefile'; \

21076

- cd $(top_srcdir) && \

21077

- $(AUTOMAKE) --gnu nothere/data/Makefile

21078

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu nothere/data/Makefile'; \

21079

+ $(am__cd) $(top_srcdir) && \

21080

+ $(AUTOMAKE) --gnu nothere/data/Makefile

21081

.PRECIOUS: Makefile

21082

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

21083

@case '$?' in \

21084

@@ -339,6 +358,7 @@

21085

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

21086

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

21087

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

21088

+$(am__aclocal_m4_deps):

21089

21090

mostlyclean-libtool:

21091

-rm -f *.lo

21092

@@ -348,37 +368,43 @@

21093

install-resourcesDATA: $(resources_DATA)

21094

@$(NORMAL_INSTALL)

21095

test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"

21096

- @list='$(resources_DATA)'; for p in $$list; do \

21097

+ @list='$(resources_DATA)'; test -n "$(resourcesdir)" || list=; \

21098

+ for p in $$list; do \

21099

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

21100

- f=$(am__strip_dir) \

21101

- echo " $(resourcesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(resourcesdir)/$$f'"; \

21102

- $(resourcesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(resourcesdir)/$$f"; \

21103

+ echo "$$d$$p"; \

21104

+ done | $(am__base_list) | \

21105

+ while read files; do \

21106

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resourcesdir)'"; \

21107

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(resourcesdir)" || exit $$?; \

21108

done

21109

21110

uninstall-resourcesDATA:

21111

@$(NORMAL_UNINSTALL)

21112

- @list='$(resources_DATA)'; for p in $$list; do \

21113

- f=$(am__strip_dir) \

21114

- echo " rm -f '$(DESTDIR)$(resourcesdir)/$$f'"; \

21115

- rm -f "$(DESTDIR)$(resourcesdir)/$$f"; \

21116

- done

21117

+ @list='$(resources_DATA)'; test -n "$(resourcesdir)" || list=; \

21118

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

21119

+ test -n "$$files" || exit 0; \

21120

+ echo " ( cd '$(DESTDIR)$(resourcesdir)' && rm -f" $$files ")"; \

21121

+ cd "$(DESTDIR)$(resourcesdir)" && rm -f $$files

21122

install-serverDATA: $(server_DATA)

21123

@$(NORMAL_INSTALL)

21124

test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"

21125

- @list='$(server_DATA)'; for p in $$list; do \

21126

+ @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \

21127

+ for p in $$list; do \

21128

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

21129

- f=$(am__strip_dir) \

21130

- echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \

21131

- $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \

21132

+ echo "$$d$$p"; \

21133

+ done | $(am__base_list) | \

21134

+ while read files; do \

21135

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(serverdir)'"; \

21136

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(serverdir)" || exit $$?; \

21137

done

21138

21139

uninstall-serverDATA:

21140

@$(NORMAL_UNINSTALL)

21141

- @list='$(server_DATA)'; for p in $$list; do \

21142

- f=$(am__strip_dir) \

21143

- echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \

21144

- rm -f "$(DESTDIR)$(serverdir)/$$f"; \

21145

- done

21146

+ @list='$(server_DATA)'; test -n "$(serverdir)" || list=; \

21147

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

21148

+ test -n "$$files" || exit 0; \

21149

+ echo " ( cd '$(DESTDIR)$(serverdir)' && rm -f" $$files ")"; \

21150

+ cd "$(DESTDIR)$(serverdir)" && rm -f $$files

21151

tags: TAGS

21152

TAGS:

21153

21154

@@ -402,13 +428,17 @@

21155

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

21156

if test -d $$d/$$file; then \

21157

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

21158

+ if test -d "$(distdir)/$$file"; then \

21159

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

21160

+ fi; \

21161

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

21162

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

21163

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

21164

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

21165

fi; \

21166

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

21167

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

21168

else \

21169

- test -f $(distdir)/$$file \

21170

- || cp -p $$d/$$file $(distdir)/$$file \

21171

+ test -f "$(distdir)/$$file" \

21172

+ || cp -p $$d/$$file "$(distdir)/$$file" \

21173

|| exit 1; \

21174

fi; \

21175

done

21176

@@ -439,6 +469,7 @@

21177

21178

distclean-generic:

21179

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

21180

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

21181

-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)

21182

21183

maintainer-clean-generic:

21184

@@ -458,6 +489,8 @@

21185

21186

html: html-am

21187

21188

+html-am:

21189

+

21190

info: info-am

21191

21192

info-am:

21193

@@ -466,18 +499,28 @@

21194

21195

install-dvi: install-dvi-am

21196

21197

+install-dvi-am:

21198

+

21199

install-exec-am:

21200

21201

install-html: install-html-am

21202

21203

+install-html-am:

21204

+

21205

install-info: install-info-am

21206

21207

+install-info-am:

21208

+

21209

install-man:

21210

21211

install-pdf: install-pdf-am

21212

21213

+install-pdf-am:

21214

+

21215

install-ps: install-ps-am

21216

21217

+install-ps-am:

21218

+

21219

installcheck-am:

21220

21221

maintainer-clean: maintainer-clean-am

21222

@@ -521,6 +564,7 @@

21223

$(server_in_files): $(server_in_files:.server.in=.server.in.in)

21224

$(QUIET_GEN)sed -e "s|\@LIBEXECDIR\@|$(notherebindir)|" $< > $@

21225

# $(schema_in_files)

21226

+

21227

# Tell versions [3.59,3.63) of GNU make to not export all variables.

21228

# Otherwise a system limit (for SysV at least) may be exceeded.

21229

.NOEXPORT:

21230

21231

=== modified file 'nothere/src/Makefile.in'

21232

--- nothere/src/Makefile.in 2009-09-17 14:07:29 +0000

21233

+++ nothere/src/Makefile.in 2009-09-17 14:14:17 +0000

21234

@@ -1,8 +1,9 @@

21235

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

21236

+# Makefile.in generated by automake 1.11 from Makefile.am.

21237

# @configure_input@

21238

21239

21240

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

21241

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

21242

+# Inc.

21243

# This Makefile.in is free software; the Free Software Foundation

21244

# gives unlimited permission to copy and/or distribute it,

21245

# with or without modifications, as long as this notice is preserved.

21246

@@ -16,8 +17,9 @@

21247

21248

VPATH = @srcdir@

21249

pkgdatadir = $(datadir)/@PACKAGE@

21250

+pkgincludedir = $(includedir)/@PACKAGE@

21251

pkglibdir = $(libdir)/@PACKAGE@

21252

-pkgincludedir = $(includedir)/@PACKAGE@

21253

+pkglibexecdir = $(libexecdir)/@PACKAGE@

21254

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

21255

install_sh_DATA = $(install_sh) -c -m 644

21256

install_sh_PROGRAM = $(install_sh) -c

21257

@@ -50,8 +52,8 @@

21258

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

21259

CONFIG_HEADER = $(top_builddir)/config.h

21260

CONFIG_CLEAN_FILES =

21261

+CONFIG_CLEAN_VPATH_FILES =

21262

am__installdirs = "$(DESTDIR)$(libexecdir)"

21263

-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

21264

PROGRAMS = $(libexec_PROGRAMS)

21265

am_nothere_applet_OBJECTS = nothere-applet.$(OBJEXT)

21266

nothere_applet_OBJECTS = $(am_nothere_applet_OBJECTS)

21267

@@ -64,6 +66,7 @@

21268

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

21269

depcomp = $(SHELL) $(top_srcdir)/depcomp

21270

am__depfiles_maybe = depfiles

21271

+am__mv = mv -f

21272

COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

21273

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

21274

LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

21275

@@ -140,6 +143,8 @@

21276

GTKDOC_CHECK = @GTKDOC_CHECK@

21277

HELP_DIR = @HELP_DIR@

21278

HTML_DIR = @HTML_DIR@

21279

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

21280

+INDICATE_LIBS = @INDICATE_LIBS@

21281

INSTALL = @INSTALL@

21282

INSTALL_DATA = @INSTALL_DATA@

21283

INSTALL_PROGRAM = @INSTALL_PROGRAM@

21284

@@ -200,6 +205,7 @@

21285

PACKAGE_NAME = @PACKAGE_NAME@

21286

PACKAGE_STRING = @PACKAGE_STRING@

21287

PACKAGE_TARNAME = @PACKAGE_TARNAME@

21288

+PACKAGE_URL = @PACKAGE_URL@

21289

PACKAGE_VERSION = @PACKAGE_VERSION@

21290

PATH_SEPARATOR = @PATH_SEPARATOR@

21291

PKG_CONFIG = @PKG_CONFIG@

21292

@@ -325,9 +331,9 @@

21293

exit 1;; \

21294

esac; \

21295

done; \

21296

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu nothere/src/Makefile'; \

21297

- cd $(top_srcdir) && \

21298

- $(AUTOMAKE) --gnu nothere/src/Makefile

21299

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu nothere/src/Makefile'; \

21300

+ $(am__cd) $(top_srcdir) && \

21301

+ $(AUTOMAKE) --gnu nothere/src/Makefile

21302

.PRECIOUS: Makefile

21303

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

21304

@case '$?' in \

21305

@@ -345,34 +351,50 @@

21306

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

21307

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

21308

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

21309

+$(am__aclocal_m4_deps):

21310

install-libexecPROGRAMS: $(libexec_PROGRAMS)

21311

@$(NORMAL_INSTALL)

21312

test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"

21313

- @list='$(libexec_PROGRAMS)'; for p in $$list; do \

21314

- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

21315

- if test -f $$p \

21316

- || test -f $$p1 \

21317

- ; then \

21318

- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

21319

- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \

21320

- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \

21321

- else :; fi; \

21322

- done

21323

+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \

21324

+ for p in $$list; do echo "$$p $$p"; done | \

21325

+ sed 's/$(EXEEXT)$$//' | \

21326

+ while read p p1; do if test -f $$p || test -f $$p1; \

21327

+ then echo "$$p"; echo "$$p"; else :; fi; \

21328

+ done | \

21329

+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \

21330

+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \

21331

+ sed 'N;N;N;s,\n, ,g' | \

21332

+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \

21333

+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

21334

+ if ($$2 == $$4) files[d] = files[d] " " $$1; \

21335

+ else { print "f", $$3 "/" $$4, $$1; } } \

21336

+ END { for (d in files) print "f", d, files[d] }' | \

21337

+ while read type dir files; do \

21338

+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

21339

+ test -z "$$files" || { \

21340

+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \

21341

+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \

21342

+ } \

21343

+ ; done

21344

21345

uninstall-libexecPROGRAMS:

21346

@$(NORMAL_UNINSTALL)

21347

- @list='$(libexec_PROGRAMS)'; for p in $$list; do \

21348

- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \

21349

- echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \

21350

- rm -f "$(DESTDIR)$(libexecdir)/$$f"; \

21351

- done

21352

+ @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \

21353

+ files=`for p in $$list; do echo "$$p"; done | \

21354

+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \

21355

+ -e 's/$$/$(EXEEXT)/' `; \

21356

+ test -n "$$list" || exit 0; \

21357

+ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \

21358

+ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files

21359

21360

clean-libexecPROGRAMS:

21361

- @list='$(libexec_PROGRAMS)'; for p in $$list; do \

21362

- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

21363

- echo " rm -f $$p $$f"; \

21364

- rm -f $$p $$f ; \

21365

- done

21366

+ @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \

21367

+ echo " rm -f" $$list; \

21368

+ rm -f $$list || exit $$?; \

21369

+ test -n "$(EXEEXT)" || exit 0; \

21370

+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \

21371

+ echo " rm -f" $$list; \

21372

+ rm -f $$list

21373

nothere-applet$(EXEEXT): $(nothere_applet_OBJECTS) $(nothere_applet_DEPENDENCIES)

21374

@rm -f nothere-applet$(EXEEXT)

21375

$(nothere_applet_LINK) $(nothere_applet_OBJECTS) $(nothere_applet_LDADD) $(LIBS)

21376

@@ -387,21 +409,21 @@

21377

21378

.c.o:

21379

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

21380

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

21381

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

21382

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

21383

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

21384

@am__fastdepCC_FALSE@ $(COMPILE) -c $<

21385

21386

.c.obj:

21387

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

21388

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

21389

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

21390

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

21391

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

21392

@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

21393

21394

.c.lo:

21395

@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

21396

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

21397

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

21398

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

21399

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

21400

@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<

21401

@@ -424,7 +446,7 @@

21402

21403

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

21404

$(TAGS_FILES) $(LISP)

21405

- tags=; \

21406

+ set x; \

21407

here=`pwd`; \

21408

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

21409

unique=`for i in $$list; do \

21410

@@ -432,29 +454,34 @@

21411

done | \

21412

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

21413

END { if (nonempty) { for (i in files) print i; }; }'`; \

21414

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

21415

+ shift; \

21416

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

21417

test -n "$$unique" || unique=$$empty_fix; \

21418

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

21419

- $$tags $$unique; \

21420

+ if test $$# -gt 0; then \

21421

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

21422

+ "$$@" $$unique; \

21423

+ else \

21424

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

21425

+ $$unique; \

21426

+ fi; \

21427

fi

21428

ctags: CTAGS

21429

CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

21430

$(TAGS_FILES) $(LISP)

21431

- tags=; \

21432

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

21433

unique=`for i in $$list; do \

21434

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

21435

done | \

21436

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

21437

END { if (nonempty) { for (i in files) print i; }; }'`; \

21438

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

21439

+ test -z "$(CTAGS_ARGS)$$unique" \

21440

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

21441

- $$tags $$unique

21442

+ $$unique

21443

21444

GTAGS:

21445

here=`$(am__cd) $(top_builddir) && pwd` \

21446

- && cd $(top_srcdir) \

21447

- && gtags -i $(GTAGS_ARGS) $$here

21448

+ && $(am__cd) $(top_srcdir) \

21449

+ && gtags -i $(GTAGS_ARGS) "$$here"

21450

21451

distclean-tags:

21452

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

21453

@@ -475,13 +502,17 @@

21454

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

21455

if test -d $$d/$$file; then \

21456

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

21457

+ if test -d "$(distdir)/$$file"; then \

21458

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

21459

+ fi; \

21460

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

21461

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

21462

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

21463

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

21464

fi; \

21465

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

21466

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

21467

else \

21468

- test -f $(distdir)/$$file \

21469

- || cp -p $$d/$$file $(distdir)/$$file \

21470

+ test -f "$(distdir)/$$file" \

21471

+ || cp -p $$d/$$file "$(distdir)/$$file" \

21472

|| exit 1; \

21473

fi; \

21474

done

21475

@@ -512,6 +543,7 @@

21476

21477

distclean-generic:

21478

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

21479

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

21480

21481

maintainer-clean-generic:

21482

@echo "This command is intended for maintainers to use"

21483

@@ -533,6 +565,8 @@

21484

21485

html: html-am

21486

21487

+html-am:

21488

+

21489

info: info-am

21490

21491

info-am:

21492

@@ -541,18 +575,28 @@

21493

21494

install-dvi: install-dvi-am

21495

21496

+install-dvi-am:

21497

+

21498

install-exec-am: install-libexecPROGRAMS

21499

21500

install-html: install-html-am

21501

21502

+install-html-am:

21503

+

21504

install-info: install-info-am

21505

21506

+install-info-am:

21507

+

21508

install-man:

21509

21510

install-pdf: install-pdf-am

21511

21512

+install-pdf-am:

21513

+

21514

install-ps: install-ps-am

21515

21516

+install-ps-am:

21517

+

21518

installcheck-am:

21519

21520

maintainer-clean: maintainer-clean-am

21521

@@ -591,6 +635,7 @@

21522

mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \

21523

tags uninstall uninstall-am uninstall-libexecPROGRAMS

21524

21525

+

21526

# Tell versions [3.59,3.63) of GNU make to not export all variables.

21527

# Otherwise a system limit (for SysV at least) may be exceeded.

21528

.NOEXPORT:

21529

21530

=== modified file 'po/Makefile.in.in'

21531

--- po/Makefile.in.in 2009-09-17 14:07:29 +0000

21532

+++ po/Makefile.in.in 2009-09-17 14:14:11 +0000

21533

@@ -56,7 +56,7 @@

21534

21535

PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)

21536

21537

-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)

21538

+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)

21539

21540

USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)

21541

21542

21543

=== modified file 'python/Makefile.in'

21544

--- python/Makefile.in 2009-09-17 14:07:29 +0000

21545

+++ python/Makefile.in 2009-09-17 14:14:17 +0000

21546

@@ -1,8 +1,9 @@

21547

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

21548

+# Makefile.in generated by automake 1.11 from Makefile.am.

21549

# @configure_input@

21550

21551

21552

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

21553

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

21554

+# Inc.

21555

# This Makefile.in is free software; the Free Software Foundation

21556

# gives unlimited permission to copy and/or distribute it,

21557

# with or without modifications, as long as this notice is preserved.

21558

@@ -15,8 +16,9 @@

21559

@SET_MAKE@

21560

VPATH = @srcdir@

21561

pkgdatadir = $(datadir)/@PACKAGE@

21562

+pkgincludedir = $(includedir)/@PACKAGE@

21563

pkglibdir = $(libdir)/@PACKAGE@

21564

-pkgincludedir = $(includedir)/@PACKAGE@

21565

+pkglibexecdir = $(libexecdir)/@PACKAGE@

21566

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

21567

install_sh_DATA = $(install_sh) -c -m 644

21568

install_sh_PROGRAM = $(install_sh) -c

21569

@@ -48,6 +50,7 @@

21570

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

21571

CONFIG_HEADER = $(top_builddir)/config.h

21572

CONFIG_CLEAN_FILES =

21573

+CONFIG_CLEAN_VPATH_FILES =

21574

SOURCES =

21575

DIST_SOURCES =

21576

RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

21577

@@ -59,10 +62,38 @@

21578

ps-recursive uninstall-recursive

21579

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

21580

distclean-recursive maintainer-clean-recursive

21581

+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

21582

+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

21583

+ distdir

21584

ETAGS = etags

21585

CTAGS = ctags

21586

DIST_SUBDIRS = $(SUBDIRS)

21587

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

21588

+am__relativize = \

21589

+ dir0=`pwd`; \

21590

+ sed_first='s,^$[^/]*$/.*$$,\1,'; \

21591

+ sed_rest='s,^[^/]*/*,,'; \

21592

+ sed_last='s,^.*/$[^/]*$$$,\1,'; \

21593

+ sed_butlast='s,/*[^/]*$$,,'; \

21594

+ while test -n "$$dir1"; do \

21595

+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \

21596

+ if test "$$first" != "."; then \

21597

+ if test "$$first" = ".."; then \

21598

+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

21599

+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

21600

+ else \

21601

+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

21602

+ if test "$$first2" = "$$first"; then \

21603

+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

21604

+ else \

21605

+ dir2="../$$dir2"; \

21606

+ fi; \

21607

+ dir0="$$dir0"/"$$first"; \

21608

+ fi; \

21609

+ fi; \

21610

+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

21611

+ done; \

21612

+ reldir="$$dir2"

21613

ACLOCAL = @ACLOCAL@

21614

ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@

21615

ALL_LINGUAS = @ALL_LINGUAS@

21616

@@ -125,6 +156,8 @@

21617

GTKDOC_CHECK = @GTKDOC_CHECK@

21618

HELP_DIR = @HELP_DIR@

21619

HTML_DIR = @HTML_DIR@

21620

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

21621

+INDICATE_LIBS = @INDICATE_LIBS@

21622

INSTALL = @INSTALL@

21623

INSTALL_DATA = @INSTALL_DATA@

21624

INSTALL_PROGRAM = @INSTALL_PROGRAM@

21625

@@ -185,6 +218,7 @@

21626

PACKAGE_NAME = @PACKAGE_NAME@

21627

PACKAGE_STRING = @PACKAGE_STRING@

21628

PACKAGE_TARNAME = @PACKAGE_TARNAME@

21629

+PACKAGE_URL = @PACKAGE_URL@

21630

PACKAGE_VERSION = @PACKAGE_VERSION@

21631

PATH_SEPARATOR = @PATH_SEPARATOR@

21632

PKG_CONFIG = @PKG_CONFIG@

21633

@@ -293,9 +327,9 @@

21634

exit 1;; \

21635

esac; \

21636

done; \

21637

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/Makefile'; \

21638

- cd $(top_srcdir) && \

21639

- $(AUTOMAKE) --gnu python/Makefile

21640

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/Makefile'; \

21641

+ $(am__cd) $(top_srcdir) && \

21642

+ $(AUTOMAKE) --gnu python/Makefile

21643

.PRECIOUS: Makefile

21644

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

21645

@case '$?' in \

21646

@@ -313,6 +347,7 @@

21647

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

21648

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

21649

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

21650

+$(am__aclocal_m4_deps):

21651

21652

mostlyclean-libtool:

21653

-rm -f *.lo

21654

@@ -344,7 +379,7 @@

21655

else \

21656

local_target="$$target"; \

21657

fi; \

21658

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

21659

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

21660

|| eval $$failcom; \

21661

done; \

21662

if test "$$dot_seen" = "no"; then \

21663

@@ -378,16 +413,16 @@

21664

else \

21665

local_target="$$target"; \

21666

fi; \

21667

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

21668

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

21669

|| eval $$failcom; \

21670

done && test -z "$$fail"

21671

tags-recursive:

21672

list='$(SUBDIRS)'; for subdir in $$list; do \

21673

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

21674

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

21675

done

21676

ctags-recursive:

21677

list='$(SUBDIRS)'; for subdir in $$list; do \

21678

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

21679

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

21680

done

21681

21682

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

21683

@@ -402,7 +437,7 @@

21684

21685

TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

21686

$(TAGS_FILES) $(LISP)

21687

- tags=; \

21688

+ set x; \

21689

here=`pwd`; \

21690

if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

21691

include_option=--etags-include; \

21692

@@ -414,7 +449,7 @@

21693

list='$(SUBDIRS)'; for subdir in $$list; do \

21694

if test "$$subdir" = .; then :; else \

21695

test ! -f $$subdir/TAGS || \

21696

- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

21697

+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

21698

fi; \

21699

done; \

21700

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

21701

@@ -423,29 +458,34 @@

21702

done | \

21703

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

21704

END { if (nonempty) { for (i in files) print i; }; }'`; \

21705

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

21706

+ shift; \

21707

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

21708

test -n "$$unique" || unique=$$empty_fix; \

21709

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

21710

- $$tags $$unique; \

21711

+ if test $$# -gt 0; then \

21712

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

21713

+ "$$@" $$unique; \

21714

+ else \

21715

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

21716

+ $$unique; \

21717

+ fi; \

21718

fi

21719

ctags: CTAGS

21720

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

21721

$(TAGS_FILES) $(LISP)

21722

- tags=; \

21723

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

21724

unique=`for i in $$list; do \

21725

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

21726

done | \

21727

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

21728

END { if (nonempty) { for (i in files) print i; }; }'`; \

21729

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

21730

+ test -z "$(CTAGS_ARGS)$$unique" \

21731

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

21732

- $$tags $$unique

21733

+ $$unique

21734

21735

GTAGS:

21736

here=`$(am__cd) $(top_builddir) && pwd` \

21737

- && cd $(top_srcdir) \

21738

- && gtags -i $(GTAGS_ARGS) $$here

21739

+ && $(am__cd) $(top_srcdir) \

21740

+ && gtags -i $(GTAGS_ARGS) "$$here"

21741

21742

distclean-tags:

21743

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

21744

@@ -466,29 +506,44 @@

21745

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

21746

if test -d $$d/$$file; then \

21747

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

21748

+ if test -d "$(distdir)/$$file"; then \

21749

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

21750

+ fi; \

21751

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

21752

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

21753

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

21754

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

21755

fi; \

21756

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

21757

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

21758

else \

21759

- test -f $(distdir)/$$file \

21760

- || cp -p $$d/$$file $(distdir)/$$file \

21761

+ test -f "$(distdir)/$$file" \

21762

+ || cp -p $$d/$$file "$(distdir)/$$file" \

21763

|| exit 1; \

21764

fi; \

21765

done

21766

- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

21767

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

21768

if test "$$subdir" = .; then :; else \

21769

test -d "$(distdir)/$$subdir" \

21770

|| $(MKDIR_P) "$(distdir)/$$subdir" \

21771

|| exit 1; \

21772

- distdir=`$(am__cd) $(distdir) && pwd`; \

21773

- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

21774

- (cd $$subdir && \

21775

+ fi; \

21776

+ done

21777

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

21778

+ if test "$$subdir" = .; then :; else \

21779

+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

21780

+ $(am__relativize); \

21781

+ new_distdir=$$reldir; \

21782

+ dir1=$$subdir; dir2="$(top_distdir)"; \

21783

+ $(am__relativize); \

21784

+ new_top_distdir=$$reldir; \

21785

+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

21786

+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

21787

+ ($(am__cd) $$subdir && \

21788

$(MAKE) $(AM_MAKEFLAGS) \

21789

- top_distdir="$$top_distdir" \

21790

- distdir="$$distdir/$$subdir" \

21791

+ top_distdir="$$new_top_distdir" \

21792

+ distdir="$$new_distdir" \

21793

am__remove_distdir=: \

21794

am__skip_length_check=: \

21795

+ am__skip_mode_fix=: \

21796

distdir) \

21797

|| exit 1; \

21798

fi; \

21799

@@ -518,6 +573,7 @@

21800

21801

distclean-generic:

21802

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

21803

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

21804

21805

maintainer-clean-generic:

21806

@echo "This command is intended for maintainers to use"

21807

@@ -536,6 +592,8 @@

21808

21809

html: html-recursive

21810

21811

+html-am:

21812

+

21813

info: info-recursive

21814

21815

info-am:

21816

@@ -544,18 +602,28 @@

21817

21818

install-dvi: install-dvi-recursive

21819

21820

+install-dvi-am:

21821

+

21822

install-exec-am:

21823

21824

install-html: install-html-recursive

21825

21826

+install-html-am:

21827

+

21828

install-info: install-info-recursive

21829

21830

+install-info-am:

21831

+

21832

install-man:

21833

21834

install-pdf: install-pdf-recursive

21835

21836

+install-pdf-am:

21837

+

21838

install-ps: install-ps-recursive

21839

21840

+install-ps-am:

21841

+

21842

installcheck-am:

21843

21844

maintainer-clean: maintainer-clean-recursive

21845

@@ -576,8 +644,8 @@

21846

21847

uninstall-am:

21848

21849

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

21850

- install-strip

21851

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \

21852

+ install-am install-strip tags-recursive

21853

21854

.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

21855

all all-am check check-am clean clean-generic clean-libtool \

21856

@@ -593,6 +661,7 @@

21857

mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \

21858

uninstall uninstall-am

21859

21860

+

21861

# Tell versions [3.59,3.63) of GNU make to not export all variables.

21862

# Otherwise a system limit (for SysV at least) may be exceeded.

21863

.NOEXPORT:

21864

21865

=== modified file 'python/pyempathy/Makefile.in'

21866

--- python/pyempathy/Makefile.in 2009-09-17 14:07:29 +0000

21867

+++ python/pyempathy/Makefile.in 2009-09-17 14:14:17 +0000

21868

@@ -1,8 +1,9 @@

21869

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

21870

+# Makefile.in generated by automake 1.11 from Makefile.am.

21871

# @configure_input@

21872

21873

21874

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

21875

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

21876

+# Inc.

21877

# This Makefile.in is free software; the Free Software Foundation

21878

# gives unlimited permission to copy and/or distribute it,

21879

# with or without modifications, as long as this notice is preserved.

21880

@@ -16,8 +17,9 @@

21881

21882

VPATH = @srcdir@

21883

pkgdatadir = $(datadir)/@PACKAGE@

21884

+pkgincludedir = $(includedir)/@PACKAGE@

21885

pkglibdir = $(libdir)/@PACKAGE@

21886

-pkgincludedir = $(includedir)/@PACKAGE@

21887

+pkglibexecdir = $(libexecdir)/@PACKAGE@

21888

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

21889

install_sh_DATA = $(install_sh) -c -m 644

21890

install_sh_PROGRAM = $(install_sh) -c

21891

@@ -50,14 +52,29 @@

21892

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

21893

CONFIG_HEADER = $(top_builddir)/config.h

21894

CONFIG_CLEAN_FILES =

21895

+CONFIG_CLEAN_VPATH_FILES =

21896

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

21897

am__vpath_adj = case $$p in \

21898

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

21899

*) f=$$p;; \

21900

esac;

21901

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

21902

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

21903

+am__install_max = 40

21904

+am__nobase_strip_setup = \

21905

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

21906

+am__nobase_strip = \

21907

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

21908

+am__nobase_list = $(am__nobase_strip_setup); \

21909

+ for p in $$list; do echo "$$p $$p"; done | \

21910

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

21911

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

21912

+ if (++n[$$2] == $(am__install_max)) \

21913

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

21914

+ END { for (dir in files) print dir, files[dir] }'

21915

+am__base_list = \

21916

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

21917

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

21918

am__installdirs = "$(DESTDIR)$(pyempathydir)"

21919

-pyempathyLTLIBRARIES_INSTALL = $(INSTALL)

21920

LTLIBRARIES = $(pyempathy_LTLIBRARIES)

21921

am__DEPENDENCIES_1 =

21922

empathy_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \

21923

@@ -72,6 +89,7 @@

21924

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

21925

depcomp = $(SHELL) $(top_srcdir)/depcomp

21926

am__depfiles_maybe = depfiles

21927

+am__mv = mv -f

21928

COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

21929

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

21930

LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

21931

@@ -148,6 +166,8 @@

21932

GTKDOC_CHECK = @GTKDOC_CHECK@

21933

HELP_DIR = @HELP_DIR@

21934

HTML_DIR = @HTML_DIR@

21935

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

21936

+INDICATE_LIBS = @INDICATE_LIBS@

21937

INSTALL = @INSTALL@

21938

INSTALL_DATA = @INSTALL_DATA@

21939

INSTALL_PROGRAM = @INSTALL_PROGRAM@

21940

@@ -208,6 +228,7 @@

21941

PACKAGE_NAME = @PACKAGE_NAME@

21942

PACKAGE_STRING = @PACKAGE_STRING@

21943

PACKAGE_TARNAME = @PACKAGE_TARNAME@

21944

+PACKAGE_URL = @PACKAGE_URL@

21945

PACKAGE_VERSION = @PACKAGE_VERSION@

21946

PATH_SEPARATOR = @PATH_SEPARATOR@

21947

PKG_CONFIG = @PKG_CONFIG@

21948

@@ -353,9 +374,9 @@

21949

exit 1;; \

21950

esac; \

21951

done; \

21952

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/pyempathy/Makefile'; \

21953

- cd $(top_srcdir) && \

21954

- $(AUTOMAKE) --gnu python/pyempathy/Makefile

21955

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/pyempathy/Makefile'; \

21956

+ $(am__cd) $(top_srcdir) && \

21957

+ $(AUTOMAKE) --gnu python/pyempathy/Makefile

21958

.PRECIOUS: Makefile

21959

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

21960

@case '$?' in \

21961

@@ -373,23 +394,28 @@

21962

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

21963

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

21964

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

21965

+$(am__aclocal_m4_deps):

21966

install-pyempathyLTLIBRARIES: $(pyempathy_LTLIBRARIES)

21967

@$(NORMAL_INSTALL)

21968

test -z "$(pyempathydir)" || $(MKDIR_P) "$(DESTDIR)$(pyempathydir)"

21969

- @list='$(pyempathy_LTLIBRARIES)'; for p in $$list; do \

21970

+ @list='$(pyempathy_LTLIBRARIES)'; test -n "$(pyempathydir)" || list=; \

21971

+ list2=; for p in $$list; do \

21972

if test -f $$p; then \

21973

- f=$(am__strip_dir) \

21974

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyempathyLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyempathydir)/$$f'"; \

21975

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyempathyLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyempathydir)/$$f"; \

21976

+ list2="$$list2 $$p"; \

21977

else :; fi; \

21978

- done

21979

+ done; \

21980

+ test -z "$$list2" || { \

21981

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pyempathydir)'"; \

21982

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pyempathydir)"; \

21983

+ }

21984

21985

uninstall-pyempathyLTLIBRARIES:

21986

@$(NORMAL_UNINSTALL)

21987

- @list='$(pyempathy_LTLIBRARIES)'; for p in $$list; do \

21988

- p=$(am__strip_dir) \

21989

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pyempathydir)/$$p'"; \

21990

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pyempathydir)/$$p"; \

21991

+ @list='$(pyempathy_LTLIBRARIES)'; test -n "$(pyempathydir)" || list=; \

21992

+ for p in $$list; do \

21993

+ $(am__strip_dir) \

21994

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pyempathydir)/$$f'"; \

21995

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pyempathydir)/$$f"; \

21996

done

21997

21998

clean-pyempathyLTLIBRARIES:

21999

@@ -414,21 +440,21 @@

22000

22001

.c.o:

22002

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

22003

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22004

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22005

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

22006

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22007

@am__fastdepCC_FALSE@ $(COMPILE) -c $<

22008

22009

.c.obj:

22010

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

22011

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22012

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22013

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

22014

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22015

@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

22016

22017

.c.lo:

22018

@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

22019

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

22020

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

22021

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

22022

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22023

@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<

22024

@@ -451,7 +477,7 @@

22025

22026

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

22027

$(TAGS_FILES) $(LISP)

22028

- tags=; \

22029

+ set x; \

22030

here=`pwd`; \

22031

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

22032

unique=`for i in $$list; do \

22033

@@ -459,29 +485,34 @@

22034

done | \

22035

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

22036

END { if (nonempty) { for (i in files) print i; }; }'`; \

22037

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

22038

+ shift; \

22039

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

22040

test -n "$$unique" || unique=$$empty_fix; \

22041

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22042

- $$tags $$unique; \

22043

+ if test $$# -gt 0; then \

22044

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22045

+ "$$@" $$unique; \

22046

+ else \

22047

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22048

+ $$unique; \

22049

+ fi; \

22050

fi

22051

ctags: CTAGS

22052

CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

22053

$(TAGS_FILES) $(LISP)

22054

- tags=; \

22055

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

22056

unique=`for i in $$list; do \

22057

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

22058

done | \

22059

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

22060

END { if (nonempty) { for (i in files) print i; }; }'`; \

22061

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

22062

+ test -z "$(CTAGS_ARGS)$$unique" \

22063

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

22064

- $$tags $$unique

22065

+ $$unique

22066

22067

GTAGS:

22068

here=`$(am__cd) $(top_builddir) && pwd` \

22069

- && cd $(top_srcdir) \

22070

- && gtags -i $(GTAGS_ARGS) $$here

22071

+ && $(am__cd) $(top_srcdir) \

22072

+ && gtags -i $(GTAGS_ARGS) "$$here"

22073

22074

distclean-tags:

22075

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

22076

@@ -502,13 +533,17 @@

22077

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

22078

if test -d $$d/$$file; then \

22079

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

22080

+ if test -d "$(distdir)/$$file"; then \

22081

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

22082

+ fi; \

22083

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

22084

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

22085

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

22086

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

22087

fi; \

22088

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

22089

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

22090

else \

22091

- test -f $(distdir)/$$file \

22092

- || cp -p $$d/$$file $(distdir)/$$file \

22093

+ test -f "$(distdir)/$$file" \

22094

+ || cp -p $$d/$$file "$(distdir)/$$file" \

22095

|| exit 1; \

22096

fi; \

22097

done

22098

@@ -542,6 +577,7 @@

22099

22100

distclean-generic:

22101

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

22102

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

22103

22104

maintainer-clean-generic:

22105

@echo "This command is intended for maintainers to use"

22106

@@ -564,6 +600,8 @@

22107

22108

html: html-am

22109

22110

+html-am:

22111

+

22112

info: info-am

22113

22114

info-am:

22115

@@ -572,18 +610,28 @@

22116

22117

install-dvi: install-dvi-am

22118

22119

+install-dvi-am:

22120

+

22121

install-exec-am:

22122

22123

install-html: install-html-am

22124

22125

+install-html-am:

22126

+

22127

install-info: install-info-am

22128

22129

+install-info-am:

22130

+

22131

install-man:

22132

22133

install-pdf: install-pdf-am

22134

22135

+install-pdf-am:

22136

+

22137

install-ps: install-ps-am

22138

22139

+install-ps-am:

22140

+

22141

installcheck-am:

22142

22143

maintainer-clean: maintainer-clean-am

22144

@@ -606,7 +654,7 @@

22145

22146

uninstall-am: uninstall-pyempathyLTLIBRARIES

22147

22148

-.MAKE: install-am install-strip

22149

+.MAKE: all check install install-am install-strip

22150

22151

.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \

22152

clean-libtool clean-pyempathyLTLIBRARIES ctags distclean \

22153

@@ -630,6 +678,7 @@

22154

--register $(PYDEFS)/gtk-types.defs \

22155

--override $(srcdir)/pyempathy.override \

22156

$(srcdir)/pyempathy.defs > $@

22157

+

22158

# Tell versions [3.59,3.63) of GNU make to not export all variables.

22159

# Otherwise a system limit (for SysV at least) may be exceeded.

22160

.NOEXPORT:

22161

22162

=== modified file 'python/pyempathygtk/Makefile.in'

22163

--- python/pyempathygtk/Makefile.in 2009-09-17 14:07:29 +0000

22164

+++ python/pyempathygtk/Makefile.in 2009-09-17 14:14:17 +0000

22165

@@ -1,8 +1,9 @@

22166

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

22167

+# Makefile.in generated by automake 1.11 from Makefile.am.

22168

# @configure_input@

22169

22170

22171

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

22172

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

22173

+# Inc.

22174

# This Makefile.in is free software; the Free Software Foundation

22175

# gives unlimited permission to copy and/or distribute it,

22176

# with or without modifications, as long as this notice is preserved.

22177

@@ -16,8 +17,9 @@

22178

22179

VPATH = @srcdir@

22180

pkgdatadir = $(datadir)/@PACKAGE@

22181

+pkgincludedir = $(includedir)/@PACKAGE@

22182

pkglibdir = $(libdir)/@PACKAGE@

22183

-pkgincludedir = $(includedir)/@PACKAGE@

22184

+pkglibexecdir = $(libexecdir)/@PACKAGE@

22185

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

22186

install_sh_DATA = $(install_sh) -c -m 644

22187

install_sh_PROGRAM = $(install_sh) -c

22188

@@ -50,14 +52,29 @@

22189

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

22190

CONFIG_HEADER = $(top_builddir)/config.h

22191

CONFIG_CLEAN_FILES =

22192

+CONFIG_CLEAN_VPATH_FILES =

22193

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

22194

am__vpath_adj = case $$p in \

22195

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

22196

*) f=$$p;; \

22197

esac;

22198

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

22199

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

22200

+am__install_max = 40

22201

+am__nobase_strip_setup = \

22202

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

22203

+am__nobase_strip = \

22204

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

22205

+am__nobase_list = $(am__nobase_strip_setup); \

22206

+ for p in $$list; do echo "$$p $$p"; done | \

22207

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

22208

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

22209

+ if (++n[$$2] == $(am__install_max)) \

22210

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

22211

+ END { for (dir in files) print dir, files[dir] }'

22212

+am__base_list = \

22213

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

22214

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

22215

am__installdirs = "$(DESTDIR)$(pyempathygtkdir)"

22216

-pyempathygtkLTLIBRARIES_INSTALL = $(INSTALL)

22217

LTLIBRARIES = $(pyempathygtk_LTLIBRARIES)

22218

am__DEPENDENCIES_1 =

22219

empathygtk_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \

22220

@@ -73,6 +90,7 @@

22221

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

22222

depcomp = $(SHELL) $(top_srcdir)/depcomp

22223

am__depfiles_maybe = depfiles

22224

+am__mv = mv -f

22225

COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

22226

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

22227

LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

22228

@@ -149,6 +167,8 @@

22229

GTKDOC_CHECK = @GTKDOC_CHECK@

22230

HELP_DIR = @HELP_DIR@

22231

HTML_DIR = @HTML_DIR@

22232

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

22233

+INDICATE_LIBS = @INDICATE_LIBS@

22234

INSTALL = @INSTALL@

22235

INSTALL_DATA = @INSTALL_DATA@

22236

INSTALL_PROGRAM = @INSTALL_PROGRAM@

22237

@@ -209,6 +229,7 @@

22238

PACKAGE_NAME = @PACKAGE_NAME@

22239

PACKAGE_STRING = @PACKAGE_STRING@

22240

PACKAGE_TARNAME = @PACKAGE_TARNAME@

22241

+PACKAGE_URL = @PACKAGE_URL@

22242

PACKAGE_VERSION = @PACKAGE_VERSION@

22243

PATH_SEPARATOR = @PATH_SEPARATOR@

22244

PKG_CONFIG = @PKG_CONFIG@

22245

@@ -354,9 +375,9 @@

22246

exit 1;; \

22247

esac; \

22248

done; \

22249

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/pyempathygtk/Makefile'; \

22250

- cd $(top_srcdir) && \

22251

- $(AUTOMAKE) --gnu python/pyempathygtk/Makefile

22252

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu python/pyempathygtk/Makefile'; \

22253

+ $(am__cd) $(top_srcdir) && \

22254

+ $(AUTOMAKE) --gnu python/pyempathygtk/Makefile

22255

.PRECIOUS: Makefile

22256

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

22257

@case '$?' in \

22258

@@ -374,23 +395,28 @@

22259

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

22260

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

22261

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

22262

+$(am__aclocal_m4_deps):

22263

install-pyempathygtkLTLIBRARIES: $(pyempathygtk_LTLIBRARIES)

22264

@$(NORMAL_INSTALL)

22265

test -z "$(pyempathygtkdir)" || $(MKDIR_P) "$(DESTDIR)$(pyempathygtkdir)"

22266

- @list='$(pyempathygtk_LTLIBRARIES)'; for p in $$list; do \

22267

+ @list='$(pyempathygtk_LTLIBRARIES)'; test -n "$(pyempathygtkdir)" || list=; \

22268

+ list2=; for p in $$list; do \

22269

if test -f $$p; then \

22270

- f=$(am__strip_dir) \

22271

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyempathygtkLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyempathygtkdir)/$$f'"; \

22272

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyempathygtkLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyempathygtkdir)/$$f"; \

22273

+ list2="$$list2 $$p"; \

22274

else :; fi; \

22275

- done

22276

+ done; \

22277

+ test -z "$$list2" || { \

22278

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pyempathygtkdir)'"; \

22279

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pyempathygtkdir)"; \

22280

+ }

22281

22282

uninstall-pyempathygtkLTLIBRARIES:

22283

@$(NORMAL_UNINSTALL)

22284

- @list='$(pyempathygtk_LTLIBRARIES)'; for p in $$list; do \

22285

- p=$(am__strip_dir) \

22286

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pyempathygtkdir)/$$p'"; \

22287

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pyempathygtkdir)/$$p"; \

22288

+ @list='$(pyempathygtk_LTLIBRARIES)'; test -n "$(pyempathygtkdir)" || list=; \

22289

+ for p in $$list; do \

22290

+ $(am__strip_dir) \

22291

+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pyempathygtkdir)/$$f'"; \

22292

+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pyempathygtkdir)/$$f"; \

22293

done

22294

22295

clean-pyempathygtkLTLIBRARIES:

22296

@@ -415,21 +441,21 @@

22297

22298

.c.o:

22299

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

22300

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22301

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22302

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

22303

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22304

@am__fastdepCC_FALSE@ $(COMPILE) -c $<

22305

22306

.c.obj:

22307

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

22308

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22309

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22310

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

22311

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22312

@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

22313

22314

.c.lo:

22315

@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

22316

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

22317

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

22318

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

22319

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22320

@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<

22321

@@ -452,7 +478,7 @@

22322

22323

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

22324

$(TAGS_FILES) $(LISP)

22325

- tags=; \

22326

+ set x; \

22327

here=`pwd`; \

22328

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

22329

unique=`for i in $$list; do \

22330

@@ -460,29 +486,34 @@

22331

done | \

22332

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

22333

END { if (nonempty) { for (i in files) print i; }; }'`; \

22334

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

22335

+ shift; \

22336

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

22337

test -n "$$unique" || unique=$$empty_fix; \

22338

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22339

- $$tags $$unique; \

22340

+ if test $$# -gt 0; then \

22341

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22342

+ "$$@" $$unique; \

22343

+ else \

22344

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22345

+ $$unique; \

22346

+ fi; \

22347

fi

22348

ctags: CTAGS

22349

CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

22350

$(TAGS_FILES) $(LISP)

22351

- tags=; \

22352

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

22353

unique=`for i in $$list; do \

22354

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

22355

done | \

22356

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

22357

END { if (nonempty) { for (i in files) print i; }; }'`; \

22358

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

22359

+ test -z "$(CTAGS_ARGS)$$unique" \

22360

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

22361

- $$tags $$unique

22362

+ $$unique

22363

22364

GTAGS:

22365

here=`$(am__cd) $(top_builddir) && pwd` \

22366

- && cd $(top_srcdir) \

22367

- && gtags -i $(GTAGS_ARGS) $$here

22368

+ && $(am__cd) $(top_srcdir) \

22369

+ && gtags -i $(GTAGS_ARGS) "$$here"

22370

22371

distclean-tags:

22372

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

22373

@@ -503,13 +534,17 @@

22374

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

22375

if test -d $$d/$$file; then \

22376

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

22377

+ if test -d "$(distdir)/$$file"; then \

22378

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

22379

+ fi; \

22380

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

22381

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

22382

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

22383

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

22384

fi; \

22385

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

22386

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

22387

else \

22388

- test -f $(distdir)/$$file \

22389

- || cp -p $$d/$$file $(distdir)/$$file \

22390

+ test -f "$(distdir)/$$file" \

22391

+ || cp -p $$d/$$file "$(distdir)/$$file" \

22392

|| exit 1; \

22393

fi; \

22394

done

22395

@@ -543,6 +578,7 @@

22396

22397

distclean-generic:

22398

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

22399

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

22400

22401

maintainer-clean-generic:

22402

@echo "This command is intended for maintainers to use"

22403

@@ -565,6 +601,8 @@

22404

22405

html: html-am

22406

22407

+html-am:

22408

+

22409

info: info-am

22410

22411

info-am:

22412

@@ -573,18 +611,28 @@

22413

22414

install-dvi: install-dvi-am

22415

22416

+install-dvi-am:

22417

+

22418

install-exec-am:

22419

22420

install-html: install-html-am

22421

22422

+install-html-am:

22423

+

22424

install-info: install-info-am

22425

22426

+install-info-am:

22427

+

22428

install-man:

22429

22430

install-pdf: install-pdf-am

22431

22432

+install-pdf-am:

22433

+

22434

install-ps: install-ps-am

22435

22436

+install-ps-am:

22437

+

22438

installcheck-am:

22439

22440

maintainer-clean: maintainer-clean-am

22441

@@ -607,7 +655,7 @@

22442

22443

uninstall-am: uninstall-pyempathygtkLTLIBRARIES

22444

22445

-.MAKE: install-am install-strip

22446

+.MAKE: all check install install-am install-strip

22447

22448

.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \

22449

clean-libtool clean-pyempathygtkLTLIBRARIES ctags distclean \

22450

@@ -632,6 +680,7 @@

22451

--register $(srcdir)/../pyempathy/pyempathy.defs \

22452

--override $(srcdir)/pyempathygtk.override \

22453

$(srcdir)/pyempathygtk.defs > $@

22454

+

22455

# Tell versions [3.59,3.63) of GNU make to not export all variables.

22456

# Otherwise a system limit (for SysV at least) may be exceeded.

22457

.NOEXPORT:

22458

22459

=== modified file 'src/Makefile.in'

22460

--- src/Makefile.in 2009-09-17 14:07:29 +0000

22461

+++ src/Makefile.in 2009-09-17 14:14:17 +0000

22462

@@ -1,8 +1,9 @@

22463

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

22464

+# Makefile.in generated by automake 1.11 from Makefile.am.

22465

# @configure_input@

22466

22467

22468

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

22469

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

22470

+# Inc.

22471

# This Makefile.in is free software; the Free Software Foundation

22472

# gives unlimited permission to copy and/or distribute it,

22473

# with or without modifications, as long as this notice is preserved.

22474

@@ -17,8 +18,9 @@

22475

22476

VPATH = @srcdir@

22477

pkgdatadir = $(datadir)/@PACKAGE@

22478

+pkgincludedir = $(includedir)/@PACKAGE@

22479

pkglibdir = $(libdir)/@PACKAGE@

22480

-pkgincludedir = $(includedir)/@PACKAGE@

22481

+pkglibexecdir = $(libexecdir)/@PACKAGE@

22482

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

22483

install_sh_DATA = $(install_sh) -c -m 644

22484

install_sh_PROGRAM = $(install_sh) -c

22485

@@ -38,14 +40,24 @@

22486

$(top_srcdir)/tools/check-coding-style.mk \

22487

$(top_srcdir)/tools/flymake.mk $(top_srcdir)/tools/shave.mk

22488

bin_PROGRAMS = empathy$(EXEEXT) empathy-logs$(EXEEXT)

22489

-@HAVE_LIBCHAMPLAIN_TRUE@am__append_1 = \

22490

+@HAVE_LIBINDICATE_TRUE@am__append_1 = \

22491

+@HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.c \

22492

+@HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.h \

22493

+@HAVE_LIBINDICATE_TRUE@ empathy-indicator.c empathy-indicator.h

22494

+

22495

+@HAVE_LIBINDICATE_FALSE@am__append_2 = \

22496

+@HAVE_LIBINDICATE_FALSE@ empathy-indicator-manager.c \

22497

+@HAVE_LIBINDICATE_FALSE@ empathy-indicator-manager.h \

22498

+@HAVE_LIBINDICATE_FALSE@ empathy-indicator.c empathy-indicator.h

22499

+

22500

+@HAVE_LIBCHAMPLAIN_TRUE@am__append_3 = \

22501

@HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.c \

22502

@HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.h

22503

22504

-@HAVE_LIBCHAMPLAIN_TRUE@am__append_2 = \

22505

+@HAVE_LIBCHAMPLAIN_TRUE@am__append_4 = \

22506

@HAVE_LIBCHAMPLAIN_TRUE@ empathy-map-view.ui

22507

22508

-@HAVE_LIBCHAMPLAIN_FALSE@am__append_3 = \

22509

+@HAVE_LIBCHAMPLAIN_FALSE@am__append_5 = \

22510

@HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.c \

22511

@HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.h \

22512

@HAVE_LIBCHAMPLAIN_FALSE@ empathy-map-view.ui

22513

@@ -66,9 +78,9 @@

22514

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

22515

CONFIG_HEADER = $(top_builddir)/config.h

22516

CONFIG_CLEAN_FILES =

22517

+CONFIG_CLEAN_VPATH_FILES =

22518

am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \

22519

"$(DESTDIR)$(uidir)"

22520

-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

22521

PROGRAMS = $(bin_PROGRAMS)

22522

am__empathy_SOURCES_DIST = empathy.c empathy-about-dialog.c \

22523

empathy-about-dialog.h empathy-account-assistant.c \

22524

@@ -91,10 +103,14 @@

22525

empathy-preferences.c empathy-preferences.h empathy-sidebar.c \

22526

empathy-sidebar.h empathy-status-icon.c empathy-status-icon.h \

22527

empathy-tube-dispatch.c empathy-tube-dispatch.h \

22528

- empathy-map-view.c empathy-map-view.h ephy-spinner.c \

22529

- ephy-spinner.h

22530

-@HAVE_LIBCHAMPLAIN_TRUE@am__objects_1 = empathy-map-view.$(OBJEXT)

22531

-am__objects_2 = empathy.$(OBJEXT) empathy-about-dialog.$(OBJEXT) \

22532

+ empathy-indicator-manager.c empathy-indicator-manager.h \

22533

+ empathy-indicator.c empathy-indicator.h empathy-map-view.c \

22534

+ empathy-map-view.h ephy-spinner.c ephy-spinner.h

22535

+@HAVE_LIBINDICATE_TRUE@am__objects_1 = \

22536

+@HAVE_LIBINDICATE_TRUE@ empathy-indicator-manager.$(OBJEXT) \

22537

+@HAVE_LIBINDICATE_TRUE@ empathy-indicator.$(OBJEXT)

22538

+@HAVE_LIBCHAMPLAIN_TRUE@am__objects_2 = empathy-map-view.$(OBJEXT)

22539

+am__objects_3 = empathy.$(OBJEXT) empathy-about-dialog.$(OBJEXT) \

22540

empathy-account-assistant.$(OBJEXT) \

22541

empathy-accounts-dialog.$(OBJEXT) \

22542

empathy-call-window.$(OBJEXT) \

22543

@@ -110,10 +126,10 @@

22544

empathy-new-chatroom-dialog.$(OBJEXT) \

22545

empathy-preferences.$(OBJEXT) empathy-sidebar.$(OBJEXT) \

22546

empathy-status-icon.$(OBJEXT) empathy-tube-dispatch.$(OBJEXT) \

22547

- $(am__objects_1)

22548

-am_empathy_OBJECTS = $(am__objects_2) ephy-spinner.$(OBJEXT)

22549

-am__objects_3 = empathy-tube-dispatch-enumtypes.$(OBJEXT)

22550

-nodist_empathy_OBJECTS = $(am__objects_3)

22551

+ $(am__objects_1) $(am__objects_2)

22552

+am_empathy_OBJECTS = $(am__objects_3) ephy-spinner.$(OBJEXT)

22553

+am__objects_4 = empathy-tube-dispatch-enumtypes.$(OBJEXT)

22554

+nodist_empathy_OBJECTS = $(am__objects_4)

22555

empathy_OBJECTS = $(am_empathy_OBJECTS) $(nodist_empathy_OBJECTS)

22556

empathy_LDADD = $(LDADD)

22557

am__DEPENDENCIES_1 =

22558

@@ -122,7 +138,8 @@

22559

$(top_builddir)/libempathy/libempathy.la \

22560

$(top_builddir)/extensions/libemp-extensions.la \

22561

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

22562

- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

22563

+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

22564

+ $(am__DEPENDENCIES_1)

22565

am_empathy_logs_OBJECTS = empathy-logs.$(OBJEXT)

22566

empathy_logs_OBJECTS = $(am_empathy_logs_OBJECTS)

22567

empathy_logs_LDADD = $(LDADD)

22568

@@ -131,10 +148,12 @@

22569

$(top_builddir)/libempathy/libempathy.la \

22570

$(top_builddir)/extensions/libemp-extensions.la \

22571

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

22572

- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

22573

+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

22574

+ $(am__DEPENDENCIES_1)

22575

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

22576

depcomp = $(SHELL) $(top_srcdir)/depcomp

22577

am__depfiles_maybe = depfiles

22578

+am__mv = mv -f

22579

COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

22580

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

22581

LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

22582

@@ -147,16 +166,30 @@

22583

SOURCES = $(empathy_SOURCES) $(nodist_empathy_SOURCES) \

22584

$(empathy_logs_SOURCES)

22585

DIST_SOURCES = $(am__empathy_SOURCES_DIST) $(empathy_logs_SOURCES)

22586

-man1dir = $(mandir)/man1

22587

-NROFF = nroff

22588

-MANS = $(dist_man_MANS)

22589

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

22590

am__vpath_adj = case $$p in \

22591

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

22592

*) f=$$p;; \

22593

esac;

22594

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

22595

-uiDATA_INSTALL = $(INSTALL_DATA)

22596

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

22597

+am__install_max = 40

22598

+am__nobase_strip_setup = \

22599

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

22600

+am__nobase_strip = \

22601

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

22602

+am__nobase_list = $(am__nobase_strip_setup); \

22603

+ for p in $$list; do echo "$$p $$p"; done | \

22604

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

22605

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

22606

+ if (++n[$$2] == $(am__install_max)) \

22607

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

22608

+ END { for (dir in files) print dir, files[dir] }'

22609

+am__base_list = \

22610

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

22611

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

22612

+man1dir = $(mandir)/man1

22613

+NROFF = nroff

22614

+MANS = $(dist_man_MANS)

22615

DATA = $(ui_DATA)

22616

ETAGS = etags

22617

CTAGS = ctags

22618

@@ -223,6 +256,8 @@

22619

GTKDOC_CHECK = @GTKDOC_CHECK@

22620

HELP_DIR = @HELP_DIR@

22621

HTML_DIR = @HTML_DIR@

22622

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

22623

+INDICATE_LIBS = @INDICATE_LIBS@

22624

INSTALL = @INSTALL@

22625

INSTALL_DATA = @INSTALL_DATA@

22626

INSTALL_PROGRAM = @INSTALL_PROGRAM@

22627

@@ -283,6 +318,7 @@

22628

PACKAGE_NAME = @PACKAGE_NAME@

22629

PACKAGE_STRING = @PACKAGE_STRING@

22630

PACKAGE_TARNAME = @PACKAGE_TARNAME@

22631

+PACKAGE_URL = @PACKAGE_URL@

22632

PACKAGE_VERSION = @PACKAGE_VERSION@

22633

PATH_SEPARATOR = @PATH_SEPARATOR@

22634

PKG_CONFIG = @PKG_CONFIG@

22635

@@ -382,8 +418,10 @@

22636

AM_CPPFLAGS = \

22637

-I$(top_srcdir) \

22638

-DG_LOG_DOMAIN=\"empathy\" \

22639

+ -DDESKTOPDIR=\"$(datadir)/applications\" \

22640

$(EMPATHY_CFLAGS) \

22641

$(LIBNOTIFY_CFLAGS) \

22642

+ $(INDICATE_CFLAGS) \

22643

$(LIBCHAMPLAIN_CFLAGS) \

22644

$(DISABLE_DEPRECATED) \

22645

$(WEBKIT_CFLAGS) \

22646

@@ -394,6 +432,7 @@

22647

$(top_builddir)/libempathy/libempathy.la \

22648

$(top_builddir)/extensions/libemp-extensions.la \

22649

$(LIBNOTIFY_LIBS) \

22650

+ $(INDICATE_LIBS) \

22651

$(EMPATHY_LIBS) \

22652

$(LIBCHAMPLAIN_LIBS) \

22653

$(WEBKIT_LIBS)

22654

@@ -423,7 +462,7 @@

22655

empathy-preferences.c empathy-preferences.h empathy-sidebar.c \

22656

empathy-sidebar.h empathy-status-icon.c empathy-status-icon.h \

22657

empathy-tube-dispatch.c empathy-tube-dispatch.h \

22658

- $(am__append_1)

22659

+ $(am__append_1) $(am__append_3)

22660

empathy_SOURCES = \

22661

$(empathy_handwritten_source) \

22662

ephy-spinner.c ephy-spinner.h

22663

@@ -440,8 +479,9 @@

22664

empathy-chat-window.ui empathy-ft-manager.ui \

22665

empathy-import-dialog.ui empathy-main-window.ui \

22666

empathy-new-chatroom-dialog.ui empathy-preferences.ui \

22667

- empathy-status-icon.ui $(am__append_2)

22668

-EXTRA_DIST = $(autostart_DATA) $(ui_DATA) $(am__append_3)

22669

+ empathy-status-icon.ui $(am__append_4)

22670

+EXTRA_DIST = $(autostart_DATA) $(ui_DATA) $(am__append_2) \

22671

+ $(am__append_5)

22672

dist_man_MANS = \

22673

empathy.1

22674

22675

@@ -460,9 +500,9 @@

22676

exit 1;; \

22677

esac; \

22678

done; \

22679

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \

22680

- cd $(top_srcdir) && \

22681

- $(AUTOMAKE) --gnu src/Makefile

22682

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \

22683

+ $(am__cd) $(top_srcdir) && \

22684

+ $(AUTOMAKE) --gnu src/Makefile

22685

.PRECIOUS: Makefile

22686

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

22687

@case '$?' in \

22688

@@ -480,34 +520,50 @@

22689

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

22690

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

22691

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

22692

+$(am__aclocal_m4_deps):

22693

install-binPROGRAMS: $(bin_PROGRAMS)

22694

@$(NORMAL_INSTALL)

22695

test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

22696

- @list='$(bin_PROGRAMS)'; for p in $$list; do \

22697

- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

22698

- if test -f $$p \

22699

- || test -f $$p1 \

22700

- ; then \

22701

- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

22702

- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \

22703

- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \

22704

- else :; fi; \

22705

- done

22706

+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

22707

+ for p in $$list; do echo "$$p $$p"; done | \

22708

+ sed 's/$(EXEEXT)$$//' | \

22709

+ while read p p1; do if test -f $$p || test -f $$p1; \

22710

+ then echo "$$p"; echo "$$p"; else :; fi; \

22711

+ done | \

22712

+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \

22713

+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \

22714

+ sed 'N;N;N;s,\n, ,g' | \

22715

+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \

22716

+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

22717

+ if ($$2 == $$4) files[d] = files[d] " " $$1; \

22718

+ else { print "f", $$3 "/" $$4, $$1; } } \

22719

+ END { for (d in files) print "f", d, files[d] }' | \

22720

+ while read type dir files; do \

22721

+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

22722

+ test -z "$$files" || { \

22723

+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \

22724

+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \

22725

+ } \

22726

+ ; done

22727

22728

uninstall-binPROGRAMS:

22729

@$(NORMAL_UNINSTALL)

22730

- @list='$(bin_PROGRAMS)'; for p in $$list; do \

22731

- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \

22732

- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \

22733

- rm -f "$(DESTDIR)$(bindir)/$$f"; \

22734

- done

22735

+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

22736

+ files=`for p in $$list; do echo "$$p"; done | \

22737

+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \

22738

+ -e 's/$$/$(EXEEXT)/' `; \

22739

+ test -n "$$list" || exit 0; \

22740

+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \

22741

+ cd "$(DESTDIR)$(bindir)" && rm -f $$files

22742

22743

clean-binPROGRAMS:

22744

- @list='$(bin_PROGRAMS)'; for p in $$list; do \

22745

- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

22746

- echo " rm -f $$p $$f"; \

22747

- rm -f $$p $$f ; \

22748

- done

22749

+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \

22750

+ echo " rm -f" $$list; \

22751

+ rm -f $$list || exit $$?; \

22752

+ test -n "$(EXEEXT)" || exit 0; \

22753

+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \

22754

+ echo " rm -f" $$list; \

22755

+ rm -f $$list

22756

empathy$(EXEEXT): $(empathy_OBJECTS) $(empathy_DEPENDENCIES)

22757

@rm -f empathy$(EXEEXT)

22758

$(LINK) $(empathy_OBJECTS) $(empathy_LDADD) $(LIBS)

22759

@@ -536,6 +592,8 @@

22760

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-pidgin.Po@am__quote@

22761

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-utils.Po@am__quote@

22762

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-import-widget.Po@am__quote@

22763

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-indicator-manager.Po@am__quote@

22764

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-indicator.Po@am__quote@

22765

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-logs.Po@am__quote@

22766

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-main-window.Po@am__quote@

22767

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empathy-map-view.Po@am__quote@

22768

@@ -551,21 +609,21 @@

22769

22770

.c.o:

22771

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

22772

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22773

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22774

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

22775

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22776

@am__fastdepCC_FALSE@ $(COMPILE) -c $<

22777

22778

.c.obj:

22779

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

22780

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22781

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

22782

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

22783

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22784

@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

22785

22786

.c.lo:

22787

@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

22788

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

22789

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

22790

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

22791

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

22792

@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<

22793

@@ -575,68 +633,64 @@

22794

22795

clean-libtool:

22796

-rm -rf .libs _libs

22797

-install-man1: $(man1_MANS) $(man_MANS)

22798

+install-man1: $(dist_man_MANS)

22799

@$(NORMAL_INSTALL)

22800

test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"

22801

- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \

22802

- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \

22803

- for i in $$l2; do \

22804

- case "$$i" in \

22805

- *.1*) list="$$list $$i" ;; \

22806

- esac; \

22807

+ @list=''; test -n "$(man1dir)" || exit 0; \

22808

+ { for i in $$list; do echo "$$i"; done; \

22809

+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \

22810

+ sed -n '/\.1[a-z]*$$/p'; \

22811

+ } | while read p; do \

22812

+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \

22813

+ echo "$$d$$p"; echo "$$p"; \

22814

+ done | \

22815

+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \

22816

+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \

22817

+ sed 'N;N;s,\n, ,g' | { \

22818

+ list=; while read file base inst; do \

22819

+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \

22820

+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \

22821

+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \

22822

+ fi; \

22823

done; \

22824

- for i in $$list; do \

22825

- if test -f $$i; then file=$$i; \

22826

- else file=$(srcdir)/$$i; fi; \

22827

- ext=`echo $$i | sed -e 's/^.*\\.//'`; \

22828

- case "$$ext" in \

22829

- 1*) ;; \

22830

- *) ext='1' ;; \

22831

- esac; \

22832

- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

22833

- inst=`echo $$inst | sed -e 's/^.*\///'`; \

22834

- inst=`echo $$inst | sed '$(transform)'`.$$ext; \

22835

- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \

22836

- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \

22837

- done

22838

+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \

22839

+ while read files; do \

22840

+ test -z "$$files" || { \

22841

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \

22842

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \

22843

+ done; }

22844

+

22845

uninstall-man1:

22846

@$(NORMAL_UNINSTALL)

22847

- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \

22848

- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \

22849

- for i in $$l2; do \

22850

- case "$$i" in \

22851

- *.1*) list="$$list $$i" ;; \

22852

- esac; \

22853

- done; \

22854

- for i in $$list; do \

22855

- ext=`echo $$i | sed -e 's/^.*\\.//'`; \

22856

- case "$$ext" in \

22857

- 1*) ;; \

22858

- *) ext='1' ;; \

22859

- esac; \

22860

- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

22861

- inst=`echo $$inst | sed -e 's/^.*\///'`; \

22862

- inst=`echo $$inst | sed '$(transform)'`.$$ext; \

22863

- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \

22864

- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \

22865

- done

22866

+ @list=''; test -n "$(man1dir)" || exit 0; \

22867

+ files=`{ for i in $$list; do echo "$$i"; done; \

22868

+ l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \

22869

+ sed -n '/\.1[a-z]*$$/p'; \

22870

+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \

22871

+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \

22872

+ test -z "$$files" || { \

22873

+ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \

22874

+ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }

22875

install-uiDATA: $(ui_DATA)

22876

@$(NORMAL_INSTALL)

22877

test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"

22878

- @list='$(ui_DATA)'; for p in $$list; do \

22879

+ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \

22880

+ for p in $$list; do \

22881

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

22882

- f=$(am__strip_dir) \

22883

- echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \

22884

- $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \

22885

+ echo "$$d$$p"; \

22886

+ done | $(am__base_list) | \

22887

+ while read files; do \

22888

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \

22889

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \

22890

done

22891

22892

uninstall-uiDATA:

22893

@$(NORMAL_UNINSTALL)

22894

- @list='$(ui_DATA)'; for p in $$list; do \

22895

- f=$(am__strip_dir) \

22896

- echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \

22897

- rm -f "$(DESTDIR)$(uidir)/$$f"; \

22898

- done

22899

+ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \

22900

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

22901

+ test -n "$$files" || exit 0; \

22902

+ echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \

22903

+ cd "$(DESTDIR)$(uidir)" && rm -f $$files

22904

22905

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

22906

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

22907

@@ -650,7 +704,7 @@

22908

22909

TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

22910

$(TAGS_FILES) $(LISP)

22911

- tags=; \

22912

+ set x; \

22913

here=`pwd`; \

22914

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

22915

unique=`for i in $$list; do \

22916

@@ -658,34 +712,52 @@

22917

done | \

22918

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

22919

END { if (nonempty) { for (i in files) print i; }; }'`; \

22920

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

22921

+ shift; \

22922

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

22923

test -n "$$unique" || unique=$$empty_fix; \

22924

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22925

- $$tags $$unique; \

22926

+ if test $$# -gt 0; then \

22927

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22928

+ "$$@" $$unique; \

22929

+ else \

22930

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

22931

+ $$unique; \

22932

+ fi; \

22933

fi

22934

ctags: CTAGS

22935

CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

22936

$(TAGS_FILES) $(LISP)

22937

- tags=; \

22938

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

22939

unique=`for i in $$list; do \

22940

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

22941

done | \

22942

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

22943

END { if (nonempty) { for (i in files) print i; }; }'`; \

22944

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

22945

+ test -z "$(CTAGS_ARGS)$$unique" \

22946

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

22947

- $$tags $$unique

22948

+ $$unique

22949

22950

GTAGS:

22951

here=`$(am__cd) $(top_builddir) && pwd` \

22952

- && cd $(top_srcdir) \

22953

- && gtags -i $(GTAGS_ARGS) $$here

22954

+ && $(am__cd) $(top_srcdir) \

22955

+ && gtags -i $(GTAGS_ARGS) "$$here"

22956

22957

distclean-tags:

22958

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

22959

22960

distdir: $(DISTFILES)

22961

+ @list='$(MANS)'; if test -n "$$list"; then \

22962

+ list=`for p in $$list; do \

22963

+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \

22964

+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \

22965

+ if test -n "$$list" && \

22966

+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \

22967

+ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \

22968

+ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \

22969

+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \

22970

+ echo " typically \`make maintainer-clean' will remove them" >&2; \

22971

+ exit 1; \

22972

+ else :; fi; \

22973

+ else :; fi

22974

@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

22975

topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

22976

list='$(DISTFILES)'; \

22977

@@ -701,13 +773,17 @@

22978

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

22979

if test -d $$d/$$file; then \

22980

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

22981

+ if test -d "$(distdir)/$$file"; then \

22982

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

22983

+ fi; \

22984

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

22985

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

22986

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

22987

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

22988

fi; \

22989

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

22990

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

22991

else \

22992

- test -f $(distdir)/$$file \

22993

- || cp -p $$d/$$file $(distdir)/$$file \

22994

+ test -f "$(distdir)/$$file" \

22995

+ || cp -p $$d/$$file "$(distdir)/$$file" \

22996

|| exit 1; \

22997

fi; \

22998

done

22999

@@ -742,6 +818,7 @@

23000

23001

distclean-generic:

23002

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

23003

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

23004

23005

maintainer-clean-generic:

23006

@echo "This command is intended for maintainers to use"

23007

@@ -763,6 +840,8 @@

23008

23009

html: html-am

23010

23011

+html-am:

23012

+

23013

info: info-am

23014

23015

info-am:

23016

@@ -771,18 +850,28 @@

23017

23018

install-dvi: install-dvi-am

23019

23020

+install-dvi-am:

23021

+

23022

install-exec-am: install-binPROGRAMS

23023

23024

install-html: install-html-am

23025

23026

+install-html-am:

23027

+

23028

install-info: install-info-am

23029

23030

+install-info-am:

23031

+

23032

install-man: install-man1

23033

23034

install-pdf: install-pdf-am

23035

23036

+install-pdf-am:

23037

+

23038

install-ps: install-ps-am

23039

23040

+install-ps-am:

23041

+

23042

installcheck-am:

23043

23044

maintainer-clean: maintainer-clean-am

23045

@@ -807,7 +896,7 @@

23046

23047

uninstall-man: uninstall-man1

23048

23049

-.MAKE: install-am install-strip

23050

+.MAKE: all check check-am install install-am install-strip

23051

23052

.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \

23053

clean-binPROGRAMS clean-generic clean-libtool ctags distclean \

23054

@@ -865,6 +954,7 @@

23055

--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@VALUENAME@\" }," \

23056

--vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \

23057

$< > $@

23058

+

23059

# Tell versions [3.59,3.63) of GNU make to not export all variables.

23060

# Otherwise a system limit (for SysV at least) may be exceeded.

23061

.NOEXPORT:

23062

23063

=== modified file 'tests/Makefile.in'

23064

--- tests/Makefile.in 2009-09-17 14:07:29 +0000

23065

+++ tests/Makefile.in 2009-09-17 14:14:17 +0000

23066

@@ -1,8 +1,9 @@

23067

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

23068

+# Makefile.in generated by automake 1.11 from Makefile.am.

23069

# @configure_input@

23070

23071

23072

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

23073

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

23074

+# Inc.

23075

# This Makefile.in is free software; the Free Software Foundation

23076

# gives unlimited permission to copy and/or distribute it,

23077

# with or without modifications, as long as this notice is preserved.

23078

@@ -16,8 +17,9 @@

23079

23080

VPATH = @srcdir@

23081

pkgdatadir = $(datadir)/@PACKAGE@

23082

+pkgincludedir = $(includedir)/@PACKAGE@

23083

pkglibdir = $(libdir)/@PACKAGE@

23084

-pkgincludedir = $(includedir)/@PACKAGE@

23085

+pkglibexecdir = $(libexecdir)/@PACKAGE@

23086

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

23087

install_sh_DATA = $(install_sh) -c -m 644

23088

install_sh_PROGRAM = $(install_sh) -c

23089

@@ -58,6 +60,7 @@

23090

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

23091

CONFIG_HEADER = $(top_builddir)/config.h

23092

CONFIG_CLEAN_FILES =

23093

+CONFIG_CLEAN_VPATH_FILES =

23094

PROGRAMS = $(noinst_PROGRAMS)

23095

am_check_main_OBJECTS = check_main-check-main.$(OBJEXT) \

23096

check_main-check-helpers.$(OBJEXT) \

23097

@@ -131,6 +134,7 @@

23098

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

23099

depcomp = $(SHELL) $(top_srcdir)/depcomp

23100

am__depfiles_maybe = depfiles

23101

+am__mv = mv -f

23102

COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

23103

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

23104

LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

23105

@@ -159,10 +163,40 @@

23106

ps-recursive uninstall-recursive

23107

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

23108

distclean-recursive maintainer-clean-recursive

23109

+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

23110

+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

23111

+ distdir

23112

ETAGS = etags

23113

CTAGS = ctags

23114

+am__tty_colors = \

23115

+red=; grn=; lgn=; blu=; std=

23116

DIST_SUBDIRS = $(SUBDIRS)

23117

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

23118

+am__relativize = \

23119

+ dir0=`pwd`; \

23120

+ sed_first='s,^$[^/]*$/.*$$,\1,'; \

23121

+ sed_rest='s,^[^/]*/*,,'; \

23122

+ sed_last='s,^.*/$[^/]*$$$,\1,'; \

23123

+ sed_butlast='s,/*[^/]*$$,,'; \

23124

+ while test -n "$$dir1"; do \

23125

+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \

23126

+ if test "$$first" != "."; then \

23127

+ if test "$$first" = ".."; then \

23128

+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

23129

+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

23130

+ else \

23131

+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

23132

+ if test "$$first2" = "$$first"; then \

23133

+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

23134

+ else \

23135

+ dir2="../$$dir2"; \

23136

+ fi; \

23137

+ dir0="$$dir0"/"$$first"; \

23138

+ fi; \

23139

+ fi; \

23140

+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

23141

+ done; \

23142

+ reldir="$$dir2"

23143

ACLOCAL = @ACLOCAL@

23144

ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@

23145

ALL_LINGUAS = @ALL_LINGUAS@

23146

@@ -225,6 +259,8 @@

23147

GTKDOC_CHECK = @GTKDOC_CHECK@

23148

HELP_DIR = @HELP_DIR@

23149

HTML_DIR = @HTML_DIR@

23150

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

23151

+INDICATE_LIBS = @INDICATE_LIBS@

23152

INSTALL = @INSTALL@

23153

INSTALL_DATA = @INSTALL_DATA@

23154

INSTALL_PROGRAM = @INSTALL_PROGRAM@

23155

@@ -285,6 +321,7 @@

23156

PACKAGE_NAME = @PACKAGE_NAME@

23157

PACKAGE_STRING = @PACKAGE_STRING@

23158

PACKAGE_TARNAME = @PACKAGE_TARNAME@

23159

+PACKAGE_URL = @PACKAGE_URL@

23160

PACKAGE_VERSION = @PACKAGE_VERSION@

23161

PATH_SEPARATOR = @PATH_SEPARATOR@

23162

PKG_CONFIG = @PKG_CONFIG@

23163

@@ -460,9 +497,9 @@

23164

exit 1;; \

23165

esac; \

23166

done; \

23167

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \

23168

- cd $(top_srcdir) && \

23169

- $(AUTOMAKE) --gnu tests/Makefile

23170

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \

23171

+ $(am__cd) $(top_srcdir) && \

23172

+ $(AUTOMAKE) --gnu tests/Makefile

23173

.PRECIOUS: Makefile

23174

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

23175

@case '$?' in \

23176

@@ -480,20 +517,25 @@

23177

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

23178

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

23179

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

23180

+$(am__aclocal_m4_deps):

23181

23182

clean-checkPROGRAMS:

23183

- @list='$(check_PROGRAMS)'; for p in $$list; do \

23184

- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

23185

- echo " rm -f $$p $$f"; \

23186

- rm -f $$p $$f ; \

23187

- done

23188

+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \

23189

+ echo " rm -f" $$list; \

23190

+ rm -f $$list || exit $$?; \

23191

+ test -n "$(EXEEXT)" || exit 0; \

23192

+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \

23193

+ echo " rm -f" $$list; \

23194

+ rm -f $$list

23195

23196

clean-noinstPROGRAMS:

23197

- @list='$(noinst_PROGRAMS)'; for p in $$list; do \

23198

- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

23199

- echo " rm -f $$p $$f"; \

23200

- rm -f $$p $$f ; \

23201

- done

23202

+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \

23203

+ echo " rm -f" $$list; \

23204

+ rm -f $$list || exit $$?; \

23205

+ test -n "$(EXEEXT)" || exit 0; \

23206

+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \

23207

+ echo " rm -f" $$list; \

23208

+ rm -f $$list

23209

check-main$(EXEEXT): $(check_main_OBJECTS) $(check_main_DEPENDENCIES)

23210

@rm -f check-main$(EXEEXT)

23211

$(check_main_LINK) $(check_main_OBJECTS) $(check_main_LDADD) $(LIBS)

23212

@@ -541,175 +583,175 @@

23213

23214

.c.o:

23215

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

23216

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

23217

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

23218

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

23219

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23220

@am__fastdepCC_FALSE@ $(COMPILE) -c $<

23221

23222

.c.obj:

23223

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

23224

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

23225

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

23226

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

23227

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23228

@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

23229

23230

.c.lo:

23231

@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

23232

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

23233

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo

23234

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

23235

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23236

@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<

23237

23238

check_main-check-main.o: check-main.c

23239

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-main.o -MD -MP -MF $(DEPDIR)/check_main-check-main.Tpo -c -o check_main-check-main.o `test -f 'check-main.c' || echo '$(srcdir)/'`check-main.c

23240

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-main.Tpo $(DEPDIR)/check_main-check-main.Po

23241

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-main.Tpo $(DEPDIR)/check_main-check-main.Po

23242

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-main.c' object='check_main-check-main.o' libtool=no @AMDEPBACKSLASH@

23243

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23244

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-main.o `test -f 'check-main.c' || echo '$(srcdir)/'`check-main.c

23245

23246

check_main-check-main.obj: check-main.c

23247

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-main.obj -MD -MP -MF $(DEPDIR)/check_main-check-main.Tpo -c -o check_main-check-main.obj `if test -f 'check-main.c'; then $(CYGPATH_W) 'check-main.c'; else $(CYGPATH_W) '$(srcdir)/check-main.c'; fi`

23248

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-main.Tpo $(DEPDIR)/check_main-check-main.Po

23249

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-main.Tpo $(DEPDIR)/check_main-check-main.Po

23250

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-main.c' object='check_main-check-main.obj' libtool=no @AMDEPBACKSLASH@

23251

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23252

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-main.obj `if test -f 'check-main.c'; then $(CYGPATH_W) 'check-main.c'; else $(CYGPATH_W) '$(srcdir)/check-main.c'; fi`

23253

23254

check_main-check-helpers.o: check-helpers.c

23255

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-helpers.o -MD -MP -MF $(DEPDIR)/check_main-check-helpers.Tpo -c -o check_main-check-helpers.o `test -f 'check-helpers.c' || echo '$(srcdir)/'`check-helpers.c

23256

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-helpers.Tpo $(DEPDIR)/check_main-check-helpers.Po

23257

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-helpers.Tpo $(DEPDIR)/check_main-check-helpers.Po

23258

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-helpers.c' object='check_main-check-helpers.o' libtool=no @AMDEPBACKSLASH@

23259

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23260

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-helpers.o `test -f 'check-helpers.c' || echo '$(srcdir)/'`check-helpers.c

23261

23262

check_main-check-helpers.obj: check-helpers.c

23263

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-helpers.obj -MD -MP -MF $(DEPDIR)/check_main-check-helpers.Tpo -c -o check_main-check-helpers.obj `if test -f 'check-helpers.c'; then $(CYGPATH_W) 'check-helpers.c'; else $(CYGPATH_W) '$(srcdir)/check-helpers.c'; fi`

23264

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-helpers.Tpo $(DEPDIR)/check_main-check-helpers.Po

23265

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-helpers.Tpo $(DEPDIR)/check_main-check-helpers.Po

23266

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-helpers.c' object='check_main-check-helpers.obj' libtool=no @AMDEPBACKSLASH@

23267

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23268

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-helpers.obj `if test -f 'check-helpers.c'; then $(CYGPATH_W) 'check-helpers.c'; else $(CYGPATH_W) '$(srcdir)/check-helpers.c'; fi`

23269

23270

check_main-check-empathy-utils.o: check-empathy-utils.c

23271

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-utils.o -MD -MP -MF $(DEPDIR)/check_main-check-empathy-utils.Tpo -c -o check_main-check-empathy-utils.o `test -f 'check-empathy-utils.c' || echo '$(srcdir)/'`check-empathy-utils.c

23272

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-utils.Tpo $(DEPDIR)/check_main-check-empathy-utils.Po

23273

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-utils.Tpo $(DEPDIR)/check_main-check-empathy-utils.Po

23274

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-utils.c' object='check_main-check-empathy-utils.o' libtool=no @AMDEPBACKSLASH@

23275

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23276

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-utils.o `test -f 'check-empathy-utils.c' || echo '$(srcdir)/'`check-empathy-utils.c

23277

23278

check_main-check-empathy-utils.obj: check-empathy-utils.c

23279

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-utils.obj -MD -MP -MF $(DEPDIR)/check_main-check-empathy-utils.Tpo -c -o check_main-check-empathy-utils.obj `if test -f 'check-empathy-utils.c'; then $(CYGPATH_W) 'check-empathy-utils.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-utils.c'; fi`

23280

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-utils.Tpo $(DEPDIR)/check_main-check-empathy-utils.Po

23281

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-utils.Tpo $(DEPDIR)/check_main-check-empathy-utils.Po

23282

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-utils.c' object='check_main-check-empathy-utils.obj' libtool=no @AMDEPBACKSLASH@

23283

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23284

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-utils.obj `if test -f 'check-empathy-utils.c'; then $(CYGPATH_W) 'check-empathy-utils.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-utils.c'; fi`

23285

23286

check_main-check-empathy-helpers.o: check-empathy-helpers.c

23287

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-helpers.o -MD -MP -MF $(DEPDIR)/check_main-check-empathy-helpers.Tpo -c -o check_main-check-empathy-helpers.o `test -f 'check-empathy-helpers.c' || echo '$(srcdir)/'`check-empathy-helpers.c

23288

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-helpers.Tpo $(DEPDIR)/check_main-check-empathy-helpers.Po

23289

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-helpers.Tpo $(DEPDIR)/check_main-check-empathy-helpers.Po

23290

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-helpers.c' object='check_main-check-empathy-helpers.o' libtool=no @AMDEPBACKSLASH@

23291

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23292

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-helpers.o `test -f 'check-empathy-helpers.c' || echo '$(srcdir)/'`check-empathy-helpers.c

23293

23294

check_main-check-empathy-helpers.obj: check-empathy-helpers.c

23295

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-helpers.obj -MD -MP -MF $(DEPDIR)/check_main-check-empathy-helpers.Tpo -c -o check_main-check-empathy-helpers.obj `if test -f 'check-empathy-helpers.c'; then $(CYGPATH_W) 'check-empathy-helpers.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-helpers.c'; fi`

23296

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-helpers.Tpo $(DEPDIR)/check_main-check-empathy-helpers.Po

23297

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-helpers.Tpo $(DEPDIR)/check_main-check-empathy-helpers.Po

23298

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-helpers.c' object='check_main-check-empathy-helpers.obj' libtool=no @AMDEPBACKSLASH@

23299

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23300

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-helpers.obj `if test -f 'check-empathy-helpers.c'; then $(CYGPATH_W) 'check-empathy-helpers.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-helpers.c'; fi`

23301

23302

check_main-check-irc-helper.o: check-irc-helper.c

23303

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-irc-helper.o -MD -MP -MF $(DEPDIR)/check_main-check-irc-helper.Tpo -c -o check_main-check-irc-helper.o `test -f 'check-irc-helper.c' || echo '$(srcdir)/'`check-irc-helper.c

23304

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-irc-helper.Tpo $(DEPDIR)/check_main-check-irc-helper.Po

23305

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-irc-helper.Tpo $(DEPDIR)/check_main-check-irc-helper.Po

23306

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-irc-helper.c' object='check_main-check-irc-helper.o' libtool=no @AMDEPBACKSLASH@

23307

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23308

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-irc-helper.o `test -f 'check-irc-helper.c' || echo '$(srcdir)/'`check-irc-helper.c

23309

23310

check_main-check-irc-helper.obj: check-irc-helper.c

23311

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-irc-helper.obj -MD -MP -MF $(DEPDIR)/check_main-check-irc-helper.Tpo -c -o check_main-check-irc-helper.obj `if test -f 'check-irc-helper.c'; then $(CYGPATH_W) 'check-irc-helper.c'; else $(CYGPATH_W) '$(srcdir)/check-irc-helper.c'; fi`

23312

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-irc-helper.Tpo $(DEPDIR)/check_main-check-irc-helper.Po

23313

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-irc-helper.Tpo $(DEPDIR)/check_main-check-irc-helper.Po

23314

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-irc-helper.c' object='check_main-check-irc-helper.obj' libtool=no @AMDEPBACKSLASH@

23315

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23316

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-irc-helper.obj `if test -f 'check-irc-helper.c'; then $(CYGPATH_W) 'check-irc-helper.c'; else $(CYGPATH_W) '$(srcdir)/check-irc-helper.c'; fi`

23317

23318

check_main-check-empathy-irc-server.o: check-empathy-irc-server.c

23319

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-irc-server.o -MD -MP -MF $(DEPDIR)/check_main-check-empathy-irc-server.Tpo -c -o check_main-check-empathy-irc-server.o `test -f 'check-empathy-irc-server.c' || echo '$(srcdir)/'`check-empathy-irc-server.c

23320

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-irc-server.Tpo $(DEPDIR)/check_main-check-empathy-irc-server.Po

23321

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-irc-server.Tpo $(DEPDIR)/check_main-check-empathy-irc-server.Po

23322

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-irc-server.c' object='check_main-check-empathy-irc-server.o' libtool=no @AMDEPBACKSLASH@

23323

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23324

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-irc-server.o `test -f 'check-empathy-irc-server.c' || echo '$(srcdir)/'`check-empathy-irc-server.c

23325

23326

check_main-check-empathy-irc-server.obj: check-empathy-irc-server.c

23327

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-irc-server.obj -MD -MP -MF $(DEPDIR)/check_main-check-empathy-irc-server.Tpo -c -o check_main-check-empathy-irc-server.obj `if test -f 'check-empathy-irc-server.c'; then $(CYGPATH_W) 'check-empathy-irc-server.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-irc-server.c'; fi`

23328

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-irc-server.Tpo $(DEPDIR)/check_main-check-empathy-irc-server.Po

23329

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-irc-server.Tpo $(DEPDIR)/check_main-check-empathy-irc-server.Po

23330

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-irc-server.c' object='check_main-check-empathy-irc-server.obj' libtool=no @AMDEPBACKSLASH@

23331

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23332

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-irc-server.obj `if test -f 'check-empathy-irc-server.c'; then $(CYGPATH_W) 'check-empathy-irc-server.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-irc-server.c'; fi`

23333

23334

check_main-check-empathy-irc-network.o: check-empathy-irc-network.c

23335

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-irc-network.o -MD -MP -MF $(DEPDIR)/check_main-check-empathy-irc-network.Tpo -c -o check_main-check-empathy-irc-network.o `test -f 'check-empathy-irc-network.c' || echo '$(srcdir)/'`check-empathy-irc-network.c

23336

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-irc-network.Tpo $(DEPDIR)/check_main-check-empathy-irc-network.Po

23337

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-irc-network.Tpo $(DEPDIR)/check_main-check-empathy-irc-network.Po

23338

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-irc-network.c' object='check_main-check-empathy-irc-network.o' libtool=no @AMDEPBACKSLASH@

23339

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23340

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-irc-network.o `test -f 'check-empathy-irc-network.c' || echo '$(srcdir)/'`check-empathy-irc-network.c

23341

23342

check_main-check-empathy-irc-network.obj: check-empathy-irc-network.c

23343

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-irc-network.obj -MD -MP -MF $(DEPDIR)/check_main-check-empathy-irc-network.Tpo -c -o check_main-check-empathy-irc-network.obj `if test -f 'check-empathy-irc-network.c'; then $(CYGPATH_W) 'check-empathy-irc-network.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-irc-network.c'; fi`

23344

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-irc-network.Tpo $(DEPDIR)/check_main-check-empathy-irc-network.Po

23345

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-irc-network.Tpo $(DEPDIR)/check_main-check-empathy-irc-network.Po

23346

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-irc-network.c' object='check_main-check-empathy-irc-network.obj' libtool=no @AMDEPBACKSLASH@

23347

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23348

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-irc-network.obj `if test -f 'check-empathy-irc-network.c'; then $(CYGPATH_W) 'check-empathy-irc-network.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-irc-network.c'; fi`

23349

23350

check_main-check-empathy-irc-network-manager.o: check-empathy-irc-network-manager.c

23351

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-irc-network-manager.o -MD -MP -MF $(DEPDIR)/check_main-check-empathy-irc-network-manager.Tpo -c -o check_main-check-empathy-irc-network-manager.o `test -f 'check-empathy-irc-network-manager.c' || echo '$(srcdir)/'`check-empathy-irc-network-manager.c

23352

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-irc-network-manager.Tpo $(DEPDIR)/check_main-check-empathy-irc-network-manager.Po

23353

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-irc-network-manager.Tpo $(DEPDIR)/check_main-check-empathy-irc-network-manager.Po

23354

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-irc-network-manager.c' object='check_main-check-empathy-irc-network-manager.o' libtool=no @AMDEPBACKSLASH@

23355

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23356

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-irc-network-manager.o `test -f 'check-empathy-irc-network-manager.c' || echo '$(srcdir)/'`check-empathy-irc-network-manager.c

23357

23358

check_main-check-empathy-irc-network-manager.obj: check-empathy-irc-network-manager.c

23359

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-irc-network-manager.obj -MD -MP -MF $(DEPDIR)/check_main-check-empathy-irc-network-manager.Tpo -c -o check_main-check-empathy-irc-network-manager.obj `if test -f 'check-empathy-irc-network-manager.c'; then $(CYGPATH_W) 'check-empathy-irc-network-manager.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-irc-network-manager.c'; fi`

23360

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-irc-network-manager.Tpo $(DEPDIR)/check_main-check-empathy-irc-network-manager.Po

23361

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-irc-network-manager.Tpo $(DEPDIR)/check_main-check-empathy-irc-network-manager.Po

23362

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-irc-network-manager.c' object='check_main-check-empathy-irc-network-manager.obj' libtool=no @AMDEPBACKSLASH@

23363

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23364

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-irc-network-manager.obj `if test -f 'check-empathy-irc-network-manager.c'; then $(CYGPATH_W) 'check-empathy-irc-network-manager.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-irc-network-manager.c'; fi`

23365

23366

check_main-check-empathy-chatroom.o: check-empathy-chatroom.c

23367

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-chatroom.o -MD -MP -MF $(DEPDIR)/check_main-check-empathy-chatroom.Tpo -c -o check_main-check-empathy-chatroom.o `test -f 'check-empathy-chatroom.c' || echo '$(srcdir)/'`check-empathy-chatroom.c

23368

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-chatroom.Tpo $(DEPDIR)/check_main-check-empathy-chatroom.Po

23369

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-chatroom.Tpo $(DEPDIR)/check_main-check-empathy-chatroom.Po

23370

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-chatroom.c' object='check_main-check-empathy-chatroom.o' libtool=no @AMDEPBACKSLASH@

23371

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23372

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-chatroom.o `test -f 'check-empathy-chatroom.c' || echo '$(srcdir)/'`check-empathy-chatroom.c

23373

23374

check_main-check-empathy-chatroom.obj: check-empathy-chatroom.c

23375

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-chatroom.obj -MD -MP -MF $(DEPDIR)/check_main-check-empathy-chatroom.Tpo -c -o check_main-check-empathy-chatroom.obj `if test -f 'check-empathy-chatroom.c'; then $(CYGPATH_W) 'check-empathy-chatroom.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-chatroom.c'; fi`

23376

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-chatroom.Tpo $(DEPDIR)/check_main-check-empathy-chatroom.Po

23377

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-chatroom.Tpo $(DEPDIR)/check_main-check-empathy-chatroom.Po

23378

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-chatroom.c' object='check_main-check-empathy-chatroom.obj' libtool=no @AMDEPBACKSLASH@

23379

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23380

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-chatroom.obj `if test -f 'check-empathy-chatroom.c'; then $(CYGPATH_W) 'check-empathy-chatroom.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-chatroom.c'; fi`

23381

23382

check_main-check-empathy-chatroom-manager.o: check-empathy-chatroom-manager.c

23383

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-chatroom-manager.o -MD -MP -MF $(DEPDIR)/check_main-check-empathy-chatroom-manager.Tpo -c -o check_main-check-empathy-chatroom-manager.o `test -f 'check-empathy-chatroom-manager.c' || echo '$(srcdir)/'`check-empathy-chatroom-manager.c

23384

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-chatroom-manager.Tpo $(DEPDIR)/check_main-check-empathy-chatroom-manager.Po

23385

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-chatroom-manager.Tpo $(DEPDIR)/check_main-check-empathy-chatroom-manager.Po

23386

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-chatroom-manager.c' object='check_main-check-empathy-chatroom-manager.o' libtool=no @AMDEPBACKSLASH@

23387

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23388

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-chatroom-manager.o `test -f 'check-empathy-chatroom-manager.c' || echo '$(srcdir)/'`check-empathy-chatroom-manager.c

23389

23390

check_main-check-empathy-chatroom-manager.obj: check-empathy-chatroom-manager.c

23391

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -MT check_main-check-empathy-chatroom-manager.obj -MD -MP -MF $(DEPDIR)/check_main-check-empathy-chatroom-manager.Tpo -c -o check_main-check-empathy-chatroom-manager.obj `if test -f 'check-empathy-chatroom-manager.c'; then $(CYGPATH_W) 'check-empathy-chatroom-manager.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-chatroom-manager.c'; fi`

23392

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/check_main-check-empathy-chatroom-manager.Tpo $(DEPDIR)/check_main-check-empathy-chatroom-manager.Po

23393

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_main-check-empathy-chatroom-manager.Tpo $(DEPDIR)/check_main-check-empathy-chatroom-manager.Po

23394

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check-empathy-chatroom-manager.c' object='check_main-check-empathy-chatroom-manager.obj' libtool=no @AMDEPBACKSLASH@

23395

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23396

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_main_CFLAGS) $(CFLAGS) -c -o check_main-check-empathy-chatroom-manager.obj `if test -f 'check-empathy-chatroom-manager.c'; then $(CYGPATH_W) 'check-empathy-chatroom-manager.c'; else $(CYGPATH_W) '$(srcdir)/check-empathy-chatroom-manager.c'; fi`

23397

23398

test_empathy_account_assistant-test-empathy-account-assistant.o: test-empathy-account-assistant.c

23399

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_empathy_account_assistant_CFLAGS) $(CFLAGS) -MT test_empathy_account_assistant-test-empathy-account-assistant.o -MD -MP -MF $(DEPDIR)/test_empathy_account_assistant-test-empathy-account-assistant.Tpo -c -o test_empathy_account_assistant-test-empathy-account-assistant.o `test -f 'test-empathy-account-assistant.c' || echo '$(srcdir)/'`test-empathy-account-assistant.c

23400

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_empathy_account_assistant-test-empathy-account-assistant.Tpo $(DEPDIR)/test_empathy_account_assistant-test-empathy-account-assistant.Po

23401

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/test_empathy_account_assistant-test-empathy-account-assistant.Tpo $(DEPDIR)/test_empathy_account_assistant-test-empathy-account-assistant.Po

23402

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-empathy-account-assistant.c' object='test_empathy_account_assistant-test-empathy-account-assistant.o' libtool=no @AMDEPBACKSLASH@

23403

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23404

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_empathy_account_assistant_CFLAGS) $(CFLAGS) -c -o test_empathy_account_assistant-test-empathy-account-assistant.o `test -f 'test-empathy-account-assistant.c' || echo '$(srcdir)/'`test-empathy-account-assistant.c

23405

23406

test_empathy_account_assistant-test-empathy-account-assistant.obj: test-empathy-account-assistant.c

23407

@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_empathy_account_assistant_CFLAGS) $(CFLAGS) -MT test_empathy_account_assistant-test-empathy-account-assistant.obj -MD -MP -MF $(DEPDIR)/test_empathy_account_assistant-test-empathy-account-assistant.Tpo -c -o test_empathy_account_assistant-test-empathy-account-assistant.obj `if test -f 'test-empathy-account-assistant.c'; then $(CYGPATH_W) 'test-empathy-account-assistant.c'; else $(CYGPATH_W) '$(srcdir)/test-empathy-account-assistant.c'; fi`

23408

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/test_empathy_account_assistant-test-empathy-account-assistant.Tpo $(DEPDIR)/test_empathy_account_assistant-test-empathy-account-assistant.Po

23409

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/test_empathy_account_assistant-test-empathy-account-assistant.Tpo $(DEPDIR)/test_empathy_account_assistant-test-empathy-account-assistant.Po

23410

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-empathy-account-assistant.c' object='test_empathy_account_assistant-test-empathy-account-assistant.obj' libtool=no @AMDEPBACKSLASH@

23411

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

23412

@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_empathy_account_assistant_CFLAGS) $(CFLAGS) -c -o test_empathy_account_assistant-test-empathy-account-assistant.obj `if test -f 'test-empathy-account-assistant.c'; then $(CYGPATH_W) 'test-empathy-account-assistant.c'; else $(CYGPATH_W) '$(srcdir)/test-empathy-account-assistant.c'; fi`

23413

@@ -744,7 +786,7 @@

23414

else \

23415

local_target="$$target"; \

23416

fi; \

23417

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

23418

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

23419

|| eval $$failcom; \

23420

done; \

23421

if test "$$dot_seen" = "no"; then \

23422

@@ -778,16 +820,16 @@

23423

else \

23424

local_target="$$target"; \

23425

fi; \

23426

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

23427

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

23428

|| eval $$failcom; \

23429

done && test -z "$$fail"

23430

tags-recursive:

23431

list='$(SUBDIRS)'; for subdir in $$list; do \

23432

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

23433

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

23434

done

23435

ctags-recursive:

23436

list='$(SUBDIRS)'; for subdir in $$list; do \

23437

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

23438

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

23439

done

23440

23441

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

23442

@@ -802,7 +844,7 @@

23443

23444

TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

23445

$(TAGS_FILES) $(LISP)

23446

- tags=; \

23447

+ set x; \

23448

here=`pwd`; \

23449

if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

23450

include_option=--etags-include; \

23451

@@ -814,7 +856,7 @@

23452

list='$(SUBDIRS)'; for subdir in $$list; do \

23453

if test "$$subdir" = .; then :; else \

23454

test ! -f $$subdir/TAGS || \

23455

- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

23456

+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

23457

fi; \

23458

done; \

23459

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

23460

@@ -823,29 +865,34 @@

23461

done | \

23462

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

23463

END { if (nonempty) { for (i in files) print i; }; }'`; \

23464

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

23465

+ shift; \

23466

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

23467

test -n "$$unique" || unique=$$empty_fix; \

23468

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

23469

- $$tags $$unique; \

23470

+ if test $$# -gt 0; then \

23471

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

23472

+ "$$@" $$unique; \

23473

+ else \

23474

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

23475

+ $$unique; \

23476

+ fi; \

23477

fi

23478

ctags: CTAGS

23479

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

23480

$(TAGS_FILES) $(LISP)

23481

- tags=; \

23482

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

23483

unique=`for i in $$list; do \

23484

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

23485

done | \

23486

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

23487

END { if (nonempty) { for (i in files) print i; }; }'`; \

23488

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

23489

+ test -z "$(CTAGS_ARGS)$$unique" \

23490

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

23491

- $$tags $$unique

23492

+ $$unique

23493

23494

GTAGS:

23495

here=`$(am__cd) $(top_builddir) && pwd` \

23496

- && cd $(top_srcdir) \

23497

- && gtags -i $(GTAGS_ARGS) $$here

23498

+ && $(am__cd) $(top_srcdir) \

23499

+ && gtags -i $(GTAGS_ARGS) "$$here"

23500

23501

distclean-tags:

23502

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

23503

@@ -854,6 +901,7 @@

23504

@failed=0; all=0; xfail=0; xpass=0; skip=0; \

23505

srcdir=$(srcdir); export srcdir; \

23506

list=' $(TESTS) '; \

23507

+ $(am__tty_colors); \

23508

if test -n "$$list"; then \

23509

for tst in $$list; do \

23510

if test -f ./$$tst; then dir=./; \

23511

@@ -865,10 +913,10 @@

23512

*[\ \ ]$$tst[\ \ ]*) \

23513

xpass=`expr $$xpass + 1`; \

23514

failed=`expr $$failed + 1`; \

23515

- echo "XPASS: $$tst"; \

23516

+ col=$$red; res=XPASS; \

23517

;; \

23518

*) \

23519

- echo "PASS: $$tst"; \

23520

+ col=$$grn; res=PASS; \

23521

;; \

23522

esac; \

23523

elif test $$? -ne 77; then \

23524

@@ -876,17 +924,18 @@

23525

case " $(XFAIL_TESTS) " in \

23526

*[\ \ ]$$tst[\ \ ]*) \

23527

xfail=`expr $$xfail + 1`; \

23528

- echo "XFAIL: $$tst"; \

23529

+ col=$$lgn; res=XFAIL; \

23530

;; \

23531

*) \

23532

failed=`expr $$failed + 1`; \

23533

- echo "FAIL: $$tst"; \

23534

+ col=$$red; res=FAIL; \

23535

;; \

23536

esac; \

23537

else \

23538

skip=`expr $$skip + 1`; \

23539

- echo "SKIP: $$tst"; \

23540

+ col=$$blu; res=SKIP; \

23541

fi; \

23542

+ echo "$${col}$$res$${std}: $$tst"; \

23543

done; \

23544

if test "$$all" -eq 1; then \

23545

tests="test"; \

23546

@@ -928,11 +977,15 @@

23547

dashes="$$report"; \

23548

fi; \

23549

dashes=`echo "$$dashes" | sed s/./=/g`; \

23550

- echo "$$dashes"; \

23551

+ if test "$$failed" -eq 0; then \

23552

+ echo "$$grn$$dashes"; \

23553

+ else \

23554

+ echo "$$red$$dashes"; \

23555

+ fi; \

23556

echo "$$banner"; \

23557

test -z "$$skipped" || echo "$$skipped"; \

23558

test -z "$$report" || echo "$$report"; \

23559

- echo "$$dashes"; \

23560

+ echo "$$dashes$$std"; \

23561

test "$$failed" -eq 0; \

23562

else :; fi

23563

23564

@@ -952,29 +1005,44 @@

23565

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

23566

if test -d $$d/$$file; then \

23567

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

23568

+ if test -d "$(distdir)/$$file"; then \

23569

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

23570

+ fi; \

23571

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

23572

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

23573

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

23574

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

23575

fi; \

23576

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

23577

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

23578

else \

23579

- test -f $(distdir)/$$file \

23580

- || cp -p $$d/$$file $(distdir)/$$file \

23581

+ test -f "$(distdir)/$$file" \

23582

+ || cp -p $$d/$$file "$(distdir)/$$file" \

23583

|| exit 1; \

23584

fi; \

23585

done

23586

- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

23587

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

23588

if test "$$subdir" = .; then :; else \

23589

test -d "$(distdir)/$$subdir" \

23590

|| $(MKDIR_P) "$(distdir)/$$subdir" \

23591

|| exit 1; \

23592

- distdir=`$(am__cd) $(distdir) && pwd`; \

23593

- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

23594

- (cd $$subdir && \

23595

+ fi; \

23596

+ done

23597

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

23598

+ if test "$$subdir" = .; then :; else \

23599

+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

23600

+ $(am__relativize); \

23601

+ new_distdir=$$reldir; \

23602

+ dir1=$$subdir; dir2="$(top_distdir)"; \

23603

+ $(am__relativize); \

23604

+ new_top_distdir=$$reldir; \

23605

+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

23606

+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

23607

+ ($(am__cd) $$subdir && \

23608

$(MAKE) $(AM_MAKEFLAGS) \

23609

- top_distdir="$$top_distdir" \

23610

- distdir="$$distdir/$$subdir" \

23611

+ top_distdir="$$new_top_distdir" \

23612

+ distdir="$$new_distdir" \

23613

am__remove_distdir=: \

23614

am__skip_length_check=: \

23615

+ am__skip_mode_fix=: \

23616

distdir) \

23617

|| exit 1; \

23618

fi; \

23619

@@ -1007,6 +1075,7 @@

23620

23621

distclean-generic:

23622

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

23623

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

23624

23625

maintainer-clean-generic:

23626

@echo "This command is intended for maintainers to use"

23627

@@ -1028,6 +1097,8 @@

23628

23629

html: html-recursive

23630

23631

+html-am:

23632

+

23633

info: info-recursive

23634

23635

info-am:

23636

@@ -1036,18 +1107,28 @@

23637

23638

install-dvi: install-dvi-recursive

23639

23640

+install-dvi-am:

23641

+

23642

install-exec-am:

23643

23644

install-html: install-html-recursive

23645

23646

+install-html-am:

23647

+

23648

install-info: install-info-recursive

23649

23650

+install-info-am:

23651

+

23652

install-man:

23653

23654

install-pdf: install-pdf-recursive

23655

23656

+install-pdf-am:

23657

+

23658

install-ps: install-ps-recursive

23659

23660

+install-ps-am:

23661

+

23662

installcheck-am:

23663

23664

maintainer-clean: maintainer-clean-recursive

23665

@@ -1070,8 +1151,8 @@

23666

23667

uninstall-am:

23668

23669

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

23670

- install-strip

23671

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \

23672

+ ctags-recursive install-am install-strip tags-recursive

23673

23674

.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

23675

all all-am check check-TESTS check-am check-local clean \

23676

@@ -1224,6 +1305,7 @@

23677

exit 0;\

23678

fi

23679

check-local: check-coding-style

23680

+

23681

# Tell versions [3.59,3.63) of GNU make to not export all variables.

23682

# Otherwise a system limit (for SysV at least) may be exceeded.

23683

.NOEXPORT:

23684

23685

=== modified file 'tests/xml/Makefile.in'

23686

--- tests/xml/Makefile.in 2009-09-17 14:07:29 +0000

23687

+++ tests/xml/Makefile.in 2009-09-17 14:14:17 +0000

23688

@@ -1,8 +1,9 @@

23689

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

23690

+# Makefile.in generated by automake 1.11 from Makefile.am.

23691

# @configure_input@

23692

23693

23694

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

23695

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

23696

+# Inc.

23697

# This Makefile.in is free software; the Free Software Foundation

23698

# gives unlimited permission to copy and/or distribute it,

23699

# with or without modifications, as long as this notice is preserved.

23700

@@ -15,8 +16,9 @@

23701

@SET_MAKE@

23702

VPATH = @srcdir@

23703

pkgdatadir = $(datadir)/@PACKAGE@

23704

+pkgincludedir = $(includedir)/@PACKAGE@

23705

pkglibdir = $(libdir)/@PACKAGE@

23706

-pkgincludedir = $(includedir)/@PACKAGE@

23707

+pkglibexecdir = $(libexecdir)/@PACKAGE@

23708

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

23709

install_sh_DATA = $(install_sh) -c -m 644

23710

install_sh_PROGRAM = $(install_sh) -c

23711

@@ -48,6 +50,7 @@

23712

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

23713

CONFIG_HEADER = $(top_builddir)/config.h

23714

CONFIG_CLEAN_FILES =

23715

+CONFIG_CLEAN_VPATH_FILES =

23716

SOURCES =

23717

DIST_SOURCES =

23718

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

23719

@@ -113,6 +116,8 @@

23720

GTKDOC_CHECK = @GTKDOC_CHECK@

23721

HELP_DIR = @HELP_DIR@

23722

HTML_DIR = @HTML_DIR@

23723

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

23724

+INDICATE_LIBS = @INDICATE_LIBS@

23725

INSTALL = @INSTALL@

23726

INSTALL_DATA = @INSTALL_DATA@

23727

INSTALL_PROGRAM = @INSTALL_PROGRAM@

23728

@@ -173,6 +178,7 @@

23729

PACKAGE_NAME = @PACKAGE_NAME@

23730

PACKAGE_STRING = @PACKAGE_STRING@

23731

PACKAGE_TARNAME = @PACKAGE_TARNAME@

23732

+PACKAGE_URL = @PACKAGE_URL@

23733

PACKAGE_VERSION = @PACKAGE_VERSION@

23734

PATH_SEPARATOR = @PATH_SEPARATOR@

23735

PKG_CONFIG = @PKG_CONFIG@

23736

@@ -285,9 +291,9 @@

23737

exit 1;; \

23738

esac; \

23739

done; \

23740

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/xml/Makefile'; \

23741

- cd $(top_srcdir) && \

23742

- $(AUTOMAKE) --gnu tests/xml/Makefile

23743

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/xml/Makefile'; \

23744

+ $(am__cd) $(top_srcdir) && \

23745

+ $(AUTOMAKE) --gnu tests/xml/Makefile

23746

.PRECIOUS: Makefile

23747

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

23748

@case '$?' in \

23749

@@ -305,6 +311,7 @@

23750

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

23751

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

23752

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

23753

+$(am__aclocal_m4_deps):

23754

23755

mostlyclean-libtool:

23756

-rm -f *.lo

23757

@@ -334,13 +341,17 @@

23758

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

23759

if test -d $$d/$$file; then \

23760

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

23761

+ if test -d "$(distdir)/$$file"; then \

23762

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

23763

+ fi; \

23764

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

23765

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

23766

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

23767

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

23768

fi; \

23769

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

23770

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

23771

else \

23772

- test -f $(distdir)/$$file \

23773

- || cp -p $$d/$$file $(distdir)/$$file \

23774

+ test -f "$(distdir)/$$file" \

23775

+ || cp -p $$d/$$file "$(distdir)/$$file" \

23776

|| exit 1; \

23777

fi; \

23778

done

23779

@@ -368,6 +379,7 @@

23780

23781

distclean-generic:

23782

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

23783

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

23784

23785

maintainer-clean-generic:

23786

@echo "This command is intended for maintainers to use"

23787

@@ -386,6 +398,8 @@

23788

23789

html: html-am

23790

23791

+html-am:

23792

+

23793

info: info-am

23794

23795

info-am:

23796

@@ -394,18 +408,28 @@

23797

23798

install-dvi: install-dvi-am

23799

23800

+install-dvi-am:

23801

+

23802

install-exec-am:

23803

23804

install-html: install-html-am

23805

23806

+install-html-am:

23807

+

23808

install-info: install-info-am

23809

23810

+install-info-am:

23811

+

23812

install-man:

23813

23814

install-pdf: install-pdf-am

23815

23816

+install-pdf-am:

23817

+

23818

install-ps: install-ps-am

23819

23820

+install-ps-am:

23821

+

23822

installcheck-am:

23823

23824

maintainer-clean: maintainer-clean-am

23825

@@ -439,6 +463,7 @@

23826

maintainer-clean-generic mostlyclean mostlyclean-generic \

23827

mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am

23828

23829

+

23830

# Tell versions [3.59,3.63) of GNU make to not export all variables.

23831

# Otherwise a system limit (for SysV at least) may be exceeded.

23832

.NOEXPORT:

23833

23834

=== modified file 'tools/Makefile.in'

23835

--- tools/Makefile.in 2009-09-17 14:07:29 +0000

23836

+++ tools/Makefile.in 2009-09-17 14:14:17 +0000

23837

@@ -1,8 +1,9 @@

23838

-# Makefile.in generated by automake 1.10.2 from Makefile.am.

23839

+# Makefile.in generated by automake 1.11 from Makefile.am.

23840

# @configure_input@

23841

23842

23843

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

23844

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

23845

+# Inc.

23846

# This Makefile.in is free software; the Free Software Foundation

23847

# gives unlimited permission to copy and/or distribute it,

23848

# with or without modifications, as long as this notice is preserved.

23849

@@ -16,8 +17,9 @@

23850

23851

VPATH = @srcdir@

23852

pkgdatadir = $(datadir)/@PACKAGE@

23853

+pkgincludedir = $(includedir)/@PACKAGE@

23854

pkglibdir = $(libdir)/@PACKAGE@

23855

-pkgincludedir = $(includedir)/@PACKAGE@

23856

+pkglibexecdir = $(libexecdir)/@PACKAGE@

23857

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

23858

install_sh_DATA = $(install_sh) -c -m 644

23859

install_sh_PROGRAM = $(install_sh) -c

23860

@@ -50,6 +52,7 @@

23861

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

23862

CONFIG_HEADER = $(top_builddir)/config.h

23863

CONFIG_CLEAN_FILES =

23864

+CONFIG_CLEAN_VPATH_FILES =

23865

SCRIPTS = $(noinst_SCRIPTS)

23866

SOURCES =

23867

DIST_SOURCES =

23868

@@ -116,6 +119,8 @@

23869

GTKDOC_CHECK = @GTKDOC_CHECK@

23870

HELP_DIR = @HELP_DIR@

23871

HTML_DIR = @HTML_DIR@

23872

+INDICATE_CFLAGS = @INDICATE_CFLAGS@

23873

+INDICATE_LIBS = @INDICATE_LIBS@

23874

INSTALL = @INSTALL@

23875

INSTALL_DATA = @INSTALL_DATA@

23876

INSTALL_PROGRAM = @INSTALL_PROGRAM@

23877

@@ -176,6 +181,7 @@

23878

PACKAGE_NAME = @PACKAGE_NAME@

23879

PACKAGE_STRING = @PACKAGE_STRING@

23880

PACKAGE_TARNAME = @PACKAGE_TARNAME@

23881

+PACKAGE_URL = @PACKAGE_URL@

23882

PACKAGE_VERSION = @PACKAGE_VERSION@

23883

PATH_SEPARATOR = @PATH_SEPARATOR@

23884

PKG_CONFIG = @PKG_CONFIG@

23885

@@ -313,9 +319,9 @@

23886

exit 1;; \

23887

esac; \

23888

done; \

23889

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \

23890

- cd $(top_srcdir) && \

23891

- $(AUTOMAKE) --gnu tools/Makefile

23892

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \

23893

+ $(am__cd) $(top_srcdir) && \

23894

+ $(AUTOMAKE) --gnu tools/Makefile

23895

.PRECIOUS: Makefile

23896

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

23897

@case '$?' in \

23898

@@ -333,6 +339,7 @@

23899

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

23900

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

23901

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

23902

+$(am__aclocal_m4_deps):

23903

23904

mostlyclean-libtool:

23905

-rm -f *.lo

23906

@@ -362,13 +369,17 @@

23907

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

23908

if test -d $$d/$$file; then \

23909

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

23910

+ if test -d "$(distdir)/$$file"; then \

23911

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

23912

+ fi; \

23913

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

23914

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

23915

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

23916

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

23917

fi; \

23918

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

23919

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

23920

else \

23921

- test -f $(distdir)/$$file \

23922

- || cp -p $$d/$$file $(distdir)/$$file \

23923

+ test -f "$(distdir)/$$file" \

23924

+ || cp -p $$d/$$file "$(distdir)/$$file" \

23925

|| exit 1; \

23926

fi; \

23927

done

23928

@@ -397,6 +408,7 @@

23929

23930

distclean-generic:

23931

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

23932

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

23933

23934

maintainer-clean-generic:

23935

@echo "This command is intended for maintainers to use"

23936

@@ -415,6 +427,8 @@

23937

23938

html: html-am

23939

23940

+html-am:

23941

+

23942

info: info-am

23943

23944

info-am:

23945

@@ -423,18 +437,28 @@

23946

23947

install-dvi: install-dvi-am

23948

23949

+install-dvi-am:

23950

+

23951

install-exec-am:

23952

23953

install-html: install-html-am

23954

23955

+install-html-am:

23956

+

23957

install-info: install-info-am

23958

23959

+install-info-am:

23960

+

23961

install-man:

23962

23963

install-pdf: install-pdf-am

23964

23965

+install-pdf-am:

23966

+

23967

install-ps: install-ps-am

23968

23969

+install-ps-am:

23970

+

23971

installcheck-am:

23972

23973

maintainer-clean: maintainer-clean-am

23974

@@ -500,6 +524,7 @@

23975

cp $(TELEPATHY_SPEC_SRCDIR)/tools/$$x $$x; \

23976

fi; \

23977

done

23978

+

23979

# Tell versions [3.59,3.63) of GNU make to not export all variables.

23980

# Otherwise a system limit (for SysV at least) may be exceeded.

23981

.NOEXPORT:

23982