~vanvugt/ubuntu/oneiric/geeqie/fix-788321 : revision 8

1

Description: autoreconf -f -i changes

2

--- a/Makefile.in

3

+++ b/Makefile.in

4

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

5

-# Makefile.in generated by automake 1.10.1 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

@@ -46,8 +47,9 @@

17

18

VPATH = @srcdir@

19

pkgdatadir = $(datadir)/@PACKAGE@

20

-pkglibdir = $(libdir)/@PACKAGE@

21

pkgincludedir = $(includedir)/@PACKAGE@

22

+pkglibdir = $(libdir)/@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

@@ -77,6 +79,7 @@

28

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

29

CONFIG_HEADER = config.h

30

CONFIG_CLEAN_FILES = geeqie.spec

31

+CONFIG_CLEAN_VPATH_FILES =

32

SOURCES =

33

DIST_SOURCES =

34

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

35

@@ -86,32 +89,72 @@

36

install-pdf-recursive install-ps-recursive install-recursive \

37

installcheck-recursive installdirs-recursive pdf-recursive \

38

ps-recursive uninstall-recursive

39

-man1dir = $(mandir)/man1

40

-am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \

41

- "$(DESTDIR)$(icondir)" "$(DESTDIR)$(readmedir)"

42

-NROFF = nroff

43

-MANS = $(man_MANS)

44

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

45

am__vpath_adj = case $$p in \

46

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

47

*) f=$$p;; \

48

esac;

49

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

50

-desktopDATA_INSTALL = $(INSTALL_DATA)

51

-iconDATA_INSTALL = $(INSTALL_DATA)

52

-readmeDATA_INSTALL = $(INSTALL_DATA)

53

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

54

+am__install_max = 40

55

+am__nobase_strip_setup = \

56

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

57

+am__nobase_strip = \

58

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

59

+am__nobase_list = $(am__nobase_strip_setup); \

60

+ for p in $$list; do echo "$$p $$p"; done | \

61

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

62

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

63

+ if (++n[$$2] == $(am__install_max)) \

64

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

65

+ END { for (dir in files) print dir, files[dir] }'

66

+am__base_list = \

67

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

68

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

69

+man1dir = $(mandir)/man1

70

+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" \

71

+ "$(DESTDIR)$(icondir)" "$(DESTDIR)$(readmedir)"

72

+NROFF = nroff

73

+MANS = $(man_MANS)

74

DATA = $(desktop_DATA) $(icon_DATA) $(readme_DATA)

75

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

76

distclean-recursive maintainer-clean-recursive

77

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

78

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

79

+ distdir dist dist-all distcheck

80

ETAGS = etags

81

CTAGS = ctags

82

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

83

distdir = $(PACKAGE)-$(VERSION)

84

top_distdir = $(distdir)

85

am__remove_distdir = \

86

- { test ! -d $(distdir) \

87

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

88

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

89

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

90

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

91

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

92

+am__relativize = \

93

+ dir0=`pwd`; \

94

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

95

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

96

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

97

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

98

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

99

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

100

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

101

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

102

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

103

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

104

+ else \

105

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

106

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

107

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

108

+ else \

109

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

110

+ fi; \

111

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

112

+ fi; \

113

+ fi; \

114

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

115

+ done; \

116

+ reldir="$$dir2"

117

DIST_ARCHIVES = $(distdir).tar.gz

118

GZIP_ENV = --best

119

distuninstallcheck_listfiles = find . -type f -print

120

@@ -208,6 +251,7 @@

121

MAINT = @MAINT@

122

MAKEINFO = @MAKEINFO@

123

MKDIR_P = @MKDIR_P@

124

+MKINSTALLDIRS = @MKINSTALLDIRS@

125

MSGFMT = @MSGFMT@

126

MSGFMT_OPTS = @MSGFMT_OPTS@

127

MSGMERGE = @MSGMERGE@

128

@@ -217,6 +261,7 @@

129

PACKAGE_NAME = @PACKAGE_NAME@

130

PACKAGE_STRING = @PACKAGE_STRING@

131

PACKAGE_TARNAME = @PACKAGE_TARNAME@

132

+PACKAGE_URL = @PACKAGE_URL@

133

PACKAGE_VERSION = @PACKAGE_VERSION@

134

PATHSEP = @PATHSEP@

135

PATH_SEPARATOR = @PATH_SEPARATOR@

136

@@ -331,15 +376,15 @@

137

@for dep in $?; do \

138

case '$(am__configure_deps)' in \

139

*$$dep*) \

140

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

141

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

142

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

143

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

144

&& exit 0; \

145

exit 1;; \

146

esac; \

147

done; \

148

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

149

- cd $(top_srcdir) && \

150

- $(AUTOMAKE) --gnu Makefile

151

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

152

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

153

+ $(AUTOMAKE) --gnu Makefile

154

.PRECIOUS: Makefile

155

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

156

@case '$?' in \

157

@@ -355,9 +400,10 @@

158

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

159

160

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

161

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

162

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

163

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

164

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

165

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

166

+$(am__aclocal_m4_deps):

167

168

config.h: stamp-h1

169

@if test ! -f $@; then \

170

@@ -369,7 +415,7 @@

171

@rm -f stamp-h1

172

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

173

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

174

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

175

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

176

rm -f stamp-h1

177

touch $@

178

179

@@ -377,102 +423,104 @@

180

-rm -f config.h stamp-h1

181

geeqie.spec: $(top_builddir)/config.status $(srcdir)/geeqie.spec.in

182

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

183

-install-man1: $(man1_MANS) $(man_MANS)

184

+install-man1: $(man_MANS)

185

@$(NORMAL_INSTALL)

186

test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"

187

- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \

188

- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \

189

- for i in $$l2; do \

190

- case "$$i" in \

191

- *.1*) list="$$list $$i" ;; \

192

- esac; \

193

+ @list=''; test -n "$(man1dir)" || exit 0; \

194

+ { for i in $$list; do echo "$$i"; done; \

195

+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \

196

+ sed -n '/\.1[a-z]*$$/p'; \

197

+ } | while read p; do \

198

+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \

199

+ echo "$$d$$p"; echo "$$p"; \

200

+ done | \

201

+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \

202

+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \

203

+ sed 'N;N;s,\n, ,g' | { \

204

+ list=; while read file base inst; do \

205

+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \

206

+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \

207

+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \

208

+ fi; \

209

done; \

210

- for i in $$list; do \

211

- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \

212

- else file=$$i; fi; \

213

- ext=`echo $$i | sed -e 's/^.*\\.//'`; \

214

- case "$$ext" in \

215

- 1*) ;; \

216

- *) ext='1' ;; \

217

- esac; \

218

- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

219

- inst=`echo $$inst | sed -e 's/^.*\///'`; \

220

- inst=`echo $$inst | sed '$(transform)'`.$$ext; \

221

- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \

222

- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \

223

- done

224

+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \

225

+ while read files; do \

226

+ test -z "$$files" || { \

227

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \

228

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \

229

+ done; }

230

+

231

uninstall-man1:

232

@$(NORMAL_UNINSTALL)

233

- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \

234

- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \

235

- for i in $$l2; do \

236

- case "$$i" in \

237

- *.1*) list="$$list $$i" ;; \

238

- esac; \

239

- done; \

240

- for i in $$list; do \

241

- ext=`echo $$i | sed -e 's/^.*\\.//'`; \

242

- case "$$ext" in \

243

- 1*) ;; \

244

- *) ext='1' ;; \

245

- esac; \

246

- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \

247

- inst=`echo $$inst | sed -e 's/^.*\///'`; \

248

- inst=`echo $$inst | sed '$(transform)'`.$$ext; \

249

- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \

250

- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \

251

- done

252

+ @list=''; test -n "$(man1dir)" || exit 0; \

253

+ files=`{ for i in $$list; do echo "$$i"; done; \

254

+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \

255

+ sed -n '/\.1[a-z]*$$/p'; \

256

+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \

257

+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \

258

+ test -z "$$files" || { \

259

+ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \

260

+ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }

261

install-desktopDATA: $(desktop_DATA)

262

@$(NORMAL_INSTALL)

263

test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"

264

- @list='$(desktop_DATA)'; for p in $$list; do \

265

+ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \

266

+ for p in $$list; do \

267

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

268

- f=$(am__strip_dir) \

269

- echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \

270

- $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \

271

+ echo "$$d$$p"; \

272

+ done | $(am__base_list) | \

273

+ while read files; do \

274

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \

275

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \

276

done

277

278

uninstall-desktopDATA:

279

@$(NORMAL_UNINSTALL)

280

- @list='$(desktop_DATA)'; for p in $$list; do \

281

- f=$(am__strip_dir) \

282

- echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \

283

- rm -f "$(DESTDIR)$(desktopdir)/$$f"; \

284

- done

285

+ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \

286

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

287

+ test -n "$$files" || exit 0; \

288

+ echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \

289

+ cd "$(DESTDIR)$(desktopdir)" && rm -f $$files

290

install-iconDATA: $(icon_DATA)

291

@$(NORMAL_INSTALL)

292

test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"

293

- @list='$(icon_DATA)'; for p in $$list; do \

294

+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \

295

+ for p in $$list; do \

296

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

297

- f=$(am__strip_dir) \

298

- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \

299

- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \

300

+ echo "$$d$$p"; \

301

+ done | $(am__base_list) | \

302

+ while read files; do \

303

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \

304

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \

305

done

306

307

uninstall-iconDATA:

308

@$(NORMAL_UNINSTALL)

309

- @list='$(icon_DATA)'; for p in $$list; do \

310

- f=$(am__strip_dir) \

311

- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \

312

- rm -f "$(DESTDIR)$(icondir)/$$f"; \

313

- done

314

+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \

315

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

316

+ test -n "$$files" || exit 0; \

317

+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \

318

+ cd "$(DESTDIR)$(icondir)" && rm -f $$files

319

install-readmeDATA: $(readme_DATA)

320

@$(NORMAL_INSTALL)

321

test -z "$(readmedir)" || $(MKDIR_P) "$(DESTDIR)$(readmedir)"

322

- @list='$(readme_DATA)'; for p in $$list; do \

323

+ @list='$(readme_DATA)'; test -n "$(readmedir)" || list=; \

324

+ for p in $$list; do \

325

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

326

- f=$(am__strip_dir) \

327

- echo " $(readmeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(readmedir)/$$f'"; \

328

- $(readmeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(readmedir)/$$f"; \

329

+ echo "$$d$$p"; \

330

+ done | $(am__base_list) | \

331

+ while read files; do \

332

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(readmedir)'"; \

333

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(readmedir)" || exit $$?; \

334

done

335

336

uninstall-readmeDATA:

337

@$(NORMAL_UNINSTALL)

338

- @list='$(readme_DATA)'; for p in $$list; do \

339

- f=$(am__strip_dir) \

340

- echo " rm -f '$(DESTDIR)$(readmedir)/$$f'"; \

341

- rm -f "$(DESTDIR)$(readmedir)/$$f"; \

342

- done

343

+ @list='$(readme_DATA)'; test -n "$(readmedir)" || list=; \

344

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

345

+ test -n "$$files" || exit 0; \

346

+ echo " ( cd '$(DESTDIR)$(readmedir)' && rm -f" $$files ")"; \

347

+ cd "$(DESTDIR)$(readmedir)" && rm -f $$files

348

349

# This directory's subdirectories are mostly independent; you can cd

350

# into them and run `make' without going through this Makefile.

351

@@ -498,7 +546,7 @@

352

else \

353

local_target="$$target"; \

354

fi; \

355

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

356

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

357

|| eval $$failcom; \

358

done; \

359

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

360

@@ -532,16 +580,16 @@

361

else \

362

local_target="$$target"; \

363

fi; \

364

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

365

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

366

|| eval $$failcom; \

367

done && test -z "$$fail"

368

tags-recursive:

369

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

370

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

371

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

372

done

373

ctags-recursive:

374

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

375

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

376

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

377

done

378

379

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

380

@@ -549,14 +597,14 @@

381

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

382

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

383

done | \

384

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

385

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

386

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

387

mkid -fID $$unique

388

tags: TAGS

389

390

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

391

$(TAGS_FILES) $(LISP)

392

- tags=; \

393

+ set x; \

394

here=`pwd`; \

395

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

396

include_option=--etags-include; \

397

@@ -568,7 +616,7 @@

398

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

399

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

400

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

401

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

402

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

403

fi; \

404

done; \

405

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

406

@@ -577,36 +625,54 @@

407

done | \

408

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

409

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

410

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

411

+ shift; \

412

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

413

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

414

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

415

- $$tags $$unique; \

416

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

417

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

418

+ "$$@" $$unique; \

419

+ else \

420

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

421

+ $$unique; \

422

+ fi; \

423

fi

424

ctags: CTAGS

425

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

426

$(TAGS_FILES) $(LISP)

427

- tags=; \

428

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

429

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

430

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

431

done | \

432

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

433

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

434

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

435

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

436

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

437

- $$tags $$unique

438

+ $$unique

439

440

GTAGS:

441

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

442

- && cd $(top_srcdir) \

443

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

444

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

445

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

446

447

distclean-tags:

448

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

449

450

distdir: $(DISTFILES)

451

+ @list='$(MANS)'; if test -n "$$list"; then \

452

+ list=`for p in $$list; do \

453

+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \

454

+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \

455

+ if test -n "$$list" && \

456

+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \

457

+ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \

458

+ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \

459

+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \

460

+ echo " typically \`make maintainer-clean' will remove them" >&2; \

461

+ exit 1; \

462

+ else :; fi; \

463

+ else :; fi

464

$(am__remove_distdir)

465

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

466

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

467

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

468

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

469

list='$(DISTFILES)'; \

470

@@ -622,29 +688,44 @@

471

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

472

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

473

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

474

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

475

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

476

+ fi; \

477

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

478

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

479

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

480

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

481

fi; \

482

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

483

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

484

else \

485

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

486

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

487

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

488

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

489

|| exit 1; \

490

fi; \

491

done

492

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

493

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

494

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

495

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

496

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

497

|| exit 1; \

498

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

499

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

500

- (cd $$subdir && \

501

+ fi; \

502

+ done

503

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

504

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

505

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

506

+ $(am__relativize); \

507

+ new_distdir=$$reldir; \

508

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

509

+ $(am__relativize); \

510

+ new_top_distdir=$$reldir; \

511

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

512

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

513

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

514

$(MAKE) $(AM_MAKEFLAGS) \

515

- top_distdir="$$top_distdir" \

516

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

517

+ top_distdir="$$new_top_distdir" \

518

+ distdir="$$new_distdir" \

519

am__remove_distdir=: \

520

am__skip_length_check=: \

521

+ am__skip_mode_fix=: \

522

distdir) \

523

|| exit 1; \

524

fi; \

525

@@ -652,11 +733,12 @@

526

$(MAKE) $(AM_MAKEFLAGS) \

527

top_distdir="$(top_distdir)" distdir="$(distdir)" \

528

dist-hook

529

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

530

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

531

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

532

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

533

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

534

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

535

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

536

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

537

dist-gzip: distdir

538

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

539

$(am__remove_distdir)

540

@@ -669,6 +751,10 @@

541

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

542

$(am__remove_distdir)

543

544

+dist-xz: distdir

545

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

546

+ $(am__remove_distdir)

547

+

548

dist-tarZ: distdir

549

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

550

$(am__remove_distdir)

551

@@ -697,6 +783,8 @@

552

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

553

*.tar.lzma*) \

554

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

555

+ *.tar.xz*) \

556

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

557

*.tar.Z*) \

558

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

559

*.shar.gz*) \

560

@@ -708,9 +796,11 @@

561

mkdir $(distdir)/_build

562

mkdir $(distdir)/_inst

563

chmod a-w $(distdir)

564

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

565

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

566

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

567

- && cd $(distdir)/_build \

568

+ && am__cwd=`pwd` \

569

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

570

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

571

$(DISTCHECK_CONFIGURE_FLAGS) \

572

&& $(MAKE) $(AM_MAKEFLAGS) \

573

@@ -732,13 +822,15 @@

574

&& rm -rf "$$dc_destdir" \

575

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

576

&& rm -rf $(DIST_ARCHIVES) \

577

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

578

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

579

+ && cd "$$am__cwd" \

580

+ || exit 1

581

$(am__remove_distdir)

582

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

583

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

584

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

585

distuninstallcheck:

586

- @cd $(distuninstallcheck_dir) \

587

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

588

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

589

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

590

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

591

@@ -783,6 +875,7 @@

592

593

distclean-generic:

594

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

595

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

596

597

maintainer-clean-generic:

598

@echo "This command is intended for maintainers to use"

599

@@ -802,6 +895,8 @@

600

601

html: html-recursive

602

603

+html-am:

604

+

605

info: info-recursive

606

607

info-am:

608

@@ -811,18 +906,28 @@

609

610

install-dvi: install-dvi-recursive

611

612

+install-dvi-am:

613

+

614

install-exec-am:

615

616

install-html: install-html-recursive

617

618

+install-html-am:

619

+

620

install-info: install-info-recursive

621

622

+install-info-am:

623

+

624

install-man: install-man1

625

626

install-pdf: install-pdf-recursive

627

628

+install-pdf-am:

629

+

630

install-ps: install-ps-recursive

631

632

+install-ps-am:

633

+

634

installcheck-am:

635

636

maintainer-clean: maintainer-clean-recursive

637

@@ -848,20 +953,20 @@

638

639

uninstall-man: uninstall-man1

640

641

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

642

- install-strip

643

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

644

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

645

646

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

647

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

648

ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \

649

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

650

- distclean distclean-generic distclean-hdr distclean-tags \

651

- distcleancheck distdir distuninstallcheck dvi dvi-am html \

652

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

653

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

654

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

655

- install-iconDATA install-info install-info-am install-man \

656

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

657

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

658

+ distcheck distclean distclean-generic distclean-hdr \

659

+ distclean-tags distcleancheck distdir distuninstallcheck dvi \

660

+ dvi-am html html-am info info-am install install-am \

661

+ install-data install-data-am install-desktopDATA install-dvi \

662

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

663

+ install-html-am install-iconDATA install-info install-info-am \

664

+ install-man install-man1 install-pdf install-pdf-am install-ps \

665

install-ps-am install-readmeDATA install-strip installcheck \

666

installcheck-am installdirs installdirs-am maintainer-clean \

667

maintainer-clean-generic mostlyclean mostlyclean-generic pdf \

668

@@ -919,6 +1024,7 @@

669

670

dist-hook: geeqie.spec

671

cp $(top_builddir)/geeqie.spec $(distdir)

672

+

673

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

674

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

675

.NOEXPORT:

676

--- a/aclocal.m4

677

+++ b/aclocal.m4

678

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

679

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

680

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

681

682

683

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

684

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

685

# This file is free software; the Free Software Foundation

686

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

687

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

688

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

689

690

m4_ifndef([AC_AUTOCONF_VERSION],

691

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

692

-m4_if(AC_AUTOCONF_VERSION, [2.63],,

693

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

694

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

695

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

696

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

697

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

698

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

699

@@ -114,8 +114,9 @@

700

{

701

int major, minor, micro;

702

char *tmp_version;

703

+ int ignored;

704

705

- system ("touch conf.glibtest");

706

+ ignored = system ("touch conf.glibtest");

707

708

/* HP/UX 9 (%@#!) writes to sscanf strings */

709

tmp_version = g_strdup("$min_glib_version");

710

@@ -586,6 +587,18 @@

711

fi

712

fi

713

714

+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly

715

+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).

716

+ dnl Try to locate is.

717

+ MKINSTALLDIRS=

718

+ if test -n "$ac_aux_dir"; then

719

+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"

720

+ fi

721

+ if test -z "$MKINSTALLDIRS"; then

722

+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"

723

+ fi

724

+ AC_SUBST(MKINSTALLDIRS)

725

+

726

dnl Generate list of files to be processed by xgettext which will

727

dnl be included in po/Makefile.

728

test -d po || mkdir po

729

@@ -1143,14 +1156,16 @@

730

# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])

731

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

732

m4_define([_PKG_CONFIG],

733

-[if test -n "$$1"; then

734

- pkg_cv_[]$1="$$1"

735

- elif test -n "$PKG_CONFIG"; then

736

- PKG_CHECK_EXISTS([$3],

737

- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],

738

- [pkg_failed=yes])

739

- else

740

- pkg_failed=untried

741

+[if test -n "$PKG_CONFIG"; then

742

+ if test -n "$$1"; then

743

+ pkg_cv_[]$1="$$1"

744

+ else

745

+ PKG_CHECK_EXISTS([$3],

746

+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],

747

+ [pkg_failed=yes])

748

+ fi

749

+else

750

+ pkg_failed=untried

751

fi[]dnl

752

])# _PKG_CONFIG

753

754

@@ -1194,9 +1209,9 @@

755

if test $pkg_failed = yes; then

756

_PKG_SHORT_ERRORS_SUPPORTED

757

if test $_pkg_short_errors_supported = yes; then

758

- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`

759

+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`

760

else

761

- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`

762

+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`

763

fi

764

# Put the nasty error message in config.log where it belongs

765

echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

766

@@ -1231,7 +1246,7 @@

767

fi[]dnl

768

])# PKG_CHECK_MODULES

769

770

771

772

#

773

# This file is free software; the Free Software Foundation

774

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

775

@@ -1243,10 +1258,10 @@

776

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

777

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

778

AC_DEFUN([AM_AUTOMAKE_VERSION],

779

-[am__api_version='1.10'

780

+[am__api_version='1.11'

781

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

782

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

783

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

784

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

785

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

786

])

787

788

@@ -1260,12 +1275,12 @@

789

# AM_SET_CURRENT_AUTOMAKE_VERSION

790

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

791

# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

792

-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

793

+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

794

AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

795

-[AM_AUTOMAKE_VERSION([1.10.1])dnl

796

+[AM_AUTOMAKE_VERSION([1.11])dnl

797

m4_ifndef([AC_AUTOCONF_VERSION],

798

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

799

-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])

800

+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

801

802

# AM_AUX_DIR_EXPAND -*- Autoconf -*-

803

804

@@ -1322,14 +1337,14 @@

805

806

# AM_CONDITIONAL -*- Autoconf -*-

807

808

809

810

# Free Software Foundation, Inc.

811

#

812

# This file is free software; the Free Software Foundation

813

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

814

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

815

816

-# serial 8

817

+# serial 9

818

819

# AM_CONDITIONAL(NAME, SHELL-CONDITION)

820

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

821

@@ -1342,6 +1357,7 @@

822

AC_SUBST([$1_FALSE])dnl

823

_AM_SUBST_NOTMAKE([$1_TRUE])dnl

824

_AM_SUBST_NOTMAKE([$1_FALSE])dnl

825

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

826

if $2; then

827

$1_TRUE=

828

$1_FALSE='#'

829

@@ -1355,14 +1371,14 @@

830

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

831

fi])])

832

833

834

835

# Free Software Foundation, Inc.

836

#

837

# This file is free software; the Free Software Foundation

838

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

839

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

840

841

-# serial 9

842

+# serial 10

843

844

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

845

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

846

@@ -1419,6 +1435,16 @@

847

if test "$am_compiler_list" = ""; then

848

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

849

fi

850

+ am__universal=false

851

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

852

+ [case " $depcc " in #(

853

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

854

+ esac],

855

+ [CXX],

856

+ [case " $depcc " in #(

857

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

858

+ esac])

859

+

860

for depmode in $am_compiler_list; do

861

# Setup a source with many dependencies, because some compilers

862

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

863

@@ -1436,7 +1462,17 @@

864

done

865

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

866

867

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

868

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

869

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

870

+ # versions had trouble with output in subdirs

871

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

872

+ am__minus_obj="-o $am__obj"

873

case $depmode in

874

+ gcc)

875

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

876

+ test "$am__universal" = false || continue

877

+ ;;

878

nosideeffect)

879

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

880

# only be used when explicitly requested

881

@@ -1446,19 +1482,23 @@

882

break

883

fi

884

;;

885

+ msvisualcpp | msvcmsys)

886

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

887

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

888

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

889

+ am__obj=conftest.${OBJEXT-o}

890

+ am__minus_obj=

891

+ ;;

892

none) break ;;

893

esac

894

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

895

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

896

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

897

if depmode=$depmode \

898

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

899

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

900

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

901

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

902

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

903

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

904

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

905

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

906

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

907

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

908

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

909

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

910

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

911

@@ -1515,57 +1555,68 @@

912

913

# Generate code to set up dependency tracking. -*- Autoconf -*-

914

915

916

917

# Free Software Foundation, Inc.

918

#

919

# This file is free software; the Free Software Foundation

920

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

921

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

922

923

-#serial 3

924

+#serial 5

925

926

# _AM_OUTPUT_DEPENDENCY_COMMANDS

927

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

928

AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

929

-[for mf in $CONFIG_FILES; do

930

- # Strip MF so we end up with the name of the file.

931

- mf=`echo "$mf" | sed -e 's/:.*$//'`

932

- # Check whether this is an Automake generated Makefile or not.

933

- # We used to match only the files named `Makefile.in', but

934

- # some people rename them; so instead we look at the file content.

935

- # Grep'ing the first line is not enough: some people post-process

936

- # each Makefile.in and add a new line on top of each file to say so.

937

- # Grep'ing the whole file is not good either: AIX grep has a line

938

- # limit of 2048, but all sed's we know have understand at least 4000.

939

- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

940

- dirpart=`AS_DIRNAME("$mf")`

941

- else

942

- continue

943

- fi

944

- # Extract the definition of DEPDIR, am__include, and am__quote

945

- # from the Makefile without running `make'.

946

- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

947

- test -z "$DEPDIR" && continue

948

- am__include=`sed -n 's/^am__include = //p' < "$mf"`

949

- test -z "am__include" && continue

950

- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

951

- # When using ansi2knr, U may be empty or an underscore; expand it

952

- U=`sed -n 's/^U = //p' < "$mf"`

953

- # Find all dependency output files, they are included files with

954

- # $(DEPDIR) in their names. We invoke sed twice because it is the

955

- # simplest approach to changing $(DEPDIR) to its actual value in the

956

- # expansion.

957

- for file in `sed -n "

958

- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

959

- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

960

- # Make sure the directory exists.

961

- test -f "$dirpart/$file" && continue

962

- fdir=`AS_DIRNAME(["$file"])`

963

- AS_MKDIR_P([$dirpart/$fdir])

964

- # echo "creating $dirpart/$file"

965

- echo '# dummy' > "$dirpart/$file"

966

+[{

967

+ # Autoconf 2.62 quotes --file arguments for eval, but not when files

968

+ # are listed without --file. Let's play safe and only enable the eval

969

+ # if we detect the quoting.

970

+ case $CONFIG_FILES in

971

+ *\'*) eval set x "$CONFIG_FILES" ;;

972

+ *) set x $CONFIG_FILES ;;

973

+ esac

974

+ shift

975

+ for mf

976

+ do

977

+ # Strip MF so we end up with the name of the file.

978

+ mf=`echo "$mf" | sed -e 's/:.*$//'`

979

+ # Check whether this is an Automake generated Makefile or not.

980

+ # We used to match only the files named `Makefile.in', but

981

+ # some people rename them; so instead we look at the file content.

982

+ # Grep'ing the first line is not enough: some people post-process

983

+ # each Makefile.in and add a new line on top of each file to say so.

984

+ # Grep'ing the whole file is not good either: AIX grep has a line

985

+ # limit of 2048, but all sed's we know have understand at least 4000.

986

+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

987

+ dirpart=`AS_DIRNAME("$mf")`

988

+ else

989

+ continue

990

+ fi

991

+ # Extract the definition of DEPDIR, am__include, and am__quote

992

+ # from the Makefile without running `make'.

993

+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

994

+ test -z "$DEPDIR" && continue

995

+ am__include=`sed -n 's/^am__include = //p' < "$mf"`

996

+ test -z "am__include" && continue

997

+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

998

+ # When using ansi2knr, U may be empty or an underscore; expand it

999

+ U=`sed -n 's/^U = //p' < "$mf"`

1000

+ # Find all dependency output files, they are included files with

1001

+ # $(DEPDIR) in their names. We invoke sed twice because it is the

1002

+ # simplest approach to changing $(DEPDIR) to its actual value in the

1003

+ # expansion.

1004

+ for file in `sed -n "

1005

+ s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

1006

+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

1007

+ # Make sure the directory exists.

1008

+ test -f "$dirpart/$file" && continue

1009

+ fdir=`AS_DIRNAME(["$file"])`

1010

+ AS_MKDIR_P([$dirpart/$fdir])

1011

+ # echo "creating $dirpart/$file"

1012

+ echo '# dummy' > "$dirpart/$file"

1013

+ done

1014

done

1015

-done

1016

+}

1017

])# _AM_OUTPUT_DEPENDENCY_COMMANDS

1018

1019

1020

@@ -1585,13 +1636,13 @@

1021

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

1022

1023

1024

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

1025

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

1026

#

1027

# This file is free software; the Free Software Foundation

1028

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

1029

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

1030

1031

-# serial 13

1032

+# serial 16

1033

1034

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

1035

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

1036

@@ -1608,7 +1659,7 @@

1037

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

1038

# release and drop the old call support.

1039

AC_DEFUN([AM_INIT_AUTOMAKE],

1040

-[AC_PREREQ([2.60])dnl

1041

+[AC_PREREQ([2.62])dnl

1042

dnl Autoconf wants to disallow AM_ names. We explicitly allow

1043

dnl the ones we care about.

1044

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

1045

@@ -1659,8 +1710,8 @@

1046

AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})

1047

AM_MISSING_PROG(AUTOHEADER, autoheader)

1048

AM_MISSING_PROG(MAKEINFO, makeinfo)

1049

-AM_PROG_INSTALL_SH

1050

-AM_PROG_INSTALL_STRIP

1051

+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl

1052

+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl

1053

AC_REQUIRE([AM_PROG_MKDIR_P])dnl

1054

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

1055

# some platforms.

1056

@@ -1668,24 +1719,37 @@

1057

AC_REQUIRE([AC_PROG_MAKE_SET])dnl

1058

AC_REQUIRE([AM_SET_LEADING_DOT])dnl

1059

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

1060

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

1061

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

1062

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

1063

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

1064

_AM_IF_OPTION([no-dependencies],,

1065

[AC_PROVIDE_IFELSE([AC_PROG_CC],

1066

- [_AM_DEPENDENCIES(CC)],

1067

- [define([AC_PROG_CC],

1068

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

1069

+ [_AM_DEPENDENCIES(CC)],

1070

+ [define([AC_PROG_CC],

1071

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

1072

AC_PROVIDE_IFELSE([AC_PROG_CXX],

1073

- [_AM_DEPENDENCIES(CXX)],

1074

- [define([AC_PROG_CXX],

1075

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

1076

+ [_AM_DEPENDENCIES(CXX)],

1077

+ [define([AC_PROG_CXX],

1078

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

1079

AC_PROVIDE_IFELSE([AC_PROG_OBJC],

1080

- [_AM_DEPENDENCIES(OBJC)],

1081

- [define([AC_PROG_OBJC],

1082

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

1083

+ [_AM_DEPENDENCIES(OBJC)],

1084

+ [define([AC_PROG_OBJC],

1085

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

1086

])

1087

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

1088

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

1089

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

1090

+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.

1091

+AC_CONFIG_COMMANDS_PRE(dnl

1092

+[m4_provide_if([_AM_COMPILER_EXEEXT],

1093

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

1094

])

1095

1096

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

1097

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

1098

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

1099

+m4_define([_AC_COMPILER_EXEEXT],

1100

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

1101

+

1102

1103

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

1104

# This file resides in the same directory as the config header

1105

@@ -1708,7 +1772,7 @@

1106

done

1107

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

1108

1109

1110

1111

#

1112

# This file is free software; the Free Software Foundation

1113

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

1114

@@ -1719,7 +1783,14 @@

1115

# Define $install_sh.

1116

AC_DEFUN([AM_PROG_INSTALL_SH],

1117

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

1118

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

1119

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

1120

+ case $am_aux_dir in

1121

+ *\ * | *\ *)

1122

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

1123

+ *)

1124

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

1125

+ esac

1126

+fi

1127

AC_SUBST(install_sh)])

1128

1129

1130

@@ -1746,27 +1817,38 @@

1131

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

1132

# From Jim Meyering

1133

1134

1135

1136

# Free Software Foundation, Inc.

1137

#

1138

# This file is free software; the Free Software Foundation

1139

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

1140

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

1141

1142

-# serial 4

1143

+# serial 5

1144

1145

+# AM_MAINTAINER_MODE([DEFAULT-MODE])

1146

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

1147

+# Control maintainer-specific portions of Makefiles.

1148

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

1149

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

1150

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

1151

AC_DEFUN([AM_MAINTAINER_MODE],

1152

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

1153

- dnl maintainer-mode is disabled by default

1154

- AC_ARG_ENABLE(maintainer-mode,

1155

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

1156

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

1157

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

1158

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

1159

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

1160

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

1161

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

1162

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

1163

+ AC_ARG_ENABLE([maintainer-mode],

1164

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

1165

(and sometimes confusing) to the casual installer],

1166

- USE_MAINTAINER_MODE=$enableval,

1167

- USE_MAINTAINER_MODE=no)

1168

+ [USE_MAINTAINER_MODE=$enableval],

1169

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

1170

AC_MSG_RESULT([$USE_MAINTAINER_MODE])

1171

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

1172

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

1173

MAINT=$MAINTAINER_MODE_TRUE

1174

- AC_SUBST(MAINT)dnl

1175

+ AC_SUBST([MAINT])dnl

1176

]

1177

)

1178

1179

@@ -1774,13 +1856,13 @@

1180

1181

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

1182

1183

1184

1185

#

1186

# This file is free software; the Free Software Foundation

1187

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

1188

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

1189

1190

-# serial 3

1191

+# serial 4

1192

1193

# AM_MAKE_INCLUDE()

1194

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

1195

@@ -1789,7 +1871,7 @@

1196

[am_make=${MAKE-make}

1197

cat > confinc << 'END'

1198

am__doit:

1199

- @echo done

1200

+ @echo this is the am__doit target

1201

.PHONY: am__doit

1202

END

1203

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

1204

@@ -1799,24 +1881,24 @@

1205

_am_result=none

1206

# First try GNU make style include.

1207

echo "include confinc" > confmf

1208

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

1209

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

1210

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

1211

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

1212

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

1213

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

1214

- am__include=include

1215

- am__quote=

1216

- _am_result=GNU

1217

-fi

1218

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

1219

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

1220

+*the\ am__doit\ target*)

1221

+ am__include=include

1222

+ am__quote=

1223

+ _am_result=GNU

1224

+ ;;

1225

+esac

1226

# Now try BSD make style include.

1227

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

1228

echo '.include "confinc"' > confmf

1229

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

1230

- am__include=.include

1231

- am__quote="\""

1232

- _am_result=BSD

1233

- fi

1234

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

1235

+ *the\ am__doit\ target*)

1236

+ am__include=.include

1237

+ am__quote="\""

1238

+ _am_result=BSD

1239

+ ;;

1240

+ esac

1241

fi

1242

AC_SUBST([am__include])

1243

AC_SUBST([am__quote])

1244

@@ -1826,14 +1908,14 @@

1245

1246

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

1247

1248

1249

1250

# Free Software Foundation, Inc.

1251

#

1252

# This file is free software; the Free Software Foundation

1253

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

1254

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

1255

1256

-# serial 5

1257

+# serial 6

1258

1259

# AM_MISSING_PROG(NAME, PROGRAM)

1260

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

1261

@@ -1850,7 +1932,14 @@

1262

AC_DEFUN([AM_MISSING_HAS_RUN],

1263

[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

1264

AC_REQUIRE_AUX_FILE([missing])dnl

1265

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

1266

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

1267

+ case $am_aux_dir in

1268

+ *\ * | *\ *)

1269

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

1270

+ *)

1271

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

1272

+ esac

1273

+fi

1274

# Use eval to expand $SHELL

1275

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

1276

am_missing_run="$MISSING --run "

1277

@@ -1888,13 +1977,13 @@

1278

1279

# Helper functions for option handling. -*- Autoconf -*-

1280

1281

1282

1283

#

1284

# This file is free software; the Free Software Foundation

1285

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

1286

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

1287

1288

-# serial 3

1289

+# serial 4

1290

1291

# _AM_MANGLE_OPTION(NAME)

1292

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

1293

@@ -1911,7 +2000,7 @@

1294

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

1295

# OPTIONS is a space-separated list of Automake options.

1296

AC_DEFUN([_AM_SET_OPTIONS],

1297

-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

1298

+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

1299

1300

# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])

1301

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

1302

@@ -1921,14 +2010,14 @@

1303

1304

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

1305

1306

1307

1308

# Free Software Foundation, Inc.

1309

#

1310

# This file is free software; the Free Software Foundation

1311

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

1312

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

1313

1314

-# serial 4

1315

+# serial 5

1316

1317

# AM_SANITY_CHECK

1318

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

1319

@@ -1937,16 +2026,29 @@

1320

# Just in case

1321

sleep 1

1322

echo timestamp > conftest.file

1323

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

1324

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

1325

+am_lf='

1326

+'

1327

+case `pwd` in

1328

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

1329

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

1330

+esac

1331

+case $srcdir in

1332

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

1333

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

1334

+esac

1335

+

1336

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

1337

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

1338

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

1339

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

1340

# directory).

1341

if (

1342

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

1343

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

1344

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

1345

# -L didn't work.

1346

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

1347

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

1348

fi

1349

rm -f conftest.file

1350

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

1351

@@ -1999,18 +2101,25 @@

1352

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

1353

AC_SUBST([INSTALL_STRIP_PROGRAM])])

1354

1355

1356

1357

#

1358

# This file is free software; the Free Software Foundation

1359

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

1360

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

1361

1362

+# serial 2

1363

+

1364

# _AM_SUBST_NOTMAKE(VARIABLE)

1365

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

1366

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

1367

# This macro is traced by Automake.

1368

AC_DEFUN([_AM_SUBST_NOTMAKE])

1369

1370

+# AM_SUBST_NOTMAKE(VARIABLE)

1371

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

1372

+# Public sister of _AM_SUBST_NOTMAKE.

1373

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

1374

+

1375

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

1376

1377

1378

--- a/auxdir/depcomp

1379

+++ b/auxdir/depcomp

1380

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

1381

#! /bin/sh

1382

# depcomp - compile a program generating dependencies as side-effects

1383

1384

-scriptversion=2007-03-29.01

1385

+scriptversion=2009-04-28.21; # UTC

1386

1387

1388

-# Foundation, Inc.

1389

1390

+# Software Foundation, Inc.

1391

1392

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

1393

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

1394

@@ -17,9 +17,7 @@

1395

# GNU General Public License for more details.

1396

1397

# You should have received a copy of the GNU General Public License

1398

-# along with this program; if not, write to the Free Software

1399

-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

1400

-# 02110-1301, USA.

1401

+# along with this program. If not, see <http://www.gnu.org/licenses/>.

1402

1403

# As a special exception to the GNU General Public License, if you

1404

# distribute this file as part of a program that contains a

1405

@@ -87,6 +85,15 @@

1406

depmode=dashmstdout

1407

fi

1408

1409

+cygpath_u="cygpath -u -f -"

1410

+if test "$depmode" = msvcmsys; then

1411

+ # This is just like msvisualcpp but w/o cygpath translation.

1412

+ # Just convert the backslash-escaped backslashes to single forward

1413

+ # slashes to satisfy depend.m4

1414

+ cygpath_u="sed s,\\\\\\\\,/,g"

1415

+ depmode=msvisualcpp

1416

+fi

1417

+

1418

case "$depmode" in

1419

gcc3)

1420

## gcc 3 implements dependency tracking that does exactly what

1421

@@ -192,14 +199,14 @@

1422

' < "$tmpdepfile" \

1423

| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \

1424

tr '

1425

-' ' ' >> $depfile

1426

- echo >> $depfile

1427

+' ' ' >> "$depfile"

1428

+ echo >> "$depfile"

1429

1430

# The second pass generates a dummy entry for each header file.

1431

tr ' ' '

1432

' < "$tmpdepfile" \

1433

| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \

1434

- >> $depfile

1435

+ >> "$depfile"

1436

else

1437

# The sourcefile does not contain any dependencies, so just

1438

# store a dummy comment line, to avoid errors with the Makefile

1439

@@ -328,7 +335,12 @@

1440

if test -f "$tmpdepfile"; then

1441

sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"

1442

# Add `dependent.h:' lines.

1443

- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"

1444

+ sed -ne '2,${

1445

+ s/^ *//

1446

+ s/ \\*$//

1447

+ s/$/:/

1448

+ p

1449

+ }' "$tmpdepfile" >> "$depfile"

1450

else

1451

echo "#dummy" > "$depfile"

1452

fi

1453

@@ -404,7 +416,7 @@

1454

1455

# Remove the call to Libtool.

1456

if test "$libtool" = yes; then

1457

- while test $1 != '--mode=compile'; do

1458

+ while test "X$1" != 'X--mode=compile'; do

1459

shift

1460

done

1461

shift

1462

@@ -455,32 +467,39 @@

1463

"$@" || exit $?

1464

# Remove any Libtool call

1465

if test "$libtool" = yes; then

1466

- while test $1 != '--mode=compile'; do

1467

+ while test "X$1" != 'X--mode=compile'; do

1468

shift

1469

done

1470

shift

1471

fi

1472

# X makedepend

1473

shift

1474

- cleared=no

1475

- for arg in "$@"; do

1476

+ cleared=no eat=no

1477

+ for arg

1478

+ do

1479

case $cleared in

1480

no)

1481

set ""; shift

1482

cleared=yes ;;

1483

esac

1484

+ if test $eat = yes; then

1485

+ eat=no

1486

+ continue

1487

+ fi

1488

case "$arg" in

1489

-D*|-I*)

1490

set fnord "$@" "$arg"; shift ;;

1491

# Strip any option that makedepend may not understand. Remove

1492

# the object too, otherwise makedepend will parse it as a source file.

1493

+ -arch)

1494

+ eat=yes ;;

1495

-*|$object)

1496

;;

1497

*)

1498

set fnord "$@" "$arg"; shift ;;

1499

esac

1500

done

1501

- obj_suffix="`echo $object | sed 's/^.*\././'`"

1502

+ obj_suffix=`echo "$object" | sed 's/^.*\././'`

1503

touch "$tmpdepfile"

1504

${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"

1505

rm -f "$depfile"

1506

@@ -500,7 +519,7 @@

1507

1508

# Remove the call to Libtool.

1509

if test "$libtool" = yes; then

1510

- while test $1 != '--mode=compile'; do

1511

+ while test "X$1" != 'X--mode=compile'; do

1512

shift

1513

done

1514

shift

1515

@@ -538,13 +557,27 @@

1516

1517

msvisualcpp)

1518

# Important note: in order to support this mode, a compiler *must*

1519

- # always write the preprocessed file to stdout, regardless of -o,

1520

- # because we must use -o when running libtool.

1521

+ # always write the preprocessed file to stdout.

1522

"$@" || exit $?

1523

+

1524

+ # Remove the call to Libtool.

1525

+ if test "$libtool" = yes; then

1526

+ while test "X$1" != 'X--mode=compile'; do

1527

+ shift

1528

+ done

1529

+ shift

1530

+ fi

1531

+

1532

IFS=" "

1533

for arg

1534

do

1535

case "$arg" in

1536

+ -o)

1537

+ shift

1538

+ ;;

1539

+ $object)

1540

+ shift

1541

+ ;;

1542

"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")

1543

set fnord "$@"

1544

shift

1545

@@ -557,16 +590,23 @@

1546

;;

1547

esac

1548

done

1549

- "$@" -E |

1550

- sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"

1551

+ "$@" -E 2>/dev/null |

1552

+ sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"

1553

rm -f "$depfile"

1554

echo "$object : \\" > "$depfile"

1555

- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s:: \1 \\:p' >> "$depfile"

1556

+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s:: \1 \\:p' >> "$depfile"

1557

echo " " >> "$depfile"

1558

- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::\1\::p' >> "$depfile"

1559

+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"

1560

rm -f "$tmpdepfile"

1561

;;

1562

1563

+msvcmsys)

1564

+ # This case exists only to let depend.m4 do its work. It works by

1565

+ # looking at the text of this script. This case will never be run,

1566

+ # since it is checked for above.

1567

+ exit 1

1568

+ ;;

1569

+

1570

none)

1571

exec "$@"

1572

;;

1573

@@ -585,5 +625,6 @@

1574

# eval: (add-hook 'write-file-hooks 'time-stamp)

1575

# time-stamp-start: "scriptversion="

1576

# time-stamp-format: "%:y-%02m-%02d.%02H"

1577

-# time-stamp-end: "$"

1578

+# time-stamp-time-zone: "UTC"

1579

+# time-stamp-end: "; # UTC"

1580

# End:

1581

--- a/auxdir/install-sh

1582

+++ b/auxdir/install-sh

1583

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

1584

#!/bin/sh

1585

# install - install a program, script, or datafile

1586

1587

-scriptversion=2006-12-25.00

1588

+scriptversion=2009-04-28.21; # UTC

1589

1590

# This originates from X11R5 (mit/util/scripts/install.sh), which was

1591

# later released in X11R6 (xc/config/util/install.sh) with the

1592

@@ -515,5 +515,6 @@

1593

# eval: (add-hook 'write-file-hooks 'time-stamp)

1594

# time-stamp-start: "scriptversion="

1595

# time-stamp-format: "%:y-%02m-%02d.%02H"

1596

-# time-stamp-end: "$"

1597

+# time-stamp-time-zone: "UTC"

1598

+# time-stamp-end: "; # UTC"

1599

# End:

1600

--- a/auxdir/missing

1601

+++ b/auxdir/missing

1602

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

1603

#! /bin/sh

1604

# Common stub for a few missing GNU programs while installing.

1605

1606

-scriptversion=2006-05-10.23

1607

+scriptversion=2009-04-28.21; # UTC

1608

1609

1610

-# Free Software Foundation, Inc.

1611

1612

+# 2008, 2009 Free Software Foundation, Inc.

1613

# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.

1614

1615

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

1616

@@ -18,9 +18,7 @@

1617

# GNU General Public License for more details.

1618

1619

# You should have received a copy of the GNU General Public License

1620

-# along with this program; if not, write to the Free Software

1621

-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

1622

-# 02110-1301, USA.

1623

+# along with this program. If not, see <http://www.gnu.org/licenses/>.

1624

1625

# As a special exception to the GNU General Public License, if you

1626

# distribute this file as part of a program that contains a

1627

@@ -89,6 +87,9 @@

1628

tar try tar, gnutar, gtar, then tar without non-portable flags

1629

yacc create \`y.tab.[ch]', if possible, from existing .[ch]

1630

1631

+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and

1632

+\`g' are ignored when checking the name.

1633

+

1634

Send bug reports to <bug-automake@gnu.org>."

1635

exit $?

1636

;;

1637

@@ -106,15 +107,22 @@

1638

1639

esac

1640

1641

+# normalize program name to check for.

1642

+program=`echo "$1" | sed '

1643

+ s/^gnu-//; t

1644

+ s/^gnu//; t

1645

+ s/^g//; t'`

1646

+

1647

# Now exit if we have it, but it failed. Also exit now if we

1648

# don't have it and --version was passed (most likely to detect

1649

-# the program).

1650

+# the program). This is about non-GNU programs, so use $1 not

1651

+# $program.

1652

case $1 in

1653

- lex|yacc)

1654

+ lex*|yacc*)

1655

# Not GNU programs, they don't have --version.

1656

;;

1657

1658

- tar)

1659

+ tar*)

1660

if test -n "$run"; then

1661

echo 1>&2 "ERROR: \`tar' requires --run"

1662

exit 1

1663

@@ -138,7 +146,7 @@

1664

1665

# If it does not exist, or fails to run (possibly an outdated version),

1666

# try to emulate it.

1667

-case $1 in

1668

+case $program in

1669

aclocal*)

1670

echo 1>&2 "\

1671

WARNING: \`$1' is $msg. You should only need it if

1672

@@ -148,7 +156,7 @@

1673

touch aclocal.m4

1674

;;

1675

1676

- autoconf)

1677

+ autoconf*)

1678

echo 1>&2 "\

1679

WARNING: \`$1' is $msg. You should only need it if

1680

you modified \`${configure_ac}'. You might want to install the

1681

@@ -157,7 +165,7 @@

1682

touch configure

1683

;;

1684

1685

- autoheader)

1686

+ autoheader*)

1687

echo 1>&2 "\

1688

WARNING: \`$1' is $msg. You should only need it if

1689

you modified \`acconfig.h' or \`${configure_ac}'. You might want

1690

@@ -187,7 +195,7 @@

1691

while read f; do touch "$f"; done

1692

;;

1693

1694

- autom4te)

1695

+ autom4te*)

1696

echo 1>&2 "\

1697

WARNING: \`$1' is needed, but is $msg.

1698

You might have modified some files without having the

1699

@@ -210,7 +218,7 @@

1700

fi

1701

;;

1702

1703

- bison|yacc)

1704

+ bison*|yacc*)

1705

echo 1>&2 "\

1706

WARNING: \`$1' $msg. You should only need it if

1707

you modified a \`.y' file. You may need the \`Bison' package

1708

@@ -240,7 +248,7 @@

1709

fi

1710

;;

1711

1712

- lex|flex)

1713

+ lex*|flex*)

1714

echo 1>&2 "\

1715

WARNING: \`$1' is $msg. You should only need it if

1716

you modified a \`.l' file. You may need the \`Flex' package

1717

@@ -263,7 +271,7 @@

1718

fi

1719

;;

1720

1721

- help2man)

1722

+ help2man*)

1723

echo 1>&2 "\

1724

WARNING: \`$1' is $msg. You should only need it if

1725

you modified a dependency of a manual page. You may need the

1726

@@ -277,11 +285,11 @@

1727

else

1728

test -z "$file" || exec >$file

1729

echo ".ab help2man is required to generate this page"

1730

- exit 1

1731

+ exit $?

1732

fi

1733

;;

1734

1735

- makeinfo)

1736

+ makeinfo*)

1737

echo 1>&2 "\

1738

WARNING: \`$1' is $msg. You should only need it if

1739

you modified a \`.texi' or \`.texinfo' file, or any other file

1740

@@ -310,7 +318,7 @@

1741

touch $file

1742

;;

1743

1744

- tar)

1745

+ tar*)

1746

shift

1747

1748

# We have already tried tar in the generic part.

1749

@@ -363,5 +371,6 @@

1750

# eval: (add-hook 'write-file-hooks 'time-stamp)

1751

# time-stamp-start: "scriptversion="

1752

# time-stamp-format: "%:y-%02m-%02d.%02H"

1753

-# time-stamp-end: "$"

1754

+# time-stamp-time-zone: "UTC"

1755

+# time-stamp-end: "; # UTC"

1756

# End:

1757

--- a/auxdir/mkinstalldirs

1758

+++ b/auxdir/mkinstalldirs

1759

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

1760

#! /bin/sh

1761

# mkinstalldirs --- make directory hierarchy

1762

1763

-scriptversion=2006-05-11.19

1764

+scriptversion=2009-04-28.21; # UTC

1765

1766

# Original author: Noah Friedman <friedman@prep.ai.mit.edu>

1767

# Created: 1993-05-16

1768

@@ -157,5 +157,6 @@

1769

# eval: (add-hook 'write-file-hooks 'time-stamp)

1770

# time-stamp-start: "scriptversion="

1771

# time-stamp-format: "%:y-%02m-%02d.%02H"

1772

-# time-stamp-end: "$"

1773

+# time-stamp-time-zone: "UTC"

1774

+# time-stamp-end: "; # UTC"

1775

# End:

1776

--- a/config.h.in

1777

+++ b/config.h.in

1778

@@ -139,6 +139,9 @@

1779

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

1780

#undef PACKAGE_TARNAME

1781

1782

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

1783

+#undef PACKAGE_URL

1784

+

1785

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

1786

#undef PACKAGE_VERSION

1787

1788

--- a/configure

1789

+++ b/configure

1790

@@ -1,20 +1,22 @@

1791

#! /bin/sh

1792

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

1793

-# Generated by GNU Autoconf 2.63 for geeqie 1.0beta2.

1794

+# Generated by GNU Autoconf 2.64 for geeqie 1.0beta2.

1795

#

1796

# Report bugs to <geeqie-devel@lists.sourceforge.net>.

1797

#

1798

1799

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

1800

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

1801

+# Foundation, Inc.

1802

+#

1803

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

1804

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

1805

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

1806

-## M4sh Initialization. ##

1807

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

1808

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

1809

+## M4sh Initialization. ##

1810

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

1811

1812

# Be more Bourne compatible

1813

DUALCASE=1; export DUALCASE # for MKS sh

1814

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

1815

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

1816

emulate sh

1817

NULLCMD=:

1818

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

1819

@@ -22,23 +24,15 @@

1820

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

1821

setopt NO_GLOB_SUBST

1822

else

1823

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

1824

- *posix*) set -o posix ;;

1825

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

1826

+ *posix*) :

1827

+ set -o posix ;; #(

1828

+ *) :

1829

+ ;;

1830

esac

1831

-

1832

fi

1833

1834

1835

-

1836

-

1837

-# PATH needs CR

1838

-# Avoid depending upon Character Ranges.

1839

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

1840

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

1841

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

1842

-as_cr_digits='0123456789'

1843

-as_cr_alnum=$as_cr_Letters$as_cr_digits

1844

-

1845

as_nl='

1846

'

1847

export as_nl

1848

@@ -46,7 +40,13 @@

1849

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

1850

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

1851

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

1852

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

1853

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

1854

+# but without wasting forks for bash or zsh.

1855

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

1856

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

1857

+ as_echo='print -r --'

1858

+ as_echo_n='print -rn --'

1859

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

1860

as_echo='printf %s\n'

1861

as_echo_n='printf %s'

1862

else

1863

@@ -57,7 +57,7 @@

1864

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

1865

as_echo_n_body='eval

1866

arg=$1;

1867

- case $arg in

1868

+ case $arg in #(

1869

*"$as_nl"*)

1870

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

1871

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

1872

@@ -80,13 +80,6 @@

1873

}

1874

fi

1875

1876

-# Support unset when possible.

1877

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

1878

- as_unset=unset

1879

-else

1880

- as_unset=false

1881

-fi

1882

-

1883

1884

# IFS

1885

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

1886

@@ -96,15 +89,15 @@

1887

IFS=" "" $as_nl"

1888

1889

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

1890

-case $0 in

1891

+case $0 in #((

1892

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

1893

*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

1894

for as_dir in $PATH

1895

do

1896

IFS=$as_save_IFS

1897

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

1898

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

1899

-done

1900

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

1901

+ done

1902

IFS=$as_save_IFS

1903

1904

;;

1905

@@ -116,12 +109,16 @@

1906

fi

1907

if test ! -f "$as_myself"; then

1908

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

1909

- { (exit 1); exit 1; }

1910

+ exit 1

1911

fi

1912

1913

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

1914

-for as_var in ENV MAIL MAILPATH

1915

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

1916

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

1917

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

1918

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

1919

+# trigger a bug in pdksh 5.2.14.

1920

+for as_var in BASH_ENV ENV MAIL MAILPATH

1921

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

1922

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

1923

done

1924

PS1='$ '

1925

PS2='> '

1926

@@ -133,330 +130,300 @@

1927

LANGUAGE=C

1928

export LANGUAGE

1929

1930

-# Required to use basename.

1931

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

1932

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

1933

- as_expr=expr

1934

-else

1935

- as_expr=false

1936

-fi

1937

-

1938

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

1939

- as_basename=basename

1940

-else

1941

- as_basename=false

1942

-fi

1943

-

1944

-

1945

-# Name of the executable.

1946

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

1947

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

1948

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

1949

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

1950

-$as_echo X/"$0" |

1951

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

1952

- s//\1/

1953

- q

1954

- }

1955

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

1956

- s//\1/

1957

- q

1958

- }

1959

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

1960

- s//\1/

1961

- q

1962

- }

1963

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

1964

-

1965

# CDPATH.

1966

-$as_unset CDPATH

1967

-

1968

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

1969

1970

if test "x$CONFIG_SHELL" = x; then

1971

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

1972

- as_have_required=yes

1973

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

1974

+ emulate sh

1975

+ NULLCMD=:

1976

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

1977

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

1978

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

1979

+ setopt NO_GLOB_SUBST

1980

else

1981

- as_have_required=no

1982

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

1983

+ *posix*) :

1984

+ set -o posix ;; #(

1985

+ *) :

1986

+ ;;

1987

+esac

1988

fi

1989

-

1990

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

1991

-(as_func_return () {

1992

- (exit \$1)

1993

-}

1994

-as_func_success () {

1995

- as_func_return 0

1996

-}

1997

-as_func_failure () {

1998

- as_func_return 1

1999

-}

2000

-as_func_ret_success () {

2001

- return 0

2002

-}

2003

-as_func_ret_failure () {

2004

- return 1

2005

-}

2006

+"

2007

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

2008

+as_fn_success () { as_fn_return 0; }

2009

+as_fn_failure () { as_fn_return 1; }

2010

+as_fn_ret_success () { return 0; }

2011

+as_fn_ret_failure () { return 1; }

2012

2013

exitcode=0

2014

-if as_func_success; then

2015

- :

2016

-else

2017

- exitcode=1

2018

- echo as_func_success failed.

2019

-fi

2020

-

2021

-if as_func_failure; then

2022

- exitcode=1

2023

- echo as_func_failure succeeded.

2024

-fi

2025

-

2026

-if as_func_ret_success; then

2027

- :

2028

-else

2029

- exitcode=1

2030

- echo as_func_ret_success failed.

2031

-fi

2032

-

2033

-if as_func_ret_failure; then

2034

- exitcode=1

2035

- echo as_func_ret_failure succeeded.

2036

-fi

2037

-

2038

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

2039

- :

2040

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

2041

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

2042

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

2043

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

2044

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

2045

+

2046

+else

2047

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

2048

+fi

2049

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

2050

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

2051

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

2052

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

2053

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

2054

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

2055

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

2056

+ as_have_required=yes

2057

else

2058

- exitcode=1

2059

- echo positional parameters were not saved.

2060

+ as_have_required=no

2061

fi

2062

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

2063

2064

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

2065

-

2066

-(

2067

- as_lineno_1=\$LINENO

2068

- as_lineno_2=\$LINENO

2069

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

2070

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

2071

-") 2> /dev/null; then

2072

- :

2073

else

2074

- as_candidate_shells=

2075

- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

2076

+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

2077

+as_found=false

2078

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

2079

do

2080

IFS=$as_save_IFS

2081

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

2082

- case $as_dir in

2083

+ as_found=:

2084

+ case $as_dir in #(

2085

/*)

2086

for as_base in sh bash ksh sh5; do

2087

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

2088

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

2089

+ as_shell=$as_dir/$as_base

2090

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

2091

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

2092

+ CONFIG_SHELL=$as_shell as_have_required=yes

2093

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

2094

+ break 2

2095

+fi

2096

+fi

2097

done;;

2098

esac

2099

+ as_found=false

2100

done

2101

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

2102

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

2103

+ CONFIG_SHELL=$SHELL as_have_required=yes

2104

+fi; }

2105

IFS=$as_save_IFS

2106

2107

2108

- for as_shell in $as_candidate_shells $SHELL; do

2109

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

2110

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

2111

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

2112

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

2113

- emulate sh

2114

- NULLCMD=:

2115

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

2116

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

2117

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

2118

- setopt NO_GLOB_SUBST

2119

-else

2120

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

2121

- *posix*) set -o posix ;;

2122

-esac

2123

-

2124

-fi

2125

-

2126

-

2127

-:

2128

-_ASEOF

2129

-}; then

2130

- CONFIG_SHELL=$as_shell

2131

- as_have_required=yes

2132

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

2133

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

2134

- emulate sh

2135

- NULLCMD=:

2136

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

2137

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

2138

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

2139

- setopt NO_GLOB_SUBST

2140

-else

2141

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

2142

- *posix*) set -o posix ;;

2143

-esac

2144

-

2145

-fi

2146

-

2147

-

2148

-:

2149

-(as_func_return () {

2150

- (exit $1)

2151

-}

2152

-as_func_success () {

2153

- as_func_return 0

2154

-}

2155

-as_func_failure () {

2156

- as_func_return 1

2157

-}

2158

-as_func_ret_success () {

2159

- return 0

2160

-}

2161

-as_func_ret_failure () {

2162

- return 1

2163

-}

2164

-

2165

-exitcode=0

2166

-if as_func_success; then

2167

- :

2168

-else

2169

- exitcode=1

2170

- echo as_func_success failed.

2171

-fi

2172

-

2173

-if as_func_failure; then

2174

- exitcode=1

2175

- echo as_func_failure succeeded.

2176

-fi

2177

-

2178

-if as_func_ret_success; then

2179

- :

2180

-else

2181

- exitcode=1

2182

- echo as_func_ret_success failed.

2183

-fi

2184

-

2185

-if as_func_ret_failure; then

2186

- exitcode=1

2187

- echo as_func_ret_failure succeeded.

2188

-fi

2189

-

2190

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

2191

- :

2192

-else

2193

- exitcode=1

2194

- echo positional parameters were not saved.

2195

-fi

2196

-

2197

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

2198

-

2199

-(

2200

- as_lineno_1=$LINENO

2201

- as_lineno_2=$LINENO

2202

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

2203

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

2204

-

2205

-_ASEOF

2206

-}; then

2207

- break

2208

-fi

2209

-

2210

-fi

2211

-

2212

- done

2213

-

2214

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

2215

- for as_var in BASH_ENV ENV

2216

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

2217

- done

2218

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

2219

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

2220

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

2221

+ # works around shells that cannot unset nonexistent variables.

2222

+ BASH_ENV=/dev/null

2223

+ ENV=/dev/null

2224

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

2225

export CONFIG_SHELL

2226

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

2227

fi

2228

2229

-

2230

- if test $as_have_required = no; then

2231

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

2232

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

2233

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

2234

- echo shell if you do have one.

2235

- { (exit 1); exit 1; }

2236

+ if test x$as_have_required = xno; then :

2237

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

2238

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

2239

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

2240

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

2241

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

2242

+ else

2243

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

2244

+$0: geeqie-devel@lists.sourceforge.net about your system,

2245

+$0: including any error possibly output before this

2246

+$0: message. Then install a modern shell, or manually run

2247

+$0: the script under such a shell if you do have one."

2248

+ fi

2249

+ exit 1

2250

fi

2251

-

2252

-

2253

fi

2254

-

2255

fi

2256

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

2257

+export SHELL

2258

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

2259

+CLICOLOR_FORCE= GREP_OPTIONS=

2260

+unset CLICOLOR_FORCE GREP_OPTIONS

2261

2262

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

2263

+## M4sh Shell Functions. ##

2264

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

2265

+# as_fn_unset VAR

2266

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

2267

+# Portably unset VAR.

2268

+as_fn_unset ()

2269

+{

2270

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

2271

+}

2272

+as_unset=as_fn_unset

2273

+

2274

+# as_fn_set_status STATUS

2275

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

2276

+# Set $? to STATUS, without forking.

2277

+as_fn_set_status ()

2278

+{

2279

+ return $1

2280

+} # as_fn_set_status

2281

+

2282

+# as_fn_exit STATUS

2283

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

2284

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

2285

+as_fn_exit ()

2286

+{

2287

+ set +e

2288

+ as_fn_set_status $1

2289

+ exit $1

2290

+} # as_fn_exit

2291

+

2292

+# as_fn_mkdir_p

2293

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

2294

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

2295

+as_fn_mkdir_p ()

2296

+{

2297

2298

+ case $as_dir in #(

2299

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

2300

+ esac

2301

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

2302

+ as_dirs=

2303

+ while :; do

2304

+ case $as_dir in #(

2305

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

2306

+ *) as_qdir=$as_dir;;

2307

+ esac

2308

+ as_dirs="'$as_qdir' $as_dirs"

2309

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

2310

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

2311

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

2312

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

2313

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

2314

+$as_echo X"$as_dir" |

2315

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

2316

+ s//\1/

2317

+ q

2318

+ }

2319

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

2320

+ s//\1/

2321

+ q

2322

+ }

2323

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

2324

+ s//\1/

2325

+ q

2326

+ }

2327

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

2328

+ s//\1/

2329

+ q

2330

+ }

2331

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

2332

+ test -d "$as_dir" && break

2333

+ done

2334

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

2335

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

2336

2337

-(eval "as_func_return () {

2338

- (exit \$1)

2339

-}

2340

-as_func_success () {

2341

- as_func_return 0

2342

-}

2343

-as_func_failure () {

2344

- as_func_return 1

2345

-}

2346

-as_func_ret_success () {

2347

- return 0

2348

-}

2349

-as_func_ret_failure () {

2350

- return 1

2351

-}

2352

2353

-exitcode=0

2354

-if as_func_success; then

2355

- :

2356

+} # as_fn_mkdir_p

2357

+# as_fn_append VAR VALUE

2358

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

2359

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

2360

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

2361

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

2362

+# implementations.

2363

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

2364

+ eval 'as_fn_append ()

2365

+ {

2366

+ eval $1+=\$2

2367

+ }'

2368

else

2369

- exitcode=1

2370

- echo as_func_success failed.

2371

-fi

2372

+ as_fn_append ()

2373

+ {

2374

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

2375

+ }

2376

+fi # as_fn_append

2377

2378

-if as_func_failure; then

2379

- exitcode=1

2380

- echo as_func_failure succeeded.

2381

-fi

2382

+# as_fn_arith ARG...

2383

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

2384

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

2385

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

2386

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

2387

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

2388

+ eval 'as_fn_arith ()

2389

+ {

2390

+ as_val=$(( $* ))

2391

+ }'

2392

+else

2393

+ as_fn_arith ()

2394

+ {

2395

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

2396

+ }

2397

+fi # as_fn_arith

2398

2399

-if as_func_ret_success; then

2400

- :

2401

+

2402

+# as_fn_error ERROR [LINENO LOG_FD]

2403

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

2404

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

2405

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

2406

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

2407

+as_fn_error ()

2408

+{

2409

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

2410

+ if test "$3"; then

2411

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

2412

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

2413

+ fi

2414

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

2415

+ as_fn_exit $as_status

2416

+} # as_fn_error

2417

+

2418

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

2419

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

2420

+ as_expr=expr

2421

else

2422

- exitcode=1

2423

- echo as_func_ret_success failed.

2424

+ as_expr=false

2425

fi

2426

2427

-if as_func_ret_failure; then

2428

- exitcode=1

2429

- echo as_func_ret_failure succeeded.

2430

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

2431

+ as_basename=basename

2432

+else

2433

+ as_basename=false

2434

fi

2435

2436

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

2437

- :

2438

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

2439

+ as_dirname=dirname

2440

else

2441

- exitcode=1

2442

- echo positional parameters were not saved.

2443

+ as_dirname=false

2444

fi

2445

2446

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

2447

- echo No shell found that supports shell functions.

2448

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

2449

- echo including any error possibly output before this message.

2450

- echo This can help us improve future autoconf versions.

2451

- echo Configuration will now proceed without shell functions.

2452

-}

2453

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

2454

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

2455

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

2456

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

2457

+$as_echo X/"$0" |

2458

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

2459

+ s//\1/

2460

+ q

2461

+ }

2462

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

2463

+ s//\1/

2464

+ q

2465

+ }

2466

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

2467

+ s//\1/

2468

+ q

2469

+ }

2470

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

2471

2472

+# Avoid depending upon Character Ranges.

2473

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

2474

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

2475

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

2476

+as_cr_digits='0123456789'

2477

+as_cr_alnum=$as_cr_Letters$as_cr_digits

2478

2479

2480

- as_lineno_1=$LINENO

2481

- as_lineno_2=$LINENO

2482

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

2483

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

2484

-

2485

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

2486

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

2487

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

2488

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

2489

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

2490

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

2491

- # case at line end.

2492

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

2493

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

2494

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

2495

+ as_lineno_1=$LINENO as_lineno_1a=$LINENO

2496

+ as_lineno_2=$LINENO as_lineno_2a=$LINENO

2497

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

2498

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

2499

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

2500

sed -n '

2501

p

2502

/[$]LINENO/=

2503

@@ -473,8 +440,7 @@

2504

s/-\n.*//

2505

' >$as_me.lineno &&

2506

chmod +x "$as_me.lineno" ||

2507

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

2508

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

2509

+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }

2510

2511

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

2512

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

2513

@@ -484,29 +450,18 @@

2514

exit

2515

}

2516

2517

-

2518

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

2519

- as_dirname=dirname

2520

-else

2521

- as_dirname=false

2522

-fi

2523

-

2524

ECHO_C= ECHO_N= ECHO_T=

2525

-case `echo -n x` in

2526

+case `echo -n x` in #(((((

2527

-n*)

2528

- case `echo 'x\c'` in

2529

+ case `echo 'xy\c'` in

2530

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

2531

- *) ECHO_C='\c';;

2532

+ xy) ECHO_C='\c';;

2533

+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null

2534

+ ECHO_T=' ';;

2535

esac;;

2536

*)

2537

ECHO_N='-n';;

2538

esac

2539

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

2540

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

2541

- as_expr=expr

2542

-else

2543

- as_expr=false

2544

-fi

2545

2546

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

2547

if test -d conf$$.dir; then

2548

@@ -536,7 +491,7 @@

2549

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

2550

2551

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

2552

- as_mkdir_p=:

2553

+ as_mkdir_p='mkdir -p "$as_dir"'

2554

else

2555

test -d ./-p && rmdir ./-p

2556

as_mkdir_p=false

2557

@@ -555,10 +510,10 @@

2558

if test -d "$1"; then

2559

test -d "$1/.";

2560

else

2561

- case $1 in

2562

+ case $1 in #(

2563

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

2564

esac;

2565

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

2566

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

2567

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

2568

'\'' sh

2569

'

2570

@@ -572,7 +527,6 @@

2571

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

2572

2573

2574

-

2575

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

2576

2577

# Name of the host.

2578

@@ -591,7 +545,6 @@

2579

subdirs=

2580

MFLAGS=

2581

MAKEFLAGS=

2582

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

2583

2584

# Identity of this package.

2585

PACKAGE_NAME='geeqie'

2586

@@ -599,6 +552,7 @@

2587

PACKAGE_VERSION='1.0beta2'

2588

PACKAGE_STRING='geeqie 1.0beta2'

2589

PACKAGE_BUGREPORT='geeqie-devel@lists.sourceforge.net'

2590

+PACKAGE_URL=''

2591

2592

ac_unique_file="src/main.c"

2593

# Factoring default headers for most tests.

2594

@@ -637,7 +591,9 @@

2595

# include <unistd.h>

2596

#endif"

2597

2598

-ac_subst_vars='LTLIBOBJS

2599

+ac_subst_vars='am__EXEEXT_FALSE

2600

+am__EXEEXT_TRUE

2601

+LTLIBOBJS

2602

LIBOBJS

2603

HAVE_LIBCHAMPLAIN_GTK_FALSE

2604

HAVE_LIBCHAMPLAIN_GTK_TRUE

2605

@@ -645,6 +601,7 @@

2606

LIBCHAMPLAIN_GTK_CFLAGS

2607

LIBCHAMPLAIN_LIBS

2608

LIBCHAMPLAIN_CFLAGS

2609

+MKINSTALLDIRS

2610

POSUB

2611

POFILES

2612

PO_IN_DATADIR_FALSE

2613

@@ -854,6 +811,7 @@

2614

program_transform_name

2615

prefix

2616

exec_prefix

2617

+PACKAGE_URL

2618

PACKAGE_BUGREPORT

2619

PACKAGE_STRING

2620

PACKAGE_VERSION

2621

@@ -1024,8 +982,7 @@

2622

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

2623

# Reject names that are not valid shell variable names.

2624

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

2625

- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2

2626

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

2627

+ as_fn_error "invalid feature name: $ac_useropt"

2628

ac_useropt_orig=$ac_useropt

2629

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

2630

case $ac_user_opts in

2631

@@ -1051,8 +1008,7 @@

2632

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

2633

# Reject names that are not valid shell variable names.

2634

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

2635

- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2

2636

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

2637

+ as_fn_error "invalid feature name: $ac_useropt"

2638

ac_useropt_orig=$ac_useropt

2639

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

2640

case $ac_user_opts in

2641

@@ -1256,8 +1212,7 @@

2642

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

2643

# Reject names that are not valid shell variable names.

2644

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

2645

- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2

2646

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

2647

+ as_fn_error "invalid package name: $ac_useropt"

2648

ac_useropt_orig=$ac_useropt

2649

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

2650

case $ac_user_opts in

2651

@@ -1273,8 +1228,7 @@

2652

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

2653

# Reject names that are not valid shell variable names.

2654

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

2655

- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2

2656

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

2657

+ as_fn_error "invalid package name: $ac_useropt"

2658

ac_useropt_orig=$ac_useropt

2659

ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

2660

case $ac_user_opts in

2661

@@ -1304,17 +1258,17 @@

2662

2663

x_libraries=$ac_optarg ;;

2664

2665

- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option

2666

-Try \`$0 --help' for more information." >&2

2667

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

2668

+ -*) as_fn_error "unrecognized option: \`$ac_option'

2669

+Try \`$0 --help' for more information."

2670

;;

2671

2672

*=*)

2673

ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`

2674

# Reject names that are not valid shell variable names.

2675

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

2676

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

2677

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

2678

+ case $ac_envvar in #(

2679

+ '' | [0-9]* | *[!_$as_cr_alnum]* )

2680

+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;

2681

+ esac

2682

eval $ac_envvar=\$ac_optarg

2683

export $ac_envvar ;;

2684

2685

@@ -1331,15 +1285,13 @@

2686

2687

if test -n "$ac_prev"; then

2688

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

2689

- { $as_echo "$as_me: error: missing argument to $ac_option" >&2

2690

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

2691

+ as_fn_error "missing argument to $ac_option"

2692

fi

2693

2694

if test -n "$ac_unrecognized_opts"; then

2695

case $enable_option_checking in

2696

no) ;;

2697

- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2

2698

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

2699

+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;

2700

*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;

2701

esac

2702

fi

2703

@@ -1362,8 +1314,7 @@

2704

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

2705

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

2706

esac

2707

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

2708

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

2709

+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"

2710

done

2711

2712

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

2713

@@ -1393,11 +1344,9 @@

2714

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

2715

ac_ls_di=`ls -di .` &&

2716

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

2717

- { $as_echo "$as_me: error: working directory cannot be determined" >&2

2718

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

2719

+ as_fn_error "working directory cannot be determined"

2720

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

2721

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

2722

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

2723

+ as_fn_error "pwd does not report name of working directory"

2724

2725

2726

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

2727

@@ -1436,13 +1385,11 @@

2728

fi

2729

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

2730

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

2731

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

2732

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

2733

+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"

2734

fi

2735

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

2736

ac_abs_confdir=`(

2737

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

2738

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

2739

+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"

2740

pwd)`

2741

# When building in place, set srcdir=.

2742

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

2743

@@ -1620,85 +1567,480 @@

2744

Use these variables to override the choices made by `configure' or to help

2745

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

2746

2747

-Report bugs to <geeqie-devel@lists.sourceforge.net>.

2748

+Report bugs to <geeqie-devel@lists.sourceforge.net>.

2749

+_ACEOF

2750

+ac_status=$?

2751

+fi

2752

+

2753

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

2754

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

2755

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

2756

+ test -d "$ac_dir" ||

2757

+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||

2758

+ continue

2759

+ ac_builddir=.

2760

+

2761

+case "$ac_dir" in

2762

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

2763

+*)

2764

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

2765

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

2766

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

2767

+ case $ac_top_builddir_sub in

2768

+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;

2769

+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

2770

+ esac ;;

2771

+esac

2772

+ac_abs_top_builddir=$ac_pwd

2773

+ac_abs_builddir=$ac_pwd$ac_dir_suffix

2774

+# for backward compatibility:

2775

+ac_top_builddir=$ac_top_build_prefix

2776

+

2777

+case $srcdir in

2778

+ .) # We are building in place.

2779

+ ac_srcdir=.

2780

+ ac_top_srcdir=$ac_top_builddir_sub

2781

+ ac_abs_top_srcdir=$ac_pwd ;;

2782

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

2783

+ ac_srcdir=$srcdir$ac_dir_suffix;

2784

+ ac_top_srcdir=$srcdir

2785

+ ac_abs_top_srcdir=$srcdir ;;

2786

+ *) # Relative name.

2787

+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix

2788

+ ac_top_srcdir=$ac_top_build_prefix$srcdir

2789

+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;

2790

+esac

2791

+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

2792

+

2793

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

2794

+ # Check for guested configure.

2795

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

2796

+ echo &&

2797

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

2798

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

2799

+ echo &&

2800

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

2801

+ else

2802

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

2803

+ fi || ac_status=$?

2804

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

2805

+ done

2806

+fi

2807

+

2808

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

2809

+if $ac_init_version; then

2810

+ cat <<\_ACEOF

2811

+geeqie configure 1.0beta2

2812

+generated by GNU Autoconf 2.64

2813

+

2814

2815

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

2816

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

2817

+_ACEOF

2818

+ exit

2819

+fi

2820

+

2821

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

2822

+## Autoconf initialization. ##

2823

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

2824

+

2825

+# ac_fn_c_try_compile LINENO

2826

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

2827

+# Try to compile conftest.$ac_ext, and return whether this succeeded.

2828

+ac_fn_c_try_compile ()

2829

+{

2830

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

2831

+ rm -f conftest.$ac_objext

2832

+ if { { ac_try="$ac_compile"

2833

+case "(($ac_try" in

2834

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2835

+ *) ac_try_echo=$ac_try;;

2836

+esac

2837

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

2838

+$as_echo "$ac_try_echo"; } >&5

2839

+ (eval "$ac_compile") 2>conftest.err

2840

+ ac_status=$?

2841

+ if test -s conftest.err; then

2842

+ grep -v '^ *+' conftest.err >conftest.er1

2843

+ cat conftest.er1 >&5

2844

+ mv -f conftest.er1 conftest.err

2845

+ fi

2846

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

2847

+ test $ac_status = 0; } && {

2848

+ test -z "$ac_c_werror_flag" ||

2849

+ test ! -s conftest.err

2850

+ } && test -s conftest.$ac_objext; then :

2851

+ ac_retval=0

2852

+else

2853

+ $as_echo "$as_me: failed program was:" >&5

2854

+sed 's/^/| /' conftest.$ac_ext >&5

2855

+

2856

+ ac_retval=1

2857

+fi

2858

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

2859

+ return $ac_retval

2860

+

2861

+} # ac_fn_c_try_compile

2862

+

2863

+# ac_fn_c_try_link LINENO

2864

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

2865

+# Try to link conftest.$ac_ext, and return whether this succeeded.

2866

+ac_fn_c_try_link ()

2867

+{

2868

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

2869

+ rm -f conftest.$ac_objext conftest$ac_exeext

2870

+ if { { ac_try="$ac_link"

2871

+case "(($ac_try" in

2872

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2873

+ *) ac_try_echo=$ac_try;;

2874

+esac

2875

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

2876

+$as_echo "$ac_try_echo"; } >&5

2877

+ (eval "$ac_link") 2>conftest.err

2878

+ ac_status=$?

2879

+ if test -s conftest.err; then

2880

+ grep -v '^ *+' conftest.err >conftest.er1

2881

+ cat conftest.er1 >&5

2882

+ mv -f conftest.er1 conftest.err

2883

+ fi

2884

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

2885

+ test $ac_status = 0; } && {

2886

+ test -z "$ac_c_werror_flag" ||

2887

+ test ! -s conftest.err

2888

+ } && test -s conftest$ac_exeext && {

2889

+ test "$cross_compiling" = yes ||

2890

+ $as_test_x conftest$ac_exeext

2891

+ }; then :

2892

+ ac_retval=0

2893

+else

2894

+ $as_echo "$as_me: failed program was:" >&5

2895

+sed 's/^/| /' conftest.$ac_ext >&5

2896

+

2897

+ ac_retval=1

2898

+fi

2899

+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information

2900

+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would

2901

+ # interfere with the next link command; also delete a directory that is

2902

+ # left behind by Apple's compiler. We do this before executing the actions.

2903

+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo

2904

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

2905

+ return $ac_retval

2906

+

2907

+} # ac_fn_c_try_link

2908

+

2909

+# ac_fn_cxx_try_compile LINENO

2910

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

2911

+# Try to compile conftest.$ac_ext, and return whether this succeeded.

2912

+ac_fn_cxx_try_compile ()

2913

+{

2914

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

2915

+ rm -f conftest.$ac_objext

2916

+ if { { ac_try="$ac_compile"

2917

+case "(($ac_try" in

2918

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2919

+ *) ac_try_echo=$ac_try;;

2920

+esac

2921

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

2922

+$as_echo "$ac_try_echo"; } >&5

2923

+ (eval "$ac_compile") 2>conftest.err

2924

+ ac_status=$?

2925

+ if test -s conftest.err; then

2926

+ grep -v '^ *+' conftest.err >conftest.er1

2927

+ cat conftest.er1 >&5

2928

+ mv -f conftest.er1 conftest.err

2929

+ fi

2930

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

2931

+ test $ac_status = 0; } && {

2932

+ test -z "$ac_cxx_werror_flag" ||

2933

+ test ! -s conftest.err

2934

+ } && test -s conftest.$ac_objext; then :

2935

+ ac_retval=0

2936

+else

2937

+ $as_echo "$as_me: failed program was:" >&5

2938

+sed 's/^/| /' conftest.$ac_ext >&5

2939

+

2940

+ ac_retval=1

2941

+fi

2942

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

2943

+ return $ac_retval

2944

+

2945

+} # ac_fn_cxx_try_compile

2946

+

2947

+# ac_fn_c_try_cpp LINENO

2948

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

2949

+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.

2950

+ac_fn_c_try_cpp ()

2951

+{

2952

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

2953

+ if { { ac_try="$ac_cpp conftest.$ac_ext"

2954

+case "(($ac_try" in

2955

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2956

+ *) ac_try_echo=$ac_try;;

2957

+esac

2958

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

2959

+$as_echo "$ac_try_echo"; } >&5

2960

+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err

2961

+ ac_status=$?

2962

+ if test -s conftest.err; then

2963

+ grep -v '^ *+' conftest.err >conftest.er1

2964

+ cat conftest.er1 >&5

2965

+ mv -f conftest.er1 conftest.err

2966

+ fi

2967

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

2968

+ test $ac_status = 0; } >/dev/null && {

2969

+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

2970

+ test ! -s conftest.err

2971

+ }; then :

2972

+ ac_retval=0

2973

+else

2974

+ $as_echo "$as_me: failed program was:" >&5

2975

+sed 's/^/| /' conftest.$ac_ext >&5

2976

+

2977

+ ac_retval=1

2978

+fi

2979

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

2980

+ return $ac_retval

2981

+

2982

+} # ac_fn_c_try_cpp

2983

+

2984

+# ac_fn_c_try_run LINENO

2985

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

2986

+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes

2987

+# that executables *can* be run.

2988

+ac_fn_c_try_run ()

2989

+{

2990

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

2991

+ if { { ac_try="$ac_link"

2992

+case "(($ac_try" in

2993

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2994

+ *) ac_try_echo=$ac_try;;

2995

+esac

2996

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

2997

+$as_echo "$ac_try_echo"; } >&5

2998

+ (eval "$ac_link") 2>&5

2999

+ ac_status=$?

3000

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

3001

+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'

3002

+ { { case "(($ac_try" in

3003

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3004

+ *) ac_try_echo=$ac_try;;

3005

+esac

3006

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

3007

+$as_echo "$ac_try_echo"; } >&5

3008

+ (eval "$ac_try") 2>&5

3009

+ ac_status=$?

3010

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

3011

+ test $ac_status = 0; }; }; then :

3012

+ ac_retval=0

3013

+else

3014

+ $as_echo "$as_me: program exited with status $ac_status" >&5

3015

+ $as_echo "$as_me: failed program was:" >&5

3016

+sed 's/^/| /' conftest.$ac_ext >&5

3017

+

3018

+ ac_retval=$ac_status

3019

+fi

3020

+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo

3021

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

3022

+ return $ac_retval

3023

+

3024

+} # ac_fn_c_try_run

3025

+

3026

+# ac_fn_c_check_func LINENO FUNC VAR

3027

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

3028

+# Tests whether FUNC exists, setting the cache variable VAR accordingly

3029

+ac_fn_c_check_func ()

3030

+{

3031

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

3032

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

3033

+$as_echo_n "checking for $2... " >&6; }

3034

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

3035

+ $as_echo_n "(cached) " >&6

3036

+else

3037

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

3038

+/* end confdefs.h. */

3039

+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.

3040

+ For example, HP-UX 11i <limits.h> declares gettimeofday. */

3041

+#define $2 innocuous_$2

3042

+

3043

+/* System header to define __stub macros and hopefully few prototypes,

3044

+ which can conflict with char $2 (); below.

3045

+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

3046

+ <limits.h> exists even on freestanding compilers. */

3047

+

3048

+#ifdef __STDC__

3049

+# include <limits.h>

3050

+#else

3051

+# include <assert.h>

3052

+#endif

3053

+

3054

+#undef $2

3055

+

3056

+/* Override any GCC internal prototype to avoid an error.

3057

+ Use char because int might match the return type of a GCC

3058

+ builtin and then its argument prototype would still apply. */

3059

+#ifdef __cplusplus

3060

+extern "C"

3061

+#endif

3062

+char $2 ();

3063

+/* The GNU C library defines this for functions which it implements

3064

+ to always fail with ENOSYS. Some functions are actually named

3065

+ something starting with __ and the normal name is an alias. */

3066

+#if defined __stub_$2 || defined __stub___$2

3067

+choke me

3068

+#endif

3069

+

3070

+int

3071

+main ()

3072

+{

3073

+return $2 ();

3074

+ ;

3075

+ return 0;

3076

+}

3077

_ACEOF

3078

-ac_status=$?

3079

+if ac_fn_c_try_link "$LINENO"; then :

3080

+ eval "$3=yes"

3081

+else

3082

+ eval "$3=no"

3083

+fi

3084

+rm -f core conftest.err conftest.$ac_objext \

3085

+ conftest$ac_exeext conftest.$ac_ext

3086

fi

3087

+eval ac_res=\$$3

3088

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

3089

+$as_echo "$ac_res" >&6; }

3090

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

3091

3092

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

3093

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

3094

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

3095

- test -d "$ac_dir" ||

3096

- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||

3097

- continue

3098

- ac_builddir=.

3099

+} # ac_fn_c_check_func

3100

3101

-case "$ac_dir" in

3102

-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

3103

-*)

3104

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

3105

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

3106

- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`

3107

- case $ac_top_builddir_sub in

3108

- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;

3109

- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

3110

- esac ;;

3111

-esac

3112

-ac_abs_top_builddir=$ac_pwd

3113

-ac_abs_builddir=$ac_pwd$ac_dir_suffix

3114

-# for backward compatibility:

3115

-ac_top_builddir=$ac_top_build_prefix

3116

+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES

3117

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

3118

+# Tests whether HEADER exists, giving a warning if it cannot be compiled using

3119

+# the include files in INCLUDES and setting the cache variable VAR

3120

+# accordingly.

3121

+ac_fn_c_check_header_mongrel ()

3122

+{

3123

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

3124

+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

3125

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

3126

+$as_echo_n "checking for $2... " >&6; }

3127

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

3128

+ $as_echo_n "(cached) " >&6

3129

+fi

3130

+eval ac_res=\$$3

3131

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

3132

+$as_echo "$ac_res" >&6; }

3133

+else

3134

+ # Is the header compilable?

3135

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5

3136

+$as_echo_n "checking $2 usability... " >&6; }

3137

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

3138

+/* end confdefs.h. */

3139

+$4

3140

+#include <$2>

3141

+_ACEOF

3142

+if ac_fn_c_try_compile "$LINENO"; then :

3143

+ ac_header_compiler=yes

3144

+else

3145

+ ac_header_compiler=no

3146

+fi

3147

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3148

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5

3149

+$as_echo "$ac_header_compiler" >&6; }

3150

3151

-case $srcdir in

3152

- .) # We are building in place.

3153

- ac_srcdir=.

3154

- ac_top_srcdir=$ac_top_builddir_sub

3155

- ac_abs_top_srcdir=$ac_pwd ;;

3156

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

3157

- ac_srcdir=$srcdir$ac_dir_suffix;

3158

- ac_top_srcdir=$srcdir

3159

- ac_abs_top_srcdir=$srcdir ;;

3160

- *) # Relative name.

3161

- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix

3162

- ac_top_srcdir=$ac_top_build_prefix$srcdir

3163

- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;

3164

-esac

3165

-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix

3166

+# Is the header present?

3167

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5

3168

+$as_echo_n "checking $2 presence... " >&6; }

3169

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

3170

+/* end confdefs.h. */

3171

+#include <$2>

3172

+_ACEOF

3173

+if ac_fn_c_try_cpp "$LINENO"; then :

3174

+ ac_header_preproc=yes

3175

+else

3176

+ ac_header_preproc=no

3177

+fi

3178

+rm -f conftest.err conftest.$ac_ext

3179

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5

3180

+$as_echo "$ac_header_preproc" >&6; }

3181

3182

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

3183

- # Check for guested configure.

3184

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

3185

- echo &&

3186

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

3187

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

3188

- echo &&

3189

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

3190

- else

3191

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

3192

- fi || ac_status=$?

3193

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

3194

- done

3195

+# So? What about this header?

3196

+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((

3197

+ yes:no: )

3198

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5

3199

+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}

3200

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

3201

+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

3202

+ ;;

3203

+ no:yes:* )

3204

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5

3205

+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}

3206

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5

3207

+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}

3208

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5

3209

+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}

3210

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5

3211

+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}

3212

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

3213

+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

3214

+( cat <<\_ASBOX

3215

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

3216

+## Report this to geeqie-devel@lists.sourceforge.net ##

3217

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

3218

+_ASBOX

3219

+ ) | sed "s/^/$as_me: WARNING: /" >&2

3220

+ ;;

3221

+esac

3222

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

3223

+$as_echo_n "checking for $2... " >&6; }

3224

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

3225

+ $as_echo_n "(cached) " >&6

3226

+else

3227

+ eval "$3=\$ac_header_compiler"

3228

+fi

3229

+eval ac_res=\$$3

3230

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

3231

+$as_echo "$ac_res" >&6; }

3232

fi

3233

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

3234

3235

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

3236

-if $ac_init_version; then

3237

- cat <<\_ACEOF

3238

-geeqie configure 1.0beta2

3239

-generated by GNU Autoconf 2.63

3240

+} # ac_fn_c_check_header_mongrel

3241

3242

3243

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

3244

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

3245

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

3246

+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES

3247

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

3248

+# Tests whether HEADER exists and can be compiled using the include files in

3249

+# INCLUDES, setting the cache variable VAR accordingly.

3250

+ac_fn_c_check_header_compile ()

3251

+{

3252

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

3253

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

3254

+$as_echo_n "checking for $2... " >&6; }

3255

+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

3256

+ $as_echo_n "(cached) " >&6

3257

+else

3258

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

3259

+/* end confdefs.h. */

3260

+$4

3261

+#include <$2>

3262

_ACEOF

3263

- exit

3264

+if ac_fn_c_try_compile "$LINENO"; then :

3265

+ eval "$3=yes"

3266

+else

3267

+ eval "$3=no"

3268

+fi

3269

+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3270

fi

3271

+eval ac_res=\$$3

3272

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

3273

+$as_echo "$ac_res" >&6; }

3274

+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

3275

+

3276

+} # ac_fn_c_check_header_compile

3277

cat >config.log <<_ACEOF

3278

This file contains any messages produced by compilers while

3279

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

3280

3281

It was created by geeqie $as_me 1.0beta2, which was

3282

-generated by GNU Autoconf 2.63. Invocation command line was

3283

+generated by GNU Autoconf 2.64. Invocation command line was

3284

3285

$ $0 $@

3286

3287

@@ -1734,8 +2076,8 @@

3288

do

3289

IFS=$as_save_IFS

3290

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

3291

- $as_echo "PATH: $as_dir"

3292

-done

3293

+ $as_echo "PATH: $as_dir"

3294

+ done

3295

IFS=$as_save_IFS

3296

3297

} >&5

3298

@@ -1772,9 +2114,9 @@

3299

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

3300

esac

3301

case $ac_pass in

3302

- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;

3303

+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;

3304

2)

3305

- ac_configure_args1="$ac_configure_args1 '$ac_arg'"

3306

+ as_fn_append ac_configure_args1 " '$ac_arg'"

3307

if test $ac_must_keep_next = true; then

3308

ac_must_keep_next=false # Got value, back to normal.

3309

else

3310

@@ -1790,13 +2132,13 @@

3311

-* ) ac_must_keep_next=true ;;

3312

esac

3313

fi

3314

- ac_configure_args="$ac_configure_args '$ac_arg'"

3315

+ as_fn_append ac_configure_args " '$ac_arg'"

3316

;;

3317

esac

3318

done

3319

done

3320

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

3321

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

3322

+{ ac_configure_args0=; unset ac_configure_args0;}

3323

+{ ac_configure_args1=; unset ac_configure_args1;}

3324

3325

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

3326

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

3327

@@ -1821,13 +2163,13 @@

3328

case $ac_val in #(

3329

*${as_nl}*)

3330

case $ac_var in #(

3331

- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5

3332

+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5

3333

$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;

3334

esac

3335

case $ac_var in #(

3336

_ | IFS | as_nl) ;; #(

3337

BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

3338

- *) $as_unset $ac_var ;;

3339

+ *) { eval $ac_var=; unset $ac_var;} ;;

3340

esac ;;

3341

esac

3342

done

3343

@@ -1899,39 +2241,41 @@

3344

exit $exit_status

3345

' 0

3346

for ac_signal in 1 2 13 15; do

3347

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

3348

+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal

3349

done

3350

ac_signal=0

3351

3352

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

3353

rm -f -r conftest* confdefs.h

3354

3355

+$as_echo "/* confdefs.h */" > confdefs.h

3356

+

3357

# Predefined preprocessor variables.

3358

3359

cat >>confdefs.h <<_ACEOF

3360

#define PACKAGE_NAME "$PACKAGE_NAME"

3361

_ACEOF

3362

3363

-

3364

cat >>confdefs.h <<_ACEOF

3365

#define PACKAGE_TARNAME "$PACKAGE_TARNAME"

3366

_ACEOF

3367

3368

-

3369

cat >>confdefs.h <<_ACEOF

3370

#define PACKAGE_VERSION "$PACKAGE_VERSION"

3371

_ACEOF

3372

3373

-

3374

cat >>confdefs.h <<_ACEOF

3375

#define PACKAGE_STRING "$PACKAGE_STRING"

3376

_ACEOF

3377

3378

-

3379

cat >>confdefs.h <<_ACEOF

3380

#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"

3381

_ACEOF

3382

3383

+cat >>confdefs.h <<_ACEOF

3384

+#define PACKAGE_URL "$PACKAGE_URL"

3385

+_ACEOF

3386

+

3387

3388

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

3389

# Prefer an explicitly selected file to automatically selected ones.

3390

@@ -1950,7 +2294,7 @@

3391

do

3392

test "x$ac_site_file" = xNONE && continue

3393

if test -r "$ac_site_file"; then

3394

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

3395

+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5

3396

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

3397

sed 's/^/| /' "$ac_site_file" >&5

3398

. "$ac_site_file"

3399

@@ -1961,7 +2305,7 @@

3400

# Some versions of bash will fail to source /dev/null (special

3401

# files actually), so we avoid doing that.

3402

if test -f "$cache_file"; then

3403

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

3404

+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5

3405

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

3406

case $cache_file in

3407

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

3408

@@ -1969,7 +2313,7 @@

3409

esac

3410

fi

3411

else

3412

- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5

3413

+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5

3414

$as_echo "$as_me: creating cache $cache_file" >&6;}

3415

>$cache_file

3416

fi

3417

@@ -1984,11 +2328,11 @@

3418

eval ac_new_val=\$ac_env_${ac_var}_value

3419

case $ac_old_set,$ac_new_set in

3420

set,)

3421

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

3422

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5

3423

$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}

3424

ac_cache_corrupted=: ;;

3425

,set)

3426

- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5

3427

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5

3428

$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}

3429

ac_cache_corrupted=: ;;

3430

,);;

3431

@@ -1998,17 +2342,17 @@

3432

ac_old_val_w=`echo x $ac_old_val`

3433

ac_new_val_w=`echo x $ac_new_val`

3434

if test "$ac_old_val_w" != "$ac_new_val_w"; then

3435

- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5

3436

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5

3437

$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

3438

ac_cache_corrupted=:

3439

else

3440

- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5

3441

+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5

3442

$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}

3443

eval $ac_var=\$ac_old_val

3444

fi

3445

- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5

3446

+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5

3447

$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}

3448

- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5

3449

+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5

3450

$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}

3451

fi;;

3452

esac

3453

@@ -2020,43 +2364,20 @@

3454

esac

3455

case " $ac_configure_args " in

3456

*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.

3457

- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;

3458

+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;

3459

esac

3460

fi

3461

done

3462

if $ac_cache_corrupted; then

3463

- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

3464

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

3465

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

3466

- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5

3467

+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5

3468

$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}

3469

- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5

3470

-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}

3471

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

3472

+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5

3473

fi

3474

-

3475

-

3476

-

3477

-

3478

-

3479

-

3480

-

3481

-

3482

-

3483

-

3484

-

3485

-

3486

-

3487

-

3488

-

3489

-

3490

-

3491

-

3492

-

3493

-

3494

-

3495

-

3496

-

3497

-

3498

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

3499

+## Main body of script. ##

3500

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

3501

3502

ac_ext=c

3503

ac_cpp='$CPP $CPPFLAGS'

3504

@@ -2071,24 +2392,16 @@

3505

3506

ac_aux_dir=

3507

for ac_dir in auxdir "$srcdir"/auxdir; do

3508

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

3509

- ac_aux_dir=$ac_dir

3510

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

3511

- break

3512

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

3513

- ac_aux_dir=$ac_dir

3514

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

3515

- break

3516

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

3517

- ac_aux_dir=$ac_dir

3518

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

3519

- break

3520

- fi

3521

+ for ac_t in install-sh install.sh shtool; do

3522

+ if test -f "$ac_dir/$ac_t"; then

3523

+ ac_aux_dir=$ac_dir

3524

+ ac_install_sh="$ac_aux_dir/$ac_t -c"

3525

+ break 2

3526

+ fi

3527

+ done

3528

done

3529

if test -z "$ac_aux_dir"; then

3530

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

3531

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

3532

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

3533

+ as_fn_error "cannot find install-sh, install.sh, or shtool in auxdir \"$srcdir\"/auxdir" "$LINENO" 5

3534

fi

3535

3536

# These three variables are undocumented and unsupported,

3537

@@ -2100,7 +2413,7 @@

3538

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

3539

3540

3541

-am__api_version='1.10'

3542

+am__api_version='1.11'

3543

3544

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

3545

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

3546

@@ -2116,10 +2429,10 @@

3547

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

3548

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

3549

# Reject install programs that cannot install multiple files.

3550

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

3551

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

3552

$as_echo_n "checking for a BSD-compatible install... " >&6; }

3553

if test -z "$INSTALL"; then

3554

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

3555

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

3556

$as_echo_n "(cached) " >&6

3557

else

3558

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3559

@@ -2127,11 +2440,11 @@

3560

do

3561

IFS=$as_save_IFS

3562

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

3563

- # Account for people who put trailing slashes in PATH elements.

3564

-case $as_dir/ in

3565

- ./ | .// | /cC/* | \

3566

+ # Account for people who put trailing slashes in PATH elements.

3567

+case $as_dir/ in #((

3568

+ ./ | .// | /[cC]/* | \

3569

/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \

3570

- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \

3571

+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \

3572

/usr/ucb/* ) ;;

3573

*)

3574

# OSF1 and SCO ODT 3.0 have their own names for install.

3575

@@ -2168,7 +2481,7 @@

3576

;;

3577

esac

3578

3579

-done

3580

+ done

3581

IFS=$as_save_IFS

3582

3583

rm -rf conftest.one conftest.two conftest.dir

3584

@@ -2184,7 +2497,7 @@

3585

INSTALL=$ac_install_sh

3586

fi

3587

fi

3588

-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5

3589

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5

3590

$as_echo "$INSTALL" >&6; }

3591

3592

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

3593

@@ -2195,21 +2508,34 @@

3594

3595

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

3596

3597

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

3598

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5

3599

$as_echo_n "checking whether build environment is sane... " >&6; }

3600

# Just in case

3601

sleep 1

3602

echo timestamp > conftest.file

3603

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

3604

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

3605

+am_lf='

3606

+'

3607

+case `pwd` in

3608

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

3609

+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;

3610

+esac

3611

+case $srcdir in

3612

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

3613

+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;

3614

+esac

3615

+

3616

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

3617

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

3618

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

3619

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

3620

# directory).

3621

if (

3622

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

3623

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

3624

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

3625

# -L didn't work.

3626

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

3627

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

3628

fi

3629

rm -f conftest.file

3630

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

3631

@@ -2219,11 +2545,8 @@

3632

# if, for instance, CONFIG_SHELL is bash and it inherits a

3633

# broken ls alias from the environment. This has actually

3634

# happened. Such a system could not be considered "sane".

3635

- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken

3636

-alias in your environment" >&5

3637

-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken

3638

-alias in your environment" >&2;}

3639

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

3640

+ as_fn_error "ls -t appears to fail. Make sure there is not a broken

3641

+alias in your environment" "$LINENO" 5

3642

fi

3643

3644

test "$2" = conftest.file

3645

@@ -2232,13 +2555,10 @@

3646

# Ok.

3647

:

3648

else

3649

- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!

3650

-Check your system clock" >&5

3651

-$as_echo "$as_me: error: newly created file is older than distributed files!

3652

-Check your system clock" >&2;}

3653

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

3654

+ as_fn_error "newly created file is older than distributed files!

3655

+Check your system clock" "$LINENO" 5

3656

fi

3657

-{ $as_echo "$as_me:$LINENO: result: yes" >&5

3658

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

3659

$as_echo "yes" >&6; }

3660

test "$program_prefix" != NONE &&

3661

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

3662

@@ -2253,20 +2573,136 @@

3663

# expand $ac_aux_dir to an absolute path

3664

am_aux_dir=`cd $ac_aux_dir && pwd`

3665

3666

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

3667

-# Use eval to expand $SHELL

3668

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

3669

- am_missing_run="$MISSING --run "

3670

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

3671

+ case $am_aux_dir in

3672

+ *\ * | *\ *)

3673

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

3674

+ *)

3675

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

3676

+ esac

3677

+fi

3678

+# Use eval to expand $SHELL

3679

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

3680

+ am_missing_run="$MISSING --run "

3681

+else

3682

+ am_missing_run=

3683

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5

3684

+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

3685

+fi

3686

+

3687

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

3688

+ case $am_aux_dir in

3689

+ *\ * | *\ *)

3690

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

3691

+ *)

3692

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

3693

+ esac

3694

+fi

3695

+

3696

+# Installed binaries are usually stripped using `strip' when the user

3697

+# run `make install-strip'. However `strip' might not be the right

3698

+# tool to use in cross-compilation environments, therefore Automake

3699

+# will honor the `STRIP' environment variable to overrule this program.

3700

+if test "$cross_compiling" != no; then

3701

+ if test -n "$ac_tool_prefix"; then

3702

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

3703

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

3704

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3705

+$as_echo_n "checking for $ac_word... " >&6; }

3706

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

3707

+ $as_echo_n "(cached) " >&6

3708

+else

3709

+ if test -n "$STRIP"; then

3710

+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

3711

+else

3712

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3713

+for as_dir in $PATH

3714

+do

3715

+ IFS=$as_save_IFS

3716

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

3717

+ for ac_exec_ext in '' $ac_executable_extensions; do

3718

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

3719

+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"

3720

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3721

+ break 2

3722

+ fi

3723

+done

3724

+ done

3725

+IFS=$as_save_IFS

3726

+

3727

+fi

3728

+fi

3729

+STRIP=$ac_cv_prog_STRIP

3730

+if test -n "$STRIP"; then

3731

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5

3732

+$as_echo "$STRIP" >&6; }

3733

+else

3734

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3735

+$as_echo "no" >&6; }

3736

+fi

3737

+

3738

+

3739

+fi

3740

+if test -z "$ac_cv_prog_STRIP"; then

3741

+ ac_ct_STRIP=$STRIP

3742

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

3743

+set dummy strip; ac_word=$2

3744

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3745

+$as_echo_n "checking for $ac_word... " >&6; }

3746

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

3747

+ $as_echo_n "(cached) " >&6

3748

+else

3749

+ if test -n "$ac_ct_STRIP"; then

3750

+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

3751

+else

3752

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3753

+for as_dir in $PATH

3754

+do

3755

+ IFS=$as_save_IFS

3756

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

3757

+ for ac_exec_ext in '' $ac_executable_extensions; do

3758

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

3759

+ ac_cv_prog_ac_ct_STRIP="strip"

3760

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3761

+ break 2

3762

+ fi

3763

+done

3764

+ done

3765

+IFS=$as_save_IFS

3766

+

3767

+fi

3768

+fi

3769

+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

3770

+if test -n "$ac_ct_STRIP"; then

3771

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5

3772

+$as_echo "$ac_ct_STRIP" >&6; }

3773

+else

3774

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3775

+$as_echo "no" >&6; }

3776

+fi

3777

+

3778

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

3779

+ STRIP=":"

3780

+ else

3781

+ case $cross_compiling:$ac_tool_warned in

3782

+yes:)

3783

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

3784

+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

3785

+ac_tool_warned=yes ;;

3786

+esac

3787

+ STRIP=$ac_ct_STRIP

3788

+ fi

3789

else

3790

- am_missing_run=

3791

- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5

3792

-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

3793

+ STRIP="$ac_cv_prog_STRIP"

3794

+fi

3795

+

3796

fi

3797

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

3798

3799

-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5

3800

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5

3801

$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }

3802

if test -z "$MKDIR_P"; then

3803

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

3804

+ if test "${ac_cv_path_mkdir+set}" = set; then :

3805

$as_echo_n "(cached) " >&6

3806

else

3807

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3808

@@ -2274,7 +2710,7 @@

3809

do

3810

IFS=$as_save_IFS

3811

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

3812

- for ac_prog in mkdir gmkdir; do

3813

+ for ac_prog in mkdir gmkdir; do

3814

for ac_exec_ext in '' $ac_executable_extensions; do

3815

{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue

3816

case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(

3817

@@ -2286,7 +2722,7 @@

3818

esac

3819

done

3820

done

3821

-done

3822

+ done

3823

IFS=$as_save_IFS

3824

3825

fi

3826

@@ -2302,7 +2738,7 @@

3827

MKDIR_P="$ac_install_sh -d"

3828

fi

3829

fi

3830

-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5

3831

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5

3832

$as_echo "$MKDIR_P" >&6; }

3833

3834

mkdir_p="$MKDIR_P"

3835

@@ -2315,9 +2751,9 @@

3836

do

3837

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

3838

set dummy $ac_prog; ac_word=$2

3839

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

3840

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

3841

$as_echo_n "checking for $ac_word... " >&6; }

3842

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

3843

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

3844

$as_echo_n "(cached) " >&6

3845

else

3846

if test -n "$AWK"; then

3847

@@ -2328,24 +2764,24 @@

3848

do

3849

IFS=$as_save_IFS

3850

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

3851

- for ac_exec_ext in '' $ac_executable_extensions; do

3852

+ for ac_exec_ext in '' $ac_executable_extensions; do

3853

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

3854

ac_cv_prog_AWK="$ac_prog"

3855

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

3856

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

3857

break 2

3858

fi

3859

done

3860

-done

3861

+ done

3862

IFS=$as_save_IFS

3863

3864

fi

3865

fi

3866

AWK=$ac_cv_prog_AWK

3867

if test -n "$AWK"; then

3868

- { $as_echo "$as_me:$LINENO: result: $AWK" >&5

3869

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5

3870

$as_echo "$AWK" >&6; }

3871

else

3872

- { $as_echo "$as_me:$LINENO: result: no" >&5

3873

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3874

$as_echo "no" >&6; }

3875

fi

3876

3877

@@ -2353,11 +2789,11 @@

3878

test -n "$AWK" && break

3879

done

3880

3881

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

3882

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

3883

$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }

3884

set x ${MAKE-make}

3885

ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

3886

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

3887

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

3888

$as_echo_n "(cached) " >&6

3889

else

3890

cat >conftest.make <<\_ACEOF

3891

@@ -2375,11 +2811,11 @@

3892

rm -f conftest.make

3893

fi

3894

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

3895

- { $as_echo "$as_me:$LINENO: result: yes" >&5

3896

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

3897

$as_echo "yes" >&6; }

3898

SET_MAKE=

3899

else

3900

- { $as_echo "$as_me:$LINENO: result: no" >&5

3901

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

3902

$as_echo "no" >&6; }

3903

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

3904

fi

3905

@@ -2399,9 +2835,7 @@

3906

am__isrc=' -I$(srcdir)'

3907

# test to see if srcdir already configured

3908

if test -f $srcdir/config.status; then

3909

- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5

3910

-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}

3911

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

3912

+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5

3913

fi

3914

fi

3915

3916

@@ -2445,108 +2879,6 @@

3917

3918

MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}

3919

3920

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

3921

-

3922

-# Installed binaries are usually stripped using `strip' when the user

3923

-# run `make install-strip'. However `strip' might not be the right

3924

-# tool to use in cross-compilation environments, therefore Automake

3925

-# will honor the `STRIP' environment variable to overrule this program.

3926

-if test "$cross_compiling" != no; then

3927

- if test -n "$ac_tool_prefix"; then

3928

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

3929

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

3930

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

3931

-$as_echo_n "checking for $ac_word... " >&6; }

3932

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

3933

- $as_echo_n "(cached) " >&6

3934

-else

3935

- if test -n "$STRIP"; then

3936

- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

3937

-else

3938

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3939

-for as_dir in $PATH

3940

-do

3941

- IFS=$as_save_IFS

3942

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

3943

- for ac_exec_ext in '' $ac_executable_extensions; do

3944

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

3945

- ac_cv_prog_STRIP="${ac_tool_prefix}strip"

3946

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

3947

- break 2

3948

- fi

3949

-done

3950

-done

3951

-IFS=$as_save_IFS

3952

-

3953

-fi

3954

-fi

3955

-STRIP=$ac_cv_prog_STRIP

3956

-if test -n "$STRIP"; then

3957

- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5

3958

-$as_echo "$STRIP" >&6; }

3959

-else

3960

- { $as_echo "$as_me:$LINENO: result: no" >&5

3961

-$as_echo "no" >&6; }

3962

-fi

3963

-

3964

-

3965

-fi

3966

-if test -z "$ac_cv_prog_STRIP"; then

3967

- ac_ct_STRIP=$STRIP

3968

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

3969

-set dummy strip; ac_word=$2

3970

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

3971

-$as_echo_n "checking for $ac_word... " >&6; }

3972

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

3973

- $as_echo_n "(cached) " >&6

3974

-else

3975

- if test -n "$ac_ct_STRIP"; then

3976

- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

3977

-else

3978

-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3979

-for as_dir in $PATH

3980

-do

3981

- IFS=$as_save_IFS

3982

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

3983

- for ac_exec_ext in '' $ac_executable_extensions; do

3984

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

3985

- ac_cv_prog_ac_ct_STRIP="strip"

3986

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

3987

- break 2

3988

- fi

3989

-done

3990

-done

3991

-IFS=$as_save_IFS

3992

-

3993

-fi

3994

-fi

3995

-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

3996

-if test -n "$ac_ct_STRIP"; then

3997

- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

3998

-$as_echo "$ac_ct_STRIP" >&6; }

3999

-else

4000

- { $as_echo "$as_me:$LINENO: result: no" >&5

4001

-$as_echo "no" >&6; }

4002

-fi

4003

-

4004

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

4005

- STRIP=":"

4006

- else

4007

- case $cross_compiling:$ac_tool_warned in

4008

-yes:)

4009

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

4010

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4011

-ac_tool_warned=yes ;;

4012

-esac

4013

- STRIP=$ac_ct_STRIP

4014

- fi

4015

-else

4016

- STRIP="$ac_cv_prog_STRIP"

4017

-fi

4018

-

4019

-fi

4020

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

4021

-

4022

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

4023

# some platforms.

4024

# Always define AMTAR for backward compatibility.

4025

@@ -2564,16 +2896,17 @@

4026

4027

4028

# Only for developers

4029

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

4030

+

4031

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

4032

$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }

4033

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

4034

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

4035

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

4036

enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval

4037

else

4038

USE_MAINTAINER_MODE=no

4039

fi

4040

4041

- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5

4042

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5

4043

$as_echo "$USE_MAINTAINER_MODE" >&6; }

4044

if test $USE_MAINTAINER_MODE = yes; then

4045

MAINTAINER_MODE_TRUE=

4046

@@ -2588,7 +2921,7 @@

4047

4048

4049

# Check whether --enable-developer was given.

4050

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

4051

+if test "${enable_developer+set}" = set; then :

4052

enableval=$enable_developer;

4053

__IS_DEVELOPER=yes

4054

4055

@@ -2639,7 +2972,7 @@

4056

4057

4058

# Check whether --enable-doxygen-doc was given.

4059

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

4060

+if test "${enable_doxygen_doc+set}" = set; then :

4061

enableval=$enable_doxygen_doc;

4062

case "$enableval" in

4063

#(

4064

@@ -2653,9 +2986,7 @@

4065

4066

;; #(

4067

*)

4068

- { { $as_echo "$as_me:$LINENO: error: invalid value '$enableval' given to doxygen-doc" >&5

4069

-$as_echo "$as_me: error: invalid value '$enableval' given to doxygen-doc" >&2;}

4070

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

4071

+ as_fn_error "invalid value '$enableval' given to doxygen-doc" "$LINENO" 5

4072

;;

4073

esac

4074

4075

@@ -2672,9 +3003,9 @@

4076

if test -n "$ac_tool_prefix"; then

4077

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

4078

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

4079

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

4080

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4081

$as_echo_n "checking for $ac_word... " >&6; }

4082

-if test "${ac_cv_path_DX_DOXYGEN+set}" = set; then

4083

+if test "${ac_cv_path_DX_DOXYGEN+set}" = set; then :

4084

$as_echo_n "(cached) " >&6

4085

else

4086

case $DX_DOXYGEN in

4087

@@ -2687,14 +3018,14 @@

4088

do

4089

IFS=$as_save_IFS

4090

test -z "$as_dir" && as_dir=.

4091

- for ac_exec_ext in '' $ac_executable_extensions; do

4092

+ for ac_exec_ext in '' $ac_executable_extensions; do

4093

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4094

ac_cv_path_DX_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"

4095

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4096

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4097

break 2

4098

fi

4099

done

4100

-done

4101

+ done

4102

IFS=$as_save_IFS

4103

4104

;;

4105

@@ -2702,10 +3033,10 @@

4106

fi

4107

DX_DOXYGEN=$ac_cv_path_DX_DOXYGEN

4108

if test -n "$DX_DOXYGEN"; then

4109

- { $as_echo "$as_me:$LINENO: result: $DX_DOXYGEN" >&5

4110

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_DOXYGEN" >&5

4111

$as_echo "$DX_DOXYGEN" >&6; }

4112

else

4113

- { $as_echo "$as_me:$LINENO: result: no" >&5

4114

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4115

$as_echo "no" >&6; }

4116

fi

4117

4118

@@ -2715,9 +3046,9 @@

4119

ac_pt_DX_DOXYGEN=$DX_DOXYGEN

4120

# Extract the first word of "doxygen", so it can be a program name with args.

4121

set dummy doxygen; ac_word=$2

4122

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4123

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4124

$as_echo_n "checking for $ac_word... " >&6; }

4125

-if test "${ac_cv_path_ac_pt_DX_DOXYGEN+set}" = set; then

4126

+if test "${ac_cv_path_ac_pt_DX_DOXYGEN+set}" = set; then :

4127

$as_echo_n "(cached) " >&6

4128

else

4129

case $ac_pt_DX_DOXYGEN in

4130

@@ -2730,14 +3061,14 @@

4131

do

4132

IFS=$as_save_IFS

4133

test -z "$as_dir" && as_dir=.

4134

- for ac_exec_ext in '' $ac_executable_extensions; do

4135

+ for ac_exec_ext in '' $ac_executable_extensions; do

4136

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4137

ac_cv_path_ac_pt_DX_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"

4138

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4139

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4140

break 2

4141

fi

4142

done

4143

-done

4144

+ done

4145

IFS=$as_save_IFS

4146

4147

;;

4148

@@ -2745,10 +3076,10 @@

4149

fi

4150

ac_pt_DX_DOXYGEN=$ac_cv_path_ac_pt_DX_DOXYGEN

4151

if test -n "$ac_pt_DX_DOXYGEN"; then

4152

- { $as_echo "$as_me:$LINENO: result: $ac_pt_DX_DOXYGEN" >&5

4153

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_DOXYGEN" >&5

4154

$as_echo "$ac_pt_DX_DOXYGEN" >&6; }

4155

else

4156

- { $as_echo "$as_me:$LINENO: result: no" >&5

4157

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4158

$as_echo "no" >&6; }

4159

fi

4160

4161

@@ -2757,7 +3088,7 @@

4162

else

4163

case $cross_compiling:$ac_tool_warned in

4164

yes:)

4165

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

4166

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

4167

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4168

ac_tool_warned=yes ;;

4169

esac

4170

@@ -2768,7 +3099,7 @@

4171

fi

4172

4173

if test "$DX_FLAG_doc$DX_DOXYGEN" = 1; then

4174

- { $as_echo "$as_me:$LINENO: WARNING: doxygen not found - will not generate any doxygen documentation" >&5

4175

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found - will not generate any doxygen documentation" >&5

4176

$as_echo "$as_me: WARNING: doxygen not found - will not generate any doxygen documentation" >&2;}

4177

DX_FLAG_doc=0

4178

4179

@@ -2778,9 +3109,9 @@

4180

if test -n "$ac_tool_prefix"; then

4181

# Extract the first word of "${ac_tool_prefix}perl", so it can be a program name with args.

4182

set dummy ${ac_tool_prefix}perl; ac_word=$2

4183

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4184

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4185

$as_echo_n "checking for $ac_word... " >&6; }

4186

-if test "${ac_cv_path_DX_PERL+set}" = set; then

4187

+if test "${ac_cv_path_DX_PERL+set}" = set; then :

4188

$as_echo_n "(cached) " >&6

4189

else

4190

case $DX_PERL in

4191

@@ -2793,14 +3124,14 @@

4192

do

4193

IFS=$as_save_IFS

4194

test -z "$as_dir" && as_dir=.

4195

- for ac_exec_ext in '' $ac_executable_extensions; do

4196

+ for ac_exec_ext in '' $ac_executable_extensions; do

4197

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4198

ac_cv_path_DX_PERL="$as_dir/$ac_word$ac_exec_ext"

4199

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4200

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4201

break 2

4202

fi

4203

done

4204

-done

4205

+ done

4206

IFS=$as_save_IFS

4207

4208

;;

4209

@@ -2808,10 +3139,10 @@

4210

fi

4211

DX_PERL=$ac_cv_path_DX_PERL

4212

if test -n "$DX_PERL"; then

4213

- { $as_echo "$as_me:$LINENO: result: $DX_PERL" >&5

4214

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_PERL" >&5

4215

$as_echo "$DX_PERL" >&6; }

4216

else

4217

- { $as_echo "$as_me:$LINENO: result: no" >&5

4218

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4219

$as_echo "no" >&6; }

4220

fi

4221

4222

@@ -2821,9 +3152,9 @@

4223

ac_pt_DX_PERL=$DX_PERL

4224

# Extract the first word of "perl", so it can be a program name with args.

4225

set dummy perl; ac_word=$2

4226

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4227

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4228

$as_echo_n "checking for $ac_word... " >&6; }

4229

-if test "${ac_cv_path_ac_pt_DX_PERL+set}" = set; then

4230

+if test "${ac_cv_path_ac_pt_DX_PERL+set}" = set; then :

4231

$as_echo_n "(cached) " >&6

4232

else

4233

case $ac_pt_DX_PERL in

4234

@@ -2836,14 +3167,14 @@

4235

do

4236

IFS=$as_save_IFS

4237

test -z "$as_dir" && as_dir=.

4238

- for ac_exec_ext in '' $ac_executable_extensions; do

4239

+ for ac_exec_ext in '' $ac_executable_extensions; do

4240

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4241

ac_cv_path_ac_pt_DX_PERL="$as_dir/$ac_word$ac_exec_ext"

4242

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4243

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4244

break 2

4245

fi

4246

done

4247

-done

4248

+ done

4249

IFS=$as_save_IFS

4250

4251

;;

4252

@@ -2851,10 +3182,10 @@

4253

fi

4254

ac_pt_DX_PERL=$ac_cv_path_ac_pt_DX_PERL

4255

if test -n "$ac_pt_DX_PERL"; then

4256

- { $as_echo "$as_me:$LINENO: result: $ac_pt_DX_PERL" >&5

4257

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_PERL" >&5

4258

$as_echo "$ac_pt_DX_PERL" >&6; }

4259

else

4260

- { $as_echo "$as_me:$LINENO: result: no" >&5

4261

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4262

$as_echo "no" >&6; }

4263

fi

4264

4265

@@ -2863,7 +3194,7 @@

4266

else

4267

case $cross_compiling:$ac_tool_warned in

4268

yes:)

4269

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

4270

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

4271

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4272

ac_tool_warned=yes ;;

4273

esac

4274

@@ -2874,7 +3205,7 @@

4275

fi

4276

4277

if test "$DX_FLAG_doc$DX_PERL" = 1; then

4278

- { $as_echo "$as_me:$LINENO: WARNING: perl not found - will not generate any doxygen documentation" >&5

4279

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl not found - will not generate any doxygen documentation" >&5

4280

$as_echo "$as_me: WARNING: perl not found - will not generate any doxygen documentation" >&2;}

4281

DX_FLAG_doc=0

4282

4283

@@ -2914,7 +3245,7 @@

4284

4285

4286

# Check whether --enable-doxygen-dot was given.

4287

-if test "${enable_doxygen_dot+set}" = set; then

4288

+if test "${enable_doxygen_dot+set}" = set; then :

4289

enableval=$enable_doxygen_dot;

4290

case "$enableval" in

4291

#(

4292

@@ -2923,9 +3254,7 @@

4293

4294

4295

test "$DX_FLAG_doc" = "1" \

4296

-|| { { $as_echo "$as_me:$LINENO: error: doxygen-dot requires doxygen-dot" >&5

4297

-$as_echo "$as_me: error: doxygen-dot requires doxygen-dot" >&2;}

4298

- { (exit 1); exit 1; }; }

4299

+|| as_fn_error "doxygen-dot requires doxygen-dot" "$LINENO" 5

4300

4301

;; #(

4302

n|N|no|No|NO)

4303

@@ -2933,9 +3262,7 @@

4304

4305

;; #(

4306

*)

4307

- { { $as_echo "$as_me:$LINENO: error: invalid value '$enableval' given to doxygen-dot" >&5

4308

-$as_echo "$as_me: error: invalid value '$enableval' given to doxygen-dot" >&2;}

4309

- { (exit 1); exit 1; }; }

4310

+ as_fn_error "invalid value '$enableval' given to doxygen-dot" "$LINENO" 5

4311

;;

4312

esac

4313

4314

@@ -2955,9 +3282,9 @@

4315

if test -n "$ac_tool_prefix"; then

4316

# Extract the first word of "${ac_tool_prefix}dot", so it can be a program name with args.

4317

set dummy ${ac_tool_prefix}dot; ac_word=$2

4318

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4319

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4320

$as_echo_n "checking for $ac_word... " >&6; }

4321

-if test "${ac_cv_path_DX_DOT+set}" = set; then

4322

+if test "${ac_cv_path_DX_DOT+set}" = set; then :

4323

$as_echo_n "(cached) " >&6

4324

else

4325

case $DX_DOT in

4326

@@ -2970,14 +3297,14 @@

4327

do

4328

IFS=$as_save_IFS

4329

test -z "$as_dir" && as_dir=.

4330

- for ac_exec_ext in '' $ac_executable_extensions; do

4331

+ for ac_exec_ext in '' $ac_executable_extensions; do

4332

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4333

ac_cv_path_DX_DOT="$as_dir/$ac_word$ac_exec_ext"

4334

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4335

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4336

break 2

4337

fi

4338

done

4339

-done

4340

+ done

4341

IFS=$as_save_IFS

4342

4343

;;

4344

@@ -2985,10 +3312,10 @@

4345

fi

4346

DX_DOT=$ac_cv_path_DX_DOT

4347

if test -n "$DX_DOT"; then

4348

- { $as_echo "$as_me:$LINENO: result: $DX_DOT" >&5

4349

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_DOT" >&5

4350

$as_echo "$DX_DOT" >&6; }

4351

else

4352

- { $as_echo "$as_me:$LINENO: result: no" >&5

4353

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4354

$as_echo "no" >&6; }

4355

fi

4356

4357

@@ -2998,9 +3325,9 @@

4358

ac_pt_DX_DOT=$DX_DOT

4359

# Extract the first word of "dot", so it can be a program name with args.

4360

set dummy dot; ac_word=$2

4361

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4362

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4363

$as_echo_n "checking for $ac_word... " >&6; }

4364

-if test "${ac_cv_path_ac_pt_DX_DOT+set}" = set; then

4365

+if test "${ac_cv_path_ac_pt_DX_DOT+set}" = set; then :

4366

$as_echo_n "(cached) " >&6

4367

else

4368

case $ac_pt_DX_DOT in

4369

@@ -3013,14 +3340,14 @@

4370

do

4371

IFS=$as_save_IFS

4372

test -z "$as_dir" && as_dir=.

4373

- for ac_exec_ext in '' $ac_executable_extensions; do

4374

+ for ac_exec_ext in '' $ac_executable_extensions; do

4375

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4376

ac_cv_path_ac_pt_DX_DOT="$as_dir/$ac_word$ac_exec_ext"

4377

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4378

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4379

break 2

4380

fi

4381

done

4382

-done

4383

+ done

4384

IFS=$as_save_IFS

4385

4386

;;

4387

@@ -3028,10 +3355,10 @@

4388

fi

4389

ac_pt_DX_DOT=$ac_cv_path_ac_pt_DX_DOT

4390

if test -n "$ac_pt_DX_DOT"; then

4391

- { $as_echo "$as_me:$LINENO: result: $ac_pt_DX_DOT" >&5

4392

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_DOT" >&5

4393

$as_echo "$ac_pt_DX_DOT" >&6; }

4394

else

4395

- { $as_echo "$as_me:$LINENO: result: no" >&5

4396

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4397

$as_echo "no" >&6; }

4398

fi

4399

4400

@@ -3040,7 +3367,7 @@

4401

else

4402

case $cross_compiling:$ac_tool_warned in

4403

yes:)

4404

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

4405

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

4406

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4407

ac_tool_warned=yes ;;

4408

esac

4409

@@ -3051,7 +3378,7 @@

4410

fi

4411

4412

if test "$DX_FLAG_dot$DX_DOT" = 1; then

4413

- { $as_echo "$as_me:$LINENO: WARNING: dot not found - will not generate graphics for doxygen documentation" >&5

4414

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dot not found - will not generate graphics for doxygen documentation" >&5

4415

$as_echo "$as_me: WARNING: dot not found - will not generate graphics for doxygen documentation" >&2;}

4416

DX_FLAG_dot=0

4417

4418

@@ -3094,7 +3421,7 @@

4419

4420

4421

# Check whether --enable-doxygen-man was given.

4422

-if test "${enable_doxygen_man+set}" = set; then

4423

+if test "${enable_doxygen_man+set}" = set; then :

4424

enableval=$enable_doxygen_man;

4425

case "$enableval" in

4426

#(

4427

@@ -3103,9 +3430,7 @@

4428

4429

4430

test "$DX_FLAG_doc" = "1" \

4431

-|| { { $as_echo "$as_me:$LINENO: error: doxygen-man requires doxygen-man" >&5

4432

-$as_echo "$as_me: error: doxygen-man requires doxygen-man" >&2;}

4433

- { (exit 1); exit 1; }; }

4434

+|| as_fn_error "doxygen-man requires doxygen-man" "$LINENO" 5

4435

4436

;; #(

4437

n|N|no|No|NO)

4438

@@ -3113,9 +3438,7 @@

4439

4440

;; #(

4441

*)

4442

- { { $as_echo "$as_me:$LINENO: error: invalid value '$enableval' given to doxygen-man" >&5

4443

-$as_echo "$as_me: error: invalid value '$enableval' given to doxygen-man" >&2;}

4444

- { (exit 1); exit 1; }; }

4445

+ as_fn_error "invalid value '$enableval' given to doxygen-man" "$LINENO" 5

4446

;;

4447

esac

4448

4449

@@ -3167,7 +3490,7 @@

4450

4451

4452

# Check whether --enable-doxygen-rtf was given.

4453

-if test "${enable_doxygen_rtf+set}" = set; then

4454

+if test "${enable_doxygen_rtf+set}" = set; then :

4455

enableval=$enable_doxygen_rtf;

4456

case "$enableval" in

4457

#(

4458

@@ -3176,9 +3499,7 @@

4459

4460

4461

test "$DX_FLAG_doc" = "1" \

4462

-|| { { $as_echo "$as_me:$LINENO: error: doxygen-rtf requires doxygen-rtf" >&5

4463

-$as_echo "$as_me: error: doxygen-rtf requires doxygen-rtf" >&2;}

4464

- { (exit 1); exit 1; }; }

4465

+|| as_fn_error "doxygen-rtf requires doxygen-rtf" "$LINENO" 5

4466

4467

;; #(

4468

n|N|no|No|NO)

4469

@@ -3186,9 +3507,7 @@

4470

4471

;; #(

4472

*)

4473

- { { $as_echo "$as_me:$LINENO: error: invalid value '$enableval' given to doxygen-rtf" >&5

4474

-$as_echo "$as_me: error: invalid value '$enableval' given to doxygen-rtf" >&2;}

4475

- { (exit 1); exit 1; }; }

4476

+ as_fn_error "invalid value '$enableval' given to doxygen-rtf" "$LINENO" 5

4477

;;

4478

esac

4479

4480

@@ -3240,7 +3559,7 @@

4481

4482

4483

# Check whether --enable-doxygen-xml was given.

4484

-if test "${enable_doxygen_xml+set}" = set; then

4485

+if test "${enable_doxygen_xml+set}" = set; then :

4486

enableval=$enable_doxygen_xml;

4487

case "$enableval" in

4488

#(

4489

@@ -3249,9 +3568,7 @@

4490

4491

4492

test "$DX_FLAG_doc" = "1" \

4493

-|| { { $as_echo "$as_me:$LINENO: error: doxygen-xml requires doxygen-xml" >&5

4494

-$as_echo "$as_me: error: doxygen-xml requires doxygen-xml" >&2;}

4495

- { (exit 1); exit 1; }; }

4496

+|| as_fn_error "doxygen-xml requires doxygen-xml" "$LINENO" 5

4497

4498

;; #(

4499

n|N|no|No|NO)

4500

@@ -3259,9 +3576,7 @@

4501

4502

;; #(

4503

*)

4504

- { { $as_echo "$as_me:$LINENO: error: invalid value '$enableval' given to doxygen-xml" >&5

4505

-$as_echo "$as_me: error: invalid value '$enableval' given to doxygen-xml" >&2;}

4506

- { (exit 1); exit 1; }; }

4507

+ as_fn_error "invalid value '$enableval' given to doxygen-xml" "$LINENO" 5

4508

;;

4509

esac

4510

4511

@@ -3313,7 +3628,7 @@

4512

4513

4514

# Check whether --enable-doxygen-chm was given.

4515

-if test "${enable_doxygen_chm+set}" = set; then

4516

+if test "${enable_doxygen_chm+set}" = set; then :

4517

enableval=$enable_doxygen_chm;

4518

case "$enableval" in

4519

#(

4520

@@ -3322,9 +3637,7 @@

4521

4522

4523

test "$DX_FLAG_doc" = "1" \

4524

-|| { { $as_echo "$as_me:$LINENO: error: doxygen-chm requires doxygen-chm" >&5

4525

-$as_echo "$as_me: error: doxygen-chm requires doxygen-chm" >&2;}

4526

- { (exit 1); exit 1; }; }

4527

+|| as_fn_error "doxygen-chm requires doxygen-chm" "$LINENO" 5

4528

4529

;; #(

4530

n|N|no|No|NO)

4531

@@ -3332,9 +3645,7 @@

4532

4533

;; #(

4534

*)

4535

- { { $as_echo "$as_me:$LINENO: error: invalid value '$enableval' given to doxygen-chm" >&5

4536

-$as_echo "$as_me: error: invalid value '$enableval' given to doxygen-chm" >&2;}

4537

- { (exit 1); exit 1; }; }

4538

+ as_fn_error "invalid value '$enableval' given to doxygen-chm" "$LINENO" 5

4539

;;

4540

esac

4541

4542

@@ -3354,9 +3665,9 @@

4543

if test -n "$ac_tool_prefix"; then

4544

# Extract the first word of "${ac_tool_prefix}hhc", so it can be a program name with args.

4545

set dummy ${ac_tool_prefix}hhc; ac_word=$2

4546

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4547

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4548

$as_echo_n "checking for $ac_word... " >&6; }

4549

-if test "${ac_cv_path_DX_HHC+set}" = set; then

4550

+if test "${ac_cv_path_DX_HHC+set}" = set; then :

4551

$as_echo_n "(cached) " >&6

4552

else

4553

case $DX_HHC in

4554

@@ -3369,14 +3680,14 @@

4555

do

4556

IFS=$as_save_IFS

4557

test -z "$as_dir" && as_dir=.

4558

- for ac_exec_ext in '' $ac_executable_extensions; do

4559

+ for ac_exec_ext in '' $ac_executable_extensions; do

4560

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4561

ac_cv_path_DX_HHC="$as_dir/$ac_word$ac_exec_ext"

4562

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4563

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4564

break 2

4565

fi

4566

done

4567

-done

4568

+ done

4569

IFS=$as_save_IFS

4570

4571

;;

4572

@@ -3384,10 +3695,10 @@

4573

fi

4574

DX_HHC=$ac_cv_path_DX_HHC

4575

if test -n "$DX_HHC"; then

4576

- { $as_echo "$as_me:$LINENO: result: $DX_HHC" >&5

4577

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_HHC" >&5

4578

$as_echo "$DX_HHC" >&6; }

4579

else

4580

- { $as_echo "$as_me:$LINENO: result: no" >&5

4581

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4582

$as_echo "no" >&6; }

4583

fi

4584

4585

@@ -3397,9 +3708,9 @@

4586

ac_pt_DX_HHC=$DX_HHC

4587

# Extract the first word of "hhc", so it can be a program name with args.

4588

set dummy hhc; ac_word=$2

4589

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4590

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4591

$as_echo_n "checking for $ac_word... " >&6; }

4592

-if test "${ac_cv_path_ac_pt_DX_HHC+set}" = set; then

4593

+if test "${ac_cv_path_ac_pt_DX_HHC+set}" = set; then :

4594

$as_echo_n "(cached) " >&6

4595

else

4596

case $ac_pt_DX_HHC in

4597

@@ -3412,14 +3723,14 @@

4598

do

4599

IFS=$as_save_IFS

4600

test -z "$as_dir" && as_dir=.

4601

- for ac_exec_ext in '' $ac_executable_extensions; do

4602

+ for ac_exec_ext in '' $ac_executable_extensions; do

4603

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4604

ac_cv_path_ac_pt_DX_HHC="$as_dir/$ac_word$ac_exec_ext"

4605

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4606

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4607

break 2

4608

fi

4609

done

4610

-done

4611

+ done

4612

IFS=$as_save_IFS

4613

4614

;;

4615

@@ -3427,10 +3738,10 @@

4616

fi

4617

ac_pt_DX_HHC=$ac_cv_path_ac_pt_DX_HHC

4618

if test -n "$ac_pt_DX_HHC"; then

4619

- { $as_echo "$as_me:$LINENO: result: $ac_pt_DX_HHC" >&5

4620

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_HHC" >&5

4621

$as_echo "$ac_pt_DX_HHC" >&6; }

4622

else

4623

- { $as_echo "$as_me:$LINENO: result: no" >&5

4624

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4625

$as_echo "no" >&6; }

4626

fi

4627

4628

@@ -3439,7 +3750,7 @@

4629

else

4630

case $cross_compiling:$ac_tool_warned in

4631

yes:)

4632

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

4633

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

4634

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4635

ac_tool_warned=yes ;;

4636

esac

4637

@@ -3450,7 +3761,7 @@

4638

fi

4639

4640

if test "$DX_FLAG_chm$DX_HHC" = 1; then

4641

- { $as_echo "$as_me:$LINENO: WARNING: hhc not found - will not generate doxygen compressed HTML help documentation" >&5

4642

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: hhc not found - will not generate doxygen compressed HTML help documentation" >&5

4643

$as_echo "$as_me: WARNING: hhc not found - will not generate doxygen compressed HTML help documentation" >&2;}

4644

DX_FLAG_chm=0

4645

4646

@@ -3495,7 +3806,7 @@

4647

4648

4649

# Check whether --enable-doxygen-chi was given.

4650

-if test "${enable_doxygen_chi+set}" = set; then

4651

+if test "${enable_doxygen_chi+set}" = set; then :

4652

enableval=$enable_doxygen_chi;

4653

case "$enableval" in

4654

#(

4655

@@ -3504,9 +3815,7 @@

4656

4657

4658

test "$DX_FLAG_chm" = "1" \

4659

-|| { { $as_echo "$as_me:$LINENO: error: doxygen-chi requires doxygen-chi" >&5

4660

-$as_echo "$as_me: error: doxygen-chi requires doxygen-chi" >&2;}

4661

- { (exit 1); exit 1; }; }

4662

+|| as_fn_error "doxygen-chi requires doxygen-chi" "$LINENO" 5

4663

4664

;; #(

4665

n|N|no|No|NO)

4666

@@ -3514,9 +3823,7 @@

4667

4668

;; #(

4669

*)

4670

- { { $as_echo "$as_me:$LINENO: error: invalid value '$enableval' given to doxygen-chi" >&5

4671

-$as_echo "$as_me: error: invalid value '$enableval' given to doxygen-chi" >&2;}

4672

- { (exit 1); exit 1; }; }

4673

+ as_fn_error "invalid value '$enableval' given to doxygen-chi" "$LINENO" 5

4674

;;

4675

esac

4676

4677

@@ -3568,7 +3875,7 @@

4678

4679

4680

# Check whether --enable-doxygen-html was given.

4681

-if test "${enable_doxygen_html+set}" = set; then

4682

+if test "${enable_doxygen_html+set}" = set; then :

4683

enableval=$enable_doxygen_html;

4684

case "$enableval" in

4685

#(

4686

@@ -3577,14 +3884,10 @@

4687

4688

4689

test "$DX_FLAG_doc" = "1" \

4690

-|| { { $as_echo "$as_me:$LINENO: error: doxygen-html requires doxygen-html" >&5

4691

-$as_echo "$as_me: error: doxygen-html requires doxygen-html" >&2;}

4692

- { (exit 1); exit 1; }; }

4693

+|| as_fn_error "doxygen-html requires doxygen-html" "$LINENO" 5

4694

4695

test "$DX_FLAG_chm" = "0" \

4696

-|| { { $as_echo "$as_me:$LINENO: error: doxygen-html contradicts doxygen-html" >&5

4697

-$as_echo "$as_me: error: doxygen-html contradicts doxygen-html" >&2;}

4698

- { (exit 1); exit 1; }; }

4699

+|| as_fn_error "doxygen-html contradicts doxygen-html" "$LINENO" 5

4700

4701

;; #(

4702

n|N|no|No|NO)

4703

@@ -3592,9 +3895,7 @@

4704

4705

;; #(

4706

*)

4707

- { { $as_echo "$as_me:$LINENO: error: invalid value '$enableval' given to doxygen-html" >&5

4708

-$as_echo "$as_me: error: invalid value '$enableval' given to doxygen-html" >&2;}

4709

- { (exit 1); exit 1; }; }

4710

+ as_fn_error "invalid value '$enableval' given to doxygen-html" "$LINENO" 5

4711

;;

4712

esac

4713

4714

@@ -3649,7 +3950,7 @@

4715

4716

4717

# Check whether --enable-doxygen-ps was given.

4718

-if test "${enable_doxygen_ps+set}" = set; then

4719

+if test "${enable_doxygen_ps+set}" = set; then :

4720

enableval=$enable_doxygen_ps;

4721

case "$enableval" in

4722

#(

4723

@@ -3658,9 +3959,7 @@

4724

4725

4726

test "$DX_FLAG_doc" = "1" \

4727

-|| { { $as_echo "$as_me:$LINENO: error: doxygen-ps requires doxygen-ps" >&5

4728

-$as_echo "$as_me: error: doxygen-ps requires doxygen-ps" >&2;}

4729

- { (exit 1); exit 1; }; }

4730

+|| as_fn_error "doxygen-ps requires doxygen-ps" "$LINENO" 5

4731

4732

;; #(

4733

n|N|no|No|NO)

4734

@@ -3668,9 +3967,7 @@

4735

4736

;; #(

4737

*)

4738

- { { $as_echo "$as_me:$LINENO: error: invalid value '$enableval' given to doxygen-ps" >&5

4739

-$as_echo "$as_me: error: invalid value '$enableval' given to doxygen-ps" >&2;}

4740

- { (exit 1); exit 1; }; }

4741

+ as_fn_error "invalid value '$enableval' given to doxygen-ps" "$LINENO" 5

4742

;;

4743

esac

4744

4745

@@ -3690,9 +3987,9 @@

4746

if test -n "$ac_tool_prefix"; then

4747

# Extract the first word of "${ac_tool_prefix}latex", so it can be a program name with args.

4748

set dummy ${ac_tool_prefix}latex; ac_word=$2

4749

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4750

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4751

$as_echo_n "checking for $ac_word... " >&6; }

4752

-if test "${ac_cv_path_DX_LATEX+set}" = set; then

4753

+if test "${ac_cv_path_DX_LATEX+set}" = set; then :

4754

$as_echo_n "(cached) " >&6

4755

else

4756

case $DX_LATEX in

4757

@@ -3705,14 +4002,14 @@

4758

do

4759

IFS=$as_save_IFS

4760

test -z "$as_dir" && as_dir=.

4761

- for ac_exec_ext in '' $ac_executable_extensions; do

4762

+ for ac_exec_ext in '' $ac_executable_extensions; do

4763

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4764

ac_cv_path_DX_LATEX="$as_dir/$ac_word$ac_exec_ext"

4765

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4766

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4767

break 2

4768

fi

4769

done

4770

-done

4771

+ done

4772

IFS=$as_save_IFS

4773

4774

;;

4775

@@ -3720,10 +4017,10 @@

4776

fi

4777

DX_LATEX=$ac_cv_path_DX_LATEX

4778

if test -n "$DX_LATEX"; then

4779

- { $as_echo "$as_me:$LINENO: result: $DX_LATEX" >&5

4780

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_LATEX" >&5

4781

$as_echo "$DX_LATEX" >&6; }

4782

else

4783

- { $as_echo "$as_me:$LINENO: result: no" >&5

4784

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4785

$as_echo "no" >&6; }

4786

fi

4787

4788

@@ -3733,9 +4030,9 @@

4789

ac_pt_DX_LATEX=$DX_LATEX

4790

# Extract the first word of "latex", so it can be a program name with args.

4791

set dummy latex; ac_word=$2

4792

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4793

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4794

$as_echo_n "checking for $ac_word... " >&6; }

4795

-if test "${ac_cv_path_ac_pt_DX_LATEX+set}" = set; then

4796

+if test "${ac_cv_path_ac_pt_DX_LATEX+set}" = set; then :

4797

$as_echo_n "(cached) " >&6

4798

else

4799

case $ac_pt_DX_LATEX in

4800

@@ -3748,14 +4045,14 @@

4801

do

4802

IFS=$as_save_IFS

4803

test -z "$as_dir" && as_dir=.

4804

- for ac_exec_ext in '' $ac_executable_extensions; do

4805

+ for ac_exec_ext in '' $ac_executable_extensions; do

4806

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4807

ac_cv_path_ac_pt_DX_LATEX="$as_dir/$ac_word$ac_exec_ext"

4808

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4809

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4810

break 2

4811

fi

4812

done

4813

-done

4814

+ done

4815

IFS=$as_save_IFS

4816

4817

;;

4818

@@ -3763,10 +4060,10 @@

4819

fi

4820

ac_pt_DX_LATEX=$ac_cv_path_ac_pt_DX_LATEX

4821

if test -n "$ac_pt_DX_LATEX"; then

4822

- { $as_echo "$as_me:$LINENO: result: $ac_pt_DX_LATEX" >&5

4823

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_LATEX" >&5

4824

$as_echo "$ac_pt_DX_LATEX" >&6; }

4825

else

4826

- { $as_echo "$as_me:$LINENO: result: no" >&5

4827

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4828

$as_echo "no" >&6; }

4829

fi

4830

4831

@@ -3775,7 +4072,7 @@

4832

else

4833

case $cross_compiling:$ac_tool_warned in

4834

yes:)

4835

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

4836

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

4837

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4838

ac_tool_warned=yes ;;

4839

esac

4840

@@ -3786,7 +4083,7 @@

4841

fi

4842

4843

if test "$DX_FLAG_ps$DX_LATEX" = 1; then

4844

- { $as_echo "$as_me:$LINENO: WARNING: latex not found - will not generate doxygen PostScript documentation" >&5

4845

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: latex not found - will not generate doxygen PostScript documentation" >&5

4846

$as_echo "$as_me: WARNING: latex not found - will not generate doxygen PostScript documentation" >&2;}

4847

DX_FLAG_ps=0

4848

4849

@@ -3796,9 +4093,9 @@

4850

if test -n "$ac_tool_prefix"; then

4851

# Extract the first word of "${ac_tool_prefix}makeindex", so it can be a program name with args.

4852

set dummy ${ac_tool_prefix}makeindex; ac_word=$2

4853

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4854

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4855

$as_echo_n "checking for $ac_word... " >&6; }

4856

-if test "${ac_cv_path_DX_MAKEINDEX+set}" = set; then

4857

+if test "${ac_cv_path_DX_MAKEINDEX+set}" = set; then :

4858

$as_echo_n "(cached) " >&6

4859

else

4860

case $DX_MAKEINDEX in

4861

@@ -3811,14 +4108,14 @@

4862

do

4863

IFS=$as_save_IFS

4864

test -z "$as_dir" && as_dir=.

4865

- for ac_exec_ext in '' $ac_executable_extensions; do

4866

+ for ac_exec_ext in '' $ac_executable_extensions; do

4867

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4868

ac_cv_path_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"

4869

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4870

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4871

break 2

4872

fi

4873

done

4874

-done

4875

+ done

4876

IFS=$as_save_IFS

4877

4878

;;

4879

@@ -3826,10 +4123,10 @@

4880

fi

4881

DX_MAKEINDEX=$ac_cv_path_DX_MAKEINDEX

4882

if test -n "$DX_MAKEINDEX"; then

4883

- { $as_echo "$as_me:$LINENO: result: $DX_MAKEINDEX" >&5

4884

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_MAKEINDEX" >&5

4885

$as_echo "$DX_MAKEINDEX" >&6; }

4886

else

4887

- { $as_echo "$as_me:$LINENO: result: no" >&5

4888

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4889

$as_echo "no" >&6; }

4890

fi

4891

4892

@@ -3839,9 +4136,9 @@

4893

ac_pt_DX_MAKEINDEX=$DX_MAKEINDEX

4894

# Extract the first word of "makeindex", so it can be a program name with args.

4895

set dummy makeindex; ac_word=$2

4896

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4897

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4898

$as_echo_n "checking for $ac_word... " >&6; }

4899

-if test "${ac_cv_path_ac_pt_DX_MAKEINDEX+set}" = set; then

4900

+if test "${ac_cv_path_ac_pt_DX_MAKEINDEX+set}" = set; then :

4901

$as_echo_n "(cached) " >&6

4902

else

4903

case $ac_pt_DX_MAKEINDEX in

4904

@@ -3854,14 +4151,14 @@

4905

do

4906

IFS=$as_save_IFS

4907

test -z "$as_dir" && as_dir=.

4908

- for ac_exec_ext in '' $ac_executable_extensions; do

4909

+ for ac_exec_ext in '' $ac_executable_extensions; do

4910

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4911

ac_cv_path_ac_pt_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"

4912

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4913

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4914

break 2

4915

fi

4916

done

4917

-done

4918

+ done

4919

IFS=$as_save_IFS

4920

4921

;;

4922

@@ -3869,10 +4166,10 @@

4923

fi

4924

ac_pt_DX_MAKEINDEX=$ac_cv_path_ac_pt_DX_MAKEINDEX

4925

if test -n "$ac_pt_DX_MAKEINDEX"; then

4926

- { $as_echo "$as_me:$LINENO: result: $ac_pt_DX_MAKEINDEX" >&5

4927

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_MAKEINDEX" >&5

4928

$as_echo "$ac_pt_DX_MAKEINDEX" >&6; }

4929

else

4930

- { $as_echo "$as_me:$LINENO: result: no" >&5

4931

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4932

$as_echo "no" >&6; }

4933

fi

4934

4935

@@ -3881,7 +4178,7 @@

4936

else

4937

case $cross_compiling:$ac_tool_warned in

4938

yes:)

4939

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

4940

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

4941

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

4942

ac_tool_warned=yes ;;

4943

esac

4944

@@ -3892,7 +4189,7 @@

4945

fi

4946

4947

if test "$DX_FLAG_ps$DX_MAKEINDEX" = 1; then

4948

- { $as_echo "$as_me:$LINENO: WARNING: makeindex not found - will not generate doxygen PostScript documentation" >&5

4949

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: makeindex not found - will not generate doxygen PostScript documentation" >&5

4950

$as_echo "$as_me: WARNING: makeindex not found - will not generate doxygen PostScript documentation" >&2;}

4951

DX_FLAG_ps=0

4952

4953

@@ -3902,9 +4199,9 @@

4954

if test -n "$ac_tool_prefix"; then

4955

# Extract the first word of "${ac_tool_prefix}dvips", so it can be a program name with args.

4956

set dummy ${ac_tool_prefix}dvips; ac_word=$2

4957

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

4958

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

4959

$as_echo_n "checking for $ac_word... " >&6; }

4960

-if test "${ac_cv_path_DX_DVIPS+set}" = set; then

4961

+if test "${ac_cv_path_DX_DVIPS+set}" = set; then :

4962

$as_echo_n "(cached) " >&6

4963

else

4964

case $DX_DVIPS in

4965

@@ -3917,14 +4214,14 @@

4966

do

4967

IFS=$as_save_IFS

4968

test -z "$as_dir" && as_dir=.

4969

- for ac_exec_ext in '' $ac_executable_extensions; do

4970

+ for ac_exec_ext in '' $ac_executable_extensions; do

4971

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

4972

ac_cv_path_DX_DVIPS="$as_dir/$ac_word$ac_exec_ext"

4973

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

4974

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

4975

break 2

4976

fi

4977

done

4978

-done

4979

+ done

4980

IFS=$as_save_IFS

4981

4982

;;

4983

@@ -3932,10 +4229,10 @@

4984

fi

4985

DX_DVIPS=$ac_cv_path_DX_DVIPS

4986

if test -n "$DX_DVIPS"; then

4987

- { $as_echo "$as_me:$LINENO: result: $DX_DVIPS" >&5

4988

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_DVIPS" >&5

4989

$as_echo "$DX_DVIPS" >&6; }

4990

else

4991

- { $as_echo "$as_me:$LINENO: result: no" >&5

4992

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

4993

$as_echo "no" >&6; }

4994

fi

4995

4996

@@ -3945,9 +4242,9 @@

4997

ac_pt_DX_DVIPS=$DX_DVIPS

4998

# Extract the first word of "dvips", so it can be a program name with args.

4999

set dummy dvips; ac_word=$2

5000

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5001

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5002

$as_echo_n "checking for $ac_word... " >&6; }

5003

-if test "${ac_cv_path_ac_pt_DX_DVIPS+set}" = set; then

5004

+if test "${ac_cv_path_ac_pt_DX_DVIPS+set}" = set; then :

5005

$as_echo_n "(cached) " >&6

5006

else

5007

case $ac_pt_DX_DVIPS in

5008

@@ -3960,14 +4257,14 @@

5009

do

5010

IFS=$as_save_IFS

5011

test -z "$as_dir" && as_dir=.

5012

- for ac_exec_ext in '' $ac_executable_extensions; do

5013

+ for ac_exec_ext in '' $ac_executable_extensions; do

5014

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5015

ac_cv_path_ac_pt_DX_DVIPS="$as_dir/$ac_word$ac_exec_ext"

5016

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5017

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5018

break 2

5019

fi

5020

done

5021

-done

5022

+ done

5023

IFS=$as_save_IFS

5024

5025

;;

5026

@@ -3975,10 +4272,10 @@

5027

fi

5028

ac_pt_DX_DVIPS=$ac_cv_path_ac_pt_DX_DVIPS

5029

if test -n "$ac_pt_DX_DVIPS"; then

5030

- { $as_echo "$as_me:$LINENO: result: $ac_pt_DX_DVIPS" >&5

5031

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_DVIPS" >&5

5032

$as_echo "$ac_pt_DX_DVIPS" >&6; }

5033

else

5034

- { $as_echo "$as_me:$LINENO: result: no" >&5

5035

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5036

$as_echo "no" >&6; }

5037

fi

5038

5039

@@ -3987,7 +4284,7 @@

5040

else

5041

case $cross_compiling:$ac_tool_warned in

5042

yes:)

5043

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

5044

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

5045

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

5046

ac_tool_warned=yes ;;

5047

esac

5048

@@ -3998,7 +4295,7 @@

5049

fi

5050

5051

if test "$DX_FLAG_ps$DX_DVIPS" = 1; then

5052

- { $as_echo "$as_me:$LINENO: WARNING: dvips not found - will not generate doxygen PostScript documentation" >&5

5053

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dvips not found - will not generate doxygen PostScript documentation" >&5

5054

$as_echo "$as_me: WARNING: dvips not found - will not generate doxygen PostScript documentation" >&2;}

5055

DX_FLAG_ps=0

5056

5057

@@ -4008,9 +4305,9 @@

5058

if test -n "$ac_tool_prefix"; then

5059

# Extract the first word of "${ac_tool_prefix}egrep", so it can be a program name with args.

5060

set dummy ${ac_tool_prefix}egrep; ac_word=$2

5061

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5062

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5063

$as_echo_n "checking for $ac_word... " >&6; }

5064

-if test "${ac_cv_path_DX_EGREP+set}" = set; then

5065

+if test "${ac_cv_path_DX_EGREP+set}" = set; then :

5066

$as_echo_n "(cached) " >&6

5067

else

5068

case $DX_EGREP in

5069

@@ -4023,14 +4320,14 @@

5070

do

5071

IFS=$as_save_IFS

5072

test -z "$as_dir" && as_dir=.

5073

- for ac_exec_ext in '' $ac_executable_extensions; do

5074

+ for ac_exec_ext in '' $ac_executable_extensions; do

5075

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5076

ac_cv_path_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"

5077

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5078

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5079

break 2

5080

fi

5081

done

5082

-done

5083

+ done

5084

IFS=$as_save_IFS

5085

5086

;;

5087

@@ -4038,10 +4335,10 @@

5088

fi

5089

DX_EGREP=$ac_cv_path_DX_EGREP

5090

if test -n "$DX_EGREP"; then

5091

- { $as_echo "$as_me:$LINENO: result: $DX_EGREP" >&5

5092

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_EGREP" >&5

5093

$as_echo "$DX_EGREP" >&6; }

5094

else

5095

- { $as_echo "$as_me:$LINENO: result: no" >&5

5096

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5097

$as_echo "no" >&6; }

5098

fi

5099

5100

@@ -4051,9 +4348,9 @@

5101

ac_pt_DX_EGREP=$DX_EGREP

5102

# Extract the first word of "egrep", so it can be a program name with args.

5103

set dummy egrep; ac_word=$2

5104

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5105

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5106

$as_echo_n "checking for $ac_word... " >&6; }

5107

-if test "${ac_cv_path_ac_pt_DX_EGREP+set}" = set; then

5108

+if test "${ac_cv_path_ac_pt_DX_EGREP+set}" = set; then :

5109

$as_echo_n "(cached) " >&6

5110

else

5111

case $ac_pt_DX_EGREP in

5112

@@ -4066,14 +4363,14 @@

5113

do

5114

IFS=$as_save_IFS

5115

test -z "$as_dir" && as_dir=.

5116

- for ac_exec_ext in '' $ac_executable_extensions; do

5117

+ for ac_exec_ext in '' $ac_executable_extensions; do

5118

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5119

ac_cv_path_ac_pt_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"

5120

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5121

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5122

break 2

5123

fi

5124

done

5125

-done

5126

+ done

5127

IFS=$as_save_IFS

5128

5129

;;

5130

@@ -4081,10 +4378,10 @@

5131

fi

5132

ac_pt_DX_EGREP=$ac_cv_path_ac_pt_DX_EGREP

5133

if test -n "$ac_pt_DX_EGREP"; then

5134

- { $as_echo "$as_me:$LINENO: result: $ac_pt_DX_EGREP" >&5

5135

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_EGREP" >&5

5136

$as_echo "$ac_pt_DX_EGREP" >&6; }

5137

else

5138

- { $as_echo "$as_me:$LINENO: result: no" >&5

5139

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5140

$as_echo "no" >&6; }

5141

fi

5142

5143

@@ -4093,7 +4390,7 @@

5144

else

5145

case $cross_compiling:$ac_tool_warned in

5146

yes:)

5147

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

5148

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

5149

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

5150

ac_tool_warned=yes ;;

5151

esac

5152

@@ -4104,7 +4401,7 @@

5153

fi

5154

5155

if test "$DX_FLAG_ps$DX_EGREP" = 1; then

5156

- { $as_echo "$as_me:$LINENO: WARNING: egrep not found - will not generate doxygen PostScript documentation" >&5

5157

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: egrep not found - will not generate doxygen PostScript documentation" >&5

5158

$as_echo "$as_me: WARNING: egrep not found - will not generate doxygen PostScript documentation" >&2;}

5159

DX_FLAG_ps=0

5160

5161

@@ -4143,7 +4440,7 @@

5162

5163

5164

# Check whether --enable-doxygen-pdf was given.

5165

-if test "${enable_doxygen_pdf+set}" = set; then

5166

+if test "${enable_doxygen_pdf+set}" = set; then :

5167

enableval=$enable_doxygen_pdf;

5168

case "$enableval" in

5169

#(

5170

@@ -4152,9 +4449,7 @@

5171

5172

5173

test "$DX_FLAG_doc" = "1" \

5174

-|| { { $as_echo "$as_me:$LINENO: error: doxygen-pdf requires doxygen-pdf" >&5

5175

-$as_echo "$as_me: error: doxygen-pdf requires doxygen-pdf" >&2;}

5176

- { (exit 1); exit 1; }; }

5177

+|| as_fn_error "doxygen-pdf requires doxygen-pdf" "$LINENO" 5

5178

5179

;; #(

5180

n|N|no|No|NO)

5181

@@ -4162,9 +4457,7 @@

5182

5183

;; #(

5184

*)

5185

- { { $as_echo "$as_me:$LINENO: error: invalid value '$enableval' given to doxygen-pdf" >&5

5186

-$as_echo "$as_me: error: invalid value '$enableval' given to doxygen-pdf" >&2;}

5187

- { (exit 1); exit 1; }; }

5188

+ as_fn_error "invalid value '$enableval' given to doxygen-pdf" "$LINENO" 5

5189

;;

5190

esac

5191

5192

@@ -4184,9 +4477,9 @@

5193

if test -n "$ac_tool_prefix"; then

5194

# Extract the first word of "${ac_tool_prefix}pdflatex", so it can be a program name with args.

5195

set dummy ${ac_tool_prefix}pdflatex; ac_word=$2

5196

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5197

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5198

$as_echo_n "checking for $ac_word... " >&6; }

5199

-if test "${ac_cv_path_DX_PDFLATEX+set}" = set; then

5200

+if test "${ac_cv_path_DX_PDFLATEX+set}" = set; then :

5201

$as_echo_n "(cached) " >&6

5202

else

5203

case $DX_PDFLATEX in

5204

@@ -4199,14 +4492,14 @@

5205

do

5206

IFS=$as_save_IFS

5207

test -z "$as_dir" && as_dir=.

5208

- for ac_exec_ext in '' $ac_executable_extensions; do

5209

+ for ac_exec_ext in '' $ac_executable_extensions; do

5210

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5211

ac_cv_path_DX_PDFLATEX="$as_dir/$ac_word$ac_exec_ext"

5212

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5213

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5214

break 2

5215

fi

5216

done

5217

-done

5218

+ done

5219

IFS=$as_save_IFS

5220

5221

;;

5222

@@ -4214,10 +4507,10 @@

5223

fi

5224

DX_PDFLATEX=$ac_cv_path_DX_PDFLATEX

5225

if test -n "$DX_PDFLATEX"; then

5226

- { $as_echo "$as_me:$LINENO: result: $DX_PDFLATEX" >&5

5227

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_PDFLATEX" >&5

5228

$as_echo "$DX_PDFLATEX" >&6; }

5229

else

5230

- { $as_echo "$as_me:$LINENO: result: no" >&5

5231

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5232

$as_echo "no" >&6; }

5233

fi

5234

5235

@@ -4227,9 +4520,9 @@

5236

ac_pt_DX_PDFLATEX=$DX_PDFLATEX

5237

# Extract the first word of "pdflatex", so it can be a program name with args.

5238

set dummy pdflatex; ac_word=$2

5239

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5240

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5241

$as_echo_n "checking for $ac_word... " >&6; }

5242

-if test "${ac_cv_path_ac_pt_DX_PDFLATEX+set}" = set; then

5243

+if test "${ac_cv_path_ac_pt_DX_PDFLATEX+set}" = set; then :

5244

$as_echo_n "(cached) " >&6

5245

else

5246

case $ac_pt_DX_PDFLATEX in

5247

@@ -4242,14 +4535,14 @@

5248

do

5249

IFS=$as_save_IFS

5250

test -z "$as_dir" && as_dir=.

5251

- for ac_exec_ext in '' $ac_executable_extensions; do

5252

+ for ac_exec_ext in '' $ac_executable_extensions; do

5253

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5254

ac_cv_path_ac_pt_DX_PDFLATEX="$as_dir/$ac_word$ac_exec_ext"

5255

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5256

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5257

break 2

5258

fi

5259

done

5260

-done

5261

+ done

5262

IFS=$as_save_IFS

5263

5264

;;

5265

@@ -4257,10 +4550,10 @@

5266

fi

5267

ac_pt_DX_PDFLATEX=$ac_cv_path_ac_pt_DX_PDFLATEX

5268

if test -n "$ac_pt_DX_PDFLATEX"; then

5269

- { $as_echo "$as_me:$LINENO: result: $ac_pt_DX_PDFLATEX" >&5

5270

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_PDFLATEX" >&5

5271

$as_echo "$ac_pt_DX_PDFLATEX" >&6; }

5272

else

5273

- { $as_echo "$as_me:$LINENO: result: no" >&5

5274

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5275

$as_echo "no" >&6; }

5276

fi

5277

5278

@@ -4269,7 +4562,7 @@

5279

else

5280

case $cross_compiling:$ac_tool_warned in

5281

yes:)

5282

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

5283

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

5284

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

5285

ac_tool_warned=yes ;;

5286

esac

5287

@@ -4280,7 +4573,7 @@

5288

fi

5289

5290

if test "$DX_FLAG_pdf$DX_PDFLATEX" = 1; then

5291

- { $as_echo "$as_me:$LINENO: WARNING: pdflatex not found - will not generate doxygen PDF documentation" >&5

5292

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pdflatex not found - will not generate doxygen PDF documentation" >&5

5293

$as_echo "$as_me: WARNING: pdflatex not found - will not generate doxygen PDF documentation" >&2;}

5294

DX_FLAG_pdf=0

5295

5296

@@ -4290,9 +4583,9 @@

5297

if test -n "$ac_tool_prefix"; then

5298

# Extract the first word of "${ac_tool_prefix}makeindex", so it can be a program name with args.

5299

set dummy ${ac_tool_prefix}makeindex; ac_word=$2

5300

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5301

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5302

$as_echo_n "checking for $ac_word... " >&6; }

5303

-if test "${ac_cv_path_DX_MAKEINDEX+set}" = set; then

5304

+if test "${ac_cv_path_DX_MAKEINDEX+set}" = set; then :

5305

$as_echo_n "(cached) " >&6

5306

else

5307

case $DX_MAKEINDEX in

5308

@@ -4305,14 +4598,14 @@

5309

do

5310

IFS=$as_save_IFS

5311

test -z "$as_dir" && as_dir=.

5312

- for ac_exec_ext in '' $ac_executable_extensions; do

5313

+ for ac_exec_ext in '' $ac_executable_extensions; do

5314

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5315

ac_cv_path_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"

5316

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5317

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5318

break 2

5319

fi

5320

done

5321

-done

5322

+ done

5323

IFS=$as_save_IFS

5324

5325

;;

5326

@@ -4320,10 +4613,10 @@

5327

fi

5328

DX_MAKEINDEX=$ac_cv_path_DX_MAKEINDEX

5329

if test -n "$DX_MAKEINDEX"; then

5330

- { $as_echo "$as_me:$LINENO: result: $DX_MAKEINDEX" >&5

5331

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_MAKEINDEX" >&5

5332

$as_echo "$DX_MAKEINDEX" >&6; }

5333

else

5334

- { $as_echo "$as_me:$LINENO: result: no" >&5

5335

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5336

$as_echo "no" >&6; }

5337

fi

5338

5339

@@ -4333,9 +4626,9 @@

5340

ac_pt_DX_MAKEINDEX=$DX_MAKEINDEX

5341

# Extract the first word of "makeindex", so it can be a program name with args.

5342

set dummy makeindex; ac_word=$2

5343

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5344

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5345

$as_echo_n "checking for $ac_word... " >&6; }

5346

-if test "${ac_cv_path_ac_pt_DX_MAKEINDEX+set}" = set; then

5347

+if test "${ac_cv_path_ac_pt_DX_MAKEINDEX+set}" = set; then :

5348

$as_echo_n "(cached) " >&6

5349

else

5350

case $ac_pt_DX_MAKEINDEX in

5351

@@ -4348,14 +4641,14 @@

5352

do

5353

IFS=$as_save_IFS

5354

test -z "$as_dir" && as_dir=.

5355

- for ac_exec_ext in '' $ac_executable_extensions; do

5356

+ for ac_exec_ext in '' $ac_executable_extensions; do

5357

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5358

ac_cv_path_ac_pt_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext"

5359

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5360

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5361

break 2

5362

fi

5363

done

5364

-done

5365

+ done

5366

IFS=$as_save_IFS

5367

5368

;;

5369

@@ -4363,10 +4656,10 @@

5370

fi

5371

ac_pt_DX_MAKEINDEX=$ac_cv_path_ac_pt_DX_MAKEINDEX

5372

if test -n "$ac_pt_DX_MAKEINDEX"; then

5373

- { $as_echo "$as_me:$LINENO: result: $ac_pt_DX_MAKEINDEX" >&5

5374

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_MAKEINDEX" >&5

5375

$as_echo "$ac_pt_DX_MAKEINDEX" >&6; }

5376

else

5377

- { $as_echo "$as_me:$LINENO: result: no" >&5

5378

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5379

$as_echo "no" >&6; }

5380

fi

5381

5382

@@ -4375,7 +4668,7 @@

5383

else

5384

case $cross_compiling:$ac_tool_warned in

5385

yes:)

5386

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

5387

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

5388

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

5389

ac_tool_warned=yes ;;

5390

esac

5391

@@ -4386,7 +4679,7 @@

5392

fi

5393

5394

if test "$DX_FLAG_pdf$DX_MAKEINDEX" = 1; then

5395

- { $as_echo "$as_me:$LINENO: WARNING: makeindex not found - will not generate doxygen PDF documentation" >&5

5396

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: makeindex not found - will not generate doxygen PDF documentation" >&5

5397

$as_echo "$as_me: WARNING: makeindex not found - will not generate doxygen PDF documentation" >&2;}

5398

DX_FLAG_pdf=0

5399

5400

@@ -4396,9 +4689,9 @@

5401

if test -n "$ac_tool_prefix"; then

5402

# Extract the first word of "${ac_tool_prefix}egrep", so it can be a program name with args.

5403

set dummy ${ac_tool_prefix}egrep; ac_word=$2

5404

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5405

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5406

$as_echo_n "checking for $ac_word... " >&6; }

5407

-if test "${ac_cv_path_DX_EGREP+set}" = set; then

5408

+if test "${ac_cv_path_DX_EGREP+set}" = set; then :

5409

$as_echo_n "(cached) " >&6

5410

else

5411

case $DX_EGREP in

5412

@@ -4411,14 +4704,14 @@

5413

do

5414

IFS=$as_save_IFS

5415

test -z "$as_dir" && as_dir=.

5416

- for ac_exec_ext in '' $ac_executable_extensions; do

5417

+ for ac_exec_ext in '' $ac_executable_extensions; do

5418

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5419

ac_cv_path_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"

5420

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5421

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5422

break 2

5423

fi

5424

done

5425

-done

5426

+ done

5427

IFS=$as_save_IFS

5428

5429

;;

5430

@@ -4426,10 +4719,10 @@

5431

fi

5432

DX_EGREP=$ac_cv_path_DX_EGREP

5433

if test -n "$DX_EGREP"; then

5434

- { $as_echo "$as_me:$LINENO: result: $DX_EGREP" >&5

5435

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_EGREP" >&5

5436

$as_echo "$DX_EGREP" >&6; }

5437

else

5438

- { $as_echo "$as_me:$LINENO: result: no" >&5

5439

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5440

$as_echo "no" >&6; }

5441

fi

5442

5443

@@ -4439,9 +4732,9 @@

5444

ac_pt_DX_EGREP=$DX_EGREP

5445

# Extract the first word of "egrep", so it can be a program name with args.

5446

set dummy egrep; ac_word=$2

5447

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5448

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5449

$as_echo_n "checking for $ac_word... " >&6; }

5450

-if test "${ac_cv_path_ac_pt_DX_EGREP+set}" = set; then

5451

+if test "${ac_cv_path_ac_pt_DX_EGREP+set}" = set; then :

5452

$as_echo_n "(cached) " >&6

5453

else

5454

case $ac_pt_DX_EGREP in

5455

@@ -4454,14 +4747,14 @@

5456

do

5457

IFS=$as_save_IFS

5458

test -z "$as_dir" && as_dir=.

5459

- for ac_exec_ext in '' $ac_executable_extensions; do

5460

+ for ac_exec_ext in '' $ac_executable_extensions; do

5461

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5462

ac_cv_path_ac_pt_DX_EGREP="$as_dir/$ac_word$ac_exec_ext"

5463

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5464

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5465

break 2

5466

fi

5467

done

5468

-done

5469

+ done

5470

IFS=$as_save_IFS

5471

5472

;;

5473

@@ -4469,10 +4762,10 @@

5474

fi

5475

ac_pt_DX_EGREP=$ac_cv_path_ac_pt_DX_EGREP

5476

if test -n "$ac_pt_DX_EGREP"; then

5477

- { $as_echo "$as_me:$LINENO: result: $ac_pt_DX_EGREP" >&5

5478

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_EGREP" >&5

5479

$as_echo "$ac_pt_DX_EGREP" >&6; }

5480

else

5481

- { $as_echo "$as_me:$LINENO: result: no" >&5

5482

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5483

$as_echo "no" >&6; }

5484

fi

5485

5486

@@ -4481,7 +4774,7 @@

5487

else

5488

case $cross_compiling:$ac_tool_warned in

5489

yes:)

5490

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

5491

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

5492

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

5493

ac_tool_warned=yes ;;

5494

esac

5495

@@ -4492,7 +4785,7 @@

5496

fi

5497

5498

if test "$DX_FLAG_pdf$DX_EGREP" = 1; then

5499

- { $as_echo "$as_me:$LINENO: WARNING: egrep not found - will not generate doxygen PDF documentation" >&5

5500

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: egrep not found - will not generate doxygen PDF documentation" >&5

5501

$as_echo "$as_me: WARNING: egrep not found - will not generate doxygen PDF documentation" >&2;}

5502

DX_FLAG_pdf=0

5503

5504

@@ -4563,9 +4856,7 @@

5505

5506

;; #(

5507

*)

5508

- { { $as_echo "$as_me:$LINENO: error: unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE'" >&5

5509

-$as_echo "$as_me: error: unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE'" >&2;}

5510

- { (exit 1); exit 1; }; }

5511

+ as_fn_error "unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE'" "$LINENO" 5

5512

;;

5513

esac

5514

5515

@@ -4588,7 +4879,7 @@

5516

5517

5518

# Check whether --enable-debug-flags was given.

5519

-if test "${enable_debug_flags+set}" = set; then

5520

+if test "${enable_debug_flags+set}" = set; then :

5521

enableval=$enable_debug_flags;

5522

else

5523

5524

@@ -4603,7 +4894,7 @@

5525

5526

5527

# Check whether --enable-debug-log was given.

5528

-if test "${enable_debug_log+set}" = set; then

5529

+if test "${enable_debug_log+set}" = set; then :

5530

enableval=$enable_debug_log;

5531

else

5532

enable_debug_log="yes"

5533

@@ -4628,9 +4919,7 @@

5534

if test "x${enable_debug_log}" != "xno"

5535

then

5536

5537

-cat >>confdefs.h <<\_ACEOF

5538

-#define DEBUG 1

5539

-_ACEOF

5540

+$as_echo "#define DEBUG 1" >>confdefs.h

5541

5542

__IS_DEBUG_LOG=yes

5543

else

5544

@@ -4647,7 +4936,7 @@

5545

5546

5547

# Check whether --enable-deprecated was given.

5548

-if test "${enable_deprecated+set}" = set; then

5549

+if test "${enable_deprecated+set}" = set; then :

5550

enableval=$enable_deprecated;

5551

else

5552

5553

@@ -4679,44 +4968,44 @@

5554

am_make=${MAKE-make}

5555

cat > confinc << 'END'

5556

am__doit:

5557

- @echo done

5558

+ @echo this is the am__doit target

5559

.PHONY: am__doit

5560

END

5561

# If we don't find an include directive, just comment out the code.

5562

-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5

5563

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5

5564

$as_echo_n "checking for style of include used by $am_make... " >&6; }

5565

am__include="#"

5566

am__quote=

5567

_am_result=none

5568

# First try GNU make style include.

5569

echo "include confinc" > confmf

5570

-# We grep out `Entering directory' and `Leaving directory'

5571

-# messages which can occur if `w' ends up in MAKEFLAGS.

5572

-# In particular we don't look at `^make:' because GNU make might

5573

-# be invoked under some other name (usually "gmake"), in which

5574

-# case it prints its new name instead of `make'.

5575

-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then

5576

- am__include=include

5577

- am__quote=

5578

- _am_result=GNU

5579

-fi

5580

+# Ignore all kinds of additional output from `make'.

5581

+case `$am_make -s -f confmf 2> /dev/null` in #(

5582

+*the\ am__doit\ target*)

5583

+ am__include=include

5584

+ am__quote=

5585

+ _am_result=GNU

5586

+ ;;

5587

+esac

5588

# Now try BSD make style include.

5589

if test "$am__include" = "#"; then

5590

echo '.include "confinc"' > confmf

5591

- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then

5592

- am__include=.include

5593

- am__quote="\""

5594

- _am_result=BSD

5595

- fi

5596

+ case `$am_make -s -f confmf 2> /dev/null` in #(

5597

+ *the\ am__doit\ target*)

5598

+ am__include=.include

5599

+ am__quote="\""

5600

+ _am_result=BSD

5601

+ ;;

5602

+ esac

5603

fi

5604

5605

5606

-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5

5607

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5

5608

$as_echo "$_am_result" >&6; }

5609

rm -f confinc confmf

5610

5611

# Check whether --enable-dependency-tracking was given.

5612

-if test "${enable_dependency_tracking+set}" = set; then

5613

+if test "${enable_dependency_tracking+set}" = set; then :

5614

enableval=$enable_dependency_tracking;

5615

fi

5616

5617

@@ -4741,9 +5030,9 @@

5618

if test -n "$ac_tool_prefix"; then

5619

# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

5620

set dummy ${ac_tool_prefix}gcc; ac_word=$2

5621

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5622

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5623

$as_echo_n "checking for $ac_word... " >&6; }

5624

-if test "${ac_cv_prog_CC+set}" = set; then

5625

+if test "${ac_cv_prog_CC+set}" = set; then :

5626

$as_echo_n "(cached) " >&6

5627

else

5628

if test -n "$CC"; then

5629

@@ -4754,24 +5043,24 @@

5630

do

5631

IFS=$as_save_IFS

5632

test -z "$as_dir" && as_dir=.

5633

- for ac_exec_ext in '' $ac_executable_extensions; do

5634

+ for ac_exec_ext in '' $ac_executable_extensions; do

5635

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5636

ac_cv_prog_CC="${ac_tool_prefix}gcc"

5637

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5638

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5639

break 2

5640

fi

5641

done

5642

-done

5643

+ done

5644

IFS=$as_save_IFS

5645

5646

fi

5647

fi

5648

CC=$ac_cv_prog_CC

5649

if test -n "$CC"; then

5650

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

5651

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

5652

$as_echo "$CC" >&6; }

5653

else

5654

- { $as_echo "$as_me:$LINENO: result: no" >&5

5655

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5656

$as_echo "no" >&6; }

5657

fi

5658

5659

@@ -4781,9 +5070,9 @@

5660

ac_ct_CC=$CC

5661

# Extract the first word of "gcc", so it can be a program name with args.

5662

set dummy gcc; ac_word=$2

5663

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5664

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5665

$as_echo_n "checking for $ac_word... " >&6; }

5666

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

5667

+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

5668

$as_echo_n "(cached) " >&6

5669

else

5670

if test -n "$ac_ct_CC"; then

5671

@@ -4794,24 +5083,24 @@

5672

do

5673

IFS=$as_save_IFS

5674

test -z "$as_dir" && as_dir=.

5675

- for ac_exec_ext in '' $ac_executable_extensions; do

5676

+ for ac_exec_ext in '' $ac_executable_extensions; do

5677

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5678

ac_cv_prog_ac_ct_CC="gcc"

5679

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5680

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5681

break 2

5682

fi

5683

done

5684

-done

5685

+ done

5686

IFS=$as_save_IFS

5687

5688

fi

5689

fi

5690

ac_ct_CC=$ac_cv_prog_ac_ct_CC

5691

if test -n "$ac_ct_CC"; then

5692

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

5693

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

5694

$as_echo "$ac_ct_CC" >&6; }

5695

else

5696

- { $as_echo "$as_me:$LINENO: result: no" >&5

5697

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5698

$as_echo "no" >&6; }

5699

fi

5700

5701

@@ -4820,7 +5109,7 @@

5702

else

5703

case $cross_compiling:$ac_tool_warned in

5704

yes:)

5705

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

5706

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

5707

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

5708

ac_tool_warned=yes ;;

5709

esac

5710

@@ -4834,9 +5123,9 @@

5711

if test -n "$ac_tool_prefix"; then

5712

# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

5713

set dummy ${ac_tool_prefix}cc; ac_word=$2

5714

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5715

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5716

$as_echo_n "checking for $ac_word... " >&6; }

5717

-if test "${ac_cv_prog_CC+set}" = set; then

5718

+if test "${ac_cv_prog_CC+set}" = set; then :

5719

$as_echo_n "(cached) " >&6

5720

else

5721

if test -n "$CC"; then

5722

@@ -4847,24 +5136,24 @@

5723

do

5724

IFS=$as_save_IFS

5725

test -z "$as_dir" && as_dir=.

5726

- for ac_exec_ext in '' $ac_executable_extensions; do

5727

+ for ac_exec_ext in '' $ac_executable_extensions; do

5728

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5729

ac_cv_prog_CC="${ac_tool_prefix}cc"

5730

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5731

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5732

break 2

5733

fi

5734

done

5735

-done

5736

+ done

5737

IFS=$as_save_IFS

5738

5739

fi

5740

fi

5741

CC=$ac_cv_prog_CC

5742

if test -n "$CC"; then

5743

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

5744

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

5745

$as_echo "$CC" >&6; }

5746

else

5747

- { $as_echo "$as_me:$LINENO: result: no" >&5

5748

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5749

$as_echo "no" >&6; }

5750

fi

5751

5752

@@ -4874,9 +5163,9 @@

5753

if test -z "$CC"; then

5754

# Extract the first word of "cc", so it can be a program name with args.

5755

set dummy cc; ac_word=$2

5756

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5757

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5758

$as_echo_n "checking for $ac_word... " >&6; }

5759

-if test "${ac_cv_prog_CC+set}" = set; then

5760

+if test "${ac_cv_prog_CC+set}" = set; then :

5761

$as_echo_n "(cached) " >&6

5762

else

5763

if test -n "$CC"; then

5764

@@ -4888,18 +5177,18 @@

5765

do

5766

IFS=$as_save_IFS

5767

test -z "$as_dir" && as_dir=.

5768

- for ac_exec_ext in '' $ac_executable_extensions; do

5769

+ for ac_exec_ext in '' $ac_executable_extensions; do

5770

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5771

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

5772

ac_prog_rejected=yes

5773

continue

5774

fi

5775

ac_cv_prog_CC="cc"

5776

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5777

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5778

break 2

5779

fi

5780

done

5781

-done

5782

+ done

5783

IFS=$as_save_IFS

5784

5785

if test $ac_prog_rejected = yes; then

5786

@@ -4918,10 +5207,10 @@

5787

fi

5788

CC=$ac_cv_prog_CC

5789

if test -n "$CC"; then

5790

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

5791

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

5792

$as_echo "$CC" >&6; }

5793

else

5794

- { $as_echo "$as_me:$LINENO: result: no" >&5

5795

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5796

$as_echo "no" >&6; }

5797

fi

5798

5799

@@ -4933,9 +5222,9 @@

5800

do

5801

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

5802

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

5803

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5804

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5805

$as_echo_n "checking for $ac_word... " >&6; }

5806

-if test "${ac_cv_prog_CC+set}" = set; then

5807

+if test "${ac_cv_prog_CC+set}" = set; then :

5808

$as_echo_n "(cached) " >&6

5809

else

5810

if test -n "$CC"; then

5811

@@ -4946,24 +5235,24 @@

5812

do

5813

IFS=$as_save_IFS

5814

test -z "$as_dir" && as_dir=.

5815

- for ac_exec_ext in '' $ac_executable_extensions; do

5816

+ for ac_exec_ext in '' $ac_executable_extensions; do

5817

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5818

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

5819

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5820

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5821

break 2

5822

fi

5823

done

5824

-done

5825

+ done

5826

IFS=$as_save_IFS

5827

5828

fi

5829

fi

5830

CC=$ac_cv_prog_CC

5831

if test -n "$CC"; then

5832

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

5833

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

5834

$as_echo "$CC" >&6; }

5835

else

5836

- { $as_echo "$as_me:$LINENO: result: no" >&5

5837

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5838

$as_echo "no" >&6; }

5839

fi

5840

5841

@@ -4977,9 +5266,9 @@

5842

do

5843

# Extract the first word of "$ac_prog", so it can be a program name with args.

5844

set dummy $ac_prog; ac_word=$2

5845

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5846

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

5847

$as_echo_n "checking for $ac_word... " >&6; }

5848

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

5849

+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

5850

$as_echo_n "(cached) " >&6

5851

else

5852

if test -n "$ac_ct_CC"; then

5853

@@ -4990,24 +5279,24 @@

5854

do

5855

IFS=$as_save_IFS

5856

test -z "$as_dir" && as_dir=.

5857

- for ac_exec_ext in '' $ac_executable_extensions; do

5858

+ for ac_exec_ext in '' $ac_executable_extensions; do

5859

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5860

ac_cv_prog_ac_ct_CC="$ac_prog"

5861

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5862

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

5863

break 2

5864

fi

5865

done

5866

-done

5867

+ done

5868

IFS=$as_save_IFS

5869

5870

fi

5871

fi

5872

ac_ct_CC=$ac_cv_prog_ac_ct_CC

5873

if test -n "$ac_ct_CC"; then

5874

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

5875

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

5876

$as_echo "$ac_ct_CC" >&6; }

5877

else

5878

- { $as_echo "$as_me:$LINENO: result: no" >&5

5879

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

5880

$as_echo "no" >&6; }

5881

fi

5882

5883

@@ -5020,7 +5309,7 @@

5884

else

5885

case $cross_compiling:$ac_tool_warned in

5886

yes:)

5887

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

5888

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

5889

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

5890

ac_tool_warned=yes ;;

5891

esac

5892

@@ -5031,73 +5320,55 @@

5893

fi

5894

5895

5896

-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

5897

+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

5898

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

5899

-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH

5900

-See \`config.log' for more details." >&5

5901

-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH

5902

-See \`config.log' for more details." >&2;}

5903

- { (exit 1); exit 1; }; }; }

5904

+as_fn_error "no acceptable C compiler found in \$PATH

5905

+See \`config.log' for more details." "$LINENO" 5; }

5906

5907

# Provide some information about the compiler.

5908

-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5

5909

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

5910

set X $ac_compile

5911

ac_compiler=$2

5912

-{ (ac_try="$ac_compiler --version >&5"

5913

-case "(($ac_try" in

5914

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5915

- *) ac_try_echo=$ac_try;;

5916

-esac

5917

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5918

-$as_echo "$ac_try_echo") >&5

5919

- (eval "$ac_compiler --version >&5") 2>&5

5920

- ac_status=$?

5921

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5922

- (exit $ac_status); }

5923

-{ (ac_try="$ac_compiler -v >&5"

5924

-case "(($ac_try" in

5925

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5926

- *) ac_try_echo=$ac_try;;

5927

-esac

5928

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5929

-$as_echo "$ac_try_echo") >&5

5930

- (eval "$ac_compiler -v >&5") 2>&5

5931

- ac_status=$?

5932

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5933

- (exit $ac_status); }

5934

-{ (ac_try="$ac_compiler -V >&5"

5935

+for ac_option in --version -v -V -qversion; do

5936

+ { { ac_try="$ac_compiler $ac_option >&5"

5937

case "(($ac_try" in

5938

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5939

*) ac_try_echo=$ac_try;;

5940

esac

5941

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5942

-$as_echo "$ac_try_echo") >&5

5943

- (eval "$ac_compiler -V >&5") 2>&5

5944

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

5945

+$as_echo "$ac_try_echo"; } >&5

5946

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

5947

ac_status=$?

5948

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5949

- (exit $ac_status); }

5950

+ if test -s conftest.err; then

5951

+ sed '10a\

5952

+... rest of stderr output deleted ...

5953

+ 10q' conftest.err >conftest.er1

5954

+ cat conftest.er1 >&5

5955

+ rm -f conftest.er1 conftest.err

5956

+ fi

5957

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

5958

+ test $ac_status = 0; }

5959

+done

5960

5961

-cat >conftest.$ac_ext <<_ACEOF

5962

-/* confdefs.h. */

5963

-_ACEOF

5964

-cat confdefs.h >>conftest.$ac_ext

5965

-cat >>conftest.$ac_ext <<_ACEOF

5966

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

5967

/* end confdefs.h. */

5968

-

5969

+#include <stdio.h>

5970

int

5971

main ()

5972

{

5973

+FILE *f = fopen ("conftest.out", "w");

5974

+ return ferror (f) || fclose (f) != 0;

5975

5976

;

5977

return 0;

5978

}

5979

_ACEOF

5980

ac_clean_files_save=$ac_clean_files

5981

-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"

5982

+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"

5983

# Try to create an executable without -o first, disregard a.out.

5984

# It will help us diagnose broken compilers, and finding out an intuition

5985

# of exeext.

5986

-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

5987

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5

5988

$as_echo_n "checking for C compiler default output file name... " >&6; }

5989

ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

5990

5991

@@ -5114,17 +5385,17 @@

5992

done

5993

rm -f $ac_rmfiles

5994

5995

-if { (ac_try="$ac_link_default"

5996

+if { { ac_try="$ac_link_default"

5997

case "(($ac_try" in

5998

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5999

*) ac_try_echo=$ac_try;;

6000

esac

6001

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6002

-$as_echo "$ac_try_echo") >&5

6003

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

6004

+$as_echo "$ac_try_echo"; } >&5

6005

(eval "$ac_link_default") 2>&5

6006

ac_status=$?

6007

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6008

- (exit $ac_status); }; then

6009

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6010

+ test $ac_status = 0; }; then :

6011

# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.

6012

# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'

6013

# in a Makefile. We should not override ac_cv_exeext if it was cached,

6014

@@ -5141,7 +5412,7 @@

6015

# certainly right.

6016

break;;

6017

*.* )

6018

- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;

6019

+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;

6020

then :; else

6021

ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

6022

fi

6023

@@ -5160,84 +5431,75 @@

6024

else

6025

ac_file=''

6026

fi

6027

-

6028

-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5

6029

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5

6030

$as_echo "$ac_file" >&6; }

6031

-if test -z "$ac_file"; then

6032

+if test -z "$ac_file"; then :

6033

$as_echo "$as_me: failed program was:" >&5

6034

sed 's/^/| /' conftest.$ac_ext >&5

6035

6036

-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

6037

+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

6038

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

6039

-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables

6040

-See \`config.log' for more details." >&5

6041

-$as_echo "$as_me: error: C compiler cannot create executables

6042

-See \`config.log' for more details." >&2;}

6043

- { (exit 77); exit 77; }; }; }

6044

+{ as_fn_set_status 77

6045

+as_fn_error "C compiler cannot create executables

6046

+See \`config.log' for more details." "$LINENO" 5; }; }

6047

fi

6048

-

6049

ac_exeext=$ac_cv_exeext

6050

6051

# Check that the compiler produces executables we can run. If not, either

6052

# the compiler is broken, or we cross compile.

6053

-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5

6054

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5

6055

$as_echo_n "checking whether the C compiler works... " >&6; }

6056

-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0

6057

# If not cross compiling, check that we can run a simple program.

6058

if test "$cross_compiling" != yes; then

6059

if { ac_try='./$ac_file'

6060

- { (case "(($ac_try" in

6061

+ { { case "(($ac_try" in

6062

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6063

*) ac_try_echo=$ac_try;;

6064

esac

6065

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6066

-$as_echo "$ac_try_echo") >&5

6067

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

6068

+$as_echo "$ac_try_echo"; } >&5

6069

(eval "$ac_try") 2>&5

6070

ac_status=$?

6071

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6072

- (exit $ac_status); }; }; then

6073

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6074

+ test $ac_status = 0; }; }; then

6075

cross_compiling=no

6076

else

6077

if test "$cross_compiling" = maybe; then

6078

cross_compiling=yes

6079

else

6080

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

6081

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

6082

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

6083

-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.

6084

-If you meant to cross compile, use \`--host'.

6085

-See \`config.log' for more details." >&5

6086

-$as_echo "$as_me: error: cannot run C compiled programs.

6087

+as_fn_error "cannot run C compiled programs.

6088

If you meant to cross compile, use \`--host'.

6089

-See \`config.log' for more details." >&2;}

6090

- { (exit 1); exit 1; }; }; }

6091

+See \`config.log' for more details." "$LINENO" 5; }

6092

fi

6093

fi

6094

fi

6095

-{ $as_echo "$as_me:$LINENO: result: yes" >&5

6096

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

6097

$as_echo "yes" >&6; }

6098

6099

-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out

6100

+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out

6101

ac_clean_files=$ac_clean_files_save

6102

# Check that the compiler produces executables we can run. If not, either

6103

# the compiler is broken, or we cross compile.

6104

-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

6105

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5

6106

$as_echo_n "checking whether we are cross compiling... " >&6; }

6107

-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5

6108

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5

6109

$as_echo "$cross_compiling" >&6; }

6110

6111

-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5

6112

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5

6113

$as_echo_n "checking for suffix of executables... " >&6; }

6114

-if { (ac_try="$ac_link"

6115

+if { { ac_try="$ac_link"

6116

case "(($ac_try" in

6117

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6118

*) ac_try_echo=$ac_try;;

6119

esac

6120

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6121

-$as_echo "$ac_try_echo") >&5

6122

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

6123

+$as_echo "$ac_try_echo"; } >&5

6124

(eval "$ac_link") 2>&5

6125

ac_status=$?

6126

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6127

- (exit $ac_status); }; then

6128

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6129

+ test $ac_status = 0; }; then :

6130

# If both `conftest.exe' and `conftest' are `present' (well, observable)

6131

# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will

6132

# work properly (i.e., refer to `conftest.exe'), while it won't with

6133

@@ -5252,32 +5514,24 @@

6134

esac

6135

done

6136

else

6137

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

6138

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

6139

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

6140

-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link

6141

-See \`config.log' for more details." >&5

6142

-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link

6143

-See \`config.log' for more details." >&2;}

6144

- { (exit 1); exit 1; }; }; }

6145

+as_fn_error "cannot compute suffix of executables: cannot compile and link

6146

+See \`config.log' for more details." "$LINENO" 5; }

6147

fi

6148

-

6149

rm -f conftest$ac_cv_exeext

6150

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5

6151

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5

6152

$as_echo "$ac_cv_exeext" >&6; }

6153

6154

rm -f conftest.$ac_ext

6155

EXEEXT=$ac_cv_exeext

6156

ac_exeext=$EXEEXT

6157

-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5

6158

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5

6159

$as_echo_n "checking for suffix of object files... " >&6; }

6160

-if test "${ac_cv_objext+set}" = set; then

6161

+if test "${ac_cv_objext+set}" = set; then :

6162

$as_echo_n "(cached) " >&6

6163

else

6164

- cat >conftest.$ac_ext <<_ACEOF

6165

-/* confdefs.h. */

6166

-_ACEOF

6167

-cat confdefs.h >>conftest.$ac_ext

6168

-cat >>conftest.$ac_ext <<_ACEOF

6169

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6170

/* end confdefs.h. */

6171

6172

int

6173

@@ -5289,17 +5543,17 @@

6174

}

6175

_ACEOF

6176

rm -f conftest.o conftest.obj

6177

-if { (ac_try="$ac_compile"

6178

+if { { ac_try="$ac_compile"

6179

case "(($ac_try" in

6180

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6181

*) ac_try_echo=$ac_try;;

6182

esac

6183

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6184

-$as_echo "$ac_try_echo") >&5

6185

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

6186

+$as_echo "$ac_try_echo"; } >&5

6187

(eval "$ac_compile") 2>&5

6188

ac_status=$?

6189

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6190

- (exit $ac_status); }; then

6191

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

6192

+ test $ac_status = 0; }; then :

6193

for ac_file in conftest.o conftest.obj conftest.*; do

6194

test -f "$ac_file" || continue;

6195

case $ac_file in

6196

@@ -5312,31 +5566,23 @@

6197

$as_echo "$as_me: failed program was:" >&5

6198

sed 's/^/| /' conftest.$ac_ext >&5

6199

6200

-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

6201

+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

6202

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

6203

-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile

6204

-See \`config.log' for more details." >&5

6205

-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile

6206

-See \`config.log' for more details." >&2;}

6207

- { (exit 1); exit 1; }; }; }

6208

+as_fn_error "cannot compute suffix of object files: cannot compile

6209

+See \`config.log' for more details." "$LINENO" 5; }

6210

fi

6211

-

6212

rm -f conftest.$ac_cv_objext conftest.$ac_ext

6213

fi

6214

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5

6215

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5

6216

$as_echo "$ac_cv_objext" >&6; }

6217

OBJEXT=$ac_cv_objext

6218

ac_objext=$OBJEXT

6219

-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

6220

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5

6221

$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }

6222

-if test "${ac_cv_c_compiler_gnu+set}" = set; then

6223

+if test "${ac_cv_c_compiler_gnu+set}" = set; then :

6224

$as_echo_n "(cached) " >&6

6225

else

6226

- cat >conftest.$ac_ext <<_ACEOF

6227

-/* confdefs.h. */

6228

-_ACEOF

6229

-cat confdefs.h >>conftest.$ac_ext

6230

-cat >>conftest.$ac_ext <<_ACEOF

6231

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6232

/* end confdefs.h. */

6233

6234

int

6235

@@ -5350,37 +5596,16 @@

6236

return 0;

6237

}

6238

_ACEOF

6239

-rm -f conftest.$ac_objext

6240

-if { (ac_try="$ac_compile"

6241

-case "(($ac_try" in

6242

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6243

- *) ac_try_echo=$ac_try;;

6244

-esac

6245

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6246

-$as_echo "$ac_try_echo") >&5

6247

- (eval "$ac_compile") 2>conftest.er1

6248

- ac_status=$?

6249

- grep -v '^ *+' conftest.er1 >conftest.err

6250

- rm -f conftest.er1

6251

- cat conftest.err >&5

6252

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6253

- (exit $ac_status); } && {

6254

- test -z "$ac_c_werror_flag" ||

6255

- test ! -s conftest.err

6256

- } && test -s conftest.$ac_objext; then

6257

+if ac_fn_c_try_compile "$LINENO"; then :

6258

ac_compiler_gnu=yes

6259

else

6260

- $as_echo "$as_me: failed program was:" >&5

6261

-sed 's/^/| /' conftest.$ac_ext >&5

6262

-

6263

- ac_compiler_gnu=no

6264

+ ac_compiler_gnu=no

6265

fi

6266

-

6267

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6268

ac_cv_c_compiler_gnu=$ac_compiler_gnu

6269

6270

fi

6271

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

6272

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5

6273

$as_echo "$ac_cv_c_compiler_gnu" >&6; }

6274

if test $ac_compiler_gnu = yes; then

6275

GCC=yes

6276

@@ -5389,59 +5614,31 @@

6277

fi

6278

ac_test_CFLAGS=${CFLAGS+set}

6279

ac_save_CFLAGS=$CFLAGS

6280

-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

6281

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5

6282

$as_echo_n "checking whether $CC accepts -g... " >&6; }

6283

-if test "${ac_cv_prog_cc_g+set}" = set; then

6284

+if test "${ac_cv_prog_cc_g+set}" = set; then :

6285

$as_echo_n "(cached) " >&6

6286

else

6287

ac_save_c_werror_flag=$ac_c_werror_flag

6288

ac_c_werror_flag=yes

6289

ac_cv_prog_cc_g=no

6290

CFLAGS="-g"

6291

- cat >conftest.$ac_ext <<_ACEOF

6292

-/* confdefs.h. */

6293

-_ACEOF

6294

-cat confdefs.h >>conftest.$ac_ext

6295

-cat >>conftest.$ac_ext <<_ACEOF

6296

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6297

/* end confdefs.h. */

6298

6299

int

6300

main ()

6301

{

6302

6303

- ;

6304

- return 0;

6305

-}

6306

-_ACEOF

6307

-rm -f conftest.$ac_objext

6308

-if { (ac_try="$ac_compile"

6309

-case "(($ac_try" in

6310

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6311

- *) ac_try_echo=$ac_try;;

6312

-esac

6313

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6314

-$as_echo "$ac_try_echo") >&5

6315

- (eval "$ac_compile") 2>conftest.er1

6316

- ac_status=$?

6317

- grep -v '^ *+' conftest.er1 >conftest.err

6318

- rm -f conftest.er1

6319

- cat conftest.err >&5

6320

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6321

- (exit $ac_status); } && {

6322

- test -z "$ac_c_werror_flag" ||

6323

- test ! -s conftest.err

6324

- } && test -s conftest.$ac_objext; then

6325

- ac_cv_prog_cc_g=yes

6326

-else

6327

- $as_echo "$as_me: failed program was:" >&5

6328

-sed 's/^/| /' conftest.$ac_ext >&5

6329

-

6330

- CFLAGS=""

6331

- cat >conftest.$ac_ext <<_ACEOF

6332

-/* confdefs.h. */

6333

+ ;

6334

+ return 0;

6335

+}

6336

_ACEOF

6337

-cat confdefs.h >>conftest.$ac_ext

6338

-cat >>conftest.$ac_ext <<_ACEOF

6339

+if ac_fn_c_try_compile "$LINENO"; then :

6340

+ ac_cv_prog_cc_g=yes

6341

+else

6342

+ CFLAGS=""

6343

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6344

/* end confdefs.h. */

6345

6346

int

6347

@@ -5452,36 +5649,12 @@

6348

return 0;

6349

}

6350

_ACEOF

6351

-rm -f conftest.$ac_objext

6352

-if { (ac_try="$ac_compile"

6353

-case "(($ac_try" in

6354

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6355

- *) ac_try_echo=$ac_try;;

6356

-esac

6357

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6358

-$as_echo "$ac_try_echo") >&5

6359

- (eval "$ac_compile") 2>conftest.er1

6360

- ac_status=$?

6361

- grep -v '^ *+' conftest.er1 >conftest.err

6362

- rm -f conftest.er1

6363

- cat conftest.err >&5

6364

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6365

- (exit $ac_status); } && {

6366

- test -z "$ac_c_werror_flag" ||

6367

- test ! -s conftest.err

6368

- } && test -s conftest.$ac_objext; then

6369

- :

6370

-else

6371

- $as_echo "$as_me: failed program was:" >&5

6372

-sed 's/^/| /' conftest.$ac_ext >&5

6373

+if ac_fn_c_try_compile "$LINENO"; then :

6374

6375

- ac_c_werror_flag=$ac_save_c_werror_flag

6376

+else

6377

+ ac_c_werror_flag=$ac_save_c_werror_flag

6378

CFLAGS="-g"

6379

- cat >conftest.$ac_ext <<_ACEOF

6380

-/* confdefs.h. */

6381

-_ACEOF

6382

-cat confdefs.h >>conftest.$ac_ext

6383

-cat >>conftest.$ac_ext <<_ACEOF

6384

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6385

/* end confdefs.h. */

6386

6387

int

6388

@@ -5492,42 +5665,17 @@

6389

return 0;

6390

}

6391

_ACEOF

6392

-rm -f conftest.$ac_objext

6393

-if { (ac_try="$ac_compile"

6394

-case "(($ac_try" in

6395

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6396

- *) ac_try_echo=$ac_try;;

6397

-esac

6398

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6399

-$as_echo "$ac_try_echo") >&5

6400

- (eval "$ac_compile") 2>conftest.er1

6401

- ac_status=$?

6402

- grep -v '^ *+' conftest.er1 >conftest.err

6403

- rm -f conftest.er1

6404

- cat conftest.err >&5

6405

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6406

- (exit $ac_status); } && {

6407

- test -z "$ac_c_werror_flag" ||

6408

- test ! -s conftest.err

6409

- } && test -s conftest.$ac_objext; then

6410

+if ac_fn_c_try_compile "$LINENO"; then :

6411

ac_cv_prog_cc_g=yes

6412

-else

6413

- $as_echo "$as_me: failed program was:" >&5

6414

-sed 's/^/| /' conftest.$ac_ext >&5

6415

-

6416

-

6417

fi

6418

-

6419

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6420

fi

6421

-

6422

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6423

fi

6424

-

6425

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6426

ac_c_werror_flag=$ac_save_c_werror_flag

6427

fi

6428

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

6429

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5

6430

$as_echo "$ac_cv_prog_cc_g" >&6; }

6431

if test "$ac_test_CFLAGS" = set; then

6432

CFLAGS=$ac_save_CFLAGS

6433

@@ -5544,18 +5692,14 @@

6434

CFLAGS=

6435

fi

6436

fi

6437

-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

6438

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5

6439

$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }

6440

-if test "${ac_cv_prog_cc_c89+set}" = set; then

6441

+if test "${ac_cv_prog_cc_c89+set}" = set; then :

6442

$as_echo_n "(cached) " >&6

6443

else

6444

ac_cv_prog_cc_c89=no

6445

ac_save_CC=$CC

6446

-cat >conftest.$ac_ext <<_ACEOF

6447

-/* confdefs.h. */

6448

-_ACEOF

6449

-cat confdefs.h >>conftest.$ac_ext

6450

-cat >>conftest.$ac_ext <<_ACEOF

6451

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6452

/* end confdefs.h. */

6453

#include <stdarg.h>

6454

#include <stdio.h>

6455

@@ -5612,32 +5756,9 @@

6456

-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

6457

do

6458

CC="$ac_save_CC $ac_arg"

6459

- rm -f conftest.$ac_objext

6460

-if { (ac_try="$ac_compile"

6461

-case "(($ac_try" in

6462

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6463

- *) ac_try_echo=$ac_try;;

6464

-esac

6465

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6466

-$as_echo "$ac_try_echo") >&5

6467

- (eval "$ac_compile") 2>conftest.er1

6468

- ac_status=$?

6469

- grep -v '^ *+' conftest.er1 >conftest.err

6470

- rm -f conftest.er1

6471

- cat conftest.err >&5

6472

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6473

- (exit $ac_status); } && {

6474

- test -z "$ac_c_werror_flag" ||

6475

- test ! -s conftest.err

6476

- } && test -s conftest.$ac_objext; then

6477

+ if ac_fn_c_try_compile "$LINENO"; then :

6478

ac_cv_prog_cc_c89=$ac_arg

6479

-else

6480

- $as_echo "$as_me: failed program was:" >&5

6481

-sed 's/^/| /' conftest.$ac_ext >&5

6482

-

6483

-

6484

fi

6485

-

6486

rm -f core conftest.err conftest.$ac_objext

6487

test "x$ac_cv_prog_cc_c89" != "xno" && break

6488

done

6489

@@ -5648,17 +5769,19 @@

6490

# AC_CACHE_VAL

6491

case "x$ac_cv_prog_cc_c89" in

6492

x)

6493

- { $as_echo "$as_me:$LINENO: result: none needed" >&5

6494

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5

6495

$as_echo "none needed" >&6; } ;;

6496

xno)

6497

- { $as_echo "$as_me:$LINENO: result: unsupported" >&5

6498

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5

6499

$as_echo "unsupported" >&6; } ;;

6500

*)

6501

CC="$CC $ac_cv_prog_cc_c89"

6502

- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

6503

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5

6504

$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;

6505

esac

6506

+if test "x$ac_cv_prog_cc_c89" != xno; then :

6507

6508

+fi

6509

6510

ac_ext=c

6511

ac_cpp='$CPP $CPPFLAGS'

6512

@@ -5668,9 +5791,9 @@

6513

6514

depcc="$CC" am_compiler_list=

6515

6516

-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

6517

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

6518

$as_echo_n "checking dependency style of $depcc... " >&6; }

6519

-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then

6520

+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :

6521

$as_echo_n "(cached) " >&6

6522

else

6523

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

6524

@@ -5696,6 +5819,11 @@

6525

if test "$am_compiler_list" = ""; then

6526

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

6527

fi

6528

+ am__universal=false

6529

+ case " $depcc " in #(

6530

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

6531

+ esac

6532

+

6533

for depmode in $am_compiler_list; do

6534

# Setup a source with many dependencies, because some compilers

6535

# like to wrap large dependency lists on column 80 (with \), and

6536

@@ -5713,7 +5841,17 @@

6537

done

6538

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

6539

6540

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

6541

+ # mode. It turns out that the SunPro C++ compiler does not properly

6542

+ # handle `-M -o', and we need to detect this. Also, some Intel

6543

+ # versions had trouble with output in subdirs

6544

+ am__obj=sub/conftest.${OBJEXT-o}

6545

+ am__minus_obj="-o $am__obj"

6546

case $depmode in

6547

+ gcc)

6548

+ # This depmode causes a compiler race in universal mode.

6549

+ test "$am__universal" = false || continue

6550

+ ;;

6551

nosideeffect)

6552

# after this tag, mechanisms are not by side-effect, so they'll

6553

# only be used when explicitly requested

6554

@@ -5723,19 +5861,23 @@

6555

break

6556

fi

6557

;;

6558

+ msvisualcpp | msvcmsys)

6559

+ # This compiler won't grok `-c -o', but also, the minuso test has

6560

+ # not run yet. These depmodes are late enough in the game, and

6561

+ # so weak that their functioning should not be impacted.

6562

+ am__obj=conftest.${OBJEXT-o}

6563

+ am__minus_obj=

6564

+ ;;

6565

none) break ;;

6566

esac

6567

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

6568

- # mode. It turns out that the SunPro C++ compiler does not properly

6569

- # handle `-M -o', and we need to detect this.

6570

if depmode=$depmode \

6571

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

6572

+ source=sub/conftest.c object=$am__obj \

6573

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

6574

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

6575

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

6576

>/dev/null 2>conftest.err &&

6577

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

6578

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

6579

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

6580

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

6581

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

6582

# icc doesn't choke on unknown options, it will just issue warnings

6583

# or remarks (even with -Werror). So we grep stderr for any message

6584

@@ -5759,7 +5901,7 @@

6585

fi

6586

6587

fi

6588

-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

6589

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5

6590

$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }

6591

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

6592

6593

@@ -5775,17 +5917,13 @@

6594

6595

6596

6597

-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5

6598

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5

6599

$as_echo_n "checking for library containing strerror... " >&6; }

6600

-if test "${ac_cv_search_strerror+set}" = set; then

6601

+if test "${ac_cv_search_strerror+set}" = set; then :

6602

$as_echo_n "(cached) " >&6

6603

else

6604

ac_func_search_save_LIBS=$LIBS

6605

-cat >conftest.$ac_ext <<_ACEOF

6606

-/* confdefs.h. */

6607

-_ACEOF

6608

-cat confdefs.h >>conftest.$ac_ext

6609

-cat >>conftest.$ac_ext <<_ACEOF

6610

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

6611

/* end confdefs.h. */

6612

6613

/* Override any GCC internal prototype to avoid an error.

6614

@@ -5810,54 +5948,27 @@

6615

ac_res=-l$ac_lib

6616

LIBS="-l$ac_lib $ac_func_search_save_LIBS"

6617

fi

6618

- rm -f conftest.$ac_objext conftest$ac_exeext

6619

-if { (ac_try="$ac_link"

6620

-case "(($ac_try" in

6621

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6622

- *) ac_try_echo=$ac_try;;

6623

-esac

6624

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6625

-$as_echo "$ac_try_echo") >&5

6626

- (eval "$ac_link") 2>conftest.er1

6627

- ac_status=$?

6628

- grep -v '^ *+' conftest.er1 >conftest.err

6629

- rm -f conftest.er1

6630

- cat conftest.err >&5

6631

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6632

- (exit $ac_status); } && {

6633

- test -z "$ac_c_werror_flag" ||

6634

- test ! -s conftest.err

6635

- } && test -s conftest$ac_exeext && {

6636

- test "$cross_compiling" = yes ||

6637

- $as_test_x conftest$ac_exeext

6638

- }; then

6639

+ if ac_fn_c_try_link "$LINENO"; then :

6640

ac_cv_search_strerror=$ac_res

6641

-else

6642

- $as_echo "$as_me: failed program was:" >&5

6643

-sed 's/^/| /' conftest.$ac_ext >&5

6644

-

6645

-

6646

fi

6647

-

6648

-rm -rf conftest.dSYM

6649

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

6650

- conftest$ac_exeext

6651

- if test "${ac_cv_search_strerror+set}" = set; then

6652

+rm -f core conftest.err conftest.$ac_objext \

6653

+ conftest$ac_exeext

6654

+ if test "${ac_cv_search_strerror+set}" = set; then :

6655

break

6656

fi

6657

done

6658

-if test "${ac_cv_search_strerror+set}" = set; then

6659

- :

6660

+if test "${ac_cv_search_strerror+set}" = set; then :

6661

+

6662

else

6663

ac_cv_search_strerror=no

6664

fi

6665

rm conftest.$ac_ext

6666

LIBS=$ac_func_search_save_LIBS

6667

fi

6668

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5

6669

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5

6670

$as_echo "$ac_cv_search_strerror" >&6; }

6671

ac_res=$ac_cv_search_strerror

6672

-if test "$ac_res" != no; then

6673

+if test "$ac_res" != no; then :

6674

test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

6675

6676

fi

6677

@@ -5870,9 +5981,9 @@

6678

if test -n "$ac_tool_prefix"; then

6679

# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.

6680

set dummy ${ac_tool_prefix}gcc; ac_word=$2

6681

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6682

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6683

$as_echo_n "checking for $ac_word... " >&6; }

6684

-if test "${ac_cv_prog_CC+set}" = set; then

6685

+if test "${ac_cv_prog_CC+set}" = set; then :

6686

$as_echo_n "(cached) " >&6

6687

else

6688

if test -n "$CC"; then

6689

@@ -5883,24 +5994,24 @@

6690

do

6691

IFS=$as_save_IFS

6692

test -z "$as_dir" && as_dir=.

6693

- for ac_exec_ext in '' $ac_executable_extensions; do

6694

+ for ac_exec_ext in '' $ac_executable_extensions; do

6695

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6696

ac_cv_prog_CC="${ac_tool_prefix}gcc"

6697

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6698

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6699

break 2

6700

fi

6701

done

6702

-done

6703

+ done

6704

IFS=$as_save_IFS

6705

6706

fi

6707

fi

6708

CC=$ac_cv_prog_CC

6709

if test -n "$CC"; then

6710

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

6711

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

6712

$as_echo "$CC" >&6; }

6713

else

6714

- { $as_echo "$as_me:$LINENO: result: no" >&5

6715

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6716

$as_echo "no" >&6; }

6717

fi

6718

6719

@@ -5910,9 +6021,9 @@

6720

ac_ct_CC=$CC

6721

# Extract the first word of "gcc", so it can be a program name with args.

6722

set dummy gcc; ac_word=$2

6723

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6724

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6725

$as_echo_n "checking for $ac_word... " >&6; }

6726

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

6727

+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

6728

$as_echo_n "(cached) " >&6

6729

else

6730

if test -n "$ac_ct_CC"; then

6731

@@ -5923,24 +6034,24 @@

6732

do

6733

IFS=$as_save_IFS

6734

test -z "$as_dir" && as_dir=.

6735

- for ac_exec_ext in '' $ac_executable_extensions; do

6736

+ for ac_exec_ext in '' $ac_executable_extensions; do

6737

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6738

ac_cv_prog_ac_ct_CC="gcc"

6739

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6740

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6741

break 2

6742

fi

6743

done

6744

-done

6745

+ done

6746

IFS=$as_save_IFS

6747

6748

fi

6749

fi

6750

ac_ct_CC=$ac_cv_prog_ac_ct_CC

6751

if test -n "$ac_ct_CC"; then

6752

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

6753

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

6754

$as_echo "$ac_ct_CC" >&6; }

6755

else

6756

- { $as_echo "$as_me:$LINENO: result: no" >&5

6757

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6758

$as_echo "no" >&6; }

6759

fi

6760

6761

@@ -5949,7 +6060,7 @@

6762

else

6763

case $cross_compiling:$ac_tool_warned in

6764

yes:)

6765

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

6766

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

6767

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6768

ac_tool_warned=yes ;;

6769

esac

6770

@@ -5963,9 +6074,9 @@

6771

if test -n "$ac_tool_prefix"; then

6772

# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.

6773

set dummy ${ac_tool_prefix}cc; ac_word=$2

6774

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6775

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6776

$as_echo_n "checking for $ac_word... " >&6; }

6777

-if test "${ac_cv_prog_CC+set}" = set; then

6778

+if test "${ac_cv_prog_CC+set}" = set; then :

6779

$as_echo_n "(cached) " >&6

6780

else

6781

if test -n "$CC"; then

6782

@@ -5976,24 +6087,24 @@

6783

do

6784

IFS=$as_save_IFS

6785

test -z "$as_dir" && as_dir=.

6786

- for ac_exec_ext in '' $ac_executable_extensions; do

6787

+ for ac_exec_ext in '' $ac_executable_extensions; do

6788

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6789

ac_cv_prog_CC="${ac_tool_prefix}cc"

6790

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6791

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6792

break 2

6793

fi

6794

done

6795

-done

6796

+ done

6797

IFS=$as_save_IFS

6798

6799

fi

6800

fi

6801

CC=$ac_cv_prog_CC

6802

if test -n "$CC"; then

6803

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

6804

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

6805

$as_echo "$CC" >&6; }

6806

else

6807

- { $as_echo "$as_me:$LINENO: result: no" >&5

6808

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6809

$as_echo "no" >&6; }

6810

fi

6811

6812

@@ -6003,9 +6114,9 @@

6813

if test -z "$CC"; then

6814

# Extract the first word of "cc", so it can be a program name with args.

6815

set dummy cc; ac_word=$2

6816

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6817

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6818

$as_echo_n "checking for $ac_word... " >&6; }

6819

-if test "${ac_cv_prog_CC+set}" = set; then

6820

+if test "${ac_cv_prog_CC+set}" = set; then :

6821

$as_echo_n "(cached) " >&6

6822

else

6823

if test -n "$CC"; then

6824

@@ -6017,18 +6128,18 @@

6825

do

6826

IFS=$as_save_IFS

6827

test -z "$as_dir" && as_dir=.

6828

- for ac_exec_ext in '' $ac_executable_extensions; do

6829

+ for ac_exec_ext in '' $ac_executable_extensions; do

6830

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6831

if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

6832

ac_prog_rejected=yes

6833

continue

6834

fi

6835

ac_cv_prog_CC="cc"

6836

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6837

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6838

break 2

6839

fi

6840

done

6841

-done

6842

+ done

6843

IFS=$as_save_IFS

6844

6845

if test $ac_prog_rejected = yes; then

6846

@@ -6047,10 +6158,10 @@

6847

fi

6848

CC=$ac_cv_prog_CC

6849

if test -n "$CC"; then

6850

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

6851

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

6852

$as_echo "$CC" >&6; }

6853

else

6854

- { $as_echo "$as_me:$LINENO: result: no" >&5

6855

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6856

$as_echo "no" >&6; }

6857

fi

6858

6859

@@ -6062,9 +6173,9 @@

6860

do

6861

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

6862

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

6863

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6864

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6865

$as_echo_n "checking for $ac_word... " >&6; }

6866

-if test "${ac_cv_prog_CC+set}" = set; then

6867

+if test "${ac_cv_prog_CC+set}" = set; then :

6868

$as_echo_n "(cached) " >&6

6869

else

6870

if test -n "$CC"; then

6871

@@ -6075,24 +6186,24 @@

6872

do

6873

IFS=$as_save_IFS

6874

test -z "$as_dir" && as_dir=.

6875

- for ac_exec_ext in '' $ac_executable_extensions; do

6876

+ for ac_exec_ext in '' $ac_executable_extensions; do

6877

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6878

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

6879

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6880

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6881

break 2

6882

fi

6883

done

6884

-done

6885

+ done

6886

IFS=$as_save_IFS

6887

6888

fi

6889

fi

6890

CC=$ac_cv_prog_CC

6891

if test -n "$CC"; then

6892

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

6893

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5

6894

$as_echo "$CC" >&6; }

6895

else

6896

- { $as_echo "$as_me:$LINENO: result: no" >&5

6897

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6898

$as_echo "no" >&6; }

6899

fi

6900

6901

@@ -6106,9 +6217,9 @@

6902

do

6903

# Extract the first word of "$ac_prog", so it can be a program name with args.

6904

set dummy $ac_prog; ac_word=$2

6905

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6906

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

6907

$as_echo_n "checking for $ac_word... " >&6; }

6908

-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then

6909

+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :

6910

$as_echo_n "(cached) " >&6

6911

else

6912

if test -n "$ac_ct_CC"; then

6913

@@ -6119,24 +6230,24 @@

6914

do

6915

IFS=$as_save_IFS

6916

test -z "$as_dir" && as_dir=.

6917

- for ac_exec_ext in '' $ac_executable_extensions; do

6918

+ for ac_exec_ext in '' $ac_executable_extensions; do

6919

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6920

ac_cv_prog_ac_ct_CC="$ac_prog"

6921

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6922

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

6923

break 2

6924

fi

6925

done

6926

-done

6927

+ done

6928

IFS=$as_save_IFS

6929

6930

fi

6931

fi

6932

ac_ct_CC=$ac_cv_prog_ac_ct_CC

6933

if test -n "$ac_ct_CC"; then

6934

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

6935

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5

6936

$as_echo "$ac_ct_CC" >&6; }

6937

else

6938

- { $as_echo "$as_me:$LINENO: result: no" >&5

6939

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

6940

$as_echo "no" >&6; }

6941

fi

6942

6943

@@ -6149,7 +6260,7 @@

6944

else

6945

case $cross_compiling:$ac_tool_warned in

6946

yes:)

6947

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

6948

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

6949

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6950

ac_tool_warned=yes ;;

6951

esac

6952

@@ -6160,62 +6271,42 @@

6953

fi

6954

6955

6956

-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

6957

+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

6958

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

6959

-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH

6960

-See \`config.log' for more details." >&5

6961

-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH

6962

-See \`config.log' for more details." >&2;}

6963

- { (exit 1); exit 1; }; }; }

6964

+as_fn_error "no acceptable C compiler found in \$PATH

6965

+See \`config.log' for more details." "$LINENO" 5; }

6966

6967

# Provide some information about the compiler.

6968

-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5

6969

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

6970

set X $ac_compile

6971

ac_compiler=$2

6972

-{ (ac_try="$ac_compiler --version >&5"

6973

-case "(($ac_try" in

6974

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6975

- *) ac_try_echo=$ac_try;;

6976

-esac

6977

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6978

-$as_echo "$ac_try_echo") >&5

6979

- (eval "$ac_compiler --version >&5") 2>&5

6980

- ac_status=$?

6981

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6982

- (exit $ac_status); }

6983

-{ (ac_try="$ac_compiler -v >&5"

6984

-case "(($ac_try" in

6985

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6986

- *) ac_try_echo=$ac_try;;

6987

-esac

6988

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6989

-$as_echo "$ac_try_echo") >&5

6990

- (eval "$ac_compiler -v >&5") 2>&5

6991

- ac_status=$?

6992

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6993

- (exit $ac_status); }

6994

-{ (ac_try="$ac_compiler -V >&5"

6995

+for ac_option in --version -v -V -qversion; do

6996

+ { { ac_try="$ac_compiler $ac_option >&5"

6997

case "(($ac_try" in

6998

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6999

*) ac_try_echo=$ac_try;;

7000

esac

7001

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7002

-$as_echo "$ac_try_echo") >&5

7003

- (eval "$ac_compiler -V >&5") 2>&5

7004

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

7005

+$as_echo "$ac_try_echo"; } >&5

7006

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

7007

ac_status=$?

7008

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7009

- (exit $ac_status); }

7010

+ if test -s conftest.err; then

7011

+ sed '10a\

7012

+... rest of stderr output deleted ...

7013

+ 10q' conftest.err >conftest.er1

7014

+ cat conftest.er1 >&5

7015

+ rm -f conftest.er1 conftest.err

7016

+ fi

7017

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

7018

+ test $ac_status = 0; }

7019

+done

7020

7021

-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

7022

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5

7023

$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }

7024

-if test "${ac_cv_c_compiler_gnu+set}" = set; then

7025

+if test "${ac_cv_c_compiler_gnu+set}" = set; then :

7026

$as_echo_n "(cached) " >&6

7027

else

7028

- cat >conftest.$ac_ext <<_ACEOF

7029

-/* confdefs.h. */

7030

-_ACEOF

7031

-cat confdefs.h >>conftest.$ac_ext

7032

-cat >>conftest.$ac_ext <<_ACEOF

7033

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7034

/* end confdefs.h. */

7035

7036

int

7037

@@ -6229,37 +6320,16 @@

7038

return 0;

7039

}

7040

_ACEOF

7041

-rm -f conftest.$ac_objext

7042

-if { (ac_try="$ac_compile"

7043

-case "(($ac_try" in

7044

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7045

- *) ac_try_echo=$ac_try;;

7046

-esac

7047

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7048

-$as_echo "$ac_try_echo") >&5

7049

- (eval "$ac_compile") 2>conftest.er1

7050

- ac_status=$?

7051

- grep -v '^ *+' conftest.er1 >conftest.err

7052

- rm -f conftest.er1

7053

- cat conftest.err >&5

7054

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7055

- (exit $ac_status); } && {

7056

- test -z "$ac_c_werror_flag" ||

7057

- test ! -s conftest.err

7058

- } && test -s conftest.$ac_objext; then

7059

+if ac_fn_c_try_compile "$LINENO"; then :

7060

ac_compiler_gnu=yes

7061

else

7062

- $as_echo "$as_me: failed program was:" >&5

7063

-sed 's/^/| /' conftest.$ac_ext >&5

7064

-

7065

- ac_compiler_gnu=no

7066

+ ac_compiler_gnu=no

7067

fi

7068

-

7069

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7070

ac_cv_c_compiler_gnu=$ac_compiler_gnu

7071

7072

fi

7073

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

7074

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5

7075

$as_echo "$ac_cv_c_compiler_gnu" >&6; }

7076

if test $ac_compiler_gnu = yes; then

7077

GCC=yes

7078

@@ -6268,20 +6338,16 @@

7079

fi

7080

ac_test_CFLAGS=${CFLAGS+set}

7081

ac_save_CFLAGS=$CFLAGS

7082

-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

7083

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5

7084

$as_echo_n "checking whether $CC accepts -g... " >&6; }

7085

-if test "${ac_cv_prog_cc_g+set}" = set; then

7086

+if test "${ac_cv_prog_cc_g+set}" = set; then :

7087

$as_echo_n "(cached) " >&6

7088

else

7089

ac_save_c_werror_flag=$ac_c_werror_flag

7090

ac_c_werror_flag=yes

7091

ac_cv_prog_cc_g=no

7092

CFLAGS="-g"

7093

- cat >conftest.$ac_ext <<_ACEOF

7094

-/* confdefs.h. */

7095

-_ACEOF

7096

-cat confdefs.h >>conftest.$ac_ext

7097

-cat >>conftest.$ac_ext <<_ACEOF

7098

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7099

/* end confdefs.h. */

7100

7101

int

7102

@@ -6292,35 +6358,11 @@

7103

return 0;

7104

}

7105

_ACEOF

7106

-rm -f conftest.$ac_objext

7107

-if { (ac_try="$ac_compile"

7108

-case "(($ac_try" in

7109

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7110

- *) ac_try_echo=$ac_try;;

7111

-esac

7112

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7113

-$as_echo "$ac_try_echo") >&5

7114

- (eval "$ac_compile") 2>conftest.er1

7115

- ac_status=$?

7116

- grep -v '^ *+' conftest.er1 >conftest.err

7117

- rm -f conftest.er1

7118

- cat conftest.err >&5

7119

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7120

- (exit $ac_status); } && {

7121

- test -z "$ac_c_werror_flag" ||

7122

- test ! -s conftest.err

7123

- } && test -s conftest.$ac_objext; then

7124

+if ac_fn_c_try_compile "$LINENO"; then :

7125

ac_cv_prog_cc_g=yes

7126

else

7127

- $as_echo "$as_me: failed program was:" >&5

7128

-sed 's/^/| /' conftest.$ac_ext >&5

7129

-

7130

- CFLAGS=""

7131

- cat >conftest.$ac_ext <<_ACEOF

7132

-/* confdefs.h. */

7133

-_ACEOF

7134

-cat confdefs.h >>conftest.$ac_ext

7135

-cat >>conftest.$ac_ext <<_ACEOF

7136

+ CFLAGS=""

7137

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7138

/* end confdefs.h. */

7139

7140

int

7141

@@ -6331,36 +6373,12 @@

7142

return 0;

7143

}

7144

_ACEOF

7145

-rm -f conftest.$ac_objext

7146

-if { (ac_try="$ac_compile"

7147

-case "(($ac_try" in

7148

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7149

- *) ac_try_echo=$ac_try;;

7150

-esac

7151

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7152

-$as_echo "$ac_try_echo") >&5

7153

- (eval "$ac_compile") 2>conftest.er1

7154

- ac_status=$?

7155

- grep -v '^ *+' conftest.er1 >conftest.err

7156

- rm -f conftest.er1

7157

- cat conftest.err >&5

7158

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7159

- (exit $ac_status); } && {

7160

- test -z "$ac_c_werror_flag" ||

7161

- test ! -s conftest.err

7162

- } && test -s conftest.$ac_objext; then

7163

- :

7164

-else

7165

- $as_echo "$as_me: failed program was:" >&5

7166

-sed 's/^/| /' conftest.$ac_ext >&5

7167

+if ac_fn_c_try_compile "$LINENO"; then :

7168

7169

- ac_c_werror_flag=$ac_save_c_werror_flag

7170

+else

7171

+ ac_c_werror_flag=$ac_save_c_werror_flag

7172

CFLAGS="-g"

7173

- cat >conftest.$ac_ext <<_ACEOF

7174

-/* confdefs.h. */

7175

-_ACEOF

7176

-cat confdefs.h >>conftest.$ac_ext

7177

-cat >>conftest.$ac_ext <<_ACEOF

7178

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7179

/* end confdefs.h. */

7180

7181

int

7182

@@ -6371,42 +6389,17 @@

7183

return 0;

7184

}

7185

_ACEOF

7186

-rm -f conftest.$ac_objext

7187

-if { (ac_try="$ac_compile"

7188

-case "(($ac_try" in

7189

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7190

- *) ac_try_echo=$ac_try;;

7191

-esac

7192

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7193

-$as_echo "$ac_try_echo") >&5

7194

- (eval "$ac_compile") 2>conftest.er1

7195

- ac_status=$?

7196

- grep -v '^ *+' conftest.er1 >conftest.err

7197

- rm -f conftest.er1

7198

- cat conftest.err >&5

7199

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7200

- (exit $ac_status); } && {

7201

- test -z "$ac_c_werror_flag" ||

7202

- test ! -s conftest.err

7203

- } && test -s conftest.$ac_objext; then

7204

+if ac_fn_c_try_compile "$LINENO"; then :

7205

ac_cv_prog_cc_g=yes

7206

-else

7207

- $as_echo "$as_me: failed program was:" >&5

7208

-sed 's/^/| /' conftest.$ac_ext >&5

7209

-

7210

-

7211

fi

7212

-

7213

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7214

fi

7215

-

7216

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7217

fi

7218

-

7219

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7220

ac_c_werror_flag=$ac_save_c_werror_flag

7221

fi

7222

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

7223

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5

7224

$as_echo "$ac_cv_prog_cc_g" >&6; }

7225

if test "$ac_test_CFLAGS" = set; then

7226

CFLAGS=$ac_save_CFLAGS

7227

@@ -6423,18 +6416,14 @@

7228

CFLAGS=

7229

fi

7230

fi

7231

-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

7232

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5

7233

$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }

7234

-if test "${ac_cv_prog_cc_c89+set}" = set; then

7235

+if test "${ac_cv_prog_cc_c89+set}" = set; then :

7236

$as_echo_n "(cached) " >&6

7237

else

7238

ac_cv_prog_cc_c89=no

7239

ac_save_CC=$CC

7240

-cat >conftest.$ac_ext <<_ACEOF

7241

-/* confdefs.h. */

7242

-_ACEOF

7243

-cat confdefs.h >>conftest.$ac_ext

7244

-cat >>conftest.$ac_ext <<_ACEOF

7245

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7246

/* end confdefs.h. */

7247

#include <stdarg.h>

7248

#include <stdio.h>

7249

@@ -6491,32 +6480,9 @@

7250

-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"

7251

do

7252

CC="$ac_save_CC $ac_arg"

7253

- rm -f conftest.$ac_objext

7254

-if { (ac_try="$ac_compile"

7255

-case "(($ac_try" in

7256

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7257

- *) ac_try_echo=$ac_try;;

7258

-esac

7259

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7260

-$as_echo "$ac_try_echo") >&5

7261

- (eval "$ac_compile") 2>conftest.er1

7262

- ac_status=$?

7263

- grep -v '^ *+' conftest.er1 >conftest.err

7264

- rm -f conftest.er1

7265

- cat conftest.err >&5

7266

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7267

- (exit $ac_status); } && {

7268

- test -z "$ac_c_werror_flag" ||

7269

- test ! -s conftest.err

7270

- } && test -s conftest.$ac_objext; then

7271

+ if ac_fn_c_try_compile "$LINENO"; then :

7272

ac_cv_prog_cc_c89=$ac_arg

7273

-else

7274

- $as_echo "$as_me: failed program was:" >&5

7275

-sed 's/^/| /' conftest.$ac_ext >&5

7276

-

7277

-

7278

fi

7279

-

7280

rm -f core conftest.err conftest.$ac_objext

7281

test "x$ac_cv_prog_cc_c89" != "xno" && break

7282

done

7283

@@ -6527,17 +6493,19 @@

7284

# AC_CACHE_VAL

7285

case "x$ac_cv_prog_cc_c89" in

7286

x)

7287

- { $as_echo "$as_me:$LINENO: result: none needed" >&5

7288

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5

7289

$as_echo "none needed" >&6; } ;;

7290

xno)

7291

- { $as_echo "$as_me:$LINENO: result: unsupported" >&5

7292

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5

7293

$as_echo "unsupported" >&6; } ;;

7294

*)

7295

CC="$CC $ac_cv_prog_cc_c89"

7296

- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

7297

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5

7298

$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;

7299

esac

7300

+if test "x$ac_cv_prog_cc_c89" != xno; then :

7301

7302

+fi

7303

7304

ac_ext=c

7305

ac_cpp='$CPP $CPPFLAGS'

7306

@@ -6547,9 +6515,9 @@

7307

7308

depcc="$CC" am_compiler_list=

7309

7310

-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

7311

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

7312

$as_echo_n "checking dependency style of $depcc... " >&6; }

7313

-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then

7314

+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :

7315

$as_echo_n "(cached) " >&6

7316

else

7317

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

7318

@@ -6575,6 +6543,11 @@

7319

if test "$am_compiler_list" = ""; then

7320

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

7321

fi

7322

+ am__universal=false

7323

+ case " $depcc " in #(

7324

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

7325

+ esac

7326

+

7327

for depmode in $am_compiler_list; do

7328

# Setup a source with many dependencies, because some compilers

7329

# like to wrap large dependency lists on column 80 (with \), and

7330

@@ -6592,7 +6565,17 @@

7331

done

7332

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

7333

7334

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

7335

+ # mode. It turns out that the SunPro C++ compiler does not properly

7336

+ # handle `-M -o', and we need to detect this. Also, some Intel

7337

+ # versions had trouble with output in subdirs

7338

+ am__obj=sub/conftest.${OBJEXT-o}

7339

+ am__minus_obj="-o $am__obj"

7340

case $depmode in

7341

+ gcc)

7342

+ # This depmode causes a compiler race in universal mode.

7343

+ test "$am__universal" = false || continue

7344

+ ;;

7345

nosideeffect)

7346

# after this tag, mechanisms are not by side-effect, so they'll

7347

# only be used when explicitly requested

7348

@@ -6602,19 +6585,23 @@

7349

break

7350

fi

7351

;;

7352

+ msvisualcpp | msvcmsys)

7353

+ # This compiler won't grok `-c -o', but also, the minuso test has

7354

+ # not run yet. These depmodes are late enough in the game, and

7355

+ # so weak that their functioning should not be impacted.

7356

+ am__obj=conftest.${OBJEXT-o}

7357

+ am__minus_obj=

7358

+ ;;

7359

none) break ;;

7360

esac

7361

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

7362

- # mode. It turns out that the SunPro C++ compiler does not properly

7363

- # handle `-M -o', and we need to detect this.

7364

if depmode=$depmode \

7365

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

7366

+ source=sub/conftest.c object=$am__obj \

7367

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

7368

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

7369

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

7370

>/dev/null 2>conftest.err &&

7371

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

7372

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

7373

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

7374

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

7375

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

7376

# icc doesn't choke on unknown options, it will just issue warnings

7377

# or remarks (even with -Werror). So we grep stderr for any message

7378

@@ -6638,7 +6625,7 @@

7379

fi

7380

7381

fi

7382

-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

7383

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5

7384

$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }

7385

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

7386

7387

@@ -6667,9 +6654,9 @@

7388

do

7389

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

7390

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

7391

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

7392

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7393

$as_echo_n "checking for $ac_word... " >&6; }

7394

-if test "${ac_cv_prog_CXX+set}" = set; then

7395

+if test "${ac_cv_prog_CXX+set}" = set; then :

7396

$as_echo_n "(cached) " >&6

7397

else

7398

if test -n "$CXX"; then

7399

@@ -6680,24 +6667,24 @@

7400

do

7401

IFS=$as_save_IFS

7402

test -z "$as_dir" && as_dir=.

7403

- for ac_exec_ext in '' $ac_executable_extensions; do

7404

+ for ac_exec_ext in '' $ac_executable_extensions; do

7405

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

7406

ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

7407

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7408

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7409

break 2

7410

fi

7411

done

7412

-done

7413

+ done

7414

IFS=$as_save_IFS

7415

7416

fi

7417

fi

7418

CXX=$ac_cv_prog_CXX

7419

if test -n "$CXX"; then

7420

- { $as_echo "$as_me:$LINENO: result: $CXX" >&5

7421

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5

7422

$as_echo "$CXX" >&6; }

7423

else

7424

- { $as_echo "$as_me:$LINENO: result: no" >&5

7425

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7426

$as_echo "no" >&6; }

7427

fi

7428

7429

@@ -6711,9 +6698,9 @@

7430

do

7431

# Extract the first word of "$ac_prog", so it can be a program name with args.

7432

set dummy $ac_prog; ac_word=$2

7433

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

7434

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

7435

$as_echo_n "checking for $ac_word... " >&6; }

7436

-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then

7437

+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :

7438

$as_echo_n "(cached) " >&6

7439

else

7440

if test -n "$ac_ct_CXX"; then

7441

@@ -6724,24 +6711,24 @@

7442

do

7443

IFS=$as_save_IFS

7444

test -z "$as_dir" && as_dir=.

7445

- for ac_exec_ext in '' $ac_executable_extensions; do

7446

+ for ac_exec_ext in '' $ac_executable_extensions; do

7447

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

7448

ac_cv_prog_ac_ct_CXX="$ac_prog"

7449

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7450

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

7451

break 2

7452

fi

7453

done

7454

-done

7455

+ done

7456

IFS=$as_save_IFS

7457

7458

fi

7459

fi

7460

ac_ct_CXX=$ac_cv_prog_ac_ct_CXX

7461

if test -n "$ac_ct_CXX"; then

7462

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

7463

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5

7464

$as_echo "$ac_ct_CXX" >&6; }

7465

else

7466

- { $as_echo "$as_me:$LINENO: result: no" >&5

7467

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

7468

$as_echo "no" >&6; }

7469

fi

7470

7471

@@ -6754,7 +6741,7 @@

7472

else

7473

case $cross_compiling:$ac_tool_warned in

7474

yes:)

7475

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

7476

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

7477

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

7478

ac_tool_warned=yes ;;

7479

esac

7480

@@ -6765,53 +6752,36 @@

7481

fi

7482

fi

7483

# Provide some information about the compiler.

7484

-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5

7485

+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5

7486

set X $ac_compile

7487

ac_compiler=$2

7488

-{ (ac_try="$ac_compiler --version >&5"

7489

-case "(($ac_try" in

7490

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7491

- *) ac_try_echo=$ac_try;;

7492

-esac

7493

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7494

-$as_echo "$ac_try_echo") >&5

7495

- (eval "$ac_compiler --version >&5") 2>&5

7496

- ac_status=$?

7497

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7498

- (exit $ac_status); }

7499

-{ (ac_try="$ac_compiler -v >&5"

7500

+for ac_option in --version -v -V -qversion; do

7501

+ { { ac_try="$ac_compiler $ac_option >&5"

7502

case "(($ac_try" in

7503

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7504

*) ac_try_echo=$ac_try;;

7505

esac

7506

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7507

-$as_echo "$ac_try_echo") >&5

7508

- (eval "$ac_compiler -v >&5") 2>&5

7509

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

7510

+$as_echo "$ac_try_echo"; } >&5

7511

+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err

7512

ac_status=$?

7513

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7514

- (exit $ac_status); }

7515

-{ (ac_try="$ac_compiler -V >&5"

7516

-case "(($ac_try" in

7517

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7518

- *) ac_try_echo=$ac_try;;

7519

-esac

7520

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7521

-$as_echo "$ac_try_echo") >&5

7522

- (eval "$ac_compiler -V >&5") 2>&5

7523

- ac_status=$?

7524

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7525

- (exit $ac_status); }

7526

+ if test -s conftest.err; then

7527

+ sed '10a\

7528

+... rest of stderr output deleted ...

7529

+ 10q' conftest.err >conftest.er1

7530

+ cat conftest.er1 >&5

7531

+ rm -f conftest.er1 conftest.err

7532

+ fi

7533

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

7534

+ test $ac_status = 0; }

7535

+done

7536

7537

-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

7538

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5

7539

$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }

7540

-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then

7541

+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :

7542

$as_echo_n "(cached) " >&6

7543

else

7544

- cat >conftest.$ac_ext <<_ACEOF

7545

-/* confdefs.h. */

7546

-_ACEOF

7547

-cat confdefs.h >>conftest.$ac_ext

7548

-cat >>conftest.$ac_ext <<_ACEOF

7549

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7550

/* end confdefs.h. */

7551

7552

int

7553

@@ -6825,37 +6795,16 @@

7554

return 0;

7555

}

7556

_ACEOF

7557

-rm -f conftest.$ac_objext

7558

-if { (ac_try="$ac_compile"

7559

-case "(($ac_try" in

7560

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7561

- *) ac_try_echo=$ac_try;;

7562

-esac

7563

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7564

-$as_echo "$ac_try_echo") >&5

7565

- (eval "$ac_compile") 2>conftest.er1

7566

- ac_status=$?

7567

- grep -v '^ *+' conftest.er1 >conftest.err

7568

- rm -f conftest.er1

7569

- cat conftest.err >&5

7570

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7571

- (exit $ac_status); } && {

7572

- test -z "$ac_cxx_werror_flag" ||

7573

- test ! -s conftest.err

7574

- } && test -s conftest.$ac_objext; then

7575

+if ac_fn_cxx_try_compile "$LINENO"; then :

7576

ac_compiler_gnu=yes

7577

else

7578

- $as_echo "$as_me: failed program was:" >&5

7579

-sed 's/^/| /' conftest.$ac_ext >&5

7580

-

7581

- ac_compiler_gnu=no

7582

+ ac_compiler_gnu=no

7583

fi

7584

-

7585

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7586

ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

7587

7588

fi

7589

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

7590

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5

7591

$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }

7592

if test $ac_compiler_gnu = yes; then

7593

GXX=yes

7594

@@ -6864,20 +6813,16 @@

7595

fi

7596

ac_test_CXXFLAGS=${CXXFLAGS+set}

7597

ac_save_CXXFLAGS=$CXXFLAGS

7598

-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

7599

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5

7600

$as_echo_n "checking whether $CXX accepts -g... " >&6; }

7601

-if test "${ac_cv_prog_cxx_g+set}" = set; then

7602

+if test "${ac_cv_prog_cxx_g+set}" = set; then :

7603

$as_echo_n "(cached) " >&6

7604

else

7605

ac_save_cxx_werror_flag=$ac_cxx_werror_flag

7606

ac_cxx_werror_flag=yes

7607

ac_cv_prog_cxx_g=no

7608

CXXFLAGS="-g"

7609

- cat >conftest.$ac_ext <<_ACEOF

7610

-/* confdefs.h. */

7611

-_ACEOF

7612

-cat confdefs.h >>conftest.$ac_ext

7613

-cat >>conftest.$ac_ext <<_ACEOF

7614

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7615

/* end confdefs.h. */

7616

7617

int

7618

@@ -6888,35 +6833,11 @@

7619

return 0;

7620

}

7621

_ACEOF

7622

-rm -f conftest.$ac_objext

7623

-if { (ac_try="$ac_compile"

7624

-case "(($ac_try" in

7625

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7626

- *) ac_try_echo=$ac_try;;

7627

-esac

7628

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7629

-$as_echo "$ac_try_echo") >&5

7630

- (eval "$ac_compile") 2>conftest.er1

7631

- ac_status=$?

7632

- grep -v '^ *+' conftest.er1 >conftest.err

7633

- rm -f conftest.er1

7634

- cat conftest.err >&5

7635

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7636

- (exit $ac_status); } && {

7637

- test -z "$ac_cxx_werror_flag" ||

7638

- test ! -s conftest.err

7639

- } && test -s conftest.$ac_objext; then

7640

+if ac_fn_cxx_try_compile "$LINENO"; then :

7641

ac_cv_prog_cxx_g=yes

7642

else

7643

- $as_echo "$as_me: failed program was:" >&5

7644

-sed 's/^/| /' conftest.$ac_ext >&5

7645

-

7646

- CXXFLAGS=""

7647

- cat >conftest.$ac_ext <<_ACEOF

7648

-/* confdefs.h. */

7649

-_ACEOF

7650

-cat confdefs.h >>conftest.$ac_ext

7651

-cat >>conftest.$ac_ext <<_ACEOF

7652

+ CXXFLAGS=""

7653

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7654

/* end confdefs.h. */

7655

7656

int

7657

@@ -6927,36 +6848,12 @@

7658

return 0;

7659

}

7660

_ACEOF

7661

-rm -f conftest.$ac_objext

7662

-if { (ac_try="$ac_compile"

7663

-case "(($ac_try" in

7664

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7665

- *) ac_try_echo=$ac_try;;

7666

-esac

7667

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7668

-$as_echo "$ac_try_echo") >&5

7669

- (eval "$ac_compile") 2>conftest.er1

7670

- ac_status=$?

7671

- grep -v '^ *+' conftest.er1 >conftest.err

7672

- rm -f conftest.er1

7673

- cat conftest.err >&5

7674

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7675

- (exit $ac_status); } && {

7676

- test -z "$ac_cxx_werror_flag" ||

7677

- test ! -s conftest.err

7678

- } && test -s conftest.$ac_objext; then

7679

- :

7680

-else

7681

- $as_echo "$as_me: failed program was:" >&5

7682

-sed 's/^/| /' conftest.$ac_ext >&5

7683

+if ac_fn_cxx_try_compile "$LINENO"; then :

7684

7685

- ac_cxx_werror_flag=$ac_save_cxx_werror_flag

7686

+else

7687

+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag

7688

CXXFLAGS="-g"

7689

- cat >conftest.$ac_ext <<_ACEOF

7690

-/* confdefs.h. */

7691

-_ACEOF

7692

-cat confdefs.h >>conftest.$ac_ext

7693

-cat >>conftest.$ac_ext <<_ACEOF

7694

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7695

/* end confdefs.h. */

7696

7697

int

7698

@@ -6967,42 +6864,17 @@

7699

return 0;

7700

}

7701

_ACEOF

7702

-rm -f conftest.$ac_objext

7703

-if { (ac_try="$ac_compile"

7704

-case "(($ac_try" in

7705

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7706

- *) ac_try_echo=$ac_try;;

7707

-esac

7708

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7709

-$as_echo "$ac_try_echo") >&5

7710

- (eval "$ac_compile") 2>conftest.er1

7711

- ac_status=$?

7712

- grep -v '^ *+' conftest.er1 >conftest.err

7713

- rm -f conftest.er1

7714

- cat conftest.err >&5

7715

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7716

- (exit $ac_status); } && {

7717

- test -z "$ac_cxx_werror_flag" ||

7718

- test ! -s conftest.err

7719

- } && test -s conftest.$ac_objext; then

7720

+if ac_fn_cxx_try_compile "$LINENO"; then :

7721

ac_cv_prog_cxx_g=yes

7722

-else

7723

- $as_echo "$as_me: failed program was:" >&5

7724

-sed 's/^/| /' conftest.$ac_ext >&5

7725

-

7726

-

7727

fi

7728

-

7729

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7730

fi

7731

-

7732

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7733

fi

7734

-

7735

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

7736

ac_cxx_werror_flag=$ac_save_cxx_werror_flag

7737

fi

7738

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

7739

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5

7740

$as_echo "$ac_cv_prog_cxx_g" >&6; }

7741

if test "$ac_test_CXXFLAGS" = set; then

7742

CXXFLAGS=$ac_save_CXXFLAGS

7743

@@ -7027,9 +6899,9 @@

7744

7745

depcc="$CXX" am_compiler_list=

7746

7747

-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

7748

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5

7749

$as_echo_n "checking dependency style of $depcc... " >&6; }

7750

-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then

7751

+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :

7752

$as_echo_n "(cached) " >&6

7753

else

7754

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

7755

@@ -7055,6 +6927,11 @@

7756

if test "$am_compiler_list" = ""; then

7757

am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

7758

fi

7759

+ am__universal=false

7760

+ case " $depcc " in #(

7761

+ *\ -arch\ *\ -arch\ *) am__universal=true ;;

7762

+ esac

7763

+

7764

for depmode in $am_compiler_list; do

7765

# Setup a source with many dependencies, because some compilers

7766

# like to wrap large dependency lists on column 80 (with \), and

7767

@@ -7072,7 +6949,17 @@

7768

done

7769

echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

7770

7771

+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

7772

+ # mode. It turns out that the SunPro C++ compiler does not properly

7773

+ # handle `-M -o', and we need to detect this. Also, some Intel

7774

+ # versions had trouble with output in subdirs

7775

+ am__obj=sub/conftest.${OBJEXT-o}

7776

+ am__minus_obj="-o $am__obj"

7777

case $depmode in

7778

+ gcc)

7779

+ # This depmode causes a compiler race in universal mode.

7780

+ test "$am__universal" = false || continue

7781

+ ;;

7782

nosideeffect)

7783

# after this tag, mechanisms are not by side-effect, so they'll

7784

# only be used when explicitly requested

7785

@@ -7082,19 +6969,23 @@

7786

break

7787

fi

7788

;;

7789

+ msvisualcpp | msvcmsys)

7790

+ # This compiler won't grok `-c -o', but also, the minuso test has

7791

+ # not run yet. These depmodes are late enough in the game, and

7792

+ # so weak that their functioning should not be impacted.

7793

+ am__obj=conftest.${OBJEXT-o}

7794

+ am__minus_obj=

7795

+ ;;

7796

none) break ;;

7797

esac

7798

- # We check with `-c' and `-o' for the sake of the "dashmstdout"

7799

- # mode. It turns out that the SunPro C++ compiler does not properly

7800

- # handle `-M -o', and we need to detect this.

7801

if depmode=$depmode \

7802

- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

7803

+ source=sub/conftest.c object=$am__obj \

7804

depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

7805

- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

7806

+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

7807

>/dev/null 2>conftest.err &&

7808

grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

7809

grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

7810

- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

7811

+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

7812

${MAKE-make} -s -f confmf > /dev/null 2>&1; then

7813

# icc doesn't choke on unknown options, it will just issue warnings

7814

# or remarks (even with -Werror). So we grep stderr for any message

7815

@@ -7118,7 +7009,7 @@

7816

fi

7817

7818

fi

7819

-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5

7820

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5

7821

$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }

7822

CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

7823

7824

@@ -7138,14 +7029,14 @@

7825

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

7826

ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

7827

ac_compiler_gnu=$ac_cv_c_compiler_gnu

7828

-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5

7829

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5

7830

$as_echo_n "checking how to run the C preprocessor... " >&6; }

7831

# On Suns, sometimes $CPP names a directory.

7832

if test -n "$CPP" && test -d "$CPP"; then

7833

CPP=

7834

fi

7835

if test -z "$CPP"; then

7836

- if test "${ac_cv_prog_CPP+set}" = set; then

7837

+ if test "${ac_cv_prog_CPP+set}" = set; then :

7838

$as_echo_n "(cached) " >&6

7839

else

7840

# Double quotes because CPP needs to be expanded

7841

@@ -7160,11 +7051,7 @@

7842

# <limits.h> exists even on freestanding compilers.

7843

# On the NeXT, cc -E runs the code through the compiler's parser,

7844

# not just through cpp. "Syntax error" is here to catch this case.

7845

- cat >conftest.$ac_ext <<_ACEOF

7846

-/* confdefs.h. */

7847

-_ACEOF

7848

-cat confdefs.h >>conftest.$ac_ext

7849

-cat >>conftest.$ac_ext <<_ACEOF

7850

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7851

/* end confdefs.h. */

7852

#ifdef __STDC__

7853

# include <limits.h>

7854

@@ -7173,78 +7060,34 @@

7855

#endif

7856

Syntax error

7857

_ACEOF

7858

-if { (ac_try="$ac_cpp conftest.$ac_ext"

7859

-case "(($ac_try" in

7860

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7861

- *) ac_try_echo=$ac_try;;

7862

-esac

7863

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7864

-$as_echo "$ac_try_echo") >&5

7865

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

7866

- ac_status=$?

7867

- grep -v '^ *+' conftest.er1 >conftest.err

7868

- rm -f conftest.er1

7869

- cat conftest.err >&5

7870

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7871

- (exit $ac_status); } >/dev/null && {

7872

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

7873

- test ! -s conftest.err

7874

- }; then

7875

- :

7876

-else

7877

- $as_echo "$as_me: failed program was:" >&5

7878

-sed 's/^/| /' conftest.$ac_ext >&5

7879

+if ac_fn_c_try_cpp "$LINENO"; then :

7880

7881

+else

7882

# Broken: fails on valid input.

7883

continue

7884

fi

7885

-

7886

rm -f conftest.err conftest.$ac_ext

7887

7888

# OK, works on sane cases. Now check whether nonexistent headers

7889

# can be detected and how.

7890

- cat >conftest.$ac_ext <<_ACEOF

7891

-/* confdefs.h. */

7892

-_ACEOF

7893

-cat confdefs.h >>conftest.$ac_ext

7894

-cat >>conftest.$ac_ext <<_ACEOF

7895

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7896

/* end confdefs.h. */

7897

#include <ac_nonexistent.h>

7898

_ACEOF

7899

-if { (ac_try="$ac_cpp conftest.$ac_ext"

7900

-case "(($ac_try" in

7901

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7902

- *) ac_try_echo=$ac_try;;

7903

-esac

7904

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7905

-$as_echo "$ac_try_echo") >&5

7906

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

7907

- ac_status=$?

7908

- grep -v '^ *+' conftest.er1 >conftest.err

7909

- rm -f conftest.er1

7910

- cat conftest.err >&5

7911

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7912

- (exit $ac_status); } >/dev/null && {

7913

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

7914

- test ! -s conftest.err

7915

- }; then

7916

+if ac_fn_c_try_cpp "$LINENO"; then :

7917

# Broken: success on invalid input.

7918

continue

7919

else

7920

- $as_echo "$as_me: failed program was:" >&5

7921

-sed 's/^/| /' conftest.$ac_ext >&5

7922

-

7923

# Passes both tests.

7924

ac_preproc_ok=:

7925

break

7926

fi

7927

-

7928

rm -f conftest.err conftest.$ac_ext

7929

7930

done

7931

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

7932

rm -f conftest.err conftest.$ac_ext

7933

-if $ac_preproc_ok; then

7934

+if $ac_preproc_ok; then :

7935

break

7936

fi

7937

7938

@@ -7256,7 +7099,7 @@

7939

else

7940

ac_cv_prog_CPP=$CPP

7941

fi

7942

-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5

7943

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5

7944

$as_echo "$CPP" >&6; }

7945

ac_preproc_ok=false

7946

for ac_c_preproc_warn_flag in '' yes

7947

@@ -7267,11 +7110,7 @@

7948

# <limits.h> exists even on freestanding compilers.

7949

# On the NeXT, cc -E runs the code through the compiler's parser,

7950

# not just through cpp. "Syntax error" is here to catch this case.

7951

- cat >conftest.$ac_ext <<_ACEOF

7952

-/* confdefs.h. */

7953

-_ACEOF

7954

-cat confdefs.h >>conftest.$ac_ext

7955

-cat >>conftest.$ac_ext <<_ACEOF

7956

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

7957

/* end confdefs.h. */

7958

#ifdef __STDC__

7959

# include <limits.h>

7960

@@ -7280,87 +7119,40 @@

7961

#endif

7962

Syntax error

7963

_ACEOF

7964

-if { (ac_try="$ac_cpp conftest.$ac_ext"

7965

-case "(($ac_try" in

7966

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7967

- *) ac_try_echo=$ac_try;;

7968

-esac

7969

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7970

-$as_echo "$ac_try_echo") >&5

7971

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

7972

- ac_status=$?

7973

- grep -v '^ *+' conftest.er1 >conftest.err

7974

- rm -f conftest.er1

7975

- cat conftest.err >&5

7976

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7977

- (exit $ac_status); } >/dev/null && {

7978

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

7979

- test ! -s conftest.err

7980

- }; then

7981

- :

7982

-else

7983

- $as_echo "$as_me: failed program was:" >&5

7984

-sed 's/^/| /' conftest.$ac_ext >&5

7985

+if ac_fn_c_try_cpp "$LINENO"; then :

7986

7987

+else

7988

# Broken: fails on valid input.

7989

continue

7990

fi

7991

-

7992

rm -f conftest.err conftest.$ac_ext

7993

7994

# OK, works on sane cases. Now check whether nonexistent headers

7995

# can be detected and how.

7996

- cat >conftest.$ac_ext <<_ACEOF

7997

-/* confdefs.h. */

7998

-_ACEOF

7999

-cat confdefs.h >>conftest.$ac_ext

8000

-cat >>conftest.$ac_ext <<_ACEOF

8001

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8002

/* end confdefs.h. */

8003

#include <ac_nonexistent.h>

8004

_ACEOF

8005

-if { (ac_try="$ac_cpp conftest.$ac_ext"

8006

-case "(($ac_try" in

8007

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8008

- *) ac_try_echo=$ac_try;;

8009

-esac

8010

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8011

-$as_echo "$ac_try_echo") >&5

8012

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

8013

- ac_status=$?

8014

- grep -v '^ *+' conftest.er1 >conftest.err

8015

- rm -f conftest.er1

8016

- cat conftest.err >&5

8017

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8018

- (exit $ac_status); } >/dev/null && {

8019

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

8020

- test ! -s conftest.err

8021

- }; then

8022

+if ac_fn_c_try_cpp "$LINENO"; then :

8023

# Broken: success on invalid input.

8024

continue

8025

else

8026

- $as_echo "$as_me: failed program was:" >&5

8027

-sed 's/^/| /' conftest.$ac_ext >&5

8028

-

8029

# Passes both tests.

8030

ac_preproc_ok=:

8031

break

8032

fi

8033

-

8034

rm -f conftest.err conftest.$ac_ext

8035

8036

done

8037

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

8038

rm -f conftest.err conftest.$ac_ext

8039

-if $ac_preproc_ok; then

8040

- :

8041

+if $ac_preproc_ok; then :

8042

+

8043

else

8044

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

8045

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

8046

$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

8047

-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check

8048

-See \`config.log' for more details." >&5

8049

-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check

8050

-See \`config.log' for more details." >&2;}

8051

- { (exit 1); exit 1; }; }; }

8052

+as_fn_error "C preprocessor \"$CPP\" fails sanity check

8053

+See \`config.log' for more details." "$LINENO" 5; }

8054

fi

8055

8056

ac_ext=c

8057

@@ -7370,9 +7162,9 @@

8058

ac_compiler_gnu=$ac_cv_c_compiler_gnu

8059

8060

8061

-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5

8062

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5

8063

$as_echo_n "checking for grep that handles long lines and -e... " >&6; }

8064

-if test "${ac_cv_path_GREP+set}" = set; then

8065

+if test "${ac_cv_path_GREP+set}" = set; then :

8066

$as_echo_n "(cached) " >&6

8067

else

8068

if test -z "$GREP"; then

8069

@@ -7383,7 +7175,7 @@

8070

do

8071

IFS=$as_save_IFS

8072

test -z "$as_dir" && as_dir=.

8073

- for ac_prog in grep ggrep; do

8074

+ for ac_prog in grep ggrep; do

8075

for ac_exec_ext in '' $ac_executable_extensions; do

8076

ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

8077

{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

8078

@@ -7403,7 +7195,7 @@

8079

$as_echo 'GREP' >> "conftest.nl"

8080

"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break

8081

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

8082

- ac_count=`expr $ac_count + 1`

8083

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

8084

if test $ac_count -gt ${ac_path_GREP_max-0}; then

8085

# Best one so far, save it but keep looking for a better one

8086

ac_cv_path_GREP="$ac_path_GREP"

8087

@@ -7418,26 +7210,24 @@

8088

$ac_path_GREP_found && break 3

8089

done

8090

done

8091

-done

8092

+ done

8093

IFS=$as_save_IFS

8094

if test -z "$ac_cv_path_GREP"; then

8095

- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

8096

-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

8097

- { (exit 1); exit 1; }; }

8098

+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

8099

fi

8100

else

8101

ac_cv_path_GREP=$GREP

8102

fi

8103

8104

fi

8105

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5

8106

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5

8107

$as_echo "$ac_cv_path_GREP" >&6; }

8108

GREP="$ac_cv_path_GREP"

8109

8110

8111

-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5

8112

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5

8113

$as_echo_n "checking for egrep... " >&6; }

8114

-if test "${ac_cv_path_EGREP+set}" = set; then

8115

+if test "${ac_cv_path_EGREP+set}" = set; then :

8116

$as_echo_n "(cached) " >&6

8117

else

8118

if echo a | $GREP -E '(a|b)' >/dev/null 2>&1

8119

@@ -7451,7 +7241,7 @@

8120

do

8121

IFS=$as_save_IFS

8122

test -z "$as_dir" && as_dir=.

8123

- for ac_prog in egrep; do

8124

+ for ac_prog in egrep; do

8125

for ac_exec_ext in '' $ac_executable_extensions; do

8126

ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

8127

{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

8128

@@ -7471,7 +7261,7 @@

8129

$as_echo 'EGREP' >> "conftest.nl"

8130

"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break

8131

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

8132

- ac_count=`expr $ac_count + 1`

8133

+ as_fn_arith $ac_count + 1 && ac_count=$as_val

8134

if test $ac_count -gt ${ac_path_EGREP_max-0}; then

8135

# Best one so far, save it but keep looking for a better one

8136

ac_cv_path_EGREP="$ac_path_EGREP"

8137

@@ -7486,12 +7276,10 @@

8138

$ac_path_EGREP_found && break 3

8139

done

8140

done

8141

-done

8142

+ done

8143

IFS=$as_save_IFS

8144

if test -z "$ac_cv_path_EGREP"; then

8145

- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

8146

-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

8147

- { (exit 1); exit 1; }; }

8148

+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

8149

fi

8150

else

8151

ac_cv_path_EGREP=$EGREP

8152

@@ -7499,21 +7287,17 @@

8153

8154

fi

8155

fi

8156

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5

8157

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5

8158

$as_echo "$ac_cv_path_EGREP" >&6; }

8159

EGREP="$ac_cv_path_EGREP"

8160

8161

8162

-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5

8163

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5

8164

$as_echo_n "checking for ANSI C header files... " >&6; }

8165

-if test "${ac_cv_header_stdc+set}" = set; then

8166

+if test "${ac_cv_header_stdc+set}" = set; then :

8167

$as_echo_n "(cached) " >&6

8168

else

8169

- cat >conftest.$ac_ext <<_ACEOF

8170

-/* confdefs.h. */

8171

-_ACEOF

8172

-cat confdefs.h >>conftest.$ac_ext

8173

-cat >>conftest.$ac_ext <<_ACEOF

8174

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8175

/* end confdefs.h. */

8176

#include <stdlib.h>

8177

#include <stdarg.h>

8178

@@ -7528,48 +7312,23 @@

8179

return 0;

8180

}

8181

_ACEOF

8182

-rm -f conftest.$ac_objext

8183

-if { (ac_try="$ac_compile"

8184

-case "(($ac_try" in

8185

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8186

- *) ac_try_echo=$ac_try;;

8187

-esac

8188

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8189

-$as_echo "$ac_try_echo") >&5

8190

- (eval "$ac_compile") 2>conftest.er1

8191

- ac_status=$?

8192

- grep -v '^ *+' conftest.er1 >conftest.err

8193

- rm -f conftest.er1

8194

- cat conftest.err >&5

8195

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8196

- (exit $ac_status); } && {

8197

- test -z "$ac_c_werror_flag" ||

8198

- test ! -s conftest.err

8199

- } && test -s conftest.$ac_objext; then

8200

+if ac_fn_c_try_compile "$LINENO"; then :

8201

ac_cv_header_stdc=yes

8202

else

8203

- $as_echo "$as_me: failed program was:" >&5

8204

-sed 's/^/| /' conftest.$ac_ext >&5

8205

-

8206

- ac_cv_header_stdc=no

8207

+ ac_cv_header_stdc=no

8208

fi

8209

-

8210

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

8211

8212

if test $ac_cv_header_stdc = yes; then

8213

# SunOS 4.x string.h does not declare mem*, contrary to ANSI.

8214

- cat >conftest.$ac_ext <<_ACEOF

8215

-/* confdefs.h. */

8216

-_ACEOF

8217

-cat confdefs.h >>conftest.$ac_ext

8218

-cat >>conftest.$ac_ext <<_ACEOF

8219

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8220

/* end confdefs.h. */

8221

#include <string.h>

8222

8223

_ACEOF

8224

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

8225

- $EGREP "memchr" >/dev/null 2>&1; then

8226

- :

8227

+ $EGREP "memchr" >/dev/null 2>&1; then :

8228

+

8229

else

8230

ac_cv_header_stdc=no

8231

fi

8232

@@ -7579,18 +7338,14 @@

8233

8234

if test $ac_cv_header_stdc = yes; then

8235

# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.

8236

- cat >conftest.$ac_ext <<_ACEOF

8237

-/* confdefs.h. */

8238

-_ACEOF

8239

-cat confdefs.h >>conftest.$ac_ext

8240

-cat >>conftest.$ac_ext <<_ACEOF

8241

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8242

/* end confdefs.h. */

8243

#include <stdlib.h>

8244

8245

_ACEOF

8246

if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

8247

- $EGREP "free" >/dev/null 2>&1; then

8248

- :

8249

+ $EGREP "free" >/dev/null 2>&1; then :

8250

+

8251

else

8252

ac_cv_header_stdc=no

8253

fi

8254

@@ -7600,14 +7355,10 @@

8255

8256

if test $ac_cv_header_stdc = yes; then

8257

# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.

8258

- if test "$cross_compiling" = yes; then

8259

+ if test "$cross_compiling" = yes; then :

8260

:

8261

else

8262

- cat >conftest.$ac_ext <<_ACEOF

8263

-/* confdefs.h. */

8264

-_ACEOF

8265

-cat confdefs.h >>conftest.$ac_ext

8266

-cat >>conftest.$ac_ext <<_ACEOF

8267

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8268

/* end confdefs.h. */

8269

#include <ctype.h>

8270

#include <stdlib.h>

8271

@@ -7634,66 +7385,37 @@

8272

return 0;

8273

}

8274

_ACEOF

8275

-rm -f conftest$ac_exeext

8276

-if { (ac_try="$ac_link"

8277

-case "(($ac_try" in

8278

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8279

- *) ac_try_echo=$ac_try;;

8280

-esac

8281

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8282

-$as_echo "$ac_try_echo") >&5

8283

- (eval "$ac_link") 2>&5

8284

- ac_status=$?

8285

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8286

- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

8287

- { (case "(($ac_try" in

8288

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8289

- *) ac_try_echo=$ac_try;;

8290

-esac

8291

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8292

-$as_echo "$ac_try_echo") >&5

8293

- (eval "$ac_try") 2>&5

8294

- ac_status=$?

8295

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8296

- (exit $ac_status); }; }; then

8297

- :

8298

-else

8299

- $as_echo "$as_me: program exited with status $ac_status" >&5

8300

-$as_echo "$as_me: failed program was:" >&5

8301

-sed 's/^/| /' conftest.$ac_ext >&5

8302

+if ac_fn_c_try_run "$LINENO"; then :

8303

8304

-( exit $ac_status )

8305

-ac_cv_header_stdc=no

8306

+else

8307

+ ac_cv_header_stdc=no

8308

fi

8309

-rm -rf conftest.dSYM

8310

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

8311

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

8312

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

8313

fi

8314

8315

-

8316

fi

8317

fi

8318

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

8319

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5

8320

$as_echo "$ac_cv_header_stdc" >&6; }

8321

if test $ac_cv_header_stdc = yes; then

8322

8323

-cat >>confdefs.h <<\_ACEOF

8324

-#define STDC_HEADERS 1

8325

-_ACEOF

8326

+$as_echo "#define STDC_HEADERS 1" >>confdefs.h

8327

8328

fi

8329

8330

8331

8332

- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5

8333

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5

8334

$as_echo_n "checking whether NLS is requested... " >&6; }

8335

# Check whether --enable-nls was given.

8336

-if test "${enable_nls+set}" = set; then

8337

+if test "${enable_nls+set}" = set; then :

8338

enableval=$enable_nls; USE_NLS=$enableval

8339

else

8340

USE_NLS=yes

8341

fi

8342

8343

- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5

8344

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5

8345

$as_echo "$USE_NLS" >&6; }

8346

8347

8348

@@ -7701,35 +7423,31 @@

8349

8350

case "$am__api_version" in

8351

1.01234)

8352

- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5

8353

-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}

8354

- { (exit 1); exit 1; }; }

8355

+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5

8356

;;

8357

*)

8358

;;

8359

esac

8360

8361

if test -n "0.35.0"; then

8362

- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5

8363

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5

8364

$as_echo_n "checking for intltool >= 0.35.0... " >&6; }

8365

8366

INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`

8367

INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`

8368

INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`

8369

8370

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5

8371

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5

8372

$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }

8373

test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||

8374

- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5

8375

-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}

8376

- { (exit 1); exit 1; }; }

8377

+ as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5

8378

fi

8379

8380

# Extract the first word of "intltool-update", so it can be a program name with args.

8381

set dummy intltool-update; ac_word=$2

8382

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

8383

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

8384

$as_echo_n "checking for $ac_word... " >&6; }

8385

-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then

8386

+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :

8387

$as_echo_n "(cached) " >&6

8388

else

8389

case $INTLTOOL_UPDATE in

8390

@@ -7742,14 +7460,14 @@

8391

do

8392

IFS=$as_save_IFS

8393

test -z "$as_dir" && as_dir=.

8394

- for ac_exec_ext in '' $ac_executable_extensions; do

8395

+ for ac_exec_ext in '' $ac_executable_extensions; do

8396

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

8397

ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"

8398

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

8399

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

8400

break 2

8401

fi

8402

done

8403

-done

8404

+ done

8405

IFS=$as_save_IFS

8406

8407

;;

8408

@@ -7757,19 +7475,19 @@

8409

fi

8410

INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE

8411

if test -n "$INTLTOOL_UPDATE"; then

8412

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5

8413

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5

8414

$as_echo "$INTLTOOL_UPDATE" >&6; }

8415

else

8416

- { $as_echo "$as_me:$LINENO: result: no" >&5

8417

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

8418

$as_echo "no" >&6; }

8419

fi

8420

8421

8422

# Extract the first word of "intltool-merge", so it can be a program name with args.

8423

set dummy intltool-merge; ac_word=$2

8424

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

8425

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

8426

$as_echo_n "checking for $ac_word... " >&6; }

8427

-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then

8428

+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :

8429

$as_echo_n "(cached) " >&6

8430

else

8431

case $INTLTOOL_MERGE in

8432

@@ -7782,14 +7500,14 @@

8433

do

8434

IFS=$as_save_IFS

8435

test -z "$as_dir" && as_dir=.

8436

- for ac_exec_ext in '' $ac_executable_extensions; do

8437

+ for ac_exec_ext in '' $ac_executable_extensions; do

8438

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

8439

ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"

8440

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

8441

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

8442

break 2

8443

fi

8444

done

8445

-done

8446

+ done

8447

IFS=$as_save_IFS

8448

8449

;;

8450

@@ -7797,19 +7515,19 @@

8451

fi

8452

INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE

8453

if test -n "$INTLTOOL_MERGE"; then

8454

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5

8455

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5

8456

$as_echo "$INTLTOOL_MERGE" >&6; }

8457

else

8458

- { $as_echo "$as_me:$LINENO: result: no" >&5

8459

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

8460

$as_echo "no" >&6; }

8461

fi

8462

8463

8464

# Extract the first word of "intltool-extract", so it can be a program name with args.

8465

set dummy intltool-extract; ac_word=$2

8466

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

8467

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

8468

$as_echo_n "checking for $ac_word... " >&6; }

8469

-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then

8470

+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :

8471

$as_echo_n "(cached) " >&6

8472

else

8473

case $INTLTOOL_EXTRACT in

8474

@@ -7822,14 +7540,14 @@

8475

do

8476

IFS=$as_save_IFS

8477

test -z "$as_dir" && as_dir=.

8478

- for ac_exec_ext in '' $ac_executable_extensions; do

8479

+ for ac_exec_ext in '' $ac_executable_extensions; do

8480

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

8481

ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"

8482

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

8483

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

8484

break 2

8485

fi

8486

done

8487

-done

8488

+ done

8489

IFS=$as_save_IFS

8490

8491

;;

8492

@@ -7837,18 +7555,16 @@

8493

fi

8494

INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT

8495

if test -n "$INTLTOOL_EXTRACT"; then

8496

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5

8497

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5

8498

$as_echo "$INTLTOOL_EXTRACT" >&6; }

8499

else

8500

- { $as_echo "$as_me:$LINENO: result: no" >&5

8501

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

8502

$as_echo "no" >&6; }

8503

fi

8504

8505

8506

if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then

8507

- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5

8508

-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}

8509

- { (exit 1); exit 1; }; }

8510

+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5

8511

fi

8512

8513

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 $< $@'

8514

@@ -7970,9 +7686,9 @@

8515

# Check the gettext tools to make sure they are GNU

8516

# Extract the first word of "xgettext", so it can be a program name with args.

8517

set dummy xgettext; ac_word=$2

8518

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

8519

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

8520

$as_echo_n "checking for $ac_word... " >&6; }

8521

-if test "${ac_cv_path_XGETTEXT+set}" = set; then

8522

+if test "${ac_cv_path_XGETTEXT+set}" = set; then :

8523

$as_echo_n "(cached) " >&6

8524

else

8525

case $XGETTEXT in

8526

@@ -7985,14 +7701,14 @@

8527

do

8528

IFS=$as_save_IFS

8529

test -z "$as_dir" && as_dir=.

8530

- for ac_exec_ext in '' $ac_executable_extensions; do

8531

+ for ac_exec_ext in '' $ac_executable_extensions; do

8532

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

8533

ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"

8534

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

8535

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

8536

break 2

8537

fi

8538

done

8539

-done

8540

+ done

8541

IFS=$as_save_IFS

8542

8543

;;

8544

@@ -8000,19 +7716,19 @@

8545

fi

8546

XGETTEXT=$ac_cv_path_XGETTEXT

8547

if test -n "$XGETTEXT"; then

8548

- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5

8549

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5

8550

$as_echo "$XGETTEXT" >&6; }

8551

else

8552

- { $as_echo "$as_me:$LINENO: result: no" >&5

8553

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

8554

$as_echo "no" >&6; }

8555

fi

8556

8557

8558

# Extract the first word of "msgmerge", so it can be a program name with args.

8559

set dummy msgmerge; ac_word=$2

8560

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

8561

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

8562

$as_echo_n "checking for $ac_word... " >&6; }

8563

-if test "${ac_cv_path_MSGMERGE+set}" = set; then

8564

+if test "${ac_cv_path_MSGMERGE+set}" = set; then :

8565

$as_echo_n "(cached) " >&6

8566

else

8567

case $MSGMERGE in

8568

@@ -8025,14 +7741,14 @@

8569

do

8570

IFS=$as_save_IFS

8571

test -z "$as_dir" && as_dir=.

8572

- for ac_exec_ext in '' $ac_executable_extensions; do

8573

+ for ac_exec_ext in '' $ac_executable_extensions; do

8574

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

8575

ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"

8576

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

8577

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

8578

break 2

8579

fi

8580

done

8581

-done

8582

+ done

8583

IFS=$as_save_IFS

8584

8585

;;

8586

@@ -8040,19 +7756,19 @@

8587

fi

8588

MSGMERGE=$ac_cv_path_MSGMERGE

8589

if test -n "$MSGMERGE"; then

8590

- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5

8591

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5

8592

$as_echo "$MSGMERGE" >&6; }

8593

else

8594

- { $as_echo "$as_me:$LINENO: result: no" >&5

8595

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

8596

$as_echo "no" >&6; }

8597

fi

8598

8599

8600

# Extract the first word of "msgfmt", so it can be a program name with args.

8601

set dummy msgfmt; ac_word=$2

8602

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

8603

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

8604

$as_echo_n "checking for $ac_word... " >&6; }

8605

-if test "${ac_cv_path_MSGFMT+set}" = set; then

8606

+if test "${ac_cv_path_MSGFMT+set}" = set; then :

8607

$as_echo_n "(cached) " >&6

8608

else

8609

case $MSGFMT in

8610

@@ -8065,14 +7781,14 @@

8611

do

8612

IFS=$as_save_IFS

8613

test -z "$as_dir" && as_dir=.

8614

- for ac_exec_ext in '' $ac_executable_extensions; do

8615

+ for ac_exec_ext in '' $ac_executable_extensions; do

8616

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

8617

ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"

8618

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

8619

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

8620

break 2

8621

fi

8622

done

8623

-done

8624

+ done

8625

IFS=$as_save_IFS

8626

8627

;;

8628

@@ -8080,19 +7796,19 @@

8629

fi

8630

MSGFMT=$ac_cv_path_MSGFMT

8631

if test -n "$MSGFMT"; then

8632

- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5

8633

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5

8634

$as_echo "$MSGFMT" >&6; }

8635

else

8636

- { $as_echo "$as_me:$LINENO: result: no" >&5

8637

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

8638

$as_echo "no" >&6; }

8639

fi

8640

8641

8642

# Extract the first word of "gmsgfmt", so it can be a program name with args.

8643

set dummy gmsgfmt; ac_word=$2

8644

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

8645

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

8646

$as_echo_n "checking for $ac_word... " >&6; }

8647

-if test "${ac_cv_path_GMSGFMT+set}" = set; then

8648

+if test "${ac_cv_path_GMSGFMT+set}" = set; then :

8649

$as_echo_n "(cached) " >&6

8650

else

8651

case $GMSGFMT in

8652

@@ -8105,14 +7821,14 @@

8653

do

8654

IFS=$as_save_IFS

8655

test -z "$as_dir" && as_dir=.

8656

- for ac_exec_ext in '' $ac_executable_extensions; do

8657

+ for ac_exec_ext in '' $ac_executable_extensions; do

8658

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

8659

ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"

8660

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

8661

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

8662

break 2

8663

fi

8664

done

8665

-done

8666

+ done

8667

IFS=$as_save_IFS

8668

8669

test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"

8670

@@ -8121,33 +7837,29 @@

8671

fi

8672

GMSGFMT=$ac_cv_path_GMSGFMT

8673

if test -n "$GMSGFMT"; then

8674

- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5

8675

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5

8676

$as_echo "$GMSGFMT" >&6; }

8677

else

8678

- { $as_echo "$as_me:$LINENO: result: no" >&5

8679

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

8680

$as_echo "no" >&6; }

8681

fi

8682

8683

8684

if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then

8685

- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5

8686

-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}

8687

- { (exit 1); exit 1; }; }

8688

+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5

8689

fi

8690

xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"

8691

mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"

8692

mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"

8693

if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then

8694

- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5

8695

-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}

8696

- { (exit 1); exit 1; }; }

8697

+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5

8698

fi

8699

8700

# Extract the first word of "perl", so it can be a program name with args.

8701

set dummy perl; ac_word=$2

8702

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

8703

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

8704

$as_echo_n "checking for $ac_word... " >&6; }

8705

-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then

8706

+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :

8707

$as_echo_n "(cached) " >&6

8708

else

8709

case $INTLTOOL_PERL in

8710

@@ -8160,14 +7872,14 @@

8711

do

8712

IFS=$as_save_IFS

8713

test -z "$as_dir" && as_dir=.

8714

- for ac_exec_ext in '' $ac_executable_extensions; do

8715

+ for ac_exec_ext in '' $ac_executable_extensions; do

8716

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

8717

ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"

8718

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

8719

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

8720

break 2

8721

fi

8722

done

8723

-done

8724

+ done

8725

IFS=$as_save_IFS

8726

8727

;;

8728

@@ -8175,41 +7887,35 @@

8729

fi

8730

INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL

8731

if test -n "$INTLTOOL_PERL"; then

8732

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5

8733

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5

8734

$as_echo "$INTLTOOL_PERL" >&6; }

8735

else

8736

- { $as_echo "$as_me:$LINENO: result: no" >&5

8737

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

8738

$as_echo "no" >&6; }

8739

fi

8740

8741

8742

if test -z "$INTLTOOL_PERL"; then

8743

- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5

8744

-$as_echo "$as_me: error: perl not found" >&2;}

8745

- { (exit 1); exit 1; }; }

8746

+ as_fn_error "perl not found" "$LINENO" 5

8747

fi

8748

-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5

8749

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5

8750

$as_echo_n "checking for perl >= 5.8.1... " >&6; }

8751

$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1

8752

if test $? -ne 0; then

8753

- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5

8754

-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}

8755

- { (exit 1); exit 1; }; }

8756

+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5

8757

else

8758

IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"

8759

- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5

8760

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5

8761

$as_echo "$IT_PERL_VERSION" >&6; }

8762

fi

8763

if test "x" != "xno-xml"; then

8764

- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5

8765

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5

8766

$as_echo_n "checking for XML::Parser... " >&6; }

8767

if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then

8768

- { $as_echo "$as_me:$LINENO: result: ok" >&5

8769

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5

8770

$as_echo "ok" >&6; }

8771

else

8772

- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5

8773

-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}

8774

- { (exit 1); exit 1; }; }

8775

+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5

8776

fi

8777

fi

8778

8779

@@ -8219,256 +7925,52 @@

8780

# Set DATADIRNAME correctly if it is not set yet

8781

# (copied from glib-gettext.m4)

8782

if test -z "$DATADIRNAME"; then

8783

- cat >conftest.$ac_ext <<_ACEOF

8784

-/* confdefs.h. */

8785

-_ACEOF

8786

-cat confdefs.h >>conftest.$ac_ext

8787

-cat >>conftest.$ac_ext <<_ACEOF

8788

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

8789

/* end confdefs.h. */

8790

8791

int

8792

main ()

8793

{

8794

extern int _nl_msg_cat_cntr;

8795

- return _nl_msg_cat_cntr

8796

- ;

8797

- return 0;

8798

-}

8799

-_ACEOF

8800

-rm -f conftest.$ac_objext conftest$ac_exeext

8801

-if { (ac_try="$ac_link"

8802

-case "(($ac_try" in

8803

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8804

- *) ac_try_echo=$ac_try;;

8805

-esac

8806

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8807

-$as_echo "$ac_try_echo") >&5

8808

- (eval "$ac_link") 2>conftest.er1

8809

- ac_status=$?

8810

- grep -v '^ *+' conftest.er1 >conftest.err

8811

- rm -f conftest.er1

8812

- cat conftest.err >&5

8813

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8814

- (exit $ac_status); } && {

8815

- test -z "$ac_c_werror_flag" ||

8816

- test ! -s conftest.err

8817

- } && test -s conftest$ac_exeext && {

8818

- test "$cross_compiling" = yes ||

8819

- $as_test_x conftest$ac_exeext

8820

- }; then

8821

- DATADIRNAME=share

8822

-else

8823

- $as_echo "$as_me: failed program was:" >&5

8824

-sed 's/^/| /' conftest.$ac_ext >&5

8825

-

8826

- case $host in

8827

- *-*-solaris*)

8828

- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

8829

-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }

8830

-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then

8831

- $as_echo_n "(cached) " >&6

8832

-else

8833

- cat >conftest.$ac_ext <<_ACEOF

8834

-/* confdefs.h. */

8835

-_ACEOF

8836

-cat confdefs.h >>conftest.$ac_ext

8837

-cat >>conftest.$ac_ext <<_ACEOF

8838

-/* end confdefs.h. */

8839

-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.

8840

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

8841

-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset

8842

-

8843

-/* System header to define __stub macros and hopefully few prototypes,

8844

- which can conflict with char bind_textdomain_codeset (); below.

8845

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

8846

- <limits.h> exists even on freestanding compilers. */

8847

-

8848

-#ifdef __STDC__

8849

-# include <limits.h>

8850

-#else

8851

-# include <assert.h>

8852

-#endif

8853

-

8854

-#undef bind_textdomain_codeset

8855

-

8856

-/* Override any GCC internal prototype to avoid an error.

8857

- Use char because int might match the return type of a GCC

8858

- builtin and then its argument prototype would still apply. */

8859

-#ifdef __cplusplus

8860

-extern "C"

8861

-#endif

8862

-char bind_textdomain_codeset ();

8863

-/* The GNU C library defines this for functions which it implements

8864

- to always fail with ENOSYS. Some functions are actually named

8865

- something starting with __ and the normal name is an alias. */

8866

-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset

8867

-choke me

8868

-#endif

8869

-

8870

-int

8871

-main ()

8872

-{

8873

-return bind_textdomain_codeset ();

8874

- ;

8875

- return 0;

8876

-}

8877

-_ACEOF

8878

-rm -f conftest.$ac_objext conftest$ac_exeext

8879

-if { (ac_try="$ac_link"

8880

-case "(($ac_try" in

8881

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8882

- *) ac_try_echo=$ac_try;;

8883

-esac

8884

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8885

-$as_echo "$ac_try_echo") >&5

8886

- (eval "$ac_link") 2>conftest.er1

8887

- ac_status=$?

8888

- grep -v '^ *+' conftest.er1 >conftest.err

8889

- rm -f conftest.er1

8890

- cat conftest.err >&5

8891

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8892

- (exit $ac_status); } && {

8893

- test -z "$ac_c_werror_flag" ||

8894

- test ! -s conftest.err

8895

- } && test -s conftest$ac_exeext && {

8896

- test "$cross_compiling" = yes ||

8897

- $as_test_x conftest$ac_exeext

8898

- }; then

8899

- ac_cv_func_bind_textdomain_codeset=yes

8900

-else

8901

- $as_echo "$as_me: failed program was:" >&5

8902

-sed 's/^/| /' conftest.$ac_ext >&5

8903

-

8904

- ac_cv_func_bind_textdomain_codeset=no

8905

-fi

8906

-

8907

-rm -rf conftest.dSYM

8908

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8909

- conftest$ac_exeext conftest.$ac_ext

8910

-fi

8911

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

8912

-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }

8913

-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then

8914

- DATADIRNAME=share

8915

-else

8916

- DATADIRNAME=lib

8917

-fi

8918

-

8919

- ;;

8920

- *)

8921

- DATADIRNAME=lib

8922

- ;;

8923

- esac

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

-fi

8930

-

8931

-

8932

-

8933

-

8934

-

8935

-

8936

-

8937

-

8938

-

8939

-

8940

-

8941

-for ac_func in strverscmp access fsync fflush

8942

-do

8943

-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

8944

-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

8945

-$as_echo_n "checking for $ac_func... " >&6; }

8946

-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

8947

- $as_echo_n "(cached) " >&6

8948

-else

8949

- cat >conftest.$ac_ext <<_ACEOF

8950

-/* confdefs.h. */

8951

-_ACEOF

8952

-cat confdefs.h >>conftest.$ac_ext

8953

-cat >>conftest.$ac_ext <<_ACEOF

8954

-/* end confdefs.h. */

8955

-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

8956

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

8957

-#define $ac_func innocuous_$ac_func

8958

-

8959

-/* System header to define __stub macros and hopefully few prototypes,

8960

- which can conflict with char $ac_func (); below.

8961

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

8962

- <limits.h> exists even on freestanding compilers. */

8963

-

8964

-#ifdef __STDC__

8965

-# include <limits.h>

8966

-#else

8967

-# include <assert.h>

8968

-#endif

8969

-

8970

-#undef $ac_func

8971

-

8972

-/* Override any GCC internal prototype to avoid an error.

8973

- Use char because int might match the return type of a GCC

8974

- builtin and then its argument prototype would still apply. */

8975

-#ifdef __cplusplus

8976

-extern "C"

8977

-#endif

8978

-char $ac_func ();

8979

-/* The GNU C library defines this for functions which it implements

8980

- to always fail with ENOSYS. Some functions are actually named

8981

- something starting with __ and the normal name is an alias. */

8982

-#if defined __stub_$ac_func || defined __stub___$ac_func

8983

-choke me

8984

-#endif

8985

-

8986

-int

8987

-main ()

8988

-{

8989

-return $ac_func ();

8990

+ return _nl_msg_cat_cntr

8991

;

8992

return 0;

8993

}

8994

_ACEOF

8995

-rm -f conftest.$ac_objext conftest$ac_exeext

8996

-if { (ac_try="$ac_link"

8997

-case "(($ac_try" in

8998

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8999

- *) ac_try_echo=$ac_try;;

9000

-esac

9001

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9002

-$as_echo "$ac_try_echo") >&5

9003

- (eval "$ac_link") 2>conftest.er1

9004

- ac_status=$?

9005

- grep -v '^ *+' conftest.er1 >conftest.err

9006

- rm -f conftest.er1

9007

- cat conftest.err >&5

9008

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9009

- (exit $ac_status); } && {

9010

- test -z "$ac_c_werror_flag" ||

9011

- test ! -s conftest.err

9012

- } && test -s conftest$ac_exeext && {

9013

- test "$cross_compiling" = yes ||

9014

- $as_test_x conftest$ac_exeext

9015

- }; then

9016

- eval "$as_ac_var=yes"

9017

+if ac_fn_c_try_link "$LINENO"; then :

9018

+ DATADIRNAME=share

9019

else

9020

- $as_echo "$as_me: failed program was:" >&5

9021

-sed 's/^/| /' conftest.$ac_ext >&5

9022

-

9023

- eval "$as_ac_var=no"

9024

+ case $host in

9025

+ *-*-solaris*)

9026

+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"

9027

+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :

9028

+ DATADIRNAME=share

9029

+else

9030

+ DATADIRNAME=lib

9031

fi

9032

9033

-rm -rf conftest.dSYM

9034

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9035

- conftest$ac_exeext conftest.$ac_ext

9036

+ ;;

9037

+ *)

9038

+ DATADIRNAME=lib

9039

+ ;;

9040

+ esac

9041

fi

9042

-ac_res=`eval 'as_val=${'$as_ac_var'}

9043

- $as_echo "$as_val"'`

9044

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

9045

-$as_echo "$ac_res" >&6; }

9046

-as_val=`eval 'as_val=${'$as_ac_var'}

9047

- $as_echo "$as_val"'`

9048

- if test "x$as_val" = x""yes; then

9049

+rm -f core conftest.err conftest.$ac_objext \

9050

+ conftest$ac_exeext conftest.$ac_ext

9051

+fi

9052

+

9053

+

9054

+

9055

+

9056

+

9057

+

9058

+

9059

+for ac_func in strverscmp access fsync fflush

9060

+do :

9061

+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

9062

+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

9063

+eval as_val=\$$as_ac_var

9064

+ if test "x$as_val" = x""yes; then :

9065

cat >>confdefs.h <<_ACEOF

9066

#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

9067

_ACEOF

9068

@@ -8481,22 +7983,20 @@

9069

# Check target architecture

9070

9071

# Check for Win32

9072

-{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5

9073

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for some Win32 platform" >&5

9074

$as_echo_n "checking for some Win32 platform... " >&6; }

9075

case "$target_os" in

9076

mingw* | cygwin*)

9077

platform_win32=yes

9078

9079

-cat >>confdefs.h <<\_ACEOF

9080

-#define PLATFORM_WIN32 1

9081

-_ACEOF

9082

+$as_echo "#define PLATFORM_WIN32 1" >>confdefs.h

9083

9084

;;

9085

*)

9086

platform_win32=no

9087

;;

9088

esac

9089

-{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5

9090

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $platform_win32" >&5

9091

$as_echo "$platform_win32" >&6; }

9092

if test "$platform_win32" = "yes"; then

9093

PLATFORM_WIN32_TRUE=

9094

@@ -8507,15 +8007,13 @@

9095

fi

9096

9097

9098

-{ $as_echo "$as_me:$LINENO: checking for native Win32" >&5

9099

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native Win32" >&5

9100

$as_echo_n "checking for native Win32... " >&6; }

9101

case "$target_os" in

9102

mingw*)

9103

os_win32=yes

9104

9105

-cat >>confdefs.h <<\_ACEOF

9106

-#define OS_WIN32 1

9107

-_ACEOF

9108

+$as_echo "#define OS_WIN32 1" >>confdefs.h

9109

9110

os_unix=no

9111

PATHSEP=';'

9112

@@ -8526,7 +8024,7 @@

9113

PATHSEP=':'

9114

;;

9115

esac

9116

-{ $as_echo "$as_me:$LINENO: result: $os_win32" >&5

9117

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $os_win32" >&5

9118

$as_echo "$os_win32" >&6; }

9119

9120

if test "$os_win32" = "yes"; then

9121

@@ -8549,9 +8047,9 @@

9122

if test "$os_win32" = "yes"; then

9123

# Extract the first word of "lib.exe", so it can be a program name with args.

9124

set dummy lib.exe; ac_word=$2

9125

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

9126

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9127

$as_echo_n "checking for $ac_word... " >&6; }

9128

-if test "${ac_cv_prog_ms_librarian+set}" = set; then

9129

+if test "${ac_cv_prog_ms_librarian+set}" = set; then :

9130

$as_echo_n "(cached) " >&6

9131

else

9132

if test -n "$ms_librarian"; then

9133

@@ -8562,14 +8060,14 @@

9134

do

9135

IFS=$as_save_IFS

9136

test -z "$as_dir" && as_dir=.

9137

- for ac_exec_ext in '' $ac_executable_extensions; do

9138

+ for ac_exec_ext in '' $ac_executable_extensions; do

9139

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9140

ac_cv_prog_ms_librarian="yes"

9141

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9142

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9143

break 2

9144

fi

9145

done

9146

-done

9147

+ done

9148

IFS=$as_save_IFS

9149

9150

test -z "$ac_cv_prog_ms_librarian" && ac_cv_prog_ms_librarian="no"

9151

@@ -8577,10 +8075,10 @@

9152

fi

9153

ms_librarian=$ac_cv_prog_ms_librarian

9154

if test -n "$ms_librarian"; then

9155

- { $as_echo "$as_me:$LINENO: result: $ms_librarian" >&5

9156

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ms_librarian" >&5

9157

$as_echo "$ms_librarian" >&6; }

9158

else

9159

- { $as_echo "$as_me:$LINENO: result: no" >&5

9160

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9161

$as_echo "no" >&6; }

9162

fi

9163

9164

@@ -8588,9 +8086,9 @@

9165

if test -n "$ac_tool_prefix"; then

9166

# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.

9167

set dummy ${ac_tool_prefix}windres; ac_word=$2

9168

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

9169

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9170

$as_echo_n "checking for $ac_word... " >&6; }

9171

-if test "${ac_cv_prog_WINDRES+set}" = set; then

9172

+if test "${ac_cv_prog_WINDRES+set}" = set; then :

9173

$as_echo_n "(cached) " >&6

9174

else

9175

if test -n "$WINDRES"; then

9176

@@ -8601,24 +8099,24 @@

9177

do

9178

IFS=$as_save_IFS

9179

test -z "$as_dir" && as_dir=.

9180

- for ac_exec_ext in '' $ac_executable_extensions; do

9181

+ for ac_exec_ext in '' $ac_executable_extensions; do

9182

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9183

ac_cv_prog_WINDRES="${ac_tool_prefix}windres"

9184

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9185

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9186

break 2

9187

fi

9188

done

9189

-done

9190

+ done

9191

IFS=$as_save_IFS

9192

9193

fi

9194

fi

9195

WINDRES=$ac_cv_prog_WINDRES

9196

if test -n "$WINDRES"; then

9197

- { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5

9198

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5

9199

$as_echo "$WINDRES" >&6; }

9200

else

9201

- { $as_echo "$as_me:$LINENO: result: no" >&5

9202

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9203

$as_echo "no" >&6; }

9204

fi

9205

9206

@@ -8628,9 +8126,9 @@

9207

ac_ct_WINDRES=$WINDRES

9208

# Extract the first word of "windres", so it can be a program name with args.

9209

set dummy windres; ac_word=$2

9210

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

9211

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9212

$as_echo_n "checking for $ac_word... " >&6; }

9213

-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then

9214

+if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then :

9215

$as_echo_n "(cached) " >&6

9216

else

9217

if test -n "$ac_ct_WINDRES"; then

9218

@@ -8641,24 +8139,24 @@

9219

do

9220

IFS=$as_save_IFS

9221

test -z "$as_dir" && as_dir=.

9222

- for ac_exec_ext in '' $ac_executable_extensions; do

9223

+ for ac_exec_ext in '' $ac_executable_extensions; do

9224

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9225

ac_cv_prog_ac_ct_WINDRES="windres"

9226

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9227

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9228

break 2

9229

fi

9230

done

9231

-done

9232

+ done

9233

IFS=$as_save_IFS

9234

9235

fi

9236

fi

9237

ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES

9238

if test -n "$ac_ct_WINDRES"; then

9239

- { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5

9240

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5

9241

$as_echo "$ac_ct_WINDRES" >&6; }

9242

else

9243

- { $as_echo "$as_me:$LINENO: result: no" >&5

9244

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9245

$as_echo "no" >&6; }

9246

fi

9247

9248

@@ -8667,7 +8165,7 @@

9249

else

9250

case $cross_compiling:$ac_tool_warned in

9251

yes:)

9252

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

9253

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

9254

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

9255

ac_tool_warned=yes ;;

9256

esac

9257

@@ -8706,7 +8204,7 @@

9258

fi

9259

9260

# Check whether --enable-glibtest was given.

9261

-if test "${enable_glibtest+set}" = set; then

9262

+if test "${enable_glibtest+set}" = set; then :

9263

enableval=$enable_glibtest;

9264

else

9265

enable_glibtest=yes

9266

@@ -8741,9 +8239,9 @@

9267

if test -n "$ac_tool_prefix"; then

9268

# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

9269

set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

9270

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

9271

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9272

$as_echo_n "checking for $ac_word... " >&6; }

9273

-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then

9274

+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :

9275

$as_echo_n "(cached) " >&6

9276

else

9277

case $PKG_CONFIG in

9278

@@ -8756,14 +8254,14 @@

9279

do

9280

IFS=$as_save_IFS

9281

test -z "$as_dir" && as_dir=.

9282

- for ac_exec_ext in '' $ac_executable_extensions; do

9283

+ for ac_exec_ext in '' $ac_executable_extensions; do

9284

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9285

ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

9286

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9287

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9288

break 2

9289

fi

9290

done

9291

-done

9292

+ done

9293

IFS=$as_save_IFS

9294

9295

;;

9296

@@ -8771,10 +8269,10 @@

9297

fi

9298

PKG_CONFIG=$ac_cv_path_PKG_CONFIG

9299

if test -n "$PKG_CONFIG"; then

9300

- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5

9301

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5

9302

$as_echo "$PKG_CONFIG" >&6; }

9303

else

9304

- { $as_echo "$as_me:$LINENO: result: no" >&5

9305

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9306

$as_echo "no" >&6; }

9307

fi

9308

9309

@@ -8784,9 +8282,9 @@

9310

ac_pt_PKG_CONFIG=$PKG_CONFIG

9311

# Extract the first word of "pkg-config", so it can be a program name with args.

9312

set dummy pkg-config; ac_word=$2

9313

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

9314

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9315

$as_echo_n "checking for $ac_word... " >&6; }

9316

-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then

9317

+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :

9318

$as_echo_n "(cached) " >&6

9319

else

9320

case $ac_pt_PKG_CONFIG in

9321

@@ -8799,14 +8297,14 @@

9322

do

9323

IFS=$as_save_IFS

9324

test -z "$as_dir" && as_dir=.

9325

- for ac_exec_ext in '' $ac_executable_extensions; do

9326

+ for ac_exec_ext in '' $ac_executable_extensions; do

9327

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9328

ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

9329

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9330

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9331

break 2

9332

fi

9333

done

9334

-done

9335

+ done

9336

IFS=$as_save_IFS

9337

9338

;;

9339

@@ -8814,10 +8312,10 @@

9340

fi

9341

ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

9342

if test -n "$ac_pt_PKG_CONFIG"; then

9343

- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5

9344

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5

9345

$as_echo "$ac_pt_PKG_CONFIG" >&6; }

9346

else

9347

- { $as_echo "$as_me:$LINENO: result: no" >&5

9348

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9349

$as_echo "no" >&6; }

9350

fi

9351

9352

@@ -8826,7 +8324,7 @@

9353

else

9354

case $cross_compiling:$ac_tool_warned in

9355

yes:)

9356

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

9357

+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

9358

$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

9359

ac_tool_warned=yes ;;

9360

esac

9361

@@ -8839,13 +8337,13 @@

9362

fi

9363

if test -n "$PKG_CONFIG"; then

9364

_pkg_min_version=0.16

9365

- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5

9366

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5

9367

$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }

9368

if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

9369

- { $as_echo "$as_me:$LINENO: result: yes" >&5

9370

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

9371

$as_echo "yes" >&6; }

9372

else

9373

- { $as_echo "$as_me:$LINENO: result: no" >&5

9374

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9375

$as_echo "no" >&6; }

9376

PKG_CONFIG=""

9377

fi

9378

@@ -8860,7 +8358,7 @@

9379

fi

9380

9381

min_glib_version=2.4.0

9382

- { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5

9383

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5

9384

$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }

9385

9386

if test x$PKG_CONFIG != xno ; then

9387

@@ -8896,14 +8394,10 @@

9388

CFLAGS="$CFLAGS $GLIB_CFLAGS"

9389

LIBS="$GLIB_LIBS $LIBS"

9390

rm -f conf.glibtest

9391

- if test "$cross_compiling" = yes; then

9392

+ if test "$cross_compiling" = yes; then :

9393

echo $ac_n "cross compiling; assumed OK... $ac_c"

9394

else

9395

- cat >conftest.$ac_ext <<_ACEOF

9396

-/* confdefs.h. */

9397

-_ACEOF

9398

-cat confdefs.h >>conftest.$ac_ext

9399

-cat >>conftest.$ac_ext <<_ACEOF

9400

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9401

/* end confdefs.h. */

9402

9403

#include <glib.h>

9404

@@ -8915,8 +8409,9 @@

9405

{

9406

int major, minor, micro;

9407

char *tmp_version;

9408

+ int ignored;

9409

9410

- system ("touch conf.glibtest");

9411

+ ignored = system ("touch conf.glibtest");

9412

9413

/* HP/UX 9 (%@#!) writes to sscanf strings */

9414

tmp_version = g_strdup("$min_glib_version");

9415

@@ -8978,52 +8473,25 @@

9416

}

9417

9418

_ACEOF

9419

-rm -f conftest$ac_exeext

9420

-if { (ac_try="$ac_link"

9421

-case "(($ac_try" in

9422

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9423

- *) ac_try_echo=$ac_try;;

9424

-esac

9425

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9426

-$as_echo "$ac_try_echo") >&5

9427

- (eval "$ac_link") 2>&5

9428

- ac_status=$?

9429

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9430

- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

9431

- { (case "(($ac_try" in

9432

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9433

- *) ac_try_echo=$ac_try;;

9434

-esac

9435

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9436

-$as_echo "$ac_try_echo") >&5

9437

- (eval "$ac_try") 2>&5

9438

- ac_status=$?

9439

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9440

- (exit $ac_status); }; }; then

9441

- :

9442

-else

9443

- $as_echo "$as_me: program exited with status $ac_status" >&5

9444

-$as_echo "$as_me: failed program was:" >&5

9445

-sed 's/^/| /' conftest.$ac_ext >&5

9446

+if ac_fn_c_try_run "$LINENO"; then :

9447

9448

-( exit $ac_status )

9449

-no_glib=yes

9450

+else

9451

+ no_glib=yes

9452

fi

9453

-rm -rf conftest.dSYM

9454

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

9455

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

9456

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

9457

fi

9458

9459

-

9460

CFLAGS="$ac_save_CFLAGS"

9461

LIBS="$ac_save_LIBS"

9462

fi

9463

fi

9464

if test "x$no_glib" = x ; then

9465

- { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5

9466

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5

9467

$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }

9468

:

9469

else

9470

- { $as_echo "$as_me:$LINENO: result: no" >&5

9471

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9472

$as_echo "no" >&6; }

9473

if test "$PKG_CONFIG" = "no" ; then

9474

echo "*** A new enough version of pkg-config was not found."

9475

@@ -9037,11 +8505,7 @@

9476

ac_save_LIBS="$LIBS"

9477

CFLAGS="$CFLAGS $GLIB_CFLAGS"

9478

LIBS="$LIBS $GLIB_LIBS"

9479

- cat >conftest.$ac_ext <<_ACEOF

9480

-/* confdefs.h. */

9481

-_ACEOF

9482

-cat confdefs.h >>conftest.$ac_ext

9483

-cat >>conftest.$ac_ext <<_ACEOF

9484

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9485

/* end confdefs.h. */

9486

9487

#include <glib.h>

9488

@@ -9055,27 +8519,7 @@

9489

return 0;

9490

}

9491

_ACEOF

9492

-rm -f conftest.$ac_objext conftest$ac_exeext

9493

-if { (ac_try="$ac_link"

9494

-case "(($ac_try" in

9495

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9496

- *) ac_try_echo=$ac_try;;

9497

-esac

9498

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9499

-$as_echo "$ac_try_echo") >&5

9500

- (eval "$ac_link") 2>conftest.er1

9501

- ac_status=$?

9502

- grep -v '^ *+' conftest.er1 >conftest.err

9503

- rm -f conftest.er1

9504

- cat conftest.err >&5

9505

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9506

- (exit $ac_status); } && {

9507

- test -z "$ac_c_werror_flag" ||

9508

- test ! -s conftest.err

9509

- } && test -s conftest$ac_exeext && {

9510

- test "$cross_compiling" = yes ||

9511

- $as_test_x conftest$ac_exeext

9512

- }; then

9513

+if ac_fn_c_try_link "$LINENO"; then :

9514

echo "*** The test program compiled, but did not run. This usually means"

9515

echo "*** that the run-time linker is not finding GLIB or finding the wrong"

9516

echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"

9517

@@ -9086,16 +8530,11 @@

9518

echo "*** If you have an old version installed, it is best to remove it, although"

9519

echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"

9520

else

9521

- $as_echo "$as_me: failed program was:" >&5

9522

-sed 's/^/| /' conftest.$ac_ext >&5

9523

-

9524

- echo "*** The test program failed to compile or link. See the file config.log for the"

9525

+ echo "*** The test program failed to compile or link. See the file config.log for the"

9526

echo "*** exact error that occured. This usually means GLIB is incorrectly installed."

9527

fi

9528

-

9529

-rm -rf conftest.dSYM

9530

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9531

- conftest$ac_exeext conftest.$ac_ext

9532

+rm -f core conftest.err conftest.$ac_objext \

9533

+ conftest$ac_exeext conftest.$ac_ext

9534

CFLAGS="$ac_save_CFLAGS"

9535

LIBS="$ac_save_LIBS"

9536

fi

9537

@@ -9105,9 +8544,7 @@

9538

GLIB_GENMARSHAL=""

9539

GOBJECT_QUERY=""

9540

GLIB_MKENUMS=""

9541

- { { $as_echo "$as_me:$LINENO: error: GLIB >= 2.4.0 not installed." >&5

9542

-$as_echo "$as_me: error: GLIB >= 2.4.0 not installed." >&2;}

9543

- { (exit 1); exit 1; }; }

9544

+ as_fn_error "GLIB >= 2.4.0 not installed." "$LINENO" 5

9545

fi

9546

9547

9548

@@ -9117,7 +8554,7 @@

9549

rm -f conf.glibtest

9550

9551

# Check whether --enable-gtktest was given.

9552

-if test "${enable_gtktest+set}" = set; then

9553

+if test "${enable_gtktest+set}" = set; then :

9554

enableval=$enable_gtktest;

9555

else

9556

enable_gtktest=yes

9557

@@ -9138,9 +8575,9 @@

9558

9559

# Extract the first word of "pkg-config", so it can be a program name with args.

9560

set dummy pkg-config; ac_word=$2

9561

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

9562

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9563

$as_echo_n "checking for $ac_word... " >&6; }

9564

-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then

9565

+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :

9566

$as_echo_n "(cached) " >&6

9567

else

9568

case $PKG_CONFIG in

9569

@@ -9153,14 +8590,14 @@

9570

do

9571

IFS=$as_save_IFS

9572

test -z "$as_dir" && as_dir=.

9573

- for ac_exec_ext in '' $ac_executable_extensions; do

9574

+ for ac_exec_ext in '' $ac_executable_extensions; do

9575

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9576

ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

9577

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9578

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9579

break 2

9580

fi

9581

done

9582

-done

9583

+ done

9584

IFS=$as_save_IFS

9585

9586

test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"

9587

@@ -9169,10 +8606,10 @@

9588

fi

9589

PKG_CONFIG=$ac_cv_path_PKG_CONFIG

9590

if test -n "$PKG_CONFIG"; then

9591

- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5

9592

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5

9593

$as_echo "$PKG_CONFIG" >&6; }

9594

else

9595

- { $as_echo "$as_me:$LINENO: result: no" >&5

9596

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9597

$as_echo "no" >&6; }

9598

fi

9599

9600

@@ -9191,7 +8628,7 @@

9601

fi

9602

9603

min_gtk_version=2.4.0

9604

- { $as_echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5

9605

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5

9606

$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }

9607

9608

if test x$PKG_CONFIG != xno ; then

9609

@@ -9223,14 +8660,10 @@

9610

CFLAGS="$CFLAGS $GTK_CFLAGS"

9611

LIBS="$GTK_LIBS $LIBS"

9612

rm -f conf.gtktest

9613

- if test "$cross_compiling" = yes; then

9614

+ if test "$cross_compiling" = yes; then :

9615

echo $ac_n "cross compiling; assumed OK... $ac_c"

9616

else

9617

- cat >conftest.$ac_ext <<_ACEOF

9618

-/* confdefs.h. */

9619

-_ACEOF

9620

-cat confdefs.h >>conftest.$ac_ext

9621

-cat >>conftest.$ac_ext <<_ACEOF

9622

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9623

/* end confdefs.h. */

9624

9625

#include <gtk/gtk.h>

9626

@@ -9305,52 +8738,25 @@

9627

}

9628

9629

_ACEOF

9630

-rm -f conftest$ac_exeext

9631

-if { (ac_try="$ac_link"

9632

-case "(($ac_try" in

9633

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9634

- *) ac_try_echo=$ac_try;;

9635

-esac

9636

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9637

-$as_echo "$ac_try_echo") >&5

9638

- (eval "$ac_link") 2>&5

9639

- ac_status=$?

9640

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9641

- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

9642

- { (case "(($ac_try" in

9643

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9644

- *) ac_try_echo=$ac_try;;

9645

-esac

9646

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9647

-$as_echo "$ac_try_echo") >&5

9648

- (eval "$ac_try") 2>&5

9649

- ac_status=$?

9650

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9651

- (exit $ac_status); }; }; then

9652

- :

9653

-else

9654

- $as_echo "$as_me: program exited with status $ac_status" >&5

9655

-$as_echo "$as_me: failed program was:" >&5

9656

-sed 's/^/| /' conftest.$ac_ext >&5

9657

+if ac_fn_c_try_run "$LINENO"; then :

9658

9659

-( exit $ac_status )

9660

-no_gtk=yes

9661

+else

9662

+ no_gtk=yes

9663

fi

9664

-rm -rf conftest.dSYM

9665

-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

9666

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

9667

+ conftest.$ac_objext conftest.beam conftest.$ac_ext

9668

fi

9669

9670

-

9671

CFLAGS="$ac_save_CFLAGS"

9672

LIBS="$ac_save_LIBS"

9673

fi

9674

fi

9675

if test "x$no_gtk" = x ; then

9676

- { $as_echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5

9677

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5

9678

$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }

9679

:

9680

else

9681

- { $as_echo "$as_me:$LINENO: result: no" >&5

9682

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9683

$as_echo "no" >&6; }

9684

if test "$PKG_CONFIG" = "no" ; then

9685

echo "*** A new enough version of pkg-config was not found."

9686

@@ -9364,11 +8770,7 @@

9687

ac_save_LIBS="$LIBS"

9688

CFLAGS="$CFLAGS $GTK_CFLAGS"

9689

LIBS="$LIBS $GTK_LIBS"

9690

- cat >conftest.$ac_ext <<_ACEOF

9691

-/* confdefs.h. */

9692

-_ACEOF

9693

-cat confdefs.h >>conftest.$ac_ext

9694

-cat >>conftest.$ac_ext <<_ACEOF

9695

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9696

/* end confdefs.h. */

9697

9698

#include <gtk/gtk.h>

9699

@@ -9382,27 +8784,7 @@

9700

return 0;

9701

}

9702

_ACEOF

9703

-rm -f conftest.$ac_objext conftest$ac_exeext

9704

-if { (ac_try="$ac_link"

9705

-case "(($ac_try" in

9706

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9707

- *) ac_try_echo=$ac_try;;

9708

-esac

9709

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9710

-$as_echo "$ac_try_echo") >&5

9711

- (eval "$ac_link") 2>conftest.er1

9712

- ac_status=$?

9713

- grep -v '^ *+' conftest.er1 >conftest.err

9714

- rm -f conftest.er1

9715

- cat conftest.err >&5

9716

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9717

- (exit $ac_status); } && {

9718

- test -z "$ac_c_werror_flag" ||

9719

- test ! -s conftest.err

9720

- } && test -s conftest$ac_exeext && {

9721

- test "$cross_compiling" = yes ||

9722

- $as_test_x conftest$ac_exeext

9723

- }; then

9724

+if ac_fn_c_try_link "$LINENO"; then :

9725

echo "*** The test program compiled, but did not run. This usually means"

9726

echo "*** that the run-time linker is not finding GTK+ or finding the wrong"

9727

echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"

9728

@@ -9413,25 +8795,18 @@

9729

echo "*** If you have an old version installed, it is best to remove it, although"

9730

echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"

9731

else

9732

- $as_echo "$as_me: failed program was:" >&5

9733

-sed 's/^/| /' conftest.$ac_ext >&5

9734

-

9735

- echo "*** The test program failed to compile or link. See the file config.log for the"

9736

+ echo "*** The test program failed to compile or link. See the file config.log for the"

9737

echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."

9738

fi

9739

-

9740

-rm -rf conftest.dSYM

9741

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9742

- conftest$ac_exeext conftest.$ac_ext

9743

+rm -f core conftest.err conftest.$ac_objext \

9744

+ conftest$ac_exeext conftest.$ac_ext

9745

CFLAGS="$ac_save_CFLAGS"

9746

LIBS="$ac_save_LIBS"

9747

fi

9748

fi

9749

GTK_CFLAGS=""

9750

GTK_LIBS=""

9751

- { { $as_echo "$as_me:$LINENO: error: GTK+ >= 2.4.0 not installed." >&5

9752

-$as_echo "$as_me: error: GTK+ >= 2.4.0 not installed." >&2;}

9753

- { (exit 1); exit 1; }; }

9754

+ as_fn_error "GTK+ >= 2.4.0 not installed." "$LINENO" 5

9755

fi

9756

9757

9758

@@ -9440,7 +8815,7 @@

9759

9760

threads="auto"

9761

# Check whether --enable-threads was given.

9762

-if test "${enable_threads+set}" = set; then

9763

+if test "${enable_threads+set}" = set; then :

9764

enableval=$enable_threads; threads="${enableval}"

9765

fi

9766

9767

@@ -9449,40 +8824,44 @@

9768

if test "x${threads}" != "xno" ; then

9769

9770

pkg_failed=no

9771

-{ $as_echo "$as_me:$LINENO: checking for GTHREAD" >&5

9772

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTHREAD" >&5

9773

$as_echo_n "checking for GTHREAD... " >&6; }

9774

9775

-if test -n "$GTHREAD_CFLAGS"; then

9776

- pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"

9777

- elif test -n "$PKG_CONFIG"; then

9778

- if test -n "$PKG_CONFIG" && \

9779

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5

9780

+if test -n "$PKG_CONFIG"; then

9781

+ if test -n "$GTHREAD_CFLAGS"; then

9782

+ pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"

9783

+ else

9784

+ if test -n "$PKG_CONFIG" && \

9785

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5

9786

($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5

9787

ac_status=$?

9788

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9789

- (exit $ac_status); }; then

9790

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

9791

+ test $ac_status = 0; }; then

9792

pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null`

9793

else

9794

pkg_failed=yes

9795

fi

9796

- else

9797

- pkg_failed=untried

9798

+ fi

9799

+else

9800

+ pkg_failed=untried

9801

fi

9802

-if test -n "$GTHREAD_LIBS"; then

9803

- pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"

9804

- elif test -n "$PKG_CONFIG"; then

9805

- if test -n "$PKG_CONFIG" && \

9806

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\"") >&5

9807

+if test -n "$PKG_CONFIG"; then

9808

+ if test -n "$GTHREAD_LIBS"; then

9809

+ pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"

9810

+ else

9811

+ if test -n "$PKG_CONFIG" && \

9812

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5

9813

($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5

9814

ac_status=$?

9815

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9816

- (exit $ac_status); }; then

9817

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

9818

+ test $ac_status = 0; }; then

9819

pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null`

9820

else

9821

pkg_failed=yes

9822

fi

9823

- else

9824

- pkg_failed=untried

9825

+ fi

9826

+else

9827

+ pkg_failed=untried

9828

fi

9829

9830

9831

@@ -9495,24 +8874,24 @@

9832

_pkg_short_errors_supported=no

9833

fi

9834

if test $_pkg_short_errors_supported = yes; then

9835

- GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gthread-2.0" 2>&1`

9836

+ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0"`

9837

else

9838

- GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0" 2>&1`

9839

+ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0"`

9840

fi

9841

# Put the nasty error message in config.log where it belongs

9842

echo "$GTHREAD_PKG_ERRORS" >&5

9843

9844

- { $as_echo "$as_me:$LINENO: result: no" >&5

9845

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9846

$as_echo "no" >&6; }

9847

- { $as_echo "$as_me:$LINENO: WARNING: \"No thread support in glib\"" >&5

9848

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"No thread support in glib\"" >&5

9849

$as_echo "$as_me: WARNING: \"No thread support in glib\"" >&2;}

9850

elif test $pkg_failed = untried; then

9851

- { $as_echo "$as_me:$LINENO: WARNING: \"No thread support in glib\"" >&5

9852

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"No thread support in glib\"" >&5

9853

$as_echo "$as_me: WARNING: \"No thread support in glib\"" >&2;}

9854

else

9855

GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS

9856

GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS

9857

- { $as_echo "$as_me:$LINENO: result: yes" >&5

9858

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

9859

$as_echo "yes" >&6; }

9860

have_gthread="yes"

9861

fi

9862

@@ -9520,9 +8899,7 @@

9863

9864

if test "x$have_gthread" != "xno"; then

9865

9866

-cat >>confdefs.h <<\_ACEOF

9867

-#define HAVE_GTHREAD 1

9868

-_ACEOF

9869

+$as_echo "#define HAVE_GTHREAD 1" >>confdefs.h

9870

9871

GLIB_CFLAGS="$GTHREAD_CFLAGS"

9872

GLIB_LIBS="$GTHREAD_LIBS"

9873

@@ -9533,9 +8910,9 @@

9874

do

9875

# Extract the first word of "$ac_prog", so it can be a program name with args.

9876

set dummy $ac_prog; ac_word=$2

9877

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

9878

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9879

$as_echo_n "checking for $ac_word... " >&6; }

9880

-if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then

9881

+if test "${ac_cv_path_GDK_PIXBUF_CSOURCE+set}" = set; then :

9882

$as_echo_n "(cached) " >&6

9883

else

9884

case $GDK_PIXBUF_CSOURCE in

9885

@@ -9548,14 +8925,14 @@

9886

do

9887

IFS=$as_save_IFS

9888

test -z "$as_dir" && as_dir=.

9889

- for ac_exec_ext in '' $ac_executable_extensions; do

9890

+ for ac_exec_ext in '' $ac_executable_extensions; do

9891

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9892

ac_cv_path_GDK_PIXBUF_CSOURCE="$as_dir/$ac_word$ac_exec_ext"

9893

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9894

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9895

break 2

9896

fi

9897

done

9898

-done

9899

+ done

9900

IFS=$as_save_IFS

9901

9902

;;

9903

@@ -9563,10 +8940,10 @@

9904

fi

9905

GDK_PIXBUF_CSOURCE=$ac_cv_path_GDK_PIXBUF_CSOURCE

9906

if test -n "$GDK_PIXBUF_CSOURCE"; then

9907

- { $as_echo "$as_me:$LINENO: result: $GDK_PIXBUF_CSOURCE" >&5

9908

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDK_PIXBUF_CSOURCE" >&5

9909

$as_echo "$GDK_PIXBUF_CSOURCE" >&6; }

9910

else

9911

- { $as_echo "$as_me:$LINENO: result: no" >&5

9912

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9913

$as_echo "no" >&6; }

9914

fi

9915

9916

@@ -9576,9 +8953,9 @@

9917

9918

# Extract the first word of "glib-genmarshal", so it can be a program name with args.

9919

set dummy glib-genmarshal; ac_word=$2

9920

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

9921

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

9922

$as_echo_n "checking for $ac_word... " >&6; }

9923

-if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then

9924

+if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then :

9925

$as_echo_n "(cached) " >&6

9926

else

9927

case $GLIB_GENMARSHAL in

9928

@@ -9591,14 +8968,14 @@

9929

do

9930

IFS=$as_save_IFS

9931

test -z "$as_dir" && as_dir=.

9932

- for ac_exec_ext in '' $ac_executable_extensions; do

9933

+ for ac_exec_ext in '' $ac_executable_extensions; do

9934

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9935

ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"

9936

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9937

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

9938

break 2

9939

fi

9940

done

9941

-done

9942

+ done

9943

IFS=$as_save_IFS

9944

9945

;;

9946

@@ -9606,10 +8983,10 @@

9947

fi

9948

GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL

9949

if test -n "$GLIB_GENMARSHAL"; then

9950

- { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5

9951

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5

9952

$as_echo "$GLIB_GENMARSHAL" >&6; }

9953

else

9954

- { $as_echo "$as_me:$LINENO: result: no" >&5

9955

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9956

$as_echo "no" >&6; }

9957

fi

9958

9959

@@ -9617,7 +8994,7 @@

9960

9961

9962

# Check whether --with-readmedir was given.

9963

-if test "${with_readmedir+set}" = set; then

9964

+if test "${with_readmedir+set}" = set; then :

9965

withval=$with_readmedir; readmedir=$withval

9966

else

9967

readmedir="$prefix/share/doc/geeqie-$VERSION"

9968

@@ -9625,7 +9002,7 @@

9969

9970

9971

# Check whether --with-htmldir was given.

9972

-if test "${with_htmldir+set}" = set; then

9973

+if test "${with_htmldir+set}" = set; then :

9974

withval=$with_htmldir; htmldir=$withval

9975

else

9976

htmldir="$readmedir/html"

9977

@@ -9665,23 +9042,23 @@

9978

# LIRC support

9979

# ----------------------------------------------------------------------

9980

9981

-{ $as_echo "$as_me:$LINENO: checking if LIRC support is enabled" >&5

9982

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if LIRC support is enabled" >&5

9983

$as_echo_n "checking if LIRC support is enabled... " >&6; }

9984

lirc=no

9985

# Check whether --enable-lirc was given.

9986

-if test "${enable_lirc+set}" = set; then

9987

+if test "${enable_lirc+set}" = set; then :

9988

enableval=$enable_lirc;

9989

if test "x${enableval}" = "xyes" -a "x$GCC" = "xyes"; then

9990

- { $as_echo "$as_me:$LINENO: result: yes" >&5

9991

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

9992

$as_echo "yes" >&6; }

9993

lirc=yes

9994

else

9995

- { $as_echo "$as_me:$LINENO: result: no" >&5

9996

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

9997

$as_echo "no" >&6; }

9998

lirc=no

9999

fi

10000

else

10001

- { $as_echo "$as_me:$LINENO: result: no" >&5

10002

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10003

$as_echo "no" >&6; }

10004

fi

10005

10006

@@ -9689,7 +9066,7 @@

10007

10008

10009

# Check whether --with-lirc-prefix was given.

10010

-if test "${with_lirc_prefix+set}" = set; then

10011

+if test "${with_lirc_prefix+set}" = set; then :

10012

withval=$with_lirc_prefix;

10013

for dir in `echo "$withval" | tr : ' '`; do

10014

if test -d $dir/lib; then CXXFLAGS="$CXXFLAGS -L$dir/lib"; fi

10015

@@ -9702,69 +9079,14 @@

10016

HAVE_LIRC=no

10017

if test "x${lirc}" != "xno" ; then

10018

# On IRIX 5.3, sys/types and inttypes.h are conflicting.

10019

-

10020

-

10021

-

10022

-

10023

-

10024

-

10025

-

10026

-

10027

-

10028

for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

10029

inttypes.h stdint.h unistd.h

10030

-do

10031

-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

10032

-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

10033

-$as_echo_n "checking for $ac_header... " >&6; }

10034

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

10035

- $as_echo_n "(cached) " >&6

10036

-else

10037

- cat >conftest.$ac_ext <<_ACEOF

10038

-/* confdefs.h. */

10039

-_ACEOF

10040

-cat confdefs.h >>conftest.$ac_ext

10041

-cat >>conftest.$ac_ext <<_ACEOF

10042

-/* end confdefs.h. */

10043

-$ac_includes_default

10044

-

10045

-#include <$ac_header>

10046

-_ACEOF

10047

-rm -f conftest.$ac_objext

10048

-if { (ac_try="$ac_compile"

10049

-case "(($ac_try" in

10050

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10051

- *) ac_try_echo=$ac_try;;

10052

-esac

10053

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10054

-$as_echo "$ac_try_echo") >&5

10055

- (eval "$ac_compile") 2>conftest.er1

10056

- ac_status=$?

10057

- grep -v '^ *+' conftest.er1 >conftest.err

10058

- rm -f conftest.er1

10059

- cat conftest.err >&5

10060

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10061

- (exit $ac_status); } && {

10062

- test -z "$ac_c_werror_flag" ||

10063

- test ! -s conftest.err

10064

- } && test -s conftest.$ac_objext; then

10065

- eval "$as_ac_Header=yes"

10066

-else

10067

- $as_echo "$as_me: failed program was:" >&5

10068

-sed 's/^/| /' conftest.$ac_ext >&5

10069

-

10070

- eval "$as_ac_Header=no"

10071

-fi

10072

-

10073

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

10074

-fi

10075

-ac_res=`eval 'as_val=${'$as_ac_Header'}

10076

- $as_echo "$as_val"'`

10077

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

10078

-$as_echo "$ac_res" >&6; }

10079

-as_val=`eval 'as_val=${'$as_ac_Header'}

10080

- $as_echo "$as_val"'`

10081

- if test "x$as_val" = x""yes; then

10082

+do :

10083

+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

10084

+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default

10085

+"

10086

+eval as_val=\$$as_ac_Header

10087

+ if test "x$as_val" = x""yes; then :

10088

cat >>confdefs.h <<_ACEOF

10089

#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

10090

_ACEOF

10091

@@ -9774,151 +9096,16 @@

10092

done

10093

10094

10095

-if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then

10096

- { $as_echo "$as_me:$LINENO: checking for lirc/lirc_client.h" >&5

10097

-$as_echo_n "checking for lirc/lirc_client.h... " >&6; }

10098

-if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then

10099

- $as_echo_n "(cached) " >&6

10100

-fi

10101

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5

10102

-$as_echo "$ac_cv_header_lirc_lirc_client_h" >&6; }

10103

-else

10104

- # Is the header compilable?

10105

-{ $as_echo "$as_me:$LINENO: checking lirc/lirc_client.h usability" >&5

10106

-$as_echo_n "checking lirc/lirc_client.h usability... " >&6; }

10107

-cat >conftest.$ac_ext <<_ACEOF

10108

-/* confdefs.h. */

10109

-_ACEOF

10110

-cat confdefs.h >>conftest.$ac_ext

10111

-cat >>conftest.$ac_ext <<_ACEOF

10112

-/* end confdefs.h. */

10113

-$ac_includes_default

10114

-#include <lirc/lirc_client.h>

10115

-_ACEOF

10116

-rm -f conftest.$ac_objext

10117

-if { (ac_try="$ac_compile"

10118

-case "(($ac_try" in

10119

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10120

- *) ac_try_echo=$ac_try;;

10121

-esac

10122

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10123

-$as_echo "$ac_try_echo") >&5

10124

- (eval "$ac_compile") 2>conftest.er1

10125

- ac_status=$?

10126

- grep -v '^ *+' conftest.er1 >conftest.err

10127

- rm -f conftest.er1

10128

- cat conftest.err >&5

10129

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10130

- (exit $ac_status); } && {

10131

- test -z "$ac_c_werror_flag" ||

10132

- test ! -s conftest.err

10133

- } && test -s conftest.$ac_objext; then

10134

- ac_header_compiler=yes

10135

-else

10136

- $as_echo "$as_me: failed program was:" >&5

10137

-sed 's/^/| /' conftest.$ac_ext >&5

10138

-

10139

- ac_header_compiler=no

10140

-fi

10141

-

10142

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

10143

-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

10144

-$as_echo "$ac_header_compiler" >&6; }

10145

-

10146

-# Is the header present?

10147

-{ $as_echo "$as_me:$LINENO: checking lirc/lirc_client.h presence" >&5

10148

-$as_echo_n "checking lirc/lirc_client.h presence... " >&6; }

10149

-cat >conftest.$ac_ext <<_ACEOF

10150

-/* confdefs.h. */

10151

-_ACEOF

10152

-cat confdefs.h >>conftest.$ac_ext

10153

-cat >>conftest.$ac_ext <<_ACEOF

10154

-/* end confdefs.h. */

10155

-#include <lirc/lirc_client.h>

10156

-_ACEOF

10157

-if { (ac_try="$ac_cpp conftest.$ac_ext"

10158

-case "(($ac_try" in

10159

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10160

- *) ac_try_echo=$ac_try;;

10161

-esac

10162

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10163

-$as_echo "$ac_try_echo") >&5

10164

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

10165

- ac_status=$?

10166

- grep -v '^ *+' conftest.er1 >conftest.err

10167

- rm -f conftest.er1

10168

- cat conftest.err >&5

10169

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10170

- (exit $ac_status); } >/dev/null && {

10171

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

10172

- test ! -s conftest.err

10173

- }; then

10174

- ac_header_preproc=yes

10175

-else

10176

- $as_echo "$as_me: failed program was:" >&5

10177

-sed 's/^/| /' conftest.$ac_ext >&5

10178

-

10179

- ac_header_preproc=no

10180

-fi

10181

-

10182

-rm -f conftest.err conftest.$ac_ext

10183

-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

10184

-$as_echo "$ac_header_preproc" >&6; }

10185

-

10186

-# So? What about this header?

10187

-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

10188

- yes:no: )

10189

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&5

10190

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

10191

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the compiler's result" >&5

10192

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the compiler's result" >&2;}

10193

- ac_header_preproc=yes

10194

- ;;

10195

- no:yes:* )

10196

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&5

10197

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&2;}

10198

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: check for missing prerequisite headers?" >&5

10199

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: check for missing prerequisite headers?" >&2;}

10200

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: see the Autoconf documentation" >&5

10201

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: see the Autoconf documentation" >&2;}

10202

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: section \"Present But Cannot Be Compiled\"" >&5

10203

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: section \"Present But Cannot Be Compiled\"" >&2;}

10204

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&5

10205

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&2;}

10206

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: in the future, the compiler will take precedence" >&5

10207

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: in the future, the compiler will take precedence" >&2;}

10208

- ( cat <<\_ASBOX

10209

-## ------------------------------------------------- ##

10210

-## Report this to geeqie-devel@lists.sourceforge.net ##

10211

-## ------------------------------------------------- ##

10212

-_ASBOX

10213

- ) | sed "s/^/$as_me: WARNING: /" >&2

10214

- ;;

10215

-esac

10216

-{ $as_echo "$as_me:$LINENO: checking for lirc/lirc_client.h" >&5

10217

-$as_echo_n "checking for lirc/lirc_client.h... " >&6; }

10218

-if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then

10219

- $as_echo_n "(cached) " >&6

10220

-else

10221

- ac_cv_header_lirc_lirc_client_h=$ac_header_preproc

10222

-fi

10223

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5

10224

-$as_echo "$ac_cv_header_lirc_lirc_client_h" >&6; }

10225

-

10226

-fi

10227

-if test "x$ac_cv_header_lirc_lirc_client_h" = x""yes; then

10228

- { $as_echo "$as_me:$LINENO: checking for lirc_init in -llirc_client" >&5

10229

+ac_fn_c_check_header_mongrel "$LINENO" "lirc/lirc_client.h" "ac_cv_header_lirc_lirc_client_h" "$ac_includes_default"

10230

+if test "x$ac_cv_header_lirc_lirc_client_h" = x""yes; then :

10231

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lirc_init in -llirc_client" >&5

10232

$as_echo_n "checking for lirc_init in -llirc_client... " >&6; }

10233

-if test "${ac_cv_lib_lirc_client_lirc_init+set}" = set; then

10234

+if test "${ac_cv_lib_lirc_client_lirc_init+set}" = set; then :

10235

$as_echo_n "(cached) " >&6

10236

else

10237

ac_check_lib_save_LIBS=$LIBS

10238

LIBS="-llirc_client $LIBS"

10239

-cat >conftest.$ac_ext <<_ACEOF

10240

-/* confdefs.h. */

10241

-_ACEOF

10242

-cat confdefs.h >>conftest.$ac_ext

10243

-cat >>conftest.$ac_ext <<_ACEOF

10244

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

10245

/* end confdefs.h. */

10246

10247

/* Override any GCC internal prototype to avoid an error.

10248

@@ -9936,47 +9123,20 @@

10249

return 0;

10250

}

10251

_ACEOF

10252

-rm -f conftest.$ac_objext conftest$ac_exeext

10253

-if { (ac_try="$ac_link"

10254

-case "(($ac_try" in

10255

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10256

- *) ac_try_echo=$ac_try;;

10257

-esac

10258

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10259

-$as_echo "$ac_try_echo") >&5

10260

- (eval "$ac_link") 2>conftest.er1

10261

- ac_status=$?

10262

- grep -v '^ *+' conftest.er1 >conftest.err

10263

- rm -f conftest.er1

10264

- cat conftest.err >&5

10265

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10266

- (exit $ac_status); } && {

10267

- test -z "$ac_c_werror_flag" ||

10268

- test ! -s conftest.err

10269

- } && test -s conftest$ac_exeext && {

10270

- test "$cross_compiling" = yes ||

10271

- $as_test_x conftest$ac_exeext

10272

- }; then

10273

+if ac_fn_c_try_link "$LINENO"; then :

10274

ac_cv_lib_lirc_client_lirc_init=yes

10275

else

10276

- $as_echo "$as_me: failed program was:" >&5

10277

-sed 's/^/| /' conftest.$ac_ext >&5

10278

-

10279

- ac_cv_lib_lirc_client_lirc_init=no

10280

+ ac_cv_lib_lirc_client_lirc_init=no

10281

fi

10282

-

10283

-rm -rf conftest.dSYM

10284

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10285

- conftest$ac_exeext conftest.$ac_ext

10286

+rm -f core conftest.err conftest.$ac_objext \

10287

+ conftest$ac_exeext conftest.$ac_ext

10288

LIBS=$ac_check_lib_save_LIBS

10289

fi

10290

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lirc_client_lirc_init" >&5

10291

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lirc_client_lirc_init" >&5

10292

$as_echo "$ac_cv_lib_lirc_client_lirc_init" >&6; }

10293

-if test "x$ac_cv_lib_lirc_client_lirc_init" = x""yes; then

10294

+if test "x$ac_cv_lib_lirc_client_lirc_init" = x""yes; then :

10295

HAVE_LIRC=yes;LIBS=-llirc_client $LIBS;

10296

-cat >>confdefs.h <<\_ACEOF

10297

-#define HAVE_LIRC /**/

10298

-_ACEOF

10299

+$as_echo "#define HAVE_LIRC /**/" >>confdefs.h

10300

10301

fi

10302

10303

@@ -9998,7 +9158,7 @@

10304

# ----------------------------------------------------------------------

10305

10306

# Check whether --enable-lcms was given.

10307

-if test "${enable_lcms+set}" = set; then

10308

+if test "${enable_lcms+set}" = set; then :

10309

enableval=$enable_lcms; liblcms=$enableval

10310

else

10311

liblcms=auto

10312

@@ -10008,40 +9168,44 @@

10313

if test "x${liblcms}" != "xno"; then

10314

10315

pkg_failed=no

10316

-{ $as_echo "$as_me:$LINENO: checking for LCMS" >&5

10317

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS" >&5

10318

$as_echo_n "checking for LCMS... " >&6; }

10319

10320

-if test -n "$LCMS_CFLAGS"; then

10321

- pkg_cv_LCMS_CFLAGS="$LCMS_CFLAGS"

10322

- elif test -n "$PKG_CONFIG"; then

10323

- if test -n "$PKG_CONFIG" && \

10324

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"lcms >= 1.14\"") >&5

10325

+if test -n "$PKG_CONFIG"; then

10326

+ if test -n "$LCMS_CFLAGS"; then

10327

+ pkg_cv_LCMS_CFLAGS="$LCMS_CFLAGS"

10328

+ else

10329

+ if test -n "$PKG_CONFIG" && \

10330

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms >= 1.14\""; } >&5

10331

($PKG_CONFIG --exists --print-errors "lcms >= 1.14") 2>&5

10332

ac_status=$?

10333

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10334

- (exit $ac_status); }; then

10335

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

10336

+ test $ac_status = 0; }; then

10337

pkg_cv_LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms >= 1.14" 2>/dev/null`

10338

else

10339

pkg_failed=yes

10340

fi

10341

- else

10342

- pkg_failed=untried

10343

+ fi

10344

+else

10345

+ pkg_failed=untried

10346

fi

10347

-if test -n "$LCMS_LIBS"; then

10348

- pkg_cv_LCMS_LIBS="$LCMS_LIBS"

10349

- elif test -n "$PKG_CONFIG"; then

10350

- if test -n "$PKG_CONFIG" && \

10351

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"lcms >= 1.14\"") >&5

10352

+if test -n "$PKG_CONFIG"; then

10353

+ if test -n "$LCMS_LIBS"; then

10354

+ pkg_cv_LCMS_LIBS="$LCMS_LIBS"

10355

+ else

10356

+ if test -n "$PKG_CONFIG" && \

10357

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms >= 1.14\""; } >&5

10358

($PKG_CONFIG --exists --print-errors "lcms >= 1.14") 2>&5

10359

ac_status=$?

10360

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10361

- (exit $ac_status); }; then

10362

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

10363

+ test $ac_status = 0; }; then

10364

pkg_cv_LCMS_LIBS=`$PKG_CONFIG --libs "lcms >= 1.14" 2>/dev/null`

10365

else

10366

pkg_failed=yes

10367

fi

10368

- else

10369

- pkg_failed=untried

10370

+ fi

10371

+else

10372

+ pkg_failed=untried

10373

fi

10374

10375

10376

@@ -10054,37 +9218,35 @@

10377

_pkg_short_errors_supported=no

10378

fi

10379

if test $_pkg_short_errors_supported = yes; then

10380

- LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lcms >= 1.14" 2>&1`

10381

+ LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lcms >= 1.14"`

10382

else

10383

- LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "lcms >= 1.14" 2>&1`

10384

+ LCMS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lcms >= 1.14"`

10385

fi

10386

# Put the nasty error message in config.log where it belongs

10387

echo "$LCMS_PKG_ERRORS" >&5

10388

10389

- { $as_echo "$as_me:$LINENO: result: no" >&5

10390

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10391

$as_echo "no" >&6; }

10392

10393

HAVE_LCMS=no

10394

- { $as_echo "$as_me:$LINENO: WARNING: $LCMS_PKG_ERRORS" >&5

10395

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LCMS_PKG_ERRORS" >&5

10396

$as_echo "$as_me: WARNING: $LCMS_PKG_ERRORS" >&2;}

10397

10398

elif test $pkg_failed = untried; then

10399

10400

HAVE_LCMS=no

10401

- { $as_echo "$as_me:$LINENO: WARNING: $LCMS_PKG_ERRORS" >&5

10402

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LCMS_PKG_ERRORS" >&5

10403

$as_echo "$as_me: WARNING: $LCMS_PKG_ERRORS" >&2;}

10404

10405

else

10406

LCMS_CFLAGS=$pkg_cv_LCMS_CFLAGS

10407

LCMS_LIBS=$pkg_cv_LCMS_LIBS

10408

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10409

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

10410

$as_echo "yes" >&6; }

10411

10412

HAVE_LCMS=yes

10413

10414

-cat >>confdefs.h <<\_ACEOF

10415

-#define HAVE_LCMS 1

10416

-_ACEOF

10417

+$as_echo "#define HAVE_LCMS 1" >>confdefs.h

10418

10419

10420

fi

10421

@@ -10108,7 +9270,7 @@

10422

# ----------------------------------------------------------------------

10423

10424

# Check whether --enable-exiv2 was given.

10425

-if test "${enable_exiv2+set}" = set; then

10426

+if test "${enable_exiv2+set}" = set; then :

10427

enableval=$enable_exiv2; libexiv2=$enableval

10428

else

10429

libexiv2=auto

10430

@@ -10118,40 +9280,44 @@

10431

if test "x${libexiv2}" != "xno"; then

10432

10433

pkg_failed=no

10434

-{ $as_echo "$as_me:$LINENO: checking for EXIV2" >&5

10435

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXIV2" >&5

10436

$as_echo_n "checking for EXIV2... " >&6; }

10437

10438

-if test -n "$EXIV2_CFLAGS"; then

10439

- pkg_cv_EXIV2_CFLAGS="$EXIV2_CFLAGS"

10440

- elif test -n "$PKG_CONFIG"; then

10441

- if test -n "$PKG_CONFIG" && \

10442

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exiv2 >= 0.11\"") >&5

10443

+if test -n "$PKG_CONFIG"; then

10444

+ if test -n "$EXIV2_CFLAGS"; then

10445

+ pkg_cv_EXIV2_CFLAGS="$EXIV2_CFLAGS"

10446

+ else

10447

+ if test -n "$PKG_CONFIG" && \

10448

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exiv2 >= 0.11\""; } >&5

10449

($PKG_CONFIG --exists --print-errors "exiv2 >= 0.11") 2>&5

10450

ac_status=$?

10451

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10452

- (exit $ac_status); }; then

10453

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

10454

+ test $ac_status = 0; }; then

10455

pkg_cv_EXIV2_CFLAGS=`$PKG_CONFIG --cflags "exiv2 >= 0.11" 2>/dev/null`

10456

else

10457

pkg_failed=yes

10458

fi

10459

- else

10460

- pkg_failed=untried

10461

+ fi

10462

+else

10463

+ pkg_failed=untried

10464

fi

10465

-if test -n "$EXIV2_LIBS"; then

10466

- pkg_cv_EXIV2_LIBS="$EXIV2_LIBS"

10467

- elif test -n "$PKG_CONFIG"; then

10468

- if test -n "$PKG_CONFIG" && \

10469

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exiv2 >= 0.11\"") >&5

10470

+if test -n "$PKG_CONFIG"; then

10471

+ if test -n "$EXIV2_LIBS"; then

10472

+ pkg_cv_EXIV2_LIBS="$EXIV2_LIBS"

10473

+ else

10474

+ if test -n "$PKG_CONFIG" && \

10475

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exiv2 >= 0.11\""; } >&5

10476

($PKG_CONFIG --exists --print-errors "exiv2 >= 0.11") 2>&5

10477

ac_status=$?

10478

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10479

- (exit $ac_status); }; then

10480

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

10481

+ test $ac_status = 0; }; then

10482

pkg_cv_EXIV2_LIBS=`$PKG_CONFIG --libs "exiv2 >= 0.11" 2>/dev/null`

10483

else

10484

pkg_failed=yes

10485

fi

10486

- else

10487

- pkg_failed=untried

10488

+ fi

10489

+else

10490

+ pkg_failed=untried

10491

fi

10492

10493

10494

@@ -10164,37 +9330,35 @@

10495

_pkg_short_errors_supported=no

10496

fi

10497

if test $_pkg_short_errors_supported = yes; then

10498

- EXIV2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exiv2 >= 0.11" 2>&1`

10499

+ EXIV2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "exiv2 >= 0.11"`

10500

else

10501

- EXIV2_PKG_ERRORS=`$PKG_CONFIG --print-errors "exiv2 >= 0.11" 2>&1`

10502

+ EXIV2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "exiv2 >= 0.11"`

10503

fi

10504

# Put the nasty error message in config.log where it belongs

10505

echo "$EXIV2_PKG_ERRORS" >&5

10506

10507

- { $as_echo "$as_me:$LINENO: result: no" >&5

10508

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

10509

$as_echo "no" >&6; }

10510

10511

HAVE_EXIV2=no

10512

- { $as_echo "$as_me:$LINENO: WARNING: $EXIV2_PKG_ERRORS" >&5

10513

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $EXIV2_PKG_ERRORS" >&5

10514

$as_echo "$as_me: WARNING: $EXIV2_PKG_ERRORS" >&2;}

10515

10516

elif test $pkg_failed = untried; then

10517

10518

HAVE_EXIV2=no

10519

- { $as_echo "$as_me:$LINENO: WARNING: $EXIV2_PKG_ERRORS" >&5

10520

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $EXIV2_PKG_ERRORS" >&5

10521

$as_echo "$as_me: WARNING: $EXIV2_PKG_ERRORS" >&2;}

10522

10523

else

10524

EXIV2_CFLAGS=$pkg_cv_EXIV2_CFLAGS

10525

EXIV2_LIBS=$pkg_cv_EXIV2_LIBS

10526

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10527

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

10528

$as_echo "yes" >&6; }

10529

10530

HAVE_EXIV2=yes

10531

10532

-cat >>confdefs.h <<\_ACEOF

10533

-#define HAVE_EXIV2 1

10534

-_ACEOF

10535

+$as_echo "#define HAVE_EXIV2 1" >>confdefs.h

10536

10537

10538

fi

10539

@@ -10229,151 +9393,12 @@

10540

_ACEOF

10541

10542

10543

-

10544

-for ac_header in locale.h

10545

-do

10546

-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

10547

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

10548

- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

10549

-$as_echo_n "checking for $ac_header... " >&6; }

10550

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

10551

- $as_echo_n "(cached) " >&6

10552

-fi

10553

-ac_res=`eval 'as_val=${'$as_ac_Header'}

10554

- $as_echo "$as_val"'`

10555

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

10556

-$as_echo "$ac_res" >&6; }

10557

-else

10558

- # Is the header compilable?

10559

-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5

10560

-$as_echo_n "checking $ac_header usability... " >&6; }

10561

-cat >conftest.$ac_ext <<_ACEOF

10562

-/* confdefs.h. */

10563

-_ACEOF

10564

-cat confdefs.h >>conftest.$ac_ext

10565

-cat >>conftest.$ac_ext <<_ACEOF

10566

-/* end confdefs.h. */

10567

-$ac_includes_default

10568

-#include <$ac_header>

10569

-_ACEOF

10570

-rm -f conftest.$ac_objext

10571

-if { (ac_try="$ac_compile"

10572

-case "(($ac_try" in

10573

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10574

- *) ac_try_echo=$ac_try;;

10575

-esac

10576

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10577

-$as_echo "$ac_try_echo") >&5

10578

- (eval "$ac_compile") 2>conftest.er1

10579

- ac_status=$?

10580

- grep -v '^ *+' conftest.er1 >conftest.err

10581

- rm -f conftest.er1

10582

- cat conftest.err >&5

10583

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10584

- (exit $ac_status); } && {

10585

- test -z "$ac_c_werror_flag" ||

10586

- test ! -s conftest.err

10587

- } && test -s conftest.$ac_objext; then

10588

- ac_header_compiler=yes

10589

-else

10590

- $as_echo "$as_me: failed program was:" >&5

10591

-sed 's/^/| /' conftest.$ac_ext >&5

10592

-

10593

- ac_header_compiler=no

10594

-fi

10595

-

10596

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

10597

-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

10598

-$as_echo "$ac_header_compiler" >&6; }

10599

-

10600

-# Is the header present?

10601

-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5

10602

-$as_echo_n "checking $ac_header presence... " >&6; }

10603

-cat >conftest.$ac_ext <<_ACEOF

10604

-/* confdefs.h. */

10605

-_ACEOF

10606

-cat confdefs.h >>conftest.$ac_ext

10607

-cat >>conftest.$ac_ext <<_ACEOF

10608

-/* end confdefs.h. */

10609

-#include <$ac_header>

10610

-_ACEOF

10611

-if { (ac_try="$ac_cpp conftest.$ac_ext"

10612

-case "(($ac_try" in

10613

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10614

- *) ac_try_echo=$ac_try;;

10615

-esac

10616

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10617

-$as_echo "$ac_try_echo") >&5

10618

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

10619

- ac_status=$?

10620

- grep -v '^ *+' conftest.er1 >conftest.err

10621

- rm -f conftest.er1

10622

- cat conftest.err >&5

10623

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10624

- (exit $ac_status); } >/dev/null && {

10625

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

10626

- test ! -s conftest.err

10627

- }; then

10628

- ac_header_preproc=yes

10629

-else

10630

- $as_echo "$as_me: failed program was:" >&5

10631

-sed 's/^/| /' conftest.$ac_ext >&5

10632

-

10633

- ac_header_preproc=no

10634

-fi

10635

-

10636

-rm -f conftest.err conftest.$ac_ext

10637

-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

10638

-$as_echo "$ac_header_preproc" >&6; }

10639

-

10640

-# So? What about this header?

10641

-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

10642

- yes:no: )

10643

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

10644

-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

10645

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

10646

-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

10647

- ac_header_preproc=yes

10648

- ;;

10649

- no:yes:* )

10650

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

10651

-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

10652

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5

10653

-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}

10654

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5

10655

-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}

10656

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5

10657

-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}

10658

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

10659

-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

10660

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

10661

-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

10662

- ( cat <<\_ASBOX

10663

-## ------------------------------------------------- ##

10664

-## Report this to geeqie-devel@lists.sourceforge.net ##

10665

-## ------------------------------------------------- ##

10666

-_ASBOX

10667

- ) | sed "s/^/$as_me: WARNING: /" >&2

10668

- ;;

10669

-esac

10670

-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

10671

-$as_echo_n "checking for $ac_header... " >&6; }

10672

-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

10673

- $as_echo_n "(cached) " >&6

10674

-else

10675

- eval "$as_ac_Header=\$ac_header_preproc"

10676

-fi

10677

-ac_res=`eval 'as_val=${'$as_ac_Header'}

10678

- $as_echo "$as_val"'`

10679

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

10680

-$as_echo "$ac_res" >&6; }

10681

-

10682

-fi

10683

-as_val=`eval 'as_val=${'$as_ac_Header'}

10684

- $as_echo "$as_val"'`

10685

- if test "x$as_val" = x""yes; then

10686

+ for ac_header in locale.h

10687

+do :

10688

+ ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"

10689

+if test "x$ac_cv_header_locale_h" = x""yes; then :

10690

cat >>confdefs.h <<_ACEOF

10691

-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

10692

+#define HAVE_LOCALE_H 1

10693

_ACEOF

10694

10695

fi

10696

@@ -10381,16 +9406,12 @@

10697

done

10698

10699

if test $ac_cv_header_locale_h = yes; then

10700

- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5

10701

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5

10702

$as_echo_n "checking for LC_MESSAGES... " >&6; }

10703

-if test "${am_cv_val_LC_MESSAGES+set}" = set; then

10704

+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :

10705

$as_echo_n "(cached) " >&6

10706

else

10707

- cat >conftest.$ac_ext <<_ACEOF

10708

-/* confdefs.h. */

10709

-_ACEOF

10710

-cat confdefs.h >>conftest.$ac_ext

10711

-cat >>conftest.$ac_ext <<_ACEOF

10712

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

10713

/* end confdefs.h. */

10714

#include <locale.h>

10715

int

10716

@@ -10401,46 +9422,19 @@

10717

return 0;

10718

}

10719

_ACEOF

10720

-rm -f conftest.$ac_objext conftest$ac_exeext

10721

-if { (ac_try="$ac_link"

10722

-case "(($ac_try" in

10723

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10724

- *) ac_try_echo=$ac_try;;

10725

-esac

10726

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10727

-$as_echo "$ac_try_echo") >&5

10728

- (eval "$ac_link") 2>conftest.er1

10729

- ac_status=$?

10730

- grep -v '^ *+' conftest.er1 >conftest.err

10731

- rm -f conftest.er1

10732

- cat conftest.err >&5

10733

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10734

- (exit $ac_status); } && {

10735

- test -z "$ac_c_werror_flag" ||

10736

- test ! -s conftest.err

10737

- } && test -s conftest$ac_exeext && {

10738

- test "$cross_compiling" = yes ||

10739

- $as_test_x conftest$ac_exeext

10740

- }; then

10741

+if ac_fn_c_try_link "$LINENO"; then :

10742

am_cv_val_LC_MESSAGES=yes

10743

else

10744

- $as_echo "$as_me: failed program was:" >&5

10745

-sed 's/^/| /' conftest.$ac_ext >&5

10746

-

10747

- am_cv_val_LC_MESSAGES=no

10748

+ am_cv_val_LC_MESSAGES=no

10749

fi

10750

-

10751

-rm -rf conftest.dSYM

10752

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10753

- conftest$ac_exeext conftest.$ac_ext

10754

+rm -f core conftest.err conftest.$ac_objext \

10755

+ conftest$ac_exeext conftest.$ac_ext

10756

fi

10757

-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5

10758

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5

10759

$as_echo "$am_cv_val_LC_MESSAGES" >&6; }

10760

if test $am_cv_val_LC_MESSAGES = yes; then

10761

10762

-cat >>confdefs.h <<\_ACEOF

10763

-#define HAVE_LC_MESSAGES 1

10764

-_ACEOF

10765

+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h

10766

10767

fi

10768

fi

10769

@@ -10453,155 +9447,20 @@

10770

XGETTEXT=:

10771

INTLLIBS=

10772

10773

- if test "${ac_cv_header_libintl_h+set}" = set; then

10774

- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5

10775

-$as_echo_n "checking for libintl.h... " >&6; }

10776

-if test "${ac_cv_header_libintl_h+set}" = set; then

10777

- $as_echo_n "(cached) " >&6

10778

-fi

10779

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

10780

-$as_echo "$ac_cv_header_libintl_h" >&6; }

10781

-else

10782

- # Is the header compilable?

10783

-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5

10784

-$as_echo_n "checking libintl.h usability... " >&6; }

10785

-cat >conftest.$ac_ext <<_ACEOF

10786

-/* confdefs.h. */

10787

-_ACEOF

10788

-cat confdefs.h >>conftest.$ac_ext

10789

-cat >>conftest.$ac_ext <<_ACEOF

10790

-/* end confdefs.h. */

10791

-$ac_includes_default

10792

-#include <libintl.h>

10793

-_ACEOF

10794

-rm -f conftest.$ac_objext

10795

-if { (ac_try="$ac_compile"

10796

-case "(($ac_try" in

10797

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10798

- *) ac_try_echo=$ac_try;;

10799

-esac

10800

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10801

-$as_echo "$ac_try_echo") >&5

10802

- (eval "$ac_compile") 2>conftest.er1

10803

- ac_status=$?

10804

- grep -v '^ *+' conftest.er1 >conftest.err

10805

- rm -f conftest.er1

10806

- cat conftest.err >&5

10807

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10808

- (exit $ac_status); } && {

10809

- test -z "$ac_c_werror_flag" ||

10810

- test ! -s conftest.err

10811

- } && test -s conftest.$ac_objext; then

10812

- ac_header_compiler=yes

10813

-else

10814

- $as_echo "$as_me: failed program was:" >&5

10815

-sed 's/^/| /' conftest.$ac_ext >&5

10816

-

10817

- ac_header_compiler=no

10818

-fi

10819

-

10820

-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

10821

-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

10822

-$as_echo "$ac_header_compiler" >&6; }

10823

-

10824

-# Is the header present?

10825

-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5

10826

-$as_echo_n "checking libintl.h presence... " >&6; }

10827

-cat >conftest.$ac_ext <<_ACEOF

10828

-/* confdefs.h. */

10829

-_ACEOF

10830

-cat confdefs.h >>conftest.$ac_ext

10831

-cat >>conftest.$ac_ext <<_ACEOF

10832

-/* end confdefs.h. */

10833

-#include <libintl.h>

10834

-_ACEOF

10835

-if { (ac_try="$ac_cpp conftest.$ac_ext"

10836

-case "(($ac_try" in

10837

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10838

- *) ac_try_echo=$ac_try;;

10839

-esac

10840

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10841

-$as_echo "$ac_try_echo") >&5

10842

- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

10843

- ac_status=$?

10844

- grep -v '^ *+' conftest.er1 >conftest.err

10845

- rm -f conftest.er1

10846

- cat conftest.err >&5

10847

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10848

- (exit $ac_status); } >/dev/null && {

10849

- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

10850

- test ! -s conftest.err

10851

- }; then

10852

- ac_header_preproc=yes

10853

-else

10854

- $as_echo "$as_me: failed program was:" >&5

10855

-sed 's/^/| /' conftest.$ac_ext >&5

10856

-

10857

- ac_header_preproc=no

10858

-fi

10859

-

10860

-rm -f conftest.err conftest.$ac_ext

10861

-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

10862

-$as_echo "$ac_header_preproc" >&6; }

10863

-

10864

-# So? What about this header?

10865

-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

10866

- yes:no: )

10867

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5

10868

-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

10869

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5

10870

-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}

10871

- ac_header_preproc=yes

10872

- ;;

10873

- no:yes:* )

10874

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5

10875

-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}

10876

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5

10877

-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}

10878

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5

10879

-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}

10880

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5

10881

-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}

10882

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5

10883

-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}

10884

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5

10885

-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}

10886

- ( cat <<\_ASBOX

10887

-## ------------------------------------------------- ##

10888

-## Report this to geeqie-devel@lists.sourceforge.net ##

10889

-## ------------------------------------------------- ##

10890

-_ASBOX

10891

- ) | sed "s/^/$as_me: WARNING: /" >&2

10892

- ;;

10893

-esac

10894

-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5

10895

-$as_echo_n "checking for libintl.h... " >&6; }

10896

-if test "${ac_cv_header_libintl_h+set}" = set; then

10897

- $as_echo_n "(cached) " >&6

10898

-else

10899

- ac_cv_header_libintl_h=$ac_header_preproc

10900

-fi

10901

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

10902

-$as_echo "$ac_cv_header_libintl_h" >&6; }

10903

-

10904

-fi

10905

-if test "x$ac_cv_header_libintl_h" = x""yes; then

10906

+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"

10907

+if test "x$ac_cv_header_libintl_h" = x""yes; then :

10908

gt_cv_func_dgettext_libintl="no"

10909

libintl_extra_libs=""

10910

10911

#

10912

# First check in libc

10913

#

10914

- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5

10915

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5

10916

$as_echo_n "checking for ngettext in libc... " >&6; }

10917

-if test "${gt_cv_func_ngettext_libc+set}" = set; then

10918

+if test "${gt_cv_func_ngettext_libc+set}" = set; then :

10919

$as_echo_n "(cached) " >&6

10920

else

10921

- cat >conftest.$ac_ext <<_ACEOF

10922

-/* confdefs.h. */

10923

-_ACEOF

10924

-cat confdefs.h >>conftest.$ac_ext

10925

-cat >>conftest.$ac_ext <<_ACEOF

10926

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

10927

/* end confdefs.h. */

10928

10929

#include <libintl.h>

10930

@@ -10614,54 +9473,25 @@

10931

return 0;

10932

}

10933

_ACEOF

10934

-rm -f conftest.$ac_objext conftest$ac_exeext

10935

-if { (ac_try="$ac_link"

10936

-case "(($ac_try" in

10937

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

10938

- *) ac_try_echo=$ac_try;;

10939

-esac

10940

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

10941

-$as_echo "$ac_try_echo") >&5

10942

- (eval "$ac_link") 2>conftest.er1

10943

- ac_status=$?

10944

- grep -v '^ *+' conftest.er1 >conftest.err

10945

- rm -f conftest.er1

10946

- cat conftest.err >&5

10947

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10948

- (exit $ac_status); } && {

10949

- test -z "$ac_c_werror_flag" ||

10950

- test ! -s conftest.err

10951

- } && test -s conftest$ac_exeext && {

10952

- test "$cross_compiling" = yes ||

10953

- $as_test_x conftest$ac_exeext

10954

- }; then

10955

+if ac_fn_c_try_link "$LINENO"; then :

10956

gt_cv_func_ngettext_libc=yes

10957

else

10958

- $as_echo "$as_me: failed program was:" >&5

10959

-sed 's/^/| /' conftest.$ac_ext >&5

10960

-

10961

- gt_cv_func_ngettext_libc=no

10962

+ gt_cv_func_ngettext_libc=no

10963

fi

10964

-

10965

-rm -rf conftest.dSYM

10966

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

10967

- conftest$ac_exeext conftest.$ac_ext

10968

+rm -f core conftest.err conftest.$ac_objext \

10969

+ conftest$ac_exeext conftest.$ac_ext

10970

10971

fi

10972

-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5

10973

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5

10974

$as_echo "$gt_cv_func_ngettext_libc" >&6; }

10975

10976

if test "$gt_cv_func_ngettext_libc" = "yes" ; then

10977

- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5

10978

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5

10979

$as_echo_n "checking for dgettext in libc... " >&6; }

10980

-if test "${gt_cv_func_dgettext_libc+set}" = set; then

10981

+if test "${gt_cv_func_dgettext_libc+set}" = set; then :

10982

$as_echo_n "(cached) " >&6

10983

else

10984

- cat >conftest.$ac_ext <<_ACEOF

10985

-/* confdefs.h. */

10986

-_ACEOF

10987

-cat confdefs.h >>conftest.$ac_ext

10988

-cat >>conftest.$ac_ext <<_ACEOF

10989

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

10990

/* end confdefs.h. */

10991

10992

#include <libintl.h>

10993

@@ -10674,141 +9504,26 @@

10994

return 0;

10995

}

10996

_ACEOF

10997

-rm -f conftest.$ac_objext conftest$ac_exeext

10998

-if { (ac_try="$ac_link"

10999

-case "(($ac_try" in

11000

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11001

- *) ac_try_echo=$ac_try;;

11002

-esac

11003

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11004

-$as_echo "$ac_try_echo") >&5

11005

- (eval "$ac_link") 2>conftest.er1

11006

- ac_status=$?

11007

- grep -v '^ *+' conftest.er1 >conftest.err

11008

- rm -f conftest.er1

11009

- cat conftest.err >&5

11010

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11011

- (exit $ac_status); } && {

11012

- test -z "$ac_c_werror_flag" ||

11013

- test ! -s conftest.err

11014

- } && test -s conftest$ac_exeext && {

11015

- test "$cross_compiling" = yes ||

11016

- $as_test_x conftest$ac_exeext

11017

- }; then

11018

+if ac_fn_c_try_link "$LINENO"; then :

11019

gt_cv_func_dgettext_libc=yes

11020

else

11021

- $as_echo "$as_me: failed program was:" >&5

11022

-sed 's/^/| /' conftest.$ac_ext >&5

11023

-

11024

- gt_cv_func_dgettext_libc=no

11025

+ gt_cv_func_dgettext_libc=no

11026

fi

11027

-

11028

-rm -rf conftest.dSYM

11029

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11030

- conftest$ac_exeext conftest.$ac_ext

11031

+rm -f core conftest.err conftest.$ac_objext \

11032

+ conftest$ac_exeext conftest.$ac_ext

11033

11034

fi

11035

-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5

11036

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5

11037

$as_echo "$gt_cv_func_dgettext_libc" >&6; }

11038

fi

11039

11040

if test "$gt_cv_func_ngettext_libc" = "yes" ; then

11041

-

11042

-for ac_func in bind_textdomain_codeset

11043

-do

11044

-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

11045

-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

11046

-$as_echo_n "checking for $ac_func... " >&6; }

11047

-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

11048

- $as_echo_n "(cached) " >&6

11049

-else

11050

- cat >conftest.$ac_ext <<_ACEOF

11051

-/* confdefs.h. */

11052

-_ACEOF

11053

-cat confdefs.h >>conftest.$ac_ext

11054

-cat >>conftest.$ac_ext <<_ACEOF

11055

-/* end confdefs.h. */

11056

-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

11057

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

11058

-#define $ac_func innocuous_$ac_func

11059

-

11060

-/* System header to define __stub macros and hopefully few prototypes,

11061

- which can conflict with char $ac_func (); below.

11062

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

11063

- <limits.h> exists even on freestanding compilers. */

11064

-

11065

-#ifdef __STDC__

11066

-# include <limits.h>

11067

-#else

11068

-# include <assert.h>

11069

-#endif

11070

-

11071

-#undef $ac_func

11072

-

11073

-/* Override any GCC internal prototype to avoid an error.

11074

- Use char because int might match the return type of a GCC

11075

- builtin and then its argument prototype would still apply. */

11076

-#ifdef __cplusplus

11077

-extern "C"

11078

-#endif

11079

-char $ac_func ();

11080

-/* The GNU C library defines this for functions which it implements

11081

- to always fail with ENOSYS. Some functions are actually named

11082

- something starting with __ and the normal name is an alias. */

11083

-#if defined __stub_$ac_func || defined __stub___$ac_func

11084

-choke me

11085

-#endif

11086

-

11087

-int

11088

-main ()

11089

-{

11090

-return $ac_func ();

11091

- ;

11092

- return 0;

11093

-}

11094

-_ACEOF

11095

-rm -f conftest.$ac_objext conftest$ac_exeext

11096

-if { (ac_try="$ac_link"

11097

-case "(($ac_try" in

11098

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11099

- *) ac_try_echo=$ac_try;;

11100

-esac

11101

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11102

-$as_echo "$ac_try_echo") >&5

11103

- (eval "$ac_link") 2>conftest.er1

11104

- ac_status=$?

11105

- grep -v '^ *+' conftest.er1 >conftest.err

11106

- rm -f conftest.er1

11107

- cat conftest.err >&5

11108

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11109

- (exit $ac_status); } && {

11110

- test -z "$ac_c_werror_flag" ||

11111

- test ! -s conftest.err

11112

- } && test -s conftest$ac_exeext && {

11113

- test "$cross_compiling" = yes ||

11114

- $as_test_x conftest$ac_exeext

11115

- }; then

11116

- eval "$as_ac_var=yes"

11117

-else

11118

- $as_echo "$as_me: failed program was:" >&5

11119

-sed 's/^/| /' conftest.$ac_ext >&5

11120

-

11121

- eval "$as_ac_var=no"

11122

-fi

11123

-

11124

-rm -rf conftest.dSYM

11125

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11126

- conftest$ac_exeext conftest.$ac_ext

11127

-fi

11128

-ac_res=`eval 'as_val=${'$as_ac_var'}

11129

- $as_echo "$as_val"'`

11130

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

11131

-$as_echo "$ac_res" >&6; }

11132

-as_val=`eval 'as_val=${'$as_ac_var'}

11133

- $as_echo "$as_val"'`

11134

- if test "x$as_val" = x""yes; then

11135

+ for ac_func in bind_textdomain_codeset

11136

+do :

11137

+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"

11138

+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :

11139

cat >>confdefs.h <<_ACEOF

11140

-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

11141

+#define HAVE_BIND_TEXTDOMAIN_CODESET 1

11142

_ACEOF

11143

11144

fi

11145

@@ -10823,18 +9538,14 @@

11146

|| test "$gt_cv_func_ngettext_libc" != "yes" \

11147

|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then

11148

11149

- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5

11150

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5

11151

$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }

11152

-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then

11153

+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :

11154

$as_echo_n "(cached) " >&6

11155

else

11156

ac_check_lib_save_LIBS=$LIBS

11157

LIBS="-lintl $LIBS"

11158

-cat >conftest.$ac_ext <<_ACEOF

11159

-/* confdefs.h. */

11160

-_ACEOF

11161

-cat confdefs.h >>conftest.$ac_ext

11162

-cat >>conftest.$ac_ext <<_ACEOF

11163

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11164

/* end confdefs.h. */

11165

11166

/* Override any GCC internal prototype to avoid an error.

11167

@@ -10849,58 +9560,29 @@

11168

{

11169

return bindtextdomain ();

11170

;

11171

- return 0;

11172

-}

11173

-_ACEOF

11174

-rm -f conftest.$ac_objext conftest$ac_exeext

11175

-if { (ac_try="$ac_link"

11176

-case "(($ac_try" in

11177

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11178

- *) ac_try_echo=$ac_try;;

11179

-esac

11180

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11181

-$as_echo "$ac_try_echo") >&5

11182

- (eval "$ac_link") 2>conftest.er1

11183

- ac_status=$?

11184

- grep -v '^ *+' conftest.er1 >conftest.err

11185

- rm -f conftest.er1

11186

- cat conftest.err >&5

11187

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11188

- (exit $ac_status); } && {

11189

- test -z "$ac_c_werror_flag" ||

11190

- test ! -s conftest.err

11191

- } && test -s conftest$ac_exeext && {

11192

- test "$cross_compiling" = yes ||

11193

- $as_test_x conftest$ac_exeext

11194

- }; then

11195

+ return 0;

11196

+}

11197

+_ACEOF

11198

+if ac_fn_c_try_link "$LINENO"; then :

11199

ac_cv_lib_intl_bindtextdomain=yes

11200

else

11201

- $as_echo "$as_me: failed program was:" >&5

11202

-sed 's/^/| /' conftest.$ac_ext >&5

11203

-

11204

- ac_cv_lib_intl_bindtextdomain=no

11205

+ ac_cv_lib_intl_bindtextdomain=no

11206

fi

11207

-

11208

-rm -rf conftest.dSYM

11209

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11210

- conftest$ac_exeext conftest.$ac_ext

11211

+rm -f core conftest.err conftest.$ac_objext \

11212

+ conftest$ac_exeext conftest.$ac_ext

11213

LIBS=$ac_check_lib_save_LIBS

11214

fi

11215

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5

11216

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5

11217

$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }

11218

-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then

11219

- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

11220

+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :

11221

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5

11222

$as_echo_n "checking for ngettext in -lintl... " >&6; }

11223

-if test "${ac_cv_lib_intl_ngettext+set}" = set; then

11224

+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :

11225

$as_echo_n "(cached) " >&6

11226

else

11227

ac_check_lib_save_LIBS=$LIBS

11228

LIBS="-lintl $LIBS"

11229

-cat >conftest.$ac_ext <<_ACEOF

11230

-/* confdefs.h. */

11231

-_ACEOF

11232

-cat confdefs.h >>conftest.$ac_ext

11233

-cat >>conftest.$ac_ext <<_ACEOF

11234

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11235

/* end confdefs.h. */

11236

11237

/* Override any GCC internal prototype to avoid an error.

11238

@@ -10918,55 +9600,26 @@

11239

return 0;

11240

}

11241

_ACEOF

11242

-rm -f conftest.$ac_objext conftest$ac_exeext

11243

-if { (ac_try="$ac_link"

11244

-case "(($ac_try" in

11245

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11246

- *) ac_try_echo=$ac_try;;

11247

-esac

11248

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11249

-$as_echo "$ac_try_echo") >&5

11250

- (eval "$ac_link") 2>conftest.er1

11251

- ac_status=$?

11252

- grep -v '^ *+' conftest.er1 >conftest.err

11253

- rm -f conftest.er1

11254

- cat conftest.err >&5

11255

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11256

- (exit $ac_status); } && {

11257

- test -z "$ac_c_werror_flag" ||

11258

- test ! -s conftest.err

11259

- } && test -s conftest$ac_exeext && {

11260

- test "$cross_compiling" = yes ||

11261

- $as_test_x conftest$ac_exeext

11262

- }; then

11263

+if ac_fn_c_try_link "$LINENO"; then :

11264

ac_cv_lib_intl_ngettext=yes

11265

else

11266

- $as_echo "$as_me: failed program was:" >&5

11267

-sed 's/^/| /' conftest.$ac_ext >&5

11268

-

11269

- ac_cv_lib_intl_ngettext=no

11270

+ ac_cv_lib_intl_ngettext=no

11271

fi

11272

-

11273

-rm -rf conftest.dSYM

11274

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11275

- conftest$ac_exeext conftest.$ac_ext

11276

+rm -f core conftest.err conftest.$ac_objext \

11277

+ conftest$ac_exeext conftest.$ac_ext

11278

LIBS=$ac_check_lib_save_LIBS

11279

fi

11280

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

11281

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5

11282

$as_echo "$ac_cv_lib_intl_ngettext" >&6; }

11283

-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then

11284

- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5

11285

+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :

11286

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5

11287

$as_echo_n "checking for dgettext in -lintl... " >&6; }

11288

-if test "${ac_cv_lib_intl_dgettext+set}" = set; then

11289

+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :

11290

$as_echo_n "(cached) " >&6

11291

else

11292

ac_check_lib_save_LIBS=$LIBS

11293

LIBS="-lintl $LIBS"

11294

-cat >conftest.$ac_ext <<_ACEOF

11295

-/* confdefs.h. */

11296

-_ACEOF

11297

-cat confdefs.h >>conftest.$ac_ext

11298

-cat >>conftest.$ac_ext <<_ACEOF

11299

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11300

/* end confdefs.h. */

11301

11302

/* Override any GCC internal prototype to avoid an error.

11303

@@ -10984,43 +9637,18 @@

11304

return 0;

11305

}

11306

_ACEOF

11307

-rm -f conftest.$ac_objext conftest$ac_exeext

11308

-if { (ac_try="$ac_link"

11309

-case "(($ac_try" in

11310

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11311

- *) ac_try_echo=$ac_try;;

11312

-esac

11313

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11314

-$as_echo "$ac_try_echo") >&5

11315

- (eval "$ac_link") 2>conftest.er1

11316

- ac_status=$?

11317

- grep -v '^ *+' conftest.er1 >conftest.err

11318

- rm -f conftest.er1

11319

- cat conftest.err >&5

11320

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11321

- (exit $ac_status); } && {

11322

- test -z "$ac_c_werror_flag" ||

11323

- test ! -s conftest.err

11324

- } && test -s conftest$ac_exeext && {

11325

- test "$cross_compiling" = yes ||

11326

- $as_test_x conftest$ac_exeext

11327

- }; then

11328

+if ac_fn_c_try_link "$LINENO"; then :

11329

ac_cv_lib_intl_dgettext=yes

11330

else

11331

- $as_echo "$as_me: failed program was:" >&5

11332

-sed 's/^/| /' conftest.$ac_ext >&5

11333

-

11334

- ac_cv_lib_intl_dgettext=no

11335

+ ac_cv_lib_intl_dgettext=no

11336

fi

11337

-

11338

-rm -rf conftest.dSYM

11339

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11340

- conftest$ac_exeext conftest.$ac_ext

11341

+rm -f core conftest.err conftest.$ac_objext \

11342

+ conftest$ac_exeext conftest.$ac_ext

11343

LIBS=$ac_check_lib_save_LIBS

11344

fi

11345

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5

11346

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5

11347

$as_echo "$ac_cv_lib_intl_dgettext" >&6; }

11348

-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then

11349

+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :

11350

gt_cv_func_dgettext_libintl=yes

11351

fi

11352

11353

@@ -11030,22 +9658,18 @@

11354

11355

11356

if test "$gt_cv_func_dgettext_libintl" != "yes" ; then

11357

- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5

11358

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5

11359

$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }

11360

- { $as_echo "$as_me:$LINENO: result: " >&5

11361

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5

11362

$as_echo "" >&6; }

11363

- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

11364

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5

11365

$as_echo_n "checking for ngettext in -lintl... " >&6; }

11366

-if test "${ac_cv_lib_intl_ngettext+set}" = set; then

11367

+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :

11368

$as_echo_n "(cached) " >&6

11369

else

11370

ac_check_lib_save_LIBS=$LIBS

11371

LIBS="-lintl -liconv $LIBS"

11372

-cat >conftest.$ac_ext <<_ACEOF

11373

-/* confdefs.h. */

11374

-_ACEOF

11375

-cat confdefs.h >>conftest.$ac_ext

11376

-cat >>conftest.$ac_ext <<_ACEOF

11377

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11378

/* end confdefs.h. */

11379

11380

/* Override any GCC internal prototype to avoid an error.

11381

@@ -11063,55 +9687,26 @@

11382

return 0;

11383

}

11384

_ACEOF

11385

-rm -f conftest.$ac_objext conftest$ac_exeext

11386

-if { (ac_try="$ac_link"

11387

-case "(($ac_try" in

11388

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11389

- *) ac_try_echo=$ac_try;;

11390

-esac

11391

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11392

-$as_echo "$ac_try_echo") >&5

11393

- (eval "$ac_link") 2>conftest.er1

11394

- ac_status=$?

11395

- grep -v '^ *+' conftest.er1 >conftest.err

11396

- rm -f conftest.er1

11397

- cat conftest.err >&5

11398

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11399

- (exit $ac_status); } && {

11400

- test -z "$ac_c_werror_flag" ||

11401

- test ! -s conftest.err

11402

- } && test -s conftest$ac_exeext && {

11403

- test "$cross_compiling" = yes ||

11404

- $as_test_x conftest$ac_exeext

11405

- }; then

11406

+if ac_fn_c_try_link "$LINENO"; then :

11407

ac_cv_lib_intl_ngettext=yes

11408

else

11409

- $as_echo "$as_me: failed program was:" >&5

11410

-sed 's/^/| /' conftest.$ac_ext >&5

11411

-

11412

- ac_cv_lib_intl_ngettext=no

11413

+ ac_cv_lib_intl_ngettext=no

11414

fi

11415

-

11416

-rm -rf conftest.dSYM

11417

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11418

- conftest$ac_exeext conftest.$ac_ext

11419

+rm -f core conftest.err conftest.$ac_objext \

11420

+ conftest$ac_exeext conftest.$ac_ext

11421

LIBS=$ac_check_lib_save_LIBS

11422

fi

11423

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

11424

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5

11425

$as_echo "$ac_cv_lib_intl_ngettext" >&6; }

11426

-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then

11427

- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5

11428

+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :

11429

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5

11430

$as_echo_n "checking for dcgettext in -lintl... " >&6; }

11431

-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then

11432

+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :

11433

$as_echo_n "(cached) " >&6

11434

else

11435

ac_check_lib_save_LIBS=$LIBS

11436

LIBS="-lintl -liconv $LIBS"

11437

-cat >conftest.$ac_ext <<_ACEOF

11438

-/* confdefs.h. */

11439

-_ACEOF

11440

-cat confdefs.h >>conftest.$ac_ext

11441

-cat >>conftest.$ac_ext <<_ACEOF

11442

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11443

/* end confdefs.h. */

11444

11445

/* Override any GCC internal prototype to avoid an error.

11446

@@ -11129,43 +9724,18 @@

11447

return 0;

11448

}

11449

_ACEOF

11450

-rm -f conftest.$ac_objext conftest$ac_exeext

11451

-if { (ac_try="$ac_link"

11452

-case "(($ac_try" in

11453

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11454

- *) ac_try_echo=$ac_try;;

11455

-esac

11456

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11457

-$as_echo "$ac_try_echo") >&5

11458

- (eval "$ac_link") 2>conftest.er1

11459

- ac_status=$?

11460

- grep -v '^ *+' conftest.er1 >conftest.err

11461

- rm -f conftest.er1

11462

- cat conftest.err >&5

11463

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11464

- (exit $ac_status); } && {

11465

- test -z "$ac_c_werror_flag" ||

11466

- test ! -s conftest.err

11467

- } && test -s conftest$ac_exeext && {

11468

- test "$cross_compiling" = yes ||

11469

- $as_test_x conftest$ac_exeext

11470

- }; then

11471

+if ac_fn_c_try_link "$LINENO"; then :

11472

ac_cv_lib_intl_dcgettext=yes

11473

else

11474

- $as_echo "$as_me: failed program was:" >&5

11475

-sed 's/^/| /' conftest.$ac_ext >&5

11476

-

11477

- ac_cv_lib_intl_dcgettext=no

11478

+ ac_cv_lib_intl_dcgettext=no

11479

fi

11480

-

11481

-rm -rf conftest.dSYM

11482

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11483

- conftest$ac_exeext conftest.$ac_ext

11484

+rm -f core conftest.err conftest.$ac_objext \

11485

+ conftest$ac_exeext conftest.$ac_ext

11486

LIBS=$ac_check_lib_save_LIBS

11487

fi

11488

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5

11489

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5

11490

$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }

11491

-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then

11492

+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :

11493

gt_cv_func_dgettext_libintl=yes

11494

libintl_extra_libs=-liconv

11495

else

11496

@@ -11187,102 +9757,12 @@

11497

glib_save_LIBS="$LIBS"

11498

LIBS="$LIBS -lintl $libintl_extra_libs"

11499

unset ac_cv_func_bind_textdomain_codeset

11500

-

11501

-for ac_func in bind_textdomain_codeset

11502

-do

11503

-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

11504

-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

11505

-$as_echo_n "checking for $ac_func... " >&6; }

11506

-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

11507

- $as_echo_n "(cached) " >&6

11508

-else

11509

- cat >conftest.$ac_ext <<_ACEOF

11510

-/* confdefs.h. */

11511

-_ACEOF

11512

-cat confdefs.h >>conftest.$ac_ext

11513

-cat >>conftest.$ac_ext <<_ACEOF

11514

-/* end confdefs.h. */

11515

-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

11516

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

11517

-#define $ac_func innocuous_$ac_func

11518

-

11519

-/* System header to define __stub macros and hopefully few prototypes,

11520

- which can conflict with char $ac_func (); below.

11521

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

11522

- <limits.h> exists even on freestanding compilers. */

11523

-

11524

-#ifdef __STDC__

11525

-# include <limits.h>

11526

-#else

11527

-# include <assert.h>

11528

-#endif

11529

-

11530

-#undef $ac_func

11531

-

11532

-/* Override any GCC internal prototype to avoid an error.

11533

- Use char because int might match the return type of a GCC

11534

- builtin and then its argument prototype would still apply. */

11535

-#ifdef __cplusplus

11536

-extern "C"

11537

-#endif

11538

-char $ac_func ();

11539

-/* The GNU C library defines this for functions which it implements

11540

- to always fail with ENOSYS. Some functions are actually named

11541

- something starting with __ and the normal name is an alias. */

11542

-#if defined __stub_$ac_func || defined __stub___$ac_func

11543

-choke me

11544

-#endif

11545

-

11546

-int

11547

-main ()

11548

-{

11549

-return $ac_func ();

11550

- ;

11551

- return 0;

11552

-}

11553

-_ACEOF

11554

-rm -f conftest.$ac_objext conftest$ac_exeext

11555

-if { (ac_try="$ac_link"

11556

-case "(($ac_try" in

11557

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11558

- *) ac_try_echo=$ac_try;;

11559

-esac

11560

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11561

-$as_echo "$ac_try_echo") >&5

11562

- (eval "$ac_link") 2>conftest.er1

11563

- ac_status=$?

11564

- grep -v '^ *+' conftest.er1 >conftest.err

11565

- rm -f conftest.er1

11566

- cat conftest.err >&5

11567

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11568

- (exit $ac_status); } && {

11569

- test -z "$ac_c_werror_flag" ||

11570

- test ! -s conftest.err

11571

- } && test -s conftest$ac_exeext && {

11572

- test "$cross_compiling" = yes ||

11573

- $as_test_x conftest$ac_exeext

11574

- }; then

11575

- eval "$as_ac_var=yes"

11576

-else

11577

- $as_echo "$as_me: failed program was:" >&5

11578

-sed 's/^/| /' conftest.$ac_ext >&5

11579

-

11580

- eval "$as_ac_var=no"

11581

-fi

11582

-

11583

-rm -rf conftest.dSYM

11584

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11585

- conftest$ac_exeext conftest.$ac_ext

11586

-fi

11587

-ac_res=`eval 'as_val=${'$as_ac_var'}

11588

- $as_echo "$as_val"'`

11589

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

11590

-$as_echo "$ac_res" >&6; }

11591

-as_val=`eval 'as_val=${'$as_ac_var'}

11592

- $as_echo "$as_val"'`

11593

- if test "x$as_val" = x""yes; then

11594

+ for ac_func in bind_textdomain_codeset

11595

+do :

11596

+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"

11597

+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :

11598

cat >>confdefs.h <<_ACEOF

11599

-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

11600

+#define HAVE_BIND_TEXTDOMAIN_CODESET 1

11601

_ACEOF

11602

11603

fi

11604

@@ -11312,15 +9792,13 @@

11605

11606

if test "$gt_cv_have_gettext" = "yes"; then

11607

11608

-cat >>confdefs.h <<\_ACEOF

11609

-#define HAVE_GETTEXT 1

11610

-_ACEOF

11611

+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h

11612

11613

# Extract the first word of "msgfmt", so it can be a program name with args.

11614

set dummy msgfmt; ac_word=$2

11615

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

11616

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11617

$as_echo_n "checking for $ac_word... " >&6; }

11618

-if test "${ac_cv_path_MSGFMT+set}" = set; then

11619

+if test "${ac_cv_path_MSGFMT+set}" = set; then :

11620

$as_echo_n "(cached) " >&6

11621

else

11622

case "$MSGFMT" in

11623

@@ -11345,118 +9823,28 @@

11624

fi

11625

MSGFMT="$ac_cv_path_MSGFMT"

11626

if test "$MSGFMT" != "no"; then

11627

- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5

11628

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5

11629

$as_echo "$MSGFMT" >&6; }

11630

else

11631

- { $as_echo "$as_me:$LINENO: result: no" >&5

11632

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11633

$as_echo "no" >&6; }

11634

fi

11635

if test "$MSGFMT" != "no"; then

11636

glib_save_LIBS="$LIBS"

11637

LIBS="$LIBS $INTLLIBS"

11638

-

11639

-for ac_func in dcgettext

11640

-do

11641

-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

11642

-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

11643

-$as_echo_n "checking for $ac_func... " >&6; }

11644

-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

11645

- $as_echo_n "(cached) " >&6

11646

-else

11647

- cat >conftest.$ac_ext <<_ACEOF

11648

-/* confdefs.h. */

11649

-_ACEOF

11650

-cat confdefs.h >>conftest.$ac_ext

11651

-cat >>conftest.$ac_ext <<_ACEOF

11652

-/* end confdefs.h. */

11653

-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

11654

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

11655

-#define $ac_func innocuous_$ac_func

11656

-

11657

-/* System header to define __stub macros and hopefully few prototypes,

11658

- which can conflict with char $ac_func (); below.

11659

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

11660

- <limits.h> exists even on freestanding compilers. */

11661

-

11662

-#ifdef __STDC__

11663

-# include <limits.h>

11664

-#else

11665

-# include <assert.h>

11666

-#endif

11667

-

11668

-#undef $ac_func

11669

-

11670

-/* Override any GCC internal prototype to avoid an error.

11671

- Use char because int might match the return type of a GCC

11672

- builtin and then its argument prototype would still apply. */

11673

-#ifdef __cplusplus

11674

-extern "C"

11675

-#endif

11676

-char $ac_func ();

11677

-/* The GNU C library defines this for functions which it implements

11678

- to always fail with ENOSYS. Some functions are actually named

11679

- something starting with __ and the normal name is an alias. */

11680

-#if defined __stub_$ac_func || defined __stub___$ac_func

11681

-choke me

11682

-#endif

11683

-

11684

-int

11685

-main ()

11686

-{

11687

-return $ac_func ();

11688

- ;

11689

- return 0;

11690

-}

11691

-_ACEOF

11692

-rm -f conftest.$ac_objext conftest$ac_exeext

11693

-if { (ac_try="$ac_link"

11694

-case "(($ac_try" in

11695

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11696

- *) ac_try_echo=$ac_try;;

11697

-esac

11698

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11699

-$as_echo "$ac_try_echo") >&5

11700

- (eval "$ac_link") 2>conftest.er1

11701

- ac_status=$?

11702

- grep -v '^ *+' conftest.er1 >conftest.err

11703

- rm -f conftest.er1

11704

- cat conftest.err >&5

11705

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11706

- (exit $ac_status); } && {

11707

- test -z "$ac_c_werror_flag" ||

11708

- test ! -s conftest.err

11709

- } && test -s conftest$ac_exeext && {

11710

- test "$cross_compiling" = yes ||

11711

- $as_test_x conftest$ac_exeext

11712

- }; then

11713

- eval "$as_ac_var=yes"

11714

-else

11715

- $as_echo "$as_me: failed program was:" >&5

11716

-sed 's/^/| /' conftest.$ac_ext >&5

11717

-

11718

- eval "$as_ac_var=no"

11719

-fi

11720

-

11721

-rm -rf conftest.dSYM

11722

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11723

- conftest$ac_exeext conftest.$ac_ext

11724

-fi

11725

-ac_res=`eval 'as_val=${'$as_ac_var'}

11726

- $as_echo "$as_val"'`

11727

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

11728

-$as_echo "$ac_res" >&6; }

11729

-as_val=`eval 'as_val=${'$as_ac_var'}

11730

- $as_echo "$as_val"'`

11731

- if test "x$as_val" = x""yes; then

11732

+ for ac_func in dcgettext

11733

+do :

11734

+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"

11735

+if test "x$ac_cv_func_dcgettext" = x""yes; then :

11736

cat >>confdefs.h <<_ACEOF

11737

-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

11738

+#define HAVE_DCGETTEXT 1

11739

_ACEOF

11740

11741

fi

11742

done

11743

11744

MSGFMT_OPTS=

11745

- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5

11746

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5

11747

$as_echo_n "checking if msgfmt accepts -c... " >&6; }

11748

cat >conftest.foo <<_ACEOF

11749

11750

@@ -11471,14 +9859,14 @@

11751

"Content-Transfer-Encoding: 8bit\n"

11752

11753

_ACEOF

11754

-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5

11755

+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5

11756

($MSGFMT -c -o /dev/null conftest.foo) 2>&5

11757

ac_status=$?

11758

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11759

- (exit $ac_status); }; then

11760

- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5

11761

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

11762

+ test $ac_status = 0; }; then

11763

+ MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

11764

$as_echo "yes" >&6; }

11765

-else { $as_echo "$as_me:$LINENO: result: no" >&5

11766

+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11767

$as_echo "no" >&6; }

11768

echo "$as_me: failed input was:" >&5

11769

sed 's/^/| /' conftest.foo >&5

11770

@@ -11486,9 +9874,9 @@

11771

11772

# Extract the first word of "gmsgfmt", so it can be a program name with args.

11773

set dummy gmsgfmt; ac_word=$2

11774

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

11775

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11776

$as_echo_n "checking for $ac_word... " >&6; }

11777

-if test "${ac_cv_path_GMSGFMT+set}" = set; then

11778

+if test "${ac_cv_path_GMSGFMT+set}" = set; then :

11779

$as_echo_n "(cached) " >&6

11780

else

11781

case $GMSGFMT in

11782

@@ -11501,14 +9889,14 @@

11783

do

11784

IFS=$as_save_IFS

11785

test -z "$as_dir" && as_dir=.

11786

- for ac_exec_ext in '' $ac_executable_extensions; do

11787

+ for ac_exec_ext in '' $ac_executable_extensions; do

11788

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11789

ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"

11790

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11791

+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

11792

break 2

11793

fi

11794

done

11795

-done

11796

+ done

11797

IFS=$as_save_IFS

11798

11799

test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"

11800

@@ -11517,19 +9905,19 @@

11801

fi

11802

GMSGFMT=$ac_cv_path_GMSGFMT

11803

if test -n "$GMSGFMT"; then

11804

- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5

11805

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5

11806

$as_echo "$GMSGFMT" >&6; }

11807

else

11808

- { $as_echo "$as_me:$LINENO: result: no" >&5

11809

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11810

$as_echo "no" >&6; }

11811

fi

11812

11813

11814

# Extract the first word of "xgettext", so it can be a program name with args.

11815

set dummy xgettext; ac_word=$2

11816

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

11817

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

11818

$as_echo_n "checking for $ac_word... " >&6; }

11819

-if test "${ac_cv_path_XGETTEXT+set}" = set; then

11820

+if test "${ac_cv_path_XGETTEXT+set}" = set; then :

11821

$as_echo_n "(cached) " >&6

11822

else

11823

case "$XGETTEXT" in

11824

@@ -11554,18 +9942,14 @@

11825

fi

11826

XGETTEXT="$ac_cv_path_XGETTEXT"

11827

if test "$XGETTEXT" != ":"; then

11828

- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5

11829

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5

11830

$as_echo "$XGETTEXT" >&6; }

11831

else

11832

- { $as_echo "$as_me:$LINENO: result: no" >&5

11833

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

11834

$as_echo "no" >&6; }

11835

fi

11836

11837

- cat >conftest.$ac_ext <<_ACEOF

11838

-/* confdefs.h. */

11839

-_ACEOF

11840

-cat confdefs.h >>conftest.$ac_ext

11841

-cat >>conftest.$ac_ext <<_ACEOF

11842

+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext

11843

/* end confdefs.h. */

11844

11845

int

11846

@@ -11577,121 +9961,14 @@

11847

return 0;

11848

}

11849

_ACEOF

11850

-rm -f conftest.$ac_objext conftest$ac_exeext

11851

-if { (ac_try="$ac_link"

11852

-case "(($ac_try" in

11853

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11854

- *) ac_try_echo=$ac_try;;

11855

-esac

11856

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11857

-$as_echo "$ac_try_echo") >&5

11858

- (eval "$ac_link") 2>conftest.er1

11859

- ac_status=$?

11860

- grep -v '^ *+' conftest.er1 >conftest.err

11861

- rm -f conftest.er1

11862

- cat conftest.err >&5

11863

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11864

- (exit $ac_status); } && {

11865

- test -z "$ac_c_werror_flag" ||

11866

- test ! -s conftest.err

11867

- } && test -s conftest$ac_exeext && {

11868

- test "$cross_compiling" = yes ||

11869

- $as_test_x conftest$ac_exeext

11870

- }; then

11871

- CATOBJEXT=.gmo

11872

- DATADIRNAME=share

11873

-else

11874

- $as_echo "$as_me: failed program was:" >&5

11875

-sed 's/^/| /' conftest.$ac_ext >&5

11876

-

11877

- case $host in

11878

- *-*-solaris*)

11879

- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

11880

-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }

11881

-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then

11882

- $as_echo_n "(cached) " >&6

11883

-else

11884

- cat >conftest.$ac_ext <<_ACEOF

11885

-/* confdefs.h. */

11886

-_ACEOF

11887

-cat confdefs.h >>conftest.$ac_ext

11888

-cat >>conftest.$ac_ext <<_ACEOF

11889

-/* end confdefs.h. */

11890

-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.

11891

- For example, HP-UX 11i <limits.h> declares gettimeofday. */

11892

-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset

11893

-

11894

-/* System header to define __stub macros and hopefully few prototypes,

11895

- which can conflict with char bind_textdomain_codeset (); below.

11896

- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

11897

- <limits.h> exists even on freestanding compilers. */

11898

-

11899

-#ifdef __STDC__

11900

-# include <limits.h>

11901

-#else

11902

-# include <assert.h>

11903

-#endif

11904

-

11905

-#undef bind_textdomain_codeset

11906

-

11907

-/* Override any GCC internal prototype to avoid an error.

11908

- Use char because int might match the return type of a GCC

11909

- builtin and then its argument prototype would still apply. */

11910

-#ifdef __cplusplus

11911

-extern "C"

11912

-#endif

11913

-char bind_textdomain_codeset ();

11914

-/* The GNU C library defines this for functions which it implements

11915

- to always fail with ENOSYS. Some functions are actually named

11916

- something starting with __ and the normal name is an alias. */

11917

-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset

11918

-choke me

11919

-#endif

11920

-

11921

-int

11922

-main ()

11923

-{

11924

-return bind_textdomain_codeset ();

11925

- ;

11926

- return 0;

11927

-}

11928

-_ACEOF

11929

-rm -f conftest.$ac_objext conftest$ac_exeext

11930

-if { (ac_try="$ac_link"

11931

-case "(($ac_try" in

11932

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11933

- *) ac_try_echo=$ac_try;;

11934

-esac

11935

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11936

-$as_echo "$ac_try_echo") >&5

11937

- (eval "$ac_link") 2>conftest.er1

11938

- ac_status=$?

11939

- grep -v '^ *+' conftest.er1 >conftest.err

11940

- rm -f conftest.er1

11941

- cat conftest.err >&5

11942

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11943

- (exit $ac_status); } && {

11944

- test -z "$ac_c_werror_flag" ||

11945

- test ! -s conftest.err

11946

- } && test -s conftest$ac_exeext && {

11947

- test "$cross_compiling" = yes ||

11948

- $as_test_x conftest$ac_exeext

11949

- }; then

11950

- ac_cv_func_bind_textdomain_codeset=yes

11951

-else

11952

- $as_echo "$as_me: failed program was:" >&5

11953

-sed 's/^/| /' conftest.$ac_ext >&5

11954

-

11955

- ac_cv_func_bind_textdomain_codeset=no

11956

-fi

11957

-

11958

-rm -rf conftest.dSYM

11959

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11960

- conftest$ac_exeext conftest.$ac_ext

11961

-fi

11962

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

11963

-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }

11964

-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then

11965

+if ac_fn_c_try_link "$LINENO"; then :

11966

+ CATOBJEXT=.gmo

11967

+ DATADIRNAME=share

11968

+else

11969

+ case $host in

11970

+ *-*-solaris*)

11971

+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"

11972

+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :

11973

CATOBJEXT=.gmo

11974

DATADIRNAME=share

11975

else

11976

@@ -11706,10 +9983,8 @@

11977

;;

11978

esac

11979

fi

11980

-

11981

-rm -rf conftest.dSYM

11982

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11983

- conftest$ac_exeext conftest.$ac_ext

11984

+rm -f core conftest.err conftest.$ac_objext \

11985

+ conftest$ac_exeext conftest.$ac_ext

11986

LIBS="$glib_save_LIBS"

11987

INSTOBJEXT=.mo

11988

else

11989

@@ -11723,9 +9998,7 @@

11990

11991

if test "$gt_cv_have_gettext" = "yes" ; then

11992

11993

-cat >>confdefs.h <<\_ACEOF

11994

-#define ENABLE_NLS 1

11995

-_ACEOF

11996

+$as_echo "#define ENABLE_NLS 1" >>confdefs.h

11997

11998

fi

11999

12000

@@ -11733,7 +10006,7 @@

12001

if $XGETTEXT --omit-header /dev/null 2> /dev/null; then

12002

: ;

12003

else

12004

- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5

12005

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5

12006

$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }

12007

XGETTEXT=":"

12008

fi

12009

@@ -11766,7 +10039,7 @@

12010

if test "x$ALL_LINGUAS" = "x"; then

12011

LINGUAS=

12012

else

12013

- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5

12014

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5

12015

$as_echo_n "checking for catalogs to be installed... " >&6; }

12016

NEW_LINGUAS=

12017

for presentlang in $ALL_LINGUAS; do

12018

@@ -11791,7 +10064,7 @@

12019

fi

12020

done

12021

LINGUAS=$NEW_LINGUAS

12022

- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5

12023

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5

12024

$as_echo "$LINGUAS" >&6; }

12025

fi

12026

12027

@@ -11800,6 +10073,15 @@

12028

fi

12029

fi

12030

12031

+ MKINSTALLDIRS=

12032

+ if test -n "$ac_aux_dir"; then

12033

+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"

12034

+ fi

12035

+ if test -z "$MKINSTALLDIRS"; then

12036

+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"

12037

+ fi

12038

+

12039

+

12040

test -d po || mkdir po

12041

if test "x$srcdir" != "x."; then

12042

if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then

12043

@@ -11845,7 +10127,7 @@

12044

# ----------------------------------------------------------------------

12045

12046

# Check whether --enable-gps was given.

12047

-if test "${enable_gps+set}" = set; then

12048

+if test "${enable_gps+set}" = set; then :

12049

enableval=$enable_gps; libgps=$enableval

12050

else

12051

libgps=auto

12052

@@ -11855,40 +10137,44 @@

12053

if test "x${libgps}" == "xyes"; then

12054

12055

pkg_failed=no

12056

-{ $as_echo "$as_me:$LINENO: checking for LIBCHAMPLAIN" >&5

12057

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN" >&5

12058

$as_echo_n "checking for LIBCHAMPLAIN... " >&6; }

12059

12060

-if test -n "$LIBCHAMPLAIN_CFLAGS"; then

12061

- pkg_cv_LIBCHAMPLAIN_CFLAGS="$LIBCHAMPLAIN_CFLAGS"

12062

- elif test -n "$PKG_CONFIG"; then

12063

- if test -n "$PKG_CONFIG" && \

12064

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"champlain-0.3 >= 0.3\"") >&5

12065

- ($PKG_CONFIG --exists --print-errors "champlain-0.3 >= 0.3") 2>&5

12066

- ac_status=$?

12067

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12068

- (exit $ac_status); }; then

12069

- pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "champlain-0.3 >= 0.3" 2>/dev/null`

12070

+if test -n "$PKG_CONFIG"; then

12071

+ if test -n "$LIBCHAMPLAIN_CFLAGS"; then

12072

+ pkg_cv_LIBCHAMPLAIN_CFLAGS="$LIBCHAMPLAIN_CFLAGS"

12073

+ else

12074

+ if test -n "$PKG_CONFIG" && \

12075

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.4 >= 0.4\""; } >&5

12076

+ ($PKG_CONFIG --exists --print-errors "champlain-0.4 >= 0.4") 2>&5

12077

+ ac_status=$?

12078

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12079

+ test $ac_status = 0; }; then

12080

+ pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "champlain-0.4 >= 0.4" 2>/dev/null`

12081

else

12082

pkg_failed=yes

12083

fi

12084

- else

12085

- pkg_failed=untried

12086

+ fi

12087

+else

12088

+ pkg_failed=untried

12089

fi

12090

-if test -n "$LIBCHAMPLAIN_LIBS"; then

12091

- pkg_cv_LIBCHAMPLAIN_LIBS="$LIBCHAMPLAIN_LIBS"

12092

- elif test -n "$PKG_CONFIG"; then

12093

- if test -n "$PKG_CONFIG" && \

12094

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"champlain-0.3 >= 0.3\"") >&5

12095

- ($PKG_CONFIG --exists --print-errors "champlain-0.3 >= 0.3") 2>&5

12096

- ac_status=$?

12097

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12098

- (exit $ac_status); }; then

12099

- pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "champlain-0.3 >= 0.3" 2>/dev/null`

12100

+if test -n "$PKG_CONFIG"; then

12101

+ if test -n "$LIBCHAMPLAIN_LIBS"; then

12102

+ pkg_cv_LIBCHAMPLAIN_LIBS="$LIBCHAMPLAIN_LIBS"

12103

+ else

12104

+ if test -n "$PKG_CONFIG" && \

12105

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.4 >= 0.4\""; } >&5

12106

+ ($PKG_CONFIG --exists --print-errors "champlain-0.4 >= 0.4") 2>&5

12107

+ ac_status=$?

12108

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12109

+ test $ac_status = 0; }; then

12110

+ pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "champlain-0.4 >= 0.4" 2>/dev/null`

12111

else

12112

pkg_failed=yes

12113

fi

12114

- else

12115

- pkg_failed=untried

12116

+ fi

12117

+else

12118

+ pkg_failed=untried

12119

fi

12120

12121

12122

@@ -11901,37 +10187,35 @@

12123

_pkg_short_errors_supported=no

12124

fi

12125

if test $_pkg_short_errors_supported = yes; then

12126

- LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "champlain-0.3 >= 0.3" 2>&1`

12127

+ LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "champlain-0.4 >= 0.4"`

12128

else

12129

- LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "champlain-0.3 >= 0.3" 2>&1`

12130

+ LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "champlain-0.4 >= 0.4"`

12131

fi

12132

# Put the nasty error message in config.log where it belongs

12133

echo "$LIBCHAMPLAIN_PKG_ERRORS" >&5

12134

12135

- { $as_echo "$as_me:$LINENO: result: no" >&5

12136

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

12137

$as_echo "no" >&6; }

12138

12139

HAVE_LIBCHAMPLAIN=no

12140

- { $as_echo "$as_me:$LINENO: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5

12141

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5

12142

$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&2;}

12143

12144

elif test $pkg_failed = untried; then

12145

12146

HAVE_LIBCHAMPLAIN=no

12147

- { $as_echo "$as_me:$LINENO: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5

12148

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&5

12149

$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_PKG_ERRORS" >&2;}

12150

12151

else

12152

LIBCHAMPLAIN_CFLAGS=$pkg_cv_LIBCHAMPLAIN_CFLAGS

12153

LIBCHAMPLAIN_LIBS=$pkg_cv_LIBCHAMPLAIN_LIBS

12154

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12155

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

12156

$as_echo "yes" >&6; }

12157

12158

HAVE_LIBCHAMPLAIN=yes

12159

12160

-cat >>confdefs.h <<\_ACEOF

12161

-#define HAVE_LIBCHAMPLAIN 1

12162

-_ACEOF

12163

+$as_echo "#define HAVE_LIBCHAMPLAIN 1" >>confdefs.h

12164

12165

12166

fi

12167

@@ -11942,40 +10226,44 @@

12168

if test "x${libgps}" == "xyes"; then

12169

12170

pkg_failed=no

12171

-{ $as_echo "$as_me:$LINENO: checking for LIBCHAMPLAIN_GTK" >&5

12172

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN_GTK" >&5

12173

$as_echo_n "checking for LIBCHAMPLAIN_GTK... " >&6; }

12174

12175

-if test -n "$LIBCHAMPLAIN_GTK_CFLAGS"; then

12176

- pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS="$LIBCHAMPLAIN_GTK_CFLAGS"

12177

- elif test -n "$PKG_CONFIG"; then

12178

- if test -n "$PKG_CONFIG" && \

12179

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.3 >= 0.3\"") >&5

12180

- ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.3 >= 0.3") 2>&5

12181

- ac_status=$?

12182

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12183

- (exit $ac_status); }; then

12184

- pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS=`$PKG_CONFIG --cflags "champlain-gtk-0.3 >= 0.3" 2>/dev/null`

12185

+if test -n "$PKG_CONFIG"; then

12186

+ if test -n "$LIBCHAMPLAIN_GTK_CFLAGS"; then

12187

+ pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS="$LIBCHAMPLAIN_GTK_CFLAGS"

12188

+ else

12189

+ if test -n "$PKG_CONFIG" && \

12190

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.4 >= 0.4\""; } >&5

12191

+ ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.4 >= 0.4") 2>&5

12192

+ ac_status=$?

12193

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12194

+ test $ac_status = 0; }; then

12195

+ pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS=`$PKG_CONFIG --cflags "champlain-gtk-0.4 >= 0.4" 2>/dev/null`

12196

else

12197

pkg_failed=yes

12198

fi

12199

- else

12200

- pkg_failed=untried

12201

+ fi

12202

+else

12203

+ pkg_failed=untried

12204

fi

12205

-if test -n "$LIBCHAMPLAIN_GTK_LIBS"; then

12206

- pkg_cv_LIBCHAMPLAIN_GTK_LIBS="$LIBCHAMPLAIN_GTK_LIBS"

12207

- elif test -n "$PKG_CONFIG"; then

12208

- if test -n "$PKG_CONFIG" && \

12209

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.3 >= 0.3\"") >&5

12210

- ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.3 >= 0.3") 2>&5

12211

- ac_status=$?

12212

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12213

- (exit $ac_status); }; then

12214

- pkg_cv_LIBCHAMPLAIN_GTK_LIBS=`$PKG_CONFIG --libs "champlain-gtk-0.3 >= 0.3" 2>/dev/null`

12215

+if test -n "$PKG_CONFIG"; then

12216

+ if test -n "$LIBCHAMPLAIN_GTK_LIBS"; then

12217

+ pkg_cv_LIBCHAMPLAIN_GTK_LIBS="$LIBCHAMPLAIN_GTK_LIBS"

12218

+ else

12219

+ if test -n "$PKG_CONFIG" && \

12220

+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-gtk-0.4 >= 0.4\""; } >&5

12221

+ ($PKG_CONFIG --exists --print-errors "champlain-gtk-0.4 >= 0.4") 2>&5

12222

+ ac_status=$?

12223

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

12224

+ test $ac_status = 0; }; then

12225

+ pkg_cv_LIBCHAMPLAIN_GTK_LIBS=`$PKG_CONFIG --libs "champlain-gtk-0.4 >= 0.4" 2>/dev/null`

12226

else

12227

pkg_failed=yes

12228

fi

12229

- else

12230

- pkg_failed=untried

12231

+ fi

12232

+else

12233

+ pkg_failed=untried

12234

fi

12235

12236

12237

@@ -11988,37 +10276,35 @@

12238

_pkg_short_errors_supported=no

12239

fi

12240

if test $_pkg_short_errors_supported = yes; then

12241

- LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "champlain-gtk-0.3 >= 0.3" 2>&1`

12242

+ LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "champlain-gtk-0.4 >= 0.4"`

12243

else

12244

- LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "champlain-gtk-0.3 >= 0.3" 2>&1`

12245

+ LIBCHAMPLAIN_GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "champlain-gtk-0.4 >= 0.4"`

12246

fi

12247

# Put the nasty error message in config.log where it belongs

12248

echo "$LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5

12249

12250

- { $as_echo "$as_me:$LINENO: result: no" >&5

12251

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

12252

$as_echo "no" >&6; }

12253

12254

HAVE_LIBCHAMPLAIN_GTK=no

12255

- { $as_echo "$as_me:$LINENO: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5

12256

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5

12257

$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&2;}

12258

12259

elif test $pkg_failed = untried; then

12260

12261

HAVE_LIBCHAMPLAIN_GTK=no

12262

- { $as_echo "$as_me:$LINENO: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5

12263

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&5

12264

$as_echo "$as_me: WARNING: $LIBCHAMPLAIN_GTK_PKG_ERRORS" >&2;}

12265

12266

else

12267

LIBCHAMPLAIN_GTK_CFLAGS=$pkg_cv_LIBCHAMPLAIN_GTK_CFLAGS

12268

LIBCHAMPLAIN_GTK_LIBS=$pkg_cv_LIBCHAMPLAIN_GTK_LIBS

12269

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12270

+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

12271

$as_echo "yes" >&6; }

12272

12273

HAVE_LIBCHAMPLAIN_GTK=yes

12274

12275

-cat >>confdefs.h <<\_ACEOF

12276

-#define HAVE_LIBCHAMPLAIN_GTK 1

12277

-_ACEOF

12278

+$as_echo "#define HAVE_LIBCHAMPLAIN_GTK 1" >>confdefs.h

12279

12280

12281

fi

12282

@@ -12042,8 +10328,6 @@

12283

12284

12285

12286

-

12287

-

12288

ac_config_files="$ac_config_files Makefile src/Makefile src/icons/Makefile src/icons/svg/Makefile po/Makefile.in doc/Makefile plugins/Makefile plugins/symlink/Makefile plugins/rotate/Makefile plugins/ufraw/Makefile plugins/import/Makefile geeqie.spec"

12289

12290

12291

@@ -12074,13 +10358,13 @@

12292

case $ac_val in #(

12293

*${as_nl}*)

12294

case $ac_var in #(

12295

- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5

12296

+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5

12297

$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;

12298

esac

12299

case $ac_var in #(

12300

_ | IFS | as_nl) ;; #(

12301

BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

12302

- *) $as_unset $ac_var ;;

12303

+ *) { eval $ac_var=; unset $ac_var;} ;;

12304

esac ;;

12305

esac

12306

done

12307

@@ -12088,8 +10372,8 @@

12308

(set) 2>&1 |

12309

case $as_nl`(ac_space=' '; set) 2>&1` in #(

12310

*${as_nl}ac_space=\ *)

12311

- # `set' does not quote correctly, so add quotes (double-quote

12312

- # substitution turns \\\\ into \\, and sed turns \\ into \).

12313

+ # `set' does not quote correctly, so add quotes: double-quote

12314

+ # substitution turns \\\\ into \\, and sed turns \\ into \.

12315

sed -n \

12316

"s/'/'\\\\''/g;

12317

s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"

12318

@@ -12112,11 +10396,11 @@

12319

if diff "$cache_file" confcache >/dev/null 2>&1; then :; else

12320

if test -w "$cache_file"; then

12321

test "x$cache_file" != "x/dev/null" &&

12322

- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5

12323

+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5

12324

$as_echo "$as_me: updating cache $cache_file" >&6;}

12325

cat confcache >$cache_file

12326

else

12327

- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5

12328

+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5

12329

$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}

12330

fi

12331

fi

12332

@@ -12136,285 +10420,183 @@

12333

ac_i=`$as_echo "$ac_i" | sed "$ac_script"`

12334

# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR

12335

# will be set to the directory where LIBOBJS objects are built.

12336

- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"

12337

- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'

12338

+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"

12339

+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'

12340

done

12341

LIBOBJS=$ac_libobjs

12342

12343

LTLIBOBJS=$ac_ltlibobjs

12344

12345

12346

+ if test -n "$EXEEXT"; then

12347

+ am__EXEEXT_TRUE=

12348

+ am__EXEEXT_FALSE='#'

12349

+else

12350

+ am__EXEEXT_TRUE='#'

12351

+ am__EXEEXT_FALSE=

12352

+fi

12353

+

12354

if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then

12355

- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.

12356

-Usually this means the macro was only invoked conditionally." >&5

12357

-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.

12358

-Usually this means the macro was only invoked conditionally." >&2;}

12359

- { (exit 1); exit 1; }; }

12360

+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.

12361

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12362

fi

12363

if test -z "${DX_COND_doc_TRUE}" && test -z "${DX_COND_doc_FALSE}"; then

12364

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_doc\" was never defined.

12365

-Usually this means the macro was only invoked conditionally." >&5

12366

-$as_echo "$as_me: error: conditional \"DX_COND_doc\" was never defined.

12367

-Usually this means the macro was only invoked conditionally." >&2;}

12368

- { (exit 1); exit 1; }; }

12369

+ as_fn_error "conditional \"DX_COND_doc\" was never defined.

12370

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12371

fi

12372

if test -z "${DX_COND_doc_TRUE}" && test -z "${DX_COND_doc_FALSE}"; then

12373

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_doc\" was never defined.

12374

-Usually this means the macro was only invoked conditionally." >&5

12375

-$as_echo "$as_me: error: conditional \"DX_COND_doc\" was never defined.

12376

-Usually this means the macro was only invoked conditionally." >&2;}

12377

- { (exit 1); exit 1; }; }

12378

+ as_fn_error "conditional \"DX_COND_doc\" was never defined.

12379

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12380

fi

12381

if test -z "${DX_COND_dot_TRUE}" && test -z "${DX_COND_dot_FALSE}"; then

12382

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_dot\" was never defined.

12383

-Usually this means the macro was only invoked conditionally." >&5

12384

-$as_echo "$as_me: error: conditional \"DX_COND_dot\" was never defined.

12385

-Usually this means the macro was only invoked conditionally." >&2;}

12386

- { (exit 1); exit 1; }; }

12387

+ as_fn_error "conditional \"DX_COND_dot\" was never defined.

12388

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12389

fi

12390

if test -z "${DX_COND_dot_TRUE}" && test -z "${DX_COND_dot_FALSE}"; then

12391

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_dot\" was never defined.

12392

-Usually this means the macro was only invoked conditionally." >&5

12393

-$as_echo "$as_me: error: conditional \"DX_COND_dot\" was never defined.

12394

-Usually this means the macro was only invoked conditionally." >&2;}

12395

- { (exit 1); exit 1; }; }

12396

+ as_fn_error "conditional \"DX_COND_dot\" was never defined.

12397

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12398

fi

12399

if test -z "${DX_COND_man_TRUE}" && test -z "${DX_COND_man_FALSE}"; then

12400

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_man\" was never defined.

12401

-Usually this means the macro was only invoked conditionally." >&5

12402

-$as_echo "$as_me: error: conditional \"DX_COND_man\" was never defined.

12403

-Usually this means the macro was only invoked conditionally." >&2;}

12404

- { (exit 1); exit 1; }; }

12405

+ as_fn_error "conditional \"DX_COND_man\" was never defined.

12406

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12407

fi

12408

if test -z "${DX_COND_man_TRUE}" && test -z "${DX_COND_man_FALSE}"; then

12409

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_man\" was never defined.

12410

-Usually this means the macro was only invoked conditionally." >&5

12411

-$as_echo "$as_me: error: conditional \"DX_COND_man\" was never defined.

12412

-Usually this means the macro was only invoked conditionally." >&2;}

12413

- { (exit 1); exit 1; }; }

12414

+ as_fn_error "conditional \"DX_COND_man\" was never defined.

12415

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12416

fi

12417

if test -z "${DX_COND_rtf_TRUE}" && test -z "${DX_COND_rtf_FALSE}"; then

12418

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_rtf\" was never defined.

12419

-Usually this means the macro was only invoked conditionally." >&5

12420

-$as_echo "$as_me: error: conditional \"DX_COND_rtf\" was never defined.

12421

-Usually this means the macro was only invoked conditionally." >&2;}

12422

- { (exit 1); exit 1; }; }

12423

+ as_fn_error "conditional \"DX_COND_rtf\" was never defined.

12424

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12425

fi

12426

if test -z "${DX_COND_rtf_TRUE}" && test -z "${DX_COND_rtf_FALSE}"; then

12427

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_rtf\" was never defined.

12428

-Usually this means the macro was only invoked conditionally." >&5

12429

-$as_echo "$as_me: error: conditional \"DX_COND_rtf\" was never defined.

12430

-Usually this means the macro was only invoked conditionally." >&2;}

12431

- { (exit 1); exit 1; }; }

12432

+ as_fn_error "conditional \"DX_COND_rtf\" was never defined.

12433

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12434

fi

12435

if test -z "${DX_COND_xml_TRUE}" && test -z "${DX_COND_xml_FALSE}"; then

12436

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_xml\" was never defined.

12437

-Usually this means the macro was only invoked conditionally." >&5

12438

-$as_echo "$as_me: error: conditional \"DX_COND_xml\" was never defined.

12439

-Usually this means the macro was only invoked conditionally." >&2;}

12440

- { (exit 1); exit 1; }; }

12441

+ as_fn_error "conditional \"DX_COND_xml\" was never defined.

12442

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12443

fi

12444

if test -z "${DX_COND_xml_TRUE}" && test -z "${DX_COND_xml_FALSE}"; then

12445

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_xml\" was never defined.

12446

-Usually this means the macro was only invoked conditionally." >&5

12447

-$as_echo "$as_me: error: conditional \"DX_COND_xml\" was never defined.

12448

-Usually this means the macro was only invoked conditionally." >&2;}

12449

- { (exit 1); exit 1; }; }

12450

+ as_fn_error "conditional \"DX_COND_xml\" was never defined.

12451

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12452

fi

12453

if test -z "${DX_COND_chm_TRUE}" && test -z "${DX_COND_chm_FALSE}"; then

12454

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_chm\" was never defined.

12455

-Usually this means the macro was only invoked conditionally." >&5

12456

-$as_echo "$as_me: error: conditional \"DX_COND_chm\" was never defined.

12457

-Usually this means the macro was only invoked conditionally." >&2;}

12458

- { (exit 1); exit 1; }; }

12459

+ as_fn_error "conditional \"DX_COND_chm\" was never defined.

12460

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12461

fi

12462

if test -z "${DX_COND_chm_TRUE}" && test -z "${DX_COND_chm_FALSE}"; then

12463

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_chm\" was never defined.

12464

-Usually this means the macro was only invoked conditionally." >&5

12465

-$as_echo "$as_me: error: conditional \"DX_COND_chm\" was never defined.

12466

-Usually this means the macro was only invoked conditionally." >&2;}

12467

- { (exit 1); exit 1; }; }

12468

+ as_fn_error "conditional \"DX_COND_chm\" was never defined.

12469

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12470

fi

12471

if test -z "${DX_COND_chi_TRUE}" && test -z "${DX_COND_chi_FALSE}"; then

12472

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_chi\" was never defined.

12473

-Usually this means the macro was only invoked conditionally." >&5

12474

-$as_echo "$as_me: error: conditional \"DX_COND_chi\" was never defined.

12475

-Usually this means the macro was only invoked conditionally." >&2;}

12476

- { (exit 1); exit 1; }; }

12477

+ as_fn_error "conditional \"DX_COND_chi\" was never defined.

12478

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12479

fi

12480

if test -z "${DX_COND_chi_TRUE}" && test -z "${DX_COND_chi_FALSE}"; then

12481

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_chi\" was never defined.

12482

-Usually this means the macro was only invoked conditionally." >&5

12483

-$as_echo "$as_me: error: conditional \"DX_COND_chi\" was never defined.

12484

-Usually this means the macro was only invoked conditionally." >&2;}

12485

- { (exit 1); exit 1; }; }

12486

+ as_fn_error "conditional \"DX_COND_chi\" was never defined.

12487

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12488

fi

12489

if test -z "${DX_COND_html_TRUE}" && test -z "${DX_COND_html_FALSE}"; then

12490

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_html\" was never defined.

12491

-Usually this means the macro was only invoked conditionally." >&5

12492

-$as_echo "$as_me: error: conditional \"DX_COND_html\" was never defined.

12493

-Usually this means the macro was only invoked conditionally." >&2;}

12494

- { (exit 1); exit 1; }; }

12495

+ as_fn_error "conditional \"DX_COND_html\" was never defined.

12496

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12497

fi

12498

if test -z "${DX_COND_html_TRUE}" && test -z "${DX_COND_html_FALSE}"; then

12499

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_html\" was never defined.

12500

-Usually this means the macro was only invoked conditionally." >&5

12501

-$as_echo "$as_me: error: conditional \"DX_COND_html\" was never defined.

12502

-Usually this means the macro was only invoked conditionally." >&2;}

12503

- { (exit 1); exit 1; }; }

12504

+ as_fn_error "conditional \"DX_COND_html\" was never defined.

12505

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12506

fi

12507

if test -z "${DX_COND_ps_TRUE}" && test -z "${DX_COND_ps_FALSE}"; then

12508

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_ps\" was never defined.

12509

-Usually this means the macro was only invoked conditionally." >&5

12510

-$as_echo "$as_me: error: conditional \"DX_COND_ps\" was never defined.

12511

-Usually this means the macro was only invoked conditionally." >&2;}

12512

- { (exit 1); exit 1; }; }

12513

+ as_fn_error "conditional \"DX_COND_ps\" was never defined.

12514

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12515

fi

12516

if test -z "${DX_COND_ps_TRUE}" && test -z "${DX_COND_ps_FALSE}"; then

12517

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_ps\" was never defined.

12518

-Usually this means the macro was only invoked conditionally." >&5

12519

-$as_echo "$as_me: error: conditional \"DX_COND_ps\" was never defined.

12520

-Usually this means the macro was only invoked conditionally." >&2;}

12521

- { (exit 1); exit 1; }; }

12522

+ as_fn_error "conditional \"DX_COND_ps\" was never defined.

12523

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12524

fi

12525

if test -z "${DX_COND_pdf_TRUE}" && test -z "${DX_COND_pdf_FALSE}"; then

12526

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_pdf\" was never defined.

12527

-Usually this means the macro was only invoked conditionally." >&5

12528

-$as_echo "$as_me: error: conditional \"DX_COND_pdf\" was never defined.

12529

-Usually this means the macro was only invoked conditionally." >&2;}

12530

- { (exit 1); exit 1; }; }

12531

+ as_fn_error "conditional \"DX_COND_pdf\" was never defined.

12532

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12533

fi

12534

if test -z "${DX_COND_pdf_TRUE}" && test -z "${DX_COND_pdf_FALSE}"; then

12535

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_pdf\" was never defined.

12536

-Usually this means the macro was only invoked conditionally." >&5

12537

-$as_echo "$as_me: error: conditional \"DX_COND_pdf\" was never defined.

12538

-Usually this means the macro was only invoked conditionally." >&2;}

12539

- { (exit 1); exit 1; }; }

12540

+ as_fn_error "conditional \"DX_COND_pdf\" was never defined.

12541

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12542

fi

12543

if test -z "${DX_COND_latex_TRUE}" && test -z "${DX_COND_latex_FALSE}"; then

12544

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_latex\" was never defined.

12545

-Usually this means the macro was only invoked conditionally." >&5

12546

-$as_echo "$as_me: error: conditional \"DX_COND_latex\" was never defined.

12547

-Usually this means the macro was only invoked conditionally." >&2;}

12548

- { (exit 1); exit 1; }; }

12549

+ as_fn_error "conditional \"DX_COND_latex\" was never defined.

12550

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12551

fi

12552

if test -z "${DX_COND_latex_TRUE}" && test -z "${DX_COND_latex_FALSE}"; then

12553

- { { $as_echo "$as_me:$LINENO: error: conditional \"DX_COND_latex\" was never defined.

12554

-Usually this means the macro was only invoked conditionally." >&5

12555

-$as_echo "$as_me: error: conditional \"DX_COND_latex\" was never defined.

12556

-Usually this means the macro was only invoked conditionally." >&2;}

12557

- { (exit 1); exit 1; }; }

12558

+ as_fn_error "conditional \"DX_COND_latex\" was never defined.

12559

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12560

fi

12561

if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then

12562

- { { $as_echo "$as_me:$LINENO: error: conditional \"DEBUG\" was never defined.

12563

-Usually this means the macro was only invoked conditionally." >&5

12564

-$as_echo "$as_me: error: conditional \"DEBUG\" was never defined.

12565

-Usually this means the macro was only invoked conditionally." >&2;}

12566

- { (exit 1); exit 1; }; }

12567

+ as_fn_error "conditional \"DEBUG\" was never defined.

12568

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12569

fi

12570

if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then

12571

- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.

12572

-Usually this means the macro was only invoked conditionally." >&5

12573

-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.

12574

-Usually this means the macro was only invoked conditionally." >&2;}

12575

- { (exit 1); exit 1; }; }

12576

+ as_fn_error "conditional \"AMDEP\" was never defined.

12577

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12578

fi

12579

if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then

12580

- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.

12581

-Usually this means the macro was only invoked conditionally." >&5

12582

-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.

12583

-Usually this means the macro was only invoked conditionally." >&2;}

12584

- { (exit 1); exit 1; }; }

12585

+ as_fn_error "conditional \"am__fastdepCC\" was never defined.

12586

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12587

fi

12588

if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then

12589

- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.

12590

-Usually this means the macro was only invoked conditionally." >&5

12591

-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.

12592

-Usually this means the macro was only invoked conditionally." >&2;}

12593

- { (exit 1); exit 1; }; }

12594

+ as_fn_error "conditional \"am__fastdepCC\" was never defined.

12595

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12596

fi

12597

if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then

12598

- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.

12599

-Usually this means the macro was only invoked conditionally." >&5

12600

-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.

12601

-Usually this means the macro was only invoked conditionally." >&2;}

12602

- { (exit 1); exit 1; }; }

12603

+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.

12604

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12605

fi

12606

12607

ac_config_commands="$ac_config_commands po/stamp-it"

12608

12609

12610

if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then

12611

- { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined.

12612

-Usually this means the macro was only invoked conditionally." >&5

12613

-$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined.

12614

-Usually this means the macro was only invoked conditionally." >&2;}

12615

- { (exit 1); exit 1; }; }

12616

+ as_fn_error "conditional \"PLATFORM_WIN32\" was never defined.

12617

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12618

fi

12619

if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then

12620

- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined.

12621

-Usually this means the macro was only invoked conditionally." >&5

12622

-$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined.

12623

-Usually this means the macro was only invoked conditionally." >&2;}

12624

- { (exit 1); exit 1; }; }

12625

+ as_fn_error "conditional \"OS_WIN32\" was never defined.

12626

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12627

fi

12628

if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then

12629

- { { $as_echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined.

12630

-Usually this means the macro was only invoked conditionally." >&5

12631

-$as_echo "$as_me: error: conditional \"OS_UNIX\" was never defined.

12632

-Usually this means the macro was only invoked conditionally." >&2;}

12633

- { (exit 1); exit 1; }; }

12634

+ as_fn_error "conditional \"OS_UNIX\" was never defined.

12635

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12636

fi

12637

if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then

12638

- { { $as_echo "$as_me:$LINENO: error: conditional \"MS_LIB_AVAILABLE\" was never defined.

12639

-Usually this means the macro was only invoked conditionally." >&5

12640

-$as_echo "$as_me: error: conditional \"MS_LIB_AVAILABLE\" was never defined.

12641

-Usually this means the macro was only invoked conditionally." >&2;}

12642

- { (exit 1); exit 1; }; }

12643

+ as_fn_error "conditional \"MS_LIB_AVAILABLE\" was never defined.

12644

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12645

fi

12646

if test -z "${HAVE_WINDRES_TRUE}" && test -z "${HAVE_WINDRES_FALSE}"; then

12647

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_WINDRES\" was never defined.

12648

-Usually this means the macro was only invoked conditionally." >&5

12649

-$as_echo "$as_me: error: conditional \"HAVE_WINDRES\" was never defined.

12650

-Usually this means the macro was only invoked conditionally." >&2;}

12651

- { (exit 1); exit 1; }; }

12652

+ as_fn_error "conditional \"HAVE_WINDRES\" was never defined.

12653

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12654

fi

12655

if test -z "${HAVE_LIRC_TRUE}" && test -z "${HAVE_LIRC_FALSE}"; then

12656

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIRC\" was never defined.

12657

-Usually this means the macro was only invoked conditionally." >&5

12658

-$as_echo "$as_me: error: conditional \"HAVE_LIRC\" was never defined.

12659

-Usually this means the macro was only invoked conditionally." >&2;}

12660

- { (exit 1); exit 1; }; }

12661

+ as_fn_error "conditional \"HAVE_LIRC\" was never defined.

12662

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12663

fi

12664

if test -z "${HAVE_LCMS_TRUE}" && test -z "${HAVE_LCMS_FALSE}"; then

12665

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LCMS\" was never defined.

12666

-Usually this means the macro was only invoked conditionally." >&5

12667

-$as_echo "$as_me: error: conditional \"HAVE_LCMS\" was never defined.

12668

-Usually this means the macro was only invoked conditionally." >&2;}

12669

- { (exit 1); exit 1; }; }

12670

+ as_fn_error "conditional \"HAVE_LCMS\" was never defined.

12671

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12672

fi

12673

if test -z "${HAVE_EXIV2_TRUE}" && test -z "${HAVE_EXIV2_FALSE}"; then

12674

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_EXIV2\" was never defined.

12675

-Usually this means the macro was only invoked conditionally." >&5

12676

-$as_echo "$as_me: error: conditional \"HAVE_EXIV2\" was never defined.

12677

-Usually this means the macro was only invoked conditionally." >&2;}

12678

- { (exit 1); exit 1; }; }

12679

+ as_fn_error "conditional \"HAVE_EXIV2\" was never defined.

12680

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12681

fi

12682

if test -z "${HAVE_LIBCHAMPLAIN_GTK_TRUE}" && test -z "${HAVE_LIBCHAMPLAIN_GTK_FALSE}"; then

12683

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_LIBCHAMPLAIN_GTK\" was never defined.

12684

-Usually this means the macro was only invoked conditionally." >&5

12685

-$as_echo "$as_me: error: conditional \"HAVE_LIBCHAMPLAIN_GTK\" was never defined.

12686

-Usually this means the macro was only invoked conditionally." >&2;}

12687

- { (exit 1); exit 1; }; }

12688

+ as_fn_error "conditional \"HAVE_LIBCHAMPLAIN_GTK\" was never defined.

12689

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

12690

fi

12691

12692

: ${CONFIG_STATUS=./config.status}

12693

ac_write_fail=0

12694

ac_clean_files_save=$ac_clean_files

12695

ac_clean_files="$ac_clean_files $CONFIG_STATUS"

12696

-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5

12697

+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5

12698

$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}

12699

-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

12700

+as_write_fail=0

12701

+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1

12702

#! $SHELL

12703

# Generated by $as_me.

12704

# Run this file to recreate the current configuration.

12705

@@ -12424,17 +10606,18 @@

12706

debug=false

12707

ac_cs_recheck=false

12708

ac_cs_silent=false

12709

-SHELL=\${CONFIG_SHELL-$SHELL}

12710

-_ACEOF

12711

12712

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

12713

-## --------------------- ##

12714

-## M4sh Initialization. ##

12715

-## --------------------- ##

12716

+SHELL=\${CONFIG_SHELL-$SHELL}

12717

+export SHELL

12718

+_ASEOF

12719

+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1

12720

+## -------------------- ##

12721

+## M4sh Initialization. ##

12722

+## -------------------- ##

12723

12724

# Be more Bourne compatible

12725

DUALCASE=1; export DUALCASE # for MKS sh

12726

-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

12727

+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :

12728

emulate sh

12729

NULLCMD=:

12730

# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

12731

@@ -12442,23 +10625,15 @@

12732

alias -g '${1+"$@"}'='"$@"'

12733

setopt NO_GLOB_SUBST

12734

else

12735

- case `(set -o) 2>/dev/null` in

12736

- *posix*) set -o posix ;;

12737

+ case `(set -o) 2>/dev/null` in #(

12738

+ *posix*) :

12739

+ set -o posix ;; #(

12740

+ *) :

12741

+ ;;

12742

esac

12743

-

12744

fi

12745

12746

12747

-

12748

-

12749

-# PATH needs CR

12750

-# Avoid depending upon Character Ranges.

12751

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

12752

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

12753

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

12754

-as_cr_digits='0123456789'

12755

-as_cr_alnum=$as_cr_Letters$as_cr_digits

12756

-

12757

as_nl='

12758

'

12759

export as_nl

12760

@@ -12466,7 +10641,13 @@

12761

as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

12762

as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

12763

as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

12764

-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

12765

+# Prefer a ksh shell builtin over an external printf program on Solaris,

12766

+# but without wasting forks for bash or zsh.

12767

+if test -z "$BASH_VERSION$ZSH_VERSION" \

12768

+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then

12769

+ as_echo='print -r --'

12770

+ as_echo_n='print -rn --'

12771

+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

12772

as_echo='printf %s\n'

12773

as_echo_n='printf %s'

12774

else

12775

@@ -12477,7 +10658,7 @@

12776

as_echo_body='eval expr "X$1" : "X\$.*\$"'

12777

as_echo_n_body='eval

12778

arg=$1;

12779

- case $arg in

12780

+ case $arg in #(

12781

*"$as_nl"*)

12782

expr "X$arg" : "X\$.*\$$as_nl";

12783

arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;

12784

@@ -12500,13 +10681,6 @@

12785

}

12786

fi

12787

12788

-# Support unset when possible.

12789

-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

12790

- as_unset=unset

12791

-else

12792

- as_unset=false

12793

-fi

12794

-

12795

12796

# IFS

12797

# We need space, tab and new line, in precisely that order. Quoting is

12798

@@ -12516,15 +10690,15 @@

12799

IFS=" "" $as_nl"

12800

12801

# Find who we are. Look in the path if we contain no directory separator.

12802

-case $0 in

12803

+case $0 in #((

12804

*[\\/]* ) as_myself=$0 ;;

12805

*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

12806

for as_dir in $PATH

12807

do

12808

IFS=$as_save_IFS

12809

test -z "$as_dir" && as_dir=.

12810

- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

12811

-done

12812

+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

12813

+ done

12814

IFS=$as_save_IFS

12815

12816

;;

12817

@@ -12536,12 +10710,16 @@

12818

fi

12819

if test ! -f "$as_myself"; then

12820

$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

12821

- { (exit 1); exit 1; }

12822

+ exit 1

12823

fi

12824

12825

-# Work around bugs in pre-3.0 UWIN ksh.

12826

-for as_var in ENV MAIL MAILPATH

12827

-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

12828

+# Unset variables that we do not need and which cause bugs (e.g. in

12829

+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"

12830

+# suppresses any "Segmentation fault" message there. '((' could

12831

+# trigger a bug in pdksh 5.2.14.

12832

+for as_var in BASH_ENV ENV MAIL MAILPATH

12833

+do eval test x\${$as_var+set} = xset \

12834

+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :

12835

done

12836

PS1='$ '

12837

PS2='> '

12838

@@ -12553,7 +10731,89 @@

12839

LANGUAGE=C

12840

export LANGUAGE

12841

12842

-# Required to use basename.

12843

+# CDPATH.

12844

+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

12845

+

12846

+

12847

+# as_fn_error ERROR [LINENO LOG_FD]

12848

+# ---------------------------------

12849

+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are

12850

+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the

12851

+# script with status $?, using 1 if that was 0.

12852

+as_fn_error ()

12853

+{

12854

+ as_status=$?; test $as_status -eq 0 && as_status=1

12855

+ if test "$3"; then

12856

+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

12857

+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3

12858

+ fi

12859

+ $as_echo "$as_me: error: $1" >&2

12860

+ as_fn_exit $as_status

12861

+} # as_fn_error

12862

+

12863

+

12864

+# as_fn_set_status STATUS

12865

+# -----------------------

12866

+# Set $? to STATUS, without forking.

12867

+as_fn_set_status ()

12868

+{

12869

+ return $1

12870

+} # as_fn_set_status

12871

+

12872

+# as_fn_exit STATUS

12873

+# -----------------

12874

+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.

12875

+as_fn_exit ()

12876

+{

12877

+ set +e

12878

+ as_fn_set_status $1

12879

+ exit $1

12880

+} # as_fn_exit

12881

+

12882

+# as_fn_unset VAR

12883

+# ---------------

12884

+# Portably unset VAR.

12885

+as_fn_unset ()

12886

+{

12887

+ { eval $1=; unset $1;}

12888

+}

12889

+as_unset=as_fn_unset

12890

+# as_fn_append VAR VALUE

12891

+# ----------------------

12892

+# Append the text in VALUE to the end of the definition contained in VAR. Take

12893

+# advantage of any shell optimizations that allow amortized linear growth over

12894

+# repeated appends, instead of the typical quadratic growth present in naive

12895

+# implementations.

12896

+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :

12897

+ eval 'as_fn_append ()

12898

+ {

12899

+ eval $1+=\$2

12900

+ }'

12901

+else

12902

+ as_fn_append ()

12903

+ {

12904

+ eval $1=\$$1\$2

12905

+ }

12906

+fi # as_fn_append

12907

+

12908

+# as_fn_arith ARG...

12909

+# ------------------

12910

+# Perform arithmetic evaluation on the ARGs, and store the result in the

12911

+# global $as_val. Take advantage of shells that can avoid forks. The arguments

12912

+# must be portable across $(()) and expr.

12913

+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :

12914

+ eval 'as_fn_arith ()

12915

+ {

12916

+ as_val=$(( $* ))

12917

+ }'

12918

+else

12919

+ as_fn_arith ()

12920

+ {

12921

+ as_val=`expr "$@" || test $? -eq 1`

12922

+ }

12923

+fi # as_fn_arith

12924

+

12925

+

12926

if expr a : '$a$' >/dev/null 2>&1 &&

12927

test "X`expr 00001 : '.*$...$'`" = X001; then

12928

as_expr=expr

12929

@@ -12567,8 +10827,12 @@

12930

as_basename=false

12931

fi

12932

12933

+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

12934

+ as_dirname=dirname

12935

+else

12936

+ as_dirname=false

12937

+fi

12938

12939

-# Name of the executable.

12940

as_me=`$as_basename -- "$0" ||

12941

$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

12942

X"$0" : 'X$//$$' \| \

12943

@@ -12588,76 +10852,25 @@

12944

}

12945

s/.*/./; q'`

12946

12947

-# CDPATH.

12948

-$as_unset CDPATH

12949

-

12950

-

12951

-

12952

- as_lineno_1=$LINENO

12953

- as_lineno_2=$LINENO

12954

- test "x$as_lineno_1" != "x$as_lineno_2" &&

12955

- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {

12956

-

12957

- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO

12958

- # uniformly replaced by the line number. The first 'sed' inserts a

12959

- # line-number line after each line using $LINENO; the second 'sed'

12960

- # does the real work. The second script uses 'N' to pair each

12961

- # line-number line with the line containing $LINENO, and appends

12962

- # trailing '-' during substitution so that $LINENO is not a special

12963

- # case at line end.

12964

- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the

12965

- # scripts with optimization help from Paolo Bonzini. Blame Lee

12966

- # E. McMahon (1931-1989) for sed's syntax. :-)

12967

- sed -n '

12968

- p

12969

- /[$]LINENO/=

12970

- ' <$as_myself |

12971

- sed '

12972

- s/[$]LINENO.*/&-/

12973

- t lineno

12974

- b

12975

- :lineno

12976

- N

12977

- :loop

12978

- s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/

12979

- t loop

12980

- s/-\n.*//

12981

- ' >$as_me.lineno &&

12982

- chmod +x "$as_me.lineno" ||

12983

- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

12984

- { (exit 1); exit 1; }; }

12985

-

12986

- # Don't try to exec as it changes $[0], causing all sort of problems

12987

- # (the dirname of $[0] is not the place where we might find the

12988

- # original and so on. Autoconf is especially sensitive to this).

12989

- . "./$as_me.lineno"

12990

- # Exit status is that of the last command.

12991

- exit

12992

-}

12993

-

12994

-

12995

-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then

12996

- as_dirname=dirname

12997

-else

12998

- as_dirname=false

12999

-fi

13000

+# Avoid depending upon Character Ranges.

13001

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

13002

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

13003

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

13004

+as_cr_digits='0123456789'

13005

+as_cr_alnum=$as_cr_Letters$as_cr_digits

13006

13007

ECHO_C= ECHO_N= ECHO_T=

13008

-case `echo -n x` in

13009

+case `echo -n x` in #(((((

13010

-n*)

13011

- case `echo 'x\c'` in

13012

+ case `echo 'xy\c'` in

13013

*c*) ECHO_T=' ';; # ECHO_T is single tab character.

13014

- *) ECHO_C='\c';;

13015

+ xy) ECHO_C='\c';;

13016

+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null

13017

+ ECHO_T=' ';;

13018

esac;;

13019

*)

13020

ECHO_N='-n';;

13021

esac

13022

-if expr a : '$a$' >/dev/null 2>&1 &&

13023

- test "X`expr 00001 : '.*$...$'`" = X001; then

13024

- as_expr=expr

13025

-else

13026

- as_expr=false

13027

-fi

13028

13029

rm -f conf$$ conf$$.exe conf$$.file

13030

if test -d conf$$.dir; then

13031

@@ -12686,8 +10899,56 @@

13032

rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file

13033

rmdir conf$$.dir 2>/dev/null

13034

13035

+

13036

+# as_fn_mkdir_p

13037

+# -------------

13038

+# Create "$as_dir" as a directory, including parents if necessary.

13039

+as_fn_mkdir_p ()

13040

+{

13041

+

13042

+ case $as_dir in #(

13043

+ -*) as_dir=./$as_dir;;

13044

+ esac

13045

+ test -d "$as_dir" || eval $as_mkdir_p || {

13046

+ as_dirs=

13047

+ while :; do

13048

+ case $as_dir in #(

13049

+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

13050

+ *) as_qdir=$as_dir;;

13051

+ esac

13052

+ as_dirs="'$as_qdir' $as_dirs"

13053

+ as_dir=`$as_dirname -- "$as_dir" ||

13054

+$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

13055

+ X"$as_dir" : 'X$//$[^/]' \| \

13056

+ X"$as_dir" : 'X$//$$' \| \

13057

+ X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

13058

+$as_echo X"$as_dir" |

13059

+ sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

13060

+ s//\1/

13061

+ q

13062

+ }

13063

+ /^X$\/\/$[^/].*/{

13064

+ s//\1/

13065

+ q

13066

+ }

13067

+ /^X$\/\/$$/{

13068

+ s//\1/

13069

+ q

13070

+ }

13071

+ /^X$\/$.*/{

13072

+ s//\1/

13073

+ q

13074

+ }

13075

+ s/.*/./; q'`

13076

+ test -d "$as_dir" && break

13077

+ done

13078

+ test -z "$as_dirs" || eval "mkdir $as_dirs"

13079

+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"

13080

+

13081

+

13082

+} # as_fn_mkdir_p

13083

if mkdir -p . 2>/dev/null; then

13084

- as_mkdir_p=:

13085

+ as_mkdir_p='mkdir -p "$as_dir"'

13086

else

13087

test -d ./-p && rmdir ./-p

13088

as_mkdir_p=false

13089

@@ -12706,10 +10967,10 @@

13090

if test -d "$1"; then

13091

test -d "$1/.";

13092

else

13093

- case $1 in

13094

+ case $1 in #(

13095

-*)set "./$1";;

13096

esac;

13097

- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

13098

+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((

13099

???[sx]*):;;*)false;;esac;fi

13100

'\'' sh

13101

'

13102

@@ -12724,13 +10985,19 @@

13103

13104

13105

exec 6>&1

13106

+## ----------------------------------- ##

13107

+## Main body of $CONFIG_STATUS script. ##

13108

+## ----------------------------------- ##

13109

+_ASEOF

13110

+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1

13111

13112

-# Save the log message, to keep $[0] and so on meaningful, and to

13113

+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

13114

+# Save the log message, to keep $0 and so on meaningful, and to

13115

# report actual input values of CONFIG_FILES etc. instead of their

13116

# values after options handling.

13117

ac_log="

13118

This file was extended by geeqie $as_me 1.0beta2, which was

13119

-generated by GNU Autoconf 2.63. Invocation command line was

13120

+generated by GNU Autoconf 2.64. Invocation command line was

13121

13122

CONFIG_FILES = $CONFIG_FILES

13123

CONFIG_HEADERS = $CONFIG_HEADERS

13124

@@ -12762,10 +11029,11 @@

13125

13126

cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

13127

ac_cs_usage="\

13128

-\`$as_me' instantiates files from templates according to the

13129

-current configuration.

13130

+\`$as_me' instantiates files and other configuration actions

13131

+from templates according to the current configuration. Unless the files

13132

+and actions are specified as TAGs, all are instantiated by default.

13133

13134

-Usage: $0 [OPTION]... [FILE]...

13135

+Usage: $0 [OPTION]... [TAG]...

13136

13137

-h, --help print this help, then exit

13138

-V, --version print version number and configuration settings, then exit

13139

@@ -12787,16 +11055,16 @@

13140

Configuration commands:

13141

$config_commands

13142

13143

-Report bugs to <bug-autoconf@gnu.org>."

13144

+Report bugs to <geeqie-devel@lists.sourceforge.net>."

13145

13146

_ACEOF

13147

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

13148

ac_cs_version="\\

13149

geeqie config.status 1.0beta2

13150

-configured by $0, generated by GNU Autoconf 2.63,

13151

+configured by $0, generated by GNU Autoconf 2.64,

13152

with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

13153

13154

13155

13156

This config.status script is free software; the Free Software Foundation

13157

gives unlimited permission to copy, distribute and modify it."

13158

13159

@@ -12839,20 +11107,19 @@

13160

case $ac_optarg in

13161

*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

13162

esac

13163

- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"

13164

+ as_fn_append CONFIG_FILES " '$ac_optarg'"

13165

ac_need_defaults=false;;

13166

--header | --heade | --head | --hea )

13167

$ac_shift

13168

case $ac_optarg in

13169

*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

13170

esac

13171

- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"

13172

+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"

13173

ac_need_defaults=false;;

13174

--he | --h)

13175

# Conflict between --help and --header

13176

- { $as_echo "$as_me: error: ambiguous option: $1

13177

-Try \`$0 --help' for more information." >&2

13178

- { (exit 1); exit 1; }; };;

13179

+ as_fn_error "ambiguous option: \`$1'

13180

+Try \`$0 --help' for more information.";;

13181

--help | --hel | -h )

13182

$as_echo "$ac_cs_usage"; exit ;;

13183

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

13184

@@ -12860,11 +11127,10 @@

13185

ac_cs_silent=: ;;

13186

13187

# This is an error.

13188

- -*) { $as_echo "$as_me: error: unrecognized option: $1

13189

-Try \`$0 --help' for more information." >&2

13190

- { (exit 1); exit 1; }; } ;;

13191

+ -*) as_fn_error "unrecognized option: \`$1'

13192

+Try \`$0 --help' for more information." ;;

13193

13194

- *) ac_config_targets="$ac_config_targets $1"

13195

+ *) as_fn_append ac_config_targets " $1"

13196

ac_need_defaults=false ;;

13197

13198

esac

13199

@@ -12933,9 +11199,7 @@

13200

"geeqie.spec") CONFIG_FILES="$CONFIG_FILES geeqie.spec" ;;

13201

"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;

13202

13203

- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

13204

-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

13205

- { (exit 1); exit 1; }; };;

13206

+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

13207

esac

13208

done

13209

13210

@@ -12962,7 +11226,7 @@

13211

trap 'exit_status=$?

13212

{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status

13213

' 0

13214

- trap '{ (exit 1); exit 1; }' 1 2 13 15

13215

+ trap 'as_fn_exit 1' 1 2 13 15

13216

}

13217

# Create a (secure) tmp directory for tmp files.

13218

13219

@@ -12973,11 +11237,7 @@

13220

{

13221

tmp=./conf$$-$RANDOM

13222

(umask 077 && mkdir "$tmp")

13223

-} ||

13224

-{

13225

- $as_echo "$as_me: cannot create a temporary directory in ." >&2

13226

- { (exit 1); exit 1; }

13227

-}

13228

+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5

13229

13230

# Set up the scripts for CONFIG_FILES section.

13231

# No need to generate them if there are no CONFIG_FILES.

13232

@@ -12985,10 +11245,16 @@

13233

if test -n "$CONFIG_FILES"; then

13234

13235

13236

-ac_cr='

b"'"

13237

+ac_cr=`echo X | tr X '\015'`

13238

+# On cygwin, bash can eat \r inside `` if the user requested igncr.

13239

+# But we know of no other shell where ac_cr would be empty at this

13240

+# point, so we can use a bashism as a fallback.

13241

+if test "x$ac_cr" = x; then

13242

+ eval ac_cr=\$\'\\r\'

13243

+fi

13244

ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`

13245

if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then

13246

- ac_cs_awk_cr='\\r'

13247

+ ac_cs_awk_cr='\r'

13248

else

13249

ac_cs_awk_cr=$ac_cr

13250

fi

13251

@@ -13002,24 +11268,18 @@

13252

echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&

13253

echo "_ACEOF"

13254

} >conf$$subs.sh ||

13255

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

13256

-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

13257

- { (exit 1); exit 1; }; }

13258

+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

13259

ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`

13260

ac_delim='%!_!# '

13261

for ac_last_try in false false false false false :; do

13262

. ./conf$$subs.sh ||

13263

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

13264

-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

13265

- { (exit 1); exit 1; }; }

13266

+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

13267

13268

ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`

13269

if test $ac_delim_n = $ac_delim_num; then

13270

break

13271

elif $ac_last_try; then

13272

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

13273

-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

13274

- { (exit 1); exit 1; }; }

13275

+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

13276

else

13277

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

13278

fi

13279

@@ -13108,9 +11368,7 @@

13280

else

13281

cat

13282

fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \

13283

- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5

13284

-$as_echo "$as_me: error: could not setup config files machinery" >&2;}

13285

- { (exit 1); exit 1; }; }

13286

+ || as_fn_error "could not setup config files machinery" "$LINENO" 5

13287

_ACEOF

13288

13289

# VPATH may cause trouble with some makes, so we remove $(srcdir),

13290

@@ -13151,9 +11409,7 @@

13291

if test -z "$ac_t"; then

13292

break

13293

elif $ac_last_try; then

13294

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5

13295

-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}

13296

- { (exit 1); exit 1; }; }

13297

+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5

13298

else

13299

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

13300

fi

13301

@@ -13238,9 +11494,7 @@

13302

_ACAWK

13303

_ACEOF

13304

cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

13305

- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5

13306

-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}

13307

- { (exit 1); exit 1; }; }

13308

+ as_fn_error "could not setup config headers machinery" "$LINENO" 5

13309

fi # test -n "$CONFIG_HEADERS"

13310

13311

13312

@@ -13253,9 +11507,7 @@

13313

esac

13314

case $ac_mode$ac_tag in

13315

:[FHL]*:*);;

13316

- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5

13317

-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}

13318

- { (exit 1); exit 1; }; };;

13319

+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;

13320

:[FH]-) ac_tag=-:-;;

13321

:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;

13322

esac

13323

@@ -13283,12 +11535,10 @@

13324

[\\/$]*) false;;

13325

*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;

13326

esac ||

13327

- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5

13328

-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}

13329

- { (exit 1); exit 1; }; };;

13330

+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;

13331

esac

13332

case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac

13333

- ac_file_inputs="$ac_file_inputs '$ac_f'"

13334

+ as_fn_append ac_file_inputs " '$ac_f'"

13335

done

13336

13337

# Let's still pretend it is `configure' which instantiates (i.e., don't

13338

@@ -13299,7 +11549,7 @@

13339

`' by configure.'

13340

if test x"$ac_file" != x-; then

13341

configure_input="$ac_file. $configure_input"

13342

- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5

13343

+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5

13344

$as_echo "$as_me: creating $ac_file" >&6;}

13345

fi

13346

# Neutralize special characters interpreted by sed in replacement strings.

13347

@@ -13312,9 +11562,7 @@

13348

13349

case $ac_tag in

13350

*:-:* | *:-) cat >"$tmp/stdin" \

13351

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

13352

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

13353

- { (exit 1); exit 1; }; } ;;

13354

+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;

13355

esac

13356

;;

13357

esac

13358

@@ -13342,47 +11590,7 @@

13359

q

13360

}

13361

s/.*/./; q'`

13362

- { as_dir="$ac_dir"

13363

- case $as_dir in #(

13364

- -*) as_dir=./$as_dir;;

13365

- esac

13366

- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

13367

- as_dirs=

13368

- while :; do

13369

- case $as_dir in #(

13370

- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

13371

- *) as_qdir=$as_dir;;

13372

- esac

13373

- as_dirs="'$as_qdir' $as_dirs"

13374

- as_dir=`$as_dirname -- "$as_dir" ||

13375

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

13376

- X"$as_dir" : 'X$//$[^/]' \| \

13377

- X"$as_dir" : 'X$//$$' \| \

13378

- X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

13379

-$as_echo X"$as_dir" |

13380

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

13381

- s//\1/

13382

- q

13383

- }

13384

- /^X$\/\/$[^/].*/{

13385

- s//\1/

13386

- q

13387

- }

13388

- /^X$\/\/$$/{

13389

- s//\1/

13390

- q

13391

- }

13392

- /^X$\/$.*/{

13393

- s//\1/

13394

- q

13395

- }

13396

- s/.*/./; q'`

13397

- test -d "$as_dir" && break

13398

- done

13399

- test -z "$as_dirs" || eval "mkdir $as_dirs"

13400

- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

13401

-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}

13402

- { (exit 1); exit 1; }; }; }

13403

+ as_dir="$ac_dir"; as_fn_mkdir_p

13404

ac_builddir=.

13405

13406

case "$ac_dir" in

13407

@@ -13439,7 +11647,6 @@

13408

# If the template does not know about datarootdir, expand it.

13409

# FIXME: This hack should be removed a few years after 2.60.

13410

ac_datarootdir_hack=; ac_datarootdir_seen=

13411

-

13412

ac_sed_dataroot='

13413

/datarootdir/ {

13414

p

13415

@@ -13449,12 +11656,11 @@

13416

/@docdir@/p

13417

/@infodir@/p

13418

/@localedir@/p

13419

-/@mandir@/p

13420

-'

13421

+/@mandir@/p'

13422

case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in

13423

*datarootdir*) ac_datarootdir_seen=yes;;

13424

*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)

13425

- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

13426

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

13427

$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

13428

_ACEOF

13429

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

13430

@@ -13464,7 +11670,7 @@

13431

s&@infodir@&$infodir&g

13432

s&@localedir@&$localedir&g

13433

s&@mandir@&$mandir&g

13434

- s&\\\${datarootdir}&$datarootdir&g' ;;

13435

+ s&\\\${datarootdir}&$datarootdir&g' ;;

13436

esac

13437

_ACEOF

13438

13439

@@ -13493,14 +11699,12 @@

13440

$ac_datarootdir_hack

13441

"

13442

eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \

13443

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

13444

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

13445

- { (exit 1); exit 1; }; }

13446

+ || as_fn_error "could not create $ac_file" "$LINENO" 5

13447

13448

test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&

13449

{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

13450

{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

13451

- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'

13452

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'

13453

which seems to be undefined. Please make sure it is defined." >&5

13454

$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

13455

which seems to be undefined. Please make sure it is defined." >&2;}

13456

@@ -13510,9 +11714,7 @@

13457

-) cat "$tmp/out" && rm -f "$tmp/out";;

13458

*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;

13459

esac \

13460

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

13461

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

13462

- { (exit 1); exit 1; }; }

13463

+ || as_fn_error "could not create $ac_file" "$LINENO" 5

13464

;;

13465

:H)

13466

#

13467

@@ -13523,25 +11725,19 @@

13468

$as_echo "/* $configure_input */" \

13469

&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"

13470

} >"$tmp/config.h" \

13471

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

13472

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

13473

- { (exit 1); exit 1; }; }

13474

+ || as_fn_error "could not create $ac_file" "$LINENO" 5

13475

if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then

13476

- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5

13477

+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5

13478

$as_echo "$as_me: $ac_file is unchanged" >&6;}

13479

else

13480

rm -f "$ac_file"

13481

mv "$tmp/config.h" "$ac_file" \

13482

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

13483

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

13484

- { (exit 1); exit 1; }; }

13485

+ || as_fn_error "could not create $ac_file" "$LINENO" 5

13486

fi

13487

else

13488

$as_echo "/* $configure_input */" \

13489

&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \

13490

- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5

13491

-$as_echo "$as_me: error: could not create -" >&2;}

13492

- { (exit 1); exit 1; }; }

13493

+ || as_fn_error "could not create -" "$LINENO" 5

13494

fi

13495

# Compute "$ac_file"'s index in $config_headers.

13496

_am_arg="$ac_file"

13497

@@ -13579,25 +11775,35 @@

13498

s/.*/./; q'`/stamp-h$_am_stamp_count

13499

;;

13500

13501

- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5

13502

+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5

13503

$as_echo "$as_me: executing $ac_file commands" >&6;}

13504

;;

13505

esac

13506

13507

13508

case $ac_file$ac_mode in

13509

- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do

13510

- # Strip MF so we end up with the name of the file.

13511

- mf=`echo "$mf" | sed -e 's/:.*$//'`

13512

- # Check whether this is an Automake generated Makefile or not.

13513

- # We used to match only the files named `Makefile.in', but

13514

- # some people rename them; so instead we look at the file content.

13515

- # Grep'ing the first line is not enough: some people post-process

13516

- # each Makefile.in and add a new line on top of each file to say so.

13517

- # Grep'ing the whole file is not good either: AIX grep has a line

13518

- # limit of 2048, but all sed's we know have understand at least 4000.

13519

- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

13520

- dirpart=`$as_dirname -- "$mf" ||

13521

+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {

13522

+ # Autoconf 2.62 quotes --file arguments for eval, but not when files

13523

+ # are listed without --file. Let's play safe and only enable the eval

13524

+ # if we detect the quoting.

13525

+ case $CONFIG_FILES in

13526

+ *\'*) eval set x "$CONFIG_FILES" ;;

13527

+ *) set x $CONFIG_FILES ;;

13528

+ esac

13529

+ shift

13530

+ for mf

13531

+ do

13532

+ # Strip MF so we end up with the name of the file.

13533

+ mf=`echo "$mf" | sed -e 's/:.*$//'`

13534

+ # Check whether this is an Automake generated Makefile or not.

13535

+ # We used to match only the files named `Makefile.in', but

13536

+ # some people rename them; so instead we look at the file content.

13537

+ # Grep'ing the first line is not enough: some people post-process

13538

+ # each Makefile.in and add a new line on top of each file to say so.

13539

+ # Grep'ing the whole file is not good either: AIX grep has a line

13540

+ # limit of 2048, but all sed's we know have understand at least 4000.

13541

+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

13542

+ dirpart=`$as_dirname -- "$mf" ||

13543

$as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

13544

X"$mf" : 'X$//$[^/]' \| \

13545

X"$mf" : 'X$//$$' \| \

13546

@@ -13620,28 +11826,28 @@

13547

q

13548

}

13549

s/.*/./; q'`

13550

- else

13551

- continue

13552

- fi

13553

- # Extract the definition of DEPDIR, am__include, and am__quote

13554

- # from the Makefile without running `make'.

13555

- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

13556

- test -z "$DEPDIR" && continue

13557

- am__include=`sed -n 's/^am__include = //p' < "$mf"`

13558

- test -z "am__include" && continue

13559

- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

13560

- # When using ansi2knr, U may be empty or an underscore; expand it

13561

- U=`sed -n 's/^U = //p' < "$mf"`

13562

- # Find all dependency output files, they are included files with

13563

- # $(DEPDIR) in their names. We invoke sed twice because it is the

13564

- # simplest approach to changing $(DEPDIR) to its actual value in the

13565

- # expansion.

13566

- for file in `sed -n "

13567

- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

13568

- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

13569

- # Make sure the directory exists.

13570

- test -f "$dirpart/$file" && continue

13571

- fdir=`$as_dirname -- "$file" ||

13572

+ else

13573

+ continue

13574

+ fi

13575

+ # Extract the definition of DEPDIR, am__include, and am__quote

13576

+ # from the Makefile without running `make'.

13577

+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

13578

+ test -z "$DEPDIR" && continue

13579

+ am__include=`sed -n 's/^am__include = //p' < "$mf"`

13580

+ test -z "am__include" && continue

13581

+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

13582

+ # When using ansi2knr, U may be empty or an underscore; expand it

13583

+ U=`sed -n 's/^U = //p' < "$mf"`

13584

+ # Find all dependency output files, they are included files with

13585

+ # $(DEPDIR) in their names. We invoke sed twice because it is the

13586

+ # simplest approach to changing $(DEPDIR) to its actual value in the

13587

+ # expansion.

13588

+ for file in `sed -n "

13589

+ s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

13590

+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

13591

+ # Make sure the directory exists.

13592

+ test -f "$dirpart/$file" && continue

13593

+ fdir=`$as_dirname -- "$file" ||

13594

$as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

13595

X"$file" : 'X$//$[^/]' \| \

13596

X"$file" : 'X$//$$' \| \

13597

@@ -13664,60 +11870,19 @@

13598

q

13599

}

13600

s/.*/./; q'`

13601

- { as_dir=$dirpart/$fdir

13602

- case $as_dir in #(

13603

- -*) as_dir=./$as_dir;;

13604

- esac

13605

- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {

13606

- as_dirs=

13607

- while :; do

13608

- case $as_dir in #(

13609

- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

13610

- *) as_qdir=$as_dir;;

13611

- esac

13612

- as_dirs="'$as_qdir' $as_dirs"

13613

- as_dir=`$as_dirname -- "$as_dir" ||

13614

-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

13615

- X"$as_dir" : 'X$//$[^/]' \| \

13616

- X"$as_dir" : 'X$//$$' \| \

13617

- X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

13618

-$as_echo X"$as_dir" |

13619

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

13620

- s//\1/

13621

- q

13622

- }

13623

- /^X$\/\/$[^/].*/{

13624

- s//\1/

13625

- q

13626

- }

13627

- /^X$\/\/$$/{

13628

- s//\1/

13629

- q

13630

- }

13631

- /^X$\/$.*/{

13632

- s//\1/

13633

- q

13634

- }

13635

- s/.*/./; q'`

13636

- test -d "$as_dir" && break

13637

+ as_dir=$dirpart/$fdir; as_fn_mkdir_p

13638

+ # echo "creating $dirpart/$file"

13639

+ echo '# dummy' > "$dirpart/$file"

13640

done

13641

- test -z "$as_dirs" || eval "mkdir $as_dirs"

13642

- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

13643

-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}

13644

- { (exit 1); exit 1; }; }; }

13645

- # echo "creating $dirpart/$file"

13646

- echo '# dummy' > "$dirpart/$file"

13647

done

13648

-done

13649

+}

13650

;;

13651

"default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)

13652

sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile

13653

esac ;;

13654

"po/stamp-it":C)

13655

if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then

13656

- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5

13657

-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}

13658

- { (exit 1); exit 1; }; }

13659

+ as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5

13660

fi

13661

rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"

13662

>"po/stamp-it.tmp"

13663

@@ -13740,15 +11905,12 @@

13664

done # for ac_tag

13665

13666

13667

-{ (exit 0); exit 0; }

13668

+as_fn_exit 0

13669

_ACEOF

13670

-chmod +x $CONFIG_STATUS

13671

ac_clean_files=$ac_clean_files_save

13672

13673

test $ac_write_fail = 0 ||

13674

- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5

13675

-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}

13676

- { (exit 1); exit 1; }; }

13677

+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5

13678

13679

13680

# configure is writing to config.log, and then calls config.status.

13681

@@ -13769,10 +11931,10 @@

13682

exec 5>>config.log

13683

# Use ||, not &&, to avoid exiting from the if with $? = 1, which

13684

# would make configure fail if this is the last instruction.

13685

- $ac_cs_success || { (exit 1); exit 1; }

13686

+ $ac_cs_success || as_fn_exit $?

13687

fi

13688

if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then

13689

- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

13690

+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

13691

$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}

13692

fi

13693

13694

--- a/doc/Makefile.in

13695

+++ b/doc/Makefile.in

13696

@@ -1,8 +1,9 @@

13697

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

13698

+# Makefile.in generated by automake 1.11 from Makefile.am.

13699

# @configure_input@

13700

13701

13702

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

13703

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

13704

+# Inc.

13705

# This Makefile.in is free software; the Free Software Foundation

13706

# gives unlimited permission to copy and/or distribute it,

13707

# with or without modifications, as long as this notice is preserved.

13708

@@ -16,8 +17,9 @@

13709

13710

VPATH = @srcdir@

13711

pkgdatadir = $(datadir)/@PACKAGE@

13712

-pkglibdir = $(libdir)/@PACKAGE@

13713

pkgincludedir = $(includedir)/@PACKAGE@

13714

+pkglibdir = $(libdir)/@PACKAGE@

13715

+pkglibexecdir = $(libexecdir)/@PACKAGE@

13716

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

13717

install_sh_DATA = $(install_sh) -c -m 644

13718

install_sh_PROGRAM = $(install_sh) -c

13719

@@ -40,6 +42,7 @@

13720

mkinstalldirs = $(SHELL) $(top_srcdir)/auxdir/mkinstalldirs

13721

CONFIG_HEADER = $(top_builddir)/config.h

13722

CONFIG_CLEAN_FILES =

13723

+CONFIG_CLEAN_VPATH_FILES =

13724

SOURCES =

13725

DIST_SOURCES =

13726

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

13727

@@ -47,9 +50,23 @@

13728

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

13729

*) f=$$p;; \

13730

esac;

13731

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

13732

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

13733

+am__install_max = 40

13734

+am__nobase_strip_setup = \

13735

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

13736

+am__nobase_strip = \

13737

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

13738

+am__nobase_list = $(am__nobase_strip_setup); \

13739

+ for p in $$list; do echo "$$p $$p"; done | \

13740

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

13741

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

13742

+ if (++n[$$2] == $(am__install_max)) \

13743

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

13744

+ END { for (dir in files) print dir, files[dir] }'

13745

+am__base_list = \

13746

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

13747

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

13748

am__installdirs = "$(DESTDIR)$(helpdir)"

13749

-helpDATA_INSTALL = $(INSTALL_DATA)

13750

DATA = $(help_DATA)

13751

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

13752

ACLOCAL = @ACLOCAL@

13753

@@ -144,6 +161,7 @@

13754

MAINT = @MAINT@

13755

MAKEINFO = @MAKEINFO@

13756

MKDIR_P = @MKDIR_P@

13757

+MKINSTALLDIRS = @MKINSTALLDIRS@

13758

MSGFMT = @MSGFMT@

13759

MSGFMT_OPTS = @MSGFMT_OPTS@

13760

MSGMERGE = @MSGMERGE@

13761

@@ -153,6 +171,7 @@

13762

PACKAGE_NAME = @PACKAGE_NAME@

13763

PACKAGE_STRING = @PACKAGE_STRING@

13764

PACKAGE_TARNAME = @PACKAGE_TARNAME@

13765

+PACKAGE_URL = @PACKAGE_URL@

13766

PACKAGE_VERSION = @PACKAGE_VERSION@

13767

PATHSEP = @PATHSEP@

13768

PATH_SEPARATOR = @PATH_SEPARATOR@

13769

@@ -275,14 +294,14 @@

13770

@for dep in $?; do \

13771

case '$(am__configure_deps)' in \

13772

*$$dep*) \

13773

- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

13774

- && exit 0; \

13775

+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

13776

+ && { if test -f $@; then exit 0; else break; fi; }; \

13777

exit 1;; \

13778

esac; \

13779

done; \

13780

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \

13781

- cd $(top_srcdir) && \

13782

- $(AUTOMAKE) --gnu doc/Makefile

13783

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \

13784

+ $(am__cd) $(top_srcdir) && \

13785

+ $(AUTOMAKE) --gnu doc/Makefile

13786

.PRECIOUS: Makefile

13787

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

13788

@case '$?' in \

13789

@@ -300,23 +319,27 @@

13790

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

13791

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

13792

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

13793

+$(am__aclocal_m4_deps):

13794

install-helpDATA: $(help_DATA)

13795

@$(NORMAL_INSTALL)

13796

test -z "$(helpdir)" || $(MKDIR_P) "$(DESTDIR)$(helpdir)"

13797

- @list='$(help_DATA)'; for p in $$list; do \

13798

+ @list='$(help_DATA)'; test -n "$(helpdir)" || list=; \

13799

+ for p in $$list; do \

13800

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

13801

- f=$(am__strip_dir) \

13802

- echo " $(helpDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(helpdir)/$$f'"; \

13803

- $(helpDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(helpdir)/$$f"; \

13804

+ echo "$$d$$p"; \

13805

+ done | $(am__base_list) | \

13806

+ while read files; do \

13807

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(helpdir)'"; \

13808

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(helpdir)" || exit $$?; \

13809

done

13810

13811

uninstall-helpDATA:

13812

@$(NORMAL_UNINSTALL)

13813

- @list='$(help_DATA)'; for p in $$list; do \

13814

- f=$(am__strip_dir) \

13815

- echo " rm -f '$(DESTDIR)$(helpdir)/$$f'"; \

13816

- rm -f "$(DESTDIR)$(helpdir)/$$f"; \

13817

- done

13818

+ @list='$(help_DATA)'; test -n "$(helpdir)" || list=; \

13819

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

13820

+ test -n "$$files" || exit 0; \

13821

+ echo " ( cd '$(DESTDIR)$(helpdir)' && rm -f" $$files ")"; \

13822

+ cd "$(DESTDIR)$(helpdir)" && rm -f $$files

13823

tags: TAGS

13824

TAGS:

13825

13826

@@ -340,13 +363,17 @@

13827

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

13828

if test -d $$d/$$file; then \

13829

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

13830

+ if test -d "$(distdir)/$$file"; then \

13831

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

13832

+ fi; \

13833

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

13834

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

13835

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

13836

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

13837

fi; \

13838

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

13839

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

13840

else \

13841

- test -f $(distdir)/$$file \

13842

- || cp -p $$d/$$file $(distdir)/$$file \

13843

+ test -f "$(distdir)/$$file" \

13844

+ || cp -p $$d/$$file "$(distdir)/$$file" \

13845

|| exit 1; \

13846

fi; \

13847

done

13848

@@ -377,6 +404,7 @@

13849

13850

distclean-generic:

13851

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

13852

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

13853

13854

maintainer-clean-generic:

13855

@echo "This command is intended for maintainers to use"

13856

@@ -395,6 +423,8 @@

13857

13858

html: html-am

13859

13860

+html-am:

13861

+

13862

info: info-am

13863

13864

info-am:

13865

@@ -403,18 +433,28 @@

13866

13867

install-dvi: install-dvi-am

13868

13869

+install-dvi-am:

13870

+

13871

install-exec-am:

13872

13873

install-html: install-html-am

13874

13875

+install-html-am:

13876

+

13877

install-info: install-info-am

13878

13879

+install-info-am:

13880

+

13881

install-man:

13882

13883

install-pdf: install-pdf-am

13884

13885

+install-pdf-am:

13886

+

13887

install-ps: install-ps-am

13888

13889

+install-ps-am:

13890

+

13891

installcheck-am:

13892

13893

maintainer-clean: maintainer-clean-am

13894

@@ -448,6 +488,7 @@

13895

mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \

13896

uninstall-am uninstall-helpDATA

13897

13898

+

13899

# Tell versions [3.59,3.63) of GNU make to not export all variables.

13900

# Otherwise a system limit (for SysV at least) may be exceeded.

13901

.NOEXPORT:

13902

--- a/plugins/Makefile.in

13903

+++ b/plugins/Makefile.in

13904

@@ -1,8 +1,9 @@

13905

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

13906

+# Makefile.in generated by automake 1.11 from Makefile.am.

13907

# @configure_input@

13908

13909

13910

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

13911

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

13912

+# Inc.

13913

# This Makefile.in is free software; the Free Software Foundation

13914

# gives unlimited permission to copy and/or distribute it,

13915

# with or without modifications, as long as this notice is preserved.

13916

@@ -18,8 +19,9 @@

13917

13918

VPATH = @srcdir@

13919

pkgdatadir = $(datadir)/@PACKAGE@

13920

-pkglibdir = $(libdir)/@PACKAGE@

13921

pkgincludedir = $(includedir)/@PACKAGE@

13922

+pkglibdir = $(libdir)/@PACKAGE@

13923

+pkglibexecdir = $(libexecdir)/@PACKAGE@

13924

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

13925

install_sh_DATA = $(install_sh) -c -m 644

13926

install_sh_PROGRAM = $(install_sh) -c

13927

@@ -42,6 +44,7 @@

13928

mkinstalldirs = $(SHELL) $(top_srcdir)/auxdir/mkinstalldirs

13929

CONFIG_HEADER = $(top_builddir)/config.h

13930

CONFIG_CLEAN_FILES =

13931

+CONFIG_CLEAN_VPATH_FILES =

13932

SOURCES =

13933

DIST_SOURCES =

13934

RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

13935

@@ -56,16 +59,58 @@

13936

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

13937

*) f=$$p;; \

13938

esac;

13939

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

13940

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

13941

+am__install_max = 40

13942

+am__nobase_strip_setup = \

13943

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

13944

+am__nobase_strip = \

13945

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

13946

+am__nobase_list = $(am__nobase_strip_setup); \

13947

+ for p in $$list; do echo "$$p $$p"; done | \

13948

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

13949

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

13950

+ if (++n[$$2] == $(am__install_max)) \

13951

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

13952

+ END { for (dir in files) print dir, files[dir] }'

13953

+am__base_list = \

13954

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

13955

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

13956

am__installdirs = "$(DESTDIR)$(qq_desktoptemplatedir)"

13957

-qq_desktoptemplateDATA_INSTALL = $(INSTALL_DATA)

13958

DATA = $(qq_desktoptemplate_DATA)

13959

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

13960

distclean-recursive maintainer-clean-recursive

13961

+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

13962

+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

13963

+ distdir

13964

ETAGS = etags

13965

CTAGS = ctags

13966

DIST_SUBDIRS = $(SUBDIRS)

13967

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

13968

+am__relativize = \

13969

+ dir0=`pwd`; \

13970

+ sed_first='s,^$[^/]*$/.*$$,\1,'; \

13971

+ sed_rest='s,^[^/]*/*,,'; \

13972

+ sed_last='s,^.*/$[^/]*$$$,\1,'; \

13973

+ sed_butlast='s,/*[^/]*$$,,'; \

13974

+ while test -n "$$dir1"; do \

13975

+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \

13976

+ if test "$$first" != "."; then \

13977

+ if test "$$first" = ".."; then \

13978

+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

13979

+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

13980

+ else \

13981

+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

13982

+ if test "$$first2" = "$$first"; then \

13983

+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

13984

+ else \

13985

+ dir2="../$$dir2"; \

13986

+ fi; \

13987

+ dir0="$$dir0"/"$$first"; \

13988

+ fi; \

13989

+ fi; \

13990

+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

13991

+ done; \

13992

+ reldir="$$dir2"

13993

ACLOCAL = @ACLOCAL@

13994

ALL_LINGUAS = @ALL_LINGUAS@

13995

AMTAR = @AMTAR@

13996

@@ -158,6 +203,7 @@

13997

MAINT = @MAINT@

13998

MAKEINFO = @MAKEINFO@

13999

MKDIR_P = @MKDIR_P@

14000

+MKINSTALLDIRS = @MKINSTALLDIRS@

14001

MSGFMT = @MSGFMT@

14002

MSGFMT_OPTS = @MSGFMT_OPTS@

14003

MSGMERGE = @MSGMERGE@

14004

@@ -167,6 +213,7 @@

14005

PACKAGE_NAME = @PACKAGE_NAME@

14006

PACKAGE_STRING = @PACKAGE_STRING@

14007

PACKAGE_TARNAME = @PACKAGE_TARNAME@

14008

+PACKAGE_URL = @PACKAGE_URL@

14009

PACKAGE_VERSION = @PACKAGE_VERSION@

14010

PATHSEP = @PATHSEP@

14011

PATH_SEPARATOR = @PATH_SEPARATOR@

14012

@@ -240,14 +287,14 @@

14013

@for dep in $?; do \

14014

case '$(am__configure_deps)' in \

14015

*$$dep*) \

14016

- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

14017

- && exit 0; \

14018

+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

14019

+ && { if test -f $@; then exit 0; else break; fi; }; \

14020

exit 1;; \

14021

esac; \

14022

done; \

14023

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \

14024

- cd $(top_srcdir) && \

14025

- $(AUTOMAKE) --gnu plugins/Makefile

14026

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \

14027

+ $(am__cd) $(top_srcdir) && \

14028

+ $(AUTOMAKE) --gnu plugins/Makefile

14029

.PRECIOUS: Makefile

14030

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

14031

@case '$?' in \

14032

@@ -265,23 +312,27 @@

14033

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

14034

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

14035

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

14036

+$(am__aclocal_m4_deps):

14037

install-qq_desktoptemplateDATA: $(qq_desktoptemplate_DATA)

14038

@$(NORMAL_INSTALL)

14039

test -z "$(qq_desktoptemplatedir)" || $(MKDIR_P) "$(DESTDIR)$(qq_desktoptemplatedir)"

14040

- @list='$(qq_desktoptemplate_DATA)'; for p in $$list; do \

14041

+ @list='$(qq_desktoptemplate_DATA)'; test -n "$(qq_desktoptemplatedir)" || list=; \

14042

+ for p in $$list; do \

14043

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

14044

- f=$(am__strip_dir) \

14045

- echo " $(qq_desktoptemplateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(qq_desktoptemplatedir)/$$f'"; \

14046

- $(qq_desktoptemplateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(qq_desktoptemplatedir)/$$f"; \

14047

+ echo "$$d$$p"; \

14048

+ done | $(am__base_list) | \

14049

+ while read files; do \

14050

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(qq_desktoptemplatedir)'"; \

14051

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(qq_desktoptemplatedir)" || exit $$?; \

14052

done

14053

14054

uninstall-qq_desktoptemplateDATA:

14055

@$(NORMAL_UNINSTALL)

14056

- @list='$(qq_desktoptemplate_DATA)'; for p in $$list; do \

14057

- f=$(am__strip_dir) \

14058

- echo " rm -f '$(DESTDIR)$(qq_desktoptemplatedir)/$$f'"; \

14059

- rm -f "$(DESTDIR)$(qq_desktoptemplatedir)/$$f"; \

14060

- done

14061

+ @list='$(qq_desktoptemplate_DATA)'; test -n "$(qq_desktoptemplatedir)" || list=; \

14062

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

14063

+ test -n "$$files" || exit 0; \

14064

+ echo " ( cd '$(DESTDIR)$(qq_desktoptemplatedir)' && rm -f" $$files ")"; \

14065

+ cd "$(DESTDIR)$(qq_desktoptemplatedir)" && rm -f $$files

14066

14067

# This directory's subdirectories are mostly independent; you can cd

14068

# into them and run `make' without going through this Makefile.

14069

@@ -307,7 +358,7 @@

14070

else \

14071

local_target="$$target"; \

14072

fi; \

14073

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

14074

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

14075

|| eval $$failcom; \

14076

done; \

14077

if test "$$dot_seen" = "no"; then \

14078

@@ -341,16 +392,16 @@

14079

else \

14080

local_target="$$target"; \

14081

fi; \

14082

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

14083

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

14084

|| eval $$failcom; \

14085

done && test -z "$$fail"

14086

tags-recursive:

14087

list='$(SUBDIRS)'; for subdir in $$list; do \

14088

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

14089

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

14090

done

14091

ctags-recursive:

14092

list='$(SUBDIRS)'; for subdir in $$list; do \

14093

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

14094

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

14095

done

14096

14097

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

14098

@@ -358,14 +409,14 @@

14099

unique=`for i in $$list; do \

14100

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

14101

done | \

14102

- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

14103

+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

14104

END { if (nonempty) { for (i in files) print i; }; }'`; \

14105

mkid -fID $$unique

14106

tags: TAGS

14107

14108

TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

14109

$(TAGS_FILES) $(LISP)

14110

- tags=; \

14111

+ set x; \

14112

here=`pwd`; \

14113

if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

14114

include_option=--etags-include; \

14115

@@ -377,7 +428,7 @@

14116

list='$(SUBDIRS)'; for subdir in $$list; do \

14117

if test "$$subdir" = .; then :; else \

14118

test ! -f $$subdir/TAGS || \

14119

- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

14120

+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

14121

fi; \

14122

done; \

14123

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

14124

@@ -386,29 +437,34 @@

14125

done | \

14126

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

14127

END { if (nonempty) { for (i in files) print i; }; }'`; \

14128

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

14129

+ shift; \

14130

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

14131

test -n "$$unique" || unique=$$empty_fix; \

14132

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

14133

- $$tags $$unique; \

14134

+ if test $$# -gt 0; then \

14135

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

14136

+ "$$@" $$unique; \

14137

+ else \

14138

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

14139

+ $$unique; \

14140

+ fi; \

14141

fi

14142

ctags: CTAGS

14143

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

14144

$(TAGS_FILES) $(LISP)

14145

- tags=; \

14146

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

14147

unique=`for i in $$list; do \

14148

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

14149

done | \

14150

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

14151

END { if (nonempty) { for (i in files) print i; }; }'`; \

14152

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

14153

+ test -z "$(CTAGS_ARGS)$$unique" \

14154

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

14155

- $$tags $$unique

14156

+ $$unique

14157

14158

GTAGS:

14159

here=`$(am__cd) $(top_builddir) && pwd` \

14160

- && cd $(top_srcdir) \

14161

- && gtags -i $(GTAGS_ARGS) $$here

14162

+ && $(am__cd) $(top_srcdir) \

14163

+ && gtags -i $(GTAGS_ARGS) "$$here"

14164

14165

distclean-tags:

14166

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

14167

@@ -429,29 +485,44 @@

14168

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

14169

if test -d $$d/$$file; then \

14170

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

14171

+ if test -d "$(distdir)/$$file"; then \

14172

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

14173

+ fi; \

14174

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

14175

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

14176

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

14177

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

14178

fi; \

14179

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

14180

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

14181

else \

14182

- test -f $(distdir)/$$file \

14183

- || cp -p $$d/$$file $(distdir)/$$file \

14184

+ test -f "$(distdir)/$$file" \

14185

+ || cp -p $$d/$$file "$(distdir)/$$file" \

14186

|| exit 1; \

14187

fi; \

14188

done

14189

- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

14190

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

14191

if test "$$subdir" = .; then :; else \

14192

test -d "$(distdir)/$$subdir" \

14193

|| $(MKDIR_P) "$(distdir)/$$subdir" \

14194

|| exit 1; \

14195

- distdir=`$(am__cd) $(distdir) && pwd`; \

14196

- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

14197

- (cd $$subdir && \

14198

+ fi; \

14199

+ done

14200

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

14201

+ if test "$$subdir" = .; then :; else \

14202

+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

14203

+ $(am__relativize); \

14204

+ new_distdir=$$reldir; \

14205

+ dir1=$$subdir; dir2="$(top_distdir)"; \

14206

+ $(am__relativize); \

14207

+ new_top_distdir=$$reldir; \

14208

+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

14209

+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

14210

+ ($(am__cd) $$subdir && \

14211

$(MAKE) $(AM_MAKEFLAGS) \

14212

- top_distdir="$$top_distdir" \

14213

- distdir="$$distdir/$$subdir" \

14214

+ top_distdir="$$new_top_distdir" \

14215

+ distdir="$$new_distdir" \

14216

am__remove_distdir=: \

14217

am__skip_length_check=: \

14218

+ am__skip_mode_fix=: \

14219

distdir) \

14220

|| exit 1; \

14221

fi; \

14222

@@ -484,6 +555,7 @@

14223

14224

distclean-generic:

14225

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

14226

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

14227

14228

maintainer-clean-generic:

14229

@echo "This command is intended for maintainers to use"

14230

@@ -502,6 +574,8 @@

14231

14232

html: html-recursive

14233

14234

+html-am:

14235

+

14236

info: info-recursive

14237

14238

info-am:

14239

@@ -510,18 +584,28 @@

14240

14241

install-dvi: install-dvi-recursive

14242

14243

+install-dvi-am:

14244

+

14245

install-exec-am:

14246

14247

install-html: install-html-recursive

14248

14249

+install-html-am:

14250

+

14251

install-info: install-info-recursive

14252

14253

+install-info-am:

14254

+

14255

install-man:

14256

14257

install-pdf: install-pdf-recursive

14258

14259

+install-pdf-am:

14260

+

14261

install-ps: install-ps-recursive

14262

14263

+install-ps-am:

14264

+

14265

installcheck-am:

14266

14267

maintainer-clean: maintainer-clean-recursive

14268

@@ -542,8 +626,8 @@

14269

14270

uninstall-am: uninstall-qq_desktoptemplateDATA

14271

14272

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

14273

- install-strip

14274

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \

14275

+ install-am install-strip tags-recursive

14276

14277

.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

14278

all all-am check check-am clean clean-generic ctags \

14279

@@ -559,6 +643,7 @@

14280

pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \

14281

uninstall-qq_desktoptemplateDATA

14282

14283

+

14284

# Tell versions [3.59,3.63) of GNU make to not export all variables.

14285

# Otherwise a system limit (for SysV at least) may be exceeded.

14286

.NOEXPORT:

14287

--- a/plugins/import/Makefile.in

14288

+++ b/plugins/import/Makefile.in

14289

@@ -1,8 +1,9 @@

14290

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

14291

+# Makefile.in generated by automake 1.11 from Makefile.am.

14292

# @configure_input@

14293

14294

14295

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

14296

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

14297

+# Inc.

14298

# This Makefile.in is free software; the Free Software Foundation

14299

# gives unlimited permission to copy and/or distribute it,

14300

# with or without modifications, as long as this notice is preserved.

14301

@@ -17,8 +18,9 @@

14302

14303

VPATH = @srcdir@

14304

pkgdatadir = $(datadir)/@PACKAGE@

14305

-pkglibdir = $(libdir)/@PACKAGE@

14306

pkgincludedir = $(includedir)/@PACKAGE@

14307

+pkglibdir = $(libdir)/@PACKAGE@

14308

+pkglibexecdir = $(libexecdir)/@PACKAGE@

14309

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

14310

install_sh_DATA = $(install_sh) -c -m 644

14311

install_sh_PROGRAM = $(install_sh) -c

14312

@@ -42,19 +44,33 @@

14313

mkinstalldirs = $(SHELL) $(top_srcdir)/auxdir/mkinstalldirs

14314

CONFIG_HEADER = $(top_builddir)/config.h

14315

CONFIG_CLEAN_FILES =

14316

-am__installdirs = "$(DESTDIR)$(gq_bindir)" \

14317

- "$(DESTDIR)$(gq_desktopdir)"

14318

-dist_gq_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)

14319

-SCRIPTS = $(dist_gq_bin_SCRIPTS)

14320

-SOURCES =

14321

-DIST_SOURCES =

14322

+CONFIG_CLEAN_VPATH_FILES =

14323

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

14324

am__vpath_adj = case $$p in \

14325

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

14326

*) f=$$p;; \

14327

esac;

14328

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

14329

-gq_desktopDATA_INSTALL = $(INSTALL_DATA)

14330

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

14331

+am__install_max = 40

14332

+am__nobase_strip_setup = \

14333

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

14334

+am__nobase_strip = \

14335

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

14336

+am__nobase_list = $(am__nobase_strip_setup); \

14337

+ for p in $$list; do echo "$$p $$p"; done | \

14338

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

14339

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

14340

+ if (++n[$$2] == $(am__install_max)) \

14341

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

14342

+ END { for (dir in files) print dir, files[dir] }'

14343

+am__base_list = \

14344

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

14345

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

14346

+am__installdirs = "$(DESTDIR)$(gq_bindir)" \

14347

+ "$(DESTDIR)$(gq_desktopdir)"

14348

+SCRIPTS = $(dist_gq_bin_SCRIPTS)

14349

+SOURCES =

14350

+DIST_SOURCES =

14351

DATA = $(gq_desktop_DATA)

14352

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

14353

ACLOCAL = @ACLOCAL@

14354

@@ -149,6 +165,7 @@

14355

MAINT = @MAINT@

14356

MAKEINFO = @MAKEINFO@

14357

MKDIR_P = @MKDIR_P@

14358

+MKINSTALLDIRS = @MKINSTALLDIRS@

14359

MSGFMT = @MSGFMT@

14360

MSGFMT_OPTS = @MSGFMT_OPTS@

14361

MSGMERGE = @MSGMERGE@

14362

@@ -158,6 +175,7 @@

14363

PACKAGE_NAME = @PACKAGE_NAME@

14364

PACKAGE_STRING = @PACKAGE_STRING@

14365

PACKAGE_TARNAME = @PACKAGE_TARNAME@

14366

+PACKAGE_URL = @PACKAGE_URL@

14367

PACKAGE_VERSION = @PACKAGE_VERSION@

14368

PATHSEP = @PATHSEP@

14369

PATH_SEPARATOR = @PATH_SEPARATOR@

14370

@@ -232,14 +250,14 @@

14371

@for dep in $?; do \

14372

case '$(am__configure_deps)' in \

14373

*$$dep*) \

14374

- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

14375

- && exit 0; \

14376

+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

14377

+ && { if test -f $@; then exit 0; else break; fi; }; \

14378

exit 1;; \

14379

esac; \

14380

done; \

14381

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/import/Makefile'; \

14382

- cd $(top_srcdir) && \

14383

- $(AUTOMAKE) --gnu plugins/import/Makefile

14384

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/import/Makefile'; \

14385

+ $(am__cd) $(top_srcdir) && \

14386

+ $(AUTOMAKE) --gnu plugins/import/Makefile

14387

.PRECIOUS: Makefile

14388

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

14389

@case '$?' in \

14390

@@ -257,42 +275,61 @@

14391

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

14392

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

14393

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

14394

+$(am__aclocal_m4_deps):

14395

install-dist_gq_binSCRIPTS: $(dist_gq_bin_SCRIPTS)

14396

@$(NORMAL_INSTALL)

14397

test -z "$(gq_bindir)" || $(MKDIR_P) "$(DESTDIR)$(gq_bindir)"

14398

- @list='$(dist_gq_bin_SCRIPTS)'; for p in $$list; do \

14399

+ @list='$(dist_gq_bin_SCRIPTS)'; test -n "$(gq_bindir)" || list=; \

14400

+ for p in $$list; do \

14401

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

14402

- if test -f $$d$$p; then \

14403

- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \

14404

- echo " $(dist_gq_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(gq_bindir)/$$f'"; \

14405

- $(dist_gq_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(gq_bindir)/$$f"; \

14406

- else :; fi; \

14407

- done

14408

+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \

14409

+ done | \

14410

+ sed -e 'p;s,.*/,,;n' \

14411

+ -e 'h;s|.*|.|' \

14412

+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \

14413

+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \

14414

+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

14415

+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \

14416

+ if (++n[d] == $(am__install_max)) { \

14417

+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \

14418

+ else { print "f", d "/" $$4, $$1 } } \

14419

+ END { for (d in files) print "f", d, files[d] }' | \

14420

+ while read type dir files; do \

14421

+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

14422

+ test -z "$$files" || { \

14423

+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(gq_bindir)$$dir'"; \

14424

+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(gq_bindir)$$dir" || exit $$?; \

14425

+ } \

14426

+ ; done

14427

14428

uninstall-dist_gq_binSCRIPTS:

14429

@$(NORMAL_UNINSTALL)

14430

- @list='$(dist_gq_bin_SCRIPTS)'; for p in $$list; do \

14431

- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \

14432

- echo " rm -f '$(DESTDIR)$(gq_bindir)/$$f'"; \

14433

- rm -f "$(DESTDIR)$(gq_bindir)/$$f"; \

14434

- done

14435

+ @list='$(dist_gq_bin_SCRIPTS)'; test -n "$(gq_bindir)" || exit 0; \

14436

+ files=`for p in $$list; do echo "$$p"; done | \

14437

+ sed -e 's,.*/,,;$(transform)'`; \

14438

+ test -n "$$list" || exit 0; \

14439

+ echo " ( cd '$(DESTDIR)$(gq_bindir)' && rm -f" $$files ")"; \

14440

+ cd "$(DESTDIR)$(gq_bindir)" && rm -f $$files

14441

install-gq_desktopDATA: $(gq_desktop_DATA)

14442

@$(NORMAL_INSTALL)

14443

test -z "$(gq_desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(gq_desktopdir)"

14444

- @list='$(gq_desktop_DATA)'; for p in $$list; do \

14445

+ @list='$(gq_desktop_DATA)'; test -n "$(gq_desktopdir)" || list=; \

14446

+ for p in $$list; do \

14447

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

14448

- f=$(am__strip_dir) \

14449

- echo " $(gq_desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gq_desktopdir)/$$f'"; \

14450

- $(gq_desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gq_desktopdir)/$$f"; \

14451

+ echo "$$d$$p"; \

14452

+ done | $(am__base_list) | \

14453

+ while read files; do \

14454

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gq_desktopdir)'"; \

14455

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(gq_desktopdir)" || exit $$?; \

14456

done

14457

14458

uninstall-gq_desktopDATA:

14459

@$(NORMAL_UNINSTALL)

14460

- @list='$(gq_desktop_DATA)'; for p in $$list; do \

14461

- f=$(am__strip_dir) \

14462

- echo " rm -f '$(DESTDIR)$(gq_desktopdir)/$$f'"; \

14463

- rm -f "$(DESTDIR)$(gq_desktopdir)/$$f"; \

14464

- done

14465

+ @list='$(gq_desktop_DATA)'; test -n "$(gq_desktopdir)" || list=; \

14466

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

14467

+ test -n "$$files" || exit 0; \

14468

+ echo " ( cd '$(DESTDIR)$(gq_desktopdir)' && rm -f" $$files ")"; \

14469

+ cd "$(DESTDIR)$(gq_desktopdir)" && rm -f $$files

14470

tags: TAGS

14471

TAGS:

14472

14473

@@ -316,13 +353,17 @@

14474

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

14475

if test -d $$d/$$file; then \

14476

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

14477

+ if test -d "$(distdir)/$$file"; then \

14478

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

14479

+ fi; \

14480

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

14481

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

14482

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

14483

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

14484

fi; \

14485

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

14486

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

14487

else \

14488

- test -f $(distdir)/$$file \

14489

- || cp -p $$d/$$file $(distdir)/$$file \

14490

+ test -f "$(distdir)/$$file" \

14491

+ || cp -p $$d/$$file "$(distdir)/$$file" \

14492

|| exit 1; \

14493

fi; \

14494

done

14495

@@ -353,6 +394,7 @@

14496

14497

distclean-generic:

14498

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

14499

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

14500

14501

maintainer-clean-generic:

14502

@echo "This command is intended for maintainers to use"

14503

@@ -371,6 +413,8 @@

14504

14505

html: html-am

14506

14507

+html-am:

14508

+

14509

info: info-am

14510

14511

info-am:

14512

@@ -379,18 +423,28 @@

14513

14514

install-dvi: install-dvi-am

14515

14516

+install-dvi-am:

14517

+

14518

install-exec-am:

14519

14520

install-html: install-html-am

14521

14522

+install-html-am:

14523

+

14524

install-info: install-info-am

14525

14526

+install-info-am:

14527

+

14528

install-man:

14529

14530

install-pdf: install-pdf-am

14531

14532

+install-pdf-am:

14533

+

14534

install-ps: install-ps-am

14535

14536

+install-ps-am:

14537

+

14538

installcheck-am:

14539

14540

maintainer-clean: maintainer-clean-am

14541

@@ -427,6 +481,7 @@

14542

uninstall-gq_desktopDATA

14543

14544

@INTLTOOL_DESKTOP_RULE@

14545

+

14546

# Tell versions [3.59,3.63) of GNU make to not export all variables.

14547

# Otherwise a system limit (for SysV at least) may be exceeded.

14548

.NOEXPORT:

14549

--- a/plugins/rotate/Makefile.in

14550

+++ b/plugins/rotate/Makefile.in

14551

@@ -1,8 +1,9 @@

14552

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

14553

+# Makefile.in generated by automake 1.11 from Makefile.am.

14554

# @configure_input@

14555

14556

14557

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

14558

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

14559

+# Inc.

14560

# This Makefile.in is free software; the Free Software Foundation

14561

# gives unlimited permission to copy and/or distribute it,

14562

# with or without modifications, as long as this notice is preserved.

14563

@@ -17,8 +18,9 @@

14564

14565

VPATH = @srcdir@

14566

pkgdatadir = $(datadir)/@PACKAGE@

14567

-pkglibdir = $(libdir)/@PACKAGE@

14568

pkgincludedir = $(includedir)/@PACKAGE@

14569

+pkglibdir = $(libdir)/@PACKAGE@

14570

+pkglibexecdir = $(libexecdir)/@PACKAGE@

14571

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

14572

install_sh_DATA = $(install_sh) -c -m 644

14573

install_sh_PROGRAM = $(install_sh) -c

14574

@@ -42,19 +44,33 @@

14575

mkinstalldirs = $(SHELL) $(top_srcdir)/auxdir/mkinstalldirs

14576

CONFIG_HEADER = $(top_builddir)/config.h

14577

CONFIG_CLEAN_FILES =

14578

-am__installdirs = "$(DESTDIR)$(gq_bindir)" \

14579

- "$(DESTDIR)$(gq_desktopdir)"

14580

-dist_gq_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)

14581

-SCRIPTS = $(dist_gq_bin_SCRIPTS)

14582

-SOURCES =

14583

-DIST_SOURCES =

14584

+CONFIG_CLEAN_VPATH_FILES =

14585

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

14586

am__vpath_adj = case $$p in \

14587

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

14588

*) f=$$p;; \

14589

esac;

14590

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

14591

-gq_desktopDATA_INSTALL = $(INSTALL_DATA)

14592

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

14593

+am__install_max = 40

14594

+am__nobase_strip_setup = \

14595

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

14596

+am__nobase_strip = \

14597

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

14598

+am__nobase_list = $(am__nobase_strip_setup); \

14599

+ for p in $$list; do echo "$$p $$p"; done | \

14600

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

14601

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

14602

+ if (++n[$$2] == $(am__install_max)) \

14603

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

14604

+ END { for (dir in files) print dir, files[dir] }'

14605

+am__base_list = \

14606

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

14607

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

14608

+am__installdirs = "$(DESTDIR)$(gq_bindir)" \

14609

+ "$(DESTDIR)$(gq_desktopdir)"

14610

+SCRIPTS = $(dist_gq_bin_SCRIPTS)

14611

+SOURCES =

14612

+DIST_SOURCES =

14613

DATA = $(gq_desktop_DATA)

14614

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

14615

ACLOCAL = @ACLOCAL@

14616

@@ -149,6 +165,7 @@

14617

MAINT = @MAINT@

14618

MAKEINFO = @MAKEINFO@

14619

MKDIR_P = @MKDIR_P@

14620

+MKINSTALLDIRS = @MKINSTALLDIRS@

14621

MSGFMT = @MSGFMT@

14622

MSGFMT_OPTS = @MSGFMT_OPTS@

14623

MSGMERGE = @MSGMERGE@

14624

@@ -158,6 +175,7 @@

14625

PACKAGE_NAME = @PACKAGE_NAME@

14626

PACKAGE_STRING = @PACKAGE_STRING@

14627

PACKAGE_TARNAME = @PACKAGE_TARNAME@

14628

+PACKAGE_URL = @PACKAGE_URL@

14629

PACKAGE_VERSION = @PACKAGE_VERSION@

14630

PATHSEP = @PATHSEP@

14631

PATH_SEPARATOR = @PATH_SEPARATOR@

14632

@@ -232,14 +250,14 @@

14633

@for dep in $?; do \

14634

case '$(am__configure_deps)' in \

14635

*$$dep*) \

14636

- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

14637

- && exit 0; \

14638

+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

14639

+ && { if test -f $@; then exit 0; else break; fi; }; \

14640

exit 1;; \

14641

esac; \

14642

done; \

14643

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/rotate/Makefile'; \

14644

- cd $(top_srcdir) && \

14645

- $(AUTOMAKE) --gnu plugins/rotate/Makefile

14646

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/rotate/Makefile'; \

14647

+ $(am__cd) $(top_srcdir) && \

14648

+ $(AUTOMAKE) --gnu plugins/rotate/Makefile

14649

.PRECIOUS: Makefile

14650

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

14651

@case '$?' in \

14652

@@ -257,42 +275,61 @@

14653

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

14654

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

14655

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

14656

+$(am__aclocal_m4_deps):

14657

install-dist_gq_binSCRIPTS: $(dist_gq_bin_SCRIPTS)

14658

@$(NORMAL_INSTALL)

14659

test -z "$(gq_bindir)" || $(MKDIR_P) "$(DESTDIR)$(gq_bindir)"

14660

- @list='$(dist_gq_bin_SCRIPTS)'; for p in $$list; do \

14661

+ @list='$(dist_gq_bin_SCRIPTS)'; test -n "$(gq_bindir)" || list=; \

14662

+ for p in $$list; do \

14663

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

14664

- if test -f $$d$$p; then \

14665

- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \

14666

- echo " $(dist_gq_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(gq_bindir)/$$f'"; \

14667

- $(dist_gq_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(gq_bindir)/$$f"; \

14668

- else :; fi; \

14669

- done

14670

+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \

14671

+ done | \

14672

+ sed -e 'p;s,.*/,,;n' \

14673

+ -e 'h;s|.*|.|' \

14674

+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \

14675

+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \

14676

+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

14677

+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \

14678

+ if (++n[d] == $(am__install_max)) { \

14679

+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \

14680

+ else { print "f", d "/" $$4, $$1 } } \

14681

+ END { for (d in files) print "f", d, files[d] }' | \

14682

+ while read type dir files; do \

14683

+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

14684

+ test -z "$$files" || { \

14685

+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(gq_bindir)$$dir'"; \

14686

+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(gq_bindir)$$dir" || exit $$?; \

14687

+ } \

14688

+ ; done

14689

14690

uninstall-dist_gq_binSCRIPTS:

14691

@$(NORMAL_UNINSTALL)

14692

- @list='$(dist_gq_bin_SCRIPTS)'; for p in $$list; do \

14693

- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \

14694

- echo " rm -f '$(DESTDIR)$(gq_bindir)/$$f'"; \

14695

- rm -f "$(DESTDIR)$(gq_bindir)/$$f"; \

14696

- done

14697

+ @list='$(dist_gq_bin_SCRIPTS)'; test -n "$(gq_bindir)" || exit 0; \

14698

+ files=`for p in $$list; do echo "$$p"; done | \

14699

+ sed -e 's,.*/,,;$(transform)'`; \

14700

+ test -n "$$list" || exit 0; \

14701

+ echo " ( cd '$(DESTDIR)$(gq_bindir)' && rm -f" $$files ")"; \

14702

+ cd "$(DESTDIR)$(gq_bindir)" && rm -f $$files

14703

install-gq_desktopDATA: $(gq_desktop_DATA)

14704

@$(NORMAL_INSTALL)

14705

test -z "$(gq_desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(gq_desktopdir)"

14706

- @list='$(gq_desktop_DATA)'; for p in $$list; do \

14707

+ @list='$(gq_desktop_DATA)'; test -n "$(gq_desktopdir)" || list=; \

14708

+ for p in $$list; do \

14709

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

14710

- f=$(am__strip_dir) \

14711

- echo " $(gq_desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gq_desktopdir)/$$f'"; \

14712

- $(gq_desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gq_desktopdir)/$$f"; \

14713

+ echo "$$d$$p"; \

14714

+ done | $(am__base_list) | \

14715

+ while read files; do \

14716

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gq_desktopdir)'"; \

14717

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(gq_desktopdir)" || exit $$?; \

14718

done

14719

14720

uninstall-gq_desktopDATA:

14721

@$(NORMAL_UNINSTALL)

14722

- @list='$(gq_desktop_DATA)'; for p in $$list; do \

14723

- f=$(am__strip_dir) \

14724

- echo " rm -f '$(DESTDIR)$(gq_desktopdir)/$$f'"; \

14725

- rm -f "$(DESTDIR)$(gq_desktopdir)/$$f"; \

14726

- done

14727

+ @list='$(gq_desktop_DATA)'; test -n "$(gq_desktopdir)" || list=; \

14728

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

14729

+ test -n "$$files" || exit 0; \

14730

+ echo " ( cd '$(DESTDIR)$(gq_desktopdir)' && rm -f" $$files ")"; \

14731

+ cd "$(DESTDIR)$(gq_desktopdir)" && rm -f $$files

14732

tags: TAGS

14733

TAGS:

14734

14735

@@ -316,13 +353,17 @@

14736

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

14737

if test -d $$d/$$file; then \

14738

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

14739

+ if test -d "$(distdir)/$$file"; then \

14740

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

14741

+ fi; \

14742

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

14743

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

14744

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

14745

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

14746

fi; \

14747

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

14748

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

14749

else \

14750

- test -f $(distdir)/$$file \

14751

- || cp -p $$d/$$file $(distdir)/$$file \

14752

+ test -f "$(distdir)/$$file" \

14753

+ || cp -p $$d/$$file "$(distdir)/$$file" \

14754

|| exit 1; \

14755

fi; \

14756

done

14757

@@ -353,6 +394,7 @@

14758

14759

distclean-generic:

14760

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

14761

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

14762

14763

maintainer-clean-generic:

14764

@echo "This command is intended for maintainers to use"

14765

@@ -371,6 +413,8 @@

14766

14767

html: html-am

14768

14769

+html-am:

14770

+

14771

info: info-am

14772

14773

info-am:

14774

@@ -379,18 +423,28 @@

14775

14776

install-dvi: install-dvi-am

14777

14778

+install-dvi-am:

14779

+

14780

install-exec-am:

14781

14782

install-html: install-html-am

14783

14784

+install-html-am:

14785

+

14786

install-info: install-info-am

14787

14788

+install-info-am:

14789

+

14790

install-man:

14791

14792

install-pdf: install-pdf-am

14793

14794

+install-pdf-am:

14795

+

14796

install-ps: install-ps-am

14797

14798

+install-ps-am:

14799

+

14800

installcheck-am:

14801

14802

maintainer-clean: maintainer-clean-am

14803

@@ -427,6 +481,7 @@

14804

uninstall-gq_desktopDATA

14805

14806

@INTLTOOL_DESKTOP_RULE@

14807

+

14808

# Tell versions [3.59,3.63) of GNU make to not export all variables.

14809

# Otherwise a system limit (for SysV at least) may be exceeded.

14810

.NOEXPORT:

14811

--- a/plugins/symlink/Makefile.in

14812

+++ b/plugins/symlink/Makefile.in

14813

@@ -1,8 +1,9 @@

14814

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

14815

+# Makefile.in generated by automake 1.11 from Makefile.am.

14816

# @configure_input@

14817

14818

14819

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

14820

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

14821

+# Inc.

14822

# This Makefile.in is free software; the Free Software Foundation

14823

# gives unlimited permission to copy and/or distribute it,

14824

# with or without modifications, as long as this notice is preserved.

14825

@@ -17,8 +18,9 @@

14826

14827

VPATH = @srcdir@

14828

pkgdatadir = $(datadir)/@PACKAGE@

14829

-pkglibdir = $(libdir)/@PACKAGE@

14830

pkgincludedir = $(includedir)/@PACKAGE@

14831

+pkglibdir = $(libdir)/@PACKAGE@

14832

+pkglibexecdir = $(libexecdir)/@PACKAGE@

14833

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

14834

install_sh_DATA = $(install_sh) -c -m 644

14835

install_sh_PROGRAM = $(install_sh) -c

14836

@@ -42,19 +44,33 @@

14837

mkinstalldirs = $(SHELL) $(top_srcdir)/auxdir/mkinstalldirs

14838

CONFIG_HEADER = $(top_builddir)/config.h

14839

CONFIG_CLEAN_FILES =

14840

-am__installdirs = "$(DESTDIR)$(gq_bindir)" \

14841

- "$(DESTDIR)$(gq_desktopdir)"

14842

-dist_gq_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)

14843

-SCRIPTS = $(dist_gq_bin_SCRIPTS)

14844

-SOURCES =

14845

-DIST_SOURCES =

14846

+CONFIG_CLEAN_VPATH_FILES =

14847

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

14848

am__vpath_adj = case $$p in \

14849

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

14850

*) f=$$p;; \

14851

esac;

14852

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

14853

-gq_desktopDATA_INSTALL = $(INSTALL_DATA)

14854

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

14855

+am__install_max = 40

14856

+am__nobase_strip_setup = \

14857

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

14858

+am__nobase_strip = \

14859

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

14860

+am__nobase_list = $(am__nobase_strip_setup); \

14861

+ for p in $$list; do echo "$$p $$p"; done | \

14862

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

14863

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

14864

+ if (++n[$$2] == $(am__install_max)) \

14865

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

14866

+ END { for (dir in files) print dir, files[dir] }'

14867

+am__base_list = \

14868

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

14869

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

14870

+am__installdirs = "$(DESTDIR)$(gq_bindir)" \

14871

+ "$(DESTDIR)$(gq_desktopdir)"

14872

+SCRIPTS = $(dist_gq_bin_SCRIPTS)

14873

+SOURCES =

14874

+DIST_SOURCES =

14875

DATA = $(gq_desktop_DATA)

14876

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

14877

ACLOCAL = @ACLOCAL@

14878

@@ -149,6 +165,7 @@

14879

MAINT = @MAINT@

14880

MAKEINFO = @MAKEINFO@

14881

MKDIR_P = @MKDIR_P@

14882

+MKINSTALLDIRS = @MKINSTALLDIRS@

14883

MSGFMT = @MSGFMT@

14884

MSGFMT_OPTS = @MSGFMT_OPTS@

14885

MSGMERGE = @MSGMERGE@

14886

@@ -158,6 +175,7 @@

14887

PACKAGE_NAME = @PACKAGE_NAME@

14888

PACKAGE_STRING = @PACKAGE_STRING@

14889

PACKAGE_TARNAME = @PACKAGE_TARNAME@

14890

+PACKAGE_URL = @PACKAGE_URL@

14891

PACKAGE_VERSION = @PACKAGE_VERSION@

14892

PATHSEP = @PATHSEP@

14893

PATH_SEPARATOR = @PATH_SEPARATOR@

14894

@@ -232,14 +250,14 @@

14895

@for dep in $?; do \

14896

case '$(am__configure_deps)' in \

14897

*$$dep*) \

14898

- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

14899

- && exit 0; \

14900

+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

14901

+ && { if test -f $@; then exit 0; else break; fi; }; \

14902

exit 1;; \

14903

esac; \

14904

done; \

14905

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/symlink/Makefile'; \

14906

- cd $(top_srcdir) && \

14907

- $(AUTOMAKE) --gnu plugins/symlink/Makefile

14908

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/symlink/Makefile'; \

14909

+ $(am__cd) $(top_srcdir) && \

14910

+ $(AUTOMAKE) --gnu plugins/symlink/Makefile

14911

.PRECIOUS: Makefile

14912

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

14913

@case '$?' in \

14914

@@ -257,42 +275,61 @@

14915

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

14916

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

14917

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

14918

+$(am__aclocal_m4_deps):

14919

install-dist_gq_binSCRIPTS: $(dist_gq_bin_SCRIPTS)

14920

@$(NORMAL_INSTALL)

14921

test -z "$(gq_bindir)" || $(MKDIR_P) "$(DESTDIR)$(gq_bindir)"

14922

- @list='$(dist_gq_bin_SCRIPTS)'; for p in $$list; do \

14923

+ @list='$(dist_gq_bin_SCRIPTS)'; test -n "$(gq_bindir)" || list=; \

14924

+ for p in $$list; do \

14925

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

14926

- if test -f $$d$$p; then \

14927

- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \

14928

- echo " $(dist_gq_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(gq_bindir)/$$f'"; \

14929

- $(dist_gq_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(gq_bindir)/$$f"; \

14930

- else :; fi; \

14931

- done

14932

+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \

14933

+ done | \

14934

+ sed -e 'p;s,.*/,,;n' \

14935

+ -e 'h;s|.*|.|' \

14936

+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \

14937

+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \

14938

+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

14939

+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \

14940

+ if (++n[d] == $(am__install_max)) { \

14941

+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \

14942

+ else { print "f", d "/" $$4, $$1 } } \

14943

+ END { for (d in files) print "f", d, files[d] }' | \

14944

+ while read type dir files; do \

14945

+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

14946

+ test -z "$$files" || { \

14947

+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(gq_bindir)$$dir'"; \

14948

+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(gq_bindir)$$dir" || exit $$?; \

14949

+ } \

14950

+ ; done

14951

14952

uninstall-dist_gq_binSCRIPTS:

14953

@$(NORMAL_UNINSTALL)

14954

- @list='$(dist_gq_bin_SCRIPTS)'; for p in $$list; do \

14955

- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \

14956

- echo " rm -f '$(DESTDIR)$(gq_bindir)/$$f'"; \

14957

- rm -f "$(DESTDIR)$(gq_bindir)/$$f"; \

14958

- done

14959

+ @list='$(dist_gq_bin_SCRIPTS)'; test -n "$(gq_bindir)" || exit 0; \

14960

+ files=`for p in $$list; do echo "$$p"; done | \

14961

+ sed -e 's,.*/,,;$(transform)'`; \

14962

+ test -n "$$list" || exit 0; \

14963

+ echo " ( cd '$(DESTDIR)$(gq_bindir)' && rm -f" $$files ")"; \

14964

+ cd "$(DESTDIR)$(gq_bindir)" && rm -f $$files

14965

install-gq_desktopDATA: $(gq_desktop_DATA)

14966

@$(NORMAL_INSTALL)

14967

test -z "$(gq_desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(gq_desktopdir)"

14968

- @list='$(gq_desktop_DATA)'; for p in $$list; do \

14969

+ @list='$(gq_desktop_DATA)'; test -n "$(gq_desktopdir)" || list=; \

14970

+ for p in $$list; do \

14971

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

14972

- f=$(am__strip_dir) \

14973

- echo " $(gq_desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gq_desktopdir)/$$f'"; \

14974

- $(gq_desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gq_desktopdir)/$$f"; \

14975

+ echo "$$d$$p"; \

14976

+ done | $(am__base_list) | \

14977

+ while read files; do \

14978

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gq_desktopdir)'"; \

14979

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(gq_desktopdir)" || exit $$?; \

14980

done

14981

14982

uninstall-gq_desktopDATA:

14983

@$(NORMAL_UNINSTALL)

14984

- @list='$(gq_desktop_DATA)'; for p in $$list; do \

14985

- f=$(am__strip_dir) \

14986

- echo " rm -f '$(DESTDIR)$(gq_desktopdir)/$$f'"; \

14987

- rm -f "$(DESTDIR)$(gq_desktopdir)/$$f"; \

14988

- done

14989

+ @list='$(gq_desktop_DATA)'; test -n "$(gq_desktopdir)" || list=; \

14990

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

14991

+ test -n "$$files" || exit 0; \

14992

+ echo " ( cd '$(DESTDIR)$(gq_desktopdir)' && rm -f" $$files ")"; \

14993

+ cd "$(DESTDIR)$(gq_desktopdir)" && rm -f $$files

14994

tags: TAGS

14995

TAGS:

14996

14997

@@ -316,13 +353,17 @@

14998

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

14999

if test -d $$d/$$file; then \

15000

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

15001

+ if test -d "$(distdir)/$$file"; then \

15002

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

15003

+ fi; \

15004

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

15005

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

15006

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

15007

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

15008

fi; \

15009

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

15010

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

15011

else \

15012

- test -f $(distdir)/$$file \

15013

- || cp -p $$d/$$file $(distdir)/$$file \

15014

+ test -f "$(distdir)/$$file" \

15015

+ || cp -p $$d/$$file "$(distdir)/$$file" \

15016

|| exit 1; \

15017

fi; \

15018

done

15019

@@ -353,6 +394,7 @@

15020

15021

distclean-generic:

15022

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

15023

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

15024

15025

maintainer-clean-generic:

15026

@echo "This command is intended for maintainers to use"

15027

@@ -371,6 +413,8 @@

15028

15029

html: html-am

15030

15031

+html-am:

15032

+

15033

info: info-am

15034

15035

info-am:

15036

@@ -379,18 +423,28 @@

15037

15038

install-dvi: install-dvi-am

15039

15040

+install-dvi-am:

15041

+

15042

install-exec-am:

15043

15044

install-html: install-html-am

15045

15046

+install-html-am:

15047

+

15048

install-info: install-info-am

15049

15050

+install-info-am:

15051

+

15052

install-man:

15053

15054

install-pdf: install-pdf-am

15055

15056

+install-pdf-am:

15057

+

15058

install-ps: install-ps-am

15059

15060

+install-ps-am:

15061

+

15062

installcheck-am:

15063

15064

maintainer-clean: maintainer-clean-am

15065

@@ -427,6 +481,7 @@

15066

uninstall-gq_desktopDATA

15067

15068

@INTLTOOL_DESKTOP_RULE@

15069

+

15070

# Tell versions [3.59,3.63) of GNU make to not export all variables.

15071

# Otherwise a system limit (for SysV at least) may be exceeded.

15072

.NOEXPORT:

15073

--- a/plugins/ufraw/Makefile.in

15074

+++ b/plugins/ufraw/Makefile.in

15075

@@ -1,8 +1,9 @@

15076

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

15077

+# Makefile.in generated by automake 1.11 from Makefile.am.

15078

# @configure_input@

15079

15080

15081

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

15082

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

15083

+# Inc.

15084

# This Makefile.in is free software; the Free Software Foundation

15085

# gives unlimited permission to copy and/or distribute it,

15086

# with or without modifications, as long as this notice is preserved.

15087

@@ -17,8 +18,9 @@

15088

15089

VPATH = @srcdir@

15090

pkgdatadir = $(datadir)/@PACKAGE@

15091

-pkglibdir = $(libdir)/@PACKAGE@

15092

pkgincludedir = $(includedir)/@PACKAGE@

15093

+pkglibdir = $(libdir)/@PACKAGE@

15094

+pkglibexecdir = $(libexecdir)/@PACKAGE@

15095

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

15096

install_sh_DATA = $(install_sh) -c -m 644

15097

install_sh_PROGRAM = $(install_sh) -c

15098

@@ -42,19 +44,33 @@

15099

mkinstalldirs = $(SHELL) $(top_srcdir)/auxdir/mkinstalldirs

15100

CONFIG_HEADER = $(top_builddir)/config.h

15101

CONFIG_CLEAN_FILES =

15102

-am__installdirs = "$(DESTDIR)$(gq_bindir)" \

15103

- "$(DESTDIR)$(gq_desktopdir)"

15104

-dist_gq_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)

15105

-SCRIPTS = $(dist_gq_bin_SCRIPTS)

15106

-SOURCES =

15107

-DIST_SOURCES =

15108

+CONFIG_CLEAN_VPATH_FILES =

15109

am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

15110

am__vpath_adj = case $$p in \

15111

$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

15112

*) f=$$p;; \

15113

esac;

15114

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

15115

-gq_desktopDATA_INSTALL = $(INSTALL_DATA)

15116

+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;

15117

+am__install_max = 40

15118

+am__nobase_strip_setup = \

15119

+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`

15120

+am__nobase_strip = \

15121

+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"

15122

+am__nobase_list = $(am__nobase_strip_setup); \

15123

+ for p in $$list; do echo "$$p $$p"; done | \

15124

+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \

15125

+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \

15126

+ if (++n[$$2] == $(am__install_max)) \

15127

+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \

15128

+ END { for (dir in files) print dir, files[dir] }'

15129

+am__base_list = \

15130

+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

15131

+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

15132

+am__installdirs = "$(DESTDIR)$(gq_bindir)" \

15133

+ "$(DESTDIR)$(gq_desktopdir)"

15134

+SCRIPTS = $(dist_gq_bin_SCRIPTS)

15135

+SOURCES =

15136

+DIST_SOURCES =

15137

DATA = $(gq_desktop_DATA)

15138

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

15139

ACLOCAL = @ACLOCAL@

15140

@@ -149,6 +165,7 @@

15141

MAINT = @MAINT@

15142

MAKEINFO = @MAKEINFO@

15143

MKDIR_P = @MKDIR_P@

15144

+MKINSTALLDIRS = @MKINSTALLDIRS@

15145

MSGFMT = @MSGFMT@

15146

MSGFMT_OPTS = @MSGFMT_OPTS@

15147

MSGMERGE = @MSGMERGE@

15148

@@ -158,6 +175,7 @@

15149

PACKAGE_NAME = @PACKAGE_NAME@

15150

PACKAGE_STRING = @PACKAGE_STRING@

15151

PACKAGE_TARNAME = @PACKAGE_TARNAME@

15152

+PACKAGE_URL = @PACKAGE_URL@

15153

PACKAGE_VERSION = @PACKAGE_VERSION@

15154

PATHSEP = @PATHSEP@

15155

PATH_SEPARATOR = @PATH_SEPARATOR@

15156

@@ -235,14 +253,14 @@

15157

@for dep in $?; do \

15158

case '$(am__configure_deps)' in \

15159

*$$dep*) \

15160

- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

15161

- && exit 0; \

15162

+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

15163

+ && { if test -f $@; then exit 0; else break; fi; }; \

15164

exit 1;; \

15165

esac; \

15166

done; \

15167

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/ufraw/Makefile'; \

15168

- cd $(top_srcdir) && \

15169

- $(AUTOMAKE) --gnu plugins/ufraw/Makefile

15170

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/ufraw/Makefile'; \

15171

+ $(am__cd) $(top_srcdir) && \

15172

+ $(AUTOMAKE) --gnu plugins/ufraw/Makefile

15173

.PRECIOUS: Makefile

15174

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

15175

@case '$?' in \

15176

@@ -260,42 +278,61 @@

15177

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

15178

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

15179

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

15180

+$(am__aclocal_m4_deps):

15181

install-dist_gq_binSCRIPTS: $(dist_gq_bin_SCRIPTS)

15182

@$(NORMAL_INSTALL)

15183

test -z "$(gq_bindir)" || $(MKDIR_P) "$(DESTDIR)$(gq_bindir)"

15184

- @list='$(dist_gq_bin_SCRIPTS)'; for p in $$list; do \

15185

+ @list='$(dist_gq_bin_SCRIPTS)'; test -n "$(gq_bindir)" || list=; \

15186

+ for p in $$list; do \

15187

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

15188

- if test -f $$d$$p; then \

15189

- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \

15190

- echo " $(dist_gq_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(gq_bindir)/$$f'"; \

15191

- $(dist_gq_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(gq_bindir)/$$f"; \

15192

- else :; fi; \

15193

- done

15194

+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \

15195

+ done | \

15196

+ sed -e 'p;s,.*/,,;n' \

15197

+ -e 'h;s|.*|.|' \

15198

+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \

15199

+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \

15200

+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

15201

+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \

15202

+ if (++n[d] == $(am__install_max)) { \

15203

+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \

15204

+ else { print "f", d "/" $$4, $$1 } } \

15205

+ END { for (d in files) print "f", d, files[d] }' | \

15206

+ while read type dir files; do \

15207

+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

15208

+ test -z "$$files" || { \

15209

+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(gq_bindir)$$dir'"; \

15210

+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(gq_bindir)$$dir" || exit $$?; \

15211

+ } \

15212

+ ; done

15213

15214

uninstall-dist_gq_binSCRIPTS:

15215

@$(NORMAL_UNINSTALL)

15216

- @list='$(dist_gq_bin_SCRIPTS)'; for p in $$list; do \

15217

- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \

15218

- echo " rm -f '$(DESTDIR)$(gq_bindir)/$$f'"; \

15219

- rm -f "$(DESTDIR)$(gq_bindir)/$$f"; \

15220

- done

15221

+ @list='$(dist_gq_bin_SCRIPTS)'; test -n "$(gq_bindir)" || exit 0; \

15222

+ files=`for p in $$list; do echo "$$p"; done | \

15223

+ sed -e 's,.*/,,;$(transform)'`; \

15224

+ test -n "$$list" || exit 0; \

15225

+ echo " ( cd '$(DESTDIR)$(gq_bindir)' && rm -f" $$files ")"; \

15226

+ cd "$(DESTDIR)$(gq_bindir)" && rm -f $$files

15227

install-gq_desktopDATA: $(gq_desktop_DATA)

15228

@$(NORMAL_INSTALL)

15229

test -z "$(gq_desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(gq_desktopdir)"

15230

- @list='$(gq_desktop_DATA)'; for p in $$list; do \

15231

+ @list='$(gq_desktop_DATA)'; test -n "$(gq_desktopdir)" || list=; \

15232

+ for p in $$list; do \

15233

if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

15234

- f=$(am__strip_dir) \

15235

- echo " $(gq_desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gq_desktopdir)/$$f'"; \

15236

- $(gq_desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gq_desktopdir)/$$f"; \

15237

+ echo "$$d$$p"; \

15238

+ done | $(am__base_list) | \

15239

+ while read files; do \

15240

+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gq_desktopdir)'"; \

15241

+ $(INSTALL_DATA) $$files "$(DESTDIR)$(gq_desktopdir)" || exit $$?; \

15242

done

15243

15244

uninstall-gq_desktopDATA:

15245

@$(NORMAL_UNINSTALL)

15246

- @list='$(gq_desktop_DATA)'; for p in $$list; do \

15247

- f=$(am__strip_dir) \

15248

- echo " rm -f '$(DESTDIR)$(gq_desktopdir)/$$f'"; \

15249

- rm -f "$(DESTDIR)$(gq_desktopdir)/$$f"; \

15250

- done

15251

+ @list='$(gq_desktop_DATA)'; test -n "$(gq_desktopdir)" || list=; \

15252

+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \

15253

+ test -n "$$files" || exit 0; \

15254

+ echo " ( cd '$(DESTDIR)$(gq_desktopdir)' && rm -f" $$files ")"; \

15255

+ cd "$(DESTDIR)$(gq_desktopdir)" && rm -f $$files

15256

tags: TAGS

15257

TAGS:

15258

15259

@@ -319,13 +356,17 @@

15260

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

15261

if test -d $$d/$$file; then \

15262

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

15263

+ if test -d "$(distdir)/$$file"; then \

15264

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

15265

+ fi; \

15266

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

15267

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

15268

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

15269

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

15270

fi; \

15271

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

15272

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

15273

else \

15274

- test -f $(distdir)/$$file \

15275

- || cp -p $$d/$$file $(distdir)/$$file \

15276

+ test -f "$(distdir)/$$file" \

15277

+ || cp -p $$d/$$file "$(distdir)/$$file" \

15278

|| exit 1; \

15279

fi; \

15280

done

15281

@@ -356,6 +397,7 @@

15282

15283

distclean-generic:

15284

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

15285

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

15286

15287

maintainer-clean-generic:

15288

@echo "This command is intended for maintainers to use"

15289

@@ -374,6 +416,8 @@

15290

15291

html: html-am

15292

15293

+html-am:

15294

+

15295

info: info-am

15296

15297

info-am:

15298

@@ -382,18 +426,28 @@

15299

15300

install-dvi: install-dvi-am

15301

15302

+install-dvi-am:

15303

+

15304

install-exec-am:

15305

15306

install-html: install-html-am

15307

15308

+install-html-am:

15309

+

15310

install-info: install-info-am

15311

15312

+install-info-am:

15313

+

15314

install-man:

15315

15316

install-pdf: install-pdf-am

15317

15318

+install-pdf-am:

15319

+

15320

install-ps: install-ps-am

15321

15322

+install-ps-am:

15323

+

15324

installcheck-am:

15325

15326

maintainer-clean: maintainer-clean-am

15327

@@ -430,6 +484,7 @@

15328

uninstall-gq_desktopDATA

15329

15330

@INTLTOOL_DESKTOP_RULE@

15331

+

15332

# Tell versions [3.59,3.63) of GNU make to not export all variables.

15333

# Otherwise a system limit (for SysV at least) may be exceeded.

15334

.NOEXPORT:

15335

--- a/src/Makefile.in

15336

+++ b/src/Makefile.in

15337

@@ -1,8 +1,9 @@

15338

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

15339

+# Makefile.in generated by automake 1.11 from Makefile.am.

15340

# @configure_input@

15341

15342

15343

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

15344

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

15345

+# Inc.

15346

# This Makefile.in is free software; the Free Software Foundation

15347

# gives unlimited permission to copy and/or distribute it,

15348

# with or without modifications, as long as this notice is preserved.

15349

@@ -17,8 +18,9 @@

15350

15351

VPATH = @srcdir@

15352

pkgdatadir = $(datadir)/@PACKAGE@

15353

-pkglibdir = $(libdir)/@PACKAGE@

15354

pkgincludedir = $(includedir)/@PACKAGE@

15355

+pkglibdir = $(libdir)/@PACKAGE@

15356

+pkglibexecdir = $(libexecdir)/@PACKAGE@

15357

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

15358

install_sh_DATA = $(install_sh) -c -m 644

15359

install_sh_PROGRAM = $(install_sh) -c

15360

@@ -42,8 +44,8 @@

15361

mkinstalldirs = $(SHELL) $(top_srcdir)/auxdir/mkinstalldirs

15362

CONFIG_HEADER = $(top_builddir)/config.h

15363

CONFIG_CLEAN_FILES =

15364

+CONFIG_CLEAN_VPATH_FILES =

15365

am__installdirs = "$(DESTDIR)$(bindir)"

15366

-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

15367

PROGRAMS = $(bin_PROGRAMS)

15368

am__objects_1 = ui_bookmark.$(OBJEXT) ui_fileops.$(OBJEXT) \

15369

ui_help.$(OBJEXT) ui_menu.$(OBJEXT) ui_misc.$(OBJEXT) \

15370

@@ -90,6 +92,7 @@

15371

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

15372

depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp

15373

am__depfiles_maybe = depfiles

15374

+am__mv = mv -f

15375

COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

15376

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

15377

CCLD = $(CC)

15378

@@ -111,9 +114,37 @@

15379

DATA = $(noinst_DATA)

15380

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

15381

distclean-recursive maintainer-clean-recursive

15382

+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

15383

+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

15384

+ distdir

15385

ETAGS = etags

15386

CTAGS = ctags

15387

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

15388

+am__relativize = \

15389

+ dir0=`pwd`; \

15390

+ sed_first='s,^$[^/]*$/.*$$,\1,'; \

15391

+ sed_rest='s,^[^/]*/*,,'; \

15392

+ sed_last='s,^.*/$[^/]*$$$,\1,'; \

15393

+ sed_butlast='s,/*[^/]*$$,,'; \

15394

+ while test -n "$$dir1"; do \

15395

+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \

15396

+ if test "$$first" != "."; then \

15397

+ if test "$$first" = ".."; then \

15398

+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

15399

+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

15400

+ else \

15401

+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

15402

+ if test "$$first2" = "$$first"; then \

15403

+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

15404

+ else \

15405

+ dir2="../$$dir2"; \

15406

+ fi; \

15407

+ dir0="$$dir0"/"$$first"; \

15408

+ fi; \

15409

+ fi; \

15410

+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

15411

+ done; \

15412

+ reldir="$$dir2"

15413

ACLOCAL = @ACLOCAL@

15414

ALL_LINGUAS = @ALL_LINGUAS@

15415

AMTAR = @AMTAR@

15416

@@ -206,6 +237,7 @@

15417

MAINT = @MAINT@

15418

MAKEINFO = @MAKEINFO@

15419

MKDIR_P = @MKDIR_P@

15420

+MKINSTALLDIRS = @MKINSTALLDIRS@

15421

MSGFMT = @MSGFMT@

15422

MSGFMT_OPTS = @MSGFMT_OPTS@

15423

MSGMERGE = @MSGMERGE@

15424

@@ -215,6 +247,7 @@

15425

PACKAGE_NAME = @PACKAGE_NAME@

15426

PACKAGE_STRING = @PACKAGE_STRING@

15427

PACKAGE_TARNAME = @PACKAGE_TARNAME@

15428

+PACKAGE_URL = @PACKAGE_URL@

15429

PACKAGE_VERSION = @PACKAGE_VERSION@

15430

PATHSEP = @PATHSEP@

15431

PATH_SEPARATOR = @PATH_SEPARATOR@

15432

@@ -512,14 +545,14 @@

15433

@for dep in $?; do \

15434

case '$(am__configure_deps)' in \

15435

*$$dep*) \

15436

- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

15437

- && exit 0; \

15438

+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

15439

+ && { if test -f $@; then exit 0; else break; fi; }; \

15440

exit 1;; \

15441

esac; \

15442

done; \

15443

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \

15444

- cd $(top_srcdir) && \

15445

- $(AUTOMAKE) --gnu src/Makefile

15446

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \

15447

+ $(am__cd) $(top_srcdir) && \

15448

+ $(AUTOMAKE) --gnu src/Makefile

15449

.PRECIOUS: Makefile

15450

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

15451

@case '$?' in \

15452

@@ -537,26 +570,41 @@

15453

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

15454

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

15455

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

15456

+$(am__aclocal_m4_deps):

15457

install-binPROGRAMS: $(bin_PROGRAMS)

15458

@$(NORMAL_INSTALL)

15459

test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

15460

- @list='$(bin_PROGRAMS)'; for p in $$list; do \

15461

- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \

15462

- if test -f $$p \

15463

- ; then \

15464

- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \

15465

- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \

15466

- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \

15467

- else :; fi; \

15468

- done

15469

+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

15470

+ for p in $$list; do echo "$$p $$p"; done | \

15471

+ sed 's/$(EXEEXT)$$//' | \

15472

+ while read p p1; do if test -f $$p; \

15473

+ then echo "$$p"; echo "$$p"; else :; fi; \

15474

+ done | \

15475

+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \

15476

+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \

15477

+ sed 'N;N;N;s,\n, ,g' | \

15478

+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \

15479

+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \

15480

+ if ($$2 == $$4) files[d] = files[d] " " $$1; \

15481

+ else { print "f", $$3 "/" $$4, $$1; } } \

15482

+ END { for (d in files) print "f", d, files[d] }' | \

15483

+ while read type dir files; do \

15484

+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \

15485

+ test -z "$$files" || { \

15486

+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \

15487

+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \

15488

+ } \

15489

+ ; done

15490

15491

uninstall-binPROGRAMS:

15492

@$(NORMAL_UNINSTALL)

15493

- @list='$(bin_PROGRAMS)'; for p in $$list; do \

15494

- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \

15495

- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \

15496

- rm -f "$(DESTDIR)$(bindir)/$$f"; \

15497

- done

15498

+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

15499

+ files=`for p in $$list; do echo "$$p"; done | \

15500

+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \

15501

+ -e 's/$$/$(EXEEXT)/' `; \

15502

+ test -n "$$list" || exit 0; \

15503

+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \

15504

+ cd "$(DESTDIR)$(bindir)" && rm -f $$files

15505

15506

clean-binPROGRAMS:

15507

-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)

15508

@@ -666,28 +714,28 @@

15509

15510

.c.o:

15511

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

15512

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

15513

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

15514

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

15515

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

15516

@am__fastdepCC_FALSE@ $(COMPILE) -c $<

15517

15518

.c.obj:

15519

@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

15520

-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

15521

+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

15522

@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

15523

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

15524

@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`

15525

15526

.cc.o:

15527

@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

15528

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

15529

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

15530

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

15531

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

15532

@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<

15533

15534

.cc.obj:

15535

@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`

15536

-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

15537

+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po

15538

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

15539

@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

15540

@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

15541

@@ -716,7 +764,7 @@

15542

else \

15543

local_target="$$target"; \

15544

fi; \

15545

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

15546

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

15547

|| eval $$failcom; \

15548

done; \

15549

if test "$$dot_seen" = "no"; then \

15550

@@ -750,16 +798,16 @@

15551

else \

15552

local_target="$$target"; \

15553

fi; \

15554

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

15555

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

15556

|| eval $$failcom; \

15557

done && test -z "$$fail"

15558

tags-recursive:

15559

list='$(SUBDIRS)'; for subdir in $$list; do \

15560

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

15561

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

15562

done

15563

ctags-recursive:

15564

list='$(SUBDIRS)'; for subdir in $$list; do \

15565

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

15566

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

15567

done

15568

15569

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

15570

@@ -767,14 +815,14 @@

15571

unique=`for i in $$list; do \

15572

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

15573

done | \

15574

- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

15575

+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

15576

END { if (nonempty) { for (i in files) print i; }; }'`; \

15577

mkid -fID $$unique

15578

tags: TAGS

15579

15580

TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

15581

$(TAGS_FILES) $(LISP)

15582

- tags=; \

15583

+ set x; \

15584

here=`pwd`; \

15585

if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

15586

include_option=--etags-include; \

15587

@@ -786,7 +834,7 @@

15588

list='$(SUBDIRS)'; for subdir in $$list; do \

15589

if test "$$subdir" = .; then :; else \

15590

test ! -f $$subdir/TAGS || \

15591

- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

15592

+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

15593

fi; \

15594

done; \

15595

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

15596

@@ -795,29 +843,34 @@

15597

done | \

15598

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

15599

END { if (nonempty) { for (i in files) print i; }; }'`; \

15600

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

15601

+ shift; \

15602

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

15603

test -n "$$unique" || unique=$$empty_fix; \

15604

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

15605

- $$tags $$unique; \

15606

+ if test $$# -gt 0; then \

15607

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

15608

+ "$$@" $$unique; \

15609

+ else \

15610

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

15611

+ $$unique; \

15612

+ fi; \

15613

fi

15614

ctags: CTAGS

15615

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

15616

$(TAGS_FILES) $(LISP)

15617

- tags=; \

15618

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

15619

unique=`for i in $$list; do \

15620

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

15621

done | \

15622

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

15623

END { if (nonempty) { for (i in files) print i; }; }'`; \

15624

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

15625

+ test -z "$(CTAGS_ARGS)$$unique" \

15626

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

15627

- $$tags $$unique

15628

+ $$unique

15629

15630

GTAGS:

15631

here=`$(am__cd) $(top_builddir) && pwd` \

15632

- && cd $(top_srcdir) \

15633

- && gtags -i $(GTAGS_ARGS) $$here

15634

+ && $(am__cd) $(top_srcdir) \

15635

+ && gtags -i $(GTAGS_ARGS) "$$here"

15636

15637

distclean-tags:

15638

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

15639

@@ -838,29 +891,44 @@

15640

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

15641

if test -d $$d/$$file; then \

15642

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

15643

+ if test -d "$(distdir)/$$file"; then \

15644

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

15645

+ fi; \

15646

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

15647

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

15648

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

15649

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

15650

fi; \

15651

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

15652

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

15653

else \

15654

- test -f $(distdir)/$$file \

15655

- || cp -p $$d/$$file $(distdir)/$$file \

15656

+ test -f "$(distdir)/$$file" \

15657

+ || cp -p $$d/$$file "$(distdir)/$$file" \

15658

|| exit 1; \

15659

fi; \

15660

done

15661

- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

15662

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

15663

if test "$$subdir" = .; then :; else \

15664

test -d "$(distdir)/$$subdir" \

15665

|| $(MKDIR_P) "$(distdir)/$$subdir" \

15666

|| exit 1; \

15667

- distdir=`$(am__cd) $(distdir) && pwd`; \

15668

- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

15669

- (cd $$subdir && \

15670

+ fi; \

15671

+ done

15672

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

15673

+ if test "$$subdir" = .; then :; else \

15674

+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

15675

+ $(am__relativize); \

15676

+ new_distdir=$$reldir; \

15677

+ dir1=$$subdir; dir2="$(top_distdir)"; \

15678

+ $(am__relativize); \

15679

+ new_top_distdir=$$reldir; \

15680

+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

15681

+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

15682

+ ($(am__cd) $$subdir && \

15683

$(MAKE) $(AM_MAKEFLAGS) \

15684

- top_distdir="$$top_distdir" \

15685

- distdir="$$distdir/$$subdir" \

15686

+ top_distdir="$$new_top_distdir" \

15687

+ distdir="$$new_distdir" \

15688

am__remove_distdir=: \

15689

am__skip_length_check=: \

15690

+ am__skip_mode_fix=: \

15691

distdir) \

15692

|| exit 1; \

15693

fi; \

15694

@@ -894,6 +962,7 @@

15695

15696

distclean-generic:

15697

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

15698

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

15699

15700

maintainer-clean-generic:

15701

@echo "This command is intended for maintainers to use"

15702

@@ -914,6 +983,8 @@

15703

15704

html: html-recursive

15705

15706

+html-am:

15707

+

15708

info: info-recursive

15709

15710

info-am:

15711

@@ -922,18 +993,28 @@

15712

15713

install-dvi: install-dvi-recursive

15714

15715

+install-dvi-am:

15716

+

15717

install-exec-am: install-binPROGRAMS

15718

15719

install-html: install-html-recursive

15720

15721

+install-html-am:

15722

+

15723

install-info: install-info-recursive

15724

15725

+install-info-am:

15726

+

15727

install-man:

15728

15729

install-pdf: install-pdf-recursive

15730

15731

+install-pdf-am:

15732

+

15733

install-ps: install-ps-recursive

15734

15735

+install-ps-am:

15736

+

15737

installcheck-am:

15738

15739

maintainer-clean: maintainer-clean-recursive

15740

@@ -955,8 +1036,8 @@

15741

15742

uninstall-am: uninstall-binPROGRAMS

15743

15744

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

15745

- install-strip

15746

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \

15747

+ install-am install-strip tags-recursive

15748

15749

.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

15750

all all-am check check-am clean clean-binPROGRAMS \

15751

@@ -995,6 +1076,7 @@

15752

15753

gq-marshal.c: gq-marshal.list

15754

(echo "#include \"gq-marshal.h\"" ; $(GLIB_GENMARSHAL) --prefix=gq_marshal $(srcdir)/gq-marshal.list --body ) >$@

15755

+

15756

# Tell versions [3.59,3.63) of GNU make to not export all variables.

15757

# Otherwise a system limit (for SysV at least) may be exceeded.

15758

.NOEXPORT:

15759

--- a/src/icons/Makefile.in

15760

+++ b/src/icons/Makefile.in

15761

@@ -1,8 +1,9 @@

15762

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

15763

+# Makefile.in generated by automake 1.11 from Makefile.am.

15764

# @configure_input@

15765

15766

15767

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

15768

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

15769

+# Inc.

15770

# This Makefile.in is free software; the Free Software Foundation

15771

# gives unlimited permission to copy and/or distribute it,

15772

# with or without modifications, as long as this notice is preserved.

15773

@@ -16,8 +17,9 @@

15774

15775

VPATH = @srcdir@

15776

pkgdatadir = $(datadir)/@PACKAGE@

15777

-pkglibdir = $(libdir)/@PACKAGE@

15778

pkgincludedir = $(includedir)/@PACKAGE@

15779

+pkglibdir = $(libdir)/@PACKAGE@

15780

+pkglibexecdir = $(libexecdir)/@PACKAGE@

15781

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

15782

install_sh_DATA = $(install_sh) -c -m 644

15783

install_sh_PROGRAM = $(install_sh) -c

15784

@@ -40,6 +42,7 @@

15785

mkinstalldirs = $(SHELL) $(top_srcdir)/auxdir/mkinstalldirs

15786

CONFIG_HEADER = $(top_builddir)/config.h

15787

CONFIG_CLEAN_FILES =

15788

+CONFIG_CLEAN_VPATH_FILES =

15789

SOURCES =

15790

DIST_SOURCES =

15791

RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

15792

@@ -52,9 +55,37 @@

15793

DATA = $(noinst_DATA)

15794

RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \

15795

distclean-recursive maintainer-clean-recursive

15796

+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

15797

+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

15798

+ distdir

15799

ETAGS = etags

15800

CTAGS = ctags

15801

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

15802

+am__relativize = \

15803

+ dir0=`pwd`; \

15804

+ sed_first='s,^$[^/]*$/.*$$,\1,'; \

15805

+ sed_rest='s,^[^/]*/*,,'; \

15806

+ sed_last='s,^.*/$[^/]*$$$,\1,'; \

15807

+ sed_butlast='s,/*[^/]*$$,,'; \

15808

+ while test -n "$$dir1"; do \

15809

+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \

15810

+ if test "$$first" != "."; then \

15811

+ if test "$$first" = ".."; then \

15812

+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \

15813

+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \

15814

+ else \

15815

+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \

15816

+ if test "$$first2" = "$$first"; then \

15817

+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \

15818

+ else \

15819

+ dir2="../$$dir2"; \

15820

+ fi; \

15821

+ dir0="$$dir0"/"$$first"; \

15822

+ fi; \

15823

+ fi; \

15824

+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

15825

+ done; \

15826

+ reldir="$$dir2"

15827

ACLOCAL = @ACLOCAL@

15828

ALL_LINGUAS = @ALL_LINGUAS@

15829

AMTAR = @AMTAR@

15830

@@ -147,6 +178,7 @@

15831

MAINT = @MAINT@

15832

MAKEINFO = @MAKEINFO@

15833

MKDIR_P = @MKDIR_P@

15834

+MKINSTALLDIRS = @MKINSTALLDIRS@

15835

MSGFMT = @MSGFMT@

15836

MSGFMT_OPTS = @MSGFMT_OPTS@

15837

MSGMERGE = @MSGMERGE@

15838

@@ -156,6 +188,7 @@

15839

PACKAGE_NAME = @PACKAGE_NAME@

15840

PACKAGE_STRING = @PACKAGE_STRING@

15841

PACKAGE_TARNAME = @PACKAGE_TARNAME@

15842

+PACKAGE_URL = @PACKAGE_URL@

15843

PACKAGE_VERSION = @PACKAGE_VERSION@

15844

PATHSEP = @PATHSEP@

15845

PATH_SEPARATOR = @PATH_SEPARATOR@

15846

@@ -265,14 +298,14 @@

15847

@for dep in $?; do \

15848

case '$(am__configure_deps)' in \

15849

*$$dep*) \

15850

- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

15851

- && exit 0; \

15852

+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

15853

+ && { if test -f $@; then exit 0; else break; fi; }; \

15854

exit 1;; \

15855

esac; \

15856

done; \

15857

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/icons/Makefile'; \

15858

- cd $(top_srcdir) && \

15859

- $(AUTOMAKE) --gnu src/icons/Makefile

15860

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/icons/Makefile'; \

15861

+ $(am__cd) $(top_srcdir) && \

15862

+ $(AUTOMAKE) --gnu src/icons/Makefile

15863

.PRECIOUS: Makefile

15864

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

15865

@case '$?' in \

15866

@@ -290,6 +323,7 @@

15867

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

15868

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

15869

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

15870

+$(am__aclocal_m4_deps):

15871

15872

# This directory's subdirectories are mostly independent; you can cd

15873

# into them and run `make' without going through this Makefile.

15874

@@ -315,7 +349,7 @@

15875

else \

15876

local_target="$$target"; \

15877

fi; \

15878

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

15879

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

15880

|| eval $$failcom; \

15881

done; \

15882

if test "$$dot_seen" = "no"; then \

15883

@@ -349,16 +383,16 @@

15884

else \

15885

local_target="$$target"; \

15886

fi; \

15887

- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

15888

+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

15889

|| eval $$failcom; \

15890

done && test -z "$$fail"

15891

tags-recursive:

15892

list='$(SUBDIRS)'; for subdir in $$list; do \

15893

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

15894

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

15895

done

15896

ctags-recursive:

15897

list='$(SUBDIRS)'; for subdir in $$list; do \

15898

- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

15899

+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \

15900

done

15901

15902

ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

15903

@@ -366,14 +400,14 @@

15904

unique=`for i in $$list; do \

15905

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

15906

done | \

15907

- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \

15908

+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \

15909

END { if (nonempty) { for (i in files) print i; }; }'`; \

15910

mkid -fID $$unique

15911

tags: TAGS

15912

15913

TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

15914

$(TAGS_FILES) $(LISP)

15915

- tags=; \

15916

+ set x; \

15917

here=`pwd`; \

15918

if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \

15919

include_option=--etags-include; \

15920

@@ -385,7 +419,7 @@

15921

list='$(SUBDIRS)'; for subdir in $$list; do \

15922

if test "$$subdir" = .; then :; else \

15923

test ! -f $$subdir/TAGS || \

15924

- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \

15925

+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \

15926

fi; \

15927

done; \

15928

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

15929

@@ -394,29 +428,34 @@

15930

done | \

15931

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

15932

END { if (nonempty) { for (i in files) print i; }; }'`; \

15933

- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \

15934

+ shift; \

15935

+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \

15936

test -n "$$unique" || unique=$$empty_fix; \

15937

- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

15938

- $$tags $$unique; \

15939

+ if test $$# -gt 0; then \

15940

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

15941

+ "$$@" $$unique; \

15942

+ else \

15943

+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \

15944

+ $$unique; \

15945

+ fi; \

15946

fi

15947

ctags: CTAGS

15948

CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \

15949

$(TAGS_FILES) $(LISP)

15950

- tags=; \

15951

list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

15952

unique=`for i in $$list; do \

15953

if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

15954

done | \

15955

$(AWK) '{ files[$$0] = 1; nonempty = 1; } \

15956

END { if (nonempty) { for (i in files) print i; }; }'`; \

15957

- test -z "$(CTAGS_ARGS)$$tags$$unique" \

15958

+ test -z "$(CTAGS_ARGS)$$unique" \

15959

|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \

15960

- $$tags $$unique

15961

+ $$unique

15962

15963

GTAGS:

15964

here=`$(am__cd) $(top_builddir) && pwd` \

15965

- && cd $(top_srcdir) \

15966

- && gtags -i $(GTAGS_ARGS) $$here

15967

+ && $(am__cd) $(top_srcdir) \

15968

+ && gtags -i $(GTAGS_ARGS) "$$here"

15969

15970

distclean-tags:

15971

-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

15972

@@ -437,29 +476,44 @@

15973

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

15974

if test -d $$d/$$file; then \

15975

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

15976

+ if test -d "$(distdir)/$$file"; then \

15977

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

15978

+ fi; \

15979

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

15980

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

15981

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

15982

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

15983

fi; \

15984

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

15985

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

15986

else \

15987

- test -f $(distdir)/$$file \

15988

- || cp -p $$d/$$file $(distdir)/$$file \

15989

+ test -f "$(distdir)/$$file" \

15990

+ || cp -p $$d/$$file "$(distdir)/$$file" \

15991

|| exit 1; \

15992

fi; \

15993

done

15994

- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

15995

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

15996

if test "$$subdir" = .; then :; else \

15997

test -d "$(distdir)/$$subdir" \

15998

|| $(MKDIR_P) "$(distdir)/$$subdir" \

15999

|| exit 1; \

16000

- distdir=`$(am__cd) $(distdir) && pwd`; \

16001

- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

16002

- (cd $$subdir && \

16003

+ fi; \

16004

+ done

16005

+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

16006

+ if test "$$subdir" = .; then :; else \

16007

+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

16008

+ $(am__relativize); \

16009

+ new_distdir=$$reldir; \

16010

+ dir1=$$subdir; dir2="$(top_distdir)"; \

16011

+ $(am__relativize); \

16012

+ new_top_distdir=$$reldir; \

16013

+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \

16014

+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \

16015

+ ($(am__cd) $$subdir && \

16016

$(MAKE) $(AM_MAKEFLAGS) \

16017

- top_distdir="$$top_distdir" \

16018

- distdir="$$distdir/$$subdir" \

16019

+ top_distdir="$$new_top_distdir" \

16020

+ distdir="$$new_distdir" \

16021

am__remove_distdir=: \

16022

am__skip_length_check=: \

16023

+ am__skip_mode_fix=: \

16024

distdir) \

16025

|| exit 1; \

16026

fi; \

16027

@@ -490,6 +544,7 @@

16028

16029

distclean-generic:

16030

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

16031

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

16032

16033

maintainer-clean-generic:

16034

@echo "This command is intended for maintainers to use"

16035

@@ -508,6 +563,8 @@

16036

16037

html: html-recursive

16038

16039

+html-am:

16040

+

16041

info: info-recursive

16042

16043

info-am:

16044

@@ -516,18 +573,28 @@

16045

16046

install-dvi: install-dvi-recursive

16047

16048

+install-dvi-am:

16049

+

16050

install-exec-am:

16051

16052

install-html: install-html-recursive

16053

16054

+install-html-am:

16055

+

16056

install-info: install-info-recursive

16057

16058

+install-info-am:

16059

+

16060

install-man:

16061

16062

install-pdf: install-pdf-recursive

16063

16064

+install-pdf-am:

16065

+

16066

install-ps: install-ps-recursive

16067

16068

+install-ps-am:

16069

+

16070

installcheck-am:

16071

16072

maintainer-clean: maintainer-clean-recursive

16073

@@ -548,8 +615,8 @@

16074

16075

uninstall-am:

16076

16077

-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

16078

- install-strip

16079

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \

16080

+ install-am install-strip tags-recursive

16081

16082

.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

16083

all all-am check check-am clean clean-generic ctags \

16084

@@ -571,6 +638,7 @@

16085

echo '#define ICONS_INLINE_H'; echo; \

16086

$(GDK_PIXBUF_CSOURCE) --raw --extern --build-list $(ICONS_INLINE_PAIRS); \

16087

echo '#endif /* ICONS_INLINE_H */') > $@ || echo "!!! Failed to generate $@ !!!"

16088

+

16089

# Tell versions [3.59,3.63) of GNU make to not export all variables.

16090

# Otherwise a system limit (for SysV at least) may be exceeded.

16091

.NOEXPORT:

16092

--- a/src/icons/svg/Makefile.in

16093

+++ b/src/icons/svg/Makefile.in

16094

@@ -1,8 +1,9 @@

16095

-# Makefile.in generated by automake 1.10.1 from Makefile.am.

16096

+# Makefile.in generated by automake 1.11 from Makefile.am.

16097

# @configure_input@

16098

16099

16100

-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

16101

+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,

16102

+# Inc.

16103

# This Makefile.in is free software; the Free Software Foundation

16104

# gives unlimited permission to copy and/or distribute it,

16105

# with or without modifications, as long as this notice is preserved.

16106

@@ -15,8 +16,9 @@

16107

@SET_MAKE@

16108

VPATH = @srcdir@

16109

pkgdatadir = $(datadir)/@PACKAGE@

16110

-pkglibdir = $(libdir)/@PACKAGE@

16111

pkgincludedir = $(includedir)/@PACKAGE@

16112

+pkglibdir = $(libdir)/@PACKAGE@

16113

+pkglibexecdir = $(libexecdir)/@PACKAGE@

16114

am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

16115

install_sh_DATA = $(install_sh) -c -m 644

16116

install_sh_PROGRAM = $(install_sh) -c

16117

@@ -39,6 +41,7 @@

16118

mkinstalldirs = $(SHELL) $(top_srcdir)/auxdir/mkinstalldirs

16119

CONFIG_HEADER = $(top_builddir)/config.h

16120

CONFIG_CLEAN_FILES =

16121

+CONFIG_CLEAN_VPATH_FILES =

16122

SOURCES =

16123

DIST_SOURCES =

16124

DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

16125

@@ -134,6 +137,7 @@

16126

MAINT = @MAINT@

16127

MAKEINFO = @MAKEINFO@

16128

MKDIR_P = @MKDIR_P@

16129

+MKINSTALLDIRS = @MKINSTALLDIRS@

16130

MSGFMT = @MSGFMT@

16131

MSGFMT_OPTS = @MSGFMT_OPTS@

16132

MSGMERGE = @MSGMERGE@

16133

@@ -143,6 +147,7 @@

16134

PACKAGE_NAME = @PACKAGE_NAME@

16135

PACKAGE_STRING = @PACKAGE_STRING@

16136

PACKAGE_TARNAME = @PACKAGE_TARNAME@

16137

+PACKAGE_URL = @PACKAGE_URL@

16138

PACKAGE_VERSION = @PACKAGE_VERSION@

16139

PATHSEP = @PATHSEP@

16140

PATH_SEPARATOR = @PATH_SEPARATOR@

16141

@@ -227,14 +232,14 @@

16142

@for dep in $?; do \

16143

case '$(am__configure_deps)' in \

16144

*$$dep*) \

16145

- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

16146

- && exit 0; \

16147

+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \

16148

+ && { if test -f $@; then exit 0; else break; fi; }; \

16149

exit 1;; \

16150

esac; \

16151

done; \

16152

- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/icons/svg/Makefile'; \

16153

- cd $(top_srcdir) && \

16154

- $(AUTOMAKE) --gnu src/icons/svg/Makefile

16155

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/icons/svg/Makefile'; \

16156

+ $(am__cd) $(top_srcdir) && \

16157

+ $(AUTOMAKE) --gnu src/icons/svg/Makefile

16158

.PRECIOUS: Makefile

16159

Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

16160

@case '$?' in \

16161

@@ -252,6 +257,7 @@

16162

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

16163

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

16164

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

16165

+$(am__aclocal_m4_deps):

16166

tags: TAGS

16167

TAGS:

16168

16169

@@ -275,13 +281,17 @@

16170

if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

16171

if test -d $$d/$$file; then \

16172

dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

16173

+ if test -d "$(distdir)/$$file"; then \

16174

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

16175

+ fi; \

16176

if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

16177

- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

16178

+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \

16179

+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \

16180

fi; \

16181

- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

16182

+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \

16183

else \

16184

- test -f $(distdir)/$$file \

16185

- || cp -p $$d/$$file $(distdir)/$$file \

16186

+ test -f "$(distdir)/$$file" \

16187

+ || cp -p $$d/$$file "$(distdir)/$$file" \

16188

|| exit 1; \

16189

fi; \

16190

done

16191

@@ -309,6 +319,7 @@

16192

16193

distclean-generic:

16194

-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

16195

+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)

16196

16197

maintainer-clean-generic:

16198

@echo "This command is intended for maintainers to use"

16199

@@ -327,6 +338,8 @@

16200

16201

html: html-am

16202

16203

+html-am:

16204

+

16205

info: info-am

16206

16207

info-am:

16208

@@ -335,18 +348,28 @@

16209

16210

install-dvi: install-dvi-am

16211

16212

+install-dvi-am:

16213

+

16214

install-exec-am:

16215

16216

install-html: install-html-am

16217

16218

+install-html-am:

16219

+

16220

install-info: install-info-am

16221

16222

+install-info-am:

16223

+

16224

install-man:

16225

16226

install-pdf: install-pdf-am

16227

16228

+install-pdf-am:

16229

+

16230

install-ps: install-ps-am

16231

16232

+install-ps-am:

16233

+

16234

installcheck-am:

16235

16236

maintainer-clean: maintainer-clean-am

16237

@@ -379,6 +402,7 @@

16238

maintainer-clean maintainer-clean-generic mostlyclean \

16239

mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am

16240

16241

+

16242

# Tell versions [3.59,3.63) of GNU make to not export all variables.

16243

# Otherwise a system limit (for SysV at least) may be exceeded.

16244

.NOEXPORT:

16245

--- a/INSTALL

16246

+++ b/INSTALL

16247

@@ -2,15 +2,15 @@

16248

*************************

16249

16250

16251

-2006, 2007 Free Software Foundation, Inc.

16252

+2006, 2007, 2008, 2009 Free Software Foundation, Inc.

16253

16254

-This file is free documentation; the Free Software Foundation gives

16255

+ This file is free documentation; the Free Software Foundation gives

16256

unlimited permission to copy, distribute and modify it.

16257

16258

Basic Installation

16259

==================

16260

16261

-Briefly, the shell commands `./configure; make; make install' should

16262

+ Briefly, the shell commands `./configure; make; make install' should

16263

configure, build, and install this package. The following

16264

more-detailed instructions are generic; see the `README' file for

16265

instructions specific to this package.

16266

@@ -73,9 +73,9 @@

16267

Compilers and Options

16268

=====================

16269

16270

-Some systems require unusual options for compilation or linking that the

16271

-`configure' script does not know about. Run `./configure --help' for

16272

-details on some of the pertinent environment variables.

16273

+ Some systems require unusual options for compilation or linking that

16274

+the `configure' script does not know about. Run `./configure --help'

16275

+for details on some of the pertinent environment variables.

16276

16277

You can give `configure' initial values for configuration parameters

16278

by setting variables in the command line or in the environment. Here

16279

@@ -88,7 +88,7 @@

16280

Compiling For Multiple Architectures

16281

====================================

16282

16283

-You can compile the package for more than one kind of computer at the

16284

+ You can compile the package for more than one kind of computer at the

16285

same time, by placing the object files for each architecture in their

16286

own directory. To do this, you can use GNU `make'. `cd' to the

16287

directory where you want the object files and executables to go and run

16288

@@ -100,10 +100,24 @@

16289

installed the package for one architecture, use `make distclean' before

16290

reconfiguring for another architecture.

16291

16292

+ On MacOS X 10.5 and later systems, you can create libraries and

16293

+executables that work on multiple system types--known as "fat" or

16294

+"universal" binaries--by specifying multiple `-arch' options to the

16295

+compiler but only a single `-arch' option to the preprocessor. Like

16296

+this:

16297

+

16298

+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \

16299

+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \

16300

+ CPP="gcc -E" CXXCPP="g++ -E"

16301

+

16302

+ This is not guaranteed to produce working output in all cases, you

16303

+may have to build one architecture at a time and combine the results

16304

+using the `lipo' tool if you have problems.

16305

+

16306

Installation Names

16307

==================

16308

16309

-By default, `make install' installs the package's commands under

16310

+ By default, `make install' installs the package's commands under

16311

`/usr/local/bin', include files under `/usr/local/include', etc. You

16312

can specify an installation prefix other than `/usr/local' by giving

16313

`configure' the option `--prefix=PREFIX'.

16314

@@ -126,7 +140,7 @@

16315

Optional Features

16316

=================

16317

16318

-Some packages pay attention to `--enable-FEATURE' options to

16319

+ Some packages pay attention to `--enable-FEATURE' options to

16320

`configure', where FEATURE indicates an optional part of the package.

16321

They may also pay attention to `--with-PACKAGE' options, where PACKAGE

16322

is something like `gnu-as' or `x' (for the X Window System). The

16323

@@ -138,14 +152,46 @@

16324

you can use the `configure' options `--x-includes=DIR' and

16325

`--x-libraries=DIR' to specify their locations.

16326

16327

+Particular systems

16328

+==================

16329

+

16330

+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU

16331

+CC is not installed, it is recommended to use the following options in

16332

+order to use an ANSI C compiler:

16333

+

16334

+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"

16335

+

16336

+and if that doesn't work, install pre-built binaries of GCC for HP-UX.

16337

+

16338

+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot

16339

+parse its `<wchar.h>' header file. The option `-nodtk' can be used as

16340

+a workaround. If GNU CC is not installed, it is therefore recommended

16341

+to try

16342

+

16343

+ ./configure CC="cc"

16344

+

16345

+and if that doesn't work, try

16346

+

16347

+ ./configure CC="cc -nodtk"

16348

+

16349

+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This

16350

+directory contains several dysfunctional programs; working variants of

16351

+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'

16352

+in your `PATH', put it _after_ `/usr/bin'.

16353

+

16354

+ On Haiku, software installed for all users goes in `/boot/common',

16355

+not `/usr/local'. It is recommended to use the following options:

16356

+

16357

+ ./configure --prefix=/boot/common

16358

+

16359

Specifying the System Type

16360

==========================

16361

16362

-There may be some features `configure' cannot figure out automatically,

16363

-but needs to determine by the type of machine the package will run on.

16364

-Usually, assuming the package is built to be run on the _same_

16365

-architectures, `configure' can figure that out, but if it prints a

16366

-message saying it cannot guess the machine type, give it the

16367

+ There may be some features `configure' cannot figure out

16368

+automatically, but needs to determine by the type of machine the package

16369

+will run on. Usually, assuming the package is built to be run on the

16370

+_same_ architectures, `configure' can figure that out, but if it prints

16371

+a message saying it cannot guess the machine type, give it the

16372

`--build=TYPE' option. TYPE can either be a short name for the system

16373

type, such as `sun4', or a canonical name which has the form:

16374

16375

@@ -153,7 +199,8 @@

16376

16377

where SYSTEM can have one of these forms:

16378

16379

- OS KERNEL-OS

16380

+ OS

16381

+ KERNEL-OS

16382

16383

See the file `config.sub' for the possible values of each field. If

16384

`config.sub' isn't included in this package, then this package doesn't

16385

@@ -171,9 +218,9 @@

16386

Sharing Defaults

16387

================

16388

16389

-If you want to set default values for `configure' scripts to share, you

16390

-can create a site shell script called `config.site' that gives default

16391

-values for variables like `CC', `cache_file', and `prefix'.

16392

+ If you want to set default values for `configure' scripts to share,

16393

+you can create a site shell script called `config.site' that gives

16394

+default values for variables like `CC', `cache_file', and `prefix'.

16395

`configure' looks for `PREFIX/share/config.site' if it exists, then

16396

`PREFIX/etc/config.site' if it exists. Or, you can set the

16397

`CONFIG_SITE' environment variable to the location of the site script.

16398

@@ -182,7 +229,7 @@

16399

Defining Variables

16400

==================

16401

16402

-Variables not defined in a site shell script can be set in the

16403

+ Variables not defined in a site shell script can be set in the

16404

environment passed to `configure'. However, some packages may run

16405

configure again during the build, and the customized values of these

16406

variables may be lost. In order to avoid this problem, you should set

16407

@@ -201,11 +248,19 @@

16408

`configure' Invocation

16409

======================

16410

16411

-`configure' recognizes the following options to control how it operates.

16412

+ `configure' recognizes the following options to control how it

16413

+operates.

16414

16415

`--help'

16416

`-h'

16417

- Print a summary of the options to `configure', and exit.

16418

+ Print a summary of all of the options to `configure', and exit.

16419

+

16420

+`--help=short'

16421

+`--help=recursive'

16422

+ Print a summary of the options unique to this package's

16423

+ `configure', and exit. The `short' variant lists options used

16424

+ only in the top level, while the `recursive' variant lists options

16425

+ also present in any nested packages.

16426

16427

`--version'

16428

`-V'

16429

@@ -232,6 +287,16 @@

16430

Look for the package's source code in directory DIR. Usually

16431

`configure' can determine that directory automatically.

16432

16433

+`--prefix=DIR'

16434

+ Use DIR as the installation prefix. *Note Installation Names::

16435

+ for more details, including other options available for fine-tuning

16436

+ the installation locations.

16437

+

16438

+`--no-create'

16439

+`-n'

16440

+ Run the configure checks, but stop before creating any output

16441

+ files.

16442

+

16443

`configure' also accepts some other, not widely useful, options. Run

16444

`configure --help' for more details.

16445