~woodrow-shen/totem/mybranch : revision 5.1.1

1

libtoolize --force --copy

2

aclocal

3

automake -acf

4

autoheader

5

autoconf

6

rm -rf autom4te.cache

7

8

Index: totem-2.24.3/Makefile.in

9

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

10

--- totem-2.24.3.orig/Makefile.in 2008-10-26 15:40:51.000000000 +0100

11

+++ totem-2.24.3/Makefile.in 2009-01-23 17:07:56.616650781 +0100

12

@@ -87,6 +87,8 @@ AUTOCONF = @AUTOCONF@

13

AUTOHEADER = @AUTOHEADER@

14

AUTOMAKE = @AUTOMAKE@

15

AWK = @AWK@

16

+BBC_CFLAGS = @BBC_CFLAGS@

17

+BBC_LIBS = @BBC_LIBS@

18

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

19

BEMUSED_LIBS = @BEMUSED_LIBS@

20

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

21

@@ -257,7 +259,6 @@ XGETTEXT = @XGETTEXT@

22

XINE_CFLAGS = @XINE_CFLAGS@

23

XINE_LIBS = @XINE_LIBS@

24

XMKMF = @XMKMF@

25

-XTEST_LIBS = @XTEST_LIBS@

26

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

27

XVIDMODE_LIBS = @XVIDMODE_LIBS@

28

X_LIBS = @X_LIBS@

29

@@ -314,7 +315,6 @@ sharedstatedir = @sharedstatedir@

30

srcdir = @srcdir@

31

sysconfdir = @sysconfdir@

32

target_alias = @target_alias@

33

-top_build_prefix = @top_build_prefix@

34

top_builddir = @top_builddir@

35

top_srcdir = @top_srcdir@

36

SUBDIRS = lib bindings po data src help $(am__append_1)

37

Index: totem-2.24.3/aclocal.m4

38

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

39

--- totem-2.24.3.orig/aclocal.m4 2008-10-26 15:40:41.000000000 +0100

40

+++ totem-2.24.3/aclocal.m4 2009-01-23 17:07:46.829151183 +0100

41

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

42

43

m4_ifndef([AC_AUTOCONF_VERSION],

44

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

45

-m4_if(AC_AUTOCONF_VERSION, [2.63],,

46

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

47

+m4_if(AC_AUTOCONF_VERSION, [2.61],,

48

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

49

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

50

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

51

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

52

@@ -919,7 +919,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_IN

53

54

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

55

56

-# serial 52 AC_PROG_LIBTOOL

57

+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL

58

59

60

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

61

@@ -1543,7 +1543,6 @@ s390*-*linux*|sparc*-*linux*)

62

esac

63

;;

64

*64-bit*)

65

- libsuff=64

66

case $host in

67

x86_64-*kfreebsd*-gnu)

68

LD="${LD-ld} -m elf_x86_64_fbsd"

69

@@ -2606,13 +2605,11 @@ linux* | k*bsd*-gnu)

70

# Some rework will be needed to allow for fast_install

71

# before this can be enabled.

72

hardcode_into_libs=yes

73

- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"

74

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

75

76

# Append ld.so.conf contents to the search path

77

if test -f /etc/ld.so.conf; then

78

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

79

- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"

80

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

81

fi

82

83

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

84

@@ -2624,6 +2621,18 @@ linux* | k*bsd*-gnu)

85

dynamic_linker='GNU/Linux ld.so'

86

;;

87

88

+netbsdelf*-gnu)

89

+ version_type=linux

90

+ need_lib_prefix=no

91

+ need_version=no

92

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

93

+ soname_spec='${libname}${release}${shared_ext}$major'

94

+ shlibpath_var=LD_LIBRARY_PATH

95

+ shlibpath_overrides_runpath=no

96

+ hardcode_into_libs=yes

97

+ dynamic_linker='NetBSD ld.elf_so'

98

+ ;;

99

+

100

netbsd*)

101

version_type=sunos

102

need_lib_prefix=no

103

@@ -3405,7 +3414,7 @@ linux* | k*bsd*-gnu)

104

lt_cv_deplibs_check_method=pass_all

105

;;

106

107

-netbsd*)

108

+netbsd* | netbsdelf*-gnu)

109

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

110

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

111

else

112

@@ -4412,7 +4421,7 @@ case $host_os in

113

;;

114

esac

115

;;

116

- netbsd*)

117

+ netbsd* | netbsdelf*-gnu)

118

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

119

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

120

wlarc=

121

@@ -6104,7 +6113,7 @@ AC_MSG_CHECKING([for $compiler option to

122

;;

123

esac

124

;;

125

- netbsd*)

126

+ netbsd* | netbsdelf*-gnu)

127

;;

128

osf3* | osf4* | osf5*)

129

case $cc_basename in

130

@@ -6481,6 +6490,9 @@ ifelse([$1],[CXX],[

131

cygwin* | mingw*)

132

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

133

;;

134

+ linux* | k*bsd*-gnu)

135

+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no

136

+ ;;

137

*)

138

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

139

;;

140

@@ -6689,12 +6701,13 @@ EOF

141

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

142

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

143

fi

144

+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no

145

else

146

_LT_AC_TAGVAR(ld_shlibs, $1)=no

147

fi

148

;;

149

150

- netbsd*)

151

+ netbsd* | netbsdelf*-gnu)

152

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

153

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

154

wlarc=

155

@@ -7125,7 +7138,7 @@ _LT_EOF

156

_LT_AC_TAGVAR(link_all_deplibs, $1)=yes

157

;;

158

159

- netbsd*)

160

+ netbsd* | netbsdelf*-gnu)

161

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

162

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

163

else

164

@@ -7656,14 +7669,16 @@ fi])

165

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

166

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

167

m4_define([_PKG_CONFIG],

168

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

169

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

170

- elif test -n "$PKG_CONFIG"; then

171

- PKG_CHECK_EXISTS([$3],

172

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

173

- [pkg_failed=yes])

174

- else

175

- pkg_failed=untried

176

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

177

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

178

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

179

+ else

180

+ PKG_CHECK_EXISTS([$3],

181

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

182

+ [pkg_failed=yes])

183

+ fi

184

+else

185

+ pkg_failed=untried

186

fi[]dnl

187

])# _PKG_CONFIG

188

189

@@ -7707,9 +7722,9 @@ See the pkg-config man page for more det

190

if test $pkg_failed = yes; then

191

_PKG_SHORT_ERRORS_SUPPORTED

192

if test $_pkg_short_errors_supported = yes; then

193

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

194

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

195

else

196

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

197

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

198

fi

199

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

200

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

201

Index: totem-2.24.3/bindings/Makefile.in

202

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

203

--- totem-2.24.3.orig/bindings/Makefile.in 2008-10-26 15:40:44.000000000 +0100

204

+++ totem-2.24.3/bindings/Makefile.in 2009-01-23 17:07:50.033150434 +0100

205

@@ -71,6 +71,8 @@ AUTOCONF = @AUTOCONF@

206

AUTOHEADER = @AUTOHEADER@

207

AUTOMAKE = @AUTOMAKE@

208

AWK = @AWK@

209

+BBC_CFLAGS = @BBC_CFLAGS@

210

+BBC_LIBS = @BBC_LIBS@

211

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

212

BEMUSED_LIBS = @BEMUSED_LIBS@

213

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

214

@@ -241,7 +243,6 @@ XGETTEXT = @XGETTEXT@

215

XINE_CFLAGS = @XINE_CFLAGS@

216

XINE_LIBS = @XINE_LIBS@

217

XMKMF = @XMKMF@

218

-XTEST_LIBS = @XTEST_LIBS@

219

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

220

XVIDMODE_LIBS = @XVIDMODE_LIBS@

221

X_LIBS = @X_LIBS@

222

@@ -298,7 +299,6 @@ sharedstatedir = @sharedstatedir@

223

srcdir = @srcdir@

224

sysconfdir = @sysconfdir@

225

target_alias = @target_alias@

226

-top_build_prefix = @top_build_prefix@

227

top_builddir = @top_builddir@

228

top_srcdir = @top_srcdir@

229

SUBDIRS = $(am__append_1) $(am__append_2)

230

Index: totem-2.24.3/bindings/python/Makefile.in

231

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

232

--- totem-2.24.3.orig/bindings/python/Makefile.in 2008-10-26 15:40:44.000000000 +0100

233

+++ totem-2.24.3/bindings/python/Makefile.in 2009-01-23 17:07:50.193151076 +0100

234

@@ -84,6 +84,8 @@ AUTOCONF = @AUTOCONF@

235

AUTOHEADER = @AUTOHEADER@

236

AUTOMAKE = @AUTOMAKE@

237

AWK = @AWK@

238

+BBC_CFLAGS = @BBC_CFLAGS@

239

+BBC_LIBS = @BBC_LIBS@

240

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

241

BEMUSED_LIBS = @BEMUSED_LIBS@

242

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

243

@@ -254,7 +256,6 @@ XGETTEXT = @XGETTEXT@

244

XINE_CFLAGS = @XINE_CFLAGS@

245

XINE_LIBS = @XINE_LIBS@

246

XMKMF = @XMKMF@

247

-XTEST_LIBS = @XTEST_LIBS@

248

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

249

XVIDMODE_LIBS = @XVIDMODE_LIBS@

250

X_LIBS = @X_LIBS@

251

@@ -311,7 +312,6 @@ sharedstatedir = @sharedstatedir@

252

srcdir = @srcdir@

253

sysconfdir = @sysconfdir@

254

target_alias = @target_alias@

255

-top_build_prefix = @top_build_prefix@

256

top_builddir = @top_builddir@

257

top_srcdir = @top_srcdir@

258

noinst_LTLIBRARIES = totem-python.la

259

Index: totem-2.24.3/bindings/vala/Makefile.in

260

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

261

--- totem-2.24.3.orig/bindings/vala/Makefile.in 2008-10-26 15:40:44.000000000 +0100

262

+++ totem-2.24.3/bindings/vala/Makefile.in 2009-01-23 17:07:50.289151266 +0100

263

@@ -60,6 +60,8 @@ AUTOCONF = @AUTOCONF@

264

AUTOHEADER = @AUTOHEADER@

265

AUTOMAKE = @AUTOMAKE@

266

AWK = @AWK@

267

+BBC_CFLAGS = @BBC_CFLAGS@

268

+BBC_LIBS = @BBC_LIBS@

269

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

270

BEMUSED_LIBS = @BEMUSED_LIBS@

271

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

272

@@ -230,7 +232,6 @@ XGETTEXT = @XGETTEXT@

273

XINE_CFLAGS = @XINE_CFLAGS@

274

XINE_LIBS = @XINE_LIBS@

275

XMKMF = @XMKMF@

276

-XTEST_LIBS = @XTEST_LIBS@

277

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

278

XVIDMODE_LIBS = @XVIDMODE_LIBS@

279

X_LIBS = @X_LIBS@

280

@@ -287,7 +288,6 @@ sharedstatedir = @sharedstatedir@

281

srcdir = @srcdir@

282

sysconfdir = @sysconfdir@

283

target_alias = @target_alias@

284

-top_build_prefix = @top_build_prefix@

285

top_builddir = @top_builddir@

286

top_srcdir = @top_srcdir@

287

dist_noinst_DATA = \

288

Index: totem-2.24.3/browser-plugin/Makefile.in

289

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

290

--- totem-2.24.3.orig/browser-plugin/Makefile.in 2008-10-26 15:40:45.000000000 +0100

291

+++ totem-2.24.3/browser-plugin/Makefile.in 2009-01-23 17:07:50.753151370 +0100

292

@@ -262,7 +262,7 @@ totem_plugin_viewer_DEPENDENCIES = \

293

libtotembrowserplugin_helper.la $(am__DEPENDENCIES_1) \

294

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

295

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

296

- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

297

+ $(am__DEPENDENCIES_1)

298

totem_plugin_viewer_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

299

$(LIBTOOLFLAGS) --mode=link $(CCLD) \

300

$(totem_plugin_viewer_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \

301

@@ -321,6 +321,8 @@ AUTOCONF = @AUTOCONF@

302

AUTOHEADER = @AUTOHEADER@

303

AUTOMAKE = @AUTOMAKE@

304

AWK = @AWK@

305

+BBC_CFLAGS = @BBC_CFLAGS@

306

+BBC_LIBS = @BBC_LIBS@

307

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

308

BEMUSED_LIBS = @BEMUSED_LIBS@

309

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

310

@@ -491,7 +493,6 @@ XGETTEXT = @XGETTEXT@

311

XINE_CFLAGS = @XINE_CFLAGS@

312

XINE_LIBS = @XINE_LIBS@

313

XMKMF = @XMKMF@

314

-XTEST_LIBS = @XTEST_LIBS@

315

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

316

XVIDMODE_LIBS = @XVIDMODE_LIBS@

317

X_LIBS = @X_LIBS@

318

@@ -548,7 +549,6 @@ sharedstatedir = @sharedstatedir@

319

srcdir = @srcdir@

320

sysconfdir = @sysconfdir@

321

target_alias = @target_alias@

322

-top_build_prefix = @top_build_prefix@

323

top_builddir = @top_builddir@

324

top_srcdir = @top_srcdir@

325

plugindir = $(BROWSER_PLUGIN_DIR)

326

Index: totem-2.24.3/config.h.in

327

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

328

--- totem-2.24.3.orig/config.h.in 2008-10-26 15:41:18.000000000 +0100

329

+++ totem-2.24.3/config.h.in 2009-01-23 17:08:12.508654932 +0100

330

@@ -78,9 +78,6 @@

331

/* defined if you have X11/XF86keysym.h */

332

#undef HAVE_XFREE

333

334

-/* defined if you have XTest library */

335

-#undef HAVE_XTEST

336

-

337

/* Define this if you have the XVidMode and XRandR extension installed */

338

#undef HAVE_XVIDMODE

339

340

Index: totem-2.24.3/configure

341

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

342

--- totem-2.24.3.orig/configure 2008-10-26 15:40:53.000000000 +0100

343

+++ totem-2.24.3/configure 2009-01-23 17:08:16.005150576 +0100

344

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

345

#! /bin/sh

346

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

347

-# Generated by GNU Autoconf 2.63 for totem 2.24.3.

348

+# Generated by GNU Autoconf 2.61 for totem 2.24.3.

349

#

350

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

351

#

352

353

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

354

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

355

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

356

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

357

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

358

@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh

359

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

360

emulate sh

361

NULLCMD=:

362

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

363

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

364

# is contrary to our usage. Disable this feature.

365

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

366

setopt NO_GLOB_SUBST

367

@@ -39,45 +39,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE

368

as_cr_digits='0123456789'

369

as_cr_alnum=$as_cr_Letters$as_cr_digits

370

371

-as_nl='

372

-'

373

-export as_nl

374

-# Printing a long string crashes Solaris 7 /usr/bin/printf.

375

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

376

-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

377

-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

378

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

379

- as_echo='printf %s\n'

380

- as_echo_n='printf %s'

381

-else

382

- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then

383

- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'

384

- as_echo_n='/usr/ucb/echo -n'

385

- else

386

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

387

- as_echo_n_body='eval

388

- arg=$1;

389

- case $arg in

390

- *"$as_nl"*)

391

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

392

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

393

- esac;

394

- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"

395

- '

396

- export as_echo_n_body

397

- as_echo_n='sh -c $as_echo_n_body as_echo'

398

- fi

399

- export as_echo_body

400

- as_echo='sh -c $as_echo_body as_echo'

401

-fi

402

-

403

# The user is always right.

404

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

405

- PATH_SEPARATOR=:

406

- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {

407

- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||

408

- PATH_SEPARATOR=';'

409

- }

410

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

411

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

412

+ chmod +x conf$$.sh

413

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

414

+ PATH_SEPARATOR=';'

415

+ else

416

+ PATH_SEPARATOR=:

417

+ fi

418

+ rm -f conf$$.sh

419

fi

420

421

# Support unset when possible.

422

@@ -93,6 +65,8 @@ fi

423

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

424

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

425

# splitting by setting IFS to empty value.)

426

+as_nl='

427

+'

428

IFS=" "" $as_nl"

429

430

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

431

@@ -115,7 +89,7 @@ if test "x$as_myself" = x; then

432

as_myself=$0

433

fi

434

if test ! -f "$as_myself"; then

435

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

436

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

437

{ (exit 1); exit 1; }

438

fi

439

440

@@ -128,10 +102,17 @@ PS2='> '

441

PS4='+ '

442

443

# NLS nuisances.

444

-LC_ALL=C

445

-export LC_ALL

446

-LANGUAGE=C

447

-export LANGUAGE

448

+for as_var in \

449

+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \

450

+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \

451

+ LC_TELEPHONE LC_TIME

452

+do

453

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

454

+ eval $as_var=C; export $as_var

455

+ else

456

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

457

+ fi

458

+done

459

460

# Required to use basename.

461

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

462

@@ -153,7 +134,7 @@ as_me=`$as_basename -- "$0" ||

463

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

464

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

465

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

466

-$as_echo X/"$0" |

467

+echo X/"$0" |

468

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

469

s//\1/

470

q

471

@@ -179,7 +160,7 @@ else

472

as_have_required=no

473

fi

474

475

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

476

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

477

(as_func_return () {

478

(exit \$1)

479

}

480

@@ -261,7 +242,7 @@ IFS=$as_save_IFS

481

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

482

emulate sh

483

NULLCMD=:

484

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

485

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

486

# is contrary to our usage. Disable this feature.

487

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

488

setopt NO_GLOB_SUBST

489

@@ -282,7 +263,7 @@ _ASEOF

490

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

491

emulate sh

492

NULLCMD=:

493

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

494

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

495

# is contrary to our usage. Disable this feature.

496

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

497

setopt NO_GLOB_SUBST

498

@@ -362,10 +343,10 @@ fi

499

500

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

501

for as_var in BASH_ENV ENV

502

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

503

- done

504

- export CONFIG_SHELL

505

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

506

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

507

+ done

508

+ export CONFIG_SHELL

509

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

510

fi

511

512

513

@@ -434,10 +415,9 @@ fi

514

515

test \$exitcode = 0") || {

516

echo No shell found that supports shell functions.

517

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

518

- echo including any error possibly output before this message.

519

- echo This can help us improve future autoconf versions.

520

- echo Configuration will now proceed without shell functions.

521

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

522

+ echo including any error possibly output before this

523

+ echo message

524

}

525

526

527

@@ -473,7 +453,7 @@ test \$exitcode = 0") || {

528

s/-\n.*//

529

' >$as_me.lineno &&

530

chmod +x "$as_me.lineno" ||

531

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

532

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

533

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

534

535

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

536

@@ -501,6 +481,7 @@ case `echo -n x` in

537

*)

538

ECHO_N='-n';;

539

esac

540

+

541

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

542

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

543

as_expr=expr

544

@@ -513,22 +494,19 @@ if test -d conf$$.dir; then

545

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

546

else

547

rm -f conf$$.dir

548

- mkdir conf$$.dir 2>/dev/null

549

+ mkdir conf$$.dir

550

fi

551

-if (echo >conf$$.file) 2>/dev/null; then

552

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

553

- as_ln_s='ln -s'

554

- # ... but there are two gotchas:

555

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

556

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

557

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

558

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

559

- as_ln_s='cp -p'

560

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

561

- as_ln_s=ln

562

- else

563

+echo >conf$$.file

564

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

565

+ as_ln_s='ln -s'

566

+ # ... but there are two gotchas:

567

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

568

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

569

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

570

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

571

as_ln_s='cp -p'

572

- fi

573

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

574

+ as_ln_s=ln

575

else

576

as_ln_s='cp -p'

577

fi

578

@@ -553,10 +531,10 @@ else

579

as_test_x='

580

eval sh -c '\''

581

if test -d "$1"; then

582

- test -d "$1/.";

583

+ test -d "$1/.";

584

else

585

case $1 in

586

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

587

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

588

esac;

589

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

590

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

591

@@ -791,329 +769,285 @@ ac_includes_default="\

592

# include <unistd.h>

593

#endif"

594

595

-ac_subst_vars='LTLIBOBJS

596

-LIBOBJS

597

-AM_LDFLAGS

598

-AM_CXXFLAGS

599

-AM_CFLAGS

600

-AM_CPPFLAGS

601

-FULL_LIBEXECDIR

602

-DISABLE_DEPRECATED

603

-MAINT

604

-MAINTAINER_MODE_FALSE

605

-MAINTAINER_MODE_TRUE

606

-WARN_CXXFLAGS

607

-WARN_CFLAGS

608

-ACLOCAL_AMFLAGS

609

-GCONF_SCHEMAS_INSTALL_FALSE

610

-GCONF_SCHEMAS_INSTALL_TRUE

611

-GCONF_SCHEMA_FILE_DIR

612

-GCONF_SCHEMA_CONFIG_SOURCE

613

-GCONFTOOL

614

-WITH_DBUS_FALSE

615

-WITH_DBUS_TRUE

616

-HAVE_NAUTILUS_FALSE

617

-HAVE_NAUTILUS_TRUE

618

-NAUTILUSDIR

619

-NAUTILUS_LIBS

620

-NAUTILUS_CFLAGS

621

-ENABLE_CONE_PLUGIN_FALSE

622

-ENABLE_CONE_PLUGIN_TRUE

623

-ENABLE_MULLY_PLUGIN_FALSE

624

-ENABLE_MULLY_PLUGIN_TRUE

625

-ENABLE_NARROWSPACE_PLUGIN_FALSE

626

-ENABLE_NARROWSPACE_PLUGIN_TRUE

627

-ENABLE_COMPLEX_PLUGIN_FALSE

628

-ENABLE_COMPLEX_PLUGIN_TRUE

629

-ENABLE_GMP_PLUGIN_FALSE

630

-ENABLE_GMP_PLUGIN_TRUE

631

-ENABLE_BASIC_PLUGIN_FALSE

632

-ENABLE_BASIC_PLUGIN_TRUE

633

-ENABLE_BROWSER_PLUGINS_FALSE

634

-ENABLE_BROWSER_PLUGINS_TRUE

635

-SN_LIBS

636

-SN_CFLAGS

637

-DBUS_BIND

638

-DBUS_LIBS

639

-DBUS_CFLAGS

640

-BROWSER_PLUGIN_LIBS

641

-BROWSER_PLUGIN_CFLAGS

642

-BROWSER_PLUGIN_DIR

643

-PLUGINS

644

-ALL_PLUGINS

645

-GLIB_LIBS

646

-GLIB_CFLAGS

647

-TRACKER_LIBS

648

-TRACKER_CFLAGS

649

-LIBEPC_LIBS

650

-LIBEPC_CFLAGS

651

-BEMUSED_LIBS

652

-BEMUSED_CFLAGS

653

-GMYTH_LIBS

654

-GMYTH_CFLAGS

655

-LIRC_LIBS

656

-MEDIA_PLAYER_KEYS_LIBS

657

-MEDIA_PLAYER_KEYS_CFLAGS

658

-LIBGALAGO_LIBS

659

-LIBGALAGO_CFLAGS

660

-ENABLE_VALA_FALSE

661

-ENABLE_VALA_TRUE

662

-VALAC

663

-VALA_LIBS

664

-VALA_CFLAGS

665

-ENABLE_PYTHON_FALSE

666

-ENABLE_PYTHON_TRUE

667

-NO_STRICT_ALIASING_CFLAGS

668

-PYGTK_H2DEF

669

-PYGTK_CODEGEN

670

-PYGTK_DEFSDIR

671

-PYGTK_LIBS

672

-PYGTK_CFLAGS

673

-PYTHON_EXTRA_LIBS

674

-PYTHON_CFLAGS

675

-PYTHON_LIB_LOC

676

-PYTHON_LIBS

677

-pkgpyexecdir

678

-pyexecdir

679

-pkgpythondir

680

-pythondir

681

-PYTHON_PLATFORM

682

-PYTHON_EXEC_PREFIX

683

-PYTHON_PREFIX

684

-PYTHON_VERSION

685

-PYTHON

686

-HAVE_XVIDMODE_FALSE

687

-HAVE_XVIDMODE_TRUE

688

-X_LIBS

689

-XVIDMODE_LIBS

690

-XVIDMODE_CFLAGS

691

-XTEST_LIBS

692

-XMKMF

693

-GTK_LIBS

694

-GTK_CFLAGS

695

-HAVE_GNOME_FALSE

696

-HAVE_GNOME_TRUE

697

-MM_LIBS

698

-MM_CFLAGS

699

-EXTRA_GNOME_LIBS

700

-EXTRA_GNOME_CFLAGS

701

-TOTEM_GST_FALSE

702

-TOTEM_GST_TRUE

703

-XINE_LIBS

704

-XINE_CFLAGS

705

-GST_LIBS

706

-GST_CFLAGS

707

-MISSING_PLUGINS_LIBS

708

-MISSING_PLUGINS_CFLAGS

709

-NVTV_LIBS

710

-NVTV_CFLAGS

711

-PLUGINDIR

712

-TOTEM_VERSION_MICRO

713

-TOTEM_VERSION_MINOR

714

-TOTEM_VERSION_MAJOR

715

-GLIB_MKENUMS

716

-GLIB_GENMARSHAL

717

-LIBTOOL

718

-ac_ct_F77

719

-FFLAGS

720

-F77

721

-CXXCPP

722

-NMEDIT

723

-DSYMUTIL

724

-RANLIB

725

-AR

726

-ECHO

727

-LN_S

728

-SED

729

-host_os

730

-host_vendor

731

-host_cpu

732

-host

733

-build_os

734

-build_vendor

735

-build_cpu

736

-build

737

-am__fastdepCXX_FALSE

738

-am__fastdepCXX_TRUE

739

-CXXDEPMODE

740

-ac_ct_CXX

741

-CXXFLAGS

742

-CXX

743

-HAVE_GNOME_DOC_UTILS_FALSE

744

-HAVE_GNOME_DOC_UTILS_TRUE

745

-DISTCHECK_CONFIGURE_FLAGS

746

-ENABLE_SK_FALSE

747

-ENABLE_SK_TRUE

748

-DOC_USER_FORMATS

749

-OMF_DIR

750

-HELP_DIR

751

-PKG_CONFIG

752

-ALL_LINGUAS

753

-INTLTOOL_PERL

754

-MSGMERGE

755

-INTLTOOL_POLICY_RULE

756

-INTLTOOL_SERVICE_RULE

757

-INTLTOOL_THEME_RULE

758

-INTLTOOL_SCHEMAS_RULE

759

-INTLTOOL_CAVES_RULE

760

-INTLTOOL_XML_NOMERGE_RULE

761

-INTLTOOL_XML_RULE

762

-INTLTOOL_KBD_RULE

763

-INTLTOOL_XAM_RULE

764

-INTLTOOL_UI_RULE

765

-INTLTOOL_SOUNDLIST_RULE

766

-INTLTOOL_SHEET_RULE

767

-INTLTOOL_SERVER_RULE

768

-INTLTOOL_PONG_RULE

769

-INTLTOOL_OAF_RULE

770

-INTLTOOL_PROP_RULE

771

-INTLTOOL_KEYS_RULE

772

-INTLTOOL_DIRECTORY_RULE

773

-INTLTOOL_DESKTOP_RULE

774

-INTLTOOL_EXTRACT

775

-INTLTOOL_MERGE

776

-INTLTOOL_UPDATE

777

-MKINSTALLDIRS

778

-POSUB

779

-POFILES

780

-PO_IN_DATADIR_FALSE

781

-PO_IN_DATADIR_TRUE

782

-INTLLIBS

783

-INSTOBJEXT

784

-GMOFILES

785

-DATADIRNAME

786

-CATOBJEXT

787

-CATALOGS

788

-XGETTEXT

789

-GMSGFMT

790

-MSGFMT_OPTS

791

-MSGFMT

792

-USE_NLS

793

-EGREP

794

-GREP

795

-CPP

796

-am__fastdepCC_FALSE

797

-am__fastdepCC_TRUE

798

-CCDEPMODE

799

-AMDEPBACKSLASH

800

-AMDEP_FALSE

801

-AMDEP_TRUE

802

-am__quote

803

-am__include

804

-DEPDIR

805

-OBJEXT

806

-EXEEXT

807

-ac_ct_CC

808

-CPPFLAGS

809

-LDFLAGS

810

-CFLAGS

811

-CC

812

-GETTEXT_PACKAGE

813

-am__untar

814

-am__tar

815

-AMTAR

816

-am__leading_dot

817

-SET_MAKE

818

-AWK

819

-mkdir_p

820

-MKDIR_P

821

-INSTALL_STRIP_PROGRAM

822

-STRIP

823

-install_sh

824

-MAKEINFO

825

-AUTOHEADER

826

-AUTOMAKE

827

-AUTOCONF

828

-ACLOCAL

829

-VERSION

830

-PACKAGE

831

-CYGPATH_W

832

-am__isrc

833

-INSTALL_DATA

834

-INSTALL_SCRIPT

835

-INSTALL_PROGRAM

836

-target_alias

837

-host_alias

838

-build_alias

839

-LIBS

840

-ECHO_T

841

-ECHO_N

842

-ECHO_C

843

-DEFS

844

-mandir

845

-localedir

846

-libdir

847

-psdir

848

-pdfdir

849

-dvidir

850

-htmldir

851

-infodir

852

-docdir

853

-oldincludedir

854

-includedir

855

-localstatedir

856

-sharedstatedir

857

-sysconfdir

858

-datadir

859

-datarootdir

860

-libexecdir

861

-sbindir

862

-bindir

863

-program_transform_name

864

-prefix

865

-exec_prefix

866

-PACKAGE_BUGREPORT

867

-PACKAGE_STRING

868

-PACKAGE_VERSION

869

-PACKAGE_TARNAME

870

-PACKAGE_NAME

871

+ac_subst_vars='SHELL

872

PATH_SEPARATOR

873

-SHELL'

874

+PACKAGE_NAME

875

+PACKAGE_TARNAME

876

+PACKAGE_VERSION

877

+PACKAGE_STRING

878

+PACKAGE_BUGREPORT

879

+exec_prefix

880

+prefix

881

+program_transform_name

882

+bindir

883

+sbindir

884

+libexecdir

885

+datarootdir

886

+datadir

887

+sysconfdir

888

+sharedstatedir

889

+localstatedir

890

+includedir

891

+oldincludedir

892

+docdir

893

+infodir

894

+htmldir

895

+dvidir

896

+pdfdir

897

+psdir

898

+libdir

899

+localedir

900

+mandir

901

+DEFS

902

+ECHO_C

903

+ECHO_N

904

+ECHO_T

905

+LIBS

906

+build_alias

907

+host_alias

908

+target_alias

909

+INSTALL_PROGRAM

910

+INSTALL_SCRIPT

911

+INSTALL_DATA

912

+am__isrc

913

+CYGPATH_W

914

+PACKAGE

915

+VERSION

916

+ACLOCAL

917

+AUTOCONF

918

+AUTOMAKE

919

+AUTOHEADER

920

+MAKEINFO

921

+install_sh

922

+STRIP

923

+INSTALL_STRIP_PROGRAM

924

+mkdir_p

925

+AWK

926

+SET_MAKE

927

+am__leading_dot

928

+AMTAR

929

+am__tar

930

+am__untar

931

+GETTEXT_PACKAGE

932

+CC

933

+CFLAGS

934

+LDFLAGS

935

+CPPFLAGS

936

+ac_ct_CC

937

+EXEEXT

938

+OBJEXT

939

+DEPDIR

940

+am__include

941

+am__quote

942

+AMDEP_TRUE

943

+AMDEP_FALSE

944

+AMDEPBACKSLASH

945

+CCDEPMODE

946

+am__fastdepCC_TRUE

947

+am__fastdepCC_FALSE

948

+CPP

949

+GREP

950

+EGREP

951

+USE_NLS

952

+MSGFMT

953

+MSGFMT_OPTS

954

+GMSGFMT

955

+XGETTEXT

956

+CATALOGS

957

+CATOBJEXT

958

+DATADIRNAME

959

+GMOFILES

960

+INSTOBJEXT

961

+INTLLIBS

962

+PO_IN_DATADIR_TRUE

963

+PO_IN_DATADIR_FALSE

964

+POFILES

965

+POSUB

966

+MKINSTALLDIRS

967

+INTLTOOL_UPDATE

968

+INTLTOOL_MERGE

969

+INTLTOOL_EXTRACT

970

+INTLTOOL_DESKTOP_RULE

971

+INTLTOOL_DIRECTORY_RULE

972

+INTLTOOL_KEYS_RULE

973

+INTLTOOL_PROP_RULE

974

+INTLTOOL_OAF_RULE

975

+INTLTOOL_PONG_RULE

976

+INTLTOOL_SERVER_RULE

977

+INTLTOOL_SHEET_RULE

978

+INTLTOOL_SOUNDLIST_RULE

979

+INTLTOOL_UI_RULE

980

+INTLTOOL_XAM_RULE

981

+INTLTOOL_KBD_RULE

982

+INTLTOOL_XML_RULE

983

+INTLTOOL_XML_NOMERGE_RULE

984

+INTLTOOL_CAVES_RULE

985

+INTLTOOL_SCHEMAS_RULE

986

+INTLTOOL_THEME_RULE

987

+INTLTOOL_SERVICE_RULE

988

+INTLTOOL_POLICY_RULE

989

+MSGMERGE

990

+INTLTOOL_PERL

991

+ALL_LINGUAS

992

+PKG_CONFIG

993

+HELP_DIR

994

+OMF_DIR

995

+DOC_USER_FORMATS

996

+ENABLE_SK_TRUE

997

+ENABLE_SK_FALSE

998

+DISTCHECK_CONFIGURE_FLAGS

999

+HAVE_GNOME_DOC_UTILS_TRUE

1000

+HAVE_GNOME_DOC_UTILS_FALSE

1001

+CXX

1002

+CXXFLAGS

1003

+ac_ct_CXX

1004

+CXXDEPMODE

1005

+am__fastdepCXX_TRUE

1006

+am__fastdepCXX_FALSE

1007

+build

1008

+build_cpu

1009

+build_vendor

1010

+build_os

1011

+host

1012

+host_cpu

1013

+host_vendor

1014

+host_os

1015

+SED

1016

+LN_S

1017

+ECHO

1018

+AR

1019

+RANLIB

1020

+DSYMUTIL

1021

+NMEDIT

1022

+CXXCPP

1023

+F77

1024

+FFLAGS

1025

+ac_ct_F77

1026

+LIBTOOL

1027

+GLIB_GENMARSHAL

1028

+GLIB_MKENUMS

1029

+TOTEM_VERSION_MAJOR

1030

+TOTEM_VERSION_MINOR

1031

+TOTEM_VERSION_MICRO

1032

+PLUGINDIR

1033

+NVTV_CFLAGS

1034

+NVTV_LIBS

1035

+MISSING_PLUGINS_CFLAGS

1036

+MISSING_PLUGINS_LIBS

1037

+GST_CFLAGS

1038

+GST_LIBS

1039

+XINE_CFLAGS

1040

+XINE_LIBS

1041

+TOTEM_GST_TRUE

1042

+TOTEM_GST_FALSE

1043

+EXTRA_GNOME_CFLAGS

1044

+EXTRA_GNOME_LIBS

1045

+MM_CFLAGS

1046

+MM_LIBS

1047

+HAVE_GNOME_TRUE

1048

+HAVE_GNOME_FALSE

1049

+GTK_CFLAGS

1050

+GTK_LIBS

1051

+XMKMF

1052

+XVIDMODE_CFLAGS

1053

+XVIDMODE_LIBS

1054

+X_LIBS

1055

+HAVE_XVIDMODE_TRUE

1056

+HAVE_XVIDMODE_FALSE

1057

+PYTHON

1058

+PYTHON_VERSION

1059

+PYTHON_PREFIX

1060

+PYTHON_EXEC_PREFIX

1061

+PYTHON_PLATFORM

1062

+pythondir

1063

+pkgpythondir

1064

+pyexecdir

1065

+pkgpyexecdir

1066

+PYTHON_LIBS

1067

+PYTHON_LIB_LOC

1068

+PYTHON_CFLAGS

1069

+PYTHON_EXTRA_LIBS

1070

+PYGTK_CFLAGS

1071

+PYGTK_LIBS

1072

+PYGTK_DEFSDIR

1073

+PYGTK_CODEGEN

1074

+PYGTK_H2DEF

1075

+NO_STRICT_ALIASING_CFLAGS

1076

+ENABLE_PYTHON_TRUE

1077

+ENABLE_PYTHON_FALSE

1078

+VALA_CFLAGS

1079

+VALA_LIBS

1080

+VALAC

1081

+ENABLE_VALA_TRUE

1082

+ENABLE_VALA_FALSE

1083

+LIBGALAGO_CFLAGS

1084

+LIBGALAGO_LIBS

1085

+MEDIA_PLAYER_KEYS_CFLAGS

1086

+MEDIA_PLAYER_KEYS_LIBS

1087

+LIRC_LIBS

1088

+GMYTH_CFLAGS

1089

+GMYTH_LIBS

1090

+BBC_CFLAGS

1091

+BBC_LIBS

1092

+BEMUSED_CFLAGS

1093

+BEMUSED_LIBS

1094

+LIBEPC_CFLAGS

1095

+LIBEPC_LIBS

1096

+TRACKER_CFLAGS

1097

+TRACKER_LIBS

1098

+GLIB_CFLAGS

1099

+GLIB_LIBS

1100

+ALL_PLUGINS

1101

+PLUGINS

1102

+BROWSER_PLUGIN_DIR

1103

+BROWSER_PLUGIN_CFLAGS

1104

+BROWSER_PLUGIN_LIBS

1105

+DBUS_CFLAGS

1106

+DBUS_LIBS

1107

+DBUS_BIND

1108

+SN_CFLAGS

1109

+SN_LIBS

1110

+ENABLE_BROWSER_PLUGINS_TRUE

1111

+ENABLE_BROWSER_PLUGINS_FALSE

1112

+ENABLE_BASIC_PLUGIN_TRUE

1113

+ENABLE_BASIC_PLUGIN_FALSE

1114

+ENABLE_GMP_PLUGIN_TRUE

1115

+ENABLE_GMP_PLUGIN_FALSE

1116

+ENABLE_COMPLEX_PLUGIN_TRUE

1117

+ENABLE_COMPLEX_PLUGIN_FALSE

1118

+ENABLE_NARROWSPACE_PLUGIN_TRUE

1119

+ENABLE_NARROWSPACE_PLUGIN_FALSE

1120

+ENABLE_MULLY_PLUGIN_TRUE

1121

+ENABLE_MULLY_PLUGIN_FALSE

1122

+ENABLE_CONE_PLUGIN_TRUE

1123

+ENABLE_CONE_PLUGIN_FALSE

1124

+NAUTILUS_CFLAGS

1125

+NAUTILUS_LIBS

1126

+NAUTILUSDIR

1127

+HAVE_NAUTILUS_TRUE

1128

+HAVE_NAUTILUS_FALSE

1129

+WITH_DBUS_TRUE

1130

+WITH_DBUS_FALSE

1131

+GCONFTOOL

1132

+GCONF_SCHEMA_CONFIG_SOURCE

1133

+GCONF_SCHEMA_FILE_DIR

1134

+GCONF_SCHEMAS_INSTALL_TRUE

1135

+GCONF_SCHEMAS_INSTALL_FALSE

1136

+ACLOCAL_AMFLAGS

1137

+WARN_CFLAGS

1138

+WARN_CXXFLAGS

1139

+MAINTAINER_MODE_TRUE

1140

+MAINTAINER_MODE_FALSE

1141

+MAINT

1142

+DISABLE_DEPRECATED

1143

+FULL_LIBEXECDIR

1144

+AM_CPPFLAGS

1145

+AM_CFLAGS

1146

+AM_CXXFLAGS

1147

+AM_LDFLAGS

1148

+LIBOBJS

1149

+LTLIBOBJS'

1150

ac_subst_files=''

1151

-ac_user_opts='

1152

-enable_option_checking

1153

-enable_dependency_tracking

1154

-enable_nls

1155

-with_help_dir

1156

-with_omf_dir

1157

-with_help_formats

1158

-enable_scrollkeeper

1159

-enable_shared

1160

-enable_static

1161

-enable_fast_install

1162

-with_gnu_ld

1163

-enable_libtool_lock

1164

-with_pic

1165

-with_tags

1166

-enable_nvtv

1167

-enable_xine

1168

-enable_easy_codec_installation

1169

-enable_iso_codes

1170

-enable_gtk

1171

-with_x

1172

-enable_python

1173

-enable_vala

1174

-with_plugins

1175

-enable_browser_plugins

1176

-enable_basic_plugin

1177

-enable_gmp_plugin

1178

-enable_complex_plugin

1179

-enable_narrowspace_plugin

1180

-enable_mully_plugin

1181

-enable_cone_plugin

1182

-enable_nautilus

1183

-with_dbus

1184

-with_gconf_source

1185

-with_gconf_schema_file_dir

1186

-enable_schemas_install

1187

-enable_debug

1188

-enable_compile_warnings

1189

-enable_iso_c

1190

-enable_cxx_warnings

1191

-enable_iso_cxx

1192

-enable_maintainer_mode

1193

-enable_run_in_source_tree

1194

-'

1195

ac_precious_vars='build_alias

1196

host_alias

1197

target_alias

1198

@@ -1157,6 +1091,8 @@ MEDIA_PLAYER_KEYS_CFLAGS

1199

MEDIA_PLAYER_KEYS_LIBS

1200

GMYTH_CFLAGS

1201

GMYTH_LIBS

1202

+BBC_CFLAGS

1203

+BBC_LIBS

1204

BEMUSED_CFLAGS

1205

BEMUSED_LIBS

1206

LIBEPC_CFLAGS

1207

@@ -1179,8 +1115,6 @@ NAUTILUS_LIBS'

1208

# Initialize some variables set by options.

1209

ac_init_help=

1210

ac_init_version=false

1211

-ac_unrecognized_opts=

1212

-ac_unrecognized_sep=

1213

# The variables have the same names as the options, with

1214

# dashes changed to underlines.

1215

cache_file=/dev/null

1216

@@ -1279,21 +1213,13 @@ do

1217

datarootdir=$ac_optarg ;;

1218

1219

-disable-* | --disable-*)

1220

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

1221

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

1222

# Reject names that are not valid shell variable names.

1223

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

1224

- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2

1225

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

1226

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

1227

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

1228

- ac_useropt_orig=$ac_useropt

1229

- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

1230

- case $ac_user_opts in

1231

- *"

1232

-"enable_$ac_useropt"

1233

-"*) ;;

1234

- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"

1235

- ac_unrecognized_sep=', ';;

1236

- esac

1237

- eval enable_$ac_useropt=no ;;

1238

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

1239

+ eval enable_$ac_feature=no ;;

1240

1241

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

1242

ac_prev=docdir ;;

1243

@@ -1306,21 +1232,13 @@ do

1244

dvidir=$ac_optarg ;;

1245

1246

-enable-* | --enable-*)

1247

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

1248

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

1249

# Reject names that are not valid shell variable names.

1250

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

1251

- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2

1252

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

1253

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

1254

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

1255

- ac_useropt_orig=$ac_useropt

1256

- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

1257

- case $ac_user_opts in

1258

- *"

1259

-"enable_$ac_useropt"

1260

-"*) ;;

1261

- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"

1262

- ac_unrecognized_sep=', ';;

1263

- esac

1264

- eval enable_$ac_useropt=\$ac_optarg ;;

1265

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

1266

+ eval enable_$ac_feature=\$ac_optarg ;;

1267

1268

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

1269

1270

@@ -1511,38 +1429,22 @@ do

1271

ac_init_version=: ;;

1272

1273

-with-* | --with-*)

1274

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

1275

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

1276

# Reject names that are not valid shell variable names.

1277

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

1278

- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2

1279

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

1280

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

1281

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

1282

- ac_useropt_orig=$ac_useropt

1283

- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

1284

- case $ac_user_opts in

1285

- *"

1286

-"with_$ac_useropt"

1287

-"*) ;;

1288

- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"

1289

- ac_unrecognized_sep=', ';;

1290

- esac

1291

- eval with_$ac_useropt=\$ac_optarg ;;

1292

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

1293

+ eval with_$ac_package=\$ac_optarg ;;

1294

1295

-without-* | --without-*)

1296

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

1297

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

1298

# Reject names that are not valid shell variable names.

1299

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

1300

- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2

1301

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

1302

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

1303

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

1304

- ac_useropt_orig=$ac_useropt

1305

- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`

1306

- case $ac_user_opts in

1307

- *"

1308

-"with_$ac_useropt"

1309

-"*) ;;

1310

- *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"

1311

- ac_unrecognized_sep=', ';;

1312

- esac

1313

- eval with_$ac_useropt=no ;;

1314

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

1315

+ eval with_$ac_package=no ;;

1316

1317

--x)

1318

# Obsolete; use --with-x.

1319

@@ -1562,7 +1464,7 @@ do

1320

1321

x_libraries=$ac_optarg ;;

1322

1323

- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option

1324

+ -*) { echo "$as_me: error: unrecognized option: $ac_option

1325

Try \`$0 --help' for more information." >&2

1326

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

1327

;;

1328

@@ -1571,16 +1473,16 @@ Try \`$0 --help' for more information."

1329

ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`

1330

# Reject names that are not valid shell variable names.

1331

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

1332

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

1333

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

1334

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

1335

eval $ac_envvar=\$ac_optarg

1336

export $ac_envvar ;;

1337

1338

*)

1339

# FIXME: should be removed in autoconf 3.0.

1340

- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2

1341

+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2

1342

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

1343

- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2

1344

+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2

1345

: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}

1346

;;

1347

1348

@@ -1589,38 +1491,22 @@ done

1349

1350

if test -n "$ac_prev"; then

1351

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

1352

- { $as_echo "$as_me: error: missing argument to $ac_option" >&2

1353

+ { echo "$as_me: error: missing argument to $ac_option" >&2

1354

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

1355

fi

1356

1357

-if test -n "$ac_unrecognized_opts"; then

1358

- case $enable_option_checking in

1359

- no) ;;

1360

- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2

1361

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

1362

- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;

1363

- esac

1364

-fi

1365

-

1366

-# Check all directory arguments for consistency.

1367

+# Be sure to have absolute directory names.

1368

for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \

1369

datadir sysconfdir sharedstatedir localstatedir includedir \

1370

oldincludedir docdir infodir htmldir dvidir pdfdir psdir \

1371

libdir localedir mandir

1372

do

1373

eval ac_val=\$$ac_var

1374

- # Remove trailing slashes.

1375

- case $ac_val in

1376

- */ )

1377

- ac_val=`expr "X$ac_val" : 'X$.*[^/]$' \| "X$ac_val" : 'X$.*$'`

1378

- eval $ac_var=\$ac_val;;

1379

- esac

1380

- # Be sure to have absolute directory names.

1381

case $ac_val in

1382

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

1383

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

1384

esac

1385

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

1386

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

1387

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

1388

done

1389

1390

@@ -1635,7 +1521,7 @@ target=$target_alias

1391

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

1392

if test "x$build_alias" = x; then

1393

cross_compiling=maybe

1394

- $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.

1395

+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.

1396

If a cross compiler is detected then cross compile mode will be used." >&2

1397

elif test "x$build_alias" != "x$host_alias"; then

1398

cross_compiling=yes

1399

@@ -1651,10 +1537,10 @@ test "$silent" = yes && exec 6>/dev/null

1400

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

1401

ac_ls_di=`ls -di .` &&

1402

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

1403

- { $as_echo "$as_me: error: working directory cannot be determined" >&2

1404

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

1405

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

1406

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

1407

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

1408

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

1409

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

1410

1411

1412

@@ -1662,12 +1548,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||

1413

if test -z "$srcdir"; then

1414

ac_srcdir_defaulted=yes

1415

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

1416

- ac_confdir=`$as_dirname -- "$as_myself" ||

1417

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

1418

- X"$as_myself" : 'X$//$[^/]' \| \

1419

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

1420

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

1421

-$as_echo X"$as_myself" |

1422

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

1423

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

1424

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

1425

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

1426

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

1427

+echo X"$0" |

1428

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

1429

s//\1/

1430

q

1431

@@ -1694,12 +1580,12 @@ else

1432

fi

1433

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

1434

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

1435

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

1436

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

1437

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

1438

fi

1439

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

1440

ac_abs_confdir=`(

1441

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

1442

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

1443

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

1444

pwd)`

1445

# When building in place, set srcdir=.

1446

@@ -1748,9 +1634,9 @@ Configuration:

1447

1448

Installation directories:

1449

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

1450

- [$ac_default_prefix]

1451

+ [$ac_default_prefix]

1452

--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX

1453

- [PREFIX]

1454

+ [PREFIX]

1455

1456

By default, \`make install' will install all the files in

1457

\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify

1458

@@ -1760,25 +1646,25 @@ for instance \`--prefix=\$HOME'.

1459

For better control, use the options below.

1460

1461

Fine tuning of the installation directories:

1462

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

1463

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

1464

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

1465

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

1466

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

1467

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

1468

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

1469

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

1470

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

1471

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

1472

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

1473

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

1474

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

1475

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

1476

- --docdir=DIR documentation root [DATAROOTDIR/doc/totem]

1477

- --htmldir=DIR html documentation [DOCDIR]

1478

- --dvidir=DIR dvi documentation [DOCDIR]

1479

- --pdfdir=DIR pdf documentation [DOCDIR]

1480

- --psdir=DIR ps documentation [DOCDIR]

1481

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

1482

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

1483

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

1484

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

1485

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

1486

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

1487

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

1488

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

1489

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

1490

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

1491

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

1492

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

1493

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

1494

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

1495

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

1496

+ --htmldir=DIR html documentation [DOCDIR]

1497

+ --dvidir=DIR dvi documentation [DOCDIR]

1498

+ --pdfdir=DIR pdf documentation [DOCDIR]

1499

+ --psdir=DIR ps documentation [DOCDIR]

1500

_ACEOF

1501

1502

cat <<\_ACEOF

1503

@@ -1805,7 +1691,6 @@ if test -n "$ac_init_help"; then

1504

cat <<\_ACEOF

1505

1506

Optional Features:

1507

- --disable-option-checking ignore unrecognized --enable/--with options

1508

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

1509

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

1510

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

1511

@@ -1928,6 +1813,8 @@ Some influential environment variables:

1512

GMYTH_CFLAGS

1513

C compiler flags for GMYTH, overriding pkg-config

1514

GMYTH_LIBS linker flags for GMYTH, overriding pkg-config

1515

+ BBC_CFLAGS C compiler flags for BBC, overriding pkg-config

1516

+ BBC_LIBS linker flags for BBC, overriding pkg-config

1517

BEMUSED_CFLAGS

1518

C compiler flags for BEMUSED, overriding pkg-config

1519

BEMUSED_LIBS

1520

@@ -1967,17 +1854,15 @@ fi

1521

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

1522

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

1523

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

1524

- test -d "$ac_dir" ||

1525

- { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||

1526

- continue

1527

+ test -d "$ac_dir" || continue

1528

ac_builddir=.

1529

1530

case "$ac_dir" in

1531

.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

1532

*)

1533

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

1534

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

1535

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

1536

- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`

1537

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

1538

case $ac_top_builddir_sub in

1539

"") ac_top_builddir_sub=. ac_top_build_prefix= ;;

1540

*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

1541

@@ -2013,7 +1898,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_

1542

echo &&

1543

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

1544

else

1545

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

1546

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

1547

fi || ac_status=$?

1548

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

1549

done

1550

@@ -2023,10 +1908,10 @@ test -n "$ac_init_help" && exit $ac_stat

1551

if $ac_init_version; then

1552

cat <<\_ACEOF

1553

totem configure 2.24.3

1554

-generated by GNU Autoconf 2.63

1555

+generated by GNU Autoconf 2.61

1556

1557

1558

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

1559

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

1560

This configure script is free software; the Free Software Foundation

1561

gives unlimited permission to copy, distribute and modify it.

1562

_ACEOF

1563

@@ -2037,7 +1922,7 @@ This file contains any messages produced

1564

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

1565

1566

It was created by totem $as_me 2.24.3, which was

1567

-generated by GNU Autoconf 2.63. Invocation command line was

1568

+generated by GNU Autoconf 2.61. Invocation command line was

1569

1570

$ $0 $@

1571

1572

@@ -2073,7 +1958,7 @@ for as_dir in $PATH

1573

do

1574

IFS=$as_save_IFS

1575

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

1576

- $as_echo "PATH: $as_dir"

1577

+ echo "PATH: $as_dir"

1578

done

1579

IFS=$as_save_IFS

1580

1581

@@ -2108,7 +1993,7 @@ do

1582

1583

continue ;;

1584

*\'*)

1585

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

1586

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

1587

esac

1588

case $ac_pass in

1589

1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;

1590

@@ -2160,12 +2045,11 @@ _ASBOX

1591

case $ac_val in #(

1592

*${as_nl}*)

1593

case $ac_var in #(

1594

- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5

1595

-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;

1596

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

1597

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

1598

esac

1599

case $ac_var in #(

1600

_ | IFS | as_nl) ;; #(

1601

- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

1602

*) $as_unset $ac_var ;;

1603

esac ;;

1604

esac

1605

@@ -2195,9 +2079,9 @@ _ASBOX

1606

do

1607

eval ac_val=\$$ac_var

1608

case $ac_val in

1609

- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

1610

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

1611

esac

1612

- $as_echo "$ac_var='\''$ac_val'\''"

1613

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

1614

done | sort

1615

echo

1616

1617

@@ -2212,9 +2096,9 @@ _ASBOX

1618

do

1619

eval ac_val=\$$ac_var

1620

case $ac_val in

1621

- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;

1622

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

1623

esac

1624

- $as_echo "$ac_var='\''$ac_val'\''"

1625

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

1626

done | sort

1627

echo

1628

fi

1629

@@ -2230,8 +2114,8 @@ _ASBOX

1630

echo

1631

fi

1632

test "$ac_signal" != 0 &&

1633

- $as_echo "$as_me: caught signal $ac_signal"

1634

- $as_echo "$as_me: exit $exit_status"

1635

+ echo "$as_me: caught signal $ac_signal"

1636

+ echo "$as_me: exit $exit_status"

1637

} >&5

1638

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

1639

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

1640

@@ -2273,24 +2157,21 @@ _ACEOF

1641

1642

1643

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

1644

-# Prefer an explicitly selected file to automatically selected ones.

1645

-ac_site_file1=NONE

1646

-ac_site_file2=NONE

1647

+# Prefer explicitly selected file to automatically selected ones.

1648

if test -n "$CONFIG_SITE"; then

1649

- ac_site_file1=$CONFIG_SITE

1650

+ set x "$CONFIG_SITE"

1651

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

1652

- ac_site_file1=$prefix/share/config.site

1653

- ac_site_file2=$prefix/etc/config.site

1654

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

1655

else

1656

- ac_site_file1=$ac_default_prefix/share/config.site

1657

- ac_site_file2=$ac_default_prefix/etc/config.site

1658

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

1659

+ "$ac_default_prefix/etc/config.site"

1660

fi

1661

-for ac_site_file in "$ac_site_file1" "$ac_site_file2"

1662

+shift

1663

+for ac_site_file

1664

do

1665

- test "x$ac_site_file" = xNONE && continue

1666

if test -r "$ac_site_file"; then

1667

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

1668

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

1669

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

1670

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

1671

sed 's/^/| /' "$ac_site_file" >&5

1672

. "$ac_site_file"

1673

fi

1674

@@ -2300,16 +2181,16 @@ if test -r "$cache_file"; then

1675

# Some versions of bash will fail to source /dev/null (special

1676

# files actually), so we avoid doing that.

1677

if test -f "$cache_file"; then

1678

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

1679

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

1680

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

1681

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

1682

case $cache_file in

1683

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

1684

*) . "./$cache_file";;

1685

esac

1686

fi

1687

else

1688

- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5

1689

-$as_echo "$as_me: creating cache $cache_file" >&6;}

1690

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

1691

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

1692

>$cache_file

1693

fi

1694

1695

@@ -2323,38 +2204,29 @@ for ac_var in $ac_precious_vars; do

1696

eval ac_new_val=\$ac_env_${ac_var}_value

1697

case $ac_old_set,$ac_new_set in

1698

set,)

1699

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

1700

-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}

1701

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

1702

+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}

1703

ac_cache_corrupted=: ;;

1704

,set)

1705

- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5

1706

-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}

1707

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

1708

+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}

1709

ac_cache_corrupted=: ;;

1710

,);;

1711

*)

1712

if test "x$ac_old_val" != "x$ac_new_val"; then

1713

- # differences in whitespace do not lead to failure.

1714

- ac_old_val_w=`echo x $ac_old_val`

1715

- ac_new_val_w=`echo x $ac_new_val`

1716

- if test "$ac_old_val_w" != "$ac_new_val_w"; then

1717

- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5

1718

-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

1719

- ac_cache_corrupted=:

1720

- else

1721

- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5

1722

-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}

1723

- eval $ac_var=\$ac_old_val

1724

- fi

1725

- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5

1726

-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}

1727

- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5

1728

-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}

1729

+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5

1730

+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}

1731

+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5

1732

+echo "$as_me: former value: $ac_old_val" >&2;}

1733

+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5

1734

+echo "$as_me: current value: $ac_new_val" >&2;}

1735

+ ac_cache_corrupted=:

1736

fi;;

1737

esac

1738

# Pass precious variables to config.status.

1739

if test "$ac_new_set" = set; then

1740

case $ac_new_val in

1741

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

1742

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

1743

*) ac_arg=$ac_var=$ac_new_val ;;

1744

esac

1745

case " $ac_configure_args " in

1746

@@ -2364,12 +2236,10 @@ $as_echo "$as_me: current value: \`$ac

1747

fi

1748

done

1749

if $ac_cache_corrupted; then

1750

- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

1751

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

1752

- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5

1753

-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}

1754

- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5

1755

-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}

1756

+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5

1757

+echo "$as_me: error: changes in the environment can compromise the build" >&2;}

1758

+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5

1759

+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}

1760

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

1761

fi

1762

1763

@@ -2428,8 +2298,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s

1764

fi

1765

done

1766

if test -z "$ac_aux_dir"; then

1767

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

1768

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

1769

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

1770

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

1771

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

1772

fi

1773

1774

@@ -2455,12 +2325,11 @@ ac_configure="$SHELL $ac_aux_dir/configu

1775

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

1776

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

1777

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

1778

-# Reject install programs that cannot install multiple files.

1779

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

1780

-$as_echo_n "checking for a BSD-compatible install... " >&6; }

1781

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

1782

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

1783

if test -z "$INSTALL"; then

1784

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

1785

- $as_echo_n "(cached) " >&6

1786

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

1787

else

1788

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

1789

for as_dir in $PATH

1790

@@ -2489,29 +2358,17 @@ case $as_dir/ in

1791

# program-specific install script used by HP pwplus--don't use.

1792

:

1793

else

1794

- rm -rf conftest.one conftest.two conftest.dir

1795

- echo one > conftest.one

1796

- echo two > conftest.two

1797

- mkdir conftest.dir

1798

- if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&

1799

- test -s conftest.one && test -s conftest.two &&

1800

- test -s conftest.dir/conftest.one &&

1801

- test -s conftest.dir/conftest.two

1802

- then

1803

- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"

1804

- break 3

1805

- fi

1806

+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"

1807

+ break 3

1808

fi

1809

fi

1810

done

1811

done

1812

;;

1813

esac

1814

-

1815

done

1816

IFS=$as_save_IFS

1817

1818

-rm -rf conftest.one conftest.two conftest.dir

1819

1820

fi

1821

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

1822

@@ -2524,8 +2381,8 @@ fi

1823

INSTALL=$ac_install_sh

1824

fi

1825

fi

1826

-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5

1827

-$as_echo "$INSTALL" >&6; }

1828

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

1829

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

1830

1831

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

1832

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

1833

@@ -2535,8 +2392,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR

1834

1835

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

1836

1837

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

1838

-$as_echo_n "checking whether build environment is sane... " >&6; }

1839

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

1840

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

1841

# Just in case

1842

sleep 1

1843

echo timestamp > conftest.file

1844

@@ -2559,9 +2416,9 @@ if (

1845

# if, for instance, CONFIG_SHELL is bash and it inherits a

1846

# broken ls alias from the environment. This has actually

1847

# happened. Such a system could not be considered "sane".

1848

- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken

1849

+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken

1850

alias in your environment" >&5

1851

-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken

1852

+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken

1853

alias in your environment" >&2;}

1854

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

1855

fi

1856

@@ -2572,23 +2429,26 @@ then

1857

# Ok.

1858

:

1859

else

1860

- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!

1861

+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!

1862

Check your system clock" >&5

1863

-$as_echo "$as_me: error: newly created file is older than distributed files!

1864

+echo "$as_me: error: newly created file is older than distributed files!

1865

Check your system clock" >&2;}

1866

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

1867

fi

1868

-{ $as_echo "$as_me:$LINENO: result: yes" >&5

1869

-$as_echo "yes" >&6; }

1870

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

1871

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

1872

test "$program_prefix" != NONE &&

1873

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

1874

# Use a double $ so make ignores it.

1875

test "$program_suffix" != NONE &&

1876

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

1877

-# Double any \ or $.

1878

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

1879

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

1880

-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'

1881

-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`

1882

+cat <<\_ACEOF >conftest.sed

1883

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

1884

+_ACEOF

1885

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

1886

+rm -f conftest.sed

1887

1888

# expand $ac_aux_dir to an absolute path

1889

am_aux_dir=`cd $ac_aux_dir && pwd`

1890

@@ -2599,15 +2459,15 @@ if eval "$MISSING --run true"; then

1891

am_missing_run="$MISSING --run "

1892

else

1893

am_missing_run=

1894

- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5

1895

-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

1896

+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5

1897

+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

1898

fi

1899

1900

-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5

1901

-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }

1902

+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5

1903

+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }

1904

if test -z "$MKDIR_P"; then

1905

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

1906

- $as_echo_n "(cached) " >&6

1907

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

1908

else

1909

as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

1910

for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin

1911

@@ -2642,8 +2502,8 @@ fi

1912

MKDIR_P="$ac_install_sh -d"

1913

fi

1914

fi

1915

-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5

1916

-$as_echo "$MKDIR_P" >&6; }

1917

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

1918

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

1919

1920

mkdir_p="$MKDIR_P"

1921

case $mkdir_p in

1922

@@ -2655,10 +2515,10 @@ for ac_prog in gawk mawk nawk awk

1923

do

1924

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

1925

set dummy $ac_prog; ac_word=$2

1926

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

1927

-$as_echo_n "checking for $ac_word... " >&6; }

1928

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

1929

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

1930

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

1931

- $as_echo_n "(cached) " >&6

1932

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

1933

else

1934

if test -n "$AWK"; then

1935

ac_cv_prog_AWK="$AWK" # Let the user override the test.

1936

@@ -2671,7 +2531,7 @@ do

1937

for ac_exec_ext in '' $ac_executable_extensions; do

1938

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

1939

ac_cv_prog_AWK="$ac_prog"

1940

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

1941

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

1942

break 2

1943

fi

1944

done

1945

@@ -2682,23 +2542,22 @@ fi

1946

fi

1947

AWK=$ac_cv_prog_AWK

1948

if test -n "$AWK"; then

1949

- { $as_echo "$as_me:$LINENO: result: $AWK" >&5

1950

-$as_echo "$AWK" >&6; }

1951

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

1952

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

1953

else

1954

- { $as_echo "$as_me:$LINENO: result: no" >&5

1955

-$as_echo "no" >&6; }

1956

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

1957

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

1958

fi

1959

1960

1961

test -n "$AWK" && break

1962

done

1963

1964

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

1965

-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }

1966

-set x ${MAKE-make}

1967

-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

1968

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

1969

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

1970

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

1971

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

1972

- $as_echo_n "(cached) " >&6

1973

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

1974

else

1975

cat >conftest.make <<\_ACEOF

1976

SHELL = /bin/sh

1977

@@ -2715,12 +2574,12 @@ esac

1978

rm -f conftest.make

1979

fi

1980

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

1981

- { $as_echo "$as_me:$LINENO: result: yes" >&5

1982

-$as_echo "yes" >&6; }

1983

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

1984

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

1985

SET_MAKE=

1986

else

1987

- { $as_echo "$as_me:$LINENO: result: no" >&5

1988

-$as_echo "no" >&6; }

1989

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

1990

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

1991

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

1992

fi

1993

1994

@@ -2739,8 +2598,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"

1995

am__isrc=' -I$(srcdir)'

1996

# test to see if srcdir already configured

1997

if test -f $srcdir/config.status; then

1998

- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5

1999

-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}

2000

+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5

2001

+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}

2002

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

2003

fi

2004

fi

2005

@@ -2795,10 +2654,10 @@ if test "$cross_compiling" != no; then

2006

if test -n "$ac_tool_prefix"; then

2007

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

2008

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

2009

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

2010

-$as_echo_n "checking for $ac_word... " >&6; }

2011

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

2012

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

2013

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

2014

- $as_echo_n "(cached) " >&6

2015

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

2016

else

2017

if test -n "$STRIP"; then

2018

ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

2019

@@ -2811,7 +2670,7 @@ do

2020

for ac_exec_ext in '' $ac_executable_extensions; do

2021

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

2022

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

2023

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

2024

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

2025

break 2

2026

fi

2027

done

2028

@@ -2822,11 +2681,11 @@ fi

2029

fi

2030

STRIP=$ac_cv_prog_STRIP

2031

if test -n "$STRIP"; then

2032

- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5

2033

-$as_echo "$STRIP" >&6; }

2034

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

2035

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

2036

else

2037

- { $as_echo "$as_me:$LINENO: result: no" >&5

2038

-$as_echo "no" >&6; }

2039

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

2040

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

2041

fi

2042

2043

2044

@@ -2835,10 +2694,10 @@ if test -z "$ac_cv_prog_STRIP"; then

2045

ac_ct_STRIP=$STRIP

2046

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

2047

set dummy strip; ac_word=$2

2048

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

2049

-$as_echo_n "checking for $ac_word... " >&6; }

2050

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

2051

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

2052

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

2053

- $as_echo_n "(cached) " >&6

2054

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

2055

else

2056

if test -n "$ac_ct_STRIP"; then

2057

ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

2058

@@ -2851,7 +2710,7 @@ do

2059

for ac_exec_ext in '' $ac_executable_extensions; do

2060

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

2061

ac_cv_prog_ac_ct_STRIP="strip"

2062

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

2063

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

2064

break 2

2065

fi

2066

done

2067

@@ -2862,11 +2721,11 @@ fi

2068

fi

2069

ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

2070

if test -n "$ac_ct_STRIP"; then

2071

- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

2072

-$as_echo "$ac_ct_STRIP" >&6; }

2073

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

2074

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

2075

else

2076

- { $as_echo "$as_me:$LINENO: result: no" >&5

2077

-$as_echo "no" >&6; }

2078

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

2079

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

2080

fi

2081

2082

if test "x$ac_ct_STRIP" = x; then

2083

@@ -2874,8 +2733,12 @@ fi

2084

else

2085

case $cross_compiling:$ac_tool_warned in

2086

yes:)

2087

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

2088

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

2089

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

2090

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

2091

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

2092

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

2093

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

2094

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

2095

ac_tool_warned=yes ;;

2096

esac

2097

STRIP=$ac_ct_STRIP

2098

@@ -2919,8 +2782,8 @@ am__doit:

2099

.PHONY: am__doit

2100

END

2101

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

2102

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

2103

-$as_echo_n "checking for style of include used by $am_make... " >&6; }

2104

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

2105

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

2106

am__include="#"

2107

am__quote=

2108

_am_result=none

2109

@@ -2947,8 +2810,8 @@ if test "$am__include" = "#"; then

2110

fi

2111

2112

2113

-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5

2114

-$as_echo "$_am_result" >&6; }

2115

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

2116

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

2117

rm -f confinc confmf

2118

2119

# Check whether --enable-dependency-tracking was given.

2120

@@ -2977,10 +2840,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

2121

if test -n "$ac_tool_prefix"; then

2122

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

2123

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

2124

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

2125

-$as_echo_n "checking for $ac_word... " >&6; }

2126

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

2127

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

2128

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

2129

- $as_echo_n "(cached) " >&6

2130

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

2131

else

2132

if test -n "$CC"; then

2133

ac_cv_prog_CC="$CC" # Let the user override the test.

2134

@@ -2993,7 +2856,7 @@ do

2135

for ac_exec_ext in '' $ac_executable_extensions; do

2136

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

2137

ac_cv_prog_CC="${ac_tool_prefix}gcc"

2138

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

2139

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

2140

break 2

2141

fi

2142

done

2143

@@ -3004,11 +2867,11 @@ fi

2144

fi

2145

CC=$ac_cv_prog_CC

2146

if test -n "$CC"; then

2147

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

2148

-$as_echo "$CC" >&6; }

2149

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

2150

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

2151

else

2152

- { $as_echo "$as_me:$LINENO: result: no" >&5

2153

-$as_echo "no" >&6; }

2154

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

2155

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

2156

fi

2157

2158

2159

@@ -3017,10 +2880,10 @@ if test -z "$ac_cv_prog_CC"; then

2160

ac_ct_CC=$CC

2161

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

2162

set dummy gcc; ac_word=$2

2163

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

2164

-$as_echo_n "checking for $ac_word... " >&6; }

2165

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

2166

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

2167

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

2168

- $as_echo_n "(cached) " >&6

2169

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

2170

else

2171

if test -n "$ac_ct_CC"; then

2172

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

2173

@@ -3033,7 +2896,7 @@ do

2174

for ac_exec_ext in '' $ac_executable_extensions; do

2175

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

2176

ac_cv_prog_ac_ct_CC="gcc"

2177

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

2178

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

2179

break 2

2180

fi

2181

done

2182

@@ -3044,11 +2907,11 @@ fi

2183

fi

2184

ac_ct_CC=$ac_cv_prog_ac_ct_CC

2185

if test -n "$ac_ct_CC"; then

2186

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

2187

-$as_echo "$ac_ct_CC" >&6; }

2188

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

2189

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

2190

else

2191

- { $as_echo "$as_me:$LINENO: result: no" >&5

2192

-$as_echo "no" >&6; }

2193

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

2194

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

2195

fi

2196

2197

if test "x$ac_ct_CC" = x; then

2198

@@ -3056,8 +2919,12 @@ fi

2199

else

2200

case $cross_compiling:$ac_tool_warned in

2201

yes:)

2202

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

2203

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

2204

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

2205

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

2206

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

2207

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

2208

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

2209

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

2210

ac_tool_warned=yes ;;

2211

esac

2212

CC=$ac_ct_CC

2213

@@ -3070,10 +2937,10 @@ if test -z "$CC"; then

2214

if test -n "$ac_tool_prefix"; then

2215

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

2216

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

2217

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

2218

-$as_echo_n "checking for $ac_word... " >&6; }

2219

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

2220

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

2221

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

2222

- $as_echo_n "(cached) " >&6

2223

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

2224

else

2225

if test -n "$CC"; then

2226

ac_cv_prog_CC="$CC" # Let the user override the test.

2227

@@ -3086,7 +2953,7 @@ do

2228

for ac_exec_ext in '' $ac_executable_extensions; do

2229

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

2230

ac_cv_prog_CC="${ac_tool_prefix}cc"

2231

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

2232

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

2233

break 2

2234

fi

2235

done

2236

@@ -3097,11 +2964,11 @@ fi

2237

fi

2238

CC=$ac_cv_prog_CC

2239

if test -n "$CC"; then

2240

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

2241

-$as_echo "$CC" >&6; }

2242

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

2243

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

2244

else

2245

- { $as_echo "$as_me:$LINENO: result: no" >&5

2246

-$as_echo "no" >&6; }

2247

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

2248

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

2249

fi

2250

2251

2252

@@ -3110,10 +2977,10 @@ fi

2253

if test -z "$CC"; then

2254

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

2255

set dummy cc; ac_word=$2

2256

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

2257

-$as_echo_n "checking for $ac_word... " >&6; }

2258

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

2259

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

2260

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

2261

- $as_echo_n "(cached) " >&6

2262

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

2263

else

2264

if test -n "$CC"; then

2265

ac_cv_prog_CC="$CC" # Let the user override the test.

2266

@@ -3131,7 +2998,7 @@ do

2267

continue

2268

fi

2269

ac_cv_prog_CC="cc"

2270

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

2271

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

2272

break 2

2273

fi

2274

done

2275

@@ -3154,11 +3021,11 @@ fi

2276

fi

2277

CC=$ac_cv_prog_CC

2278

if test -n "$CC"; then

2279

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

2280

-$as_echo "$CC" >&6; }

2281

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

2282

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

2283

else

2284

- { $as_echo "$as_me:$LINENO: result: no" >&5

2285

-$as_echo "no" >&6; }

2286

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

2287

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

2288

fi

2289

2290

2291

@@ -3169,10 +3036,10 @@ if test -z "$CC"; then

2292

do

2293

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

2294

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

2295

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

2296

-$as_echo_n "checking for $ac_word... " >&6; }

2297

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

2298

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

2299

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

2300

- $as_echo_n "(cached) " >&6

2301

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

2302

else

2303

if test -n "$CC"; then

2304

ac_cv_prog_CC="$CC" # Let the user override the test.

2305

@@ -3185,7 +3052,7 @@ do

2306

for ac_exec_ext in '' $ac_executable_extensions; do

2307

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

2308

ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

2309

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

2310

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

2311

break 2

2312

fi

2313

done

2314

@@ -3196,11 +3063,11 @@ fi

2315

fi

2316

CC=$ac_cv_prog_CC

2317

if test -n "$CC"; then

2318

- { $as_echo "$as_me:$LINENO: result: $CC" >&5

2319

-$as_echo "$CC" >&6; }

2320

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

2321

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

2322

else

2323

- { $as_echo "$as_me:$LINENO: result: no" >&5

2324

-$as_echo "no" >&6; }

2325

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

2326

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

2327

fi

2328

2329

2330

@@ -3213,10 +3080,10 @@ if test -z "$CC"; then

2331

do

2332

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

2333

set dummy $ac_prog; ac_word=$2

2334

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

2335

-$as_echo_n "checking for $ac_word... " >&6; }

2336

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

2337

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

2338

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

2339

- $as_echo_n "(cached) " >&6

2340

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

2341

else

2342

if test -n "$ac_ct_CC"; then

2343

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

2344

@@ -3229,7 +3096,7 @@ do

2345

for ac_exec_ext in '' $ac_executable_extensions; do

2346

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

2347

ac_cv_prog_ac_ct_CC="$ac_prog"

2348

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

2349

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

2350

break 2

2351

fi

2352

done

2353

@@ -3240,11 +3107,11 @@ fi

2354

fi

2355

ac_ct_CC=$ac_cv_prog_ac_ct_CC

2356

if test -n "$ac_ct_CC"; then

2357

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5

2358

-$as_echo "$ac_ct_CC" >&6; }

2359

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

2360

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

2361

else

2362

- { $as_echo "$as_me:$LINENO: result: no" >&5

2363

-$as_echo "no" >&6; }

2364

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

2365

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

2366

fi

2367

2368

2369

@@ -3256,8 +3123,12 @@ done

2370

else

2371

case $cross_compiling:$ac_tool_warned in

2372

yes:)

2373

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

2374

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

2375

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

2376

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

2377

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

2378

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

2379

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

2380

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

2381

ac_tool_warned=yes ;;

2382

esac

2383

CC=$ac_ct_CC

2384

@@ -3267,50 +3138,44 @@ fi

2385

fi

2386

2387

2388

-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

2389

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2390

-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH

2391

+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH

2392

See \`config.log' for more details." >&5

2393

-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH

2394

+echo "$as_me: error: no acceptable C compiler found in \$PATH

2395

See \`config.log' for more details." >&2;}

2396

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

2397

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

2398

2399

# Provide some information about the compiler.

2400

-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5

2401

-set X $ac_compile

2402

-ac_compiler=$2

2403

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

2404

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

2405

{ (ac_try="$ac_compiler --version >&5"

2406

case "(($ac_try" in

2407

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2408

*) ac_try_echo=$ac_try;;

2409

esac

2410

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2411

-$as_echo "$ac_try_echo") >&5

2412

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2413

(eval "$ac_compiler --version >&5") 2>&5

2414

ac_status=$?

2415

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2416

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2417

(exit $ac_status); }

2418

{ (ac_try="$ac_compiler -v >&5"

2419

case "(($ac_try" in

2420

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2421

*) ac_try_echo=$ac_try;;

2422

esac

2423

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2424

-$as_echo "$ac_try_echo") >&5

2425

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2426

(eval "$ac_compiler -v >&5") 2>&5

2427

ac_status=$?

2428

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2429

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2430

(exit $ac_status); }

2431

{ (ac_try="$ac_compiler -V >&5"

2432

case "(($ac_try" in

2433

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2434

*) ac_try_echo=$ac_try;;

2435

esac

2436

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2437

-$as_echo "$ac_try_echo") >&5

2438

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2439

(eval "$ac_compiler -V >&5") 2>&5

2440

ac_status=$?

2441

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2442

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2443

(exit $ac_status); }

2444

2445

cat >conftest.$ac_ext <<_ACEOF

2446

@@ -3329,22 +3194,27 @@ main ()

2447

}

2448

_ACEOF

2449

ac_clean_files_save=$ac_clean_files

2450

-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"

2451

+ac_clean_files="$ac_clean_files a.out a.exe b.out"

2452

# Try to create an executable without -o first, disregard a.out.

2453

# It will help us diagnose broken compilers, and finding out an intuition

2454

# of exeext.

2455

-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

2456

-$as_echo_n "checking for C compiler default output file name... " >&6; }

2457

-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

2458

-

2459

-# The possible output files:

2460

-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"

2461

-

2462

+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5

2463

+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }

2464

+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

2465

+#

2466

+# List of possible output files, starting from the most likely.

2467

+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)

2468

+# only as a last resort. b.out is created by i960 compilers.

2469

+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'

2470

+#

2471

+# The IRIX 6 linker writes into existing files which may not be

2472

+# executable, retaining their permissions. Remove them first so a

2473

+# subsequent execution test works.

2474

ac_rmfiles=

2475

for ac_file in $ac_files

2476

do

2477

case $ac_file in

2478

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;

2479

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

2480

* ) ac_rmfiles="$ac_rmfiles $ac_file";;

2481

esac

2482

done

2483

@@ -3355,11 +3225,10 @@ case "(($ac_try" in

2484

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2485

*) ac_try_echo=$ac_try;;

2486

esac

2487

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2488

-$as_echo "$ac_try_echo") >&5

2489

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2490

(eval "$ac_link_default") 2>&5

2491

ac_status=$?

2492

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2493

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2494

(exit $ac_status); }; then

2495

# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.

2496

# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'

2497

@@ -3370,7 +3239,7 @@ for ac_file in $ac_files ''

2498

do

2499

test -f "$ac_file" || continue

2500

case $ac_file in

2501

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )

2502

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )

2503

;;

2504

[ab].out )

2505

# We found the default executable, but exeext='' is most

2506

@@ -3397,27 +3266,25 @@ else

2507

ac_file=''

2508

fi

2509

2510

-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5

2511

-$as_echo "$ac_file" >&6; }

2512

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

2513

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

2514

if test -z "$ac_file"; then

2515

- $as_echo "$as_me: failed program was:" >&5

2516

+ echo "$as_me: failed program was:" >&5

2517

sed 's/^/| /' conftest.$ac_ext >&5

2518

2519

-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

2520

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2521

-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables

2522

+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables

2523

See \`config.log' for more details." >&5

2524

-$as_echo "$as_me: error: C compiler cannot create executables

2525

+echo "$as_me: error: C compiler cannot create executables

2526

See \`config.log' for more details." >&2;}

2527

- { (exit 77); exit 77; }; }; }

2528

+ { (exit 77); exit 77; }; }

2529

fi

2530

2531

ac_exeext=$ac_cv_exeext

2532

2533

# Check that the compiler produces executables we can run. If not, either

2534

# the compiler is broken, or we cross compile.

2535

-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5

2536

-$as_echo_n "checking whether the C compiler works... " >&6; }

2537

+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5

2538

+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }

2539

# FIXME: These cross compiler hacks should be removed for Autoconf 3.0

2540

# If not cross compiling, check that we can run a simple program.

2541

if test "$cross_compiling" != yes; then

2542

@@ -3426,53 +3293,49 @@ if test "$cross_compiling" != yes; then

2543

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2544

*) ac_try_echo=$ac_try;;

2545

esac

2546

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2547

-$as_echo "$ac_try_echo") >&5

2548

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2549

(eval "$ac_try") 2>&5

2550

ac_status=$?

2551

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2552

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2553

(exit $ac_status); }; }; then

2554

cross_compiling=no

2555

else

2556

if test "$cross_compiling" = maybe; then

2557

cross_compiling=yes

2558

else

2559

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

2560

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2561

-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.

2562

+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.

2563

If you meant to cross compile, use \`--host'.

2564

See \`config.log' for more details." >&5

2565

-$as_echo "$as_me: error: cannot run C compiled programs.

2566

+echo "$as_me: error: cannot run C compiled programs.

2567

If you meant to cross compile, use \`--host'.

2568

See \`config.log' for more details." >&2;}

2569

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

2570

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

2571

fi

2572

fi

2573

fi

2574

-{ $as_echo "$as_me:$LINENO: result: yes" >&5

2575

-$as_echo "yes" >&6; }

2576

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

2577

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

2578

2579

-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out

2580

+rm -f a.out a.exe conftest$ac_cv_exeext b.out

2581

ac_clean_files=$ac_clean_files_save

2582

# Check that the compiler produces executables we can run. If not, either

2583

# the compiler is broken, or we cross compile.

2584

-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

2585

-$as_echo_n "checking whether we are cross compiling... " >&6; }

2586

-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5

2587

-$as_echo "$cross_compiling" >&6; }

2588

+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5

2589

+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }

2590

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

2591

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

2592

2593

-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5

2594

-$as_echo_n "checking for suffix of executables... " >&6; }

2595

+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5

2596

+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }

2597

if { (ac_try="$ac_link"

2598

case "(($ac_try" in

2599

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2600

*) ac_try_echo=$ac_try;;

2601

esac

2602

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2603

-$as_echo "$ac_try_echo") >&5

2604

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2605

(eval "$ac_link") 2>&5

2606

ac_status=$?

2607

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2608

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2609

(exit $ac_status); }; then

2610

# If both `conftest.exe' and `conftest' are `present' (well, observable)

2611

# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will

2612

@@ -3481,33 +3344,31 @@ $as_echo "$ac_try_echo") >&5

2613

for ac_file in conftest.exe conftest conftest.*; do

2614

test -f "$ac_file" || continue

2615

case $ac_file in

2616

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;

2617

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;

2618

*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`

2619

break;;

2620

* ) break;;

2621

esac

2622

done

2623

else

2624

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

2625

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2626

-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link

2627

+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link

2628

See \`config.log' for more details." >&5

2629

-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link

2630

+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link

2631

See \`config.log' for more details." >&2;}

2632

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

2633

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

2634

fi

2635

2636

rm -f conftest$ac_cv_exeext

2637

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5

2638

-$as_echo "$ac_cv_exeext" >&6; }

2639

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

2640

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

2641

2642

rm -f conftest.$ac_ext

2643

EXEEXT=$ac_cv_exeext

2644

ac_exeext=$EXEEXT

2645

-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5

2646

-$as_echo_n "checking for suffix of object files... " >&6; }

2647

+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5

2648

+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }

2649

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

2650

- $as_echo_n "(cached) " >&6

2651

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

2652

else

2653

cat >conftest.$ac_ext <<_ACEOF

2654

/* confdefs.h. */

2655

@@ -3530,43 +3391,40 @@ case "(($ac_try" in

2656

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2657

*) ac_try_echo=$ac_try;;

2658

esac

2659

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2660

-$as_echo "$ac_try_echo") >&5

2661

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2662

(eval "$ac_compile") 2>&5

2663

ac_status=$?

2664

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2665

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2666

(exit $ac_status); }; then

2667

for ac_file in conftest.o conftest.obj conftest.*; do

2668

test -f "$ac_file" || continue;

2669

case $ac_file in

2670

- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;

2671

+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;

2672

*) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`

2673

break;;

2674

esac

2675

done

2676

else

2677

- $as_echo "$as_me: failed program was:" >&5

2678

+ echo "$as_me: failed program was:" >&5

2679

sed 's/^/| /' conftest.$ac_ext >&5

2680

2681

-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

2682

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

2683

-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile

2684

+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile

2685

See \`config.log' for more details." >&5

2686

-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile

2687

+echo "$as_me: error: cannot compute suffix of object files: cannot compile

2688

See \`config.log' for more details." >&2;}

2689

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

2690

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

2691

fi

2692

2693

rm -f conftest.$ac_cv_objext conftest.$ac_ext

2694

fi

2695

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5

2696

-$as_echo "$ac_cv_objext" >&6; }

2697

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

2698

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

2699

OBJEXT=$ac_cv_objext

2700

ac_objext=$OBJEXT

2701

-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

2702

-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }

2703

+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5

2704

+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }

2705

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

2706

- $as_echo_n "(cached) " >&6

2707

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

2708

else

2709

cat >conftest.$ac_ext <<_ACEOF

2710

/* confdefs.h. */

2711

@@ -3592,21 +3450,20 @@ case "(($ac_try" in

2712

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2713

*) ac_try_echo=$ac_try;;

2714

esac

2715

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2716

-$as_echo "$ac_try_echo") >&5

2717

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2718

(eval "$ac_compile") 2>conftest.er1

2719

ac_status=$?

2720

grep -v '^ *+' conftest.er1 >conftest.err

2721

rm -f conftest.er1

2722

cat conftest.err >&5

2723

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2724

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2725

(exit $ac_status); } && {

2726

test -z "$ac_c_werror_flag" ||

2727

test ! -s conftest.err

2728

} && test -s conftest.$ac_objext; then

2729

ac_compiler_gnu=yes

2730

else

2731

- $as_echo "$as_me: failed program was:" >&5

2732

+ echo "$as_me: failed program was:" >&5

2733

sed 's/^/| /' conftest.$ac_ext >&5

2734

2735

ac_compiler_gnu=no

2736

@@ -3616,19 +3473,15 @@ rm -f core conftest.err conftest.$ac_obj

2737

ac_cv_c_compiler_gnu=$ac_compiler_gnu

2738

2739

fi

2740

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5

2741

-$as_echo "$ac_cv_c_compiler_gnu" >&6; }

2742

-if test $ac_compiler_gnu = yes; then

2743

- GCC=yes

2744

-else

2745

- GCC=

2746

-fi

2747

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

2748

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

2749

+GCC=`test $ac_compiler_gnu = yes && echo yes`

2750

ac_test_CFLAGS=${CFLAGS+set}

2751

ac_save_CFLAGS=$CFLAGS

2752

-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

2753

-$as_echo_n "checking whether $CC accepts -g... " >&6; }

2754

+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5

2755

+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }

2756

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

2757

- $as_echo_n "(cached) " >&6

2758

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

2759

else

2760

ac_save_c_werror_flag=$ac_c_werror_flag

2761

ac_c_werror_flag=yes

2762

@@ -3655,21 +3508,20 @@ case "(($ac_try" in

2763

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2764

*) ac_try_echo=$ac_try;;

2765

esac

2766

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2767

-$as_echo "$ac_try_echo") >&5

2768

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2769

(eval "$ac_compile") 2>conftest.er1

2770

ac_status=$?

2771

grep -v '^ *+' conftest.er1 >conftest.err

2772

rm -f conftest.er1

2773

cat conftest.err >&5

2774

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2775

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2776

(exit $ac_status); } && {

2777

test -z "$ac_c_werror_flag" ||

2778

test ! -s conftest.err

2779

} && test -s conftest.$ac_objext; then

2780

ac_cv_prog_cc_g=yes

2781

else

2782

- $as_echo "$as_me: failed program was:" >&5

2783

+ echo "$as_me: failed program was:" >&5

2784

sed 's/^/| /' conftest.$ac_ext >&5

2785

2786

CFLAGS=""

2787

@@ -3694,21 +3546,20 @@ case "(($ac_try" in

2788

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2789

*) ac_try_echo=$ac_try;;

2790

esac

2791

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2792

-$as_echo "$ac_try_echo") >&5

2793

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2794

(eval "$ac_compile") 2>conftest.er1

2795

ac_status=$?

2796

grep -v '^ *+' conftest.er1 >conftest.err

2797

rm -f conftest.er1

2798

cat conftest.err >&5

2799

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2800

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2801

(exit $ac_status); } && {

2802

test -z "$ac_c_werror_flag" ||

2803

test ! -s conftest.err

2804

} && test -s conftest.$ac_objext; then

2805

:

2806

else

2807

- $as_echo "$as_me: failed program was:" >&5

2808

+ echo "$as_me: failed program was:" >&5

2809

sed 's/^/| /' conftest.$ac_ext >&5

2810

2811

ac_c_werror_flag=$ac_save_c_werror_flag

2812

@@ -3734,21 +3585,20 @@ case "(($ac_try" in

2813

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2814

*) ac_try_echo=$ac_try;;

2815

esac

2816

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2817

-$as_echo "$ac_try_echo") >&5

2818

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2819

(eval "$ac_compile") 2>conftest.er1

2820

ac_status=$?

2821

grep -v '^ *+' conftest.er1 >conftest.err

2822

rm -f conftest.er1

2823

cat conftest.err >&5

2824

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2825

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2826

(exit $ac_status); } && {

2827

test -z "$ac_c_werror_flag" ||

2828

test ! -s conftest.err

2829

} && test -s conftest.$ac_objext; then

2830

ac_cv_prog_cc_g=yes

2831

else

2832

- $as_echo "$as_me: failed program was:" >&5

2833

+ echo "$as_me: failed program was:" >&5

2834

sed 's/^/| /' conftest.$ac_ext >&5

2835

2836

2837

@@ -3763,8 +3613,8 @@ fi

2838

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

2839

ac_c_werror_flag=$ac_save_c_werror_flag

2840

fi

2841

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5

2842

-$as_echo "$ac_cv_prog_cc_g" >&6; }

2843

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

2844

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

2845

if test "$ac_test_CFLAGS" = set; then

2846

CFLAGS=$ac_save_CFLAGS

2847

elif test $ac_cv_prog_cc_g = yes; then

2848

@@ -3780,10 +3630,10 @@ else

2849

CFLAGS=

2850

fi

2851

fi

2852

-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

2853

-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }

2854

+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5

2855

+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }

2856

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

2857

- $as_echo_n "(cached) " >&6

2858

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

2859

else

2860

ac_cv_prog_cc_c89=no

2861

ac_save_CC=$CC

2862

@@ -3854,21 +3704,20 @@ case "(($ac_try" in

2863

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2864

*) ac_try_echo=$ac_try;;

2865

esac

2866

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2867

-$as_echo "$ac_try_echo") >&5

2868

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2869

(eval "$ac_compile") 2>conftest.er1

2870

ac_status=$?

2871

grep -v '^ *+' conftest.er1 >conftest.err

2872

rm -f conftest.er1

2873

cat conftest.err >&5

2874

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2875

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2876

(exit $ac_status); } && {

2877

test -z "$ac_c_werror_flag" ||

2878

test ! -s conftest.err

2879

} && test -s conftest.$ac_objext; then

2880

ac_cv_prog_cc_c89=$ac_arg

2881

else

2882

- $as_echo "$as_me: failed program was:" >&5

2883

+ echo "$as_me: failed program was:" >&5

2884

sed 's/^/| /' conftest.$ac_ext >&5

2885

2886

2887

@@ -3884,15 +3733,15 @@ fi

2888

# AC_CACHE_VAL

2889

case "x$ac_cv_prog_cc_c89" in

2890

x)

2891

- { $as_echo "$as_me:$LINENO: result: none needed" >&5

2892

-$as_echo "none needed" >&6; } ;;

2893

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

2894

+echo "${ECHO_T}none needed" >&6; } ;;

2895

xno)

2896

- { $as_echo "$as_me:$LINENO: result: unsupported" >&5

2897

-$as_echo "unsupported" >&6; } ;;

2898

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

2899

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

2900

*)

2901

CC="$CC $ac_cv_prog_cc_c89"

2902

- { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5

2903

-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;

2904

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

2905

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

2906

esac

2907

2908

2909

@@ -3904,10 +3753,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

2910

2911

depcc="$CC" am_compiler_list=

2912

2913

-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

2914

-$as_echo_n "checking dependency style of $depcc... " >&6; }

2915

+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

2916

+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

2917

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

2918

- $as_echo_n "(cached) " >&6

2919

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

2920

else

2921

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

2922

# We make a subdir and do the tests there. Otherwise we can end up

2923

@@ -3995,8 +3844,8 @@ else

2924

fi

2925

2926

fi

2927

-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5

2928

-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }

2929

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

2930

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

2931

CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

2932

2933

if

2934

@@ -4016,15 +3865,15 @@ ac_cpp='$CPP $CPPFLAGS'

2935

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

2936

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

2937

ac_compiler_gnu=$ac_cv_c_compiler_gnu

2938

-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5

2939

-$as_echo_n "checking how to run the C preprocessor... " >&6; }

2940

+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5

2941

+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }

2942

# On Suns, sometimes $CPP names a directory.

2943

if test -n "$CPP" && test -d "$CPP"; then

2944

CPP=

2945

fi

2946

if test -z "$CPP"; then

2947

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

2948

- $as_echo_n "(cached) " >&6

2949

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

2950

else

2951

# Double quotes because CPP needs to be expanded

2952

for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"

2953

@@ -4056,21 +3905,20 @@ case "(($ac_try" in

2954

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2955

*) ac_try_echo=$ac_try;;

2956

esac

2957

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2958

-$as_echo "$ac_try_echo") >&5

2959

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2960

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

2961

ac_status=$?

2962

grep -v '^ *+' conftest.er1 >conftest.err

2963

rm -f conftest.er1

2964

cat conftest.err >&5

2965

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2966

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2967

(exit $ac_status); } >/dev/null && {

2968

test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

2969

test ! -s conftest.err

2970

}; then

2971

:

2972

else

2973

- $as_echo "$as_me: failed program was:" >&5

2974

+ echo "$as_me: failed program was:" >&5

2975

sed 's/^/| /' conftest.$ac_ext >&5

2976

2977

# Broken: fails on valid input.

2978

@@ -4094,14 +3942,13 @@ case "(($ac_try" in

2979

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

2980

*) ac_try_echo=$ac_try;;

2981

esac

2982

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

2983

-$as_echo "$ac_try_echo") >&5

2984

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

2985

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

2986

ac_status=$?

2987

grep -v '^ *+' conftest.er1 >conftest.err

2988

rm -f conftest.er1

2989

cat conftest.err >&5

2990

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

2991

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

2992

(exit $ac_status); } >/dev/null && {

2993

test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

2994

test ! -s conftest.err

2995

@@ -4109,7 +3956,7 @@ $as_echo "$ac_try_echo") >&5

2996

# Broken: success on invalid input.

2997

continue

2998

else

2999

- $as_echo "$as_me: failed program was:" >&5

3000

+ echo "$as_me: failed program was:" >&5

3001

sed 's/^/| /' conftest.$ac_ext >&5

3002

3003

# Passes both tests.

3004

@@ -4134,8 +3981,8 @@ fi

3005

else

3006

ac_cv_prog_CPP=$CPP

3007

fi

3008

-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5

3009

-$as_echo "$CPP" >&6; }

3010

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

3011

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

3012

ac_preproc_ok=false

3013

for ac_c_preproc_warn_flag in '' yes

3014

do

3015

@@ -4163,21 +4010,20 @@ case "(($ac_try" in

3016

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3017

*) ac_try_echo=$ac_try;;

3018

esac

3019

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3020

-$as_echo "$ac_try_echo") >&5

3021

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3022

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

3023

ac_status=$?

3024

grep -v '^ *+' conftest.er1 >conftest.err

3025

rm -f conftest.er1

3026

cat conftest.err >&5

3027

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3028

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3029

(exit $ac_status); } >/dev/null && {

3030

test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

3031

test ! -s conftest.err

3032

}; then

3033

:

3034

else

3035

- $as_echo "$as_me: failed program was:" >&5

3036

+ echo "$as_me: failed program was:" >&5

3037

sed 's/^/| /' conftest.$ac_ext >&5

3038

3039

# Broken: fails on valid input.

3040

@@ -4201,14 +4047,13 @@ case "(($ac_try" in

3041

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3042

*) ac_try_echo=$ac_try;;

3043

esac

3044

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3045

-$as_echo "$ac_try_echo") >&5

3046

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3047

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

3048

ac_status=$?

3049

grep -v '^ *+' conftest.er1 >conftest.err

3050

rm -f conftest.er1

3051

cat conftest.err >&5

3052

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3053

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3054

(exit $ac_status); } >/dev/null && {

3055

test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

3056

test ! -s conftest.err

3057

@@ -4216,7 +4061,7 @@ $as_echo "$ac_try_echo") >&5

3058

# Broken: success on invalid input.

3059

continue

3060

else

3061

- $as_echo "$as_me: failed program was:" >&5

3062

+ echo "$as_me: failed program was:" >&5

3063

sed 's/^/| /' conftest.$ac_ext >&5

3064

3065

# Passes both tests.

3066

@@ -4232,13 +4077,11 @@ rm -f conftest.err conftest.$ac_ext

3067

if $ac_preproc_ok; then

3068

:

3069

else

3070

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

3071

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

3072

-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check

3073

+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check

3074

See \`config.log' for more details." >&5

3075

-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check

3076

+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check

3077

See \`config.log' for more details." >&2;}

3078

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

3079

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

3080

fi

3081

3082

ac_ext=c

3083

@@ -4248,37 +4091,42 @@ ac_link='$CC -o conftest$ac_exeext $CFLA

3084

ac_compiler_gnu=$ac_cv_c_compiler_gnu

3085

3086

3087

-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5

3088

-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }

3089

+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5

3090

+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }

3091

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

3092

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

3093

+else

3094

+ # Extract the first word of "grep ggrep" to use in msg output

3095

+if test -z "$GREP"; then

3096

+set dummy grep ggrep; ac_prog_name=$2

3097

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

3098

- $as_echo_n "(cached) " >&6

3099

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

3100

else

3101

- if test -z "$GREP"; then

3102

ac_path_GREP_found=false

3103

- # Loop through the user's path and test for each of PROGNAME-LIST

3104

- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3105

+# Loop through the user's path and test for each of PROGNAME-LIST

3106

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3107

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

3108

do

3109

IFS=$as_save_IFS

3110

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

3111

for ac_prog in grep ggrep; do

3112

- for ac_exec_ext in '' $ac_executable_extensions; do

3113

- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

3114

- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

3115

-# Check for GNU ac_path_GREP and select it if it is found.

3116

+ for ac_exec_ext in '' $ac_executable_extensions; do

3117

+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

3118

+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

3119

+ # Check for GNU ac_path_GREP and select it if it is found.

3120

# Check for GNU $ac_path_GREP

3121

case `"$ac_path_GREP" --version 2>&1` in

3122

*GNU*)

3123

ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;

3124

*)

3125

ac_count=0

3126

- $as_echo_n 0123456789 >"conftest.in"

3127

+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

3128

while :

3129

do

3130

cat "conftest.in" "conftest.in" >"conftest.tmp"

3131

mv "conftest.tmp" "conftest.in"

3132

cp "conftest.in" "conftest.nl"

3133

- $as_echo 'GREP' >> "conftest.nl"

3134

+ echo 'GREP' >> "conftest.nl"

3135

"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break

3136

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

3137

ac_count=`expr $ac_count + 1`

3138

@@ -4293,60 +4141,74 @@ case `"$ac_path_GREP" --version 2>&1` in

3139

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

3140

esac

3141

3142

- $ac_path_GREP_found && break 3

3143

- done

3144

+

3145

+ $ac_path_GREP_found && break 3

3146

done

3147

done

3148

+

3149

+done

3150

IFS=$as_save_IFS

3151

- if test -z "$ac_cv_path_GREP"; then

3152

- { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

3153

-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

3154

+

3155

+

3156

+fi

3157

+

3158

+GREP="$ac_cv_path_GREP"

3159

+if test -z "$GREP"; then

3160

+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

3161

+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

3162

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

3163

- fi

3164

+fi

3165

+

3166

else

3167

ac_cv_path_GREP=$GREP

3168

fi

3169

3170

+

3171

fi

3172

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5

3173

-$as_echo "$ac_cv_path_GREP" >&6; }

3174

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

3175

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

3176

GREP="$ac_cv_path_GREP"

3177

3178

3179

-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5

3180

-$as_echo_n "checking for egrep... " >&6; }

3181

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

3182

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

3183

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

3184

- $as_echo_n "(cached) " >&6

3185

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

3186

else

3187

if echo a | $GREP -E '(a|b)' >/dev/null 2>&1

3188

then ac_cv_path_EGREP="$GREP -E"

3189

else

3190

- if test -z "$EGREP"; then

3191

+ # Extract the first word of "egrep" to use in msg output

3192

+if test -z "$EGREP"; then

3193

+set dummy egrep; ac_prog_name=$2

3194

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

3195

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

3196

+else

3197

ac_path_EGREP_found=false

3198

- # Loop through the user's path and test for each of PROGNAME-LIST

3199

- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3200

+# Loop through the user's path and test for each of PROGNAME-LIST

3201

+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

3202

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

3203

do

3204

IFS=$as_save_IFS

3205

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

3206

for ac_prog in egrep; do

3207

- for ac_exec_ext in '' $ac_executable_extensions; do

3208

- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

3209

- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

3210

-# Check for GNU ac_path_EGREP and select it if it is found.

3211

+ for ac_exec_ext in '' $ac_executable_extensions; do

3212

+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

3213

+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

3214

+ # Check for GNU ac_path_EGREP and select it if it is found.

3215

# Check for GNU $ac_path_EGREP

3216

case `"$ac_path_EGREP" --version 2>&1` in

3217

*GNU*)

3218

ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;

3219

*)

3220

ac_count=0

3221

- $as_echo_n 0123456789 >"conftest.in"

3222

+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"

3223

while :

3224

do

3225

cat "conftest.in" "conftest.in" >"conftest.tmp"

3226

mv "conftest.tmp" "conftest.in"

3227

cp "conftest.in" "conftest.nl"

3228

- $as_echo 'EGREP' >> "conftest.nl"

3229

+ echo 'EGREP' >> "conftest.nl"

3230

"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break

3231

diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break

3232

ac_count=`expr $ac_count + 1`

3233

@@ -4361,31 +4223,40 @@ case `"$ac_path_EGREP" --version 2>&1` i

3234

rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

3235

esac

3236

3237

- $ac_path_EGREP_found && break 3

3238

- done

3239

+

3240

+ $ac_path_EGREP_found && break 3

3241

done

3242

done

3243

+

3244

+done

3245

IFS=$as_save_IFS

3246

- if test -z "$ac_cv_path_EGREP"; then

3247

- { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

3248

-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

3249

+

3250

+

3251

+fi

3252

+

3253

+EGREP="$ac_cv_path_EGREP"

3254

+if test -z "$EGREP"; then

3255

+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5

3256

+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}

3257

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

3258

- fi

3259

+fi

3260

+

3261

else

3262

ac_cv_path_EGREP=$EGREP

3263

fi

3264

3265

+

3266

fi

3267

fi

3268

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5

3269

-$as_echo "$ac_cv_path_EGREP" >&6; }

3270

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

3271

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

3272

EGREP="$ac_cv_path_EGREP"

3273

3274

3275

-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5

3276

-$as_echo_n "checking for ANSI C header files... " >&6; }

3277

+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5

3278

+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }

3279

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

3280

- $as_echo_n "(cached) " >&6

3281

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

3282

else

3283

cat >conftest.$ac_ext <<_ACEOF

3284

/* confdefs.h. */

3285

@@ -4412,21 +4283,20 @@ case "(($ac_try" in

3286

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3287

*) ac_try_echo=$ac_try;;

3288

esac

3289

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3290

-$as_echo "$ac_try_echo") >&5

3291

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3292

(eval "$ac_compile") 2>conftest.er1

3293

ac_status=$?

3294

grep -v '^ *+' conftest.er1 >conftest.err

3295

rm -f conftest.er1

3296

cat conftest.err >&5

3297

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3298

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3299

(exit $ac_status); } && {

3300

test -z "$ac_c_werror_flag" ||

3301

test ! -s conftest.err

3302

} && test -s conftest.$ac_objext; then

3303

ac_cv_header_stdc=yes

3304

else

3305

- $as_echo "$as_me: failed program was:" >&5

3306

+ echo "$as_me: failed program was:" >&5

3307

sed 's/^/| /' conftest.$ac_ext >&5

3308

3309

ac_cv_header_stdc=no

3310

@@ -4518,40 +4388,37 @@ case "(($ac_try" in

3311

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3312

*) ac_try_echo=$ac_try;;

3313

esac

3314

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3315

-$as_echo "$ac_try_echo") >&5

3316

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3317

(eval "$ac_link") 2>&5

3318

ac_status=$?

3319

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3320

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3321

(exit $ac_status); } && { ac_try='./conftest$ac_exeext'

3322

{ (case "(($ac_try" in

3323

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3324

*) ac_try_echo=$ac_try;;

3325

esac

3326

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3327

-$as_echo "$ac_try_echo") >&5

3328

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3329

(eval "$ac_try") 2>&5

3330

ac_status=$?

3331

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3332

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3333

(exit $ac_status); }; }; then

3334

:

3335

else

3336

- $as_echo "$as_me: program exited with status $ac_status" >&5

3337

-$as_echo "$as_me: failed program was:" >&5

3338

+ echo "$as_me: program exited with status $ac_status" >&5

3339

+echo "$as_me: failed program was:" >&5

3340

sed 's/^/| /' conftest.$ac_ext >&5

3341

3342

( exit $ac_status )

3343

ac_cv_header_stdc=no

3344

fi

3345

-rm -rf conftest.dSYM

3346

rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

3347

fi

3348

3349

3350

fi

3351

fi

3352

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5

3353

-$as_echo "$ac_cv_header_stdc" >&6; }

3354

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

3355

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

3356

if test $ac_cv_header_stdc = yes; then

3357

3358

cat >>confdefs.h <<\_ACEOF

3359

@@ -4573,11 +4440,11 @@ fi

3360

for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \

3361

inttypes.h stdint.h unistd.h

3362

do

3363

-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

3364

-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

3365

-$as_echo_n "checking for $ac_header... " >&6; }

3366

+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

3367

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

3368

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

3369

if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

3370

- $as_echo_n "(cached) " >&6

3371

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

3372

else

3373

cat >conftest.$ac_ext <<_ACEOF

3374

/* confdefs.h. */

3375

@@ -4595,21 +4462,20 @@ case "(($ac_try" in

3376

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3377

*) ac_try_echo=$ac_try;;

3378

esac

3379

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3380

-$as_echo "$ac_try_echo") >&5

3381

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3382

(eval "$ac_compile") 2>conftest.er1

3383

ac_status=$?

3384

grep -v '^ *+' conftest.er1 >conftest.err

3385

rm -f conftest.er1

3386

cat conftest.err >&5

3387

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3388

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3389

(exit $ac_status); } && {

3390

test -z "$ac_c_werror_flag" ||

3391

test ! -s conftest.err

3392

} && test -s conftest.$ac_objext; then

3393

eval "$as_ac_Header=yes"

3394

else

3395

- $as_echo "$as_me: failed program was:" >&5

3396

+ echo "$as_me: failed program was:" >&5

3397

sed 's/^/| /' conftest.$ac_ext >&5

3398

3399

eval "$as_ac_Header=no"

3400

@@ -4617,15 +4483,12 @@ fi

3401

3402

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3403

fi

3404

-ac_res=`eval 'as_val=${'$as_ac_Header'}

3405

- $as_echo "$as_val"'`

3406

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

3407

-$as_echo "$ac_res" >&6; }

3408

-as_val=`eval 'as_val=${'$as_ac_Header'}

3409

- $as_echo "$as_val"'`

3410

- if test "x$as_val" = x""yes; then

3411

+ac_res=`eval echo '${'$as_ac_Header'}'`

3412

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

3413

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

3414

+if test `eval echo '${'$as_ac_Header'}'` = yes; then

3415

cat >>confdefs.h <<_ACEOF

3416

-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

3417

+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

3418

_ACEOF

3419

3420

fi

3421

@@ -4637,21 +4500,20 @@ done

3422

3423

for ac_header in locale.h

3424

do

3425

-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

3426

+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

3427

if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

3428

- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

3429

-$as_echo_n "checking for $ac_header... " >&6; }

3430

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

3431

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

3432

if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

3433

- $as_echo_n "(cached) " >&6

3434

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

3435

fi

3436

-ac_res=`eval 'as_val=${'$as_ac_Header'}

3437

- $as_echo "$as_val"'`

3438

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

3439

-$as_echo "$ac_res" >&6; }

3440

+ac_res=`eval echo '${'$as_ac_Header'}'`

3441

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

3442

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

3443

else

3444

# Is the header compilable?

3445

-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5

3446

-$as_echo_n "checking $ac_header usability... " >&6; }

3447

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

3448

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

3449

cat >conftest.$ac_ext <<_ACEOF

3450

/* confdefs.h. */

3451

_ACEOF

3452

@@ -4667,33 +4529,32 @@ case "(($ac_try" in

3453

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3454

*) ac_try_echo=$ac_try;;

3455

esac

3456

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3457

-$as_echo "$ac_try_echo") >&5

3458

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3459

(eval "$ac_compile") 2>conftest.er1

3460

ac_status=$?

3461

grep -v '^ *+' conftest.er1 >conftest.err

3462

rm -f conftest.er1

3463

cat conftest.err >&5

3464

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3465

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3466

(exit $ac_status); } && {

3467

test -z "$ac_c_werror_flag" ||

3468

test ! -s conftest.err

3469

} && test -s conftest.$ac_objext; then

3470

ac_header_compiler=yes

3471

else

3472

- $as_echo "$as_me: failed program was:" >&5

3473

+ echo "$as_me: failed program was:" >&5

3474

sed 's/^/| /' conftest.$ac_ext >&5

3475

3476

ac_header_compiler=no

3477

fi

3478

3479

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3480

-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

3481

-$as_echo "$ac_header_compiler" >&6; }

3482

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

3483

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

3484

3485

# Is the header present?

3486

-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5

3487

-$as_echo_n "checking $ac_header presence... " >&6; }

3488

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

3489

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

3490

cat >conftest.$ac_ext <<_ACEOF

3491

/* confdefs.h. */

3492

_ACEOF

3493

@@ -4707,52 +4568,51 @@ case "(($ac_try" in

3494

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3495

*) ac_try_echo=$ac_try;;

3496

esac

3497

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3498

-$as_echo "$ac_try_echo") >&5

3499

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3500

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

3501

ac_status=$?

3502

grep -v '^ *+' conftest.er1 >conftest.err

3503

rm -f conftest.er1

3504

cat conftest.err >&5

3505

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3506

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3507

(exit $ac_status); } >/dev/null && {

3508

test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

3509

test ! -s conftest.err

3510

}; then

3511

ac_header_preproc=yes

3512

else

3513

- $as_echo "$as_me: failed program was:" >&5

3514

+ echo "$as_me: failed program was:" >&5

3515

sed 's/^/| /' conftest.$ac_ext >&5

3516

3517

ac_header_preproc=no

3518

fi

3519

3520

rm -f conftest.err conftest.$ac_ext

3521

-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

3522

-$as_echo "$ac_header_preproc" >&6; }

3523

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

3524

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

3525

3526

# So? What about this header?

3527

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

3528

yes:no: )

3529

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

3530

-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

3531

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

3532

-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

3533

+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

3534

+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

3535

+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

3536

+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

3537

ac_header_preproc=yes

3538

;;

3539

no:yes:* )

3540

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

3541

-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

3542

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5

3543

-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}

3544

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5

3545

-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}

3546

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5

3547

-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}

3548

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

3549

-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

3550

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

3551

-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

3552

+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

3553

+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

3554

+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5

3555

+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}

3556

+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5

3557

+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}

3558

+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5

3559

+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}

3560

+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

3561

+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

3562

+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

3563

+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

3564

( cat <<\_ASBOX

3565

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

3566

## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ##

3567

@@ -4761,24 +4621,21 @@ _ASBOX

3568

) | sed "s/^/$as_me: WARNING: /" >&2

3569

;;

3570

esac

3571

-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

3572

-$as_echo_n "checking for $ac_header... " >&6; }

3573

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

3574

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

3575

if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

3576

- $as_echo_n "(cached) " >&6

3577

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

3578

else

3579

eval "$as_ac_Header=\$ac_header_preproc"

3580

fi

3581

-ac_res=`eval 'as_val=${'$as_ac_Header'}

3582

- $as_echo "$as_val"'`

3583

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

3584

-$as_echo "$ac_res" >&6; }

3585

+ac_res=`eval echo '${'$as_ac_Header'}'`

3586

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

3587

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

3588

3589

fi

3590

-as_val=`eval 'as_val=${'$as_ac_Header'}

3591

- $as_echo "$as_val"'`

3592

- if test "x$as_val" = x""yes; then

3593

+if test `eval echo '${'$as_ac_Header'}'` = yes; then

3594

cat >>confdefs.h <<_ACEOF

3595

-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

3596

+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

3597

_ACEOF

3598

3599

fi

3600

@@ -4786,10 +4643,10 @@ fi

3601

done

3602

3603

if test $ac_cv_header_locale_h = yes; then

3604

- { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5

3605

-$as_echo_n "checking for LC_MESSAGES... " >&6; }

3606

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

3607

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

3608

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

3609

- $as_echo_n "(cached) " >&6

3610

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

3611

else

3612

cat >conftest.$ac_ext <<_ACEOF

3613

/* confdefs.h. */

3614

@@ -4812,35 +4669,31 @@ case "(($ac_try" in

3615

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3616

*) ac_try_echo=$ac_try;;

3617

esac

3618

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3619

-$as_echo "$ac_try_echo") >&5

3620

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3621

(eval "$ac_link") 2>conftest.er1

3622

ac_status=$?

3623

grep -v '^ *+' conftest.er1 >conftest.err

3624

rm -f conftest.er1

3625

cat conftest.err >&5

3626

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3627

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3628

(exit $ac_status); } && {

3629

test -z "$ac_c_werror_flag" ||

3630

test ! -s conftest.err

3631

- } && test -s conftest$ac_exeext && {

3632

- test "$cross_compiling" = yes ||

3633

- $as_test_x conftest$ac_exeext

3634

- }; then

3635

+ } && test -s conftest$ac_exeext &&

3636

+ $as_test_x conftest$ac_exeext; then

3637

am_cv_val_LC_MESSAGES=yes

3638

else

3639

- $as_echo "$as_me: failed program was:" >&5

3640

+ echo "$as_me: failed program was:" >&5

3641

sed 's/^/| /' conftest.$ac_ext >&5

3642

3643

am_cv_val_LC_MESSAGES=no

3644

fi

3645

3646

-rm -rf conftest.dSYM

3647

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

3648

conftest$ac_exeext conftest.$ac_ext

3649

fi

3650

-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5

3651

-$as_echo "$am_cv_val_LC_MESSAGES" >&6; }

3652

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

3653

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

3654

if test $am_cv_val_LC_MESSAGES = yes; then

3655

3656

cat >>confdefs.h <<\_ACEOF

3657

@@ -4859,17 +4712,17 @@ _ACEOF

3658

INTLLIBS=

3659

3660

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

3661

- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5

3662

-$as_echo_n "checking for libintl.h... " >&6; }

3663

+ { echo "$as_me:$LINENO: checking for libintl.h" >&5

3664

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

3665

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

3666

- $as_echo_n "(cached) " >&6

3667

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

3668

fi

3669

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

3670

-$as_echo "$ac_cv_header_libintl_h" >&6; }

3671

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

3672

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

3673

else

3674

# Is the header compilable?

3675

-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5

3676

-$as_echo_n "checking libintl.h usability... " >&6; }

3677

+{ echo "$as_me:$LINENO: checking libintl.h usability" >&5

3678

+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; }

3679

cat >conftest.$ac_ext <<_ACEOF

3680

/* confdefs.h. */

3681

_ACEOF

3682

@@ -4885,33 +4738,32 @@ case "(($ac_try" in

3683

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3684

*) ac_try_echo=$ac_try;;

3685

esac

3686

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3687

-$as_echo "$ac_try_echo") >&5

3688

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3689

(eval "$ac_compile") 2>conftest.er1

3690

ac_status=$?

3691

grep -v '^ *+' conftest.er1 >conftest.err

3692

rm -f conftest.er1

3693

cat conftest.err >&5

3694

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3695

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3696

(exit $ac_status); } && {

3697

test -z "$ac_c_werror_flag" ||

3698

test ! -s conftest.err

3699

} && test -s conftest.$ac_objext; then

3700

ac_header_compiler=yes

3701

else

3702

- $as_echo "$as_me: failed program was:" >&5

3703

+ echo "$as_me: failed program was:" >&5

3704

sed 's/^/| /' conftest.$ac_ext >&5

3705

3706

ac_header_compiler=no

3707

fi

3708

3709

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

3710

-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

3711

-$as_echo "$ac_header_compiler" >&6; }

3712

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

3713

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

3714

3715

# Is the header present?

3716

-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5

3717

-$as_echo_n "checking libintl.h presence... " >&6; }

3718

+{ echo "$as_me:$LINENO: checking libintl.h presence" >&5

3719

+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; }

3720

cat >conftest.$ac_ext <<_ACEOF

3721

/* confdefs.h. */

3722

_ACEOF

3723

@@ -4925,52 +4777,51 @@ case "(($ac_try" in

3724

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3725

*) ac_try_echo=$ac_try;;

3726

esac

3727

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3728

-$as_echo "$ac_try_echo") >&5

3729

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3730

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

3731

ac_status=$?

3732

grep -v '^ *+' conftest.er1 >conftest.err

3733

rm -f conftest.er1

3734

cat conftest.err >&5

3735

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3736

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3737

(exit $ac_status); } >/dev/null && {

3738

test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

3739

test ! -s conftest.err

3740

}; then

3741

ac_header_preproc=yes

3742

else

3743

- $as_echo "$as_me: failed program was:" >&5

3744

+ echo "$as_me: failed program was:" >&5

3745

sed 's/^/| /' conftest.$ac_ext >&5

3746

3747

ac_header_preproc=no

3748

fi

3749

3750

rm -f conftest.err conftest.$ac_ext

3751

-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

3752

-$as_echo "$ac_header_preproc" >&6; }

3753

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

3754

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

3755

3756

# So? What about this header?

3757

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

3758

yes:no: )

3759

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5

3760

-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

3761

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5

3762

-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}

3763

+ { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5

3764

+echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

3765

+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5

3766

+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}

3767

ac_header_preproc=yes

3768

;;

3769

no:yes:* )

3770

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5

3771

-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}

3772

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5

3773

-$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}

3774

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5

3775

-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}

3776

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5

3777

-$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}

3778

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5

3779

-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}

3780

- { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5

3781

-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}

3782

+ { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5

3783

+echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}

3784

+ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5

3785

+echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}

3786

+ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5

3787

+echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}

3788

+ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5

3789

+echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}

3790

+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5

3791

+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}

3792

+ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5

3793

+echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}

3794

( cat <<\_ASBOX

3795

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

3796

## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ##

3797

@@ -4979,28 +4830,28 @@ _ASBOX

3798

) | sed "s/^/$as_me: WARNING: /" >&2

3799

;;

3800

esac

3801

-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5

3802

-$as_echo_n "checking for libintl.h... " >&6; }

3803

+{ echo "$as_me:$LINENO: checking for libintl.h" >&5

3804

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

3805

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

3806

- $as_echo_n "(cached) " >&6

3807

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

3808

else

3809

ac_cv_header_libintl_h=$ac_header_preproc

3810

fi

3811

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5

3812

-$as_echo "$ac_cv_header_libintl_h" >&6; }

3813

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

3814

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

3815

3816

fi

3817

-if test "x$ac_cv_header_libintl_h" = x""yes; then

3818

+if test $ac_cv_header_libintl_h = yes; then

3819

gt_cv_func_dgettext_libintl="no"

3820

libintl_extra_libs=""

3821

3822

#

3823

# First check in libc

3824

#

3825

- { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5

3826

-$as_echo_n "checking for ngettext in libc... " >&6; }

3827

+ { echo "$as_me:$LINENO: checking for ngettext in libc" >&5

3828

+echo $ECHO_N "checking for ngettext in libc... $ECHO_C" >&6; }

3829

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

3830

- $as_echo_n "(cached) " >&6

3831

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

3832

else

3833

cat >conftest.$ac_ext <<_ACEOF

3834

/* confdefs.h. */

3835

@@ -5025,42 +4876,38 @@ case "(($ac_try" in

3836

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3837

*) ac_try_echo=$ac_try;;

3838

esac

3839

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3840

-$as_echo "$ac_try_echo") >&5

3841

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3842

(eval "$ac_link") 2>conftest.er1

3843

ac_status=$?

3844

grep -v '^ *+' conftest.er1 >conftest.err

3845

rm -f conftest.er1

3846

cat conftest.err >&5

3847

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3848

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3849

(exit $ac_status); } && {

3850

test -z "$ac_c_werror_flag" ||

3851

test ! -s conftest.err

3852

- } && test -s conftest$ac_exeext && {

3853

- test "$cross_compiling" = yes ||

3854

- $as_test_x conftest$ac_exeext

3855

- }; then

3856

+ } && test -s conftest$ac_exeext &&

3857

+ $as_test_x conftest$ac_exeext; then

3858

gt_cv_func_ngettext_libc=yes

3859

else

3860

- $as_echo "$as_me: failed program was:" >&5

3861

+ echo "$as_me: failed program was:" >&5

3862

sed 's/^/| /' conftest.$ac_ext >&5

3863

3864

gt_cv_func_ngettext_libc=no

3865

fi

3866

3867

-rm -rf conftest.dSYM

3868

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

3869

conftest$ac_exeext conftest.$ac_ext

3870

3871

fi

3872

-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5

3873

-$as_echo "$gt_cv_func_ngettext_libc" >&6; }

3874

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

3875

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

3876

3877

if test "$gt_cv_func_ngettext_libc" = "yes" ; then

3878

- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5

3879

-$as_echo_n "checking for dgettext in libc... " >&6; }

3880

+ { echo "$as_me:$LINENO: checking for dgettext in libc" >&5

3881

+echo $ECHO_N "checking for dgettext in libc... $ECHO_C" >&6; }

3882

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

3883

- $as_echo_n "(cached) " >&6

3884

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

3885

else

3886

cat >conftest.$ac_ext <<_ACEOF

3887

/* confdefs.h. */

3888

@@ -5085,47 +4932,43 @@ case "(($ac_try" in

3889

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3890

*) ac_try_echo=$ac_try;;

3891

esac

3892

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3893

-$as_echo "$ac_try_echo") >&5

3894

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3895

(eval "$ac_link") 2>conftest.er1

3896

ac_status=$?

3897

grep -v '^ *+' conftest.er1 >conftest.err

3898

rm -f conftest.er1

3899

cat conftest.err >&5

3900

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3901

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3902

(exit $ac_status); } && {

3903

test -z "$ac_c_werror_flag" ||

3904

test ! -s conftest.err

3905

- } && test -s conftest$ac_exeext && {

3906

- test "$cross_compiling" = yes ||

3907

- $as_test_x conftest$ac_exeext

3908

- }; then

3909

+ } && test -s conftest$ac_exeext &&

3910

+ $as_test_x conftest$ac_exeext; then

3911

gt_cv_func_dgettext_libc=yes

3912

else

3913

- $as_echo "$as_me: failed program was:" >&5

3914

+ echo "$as_me: failed program was:" >&5

3915

sed 's/^/| /' conftest.$ac_ext >&5

3916

3917

gt_cv_func_dgettext_libc=no

3918

fi

3919

3920

-rm -rf conftest.dSYM

3921

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

3922

conftest$ac_exeext conftest.$ac_ext

3923

3924

fi

3925

-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5

3926

-$as_echo "$gt_cv_func_dgettext_libc" >&6; }

3927

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

3928

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

3929

fi

3930

3931

if test "$gt_cv_func_ngettext_libc" = "yes" ; then

3932

3933

for ac_func in bind_textdomain_codeset

3934

do

3935

-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

3936

-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

3937

-$as_echo_n "checking for $ac_func... " >&6; }

3938

+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

3939

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

3940

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

3941

if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

3942

- $as_echo_n "(cached) " >&6

3943

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

3944

else

3945

cat >conftest.$ac_ext <<_ACEOF

3946

/* confdefs.h. */

3947

@@ -5178,42 +5021,35 @@ case "(($ac_try" in

3948

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

3949

*) ac_try_echo=$ac_try;;

3950

esac

3951

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

3952

-$as_echo "$ac_try_echo") >&5

3953

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

3954

(eval "$ac_link") 2>conftest.er1

3955

ac_status=$?

3956

grep -v '^ *+' conftest.er1 >conftest.err

3957

rm -f conftest.er1

3958

cat conftest.err >&5

3959

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

3960

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

3961

(exit $ac_status); } && {

3962

test -z "$ac_c_werror_flag" ||

3963

test ! -s conftest.err

3964

- } && test -s conftest$ac_exeext && {

3965

- test "$cross_compiling" = yes ||

3966

- $as_test_x conftest$ac_exeext

3967

- }; then

3968

+ } && test -s conftest$ac_exeext &&

3969

+ $as_test_x conftest$ac_exeext; then

3970

eval "$as_ac_var=yes"

3971

else

3972

- $as_echo "$as_me: failed program was:" >&5

3973

+ echo "$as_me: failed program was:" >&5

3974

sed 's/^/| /' conftest.$ac_ext >&5

3975

3976

eval "$as_ac_var=no"

3977

fi

3978

3979

-rm -rf conftest.dSYM

3980

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

3981

conftest$ac_exeext conftest.$ac_ext

3982

fi

3983

-ac_res=`eval 'as_val=${'$as_ac_var'}

3984

- $as_echo "$as_val"'`

3985

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

3986

-$as_echo "$ac_res" >&6; }

3987

-as_val=`eval 'as_val=${'$as_ac_var'}

3988

- $as_echo "$as_val"'`

3989

- if test "x$as_val" = x""yes; then

3990

+ac_res=`eval echo '${'$as_ac_var'}'`

3991

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

3992

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

3993

+if test `eval echo '${'$as_ac_var'}'` = yes; then

3994

cat >>confdefs.h <<_ACEOF

3995

-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

3996

+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

3997

_ACEOF

3998

3999

fi

4000

@@ -5228,10 +5064,10 @@ done

4001

|| test "$gt_cv_func_ngettext_libc" != "yes" \

4002

|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then

4003

4004

- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5

4005

-$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }

4006

+ { echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5

4007

+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6; }

4008

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

4009

- $as_echo_n "(cached) " >&6

4010

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

4011

else

4012

ac_check_lib_save_LIBS=$LIBS

4013

LIBS="-lintl $LIBS"

4014

@@ -5263,41 +5099,37 @@ case "(($ac_try" in

4015

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4016

*) ac_try_echo=$ac_try;;

4017

esac

4018

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4019

-$as_echo "$ac_try_echo") >&5

4020

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4021

(eval "$ac_link") 2>conftest.er1

4022

ac_status=$?

4023

grep -v '^ *+' conftest.er1 >conftest.err

4024

rm -f conftest.er1

4025

cat conftest.err >&5

4026

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4027

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4028

(exit $ac_status); } && {

4029

test -z "$ac_c_werror_flag" ||

4030

test ! -s conftest.err

4031

- } && test -s conftest$ac_exeext && {

4032

- test "$cross_compiling" = yes ||

4033

- $as_test_x conftest$ac_exeext

4034

- }; then

4035

+ } && test -s conftest$ac_exeext &&

4036

+ $as_test_x conftest$ac_exeext; then

4037

ac_cv_lib_intl_bindtextdomain=yes

4038

else

4039

- $as_echo "$as_me: failed program was:" >&5

4040

+ echo "$as_me: failed program was:" >&5

4041

sed 's/^/| /' conftest.$ac_ext >&5

4042

4043

ac_cv_lib_intl_bindtextdomain=no

4044

fi

4045

4046

-rm -rf conftest.dSYM

4047

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4048

conftest$ac_exeext conftest.$ac_ext

4049

LIBS=$ac_check_lib_save_LIBS

4050

fi

4051

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5

4052

-$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }

4053

-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then

4054

- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

4055

-$as_echo_n "checking for ngettext in -lintl... " >&6; }

4056

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

4057

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

4058

+if test $ac_cv_lib_intl_bindtextdomain = yes; then

4059

+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

4060

+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }

4061

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

4062

- $as_echo_n "(cached) " >&6

4063

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

4064

else

4065

ac_check_lib_save_LIBS=$LIBS

4066

LIBS="-lintl $LIBS"

4067

@@ -5329,41 +5161,37 @@ case "(($ac_try" in

4068

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4069

*) ac_try_echo=$ac_try;;

4070

esac

4071

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4072

-$as_echo "$ac_try_echo") >&5

4073

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4074

(eval "$ac_link") 2>conftest.er1

4075

ac_status=$?

4076

grep -v '^ *+' conftest.er1 >conftest.err

4077

rm -f conftest.er1

4078

cat conftest.err >&5

4079

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4080

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4081

(exit $ac_status); } && {

4082

test -z "$ac_c_werror_flag" ||

4083

test ! -s conftest.err

4084

- } && test -s conftest$ac_exeext && {

4085

- test "$cross_compiling" = yes ||

4086

- $as_test_x conftest$ac_exeext

4087

- }; then

4088

+ } && test -s conftest$ac_exeext &&

4089

+ $as_test_x conftest$ac_exeext; then

4090

ac_cv_lib_intl_ngettext=yes

4091

else

4092

- $as_echo "$as_me: failed program was:" >&5

4093

+ echo "$as_me: failed program was:" >&5

4094

sed 's/^/| /' conftest.$ac_ext >&5

4095

4096

ac_cv_lib_intl_ngettext=no

4097

fi

4098

4099

-rm -rf conftest.dSYM

4100

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4101

conftest$ac_exeext conftest.$ac_ext

4102

LIBS=$ac_check_lib_save_LIBS

4103

fi

4104

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

4105

-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }

4106

-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then

4107

- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5

4108

-$as_echo_n "checking for dgettext in -lintl... " >&6; }

4109

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

4110

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

4111

+if test $ac_cv_lib_intl_ngettext = yes; then

4112

+ { echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5

4113

+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; }

4114

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

4115

- $as_echo_n "(cached) " >&6

4116

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

4117

else

4118

ac_check_lib_save_LIBS=$LIBS

4119

LIBS="-lintl $LIBS"

4120

@@ -5395,37 +5223,33 @@ case "(($ac_try" in

4121

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4122

*) ac_try_echo=$ac_try;;

4123

esac

4124

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4125

-$as_echo "$ac_try_echo") >&5

4126

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4127

(eval "$ac_link") 2>conftest.er1

4128

ac_status=$?

4129

grep -v '^ *+' conftest.er1 >conftest.err

4130

rm -f conftest.er1

4131

cat conftest.err >&5

4132

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4133

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4134

(exit $ac_status); } && {

4135

test -z "$ac_c_werror_flag" ||

4136

test ! -s conftest.err

4137

- } && test -s conftest$ac_exeext && {

4138

- test "$cross_compiling" = yes ||

4139

- $as_test_x conftest$ac_exeext

4140

- }; then

4141

+ } && test -s conftest$ac_exeext &&

4142

+ $as_test_x conftest$ac_exeext; then

4143

ac_cv_lib_intl_dgettext=yes

4144

else

4145

- $as_echo "$as_me: failed program was:" >&5

4146

+ echo "$as_me: failed program was:" >&5

4147

sed 's/^/| /' conftest.$ac_ext >&5

4148

4149

ac_cv_lib_intl_dgettext=no

4150

fi

4151

4152

-rm -rf conftest.dSYM

4153

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4154

conftest$ac_exeext conftest.$ac_ext

4155

LIBS=$ac_check_lib_save_LIBS

4156

fi

4157

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5

4158

-$as_echo "$ac_cv_lib_intl_dgettext" >&6; }

4159

-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then

4160

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

4161

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

4162

+if test $ac_cv_lib_intl_dgettext = yes; then

4163

gt_cv_func_dgettext_libintl=yes

4164

fi

4165

4166

@@ -5435,14 +5259,14 @@ fi

4167

4168

4169

if test "$gt_cv_func_dgettext_libintl" != "yes" ; then

4170

- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5

4171

-$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }

4172

- { $as_echo "$as_me:$LINENO: result: " >&5

4173

-$as_echo "" >&6; }

4174

- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

4175

-$as_echo_n "checking for ngettext in -lintl... " >&6; }

4176

+ { echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5

4177

+echo $ECHO_N "checking if -liconv is needed to use gettext... $ECHO_C" >&6; }

4178

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

4179

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

4180

+ { echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5

4181

+echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6; }

4182

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

4183

- $as_echo_n "(cached) " >&6

4184

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

4185

else

4186

ac_check_lib_save_LIBS=$LIBS

4187

LIBS="-lintl -liconv $LIBS"

4188

@@ -5474,41 +5298,37 @@ case "(($ac_try" in

4189

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4190

*) ac_try_echo=$ac_try;;

4191

esac

4192

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4193

-$as_echo "$ac_try_echo") >&5

4194

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4195

(eval "$ac_link") 2>conftest.er1

4196

ac_status=$?

4197

grep -v '^ *+' conftest.er1 >conftest.err

4198

rm -f conftest.er1

4199

cat conftest.err >&5

4200

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4201

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4202

(exit $ac_status); } && {

4203

test -z "$ac_c_werror_flag" ||

4204

test ! -s conftest.err

4205

- } && test -s conftest$ac_exeext && {

4206

- test "$cross_compiling" = yes ||

4207

- $as_test_x conftest$ac_exeext

4208

- }; then

4209

+ } && test -s conftest$ac_exeext &&

4210

+ $as_test_x conftest$ac_exeext; then

4211

ac_cv_lib_intl_ngettext=yes

4212

else

4213

- $as_echo "$as_me: failed program was:" >&5

4214

+ echo "$as_me: failed program was:" >&5

4215

sed 's/^/| /' conftest.$ac_ext >&5

4216

4217

ac_cv_lib_intl_ngettext=no

4218

fi

4219

4220

-rm -rf conftest.dSYM

4221

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4222

conftest$ac_exeext conftest.$ac_ext

4223

LIBS=$ac_check_lib_save_LIBS

4224

fi

4225

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5

4226

-$as_echo "$ac_cv_lib_intl_ngettext" >&6; }

4227

-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then

4228

- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5

4229

-$as_echo_n "checking for dcgettext in -lintl... " >&6; }

4230

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

4231

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

4232

+if test $ac_cv_lib_intl_ngettext = yes; then

4233

+ { echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5

4234

+echo $ECHO_N "checking for dcgettext in -lintl... $ECHO_C" >&6; }

4235

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

4236

- $as_echo_n "(cached) " >&6

4237

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

4238

else

4239

ac_check_lib_save_LIBS=$LIBS

4240

LIBS="-lintl -liconv $LIBS"

4241

@@ -5540,37 +5360,33 @@ case "(($ac_try" in

4242

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4243

*) ac_try_echo=$ac_try;;

4244

esac

4245

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4246

-$as_echo "$ac_try_echo") >&5

4247

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4248

(eval "$ac_link") 2>conftest.er1

4249

ac_status=$?

4250

grep -v '^ *+' conftest.er1 >conftest.err

4251

rm -f conftest.er1

4252

cat conftest.err >&5

4253

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4254

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4255

(exit $ac_status); } && {

4256

test -z "$ac_c_werror_flag" ||

4257

test ! -s conftest.err

4258

- } && test -s conftest$ac_exeext && {

4259

- test "$cross_compiling" = yes ||

4260

- $as_test_x conftest$ac_exeext

4261

- }; then

4262

+ } && test -s conftest$ac_exeext &&

4263

+ $as_test_x conftest$ac_exeext; then

4264

ac_cv_lib_intl_dcgettext=yes

4265

else

4266

- $as_echo "$as_me: failed program was:" >&5

4267

+ echo "$as_me: failed program was:" >&5

4268

sed 's/^/| /' conftest.$ac_ext >&5

4269

4270

ac_cv_lib_intl_dcgettext=no

4271

fi

4272

4273

-rm -rf conftest.dSYM

4274

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4275

conftest$ac_exeext conftest.$ac_ext

4276

LIBS=$ac_check_lib_save_LIBS

4277

fi

4278

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5

4279

-$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }

4280

-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then

4281

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

4282

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

4283

+if test $ac_cv_lib_intl_dcgettext = yes; then

4284

gt_cv_func_dgettext_libintl=yes

4285

libintl_extra_libs=-liconv

4286

else

4287

@@ -5595,11 +5411,11 @@ fi

4288

4289

for ac_func in bind_textdomain_codeset

4290

do

4291

-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

4292

-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

4293

-$as_echo_n "checking for $ac_func... " >&6; }

4294

+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

4295

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

4296

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

4297

if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

4298

- $as_echo_n "(cached) " >&6

4299

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

4300

else

4301

cat >conftest.$ac_ext <<_ACEOF

4302

/* confdefs.h. */

4303

@@ -5652,42 +5468,35 @@ case "(($ac_try" in

4304

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4305

*) ac_try_echo=$ac_try;;

4306

esac

4307

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4308

-$as_echo "$ac_try_echo") >&5

4309

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4310

(eval "$ac_link") 2>conftest.er1

4311

ac_status=$?

4312

grep -v '^ *+' conftest.er1 >conftest.err

4313

rm -f conftest.er1

4314

cat conftest.err >&5

4315

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4316

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4317

(exit $ac_status); } && {

4318

test -z "$ac_c_werror_flag" ||

4319

test ! -s conftest.err

4320

- } && test -s conftest$ac_exeext && {

4321

- test "$cross_compiling" = yes ||

4322

- $as_test_x conftest$ac_exeext

4323

- }; then

4324

+ } && test -s conftest$ac_exeext &&

4325

+ $as_test_x conftest$ac_exeext; then

4326

eval "$as_ac_var=yes"

4327

else

4328

- $as_echo "$as_me: failed program was:" >&5

4329

+ echo "$as_me: failed program was:" >&5

4330

sed 's/^/| /' conftest.$ac_ext >&5

4331

4332

eval "$as_ac_var=no"

4333

fi

4334

4335

-rm -rf conftest.dSYM

4336

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4337

conftest$ac_exeext conftest.$ac_ext

4338

fi

4339

-ac_res=`eval 'as_val=${'$as_ac_var'}

4340

- $as_echo "$as_val"'`

4341

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

4342

-$as_echo "$ac_res" >&6; }

4343

-as_val=`eval 'as_val=${'$as_ac_var'}

4344

- $as_echo "$as_val"'`

4345

- if test "x$as_val" = x""yes; then

4346

+ac_res=`eval echo '${'$as_ac_var'}'`

4347

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

4348

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

4349

+if test `eval echo '${'$as_ac_var'}'` = yes; then

4350

cat >>confdefs.h <<_ACEOF

4351

-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

4352

+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

4353

_ACEOF

4354

4355

fi

4356

@@ -5723,10 +5532,10 @@ _ACEOF

4357

4358

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

4359

set dummy msgfmt; ac_word=$2

4360

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

4361

-$as_echo_n "checking for $ac_word... " >&6; }

4362

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

4363

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

4364

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

4365

- $as_echo_n "(cached) " >&6

4366

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

4367

else

4368

case "$MSGFMT" in

4369

/*)

4370

@@ -5750,11 +5559,11 @@ esac

4371

fi

4372

MSGFMT="$ac_cv_path_MSGFMT"

4373

if test "$MSGFMT" != "no"; then

4374

- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5

4375

-$as_echo "$MSGFMT" >&6; }

4376

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

4377

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

4378

else

4379

- { $as_echo "$as_me:$LINENO: result: no" >&5

4380

-$as_echo "no" >&6; }

4381

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

4382

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

4383

fi

4384

if test "$MSGFMT" != "no"; then

4385

glib_save_LIBS="$LIBS"

4386

@@ -5762,11 +5571,11 @@ fi

4387

4388

for ac_func in dcgettext

4389

do

4390

-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

4391

-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

4392

-$as_echo_n "checking for $ac_func... " >&6; }

4393

+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

4394

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

4395

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

4396

if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

4397

- $as_echo_n "(cached) " >&6

4398

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

4399

else

4400

cat >conftest.$ac_ext <<_ACEOF

4401

/* confdefs.h. */

4402

@@ -5819,50 +5628,43 @@ case "(($ac_try" in

4403

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4404

*) ac_try_echo=$ac_try;;

4405

esac

4406

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4407

-$as_echo "$ac_try_echo") >&5

4408

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4409

(eval "$ac_link") 2>conftest.er1

4410

ac_status=$?

4411

grep -v '^ *+' conftest.er1 >conftest.err

4412

rm -f conftest.er1

4413

cat conftest.err >&5

4414

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4415

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4416

(exit $ac_status); } && {

4417

test -z "$ac_c_werror_flag" ||

4418

test ! -s conftest.err

4419

- } && test -s conftest$ac_exeext && {

4420

- test "$cross_compiling" = yes ||

4421

- $as_test_x conftest$ac_exeext

4422

- }; then

4423

+ } && test -s conftest$ac_exeext &&

4424

+ $as_test_x conftest$ac_exeext; then

4425

eval "$as_ac_var=yes"

4426

else

4427

- $as_echo "$as_me: failed program was:" >&5

4428

+ echo "$as_me: failed program was:" >&5

4429

sed 's/^/| /' conftest.$ac_ext >&5

4430

4431

eval "$as_ac_var=no"

4432

fi

4433

4434

-rm -rf conftest.dSYM

4435

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4436

conftest$ac_exeext conftest.$ac_ext

4437

fi

4438

-ac_res=`eval 'as_val=${'$as_ac_var'}

4439

- $as_echo "$as_val"'`

4440

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

4441

-$as_echo "$ac_res" >&6; }

4442

-as_val=`eval 'as_val=${'$as_ac_var'}

4443

- $as_echo "$as_val"'`

4444

- if test "x$as_val" = x""yes; then

4445

+ac_res=`eval echo '${'$as_ac_var'}'`

4446

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

4447

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

4448

+if test `eval echo '${'$as_ac_var'}'` = yes; then

4449

cat >>confdefs.h <<_ACEOF

4450

-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

4451

+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

4452

_ACEOF

4453

4454

fi

4455

done

4456

4457

MSGFMT_OPTS=

4458

- { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5

4459

-$as_echo_n "checking if msgfmt accepts -c... " >&6; }

4460

+ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5

4461

+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }

4462

cat >conftest.foo <<_ACEOF

4463

4464

msgid ""

4465

@@ -5876,25 +5678,25 @@ msgstr ""

4466

"Content-Transfer-Encoding: 8bit\n"

4467

4468

_ACEOF

4469

-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5

4470

+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5

4471

($MSGFMT -c -o /dev/null conftest.foo) 2>&5

4472

ac_status=$?

4473

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4474

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4475

(exit $ac_status); }; then

4476

- MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5

4477

-$as_echo "yes" >&6; }

4478

-else { $as_echo "$as_me:$LINENO: result: no" >&5

4479

-$as_echo "no" >&6; }

4480

+ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5

4481

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

4482

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

4483

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

4484

echo "$as_me: failed input was:" >&5

4485

sed 's/^/| /' conftest.foo >&5

4486

fi

4487

4488

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

4489

set dummy gmsgfmt; ac_word=$2

4490

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

4491

-$as_echo_n "checking for $ac_word... " >&6; }

4492

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

4493

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

4494

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

4495

- $as_echo_n "(cached) " >&6

4496

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

4497

else

4498

case $GMSGFMT in

4499

[\\/]* | ?:[\\/]*)

4500

@@ -5909,7 +5711,7 @@ do

4501

for ac_exec_ext in '' $ac_executable_extensions; do

4502

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

4503

ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"

4504

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

4505

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

4506

break 2

4507

fi

4508

done

4509

@@ -5922,20 +5724,20 @@ esac

4510

fi

4511

GMSGFMT=$ac_cv_path_GMSGFMT

4512

if test -n "$GMSGFMT"; then

4513

- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5

4514

-$as_echo "$GMSGFMT" >&6; }

4515

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

4516

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

4517

else

4518

- { $as_echo "$as_me:$LINENO: result: no" >&5

4519

-$as_echo "no" >&6; }

4520

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

4521

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

4522

fi

4523

4524

4525

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

4526

set dummy xgettext; ac_word=$2

4527

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

4528

-$as_echo_n "checking for $ac_word... " >&6; }

4529

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

4530

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

4531

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

4532

- $as_echo_n "(cached) " >&6

4533

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

4534

else

4535

case "$XGETTEXT" in

4536

/*)

4537

@@ -5959,11 +5761,11 @@ esac

4538

fi

4539

XGETTEXT="$ac_cv_path_XGETTEXT"

4540

if test "$XGETTEXT" != ":"; then

4541

- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5

4542

-$as_echo "$XGETTEXT" >&6; }

4543

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

4544

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

4545

else

4546

- { $as_echo "$as_me:$LINENO: result: no" >&5

4547

-$as_echo "no" >&6; }

4548

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

4549

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

4550

fi

4551

4552

cat >conftest.$ac_ext <<_ACEOF

4553

@@ -5988,33 +5790,30 @@ case "(($ac_try" in

4554

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4555

*) ac_try_echo=$ac_try;;

4556

esac

4557

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4558

-$as_echo "$ac_try_echo") >&5

4559

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4560

(eval "$ac_link") 2>conftest.er1

4561

ac_status=$?

4562

grep -v '^ *+' conftest.er1 >conftest.err

4563

rm -f conftest.er1

4564

cat conftest.err >&5

4565

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4566

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4567

(exit $ac_status); } && {

4568

test -z "$ac_c_werror_flag" ||

4569

test ! -s conftest.err

4570

- } && test -s conftest$ac_exeext && {

4571

- test "$cross_compiling" = yes ||

4572

- $as_test_x conftest$ac_exeext

4573

- }; then

4574

+ } && test -s conftest$ac_exeext &&

4575

+ $as_test_x conftest$ac_exeext; then

4576

CATOBJEXT=.gmo

4577

DATADIRNAME=share

4578

else

4579

- $as_echo "$as_me: failed program was:" >&5

4580

+ echo "$as_me: failed program was:" >&5

4581

sed 's/^/| /' conftest.$ac_ext >&5

4582

4583

case $host in

4584

*-*-solaris*)

4585

- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

4586

-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }

4587

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

4588

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

4589

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

4590

- $as_echo_n "(cached) " >&6

4591

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

4592

else

4593

cat >conftest.$ac_ext <<_ACEOF

4594

/* confdefs.h. */

4595

@@ -6067,36 +5866,32 @@ case "(($ac_try" in

4596

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

4597

*) ac_try_echo=$ac_try;;

4598

esac

4599

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

4600

-$as_echo "$ac_try_echo") >&5

4601

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

4602

(eval "$ac_link") 2>conftest.er1

4603

ac_status=$?

4604

grep -v '^ *+' conftest.er1 >conftest.err

4605

rm -f conftest.er1

4606

cat conftest.err >&5

4607

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

4608

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

4609

(exit $ac_status); } && {

4610

test -z "$ac_c_werror_flag" ||

4611

test ! -s conftest.err

4612

- } && test -s conftest$ac_exeext && {

4613

- test "$cross_compiling" = yes ||

4614

- $as_test_x conftest$ac_exeext

4615

- }; then

4616

+ } && test -s conftest$ac_exeext &&

4617

+ $as_test_x conftest$ac_exeext; then

4618

ac_cv_func_bind_textdomain_codeset=yes

4619

else

4620

- $as_echo "$as_me: failed program was:" >&5

4621

+ echo "$as_me: failed program was:" >&5

4622

sed 's/^/| /' conftest.$ac_ext >&5

4623

4624

ac_cv_func_bind_textdomain_codeset=no

4625

fi

4626

4627

-rm -rf conftest.dSYM

4628

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4629

conftest$ac_exeext conftest.$ac_ext

4630

fi

4631

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

4632

-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }

4633

-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then

4634

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

4635

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

4636

+if test $ac_cv_func_bind_textdomain_codeset = yes; then

4637

CATOBJEXT=.gmo

4638

DATADIRNAME=share

4639

else

4640

@@ -6112,7 +5907,6 @@ fi

4641

esac

4642

fi

4643

4644

-rm -rf conftest.dSYM

4645

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

4646

conftest$ac_exeext conftest.$ac_ext

4647

LIBS="$glib_save_LIBS"

4648

@@ -6138,8 +5932,8 @@ _ACEOF

4649

if $XGETTEXT --omit-header /dev/null 2> /dev/null; then

4650

: ;

4651

else

4652

- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5

4653

-$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }

4654

+ { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5

4655

+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }

4656

XGETTEXT=":"

4657

fi

4658

fi

4659

@@ -6171,8 +5965,8 @@ $as_echo "found xgettext program is not

4660

if test "x$ALL_LINGUAS" = "x"; then

4661

LINGUAS=

4662

else

4663

- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5

4664

-$as_echo_n "checking for catalogs to be installed... " >&6; }

4665

+ { echo "$as_me:$LINENO: checking for catalogs to be installed" >&5

4666

+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6; }

4667

NEW_LINGUAS=

4668

for presentlang in $ALL_LINGUAS; do

4669

useit=no

4670

@@ -6196,8 +5990,8 @@ $as_echo_n "checking for catalogs to be

4671

fi

4672

done

4673

LINGUAS=$NEW_LINGUAS

4674

- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5

4675

-$as_echo "$LINGUAS" >&6; }

4676

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

4677

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

4678

fi

4679

4680

if test -n "$LINGUAS"; then

4681

@@ -6229,8 +6023,8 @@ $as_echo "$LINGUAS" >&6; }

4682

< $srcdir/po/POTFILES.in > po/POTFILES

4683

4684

4685

- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5

4686

-$as_echo_n "checking whether NLS is requested... " >&6; }

4687

+ { echo "$as_me:$LINENO: checking whether NLS is requested" >&5

4688

+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }

4689

# Check whether --enable-nls was given.

4690

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

4691

enableval=$enable_nls; USE_NLS=$enableval

4692

@@ -6238,16 +6032,16 @@ else

4693

USE_NLS=yes

4694

fi

4695

4696

- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5

4697

-$as_echo "$USE_NLS" >&6; }

4698

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

4699

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

4700

4701

4702

4703

4704

case "$am__api_version" in

4705

1.01234)

4706

- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5

4707

-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}

4708

+ { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5

4709

+echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}

4710

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

4711

;;

4712

*)

4713

@@ -6255,27 +6049,27 @@ $as_echo "$as_me: error: Automake 1.5 or

4714

esac

4715

4716

if test -n "0.40.0"; then

4717

- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5

4718

-$as_echo_n "checking for intltool >= 0.40.0... " >&6; }

4719

+ { echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5

4720

+echo $ECHO_N "checking for intltool >= 0.40.0... $ECHO_C" >&6; }

4721

4722

INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`

4723

INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`

4724

INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`

4725

4726

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5

4727

-$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }

4728

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

4729

+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }

4730

test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||

4731

- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5

4732

-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;}

4733

+ { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5

4734

+echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;}

4735

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

4736

fi

4737

4738

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

4739

set dummy intltool-update; ac_word=$2

4740

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

4741

-$as_echo_n "checking for $ac_word... " >&6; }

4742

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

4743

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

4744

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

4745

- $as_echo_n "(cached) " >&6

4746

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

4747

else

4748

case $INTLTOOL_UPDATE in

4749

[\\/]* | ?:[\\/]*)

4750

@@ -6290,7 +6084,7 @@ do

4751

for ac_exec_ext in '' $ac_executable_extensions; do

4752

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

4753

ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"

4754

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

4755

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

4756

break 2

4757

fi

4758

done

4759

@@ -6302,20 +6096,20 @@ esac

4760

fi

4761

INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE

4762

if test -n "$INTLTOOL_UPDATE"; then

4763

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5

4764

-$as_echo "$INTLTOOL_UPDATE" >&6; }

4765

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

4766

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

4767

else

4768

- { $as_echo "$as_me:$LINENO: result: no" >&5

4769

-$as_echo "no" >&6; }

4770

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

4771

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

4772

fi

4773

4774

4775

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

4776

set dummy intltool-merge; ac_word=$2

4777

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

4778

-$as_echo_n "checking for $ac_word... " >&6; }

4779

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

4780

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

4781

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

4782

- $as_echo_n "(cached) " >&6

4783

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

4784

else

4785

case $INTLTOOL_MERGE in

4786

[\\/]* | ?:[\\/]*)

4787

@@ -6330,7 +6124,7 @@ do

4788

for ac_exec_ext in '' $ac_executable_extensions; do

4789

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

4790

ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"

4791

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

4792

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

4793

break 2

4794

fi

4795

done

4796

@@ -6342,20 +6136,20 @@ esac

4797

fi

4798

INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE

4799

if test -n "$INTLTOOL_MERGE"; then

4800

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5

4801

-$as_echo "$INTLTOOL_MERGE" >&6; }

4802

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

4803

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

4804

else

4805

- { $as_echo "$as_me:$LINENO: result: no" >&5

4806

-$as_echo "no" >&6; }

4807

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

4808

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

4809

fi

4810

4811

4812

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

4813

set dummy intltool-extract; ac_word=$2

4814

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

4815

-$as_echo_n "checking for $ac_word... " >&6; }

4816

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

4817

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

4818

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

4819

- $as_echo_n "(cached) " >&6

4820

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

4821

else

4822

case $INTLTOOL_EXTRACT in

4823

[\\/]* | ?:[\\/]*)

4824

@@ -6370,7 +6164,7 @@ do

4825

for ac_exec_ext in '' $ac_executable_extensions; do

4826

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

4827

ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"

4828

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

4829

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

4830

break 2

4831

fi

4832

done

4833

@@ -6382,17 +6176,17 @@ esac

4834

fi

4835

INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT

4836

if test -n "$INTLTOOL_EXTRACT"; then

4837

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5

4838

-$as_echo "$INTLTOOL_EXTRACT" >&6; }

4839

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

4840

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

4841

else

4842

- { $as_echo "$as_me:$LINENO: result: no" >&5

4843

-$as_echo "no" >&6; }

4844

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

4845

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

4846

fi

4847

4848

4849

if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then

4850

- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5

4851

-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}

4852

+ { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5

4853

+echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}

4854

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

4855

fi

4856

4857

@@ -6439,10 +6233,10 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.

4858

# Check the gettext tools to make sure they are GNU

4859

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

4860

set dummy xgettext; ac_word=$2

4861

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

4862

-$as_echo_n "checking for $ac_word... " >&6; }

4863

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

4864

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

4865

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

4866

- $as_echo_n "(cached) " >&6

4867

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

4868

else

4869

case $XGETTEXT in

4870

[\\/]* | ?:[\\/]*)

4871

@@ -6457,7 +6251,7 @@ do

4872

for ac_exec_ext in '' $ac_executable_extensions; do

4873

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

4874

ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"

4875

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

4876

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

4877

break 2

4878

fi

4879

done

4880

@@ -6469,20 +6263,20 @@ esac

4881

fi

4882

XGETTEXT=$ac_cv_path_XGETTEXT

4883

if test -n "$XGETTEXT"; then

4884

- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5

4885

-$as_echo "$XGETTEXT" >&6; }

4886

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

4887

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

4888

else

4889

- { $as_echo "$as_me:$LINENO: result: no" >&5

4890

-$as_echo "no" >&6; }

4891

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

4892

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

4893

fi

4894

4895

4896

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

4897

set dummy msgmerge; ac_word=$2

4898

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

4899

-$as_echo_n "checking for $ac_word... " >&6; }

4900

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

4901

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

4902

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

4903

- $as_echo_n "(cached) " >&6

4904

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

4905

else

4906

case $MSGMERGE in

4907

[\\/]* | ?:[\\/]*)

4908

@@ -6497,7 +6291,7 @@ 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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"

4912

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

4913

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

4914

break 2

4915

fi

4916

done

4917

@@ -6509,20 +6303,20 @@ esac

4918

fi

4919

MSGMERGE=$ac_cv_path_MSGMERGE

4920

if test -n "$MSGMERGE"; then

4921

- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5

4922

-$as_echo "$MSGMERGE" >&6; }

4923

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

4924

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

4925

else

4926

- { $as_echo "$as_me:$LINENO: result: no" >&5

4927

-$as_echo "no" >&6; }

4928

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

4929

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

4930

fi

4931

4932

4933

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

4934

set dummy msgfmt; ac_word=$2

4935

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

4936

-$as_echo_n "checking for $ac_word... " >&6; }

4937

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

4938

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

4939

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

4940

- $as_echo_n "(cached) " >&6

4941

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

4942

else

4943

case $MSGFMT in

4944

[\\/]* | ?:[\\/]*)

4945

@@ -6537,7 +6331,7 @@ do

4946

for ac_exec_ext in '' $ac_executable_extensions; do

4947

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

4948

ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"

4949

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

4950

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

4951

break 2

4952

fi

4953

done

4954

@@ -6549,20 +6343,20 @@ esac

4955

fi

4956

MSGFMT=$ac_cv_path_MSGFMT

4957

if test -n "$MSGFMT"; then

4958

- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5

4959

-$as_echo "$MSGFMT" >&6; }

4960

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

4961

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

4962

else

4963

- { $as_echo "$as_me:$LINENO: result: no" >&5

4964

-$as_echo "no" >&6; }

4965

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

4966

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

4967

fi

4968

4969

4970

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

4971

set dummy gmsgfmt; ac_word=$2

4972

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

4973

-$as_echo_n "checking for $ac_word... " >&6; }

4974

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

4975

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

4976

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

4977

- $as_echo_n "(cached) " >&6

4978

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

4979

else

4980

case $GMSGFMT in

4981

[\\/]* | ?:[\\/]*)

4982

@@ -6577,7 +6371,7 @@ do

4983

for ac_exec_ext in '' $ac_executable_extensions; do

4984

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

4985

ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"

4986

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

4987

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

4988

break 2

4989

fi

4990

done

4991

@@ -6590,34 +6384,34 @@ esac

4992

fi

4993

GMSGFMT=$ac_cv_path_GMSGFMT

4994

if test -n "$GMSGFMT"; then

4995

- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5

4996

-$as_echo "$GMSGFMT" >&6; }

4997

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

4998

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

4999

else

5000

- { $as_echo "$as_me:$LINENO: result: no" >&5

5001

-$as_echo "no" >&6; }

5002

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

5003

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

5004

fi

5005

5006

5007

if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then

5008

- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5

5009

-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}

5010

+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5

5011

+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}

5012

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

5013

fi

5014

xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"

5015

mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"

5016

mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"

5017

if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then

5018

- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5

5019

-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}

5020

+ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5

5021

+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}

5022

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

5023

fi

5024

5025

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

5026

set dummy perl; ac_word=$2

5027

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

5028

-$as_echo_n "checking for $ac_word... " >&6; }

5029

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

5030

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

5031

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

5032

- $as_echo_n "(cached) " >&6

5033

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

5034

else

5035

case $INTLTOOL_PERL in

5036

[\\/]* | ?:[\\/]*)

5037

@@ -6632,7 +6426,7 @@ do

5038

for ac_exec_ext in '' $ac_executable_extensions; do

5039

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

5040

ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"

5041

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

5042

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

5043

break 2

5044

fi

5045

done

5046

@@ -6644,33 +6438,33 @@ esac

5047

fi

5048

INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL

5049

if test -n "$INTLTOOL_PERL"; then

5050

- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5

5051

-$as_echo "$INTLTOOL_PERL" >&6; }

5052

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

5053

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

5054

else

5055

- { $as_echo "$as_me:$LINENO: result: no" >&5

5056

-$as_echo "no" >&6; }

5057

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

5058

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

5059

fi

5060

5061

5062

if test -z "$INTLTOOL_PERL"; then

5063

- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5

5064

-$as_echo "$as_me: error: perl not found; required for intltool" >&2;}

5065

+ { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5

5066

+echo "$as_me: error: perl not found; required for intltool" >&2;}

5067

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

5068

fi

5069

if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then

5070

- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5

5071

-$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}

5072

+ { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5

5073

+echo "$as_me: error: perl 5.x required for intltool" >&2;}

5074

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

5075

fi

5076

if test "x" != "xno-xml"; then

5077

- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5

5078

-$as_echo_n "checking for XML::Parser... " >&6; }

5079

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

5080

+echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }

5081

if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then

5082

- { $as_echo "$as_me:$LINENO: result: ok" >&5

5083

-$as_echo "ok" >&6; }

5084

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

5085

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

5086

else

5087

- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5

5088

-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}

5089

+ { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5

5090

+echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}

5091

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

5092

fi

5093

fi

5094

@@ -6703,32 +6497,29 @@ case "(($ac_try" in

5095

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5096

*) ac_try_echo=$ac_try;;

5097

esac

5098

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5099

-$as_echo "$ac_try_echo") >&5

5100

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5101

(eval "$ac_link") 2>conftest.er1

5102

ac_status=$?

5103

grep -v '^ *+' conftest.er1 >conftest.err

5104

rm -f conftest.er1

5105

cat conftest.err >&5

5106

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5107

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5108

(exit $ac_status); } && {

5109

test -z "$ac_c_werror_flag" ||

5110

test ! -s conftest.err

5111

- } && test -s conftest$ac_exeext && {

5112

- test "$cross_compiling" = yes ||

5113

- $as_test_x conftest$ac_exeext

5114

- }; then

5115

+ } && test -s conftest$ac_exeext &&

5116

+ $as_test_x conftest$ac_exeext; then

5117

DATADIRNAME=share

5118

else

5119

- $as_echo "$as_me: failed program was:" >&5

5120

+ echo "$as_me: failed program was:" >&5

5121

sed 's/^/| /' conftest.$ac_ext >&5

5122

5123

case $host in

5124

*-*-solaris*)

5125

- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5

5126

-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }

5127

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

5128

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

5129

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

5130

- $as_echo_n "(cached) " >&6

5131

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

5132

else

5133

cat >conftest.$ac_ext <<_ACEOF

5134

/* confdefs.h. */

5135

@@ -6781,36 +6572,32 @@ case "(($ac_try" in

5136

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5137

*) ac_try_echo=$ac_try;;

5138

esac

5139

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5140

-$as_echo "$ac_try_echo") >&5

5141

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5142

(eval "$ac_link") 2>conftest.er1

5143

ac_status=$?

5144

grep -v '^ *+' conftest.er1 >conftest.err

5145

rm -f conftest.er1

5146

cat conftest.err >&5

5147

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5148

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5149

(exit $ac_status); } && {

5150

test -z "$ac_c_werror_flag" ||

5151

test ! -s conftest.err

5152

- } && test -s conftest$ac_exeext && {

5153

- test "$cross_compiling" = yes ||

5154

- $as_test_x conftest$ac_exeext

5155

- }; then

5156

+ } && test -s conftest$ac_exeext &&

5157

+ $as_test_x conftest$ac_exeext; then

5158

ac_cv_func_bind_textdomain_codeset=yes

5159

else

5160

- $as_echo "$as_me: failed program was:" >&5

5161

+ echo "$as_me: failed program was:" >&5

5162

sed 's/^/| /' conftest.$ac_ext >&5

5163

5164

ac_cv_func_bind_textdomain_codeset=no

5165

fi

5166

5167

-rm -rf conftest.dSYM

5168

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

5169

conftest$ac_exeext conftest.$ac_ext

5170

fi

5171

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5

5172

-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }

5173

-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then

5174

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

5175

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

5176

+if test $ac_cv_func_bind_textdomain_codeset = yes; then

5177

DATADIRNAME=share

5178

else

5179

DATADIRNAME=lib

5180

@@ -6823,7 +6610,6 @@ fi

5181

esac

5182

fi

5183

5184

-rm -rf conftest.dSYM

5185

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

5186

conftest$ac_exeext conftest.$ac_ext

5187

fi

5188

@@ -6839,10 +6625,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=

5189

if test -n "$ac_tool_prefix"; then

5190

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

5191

set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

5192

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

5193

-$as_echo_n "checking for $ac_word... " >&6; }

5194

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

5195

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

5196

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

5197

- $as_echo_n "(cached) " >&6

5198

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

5199

else

5200

case $PKG_CONFIG in

5201

[\\/]* | ?:[\\/]*)

5202

@@ -6857,7 +6643,7 @@ do

5203

for ac_exec_ext in '' $ac_executable_extensions; do

5204

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5205

ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

5206

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5207

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5208

break 2

5209

fi

5210

done

5211

@@ -6869,11 +6655,11 @@ esac

5212

fi

5213

PKG_CONFIG=$ac_cv_path_PKG_CONFIG

5214

if test -n "$PKG_CONFIG"; then

5215

- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5

5216

-$as_echo "$PKG_CONFIG" >&6; }

5217

+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5

5218

+echo "${ECHO_T}$PKG_CONFIG" >&6; }

5219

else

5220

- { $as_echo "$as_me:$LINENO: result: no" >&5

5221

-$as_echo "no" >&6; }

5222

+ { echo "$as_me:$LINENO: result: no" >&5

5223

+echo "${ECHO_T}no" >&6; }

5224

fi

5225

5226

5227

@@ -6882,10 +6668,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the

5228

ac_pt_PKG_CONFIG=$PKG_CONFIG

5229

# Extract the first word of "pkg-config", so it can be a program name with args.

5230

set dummy pkg-config; ac_word=$2

5231

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5232

-$as_echo_n "checking for $ac_word... " >&6; }

5233

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5234

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5235

if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then

5236

- $as_echo_n "(cached) " >&6

5237

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5238

else

5239

case $ac_pt_PKG_CONFIG in

5240

[\\/]* | ?:[\\/]*)

5241

@@ -6900,7 +6686,7 @@ do

5242

for ac_exec_ext in '' $ac_executable_extensions; do

5243

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5244

ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

5245

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5246

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5247

break 2

5248

fi

5249

done

5250

@@ -6912,11 +6698,11 @@ esac

5251

fi

5252

ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

5253

if test -n "$ac_pt_PKG_CONFIG"; then

5254

- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5

5255

-$as_echo "$ac_pt_PKG_CONFIG" >&6; }

5256

+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5

5257

+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }

5258

else

5259

- { $as_echo "$as_me:$LINENO: result: no" >&5

5260

-$as_echo "no" >&6; }

5261

+ { echo "$as_me:$LINENO: result: no" >&5

5262

+echo "${ECHO_T}no" >&6; }

5263

fi

5264

5265

if test "x$ac_pt_PKG_CONFIG" = x; then

5266

@@ -6924,8 +6710,12 @@ fi

5267

else

5268

case $cross_compiling:$ac_tool_warned in

5269

yes:)

5270

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

5271

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

5272

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

5273

+whose name does not start with the host triplet. If you think this

5274

+configuration is useful to you, please write to autoconf@gnu.org." >&5

5275

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

5276

+whose name does not start with the host triplet. If you think this

5277

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

5278

ac_tool_warned=yes ;;

5279

esac

5280

PKG_CONFIG=$ac_pt_PKG_CONFIG

5281

@@ -6937,14 +6727,14 @@ fi

5282

fi

5283

if test -n "$PKG_CONFIG"; then

5284

_pkg_min_version=0.9.0

5285

- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5

5286

-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }

5287

+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5

5288

+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }

5289

if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

5290

- { $as_echo "$as_me:$LINENO: result: yes" >&5

5291

-$as_echo "yes" >&6; }

5292

+ { echo "$as_me:$LINENO: result: yes" >&5

5293

+echo "${ECHO_T}yes" >&6; }

5294

else

5295

- { $as_echo "$as_me:$LINENO: result: no" >&5

5296

-$as_echo "no" >&6; }

5297

+ { echo "$as_me:$LINENO: result: no" >&5

5298

+echo "${ECHO_T}no" >&6; }

5299

PKG_CONFIG=""

5300

fi

5301

5302

@@ -6953,10 +6743,10 @@ fi

5303

gdu_cv_version_required=0.3.2

5304

5305

if test -n "$PKG_CONFIG" && \

5306

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5

5307

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5

5308

($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5

5309

ac_status=$?

5310

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5311

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5312

(exit $ac_status); }; then

5313

gdu_cv_have_gdu=yes

5314

else

5315

@@ -6966,8 +6756,8 @@ fi

5316

if test "$gdu_cv_have_gdu" = "yes"; then

5317

:

5318

else

5319

- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5

5320

-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}

5321

+ { { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5

5322

+echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}

5323

{ (exit 1); exit 1; }; }

5324

fi

5325

5326

@@ -7049,10 +6839,10 @@ if test -z "$CXX"; then

5327

do

5328

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

5329

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

5330

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5331

-$as_echo_n "checking for $ac_word... " >&6; }

5332

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5333

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5334

if test "${ac_cv_prog_CXX+set}" = set; then

5335

- $as_echo_n "(cached) " >&6

5336

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5337

else

5338

if test -n "$CXX"; then

5339

ac_cv_prog_CXX="$CXX" # Let the user override the test.

5340

@@ -7065,7 +6855,7 @@ do

5341

for ac_exec_ext in '' $ac_executable_extensions; do

5342

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5343

ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"

5344

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5345

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5346

break 2

5347

fi

5348

done

5349

@@ -7076,11 +6866,11 @@ fi

5350

fi

5351

CXX=$ac_cv_prog_CXX

5352

if test -n "$CXX"; then

5353

- { $as_echo "$as_me:$LINENO: result: $CXX" >&5

5354

-$as_echo "$CXX" >&6; }

5355

+ { echo "$as_me:$LINENO: result: $CXX" >&5

5356

+echo "${ECHO_T}$CXX" >&6; }

5357

else

5358

- { $as_echo "$as_me:$LINENO: result: no" >&5

5359

-$as_echo "no" >&6; }

5360

+ { echo "$as_me:$LINENO: result: no" >&5

5361

+echo "${ECHO_T}no" >&6; }

5362

fi

5363

5364

5365

@@ -7093,10 +6883,10 @@ if test -z "$CXX"; then

5366

do

5367

# Extract the first word of "$ac_prog", so it can be a program name with args.

5368

set dummy $ac_prog; ac_word=$2

5369

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

5370

-$as_echo_n "checking for $ac_word... " >&6; }

5371

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

5372

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

5373

if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then

5374

- $as_echo_n "(cached) " >&6

5375

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5376

else

5377

if test -n "$ac_ct_CXX"; then

5378

ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.

5379

@@ -7109,7 +6899,7 @@ do

5380

for ac_exec_ext in '' $ac_executable_extensions; do

5381

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

5382

ac_cv_prog_ac_ct_CXX="$ac_prog"

5383

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5384

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

5385

break 2

5386

fi

5387

done

5388

@@ -7120,11 +6910,11 @@ fi

5389

fi

5390

ac_ct_CXX=$ac_cv_prog_ac_ct_CXX

5391

if test -n "$ac_ct_CXX"; then

5392

- { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

5393

-$as_echo "$ac_ct_CXX" >&6; }

5394

+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5

5395

+echo "${ECHO_T}$ac_ct_CXX" >&6; }

5396

else

5397

- { $as_echo "$as_me:$LINENO: result: no" >&5

5398

-$as_echo "no" >&6; }

5399

+ { echo "$as_me:$LINENO: result: no" >&5

5400

+echo "${ECHO_T}no" >&6; }

5401

fi

5402

5403

5404

@@ -7136,8 +6926,12 @@ done

5405

else

5406

case $cross_compiling:$ac_tool_warned in

5407

yes:)

5408

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

5409

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

5410

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

5411

+whose name does not start with the host triplet. If you think this

5412

+configuration is useful to you, please write to autoconf@gnu.org." >&5

5413

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

5414

+whose name does not start with the host triplet. If you think this

5415

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

5416

ac_tool_warned=yes ;;

5417

esac

5418

CXX=$ac_ct_CXX

5419

@@ -7147,47 +6941,43 @@ fi

5420

fi

5421

fi

5422

# Provide some information about the compiler.

5423

-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5

5424

-set X $ac_compile

5425

-ac_compiler=$2

5426

+echo "$as_me:$LINENO: checking for C++ compiler version" >&5

5427

+ac_compiler=`set X $ac_compile; echo $2`

5428

{ (ac_try="$ac_compiler --version >&5"

5429

case "(($ac_try" in

5430

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5431

*) ac_try_echo=$ac_try;;

5432

esac

5433

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5434

-$as_echo "$ac_try_echo") >&5

5435

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5436

(eval "$ac_compiler --version >&5") 2>&5

5437

ac_status=$?

5438

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5439

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5440

(exit $ac_status); }

5441

{ (ac_try="$ac_compiler -v >&5"

5442

case "(($ac_try" in

5443

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5444

*) ac_try_echo=$ac_try;;

5445

esac

5446

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5447

-$as_echo "$ac_try_echo") >&5

5448

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5449

(eval "$ac_compiler -v >&5") 2>&5

5450

ac_status=$?

5451

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5452

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5453

(exit $ac_status); }

5454

{ (ac_try="$ac_compiler -V >&5"

5455

case "(($ac_try" in

5456

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5457

*) ac_try_echo=$ac_try;;

5458

esac

5459

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5460

-$as_echo "$ac_try_echo") >&5

5461

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5462

(eval "$ac_compiler -V >&5") 2>&5

5463

ac_status=$?

5464

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5465

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5466

(exit $ac_status); }

5467

5468

-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

5469

-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }

5470

+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5

5471

+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }

5472

if test "${ac_cv_cxx_compiler_gnu+set}" = set; then

5473

- $as_echo_n "(cached) " >&6

5474

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5475

else

5476

cat >conftest.$ac_ext <<_ACEOF

5477

/* confdefs.h. */

5478

@@ -7213,21 +7003,20 @@ case "(($ac_try" in

5479

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5480

*) ac_try_echo=$ac_try;;

5481

esac

5482

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5483

-$as_echo "$ac_try_echo") >&5

5484

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5485

(eval "$ac_compile") 2>conftest.er1

5486

ac_status=$?

5487

grep -v '^ *+' conftest.er1 >conftest.err

5488

rm -f conftest.er1

5489

cat conftest.err >&5

5490

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5491

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5492

(exit $ac_status); } && {

5493

test -z "$ac_cxx_werror_flag" ||

5494

test ! -s conftest.err

5495

} && test -s conftest.$ac_objext; then

5496

ac_compiler_gnu=yes

5497

else

5498

- $as_echo "$as_me: failed program was:" >&5

5499

+ echo "$as_me: failed program was:" >&5

5500

sed 's/^/| /' conftest.$ac_ext >&5

5501

5502

ac_compiler_gnu=no

5503

@@ -7237,19 +7026,15 @@ rm -f core conftest.err conftest.$ac_obj

5504

ac_cv_cxx_compiler_gnu=$ac_compiler_gnu

5505

5506

fi

5507

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

5508

-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }

5509

-if test $ac_compiler_gnu = yes; then

5510

- GXX=yes

5511

-else

5512

- GXX=

5513

-fi

5514

+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5

5515

+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }

5516

+GXX=`test $ac_compiler_gnu = yes && echo yes`

5517

ac_test_CXXFLAGS=${CXXFLAGS+set}

5518

ac_save_CXXFLAGS=$CXXFLAGS

5519

-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

5520

-$as_echo_n "checking whether $CXX accepts -g... " >&6; }

5521

+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5

5522

+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }

5523

if test "${ac_cv_prog_cxx_g+set}" = set; then

5524

- $as_echo_n "(cached) " >&6

5525

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5526

else

5527

ac_save_cxx_werror_flag=$ac_cxx_werror_flag

5528

ac_cxx_werror_flag=yes

5529

@@ -7276,21 +7061,20 @@ case "(($ac_try" in

5530

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5531

*) ac_try_echo=$ac_try;;

5532

esac

5533

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5534

-$as_echo "$ac_try_echo") >&5

5535

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5536

(eval "$ac_compile") 2>conftest.er1

5537

ac_status=$?

5538

grep -v '^ *+' conftest.er1 >conftest.err

5539

rm -f conftest.er1

5540

cat conftest.err >&5

5541

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5542

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5543

(exit $ac_status); } && {

5544

test -z "$ac_cxx_werror_flag" ||

5545

test ! -s conftest.err

5546

} && test -s conftest.$ac_objext; then

5547

ac_cv_prog_cxx_g=yes

5548

else

5549

- $as_echo "$as_me: failed program was:" >&5

5550

+ echo "$as_me: failed program was:" >&5

5551

sed 's/^/| /' conftest.$ac_ext >&5

5552

5553

CXXFLAGS=""

5554

@@ -7315,21 +7099,20 @@ case "(($ac_try" in

5555

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5556

*) ac_try_echo=$ac_try;;

5557

esac

5558

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5559

-$as_echo "$ac_try_echo") >&5

5560

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5561

(eval "$ac_compile") 2>conftest.er1

5562

ac_status=$?

5563

grep -v '^ *+' conftest.er1 >conftest.err

5564

rm -f conftest.er1

5565

cat conftest.err >&5

5566

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5567

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5568

(exit $ac_status); } && {

5569

test -z "$ac_cxx_werror_flag" ||

5570

test ! -s conftest.err

5571

} && test -s conftest.$ac_objext; then

5572

:

5573

else

5574

- $as_echo "$as_me: failed program was:" >&5

5575

+ echo "$as_me: failed program was:" >&5

5576

sed 's/^/| /' conftest.$ac_ext >&5

5577

5578

ac_cxx_werror_flag=$ac_save_cxx_werror_flag

5579

@@ -7355,21 +7138,20 @@ case "(($ac_try" in

5580

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5581

*) ac_try_echo=$ac_try;;

5582

esac

5583

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5584

-$as_echo "$ac_try_echo") >&5

5585

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5586

(eval "$ac_compile") 2>conftest.er1

5587

ac_status=$?

5588

grep -v '^ *+' conftest.er1 >conftest.err

5589

rm -f conftest.er1

5590

cat conftest.err >&5

5591

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5592

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5593

(exit $ac_status); } && {

5594

test -z "$ac_cxx_werror_flag" ||

5595

test ! -s conftest.err

5596

} && test -s conftest.$ac_objext; then

5597

ac_cv_prog_cxx_g=yes

5598

else

5599

- $as_echo "$as_me: failed program was:" >&5

5600

+ echo "$as_me: failed program was:" >&5

5601

sed 's/^/| /' conftest.$ac_ext >&5

5602

5603

5604

@@ -7384,8 +7166,8 @@ fi

5605

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

5606

ac_cxx_werror_flag=$ac_save_cxx_werror_flag

5607

fi

5608

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

5609

-$as_echo "$ac_cv_prog_cxx_g" >&6; }

5610

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5

5611

+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }

5612

if test "$ac_test_CXXFLAGS" = set; then

5613

CXXFLAGS=$ac_save_CXXFLAGS

5614

elif test $ac_cv_prog_cxx_g = yes; then

5615

@@ -7409,10 +7191,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

5616

5617

depcc="$CXX" am_compiler_list=

5618

5619

-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

5620

-$as_echo_n "checking dependency style of $depcc... " >&6; }

5621

+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5

5622

+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }

5623

if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then

5624

- $as_echo_n "(cached) " >&6

5625

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5626

else

5627

if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then

5628

# We make a subdir and do the tests there. Otherwise we can end up

5629

@@ -7500,8 +7282,8 @@ else

5630

fi

5631

5632

fi

5633

-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5

5634

-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }

5635

+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5

5636

+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }

5637

CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

5638

5639

if

5640

@@ -7516,16 +7298,16 @@ fi

5641

5642

5643

if test "x$CC" != xcc; then

5644

- { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5

5645

-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }

5646

+ { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5

5647

+echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }

5648

else

5649

- { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5

5650

-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }

5651

+ { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5

5652

+echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }

5653

fi

5654

-set dummy $CC; ac_cc=`$as_echo "$2" |

5655

+set dummy $CC; ac_cc=`echo $2 |

5656

sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`

5657

if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then

5658

- $as_echo_n "(cached) " >&6

5659

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5660

else

5661

cat >conftest.$ac_ext <<_ACEOF

5662

/* confdefs.h. */

5663

@@ -7551,21 +7333,19 @@ if { (case "(($ac_try" in

5664

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5665

*) ac_try_echo=$ac_try;;

5666

esac

5667

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5668

-$as_echo "$ac_try_echo") >&5

5669

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5670

(eval "$ac_try") 2>&5

5671

ac_status=$?

5672

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5673

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5674

(exit $ac_status); } &&

5675

test -f conftest2.$ac_objext && { (case "(($ac_try" in

5676

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5677

*) ac_try_echo=$ac_try;;

5678

esac

5679

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5680

-$as_echo "$ac_try_echo") >&5

5681

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5682

(eval "$ac_try") 2>&5

5683

ac_status=$?

5684

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5685

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5686

(exit $ac_status); };

5687

then

5688

eval ac_cv_prog_cc_${ac_cc}_c_o=yes

5689

@@ -7576,11 +7356,10 @@ then

5690

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5691

*) ac_try_echo=$ac_try;;

5692

esac

5693

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5694

-$as_echo "$ac_try_echo") >&5

5695

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5696

(eval "$ac_try") 2>&5

5697

ac_status=$?

5698

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5699

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5700

(exit $ac_status); }; }; then

5701

ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'

5702

rm -f conftest2.*

5703

@@ -7588,21 +7367,19 @@ $as_echo "$ac_try_echo") >&5

5704

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5705

*) ac_try_echo=$ac_try;;

5706

esac

5707

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5708

-$as_echo "$ac_try_echo") >&5

5709

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5710

(eval "$ac_try") 2>&5

5711

ac_status=$?

5712

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5713

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5714

(exit $ac_status); } &&

5715

test -f conftest2.$ac_objext && { (case "(($ac_try" in

5716

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

5717

*) ac_try_echo=$ac_try;;

5718

esac

5719

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

5720

-$as_echo "$ac_try_echo") >&5

5721

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

5722

(eval "$ac_try") 2>&5

5723

ac_status=$?

5724

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

5725

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

5726

(exit $ac_status); };

5727

then

5728

# cc works too.

5729

@@ -7620,11 +7397,11 @@ rm -f core conftest*

5730

5731

fi

5732

if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then

5733

- { $as_echo "$as_me:$LINENO: result: yes" >&5

5734

-$as_echo "yes" >&6; }

5735

+ { echo "$as_me:$LINENO: result: yes" >&5

5736

+echo "${ECHO_T}yes" >&6; }

5737

else

5738

- { $as_echo "$as_me:$LINENO: result: no" >&5

5739

-$as_echo "no" >&6; }

5740

+ { echo "$as_me:$LINENO: result: no" >&5

5741

+echo "${ECHO_T}no" >&6; }

5742

5743

cat >>confdefs.h <<\_ACEOF

5744

#define NO_MINUS_C_MINUS_O 1

5745

@@ -7720,34 +7497,34 @@ fi

5746

5747

# Make sure we can run config.sub.

5748

$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||

5749

- { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5

5750

-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}

5751

+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5

5752

+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}

5753

{ (exit 1); exit 1; }; }

5754

5755

-{ $as_echo "$as_me:$LINENO: checking build system type" >&5

5756

-$as_echo_n "checking build system type... " >&6; }

5757

+{ echo "$as_me:$LINENO: checking build system type" >&5

5758

+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }

5759

if test "${ac_cv_build+set}" = set; then

5760

- $as_echo_n "(cached) " >&6

5761

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5762

else

5763

ac_build_alias=$build_alias

5764

test "x$ac_build_alias" = x &&

5765

ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`

5766

test "x$ac_build_alias" = x &&

5767

- { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5

5768

-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}

5769

+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5

5770

+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}

5771

{ (exit 1); exit 1; }; }

5772

ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||

5773

- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5

5774

-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}

5775

+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5

5776

+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}

5777

{ (exit 1); exit 1; }; }

5778

5779

fi

5780

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5

5781

-$as_echo "$ac_cv_build" >&6; }

5782

+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5

5783

+echo "${ECHO_T}$ac_cv_build" >&6; }

5784

case $ac_cv_build in

5785

*-*-*) ;;

5786

-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5

5787

-$as_echo "$as_me: error: invalid value of canonical build" >&2;}

5788

+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5

5789

+echo "$as_me: error: invalid value of canonical build" >&2;}

5790

{ (exit 1); exit 1; }; };;

5791

esac

5792

build=$ac_cv_build

5793

@@ -7764,27 +7541,27 @@ IFS=$ac_save_IFS

5794

case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac

5795

5796

5797

-{ $as_echo "$as_me:$LINENO: checking host system type" >&5

5798

-$as_echo_n "checking host system type... " >&6; }

5799

+{ echo "$as_me:$LINENO: checking host system type" >&5

5800

+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }

5801

if test "${ac_cv_host+set}" = set; then

5802

- $as_echo_n "(cached) " >&6

5803

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5804

else

5805

if test "x$host_alias" = x; then

5806

ac_cv_host=$ac_cv_build

5807

else

5808

ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||

5809

- { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5

5810

-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}

5811

+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5

5812

+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}

5813

{ (exit 1); exit 1; }; }

5814

fi

5815

5816

fi

5817

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5

5818

-$as_echo "$ac_cv_host" >&6; }

5819

+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5

5820

+echo "${ECHO_T}$ac_cv_host" >&6; }

5821

case $ac_cv_host in

5822

*-*-*) ;;

5823

-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5

5824

-$as_echo "$as_me: error: invalid value of canonical host" >&2;}

5825

+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5

5826

+echo "$as_me: error: invalid value of canonical host" >&2;}

5827

{ (exit 1); exit 1; }; };;

5828

esac

5829

host=$ac_cv_host

5830

@@ -7801,10 +7578,10 @@ IFS=$ac_save_IFS

5831

case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac

5832

5833

5834

-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5

5835

-$as_echo_n "checking for a sed that does not truncate output... " >&6; }

5836

+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5

5837

+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }

5838

if test "${lt_cv_path_SED+set}" = set; then

5839

- $as_echo_n "(cached) " >&6

5840

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5841

else

5842

# Loop through the user's path and test for sed and gsed.

5843

# Then use that list of sed's as ones to test for truncation.

5844

@@ -7857,8 +7634,8 @@ fi

5845

5846

SED=$lt_cv_path_SED

5847

5848

-{ $as_echo "$as_me:$LINENO: result: $SED" >&5

5849

-$as_echo "$SED" >&6; }

5850

+{ echo "$as_me:$LINENO: result: $SED" >&5

5851

+echo "${ECHO_T}$SED" >&6; }

5852

5853

5854

# Check whether --with-gnu-ld was given.

5855

@@ -7871,8 +7648,8 @@ fi

5856

ac_prog=ld

5857

if test "$GCC" = yes; then

5858

# Check if gcc -print-prog-name=ld gives a path.

5859

- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5

5860

-$as_echo_n "checking for ld used by $CC... " >&6; }

5861

+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

5862

+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

5863

case $host in

5864

*-*-mingw*)

5865

# gcc leaves a trailing carriage return which upsets mingw

5866

@@ -7901,14 +7678,14 @@ $as_echo_n "checking for ld used by $CC.

5867

;;

5868

esac

5869

elif test "$with_gnu_ld" = yes; then

5870

- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5

5871

-$as_echo_n "checking for GNU ld... " >&6; }

5872

+ { echo "$as_me:$LINENO: checking for GNU ld" >&5

5873

+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

5874

else

5875

- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5

5876

-$as_echo_n "checking for non-GNU ld... " >&6; }

5877

+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

5878

+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

5879

fi

5880

if test "${lt_cv_path_LD+set}" = set; then

5881

- $as_echo_n "(cached) " >&6

5882

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5883

else

5884

if test -z "$LD"; then

5885

lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

5886

@@ -7938,19 +7715,19 @@ fi

5887

5888

LD="$lt_cv_path_LD"

5889

if test -n "$LD"; then

5890

- { $as_echo "$as_me:$LINENO: result: $LD" >&5

5891

-$as_echo "$LD" >&6; }

5892

+ { echo "$as_me:$LINENO: result: $LD" >&5

5893

+echo "${ECHO_T}$LD" >&6; }

5894

else

5895

- { $as_echo "$as_me:$LINENO: result: no" >&5

5896

-$as_echo "no" >&6; }

5897

+ { echo "$as_me:$LINENO: result: no" >&5

5898

+echo "${ECHO_T}no" >&6; }

5899

fi

5900

-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

5901

-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

5902

+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

5903

+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

5904

{ (exit 1); exit 1; }; }

5905

-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

5906

-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

5907

+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

5908

+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

5909

if test "${lt_cv_prog_gnu_ld+set}" = set; then

5910

- $as_echo_n "(cached) " >&6

5911

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5912

else

5913

# I'd rather use --version here, but apparently some GNU lds only accept -v.

5914

case `$LD -v 2>&1 </dev/null` in

5915

@@ -7962,20 +7739,20 @@ case `$LD -v 2>&1 </dev/null` in

5916

;;

5917

esac

5918

fi

5919

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

5920

-$as_echo "$lt_cv_prog_gnu_ld" >&6; }

5921

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

5922

+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

5923

with_gnu_ld=$lt_cv_prog_gnu_ld

5924

5925

5926

-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5

5927

-$as_echo_n "checking for $LD option to reload object files... " >&6; }

5928

+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5

5929

+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }

5930

if test "${lt_cv_ld_reload_flag+set}" = set; then

5931

- $as_echo_n "(cached) " >&6

5932

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5933

else

5934

lt_cv_ld_reload_flag='-r'

5935

fi

5936

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5

5937

-$as_echo "$lt_cv_ld_reload_flag" >&6; }

5938

+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5

5939

+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }

5940

reload_flag=$lt_cv_ld_reload_flag

5941

case $reload_flag in

5942

"" | " "*) ;;

5943

@@ -7992,10 +7769,10 @@ case $host_os in

5944

;;

5945

esac

5946

5947

-{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5

5948

-$as_echo_n "checking for BSD-compatible nm... " >&6; }

5949

+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5

5950

+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }

5951

if test "${lt_cv_path_NM+set}" = set; then

5952

- $as_echo_n "(cached) " >&6

5953

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5954

else

5955

if test -n "$NM"; then

5956

# Let the user override the test.

5957

@@ -8041,25 +7818,25 @@ else

5958

test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm

5959

fi

5960

fi

5961

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5

5962

-$as_echo "$lt_cv_path_NM" >&6; }

5963

+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5

5964

+echo "${ECHO_T}$lt_cv_path_NM" >&6; }

5965

NM="$lt_cv_path_NM"

5966

5967

-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5

5968

-$as_echo_n "checking whether ln -s works... " >&6; }

5969

+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5

5970

+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }

5971

LN_S=$as_ln_s

5972

if test "$LN_S" = "ln -s"; then

5973

- { $as_echo "$as_me:$LINENO: result: yes" >&5

5974

-$as_echo "yes" >&6; }

5975

+ { echo "$as_me:$LINENO: result: yes" >&5

5976

+echo "${ECHO_T}yes" >&6; }

5977

else

5978

- { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5

5979

-$as_echo "no, using $LN_S" >&6; }

5980

+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5

5981

+echo "${ECHO_T}no, using $LN_S" >&6; }

5982

fi

5983

5984

-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5

5985

-$as_echo_n "checking how to recognize dependent libraries... " >&6; }

5986

+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5

5987

+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }

5988

if test "${lt_cv_deplibs_check_method+set}" = set; then

5989

- $as_echo_n "(cached) " >&6

5990

+ echo $ECHO_N "(cached) $ECHO_C" >&6

5991

else

5992

lt_cv_file_magic_cmd='$MAGIC_CMD'

5993

lt_cv_file_magic_test_file=

5994

@@ -8171,7 +7948,7 @@ linux* | k*bsd*-gnu)

5995

lt_cv_deplibs_check_method=pass_all

5996

;;

5997

5998

-netbsd*)

5999

+netbsd* | netbsdelf*-gnu)

6000

if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

6001

lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'

6002

else

6003

@@ -8242,8 +8019,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*

6004

esac

6005

6006

fi

6007

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5

6008

-$as_echo "$lt_cv_deplibs_check_method" >&6; }

6009

+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5

6010

+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }

6011

file_magic_cmd=$lt_cv_file_magic_cmd

6012

deplibs_check_method=$lt_cv_deplibs_check_method

6013

test -z "$deplibs_check_method" && deplibs_check_method=unknown

6014

@@ -8276,7 +8053,7 @@ ia64-*-hpux*)

6015

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6016

(eval $ac_compile) 2>&5

6017

ac_status=$?

6018

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6019

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6020

(exit $ac_status); }; then

6021

case `/usr/bin/file conftest.$ac_objext` in

6022

*ELF-32*)

6023

@@ -8291,11 +8068,11 @@ ia64-*-hpux*)

6024

;;

6025

*-*-irix6*)

6026

# Find out which ABI we are using.

6027

- echo '#line 8294 "configure"' > conftest.$ac_ext

6028

+ echo '#line 8071 "configure"' > conftest.$ac_ext

6029

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6030

(eval $ac_compile) 2>&5

6031

ac_status=$?

6032

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6033

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6034

(exit $ac_status); }; then

6035

if test "$lt_cv_prog_gnu_ld" = yes; then

6036

case `/usr/bin/file conftest.$ac_objext` in

6037

@@ -8333,7 +8110,7 @@ s390*-*linux*|sparc*-*linux*)

6038

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6039

(eval $ac_compile) 2>&5

6040

ac_status=$?

6041

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6042

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6043

(exit $ac_status); }; then

6044

case `/usr/bin/file conftest.o` in

6045

*32-bit*)

6046

@@ -8356,7 +8133,6 @@ s390*-*linux*|sparc*-*linux*)

6047

esac

6048

;;

6049

*64-bit*)

6050

- libsuff=64

6051

case $host in

6052

x86_64-*kfreebsd*-gnu)

6053

LD="${LD-ld} -m elf_x86_64_fbsd"

6054

@@ -8384,10 +8160,10 @@ s390*-*linux*|sparc*-*linux*)

6055

# On SCO OpenServer 5, we need -belf to get full-featured binaries.

6056

SAVE_CFLAGS="$CFLAGS"

6057

CFLAGS="$CFLAGS -belf"

6058

- { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5

6059

-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }

6060

+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5

6061

+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }

6062

if test "${lt_cv_cc_needs_belf+set}" = set; then

6063

- $as_echo_n "(cached) " >&6

6064

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6065

else

6066

ac_ext=c

6067

ac_cpp='$CPP $CPPFLAGS'

6068

@@ -8416,30 +8192,26 @@ case "(($ac_try" in

6069

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6070

*) ac_try_echo=$ac_try;;

6071

esac

6072

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6073

-$as_echo "$ac_try_echo") >&5

6074

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6075

(eval "$ac_link") 2>conftest.er1

6076

ac_status=$?

6077

grep -v '^ *+' conftest.er1 >conftest.err

6078

rm -f conftest.er1

6079

cat conftest.err >&5

6080

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6081

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6082

(exit $ac_status); } && {

6083

test -z "$ac_c_werror_flag" ||

6084

test ! -s conftest.err

6085

- } && test -s conftest$ac_exeext && {

6086

- test "$cross_compiling" = yes ||

6087

- $as_test_x conftest$ac_exeext

6088

- }; then

6089

+ } && test -s conftest$ac_exeext &&

6090

+ $as_test_x conftest$ac_exeext; then

6091

lt_cv_cc_needs_belf=yes

6092

else

6093

- $as_echo "$as_me: failed program was:" >&5

6094

+ echo "$as_me: failed program was:" >&5

6095

sed 's/^/| /' conftest.$ac_ext >&5

6096

6097

lt_cv_cc_needs_belf=no

6098

fi

6099

6100

-rm -rf conftest.dSYM

6101

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

6102

conftest$ac_exeext conftest.$ac_ext

6103

ac_ext=c

6104

@@ -8449,8 +8221,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLA

6105

ac_compiler_gnu=$ac_cv_c_compiler_gnu

6106

6107

fi

6108

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5

6109

-$as_echo "$lt_cv_cc_needs_belf" >&6; }

6110

+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5

6111

+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }

6112

if test x"$lt_cv_cc_needs_belf" != x"yes"; then

6113

# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf

6114

CFLAGS="$SAVE_CFLAGS"

6115

@@ -8462,7 +8234,7 @@ sparc*-*solaris*)

6116

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6117

(eval $ac_compile) 2>&5

6118

ac_status=$?

6119

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6120

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6121

(exit $ac_status); }; then

6122

case `/usr/bin/file conftest.o` in

6123

*64-bit*)

6124

@@ -8489,21 +8261,20 @@ need_locks="$enable_libtool_lock"

6125

6126

for ac_header in dlfcn.h

6127

do

6128

-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

6129

+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

6130

if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

6131

- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

6132

-$as_echo_n "checking for $ac_header... " >&6; }

6133

+ { echo "$as_me:$LINENO: checking for $ac_header" >&5

6134

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

6135

if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

6136

- $as_echo_n "(cached) " >&6

6137

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6138

fi

6139

-ac_res=`eval 'as_val=${'$as_ac_Header'}

6140

- $as_echo "$as_val"'`

6141

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

6142

-$as_echo "$ac_res" >&6; }

6143

+ac_res=`eval echo '${'$as_ac_Header'}'`

6144

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

6145

+echo "${ECHO_T}$ac_res" >&6; }

6146

else

6147

# Is the header compilable?

6148

-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5

6149

-$as_echo_n "checking $ac_header usability... " >&6; }

6150

+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5

6151

+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }

6152

cat >conftest.$ac_ext <<_ACEOF

6153

/* confdefs.h. */

6154

_ACEOF

6155

@@ -8519,33 +8290,32 @@ case "(($ac_try" in

6156

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6157

*) ac_try_echo=$ac_try;;

6158

esac

6159

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6160

-$as_echo "$ac_try_echo") >&5

6161

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6162

(eval "$ac_compile") 2>conftest.er1

6163

ac_status=$?

6164

grep -v '^ *+' conftest.er1 >conftest.err

6165

rm -f conftest.er1

6166

cat conftest.err >&5

6167

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6168

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6169

(exit $ac_status); } && {

6170

test -z "$ac_c_werror_flag" ||

6171

test ! -s conftest.err

6172

} && test -s conftest.$ac_objext; then

6173

ac_header_compiler=yes

6174

else

6175

- $as_echo "$as_me: failed program was:" >&5

6176

+ echo "$as_me: failed program was:" >&5

6177

sed 's/^/| /' conftest.$ac_ext >&5

6178

6179

ac_header_compiler=no

6180

fi

6181

6182

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6183

-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

6184

-$as_echo "$ac_header_compiler" >&6; }

6185

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

6186

+echo "${ECHO_T}$ac_header_compiler" >&6; }

6187

6188

# Is the header present?

6189

-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5

6190

-$as_echo_n "checking $ac_header presence... " >&6; }

6191

+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5

6192

+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }

6193

cat >conftest.$ac_ext <<_ACEOF

6194

/* confdefs.h. */

6195

_ACEOF

6196

@@ -8559,52 +8329,51 @@ case "(($ac_try" in

6197

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6198

*) ac_try_echo=$ac_try;;

6199

esac

6200

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6201

-$as_echo "$ac_try_echo") >&5

6202

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6203

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6204

ac_status=$?

6205

grep -v '^ *+' conftest.er1 >conftest.err

6206

rm -f conftest.er1

6207

cat conftest.err >&5

6208

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6209

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6210

(exit $ac_status); } >/dev/null && {

6211

test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

6212

test ! -s conftest.err

6213

}; then

6214

ac_header_preproc=yes

6215

else

6216

- $as_echo "$as_me: failed program was:" >&5

6217

+ echo "$as_me: failed program was:" >&5

6218

sed 's/^/| /' conftest.$ac_ext >&5

6219

6220

ac_header_preproc=no

6221

fi

6222

6223

rm -f conftest.err conftest.$ac_ext

6224

-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

6225

-$as_echo "$ac_header_preproc" >&6; }

6226

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

6227

+echo "${ECHO_T}$ac_header_preproc" >&6; }

6228

6229

# So? What about this header?

6230

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

6231

yes:no: )

6232

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

6233

-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

6234

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

6235

-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

6236

+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5

6237

+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}

6238

+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5

6239

+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}

6240

ac_header_preproc=yes

6241

;;

6242

no:yes:* )

6243

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

6244

-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

6245

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5

6246

-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}

6247

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5

6248

-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}

6249

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5

6250

-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}

6251

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

6252

-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

6253

- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

6254

-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

6255

+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5

6256

+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}

6257

+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5

6258

+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}

6259

+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5

6260

+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}

6261

+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5

6262

+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}

6263

+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5

6264

+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}

6265

+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5

6266

+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}

6267

( cat <<\_ASBOX

6268

## -------------------------------------------------------------------- ##

6269

## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ##

6270

@@ -8613,24 +8382,21 @@ _ASBOX

6271

) | sed "s/^/$as_me: WARNING: /" >&2

6272

;;

6273

esac

6274

-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5

6275

-$as_echo_n "checking for $ac_header... " >&6; }

6276

+{ echo "$as_me:$LINENO: checking for $ac_header" >&5

6277

+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }

6278

if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then

6279

- $as_echo_n "(cached) " >&6

6280

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6281

else

6282

eval "$as_ac_Header=\$ac_header_preproc"

6283

fi

6284

-ac_res=`eval 'as_val=${'$as_ac_Header'}

6285

- $as_echo "$as_val"'`

6286

- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5

6287

-$as_echo "$ac_res" >&6; }

6288

+ac_res=`eval echo '${'$as_ac_Header'}'`

6289

+ { echo "$as_me:$LINENO: result: $ac_res" >&5

6290

+echo "${ECHO_T}$ac_res" >&6; }

6291

6292

fi

6293

-as_val=`eval 'as_val=${'$as_ac_Header'}

6294

- $as_echo "$as_val"'`

6295

- if test "x$as_val" = x""yes; then

6296

+if test `eval echo '${'$as_ac_Header'}'` = yes; then

6297

cat >>confdefs.h <<_ACEOF

6298

-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

6299

+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1

6300

_ACEOF

6301

6302

fi

6303

@@ -8647,11 +8413,11 @@ ac_cpp='$CXXCPP $CPPFLAGS'

6304

ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

6305

ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

6306

ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

6307

-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5

6308

-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }

6309

+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5

6310

+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }

6311

if test -z "$CXXCPP"; then

6312

if test "${ac_cv_prog_CXXCPP+set}" = set; then

6313

- $as_echo_n "(cached) " >&6

6314

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6315

else

6316

# Double quotes because CXXCPP needs to be expanded

6317

for CXXCPP in "$CXX -E" "/lib/cpp"

6318

@@ -8683,21 +8449,20 @@ case "(($ac_try" in

6319

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6320

*) ac_try_echo=$ac_try;;

6321

esac

6322

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6323

-$as_echo "$ac_try_echo") >&5

6324

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6325

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6326

ac_status=$?

6327

grep -v '^ *+' conftest.er1 >conftest.err

6328

rm -f conftest.er1

6329

cat conftest.err >&5

6330

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6331

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6332

(exit $ac_status); } >/dev/null && {

6333

test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

6334

test ! -s conftest.err

6335

}; then

6336

:

6337

else

6338

- $as_echo "$as_me: failed program was:" >&5

6339

+ echo "$as_me: failed program was:" >&5

6340

sed 's/^/| /' conftest.$ac_ext >&5

6341

6342

# Broken: fails on valid input.

6343

@@ -8721,14 +8486,13 @@ case "(($ac_try" in

6344

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6345

*) ac_try_echo=$ac_try;;

6346

esac

6347

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6348

-$as_echo "$ac_try_echo") >&5

6349

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6350

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6351

ac_status=$?

6352

grep -v '^ *+' conftest.er1 >conftest.err

6353

rm -f conftest.er1

6354

cat conftest.err >&5

6355

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6356

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6357

(exit $ac_status); } >/dev/null && {

6358

test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

6359

test ! -s conftest.err

6360

@@ -8736,7 +8500,7 @@ $as_echo "$ac_try_echo") >&5

6361

# Broken: success on invalid input.

6362

continue

6363

else

6364

- $as_echo "$as_me: failed program was:" >&5

6365

+ echo "$as_me: failed program was:" >&5

6366

sed 's/^/| /' conftest.$ac_ext >&5

6367

6368

# Passes both tests.

6369

@@ -8761,8 +8525,8 @@ fi

6370

else

6371

ac_cv_prog_CXXCPP=$CXXCPP

6372

fi

6373

-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5

6374

-$as_echo "$CXXCPP" >&6; }

6375

+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5

6376

+echo "${ECHO_T}$CXXCPP" >&6; }

6377

ac_preproc_ok=false

6378

for ac_cxx_preproc_warn_flag in '' yes

6379

do

6380

@@ -8790,21 +8554,20 @@ case "(($ac_try" in

6381

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6382

*) ac_try_echo=$ac_try;;

6383

esac

6384

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6385

-$as_echo "$ac_try_echo") >&5

6386

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6387

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6388

ac_status=$?

6389

grep -v '^ *+' conftest.er1 >conftest.err

6390

rm -f conftest.er1

6391

cat conftest.err >&5

6392

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6393

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6394

(exit $ac_status); } >/dev/null && {

6395

test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

6396

test ! -s conftest.err

6397

}; then

6398

:

6399

else

6400

- $as_echo "$as_me: failed program was:" >&5

6401

+ echo "$as_me: failed program was:" >&5

6402

sed 's/^/| /' conftest.$ac_ext >&5

6403

6404

# Broken: fails on valid input.

6405

@@ -8828,14 +8591,13 @@ case "(($ac_try" in

6406

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6407

*) ac_try_echo=$ac_try;;

6408

esac

6409

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6410

-$as_echo "$ac_try_echo") >&5

6411

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6412

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

6413

ac_status=$?

6414

grep -v '^ *+' conftest.er1 >conftest.err

6415

rm -f conftest.er1

6416

cat conftest.err >&5

6417

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6418

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6419

(exit $ac_status); } >/dev/null && {

6420

test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

6421

test ! -s conftest.err

6422

@@ -8843,7 +8605,7 @@ $as_echo "$ac_try_echo") >&5

6423

# Broken: success on invalid input.

6424

continue

6425

else

6426

- $as_echo "$as_me: failed program was:" >&5

6427

+ echo "$as_me: failed program was:" >&5

6428

sed 's/^/| /' conftest.$ac_ext >&5

6429

6430

# Passes both tests.

6431

@@ -8859,13 +8621,11 @@ rm -f conftest.err conftest.$ac_ext

6432

if $ac_preproc_ok; then

6433

:

6434

else

6435

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

6436

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

6437

-{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check

6438

+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check

6439

See \`config.log' for more details." >&5

6440

-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check

6441

+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check

6442

See \`config.log' for more details." >&2;}

6443

- { (exit 1); exit 1; }; }; }

6444

+ { (exit 1); exit 1; }; }

6445

fi

6446

6447

ac_ext=cpp

6448

@@ -8886,10 +8646,10 @@ if test -n "$ac_tool_prefix"; then

6449

do

6450

# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.

6451

set dummy $ac_tool_prefix$ac_prog; ac_word=$2

6452

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6453

-$as_echo_n "checking for $ac_word... " >&6; }

6454

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6455

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6456

if test "${ac_cv_prog_F77+set}" = set; then

6457

- $as_echo_n "(cached) " >&6

6458

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6459

else

6460

if test -n "$F77"; then

6461

ac_cv_prog_F77="$F77" # Let the user override the test.

6462

@@ -8902,7 +8662,7 @@ do

6463

for ac_exec_ext in '' $ac_executable_extensions; do

6464

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6465

ac_cv_prog_F77="$ac_tool_prefix$ac_prog"

6466

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6467

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6468

break 2

6469

fi

6470

done

6471

@@ -8913,11 +8673,11 @@ fi

6472

fi

6473

F77=$ac_cv_prog_F77

6474

if test -n "$F77"; then

6475

- { $as_echo "$as_me:$LINENO: result: $F77" >&5

6476

-$as_echo "$F77" >&6; }

6477

+ { echo "$as_me:$LINENO: result: $F77" >&5

6478

+echo "${ECHO_T}$F77" >&6; }

6479

else

6480

- { $as_echo "$as_me:$LINENO: result: no" >&5

6481

-$as_echo "no" >&6; }

6482

+ { echo "$as_me:$LINENO: result: no" >&5

6483

+echo "${ECHO_T}no" >&6; }

6484

fi

6485

6486

6487

@@ -8930,10 +8690,10 @@ if test -z "$F77"; then

6488

do

6489

# Extract the first word of "$ac_prog", so it can be a program name with args.

6490

set dummy $ac_prog; ac_word=$2

6491

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6492

-$as_echo_n "checking for $ac_word... " >&6; }

6493

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6494

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6495

if test "${ac_cv_prog_ac_ct_F77+set}" = set; then

6496

- $as_echo_n "(cached) " >&6

6497

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6498

else

6499

if test -n "$ac_ct_F77"; then

6500

ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.

6501

@@ -8946,7 +8706,7 @@ do

6502

for ac_exec_ext in '' $ac_executable_extensions; do

6503

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6504

ac_cv_prog_ac_ct_F77="$ac_prog"

6505

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6506

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6507

break 2

6508

fi

6509

done

6510

@@ -8957,11 +8717,11 @@ fi

6511

fi

6512

ac_ct_F77=$ac_cv_prog_ac_ct_F77

6513

if test -n "$ac_ct_F77"; then

6514

- { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5

6515

-$as_echo "$ac_ct_F77" >&6; }

6516

+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5

6517

+echo "${ECHO_T}$ac_ct_F77" >&6; }

6518

else

6519

- { $as_echo "$as_me:$LINENO: result: no" >&5

6520

-$as_echo "no" >&6; }

6521

+ { echo "$as_me:$LINENO: result: no" >&5

6522

+echo "${ECHO_T}no" >&6; }

6523

fi

6524

6525

6526

@@ -8973,8 +8733,12 @@ done

6527

else

6528

case $cross_compiling:$ac_tool_warned in

6529

yes:)

6530

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

6531

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6532

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6533

+whose name does not start with the host triplet. If you think this

6534

+configuration is useful to you, please write to autoconf@gnu.org." >&5

6535

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6536

+whose name does not start with the host triplet. If you think this

6537

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6538

ac_tool_warned=yes ;;

6539

esac

6540

F77=$ac_ct_F77

6541

@@ -8983,41 +8747,37 @@ fi

6542

6543

6544

# Provide some information about the compiler.

6545

-$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5

6546

-set X $ac_compile

6547

-ac_compiler=$2

6548

+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5

6549

+ac_compiler=`set X $ac_compile; echo $2`

6550

{ (ac_try="$ac_compiler --version >&5"

6551

case "(($ac_try" in

6552

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6553

*) ac_try_echo=$ac_try;;

6554

esac

6555

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6556

-$as_echo "$ac_try_echo") >&5

6557

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6558

(eval "$ac_compiler --version >&5") 2>&5

6559

ac_status=$?

6560

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6561

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6562

(exit $ac_status); }

6563

{ (ac_try="$ac_compiler -v >&5"

6564

case "(($ac_try" in

6565

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6566

*) ac_try_echo=$ac_try;;

6567

esac

6568

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6569

-$as_echo "$ac_try_echo") >&5

6570

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6571

(eval "$ac_compiler -v >&5") 2>&5

6572

ac_status=$?

6573

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6574

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6575

(exit $ac_status); }

6576

{ (ac_try="$ac_compiler -V >&5"

6577

case "(($ac_try" in

6578

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6579

*) ac_try_echo=$ac_try;;

6580

esac

6581

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6582

-$as_echo "$ac_try_echo") >&5

6583

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6584

(eval "$ac_compiler -V >&5") 2>&5

6585

ac_status=$?

6586

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6587

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6588

(exit $ac_status); }

6589

rm -f a.out

6590

6591

@@ -9025,10 +8785,10 @@ rm -f a.out

6592

# input file. (Note that this only needs to work for GNU compilers.)

6593

ac_save_ext=$ac_ext

6594

ac_ext=F

6595

-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5

6596

-$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }

6597

+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5

6598

+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }

6599

if test "${ac_cv_f77_compiler_gnu+set}" = set; then

6600

- $as_echo_n "(cached) " >&6

6601

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6602

else

6603

cat >conftest.$ac_ext <<_ACEOF

6604

program main

6605

@@ -9044,21 +8804,20 @@ case "(($ac_try" in

6606

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6607

*) ac_try_echo=$ac_try;;

6608

esac

6609

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6610

-$as_echo "$ac_try_echo") >&5

6611

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6612

(eval "$ac_compile") 2>conftest.er1

6613

ac_status=$?

6614

grep -v '^ *+' conftest.er1 >conftest.err

6615

rm -f conftest.er1

6616

cat conftest.err >&5

6617

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6618

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6619

(exit $ac_status); } && {

6620

test -z "$ac_f77_werror_flag" ||

6621

test ! -s conftest.err

6622

} && test -s conftest.$ac_objext; then

6623

ac_compiler_gnu=yes

6624

else

6625

- $as_echo "$as_me: failed program was:" >&5

6626

+ echo "$as_me: failed program was:" >&5

6627

sed 's/^/| /' conftest.$ac_ext >&5

6628

6629

ac_compiler_gnu=no

6630

@@ -9068,16 +8827,16 @@ rm -f core conftest.err conftest.$ac_obj

6631

ac_cv_f77_compiler_gnu=$ac_compiler_gnu

6632

6633

fi

6634

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5

6635

-$as_echo "$ac_cv_f77_compiler_gnu" >&6; }

6636

+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5

6637

+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }

6638

ac_ext=$ac_save_ext

6639

ac_test_FFLAGS=${FFLAGS+set}

6640

ac_save_FFLAGS=$FFLAGS

6641

FFLAGS=

6642

-{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5

6643

-$as_echo_n "checking whether $F77 accepts -g... " >&6; }

6644

+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5

6645

+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }

6646

if test "${ac_cv_prog_f77_g+set}" = set; then

6647

- $as_echo_n "(cached) " >&6

6648

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6649

else

6650

FFLAGS=-g

6651

cat >conftest.$ac_ext <<_ACEOF

6652

@@ -9091,21 +8850,20 @@ case "(($ac_try" in

6653

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

6654

*) ac_try_echo=$ac_try;;

6655

esac

6656

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

6657

-$as_echo "$ac_try_echo") >&5

6658

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

6659

(eval "$ac_compile") 2>conftest.er1

6660

ac_status=$?

6661

grep -v '^ *+' conftest.er1 >conftest.err

6662

rm -f conftest.er1

6663

cat conftest.err >&5

6664

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6665

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6666

(exit $ac_status); } && {

6667

test -z "$ac_f77_werror_flag" ||

6668

test ! -s conftest.err

6669

} && test -s conftest.$ac_objext; then

6670

ac_cv_prog_f77_g=yes

6671

else

6672

- $as_echo "$as_me: failed program was:" >&5

6673

+ echo "$as_me: failed program was:" >&5

6674

sed 's/^/| /' conftest.$ac_ext >&5

6675

6676

ac_cv_prog_f77_g=no

6677

@@ -9114,8 +8872,8 @@ fi

6678

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

6679

6680

fi

6681

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5

6682

-$as_echo "$ac_cv_prog_f77_g" >&6; }

6683

+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5

6684

+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }

6685

if test "$ac_test_FFLAGS" = set; then

6686

FFLAGS=$ac_save_FFLAGS

6687

elif test $ac_cv_prog_f77_g = yes; then

6688

@@ -9132,11 +8890,7 @@ else

6689

fi

6690

fi

6691

6692

-if test $ac_compiler_gnu = yes; then

6693

- G77=yes

6694

-else

6695

- G77=

6696

-fi

6697

+G77=`test $ac_compiler_gnu = yes && echo yes`

6698

ac_ext=c

6699

ac_cpp='$CPP $CPPFLAGS'

6700

ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

6701

@@ -9147,10 +8901,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

6702

6703

# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!

6704

# find the maximum length of command line arguments

6705

-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5

6706

-$as_echo_n "checking the maximum length of command line arguments... " >&6; }

6707

+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5

6708

+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }

6709

if test "${lt_cv_sys_max_cmd_len+set}" = set; then

6710

- $as_echo_n "(cached) " >&6

6711

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6712

else

6713

i=0

6714

teststring="ABCD"

6715

@@ -9259,11 +9013,11 @@ else

6716

fi

6717

6718

if test -n $lt_cv_sys_max_cmd_len ; then

6719

- { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5

6720

-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }

6721

+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5

6722

+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }

6723

else

6724

- { $as_echo "$as_me:$LINENO: result: none" >&5

6725

-$as_echo "none" >&6; }

6726

+ { echo "$as_me:$LINENO: result: none" >&5

6727

+echo "${ECHO_T}none" >&6; }

6728

fi

6729

6730

6731

@@ -9271,10 +9025,10 @@ fi

6732

6733

6734

# Check for command to grab the raw symbol name followed by C symbol from nm.

6735

-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

6736

-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }

6737

+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5

6738

+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }

6739

if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then

6740

- $as_echo_n "(cached) " >&6

6741

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6742

else

6743

6744

# These are sane defaults that work on at least a few old systems.

6745

@@ -9379,14 +9133,14 @@ EOF

6746

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

6747

(eval $ac_compile) 2>&5

6748

ac_status=$?

6749

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6750

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6751

(exit $ac_status); }; then

6752

# Now try to grab the symbols.

6753

nlist=conftest.nm

6754

if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5

6755

(eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5

6756

ac_status=$?

6757

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6758

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6759

(exit $ac_status); } && test -s "$nlist"; then

6760

# Try sorting and uniquifying the output.

6761

if sort "$nlist" | uniq > "$nlist"T; then

6762

@@ -9441,7 +9195,7 @@ EOF

6763

if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

6764

(eval $ac_link) 2>&5

6765

ac_status=$?

6766

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

6767

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

6768

(exit $ac_status); } && test -s conftest${ac_exeext}; then

6769

pipe_works=yes

6770

fi

6771

@@ -9476,17 +9230,17 @@ if test -z "$lt_cv_sys_global_symbol_pip

6772

lt_cv_sys_global_symbol_to_cdecl=

6773

fi

6774

if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then

6775

- { $as_echo "$as_me:$LINENO: result: failed" >&5

6776

-$as_echo "failed" >&6; }

6777

+ { echo "$as_me:$LINENO: result: failed" >&5

6778

+echo "${ECHO_T}failed" >&6; }

6779

else

6780

- { $as_echo "$as_me:$LINENO: result: ok" >&5

6781

-$as_echo "ok" >&6; }

6782

+ { echo "$as_me:$LINENO: result: ok" >&5

6783

+echo "${ECHO_T}ok" >&6; }

6784

fi

6785

6786

-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5

6787

-$as_echo_n "checking for objdir... " >&6; }

6788

+{ echo "$as_me:$LINENO: checking for objdir" >&5

6789

+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }

6790

if test "${lt_cv_objdir+set}" = set; then

6791

- $as_echo_n "(cached) " >&6

6792

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6793

else

6794

rm -f .libs 2>/dev/null

6795

mkdir .libs 2>/dev/null

6796

@@ -9498,8 +9252,8 @@ else

6797

fi

6798

rmdir .libs 2>/dev/null

6799

fi

6800

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5

6801

-$as_echo "$lt_cv_objdir" >&6; }

6802

+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5

6803

+echo "${ECHO_T}$lt_cv_objdir" >&6; }

6804

objdir=$lt_cv_objdir

6805

6806

6807

@@ -9550,10 +9304,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"

6808

if test -n "$ac_tool_prefix"; then

6809

# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.

6810

set dummy ${ac_tool_prefix}ar; ac_word=$2

6811

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6812

-$as_echo_n "checking for $ac_word... " >&6; }

6813

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6814

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6815

if test "${ac_cv_prog_AR+set}" = set; then

6816

- $as_echo_n "(cached) " >&6

6817

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6818

else

6819

if test -n "$AR"; then

6820

ac_cv_prog_AR="$AR" # Let the user override the test.

6821

@@ -9566,7 +9320,7 @@ do

6822

for ac_exec_ext in '' $ac_executable_extensions; do

6823

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6824

ac_cv_prog_AR="${ac_tool_prefix}ar"

6825

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6826

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6827

break 2

6828

fi

6829

done

6830

@@ -9577,11 +9331,11 @@ fi

6831

fi

6832

AR=$ac_cv_prog_AR

6833

if test -n "$AR"; then

6834

- { $as_echo "$as_me:$LINENO: result: $AR" >&5

6835

-$as_echo "$AR" >&6; }

6836

+ { echo "$as_me:$LINENO: result: $AR" >&5

6837

+echo "${ECHO_T}$AR" >&6; }

6838

else

6839

- { $as_echo "$as_me:$LINENO: result: no" >&5

6840

-$as_echo "no" >&6; }

6841

+ { echo "$as_me:$LINENO: result: no" >&5

6842

+echo "${ECHO_T}no" >&6; }

6843

fi

6844

6845

6846

@@ -9590,10 +9344,10 @@ if test -z "$ac_cv_prog_AR"; then

6847

ac_ct_AR=$AR

6848

# Extract the first word of "ar", so it can be a program name with args.

6849

set dummy ar; ac_word=$2

6850

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6851

-$as_echo_n "checking for $ac_word... " >&6; }

6852

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6853

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6854

if test "${ac_cv_prog_ac_ct_AR+set}" = set; then

6855

- $as_echo_n "(cached) " >&6

6856

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6857

else

6858

if test -n "$ac_ct_AR"; then

6859

ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.

6860

@@ -9606,7 +9360,7 @@ do

6861

for ac_exec_ext in '' $ac_executable_extensions; do

6862

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6863

ac_cv_prog_ac_ct_AR="ar"

6864

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6865

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6866

break 2

6867

fi

6868

done

6869

@@ -9617,11 +9371,11 @@ fi

6870

fi

6871

ac_ct_AR=$ac_cv_prog_ac_ct_AR

6872

if test -n "$ac_ct_AR"; then

6873

- { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5

6874

-$as_echo "$ac_ct_AR" >&6; }

6875

+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5

6876

+echo "${ECHO_T}$ac_ct_AR" >&6; }

6877

else

6878

- { $as_echo "$as_me:$LINENO: result: no" >&5

6879

-$as_echo "no" >&6; }

6880

+ { echo "$as_me:$LINENO: result: no" >&5

6881

+echo "${ECHO_T}no" >&6; }

6882

fi

6883

6884

if test "x$ac_ct_AR" = x; then

6885

@@ -9629,8 +9383,12 @@ fi

6886

else

6887

case $cross_compiling:$ac_tool_warned in

6888

yes:)

6889

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

6890

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6891

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6892

+whose name does not start with the host triplet. If you think this

6893

+configuration is useful to you, please write to autoconf@gnu.org." >&5

6894

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6895

+whose name does not start with the host triplet. If you think this

6896

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6897

ac_tool_warned=yes ;;

6898

esac

6899

AR=$ac_ct_AR

6900

@@ -9642,10 +9400,10 @@ fi

6901

if test -n "$ac_tool_prefix"; then

6902

# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.

6903

set dummy ${ac_tool_prefix}ranlib; ac_word=$2

6904

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6905

-$as_echo_n "checking for $ac_word... " >&6; }

6906

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6907

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6908

if test "${ac_cv_prog_RANLIB+set}" = set; then

6909

- $as_echo_n "(cached) " >&6

6910

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6911

else

6912

if test -n "$RANLIB"; then

6913

ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.

6914

@@ -9658,7 +9416,7 @@ do

6915

for ac_exec_ext in '' $ac_executable_extensions; do

6916

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6917

ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

6918

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6919

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6920

break 2

6921

fi

6922

done

6923

@@ -9669,11 +9427,11 @@ fi

6924

fi

6925

RANLIB=$ac_cv_prog_RANLIB

6926

if test -n "$RANLIB"; then

6927

- { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5

6928

-$as_echo "$RANLIB" >&6; }

6929

+ { echo "$as_me:$LINENO: result: $RANLIB" >&5

6930

+echo "${ECHO_T}$RANLIB" >&6; }

6931

else

6932

- { $as_echo "$as_me:$LINENO: result: no" >&5

6933

-$as_echo "no" >&6; }

6934

+ { echo "$as_me:$LINENO: result: no" >&5

6935

+echo "${ECHO_T}no" >&6; }

6936

fi

6937

6938

6939

@@ -9682,10 +9440,10 @@ if test -z "$ac_cv_prog_RANLIB"; then

6940

ac_ct_RANLIB=$RANLIB

6941

# Extract the first word of "ranlib", so it can be a program name with args.

6942

set dummy ranlib; ac_word=$2

6943

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6944

-$as_echo_n "checking for $ac_word... " >&6; }

6945

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

6946

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

6947

if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then

6948

- $as_echo_n "(cached) " >&6

6949

+ echo $ECHO_N "(cached) $ECHO_C" >&6

6950

else

6951

if test -n "$ac_ct_RANLIB"; then

6952

ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.

6953

@@ -9698,7 +9456,7 @@ do

6954

for ac_exec_ext in '' $ac_executable_extensions; do

6955

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

6956

ac_cv_prog_ac_ct_RANLIB="ranlib"

6957

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6958

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

6959

break 2

6960

fi

6961

done

6962

@@ -9709,11 +9467,11 @@ fi

6963

fi

6964

ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB

6965

if test -n "$ac_ct_RANLIB"; then

6966

- { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5

6967

-$as_echo "$ac_ct_RANLIB" >&6; }

6968

+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5

6969

+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }

6970

else

6971

- { $as_echo "$as_me:$LINENO: result: no" >&5

6972

-$as_echo "no" >&6; }

6973

+ { echo "$as_me:$LINENO: result: no" >&5

6974

+echo "${ECHO_T}no" >&6; }

6975

fi

6976

6977

if test "x$ac_ct_RANLIB" = x; then

6978

@@ -9721,8 +9479,12 @@ fi

6979

else

6980

case $cross_compiling:$ac_tool_warned in

6981

yes:)

6982

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

6983

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

6984

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

6985

+whose name does not start with the host triplet. If you think this

6986

+configuration is useful to you, please write to autoconf@gnu.org." >&5

6987

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

6988

+whose name does not start with the host triplet. If you think this

6989

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

6990

ac_tool_warned=yes ;;

6991

esac

6992

RANLIB=$ac_ct_RANLIB

6993

@@ -9734,10 +9496,10 @@ fi

6994

if test -n "$ac_tool_prefix"; then

6995

# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

6996

set dummy ${ac_tool_prefix}strip; ac_word=$2

6997

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

6998

-$as_echo_n "checking for $ac_word... " >&6; }

6999

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

7000

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

7001

if test "${ac_cv_prog_STRIP+set}" = set; then

7002

- $as_echo_n "(cached) " >&6

7003

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7004

else

7005

if test -n "$STRIP"; then

7006

ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

7007

@@ -9750,7 +9512,7 @@ do

7008

for ac_exec_ext in '' $ac_executable_extensions; do

7009

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

7010

ac_cv_prog_STRIP="${ac_tool_prefix}strip"

7011

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7012

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7013

break 2

7014

fi

7015

done

7016

@@ -9761,11 +9523,11 @@ fi

7017

fi

7018

STRIP=$ac_cv_prog_STRIP

7019

if test -n "$STRIP"; then

7020

- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5

7021

-$as_echo "$STRIP" >&6; }

7022

+ { echo "$as_me:$LINENO: result: $STRIP" >&5

7023

+echo "${ECHO_T}$STRIP" >&6; }

7024

else

7025

- { $as_echo "$as_me:$LINENO: result: no" >&5

7026

-$as_echo "no" >&6; }

7027

+ { echo "$as_me:$LINENO: result: no" >&5

7028

+echo "${ECHO_T}no" >&6; }

7029

fi

7030

7031

7032

@@ -9774,10 +9536,10 @@ if test -z "$ac_cv_prog_STRIP"; then

7033

ac_ct_STRIP=$STRIP

7034

# Extract the first word of "strip", so it can be a program name with args.

7035

set dummy strip; ac_word=$2

7036

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

7037

-$as_echo_n "checking for $ac_word... " >&6; }

7038

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

7039

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

7040

if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then

7041

- $as_echo_n "(cached) " >&6

7042

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7043

else

7044

if test -n "$ac_ct_STRIP"; then

7045

ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

7046

@@ -9790,7 +9552,7 @@ do

7047

for ac_exec_ext in '' $ac_executable_extensions; do

7048

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

7049

ac_cv_prog_ac_ct_STRIP="strip"

7050

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7051

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7052

break 2

7053

fi

7054

done

7055

@@ -9801,11 +9563,11 @@ fi

7056

fi

7057

ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

7058

if test -n "$ac_ct_STRIP"; then

7059

- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

7060

-$as_echo "$ac_ct_STRIP" >&6; }

7061

+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5

7062

+echo "${ECHO_T}$ac_ct_STRIP" >&6; }

7063

else

7064

- { $as_echo "$as_me:$LINENO: result: no" >&5

7065

-$as_echo "no" >&6; }

7066

+ { echo "$as_me:$LINENO: result: no" >&5

7067

+echo "${ECHO_T}no" >&6; }

7068

fi

7069

7070

if test "x$ac_ct_STRIP" = x; then

7071

@@ -9813,8 +9575,12 @@ fi

7072

else

7073

case $cross_compiling:$ac_tool_warned in

7074

yes:)

7075

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

7076

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

7077

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

7078

+whose name does not start with the host triplet. If you think this

7079

+configuration is useful to you, please write to autoconf@gnu.org." >&5

7080

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

7081

+whose name does not start with the host triplet. If you think this

7082

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

7083

ac_tool_warned=yes ;;

7084

esac

7085

STRIP=$ac_ct_STRIP

7086

@@ -9877,10 +9643,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -

7087

case $deplibs_check_method in

7088

file_magic*)

7089

if test "$file_magic_cmd" = '$MAGIC_CMD'; then

7090

- { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5

7091

-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }

7092

+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5

7093

+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }

7094

if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

7095

- $as_echo_n "(cached) " >&6

7096

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7097

else

7098

case $MAGIC_CMD in

7099

[\\/*] | ?:[\\/]*)

7100

@@ -9930,19 +9696,19 @@ fi

7101

7102

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

7103

if test -n "$MAGIC_CMD"; then

7104

- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

7105

-$as_echo "$MAGIC_CMD" >&6; }

7106

+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

7107

+echo "${ECHO_T}$MAGIC_CMD" >&6; }

7108

else

7109

- { $as_echo "$as_me:$LINENO: result: no" >&5

7110

-$as_echo "no" >&6; }

7111

+ { echo "$as_me:$LINENO: result: no" >&5

7112

+echo "${ECHO_T}no" >&6; }

7113

fi

7114

7115

if test -z "$lt_cv_path_MAGIC_CMD"; then

7116

if test -n "$ac_tool_prefix"; then

7117

- { $as_echo "$as_me:$LINENO: checking for file" >&5

7118

-$as_echo_n "checking for file... " >&6; }

7119

+ { echo "$as_me:$LINENO: checking for file" >&5

7120

+echo $ECHO_N "checking for file... $ECHO_C" >&6; }

7121

if test "${lt_cv_path_MAGIC_CMD+set}" = set; then

7122

- $as_echo_n "(cached) " >&6

7123

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7124

else

7125

case $MAGIC_CMD in

7126

[\\/*] | ?:[\\/]*)

7127

@@ -9992,11 +9758,11 @@ fi

7128

7129

MAGIC_CMD="$lt_cv_path_MAGIC_CMD"

7130

if test -n "$MAGIC_CMD"; then

7131

- { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

7132

-$as_echo "$MAGIC_CMD" >&6; }

7133

+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5

7134

+echo "${ECHO_T}$MAGIC_CMD" >&6; }

7135

else

7136

- { $as_echo "$as_me:$LINENO: result: no" >&5

7137

-$as_echo "no" >&6; }

7138

+ { echo "$as_me:$LINENO: result: no" >&5

7139

+echo "${ECHO_T}no" >&6; }

7140

fi

7141

7142

else

7143

@@ -10014,10 +9780,10 @@ esac

7144

if test -n "$ac_tool_prefix"; then

7145

# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.

7146

set dummy ${ac_tool_prefix}dsymutil; ac_word=$2

7147

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

7148

-$as_echo_n "checking for $ac_word... " >&6; }

7149

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

7150

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

7151

if test "${ac_cv_prog_DSYMUTIL+set}" = set; then

7152

- $as_echo_n "(cached) " >&6

7153

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7154

else

7155

if test -n "$DSYMUTIL"; then

7156

ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.

7157

@@ -10030,7 +9796,7 @@ do

7158

for ac_exec_ext in '' $ac_executable_extensions; do

7159

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

7160

ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"

7161

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7162

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7163

break 2

7164

fi

7165

done

7166

@@ -10041,11 +9807,11 @@ fi

7167

fi

7168

DSYMUTIL=$ac_cv_prog_DSYMUTIL

7169

if test -n "$DSYMUTIL"; then

7170

- { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5

7171

-$as_echo "$DSYMUTIL" >&6; }

7172

+ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5

7173

+echo "${ECHO_T}$DSYMUTIL" >&6; }

7174

else

7175

- { $as_echo "$as_me:$LINENO: result: no" >&5

7176

-$as_echo "no" >&6; }

7177

+ { echo "$as_me:$LINENO: result: no" >&5

7178

+echo "${ECHO_T}no" >&6; }

7179

fi

7180

7181

7182

@@ -10054,10 +9820,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then

7183

ac_ct_DSYMUTIL=$DSYMUTIL

7184

# Extract the first word of "dsymutil", so it can be a program name with args.

7185

set dummy dsymutil; ac_word=$2

7186

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

7187

-$as_echo_n "checking for $ac_word... " >&6; }

7188

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

7189

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

7190

if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then

7191

- $as_echo_n "(cached) " >&6

7192

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7193

else

7194

if test -n "$ac_ct_DSYMUTIL"; then

7195

ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.

7196

@@ -10070,7 +9836,7 @@ do

7197

for ac_exec_ext in '' $ac_executable_extensions; do

7198

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

7199

ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"

7200

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7201

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7202

break 2

7203

fi

7204

done

7205

@@ -10081,11 +9847,11 @@ fi

7206

fi

7207

ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL

7208

if test -n "$ac_ct_DSYMUTIL"; then

7209

- { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5

7210

-$as_echo "$ac_ct_DSYMUTIL" >&6; }

7211

+ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5

7212

+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }

7213

else

7214

- { $as_echo "$as_me:$LINENO: result: no" >&5

7215

-$as_echo "no" >&6; }

7216

+ { echo "$as_me:$LINENO: result: no" >&5

7217

+echo "${ECHO_T}no" >&6; }

7218

fi

7219

7220

if test "x$ac_ct_DSYMUTIL" = x; then

7221

@@ -10093,8 +9859,12 @@ fi

7222

else

7223

case $cross_compiling:$ac_tool_warned in

7224

yes:)

7225

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

7226

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

7227

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

7228

+whose name does not start with the host triplet. If you think this

7229

+configuration is useful to you, please write to autoconf@gnu.org." >&5

7230

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

7231

+whose name does not start with the host triplet. If you think this

7232

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

7233

ac_tool_warned=yes ;;

7234

esac

7235

DSYMUTIL=$ac_ct_DSYMUTIL

7236

@@ -10106,10 +9876,10 @@ fi

7237

if test -n "$ac_tool_prefix"; then

7238

# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.

7239

set dummy ${ac_tool_prefix}nmedit; ac_word=$2

7240

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

7241

-$as_echo_n "checking for $ac_word... " >&6; }

7242

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

7243

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

7244

if test "${ac_cv_prog_NMEDIT+set}" = set; then

7245

- $as_echo_n "(cached) " >&6

7246

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7247

else

7248

if test -n "$NMEDIT"; then

7249

ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.

7250

@@ -10122,7 +9892,7 @@ do

7251

for ac_exec_ext in '' $ac_executable_extensions; do

7252

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

7253

ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"

7254

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7255

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7256

break 2

7257

fi

7258

done

7259

@@ -10133,11 +9903,11 @@ fi

7260

fi

7261

NMEDIT=$ac_cv_prog_NMEDIT

7262

if test -n "$NMEDIT"; then

7263

- { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5

7264

-$as_echo "$NMEDIT" >&6; }

7265

+ { echo "$as_me:$LINENO: result: $NMEDIT" >&5

7266

+echo "${ECHO_T}$NMEDIT" >&6; }

7267

else

7268

- { $as_echo "$as_me:$LINENO: result: no" >&5

7269

-$as_echo "no" >&6; }

7270

+ { echo "$as_me:$LINENO: result: no" >&5

7271

+echo "${ECHO_T}no" >&6; }

7272

fi

7273

7274

7275

@@ -10146,10 +9916,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then

7276

ac_ct_NMEDIT=$NMEDIT

7277

# Extract the first word of "nmedit", so it can be a program name with args.

7278

set dummy nmedit; ac_word=$2

7279

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

7280

-$as_echo_n "checking for $ac_word... " >&6; }

7281

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

7282

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

7283

if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then

7284

- $as_echo_n "(cached) " >&6

7285

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7286

else

7287

if test -n "$ac_ct_NMEDIT"; then

7288

ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.

7289

@@ -10162,7 +9932,7 @@ do

7290

for ac_exec_ext in '' $ac_executable_extensions; do

7291

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

7292

ac_cv_prog_ac_ct_NMEDIT="nmedit"

7293

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7294

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

7295

break 2

7296

fi

7297

done

7298

@@ -10173,11 +9943,11 @@ fi

7299

fi

7300

ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT

7301

if test -n "$ac_ct_NMEDIT"; then

7302

- { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5

7303

-$as_echo "$ac_ct_NMEDIT" >&6; }

7304

+ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5

7305

+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }

7306

else

7307

- { $as_echo "$as_me:$LINENO: result: no" >&5

7308

-$as_echo "no" >&6; }

7309

+ { echo "$as_me:$LINENO: result: no" >&5

7310

+echo "${ECHO_T}no" >&6; }

7311

fi

7312

7313

if test "x$ac_ct_NMEDIT" = x; then

7314

@@ -10185,8 +9955,12 @@ fi

7315

else

7316

case $cross_compiling:$ac_tool_warned in

7317

yes:)

7318

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

7319

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

7320

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

7321

+whose name does not start with the host triplet. If you think this

7322

+configuration is useful to you, please write to autoconf@gnu.org." >&5

7323

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

7324

+whose name does not start with the host triplet. If you think this

7325

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

7326

ac_tool_warned=yes ;;

7327

esac

7328

NMEDIT=$ac_ct_NMEDIT

7329

@@ -10196,10 +9970,10 @@ else

7330

fi

7331

7332

7333

- { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5

7334

-$as_echo_n "checking for -single_module linker flag... " >&6; }

7335

+ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5

7336

+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }

7337

if test "${lt_cv_apple_cc_single_mod+set}" = set; then

7338

- $as_echo_n "(cached) " >&6

7339

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7340

else

7341

lt_cv_apple_cc_single_mod=no

7342

if test -z "${LT_MULTI_MODULE}"; then

7343

@@ -10217,12 +9991,12 @@ else

7344

rm conftest.c

7345

fi

7346

fi

7347

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5

7348

-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }

7349

- { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5

7350

-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }

7351

+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5

7352

+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }

7353

+ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5

7354

+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }

7355

if test "${lt_cv_ld_exported_symbols_list+set}" = set; then

7356

- $as_echo_n "(cached) " >&6

7357

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7358

else

7359

lt_cv_ld_exported_symbols_list=no

7360

save_LDFLAGS=$LDFLAGS

7361

@@ -10249,37 +10023,33 @@ case "(($ac_try" in

7362

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7363

*) ac_try_echo=$ac_try;;

7364

esac

7365

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7366

-$as_echo "$ac_try_echo") >&5

7367

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7368

(eval "$ac_link") 2>conftest.er1

7369

ac_status=$?

7370

grep -v '^ *+' conftest.er1 >conftest.err

7371

rm -f conftest.er1

7372

cat conftest.err >&5

7373

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7374

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

7375

(exit $ac_status); } && {

7376

test -z "$ac_c_werror_flag" ||

7377

test ! -s conftest.err

7378

- } && test -s conftest$ac_exeext && {

7379

- test "$cross_compiling" = yes ||

7380

- $as_test_x conftest$ac_exeext

7381

- }; then

7382

+ } && test -s conftest$ac_exeext &&

7383

+ $as_test_x conftest$ac_exeext; then

7384

lt_cv_ld_exported_symbols_list=yes

7385

else

7386

- $as_echo "$as_me: failed program was:" >&5

7387

+ echo "$as_me: failed program was:" >&5

7388

sed 's/^/| /' conftest.$ac_ext >&5

7389

7390

lt_cv_ld_exported_symbols_list=no

7391

fi

7392

7393

-rm -rf conftest.dSYM

7394

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7395

conftest$ac_exeext conftest.$ac_ext

7396

LDFLAGS="$save_LDFLAGS"

7397

7398

fi

7399

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5

7400

-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }

7401

+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5

7402

+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }

7403

case $host_os in

7404

rhapsody* | darwin1.[0123])

7405

_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

7406

@@ -10391,10 +10161,10 @@ if test "$GCC" = yes; then

7407

lt_prog_compiler_no_builtin_flag=' -fno-builtin'

7408

7409

7410

-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

7411

-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }

7412

+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

7413

+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }

7414

if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then

7415

- $as_echo_n "(cached) " >&6

7416

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7417

else

7418

lt_cv_prog_compiler_rtti_exceptions=no

7419

ac_outfile=conftest.$ac_objext

7420

@@ -10409,11 +10179,11 @@ else

7421

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

7422

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

7423

-e 's:$: $lt_compiler_flag:'`

7424

- (eval echo "\"\$as_me:10412: $lt_compile\"" >&5)

7425

+ (eval echo "\"\$as_me:10182: $lt_compile\"" >&5)

7426

(eval "$lt_compile" 2>conftest.err)

7427

ac_status=$?

7428

cat conftest.err >&5

7429

- echo "$as_me:10416: \$? = $ac_status" >&5

7430

+ echo "$as_me:10186: \$? = $ac_status" >&5

7431

if (exit $ac_status) && test -s "$ac_outfile"; then

7432

# The compiler can only warn and ignore the option if not recognized

7433

# So say no if there are warnings other than the usual output.

7434

@@ -10426,8 +10196,8 @@ else

7435

$rm conftest*

7436

7437

fi

7438

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

7439

-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }

7440

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

7441

+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }

7442

7443

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

7444

lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"

7445

@@ -10441,8 +10211,8 @@ lt_prog_compiler_wl=

7446

lt_prog_compiler_pic=

7447

lt_prog_compiler_static=

7448

7449

-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

7450

-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

7451

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

7452

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

7453

7454

if test "$GCC" = yes; then

7455

lt_prog_compiler_wl='-Wl,'

7456

@@ -10673,18 +10443,18 @@ $as_echo_n "checking for $compiler optio

7457

esac

7458

fi

7459

7460

-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5

7461

-$as_echo "$lt_prog_compiler_pic" >&6; }

7462

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5

7463

+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }

7464

7465

#

7466

# Check to make sure the PIC flag actually works.

7467

#

7468

if test -n "$lt_prog_compiler_pic"; then

7469

7470

-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

7471

-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }

7472

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5

7473

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }

7474

if test "${lt_cv_prog_compiler_pic_works+set}" = set; then

7475

- $as_echo_n "(cached) " >&6

7476

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7477

else

7478

lt_cv_prog_compiler_pic_works=no

7479

ac_outfile=conftest.$ac_objext

7480

@@ -10699,11 +10469,11 @@ else

7481

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

7482

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

7483

-e 's:$: $lt_compiler_flag:'`

7484

- (eval echo "\"\$as_me:10702: $lt_compile\"" >&5)

7485

+ (eval echo "\"\$as_me:10472: $lt_compile\"" >&5)

7486

(eval "$lt_compile" 2>conftest.err)

7487

ac_status=$?

7488

cat conftest.err >&5

7489

- echo "$as_me:10706: \$? = $ac_status" >&5

7490

+ echo "$as_me:10476: \$? = $ac_status" >&5

7491

if (exit $ac_status) && test -s "$ac_outfile"; then

7492

# The compiler can only warn and ignore the option if not recognized

7493

# So say no if there are warnings other than the usual output.

7494

@@ -10716,8 +10486,8 @@ else

7495

$rm conftest*

7496

7497

fi

7498

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5

7499

-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }

7500

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5

7501

+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }

7502

7503

if test x"$lt_cv_prog_compiler_pic_works" = xyes; then

7504

case $lt_prog_compiler_pic in

7505

@@ -10744,10 +10514,10 @@ esac

7506

# Check to make sure the static flag actually works.

7507

#

7508

wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"

7509

-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

7510

-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

7511

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

7512

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

7513

if test "${lt_cv_prog_compiler_static_works+set}" = set; then

7514

- $as_echo_n "(cached) " >&6

7515

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7516

else

7517

lt_cv_prog_compiler_static_works=no

7518

save_LDFLAGS="$LDFLAGS"

7519

@@ -10772,8 +10542,8 @@ else

7520

LDFLAGS="$save_LDFLAGS"

7521

7522

fi

7523

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5

7524

-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }

7525

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5

7526

+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }

7527

7528

if test x"$lt_cv_prog_compiler_static_works" = xyes; then

7529

:

7530

@@ -10782,10 +10552,10 @@ else

7531

fi

7532

7533

7534

-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

7535

-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

7536

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

7537

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

7538

if test "${lt_cv_prog_compiler_c_o+set}" = set; then

7539

- $as_echo_n "(cached) " >&6

7540

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7541

else

7542

lt_cv_prog_compiler_c_o=no

7543

$rm -r conftest 2>/dev/null

7544

@@ -10803,11 +10573,11 @@ else

7545

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

7546

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

7547

-e 's:$: $lt_compiler_flag:'`

7548

- (eval echo "\"\$as_me:10806: $lt_compile\"" >&5)

7549

+ (eval echo "\"\$as_me:10576: $lt_compile\"" >&5)

7550

(eval "$lt_compile" 2>out/conftest.err)

7551

ac_status=$?

7552

cat out/conftest.err >&5

7553

- echo "$as_me:10810: \$? = $ac_status" >&5

7554

+ echo "$as_me:10580: \$? = $ac_status" >&5

7555

if (exit $ac_status) && test -s out/conftest2.$ac_objext

7556

then

7557

# The compiler can only warn and ignore the option if not recognized

7558

@@ -10829,34 +10599,34 @@ else

7559

$rm conftest*

7560

7561

fi

7562

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

7563

-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }

7564

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5

7565

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }

7566

7567

7568

hard_links="nottested"

7569

if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then

7570

# do not overwrite the value of need_locks provided by the user

7571

- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

7572

-$as_echo_n "checking if we can lock with hard links... " >&6; }

7573

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

7574

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

7575

hard_links=yes

7576

$rm conftest*

7577

ln conftest.a conftest.b 2>/dev/null && hard_links=no

7578

touch conftest.a

7579

ln conftest.a conftest.b 2>&5 || hard_links=no

7580

ln conftest.a conftest.b 2>/dev/null && hard_links=no

7581

- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5

7582

-$as_echo "$hard_links" >&6; }

7583

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

7584

+echo "${ECHO_T}$hard_links" >&6; }

7585

if test "$hard_links" = no; then

7586

- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

7587

-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

7588

+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

7589

+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

7590

need_locks=warn

7591

fi

7592

else

7593

need_locks=no

7594

fi

7595

7596

-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

7597

-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

7598

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

7599

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

7600

7601

runpath_var=

7602

allow_undefined_flag=

7603

@@ -11068,12 +10838,13 @@ EOF

7604

$echo "local: *; };" >> $output_objdir/$libname.ver~

7605

$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

7606

fi

7607

+ link_all_deplibs=no

7608

else

7609

ld_shlibs=no

7610

fi

7611

;;

7612

7613

- netbsd*)

7614

+ netbsd* | netbsdelf*-gnu)

7615

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

7616

archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

7617

wlarc=

7618

@@ -11286,21 +11057,18 @@ case "(($ac_try" in

7619

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7620

*) ac_try_echo=$ac_try;;

7621

esac

7622

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7623

-$as_echo "$ac_try_echo") >&5

7624

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7625

(eval "$ac_link") 2>conftest.er1

7626

ac_status=$?

7627

grep -v '^ *+' conftest.er1 >conftest.err

7628

rm -f conftest.er1

7629

cat conftest.err >&5

7630

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7631

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

7632

(exit $ac_status); } && {

7633

test -z "$ac_c_werror_flag" ||

7634

test ! -s conftest.err

7635

- } && test -s conftest$ac_exeext && {

7636

- test "$cross_compiling" = yes ||

7637

- $as_test_x conftest$ac_exeext

7638

- }; then

7639

+ } && test -s conftest$ac_exeext &&

7640

+ $as_test_x conftest$ac_exeext; then

7641

7642

lt_aix_libpath_sed='

7643

/Import File Strings/,/^$/ {

7644

@@ -11315,13 +11083,12 @@ if test -z "$aix_libpath"; then

7645

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

7646

fi

7647

else

7648

- $as_echo "$as_me: failed program was:" >&5

7649

+ echo "$as_me: failed program was:" >&5

7650

sed 's/^/| /' conftest.$ac_ext >&5

7651

7652

7653

fi

7654

7655

-rm -rf conftest.dSYM

7656

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7657

conftest$ac_exeext conftest.$ac_ext

7658

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

7659

@@ -11356,21 +11123,18 @@ case "(($ac_try" in

7660

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7661

*) ac_try_echo=$ac_try;;

7662

esac

7663

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7664

-$as_echo "$ac_try_echo") >&5

7665

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7666

(eval "$ac_link") 2>conftest.er1

7667

ac_status=$?

7668

grep -v '^ *+' conftest.er1 >conftest.err

7669

rm -f conftest.er1

7670

cat conftest.err >&5

7671

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7672

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

7673

(exit $ac_status); } && {

7674

test -z "$ac_c_werror_flag" ||

7675

test ! -s conftest.err

7676

- } && test -s conftest$ac_exeext && {

7677

- test "$cross_compiling" = yes ||

7678

- $as_test_x conftest$ac_exeext

7679

- }; then

7680

+ } && test -s conftest$ac_exeext &&

7681

+ $as_test_x conftest$ac_exeext; then

7682

7683

lt_aix_libpath_sed='

7684

/Import File Strings/,/^$/ {

7685

@@ -11385,13 +11149,12 @@ if test -z "$aix_libpath"; then

7686

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

7687

fi

7688

else

7689

- $as_echo "$as_me: failed program was:" >&5

7690

+ echo "$as_me: failed program was:" >&5

7691

sed 's/^/| /' conftest.$ac_ext >&5

7692

7693

7694

fi

7695

7696

-rm -rf conftest.dSYM

7697

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7698

conftest$ac_exeext conftest.$ac_ext

7699

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

7700

@@ -11624,7 +11387,7 @@ if test -z "$aix_libpath"; then aix_libp

7701

link_all_deplibs=yes

7702

;;

7703

7704

- netbsd*)

7705

+ netbsd* | netbsdelf*-gnu)

7706

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

7707

archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

7708

else

7709

@@ -11843,8 +11606,8 @@ if test -z "$aix_libpath"; then aix_libp

7710

esac

7711

fi

7712

7713

-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5

7714

-$as_echo "$ld_shlibs" >&6; }

7715

+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5

7716

+echo "${ECHO_T}$ld_shlibs" >&6; }

7717

test "$ld_shlibs" = no && can_build_shared=no

7718

7719

#

7720

@@ -11864,15 +11627,15 @@ x|xyes)

7721

# Test whether the compiler implicitly links with -lc since on some

7722

# systems, -lgcc has to come before -lc. If gcc already passes -lc

7723

# to ld, don't add -lc before -lgcc.

7724

- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

7725

-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

7726

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

7727

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

7728

$rm conftest*

7729

echo "$lt_simple_compile_test_code" > conftest.$ac_ext

7730

7731

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

7732

(eval $ac_compile) 2>&5

7733

ac_status=$?

7734

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7735

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

7736

(exit $ac_status); } 2>conftest.err; then

7737

soname=conftest

7738

lib=conftest

7739

@@ -11890,7 +11653,7 @@ $as_echo_n "checking whether -lc should

7740

if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5

7741

(eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5

7742

ac_status=$?

7743

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7744

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

7745

(exit $ac_status); }

7746

then

7747

archive_cmds_need_lc=no

7748

@@ -11902,16 +11665,16 @@ $as_echo_n "checking whether -lc should

7749

cat conftest.err 1>&5

7750

fi

7751

$rm conftest*

7752

- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5

7753

-$as_echo "$archive_cmds_need_lc" >&6; }

7754

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5

7755

+echo "${ECHO_T}$archive_cmds_need_lc" >&6; }

7756

;;

7757

esac

7758

fi

7759

;;

7760

esac

7761

7762

-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

7763

-$as_echo_n "checking dynamic linker characteristics... " >&6; }

7764

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

7765

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

7766

library_names_spec=

7767

libname_spec='lib$name'

7768

soname_spec=

7769

@@ -12319,13 +12082,11 @@ linux* | k*bsd*-gnu)

7770

# Some rework will be needed to allow for fast_install

7771

# before this can be enabled.

7772

hardcode_into_libs=yes

7773

- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"

7774

- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"

7775

7776

# Append ld.so.conf contents to the search path

7777

if test -f /etc/ld.so.conf; then

7778

lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

7779

- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"

7780

+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

7781

fi

7782

7783

# We used to test for /lib/ld.so.1 and disable shared libraries on

7784

@@ -12337,6 +12098,18 @@ linux* | k*bsd*-gnu)

7785

dynamic_linker='GNU/Linux ld.so'

7786

;;

7787

7788

+netbsdelf*-gnu)

7789

+ version_type=linux

7790

+ need_lib_prefix=no

7791

+ need_version=no

7792

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

7793

+ soname_spec='${libname}${release}${shared_ext}$major'

7794

+ shlibpath_var=LD_LIBRARY_PATH

7795

+ shlibpath_overrides_runpath=no

7796

+ hardcode_into_libs=yes

7797

+ dynamic_linker='NetBSD ld.elf_so'

7798

+ ;;

7799

+

7800

netbsd*)

7801

version_type=sunos

7802

need_lib_prefix=no

7803

@@ -12514,19 +12287,19 @@ uts4*)

7804

dynamic_linker=no

7805

;;

7806

esac

7807

-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5

7808

-$as_echo "$dynamic_linker" >&6; }

7809

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

7810

+echo "${ECHO_T}$dynamic_linker" >&6; }

7811

test "$dynamic_linker" = no && can_build_shared=no

7812

7813

if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then

7814

- $as_echo_n "(cached) " >&6

7815

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7816

else

7817

lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"

7818

fi

7819

7820

sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

7821

if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then

7822

- $as_echo_n "(cached) " >&6

7823

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7824

else

7825

lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"

7826

fi

7827

@@ -12538,8 +12311,8 @@ if test "$GCC" = yes; then

7828

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

7829

fi

7830

7831

-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

7832

-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

7833

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

7834

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

7835

hardcode_action=

7836

if test -n "$hardcode_libdir_flag_spec" || \

7837

test -n "$runpath_var" || \

7838

@@ -12563,8 +12336,8 @@ else

7839

# directories.

7840

hardcode_action=unsupported

7841

fi

7842

-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5

7843

-$as_echo "$hardcode_action" >&6; }

7844

+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5

7845

+echo "${ECHO_T}$hardcode_action" >&6; }

7846

7847

if test "$hardcode_action" = relink; then

7848

# Fast installation is not supported

7849

@@ -12577,13 +12350,13 @@ fi

7850

7851

striplib=

7852

old_striplib=

7853

-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5

7854

-$as_echo_n "checking whether stripping libraries is possible... " >&6; }

7855

+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5

7856

+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }

7857

if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then

7858

test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"

7859

test -z "$striplib" && striplib="$STRIP --strip-unneeded"

7860

- { $as_echo "$as_me:$LINENO: result: yes" >&5

7861

-$as_echo "yes" >&6; }

7862

+ { echo "$as_me:$LINENO: result: yes" >&5

7863

+echo "${ECHO_T}yes" >&6; }

7864

else

7865

# FIXME - insert some real tests, host_os isn't really good enough

7866

case $host_os in

7867

@@ -12591,16 +12364,16 @@ else

7868

if test -n "$STRIP" ; then

7869

striplib="$STRIP -x"

7870

old_striplib="$STRIP -S"

7871

- { $as_echo "$as_me:$LINENO: result: yes" >&5

7872

-$as_echo "yes" >&6; }

7873

+ { echo "$as_me:$LINENO: result: yes" >&5

7874

+echo "${ECHO_T}yes" >&6; }

7875

else

7876

- { $as_echo "$as_me:$LINENO: result: no" >&5

7877

-$as_echo "no" >&6; }

7878

+ { echo "$as_me:$LINENO: result: no" >&5

7879

+echo "${ECHO_T}no" >&6; }

7880

fi

7881

;;

7882

*)

7883

- { $as_echo "$as_me:$LINENO: result: no" >&5

7884

-$as_echo "no" >&6; }

7885

+ { echo "$as_me:$LINENO: result: no" >&5

7886

+echo "${ECHO_T}no" >&6; }

7887

;;

7888

esac

7889

fi

7890

@@ -12632,10 +12405,10 @@ else

7891

7892

darwin*)

7893

# if libdl is installed we need to link against it

7894

- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

7895

-$as_echo_n "checking for dlopen in -ldl... " >&6; }

7896

+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

7897

+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

7898

if test "${ac_cv_lib_dl_dlopen+set}" = set; then

7899

- $as_echo_n "(cached) " >&6

7900

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7901

else

7902

ac_check_lib_save_LIBS=$LIBS

7903

LIBS="-ldl $LIBS"

7904

@@ -12667,37 +12440,33 @@ case "(($ac_try" in

7905

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7906

*) ac_try_echo=$ac_try;;

7907

esac

7908

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7909

-$as_echo "$ac_try_echo") >&5

7910

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7911

(eval "$ac_link") 2>conftest.er1

7912

ac_status=$?

7913

grep -v '^ *+' conftest.er1 >conftest.err

7914

rm -f conftest.er1

7915

cat conftest.err >&5

7916

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

7917

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

7918

(exit $ac_status); } && {

7919

test -z "$ac_c_werror_flag" ||

7920

test ! -s conftest.err

7921

- } && test -s conftest$ac_exeext && {

7922

- test "$cross_compiling" = yes ||

7923

- $as_test_x conftest$ac_exeext

7924

- }; then

7925

+ } && test -s conftest$ac_exeext &&

7926

+ $as_test_x conftest$ac_exeext; then

7927

ac_cv_lib_dl_dlopen=yes

7928

else

7929

- $as_echo "$as_me: failed program was:" >&5

7930

+ echo "$as_me: failed program was:" >&5

7931

sed 's/^/| /' conftest.$ac_ext >&5

7932

7933

ac_cv_lib_dl_dlopen=no

7934

fi

7935

7936

-rm -rf conftest.dSYM

7937

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7938

conftest$ac_exeext conftest.$ac_ext

7939

LIBS=$ac_check_lib_save_LIBS

7940

fi

7941

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

7942

-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

7943

-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then

7944

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

7945

+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

7946

+if test $ac_cv_lib_dl_dlopen = yes; then

7947

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

7948

else

7949

7950

@@ -12710,10 +12479,10 @@ fi

7951

;;

7952

7953

*)

7954

- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5

7955

-$as_echo_n "checking for shl_load... " >&6; }

7956

+ { echo "$as_me:$LINENO: checking for shl_load" >&5

7957

+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }

7958

if test "${ac_cv_func_shl_load+set}" = set; then

7959

- $as_echo_n "(cached) " >&6

7960

+ echo $ECHO_N "(cached) $ECHO_C" >&6

7961

else

7962

cat >conftest.$ac_ext <<_ACEOF

7963

/* confdefs.h. */

7964

@@ -12766,42 +12535,38 @@ case "(($ac_try" in

7965

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

7966

*) ac_try_echo=$ac_try;;

7967

esac

7968

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

7969

-$as_echo "$ac_try_echo") >&5

7970

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

7971

(eval "$ac_link") 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

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

7978

(exit $ac_status); } && {

7979

test -z "$ac_c_werror_flag" ||

7980

test ! -s conftest.err

7981

- } && test -s conftest$ac_exeext && {

7982

- test "$cross_compiling" = yes ||

7983

- $as_test_x conftest$ac_exeext

7984

- }; then

7985

+ } && test -s conftest$ac_exeext &&

7986

+ $as_test_x conftest$ac_exeext; then

7987

ac_cv_func_shl_load=yes

7988

else

7989

- $as_echo "$as_me: failed program was:" >&5

7990

+ echo "$as_me: failed program was:" >&5

7991

sed 's/^/| /' conftest.$ac_ext >&5

7992

7993

ac_cv_func_shl_load=no

7994

fi

7995

7996

-rm -rf conftest.dSYM

7997

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

7998

conftest$ac_exeext conftest.$ac_ext

7999

fi

8000

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

8001

-$as_echo "$ac_cv_func_shl_load" >&6; }

8002

-if test "x$ac_cv_func_shl_load" = x""yes; then

8003

+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5

8004

+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }

8005

+if test $ac_cv_func_shl_load = yes; then

8006

lt_cv_dlopen="shl_load"

8007

else

8008

- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

8009

-$as_echo_n "checking for shl_load in -ldld... " >&6; }

8010

+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5

8011

+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }

8012

if test "${ac_cv_lib_dld_shl_load+set}" = set; then

8013

- $as_echo_n "(cached) " >&6

8014

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8015

else

8016

ac_check_lib_save_LIBS=$LIBS

8017

LIBS="-ldld $LIBS"

8018

@@ -12833,43 +12598,39 @@ case "(($ac_try" in

8019

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8020

*) ac_try_echo=$ac_try;;

8021

esac

8022

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8023

-$as_echo "$ac_try_echo") >&5

8024

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8025

(eval "$ac_link") 2>conftest.er1

8026

ac_status=$?

8027

grep -v '^ *+' conftest.er1 >conftest.err

8028

rm -f conftest.er1

8029

cat conftest.err >&5

8030

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8031

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

8032

(exit $ac_status); } && {

8033

test -z "$ac_c_werror_flag" ||

8034

test ! -s conftest.err

8035

- } && test -s conftest$ac_exeext && {

8036

- test "$cross_compiling" = yes ||

8037

- $as_test_x conftest$ac_exeext

8038

- }; then

8039

+ } && test -s conftest$ac_exeext &&

8040

+ $as_test_x conftest$ac_exeext; then

8041

ac_cv_lib_dld_shl_load=yes

8042

else

8043

- $as_echo "$as_me: failed program was:" >&5

8044

+ echo "$as_me: failed program was:" >&5

8045

sed 's/^/| /' conftest.$ac_ext >&5

8046

8047

ac_cv_lib_dld_shl_load=no

8048

fi

8049

8050

-rm -rf conftest.dSYM

8051

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8052

conftest$ac_exeext conftest.$ac_ext

8053

LIBS=$ac_check_lib_save_LIBS

8054

fi

8055

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5

8056

-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }

8057

-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then

8058

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5

8059

+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }

8060

+if test $ac_cv_lib_dld_shl_load = yes; then

8061

lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"

8062

else

8063

- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5

8064

-$as_echo_n "checking for dlopen... " >&6; }

8065

+ { echo "$as_me:$LINENO: checking for dlopen" >&5

8066

+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }

8067

if test "${ac_cv_func_dlopen+set}" = set; then

8068

- $as_echo_n "(cached) " >&6

8069

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8070

else

8071

cat >conftest.$ac_ext <<_ACEOF

8072

/* confdefs.h. */

8073

@@ -12922,42 +12683,38 @@ case "(($ac_try" in

8074

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8075

*) ac_try_echo=$ac_try;;

8076

esac

8077

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8078

-$as_echo "$ac_try_echo") >&5

8079

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8080

(eval "$ac_link") 2>conftest.er1

8081

ac_status=$?

8082

grep -v '^ *+' conftest.er1 >conftest.err

8083

rm -f conftest.er1

8084

cat conftest.err >&5

8085

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8086

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

8087

(exit $ac_status); } && {

8088

test -z "$ac_c_werror_flag" ||

8089

test ! -s conftest.err

8090

- } && test -s conftest$ac_exeext && {

8091

- test "$cross_compiling" = yes ||

8092

- $as_test_x conftest$ac_exeext

8093

- }; then

8094

+ } && test -s conftest$ac_exeext &&

8095

+ $as_test_x conftest$ac_exeext; then

8096

ac_cv_func_dlopen=yes

8097

else

8098

- $as_echo "$as_me: failed program was:" >&5

8099

+ echo "$as_me: failed program was:" >&5

8100

sed 's/^/| /' conftest.$ac_ext >&5

8101

8102

ac_cv_func_dlopen=no

8103

fi

8104

8105

-rm -rf conftest.dSYM

8106

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8107

conftest$ac_exeext conftest.$ac_ext

8108

fi

8109

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

8110

-$as_echo "$ac_cv_func_dlopen" >&6; }

8111

-if test "x$ac_cv_func_dlopen" = x""yes; then

8112

+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5

8113

+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }

8114

+if test $ac_cv_func_dlopen = yes; then

8115

lt_cv_dlopen="dlopen"

8116

else

8117

- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

8118

-$as_echo_n "checking for dlopen in -ldl... " >&6; }

8119

+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5

8120

+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }

8121

if test "${ac_cv_lib_dl_dlopen+set}" = set; then

8122

- $as_echo_n "(cached) " >&6

8123

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8124

else

8125

ac_check_lib_save_LIBS=$LIBS

8126

LIBS="-ldl $LIBS"

8127

@@ -12989,43 +12746,39 @@ case "(($ac_try" in

8128

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8129

*) ac_try_echo=$ac_try;;

8130

esac

8131

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8132

-$as_echo "$ac_try_echo") >&5

8133

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8134

(eval "$ac_link") 2>conftest.er1

8135

ac_status=$?

8136

grep -v '^ *+' conftest.er1 >conftest.err

8137

rm -f conftest.er1

8138

cat conftest.err >&5

8139

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8140

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

8141

(exit $ac_status); } && {

8142

test -z "$ac_c_werror_flag" ||

8143

test ! -s conftest.err

8144

- } && test -s conftest$ac_exeext && {

8145

- test "$cross_compiling" = yes ||

8146

- $as_test_x conftest$ac_exeext

8147

- }; then

8148

+ } && test -s conftest$ac_exeext &&

8149

+ $as_test_x conftest$ac_exeext; then

8150

ac_cv_lib_dl_dlopen=yes

8151

else

8152

- $as_echo "$as_me: failed program was:" >&5

8153

+ echo "$as_me: failed program was:" >&5

8154

sed 's/^/| /' conftest.$ac_ext >&5

8155

8156

ac_cv_lib_dl_dlopen=no

8157

fi

8158

8159

-rm -rf conftest.dSYM

8160

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8161

conftest$ac_exeext conftest.$ac_ext

8162

LIBS=$ac_check_lib_save_LIBS

8163

fi

8164

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

8165

-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }

8166

-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then

8167

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5

8168

+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }

8169

+if test $ac_cv_lib_dl_dlopen = yes; then

8170

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"

8171

else

8172

- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5

8173

-$as_echo_n "checking for dlopen in -lsvld... " >&6; }

8174

+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5

8175

+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }

8176

if test "${ac_cv_lib_svld_dlopen+set}" = set; then

8177

- $as_echo_n "(cached) " >&6

8178

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8179

else

8180

ac_check_lib_save_LIBS=$LIBS

8181

LIBS="-lsvld $LIBS"

8182

@@ -13057,43 +12810,39 @@ case "(($ac_try" in

8183

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8184

*) ac_try_echo=$ac_try;;

8185

esac

8186

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8187

-$as_echo "$ac_try_echo") >&5

8188

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8189

(eval "$ac_link") 2>conftest.er1

8190

ac_status=$?

8191

grep -v '^ *+' conftest.er1 >conftest.err

8192

rm -f conftest.er1

8193

cat conftest.err >&5

8194

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8195

+ 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_exeext && {

8200

- test "$cross_compiling" = yes ||

8201

- $as_test_x conftest$ac_exeext

8202

- }; then

8203

+ } && test -s conftest$ac_exeext &&

8204

+ $as_test_x conftest$ac_exeext; then

8205

ac_cv_lib_svld_dlopen=yes

8206

else

8207

- $as_echo "$as_me: failed program was:" >&5

8208

+ echo "$as_me: failed program was:" >&5

8209

sed 's/^/| /' conftest.$ac_ext >&5

8210

8211

ac_cv_lib_svld_dlopen=no

8212

fi

8213

8214

-rm -rf conftest.dSYM

8215

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8216

conftest$ac_exeext conftest.$ac_ext

8217

LIBS=$ac_check_lib_save_LIBS

8218

fi

8219

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5

8220

-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }

8221

-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then

8222

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5

8223

+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }

8224

+if test $ac_cv_lib_svld_dlopen = yes; then

8225

lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"

8226

else

8227

- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5

8228

-$as_echo_n "checking for dld_link in -ldld... " >&6; }

8229

+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5

8230

+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }

8231

if test "${ac_cv_lib_dld_dld_link+set}" = set; then

8232

- $as_echo_n "(cached) " >&6

8233

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8234

else

8235

ac_check_lib_save_LIBS=$LIBS

8236

LIBS="-ldld $LIBS"

8237

@@ -13125,37 +12874,33 @@ case "(($ac_try" in

8238

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8239

*) ac_try_echo=$ac_try;;

8240

esac

8241

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8242

-$as_echo "$ac_try_echo") >&5

8243

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8244

(eval "$ac_link") 2>conftest.er1

8245

ac_status=$?

8246

grep -v '^ *+' conftest.er1 >conftest.err

8247

rm -f conftest.er1

8248

cat conftest.err >&5

8249

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8250

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

8251

(exit $ac_status); } && {

8252

test -z "$ac_c_werror_flag" ||

8253

test ! -s conftest.err

8254

- } && test -s conftest$ac_exeext && {

8255

- test "$cross_compiling" = yes ||

8256

- $as_test_x conftest$ac_exeext

8257

- }; then

8258

+ } && test -s conftest$ac_exeext &&

8259

+ $as_test_x conftest$ac_exeext; then

8260

ac_cv_lib_dld_dld_link=yes

8261

else

8262

- $as_echo "$as_me: failed program was:" >&5

8263

+ echo "$as_me: failed program was:" >&5

8264

sed 's/^/| /' conftest.$ac_ext >&5

8265

8266

ac_cv_lib_dld_dld_link=no

8267

fi

8268

8269

-rm -rf conftest.dSYM

8270

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8271

conftest$ac_exeext conftest.$ac_ext

8272

LIBS=$ac_check_lib_save_LIBS

8273

fi

8274

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5

8275

-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }

8276

-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then

8277

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5

8278

+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }

8279

+if test $ac_cv_lib_dld_dld_link = yes; then

8280

lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"

8281

fi

8282

8283

@@ -13194,10 +12939,10 @@ fi

8284

save_LIBS="$LIBS"

8285

LIBS="$lt_cv_dlopen_libs $LIBS"

8286

8287

- { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5

8288

-$as_echo_n "checking whether a program can dlopen itself... " >&6; }

8289

+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5

8290

+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }

8291

if test "${lt_cv_dlopen_self+set}" = set; then

8292

- $as_echo_n "(cached) " >&6

8293

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8294

else

8295

if test "$cross_compiling" = yes; then :

8296

lt_cv_dlopen_self=cross

8297

@@ -13205,7 +12950,7 @@ else

8298

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

8299

lt_status=$lt_dlunknown

8300

cat > conftest.$ac_ext <<EOF

8301

-#line 13208 "configure"

8302

+#line 12953 "configure"

8303

#include "confdefs.h"

8304

8305

#if HAVE_DLFCN_H

8306

@@ -13271,7 +13016,7 @@ EOF

8307

if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8308

(eval $ac_link) 2>&5

8309

ac_status=$?

8310

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8311

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

8312

(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then

8313

(./conftest; exit; ) >&5 2>/dev/null

8314

lt_status=$?

8315

@@ -13289,15 +13034,15 @@ rm -fr conftest*

8316

8317

8318

fi

8319

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5

8320

-$as_echo "$lt_cv_dlopen_self" >&6; }

8321

+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5

8322

+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }

8323

8324

if test "x$lt_cv_dlopen_self" = xyes; then

8325

wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"

8326

- { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5

8327

-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }

8328

+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5

8329

+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }

8330

if test "${lt_cv_dlopen_self_static+set}" = set; then

8331

- $as_echo_n "(cached) " >&6

8332

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8333

else

8334

if test "$cross_compiling" = yes; then :

8335

lt_cv_dlopen_self_static=cross

8336

@@ -13305,7 +13050,7 @@ else

8337

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

8338

lt_status=$lt_dlunknown

8339

cat > conftest.$ac_ext <<EOF

8340

-#line 13308 "configure"

8341

+#line 13053 "configure"

8342

#include "confdefs.h"

8343

8344

#if HAVE_DLFCN_H

8345

@@ -13371,7 +13116,7 @@ EOF

8346

if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

8347

(eval $ac_link) 2>&5

8348

ac_status=$?

8349

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8350

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

8351

(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then

8352

(./conftest; exit; ) >&5 2>/dev/null

8353

lt_status=$?

8354

@@ -13389,8 +13134,8 @@ rm -fr conftest*

8355

8356

8357

fi

8358

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5

8359

-$as_echo "$lt_cv_dlopen_self_static" >&6; }

8360

+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5

8361

+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }

8362

fi

8363

8364

CPPFLAGS="$save_CPPFLAGS"

8365

@@ -13412,13 +13157,13 @@ fi

8366

8367

8368

# Report which library types will actually be built

8369

-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

8370

-$as_echo_n "checking if libtool supports shared libraries... " >&6; }

8371

-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5

8372

-$as_echo "$can_build_shared" >&6; }

8373

+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

8374

+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }

8375

+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5

8376

+echo "${ECHO_T}$can_build_shared" >&6; }

8377

8378

-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

8379

-$as_echo_n "checking whether to build shared libraries... " >&6; }

8380

+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

8381

+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }

8382

test "$can_build_shared" = "no" && enable_shared=no

8383

8384

# On AIX, shared libraries and static libraries use the same namespace, and

8385

@@ -13438,15 +13183,15 @@ aix[4-9]*)

8386

fi

8387

;;

8388

esac

8389

-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5

8390

-$as_echo "$enable_shared" >&6; }

8391

+{ echo "$as_me:$LINENO: result: $enable_shared" >&5

8392

+echo "${ECHO_T}$enable_shared" >&6; }

8393

8394

-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5

8395

-$as_echo_n "checking whether to build static libraries... " >&6; }

8396

+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5

8397

+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }

8398

# Make sure either enable_shared or enable_static is yes.

8399

test "$enable_shared" = yes || enable_static=yes

8400

-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5

8401

-$as_echo "$enable_static" >&6; }

8402

+{ echo "$as_me:$LINENO: result: $enable_static" >&5

8403

+echo "${ECHO_T}$enable_static" >&6; }

8404

8405

# The else clause should only fire when bootstrapping the

8406

# libtool distribution, otherwise you forgot to ship ltmain.sh

8407

@@ -13539,8 +13284,8 @@ if test -f "$ltmain"; then

8408

cfgfile="${ofile}T"

8409

trap "$rm \"$cfgfile\"; exit 1" 1 2 15

8410

$rm -f "$cfgfile"

8411

- { $as_echo "$as_me:$LINENO: creating $ofile" >&5

8412

-$as_echo "$as_me: creating $ofile" >&6;}

8413

+ { echo "$as_me:$LINENO: creating $ofile" >&5

8414

+echo "$as_me: creating $ofile" >&6;}

8415

8416

cat <<__EOF__ >> "$cfgfile"

8417

#! $SHELL

8418

@@ -13952,18 +13697,18 @@ fi

8419

8420

if test -f "$ltmain" && test -n "$tagnames"; then

8421

if test ! -f "${ofile}"; then

8422

- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5

8423

-$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}

8424

+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5

8425

+echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}

8426

fi

8427

8428

if test -z "$LTCC"; then

8429

eval "`$SHELL ${ofile} --config | grep '^LTCC='`"

8430

if test -z "$LTCC"; then

8431

- { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5

8432

-$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}

8433

+ { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5

8434

+echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}

8435

else

8436

- { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5

8437

-$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}

8438

+ { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5

8439

+echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}

8440

fi

8441

fi

8442

if test -z "$LTCFLAGS"; then

8443

@@ -13980,16 +13725,16 @@ $as_echo "$as_me: WARNING: using \`LTCC=

8444

# Check whether tagname contains only valid characters

8445

case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in

8446

"") ;;

8447

- *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5

8448

-$as_echo "$as_me: error: invalid tag name: $tagname" >&2;}

8449

+ *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5

8450

+echo "$as_me: error: invalid tag name: $tagname" >&2;}

8451

{ (exit 1); exit 1; }; }

8452

;;

8453

esac

8454

8455

if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null

8456

then

8457

- { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5

8458

-$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}

8459

+ { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5

8460

+echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}

8461

{ (exit 1); exit 1; }; }

8462

fi

8463

8464

@@ -14132,8 +13877,8 @@ fi

8465

ac_prog=ld

8466

if test "$GCC" = yes; then

8467

# Check if gcc -print-prog-name=ld gives a path.

8468

- { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5

8469

-$as_echo_n "checking for ld used by $CC... " >&6; }

8470

+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5

8471

+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }

8472

case $host in

8473

*-*-mingw*)

8474

# gcc leaves a trailing carriage return which upsets mingw

8475

@@ -14162,14 +13907,14 @@ $as_echo_n "checking for ld used by $CC.

8476

;;

8477

esac

8478

elif test "$with_gnu_ld" = yes; then

8479

- { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5

8480

-$as_echo_n "checking for GNU ld... " >&6; }

8481

+ { echo "$as_me:$LINENO: checking for GNU ld" >&5

8482

+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }

8483

else

8484

- { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5

8485

-$as_echo_n "checking for non-GNU ld... " >&6; }

8486

+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5

8487

+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }

8488

fi

8489

if test "${lt_cv_path_LD+set}" = set; then

8490

- $as_echo_n "(cached) " >&6

8491

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8492

else

8493

if test -z "$LD"; then

8494

lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

8495

@@ -14199,19 +13944,19 @@ fi

8496

8497

LD="$lt_cv_path_LD"

8498

if test -n "$LD"; then

8499

- { $as_echo "$as_me:$LINENO: result: $LD" >&5

8500

-$as_echo "$LD" >&6; }

8501

+ { echo "$as_me:$LINENO: result: $LD" >&5

8502

+echo "${ECHO_T}$LD" >&6; }

8503

else

8504

- { $as_echo "$as_me:$LINENO: result: no" >&5

8505

-$as_echo "no" >&6; }

8506

+ { echo "$as_me:$LINENO: result: no" >&5

8507

+echo "${ECHO_T}no" >&6; }

8508

fi

8509

-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

8510

-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

8511

+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5

8512

+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}

8513

{ (exit 1); exit 1; }; }

8514

-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

8515

-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

8516

+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5

8517

+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }

8518

if test "${lt_cv_prog_gnu_ld+set}" = set; then

8519

- $as_echo_n "(cached) " >&6

8520

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8521

else

8522

# I'd rather use --version here, but apparently some GNU lds only accept -v.

8523

case `$LD -v 2>&1 </dev/null` in

8524

@@ -14223,8 +13968,8 @@ case `$LD -v 2>&1 </dev/null` in

8525

;;

8526

esac

8527

fi

8528

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

8529

-$as_echo "$lt_cv_prog_gnu_ld" >&6; }

8530

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5

8531

+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }

8532

with_gnu_ld=$lt_cv_prog_gnu_ld

8533

8534

8535

@@ -14274,8 +14019,8 @@ else

8536

fi

8537

8538

# PORTME: fill in a description of your system's C++ link characteristics

8539

-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8540

-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

8541

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8542

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

8543

ld_shlibs_CXX=yes

8544

case $host_os in

8545

aix3*)

8546

@@ -14392,21 +14137,18 @@ case "(($ac_try" in

8547

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8548

*) ac_try_echo=$ac_try;;

8549

esac

8550

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8551

-$as_echo "$ac_try_echo") >&5

8552

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8553

(eval "$ac_link") 2>conftest.er1

8554

ac_status=$?

8555

grep -v '^ *+' conftest.er1 >conftest.err

8556

rm -f conftest.er1

8557

cat conftest.err >&5

8558

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8559

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

8560

(exit $ac_status); } && {

8561

test -z "$ac_cxx_werror_flag" ||

8562

test ! -s conftest.err

8563

- } && test -s conftest$ac_exeext && {

8564

- test "$cross_compiling" = yes ||

8565

- $as_test_x conftest$ac_exeext

8566

- }; then

8567

+ } && test -s conftest$ac_exeext &&

8568

+ $as_test_x conftest$ac_exeext; then

8569

8570

lt_aix_libpath_sed='

8571

/Import File Strings/,/^$/ {

8572

@@ -14421,13 +14163,12 @@ if test -z "$aix_libpath"; then

8573

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

8574

fi

8575

else

8576

- $as_echo "$as_me: failed program was:" >&5

8577

+ echo "$as_me: failed program was:" >&5

8578

sed 's/^/| /' conftest.$ac_ext >&5

8579

8580

8581

fi

8582

8583

-rm -rf conftest.dSYM

8584

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8585

conftest$ac_exeext conftest.$ac_ext

8586

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8587

@@ -14463,21 +14204,18 @@ case "(($ac_try" in

8588

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

8589

*) ac_try_echo=$ac_try;;

8590

esac

8591

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

8592

-$as_echo "$ac_try_echo") >&5

8593

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

8594

(eval "$ac_link") 2>conftest.er1

8595

ac_status=$?

8596

grep -v '^ *+' conftest.er1 >conftest.err

8597

rm -f conftest.er1

8598

cat conftest.err >&5

8599

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8600

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

8601

(exit $ac_status); } && {

8602

test -z "$ac_cxx_werror_flag" ||

8603

test ! -s conftest.err

8604

- } && test -s conftest$ac_exeext && {

8605

- test "$cross_compiling" = yes ||

8606

- $as_test_x conftest$ac_exeext

8607

- }; then

8608

+ } && test -s conftest$ac_exeext &&

8609

+ $as_test_x conftest$ac_exeext; then

8610

8611

lt_aix_libpath_sed='

8612

/Import File Strings/,/^$/ {

8613

@@ -14492,13 +14230,12 @@ if test -z "$aix_libpath"; then

8614

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

8615

fi

8616

else

8617

- $as_echo "$as_me: failed program was:" >&5

8618

+ echo "$as_me: failed program was:" >&5

8619

sed 's/^/| /' conftest.$ac_ext >&5

8620

8621

8622

fi

8623

8624

-rm -rf conftest.dSYM

8625

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

8626

conftest$ac_exeext conftest.$ac_ext

8627

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

8628

@@ -14901,7 +14638,7 @@ if test -z "$aix_libpath"; then aix_libp

8629

;;

8630

esac

8631

;;

8632

- netbsd*)

8633

+ netbsd* | netbsdelf*-gnu)

8634

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

8635

archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'

8636

wlarc=

8637

@@ -15228,8 +14965,8 @@ if test -z "$aix_libpath"; then aix_libp

8638

ld_shlibs_CXX=no

8639

;;

8640

esac

8641

-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

8642

-$as_echo "$ld_shlibs_CXX" >&6; }

8643

+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

8644

+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

8645

test "$ld_shlibs_CXX" = no && can_build_shared=no

8646

8647

GCC_CXX="$GXX"

8648

@@ -15248,7 +14985,7 @@ EOF

8649

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

8650

(eval $ac_compile) 2>&5

8651

ac_status=$?

8652

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8653

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

8654

(exit $ac_status); }; then

8655

# Parse the compiler output and extract the necessary

8656

# objects, libraries and library flags.

8657

@@ -15404,8 +15141,8 @@ lt_prog_compiler_wl_CXX=

8658

lt_prog_compiler_pic_CXX=

8659

lt_prog_compiler_static_CXX=

8660

8661

-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

8662

-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

8663

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

8664

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

8665

8666

# C++ specific cases for pic, static, wl, etc.

8667

if test "$GXX" = yes; then

8668

@@ -15605,7 +15342,7 @@ $as_echo_n "checking for $compiler optio

8669

;;

8670

esac

8671

;;

8672

- netbsd*)

8673

+ netbsd* | netbsdelf*-gnu)

8674

;;

8675

osf3* | osf4* | osf5*)

8676

case $cc_basename in

8677

@@ -15688,18 +15425,18 @@ $as_echo_n "checking for $compiler optio

8678

esac

8679

fi

8680

8681

-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5

8682

-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }

8683

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5

8684

+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }

8685

8686

#

8687

# Check to make sure the PIC flag actually works.

8688

#

8689

if test -n "$lt_prog_compiler_pic_CXX"; then

8690

8691

-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

8692

-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }

8693

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5

8694

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }

8695

if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then

8696

- $as_echo_n "(cached) " >&6

8697

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8698

else

8699

lt_cv_prog_compiler_pic_works_CXX=no

8700

ac_outfile=conftest.$ac_objext

8701

@@ -15714,11 +15451,11 @@ else

8702

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

8703

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

8704

-e 's:$: $lt_compiler_flag:'`

8705

- (eval echo "\"\$as_me:15717: $lt_compile\"" >&5)

8706

+ (eval echo "\"\$as_me:15454: $lt_compile\"" >&5)

8707

(eval "$lt_compile" 2>conftest.err)

8708

ac_status=$?

8709

cat conftest.err >&5

8710

- echo "$as_me:15721: \$? = $ac_status" >&5

8711

+ echo "$as_me:15458: \$? = $ac_status" >&5

8712

if (exit $ac_status) && test -s "$ac_outfile"; then

8713

# The compiler can only warn and ignore the option if not recognized

8714

# So say no if there are warnings other than the usual output.

8715

@@ -15731,8 +15468,8 @@ else

8716

$rm conftest*

8717

8718

fi

8719

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5

8720

-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }

8721

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5

8722

+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }

8723

8724

if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then

8725

case $lt_prog_compiler_pic_CXX in

8726

@@ -15759,10 +15496,10 @@ esac

8727

# Check to make sure the static flag actually works.

8728

#

8729

wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"

8730

-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

8731

-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

8732

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

8733

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

8734

if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then

8735

- $as_echo_n "(cached) " >&6

8736

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8737

else

8738

lt_cv_prog_compiler_static_works_CXX=no

8739

save_LDFLAGS="$LDFLAGS"

8740

@@ -15787,8 +15524,8 @@ else

8741

LDFLAGS="$save_LDFLAGS"

8742

8743

fi

8744

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5

8745

-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }

8746

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5

8747

+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }

8748

8749

if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then

8750

:

8751

@@ -15797,10 +15534,10 @@ else

8752

fi

8753

8754

8755

-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

8756

-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

8757

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

8758

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

8759

if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then

8760

- $as_echo_n "(cached) " >&6

8761

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8762

else

8763

lt_cv_prog_compiler_c_o_CXX=no

8764

$rm -r conftest 2>/dev/null

8765

@@ -15818,11 +15555,11 @@ else

8766

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

8767

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

8768

-e 's:$: $lt_compiler_flag:'`

8769

- (eval echo "\"\$as_me:15821: $lt_compile\"" >&5)

8770

+ (eval echo "\"\$as_me:15558: $lt_compile\"" >&5)

8771

(eval "$lt_compile" 2>out/conftest.err)

8772

ac_status=$?

8773

cat out/conftest.err >&5

8774

- echo "$as_me:15825: \$? = $ac_status" >&5

8775

+ echo "$as_me:15562: \$? = $ac_status" >&5

8776

if (exit $ac_status) && test -s out/conftest2.$ac_objext

8777

then

8778

# The compiler can only warn and ignore the option if not recognized

8779

@@ -15844,34 +15581,34 @@ else

8780

$rm conftest*

8781

8782

fi

8783

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

8784

-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }

8785

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5

8786

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }

8787

8788

8789

hard_links="nottested"

8790

if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then

8791

# do not overwrite the value of need_locks provided by the user

8792

- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

8793

-$as_echo_n "checking if we can lock with hard links... " >&6; }

8794

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

8795

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

8796

hard_links=yes

8797

$rm conftest*

8798

ln conftest.a conftest.b 2>/dev/null && hard_links=no

8799

touch conftest.a

8800

ln conftest.a conftest.b 2>&5 || hard_links=no

8801

ln conftest.a conftest.b 2>/dev/null && hard_links=no

8802

- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5

8803

-$as_echo "$hard_links" >&6; }

8804

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

8805

+echo "${ECHO_T}$hard_links" >&6; }

8806

if test "$hard_links" = no; then

8807

- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

8808

-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

8809

+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

8810

+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

8811

need_locks=warn

8812

fi

8813

else

8814

need_locks=no

8815

fi

8816

8817

-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8818

-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

8819

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

8820

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

8821

8822

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

8823

case $host_os in

8824

@@ -15890,14 +15627,17 @@ $as_echo_n "checking whether the $compil

8825

cygwin* | mingw*)

8826

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]$[^ ]*$/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__$[^ ]*$[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'

8827

;;

8828

+ linux* | k*bsd*-gnu)

8829

+ link_all_deplibs_CXX=no

8830

+ ;;

8831

*)

8832

export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

8833

;;

8834

esac

8835

exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'

8836

8837

-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

8838

-$as_echo "$ld_shlibs_CXX" >&6; }

8839

+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5

8840

+echo "${ECHO_T}$ld_shlibs_CXX" >&6; }

8841

test "$ld_shlibs_CXX" = no && can_build_shared=no

8842

8843

#

8844

@@ -15917,15 +15657,15 @@ x|xyes)

8845

# Test whether the compiler implicitly links with -lc since on some

8846

# systems, -lgcc has to come before -lc. If gcc already passes -lc

8847

# to ld, don't add -lc before -lgcc.

8848

- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

8849

-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

8850

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

8851

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

8852

$rm conftest*

8853

echo "$lt_simple_compile_test_code" > conftest.$ac_ext

8854

8855

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

8856

(eval $ac_compile) 2>&5

8857

ac_status=$?

8858

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8859

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

8860

(exit $ac_status); } 2>conftest.err; then

8861

soname=conftest

8862

lib=conftest

8863

@@ -15943,7 +15683,7 @@ $as_echo_n "checking whether -lc should

8864

if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5

8865

(eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5

8866

ac_status=$?

8867

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

8868

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

8869

(exit $ac_status); }

8870

then

8871

archive_cmds_need_lc_CXX=no

8872

@@ -15955,16 +15695,16 @@ $as_echo_n "checking whether -lc should

8873

cat conftest.err 1>&5

8874

fi

8875

$rm conftest*

8876

- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5

8877

-$as_echo "$archive_cmds_need_lc_CXX" >&6; }

8878

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5

8879

+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }

8880

;;

8881

esac

8882

fi

8883

;;

8884

esac

8885

8886

-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

8887

-$as_echo_n "checking dynamic linker characteristics... " >&6; }

8888

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

8889

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

8890

library_names_spec=

8891

libname_spec='lib$name'

8892

soname_spec=

8893

@@ -16320,13 +16060,11 @@ linux* | k*bsd*-gnu)

8894

# Some rework will be needed to allow for fast_install

8895

# before this can be enabled.

8896

hardcode_into_libs=yes

8897

- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"

8898

- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"

8899

8900

# Append ld.so.conf contents to the search path

8901

if test -f /etc/ld.so.conf; then

8902

lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

8903

- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"

8904

+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

8905

fi

8906

8907

# We used to test for /lib/ld.so.1 and disable shared libraries on

8908

@@ -16338,6 +16076,18 @@ linux* | k*bsd*-gnu)

8909

dynamic_linker='GNU/Linux ld.so'

8910

;;

8911

8912

+netbsdelf*-gnu)

8913

+ version_type=linux

8914

+ need_lib_prefix=no

8915

+ need_version=no

8916

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

8917

+ soname_spec='${libname}${release}${shared_ext}$major'

8918

+ shlibpath_var=LD_LIBRARY_PATH

8919

+ shlibpath_overrides_runpath=no

8920

+ hardcode_into_libs=yes

8921

+ dynamic_linker='NetBSD ld.elf_so'

8922

+ ;;

8923

+

8924

netbsd*)

8925

version_type=sunos

8926

need_lib_prefix=no

8927

@@ -16515,19 +16265,19 @@ uts4*)

8928

dynamic_linker=no

8929

;;

8930

esac

8931

-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5

8932

-$as_echo "$dynamic_linker" >&6; }

8933

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

8934

+echo "${ECHO_T}$dynamic_linker" >&6; }

8935

test "$dynamic_linker" = no && can_build_shared=no

8936

8937

if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then

8938

- $as_echo_n "(cached) " >&6

8939

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8940

else

8941

lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"

8942

fi

8943

8944

sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

8945

if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then

8946

- $as_echo_n "(cached) " >&6

8947

+ echo $ECHO_N "(cached) $ECHO_C" >&6

8948

else

8949

lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"

8950

fi

8951

@@ -16539,8 +16289,8 @@ if test "$GCC" = yes; then

8952

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

8953

fi

8954

8955

-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

8956

-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

8957

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

8958

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

8959

hardcode_action_CXX=

8960

if test -n "$hardcode_libdir_flag_spec_CXX" || \

8961

test -n "$runpath_var_CXX" || \

8962

@@ -16564,8 +16314,8 @@ else

8963

# directories.

8964

hardcode_action_CXX=unsupported

8965

fi

8966

-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5

8967

-$as_echo "$hardcode_action_CXX" >&6; }

8968

+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5

8969

+echo "${ECHO_T}$hardcode_action_CXX" >&6; }

8970

8971

if test "$hardcode_action_CXX" = relink; then

8972

# Fast installation is not supported

8973

@@ -17103,13 +16853,13 @@ done

8974

cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`

8975

8976

8977

-{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

8978

-$as_echo_n "checking if libtool supports shared libraries... " >&6; }

8979

-{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5

8980

-$as_echo "$can_build_shared" >&6; }

8981

+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5

8982

+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }

8983

+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5

8984

+echo "${ECHO_T}$can_build_shared" >&6; }

8985

8986

-{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

8987

-$as_echo_n "checking whether to build shared libraries... " >&6; }

8988

+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5

8989

+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }

8990

test "$can_build_shared" = "no" && enable_shared=no

8991

8992

# On AIX, shared libraries and static libraries use the same namespace, and

8993

@@ -17128,15 +16878,15 @@ aix[4-9]*)

8994

fi

8995

;;

8996

esac

8997

-{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5

8998

-$as_echo "$enable_shared" >&6; }

8999

+{ echo "$as_me:$LINENO: result: $enable_shared" >&5

9000

+echo "${ECHO_T}$enable_shared" >&6; }

9001

9002

-{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5

9003

-$as_echo_n "checking whether to build static libraries... " >&6; }

9004

+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5

9005

+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }

9006

# Make sure either enable_shared or enable_static is yes.

9007

test "$enable_shared" = yes || enable_static=yes

9008

-{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5

9009

-$as_echo "$enable_static" >&6; }

9010

+{ echo "$as_me:$LINENO: result: $enable_static" >&5

9011

+echo "${ECHO_T}$enable_static" >&6; }

9012

9013

GCC_F77="$G77"

9014

LD_F77="$LD"

9015

@@ -17145,8 +16895,8 @@ lt_prog_compiler_wl_F77=

9016

lt_prog_compiler_pic_F77=

9017

lt_prog_compiler_static_F77=

9018

9019

-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

9020

-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

9021

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

9022

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

9023

9024

if test "$GCC" = yes; then

9025

lt_prog_compiler_wl_F77='-Wl,'

9026

@@ -17377,18 +17127,18 @@ $as_echo_n "checking for $compiler optio

9027

esac

9028

fi

9029

9030

-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5

9031

-$as_echo "$lt_prog_compiler_pic_F77" >&6; }

9032

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5

9033

+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }

9034

9035

#

9036

# Check to make sure the PIC flag actually works.

9037

#

9038

if test -n "$lt_prog_compiler_pic_F77"; then

9039

9040

-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5

9041

-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }

9042

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5

9043

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }

9044

if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then

9045

- $as_echo_n "(cached) " >&6

9046

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9047

else

9048

lt_cv_prog_compiler_pic_works_F77=no

9049

ac_outfile=conftest.$ac_objext

9050

@@ -17403,11 +17153,11 @@ else

9051

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9052

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9053

-e 's:$: $lt_compiler_flag:'`

9054

- (eval echo "\"\$as_me:17406: $lt_compile\"" >&5)

9055

+ (eval echo "\"\$as_me:17156: $lt_compile\"" >&5)

9056

(eval "$lt_compile" 2>conftest.err)

9057

ac_status=$?

9058

cat conftest.err >&5

9059

- echo "$as_me:17410: \$? = $ac_status" >&5

9060

+ echo "$as_me:17160: \$? = $ac_status" >&5

9061

if (exit $ac_status) && test -s "$ac_outfile"; then

9062

# The compiler can only warn and ignore the option if not recognized

9063

# So say no if there are warnings other than the usual output.

9064

@@ -17420,8 +17170,8 @@ else

9065

$rm conftest*

9066

9067

fi

9068

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5

9069

-$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }

9070

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5

9071

+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }

9072

9073

if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then

9074

case $lt_prog_compiler_pic_F77 in

9075

@@ -17448,10 +17198,10 @@ esac

9076

# Check to make sure the static flag actually works.

9077

#

9078

wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"

9079

-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9080

-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

9081

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9082

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

9083

if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then

9084

- $as_echo_n "(cached) " >&6

9085

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9086

else

9087

lt_cv_prog_compiler_static_works_F77=no

9088

save_LDFLAGS="$LDFLAGS"

9089

@@ -17476,8 +17226,8 @@ else

9090

LDFLAGS="$save_LDFLAGS"

9091

9092

fi

9093

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5

9094

-$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }

9095

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5

9096

+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }

9097

9098

if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then

9099

:

9100

@@ -17486,10 +17236,10 @@ else

9101

fi

9102

9103

9104

-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9105

-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

9106

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9107

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

9108

if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then

9109

- $as_echo_n "(cached) " >&6

9110

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9111

else

9112

lt_cv_prog_compiler_c_o_F77=no

9113

$rm -r conftest 2>/dev/null

9114

@@ -17507,11 +17257,11 @@ else

9115

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9116

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9117

-e 's:$: $lt_compiler_flag:'`

9118

- (eval echo "\"\$as_me:17510: $lt_compile\"" >&5)

9119

+ (eval echo "\"\$as_me:17260: $lt_compile\"" >&5)

9120

(eval "$lt_compile" 2>out/conftest.err)

9121

ac_status=$?

9122

cat out/conftest.err >&5

9123

- echo "$as_me:17514: \$? = $ac_status" >&5

9124

+ echo "$as_me:17264: \$? = $ac_status" >&5

9125

if (exit $ac_status) && test -s out/conftest2.$ac_objext

9126

then

9127

# The compiler can only warn and ignore the option if not recognized

9128

@@ -17533,34 +17283,34 @@ else

9129

$rm conftest*

9130

9131

fi

9132

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5

9133

-$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }

9134

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5

9135

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }

9136

9137

9138

hard_links="nottested"

9139

if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then

9140

# do not overwrite the value of need_locks provided by the user

9141

- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9142

-$as_echo_n "checking if we can lock with hard links... " >&6; }

9143

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9144

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

9145

hard_links=yes

9146

$rm conftest*

9147

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9148

touch conftest.a

9149

ln conftest.a conftest.b 2>&5 || hard_links=no

9150

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9151

- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5

9152

-$as_echo "$hard_links" >&6; }

9153

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

9154

+echo "${ECHO_T}$hard_links" >&6; }

9155

if test "$hard_links" = no; then

9156

- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

9157

-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

9158

+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

9159

+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

9160

need_locks=warn

9161

fi

9162

else

9163

need_locks=no

9164

fi

9165

9166

-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9167

-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

9168

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9169

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

9170

9171

runpath_var=

9172

allow_undefined_flag_F77=

9173

@@ -17772,12 +17522,13 @@ EOF

9174

$echo "local: *; };" >> $output_objdir/$libname.ver~

9175

$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

9176

fi

9177

+ link_all_deplibs_F77=no

9178

else

9179

ld_shlibs_F77=no

9180

fi

9181

;;

9182

9183

- netbsd*)

9184

+ netbsd* | netbsdelf*-gnu)

9185

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

9186

archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

9187

wlarc=

9188

@@ -17980,21 +17731,18 @@ case "(($ac_try" in

9189

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9190

*) ac_try_echo=$ac_try;;

9191

esac

9192

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9193

-$as_echo "$ac_try_echo") >&5

9194

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9195

(eval "$ac_link") 2>conftest.er1

9196

ac_status=$?

9197

grep -v '^ *+' conftest.er1 >conftest.err

9198

rm -f conftest.er1

9199

cat conftest.err >&5

9200

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9201

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

9202

(exit $ac_status); } && {

9203

test -z "$ac_f77_werror_flag" ||

9204

test ! -s conftest.err

9205

- } && test -s conftest$ac_exeext && {

9206

- test "$cross_compiling" = yes ||

9207

- $as_test_x conftest$ac_exeext

9208

- }; then

9209

+ } && test -s conftest$ac_exeext &&

9210

+ $as_test_x conftest$ac_exeext; then

9211

9212

lt_aix_libpath_sed='

9213

/Import File Strings/,/^$/ {

9214

@@ -18009,13 +17757,12 @@ if test -z "$aix_libpath"; then

9215

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

9216

fi

9217

else

9218

- $as_echo "$as_me: failed program was:" >&5

9219

+ echo "$as_me: failed program was:" >&5

9220

sed 's/^/| /' conftest.$ac_ext >&5

9221

9222

9223

fi

9224

9225

-rm -rf conftest.dSYM

9226

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9227

conftest$ac_exeext conftest.$ac_ext

9228

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

9229

@@ -18040,21 +17787,18 @@ case "(($ac_try" in

9230

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9231

*) ac_try_echo=$ac_try;;

9232

esac

9233

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9234

-$as_echo "$ac_try_echo") >&5

9235

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9236

(eval "$ac_link") 2>conftest.er1

9237

ac_status=$?

9238

grep -v '^ *+' conftest.er1 >conftest.err

9239

rm -f conftest.er1

9240

cat conftest.err >&5

9241

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9242

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

9243

(exit $ac_status); } && {

9244

test -z "$ac_f77_werror_flag" ||

9245

test ! -s conftest.err

9246

- } && test -s conftest$ac_exeext && {

9247

- test "$cross_compiling" = yes ||

9248

- $as_test_x conftest$ac_exeext

9249

- }; then

9250

+ } && test -s conftest$ac_exeext &&

9251

+ $as_test_x conftest$ac_exeext; then

9252

9253

lt_aix_libpath_sed='

9254

/Import File Strings/,/^$/ {

9255

@@ -18069,13 +17813,12 @@ if test -z "$aix_libpath"; then

9256

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

9257

fi

9258

else

9259

- $as_echo "$as_me: failed program was:" >&5

9260

+ echo "$as_me: failed program was:" >&5

9261

sed 's/^/| /' conftest.$ac_ext >&5

9262

9263

9264

fi

9265

9266

-rm -rf conftest.dSYM

9267

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9268

conftest$ac_exeext conftest.$ac_ext

9269

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

9270

@@ -18308,7 +18051,7 @@ if test -z "$aix_libpath"; then aix_libp

9271

link_all_deplibs_F77=yes

9272

;;

9273

9274

- netbsd*)

9275

+ netbsd* | netbsdelf*-gnu)

9276

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

9277

archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

9278

else

9279

@@ -18527,8 +18270,8 @@ if test -z "$aix_libpath"; then aix_libp

9280

esac

9281

fi

9282

9283

-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5

9284

-$as_echo "$ld_shlibs_F77" >&6; }

9285

+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5

9286

+echo "${ECHO_T}$ld_shlibs_F77" >&6; }

9287

test "$ld_shlibs_F77" = no && can_build_shared=no

9288

9289

#

9290

@@ -18548,15 +18291,15 @@ x|xyes)

9291

# Test whether the compiler implicitly links with -lc since on some

9292

# systems, -lgcc has to come before -lc. If gcc already passes -lc

9293

# to ld, don't add -lc before -lgcc.

9294

- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

9295

-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

9296

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

9297

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

9298

$rm conftest*

9299

echo "$lt_simple_compile_test_code" > conftest.$ac_ext

9300

9301

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

9302

(eval $ac_compile) 2>&5

9303

ac_status=$?

9304

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9305

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

9306

(exit $ac_status); } 2>conftest.err; then

9307

soname=conftest

9308

lib=conftest

9309

@@ -18574,7 +18317,7 @@ $as_echo_n "checking whether -lc should

9310

if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5

9311

(eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5

9312

ac_status=$?

9313

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9314

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

9315

(exit $ac_status); }

9316

then

9317

archive_cmds_need_lc_F77=no

9318

@@ -18586,16 +18329,16 @@ $as_echo_n "checking whether -lc should

9319

cat conftest.err 1>&5

9320

fi

9321

$rm conftest*

9322

- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5

9323

-$as_echo "$archive_cmds_need_lc_F77" >&6; }

9324

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5

9325

+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }

9326

;;

9327

esac

9328

fi

9329

;;

9330

esac

9331

9332

-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

9333

-$as_echo_n "checking dynamic linker characteristics... " >&6; }

9334

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

9335

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

9336

library_names_spec=

9337

libname_spec='lib$name'

9338

soname_spec=

9339

@@ -18951,13 +18694,11 @@ linux* | k*bsd*-gnu)

9340

# Some rework will be needed to allow for fast_install

9341

# before this can be enabled.

9342

hardcode_into_libs=yes

9343

- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"

9344

- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"

9345

9346

# Append ld.so.conf contents to the search path

9347

if test -f /etc/ld.so.conf; then

9348

lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

9349

- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"

9350

+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

9351

fi

9352

9353

# We used to test for /lib/ld.so.1 and disable shared libraries on

9354

@@ -18969,6 +18710,18 @@ linux* | k*bsd*-gnu)

9355

dynamic_linker='GNU/Linux ld.so'

9356

;;

9357

9358

+netbsdelf*-gnu)

9359

+ version_type=linux

9360

+ need_lib_prefix=no

9361

+ need_version=no

9362

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

9363

+ soname_spec='${libname}${release}${shared_ext}$major'

9364

+ shlibpath_var=LD_LIBRARY_PATH

9365

+ shlibpath_overrides_runpath=no

9366

+ hardcode_into_libs=yes

9367

+ dynamic_linker='NetBSD ld.elf_so'

9368

+ ;;

9369

+

9370

netbsd*)

9371

version_type=sunos

9372

need_lib_prefix=no

9373

@@ -19146,19 +18899,19 @@ uts4*)

9374

dynamic_linker=no

9375

;;

9376

esac

9377

-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5

9378

-$as_echo "$dynamic_linker" >&6; }

9379

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

9380

+echo "${ECHO_T}$dynamic_linker" >&6; }

9381

test "$dynamic_linker" = no && can_build_shared=no

9382

9383

if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then

9384

- $as_echo_n "(cached) " >&6

9385

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9386

else

9387

lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"

9388

fi

9389

9390

sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

9391

if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then

9392

- $as_echo_n "(cached) " >&6

9393

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9394

else

9395

lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"

9396

fi

9397

@@ -19170,8 +18923,8 @@ if test "$GCC" = yes; then

9398

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

9399

fi

9400

9401

-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

9402

-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

9403

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

9404

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

9405

hardcode_action_F77=

9406

if test -n "$hardcode_libdir_flag_spec_F77" || \

9407

test -n "$runpath_var_F77" || \

9408

@@ -19195,8 +18948,8 @@ else

9409

# directories.

9410

hardcode_action_F77=unsupported

9411

fi

9412

-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5

9413

-$as_echo "$hardcode_action_F77" >&6; }

9414

+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5

9415

+echo "${ECHO_T}$hardcode_action_F77" >&6; }

9416

9417

if test "$hardcode_action_F77" = relink; then

9418

# Fast installation is not supported

9419

@@ -19706,10 +19459,10 @@ if test "$GCC" = yes; then

9420

lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'

9421

9422

9423

-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

9424

-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }

9425

+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5

9426

+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }

9427

if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then

9428

- $as_echo_n "(cached) " >&6

9429

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9430

else

9431

lt_cv_prog_compiler_rtti_exceptions=no

9432

ac_outfile=conftest.$ac_objext

9433

@@ -19724,11 +19477,11 @@ else

9434

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9435

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9436

-e 's:$: $lt_compiler_flag:'`

9437

- (eval echo "\"\$as_me:19727: $lt_compile\"" >&5)

9438

+ (eval echo "\"\$as_me:19480: $lt_compile\"" >&5)

9439

(eval "$lt_compile" 2>conftest.err)

9440

ac_status=$?

9441

cat conftest.err >&5

9442

- echo "$as_me:19731: \$? = $ac_status" >&5

9443

+ echo "$as_me:19484: \$? = $ac_status" >&5

9444

if (exit $ac_status) && test -s "$ac_outfile"; then

9445

# The compiler can only warn and ignore the option if not recognized

9446

# So say no if there are warnings other than the usual output.

9447

@@ -19741,8 +19494,8 @@ else

9448

$rm conftest*

9449

9450

fi

9451

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

9452

-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }

9453

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5

9454

+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }

9455

9456

if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then

9457

lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"

9458

@@ -19756,8 +19509,8 @@ lt_prog_compiler_wl_GCJ=

9459

lt_prog_compiler_pic_GCJ=

9460

lt_prog_compiler_static_GCJ=

9461

9462

-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

9463

-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }

9464

+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5

9465

+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }

9466

9467

if test "$GCC" = yes; then

9468

lt_prog_compiler_wl_GCJ='-Wl,'

9469

@@ -19988,18 +19741,18 @@ $as_echo_n "checking for $compiler optio

9470

esac

9471

fi

9472

9473

-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5

9474

-$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }

9475

+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5

9476

+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }

9477

9478

#

9479

# Check to make sure the PIC flag actually works.

9480

#

9481

if test -n "$lt_prog_compiler_pic_GCJ"; then

9482

9483

-{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5

9484

-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }

9485

+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5

9486

+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }

9487

if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then

9488

- $as_echo_n "(cached) " >&6

9489

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9490

else

9491

lt_cv_prog_compiler_pic_works_GCJ=no

9492

ac_outfile=conftest.$ac_objext

9493

@@ -20014,11 +19767,11 @@ else

9494

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9495

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9496

-e 's:$: $lt_compiler_flag:'`

9497

- (eval echo "\"\$as_me:20017: $lt_compile\"" >&5)

9498

+ (eval echo "\"\$as_me:19770: $lt_compile\"" >&5)

9499

(eval "$lt_compile" 2>conftest.err)

9500

ac_status=$?

9501

cat conftest.err >&5

9502

- echo "$as_me:20021: \$? = $ac_status" >&5

9503

+ echo "$as_me:19774: \$? = $ac_status" >&5

9504

if (exit $ac_status) && test -s "$ac_outfile"; then

9505

# The compiler can only warn and ignore the option if not recognized

9506

# So say no if there are warnings other than the usual output.

9507

@@ -20031,8 +19784,8 @@ else

9508

$rm conftest*

9509

9510

fi

9511

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5

9512

-$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }

9513

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5

9514

+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }

9515

9516

if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then

9517

case $lt_prog_compiler_pic_GCJ in

9518

@@ -20059,10 +19812,10 @@ esac

9519

# Check to make sure the static flag actually works.

9520

#

9521

wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"

9522

-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9523

-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }

9524

+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5

9525

+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }

9526

if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then

9527

- $as_echo_n "(cached) " >&6

9528

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9529

else

9530

lt_cv_prog_compiler_static_works_GCJ=no

9531

save_LDFLAGS="$LDFLAGS"

9532

@@ -20087,8 +19840,8 @@ else

9533

LDFLAGS="$save_LDFLAGS"

9534

9535

fi

9536

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5

9537

-$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }

9538

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5

9539

+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }

9540

9541

if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then

9542

:

9543

@@ -20097,10 +19850,10 @@ else

9544

fi

9545

9546

9547

-{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9548

-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }

9549

+{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5

9550

+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }

9551

if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then

9552

- $as_echo_n "(cached) " >&6

9553

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9554

else

9555

lt_cv_prog_compiler_c_o_GCJ=no

9556

$rm -r conftest 2>/dev/null

9557

@@ -20118,11 +19871,11 @@ else

9558

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

9559

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

9560

-e 's:$: $lt_compiler_flag:'`

9561

- (eval echo "\"\$as_me:20121: $lt_compile\"" >&5)

9562

+ (eval echo "\"\$as_me:19874: $lt_compile\"" >&5)

9563

(eval "$lt_compile" 2>out/conftest.err)

9564

ac_status=$?

9565

cat out/conftest.err >&5

9566

- echo "$as_me:20125: \$? = $ac_status" >&5

9567

+ echo "$as_me:19878: \$? = $ac_status" >&5

9568

if (exit $ac_status) && test -s out/conftest2.$ac_objext

9569

then

9570

# The compiler can only warn and ignore the option if not recognized

9571

@@ -20144,34 +19897,34 @@ else

9572

$rm conftest*

9573

9574

fi

9575

-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5

9576

-$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }

9577

+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5

9578

+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }

9579

9580

9581

hard_links="nottested"

9582

if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then

9583

# do not overwrite the value of need_locks provided by the user

9584

- { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9585

-$as_echo_n "checking if we can lock with hard links... " >&6; }

9586

+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5

9587

+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }

9588

hard_links=yes

9589

$rm conftest*

9590

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9591

touch conftest.a

9592

ln conftest.a conftest.b 2>&5 || hard_links=no

9593

ln conftest.a conftest.b 2>/dev/null && hard_links=no

9594

- { $as_echo "$as_me:$LINENO: result: $hard_links" >&5

9595

-$as_echo "$hard_links" >&6; }

9596

+ { echo "$as_me:$LINENO: result: $hard_links" >&5

9597

+echo "${ECHO_T}$hard_links" >&6; }

9598

if test "$hard_links" = no; then

9599

- { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

9600

-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

9601

+ { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5

9602

+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}

9603

need_locks=warn

9604

fi

9605

else

9606

need_locks=no

9607

fi

9608

9609

-{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9610

-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }

9611

+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5

9612

+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }

9613

9614

runpath_var=

9615

allow_undefined_flag_GCJ=

9616

@@ -20383,12 +20136,13 @@ EOF

9617

$echo "local: *; };" >> $output_objdir/$libname.ver~

9618

$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

9619

fi

9620

+ link_all_deplibs_GCJ=no

9621

else

9622

ld_shlibs_GCJ=no

9623

fi

9624

;;

9625

9626

- netbsd*)

9627

+ netbsd* | netbsdelf*-gnu)

9628

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

9629

archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

9630

wlarc=

9631

@@ -20601,21 +20355,18 @@ case "(($ac_try" in

9632

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9633

*) ac_try_echo=$ac_try;;

9634

esac

9635

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9636

-$as_echo "$ac_try_echo") >&5

9637

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9638

(eval "$ac_link") 2>conftest.er1

9639

ac_status=$?

9640

grep -v '^ *+' conftest.er1 >conftest.err

9641

rm -f conftest.er1

9642

cat conftest.err >&5

9643

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9644

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

9645

(exit $ac_status); } && {

9646

test -z "$ac_c_werror_flag" ||

9647

test ! -s conftest.err

9648

- } && test -s conftest$ac_exeext && {

9649

- test "$cross_compiling" = yes ||

9650

- $as_test_x conftest$ac_exeext

9651

- }; then

9652

+ } && test -s conftest$ac_exeext &&

9653

+ $as_test_x conftest$ac_exeext; then

9654

9655

lt_aix_libpath_sed='

9656

/Import File Strings/,/^$/ {

9657

@@ -20630,13 +20381,12 @@ if test -z "$aix_libpath"; then

9658

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

9659

fi

9660

else

9661

- $as_echo "$as_me: failed program was:" >&5

9662

+ echo "$as_me: failed program was:" >&5

9663

sed 's/^/| /' conftest.$ac_ext >&5

9664

9665

9666

fi

9667

9668

-rm -rf conftest.dSYM

9669

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9670

conftest$ac_exeext conftest.$ac_ext

9671

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

9672

@@ -20671,21 +20421,18 @@ case "(($ac_try" in

9673

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

9674

*) ac_try_echo=$ac_try;;

9675

esac

9676

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

9677

-$as_echo "$ac_try_echo") >&5

9678

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

9679

(eval "$ac_link") 2>conftest.er1

9680

ac_status=$?

9681

grep -v '^ *+' conftest.er1 >conftest.err

9682

rm -f conftest.er1

9683

cat conftest.err >&5

9684

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9685

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

9686

(exit $ac_status); } && {

9687

test -z "$ac_c_werror_flag" ||

9688

test ! -s conftest.err

9689

- } && test -s conftest$ac_exeext && {

9690

- test "$cross_compiling" = yes ||

9691

- $as_test_x conftest$ac_exeext

9692

- }; then

9693

+ } && test -s conftest$ac_exeext &&

9694

+ $as_test_x conftest$ac_exeext; then

9695

9696

lt_aix_libpath_sed='

9697

/Import File Strings/,/^$/ {

9698

@@ -20700,13 +20447,12 @@ if test -z "$aix_libpath"; then

9699

aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

9700

fi

9701

else

9702

- $as_echo "$as_me: failed program was:" >&5

9703

+ echo "$as_me: failed program was:" >&5

9704

sed 's/^/| /' conftest.$ac_ext >&5

9705

9706

9707

fi

9708

9709

-rm -rf conftest.dSYM

9710

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

9711

conftest$ac_exeext conftest.$ac_ext

9712

if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

9713

@@ -20939,7 +20685,7 @@ if test -z "$aix_libpath"; then aix_libp

9714

link_all_deplibs_GCJ=yes

9715

;;

9716

9717

- netbsd*)

9718

+ netbsd* | netbsdelf*-gnu)

9719

if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

9720

archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out

9721

else

9722

@@ -21158,8 +20904,8 @@ if test -z "$aix_libpath"; then aix_libp

9723

esac

9724

fi

9725

9726

-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5

9727

-$as_echo "$ld_shlibs_GCJ" >&6; }

9728

+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5

9729

+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }

9730

test "$ld_shlibs_GCJ" = no && can_build_shared=no

9731

9732

#

9733

@@ -21179,15 +20925,15 @@ x|xyes)

9734

# Test whether the compiler implicitly links with -lc since on some

9735

# systems, -lgcc has to come before -lc. If gcc already passes -lc

9736

# to ld, don't add -lc before -lgcc.

9737

- { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

9738

-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }

9739

+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5

9740

+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }

9741

$rm conftest*

9742

echo "$lt_simple_compile_test_code" > conftest.$ac_ext

9743

9744

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

9745

(eval $ac_compile) 2>&5

9746

ac_status=$?

9747

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9748

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

9749

(exit $ac_status); } 2>conftest.err; then

9750

soname=conftest

9751

lib=conftest

9752

@@ -21205,7 +20951,7 @@ $as_echo_n "checking whether -lc should

9753

if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5

9754

(eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5

9755

ac_status=$?

9756

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

9757

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

9758

(exit $ac_status); }

9759

then

9760

archive_cmds_need_lc_GCJ=no

9761

@@ -21217,16 +20963,16 @@ $as_echo_n "checking whether -lc should

9762

cat conftest.err 1>&5

9763

fi

9764

$rm conftest*

9765

- { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5

9766

-$as_echo "$archive_cmds_need_lc_GCJ" >&6; }

9767

+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5

9768

+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }

9769

;;

9770

esac

9771

fi

9772

;;

9773

esac

9774

9775

-{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

9776

-$as_echo_n "checking dynamic linker characteristics... " >&6; }

9777

+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5

9778

+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }

9779

library_names_spec=

9780

libname_spec='lib$name'

9781

soname_spec=

9782

@@ -21582,13 +21328,11 @@ linux* | k*bsd*-gnu)

9783

# Some rework will be needed to allow for fast_install

9784

# before this can be enabled.

9785

hardcode_into_libs=yes

9786

- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"

9787

- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"

9788

9789

# Append ld.so.conf contents to the search path

9790

if test -f /etc/ld.so.conf; then

9791

lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

9792

- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"

9793

+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

9794

fi

9795

9796

# We used to test for /lib/ld.so.1 and disable shared libraries on

9797

@@ -21600,6 +21344,18 @@ linux* | k*bsd*-gnu)

9798

dynamic_linker='GNU/Linux ld.so'

9799

;;

9800

9801

+netbsdelf*-gnu)

9802

+ version_type=linux

9803

+ need_lib_prefix=no

9804

+ need_version=no

9805

+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

9806

+ soname_spec='${libname}${release}${shared_ext}$major'

9807

+ shlibpath_var=LD_LIBRARY_PATH

9808

+ shlibpath_overrides_runpath=no

9809

+ hardcode_into_libs=yes

9810

+ dynamic_linker='NetBSD ld.elf_so'

9811

+ ;;

9812

+

9813

netbsd*)

9814

version_type=sunos

9815

need_lib_prefix=no

9816

@@ -21777,19 +21533,19 @@ uts4*)

9817

dynamic_linker=no

9818

;;

9819

esac

9820

-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5

9821

-$as_echo "$dynamic_linker" >&6; }

9822

+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5

9823

+echo "${ECHO_T}$dynamic_linker" >&6; }

9824

test "$dynamic_linker" = no && can_build_shared=no

9825

9826

if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then

9827

- $as_echo_n "(cached) " >&6

9828

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9829

else

9830

lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"

9831

fi

9832

9833

sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"

9834

if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then

9835

- $as_echo_n "(cached) " >&6

9836

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9837

else

9838

lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"

9839

fi

9840

@@ -21801,8 +21557,8 @@ if test "$GCC" = yes; then

9841

variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"

9842

fi

9843

9844

-{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

9845

-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }

9846

+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5

9847

+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }

9848

hardcode_action_GCJ=

9849

if test -n "$hardcode_libdir_flag_spec_GCJ" || \

9850

test -n "$runpath_var_GCJ" || \

9851

@@ -21826,8 +21582,8 @@ else

9852

# directories.

9853

hardcode_action_GCJ=unsupported

9854

fi

9855

-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5

9856

-$as_echo "$hardcode_action_GCJ" >&6; }

9857

+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5

9858

+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }

9859

9860

if test "$hardcode_action_GCJ" = relink; then

9861

# Fast installation is not supported

9862

@@ -22750,8 +22506,8 @@ CC="$lt_save_CC"

9863

;;

9864

9865

*)

9866

- { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5

9867

-$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;}

9868

+ { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5

9869

+echo "$as_me: error: Unsupported tag name: $tagname" >&2;}

9870

{ (exit 1); exit 1; }; }

9871

;;

9872

esac

9873

@@ -22770,8 +22526,8 @@ $as_echo "$as_me: error: Unsupported tag

9874

chmod +x "$ofile"

9875

else

9876

rm -f "${ofile}T"

9877

- { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5

9878

-$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;}

9879

+ { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5

9880

+echo "$as_me: error: unable to update list of available tagged configurations." >&2;}

9881

{ (exit 1); exit 1; }; }

9882

fi

9883

fi

9884

@@ -22813,10 +22569,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=

9885

if test -n "$ac_tool_prefix"; then

9886

# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

9887

set dummy ${ac_tool_prefix}pkg-config; ac_word=$2

9888

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

9889

-$as_echo_n "checking for $ac_word... " >&6; }

9890

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

9891

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

9892

if test "${ac_cv_path_PKG_CONFIG+set}" = set; then

9893

- $as_echo_n "(cached) " >&6

9894

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9895

else

9896

case $PKG_CONFIG in

9897

[\\/]* | ?:[\\/]*)

9898

@@ -22831,7 +22587,7 @@ do

9899

for ac_exec_ext in '' $ac_executable_extensions; do

9900

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9901

ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

9902

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9903

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9904

break 2

9905

fi

9906

done

9907

@@ -22843,11 +22599,11 @@ esac

9908

fi

9909

PKG_CONFIG=$ac_cv_path_PKG_CONFIG

9910

if test -n "$PKG_CONFIG"; then

9911

- { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5

9912

-$as_echo "$PKG_CONFIG" >&6; }

9913

+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5

9914

+echo "${ECHO_T}$PKG_CONFIG" >&6; }

9915

else

9916

- { $as_echo "$as_me:$LINENO: result: no" >&5

9917

-$as_echo "no" >&6; }

9918

+ { echo "$as_me:$LINENO: result: no" >&5

9919

+echo "${ECHO_T}no" >&6; }

9920

fi

9921

9922

9923

@@ -22856,10 +22612,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the

9924

ac_pt_PKG_CONFIG=$PKG_CONFIG

9925

# Extract the first word of "pkg-config", so it can be a program name with args.

9926

set dummy pkg-config; ac_word=$2

9927

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

9928

-$as_echo_n "checking for $ac_word... " >&6; }

9929

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

9930

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

9931

if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then

9932

- $as_echo_n "(cached) " >&6

9933

+ echo $ECHO_N "(cached) $ECHO_C" >&6

9934

else

9935

case $ac_pt_PKG_CONFIG in

9936

[\\/]* | ?:[\\/]*)

9937

@@ -22874,7 +22630,7 @@ do

9938

for ac_exec_ext in '' $ac_executable_extensions; do

9939

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

9940

ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"

9941

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9942

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

9943

break 2

9944

fi

9945

done

9946

@@ -22886,11 +22642,11 @@ esac

9947

fi

9948

ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG

9949

if test -n "$ac_pt_PKG_CONFIG"; then

9950

- { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5

9951

-$as_echo "$ac_pt_PKG_CONFIG" >&6; }

9952

+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5

9953

+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }

9954

else

9955

- { $as_echo "$as_me:$LINENO: result: no" >&5

9956

-$as_echo "no" >&6; }

9957

+ { echo "$as_me:$LINENO: result: no" >&5

9958

+echo "${ECHO_T}no" >&6; }

9959

fi

9960

9961

if test "x$ac_pt_PKG_CONFIG" = x; then

9962

@@ -22898,8 +22654,12 @@ fi

9963

else

9964

case $cross_compiling:$ac_tool_warned in

9965

yes:)

9966

-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5

9967

-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

9968

+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools

9969

+whose name does not start with the host triplet. If you think this

9970

+configuration is useful to you, please write to autoconf@gnu.org." >&5

9971

+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools

9972

+whose name does not start with the host triplet. If you think this

9973

+configuration is useful to you, please write to autoconf@gnu.org." >&2;}

9974

ac_tool_warned=yes ;;

9975

esac

9976

PKG_CONFIG=$ac_pt_PKG_CONFIG

9977

@@ -22911,14 +22671,14 @@ fi

9978

fi

9979

if test -n "$PKG_CONFIG"; then

9980

_pkg_min_version=0.9.0

9981

- { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5

9982

-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }

9983

+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5

9984

+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }

9985

if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then

9986

- { $as_echo "$as_me:$LINENO: result: yes" >&5

9987

-$as_echo "yes" >&6; }

9988

+ { echo "$as_me:$LINENO: result: yes" >&5

9989

+echo "${ECHO_T}yes" >&6; }

9990

else

9991

- { $as_echo "$as_me:$LINENO: result: no" >&5

9992

-$as_echo "no" >&6; }

9993

+ { echo "$as_me:$LINENO: result: no" >&5

9994

+echo "${ECHO_T}no" >&6; }

9995

PKG_CONFIG=""

9996

fi

9997

9998

@@ -22926,10 +22686,10 @@ fi

9999

10000

# Extract the first word of "glib-genmarshal", so it can be a program name with args.

10001

set dummy glib-genmarshal; ac_word=$2

10002

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

10003

-$as_echo_n "checking for $ac_word... " >&6; }

10004

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10005

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10006

if test "${ac_cv_path_GLIB_GENMARSHAL+set}" = set; then

10007

- $as_echo_n "(cached) " >&6

10008

+ echo $ECHO_N "(cached) $ECHO_C" >&6

10009

else

10010

case $GLIB_GENMARSHAL in

10011

[\\/]* | ?:[\\/]*)

10012

@@ -22944,7 +22704,7 @@ do

10013

for ac_exec_ext in '' $ac_executable_extensions; do

10014

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10015

ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext"

10016

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10017

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10018

break 2

10019

fi

10020

done

10021

@@ -22956,20 +22716,20 @@ esac

10022

fi

10023

GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL

10024

if test -n "$GLIB_GENMARSHAL"; then

10025

- { $as_echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5

10026

-$as_echo "$GLIB_GENMARSHAL" >&6; }

10027

+ { echo "$as_me:$LINENO: result: $GLIB_GENMARSHAL" >&5

10028

+echo "${ECHO_T}$GLIB_GENMARSHAL" >&6; }

10029

else

10030

- { $as_echo "$as_me:$LINENO: result: no" >&5

10031

-$as_echo "no" >&6; }

10032

+ { echo "$as_me:$LINENO: result: no" >&5

10033

+echo "${ECHO_T}no" >&6; }

10034

fi

10035

10036

10037

# Extract the first word of "glib-mkenums", so it can be a program name with args.

10038

set dummy glib-mkenums; ac_word=$2

10039

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

10040

-$as_echo_n "checking for $ac_word... " >&6; }

10041

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

10042

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

10043

if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then

10044

- $as_echo_n "(cached) " >&6

10045

+ echo $ECHO_N "(cached) $ECHO_C" >&6

10046

else

10047

case $GLIB_MKENUMS in

10048

[\\/]* | ?:[\\/]*)

10049

@@ -22984,7 +22744,7 @@ do

10050

for ac_exec_ext in '' $ac_executable_extensions; do

10051

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

10052

ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext"

10053

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10054

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

10055

break 2

10056

fi

10057

done

10058

@@ -22996,11 +22756,11 @@ esac

10059

fi

10060

GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS

10061

if test -n "$GLIB_MKENUMS"; then

10062

- { $as_echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5

10063

-$as_echo "$GLIB_MKENUMS" >&6; }

10064

+ { echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5

10065

+echo "${ECHO_T}$GLIB_MKENUMS" >&6; }

10066

else

10067

- { $as_echo "$as_me:$LINENO: result: no" >&5

10068

-$as_echo "no" >&6; }

10069

+ { echo "$as_me:$LINENO: result: no" >&5

10070

+echo "${ECHO_T}no" >&6; }

10071

fi

10072

10073

10074

@@ -23023,7 +22783,7 @@ TOTEM_VERSION_MICRO=3

10075

10076

10077

# The full list of plugins

10078

-allowed_plugins="thumbnail screensaver ontop galago gromit lirc media-player-keys mythtv properties sidebar-test skipto sample-python sample-vala bemused youtube publish tracker pythonconsole"

10079

+allowed_plugins="thumbnail screensaver ontop galago gromit lirc media-player-keys mythtv properties sidebar-test skipto sample-python sample-vala bbc bemused youtube publish tracker pythonconsole"

10080

10081

PLUGINDIR='${libdir}/totem/plugins'

10082

10083

@@ -23039,40 +22799,44 @@ fi

10084

if test x$enable_nvtv = xyes; then

10085

10086

pkg_failed=no

10087

-{ $as_echo "$as_me:$LINENO: checking for NVTV" >&5

10088

-$as_echo_n "checking for NVTV... " >&6; }

10089

+{ echo "$as_me:$LINENO: checking for NVTV" >&5

10090

+echo $ECHO_N "checking for NVTV... $ECHO_C" >&6; }

10091

10092

-if test -n "$NVTV_CFLAGS"; then

10093

- pkg_cv_NVTV_CFLAGS="$NVTV_CFLAGS"

10094

- elif test -n "$PKG_CONFIG"; then

10095

- if test -n "$PKG_CONFIG" && \

10096

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nvtvsimple >= 0.4.5\"") >&5

10097

+if test -n "$PKG_CONFIG"; then

10098

+ if test -n "$NVTV_CFLAGS"; then

10099

+ pkg_cv_NVTV_CFLAGS="$NVTV_CFLAGS"

10100

+ else

10101

+ if test -n "$PKG_CONFIG" && \

10102

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nvtvsimple >= 0.4.5\"") >&5

10103

($PKG_CONFIG --exists --print-errors "nvtvsimple >= 0.4.5") 2>&5

10104

ac_status=$?

10105

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10106

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10107

(exit $ac_status); }; then

10108

pkg_cv_NVTV_CFLAGS=`$PKG_CONFIG --cflags "nvtvsimple >= 0.4.5" 2>/dev/null`

10109

else

10110

pkg_failed=yes

10111

fi

10112

- else

10113

- pkg_failed=untried

10114

+ fi

10115

+else

10116

+ pkg_failed=untried

10117

fi

10118

-if test -n "$NVTV_LIBS"; then

10119

- pkg_cv_NVTV_LIBS="$NVTV_LIBS"

10120

- elif test -n "$PKG_CONFIG"; then

10121

- if test -n "$PKG_CONFIG" && \

10122

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nvtvsimple >= 0.4.5\"") >&5

10123

+if test -n "$PKG_CONFIG"; then

10124

+ if test -n "$NVTV_LIBS"; then

10125

+ pkg_cv_NVTV_LIBS="$NVTV_LIBS"

10126

+ else

10127

+ if test -n "$PKG_CONFIG" && \

10128

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"nvtvsimple >= 0.4.5\"") >&5

10129

($PKG_CONFIG --exists --print-errors "nvtvsimple >= 0.4.5") 2>&5

10130

ac_status=$?

10131

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10132

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10133

(exit $ac_status); }; then

10134

pkg_cv_NVTV_LIBS=`$PKG_CONFIG --libs "nvtvsimple >= 0.4.5" 2>/dev/null`

10135

else

10136

pkg_failed=yes

10137

fi

10138

- else

10139

- pkg_failed=untried

10140

+ fi

10141

+else

10142

+ pkg_failed=untried

10143

fi

10144

10145

10146

@@ -23085,23 +22849,23 @@ else

10147

_pkg_short_errors_supported=no

10148

fi

10149

if test $_pkg_short_errors_supported = yes; then

10150

- NVTV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nvtvsimple >= 0.4.5" 2>&1`

10151

+ NVTV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "nvtvsimple >= 0.4.5"`

10152

else

10153

- NVTV_PKG_ERRORS=`$PKG_CONFIG --print-errors "nvtvsimple >= 0.4.5" 2>&1`

10154

+ NVTV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nvtvsimple >= 0.4.5"`

10155

fi

10156

# Put the nasty error message in config.log where it belongs

10157

echo "$NVTV_PKG_ERRORS" >&5

10158

10159

- { $as_echo "$as_me:$LINENO: result: no" >&5

10160

-$as_echo "no" >&6; }

10161

+ { echo "$as_me:$LINENO: result: no" >&5

10162

+echo "${ECHO_T}no" >&6; }

10163

found_nvtv=no

10164

elif test $pkg_failed = untried; then

10165

found_nvtv=no

10166

else

10167

NVTV_CFLAGS=$pkg_cv_NVTV_CFLAGS

10168

NVTV_LIBS=$pkg_cv_NVTV_LIBS

10169

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10170

-$as_echo "yes" >&6; }

10171

+ { echo "$as_me:$LINENO: result: yes" >&5

10172

+echo "${ECHO_T}yes" >&6; }

10173

found_nvtv=yes

10174

fi

10175

if test x"$found_nvtv" = "xyes" ; then

10176

@@ -23124,13 +22888,13 @@ if test "${enable_xine+set}" = set; then

10177

enableval=$enable_xine; case "${enableval}" in

10178

yes) ENABLE_XINE=yes ;;

10179

no) ENABLE_XINE=no ;;

10180

- *) { { $as_echo "$as_me:$LINENO: error:

10181

+ *) { { echo "$as_me:$LINENO: error:

10182

***** Bad value ${enableval} for --enable-xine

10183

***** Please use one of the following:

10184

***** --enable-xine=yes

10185

***** --enable-xine=no

10186

" >&5

10187

-$as_echo "$as_me: error:

10188

+echo "$as_me: error:

10189

***** Bad value ${enableval} for --enable-xine

10190

***** Please use one of the following:

10191

***** --enable-xine=yes

10192

@@ -23144,8 +22908,8 @@ fi

10193

10194

HAVE_GSTREAMER=no

10195

if test x$ENABLE_XINE = xno || test x$ENABLE_XINE = xauto; then

10196

- { $as_echo "$as_me:$LINENO: checking whether to enable easy codec installation support" >&5

10197

-$as_echo_n "checking whether to enable easy codec installation support... " >&6; }

10198

+ { echo "$as_me:$LINENO: checking whether to enable easy codec installation support" >&5

10199

+echo $ECHO_N "checking whether to enable easy codec installation support... $ECHO_C" >&6; }

10200

# Check whether --enable-easy-codec-installation was given.

10201

if test "${enable_easy_codec_installation+set}" = set; then

10202

enableval=$enable_easy_codec_installation;

10203

@@ -23162,46 +22926,50 @@ else

10204

10205

fi

10206

10207

- { $as_echo "$as_me:$LINENO: result: $enable_easy_codec_installation" >&5

10208

-$as_echo "$enable_easy_codec_installation" >&6; }

10209

+ { echo "$as_me:$LINENO: result: $enable_easy_codec_installation" >&5

10210

+echo "${ECHO_T}$enable_easy_codec_installation" >&6; }

10211

10212

if test "x$enable_easy_codec_installation" != "xno"; then

10213

10214

pkg_failed=no

10215

-{ $as_echo "$as_me:$LINENO: checking for MISSING_PLUGINS" >&5

10216

-$as_echo_n "checking for MISSING_PLUGINS... " >&6; }

10217

+{ echo "$as_me:$LINENO: checking for MISSING_PLUGINS" >&5

10218

+echo $ECHO_N "checking for MISSING_PLUGINS... $ECHO_C" >&6; }

10219

10220

-if test -n "$MISSING_PLUGINS_CFLAGS"; then

10221

- pkg_cv_MISSING_PLUGINS_CFLAGS="$MISSING_PLUGINS_CFLAGS"

10222

- elif test -n "$PKG_CONFIG"; then

10223

- if test -n "$PKG_CONFIG" && \

10224

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\"") >&5

10225

+if test -n "$PKG_CONFIG"; then

10226

+ if test -n "$MISSING_PLUGINS_CFLAGS"; then

10227

+ pkg_cv_MISSING_PLUGINS_CFLAGS="$MISSING_PLUGINS_CFLAGS"

10228

+ else

10229

+ if test -n "$PKG_CONFIG" && \

10230

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\"") >&5

10231

($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5

10232

ac_status=$?

10233

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10234

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10235

(exit $ac_status); }; then

10236

pkg_cv_MISSING_PLUGINS_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-plugins-base-0.10" 2>/dev/null`

10237

else

10238

pkg_failed=yes

10239

fi

10240

- else

10241

- pkg_failed=untried

10242

+ fi

10243

+else

10244

+ pkg_failed=untried

10245

fi

10246

-if test -n "$MISSING_PLUGINS_LIBS"; then

10247

- pkg_cv_MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS"

10248

- elif test -n "$PKG_CONFIG"; then

10249

- if test -n "$PKG_CONFIG" && \

10250

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\"") >&5

10251

+if test -n "$PKG_CONFIG"; then

10252

+ if test -n "$MISSING_PLUGINS_LIBS"; then

10253

+ pkg_cv_MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS"

10254

+ else

10255

+ if test -n "$PKG_CONFIG" && \

10256

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\"") >&5

10257

($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5

10258

ac_status=$?

10259

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10260

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10261

(exit $ac_status); }; then

10262

pkg_cv_MISSING_PLUGINS_LIBS=`$PKG_CONFIG --libs "gstreamer-plugins-base-0.10" 2>/dev/null`

10263

else

10264

pkg_failed=yes

10265

fi

10266

- else

10267

- pkg_failed=untried

10268

+ fi

10269

+else

10270

+ pkg_failed=untried

10271

fi

10272

10273

10274

@@ -23214,14 +22982,14 @@ else

10275

_pkg_short_errors_supported=no

10276

fi

10277

if test $_pkg_short_errors_supported = yes; then

10278

- MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-plugins-base-0.10" 2>&1`

10279

+ MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10"`

10280

else

10281

- MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-plugins-base-0.10" 2>&1`

10282

+ MISSING_PLUGINS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-plugins-base-0.10"`

10283

fi

10284

# Put the nasty error message in config.log where it belongs

10285

echo "$MISSING_PLUGINS_PKG_ERRORS" >&5

10286

10287

- { { $as_echo "$as_me:$LINENO: error: Package requirements (gstreamer-plugins-base-0.10) were not met:

10288

+ { { echo "$as_me:$LINENO: error: Package requirements (gstreamer-plugins-base-0.10) were not met:

10289

10290

$MISSING_PLUGINS_PKG_ERRORS

10291

10292

@@ -23232,7 +23000,7 @@ Alternatively, you may set the environme

10293

and MISSING_PLUGINS_LIBS to avoid the need to call pkg-config.

10294

See the pkg-config man page for more details.

10295

" >&5

10296

-$as_echo "$as_me: error: Package requirements (gstreamer-plugins-base-0.10) were not met:

10297

+echo "$as_me: error: Package requirements (gstreamer-plugins-base-0.10) were not met:

10298

10299

$MISSING_PLUGINS_PKG_ERRORS

10300

10301

@@ -23245,9 +23013,7 @@ See the pkg-config man page for more det

10302

" >&2;}

10303

{ (exit 1); exit 1; }; }

10304

elif test $pkg_failed = untried; then

10305

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

10306

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

10307

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

10308

+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

10309

is in your PATH or set the PKG_CONFIG environment variable to the full

10310

path to pkg-config.

10311

10312

@@ -23257,7 +23023,7 @@ See the pkg-config man page for more det

10313

10314

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

10315

See \`config.log' for more details." >&5

10316

-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

10317

+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

10318

is in your PATH or set the PKG_CONFIG environment variable to the full

10319

path to pkg-config.

10320

10321

@@ -23267,12 +23033,12 @@ See the pkg-config man page for more det

10322

10323

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

10324

See \`config.log' for more details." >&2;}

10325

- { (exit 1); exit 1; }; }; }

10326

+ { (exit 1); exit 1; }; }

10327

else

10328

MISSING_PLUGINS_CFLAGS=$pkg_cv_MISSING_PLUGINS_CFLAGS

10329

MISSING_PLUGINS_LIBS=$pkg_cv_MISSING_PLUGINS_LIBS

10330

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10331

-$as_echo "yes" >&6; }

10332

+ { echo "$as_me:$LINENO: result: yes" >&5

10333

+echo "${ECHO_T}yes" >&6; }

10334

10335

MISSING_PLUGINS_LIBS="$MISSING_PLUGINS_LIBS -lgstpbutils-0.10"

10336

10337

@@ -23287,40 +23053,44 @@ fi

10338

MM="gstreamer-0.10 >= $GST_REQS gstreamer-base-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GSTPLUG_REQS gstreamer-tag-0.10 >= $GSTPLUG_REQS gconf-2.0"

10339

10340

pkg_failed=no

10341

-{ $as_echo "$as_me:$LINENO: checking for GST" >&5

10342

-$as_echo_n "checking for GST... " >&6; }

10343

+{ echo "$as_me:$LINENO: checking for GST" >&5

10344

+echo $ECHO_N "checking for GST... $ECHO_C" >&6; }

10345

10346

-if test -n "$GST_CFLAGS"; then

10347

- pkg_cv_GST_CFLAGS="$GST_CFLAGS"

10348

- elif test -n "$PKG_CONFIG"; then

10349

- if test -n "$PKG_CONFIG" && \

10350

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10351

+if test -n "$PKG_CONFIG"; then

10352

+ if test -n "$GST_CFLAGS"; then

10353

+ pkg_cv_GST_CFLAGS="$GST_CFLAGS"

10354

+ else

10355

+ if test -n "$PKG_CONFIG" && \

10356

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10357

($PKG_CONFIG --exists --print-errors "$MM") 2>&5

10358

ac_status=$?

10359

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10360

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10361

(exit $ac_status); }; then

10362

pkg_cv_GST_CFLAGS=`$PKG_CONFIG --cflags "$MM" 2>/dev/null`

10363

else

10364

pkg_failed=yes

10365

fi

10366

- else

10367

- pkg_failed=untried

10368

+ fi

10369

+else

10370

+ pkg_failed=untried

10371

fi

10372

-if test -n "$GST_LIBS"; then

10373

- pkg_cv_GST_LIBS="$GST_LIBS"

10374

- elif test -n "$PKG_CONFIG"; then

10375

- if test -n "$PKG_CONFIG" && \

10376

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10377

+if test -n "$PKG_CONFIG"; then

10378

+ if test -n "$GST_LIBS"; then

10379

+ pkg_cv_GST_LIBS="$GST_LIBS"

10380

+ else

10381

+ if test -n "$PKG_CONFIG" && \

10382

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10383

($PKG_CONFIG --exists --print-errors "$MM") 2>&5

10384

ac_status=$?

10385

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10386

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10387

(exit $ac_status); }; then

10388

pkg_cv_GST_LIBS=`$PKG_CONFIG --libs "$MM" 2>/dev/null`

10389

else

10390

pkg_failed=yes

10391

fi

10392

- else

10393

- pkg_failed=untried

10394

+ fi

10395

+else

10396

+ pkg_failed=untried

10397

fi

10398

10399

10400

@@ -23333,57 +23103,57 @@ else

10401

_pkg_short_errors_supported=no

10402

fi

10403

if test $_pkg_short_errors_supported = yes; then

10404

- GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1`

10405

+ GST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MM"`

10406

else

10407

- GST_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1`

10408

+ GST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MM"`

10409

fi

10410

# Put the nasty error message in config.log where it belongs

10411

echo "$GST_PKG_ERRORS" >&5

10412

10413

- { $as_echo "$as_me:$LINENO: result: no" >&5

10414

-$as_echo "no" >&6; }

10415

+ { echo "$as_me:$LINENO: result: no" >&5

10416

+echo "${ECHO_T}no" >&6; }

10417

HAVE_GSTREAMER=no

10418

elif test $pkg_failed = untried; then

10419

HAVE_GSTREAMER=no

10420

else

10421

GST_CFLAGS=$pkg_cv_GST_CFLAGS

10422

GST_LIBS=$pkg_cv_GST_LIBS

10423

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10424

-$as_echo "yes" >&6; }

10425

+ { echo "$as_me:$LINENO: result: yes" >&5

10426

+echo "${ECHO_T}yes" >&6; }

10427

HAVE_GSTREAMER=yes

10428

fi

10429

GST_LIBS="$GST_LIBS -lgstbase-$GST_MAJORMINOR -lgstinterfaces-$GST_MAJORMINOR -lgstvideo-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR -lgstpbutils-$GST_MAJORMINOR -lgsttag-$GST_MAJORMINOR"

10430

10431

EXTRA_BACKEND_LIBS="-lgstinterfaces-$GST_MAJORMINOR -lgstvideo-$GST_MAJORMINOR -lgstaudio-$GST_MAJORMINOR -lgstpbutils-$GST_MAJORMINOR"

10432

10433

- { $as_echo "$as_me:$LINENO: checking for backend libraries" >&5

10434

-$as_echo_n "checking for backend libraries... " >&6; }

10435

+ { echo "$as_me:$LINENO: checking for backend libraries" >&5

10436

+echo $ECHO_N "checking for backend libraries... $ECHO_C" >&6; }

10437

if test "x$HAVE_GSTREAMER" = "xno"; then

10438

- { { $as_echo "$as_me:$LINENO: error: you need the GStreamer or the xine-lib development packages installed" >&5

10439

-$as_echo "$as_me: error: you need the GStreamer or the xine-lib development packages installed" >&2;}

10440

+ { { echo "$as_me:$LINENO: error: you need the GStreamer or the xine-lib development packages installed" >&5

10441

+echo "$as_me: error: you need the GStreamer or the xine-lib development packages installed" >&2;}

10442

{ (exit 1); exit 1; }; }

10443

fi

10444

- { $as_echo "$as_me:$LINENO: result: GStreamer-$GST_MAJORMINOR" >&5

10445

-$as_echo "GStreamer-$GST_MAJORMINOR" >&6; }

10446

+ { echo "$as_me:$LINENO: result: GStreamer-$GST_MAJORMINOR" >&5

10447

+echo "${ECHO_T}GStreamer-$GST_MAJORMINOR" >&6; }

10448

10449

gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`

10450

gst010_inspect="$gst010_toolsdir/gst-inspect-0.10"

10451

10452

for base_element in playbin ffmpegcolorspace videoscale

10453

do

10454

- { $as_echo "$as_me:$LINENO: checking GStreamer 0.10 $base_element plugin" >&5

10455

-$as_echo_n "checking GStreamer 0.10 $base_element plugin... " >&6; }

10456

+ { echo "$as_me:$LINENO: checking GStreamer 0.10 $base_element plugin" >&5

10457

+echo $ECHO_N "checking GStreamer 0.10 $base_element plugin... $ECHO_C" >&6; }

10458

if $gst010_inspect $base_element >/dev/null 2>/dev/null; then

10459

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10460

-$as_echo "yes" >&6; }

10461

+ { echo "$as_me:$LINENO: result: yes" >&5

10462

+echo "${ECHO_T}yes" >&6; }

10463

else

10464

- { $as_echo "$as_me:$LINENO: result: no" >&5

10465

-$as_echo "no" >&6; }

10466

- { { $as_echo "$as_me:$LINENO: error:

10467

+ { echo "$as_me:$LINENO: result: no" >&5

10468

+echo "${ECHO_T}no" >&6; }

10469

+ { { echo "$as_me:$LINENO: error:

10470

Cannot find required GStreamer-0.10 plugin '$base_element'.

10471

It should be part of gst-plugins-base. Please install it.

10472

" >&5

10473

-$as_echo "$as_me: error:

10474

+echo "$as_me: error:

10475

Cannot find required GStreamer-0.10 plugin '$base_element'.

10476

It should be part of gst-plugins-base. Please install it.

10477

" >&2;}

10478

@@ -23393,19 +23163,19 @@ $as_echo "$as_me: error:

10479

10480

for good_element in gconfaudiosink gconfvideosink goom

10481

do

10482

- { $as_echo "$as_me:$LINENO: checking GStreamer 0.10 $good_element plugin" >&5

10483

-$as_echo_n "checking GStreamer 0.10 $good_element plugin... " >&6; }

10484

+ { echo "$as_me:$LINENO: checking GStreamer 0.10 $good_element plugin" >&5

10485

+echo $ECHO_N "checking GStreamer 0.10 $good_element plugin... $ECHO_C" >&6; }

10486

if $gst010_inspect $good_element >/dev/null 2>/dev/null; then

10487

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10488

-$as_echo "yes" >&6; }

10489

+ { echo "$as_me:$LINENO: result: yes" >&5

10490

+echo "${ECHO_T}yes" >&6; }

10491

else

10492

- { $as_echo "$as_me:$LINENO: result: no" >&5

10493

-$as_echo "no" >&6; }

10494

- { { $as_echo "$as_me:$LINENO: error:

10495

+ { echo "$as_me:$LINENO: result: no" >&5

10496

+echo "${ECHO_T}no" >&6; }

10497

+ { { echo "$as_me:$LINENO: error:

10498

Cannot find required GStreamer-0.10 plugin '$good_element'.

10499

It should be part of gst-plugins-good. Please install it.

10500

" >&5

10501

-$as_echo "$as_me: error:

10502

+echo "$as_me: error:

10503

Cannot find required GStreamer-0.10 plugin '$good_element'.

10504

It should be part of gst-plugins-good. Please install it.

10505

" >&2;}

10506

@@ -23417,12 +23187,12 @@ $as_echo "$as_me: error:

10507

fi

10508

10509

if test x$ENABLE_XINE = xno && test x$HAVE_GSTREAMER = xno; then

10510

- { $as_echo "$as_me:$LINENO: checking for backend libraries" >&5

10511

-$as_echo_n "checking for backend libraries... " >&6; }

10512

- { $as_echo "$as_me:$LINENO: result: none" >&5

10513

-$as_echo "none" >&6; }

10514

- { { $as_echo "$as_me:$LINENO: error: you need the GStreamer or the xine-lib development packages installed" >&5

10515

-$as_echo "$as_me: error: you need the GStreamer or the xine-lib development packages installed" >&2;}

10516

+ { echo "$as_me:$LINENO: checking for backend libraries" >&5

10517

+echo $ECHO_N "checking for backend libraries... $ECHO_C" >&6; }

10518

+ { echo "$as_me:$LINENO: result: none" >&5

10519

+echo "${ECHO_T}none" >&6; }

10520

+ { { echo "$as_me:$LINENO: error: you need the GStreamer or the xine-lib development packages installed" >&5

10521

+echo "$as_me: error: you need the GStreamer or the xine-lib development packages installed" >&2;}

10522

{ (exit 1); exit 1; }; }

10523

fi

10524

10525

@@ -23430,40 +23200,44 @@ if test x$HAVE_GSTREAMER = xno; then

10526

MM="libxine >= $XINE_REQS gconf-2.0"

10527

10528

pkg_failed=no

10529

-{ $as_echo "$as_me:$LINENO: checking for XINE" >&5

10530

-$as_echo_n "checking for XINE... " >&6; }

10531

+{ echo "$as_me:$LINENO: checking for XINE" >&5

10532

+echo $ECHO_N "checking for XINE... $ECHO_C" >&6; }

10533

10534

-if test -n "$XINE_CFLAGS"; then

10535

- pkg_cv_XINE_CFLAGS="$XINE_CFLAGS"

10536

- elif test -n "$PKG_CONFIG"; then

10537

- if test -n "$PKG_CONFIG" && \

10538

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10539

+if test -n "$PKG_CONFIG"; then

10540

+ if test -n "$XINE_CFLAGS"; then

10541

+ pkg_cv_XINE_CFLAGS="$XINE_CFLAGS"

10542

+ else

10543

+ if test -n "$PKG_CONFIG" && \

10544

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10545

($PKG_CONFIG --exists --print-errors "$MM") 2>&5

10546

ac_status=$?

10547

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10548

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10549

(exit $ac_status); }; then

10550

pkg_cv_XINE_CFLAGS=`$PKG_CONFIG --cflags "$MM" 2>/dev/null`

10551

else

10552

pkg_failed=yes

10553

fi

10554

- else

10555

- pkg_failed=untried

10556

+ fi

10557

+else

10558

+ pkg_failed=untried

10559

fi

10560

-if test -n "$XINE_LIBS"; then

10561

- pkg_cv_XINE_LIBS="$XINE_LIBS"

10562

- elif test -n "$PKG_CONFIG"; then

10563

- if test -n "$PKG_CONFIG" && \

10564

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10565

+if test -n "$PKG_CONFIG"; then

10566

+ if test -n "$XINE_LIBS"; then

10567

+ pkg_cv_XINE_LIBS="$XINE_LIBS"

10568

+ else

10569

+ if test -n "$PKG_CONFIG" && \

10570

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10571

($PKG_CONFIG --exists --print-errors "$MM") 2>&5

10572

ac_status=$?

10573

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10574

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10575

(exit $ac_status); }; then

10576

pkg_cv_XINE_LIBS=`$PKG_CONFIG --libs "$MM" 2>/dev/null`

10577

else

10578

pkg_failed=yes

10579

fi

10580

- else

10581

- pkg_failed=untried

10582

+ fi

10583

+else

10584

+ pkg_failed=untried

10585

fi

10586

10587

10588

@@ -23476,41 +23250,41 @@ else

10589

_pkg_short_errors_supported=no

10590

fi

10591

if test $_pkg_short_errors_supported = yes; then

10592

- XINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1`

10593

+ XINE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MM"`

10594

else

10595

- XINE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1`

10596

+ XINE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MM"`

10597

fi

10598

# Put the nasty error message in config.log where it belongs

10599

echo "$XINE_PKG_ERRORS" >&5

10600

10601

- { $as_echo "$as_me:$LINENO: result: no" >&5

10602

-$as_echo "no" >&6; }

10603

+ { echo "$as_me:$LINENO: result: no" >&5

10604

+echo "${ECHO_T}no" >&6; }

10605

10606

- { $as_echo "$as_me:$LINENO: result: no" >&5

10607

-$as_echo "no" >&6; }

10608

+ { echo "$as_me:$LINENO: result: no" >&5

10609

+echo "${ECHO_T}no" >&6; }

10610

HAVE_XINE=no

10611

10612

elif test $pkg_failed = untried; then

10613

10614

- { $as_echo "$as_me:$LINENO: result: no" >&5

10615

-$as_echo "no" >&6; }

10616

+ { echo "$as_me:$LINENO: result: no" >&5

10617

+echo "${ECHO_T}no" >&6; }

10618

HAVE_XINE=no

10619

10620

else

10621

XINE_CFLAGS=$pkg_cv_XINE_CFLAGS

10622

XINE_LIBS=$pkg_cv_XINE_LIBS

10623

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10624

-$as_echo "yes" >&6; }

10625

+ { echo "$as_me:$LINENO: result: yes" >&5

10626

+echo "${ECHO_T}yes" >&6; }

10627

HAVE_XINE=yes

10628

fi

10629

- { $as_echo "$as_me:$LINENO: checking for backend libraries" >&5

10630

-$as_echo_n "checking for backend libraries... " >&6; }

10631

+ { echo "$as_me:$LINENO: checking for backend libraries" >&5

10632

+echo $ECHO_N "checking for backend libraries... $ECHO_C" >&6; }

10633

if test x$HAVE_XINE = xyes; then

10634

- { $as_echo "$as_me:$LINENO: result: xine-lib" >&5

10635

-$as_echo "xine-lib" >&6; }

10636

+ { echo "$as_me:$LINENO: result: xine-lib" >&5

10637

+echo "${ECHO_T}xine-lib" >&6; }

10638

else

10639

- { $as_echo "$as_me:$LINENO: WARNING: No xine-lib found" >&5

10640

-$as_echo "$as_me: WARNING: No xine-lib found" >&2;}

10641

+ { echo "$as_me:$LINENO: WARNING: No xine-lib found" >&5

10642

+echo "$as_me: WARNING: No xine-lib found" >&2;}

10643

fi

10644

fi

10645

10646

@@ -23531,8 +23305,8 @@ else

10647

fi

10648

10649

10650

-{ $as_echo "$as_me:$LINENO: checking Whether not to check for iso-codes" >&5

10651

-$as_echo_n "checking Whether not to check for iso-codes... " >&6; }

10652

+{ echo "$as_me:$LINENO: checking Whether not to check for iso-codes" >&5

10653

+echo $ECHO_N "checking Whether not to check for iso-codes... $ECHO_C" >&6; }

10654

# Check whether --enable-iso-codes was given.

10655

if test "${enable_iso_codes+set}" = set; then

10656

enableval=$enable_iso_codes;

10657

@@ -23541,22 +23315,22 @@ else

10658

fi

10659

10660

if test x$disable_iso_codes_check = xno ; then

10661

- { $as_echo "$as_me:$LINENO: result: no" >&5

10662

-$as_echo "no" >&6; }

10663

+ { echo "$as_me:$LINENO: result: no" >&5

10664

+echo "${ECHO_T}no" >&6; }

10665

else

10666

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10667

-$as_echo "yes" >&6; }

10668

+ { echo "$as_me:$LINENO: result: yes" >&5

10669

+echo "${ECHO_T}yes" >&6; }

10670

fi

10671

10672

if test x$disable_iso_codes_check = "xno" ; then

10673

- { $as_echo "$as_me:$LINENO: checking whether iso-codes has iso-639 domain" >&5

10674

-$as_echo_n "checking whether iso-codes has iso-639 domain... " >&6; }

10675

+ { echo "$as_me:$LINENO: checking whether iso-codes has iso-639 domain" >&5

10676

+echo $ECHO_N "checking whether iso-codes has iso-639 domain... $ECHO_C" >&6; }

10677

if $PKG_CONFIG --variable=domains iso-codes | grep 639 >/dev/null ; then

10678

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10679

-$as_echo "yes" >&6; }

10680

+ { echo "$as_me:$LINENO: result: yes" >&5

10681

+echo "${ECHO_T}yes" >&6; }

10682

else

10683

- { $as_echo "$as_me:$LINENO: result: no" >&5

10684

-$as_echo "no" >&6; }

10685

+ { echo "$as_me:$LINENO: result: no" >&5

10686

+echo "${ECHO_T}no" >&6; }

10687

fi

10688

10689

cat >>confdefs.h <<_ACEOF

10690

@@ -23578,8 +23352,8 @@ if test "${enable_gtk+set}" = set; then

10691

enableval=$enable_gtk; case "${enableval}" in

10692

yes) ENABLE_GTK=yes ;;

10693

no) ENABLE_GTK=no ;;

10694

- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-gtk" >&5

10695

-$as_echo "$as_me: error: bad value ${enableval} for --disable-gtk" >&2;}

10696

+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-gtk" >&5

10697

+echo "$as_me: error: bad value ${enableval} for --disable-gtk" >&2;}

10698

{ (exit 1); exit 1; }; } ;;

10699

esac

10700

else

10701

@@ -23590,40 +23364,44 @@ if test x$ENABLE_GTK = "xno" ; then

10702

# FIXME: use gmodule-no-export instead!

10703

10704

pkg_failed=no

10705

-{ $as_echo "$as_me:$LINENO: checking for EXTRA_GNOME" >&5

10706

-$as_echo_n "checking for EXTRA_GNOME... " >&6; }

10707

+{ echo "$as_me:$LINENO: checking for EXTRA_GNOME" >&5

10708

+echo $ECHO_N "checking for EXTRA_GNOME... $ECHO_C" >&6; }

10709

10710

-if test -n "$EXTRA_GNOME_CFLAGS"; then

10711

- pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS"

10712

- elif test -n "$PKG_CONFIG"; then

10713

- if test -n "$PKG_CONFIG" && \

10714

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gio-2.0 libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5

10715

+if test -n "$PKG_CONFIG"; then

10716

+ if test -n "$EXTRA_GNOME_CFLAGS"; then

10717

+ pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS"

10718

+ else

10719

+ if test -n "$PKG_CONFIG" && \

10720

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gio-2.0 libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5

10721

($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5

10722

ac_status=$?

10723

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10724

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10725

(exit $ac_status); }; then

10726

pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null`

10727

else

10728

pkg_failed=yes

10729

fi

10730

- else

10731

- pkg_failed=untried

10732

+ fi

10733

+else

10734

+ pkg_failed=untried

10735

fi

10736

-if test -n "$EXTRA_GNOME_LIBS"; then

10737

- pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS"

10738

- elif test -n "$PKG_CONFIG"; then

10739

- if test -n "$PKG_CONFIG" && \

10740

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gio-2.0 libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5

10741

+if test -n "$PKG_CONFIG"; then

10742

+ if test -n "$EXTRA_GNOME_LIBS"; then

10743

+ pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS"

10744

+ else

10745

+ if test -n "$PKG_CONFIG" && \

10746

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gio-2.0 libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5

10747

($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5

10748

ac_status=$?

10749

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10750

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10751

(exit $ac_status); }; then

10752

pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null`

10753

else

10754

pkg_failed=yes

10755

fi

10756

- else

10757

- pkg_failed=untried

10758

+ fi

10759

+else

10760

+ pkg_failed=untried

10761

fi

10762

10763

10764

@@ -23636,14 +23414,14 @@ else

10765

_pkg_short_errors_supported=no

10766

fi

10767

if test $_pkg_short_errors_supported = yes; then

10768

- EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>&1`

10769

+ EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES"`

10770

else

10771

- EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>&1`

10772

+ EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES"`

10773

fi

10774

# Put the nasty error message in config.log where it belongs

10775

echo "$EXTRA_GNOME_PKG_ERRORS" >&5

10776

10777

- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met:

10778

+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met:

10779

10780

$EXTRA_GNOME_PKG_ERRORS

10781

10782

@@ -23654,7 +23432,7 @@ Alternatively, you may set the environme

10783

and EXTRA_GNOME_LIBS to avoid the need to call pkg-config.

10784

See the pkg-config man page for more details.

10785

" >&5

10786

-$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met:

10787

+echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met:

10788

10789

$EXTRA_GNOME_PKG_ERRORS

10790

10791

@@ -23667,9 +23445,7 @@ See the pkg-config man page for more det

10792

" >&2;}

10793

{ (exit 1); exit 1; }; }

10794

elif test $pkg_failed = untried; then

10795

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

10796

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

10797

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

10798

+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

10799

is in your PATH or set the PKG_CONFIG environment variable to the full

10800

path to pkg-config.

10801

10802

@@ -23679,7 +23455,7 @@ See the pkg-config man page for more det

10803

10804

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

10805

See \`config.log' for more details." >&5

10806

-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

10807

+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

10808

is in your PATH or set the PKG_CONFIG environment variable to the full

10809

path to pkg-config.

10810

10811

@@ -23689,12 +23465,12 @@ See the pkg-config man page for more det

10812

10813

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

10814

See \`config.log' for more details." >&2;}

10815

- { (exit 1); exit 1; }; }; }

10816

+ { (exit 1); exit 1; }; }

10817

else

10818

EXTRA_GNOME_CFLAGS=$pkg_cv_EXTRA_GNOME_CFLAGS

10819

EXTRA_GNOME_LIBS=$pkg_cv_EXTRA_GNOME_LIBS

10820

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10821

-$as_echo "yes" >&6; }

10822

+ { echo "$as_me:$LINENO: result: yes" >&5

10823

+echo "${ECHO_T}yes" >&6; }

10824

:

10825

fi

10826

HAVE_GNOME=yes

10827

@@ -23702,40 +23478,44 @@ else

10828

# FIXME: use gmodule-no-export instead!

10829

10830

pkg_failed=no

10831

-{ $as_echo "$as_me:$LINENO: checking for EXTRA_GNOME" >&5

10832

-$as_echo_n "checking for EXTRA_GNOME... " >&6; }

10833

+{ echo "$as_me:$LINENO: checking for EXTRA_GNOME" >&5

10834

+echo $ECHO_N "checking for EXTRA_GNOME... $ECHO_C" >&6; }

10835

10836

-if test -n "$EXTRA_GNOME_CFLAGS"; then

10837

- pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS"

10838

- elif test -n "$PKG_CONFIG"; then

10839

- if test -n "$PKG_CONFIG" && \

10840

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gio-2.0 gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5

10841

+if test -n "$PKG_CONFIG"; then

10842

+ if test -n "$EXTRA_GNOME_CFLAGS"; then

10843

+ pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS"

10844

+ else

10845

+ if test -n "$PKG_CONFIG" && \

10846

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gio-2.0 gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5

10847

($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5

10848

ac_status=$?

10849

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10850

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10851

(exit $ac_status); }; then

10852

pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null`

10853

else

10854

pkg_failed=yes

10855

fi

10856

- else

10857

- pkg_failed=untried

10858

+ fi

10859

+else

10860

+ pkg_failed=untried

10861

fi

10862

-if test -n "$EXTRA_GNOME_LIBS"; then

10863

- pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS"

10864

- elif test -n "$PKG_CONFIG"; then

10865

- if test -n "$PKG_CONFIG" && \

10866

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gio-2.0 gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5

10867

+if test -n "$PKG_CONFIG"; then

10868

+ if test -n "$EXTRA_GNOME_LIBS"; then

10869

+ pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS"

10870

+ else

10871

+ if test -n "$PKG_CONFIG" && \

10872

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gio-2.0 gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES\"") >&5

10873

($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES") 2>&5

10874

ac_status=$?

10875

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10876

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10877

(exit $ac_status); }; then

10878

pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>/dev/null`

10879

else

10880

pkg_failed=yes

10881

fi

10882

- else

10883

- pkg_failed=untried

10884

+ fi

10885

+else

10886

+ pkg_failed=untried

10887

fi

10888

10889

10890

@@ -23748,14 +23528,14 @@ else

10891

_pkg_short_errors_supported=no

10892

fi

10893

if test $_pkg_short_errors_supported = yes; then

10894

- EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>&1`

10895

+ EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES"`

10896

else

10897

- EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES" 2>&1`

10898

+ EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES"`

10899

fi

10900

# Put the nasty error message in config.log where it belongs

10901

echo "$EXTRA_GNOME_PKG_ERRORS" >&5

10902

10903

- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met:

10904

+ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met:

10905

10906

$EXTRA_GNOME_PKG_ERRORS

10907

10908

@@ -23766,7 +23546,7 @@ Alternatively, you may set the environme

10909

and EXTRA_GNOME_LIBS to avoid the need to call pkg-config.

10910

See the pkg-config man page for more details.

10911

" >&5

10912

-$as_echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met:

10913

+echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES) were not met:

10914

10915

$EXTRA_GNOME_PKG_ERRORS

10916

10917

@@ -23779,9 +23559,7 @@ See the pkg-config man page for more det

10918

" >&2;}

10919

{ (exit 1); exit 1; }; }

10920

elif test $pkg_failed = untried; then

10921

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

10922

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

10923

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

10924

+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

10925

is in your PATH or set the PKG_CONFIG environment variable to the full

10926

path to pkg-config.

10927

10928

@@ -23791,7 +23569,7 @@ See the pkg-config man page for more det

10929

10930

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

10931

See \`config.log' for more details." >&5

10932

-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

10933

+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

10934

is in your PATH or set the PKG_CONFIG environment variable to the full

10935

path to pkg-config.

10936

10937

@@ -23801,12 +23579,12 @@ See the pkg-config man page for more det

10938

10939

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

10940

See \`config.log' for more details." >&2;}

10941

- { (exit 1); exit 1; }; }; }

10942

+ { (exit 1); exit 1; }; }

10943

else

10944

EXTRA_GNOME_CFLAGS=$pkg_cv_EXTRA_GNOME_CFLAGS

10945

EXTRA_GNOME_LIBS=$pkg_cv_EXTRA_GNOME_LIBS

10946

- { $as_echo "$as_me:$LINENO: result: yes" >&5

10947

-$as_echo "yes" >&6; }

10948

+ { echo "$as_me:$LINENO: result: yes" >&5

10949

+echo "${ECHO_T}yes" >&6; }

10950

:

10951

fi

10952

10953

@@ -23824,40 +23602,44 @@ fi

10954

10955

10956

pkg_failed=no

10957

-{ $as_echo "$as_me:$LINENO: checking for MM" >&5

10958

-$as_echo_n "checking for MM... " >&6; }

10959

+{ echo "$as_me:$LINENO: checking for MM" >&5

10960

+echo $ECHO_N "checking for MM... $ECHO_C" >&6; }

10961

10962

-if test -n "$MM_CFLAGS"; then

10963

- pkg_cv_MM_CFLAGS="$MM_CFLAGS"

10964

- elif test -n "$PKG_CONFIG"; then

10965

- if test -n "$PKG_CONFIG" && \

10966

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10967

+if test -n "$PKG_CONFIG"; then

10968

+ if test -n "$MM_CFLAGS"; then

10969

+ pkg_cv_MM_CFLAGS="$MM_CFLAGS"

10970

+ else

10971

+ if test -n "$PKG_CONFIG" && \

10972

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10973

($PKG_CONFIG --exists --print-errors "$MM") 2>&5

10974

ac_status=$?

10975

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

10976

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

10977

(exit $ac_status); }; then

10978

pkg_cv_MM_CFLAGS=`$PKG_CONFIG --cflags "$MM" 2>/dev/null`

10979

else

10980

pkg_failed=yes

10981

fi

10982

- else

10983

- pkg_failed=untried

10984

+ fi

10985

+else

10986

+ pkg_failed=untried

10987

fi

10988

-if test -n "$MM_LIBS"; then

10989

- pkg_cv_MM_LIBS="$MM_LIBS"

10990

- elif test -n "$PKG_CONFIG"; then

10991

- if test -n "$PKG_CONFIG" && \

10992

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10993

+if test -n "$PKG_CONFIG"; then

10994

+ if test -n "$MM_LIBS"; then

10995

+ pkg_cv_MM_LIBS="$MM_LIBS"

10996

+ else

10997

+ if test -n "$PKG_CONFIG" && \

10998

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MM\"") >&5

10999

($PKG_CONFIG --exists --print-errors "$MM") 2>&5

11000

ac_status=$?

11001

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11002

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

11003

(exit $ac_status); }; then

11004

pkg_cv_MM_LIBS=`$PKG_CONFIG --libs "$MM" 2>/dev/null`

11005

else

11006

pkg_failed=yes

11007

fi

11008

- else

11009

- pkg_failed=untried

11010

+ fi

11011

+else

11012

+ pkg_failed=untried

11013

fi

11014

11015

11016

@@ -23870,14 +23652,14 @@ else

11017

_pkg_short_errors_supported=no

11018

fi

11019

if test $_pkg_short_errors_supported = yes; then

11020

- MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$MM" 2>&1`

11021

+ MM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MM"`

11022

else

11023

- MM_PKG_ERRORS=`$PKG_CONFIG --print-errors "$MM" 2>&1`

11024

+ MM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MM"`

11025

fi

11026

# Put the nasty error message in config.log where it belongs

11027

echo "$MM_PKG_ERRORS" >&5

11028

11029

- { { $as_echo "$as_me:$LINENO: error: Package requirements ($MM) were not met:

11030

+ { { echo "$as_me:$LINENO: error: Package requirements ($MM) were not met:

11031

11032

$MM_PKG_ERRORS

11033

11034

@@ -23888,7 +23670,7 @@ Alternatively, you may set the environme

11035

and MM_LIBS to avoid the need to call pkg-config.

11036

See the pkg-config man page for more details.

11037

" >&5

11038

-$as_echo "$as_me: error: Package requirements ($MM) were not met:

11039

+echo "$as_me: error: Package requirements ($MM) were not met:

11040

11041

$MM_PKG_ERRORS

11042

11043

@@ -23901,9 +23683,7 @@ See the pkg-config man page for more det

11044

" >&2;}

11045

{ (exit 1); exit 1; }; }

11046

elif test $pkg_failed = untried; then

11047

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

11048

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

11049

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

11050

+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

11051

is in your PATH or set the PKG_CONFIG environment variable to the full

11052

path to pkg-config.

11053

11054

@@ -23913,7 +23693,7 @@ See the pkg-config man page for more det

11055

11056

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

11057

See \`config.log' for more details." >&5

11058

-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

11059

+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

11060

is in your PATH or set the PKG_CONFIG environment variable to the full

11061

path to pkg-config.

11062

11063

@@ -23923,12 +23703,12 @@ See the pkg-config man page for more det

11064

11065

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

11066

See \`config.log' for more details." >&2;}

11067

- { (exit 1); exit 1; }; }; }

11068

+ { (exit 1); exit 1; }; }

11069

else

11070

MM_CFLAGS=$pkg_cv_MM_CFLAGS

11071

MM_LIBS=$pkg_cv_MM_LIBS

11072

- { $as_echo "$as_me:$LINENO: result: yes" >&5

11073

-$as_echo "yes" >&6; }

11074

+ { echo "$as_me:$LINENO: result: yes" >&5

11075

+echo "${ECHO_T}yes" >&6; }

11076

:

11077

fi

11078

11079

@@ -23947,40 +23727,44 @@ EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS $EXT

11080

11081

11082

pkg_failed=no

11083

-{ $as_echo "$as_me:$LINENO: checking for GTK" >&5

11084

-$as_echo_n "checking for GTK... " >&6; }

11085

+{ echo "$as_me:$LINENO: checking for GTK" >&5

11086

+echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }

11087

11088

-if test -n "$GTK_CFLAGS"; then

11089

- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"

11090

- elif test -n "$PKG_CONFIG"; then

11091

- if test -n "$PKG_CONFIG" && \

11092

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\"") >&5

11093

+if test -n "$PKG_CONFIG"; then

11094

+ if test -n "$GTK_CFLAGS"; then

11095

+ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"

11096

+ else

11097

+ if test -n "$PKG_CONFIG" && \

11098

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\"") >&5

11099

($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5

11100

ac_status=$?

11101

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11102

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

11103

(exit $ac_status); }; then

11104

pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 gthread-2.0" 2>/dev/null`

11105

else

11106

pkg_failed=yes

11107

fi

11108

- else

11109

- pkg_failed=untried

11110

+ fi

11111

+else

11112

+ pkg_failed=untried

11113

fi

11114

-if test -n "$GTK_LIBS"; then

11115

- pkg_cv_GTK_LIBS="$GTK_LIBS"

11116

- elif test -n "$PKG_CONFIG"; then

11117

- if test -n "$PKG_CONFIG" && \

11118

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\"") >&5

11119

+if test -n "$PKG_CONFIG"; then

11120

+ if test -n "$GTK_LIBS"; then

11121

+ pkg_cv_GTK_LIBS="$GTK_LIBS"

11122

+ else

11123

+ if test -n "$PKG_CONFIG" && \

11124

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\"") >&5

11125

($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5

11126

ac_status=$?

11127

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11128

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

11129

(exit $ac_status); }; then

11130

pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 gthread-2.0" 2>/dev/null`

11131

else

11132

pkg_failed=yes

11133

fi

11134

- else

11135

- pkg_failed=untried

11136

+ fi

11137

+else

11138

+ pkg_failed=untried

11139

fi

11140

11141

11142

@@ -23993,14 +23777,14 @@ else

11143

_pkg_short_errors_supported=no

11144

fi

11145

if test $_pkg_short_errors_supported = yes; then

11146

- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 gthread-2.0" 2>&1`

11147

+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0"`

11148

else

11149

- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 gthread-2.0" 2>&1`

11150

+ GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0"`

11151

fi

11152

# Put the nasty error message in config.log where it belongs

11153

echo "$GTK_PKG_ERRORS" >&5

11154

11155

- { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 gthread-2.0) were not met:

11156

+ { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 gthread-2.0) were not met:

11157

11158

$GTK_PKG_ERRORS

11159

11160

@@ -24011,7 +23795,7 @@ Alternatively, you may set the environme

11161

and GTK_LIBS to avoid the need to call pkg-config.

11162

See the pkg-config man page for more details.

11163

" >&5

11164

-$as_echo "$as_me: error: Package requirements (gtk+-2.0 gthread-2.0) were not met:

11165

+echo "$as_me: error: Package requirements (gtk+-2.0 gthread-2.0) were not met:

11166

11167

$GTK_PKG_ERRORS

11168

11169

@@ -24024,9 +23808,7 @@ See the pkg-config man page for more det

11170

" >&2;}

11171

{ (exit 1); exit 1; }; }

11172

elif test $pkg_failed = untried; then

11173

- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5

11174

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

11175

-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

11176

+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it

11177

is in your PATH or set the PKG_CONFIG environment variable to the full

11178

path to pkg-config.

11179

11180

@@ -24036,7 +23818,7 @@ See the pkg-config man page for more det

11181

11182

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

11183

See \`config.log' for more details." >&5

11184

-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

11185

+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it

11186

is in your PATH or set the PKG_CONFIG environment variable to the full

11187

path to pkg-config.

11188

11189

@@ -24046,12 +23828,12 @@ See the pkg-config man page for more det

11190

11191

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

11192

See \`config.log' for more details." >&2;}

11193

- { (exit 1); exit 1; }; }; }

11194

+ { (exit 1); exit 1; }; }

11195

else

11196

GTK_CFLAGS=$pkg_cv_GTK_CFLAGS

11197

GTK_LIBS=$pkg_cv_GTK_LIBS

11198

- { $as_echo "$as_me:$LINENO: result: yes" >&5

11199

-$as_echo "yes" >&6; }

11200

+ { echo "$as_me:$LINENO: result: yes" >&5

11201

+echo "${ECHO_T}yes" >&6; }

11202

:

11203

fi

11204

11205

@@ -24060,8 +23842,8 @@ GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS"

11206

11207

have_x11=no

11208

if test x$(pkg-config --variable=target gtk+-2.0) = xx11; then

11209

- { $as_echo "$as_me:$LINENO: checking for X" >&5

11210

-$as_echo_n "checking for X... " >&6; }

11211

+ { echo "$as_me:$LINENO: checking for X" >&5

11212

+echo $ECHO_N "checking for X... $ECHO_C" >&6; }

11213

11214

11215

# Check whether --with-x was given.

11216

@@ -24075,11 +23857,11 @@ if test "x$with_x" = xno; then

11217

have_x=disabled

11218

else

11219

case $x_includes,$x_libraries in #(

11220

- *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5

11221

-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}

11222

+ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5

11223

+echo "$as_me: error: Cannot use X directory names containing '" >&2;}

11224

{ (exit 1); exit 1; }; };; #(

11225

*,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then

11226

- $as_echo_n "(cached) " >&6

11227

+ echo $ECHO_N "(cached) $ECHO_C" >&6

11228

else

11229

# One or both of the vars are not set, and there is no cached value.

11230

ac_x_includes=no ac_x_libraries=no

11231

@@ -24100,7 +23882,7 @@ _ACEOF

11232

eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"

11233

done

11234

# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.

11235

- for ac_extension in a so sl dylib la dll; do

11236

+ for ac_extension in a so sl; do

11237

if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&

11238

test -f "$ac_im_libdir/libX11.$ac_extension"; then

11239

ac_im_usrlibdir=$ac_im_libdir; break

11240

@@ -24114,7 +23896,7 @@ _ACEOF

11241

*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;

11242

esac

11243

case $ac_im_usrlibdir in

11244

- /usr/lib | /usr/lib64 | /lib | /lib64) ;;

11245

+ /usr/lib | /lib) ;;

11246

*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;

11247

esac

11248

fi

11249

@@ -24175,14 +23957,13 @@ case "(($ac_try" in

11250

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11251

*) ac_try_echo=$ac_try;;

11252

esac

11253

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11254

-$as_echo "$ac_try_echo") >&5

11255

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11256

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

11257

ac_status=$?

11258

grep -v '^ *+' conftest.er1 >conftest.err

11259

rm -f conftest.er1

11260

cat conftest.err >&5

11261

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11262

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

11263

(exit $ac_status); } >/dev/null && {

11264

test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

11265

test ! -s conftest.err

11266

@@ -24190,7 +23971,7 @@ $as_echo "$ac_try_echo") >&5

11267

# We can compile using X headers with no special include directory.

11268

ac_x_includes=

11269

else

11270

- $as_echo "$as_me: failed program was:" >&5

11271

+ echo "$as_me: failed program was:" >&5

11272

sed 's/^/| /' conftest.$ac_ext >&5

11273

11274

for ac_dir in $ac_x_header_dirs; do

11275

@@ -24231,33 +24012,30 @@ case "(($ac_try" in

11276

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11277

*) ac_try_echo=$ac_try;;

11278

esac

11279

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11280

-$as_echo "$ac_try_echo") >&5

11281

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11282

(eval "$ac_link") 2>conftest.er1

11283

ac_status=$?

11284

grep -v '^ *+' conftest.er1 >conftest.err

11285

rm -f conftest.er1

11286

cat conftest.err >&5

11287

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11288

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

11289

(exit $ac_status); } && {

11290

test -z "$ac_c_werror_flag" ||

11291

test ! -s conftest.err

11292

- } && test -s conftest$ac_exeext && {

11293

- test "$cross_compiling" = yes ||

11294

- $as_test_x conftest$ac_exeext

11295

- }; then

11296

+ } && test -s conftest$ac_exeext &&

11297

+ $as_test_x conftest$ac_exeext; then

11298

LIBS=$ac_save_LIBS

11299

# We can link X programs with no special library path.

11300

ac_x_libraries=

11301

else

11302

- $as_echo "$as_me: failed program was:" >&5

11303

+ echo "$as_me: failed program was:" >&5

11304

sed 's/^/| /' conftest.$ac_ext >&5

11305

11306

LIBS=$ac_save_LIBS

11307

-for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`

11308

+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`

11309

do

11310

# Don't even attempt the hair of trying to link an X program!

11311

- for ac_extension in a so sl dylib la dll; do

11312

+ for ac_extension in a so sl; do

11313

if test -r "$ac_dir/libX11.$ac_extension"; then

11314

ac_x_libraries=$ac_dir

11315

break 2

11316

@@ -24266,7 +24044,6 @@ do

11317

done

11318

fi

11319

11320

-rm -rf conftest.dSYM

11321

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11322

conftest$ac_exeext conftest.$ac_ext

11323

fi # $ac_x_libraries = no

11324

@@ -24289,8 +24066,8 @@ fi

11325

fi # $with_x != no

11326

11327

if test "$have_x" != yes; then

11328

- { $as_echo "$as_me:$LINENO: result: $have_x" >&5

11329

-$as_echo "$have_x" >&6; }

11330

+ { echo "$as_me:$LINENO: result: $have_x" >&5

11331

+echo "${ECHO_T}$have_x" >&6; }

11332

no_x=yes

11333

else

11334

# If each of the values was on the command line, it overrides each guess.

11335

@@ -24300,8 +24077,8 @@ else

11336

ac_cv_have_x="have_x=yes\

11337

ac_x_includes='$x_includes'\

11338

ac_x_libraries='$x_libraries'"

11339

- { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5

11340

-$as_echo "libraries $x_libraries, headers $x_includes" >&6; }

11341

+ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5

11342

+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }

11343

fi

11344

11345

11346

@@ -24316,121 +24093,46 @@ fi

11347

CFLAGS="$X_INCLUDES $CFLAGS"

11348

LIBS="$X_LIBRARIES $LIBS"

11349

11350

- XTEST_LIBS=""

11351

- enable_xtest=no

11352

- { $as_echo "$as_me:$LINENO: checking for XTestFakeKeyEvent in -lXtst" >&5

11353

-$as_echo_n "checking for XTestFakeKeyEvent in -lXtst... " >&6; }

11354

-if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then

11355

- $as_echo_n "(cached) " >&6

11356

-else

11357

- ac_check_lib_save_LIBS=$LIBS

11358

-LIBS="-lXtst $X_LIBRARIES $LIBS"

11359

-cat >conftest.$ac_ext <<_ACEOF

11360

-/* confdefs.h. */

11361

-_ACEOF

11362

-cat confdefs.h >>conftest.$ac_ext

11363

-cat >>conftest.$ac_ext <<_ACEOF

11364

-/* end confdefs.h. */

11365

-

11366

-/* Override any GCC internal prototype to avoid an error.

11367

- Use char because int might match the return type of a GCC

11368

- builtin and then its argument prototype would still apply. */

11369

-#ifdef __cplusplus

11370

-extern "C"

11371

-#endif

11372

-char XTestFakeKeyEvent ();

11373

-int

11374

-main ()

11375

-{

11376

-return XTestFakeKeyEvent ();

11377

- ;

11378

- return 0;

11379

-}

11380

-_ACEOF

11381

-rm -f conftest.$ac_objext conftest$ac_exeext

11382

-if { (ac_try="$ac_link"

11383

-case "(($ac_try" in

11384

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11385

- *) ac_try_echo=$ac_try;;

11386

-esac

11387

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11388

-$as_echo "$ac_try_echo") >&5

11389

- (eval "$ac_link") 2>conftest.er1

11390

- ac_status=$?

11391

- grep -v '^ *+' conftest.er1 >conftest.err

11392

- rm -f conftest.er1

11393

- cat conftest.err >&5

11394

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11395

- (exit $ac_status); } && {

11396

- test -z "$ac_c_werror_flag" ||

11397

- test ! -s conftest.err

11398

- } && test -s conftest$ac_exeext && {

11399

- test "$cross_compiling" = yes ||

11400

- $as_test_x conftest$ac_exeext

11401

- }; then

11402

- ac_cv_lib_Xtst_XTestFakeKeyEvent=yes

11403

-else

11404

- $as_echo "$as_me: failed program was:" >&5

11405

-sed 's/^/| /' conftest.$ac_ext >&5

11406

-

11407

- ac_cv_lib_Xtst_XTestFakeKeyEvent=no

11408

-fi

11409

-

11410

-rm -rf conftest.dSYM

11411

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

11412

- conftest$ac_exeext conftest.$ac_ext

11413

-LIBS=$ac_check_lib_save_LIBS

11414

-fi

11415

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xtst_XTestFakeKeyEvent" >&5

11416

-$as_echo "$ac_cv_lib_Xtst_XTestFakeKeyEvent" >&6; }

11417

-if test "x$ac_cv_lib_Xtst_XTestFakeKeyEvent" = x""yes; then

11418

- XTEST_LIBS="-lX11 -lXtst $X_LIBRARIES"

11419

- enable_xtest=yes

11420

-

11421

-cat >>confdefs.h <<\_ACEOF

11422

-#define HAVE_XTEST 1

11423

-_ACEOF

11424

-

11425

-fi

11426

-

11427

-

11428

-

11429

11430

pkg_failed=no

11431

-{ $as_echo "$as_me:$LINENO: checking for XVIDMODE" >&5

11432

-$as_echo_n "checking for XVIDMODE... " >&6; }

11433

+{ echo "$as_me:$LINENO: checking for XVIDMODE" >&5

11434

+echo $ECHO_N "checking for XVIDMODE... $ECHO_C" >&6; }

11435

11436

-if test -n "$XVIDMODE_CFLAGS"; then

11437

- pkg_cv_XVIDMODE_CFLAGS="$XVIDMODE_CFLAGS"

11438

- elif test -n "$PKG_CONFIG"; then

11439

- if test -n "$PKG_CONFIG" && \

11440

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\"") >&5

11441

+if test -n "$PKG_CONFIG"; then

11442

+ if test -n "$XVIDMODE_CFLAGS"; then

11443

+ pkg_cv_XVIDMODE_CFLAGS="$XVIDMODE_CFLAGS"

11444

+ else

11445

+ if test -n "$PKG_CONFIG" && \

11446

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\"") >&5

11447

($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5

11448

ac_status=$?

11449

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11450

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

11451

(exit $ac_status); }; then

11452

pkg_cv_XVIDMODE_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>/dev/null`

11453

else

11454

pkg_failed=yes

11455

fi

11456

- else

11457

- pkg_failed=untried

11458

+ fi

11459

+else

11460

+ pkg_failed=untried

11461

fi

11462

-if test -n "$XVIDMODE_LIBS"; then

11463

- pkg_cv_XVIDMODE_LIBS="$XVIDMODE_LIBS"

11464

- elif test -n "$PKG_CONFIG"; then

11465

- if test -n "$PKG_CONFIG" && \

11466

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\"") >&5

11467

+if test -n "$PKG_CONFIG"; then

11468

+ if test -n "$XVIDMODE_LIBS"; then

11469

+ pkg_cv_XVIDMODE_LIBS="$XVIDMODE_LIBS"

11470

+ else

11471

+ if test -n "$PKG_CONFIG" && \

11472

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\"") >&5

11473

($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5

11474

ac_status=$?

11475

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11476

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

11477

(exit $ac_status); }; then

11478

pkg_cv_XVIDMODE_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>/dev/null`

11479

else

11480

pkg_failed=yes

11481

fi

11482

- else

11483

- pkg_failed=untried

11484

+ fi

11485

+else

11486

+ pkg_failed=untried

11487

fi

11488

11489

11490

@@ -24443,30 +24145,30 @@ else

11491

_pkg_short_errors_supported=no

11492

fi

11493

if test $_pkg_short_errors_supported = yes; then

11494

- XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>&1`

11495

+ XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1"`

11496

else

11497

- XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1" 2>&1`

11498

+ XVIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1"`

11499

fi

11500

# Put the nasty error message in config.log where it belongs

11501

echo "$XVIDMODE_PKG_ERRORS" >&5

11502

11503

- { $as_echo "$as_me:$LINENO: result: no" >&5

11504

-$as_echo "no" >&6; }

11505

+ { echo "$as_me:$LINENO: result: no" >&5

11506

+echo "${ECHO_T}no" >&6; }

11507

have_xvidmode=no

11508

elif test $pkg_failed = untried; then

11509

have_xvidmode=no

11510

else

11511

XVIDMODE_CFLAGS=$pkg_cv_XVIDMODE_CFLAGS

11512

XVIDMODE_LIBS=$pkg_cv_XVIDMODE_LIBS

11513

- { $as_echo "$as_me:$LINENO: result: yes" >&5

11514

-$as_echo "yes" >&6; }

11515

+ { echo "$as_me:$LINENO: result: yes" >&5

11516

+echo "${ECHO_T}yes" >&6; }

11517

have_xvidmode=yes

11518

fi

11519

11520

if test x$have_xvidmode = xyes; then

11521

11522

cat >>confdefs.h <<\_ACEOF

11523

-#define HAVE_XVIDMODE /**/

11524

+#define HAVE_XVIDMODE

11525

_ACEOF

11526

11527

fi

11528

@@ -24491,14 +24193,13 @@ case "(($ac_try" in

11529

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11530

*) ac_try_echo=$ac_try;;

11531

esac

11532

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11533

-$as_echo "$ac_try_echo") >&5

11534

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11535

(eval "$ac_compile") 2>conftest.er1

11536

ac_status=$?

11537

grep -v '^ *+' conftest.er1 >conftest.err

11538

rm -f conftest.er1

11539

cat conftest.err >&5

11540

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11541

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

11542

(exit $ac_status); } && {

11543

test -z "$ac_c_werror_flag" ||

11544

test ! -s conftest.err

11545

@@ -24506,17 +24207,17 @@ $as_echo "$ac_try_echo") >&5

11546

have_xfree=yes

11547

11548

else

11549

- $as_echo "$as_me: failed program was:" >&5

11550

+ echo "$as_me: failed program was:" >&5

11551

sed 's/^/| /' conftest.$ac_ext >&5

11552

11553

11554

fi

11555

11556

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

11557

- { $as_echo "$as_me:$LINENO: checking for X11 XFree86 headers" >&5

11558

-$as_echo_n "checking for X11 XFree86 headers... " >&6; }

11559

- { $as_echo "$as_me:$LINENO: result: $have_xfree" >&5

11560

-$as_echo "$have_xfree" >&6; }

11561

+ { echo "$as_me:$LINENO: checking for X11 XFree86 headers" >&5

11562

+echo $ECHO_N "checking for X11 XFree86 headers... $ECHO_C" >&6; }

11563

+ { echo "$as_me:$LINENO: result: $have_xfree" >&5

11564

+echo "${ECHO_T}$have_xfree" >&6; }

11565

if test x"$have_xfree" = "xyes" ; then

11566

11567

cat >>confdefs.h <<\_ACEOF

11568

@@ -24535,8 +24236,8 @@ fi

11569

11570

11571

11572

-{ $as_echo "$as_me:$LINENO: checking whether Python plugin support is requested" >&5

11573

-$as_echo_n "checking whether Python plugin support is requested... " >&6; }

11574

+{ echo "$as_me:$LINENO: checking whether Python plugin support is requested" >&5

11575

+echo $ECHO_N "checking whether Python plugin support is requested... $ECHO_C" >&6; }

11576

# Check whether --enable-python was given.

11577

if test "${enable_python+set}" = set; then

11578

enableval=$enable_python; enable_python=$enableval have_python=$enableval

11579

@@ -24544,18 +24245,18 @@ else

11580

enable_python=autodetect have_python=yes

11581

fi

11582

11583

-{ $as_echo "$as_me:$LINENO: result: $enable_python" >&5

11584

-$as_echo "$enable_python" >&6; }

11585

+{ echo "$as_me:$LINENO: result: $enable_python" >&5

11586

+echo "${ECHO_T}$enable_python" >&6; }

11587

11588

if test "x$have_python" != "xyes"; then

11589

if test "x$enable_python" = "xyes"; then

11590

- { { $as_echo "$as_me:$LINENO: error: Python not found" >&5

11591

-$as_echo "$as_me: error: Python not found" >&2;}

11592

+ { { echo "$as_me:$LINENO: error: Python not found" >&5

11593

+echo "$as_me: error: Python not found" >&2;}

11594

{ (exit 1); exit 1; }; }

11595

elif test "x$enable_python" = "xautodetect"; then

11596

enable_python=no

11597

- { $as_echo "$as_me:$LINENO: WARNING: Python not found, disabling python support" >&5

11598

-$as_echo "$as_me: WARNING: Python not found, disabling python support" >&2;}

11599

+ { echo "$as_me:$LINENO: WARNING: Python not found, disabling python support" >&5

11600

+echo "$as_me: WARNING: Python not found, disabling python support" >&2;}

11601

fi

11602

fi

11603

11604

@@ -24566,8 +24267,8 @@ if test "x$have_python" != "xno"; then

11605

11606

if test -n "$PYTHON"; then

11607

# If the user set $PYTHON, use it and don't search something else.

11608

- { $as_echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3" >&5

11609

-$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; }

11610

+ { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.3" >&5

11611

+echo $ECHO_N "checking whether $PYTHON version >= 2.3... $ECHO_C" >&6; }

11612

prog="import sys, string

11613

# split strings by '.' and convert to numeric. Append some zeros

11614

# because we need at least 4 digits for the hex conversion.

11615

@@ -24580,11 +24281,11 @@ sys.exit(sys.hexversion < minverhex)"

11616

ac_status=$?

11617

echo "$as_me:$LINENO: \$? = $ac_status" >&5

11618

(exit $ac_status); }; then

11619

- { $as_echo "$as_me:$LINENO: result: yes" >&5

11620

-$as_echo "yes" >&6; }

11621

+ { echo "$as_me:$LINENO: result: yes" >&5

11622

+echo "${ECHO_T}yes" >&6; }

11623

else

11624

- { { $as_echo "$as_me:$LINENO: error: too old" >&5

11625

-$as_echo "$as_me: error: too old" >&2;}

11626

+ { { echo "$as_me:$LINENO: error: too old" >&5

11627

+echo "$as_me: error: too old" >&2;}

11628

{ (exit 1); exit 1; }; }

11629

fi

11630

11631

@@ -24592,10 +24293,10 @@ fi

11632

else

11633

# Otherwise, try each interpreter until we find one that satisfies

11634

# VERSION.

11635

- { $as_echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.3" >&5

11636

-$as_echo_n "checking for a Python interpreter with version >= 2.3... " >&6; }

11637

+ { echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.3" >&5

11638

+echo $ECHO_N "checking for a Python interpreter with version >= 2.3... $ECHO_C" >&6; }

11639

if test "${am_cv_pathless_PYTHON+set}" = set; then

11640

- $as_echo_n "(cached) " >&6

11641

+ echo $ECHO_N "(cached) $ECHO_C" >&6

11642

else

11643

11644

for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do

11645

@@ -24617,18 +24318,18 @@ fi

11646

11647

done

11648

fi

11649

-{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5

11650

-$as_echo "$am_cv_pathless_PYTHON" >&6; }

11651

+{ echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5

11652

+echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6; }

11653

# Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.

11654

if test "$am_cv_pathless_PYTHON" = none; then

11655

PYTHON=:

11656

else

11657

# Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.

11658

set dummy $am_cv_pathless_PYTHON; ac_word=$2

11659

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

11660

-$as_echo_n "checking for $ac_word... " >&6; }

11661

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

11662

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

11663

if test "${ac_cv_path_PYTHON+set}" = set; then

11664

- $as_echo_n "(cached) " >&6

11665

+ echo $ECHO_N "(cached) $ECHO_C" >&6

11666

else

11667

case $PYTHON in

11668

[\\/]* | ?:[\\/]*)

11669

@@ -24643,7 +24344,7 @@ do

11670

for ac_exec_ext in '' $ac_executable_extensions; do

11671

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

11672

ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"

11673

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11674

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

11675

break 2

11676

fi

11677

done

11678

@@ -24655,11 +24356,11 @@ esac

11679

fi

11680

PYTHON=$ac_cv_path_PYTHON

11681

if test -n "$PYTHON"; then

11682

- { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5

11683

-$as_echo "$PYTHON" >&6; }

11684

+ { echo "$as_me:$LINENO: result: $PYTHON" >&5

11685

+echo "${ECHO_T}$PYTHON" >&6; }

11686

else

11687

- { $as_echo "$as_me:$LINENO: result: no" >&5

11688

-$as_echo "no" >&6; }

11689

+ { echo "$as_me:$LINENO: result: no" >&5

11690

+echo "${ECHO_T}no" >&6; }

11691

fi

11692

11693

11694

@@ -24673,15 +24374,15 @@ fi

11695

else

11696

11697

11698

- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5

11699

-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }

11700

+ { echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5

11701

+echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6; }

11702

if test "${am_cv_python_version+set}" = set; then

11703

- $as_echo_n "(cached) " >&6

11704

+ echo $ECHO_N "(cached) $ECHO_C" >&6

11705

else

11706

am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`

11707

fi

11708

-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5

11709

-$as_echo "$am_cv_python_version" >&6; }

11710

+{ echo "$as_me:$LINENO: result: $am_cv_python_version" >&5

11711

+echo "${ECHO_T}$am_cv_python_version" >&6; }

11712

PYTHON_VERSION=$am_cv_python_version

11713

11714

11715

@@ -24692,30 +24393,30 @@ $as_echo "$am_cv_python_version" >&6; }

11716

11717

11718

11719

- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5

11720

-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }

11721

+ { echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5

11722

+echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6; }

11723

if test "${am_cv_python_platform+set}" = set; then

11724

- $as_echo_n "(cached) " >&6

11725

+ echo $ECHO_N "(cached) $ECHO_C" >&6

11726

else

11727

am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`

11728

fi

11729

-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5

11730

-$as_echo "$am_cv_python_platform" >&6; }

11731

+{ echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5

11732

+echo "${ECHO_T}$am_cv_python_platform" >&6; }

11733

PYTHON_PLATFORM=$am_cv_python_platform

11734

11735

11736

11737

11738

- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5

11739

-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }

11740

+ { echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5

11741

+echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6; }

11742

if test "${am_cv_python_pythondir+set}" = set; then

11743

- $as_echo_n "(cached) " >&6

11744

+ echo $ECHO_N "(cached) $ECHO_C" >&6

11745

else

11746

am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||

11747

echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`

11748

fi

11749

-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5

11750

-$as_echo "$am_cv_python_pythondir" >&6; }

11751

+{ echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5

11752

+echo "${ECHO_T}$am_cv_python_pythondir" >&6; }

11753

pythondir=$am_cv_python_pythondir

11754

11755

11756

@@ -24723,16 +24424,16 @@ $as_echo "$am_cv_python_pythondir" >&6;

11757

pkgpythondir=\${pythondir}/$PACKAGE

11758

11759

11760

- { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5

11761

-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }

11762

+ { echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5

11763

+echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6; }

11764

if test "${am_cv_python_pyexecdir+set}" = set; then

11765

- $as_echo_n "(cached) " >&6

11766

+ echo $ECHO_N "(cached) $ECHO_C" >&6

11767

else

11768

am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||

11769

echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`

11770

fi

11771

-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5

11772

-$as_echo "$am_cv_python_pyexecdir" >&6; }

11773

+{ echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5

11774

+echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }

11775

pyexecdir=$am_cv_python_pyexecdir

11776

11777

11778

@@ -24774,21 +24475,22 @@ if test "x$have_python" != "xno"; then

11779

11780

11781

pkg_failed=no

11782

-{ $as_echo "$as_me:$LINENO: checking for PYGTK" >&5

11783

-$as_echo_n "checking for PYGTK... " >&6; }

11784

+{ echo "$as_me:$LINENO: checking for PYGTK" >&5

11785

+echo $ECHO_N "checking for PYGTK... $ECHO_C" >&6; }

11786

11787

-if test -n "$PYGTK_CFLAGS"; then

11788

- pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"

11789

- elif test -n "$PKG_CONFIG"; then

11790

- if test -n "$PKG_CONFIG" && \

11791

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

11792

+if test -n "$PKG_CONFIG"; then

11793

+ if test -n "$PYGTK_CFLAGS"; then

11794

+ pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS"

11795

+ else

11796

+ if test -n "$PKG_CONFIG" && \

11797

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

11798

pygtk-2.0 >= \$PYGTK_REQUIRED

11799

totem-plparser >= \$TOTEM_PLPARSER_REQS\"") >&5

11800

($PKG_CONFIG --exists --print-errors "

11801

pygtk-2.0 >= $PYGTK_REQUIRED

11802

totem-plparser >= $TOTEM_PLPARSER_REQS") 2>&5

11803

ac_status=$?

11804

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11805

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

11806

(exit $ac_status); }; then

11807

pkg_cv_PYGTK_CFLAGS=`$PKG_CONFIG --cflags "

11808

pygtk-2.0 >= $PYGTK_REQUIRED

11809

@@ -24796,21 +24498,23 @@ if test -n "$PYGTK_CFLAGS"; then

11810

else

11811

pkg_failed=yes

11812

fi

11813

- else

11814

- pkg_failed=untried

11815

+ fi

11816

+else

11817

+ pkg_failed=untried

11818

fi

11819

-if test -n "$PYGTK_LIBS"; then

11820

- pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"

11821

- elif test -n "$PKG_CONFIG"; then

11822

- if test -n "$PKG_CONFIG" && \

11823

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

11824

+if test -n "$PKG_CONFIG"; then

11825

+ if test -n "$PYGTK_LIBS"; then

11826

+ pkg_cv_PYGTK_LIBS="$PYGTK_LIBS"

11827

+ else

11828

+ if test -n "$PKG_CONFIG" && \

11829

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"

11830

pygtk-2.0 >= \$PYGTK_REQUIRED

11831

totem-plparser >= \$TOTEM_PLPARSER_REQS\"") >&5

11832

($PKG_CONFIG --exists --print-errors "

11833

pygtk-2.0 >= $PYGTK_REQUIRED

11834

totem-plparser >= $TOTEM_PLPARSER_REQS") 2>&5

11835

ac_status=$?

11836

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11837

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

11838

(exit $ac_status); }; then

11839

pkg_cv_PYGTK_LIBS=`$PKG_CONFIG --libs "

11840

pygtk-2.0 >= $PYGTK_REQUIRED

11841

@@ -24818,8 +24522,9 @@ if test -n "$PYGTK_LIBS"; then

11842

else

11843

pkg_failed=yes

11844

fi

11845

- else

11846

- pkg_failed=untried

11847

+ fi

11848

+else

11849

+ pkg_failed=untried

11850

fi

11851

11852

11853

@@ -24832,53 +24537,53 @@ else

11854

_pkg_short_errors_supported=no

11855

fi

11856

if test $_pkg_short_errors_supported = yes; then

11857

- PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "

11858

+ PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "

11859

pygtk-2.0 >= $PYGTK_REQUIRED

11860

- totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1`

11861

+ totem-plparser >= $TOTEM_PLPARSER_REQS"`

11862

else

11863

- PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "

11864

+ PYGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "

11865

pygtk-2.0 >= $PYGTK_REQUIRED

11866

- totem-plparser >= $TOTEM_PLPARSER_REQS" 2>&1`

11867

+ totem-plparser >= $TOTEM_PLPARSER_REQS"`

11868

fi

11869

# Put the nasty error message in config.log where it belongs

11870

echo "$PYGTK_PKG_ERRORS" >&5

11871

11872

- { $as_echo "$as_me:$LINENO: result: no" >&5

11873

-$as_echo "no" >&6; }

11874

+ { echo "$as_me:$LINENO: result: no" >&5

11875

+echo "${ECHO_T}no" >&6; }

11876

11877

have_python=no

11878

if test "x$enable_python" = "xyes"; then

11879

- { { $as_echo "$as_me:$LINENO: error: $PYGTK_PKG_ERRORS" >&5

11880

-$as_echo "$as_me: error: $PYGTK_PKG_ERRORS" >&2;}

11881

+ { { echo "$as_me:$LINENO: error: $PYGTK_PKG_ERRORS" >&5

11882

+echo "$as_me: error: $PYGTK_PKG_ERRORS" >&2;}

11883

{ (exit 1); exit 1; }; }

11884

elif test "x$enable_python" = "xautodetect"; then

11885

enable_python=no

11886

- { $as_echo "$as_me:$LINENO: WARNING: $PYGTK_PKG_ERRORS" >&5

11887

-$as_echo "$as_me: WARNING: $PYGTK_PKG_ERRORS" >&2;}

11888

- { $as_echo "$as_me:$LINENO: WARNING: Disabling python support" >&5

11889

-$as_echo "$as_me: WARNING: Disabling python support" >&2;}

11890

+ { echo "$as_me:$LINENO: WARNING: $PYGTK_PKG_ERRORS" >&5

11891

+echo "$as_me: WARNING: $PYGTK_PKG_ERRORS" >&2;}

11892

+ { echo "$as_me:$LINENO: WARNING: Disabling python support" >&5

11893

+echo "$as_me: WARNING: Disabling python support" >&2;}

11894

fi

11895

11896

elif test $pkg_failed = untried; then

11897

11898

have_python=no

11899

if test "x$enable_python" = "xyes"; then

11900

- { { $as_echo "$as_me:$LINENO: error: $PYGTK_PKG_ERRORS" >&5

11901

-$as_echo "$as_me: error: $PYGTK_PKG_ERRORS" >&2;}

11902

+ { { echo "$as_me:$LINENO: error: $PYGTK_PKG_ERRORS" >&5

11903

+echo "$as_me: error: $PYGTK_PKG_ERRORS" >&2;}

11904

{ (exit 1); exit 1; }; }

11905

elif test "x$enable_python" = "xautodetect"; then

11906

enable_python=no

11907

- { $as_echo "$as_me:$LINENO: WARNING: $PYGTK_PKG_ERRORS" >&5

11908

-$as_echo "$as_me: WARNING: $PYGTK_PKG_ERRORS" >&2;}

11909

- { $as_echo "$as_me:$LINENO: WARNING: Disabling python support" >&5

11910

-$as_echo "$as_me: WARNING: Disabling python support" >&2;}

11911

+ { echo "$as_me:$LINENO: WARNING: $PYGTK_PKG_ERRORS" >&5

11912

+echo "$as_me: WARNING: $PYGTK_PKG_ERRORS" >&2;}

11913

+ { echo "$as_me:$LINENO: WARNING: Disabling python support" >&5

11914

+echo "$as_me: WARNING: Disabling python support" >&2;}

11915

fi

11916

11917

else

11918

PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS

11919

PYGTK_LIBS=$pkg_cv_PYGTK_LIBS

11920

- { $as_echo "$as_me:$LINENO: result: yes" >&5

11921

-$as_echo "yes" >&6; }

11922

+ { echo "$as_me:$LINENO: result: yes" >&5

11923

+echo "${ECHO_T}yes" >&6; }

11924

:

11925

fi

11926

11927

@@ -24887,23 +24592,23 @@ fi

11928

fi

11929

11930

if test "x$have_python" != "xno"; then

11931

- { $as_echo "$as_me:$LINENO: checking for pygtk defs" >&5

11932

-$as_echo_n "checking for pygtk defs... " >&6; }

11933

+ { echo "$as_me:$LINENO: checking for pygtk defs" >&5

11934

+echo $ECHO_N "checking for pygtk defs... $ECHO_C" >&6; }

11935

PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`

11936

- { $as_echo "$as_me:$LINENO: result: $PYGTK_DEFSDIR" >&5

11937

-$as_echo "$PYGTK_DEFSDIR" >&6; }

11938

+ { echo "$as_me:$LINENO: result: $PYGTK_DEFSDIR" >&5

11939

+echo "${ECHO_T}$PYGTK_DEFSDIR" >&6; }

11940

11941

- { $as_echo "$as_me:$LINENO: checking for pygtk codegen" >&5

11942

-$as_echo_n "checking for pygtk codegen... " >&6; }

11943

+ { echo "$as_me:$LINENO: checking for pygtk codegen" >&5

11944

+echo $ECHO_N "checking for pygtk codegen... $ECHO_C" >&6; }

11945

PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"

11946

- { $as_echo "$as_me:$LINENO: result: $PYGTK_CODEGEN" >&5

11947

-$as_echo "$PYGTK_CODEGEN" >&6; }

11948

+ { echo "$as_me:$LINENO: result: $PYGTK_CODEGEN" >&5

11949

+echo "${ECHO_T}$PYGTK_CODEGEN" >&6; }

11950

11951

- { $as_echo "$as_me:$LINENO: checking for pygtk h2def" >&5

11952

-$as_echo_n "checking for pygtk h2def... " >&6; }

11953

+ { echo "$as_me:$LINENO: checking for pygtk h2def" >&5

11954

+echo $ECHO_N "checking for pygtk h2def... $ECHO_C" >&6; }

11955

PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py"

11956

- { $as_echo "$as_me:$LINENO: result: $PYGTK_H2DEF" >&5

11957

-$as_echo "$PYGTK_H2DEF" >&6; }

11958

+ { echo "$as_me:$LINENO: result: $PYGTK_H2DEF" >&5

11959

+echo "${ECHO_T}$PYGTK_H2DEF" >&6; }

11960

11961

11962

11963

@@ -24913,8 +24618,8 @@ $as_echo "$PYGTK_H2DEF" >&6; }

11964

FLAGS="-fno-strict-aliasing"

11965

save_CFLAGS="$CFLAGS"

11966

CFLAGS="$CFLAGS $FLAGS"

11967

- { $as_echo "$as_me:$LINENO: checking whether $CC understands $FLAGS" >&5

11968

-$as_echo_n "checking whether $CC understands $FLAGS... " >&6; }

11969

+ { echo "$as_me:$LINENO: checking whether $CC understands $FLAGS" >&5

11970

+echo $ECHO_N "checking whether $CC understands $FLAGS... $ECHO_C" >&6; }

11971

cat >conftest.$ac_ext <<_ACEOF

11972

/* confdefs.h. */

11973

_ACEOF

11974

@@ -24936,21 +24641,20 @@ case "(($ac_try" in

11975

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

11976

*) ac_try_echo=$ac_try;;

11977

esac

11978

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

11979

-$as_echo "$ac_try_echo") >&5

11980

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

11981

(eval "$ac_compile") 2>conftest.er1

11982

ac_status=$?

11983

grep -v '^ *+' conftest.er1 >conftest.err

11984

rm -f conftest.er1

11985

cat conftest.err >&5

11986

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

11987

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

11988

(exit $ac_status); } && {

11989

test -z "$ac_c_werror_flag" ||

11990

test ! -s conftest.err

11991

} && test -s conftest.$ac_objext; then

11992

compiler_has_option=yes

11993

else

11994

- $as_echo "$as_me: failed program was:" >&5

11995

+ echo "$as_me: failed program was:" >&5

11996

sed 's/^/| /' conftest.$ac_ext >&5

11997

11998

compiler_has_option=no

11999

@@ -24958,8 +24662,8 @@ fi

12000

12001

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12002

CFLAGS="$save_CFLAGS"

12003

- { $as_echo "$as_me:$LINENO: result: $compiler_has_option" >&5

12004

-$as_echo "$compiler_has_option" >&6; }

12005

+ { echo "$as_me:$LINENO: result: $compiler_has_option" >&5

12006

+echo "${ECHO_T}$compiler_has_option" >&6; }

12007

if test $compiler_has_option = yes; then

12008

NO_STRICT_ALIASING_CFLAGS="$FLAGS"

12009

fi

12010

@@ -24984,8 +24688,8 @@ else

12011

fi

12012

12013

12014

-{ $as_echo "$as_me:$LINENO: checking whether Vala plugin support is requested" >&5

12015

-$as_echo_n "checking whether Vala plugin support is requested... " >&6; }

12016

+{ echo "$as_me:$LINENO: checking whether Vala plugin support is requested" >&5

12017

+echo $ECHO_N "checking whether Vala plugin support is requested... $ECHO_C" >&6; }

12018

# Check whether --enable-vala was given.

12019

if test "${enable_vala+set}" = set; then

12020

enableval=$enable_vala; enable_vala=$enableval have_vala=$enableval

12021

@@ -24993,45 +24697,49 @@ else

12022

enable_vala=autodetect have_vala=yes

12023

fi

12024

12025

-{ $as_echo "$as_me:$LINENO: result: $enable_vala" >&5

12026

-$as_echo "$enable_vala" >&6; }

12027

+{ echo "$as_me:$LINENO: result: $enable_vala" >&5

12028

+echo "${ECHO_T}$enable_vala" >&6; }

12029

if test "x$enable_vala" != "xno"; then

12030

12031

pkg_failed=no

12032

-{ $as_echo "$as_me:$LINENO: checking for VALA" >&5

12033

-$as_echo_n "checking for VALA... " >&6; }

12034

+{ echo "$as_me:$LINENO: checking for VALA" >&5

12035

+echo $ECHO_N "checking for VALA... $ECHO_C" >&6; }

12036

12037

-if test -n "$VALA_CFLAGS"; then

12038

- pkg_cv_VALA_CFLAGS="$VALA_CFLAGS"

12039

- elif test -n "$PKG_CONFIG"; then

12040

- if test -n "$PKG_CONFIG" && \

12041

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\"") >&5

12042

+if test -n "$PKG_CONFIG"; then

12043

+ if test -n "$VALA_CFLAGS"; then

12044

+ pkg_cv_VALA_CFLAGS="$VALA_CFLAGS"

12045

+ else

12046

+ if test -n "$PKG_CONFIG" && \

12047

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\"") >&5

12048

($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5

12049

ac_status=$?

12050

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12051

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12052

(exit $ac_status); }; then

12053

pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-1.0 >= $VALA_REQS" 2>/dev/null`

12054

else

12055

pkg_failed=yes

12056

fi

12057

- else

12058

- pkg_failed=untried

12059

+ fi

12060

+else

12061

+ pkg_failed=untried

12062

fi

12063

-if test -n "$VALA_LIBS"; then

12064

- pkg_cv_VALA_LIBS="$VALA_LIBS"

12065

- elif test -n "$PKG_CONFIG"; then

12066

- if test -n "$PKG_CONFIG" && \

12067

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\"") >&5

12068

+if test -n "$PKG_CONFIG"; then

12069

+ if test -n "$VALA_LIBS"; then

12070

+ pkg_cv_VALA_LIBS="$VALA_LIBS"

12071

+ else

12072

+ if test -n "$PKG_CONFIG" && \

12073

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\"") >&5

12074

($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5

12075

ac_status=$?

12076

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12077

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12078

(exit $ac_status); }; then

12079

pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-1.0 >= $VALA_REQS" 2>/dev/null`

12080

else

12081

pkg_failed=yes

12082

fi

12083

- else

12084

- pkg_failed=untried

12085

+ fi

12086

+else

12087

+ pkg_failed=untried

12088

fi

12089

12090

12091

@@ -25044,31 +24752,31 @@ else

12092

_pkg_short_errors_supported=no

12093

fi

12094

if test $_pkg_short_errors_supported = yes; then

12095

- VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vala-1.0 >= $VALA_REQS" 2>&1`

12096

+ VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vala-1.0 >= $VALA_REQS"`

12097

else

12098

- VALA_PKG_ERRORS=`$PKG_CONFIG --print-errors "vala-1.0 >= $VALA_REQS" 2>&1`

12099

+ VALA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vala-1.0 >= $VALA_REQS"`

12100

fi

12101

# Put the nasty error message in config.log where it belongs

12102

echo "$VALA_PKG_ERRORS" >&5

12103

12104

- { $as_echo "$as_me:$LINENO: result: no" >&5

12105

-$as_echo "no" >&6; }

12106

+ { echo "$as_me:$LINENO: result: no" >&5

12107

+echo "${ECHO_T}no" >&6; }

12108

with_vala=no

12109

elif test $pkg_failed = untried; then

12110

with_vala=no

12111

else

12112

VALA_CFLAGS=$pkg_cv_VALA_CFLAGS

12113

VALA_LIBS=$pkg_cv_VALA_LIBS

12114

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12115

-$as_echo "yes" >&6; }

12116

+ { echo "$as_me:$LINENO: result: yes" >&5

12117

+echo "${ECHO_T}yes" >&6; }

12118

with_vala=yes

12119

fi

12120

if test "x$with_vala" = "xyes"; then

12121

VALAC="`pkg-config --variable=prefix vala-1.0`/bin/valac"

12122

12123

elif test "x$enable_vala" = "xyes"; then

12124

- { { $as_echo "$as_me:$LINENO: error: Vala plugin support explicitly requested, but not found" >&5

12125

-$as_echo "$as_me: error: Vala plugin support explicitly requested, but not found" >&2;}

12126

+ { { echo "$as_me:$LINENO: error: Vala plugin support explicitly requested, but not found" >&5

12127

+echo "$as_me: error: Vala plugin support explicitly requested, but not found" >&2;}

12128

{ (exit 1); exit 1; }; }

12129

fi

12130

fi

12131

@@ -25088,12 +24796,12 @@ fi

12132

plugin_error_or_ignore()

12133

{

12134

if test "${error_on_bad_plugin}" = "1" ; then

12135

- { { $as_echo "$as_me:$LINENO: error: $1" >&5

12136

-$as_echo "$as_me: error: $1" >&2;}

12137

+ { { echo "$as_me:$LINENO: error: $1" >&5

12138

+echo "$as_me: error: $1" >&2;}

12139

{ (exit 1); exit 1; }; }

12140

else

12141

- { $as_echo "$as_me:$LINENO: WARNING: $1 (disabling plugin)" >&5

12142

-$as_echo "$as_me: WARNING: $1 (disabling plugin)" >&2;}

12143

+ { echo "$as_me:$LINENO: WARNING: $1 (disabling plugin)" >&5

12144

+echo "$as_me: WARNING: $1 (disabling plugin)" >&2;}

12145

fi

12146

}

12147

12148

@@ -25146,40 +24854,44 @@ for plugin in ${used_plugins}; do

12149

galago)

12150

12151

pkg_failed=no

12152

-{ $as_echo "$as_me:$LINENO: checking for LIBGALAGO" >&5

12153

-$as_echo_n "checking for LIBGALAGO... " >&6; }

12154

+{ echo "$as_me:$LINENO: checking for LIBGALAGO" >&5

12155

+echo $ECHO_N "checking for LIBGALAGO... $ECHO_C" >&6; }

12156

12157

-if test -n "$LIBGALAGO_CFLAGS"; then

12158

- pkg_cv_LIBGALAGO_CFLAGS="$LIBGALAGO_CFLAGS"

12159

- elif test -n "$PKG_CONFIG"; then

12160

- if test -n "$PKG_CONFIG" && \

12161

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\"") >&5

12162

+if test -n "$PKG_CONFIG"; then

12163

+ if test -n "$LIBGALAGO_CFLAGS"; then

12164

+ pkg_cv_LIBGALAGO_CFLAGS="$LIBGALAGO_CFLAGS"

12165

+ else

12166

+ if test -n "$PKG_CONFIG" && \

12167

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\"") >&5

12168

($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5

12169

ac_status=$?

12170

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12171

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12172

(exit $ac_status); }; then

12173

pkg_cv_LIBGALAGO_CFLAGS=`$PKG_CONFIG --cflags "libgalago >= 0.5.2" 2>/dev/null`

12174

else

12175

pkg_failed=yes

12176

fi

12177

- else

12178

- pkg_failed=untried

12179

+ fi

12180

+else

12181

+ pkg_failed=untried

12182

fi

12183

-if test -n "$LIBGALAGO_LIBS"; then

12184

- pkg_cv_LIBGALAGO_LIBS="$LIBGALAGO_LIBS"

12185

- elif test -n "$PKG_CONFIG"; then

12186

- if test -n "$PKG_CONFIG" && \

12187

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\"") >&5

12188

+if test -n "$PKG_CONFIG"; then

12189

+ if test -n "$LIBGALAGO_LIBS"; then

12190

+ pkg_cv_LIBGALAGO_LIBS="$LIBGALAGO_LIBS"

12191

+ else

12192

+ if test -n "$PKG_CONFIG" && \

12193

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\"") >&5

12194

($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5

12195

ac_status=$?

12196

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12197

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12198

(exit $ac_status); }; then

12199

pkg_cv_LIBGALAGO_LIBS=`$PKG_CONFIG --libs "libgalago >= 0.5.2" 2>/dev/null`

12200

else

12201

pkg_failed=yes

12202

fi

12203

- else

12204

- pkg_failed=untried

12205

+ fi

12206

+else

12207

+ pkg_failed=untried

12208

fi

12209

12210

12211

@@ -25192,23 +24904,23 @@ else

12212

_pkg_short_errors_supported=no

12213

fi

12214

if test $_pkg_short_errors_supported = yes; then

12215

- LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgalago >= 0.5.2" 2>&1`

12216

+ LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgalago >= 0.5.2"`

12217

else

12218

- LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgalago >= 0.5.2" 2>&1`

12219

+ LIBGALAGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgalago >= 0.5.2"`

12220

fi

12221

# Put the nasty error message in config.log where it belongs

12222

echo "$LIBGALAGO_PKG_ERRORS" >&5

12223

12224

- { $as_echo "$as_me:$LINENO: result: no" >&5

12225

-$as_echo "no" >&6; }

12226

+ { echo "$as_me:$LINENO: result: no" >&5

12227

+echo "${ECHO_T}no" >&6; }

12228

HAVE_LIBGALAGO=no

12229

elif test $pkg_failed = untried; then

12230

HAVE_LIBGALAGO=no

12231

else

12232

LIBGALAGO_CFLAGS=$pkg_cv_LIBGALAGO_CFLAGS

12233

LIBGALAGO_LIBS=$pkg_cv_LIBGALAGO_LIBS

12234

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12235

-$as_echo "yes" >&6; }

12236

+ { echo "$as_me:$LINENO: result: yes" >&5

12237

+echo "${ECHO_T}yes" >&6; }

12238

HAVE_LIBGALAGO=yes

12239

fi

12240

if test "${HAVE_LIBGALAGO}" != "yes" ; then

12241

@@ -25225,40 +24937,44 @@ fi

12242

media-player-keys)

12243

12244

pkg_failed=no

12245

-{ $as_echo "$as_me:$LINENO: checking for MEDIA_PLAYER_KEYS" >&5

12246

-$as_echo_n "checking for MEDIA_PLAYER_KEYS... " >&6; }

12247

+{ echo "$as_me:$LINENO: checking for MEDIA_PLAYER_KEYS" >&5

12248

+echo $ECHO_N "checking for MEDIA_PLAYER_KEYS... $ECHO_C" >&6; }

12249

12250

-if test -n "$MEDIA_PLAYER_KEYS_CFLAGS"; then

12251

- pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS="$MEDIA_PLAYER_KEYS_CFLAGS"

12252

- elif test -n "$PKG_CONFIG"; then

12253

- if test -n "$PKG_CONFIG" && \

12254

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5

12255

+if test -n "$PKG_CONFIG"; then

12256

+ if test -n "$MEDIA_PLAYER_KEYS_CFLAGS"; then

12257

+ pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS="$MEDIA_PLAYER_KEYS_CFLAGS"

12258

+ else

12259

+ if test -n "$PKG_CONFIG" && \

12260

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5

12261

($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5

12262

ac_status=$?

12263

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12264

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12265

(exit $ac_status); }; then

12266

pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1" 2>/dev/null`

12267

else

12268

pkg_failed=yes

12269

fi

12270

- else

12271

- pkg_failed=untried

12272

+ fi

12273

+else

12274

+ pkg_failed=untried

12275

fi

12276

-if test -n "$MEDIA_PLAYER_KEYS_LIBS"; then

12277

- pkg_cv_MEDIA_PLAYER_KEYS_LIBS="$MEDIA_PLAYER_KEYS_LIBS"

12278

- elif test -n "$PKG_CONFIG"; then

12279

- if test -n "$PKG_CONFIG" && \

12280

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5

12281

+if test -n "$PKG_CONFIG"; then

12282

+ if test -n "$MEDIA_PLAYER_KEYS_LIBS"; then

12283

+ pkg_cv_MEDIA_PLAYER_KEYS_LIBS="$MEDIA_PLAYER_KEYS_LIBS"

12284

+ else

12285

+ if test -n "$PKG_CONFIG" && \

12286

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\"") >&5

12287

($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5

12288

ac_status=$?

12289

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12290

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12291

(exit $ac_status); }; then

12292

pkg_cv_MEDIA_PLAYER_KEYS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1" 2>/dev/null`

12293

else

12294

pkg_failed=yes

12295

fi

12296

- else

12297

- pkg_failed=untried

12298

+ fi

12299

+else

12300

+ pkg_failed=untried

12301

fi

12302

12303

12304

@@ -25271,23 +24987,23 @@ else

12305

_pkg_short_errors_supported=no

12306

fi

12307

if test $_pkg_short_errors_supported = yes; then

12308

- MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1" 2>&1`

12309

+ MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1"`

12310

else

12311

- MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1" 2>&1`

12312

+ MEDIA_PLAYER_KEYS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1"`

12313

fi

12314

# Put the nasty error message in config.log where it belongs

12315

echo "$MEDIA_PLAYER_KEYS_PKG_ERRORS" >&5

12316

12317

- { $as_echo "$as_me:$LINENO: result: no" >&5

12318

-$as_echo "no" >&6; }

12319

+ { echo "$as_me:$LINENO: result: no" >&5

12320

+echo "${ECHO_T}no" >&6; }

12321

HAVE_MEDIA_PLAYER_KEYS=no

12322

elif test $pkg_failed = untried; then

12323

HAVE_MEDIA_PLAYER_KEYS=no

12324

else

12325

MEDIA_PLAYER_KEYS_CFLAGS=$pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS

12326

MEDIA_PLAYER_KEYS_LIBS=$pkg_cv_MEDIA_PLAYER_KEYS_LIBS

12327

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12328

-$as_echo "yes" >&6; }

12329

+ { echo "$as_me:$LINENO: result: yes" >&5

12330

+echo "${ECHO_T}yes" >&6; }

12331

HAVE_MEDIA_PLAYER_KEYS=yes

12332

fi

12333

if test "${HAVE_MEDIA_PLAYER_KEYS}" != "yes" ; then

12334

@@ -25296,10 +25012,10 @@ fi

12335

fi

12336

;;

12337

lirc)

12338

- { $as_echo "$as_me:$LINENO: checking for lirc_init in -llirc_client" >&5

12339

-$as_echo_n "checking for lirc_init in -llirc_client... " >&6; }

12340

+ { echo "$as_me:$LINENO: checking for lirc_init in -llirc_client" >&5

12341

+echo $ECHO_N "checking for lirc_init in -llirc_client... $ECHO_C" >&6; }

12342

if test "${ac_cv_lib_lirc_client_lirc_init+set}" = set; then

12343

- $as_echo_n "(cached) " >&6

12344

+ echo $ECHO_N "(cached) $ECHO_C" >&6

12345

else

12346

ac_check_lib_save_LIBS=$LIBS

12347

LIBS="-llirc_client $LIBS"

12348

@@ -25331,49 +25047,45 @@ case "(($ac_try" in

12349

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12350

*) ac_try_echo=$ac_try;;

12351

esac

12352

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

12353

-$as_echo "$ac_try_echo") >&5

12354

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12355

(eval "$ac_link") 2>conftest.er1

12356

ac_status=$?

12357

grep -v '^ *+' conftest.er1 >conftest.err

12358

rm -f conftest.er1

12359

cat conftest.err >&5

12360

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12361

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12362

(exit $ac_status); } && {

12363

test -z "$ac_c_werror_flag" ||

12364

test ! -s conftest.err

12365

- } && test -s conftest$ac_exeext && {

12366

- test "$cross_compiling" = yes ||

12367

- $as_test_x conftest$ac_exeext

12368

- }; then

12369

+ } && test -s conftest$ac_exeext &&

12370

+ $as_test_x conftest$ac_exeext; then

12371

ac_cv_lib_lirc_client_lirc_init=yes

12372

else

12373

- $as_echo "$as_me: failed program was:" >&5

12374

+ echo "$as_me: failed program was:" >&5

12375

sed 's/^/| /' conftest.$ac_ext >&5

12376

12377

ac_cv_lib_lirc_client_lirc_init=no

12378

fi

12379

12380

-rm -rf conftest.dSYM

12381

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

12382

conftest$ac_exeext conftest.$ac_ext

12383

LIBS=$ac_check_lib_save_LIBS

12384

fi

12385

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lirc_client_lirc_init" >&5

12386

-$as_echo "$ac_cv_lib_lirc_client_lirc_init" >&6; }

12387

-if test "x$ac_cv_lib_lirc_client_lirc_init" = x""yes; then

12388

+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lirc_client_lirc_init" >&5

12389

+echo "${ECHO_T}$ac_cv_lib_lirc_client_lirc_init" >&6; }

12390

+if test $ac_cv_lib_lirc_client_lirc_init = yes; then

12391

if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then

12392

- { $as_echo "$as_me:$LINENO: checking for lirc/lirc_client.h" >&5

12393

-$as_echo_n "checking for lirc/lirc_client.h... " >&6; }

12394

+ { echo "$as_me:$LINENO: checking for lirc/lirc_client.h" >&5

12395

+echo $ECHO_N "checking for lirc/lirc_client.h... $ECHO_C" >&6; }

12396

if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then

12397

- $as_echo_n "(cached) " >&6

12398

+ echo $ECHO_N "(cached) $ECHO_C" >&6

12399

fi

12400

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5

12401

-$as_echo "$ac_cv_header_lirc_lirc_client_h" >&6; }

12402

+{ echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5

12403

+echo "${ECHO_T}$ac_cv_header_lirc_lirc_client_h" >&6; }

12404

else

12405

# Is the header compilable?

12406

-{ $as_echo "$as_me:$LINENO: checking lirc/lirc_client.h usability" >&5

12407

-$as_echo_n "checking lirc/lirc_client.h usability... " >&6; }

12408

+{ echo "$as_me:$LINENO: checking lirc/lirc_client.h usability" >&5

12409

+echo $ECHO_N "checking lirc/lirc_client.h usability... $ECHO_C" >&6; }

12410

cat >conftest.$ac_ext <<_ACEOF

12411

/* confdefs.h. */

12412

_ACEOF

12413

@@ -25389,33 +25101,32 @@ case "(($ac_try" in

12414

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12415

*) ac_try_echo=$ac_try;;

12416

esac

12417

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

12418

-$as_echo "$ac_try_echo") >&5

12419

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12420

(eval "$ac_compile") 2>conftest.er1

12421

ac_status=$?

12422

grep -v '^ *+' conftest.er1 >conftest.err

12423

rm -f conftest.er1

12424

cat conftest.err >&5

12425

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12426

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12427

(exit $ac_status); } && {

12428

test -z "$ac_c_werror_flag" ||

12429

test ! -s conftest.err

12430

} && test -s conftest.$ac_objext; then

12431

ac_header_compiler=yes

12432

else

12433

- $as_echo "$as_me: failed program was:" >&5

12434

+ echo "$as_me: failed program was:" >&5

12435

sed 's/^/| /' conftest.$ac_ext >&5

12436

12437

ac_header_compiler=no

12438

fi

12439

12440

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

12441

-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

12442

-$as_echo "$ac_header_compiler" >&6; }

12443

+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5

12444

+echo "${ECHO_T}$ac_header_compiler" >&6; }

12445

12446

# Is the header present?

12447

-{ $as_echo "$as_me:$LINENO: checking lirc/lirc_client.h presence" >&5

12448

-$as_echo_n "checking lirc/lirc_client.h presence... " >&6; }

12449

+{ echo "$as_me:$LINENO: checking lirc/lirc_client.h presence" >&5

12450

+echo $ECHO_N "checking lirc/lirc_client.h presence... $ECHO_C" >&6; }

12451

cat >conftest.$ac_ext <<_ACEOF

12452

/* confdefs.h. */

12453

_ACEOF

12454

@@ -25429,52 +25140,51 @@ case "(($ac_try" in

12455

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

12456

*) ac_try_echo=$ac_try;;

12457

esac

12458

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

12459

-$as_echo "$ac_try_echo") >&5

12460

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

12461

(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1

12462

ac_status=$?

12463

grep -v '^ *+' conftest.er1 >conftest.err

12464

rm -f conftest.er1

12465

cat conftest.err >&5

12466

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12467

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12468

(exit $ac_status); } >/dev/null && {

12469

test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

12470

test ! -s conftest.err

12471

}; then

12472

ac_header_preproc=yes

12473

else

12474

- $as_echo "$as_me: failed program was:" >&5

12475

+ echo "$as_me: failed program was:" >&5

12476

sed 's/^/| /' conftest.$ac_ext >&5

12477

12478

ac_header_preproc=no

12479

fi

12480

12481

rm -f conftest.err conftest.$ac_ext

12482

-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

12483

-$as_echo "$ac_header_preproc" >&6; }

12484

+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5

12485

+echo "${ECHO_T}$ac_header_preproc" >&6; }

12486

12487

# So? What about this header?

12488

case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in

12489

yes:no: )

12490

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&5

12491

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

12492

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the compiler's result" >&5

12493

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the compiler's result" >&2;}

12494

+ { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&5

12495

+echo "$as_me: WARNING: lirc/lirc_client.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

12496

+ { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the compiler's result" >&5

12497

+echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the compiler's result" >&2;}

12498

ac_header_preproc=yes

12499

;;

12500

no:yes:* )

12501

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&5

12502

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&2;}

12503

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: check for missing prerequisite headers?" >&5

12504

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: check for missing prerequisite headers?" >&2;}

12505

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: see the Autoconf documentation" >&5

12506

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: see the Autoconf documentation" >&2;}

12507

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: section \"Present But Cannot Be Compiled\"" >&5

12508

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: section \"Present But Cannot Be Compiled\"" >&2;}

12509

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&5

12510

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&2;}

12511

- { $as_echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: in the future, the compiler will take precedence" >&5

12512

-$as_echo "$as_me: WARNING: lirc/lirc_client.h: in the future, the compiler will take precedence" >&2;}

12513

+ { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&5

12514

+echo "$as_me: WARNING: lirc/lirc_client.h: present but cannot be compiled" >&2;}

12515

+ { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: check for missing prerequisite headers?" >&5

12516

+echo "$as_me: WARNING: lirc/lirc_client.h: check for missing prerequisite headers?" >&2;}

12517

+ { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: see the Autoconf documentation" >&5

12518

+echo "$as_me: WARNING: lirc/lirc_client.h: see the Autoconf documentation" >&2;}

12519

+ { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: section \"Present But Cannot Be Compiled\"" >&5

12520

+echo "$as_me: WARNING: lirc/lirc_client.h: section \"Present But Cannot Be Compiled\"" >&2;}

12521

+ { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&5

12522

+echo "$as_me: WARNING: lirc/lirc_client.h: proceeding with the preprocessor's result" >&2;}

12523

+ { echo "$as_me:$LINENO: WARNING: lirc/lirc_client.h: in the future, the compiler will take precedence" >&5

12524

+echo "$as_me: WARNING: lirc/lirc_client.h: in the future, the compiler will take precedence" >&2;}

12525

( cat <<\_ASBOX

12526

## -------------------------------------------------------------------- ##

12527

## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=totem ##

12528

@@ -25483,18 +25193,18 @@ _ASBOX

12529

) | sed "s/^/$as_me: WARNING: /" >&2

12530

;;

12531

esac

12532

-{ $as_echo "$as_me:$LINENO: checking for lirc/lirc_client.h" >&5

12533

-$as_echo_n "checking for lirc/lirc_client.h... " >&6; }

12534

+{ echo "$as_me:$LINENO: checking for lirc/lirc_client.h" >&5

12535

+echo $ECHO_N "checking for lirc/lirc_client.h... $ECHO_C" >&6; }

12536

if test "${ac_cv_header_lirc_lirc_client_h+set}" = set; then

12537

- $as_echo_n "(cached) " >&6

12538

+ echo $ECHO_N "(cached) $ECHO_C" >&6

12539

else

12540

ac_cv_header_lirc_lirc_client_h=$ac_header_preproc

12541

fi

12542

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5

12543

-$as_echo "$ac_cv_header_lirc_lirc_client_h" >&6; }

12544

+{ echo "$as_me:$LINENO: result: $ac_cv_header_lirc_lirc_client_h" >&5

12545

+echo "${ECHO_T}$ac_cv_header_lirc_lirc_client_h" >&6; }

12546

12547

fi

12548

-if test "x$ac_cv_header_lirc_lirc_client_h" = x""yes; then

12549

+if test $ac_cv_header_lirc_lirc_client_h = yes; then

12550

LIRC_LIBS="-llirc_client"

12551

HAVE_LIRC=yes

12552

else

12553

@@ -25515,40 +25225,44 @@ fi

12554

mythtv)

12555

12556

pkg_failed=no

12557

-{ $as_echo "$as_me:$LINENO: checking for GMYTH" >&5

12558

-$as_echo_n "checking for GMYTH... " >&6; }

12559

+{ echo "$as_me:$LINENO: checking for GMYTH" >&5

12560

+echo $ECHO_N "checking for GMYTH... $ECHO_C" >&6; }

12561

12562

-if test -n "$GMYTH_CFLAGS"; then

12563

- pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS"

12564

- elif test -n "$PKG_CONFIG"; then

12565

- if test -n "$PKG_CONFIG" && \

12566

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1\"") >&5

12567

+if test -n "$PKG_CONFIG"; then

12568

+ if test -n "$GMYTH_CFLAGS"; then

12569

+ pkg_cv_GMYTH_CFLAGS="$GMYTH_CFLAGS"

12570

+ else

12571

+ if test -n "$PKG_CONFIG" && \

12572

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1\"") >&5

12573

($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1") 2>&5

12574

ac_status=$?

12575

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12576

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12577

(exit $ac_status); }; then

12578

pkg_cv_GMYTH_CFLAGS=`$PKG_CONFIG --cflags "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1" 2>/dev/null`

12579

else

12580

pkg_failed=yes

12581

fi

12582

- else

12583

- pkg_failed=untried

12584

+ fi

12585

+else

12586

+ pkg_failed=untried

12587

fi

12588

-if test -n "$GMYTH_LIBS"; then

12589

- pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"

12590

- elif test -n "$PKG_CONFIG"; then

12591

- if test -n "$PKG_CONFIG" && \

12592

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1\"") >&5

12593

+if test -n "$PKG_CONFIG"; then

12594

+ if test -n "$GMYTH_LIBS"; then

12595

+ pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"

12596

+ else

12597

+ if test -n "$PKG_CONFIG" && \

12598

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1\"") >&5

12599

($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1") 2>&5

12600

ac_status=$?

12601

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12602

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12603

(exit $ac_status); }; then

12604

pkg_cv_GMYTH_LIBS=`$PKG_CONFIG --libs "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1" 2>/dev/null`

12605

else

12606

pkg_failed=yes

12607

fi

12608

- else

12609

- pkg_failed=untried

12610

+ fi

12611

+else

12612

+ pkg_failed=untried

12613

fi

12614

12615

12616

@@ -25561,23 +25275,23 @@ else

12617

_pkg_short_errors_supported=no

12618

fi

12619

if test $_pkg_short_errors_supported = yes; then

12620

- GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1" 2>&1`

12621

+ GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1"`

12622

else

12623

- GMYTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1" 2>&1`

12624

+ GMYTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1"`

12625

fi

12626

# Put the nasty error message in config.log where it belongs

12627

echo "$GMYTH_PKG_ERRORS" >&5

12628

12629

- { $as_echo "$as_me:$LINENO: result: no" >&5

12630

-$as_echo "no" >&6; }

12631

+ { echo "$as_me:$LINENO: result: no" >&5

12632

+echo "${ECHO_T}no" >&6; }

12633

HAVE_GMYTH=no

12634

elif test $pkg_failed = untried; then

12635

HAVE_GMYTH=no

12636

else

12637

GMYTH_CFLAGS=$pkg_cv_GMYTH_CFLAGS

12638

GMYTH_LIBS=$pkg_cv_GMYTH_LIBS

12639

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12640

-$as_echo "yes" >&6; }

12641

+ { echo "$as_me:$LINENO: result: yes" >&5

12642

+echo "${ECHO_T}yes" >&6; }

12643

HAVE_GMYTH=yes

12644

fi

12645

if test "${HAVE_GMYTH}" != "yes"; then

12646

@@ -25585,43 +25299,145 @@ fi

12647

add_plugin="0"

12648

fi

12649

;;

12650

+ bbc)

12651

+ if test x$HAVE_GSTREAMER = xno ; then

12652

+ plugin_error_or_ignore "The BBC plugin currently works only with the GStreamer backend"

12653

+ add_plugin="0"

12654

+ fi

12655

+ # pygobject >= 2.15.3 for gio support

12656

+ # pygtk >= 2.13.0 for gtk_tree_view_get_tooltip_context support

12657

+

12658

+pkg_failed=no

12659

+{ echo "$as_me:$LINENO: checking for BBC" >&5

12660

+echo $ECHO_N "checking for BBC... $ECHO_C" >&6; }

12661

+

12662

+if test -n "$PKG_CONFIG"; then

12663

+ if test -n "$BBC_CFLAGS"; then

12664

+ pkg_cv_BBC_CFLAGS="$BBC_CFLAGS"

12665

+ else

12666

+ if test -n "$PKG_CONFIG" && \

12667

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 \"") >&5

12668

+ ($PKG_CONFIG --exists --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 ") 2>&5

12669

+ ac_status=$?

12670

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12671

+ (exit $ac_status); }; then

12672

+ pkg_cv_BBC_CFLAGS=`$PKG_CONFIG --cflags " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 " 2>/dev/null`

12673

+else

12674

+ pkg_failed=yes

12675

+fi

12676

+ fi

12677

+else

12678

+ pkg_failed=untried

12679

+fi

12680

+if test -n "$PKG_CONFIG"; then

12681

+ if test -n "$BBC_LIBS"; then

12682

+ pkg_cv_BBC_LIBS="$BBC_LIBS"

12683

+ else

12684

+ if test -n "$PKG_CONFIG" && \

12685

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 \"") >&5

12686

+ ($PKG_CONFIG --exists --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 ") 2>&5

12687

+ ac_status=$?

12688

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12689

+ (exit $ac_status); }; then

12690

+ pkg_cv_BBC_LIBS=`$PKG_CONFIG --libs " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 " 2>/dev/null`

12691

+else

12692

+ pkg_failed=yes

12693

+fi

12694

+ fi

12695

+else

12696

+ pkg_failed=untried

12697

+fi

12698

+

12699

+

12700

+

12701

+if test $pkg_failed = yes; then

12702

+

12703

+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

12704

+ _pkg_short_errors_supported=yes

12705

+else

12706

+ _pkg_short_errors_supported=no

12707

+fi

12708

+ if test $_pkg_short_errors_supported = yes; then

12709

+ BBC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "`

12710

+ else

12711

+ BBC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "`

12712

+ fi

12713

+ # Put the nasty error message in config.log where it belongs

12714

+ echo "$BBC_PKG_ERRORS" >&5

12715

+

12716

+ { echo "$as_me:$LINENO: result: no" >&5

12717

+echo "${ECHO_T}no" >&6; }

12718

+ HAVE_BBCSTUFF=no

12719

+elif test $pkg_failed = untried; then

12720

+ HAVE_BBCSTUFF=no

12721

+else

12722

+ BBC_CFLAGS=$pkg_cv_BBC_CFLAGS

12723

+ BBC_LIBS=$pkg_cv_BBC_LIBS

12724

+ { echo "$as_me:$LINENO: result: yes" >&5

12725

+echo "${ECHO_T}yes" >&6; }

12726

+ HAVE_BBCSTUFF=yes

12727

+fi

12728

+ if test "x$HAVE_BBCSTUFF" != "xyes"; then

12729

+ plugin_error_or_ignore "you need pygobject-2.0 >= 2.15.3 and gst-python-0.10 >= 0.10.11 and pygtk-2.0 >= 2.13.0 installed for the BBC plugin"

12730

+ add_plugin="0"

12731

+ fi

12732

+ # only require python apt and gdbm where we would actually be using it, ie. on ubuntu

12733

+ bbc_py_pkg_reqs=''

12734

+ if test -f /etc/debian_version ; then

12735

+ bbc_distro_id=`lsb_release -s -i 2>/dev/null`

12736

+ if test x$bbc_distro_id = xUbuntu; then

12737

+ bbc_py_pkg_reqs="apt gdbm"

12738

+ fi

12739

+ fi

12740

+ for pymodule in rdflib.Graph xdg $bbc_py_pkg_reqs

12741

+ do

12742

+ if ! $PYTHON -c "import $pymodule" 2>/dev/null >/dev/null; then

12743

+ plugin_error_or_ignore "you need the python $pymodule module installed for the BBC plugin"

12744

+ add_plugin="0"

12745

+ fi

12746

+ done

12747

+ ;;

12748

bemused)

12749

12750

pkg_failed=no

12751

-{ $as_echo "$as_me:$LINENO: checking for BEMUSED" >&5

12752

-$as_echo_n "checking for BEMUSED... " >&6; }

12753

+{ echo "$as_me:$LINENO: checking for BEMUSED" >&5

12754

+echo $ECHO_N "checking for BEMUSED... $ECHO_C" >&6; }

12755

12756

-if test -n "$BEMUSED_CFLAGS"; then

12757

- pkg_cv_BEMUSED_CFLAGS="$BEMUSED_CFLAGS"

12758

- elif test -n "$PKG_CONFIG"; then

12759

- if test -n "$PKG_CONFIG" && \

12760

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5

12761

+if test -n "$PKG_CONFIG"; then

12762

+ if test -n "$BEMUSED_CFLAGS"; then

12763

+ pkg_cv_BEMUSED_CFLAGS="$BEMUSED_CFLAGS"

12764

+ else

12765

+ if test -n "$PKG_CONFIG" && \

12766

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5

12767

($PKG_CONFIG --exists --print-errors "bluez") 2>&5

12768

ac_status=$?

12769

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12770

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12771

(exit $ac_status); }; then

12772

pkg_cv_BEMUSED_CFLAGS=`$PKG_CONFIG --cflags "bluez" 2>/dev/null`

12773

else

12774

pkg_failed=yes

12775

fi

12776

- else

12777

- pkg_failed=untried

12778

+ fi

12779

+else

12780

+ pkg_failed=untried

12781

fi

12782

-if test -n "$BEMUSED_LIBS"; then

12783

- pkg_cv_BEMUSED_LIBS="$BEMUSED_LIBS"

12784

- elif test -n "$PKG_CONFIG"; then

12785

- if test -n "$PKG_CONFIG" && \

12786

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5

12787

+if test -n "$PKG_CONFIG"; then

12788

+ if test -n "$BEMUSED_LIBS"; then

12789

+ pkg_cv_BEMUSED_LIBS="$BEMUSED_LIBS"

12790

+ else

12791

+ if test -n "$PKG_CONFIG" && \

12792

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5

12793

($PKG_CONFIG --exists --print-errors "bluez") 2>&5

12794

ac_status=$?

12795

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12796

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12797

(exit $ac_status); }; then

12798

pkg_cv_BEMUSED_LIBS=`$PKG_CONFIG --libs "bluez" 2>/dev/null`

12799

else

12800

pkg_failed=yes

12801

fi

12802

- else

12803

- pkg_failed=untried

12804

+ fi

12805

+else

12806

+ pkg_failed=untried

12807

fi

12808

12809

12810

@@ -25634,23 +25450,23 @@ else

12811

_pkg_short_errors_supported=no

12812

fi

12813

if test $_pkg_short_errors_supported = yes; then

12814

- BEMUSED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "bluez" 2>&1`

12815

+ BEMUSED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "bluez"`

12816

else

12817

- BEMUSED_PKG_ERRORS=`$PKG_CONFIG --print-errors "bluez" 2>&1`

12818

+ BEMUSED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "bluez"`

12819

fi

12820

# Put the nasty error message in config.log where it belongs

12821

echo "$BEMUSED_PKG_ERRORS" >&5

12822

12823

- { $as_echo "$as_me:$LINENO: result: no" >&5

12824

-$as_echo "no" >&6; }

12825

+ { echo "$as_me:$LINENO: result: no" >&5

12826

+echo "${ECHO_T}no" >&6; }

12827

HAVE_BLUEZ=no

12828

elif test $pkg_failed = untried; then

12829

HAVE_BLUEZ=no

12830

else

12831

BEMUSED_CFLAGS=$pkg_cv_BEMUSED_CFLAGS

12832

BEMUSED_LIBS=$pkg_cv_BEMUSED_LIBS

12833

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12834

-$as_echo "yes" >&6; }

12835

+ { echo "$as_me:$LINENO: result: yes" >&5

12836

+echo "${ECHO_T}yes" >&6; }

12837

HAVE_BLUEZ=yes

12838

fi

12839

if test "${HAVE_BLUEZ}" != "yes" ; then

12840

@@ -25661,40 +25477,44 @@ fi

12841

publish)

12842

12843

pkg_failed=no

12844

-{ $as_echo "$as_me:$LINENO: checking for LIBEPC" >&5

12845

-$as_echo_n "checking for LIBEPC... " >&6; }

12846

+{ echo "$as_me:$LINENO: checking for LIBEPC" >&5

12847

+echo $ECHO_N "checking for LIBEPC... $ECHO_C" >&6; }

12848

12849

-if test -n "$LIBEPC_CFLAGS"; then

12850

- pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS"

12851

- elif test -n "$PKG_CONFIG"; then

12852

- if test -n "$PKG_CONFIG" && \

12853

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5

12854

+if test -n "$PKG_CONFIG"; then

12855

+ if test -n "$LIBEPC_CFLAGS"; then

12856

+ pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS"

12857

+ else

12858

+ if test -n "$PKG_CONFIG" && \

12859

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5

12860

($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5

12861

ac_status=$?

12862

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12863

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12864

(exit $ac_status); }; then

12865

pkg_cv_LIBEPC_CFLAGS=`$PKG_CONFIG --cflags "libepc-ui-1.0 >= 0.3.0" 2>/dev/null`

12866

else

12867

pkg_failed=yes

12868

fi

12869

- else

12870

- pkg_failed=untried

12871

+ fi

12872

+else

12873

+ pkg_failed=untried

12874

fi

12875

-if test -n "$LIBEPC_LIBS"; then

12876

- pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS"

12877

- elif test -n "$PKG_CONFIG"; then

12878

- if test -n "$PKG_CONFIG" && \

12879

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5

12880

+if test -n "$PKG_CONFIG"; then

12881

+ if test -n "$LIBEPC_LIBS"; then

12882

+ pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS"

12883

+ else

12884

+ if test -n "$PKG_CONFIG" && \

12885

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5

12886

($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5

12887

ac_status=$?

12888

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12889

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12890

(exit $ac_status); }; then

12891

pkg_cv_LIBEPC_LIBS=`$PKG_CONFIG --libs "libepc-ui-1.0 >= 0.3.0" 2>/dev/null`

12892

else

12893

pkg_failed=yes

12894

fi

12895

- else

12896

- pkg_failed=untried

12897

+ fi

12898

+else

12899

+ pkg_failed=untried

12900

fi

12901

12902

12903

@@ -25707,23 +25527,23 @@ else

12904

_pkg_short_errors_supported=no

12905

fi

12906

if test $_pkg_short_errors_supported = yes; then

12907

- LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libepc-ui-1.0 >= 0.3.0" 2>&1`

12908

+ LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"`

12909

else

12910

- LIBEPC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libepc-ui-1.0 >= 0.3.0" 2>&1`

12911

+ LIBEPC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"`

12912

fi

12913

# Put the nasty error message in config.log where it belongs

12914

echo "$LIBEPC_PKG_ERRORS" >&5

12915

12916

- { $as_echo "$as_me:$LINENO: result: no" >&5

12917

-$as_echo "no" >&6; }

12918

+ { echo "$as_me:$LINENO: result: no" >&5

12919

+echo "${ECHO_T}no" >&6; }

12920

HAVE_LIBEPC=no

12921

elif test $pkg_failed = untried; then

12922

HAVE_LIBEPC=no

12923

else

12924

LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS

12925

LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS

12926

- { $as_echo "$as_me:$LINENO: result: yes" >&5

12927

-$as_echo "yes" >&6; }

12928

+ { echo "$as_me:$LINENO: result: yes" >&5

12929

+echo "${ECHO_T}yes" >&6; }

12930

HAVE_LIBEPC=yes

12931

fi

12932

if test "${HAVE_LIBEPC}" != "yes" ; then

12933

@@ -25734,40 +25554,44 @@ fi

12934

tracker)

12935

12936

pkg_failed=no

12937

-{ $as_echo "$as_me:$LINENO: checking for TRACKER" >&5

12938

-$as_echo_n "checking for TRACKER... " >&6; }

12939

+{ echo "$as_me:$LINENO: checking for TRACKER" >&5

12940

+echo $ECHO_N "checking for TRACKER... $ECHO_C" >&6; }

12941

12942

-if test -n "$TRACKER_CFLAGS"; then

12943

- pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"

12944

- elif test -n "$PKG_CONFIG"; then

12945

- if test -n "$PKG_CONFIG" && \

12946

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker\"") >&5

12947

+if test -n "$PKG_CONFIG"; then

12948

+ if test -n "$TRACKER_CFLAGS"; then

12949

+ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"

12950

+ else

12951

+ if test -n "$PKG_CONFIG" && \

12952

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker\"") >&5

12953

($PKG_CONFIG --exists --print-errors "tracker") 2>&5

12954

ac_status=$?

12955

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12956

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12957

(exit $ac_status); }; then

12958

pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker" 2>/dev/null`

12959

else

12960

pkg_failed=yes

12961

fi

12962

- else

12963

- pkg_failed=untried

12964

+ fi

12965

+else

12966

+ pkg_failed=untried

12967

fi

12968

-if test -n "$TRACKER_LIBS"; then

12969

- pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"

12970

- elif test -n "$PKG_CONFIG"; then

12971

- if test -n "$PKG_CONFIG" && \

12972

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker\"") >&5

12973

+if test -n "$PKG_CONFIG"; then

12974

+ if test -n "$TRACKER_LIBS"; then

12975

+ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"

12976

+ else

12977

+ if test -n "$PKG_CONFIG" && \

12978

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker\"") >&5

12979

($PKG_CONFIG --exists --print-errors "tracker") 2>&5

12980

ac_status=$?

12981

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

12982

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

12983

(exit $ac_status); }; then

12984

pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker" 2>/dev/null`

12985

else

12986

pkg_failed=yes

12987

fi

12988

- else

12989

- pkg_failed=untried

12990

+ fi

12991

+else

12992

+ pkg_failed=untried

12993

fi

12994

12995

12996

@@ -25780,23 +25604,23 @@ else

12997

_pkg_short_errors_supported=no

12998

fi

12999

if test $_pkg_short_errors_supported = yes; then

13000

- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker" 2>&1`

13001

+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker"`

13002

else

13003

- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker" 2>&1`

13004

+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker"`

13005

fi

13006

# Put the nasty error message in config.log where it belongs

13007

echo "$TRACKER_PKG_ERRORS" >&5

13008

13009

- { $as_echo "$as_me:$LINENO: result: no" >&5

13010

-$as_echo "no" >&6; }

13011

+ { echo "$as_me:$LINENO: result: no" >&5

13012

+echo "${ECHO_T}no" >&6; }

13013

HAVE_TRACKER=no

13014

elif test $pkg_failed = untried; then

13015

HAVE_TRACKER=no

13016

else

13017

TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS

13018

TRACKER_LIBS=$pkg_cv_TRACKER_LIBS

13019

- { $as_echo "$as_me:$LINENO: result: yes" >&5

13020

-$as_echo "yes" >&6; }

13021

+ { echo "$as_me:$LINENO: result: yes" >&5

13022

+echo "${ECHO_T}yes" >&6; }

13023

HAVE_TRACKER=yes

13024

fi

13025

if test "${HAVE_TRACKER}" != "yes" ; then

13026

@@ -25813,40 +25637,44 @@ fi

13027

thumbnail)

13028

13029

pkg_failed=no

13030

-{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5

13031

-$as_echo_n "checking for GLIB... " >&6; }

13032

+{ echo "$as_me:$LINENO: checking for GLIB" >&5

13033

+echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; }

13034

13035

-if test -n "$GLIB_CFLAGS"; then

13036

- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"

13037

- elif test -n "$PKG_CONFIG"; then

13038

- if test -n "$PKG_CONFIG" && \

13039

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\"") >&5

13040

+if test -n "$PKG_CONFIG"; then

13041

+ if test -n "$GLIB_CFLAGS"; then

13042

+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"

13043

+ else

13044

+ if test -n "$PKG_CONFIG" && \

13045

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\"") >&5

13046

($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5

13047

ac_status=$?

13048

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13049

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13050

(exit $ac_status); }; then

13051

pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.15.0" 2>/dev/null`

13052

else

13053

pkg_failed=yes

13054

fi

13055

- else

13056

- pkg_failed=untried

13057

+ fi

13058

+else

13059

+ pkg_failed=untried

13060

fi

13061

-if test -n "$GLIB_LIBS"; then

13062

- pkg_cv_GLIB_LIBS="$GLIB_LIBS"

13063

- elif test -n "$PKG_CONFIG"; then

13064

- if test -n "$PKG_CONFIG" && \

13065

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\"") >&5

13066

+if test -n "$PKG_CONFIG"; then

13067

+ if test -n "$GLIB_LIBS"; then

13068

+ pkg_cv_GLIB_LIBS="$GLIB_LIBS"

13069

+ else

13070

+ if test -n "$PKG_CONFIG" && \

13071

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\"") >&5

13072

($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5

13073

ac_status=$?

13074

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13075

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13076

(exit $ac_status); }; then

13077

pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.15.0" 2>/dev/null`

13078

else

13079

pkg_failed=yes

13080

fi

13081

- else

13082

- pkg_failed=untried

13083

+ fi

13084

+else

13085

+ pkg_failed=untried

13086

fi

13087

13088

13089

@@ -25859,23 +25687,23 @@ else

13090

_pkg_short_errors_supported=no

13091

fi

13092

if test $_pkg_short_errors_supported = yes; then

13093

- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.15.0" 2>&1`

13094

+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.15.0"`

13095

else

13096

- GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.15.0" 2>&1`

13097

+ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.15.0"`

13098

fi

13099

# Put the nasty error message in config.log where it belongs

13100

echo "$GLIB_PKG_ERRORS" >&5

13101

13102

- { $as_echo "$as_me:$LINENO: result: no" >&5

13103

-$as_echo "no" >&6; }

13104

+ { echo "$as_me:$LINENO: result: no" >&5

13105

+echo "${ECHO_T}no" >&6; }

13106

HAVE_GLIB_2_15=no

13107

elif test $pkg_failed = untried; then

13108

HAVE_GLIB_2_15=no

13109

else

13110

GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS

13111

GLIB_LIBS=$pkg_cv_GLIB_LIBS

13112

- { $as_echo "$as_me:$LINENO: result: yes" >&5

13113

-$as_echo "yes" >&6; }

13114

+ { echo "$as_me:$LINENO: result: yes" >&5

13115

+echo "${ECHO_T}yes" >&6; }

13116

HAVE_GLIB_2_15=yes

13117

fi

13118

if test "${HAVE_GLIB_2_15}" != "yes" ; then

13119

@@ -25894,10 +25722,10 @@ done

13120

ALL_PLUGINS=$allowed_plugins

13121

PLUGINS=$used_plugins2

13122

13123

-{ $as_echo "$as_me:$LINENO: checking which plugins to compile" >&5

13124

-$as_echo_n "checking which plugins to compile... " >&6; }

13125

-{ $as_echo "$as_me:$LINENO: result: $PLUGINS" >&5

13126

-$as_echo "$PLUGINS" >&6; }

13127

+{ echo "$as_me:$LINENO: checking which plugins to compile" >&5

13128

+echo $ECHO_N "checking which plugins to compile... $ECHO_C" >&6; }

13129

+{ echo "$as_me:$LINENO: result: $PLUGINS" >&5

13130

+echo "${ECHO_T}$PLUGINS" >&6; }

13131

13132

13133

13134

@@ -25906,8 +25734,8 @@ $as_echo "$PLUGINS" >&6; }

13135

# Browser plugins

13136

# ***************

13137

13138

-{ $as_echo "$as_me:$LINENO: checking whether to compile the browser plugins" >&5

13139

-$as_echo_n "checking whether to compile the browser plugins... " >&6; }

13140

+{ echo "$as_me:$LINENO: checking whether to compile the browser plugins" >&5

13141

+echo $ECHO_N "checking whether to compile the browser plugins... $ECHO_C" >&6; }

13142

13143

# Check whether --enable-browser-plugins was given.

13144

if test "${enable_browser_plugins+set}" = set; then

13145

@@ -25916,8 +25744,8 @@ else

13146

enable_browser_plugins=yes

13147

fi

13148

13149

-{ $as_echo "$as_me:$LINENO: result: $enable_browser_plugins" >&5

13150

-$as_echo "$enable_browser_plugins" >&6; }

13151

+{ echo "$as_me:$LINENO: result: $enable_browser_plugins" >&5

13152

+echo "${ECHO_T}$enable_browser_plugins" >&6; }

13153

13154

if test "$enable_browser_plugins" = "yes" ; then

13155

13156

@@ -25931,21 +25759,22 @@ _ACEOF

13157

13158

13159

pkg_failed=no

13160

-{ $as_echo "$as_me:$LINENO: checking for BROWSER_PLUGIN" >&5

13161

-$as_echo_n "checking for BROWSER_PLUGIN... " >&6; }

13162

+{ echo "$as_me:$LINENO: checking for BROWSER_PLUGIN" >&5

13163

+echo $ECHO_N "checking for BROWSER_PLUGIN... $ECHO_C" >&6; }

13164

13165

-if test -n "$BROWSER_PLUGIN_CFLAGS"; then

13166

- pkg_cv_BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_CFLAGS"

13167

- elif test -n "$PKG_CONFIG"; then

13168

- if test -n "$PKG_CONFIG" && \

13169

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0

13170

+if test -n "$PKG_CONFIG"; then

13171

+ if test -n "$BROWSER_PLUGIN_CFLAGS"; then

13172

+ pkg_cv_BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_CFLAGS"

13173

+ else

13174

+ if test -n "$PKG_CONFIG" && \

13175

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0

13176

gio-2.0

13177

totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5

13178

($PKG_CONFIG --exists --print-errors "glib-2.0

13179

gio-2.0

13180

totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5

13181

ac_status=$?

13182

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13183

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13184

(exit $ac_status); }; then

13185

pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0

13186

gio-2.0

13187

@@ -25953,21 +25782,23 @@ if test -n "$BROWSER_PLUGIN_CFLAGS"; the

13188

else

13189

pkg_failed=yes

13190

fi

13191

- else

13192

- pkg_failed=untried

13193

+ fi

13194

+else

13195

+ pkg_failed=untried

13196

fi

13197

-if test -n "$BROWSER_PLUGIN_LIBS"; then

13198

- pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS"

13199

- elif test -n "$PKG_CONFIG"; then

13200

- if test -n "$PKG_CONFIG" && \

13201

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0

13202

+if test -n "$PKG_CONFIG"; then

13203

+ if test -n "$BROWSER_PLUGIN_LIBS"; then

13204

+ pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS"

13205

+ else

13206

+ if test -n "$PKG_CONFIG" && \

13207

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0

13208

gio-2.0

13209

totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5

13210

($PKG_CONFIG --exists --print-errors "glib-2.0

13211

gio-2.0

13212

totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5

13213

ac_status=$?

13214

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13215

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13216

(exit $ac_status); }; then

13217

pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0

13218

gio-2.0

13219

@@ -25975,8 +25806,9 @@ if test -n "$BROWSER_PLUGIN_LIBS"; then

13220

else

13221

pkg_failed=yes

13222

fi

13223

- else

13224

- pkg_failed=untried

13225

+ fi

13226

+else

13227

+ pkg_failed=untried

13228

fi

13229

13230

13231

@@ -25989,27 +25821,27 @@ else

13232

_pkg_short_errors_supported=no

13233

fi

13234

if test $_pkg_short_errors_supported = yes; then

13235

- BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0

13236

+ BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0

13237

gio-2.0

13238

- totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>&1`

13239

+ totem-plparser-mini >= $TOTEM_PLPARSER_REQS"`

13240

else

13241

- BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0

13242

+ BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0

13243

gio-2.0

13244

- totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>&1`

13245

+ totem-plparser-mini >= $TOTEM_PLPARSER_REQS"`

13246

fi

13247

# Put the nasty error message in config.log where it belongs

13248

echo "$BROWSER_PLUGIN_PKG_ERRORS" >&5

13249

13250

- { $as_echo "$as_me:$LINENO: result: no" >&5

13251

-$as_echo "no" >&6; }

13252

+ { echo "$as_me:$LINENO: result: no" >&5

13253

+echo "${ECHO_T}no" >&6; }

13254

enable_browser_plugins=no

13255

elif test $pkg_failed = untried; then

13256

enable_browser_plugins=no

13257

else

13258

BROWSER_PLUGIN_CFLAGS=$pkg_cv_BROWSER_PLUGIN_CFLAGS

13259

BROWSER_PLUGIN_LIBS=$pkg_cv_BROWSER_PLUGIN_LIBS

13260

- { $as_echo "$as_me:$LINENO: result: yes" >&5

13261

-$as_echo "yes" >&6; }

13262

+ { echo "$as_me:$LINENO: result: yes" >&5

13263

+echo "${ECHO_T}yes" >&6; }

13264

:

13265

fi

13266

13267

@@ -26018,17 +25850,17 @@ fi

13268

13269

# Earlier versions misdetect playlists

13270

if test -n "$PKG_CONFIG" && \

13271

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"shared-mime-info >= 0.22\"") >&5

13272

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"shared-mime-info >= 0.22\"") >&5

13273

($PKG_CONFIG --exists --print-errors "shared-mime-info >= 0.22") 2>&5

13274

ac_status=$?

13275

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13276

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13277

(exit $ac_status); }; then

13278

:

13279

else

13280

- { { $as_echo "$as_me:$LINENO: error:

13281

+ { { echo "$as_me:$LINENO: error:

13282

The Browser plugin requires shared-mime-info

13283

>= 0.22 to function." >&5

13284

-$as_echo "$as_me: error:

13285

+echo "$as_me: error:

13286

The Browser plugin requires shared-mime-info

13287

>= 0.22 to function." >&2;}

13288

{ (exit 1); exit 1; }; }

13289

@@ -26036,40 +25868,44 @@ fi

13290

13291

13292

pkg_failed=no

13293

-{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5

13294

-$as_echo_n "checking for DBUS... " >&6; }

13295

+{ echo "$as_me:$LINENO: checking for DBUS" >&5

13296

+echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; }

13297

13298

-if test -n "$DBUS_CFLAGS"; then

13299

- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"

13300

- elif test -n "$PKG_CONFIG"; then

13301

- if test -n "$PKG_CONFIG" && \

13302

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5

13303

+if test -n "$PKG_CONFIG"; then

13304

+ if test -n "$DBUS_CFLAGS"; then

13305

+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"

13306

+ else

13307

+ if test -n "$PKG_CONFIG" && \

13308

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5

13309

($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5

13310

ac_status=$?

13311

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13312

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13313

(exit $ac_status); }; then

13314

pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null`

13315

else

13316

pkg_failed=yes

13317

fi

13318

- else

13319

- pkg_failed=untried

13320

+ fi

13321

+else

13322

+ pkg_failed=untried

13323

fi

13324

-if test -n "$DBUS_LIBS"; then

13325

- pkg_cv_DBUS_LIBS="$DBUS_LIBS"

13326

- elif test -n "$PKG_CONFIG"; then

13327

- if test -n "$PKG_CONFIG" && \

13328

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5

13329

+if test -n "$PKG_CONFIG"; then

13330

+ if test -n "$DBUS_LIBS"; then

13331

+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"

13332

+ else

13333

+ if test -n "$PKG_CONFIG" && \

13334

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5

13335

($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5

13336

ac_status=$?

13337

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13338

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13339

(exit $ac_status); }; then

13340

pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null`

13341

else

13342

pkg_failed=yes

13343

fi

13344

- else

13345

- pkg_failed=untried

13346

+ fi

13347

+else

13348

+ pkg_failed=untried

13349

fi

13350

13351

13352

@@ -26082,33 +25918,33 @@ else

13353

_pkg_short_errors_supported=no

13354

fi

13355

if test $_pkg_short_errors_supported = yes; then

13356

- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1`

13357

+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"`

13358

else

13359

- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1`

13360

+ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"`

13361

fi

13362

# Put the nasty error message in config.log where it belongs

13363

echo "$DBUS_PKG_ERRORS" >&5

13364

13365

- { $as_echo "$as_me:$LINENO: result: no" >&5

13366

-$as_echo "no" >&6; }

13367

+ { echo "$as_me:$LINENO: result: no" >&5

13368

+echo "${ECHO_T}no" >&6; }

13369

enable_browser_plugins=no

13370

elif test $pkg_failed = untried; then

13371

enable_browser_plugins=no

13372

else

13373

DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS

13374

DBUS_LIBS=$pkg_cv_DBUS_LIBS

13375

- { $as_echo "$as_me:$LINENO: result: yes" >&5

13376

-$as_echo "yes" >&6; }

13377

+ { echo "$as_me:$LINENO: result: yes" >&5

13378

+echo "${ECHO_T}yes" >&6; }

13379

:

13380

fi

13381

DBUSLIBDIR="`$PKG_CONFIG dbus-glib-1 --variable=libdir`"

13382

DBUSBINDIR="`echo $DBUSLIBDIR | sed -e s/lib/bin/`"

13383

# Extract the first word of "dbus-binding-tool", so it can be a program name with args.

13384

set dummy dbus-binding-tool; ac_word=$2

13385

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

13386

-$as_echo_n "checking for $ac_word... " >&6; }

13387

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

13388

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

13389

if test "${ac_cv_path_DBUS_BIND+set}" = set; then

13390

- $as_echo_n "(cached) " >&6

13391

+ echo $ECHO_N "(cached) $ECHO_C" >&6

13392

else

13393

case $DBUS_BIND in

13394

[\\/]* | ?:[\\/]*)

13395

@@ -26124,7 +25960,7 @@ do

13396

for ac_exec_ext in '' $ac_executable_extensions; do

13397

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

13398

ac_cv_path_DBUS_BIND="$as_dir/$ac_word$ac_exec_ext"

13399

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

13400

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

13401

break 2

13402

fi

13403

done

13404

@@ -26137,56 +25973,60 @@ esac

13405

fi

13406

DBUS_BIND=$ac_cv_path_DBUS_BIND

13407

if test -n "$DBUS_BIND"; then

13408

- { $as_echo "$as_me:$LINENO: result: $DBUS_BIND" >&5

13409

-$as_echo "$DBUS_BIND" >&6; }

13410

+ { echo "$as_me:$LINENO: result: $DBUS_BIND" >&5

13411

+echo "${ECHO_T}$DBUS_BIND" >&6; }

13412

else

13413

- { $as_echo "$as_me:$LINENO: result: no" >&5

13414

-$as_echo "no" >&6; }

13415

+ { echo "$as_me:$LINENO: result: no" >&5

13416

+echo "${ECHO_T}no" >&6; }

13417

fi

13418

13419

13420

if test "x$DBUS_BIND" = "xno"; then

13421

- { $as_echo "$as_me:$LINENO: WARNING: dbus-binding-tool not found" >&5

13422

-$as_echo "$as_me: WARNING: dbus-binding-tool not found" >&2;}

13423

+ { echo "$as_me:$LINENO: WARNING: dbus-binding-tool not found" >&5

13424

+echo "$as_me: WARNING: dbus-binding-tool not found" >&2;}

13425

enable_browser_plugins=no

13426

fi

13427

13428

13429

pkg_failed=no

13430

-{ $as_echo "$as_me:$LINENO: checking for SN" >&5

13431

-$as_echo_n "checking for SN... " >&6; }

13432

+{ echo "$as_me:$LINENO: checking for SN" >&5

13433

+echo $ECHO_N "checking for SN... $ECHO_C" >&6; }

13434

13435

-if test -n "$SN_CFLAGS"; then

13436

- pkg_cv_SN_CFLAGS="$SN_CFLAGS"

13437

- elif test -n "$PKG_CONFIG"; then

13438

- if test -n "$PKG_CONFIG" && \

13439

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libstartup-notification-1.0 >= 0.8 \"") >&5

13440

+if test -n "$PKG_CONFIG"; then

13441

+ if test -n "$SN_CFLAGS"; then

13442

+ pkg_cv_SN_CFLAGS="$SN_CFLAGS"

13443

+ else

13444

+ if test -n "$PKG_CONFIG" && \

13445

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libstartup-notification-1.0 >= 0.8 \"") >&5

13446

($PKG_CONFIG --exists --print-errors " libstartup-notification-1.0 >= 0.8 ") 2>&5

13447

ac_status=$?

13448

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13449

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13450

(exit $ac_status); }; then

13451

pkg_cv_SN_CFLAGS=`$PKG_CONFIG --cflags " libstartup-notification-1.0 >= 0.8 " 2>/dev/null`

13452

else

13453

pkg_failed=yes

13454

fi

13455

- else

13456

- pkg_failed=untried

13457

+ fi

13458

+else

13459

+ pkg_failed=untried

13460

fi

13461

-if test -n "$SN_LIBS"; then

13462

- pkg_cv_SN_LIBS="$SN_LIBS"

13463

- elif test -n "$PKG_CONFIG"; then

13464

- if test -n "$PKG_CONFIG" && \

13465

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libstartup-notification-1.0 >= 0.8 \"") >&5

13466

+if test -n "$PKG_CONFIG"; then

13467

+ if test -n "$SN_LIBS"; then

13468

+ pkg_cv_SN_LIBS="$SN_LIBS"

13469

+ else

13470

+ if test -n "$PKG_CONFIG" && \

13471

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libstartup-notification-1.0 >= 0.8 \"") >&5

13472

($PKG_CONFIG --exists --print-errors " libstartup-notification-1.0 >= 0.8 ") 2>&5

13473

ac_status=$?

13474

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13475

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13476

(exit $ac_status); }; then

13477

pkg_cv_SN_LIBS=`$PKG_CONFIG --libs " libstartup-notification-1.0 >= 0.8 " 2>/dev/null`

13478

else

13479

pkg_failed=yes

13480

fi

13481

- else

13482

- pkg_failed=untried

13483

+ fi

13484

+else

13485

+ pkg_failed=untried

13486

fi

13487

13488

13489

@@ -26199,28 +26039,28 @@ else

13490

_pkg_short_errors_supported=no

13491

fi

13492

if test $_pkg_short_errors_supported = yes; then

13493

- SN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libstartup-notification-1.0 >= 0.8 " 2>&1`

13494

+ SN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " libstartup-notification-1.0 >= 0.8 "`

13495

else

13496

- SN_PKG_ERRORS=`$PKG_CONFIG --print-errors " libstartup-notification-1.0 >= 0.8 " 2>&1`

13497

+ SN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libstartup-notification-1.0 >= 0.8 "`

13498

fi

13499

# Put the nasty error message in config.log where it belongs

13500

echo "$SN_PKG_ERRORS" >&5

13501

13502

- { $as_echo "$as_me:$LINENO: result: no" >&5

13503

-$as_echo "no" >&6; }

13504

+ { echo "$as_me:$LINENO: result: no" >&5

13505

+echo "${ECHO_T}no" >&6; }

13506

enable_browser_plugins=no

13507

elif test $pkg_failed = untried; then

13508

enable_browser_plugins=no

13509

else

13510

SN_CFLAGS=$pkg_cv_SN_CFLAGS

13511

SN_LIBS=$pkg_cv_SN_LIBS

13512

- { $as_echo "$as_me:$LINENO: result: yes" >&5

13513

-$as_echo "yes" >&6; }

13514

+ { echo "$as_me:$LINENO: result: yes" >&5

13515

+echo "${ECHO_T}yes" >&6; }

13516

enable_browser_plugins=yes

13517

fi

13518

if test "x$enable_browser_plugins" != "xyes" ; then

13519

- { $as_echo "$as_me:$LINENO: WARNING: libstartup-notification not found, necessary to build the plugin viewer" >&5

13520

-$as_echo "$as_me: WARNING: libstartup-notification not found, necessary to build the plugin viewer" >&2;}

13521

+ { echo "$as_me:$LINENO: WARNING: libstartup-notification not found, necessary to build the plugin viewer" >&5

13522

+echo "$as_me: WARNING: libstartup-notification not found, necessary to build the plugin viewer" >&2;}

13523

fi

13524

13525

# check for -fno-rtti flag

13526

@@ -26234,8 +26074,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu

13527

__SAVE_CXXFLAGS=$CXXFLAGS

13528

CXXFLAGS="-fno-rtti $CXXFLAGS"

13529

13530

- { $as_echo "$as_me:$LINENO: checking for -fno-rtti compiler flag" >&5

13531

-$as_echo_n "checking for -fno-rtti compiler flag... " >&6; }

13532

+ { echo "$as_me:$LINENO: checking for -fno-rtti compiler flag" >&5

13533

+echo $ECHO_N "checking for -fno-rtti compiler flag... $ECHO_C" >&6; }

13534

cat >conftest.$ac_ext <<_ACEOF

13535

/* confdefs.h. */

13536

_ACEOF

13537

@@ -26257,29 +26097,28 @@ case "(($ac_try" in

13538

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13539

*) ac_try_echo=$ac_try;;

13540

esac

13541

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13542

-$as_echo "$ac_try_echo") >&5

13543

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13544

(eval "$ac_compile") 2>conftest.er1

13545

ac_status=$?

13546

grep -v '^ *+' conftest.er1 >conftest.err

13547

rm -f conftest.er1

13548

cat conftest.err >&5

13549

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13550

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13551

(exit $ac_status); } && {

13552

test -z "$ac_cxx_werror_flag" ||

13553

test ! -s conftest.err

13554

} && test -s conftest.$ac_objext; then

13555

have_no_rtti_flag=yes

13556

else

13557

- $as_echo "$as_me: failed program was:" >&5

13558

+ echo "$as_me: failed program was:" >&5

13559

sed 's/^/| /' conftest.$ac_ext >&5

13560

13561

have_no_rtti_flag=no

13562

fi

13563

13564

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

13565

- { $as_echo "$as_me:$LINENO: result: $have_no_rtti_flag" >&5

13566

-$as_echo "$have_no_rtti_flag" >&6; }

13567

+ { echo "$as_me:$LINENO: result: $have_no_rtti_flag" >&5

13568

+echo "${ECHO_T}$have_no_rtti_flag" >&6; }

13569

13570

CXXFLAGS=$__SAVE_CXXFLAGS

13571

ac_ext=c

13572

@@ -26307,8 +26146,8 @@ fi

13573

13574

if test "$enable_browser_plugins" = "yes"; then

13575

13576

-{ $as_echo "$as_me:$LINENO: checking whether to enable the basic browser plugin" >&5

13577

-$as_echo_n "checking whether to enable the basic browser plugin... " >&6; }

13578

+{ echo "$as_me:$LINENO: checking whether to enable the basic browser plugin" >&5

13579

+echo $ECHO_N "checking whether to enable the basic browser plugin... $ECHO_C" >&6; }

13580

# Check whether --enable-basic-plugin was given.

13581

if test "${enable_basic_plugin+set}" = set; then

13582

enableval=$enable_basic_plugin;

13583

@@ -26316,11 +26155,11 @@ else

13584

enable_basic_plugin=yes

13585

fi

13586

13587

-{ $as_echo "$as_me:$LINENO: result: $enable_basic_plugin" >&5

13588

-$as_echo "$enable_basic_plugin" >&6; }

13589

+{ echo "$as_me:$LINENO: result: $enable_basic_plugin" >&5

13590

+echo "${ECHO_T}$enable_basic_plugin" >&6; }

13591

13592

-{ $as_echo "$as_me:$LINENO: checking whether to enable the GMP browser plugin" >&5

13593

-$as_echo_n "checking whether to enable the GMP browser plugin... " >&6; }

13594

+{ echo "$as_me:$LINENO: checking whether to enable the GMP browser plugin" >&5

13595

+echo $ECHO_N "checking whether to enable the GMP browser plugin... $ECHO_C" >&6; }

13596

# Check whether --enable-gmp-plugin was given.

13597

if test "${enable_gmp_plugin+set}" = set; then

13598

enableval=$enable_gmp_plugin;

13599

@@ -26328,11 +26167,11 @@ else

13600

enable_gmp_plugin=yes

13601

fi

13602

13603

-{ $as_echo "$as_me:$LINENO: result: $enable_gmp_plugin" >&5

13604

-$as_echo "$enable_gmp_plugin" >&6; }

13605

+{ echo "$as_me:$LINENO: result: $enable_gmp_plugin" >&5

13606

+echo "${ECHO_T}$enable_gmp_plugin" >&6; }

13607

13608

-{ $as_echo "$as_me:$LINENO: checking whether to enable the Complex browser plugin" >&5

13609

-$as_echo_n "checking whether to enable the Complex browser plugin... " >&6; }

13610

+{ echo "$as_me:$LINENO: checking whether to enable the Complex browser plugin" >&5

13611

+echo $ECHO_N "checking whether to enable the Complex browser plugin... $ECHO_C" >&6; }

13612

# Check whether --enable-complex-plugin was given.

13613

if test "${enable_complex_plugin+set}" = set; then

13614

enableval=$enable_complex_plugin;

13615

@@ -26340,11 +26179,11 @@ else

13616

enable_complex_plugin=no

13617

fi

13618

13619

-{ $as_echo "$as_me:$LINENO: result: $enable_complex_plugin" >&5

13620

-$as_echo "$enable_complex_plugin" >&6; }

13621

+{ echo "$as_me:$LINENO: result: $enable_complex_plugin" >&5

13622

+echo "${ECHO_T}$enable_complex_plugin" >&6; }

13623

13624

-{ $as_echo "$as_me:$LINENO: checking whether to enable the NarrowSpace browser plugin" >&5

13625

-$as_echo_n "checking whether to enable the NarrowSpace browser plugin... " >&6; }

13626

+{ echo "$as_me:$LINENO: checking whether to enable the NarrowSpace browser plugin" >&5

13627

+echo $ECHO_N "checking whether to enable the NarrowSpace browser plugin... $ECHO_C" >&6; }

13628

# Check whether --enable-narrowspace-plugin was given.

13629

if test "${enable_narrowspace_plugin+set}" = set; then

13630

enableval=$enable_narrowspace_plugin;

13631

@@ -26352,11 +26191,11 @@ else

13632

enable_narrowspace_plugin=yes

13633

fi

13634

13635

-{ $as_echo "$as_me:$LINENO: result: $enable_narrowspace_plugin" >&5

13636

-$as_echo "$enable_narrowspace_plugin" >&6; }

13637

+{ echo "$as_me:$LINENO: result: $enable_narrowspace_plugin" >&5

13638

+echo "${ECHO_T}$enable_narrowspace_plugin" >&6; }

13639

13640

-{ $as_echo "$as_me:$LINENO: checking whether to enable the MullY browser plugin" >&5

13641

-$as_echo_n "checking whether to enable the MullY browser plugin... " >&6; }

13642

+{ echo "$as_me:$LINENO: checking whether to enable the MullY browser plugin" >&5

13643

+echo $ECHO_N "checking whether to enable the MullY browser plugin... $ECHO_C" >&6; }

13644

# Check whether --enable-mully-plugin was given.

13645

if test "${enable_mully_plugin+set}" = set; then

13646

enableval=$enable_mully_plugin;

13647

@@ -26364,11 +26203,11 @@ else

13648

enable_mully_plugin=yes

13649

fi

13650

13651

-{ $as_echo "$as_me:$LINENO: result: $enable_mully_plugin" >&5

13652

-$as_echo "$enable_mully_plugin" >&6; }

13653

+{ echo "$as_me:$LINENO: result: $enable_mully_plugin" >&5

13654

+echo "${ECHO_T}$enable_mully_plugin" >&6; }

13655

13656

-{ $as_echo "$as_me:$LINENO: checking whether to enable the Cone browser plugin" >&5

13657

-$as_echo_n "checking whether to enable the Cone browser plugin... " >&6; }

13658

+{ echo "$as_me:$LINENO: checking whether to enable the Cone browser plugin" >&5

13659

+echo $ECHO_N "checking whether to enable the Cone browser plugin... $ECHO_C" >&6; }

13660

# Check whether --enable-cone-plugin was given.

13661

if test "${enable_cone_plugin+set}" = set; then

13662

enableval=$enable_cone_plugin;

13663

@@ -26376,8 +26215,8 @@ else

13664

enable_cone_plugin=yes

13665

fi

13666

13667

-{ $as_echo "$as_me:$LINENO: result: $enable_cone_plugin" >&5

13668

-$as_echo "$enable_cone_plugin" >&6; }

13669

+{ echo "$as_me:$LINENO: result: $enable_cone_plugin" >&5

13670

+echo "${ECHO_T}$enable_cone_plugin" >&6; }

13671

13672

fi

13673

13674

@@ -26436,8 +26275,8 @@ if test "${enable_nautilus+set}" = set;

13675

enableval=$enable_nautilus; case "${enableval}" in

13676

yes) ENABLE_NAUTILUS=yes ;;

13677

no) ENABLE_NAUTILUS=no ;;

13678

- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-nautilus" >&5

13679

-$as_echo "$as_me: error: bad value ${enableval} for --enable-nautilus" >&2;}

13680

+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-nautilus" >&5

13681

+echo "$as_me: error: bad value ${enableval} for --enable-nautilus" >&2;}

13682

{ (exit 1); exit 1; }; } ;;

13683

esac

13684

else

13685

@@ -26447,40 +26286,44 @@ fi

13686

if test x$ENABLE_NAUTILUS = "xyes" ; then

13687

13688

pkg_failed=no

13689

-{ $as_echo "$as_me:$LINENO: checking for NAUTILUS" >&5

13690

-$as_echo_n "checking for NAUTILUS... " >&6; }

13691

+{ echo "$as_me:$LINENO: checking for NAUTILUS" >&5

13692

+echo $ECHO_N "checking for NAUTILUS... $ECHO_C" >&6; }

13693

13694

-if test -n "$NAUTILUS_CFLAGS"; then

13695

- pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS"

13696

- elif test -n "$PKG_CONFIG"; then

13697

- if test -n "$PKG_CONFIG" && \

13698

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\"") >&5

13699

+if test -n "$PKG_CONFIG"; then

13700

+ if test -n "$NAUTILUS_CFLAGS"; then

13701

+ pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS"

13702

+ else

13703

+ if test -n "$PKG_CONFIG" && \

13704

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\"") >&5

13705

($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5

13706

ac_status=$?

13707

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13708

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13709

(exit $ac_status); }; then

13710

pkg_cv_NAUTILUS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>/dev/null`

13711

else

13712

pkg_failed=yes

13713

fi

13714

- else

13715

- pkg_failed=untried

13716

+ fi

13717

+else

13718

+ pkg_failed=untried

13719

fi

13720

-if test -n "$NAUTILUS_LIBS"; then

13721

- pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS"

13722

- elif test -n "$PKG_CONFIG"; then

13723

- if test -n "$PKG_CONFIG" && \

13724

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\"") >&5

13725

+if test -n "$PKG_CONFIG"; then

13726

+ if test -n "$NAUTILUS_LIBS"; then

13727

+ pkg_cv_NAUTILUS_LIBS="$NAUTILUS_LIBS"

13728

+ else

13729

+ if test -n "$PKG_CONFIG" && \

13730

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\"") >&5

13731

($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5

13732

ac_status=$?

13733

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13734

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13735

(exit $ac_status); }; then

13736

pkg_cv_NAUTILUS_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>/dev/null`

13737

else

13738

pkg_failed=yes

13739

fi

13740

- else

13741

- pkg_failed=untried

13742

+ fi

13743

+else

13744

+ pkg_failed=untried

13745

fi

13746

13747

13748

@@ -26493,23 +26336,23 @@ else

13749

_pkg_short_errors_supported=no

13750

fi

13751

if test $_pkg_short_errors_supported = yes; then

13752

- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>&1`

13753

+ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension"`

13754

else

13755

- NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension" 2>&1`

13756

+ NAUTILUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension"`

13757

fi

13758

# Put the nasty error message in config.log where it belongs

13759

echo "$NAUTILUS_PKG_ERRORS" >&5

13760

13761

- { $as_echo "$as_me:$LINENO: result: no" >&5

13762

-$as_echo "no" >&6; }

13763

+ { echo "$as_me:$LINENO: result: no" >&5

13764

+echo "${ECHO_T}no" >&6; }

13765

HAVE_NAUTILUS=no

13766

elif test $pkg_failed = untried; then

13767

HAVE_NAUTILUS=no

13768

else

13769

NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS

13770

NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS

13771

- { $as_echo "$as_me:$LINENO: result: yes" >&5

13772

-$as_echo "yes" >&6; }

13773

+ { echo "$as_me:$LINENO: result: yes" >&5

13774

+echo "${ECHO_T}yes" >&6; }

13775

HAVE_NAUTILUS=yes

13776

fi

13777

fi

13778

@@ -26546,40 +26389,44 @@ fi

13779

if test "x$with_dbus" != "xno"; then

13780

13781

pkg_failed=no

13782

-{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5

13783

-$as_echo_n "checking for DBUS... " >&6; }

13784

+{ echo "$as_me:$LINENO: checking for DBUS" >&5

13785

+echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; }

13786

13787

-if test -n "$DBUS_CFLAGS"; then

13788

- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"

13789

- elif test -n "$PKG_CONFIG"; then

13790

- if test -n "$PKG_CONFIG" && \

13791

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5

13792

+if test -n "$PKG_CONFIG"; then

13793

+ if test -n "$DBUS_CFLAGS"; then

13794

+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"

13795

+ else

13796

+ if test -n "$PKG_CONFIG" && \

13797

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5

13798

($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5

13799

ac_status=$?

13800

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13801

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13802

(exit $ac_status); }; then

13803

pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null`

13804

else

13805

pkg_failed=yes

13806

fi

13807

- else

13808

- pkg_failed=untried

13809

+ fi

13810

+else

13811

+ pkg_failed=untried

13812

fi

13813

-if test -n "$DBUS_LIBS"; then

13814

- pkg_cv_DBUS_LIBS="$DBUS_LIBS"

13815

- elif test -n "$PKG_CONFIG"; then

13816

- if test -n "$PKG_CONFIG" && \

13817

- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5

13818

+if test -n "$PKG_CONFIG"; then

13819

+ if test -n "$DBUS_LIBS"; then

13820

+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"

13821

+ else

13822

+ if test -n "$PKG_CONFIG" && \

13823

+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\"") >&5

13824

($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5

13825

ac_status=$?

13826

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13827

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13828

(exit $ac_status); }; then

13829

pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= $DBUS_REQS" 2>/dev/null`

13830

else

13831

pkg_failed=yes

13832

fi

13833

- else

13834

- pkg_failed=untried

13835

+ fi

13836

+else

13837

+ pkg_failed=untried

13838

fi

13839

13840

13841

@@ -26592,28 +26439,28 @@ else

13842

_pkg_short_errors_supported=no

13843

fi

13844

if test $_pkg_short_errors_supported = yes; then

13845

- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1`

13846

+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"`

13847

else

13848

- DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-glib-1 >= $DBUS_REQS" 2>&1`

13849

+ DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-glib-1 >= $DBUS_REQS"`

13850

fi

13851

# Put the nasty error message in config.log where it belongs

13852

echo "$DBUS_PKG_ERRORS" >&5

13853

13854

- { $as_echo "$as_me:$LINENO: result: no" >&5

13855

-$as_echo "no" >&6; }

13856

+ { echo "$as_me:$LINENO: result: no" >&5

13857

+echo "${ECHO_T}no" >&6; }

13858

enable_dbus=no

13859

elif test $pkg_failed = untried; then

13860

enable_dbus=no

13861

else

13862

DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS

13863

DBUS_LIBS=$pkg_cv_DBUS_LIBS

13864

- { $as_echo "$as_me:$LINENO: result: yes" >&5

13865

-$as_echo "yes" >&6; }

13866

+ { echo "$as_me:$LINENO: result: yes" >&5

13867

+echo "${ECHO_T}yes" >&6; }

13868

enable_dbus=yes

13869

fi

13870

if test "x$with_dbus" = xyes && test "x$enable_dbus" = xno; then

13871

- { { $as_echo "$as_me:$LINENO: error: D-BUS explicitly requested but no support found" >&5

13872

-$as_echo "$as_me: error: D-BUS explicitly requested but no support found" >&2;}

13873

+ { { echo "$as_me:$LINENO: error: D-BUS explicitly requested but no support found" >&5

13874

+echo "$as_me: error: D-BUS explicitly requested but no support found" >&2;}

13875

{ (exit 1); exit 1; }; }

13876

fi

13877

if test "x$enable_dbus" = xyes; then

13878

@@ -26635,10 +26482,10 @@ fi

13879

13880

# Extract the first word of "gconftool-2", so it can be a program name with args.

13881

set dummy gconftool-2; ac_word=$2

13882

-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5

13883

-$as_echo_n "checking for $ac_word... " >&6; }

13884

+{ echo "$as_me:$LINENO: checking for $ac_word" >&5

13885

+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }

13886

if test "${ac_cv_path_GCONFTOOL+set}" = set; then

13887

- $as_echo_n "(cached) " >&6

13888

+ echo $ECHO_N "(cached) $ECHO_C" >&6

13889

else

13890

case $GCONFTOOL in

13891

[\\/]* | ?:[\\/]*)

13892

@@ -26653,7 +26500,7 @@ do

13893

for ac_exec_ext in '' $ac_executable_extensions; do

13894

if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

13895

ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"

13896

- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

13897

+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

13898

break 2

13899

fi

13900

done

13901

@@ -26665,11 +26512,11 @@ esac

13902

fi

13903

GCONFTOOL=$ac_cv_path_GCONFTOOL

13904

if test -n "$GCONFTOOL"; then

13905

- { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5

13906

-$as_echo "$GCONFTOOL" >&6; }

13907

+ { echo "$as_me:$LINENO: result: $GCONFTOOL" >&5

13908

+echo "${ECHO_T}$GCONFTOOL" >&6; }

13909

else

13910

- { $as_echo "$as_me:$LINENO: result: no" >&5

13911

-$as_echo "no" >&6; }

13912

+ { echo "$as_me:$LINENO: result: no" >&5

13913

+echo "${ECHO_T}no" >&6; }

13914

fi

13915

13916

13917

@@ -26688,8 +26535,8 @@ fi

13918

13919

13920

13921

- { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5

13922

-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }

13923

+ { echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5

13924

+echo "${ECHO_T}Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }

13925

13926

if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then

13927

GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'

13928

@@ -26703,15 +26550,15 @@ fi

13929

13930

13931

13932

- { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5

13933

-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }

13934

+ { echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5

13935

+echo "${ECHO_T}Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }

13936

13937

# Check whether --enable-schemas-install was given.

13938

if test "${enable_schemas_install+set}" = set; then

13939

enableval=$enable_schemas_install; case ${enableval} in

13940

yes|no) ;;

13941

- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5

13942

-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}

13943

+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5

13944

+echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}

13945

{ (exit 1); exit 1; }; } ;;

13946

esac

13947

fi

13948

@@ -26787,8 +26634,8 @@ fi

13949

for option in -Wno-sign-compare; do

13950

SAVE_CFLAGS="$CFLAGS"

13951

CFLAGS="$CFLAGS $option"

13952

- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5

13953

-$as_echo_n "checking whether gcc understands $option... " >&6; }

13954

+ { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5

13955

+echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }

13956

cat >conftest.$ac_ext <<_ACEOF

13957

/* confdefs.h. */

13958

_ACEOF

13959

@@ -26810,21 +26657,20 @@ case "(($ac_try" in

13960

*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

13961

*) ac_try_echo=$ac_try;;

13962

esac

13963

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

13964

-$as_echo "$ac_try_echo") >&5

13965

+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

13966

(eval "$ac_compile") 2>conftest.er1

13967

ac_status=$?

13968

grep -v '^ *+' conftest.er1 >conftest.err

13969

rm -f conftest.er1

13970

cat conftest.err >&5

13971

- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

13972

+ echo "$as_me:$LINENO: \$? = $ac_status" >&5

13973

(exit $ac_status); } && {

13974

test -z "$ac_c_werror_flag" ||

13975

test ! -s conftest.err

13976

} && test -s conftest.$ac_objext; then

13977

has_option=yes

13978

else

13979

- $as_echo "$as_me: failed program was:" >&5

13980

+ echo "$as_me: failed program was:" >&5

13981

sed 's/^/| /' conftest.$ac_ext >&5

13982

13983

has_option=no

13984

@@ -26832,8 +26678,8 @@ fi

13985

13986

rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

13987

CFLAGS="$SAVE_CFLAGS"

13988

- { $as_echo "$as_me:$LINENO: result: $has_option" >&5

13989

-$as_echo "$has_option" >&6; }

13990

+ { echo "$as_me:$LINENO: result: $has_option" >&5

13991

+echo "${ECHO_T}$has_option" >&6; }

13992

if test $has_option = yes; then

13993

warning_flags="$warning_flags $option"

13994

fi

13995

@@ -26846,16 +26692,16 @@ $as_echo "$has_option" >&6; }

13996

fi

13997

;;

13998

*)

13999

- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5

14000

-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}

14001

+ { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5

14002

+echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}

14003

{ (exit 1); exit 1; }; }

14004

;;

14005

esac

14006

CFLAGS="$realsave_CFLAGS"

14007

- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5

14008

-$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }

14009

- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5

14010

-$as_echo "$warning_flags" >&6; }

14011

+ { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5

14012

+echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }

14013

+ { echo "$as_me:$LINENO: result: $warning_flags" >&5

14014

+echo "${ECHO_T}$warning_flags" >&6; }

14015

14016

# Check whether --enable-iso-c was given.

14017

if test "${enable_iso_c+set}" = set; then

14018

@@ -26865,8 +26711,8 @@ else

14019

fi

14020

14021

14022

- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5

14023

-$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }

14024

+ { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5

14025

+echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }

14026

complCFLAGS=

14027

if test "x$enable_iso_c" != "xno"; then

14028

if test "x$GCC" = "xyes"; then

14029

@@ -26880,8 +26726,8 @@ $as_echo_n "checking what language compl

14030

esac

14031

fi

14032

fi

14033

- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5

14034

-$as_echo "$complCFLAGS" >&6; }

14035

+ { echo "$as_me:$LINENO: result: $complCFLAGS" >&5

14036

+echo "${ECHO_T}$complCFLAGS" >&6; }

14037

14038

WARN_CFLAGS="$warning_flags $complCFLAGS"

14039

14040

@@ -26895,8 +26741,8 @@ else

14041

fi

14042

14043

14044

- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C++ compiler" >&5

14045

-$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }

14046

+ { echo "$as_me:$LINENO: checking what warning flags to pass to the C++ compiler" >&5

14047

+echo $ECHO_N "checking what warning flags to pass to the C++ compiler... $ECHO_C" >&6; }

14048

warnCXXFLAGS=

14049

if test "x$GXX" != xyes; then

14050

enable_cxx_warnings=no

14051

@@ -26915,8 +26761,8 @@ $as_echo_n "checking what warning flags

14052

fi

14053

fi

14054

fi

14055

- { $as_echo "$as_me:$LINENO: result: $warnCXXFLAGS" >&5

14056

-$as_echo "$warnCXXFLAGS" >&6; }

14057

+ { echo "$as_me:$LINENO: result: $warnCXXFLAGS" >&5

14058

+echo "${ECHO_T}$warnCXXFLAGS" >&6; }

14059

14060

# Check whether --enable-iso-cxx was given.

14061

if test "${enable_iso_cxx+set}" = set; then

14062

@@ -26926,8 +26772,8 @@ else

14063

fi

14064

14065

14066

- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C++ compiler" >&5

14067

-$as_echo_n "checking what language compliance flags to pass to the C++ compiler... " >&6; }

14068

+ { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C++ compiler" >&5

14069

+echo $ECHO_N "checking what language compliance flags to pass to the C++ compiler... $ECHO_C" >&6; }

14070

complCXXFLAGS=

14071

if test "x$enable_iso_cxx" != "xno"; then

14072

if test "x$GXX" = "xyes"; then

14073

@@ -26942,14 +26788,14 @@ $as_echo_n "checking what language compl

14074

esac

14075

fi

14076

fi

14077

- { $as_echo "$as_me:$LINENO: result: $complCXXFLAGS" >&5

14078

-$as_echo "$complCXXFLAGS" >&6; }

14079

+ { echo "$as_me:$LINENO: result: $complCXXFLAGS" >&5

14080

+echo "${ECHO_T}$complCXXFLAGS" >&6; }

14081

14082

WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"

14083

14084

14085

-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5

14086

-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }

14087

+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5

14088

+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }

14089

# Check whether --enable-maintainer-mode was given.

14090

if test "${enable_maintainer_mode+set}" = set; then

14091

enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval

14092

@@ -26957,8 +26803,8 @@ else

14093

USE_MAINTAINER_MODE=no

14094

fi

14095

14096

- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5

14097

-$as_echo "$USE_MAINTAINER_MODE" >&6; }

14098

+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5

14099

+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }

14100

if test $USE_MAINTAINER_MODE = yes; then

14101

MAINTAINER_MODE_TRUE=

14102

MAINTAINER_MODE_FALSE='#'

14103

@@ -27001,8 +26847,8 @@ if test "${enable_debug+set}" = set; the

14104

enableval=$enable_debug; case "${enableval}" in

14105

yes) ENABLE_DEBUG=yes ;;

14106

no) ENABLE_DEBUG=no ;;

14107

- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-debug" >&5

14108

-$as_echo "$as_me: error: bad value ${enableval} for --disable-debug" >&2;}

14109

+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-debug" >&5

14110

+echo "$as_me: error: bad value ${enableval} for --disable-debug" >&2;}

14111

{ (exit 1); exit 1; }; } ;;

14112

esac

14113

else

14114

@@ -27021,8 +26867,8 @@ if test "${enable_run_in_source_tree+set

14115

enableval=$enable_run_in_source_tree; case "${enableval}" in

14116

yes) ENABLE_RUN_IN_SOURCE_TREE=yes ;;

14117

no) ENABLE_RUN_IN_SOURCE_TREE=no ;;

14118

- *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-run-in-source-tree" >&5

14119

-$as_echo "$as_me: error: bad value ${enableval} for --disable-run-in-source-tree" >&2;}

14120

+ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-run-in-source-tree" >&5

14121

+echo "$as_me: error: bad value ${enableval} for --disable-run-in-source-tree" >&2;}

14122

{ (exit 1); exit 1; }; } ;;

14123

esac

14124

else

14125

@@ -27051,7 +26897,7 @@ fi

14126

14127

14128

14129

-ac_config_files="$ac_config_files Makefile totem.spec lib/Makefile src/Makefile src/plugins/Makefile src/plugins/bemused/Makefile src/plugins/screensaver/Makefile src/plugins/ontop/Makefile src/plugins/galago/Makefile src/plugins/gromit/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/mythtv/Makefile src/plugins/properties/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/sample-python/Makefile src/plugins/sample-vala/Makefile src/plugins/thumbnail/Makefile src/plugins/totem/Makefile src/plugins/tracker/Makefile src/plugins/youtube/Makefile src/plugins/pythonconsole/Makefile src/plugins/publish/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/totem.desktop.in.in data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile help/bg/Makefile bindings/Makefile bindings/python/Makefile bindings/vala/Makefile"

14130

+ac_config_files="$ac_config_files Makefile totem.spec lib/Makefile src/Makefile src/plugins/Makefile src/plugins/bbc/Makefile src/plugins/bemused/Makefile src/plugins/screensaver/Makefile src/plugins/ontop/Makefile src/plugins/galago/Makefile src/plugins/gromit/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/mythtv/Makefile src/plugins/properties/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/sample-python/Makefile src/plugins/sample-vala/Makefile src/plugins/thumbnail/Makefile src/plugins/totem/Makefile src/plugins/tracker/Makefile src/plugins/youtube/Makefile src/plugins/pythonconsole/Makefile src/plugins/publish/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/totem.desktop.in.in data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile help/bg/Makefile bindings/Makefile bindings/python/Makefile bindings/vala/Makefile"

14131

14132

cat >confcache <<\_ACEOF

14133

# This file is a shell script that caches the results of configure

14134

@@ -27080,12 +26926,11 @@ _ACEOF

14135

case $ac_val in #(

14136

*${as_nl}*)

14137

case $ac_var in #(

14138

- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5

14139

-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;

14140

+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5

14141

+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;

14142

esac

14143

case $ac_var in #(

14144

_ | IFS | as_nl) ;; #(

14145

- BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(

14146

*) $as_unset $ac_var ;;

14147

esac ;;

14148

esac

14149

@@ -27118,12 +26963,12 @@ $as_echo "$as_me: WARNING: cache variabl

14150

if diff "$cache_file" confcache >/dev/null 2>&1; then :; else

14151

if test -w "$cache_file"; then

14152

test "x$cache_file" != "x/dev/null" &&

14153

- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5

14154

-$as_echo "$as_me: updating cache $cache_file" >&6;}

14155

+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5

14156

+echo "$as_me: updating cache $cache_file" >&6;}

14157

cat confcache >$cache_file

14158

else

14159

- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5

14160

-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}

14161

+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5

14162

+echo "$as_me: not updating unwritable cache $cache_file" >&6;}

14163

fi

14164

fi

14165

rm -f confcache

14166

@@ -27139,7 +26984,7 @@ ac_ltlibobjs=

14167

for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue

14168

# 1. Remove the extension, and $U if already installed.

14169

ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'

14170

- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`

14171

+ ac_i=`echo "$ac_i" | sed "$ac_script"`

14172

# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR

14173

# will be set to the directory where LIBOBJS objects are built.

14174

ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"

14175

@@ -27151,16 +26996,16 @@ LTLIBOBJS=$ac_ltlibobjs

14176

14177

14178

if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then

14179

- { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.

14180

+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.

14181

Usually this means the macro was only invoked conditionally." >&5

14182

-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.

14183

+echo "$as_me: error: conditional \"AMDEP\" was never defined.

14184

Usually this means the macro was only invoked conditionally." >&2;}

14185

{ (exit 1); exit 1; }; }

14186

fi

14187

if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then

14188

- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.

14189

+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.

14190

Usually this means the macro was only invoked conditionally." >&5

14191

-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.

14192

+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.

14193

Usually this means the macro was only invoked conditionally." >&2;}

14194

{ (exit 1); exit 1; }; }

14195

fi

14196

@@ -27169,146 +27014,145 @@ fi

14197

14198

14199

if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then

14200

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.

14201

+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.

14202

Usually this means the macro was only invoked conditionally." >&5

14203

-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.

14204

+echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.

14205

Usually this means the macro was only invoked conditionally." >&2;}

14206

{ (exit 1); exit 1; }; }

14207

fi

14208

if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then

14209

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.

14210

+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.

14211

Usually this means the macro was only invoked conditionally." >&5

14212

-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.

14213

+echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.

14214

Usually this means the macro was only invoked conditionally." >&2;}

14215

{ (exit 1); exit 1; }; }

14216

fi

14217

if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then

14218

- { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.

14219

+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.

14220

Usually this means the macro was only invoked conditionally." >&5

14221

-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.

14222

+echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.

14223

Usually this means the macro was only invoked conditionally." >&2;}

14224

{ (exit 1); exit 1; }; }

14225

fi

14226

if test -z "${TOTEM_GST_TRUE}" && test -z "${TOTEM_GST_FALSE}"; then

14227

- { { $as_echo "$as_me:$LINENO: error: conditional \"TOTEM_GST\" was never defined.

14228

+ { { echo "$as_me:$LINENO: error: conditional \"TOTEM_GST\" was never defined.

14229

Usually this means the macro was only invoked conditionally." >&5

14230

-$as_echo "$as_me: error: conditional \"TOTEM_GST\" was never defined.

14231

+echo "$as_me: error: conditional \"TOTEM_GST\" was never defined.

14232

Usually this means the macro was only invoked conditionally." >&2;}

14233

{ (exit 1); exit 1; }; }

14234

fi

14235

if test -z "${HAVE_GNOME_TRUE}" && test -z "${HAVE_GNOME_FALSE}"; then

14236

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME\" was never defined.

14237

+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME\" was never defined.

14238

Usually this means the macro was only invoked conditionally." >&5

14239

-$as_echo "$as_me: error: conditional \"HAVE_GNOME\" was never defined.

14240

+echo "$as_me: error: conditional \"HAVE_GNOME\" was never defined.

14241

Usually this means the macro was only invoked conditionally." >&2;}

14242

{ (exit 1); exit 1; }; }

14243

fi

14244

if test -z "${HAVE_XVIDMODE_TRUE}" && test -z "${HAVE_XVIDMODE_FALSE}"; then

14245

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_XVIDMODE\" was never defined.

14246

+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_XVIDMODE\" was never defined.

14247

Usually this means the macro was only invoked conditionally." >&5

14248

-$as_echo "$as_me: error: conditional \"HAVE_XVIDMODE\" was never defined.

14249

+echo "$as_me: error: conditional \"HAVE_XVIDMODE\" was never defined.

14250

Usually this means the macro was only invoked conditionally." >&2;}

14251

{ (exit 1); exit 1; }; }

14252

fi

14253

if test -z "${ENABLE_PYTHON_TRUE}" && test -z "${ENABLE_PYTHON_FALSE}"; then

14254

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_PYTHON\" was never defined.

14255

+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_PYTHON\" was never defined.

14256

Usually this means the macro was only invoked conditionally." >&5

14257

-$as_echo "$as_me: error: conditional \"ENABLE_PYTHON\" was never defined.

14258

+echo "$as_me: error: conditional \"ENABLE_PYTHON\" was never defined.

14259

Usually this means the macro was only invoked conditionally." >&2;}

14260

{ (exit 1); exit 1; }; }

14261

fi

14262

if test -z "${ENABLE_VALA_TRUE}" && test -z "${ENABLE_VALA_FALSE}"; then

14263

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_VALA\" was never defined.

14264

+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_VALA\" was never defined.

14265

Usually this means the macro was only invoked conditionally." >&5

14266

-$as_echo "$as_me: error: conditional \"ENABLE_VALA\" was never defined.

14267

+echo "$as_me: error: conditional \"ENABLE_VALA\" was never defined.

14268

Usually this means the macro was only invoked conditionally." >&2;}

14269

{ (exit 1); exit 1; }; }

14270

fi

14271

if test -z "${ENABLE_BROWSER_PLUGINS_TRUE}" && test -z "${ENABLE_BROWSER_PLUGINS_FALSE}"; then

14272

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_BROWSER_PLUGINS\" was never defined.

14273

+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_BROWSER_PLUGINS\" was never defined.

14274

Usually this means the macro was only invoked conditionally." >&5

14275

-$as_echo "$as_me: error: conditional \"ENABLE_BROWSER_PLUGINS\" was never defined.

14276

+echo "$as_me: error: conditional \"ENABLE_BROWSER_PLUGINS\" was never defined.

14277

Usually this means the macro was only invoked conditionally." >&2;}

14278

{ (exit 1); exit 1; }; }

14279

fi

14280

if test -z "${ENABLE_BASIC_PLUGIN_TRUE}" && test -z "${ENABLE_BASIC_PLUGIN_FALSE}"; then

14281

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_BASIC_PLUGIN\" was never defined.

14282

+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_BASIC_PLUGIN\" was never defined.

14283

Usually this means the macro was only invoked conditionally." >&5

14284

-$as_echo "$as_me: error: conditional \"ENABLE_BASIC_PLUGIN\" was never defined.

14285

+echo "$as_me: error: conditional \"ENABLE_BASIC_PLUGIN\" was never defined.

14286

Usually this means the macro was only invoked conditionally." >&2;}

14287

{ (exit 1); exit 1; }; }

14288

fi

14289

if test -z "${ENABLE_GMP_PLUGIN_TRUE}" && test -z "${ENABLE_GMP_PLUGIN_FALSE}"; then

14290

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GMP_PLUGIN\" was never defined.

14291

+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GMP_PLUGIN\" was never defined.

14292

Usually this means the macro was only invoked conditionally." >&5

14293

-$as_echo "$as_me: error: conditional \"ENABLE_GMP_PLUGIN\" was never defined.

14294

+echo "$as_me: error: conditional \"ENABLE_GMP_PLUGIN\" was never defined.

14295

Usually this means the macro was only invoked conditionally." >&2;}

14296

{ (exit 1); exit 1; }; }

14297

fi

14298

if test -z "${ENABLE_COMPLEX_PLUGIN_TRUE}" && test -z "${ENABLE_COMPLEX_PLUGIN_FALSE}"; then

14299

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_COMPLEX_PLUGIN\" was never defined.

14300

+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_COMPLEX_PLUGIN\" was never defined.

14301

Usually this means the macro was only invoked conditionally." >&5

14302

-$as_echo "$as_me: error: conditional \"ENABLE_COMPLEX_PLUGIN\" was never defined.

14303

+echo "$as_me: error: conditional \"ENABLE_COMPLEX_PLUGIN\" was never defined.

14304

Usually this means the macro was only invoked conditionally." >&2;}

14305

{ (exit 1); exit 1; }; }

14306

fi

14307

if test -z "${ENABLE_NARROWSPACE_PLUGIN_TRUE}" && test -z "${ENABLE_NARROWSPACE_PLUGIN_FALSE}"; then

14308

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_NARROWSPACE_PLUGIN\" was never defined.

14309

+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_NARROWSPACE_PLUGIN\" was never defined.

14310

Usually this means the macro was only invoked conditionally." >&5

14311

-$as_echo "$as_me: error: conditional \"ENABLE_NARROWSPACE_PLUGIN\" was never defined.

14312

+echo "$as_me: error: conditional \"ENABLE_NARROWSPACE_PLUGIN\" was never defined.

14313

Usually this means the macro was only invoked conditionally." >&2;}

14314

{ (exit 1); exit 1; }; }

14315

fi

14316

if test -z "${ENABLE_MULLY_PLUGIN_TRUE}" && test -z "${ENABLE_MULLY_PLUGIN_FALSE}"; then

14317

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_MULLY_PLUGIN\" was never defined.

14318

+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_MULLY_PLUGIN\" was never defined.

14319

Usually this means the macro was only invoked conditionally." >&5

14320

-$as_echo "$as_me: error: conditional \"ENABLE_MULLY_PLUGIN\" was never defined.

14321

+echo "$as_me: error: conditional \"ENABLE_MULLY_PLUGIN\" was never defined.

14322

Usually this means the macro was only invoked conditionally." >&2;}

14323

{ (exit 1); exit 1; }; }

14324

fi

14325

if test -z "${ENABLE_CONE_PLUGIN_TRUE}" && test -z "${ENABLE_CONE_PLUGIN_FALSE}"; then

14326

- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_CONE_PLUGIN\" was never defined.

14327

+ { { echo "$as_me:$LINENO: error: conditional \"ENABLE_CONE_PLUGIN\" was never defined.

14328

Usually this means the macro was only invoked conditionally." >&5

14329

-$as_echo "$as_me: error: conditional \"ENABLE_CONE_PLUGIN\" was never defined.

14330

+echo "$as_me: error: conditional \"ENABLE_CONE_PLUGIN\" was never defined.

14331

Usually this means the macro was only invoked conditionally." >&2;}

14332

{ (exit 1); exit 1; }; }

14333

fi

14334

if test -z "${HAVE_NAUTILUS_TRUE}" && test -z "${HAVE_NAUTILUS_FALSE}"; then

14335

- { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_NAUTILUS\" was never defined.

14336

+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_NAUTILUS\" was never defined.

14337

Usually this means the macro was only invoked conditionally." >&5

14338

-$as_echo "$as_me: error: conditional \"HAVE_NAUTILUS\" was never defined.

14339

+echo "$as_me: error: conditional \"HAVE_NAUTILUS\" was never defined.

14340

Usually this means the macro was only invoked conditionally." >&2;}

14341

{ (exit 1); exit 1; }; }

14342

fi

14343

if test -z "${WITH_DBUS_TRUE}" && test -z "${WITH_DBUS_FALSE}"; then

14344

- { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_DBUS\" was never defined.

14345

+ { { echo "$as_me:$LINENO: error: conditional \"WITH_DBUS\" was never defined.

14346

Usually this means the macro was only invoked conditionally." >&5

14347

-$as_echo "$as_me: error: conditional \"WITH_DBUS\" was never defined.

14348

+echo "$as_me: error: conditional \"WITH_DBUS\" was never defined.

14349

Usually this means the macro was only invoked conditionally." >&2;}

14350

{ (exit 1); exit 1; }; }

14351

fi

14352

if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then

14353

- { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.

14354

+ { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.

14355

Usually this means the macro was only invoked conditionally." >&5

14356

-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.

14357

+echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.

14358

Usually this means the macro was only invoked conditionally." >&2;}

14359

{ (exit 1); exit 1; }; }

14360

fi

14361

if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then

14362

- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.

14363

+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.

14364

Usually this means the macro was only invoked conditionally." >&5

14365

-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.

14366

+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.

14367

Usually this means the macro was only invoked conditionally." >&2;}

14368

{ (exit 1); exit 1; }; }

14369

fi

14370

14371

: ${CONFIG_STATUS=./config.status}

14372

-ac_write_fail=0

14373

ac_clean_files_save=$ac_clean_files

14374

ac_clean_files="$ac_clean_files $CONFIG_STATUS"

14375

-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5

14376

-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}

14377

-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

14378

+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5

14379

+echo "$as_me: creating $CONFIG_STATUS" >&6;}

14380

+cat >$CONFIG_STATUS <<_ACEOF

14381

#! $SHELL

14382

# Generated by $as_me.

14383

# Run this file to recreate the current configuration.

14384

@@ -27321,7 +27165,7 @@ ac_cs_silent=false

14385

SHELL=\${CONFIG_SHELL-$SHELL}

14386

_ACEOF

14387

14388

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

14389

+cat >>$CONFIG_STATUS <<\_ACEOF

14390

## --------------------- ##

14391

## M4sh Initialization. ##

14392

## --------------------- ##

14393

@@ -27331,7 +27175,7 @@ DUALCASE=1; export DUALCASE # for MKS sh

14394

if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

14395

emulate sh

14396

NULLCMD=:

14397

- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which

14398

+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

14399

# is contrary to our usage. Disable this feature.

14400

alias -g '${1+"$@"}'='"$@"'

14401

setopt NO_GLOB_SUBST

14402

@@ -27353,45 +27197,17 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE

14403

as_cr_digits='0123456789'

14404

as_cr_alnum=$as_cr_Letters$as_cr_digits

14405

14406

-as_nl='

14407

-'

14408

-export as_nl

14409

-# Printing a long string crashes Solaris 7 /usr/bin/printf.

14410

-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'

14411

-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo

14412

-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo

14413

-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then

14414

- as_echo='printf %s\n'

14415

- as_echo_n='printf %s'

14416

-else

14417

- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then

14418

- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'

14419

- as_echo_n='/usr/ucb/echo -n'

14420

- else

14421

- as_echo_body='eval expr "X$1" : "X\$.*\$"'

14422

- as_echo_n_body='eval

14423

- arg=$1;

14424

- case $arg in

14425

- *"$as_nl"*)

14426

- expr "X$arg" : "X\$.*\$$as_nl";

14427

- arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;

14428

- esac;

14429

- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"

14430

- '

14431

- export as_echo_n_body

14432

- as_echo_n='sh -c $as_echo_n_body as_echo'

14433

- fi

14434

- export as_echo_body

14435

- as_echo='sh -c $as_echo_body as_echo'

14436

-fi

14437

-

14438

# The user is always right.

14439

if test "${PATH_SEPARATOR+set}" != set; then

14440

- PATH_SEPARATOR=:

14441

- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {

14442

- (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||

14443

- PATH_SEPARATOR=';'

14444

- }

14445

+ echo "#! /bin/sh" >conf$$.sh

14446

+ echo "exit 0" >>conf$$.sh

14447

+ chmod +x conf$$.sh

14448

+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

14449

+ PATH_SEPARATOR=';'

14450

+ else

14451

+ PATH_SEPARATOR=:

14452

+ fi

14453

+ rm -f conf$$.sh

14454

fi

14455

14456

# Support unset when possible.

14457

@@ -27407,6 +27223,8 @@ fi

14458

# there to prevent editors from complaining about space-tab.

14459

# (If _AS_PATH_WALK were called with IFS unset, it would disable word

14460

# splitting by setting IFS to empty value.)

14461

+as_nl='

14462

+'

14463

IFS=" "" $as_nl"

14464

14465

# Find who we are. Look in the path if we contain no directory separator.

14466

@@ -27429,7 +27247,7 @@ if test "x$as_myself" = x; then

14467

as_myself=$0

14468

fi

14469

if test ! -f "$as_myself"; then

14470

- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

14471

+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

14472

{ (exit 1); exit 1; }

14473

fi

14474

14475

@@ -27442,10 +27260,17 @@ PS2='> '

14476

PS4='+ '

14477

14478

# NLS nuisances.

14479

-LC_ALL=C

14480

-export LC_ALL

14481

-LANGUAGE=C

14482

-export LANGUAGE

14483

+for as_var in \

14484

+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \

14485

+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \

14486

+ LC_TELEPHONE LC_TIME

14487

+do

14488

+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

14489

+ eval $as_var=C; export $as_var

14490

+ else

14491

+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

14492

+ fi

14493

+done

14494

14495

# Required to use basename.

14496

if expr a : '$a$' >/dev/null 2>&1 &&

14497

@@ -27467,7 +27292,7 @@ as_me=`$as_basename -- "$0" ||

14498

$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \

14499

X"$0" : 'X$//$$' \| \

14500

X"$0" : 'X$/$' \| . 2>/dev/null ||

14501

-$as_echo X/"$0" |

14502

+echo X/"$0" |

14503

sed '/^.*\/$[^/][^/]*$\/*$/{

14504

s//\1/

14505

q

14506

@@ -27518,7 +27343,7 @@ $as_unset CDPATH

14507

s/-\n.*//

14508

' >$as_me.lineno &&

14509

chmod +x "$as_me.lineno" ||

14510

- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

14511

+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2

14512

{ (exit 1); exit 1; }; }

14513

14514

# Don't try to exec as it changes $[0], causing all sort of problems

14515

@@ -27546,6 +27371,7 @@ case `echo -n x` in

14516

*)

14517

ECHO_N='-n';;

14518

esac

14519

+

14520

if expr a : '$a$' >/dev/null 2>&1 &&

14521

test "X`expr 00001 : '.*$...$'`" = X001; then

14522

as_expr=expr

14523

@@ -27558,22 +27384,19 @@ if test -d conf$$.dir; then

14524

rm -f conf$$.dir/conf$$.file

14525

else

14526

rm -f conf$$.dir

14527

- mkdir conf$$.dir 2>/dev/null

14528

+ mkdir conf$$.dir

14529

fi

14530

-if (echo >conf$$.file) 2>/dev/null; then

14531

- if ln -s conf$$.file conf$$ 2>/dev/null; then

14532

- as_ln_s='ln -s'

14533

- # ... but there are two gotchas:

14534

- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

14535

- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

14536

- # In both cases, we have to default to `cp -p'.

14537

- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

14538

- as_ln_s='cp -p'

14539

- elif ln conf$$.file conf$$ 2>/dev/null; then

14540

- as_ln_s=ln

14541

- else

14542

+echo >conf$$.file

14543

+if ln -s conf$$.file conf$$ 2>/dev/null; then

14544

+ as_ln_s='ln -s'

14545

+ # ... but there are two gotchas:

14546

+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.

14547

+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.

14548

+ # In both cases, we have to default to `cp -p'.

14549

+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||

14550

as_ln_s='cp -p'

14551

- fi

14552

+elif ln conf$$.file conf$$ 2>/dev/null; then

14553

+ as_ln_s=ln

14554

else

14555

as_ln_s='cp -p'

14556

fi

14557

@@ -27598,10 +27421,10 @@ else

14558

as_test_x='

14559

eval sh -c '\''

14560

if test -d "$1"; then

14561

- test -d "$1/.";

14562

+ test -d "$1/.";

14563

else

14564

case $1 in

14565

- -*)set "./$1";;

14566

+ -*)set "./$1";;

14567

esac;

14568

case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

14569

???[sx]*):;;*)false;;esac;fi

14570

@@ -27624,7 +27447,7 @@ exec 6>&1

14571

# values after options handling.

14572

ac_log="

14573

This file was extended by totem $as_me 2.24.3, which was

14574

-generated by GNU Autoconf 2.63. Invocation command line was

14575

+generated by GNU Autoconf 2.61. Invocation command line was

14576

14577

CONFIG_FILES = $CONFIG_FILES

14578

CONFIG_HEADERS = $CONFIG_HEADERS

14579

@@ -27637,16 +27460,7 @@ on `(hostname || uname -n) 2>/dev/null |

14580

14581

_ACEOF

14582

14583

-case $ac_config_files in *"

14584

-"*) set x $ac_config_files; shift; ac_config_files=$*;;

14585

-esac

14586

-

14587

-case $ac_config_headers in *"

14588

-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;

14589

-esac

14590

-

14591

-

14592

-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

14593

+cat >>$CONFIG_STATUS <<_ACEOF

14594

# Files that config.status was made for.

14595

config_files="$ac_config_files"

14596

config_headers="$ac_config_headers"

14597

@@ -27654,23 +27468,22 @@ config_commands="$ac_config_commands"

14598

14599

_ACEOF

14600

14601

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

14602

+cat >>$CONFIG_STATUS <<\_ACEOF

14603

ac_cs_usage="\

14604

\`$as_me' instantiates files from templates according to the

14605

current configuration.

14606

14607

-Usage: $0 [OPTION]... [FILE]...

14608

+Usage: $0 [OPTIONS] [FILE]...

14609

14610

-h, --help print this help, then exit

14611

-V, --version print version number and configuration settings, then exit

14612

- -q, --quiet, --silent

14613

- do not print progress messages

14614

+ -q, --quiet do not print progress messages

14615

-d, --debug don't remove temporary files

14616

--recheck update $as_me by reconfiguring in the same conditions

14617

- --file=FILE[:TEMPLATE]

14618

- instantiate the configuration file FILE

14619

- --header=FILE[:TEMPLATE]

14620

- instantiate the configuration header FILE

14621

+ --file=FILE[:TEMPLATE]

14622

+ instantiate the configuration file FILE

14623

+ --header=FILE[:TEMPLATE]

14624

+ instantiate the configuration header FILE

14625

14626

Configuration files:

14627

$config_files

14628

@@ -27684,13 +27497,13 @@ $config_commands

14629

Report bugs to <bug-autoconf@gnu.org>."

14630

14631

_ACEOF

14632

-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

14633

+cat >>$CONFIG_STATUS <<_ACEOF

14634

ac_cs_version="\\

14635

totem config.status 2.24.3

14636

-configured by $0, generated by GNU Autoconf 2.63,

14637

- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

14638

+configured by $0, generated by GNU Autoconf 2.61,

14639

+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

14640

14641

14642

14643

This config.status script is free software; the Free Software Foundation

14644

gives unlimited permission to copy, distribute and modify it."

14645

14646

@@ -27698,12 +27511,11 @@ ac_pwd='$ac_pwd'

14647

srcdir='$srcdir'

14648

INSTALL='$INSTALL'

14649

MKDIR_P='$MKDIR_P'

14650

-AWK='$AWK'

14651

-test -n "\$AWK" || AWK=awk

14652

_ACEOF

14653

14654

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

14655

-# The default lists apply if the user does not specify any file.

14656

+cat >>$CONFIG_STATUS <<\_ACEOF

14657

+# If no file are specified by the user, then we need to provide default

14658

+# value. By we need to know if files were specified by the user.

14659

ac_need_defaults=:

14660

while test $# != 0

14661

do

14662

@@ -27725,36 +27537,30 @@ do

14663

14664

ac_cs_recheck=: ;;

14665

--version | --versio | --versi | --vers | --ver | --ve | --v | -V )

14666

- $as_echo "$ac_cs_version"; exit ;;

14667

+ echo "$ac_cs_version"; exit ;;

14668

--debug | --debu | --deb | --de | --d | -d )

14669

debug=: ;;

14670

--file | --fil | --fi | --f )

14671

$ac_shift

14672

- case $ac_optarg in

14673

- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

14674

- esac

14675

- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"

14676

+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"

14677

ac_need_defaults=false;;

14678

--header | --heade | --head | --hea )

14679

$ac_shift

14680

- case $ac_optarg in

14681

- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;

14682

- esac

14683

- CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"

14684

+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"

14685

ac_need_defaults=false;;

14686

--he | --h)

14687

# Conflict between --help and --header

14688

- { $as_echo "$as_me: error: ambiguous option: $1

14689

+ { echo "$as_me: error: ambiguous option: $1

14690

Try \`$0 --help' for more information." >&2

14691

{ (exit 1); exit 1; }; };;

14692

--help | --hel | -h )

14693

- $as_echo "$ac_cs_usage"; exit ;;

14694

+ echo "$ac_cs_usage"; exit ;;

14695

-q | -quiet | --quiet | --quie | --qui | --qu | --q \

14696

| -silent | --silent | --silen | --sile | --sil | --si | --s)

14697

ac_cs_silent=: ;;

14698

14699

# This is an error.

14700

- -*) { $as_echo "$as_me: error: unrecognized option: $1

14701

+ -*) { echo "$as_me: error: unrecognized option: $1

14702

Try \`$0 --help' for more information." >&2

14703

{ (exit 1); exit 1; }; } ;;

14704

14705

@@ -27773,29 +27579,27 @@ if $ac_cs_silent; then

14706

fi

14707

14708

_ACEOF

14709

-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

14710

+cat >>$CONFIG_STATUS <<_ACEOF

14711

if \$ac_cs_recheck; then

14712

- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

14713

- shift

14714

- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6

14715

- CONFIG_SHELL='$SHELL'

14716

+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6

14717

+ CONFIG_SHELL=$SHELL

14718

export CONFIG_SHELL

14719

- exec "\$@"

14720

+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion

14721

fi

14722

14723

_ACEOF

14724

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

14725

+cat >>$CONFIG_STATUS <<\_ACEOF

14726

exec 5>>config.log

14727

{

14728

echo

14729

sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX

14730

## Running $as_me. ##

14731

_ASBOX

14732

- $as_echo "$ac_log"

14733

+ echo "$ac_log"

14734

} >&5

14735

14736

_ACEOF

14737

-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

14738

+cat >>$CONFIG_STATUS <<_ACEOF

14739

#

14740

# INIT-COMMANDS

14741

#

14742

@@ -27804,7 +27608,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac

14743

14744

_ACEOF

14745

14746

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

14747

+cat >>$CONFIG_STATUS <<\_ACEOF

14748

14749

# Handling of arguments.

14750

for ac_config_target in $ac_config_targets

14751

@@ -27818,6 +27622,7 @@ do

14752

"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;

14753

"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;

14754

"src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;;

14755

+ "src/plugins/bbc/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bbc/Makefile" ;;

14756

"src/plugins/bemused/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bemused/Makefile" ;;

14757

"src/plugins/screensaver/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/screensaver/Makefile" ;;

14758

"src/plugins/ontop/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/ontop/Makefile" ;;

14759

@@ -27856,8 +27661,8 @@ do

14760

"bindings/vala/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/Makefile" ;;

14761

"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;

14762

14763

- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

14764

-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

14765

+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

14766

+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

14767

{ (exit 1); exit 1; }; };;

14768

esac

14769

done

14770

@@ -27898,144 +27703,425 @@ $debug ||

14771

(umask 077 && mkdir "$tmp")

14772

} ||

14773

{

14774

- $as_echo "$as_me: cannot create a temporary directory in ." >&2

14775

+ echo "$me: cannot create a temporary directory in ." >&2

14776

{ (exit 1); exit 1; }

14777

}

14778

14779

-# Set up the scripts for CONFIG_FILES section.

14780

-# No need to generate them if there are no CONFIG_FILES.

14781

-# This happens for instance with `./config.status config.h'.

14782

+#

14783

+# Set up the sed scripts for CONFIG_FILES section.

14784

+#

14785

+

14786

+# No need to generate the scripts if there are no CONFIG_FILES.

14787

+# This happens for instance when ./config.status config.h

14788

if test -n "$CONFIG_FILES"; then

14789

14790

+_ACEOF

14791

+

14792

14793

-ac_cr='

b"'"

14794

-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`

14795

-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then

14796

- ac_cs_awk_cr='\\r'

14797

-else

14798

- ac_cs_awk_cr=$ac_cr

14799

+

14800

+ac_delim='%!_!# '

14801

+for ac_last_try in false false false false false :; do

14802

+ cat >conf$$subs.sed <<_ACEOF

14803

+SHELL!$SHELL$ac_delim

14804

+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim

14805

+PACKAGE_NAME!$PACKAGE_NAME$ac_delim

14806

+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim

14807

+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim

14808

+PACKAGE_STRING!$PACKAGE_STRING$ac_delim

14809

+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim

14810

+exec_prefix!$exec_prefix$ac_delim

14811

+prefix!$prefix$ac_delim

14812

+program_transform_name!$program_transform_name$ac_delim

14813

+bindir!$bindir$ac_delim

14814

+sbindir!$sbindir$ac_delim

14815

+libexecdir!$libexecdir$ac_delim

14816

+datarootdir!$datarootdir$ac_delim

14817

+datadir!$datadir$ac_delim

14818

+sysconfdir!$sysconfdir$ac_delim

14819

+sharedstatedir!$sharedstatedir$ac_delim

14820

+localstatedir!$localstatedir$ac_delim

14821

+includedir!$includedir$ac_delim

14822

+oldincludedir!$oldincludedir$ac_delim

14823

+docdir!$docdir$ac_delim

14824

+infodir!$infodir$ac_delim

14825

+htmldir!$htmldir$ac_delim

14826

+dvidir!$dvidir$ac_delim

14827

+pdfdir!$pdfdir$ac_delim

14828

+psdir!$psdir$ac_delim

14829

+libdir!$libdir$ac_delim

14830

+localedir!$localedir$ac_delim

14831

+mandir!$mandir$ac_delim

14832

+DEFS!$DEFS$ac_delim

14833

+ECHO_C!$ECHO_C$ac_delim

14834

+ECHO_N!$ECHO_N$ac_delim

14835

+ECHO_T!$ECHO_T$ac_delim

14836

+LIBS!$LIBS$ac_delim

14837

+build_alias!$build_alias$ac_delim

14838

+host_alias!$host_alias$ac_delim

14839

+target_alias!$target_alias$ac_delim

14840

+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim

14841

+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim

14842

+INSTALL_DATA!$INSTALL_DATA$ac_delim

14843

+am__isrc!$am__isrc$ac_delim

14844

+CYGPATH_W!$CYGPATH_W$ac_delim

14845

+PACKAGE!$PACKAGE$ac_delim

14846

+VERSION!$VERSION$ac_delim

14847

+ACLOCAL!$ACLOCAL$ac_delim

14848

+AUTOCONF!$AUTOCONF$ac_delim

14849

+AUTOMAKE!$AUTOMAKE$ac_delim

14850

+AUTOHEADER!$AUTOHEADER$ac_delim

14851

+MAKEINFO!$MAKEINFO$ac_delim

14852

+install_sh!$install_sh$ac_delim

14853

+STRIP!$STRIP$ac_delim

14854

+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim

14855

+mkdir_p!$mkdir_p$ac_delim

14856

+AWK!$AWK$ac_delim

14857

+SET_MAKE!$SET_MAKE$ac_delim

14858

+am__leading_dot!$am__leading_dot$ac_delim

14859

+AMTAR!$AMTAR$ac_delim

14860

+am__tar!$am__tar$ac_delim

14861

+am__untar!$am__untar$ac_delim

14862

+GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim

14863

+CC!$CC$ac_delim

14864

+CFLAGS!$CFLAGS$ac_delim

14865

+LDFLAGS!$LDFLAGS$ac_delim

14866

+CPPFLAGS!$CPPFLAGS$ac_delim

14867

+ac_ct_CC!$ac_ct_CC$ac_delim

14868

+EXEEXT!$EXEEXT$ac_delim

14869

+OBJEXT!$OBJEXT$ac_delim

14870

+DEPDIR!$DEPDIR$ac_delim

14871

+am__include!$am__include$ac_delim

14872

+am__quote!$am__quote$ac_delim

14873

+AMDEP_TRUE!$AMDEP_TRUE$ac_delim

14874

+AMDEP_FALSE!$AMDEP_FALSE$ac_delim

14875

+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim

14876

+CCDEPMODE!$CCDEPMODE$ac_delim

14877

+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim

14878

+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim

14879

+CPP!$CPP$ac_delim

14880

+GREP!$GREP$ac_delim

14881

+EGREP!$EGREP$ac_delim

14882

+USE_NLS!$USE_NLS$ac_delim

14883

+MSGFMT!$MSGFMT$ac_delim

14884

+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim

14885

+GMSGFMT!$GMSGFMT$ac_delim

14886

+XGETTEXT!$XGETTEXT$ac_delim

14887

+CATALOGS!$CATALOGS$ac_delim

14888

+CATOBJEXT!$CATOBJEXT$ac_delim

14889

+DATADIRNAME!$DATADIRNAME$ac_delim

14890

+GMOFILES!$GMOFILES$ac_delim

14891

+INSTOBJEXT!$INSTOBJEXT$ac_delim

14892

+INTLLIBS!$INTLLIBS$ac_delim

14893

+PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim

14894

+PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim

14895

+POFILES!$POFILES$ac_delim

14896

+POSUB!$POSUB$ac_delim

14897

+MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim

14898

+INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim

14899

+INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim

14900

+_ACEOF

14901

+

14902

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then

14903

+ break

14904

+ elif $ac_last_try; then

14905

+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

14906

+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

14907

+ { (exit 1); exit 1; }; }

14908

+ else

14909

+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

14910

+ fi

14911

+done

14912

+

14913

+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

14914

+if test -n "$ac_eof"; then

14915

+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

14916

+ ac_eof=`expr $ac_eof + 1`

14917

fi

14918

14919

-echo 'BEGIN {' >"$tmp/subs1.awk" &&

14920

+cat >>$CONFIG_STATUS <<_ACEOF

14921

+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof

14922

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

14923

+_ACEOF

14924

+sed '

14925

+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

14926

+s/^/s,@/; s/!/@,|#_!!_#|/

14927

+:n

14928

+t n

14929

+s/'"$ac_delim"'$/,g/; t

14930

+s/$/\\/; p

14931

+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

14932

+' >>$CONFIG_STATUS <conf$$subs.sed

14933

+rm -f conf$$subs.sed

14934

+cat >>$CONFIG_STATUS <<_ACEOF

14935

+CEOF$ac_eof

14936

_ACEOF

14937

14938

14939

-{

14940

- echo "cat >conf$$subs.awk <<_ACEOF" &&

14941

- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&

14942

- echo "_ACEOF"

14943

-} >conf$$subs.sh ||

14944

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

14945

-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

14946

- { (exit 1); exit 1; }; }

14947

-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`

14948

ac_delim='%!_!# '

14949

for ac_last_try in false false false false false :; do

14950

- . ./conf$$subs.sh ||

14951

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

14952

-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

14953

- { (exit 1); exit 1; }; }

14954

+ cat >conf$$subs.sed <<_ACEOF

14955

+INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim

14956

+INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim

14957

+INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim

14958

+INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim

14959

+INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim

14960

+INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim

14961

+INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim

14962

+INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim

14963

+INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim

14964

+INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim

14965

+INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim

14966

+INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim

14967

+INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim

14968

+INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim

14969

+INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim

14970

+INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim

14971

+INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim

14972

+INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim

14973

+INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim

14974

+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim

14975

+MSGMERGE!$MSGMERGE$ac_delim

14976

+INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim

14977

+ALL_LINGUAS!$ALL_LINGUAS$ac_delim

14978

+PKG_CONFIG!$PKG_CONFIG$ac_delim

14979

+HELP_DIR!$HELP_DIR$ac_delim

14980

+OMF_DIR!$OMF_DIR$ac_delim

14981

+DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim

14982

+ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim

14983

+ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim

14984

+DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim

14985

+HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim

14986

+HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim

14987

+CXX!$CXX$ac_delim

14988

+CXXFLAGS!$CXXFLAGS$ac_delim

14989

+ac_ct_CXX!$ac_ct_CXX$ac_delim

14990

+CXXDEPMODE!$CXXDEPMODE$ac_delim

14991

+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim

14992

+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim

14993

+build!$build$ac_delim

14994

+build_cpu!$build_cpu$ac_delim

14995

+build_vendor!$build_vendor$ac_delim

14996

+build_os!$build_os$ac_delim

14997

+host!$host$ac_delim

14998

+host_cpu!$host_cpu$ac_delim

14999

+host_vendor!$host_vendor$ac_delim

15000

+host_os!$host_os$ac_delim

15001

+SED!$SED$ac_delim

15002

+LN_S!$LN_S$ac_delim

15003

+ECHO!$ECHO$ac_delim

15004

+AR!$AR$ac_delim

15005

+RANLIB!$RANLIB$ac_delim

15006

+DSYMUTIL!$DSYMUTIL$ac_delim

15007

+NMEDIT!$NMEDIT$ac_delim

15008

+CXXCPP!$CXXCPP$ac_delim

15009

+F77!$F77$ac_delim

15010

+FFLAGS!$FFLAGS$ac_delim

15011

+ac_ct_F77!$ac_ct_F77$ac_delim

15012

+LIBTOOL!$LIBTOOL$ac_delim

15013

+GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim

15014

+GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim

15015

+TOTEM_VERSION_MAJOR!$TOTEM_VERSION_MAJOR$ac_delim

15016

+TOTEM_VERSION_MINOR!$TOTEM_VERSION_MINOR$ac_delim

15017

+TOTEM_VERSION_MICRO!$TOTEM_VERSION_MICRO$ac_delim

15018

+PLUGINDIR!$PLUGINDIR$ac_delim

15019

+NVTV_CFLAGS!$NVTV_CFLAGS$ac_delim

15020

+NVTV_LIBS!$NVTV_LIBS$ac_delim

15021

+MISSING_PLUGINS_CFLAGS!$MISSING_PLUGINS_CFLAGS$ac_delim

15022

+MISSING_PLUGINS_LIBS!$MISSING_PLUGINS_LIBS$ac_delim

15023

+GST_CFLAGS!$GST_CFLAGS$ac_delim

15024

+GST_LIBS!$GST_LIBS$ac_delim

15025

+XINE_CFLAGS!$XINE_CFLAGS$ac_delim

15026

+XINE_LIBS!$XINE_LIBS$ac_delim

15027

+TOTEM_GST_TRUE!$TOTEM_GST_TRUE$ac_delim

15028

+TOTEM_GST_FALSE!$TOTEM_GST_FALSE$ac_delim

15029

+EXTRA_GNOME_CFLAGS!$EXTRA_GNOME_CFLAGS$ac_delim

15030

+EXTRA_GNOME_LIBS!$EXTRA_GNOME_LIBS$ac_delim

15031

+MM_CFLAGS!$MM_CFLAGS$ac_delim

15032

+MM_LIBS!$MM_LIBS$ac_delim

15033

+HAVE_GNOME_TRUE!$HAVE_GNOME_TRUE$ac_delim

15034

+HAVE_GNOME_FALSE!$HAVE_GNOME_FALSE$ac_delim

15035

+GTK_CFLAGS!$GTK_CFLAGS$ac_delim

15036

+GTK_LIBS!$GTK_LIBS$ac_delim

15037

+XMKMF!$XMKMF$ac_delim

15038

+XVIDMODE_CFLAGS!$XVIDMODE_CFLAGS$ac_delim

15039

+XVIDMODE_LIBS!$XVIDMODE_LIBS$ac_delim

15040

+X_LIBS!$X_LIBS$ac_delim

15041

+HAVE_XVIDMODE_TRUE!$HAVE_XVIDMODE_TRUE$ac_delim

15042

+HAVE_XVIDMODE_FALSE!$HAVE_XVIDMODE_FALSE$ac_delim

15043

+PYTHON!$PYTHON$ac_delim

15044

+PYTHON_VERSION!$PYTHON_VERSION$ac_delim

15045

+PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim

15046

+PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim

15047

+PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim

15048

+pythondir!$pythondir$ac_delim

15049

+pkgpythondir!$pkgpythondir$ac_delim

15050

+pyexecdir!$pyexecdir$ac_delim

15051

+pkgpyexecdir!$pkgpyexecdir$ac_delim

15052

+_ACEOF

15053

15054

- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`

15055

- if test $ac_delim_n = $ac_delim_num; then

15056

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then

15057

break

15058

elif $ac_last_try; then

15059

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

15060

-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

15061

+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

15062

+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

15063

{ (exit 1); exit 1; }; }

15064

else

15065

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

15066

fi

15067

done

15068

-rm -f conf$$subs.sh

15069

15070

-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

15071

-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&

15072

-_ACEOF

15073

-sed -n '

15074

-h

15075

-s/^/S["/; s/!.*/"]=/

15076

-p

15077

-g

15078

-s/^[^!]*!//

15079

-:repl

15080

-t repl

15081

-s/'"$ac_delim"'$//

15082

-t delim

15083

-:nl

15084

-h

15085

-s/$.\{148\}$.*/\1/

15086

-t more1

15087

-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/

15088

-p

15089

-n

15090

-b repl

15091

-:more1

15092

-s/["\\]/\\&/g; s/^/"/; s/$/"\\/

15093

-p

15094

-g

15095

-s/.\{148\}//

15096

-t nl

15097

-:delim

15098

-h

15099

-s/$.\{148\}$.*/\1/

15100

-t more2

15101

-s/["\\]/\\&/g; s/^/"/; s/$/"/

15102

-p

15103

-b

15104

-:more2

15105

-s/["\\]/\\&/g; s/^/"/; s/$/"\\/

15106

-p

15107

-g

15108

-s/.\{148\}//

15109

-t delim

15110

-' <conf$$subs.awk | sed '

15111

-/^[^""]/{

15112

- N

15113

- s/\n//

15114

-}

15115

-' >>$CONFIG_STATUS || ac_write_fail=1

15116

-rm -f conf$$subs.awk

15117

-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

15118

-_ACAWK

15119

-cat >>"\$tmp/subs1.awk" <<_ACAWK &&

15120

- for (key in S) S_is_set[key] = 1

15121

- FS = ""

15122

+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

15123

+if test -n "$ac_eof"; then

15124

+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

15125

+ ac_eof=`expr $ac_eof + 1`

15126

+fi

15127

15128

-}

15129

-{

15130

- line = $ 0

15131

- nfields = split(line, field, "@")

15132

- substed = 0

15133

- len = length(field[1])

15134

- for (i = 2; i < nfields; i++) {

15135

- key = field[i]

15136

- keylen = length(key)

15137

- if (S_is_set[key]) {

15138

- value = S[key]

15139

- line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)

15140

- len += length(value) + length(field[++i])

15141

- substed = 1

15142

- } else

15143

- len += 1 + keylen

15144

- }

15145

+cat >>$CONFIG_STATUS <<_ACEOF

15146

+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof

15147

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

15148

+_ACEOF

15149

+sed '

15150

+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

15151

+s/^/s,@/; s/!/@,|#_!!_#|/

15152

+:n

15153

+t n

15154

+s/'"$ac_delim"'$/,g/; t

15155

+s/$/\\/; p

15156

+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

15157

+' >>$CONFIG_STATUS <conf$$subs.sed

15158

+rm -f conf$$subs.sed

15159

+cat >>$CONFIG_STATUS <<_ACEOF

15160

+CEOF$ac_eof

15161

+_ACEOF

15162

15163

- print line

15164

-}

15165

15166

-_ACAWK

15167

+ac_delim='%!_!# '

15168

+for ac_last_try in false false false false false :; do

15169

+ cat >conf$$subs.sed <<_ACEOF

15170

+PYTHON_LIBS!$PYTHON_LIBS$ac_delim

15171

+PYTHON_LIB_LOC!$PYTHON_LIB_LOC$ac_delim

15172

+PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim

15173

+PYTHON_EXTRA_LIBS!$PYTHON_EXTRA_LIBS$ac_delim

15174

+PYGTK_CFLAGS!$PYGTK_CFLAGS$ac_delim

15175

+PYGTK_LIBS!$PYGTK_LIBS$ac_delim

15176

+PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim

15177

+PYGTK_CODEGEN!$PYGTK_CODEGEN$ac_delim

15178

+PYGTK_H2DEF!$PYGTK_H2DEF$ac_delim

15179

+NO_STRICT_ALIASING_CFLAGS!$NO_STRICT_ALIASING_CFLAGS$ac_delim

15180

+ENABLE_PYTHON_TRUE!$ENABLE_PYTHON_TRUE$ac_delim

15181

+ENABLE_PYTHON_FALSE!$ENABLE_PYTHON_FALSE$ac_delim

15182

+VALA_CFLAGS!$VALA_CFLAGS$ac_delim

15183

+VALA_LIBS!$VALA_LIBS$ac_delim

15184

+VALAC!$VALAC$ac_delim

15185

+ENABLE_VALA_TRUE!$ENABLE_VALA_TRUE$ac_delim

15186

+ENABLE_VALA_FALSE!$ENABLE_VALA_FALSE$ac_delim

15187

+LIBGALAGO_CFLAGS!$LIBGALAGO_CFLAGS$ac_delim

15188

+LIBGALAGO_LIBS!$LIBGALAGO_LIBS$ac_delim

15189

+MEDIA_PLAYER_KEYS_CFLAGS!$MEDIA_PLAYER_KEYS_CFLAGS$ac_delim

15190

+MEDIA_PLAYER_KEYS_LIBS!$MEDIA_PLAYER_KEYS_LIBS$ac_delim

15191

+LIRC_LIBS!$LIRC_LIBS$ac_delim

15192

+GMYTH_CFLAGS!$GMYTH_CFLAGS$ac_delim

15193

+GMYTH_LIBS!$GMYTH_LIBS$ac_delim

15194

+BBC_CFLAGS!$BBC_CFLAGS$ac_delim

15195

+BBC_LIBS!$BBC_LIBS$ac_delim

15196

+BEMUSED_CFLAGS!$BEMUSED_CFLAGS$ac_delim

15197

+BEMUSED_LIBS!$BEMUSED_LIBS$ac_delim

15198

+LIBEPC_CFLAGS!$LIBEPC_CFLAGS$ac_delim

15199

+LIBEPC_LIBS!$LIBEPC_LIBS$ac_delim

15200

+TRACKER_CFLAGS!$TRACKER_CFLAGS$ac_delim

15201

+TRACKER_LIBS!$TRACKER_LIBS$ac_delim

15202

+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim

15203

+GLIB_LIBS!$GLIB_LIBS$ac_delim

15204

+ALL_PLUGINS!$ALL_PLUGINS$ac_delim

15205

+PLUGINS!$PLUGINS$ac_delim

15206

+BROWSER_PLUGIN_DIR!$BROWSER_PLUGIN_DIR$ac_delim

15207

+BROWSER_PLUGIN_CFLAGS!$BROWSER_PLUGIN_CFLAGS$ac_delim

15208

+BROWSER_PLUGIN_LIBS!$BROWSER_PLUGIN_LIBS$ac_delim

15209

+DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim

15210

+DBUS_LIBS!$DBUS_LIBS$ac_delim

15211

+DBUS_BIND!$DBUS_BIND$ac_delim

15212

+SN_CFLAGS!$SN_CFLAGS$ac_delim

15213

+SN_LIBS!$SN_LIBS$ac_delim

15214

+ENABLE_BROWSER_PLUGINS_TRUE!$ENABLE_BROWSER_PLUGINS_TRUE$ac_delim

15215

+ENABLE_BROWSER_PLUGINS_FALSE!$ENABLE_BROWSER_PLUGINS_FALSE$ac_delim

15216

+ENABLE_BASIC_PLUGIN_TRUE!$ENABLE_BASIC_PLUGIN_TRUE$ac_delim

15217

+ENABLE_BASIC_PLUGIN_FALSE!$ENABLE_BASIC_PLUGIN_FALSE$ac_delim

15218

+ENABLE_GMP_PLUGIN_TRUE!$ENABLE_GMP_PLUGIN_TRUE$ac_delim

15219

+ENABLE_GMP_PLUGIN_FALSE!$ENABLE_GMP_PLUGIN_FALSE$ac_delim

15220

+ENABLE_COMPLEX_PLUGIN_TRUE!$ENABLE_COMPLEX_PLUGIN_TRUE$ac_delim

15221

+ENABLE_COMPLEX_PLUGIN_FALSE!$ENABLE_COMPLEX_PLUGIN_FALSE$ac_delim

15222

+ENABLE_NARROWSPACE_PLUGIN_TRUE!$ENABLE_NARROWSPACE_PLUGIN_TRUE$ac_delim

15223

+ENABLE_NARROWSPACE_PLUGIN_FALSE!$ENABLE_NARROWSPACE_PLUGIN_FALSE$ac_delim

15224

+ENABLE_MULLY_PLUGIN_TRUE!$ENABLE_MULLY_PLUGIN_TRUE$ac_delim

15225

+ENABLE_MULLY_PLUGIN_FALSE!$ENABLE_MULLY_PLUGIN_FALSE$ac_delim

15226

+ENABLE_CONE_PLUGIN_TRUE!$ENABLE_CONE_PLUGIN_TRUE$ac_delim

15227

+ENABLE_CONE_PLUGIN_FALSE!$ENABLE_CONE_PLUGIN_FALSE$ac_delim

15228

+NAUTILUS_CFLAGS!$NAUTILUS_CFLAGS$ac_delim

15229

+NAUTILUS_LIBS!$NAUTILUS_LIBS$ac_delim

15230

+NAUTILUSDIR!$NAUTILUSDIR$ac_delim

15231

+HAVE_NAUTILUS_TRUE!$HAVE_NAUTILUS_TRUE$ac_delim

15232

+HAVE_NAUTILUS_FALSE!$HAVE_NAUTILUS_FALSE$ac_delim

15233

+WITH_DBUS_TRUE!$WITH_DBUS_TRUE$ac_delim

15234

+WITH_DBUS_FALSE!$WITH_DBUS_FALSE$ac_delim

15235

+GCONFTOOL!$GCONFTOOL$ac_delim

15236

+GCONF_SCHEMA_CONFIG_SOURCE!$GCONF_SCHEMA_CONFIG_SOURCE$ac_delim

15237

+GCONF_SCHEMA_FILE_DIR!$GCONF_SCHEMA_FILE_DIR$ac_delim

15238

+GCONF_SCHEMAS_INSTALL_TRUE!$GCONF_SCHEMAS_INSTALL_TRUE$ac_delim

15239

+GCONF_SCHEMAS_INSTALL_FALSE!$GCONF_SCHEMAS_INSTALL_FALSE$ac_delim

15240

+ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim

15241

+WARN_CFLAGS!$WARN_CFLAGS$ac_delim

15242

+WARN_CXXFLAGS!$WARN_CXXFLAGS$ac_delim

15243

+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim

15244

+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim

15245

+MAINT!$MAINT$ac_delim

15246

+DISABLE_DEPRECATED!$DISABLE_DEPRECATED$ac_delim

15247

+FULL_LIBEXECDIR!$FULL_LIBEXECDIR$ac_delim

15248

+AM_CPPFLAGS!$AM_CPPFLAGS$ac_delim

15249

+AM_CFLAGS!$AM_CFLAGS$ac_delim

15250

+AM_CXXFLAGS!$AM_CXXFLAGS$ac_delim

15251

+AM_LDFLAGS!$AM_LDFLAGS$ac_delim

15252

+LIBOBJS!$LIBOBJS$ac_delim

15253

+LTLIBOBJS!$LTLIBOBJS$ac_delim

15254

_ACEOF

15255

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

15256

-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then

15257

- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"

15258

-else

15259

- cat

15260

-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \

15261

- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5

15262

-$as_echo "$as_me: error: could not setup config files machinery" >&2;}

15263

+

15264

+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then

15265

+ break

15266

+ elif $ac_last_try; then

15267

+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

15268

+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}

15269

{ (exit 1); exit 1; }; }

15270

+ else

15271

+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

15272

+ fi

15273

+done

15274

+

15275

+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`

15276

+if test -n "$ac_eof"; then

15277

+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`

15278

+ ac_eof=`expr $ac_eof + 1`

15279

+fi

15280

+

15281

+cat >>$CONFIG_STATUS <<_ACEOF

15282

+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof

15283

+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end

15284

+_ACEOF

15285

+sed '

15286

+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g

15287

+s/^/s,@/; s/!/@,|#_!!_#|/

15288

+:n

15289

+t n

15290

+s/'"$ac_delim"'$/,g/; t

15291

+s/$/\\/; p

15292

+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n

15293

+' >>$CONFIG_STATUS <conf$$subs.sed

15294

+rm -f conf$$subs.sed

15295

+cat >>$CONFIG_STATUS <<_ACEOF

15296

+:end

15297

+s/|#_!!_#|//g

15298

+CEOF$ac_eof

15299

_ACEOF

15300

15301

+

15302

# VPATH may cause trouble with some makes, so we remove $(srcdir),

15303

# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and

15304

# trailing colons and then remove the whole line if VPATH becomes empty

15305

@@ -28051,133 +28137,19 @@ s/^[^=]*=[ ]*$//

15306

}'

15307

fi

15308

15309

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

15310

+cat >>$CONFIG_STATUS <<\_ACEOF

15311

fi # test -n "$CONFIG_FILES"

15312

15313

-# Set up the scripts for CONFIG_HEADERS section.

15314

-# No need to generate them if there are no CONFIG_HEADERS.

15315

-# This happens for instance with `./config.status Makefile'.

15316

-if test -n "$CONFIG_HEADERS"; then

15317

-cat >"$tmp/defines.awk" <<\_ACAWK ||

15318

-BEGIN {

15319

-_ACEOF

15320

-

15321

-# Transform confdefs.h into an awk script `defines.awk', embedded as

15322

-# here-document in config.status, that substitutes the proper values into

15323

-# config.h.in to produce config.h.

15324

-

15325

-# Create a delimiter string that does not exist in confdefs.h, to ease

15326

-# handling of long lines.

15327

-ac_delim='%!_!# '

15328

-for ac_last_try in false false :; do

15329

- ac_t=`sed -n "/$ac_delim/p" confdefs.h`

15330

- if test -z "$ac_t"; then

15331

- break

15332

- elif $ac_last_try; then

15333

- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5

15334

-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}

15335

- { (exit 1); exit 1; }; }

15336

- else

15337

- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

15338

- fi

15339

-done

15340

-

15341

-# For the awk script, D is an array of macro values keyed by name,

15342

-# likewise P contains macro parameters if any. Preserve backslash

15343

-# newline sequences.

15344

-

15345

-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*

15346

-sed -n '

15347

-s/.\{148\}/&'"$ac_delim"'/g

15348

-t rset

15349

-:rset

15350

-s/^[ ]*#[ ]*define[ ][ ]*/ /

15351

-t def

15352

-d

15353

-:def

15354

-s/\\$//

15355

-t bsnl

15356

-s/["\\]/\\&/g

15357

-s/^ $'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/P["\1"]="\2"\

15358

-D["\1"]=" \3"/p

15359

-s/^ $'"$ac_word_re"'$[ ]*$.*$/D["\1"]=" \2"/p

15360

-d

15361

-:bsnl

15362

-s/["\\]/\\&/g

15363

-s/^ $'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/P["\1"]="\2"\

15364

-D["\1"]=" \3\\\\\\n"\\/p

15365

-t cont

15366

-s/^ $'"$ac_word_re"'$[ ]*$.*$/D["\1"]=" \2\\\\\\n"\\/p

15367

-t cont

15368

-d

15369

-:cont

15370

-n

15371

-s/.\{148\}/&'"$ac_delim"'/g

15372

-t clear

15373

-:clear

15374

-s/\\$//

15375

-t bsnlc

15376

-s/["\\]/\\&/g; s/^/"/; s/$/"/p

15377

-d

15378

-:bsnlc

15379

-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p

15380

-b cont

15381

-' <confdefs.h | sed '

15382

-s/'"$ac_delim"'/"\\\

15383

-"/g' >>$CONFIG_STATUS || ac_write_fail=1

15384

-

15385

-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

15386

- for (key in D) D_is_set[key] = 1

15387

- FS = ""

15388

-}

15389

-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {

15390

- line = \$ 0

15391

- split(line, arg, " ")

15392

- if (arg[1] == "#") {

15393

- defundef = arg[2]

15394

- mac1 = arg[3]

15395

- } else {

15396

- defundef = substr(arg[1], 2)

15397

- mac1 = arg[2]

15398

- }

15399

- split(mac1, mac2, "(") #)

15400

- macro = mac2[1]

15401

- prefix = substr(line, 1, index(line, defundef) - 1)

15402

- if (D_is_set[macro]) {

15403

- # Preserve the white space surrounding the "#".

15404

- print prefix "define", macro P[macro] D[macro]

15405

- next

15406

- } else {

15407

- # Replace #undef with comments. This is necessary, for example,

15408

- # in the case of _POSIX_SOURCE, which is predefined and required

15409

- # on some systems where configure will not decide to define it.

15410

- if (defundef == "undef") {

15411

- print "/*", prefix defundef, macro, "*/"

15412

- next

15413

- }

15414

- }

15415

-}

15416

-{ print }

15417

-_ACAWK

15418

-_ACEOF

15419

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

15420

- { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5

15421

-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}

15422

- { (exit 1); exit 1; }; }

15423

-fi # test -n "$CONFIG_HEADERS"

15424

-

15425

15426

-eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"

15427

-shift

15428

-for ac_tag

15429

+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS

15430

do

15431

case $ac_tag in

15432

:[FHLC]) ac_mode=$ac_tag; continue;;

15433

esac

15434

case $ac_mode$ac_tag in

15435

:[FHL]*:*);;

15436

- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5

15437

-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}

15438

+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5

15439

+echo "$as_me: error: Invalid tag $ac_tag." >&2;}

15440

{ (exit 1); exit 1; }; };;

15441

:[FH]-) ac_tag=-:-;;

15442

:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;

15443

@@ -28206,38 +28178,26 @@ $as_echo "$as_me: error: invalid tag $ac

15444

[\\/$]*) false;;

15445

*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;

15446

esac ||

15447

- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5

15448

-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}

15449

+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5

15450

+echo "$as_me: error: cannot find input file: $ac_f" >&2;}

15451

{ (exit 1); exit 1; }; };;

15452

esac

15453

- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac

15454

- ac_file_inputs="$ac_file_inputs '$ac_f'"

15455

+ ac_file_inputs="$ac_file_inputs $ac_f"

15456

done

15457

15458

# Let's still pretend it is `configure' which instantiates (i.e., don't

15459

# use $as_me), people would be surprised to read:

15460

# /* config.h. Generated by config.status. */

15461

- configure_input='Generated from '`

15462

- $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'

15463

- `' by configure.'

15464

+ configure_input="Generated from "`IFS=:

15465

+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."

15466

if test x"$ac_file" != x-; then

15467

configure_input="$ac_file. $configure_input"

15468

- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5

15469

-$as_echo "$as_me: creating $ac_file" >&6;}

15470

+ { echo "$as_me:$LINENO: creating $ac_file" >&5

15471

+echo "$as_me: creating $ac_file" >&6;}

15472

fi

15473

- # Neutralize special characters interpreted by sed in replacement strings.

15474

- case $configure_input in #(

15475

- *\&* | *\|* | *\\* )

15476

- ac_sed_conf_input=`$as_echo "$configure_input" |

15477

- sed 's/[\\\\&|]/\\\\&/g'`;; #(

15478

- *) ac_sed_conf_input=$configure_input;;

15479

- esac

15480

15481

case $ac_tag in

15482

- *:-:* | *:-) cat >"$tmp/stdin" \

15483

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

15484

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

15485

- { (exit 1); exit 1; }; } ;;

15486

+ *:-:* | *:-) cat >"$tmp/stdin";;

15487

esac

15488

;;

15489

esac

15490

@@ -28247,7 +28207,7 @@ $as_expr X"$ac_file" : 'X$.*[^/]$//*[^

15491

X"$ac_file" : 'X$//$[^/]' \| \

15492

X"$ac_file" : 'X$//$$' \| \

15493

X"$ac_file" : 'X$/$' \| . 2>/dev/null ||

15494

-$as_echo X"$ac_file" |

15495

+echo X"$ac_file" |

15496

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15497

s//\1/

15498

q

15499

@@ -28273,7 +28233,7 @@ $as_echo X"$ac_file" |

15500

as_dirs=

15501

while :; do

15502

case $as_dir in #(

15503

- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

15504

+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

15505

*) as_qdir=$as_dir;;

15506

esac

15507

as_dirs="'$as_qdir' $as_dirs"

15508

@@ -28282,7 +28242,7 @@ $as_expr X"$as_dir" : 'X$.*[^/]$//*[^/

15509

X"$as_dir" : 'X$//$[^/]' \| \

15510

X"$as_dir" : 'X$//$$' \| \

15511

X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

15512

-$as_echo X"$as_dir" |

15513

+echo X"$as_dir" |

15514

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15515

s//\1/

15516

q

15517

@@ -28303,17 +28263,17 @@ $as_echo X"$as_dir" |

15518

test -d "$as_dir" && break

15519

done

15520

test -z "$as_dirs" || eval "mkdir $as_dirs"

15521

- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

15522

-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}

15523

+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

15524

+echo "$as_me: error: cannot create directory $as_dir" >&2;}

15525

{ (exit 1); exit 1; }; }; }

15526

ac_builddir=.

15527

15528

case "$ac_dir" in

15529

.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;

15530

*)

15531

- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`

15532

+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`

15533

# A ".." for each directory in $ac_dir_suffix.

15534

- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`

15535

+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`

15536

case $ac_top_builddir_sub in

15537

"") ac_top_builddir_sub=. ac_top_build_prefix= ;;

15538

*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;

15539

@@ -28358,13 +28318,12 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_

15540

esac

15541

_ACEOF

15542

15543

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

15544

+cat >>$CONFIG_STATUS <<\_ACEOF

15545

# If the template does not know about datarootdir, expand it.

15546

# FIXME: This hack should be removed a few years after 2.60.

15547

ac_datarootdir_hack=; ac_datarootdir_seen=

15548

15549

-ac_sed_dataroot='

15550

-/datarootdir/ {

15551

+case `sed -n '/datarootdir/ {

15552

p

15553

q

15554

}

15555

@@ -28373,14 +28332,13 @@ ac_sed_dataroot='

15556

/@infodir@/p

15557

/@localedir@/p

15558

/@mandir@/p

15559

-'

15560

-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in

15561

+' $ac_file_inputs` in

15562

*datarootdir*) ac_datarootdir_seen=yes;;

15563

*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)

15564

- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

15565

-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

15566

+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5

15567

+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}

15568

_ACEOF

15569

-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

15570

+cat >>$CONFIG_STATUS <<_ACEOF

15571

ac_datarootdir_hack='

15572

s&@datadir@&$datadir&g

15573

s&@docdir@&$docdir&g

15574

@@ -28394,16 +28352,15 @@ _ACEOF

15575

# Neutralize VPATH when `$srcdir' = `.'.

15576

# Shell code in configure.ac might set extrasub.

15577

# FIXME: do we really want to maintain this feature?

15578

-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

15579

-ac_sed_extra="$ac_vpsub

15580

+cat >>$CONFIG_STATUS <<_ACEOF

15581

+ sed "$ac_vpsub

15582

$extrasub

15583

_ACEOF

15584

-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

15585

+cat >>$CONFIG_STATUS <<\_ACEOF

15586

:t

15587

/@[a-zA-Z_][a-zA-Z_0-9]*@/!b

15588

-s|@configure_input@|$ac_sed_conf_input|;t t

15589

+s&@configure_input@&$configure_input&;t t

15590

s&@top_builddir@&$ac_top_builddir_sub&;t t

15591

-s&@top_build_prefix@&$ac_top_build_prefix&;t t

15592

s&@srcdir@&$ac_srcdir&;t t

15593

s&@abs_srcdir@&$ac_abs_srcdir&;t t

15594

s&@top_srcdir@&$ac_top_srcdir&;t t

15595

@@ -28414,60 +28371,121 @@ s&@abs_top_builddir@&$ac_abs_top_builddi

15596

s&@INSTALL@&$ac_INSTALL&;t t

15597

s&@MKDIR_P@&$ac_MKDIR_P&;t t

15598

$ac_datarootdir_hack

15599

-"

15600

-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \

15601

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

15602

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

15603

- { (exit 1); exit 1; }; }

15604

+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out

15605

15606

test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&

15607

{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

15608

{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

15609

- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'

15610

+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'

15611

which seems to be undefined. Please make sure it is defined." >&5

15612

-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

15613

+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

15614

which seems to be undefined. Please make sure it is defined." >&2;}

15615

15616

rm -f "$tmp/stdin"

15617

case $ac_file in

15618

- -) cat "$tmp/out" && rm -f "$tmp/out";;

15619

- *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;

15620

- esac \

15621

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

15622

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

15623

- { (exit 1); exit 1; }; }

15624

+ -) cat "$tmp/out"; rm -f "$tmp/out";;

15625

+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;

15626

+ esac

15627

;;

15628

:H)

15629

#

15630

# CONFIG_HEADER

15631

#

15632

+_ACEOF

15633

+

15634

+# Transform confdefs.h into a sed script `conftest.defines', that

15635

+# substitutes the proper values into config.h.in to produce config.h.

15636

+rm -f conftest.defines conftest.tail

15637

+# First, append a space to every undef/define line, to ease matching.

15638

+echo 's/$/ /' >conftest.defines

15639

+# Then, protect against being on the right side of a sed subst, or in

15640

+# an unquoted here document, in config.status. If some macros were

15641

+# called several times there might be several #defines for the same

15642

+# symbol, which is useless. But do not sort them, since the last

15643

+# AC_DEFINE must be honored.

15644

+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*

15645

+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where

15646

+# NAME is the cpp macro being defined, VALUE is the value it is being given.

15647

+# PARAMS is the parameter list in the macro definition--in most cases, it's

15648

+# just an empty string.

15649

+ac_dA='s,^\$[ #]*\$[^ ]*\\([ ]*'

15650

+ac_dB='\\)[ (].*,\\1define\\2'

15651

+ac_dC=' '

15652

+ac_dD=' ,'

15653

+

15654

+uniq confdefs.h |

15655

+ sed -n '

15656

+ t rset

15657

+ :rset

15658

+ s/^[ ]*#[ ]*define[ ][ ]*//

15659

+ t ok

15660

+ d

15661

+ :ok

15662

+ s/[\\&,]/\\&/g

15663

+ s/^$'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p

15664

+ s/^$'"$ac_word_re"'$[ ]*$.*$/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p

15665

+ ' >>conftest.defines

15666

+

15667

+# Remove the space that was appended to ease matching.

15668

+# Then replace #undef with comments. This is necessary, for

15669

+# example, in the case of _POSIX_SOURCE, which is predefined and required

15670

+# on some systems where configure will not decide to define it.

15671

+# (The regexp can be short, since the line contains either #define or #undef.)

15672

+echo 's/ $//

15673

+s,^[ #]*u.*,/* & */,' >>conftest.defines

15674

+

15675

+# Break up conftest.defines:

15676

+ac_max_sed_lines=50

15677

+

15678

+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"

15679

+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"

15680

+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"

15681

+# et cetera.

15682

+ac_in='$ac_file_inputs'

15683

+ac_out='"$tmp/out1"'

15684

+ac_nxt='"$tmp/out2"'

15685

+

15686

+while :

15687

+do

15688

+ # Write a here document:

15689

+ cat >>$CONFIG_STATUS <<_ACEOF

15690

+ # First, check the format of the line:

15691

+ cat >"\$tmp/defines.sed" <<\\CEOF

15692

+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def

15693

+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def

15694

+b

15695

+:def

15696

+_ACEOF

15697

+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS

15698

+ echo 'CEOF

15699

+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS

15700

+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in

15701

+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail

15702

+ grep . conftest.tail >/dev/null || break

15703

+ rm -f conftest.defines

15704

+ mv conftest.tail conftest.defines

15705

+done

15706

+rm -f conftest.defines conftest.tail

15707

+

15708

+echo "ac_result=$ac_in" >>$CONFIG_STATUS

15709

+cat >>$CONFIG_STATUS <<\_ACEOF

15710

if test x"$ac_file" != x-; then

15711

- {

15712

- $as_echo "/* $configure_input */" \

15713

- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"

15714

- } >"$tmp/config.h" \

15715

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

15716

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

15717

- { (exit 1); exit 1; }; }

15718

- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then

15719

- { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5

15720

-$as_echo "$as_me: $ac_file is unchanged" >&6;}

15721

+ echo "/* $configure_input */" >"$tmp/config.h"

15722

+ cat "$ac_result" >>"$tmp/config.h"

15723

+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then

15724

+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5

15725

+echo "$as_me: $ac_file is unchanged" >&6;}

15726

else

15727

- rm -f "$ac_file"

15728

- mv "$tmp/config.h" "$ac_file" \

15729

- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5

15730

-$as_echo "$as_me: error: could not create $ac_file" >&2;}

15731

- { (exit 1); exit 1; }; }

15732

+ rm -f $ac_file

15733

+ mv "$tmp/config.h" $ac_file

15734

fi

15735

else

15736

- $as_echo "/* $configure_input */" \

15737

- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \

15738

- || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5

15739

-$as_echo "$as_me: error: could not create -" >&2;}

15740

- { (exit 1); exit 1; }; }

15741

+ echo "/* $configure_input */"

15742

+ cat "$ac_result"

15743

fi

15744

-# Compute "$ac_file"'s index in $config_headers.

15745

-_am_arg="$ac_file"

15746

+ rm -f "$tmp/out12"

15747

+# Compute $ac_file's index in $config_headers.

15748

+_am_arg=$ac_file

15749

_am_stamp_count=1

15750

for _am_header in $config_headers :; do

15751

case $_am_header in

15752

@@ -28482,7 +28500,7 @@ $as_expr X"$_am_arg" : 'X$.*[^/]$//*[^

15753

X"$_am_arg" : 'X$//$[^/]' \| \

15754

X"$_am_arg" : 'X$//$$' \| \

15755

X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||

15756

-$as_echo X"$_am_arg" |

15757

+echo X"$_am_arg" |

15758

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15759

s//\1/

15760

q

15761

@@ -28502,8 +28520,8 @@ $as_echo X"$_am_arg" |

15762

s/.*/./; q'`/stamp-h$_am_stamp_count

15763

;;

15764

15765

- :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5

15766

-$as_echo "$as_me: executing $ac_file commands" >&6;}

15767

+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5

15768

+echo "$as_me: executing $ac_file commands" >&6;}

15769

;;

15770

esac

15771

15772

@@ -28525,7 +28543,7 @@ $as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/

15773

X"$mf" : 'X$//$[^/]' \| \

15774

X"$mf" : 'X$//$$' \| \

15775

X"$mf" : 'X$/$' \| . 2>/dev/null ||

15776

-$as_echo X"$mf" |

15777

+echo X"$mf" |

15778

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15779

s//\1/

15780

q

15781

@@ -28569,7 +28587,7 @@ $as_expr X"$file" : 'X$.*[^/]$//*[^/][

15782

X"$file" : 'X$//$[^/]' \| \

15783

X"$file" : 'X$//$$' \| \

15784

X"$file" : 'X$/$' \| . 2>/dev/null ||

15785

-$as_echo X"$file" |

15786

+echo X"$file" |

15787

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15788

s//\1/

15789

q

15790

@@ -28595,7 +28613,7 @@ $as_echo X"$file" |

15791

as_dirs=

15792

while :; do

15793

case $as_dir in #(

15794

- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(

15795

+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(

15796

*) as_qdir=$as_dir;;

15797

esac

15798

as_dirs="'$as_qdir' $as_dirs"

15799

@@ -28604,7 +28622,7 @@ $as_expr X"$as_dir" : 'X$.*[^/]$//*[^/

15800

X"$as_dir" : 'X$//$[^/]' \| \

15801

X"$as_dir" : 'X$//$$' \| \

15802

X"$as_dir" : 'X$/$' \| . 2>/dev/null ||

15803

-$as_echo X"$as_dir" |

15804

+echo X"$as_dir" |

15805

sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

15806

s//\1/

15807

q

15808

@@ -28625,8 +28643,8 @@ $as_echo X"$as_dir" |

15809

test -d "$as_dir" && break

15810

done

15811

test -z "$as_dirs" || eval "mkdir $as_dirs"

15812

- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

15813

-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}

15814

+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5

15815

+echo "$as_me: error: cannot create directory $as_dir" >&2;}

15816

{ (exit 1); exit 1; }; }; }

15817

# echo "creating $dirpart/$file"

15818

echo '# dummy' > "$dirpart/$file"

15819

@@ -28638,8 +28656,8 @@ done

15820

esac ;;

15821

"po/stamp-it":C)

15822

if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then

15823

- { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5

15824

-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}

15825

+ { { echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5

15826

+echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}

15827

{ (exit 1); exit 1; }; }

15828

fi

15829

rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"

15830

@@ -28668,11 +28686,6 @@ _ACEOF

15831

chmod +x $CONFIG_STATUS

15832

ac_clean_files=$ac_clean_files_save

15833

15834

-test $ac_write_fail = 0 ||

15835

- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5

15836

-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}

15837

- { (exit 1); exit 1; }; }

15838

-

15839

15840

# configure is writing to config.log, and then calls config.status.

15841

# config.status does its own redirection, appending to config.log.

15842

@@ -28694,167 +28707,163 @@ if test "$no_create" != yes; then

15843

# would make configure fail if this is the last instruction.

15844

$ac_cs_success || { (exit 1); exit 1; }

15845

fi

15846

-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then

15847

- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

15848

-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}

15849

-fi

15850

15851

15852

-{ $as_echo "$as_me:$LINENO: Totem was configured with the following options:" >&5

15853

-$as_echo "$as_me: Totem was configured with the following options:" >&6;}

15854

+{ echo "$as_me:$LINENO: Totem was configured with the following options:" >&5

15855

+echo "$as_me: Totem was configured with the following options:" >&6;}

15856

if test x$HAVE_GSTREAMER = xno ; then

15857

- { $as_echo "$as_me:$LINENO: ** Using the xine backend" >&5

15858

-$as_echo "$as_me: ** Using the xine backend" >&6;}

15859

+ { echo "$as_me:$LINENO: ** Using the xine backend" >&5

15860

+echo "$as_me: ** Using the xine backend" >&6;}

15861

else

15862

- { $as_echo "$as_me:$LINENO: ** Using the GStreamer-$GST_MAJORMINOR backend" >&5

15863

-$as_echo "$as_me: ** Using the GStreamer-$GST_MAJORMINOR backend" >&6;}

15864

+ { echo "$as_me:$LINENO: ** Using the GStreamer-$GST_MAJORMINOR backend" >&5

15865

+echo "$as_me: ** Using the GStreamer-$GST_MAJORMINOR backend" >&6;}

15866

if test "x$MISSING_PLUGINS_LIBS" != "x"; then

15867

- { $as_echo "$as_me:$LINENO: ** Easy codec installation support enabled" >&5

15868

-$as_echo "$as_me: ** Easy codec installation support enabled" >&6;}

15869

+ { echo "$as_me:$LINENO: ** Easy codec installation support enabled" >&5

15870

+echo "$as_me: ** Easy codec installation support enabled" >&6;}

15871

else

15872

- { $as_echo "$as_me:$LINENO: Easy codec installation support disabled" >&5

15873

-$as_echo "$as_me: Easy codec installation support disabled" >&6;}

15874

+ { echo "$as_me:$LINENO: Easy codec installation support disabled" >&5

15875

+echo "$as_me: Easy codec installation support disabled" >&6;}

15876

fi

15877

fi

15878

if test x$found_nvtv = xyes ; then

15879

- { $as_echo "$as_me:$LINENO: ** nvtv support enabled" >&5

15880

-$as_echo "$as_me: ** nvtv support enabled" >&6;}

15881

+ { echo "$as_me:$LINENO: ** nvtv support enabled" >&5

15882

+echo "$as_me: ** nvtv support enabled" >&6;}

15883

else

15884

- { $as_echo "$as_me:$LINENO: nvtv support disabled" >&5

15885

-$as_echo "$as_me: nvtv support disabled" >&6;}

15886

+ { echo "$as_me:$LINENO: nvtv support disabled" >&5

15887

+echo "$as_me: nvtv support disabled" >&6;}

15888

fi

15889

if test x$ENABLE_GTK = xyes ; then

15890

- { $as_echo "$as_me:$LINENO: ** GTK+-only version enabled" >&5

15891

-$as_echo "$as_me: ** GTK+-only version enabled" >&6;}

15892

+ { echo "$as_me:$LINENO: ** GTK+-only version enabled" >&5

15893

+echo "$as_me: ** GTK+-only version enabled" >&6;}

15894

else

15895

- { $as_echo "$as_me:$LINENO: ** GNOME version enabled" >&5

15896

-$as_echo "$as_me: ** GNOME version enabled" >&6;}

15897

+ { echo "$as_me:$LINENO: ** GNOME version enabled" >&5

15898

+echo "$as_me: ** GNOME version enabled" >&6;}

15899

fi

15900

if test x$enable_python = xyes ; then

15901

- { $as_echo "$as_me:$LINENO: ** Python binding support enabled" >&5

15902

-$as_echo "$as_me: ** Python binding support enabled" >&6;}

15903

+ { echo "$as_me:$LINENO: ** Python binding support enabled" >&5

15904

+echo "$as_me: ** Python binding support enabled" >&6;}

15905

else

15906

- { $as_echo "$as_me:$LINENO: Python binding support disabled" >&5

15907

-$as_echo "$as_me: Python binding support disabled" >&6;}

15908

+ { echo "$as_me:$LINENO: Python binding support disabled" >&5

15909

+echo "$as_me: Python binding support disabled" >&6;}

15910

fi

15911

if test x$with_vala = xyes ; then

15912

- { $as_echo "$as_me:$LINENO: ** Vala binding support enabled" >&5

15913

-$as_echo "$as_me: ** Vala binding support enabled" >&6;}

15914

+ { echo "$as_me:$LINENO: ** Vala binding support enabled" >&5

15915

+echo "$as_me: ** Vala binding support enabled" >&6;}

15916

else

15917

- { $as_echo "$as_me:$LINENO: Vala binding support disabled" >&5

15918

-$as_echo "$as_me: Vala binding support disabled" >&6;}

15919

+ { echo "$as_me:$LINENO: Vala binding support disabled" >&5

15920

+echo "$as_me: Vala binding support disabled" >&6;}

15921

fi

15922

if test "x${PLUGINS}" != "x" ; then

15923

for allowed_plugin in ${ALL_PLUGINS}; do

15924

for plugin in ${PLUGINS}; do

15925

case ${allowed_plugin} in

15926

${plugin})

15927

- { $as_echo "$as_me:$LINENO: ** ${allowed_plugin} plugin enabled" >&5

15928

-$as_echo "$as_me: ** ${allowed_plugin} plugin enabled" >&6;}

15929

+ { echo "$as_me:$LINENO: ** ${allowed_plugin} plugin enabled" >&5

15930

+echo "$as_me: ** ${allowed_plugin} plugin enabled" >&6;}

15931

continue 2

15932

;;

15933

*);;

15934

esac

15935

done

15936

- { $as_echo "$as_me:$LINENO: ${allowed_plugin} plugin disabled" >&5

15937

-$as_echo "$as_me: ${allowed_plugin} plugin disabled" >&6;}

15938

+ { echo "$as_me:$LINENO: ${allowed_plugin} plugin disabled" >&5

15939

+echo "$as_me: ${allowed_plugin} plugin disabled" >&6;}

15940

done

15941

else

15942

- { $as_echo "$as_me:$LINENO: No Totem plugins enabled" >&5

15943

-$as_echo "$as_me: No Totem plugins enabled" >&6;}

15944

+ { echo "$as_me:$LINENO: No Totem plugins enabled" >&5

15945

+echo "$as_me: No Totem plugins enabled" >&6;}

15946

fi

15947

if test x$enable_browser_plugins = xyes ; then

15948

- { $as_echo "$as_me:$LINENO: ** Browser plugin enabled (using $MOZILLA)" >&5

15949

-$as_echo "$as_me: ** Browser plugin enabled (using $MOZILLA)" >&6;}

15950

+ { echo "$as_me:$LINENO: ** Browser plugin enabled (using $MOZILLA)" >&5

15951

+echo "$as_me: ** Browser plugin enabled (using $MOZILLA)" >&6;}

15952

if test x$enable_basic_plugin = xyes ; then

15953

- { $as_echo "$as_me:$LINENO: ** Basic browser plugin enabled" >&5

15954

-$as_echo "$as_me: ** Basic browser plugin enabled" >&6;}

15955

+ { echo "$as_me:$LINENO: ** Basic browser plugin enabled" >&5

15956

+echo "$as_me: ** Basic browser plugin enabled" >&6;}

15957

else

15958

- { $as_echo "$as_me:$LINENO: Basic browser plugin disabled" >&5

15959

-$as_echo "$as_me: Basic browser plugin disabled" >&6;}

15960

+ { echo "$as_me:$LINENO: Basic browser plugin disabled" >&5

15961

+echo "$as_me: Basic browser plugin disabled" >&6;}

15962

fi

15963

if test x$enable_gmp_plugin = xyes ; then

15964

- { $as_echo "$as_me:$LINENO: ** GMP (Windows Media) plugin enabled" >&5

15965

-$as_echo "$as_me: ** GMP (Windows Media) plugin enabled" >&6;}

15966

+ { echo "$as_me:$LINENO: ** GMP (Windows Media) plugin enabled" >&5

15967

+echo "$as_me: ** GMP (Windows Media) plugin enabled" >&6;}

15968

else

15969

- { $as_echo "$as_me:$LINENO: GMP (Windows Media) plugin disabled" >&5

15970

-$as_echo "$as_me: GMP (Windows Media) plugin disabled" >&6;}

15971

+ { echo "$as_me:$LINENO: GMP (Windows Media) plugin disabled" >&5

15972

+echo "$as_me: GMP (Windows Media) plugin disabled" >&6;}

15973

fi

15974

if test x$enable_complex_plugin = xyes ; then

15975

- { $as_echo "$as_me:$LINENO: ** Complex (Real) plugin enabled" >&5

15976

-$as_echo "$as_me: ** Complex (Real) plugin enabled" >&6;}

15977

+ { echo "$as_me:$LINENO: ** Complex (Real) plugin enabled" >&5

15978

+echo "$as_me: ** Complex (Real) plugin enabled" >&6;}

15979

else

15980

- { $as_echo "$as_me:$LINENO: Complex (Real) plugin disabled" >&5

15981

-$as_echo "$as_me: Complex (Real) plugin disabled" >&6;}

15982

+ { echo "$as_me:$LINENO: Complex (Real) plugin disabled" >&5

15983

+echo "$as_me: Complex (Real) plugin disabled" >&6;}

15984

fi

15985

if test x$enable_narrowspace_plugin = xyes ; then

15986

- { $as_echo "$as_me:$LINENO: ** NarrowSpace (QuickTime) plugin enabled" >&5

15987

-$as_echo "$as_me: ** NarrowSpace (QuickTime) plugin enabled" >&6;}

15988

+ { echo "$as_me:$LINENO: ** NarrowSpace (QuickTime) plugin enabled" >&5

15989

+echo "$as_me: ** NarrowSpace (QuickTime) plugin enabled" >&6;}

15990

else

15991

- { $as_echo "$as_me:$LINENO: NarrowSpace (QuickTime) plugin disabled" >&5

15992

-$as_echo "$as_me: NarrowSpace (QuickTime) plugin disabled" >&6;}

15993

+ { echo "$as_me:$LINENO: NarrowSpace (QuickTime) plugin disabled" >&5

15994

+echo "$as_me: NarrowSpace (QuickTime) plugin disabled" >&6;}

15995

fi

15996

if test x$enable_mully_plugin = xyes ; then

15997

- { $as_echo "$as_me:$LINENO: ** MullY (DivX) plugin enabled" >&5

15998

-$as_echo "$as_me: ** MullY (DivX) plugin enabled" >&6;}

15999

+ { echo "$as_me:$LINENO: ** MullY (DivX) plugin enabled" >&5

16000

+echo "$as_me: ** MullY (DivX) plugin enabled" >&6;}

16001

else

16002

- { $as_echo "$as_me:$LINENO: MullY (DivX) plugin disabled" >&5

16003

-$as_echo "$as_me: MullY (DivX) plugin disabled" >&6;}

16004

+ { echo "$as_me:$LINENO: MullY (DivX) plugin disabled" >&5

16005

+echo "$as_me: MullY (DivX) plugin disabled" >&6;}

16006

fi

16007

if test x$enable_cone_plugin = xyes ; then

16008

- { $as_echo "$as_me:$LINENO: ** Cone (VLC) plugin enabled" >&5

16009

-$as_echo "$as_me: ** Cone (VLC) plugin enabled" >&6;}

16010

+ { echo "$as_me:$LINENO: ** Cone (VLC) plugin enabled" >&5

16011

+echo "$as_me: ** Cone (VLC) plugin enabled" >&6;}

16012

else

16013

- { $as_echo "$as_me:$LINENO: Cone (VLC) plugin disabled" >&5

16014

-$as_echo "$as_me: Cone (VLC) plugin disabled" >&6;}

16015

+ { echo "$as_me:$LINENO: Cone (VLC) plugin disabled" >&5

16016

+echo "$as_me: Cone (VLC) plugin disabled" >&6;}

16017

fi

16018

else

16019

- { $as_echo "$as_me:$LINENO: Browser plugin disabled" >&5

16020

-$as_echo "$as_me: Browser plugin disabled" >&6;}

16021

+ { echo "$as_me:$LINENO: Browser plugin disabled" >&5

16022

+echo "$as_me: Browser plugin disabled" >&6;}

16023

fi

16024

if test x$ENABLE_NAUTILUS = xyes ; then

16025

- { $as_echo "$as_me:$LINENO: ** Nautilus properties page enabled" >&5

16026

-$as_echo "$as_me: ** Nautilus properties page enabled" >&6;}

16027

+ { echo "$as_me:$LINENO: ** Nautilus properties page enabled" >&5

16028

+echo "$as_me: ** Nautilus properties page enabled" >&6;}

16029

else

16030

- { $as_echo "$as_me:$LINENO: Nautilus properties page disabled" >&5

16031

-$as_echo "$as_me: Nautilus properties page disabled" >&6;}

16032

+ { echo "$as_me:$LINENO: Nautilus properties page disabled" >&5

16033

+echo "$as_me: Nautilus properties page disabled" >&6;}

16034

fi

16035

if test x$disable_iso_codes_check = xno ; then

16036

- { $as_echo "$as_me:$LINENO: ** iso-codes support checked" >&5

16037

-$as_echo "$as_me: ** iso-codes support checked" >&6;}

16038

+ { echo "$as_me:$LINENO: ** iso-codes support checked" >&5

16039

+echo "$as_me: ** iso-codes support checked" >&6;}

16040

else

16041

- { $as_echo "$as_me:$LINENO: iso-codes support checked at run-time" >&5

16042

-$as_echo "$as_me: iso-codes support checked at run-time" >&6;}

16043

+ { echo "$as_me:$LINENO: iso-codes support checked at run-time" >&5

16044

+echo "$as_me: iso-codes support checked at run-time" >&6;}

16045

fi

16046

if test x$enable_xtest = xyes ; then

16047

- { $as_echo "$as_me:$LINENO: ** XTest (legacy screensaver) support enabled" >&5

16048

-$as_echo "$as_me: ** XTest (legacy screensaver) support enabled" >&6;}

16049

+ { echo "$as_me:$LINENO: ** XTest (legacy screensaver) support enabled" >&5

16050

+echo "$as_me: ** XTest (legacy screensaver) support enabled" >&6;}

16051

else

16052

- { $as_echo "$as_me:$LINENO: XTest (legacy screensaver) support disabled" >&5

16053

-$as_echo "$as_me: XTest (legacy screensaver) support disabled" >&6;}

16054

+ { echo "$as_me:$LINENO: XTest (legacy screensaver) support disabled" >&5

16055

+echo "$as_me: XTest (legacy screensaver) support disabled" >&6;}

16056

fi

16057

if test x$enable_dbus = xyes ; then

16058

- { $as_echo "$as_me:$LINENO: ** D-Bus (gnome-screensaver) support enabled" >&5

16059

-$as_echo "$as_me: ** D-Bus (gnome-screensaver) support enabled" >&6;}

16060

+ { echo "$as_me:$LINENO: ** D-Bus (gnome-screensaver) support enabled" >&5

16061

+echo "$as_me: ** D-Bus (gnome-screensaver) support enabled" >&6;}

16062

else

16063

- { $as_echo "$as_me:$LINENO: D-Bus (gnome-screensaver) support disabled" >&5

16064

-$as_echo "$as_me: D-Bus (gnome-screensaver) support disabled" >&6;}

16065

+ { echo "$as_me:$LINENO: D-Bus (gnome-screensaver) support disabled" >&5

16066

+echo "$as_me: D-Bus (gnome-screensaver) support disabled" >&6;}

16067

fi

16068

if test x$have_xvidmode = xyes ; then

16069

- { $as_echo "$as_me:$LINENO: ** XVidmode support enabled" >&5

16070

-$as_echo "$as_me: ** XVidmode support enabled" >&6;}

16071

+ { echo "$as_me:$LINENO: ** XVidmode support enabled" >&5

16072

+echo "$as_me: ** XVidmode support enabled" >&6;}

16073

else

16074

- { $as_echo "$as_me:$LINENO: XVidmode support disabled" >&5

16075

-$as_echo "$as_me: XVidmode support disabled" >&6;}

16076

+ { echo "$as_me:$LINENO: XVidmode support disabled" >&5

16077

+echo "$as_me: XVidmode support disabled" >&6;}

16078

fi

16079

if test x$have_xfree = xyes ; then

16080

- { $as_echo "$as_me:$LINENO: ** XFree86 multimedia keys support enabled" >&5

16081

-$as_echo "$as_me: ** XFree86 multimedia keys support enabled" >&6;}

16082

+ { echo "$as_me:$LINENO: ** XFree86 multimedia keys support enabled" >&5

16083

+echo "$as_me: ** XFree86 multimedia keys support enabled" >&6;}

16084

else

16085

- { $as_echo "$as_me:$LINENO: XFree86 multimedia keys support disabled" >&5

16086

-$as_echo "$as_me: XFree86 multimedia keys support disabled" >&6;}

16087

+ { echo "$as_me:$LINENO: XFree86 multimedia keys support disabled" >&5

16088

+echo "$as_me: XFree86 multimedia keys support disabled" >&6;}

16089

fi

16090

16091

-{ $as_echo "$as_me:$LINENO: End options" >&5

16092

-$as_echo "$as_me: End options" >&6;}

16093

+{ echo "$as_me:$LINENO: End options" >&5

16094

+echo "$as_me: End options" >&6;}

16095

16096

Index: totem-2.24.3/data/Makefile.in

16097

===================================================================

16098

--- totem-2.24.3.orig/data/Makefile.in 2008-10-26 15:40:45.000000000 +0100

16099

+++ totem-2.24.3/data/Makefile.in 2009-01-23 17:07:50.909150456 +0100

16100

@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@

16101

AUTOHEADER = @AUTOHEADER@

16102

AUTOMAKE = @AUTOMAKE@

16103

AWK = @AWK@

16104

+BBC_CFLAGS = @BBC_CFLAGS@

16105

+BBC_LIBS = @BBC_LIBS@

16106

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16107

BEMUSED_LIBS = @BEMUSED_LIBS@

16108

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16109

@@ -262,7 +264,6 @@ XGETTEXT = @XGETTEXT@

16110

XINE_CFLAGS = @XINE_CFLAGS@

16111

XINE_LIBS = @XINE_LIBS@

16112

XMKMF = @XMKMF@

16113

-XTEST_LIBS = @XTEST_LIBS@

16114

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16115

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16116

X_LIBS = @X_LIBS@

16117

@@ -319,7 +320,6 @@ sharedstatedir = @sharedstatedir@

16118

srcdir = @srcdir@

16119

sysconfdir = @sysconfdir@

16120

target_alias = @target_alias@

16121

-top_build_prefix = @top_build_prefix@

16122

top_builddir = @top_builddir@

16123

top_srcdir = @top_srcdir@

16124

SUBDIRS = icons

16125

Index: totem-2.24.3/data/icons/16x16/Makefile.in

16126

===================================================================

16127

--- totem-2.24.3.orig/data/icons/16x16/Makefile.in 2008-10-26 15:40:45.000000000 +0100

16128

+++ totem-2.24.3/data/icons/16x16/Makefile.in 2009-01-23 17:07:51.021151004 +0100

16129

@@ -67,6 +67,8 @@ AUTOCONF = @AUTOCONF@

16130

AUTOHEADER = @AUTOHEADER@

16131

AUTOMAKE = @AUTOMAKE@

16132

AWK = @AWK@

16133

+BBC_CFLAGS = @BBC_CFLAGS@

16134

+BBC_LIBS = @BBC_LIBS@

16135

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16136

BEMUSED_LIBS = @BEMUSED_LIBS@

16137

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16138

@@ -237,7 +239,6 @@ XGETTEXT = @XGETTEXT@

16139

XINE_CFLAGS = @XINE_CFLAGS@

16140

XINE_LIBS = @XINE_LIBS@

16141

XMKMF = @XMKMF@

16142

-XTEST_LIBS = @XTEST_LIBS@

16143

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16144

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16145

X_LIBS = @X_LIBS@

16146

@@ -294,7 +295,6 @@ sharedstatedir = @sharedstatedir@

16147

srcdir = @srcdir@

16148

sysconfdir = @sysconfdir@

16149

target_alias = @target_alias@

16150

-top_build_prefix = @top_build_prefix@

16151

top_builddir = @top_builddir@

16152

top_srcdir = @top_srcdir@

16153

icondir = $(datadir)/icons/hicolor/16x16/apps

16154

Index: totem-2.24.3/data/icons/22x22/Makefile.in

16155

===================================================================

16156

--- totem-2.24.3.orig/data/icons/22x22/Makefile.in 2008-10-26 15:40:45.000000000 +0100

16157

+++ totem-2.24.3/data/icons/22x22/Makefile.in 2009-01-23 17:07:51.133150574 +0100

16158

@@ -67,6 +67,8 @@ AUTOCONF = @AUTOCONF@

16159

AUTOHEADER = @AUTOHEADER@

16160

AUTOMAKE = @AUTOMAKE@

16161

AWK = @AWK@

16162

+BBC_CFLAGS = @BBC_CFLAGS@

16163

+BBC_LIBS = @BBC_LIBS@

16164

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16165

BEMUSED_LIBS = @BEMUSED_LIBS@

16166

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16167

@@ -237,7 +239,6 @@ XGETTEXT = @XGETTEXT@

16168

XINE_CFLAGS = @XINE_CFLAGS@

16169

XINE_LIBS = @XINE_LIBS@

16170

XMKMF = @XMKMF@

16171

-XTEST_LIBS = @XTEST_LIBS@

16172

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16173

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16174

X_LIBS = @X_LIBS@

16175

@@ -294,7 +295,6 @@ sharedstatedir = @sharedstatedir@

16176

srcdir = @srcdir@

16177

sysconfdir = @sysconfdir@

16178

target_alias = @target_alias@

16179

-top_build_prefix = @top_build_prefix@

16180

top_builddir = @top_builddir@

16181

top_srcdir = @top_srcdir@

16182

icondir = $(datadir)/icons/hicolor/22x22/apps

16183

Index: totem-2.24.3/data/icons/24x24/Makefile.in

16184

===================================================================

16185

--- totem-2.24.3.orig/data/icons/24x24/Makefile.in 2008-10-26 15:40:45.000000000 +0100

16186

+++ totem-2.24.3/data/icons/24x24/Makefile.in 2009-01-23 17:07:51.245151610 +0100

16187

@@ -67,6 +67,8 @@ AUTOCONF = @AUTOCONF@

16188

AUTOHEADER = @AUTOHEADER@

16189

AUTOMAKE = @AUTOMAKE@

16190

AWK = @AWK@

16191

+BBC_CFLAGS = @BBC_CFLAGS@

16192

+BBC_LIBS = @BBC_LIBS@

16193

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16194

BEMUSED_LIBS = @BEMUSED_LIBS@

16195

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16196

@@ -237,7 +239,6 @@ XGETTEXT = @XGETTEXT@

16197

XINE_CFLAGS = @XINE_CFLAGS@

16198

XINE_LIBS = @XINE_LIBS@

16199

XMKMF = @XMKMF@

16200

-XTEST_LIBS = @XTEST_LIBS@

16201

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16202

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16203

X_LIBS = @X_LIBS@

16204

@@ -294,7 +295,6 @@ sharedstatedir = @sharedstatedir@

16205

srcdir = @srcdir@

16206

sysconfdir = @sysconfdir@

16207

target_alias = @target_alias@

16208

-top_build_prefix = @top_build_prefix@

16209

top_builddir = @top_builddir@

16210

top_srcdir = @top_srcdir@

16211

icondir = $(datadir)/icons/hicolor/24x24/apps

16212

Index: totem-2.24.3/data/icons/32x32/Makefile.in

16213

===================================================================

16214

--- totem-2.24.3.orig/data/icons/32x32/Makefile.in 2008-10-26 15:40:45.000000000 +0100

16215

+++ totem-2.24.3/data/icons/32x32/Makefile.in 2009-01-23 17:07:51.365150870 +0100

16216

@@ -67,6 +67,8 @@ AUTOCONF = @AUTOCONF@

16217

AUTOHEADER = @AUTOHEADER@

16218

AUTOMAKE = @AUTOMAKE@

16219

AWK = @AWK@

16220

+BBC_CFLAGS = @BBC_CFLAGS@

16221

+BBC_LIBS = @BBC_LIBS@

16222

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16223

BEMUSED_LIBS = @BEMUSED_LIBS@

16224

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16225

@@ -237,7 +239,6 @@ XGETTEXT = @XGETTEXT@

16226

XINE_CFLAGS = @XINE_CFLAGS@

16227

XINE_LIBS = @XINE_LIBS@

16228

XMKMF = @XMKMF@

16229

-XTEST_LIBS = @XTEST_LIBS@

16230

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16231

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16232

X_LIBS = @X_LIBS@

16233

@@ -294,7 +295,6 @@ sharedstatedir = @sharedstatedir@

16234

srcdir = @srcdir@

16235

sysconfdir = @sysconfdir@

16236

target_alias = @target_alias@

16237

-top_build_prefix = @top_build_prefix@

16238

top_builddir = @top_builddir@

16239

top_srcdir = @top_srcdir@

16240

icondir = $(datadir)/icons/hicolor/32x32/apps

16241

Index: totem-2.24.3/data/icons/48x48/Makefile.in

16242

===================================================================

16243

--- totem-2.24.3.orig/data/icons/48x48/Makefile.in 2008-10-26 15:40:46.000000000 +0100

16244

+++ totem-2.24.3/data/icons/48x48/Makefile.in 2009-01-23 17:07:51.477150929 +0100

16245

@@ -67,6 +67,8 @@ AUTOCONF = @AUTOCONF@

16246

AUTOHEADER = @AUTOHEADER@

16247

AUTOMAKE = @AUTOMAKE@

16248

AWK = @AWK@

16249

+BBC_CFLAGS = @BBC_CFLAGS@

16250

+BBC_LIBS = @BBC_LIBS@

16251

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16252

BEMUSED_LIBS = @BEMUSED_LIBS@

16253

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16254

@@ -237,7 +239,6 @@ XGETTEXT = @XGETTEXT@

16255

XINE_CFLAGS = @XINE_CFLAGS@

16256

XINE_LIBS = @XINE_LIBS@

16257

XMKMF = @XMKMF@

16258

-XTEST_LIBS = @XTEST_LIBS@

16259

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16260

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16261

X_LIBS = @X_LIBS@

16262

@@ -294,7 +295,6 @@ sharedstatedir = @sharedstatedir@

16263

srcdir = @srcdir@

16264

sysconfdir = @sysconfdir@

16265

target_alias = @target_alias@

16266

-top_build_prefix = @top_build_prefix@

16267

top_builddir = @top_builddir@

16268

top_srcdir = @top_srcdir@

16269

icondir = $(datadir)/icons/hicolor/48x48/apps

16270

Index: totem-2.24.3/data/icons/Makefile.in

16271

===================================================================

16272

--- totem-2.24.3.orig/data/icons/Makefile.in 2008-10-26 15:40:46.000000000 +0100

16273

+++ totem-2.24.3/data/icons/Makefile.in 2009-01-23 17:07:51.593151077 +0100

16274

@@ -69,6 +69,8 @@ AUTOCONF = @AUTOCONF@

16275

AUTOHEADER = @AUTOHEADER@

16276

AUTOMAKE = @AUTOMAKE@

16277

AWK = @AWK@

16278

+BBC_CFLAGS = @BBC_CFLAGS@

16279

+BBC_LIBS = @BBC_LIBS@

16280

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16281

BEMUSED_LIBS = @BEMUSED_LIBS@

16282

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16283

@@ -239,7 +241,6 @@ XGETTEXT = @XGETTEXT@

16284

XINE_CFLAGS = @XINE_CFLAGS@

16285

XINE_LIBS = @XINE_LIBS@

16286

XMKMF = @XMKMF@

16287

-XTEST_LIBS = @XTEST_LIBS@

16288

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16289

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16290

X_LIBS = @X_LIBS@

16291

@@ -296,7 +297,6 @@ sharedstatedir = @sharedstatedir@

16292

srcdir = @srcdir@

16293

sysconfdir = @sysconfdir@

16294

target_alias = @target_alias@

16295

-top_build_prefix = @top_build_prefix@

16296

top_builddir = @top_builddir@

16297

top_srcdir = @top_srcdir@

16298

SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable

16299

Index: totem-2.24.3/data/icons/scalable/Makefile.in

16300

===================================================================

16301

--- totem-2.24.3.orig/data/icons/scalable/Makefile.in 2008-10-26 15:40:46.000000000 +0100

16302

+++ totem-2.24.3/data/icons/scalable/Makefile.in 2009-01-23 17:07:51.709153669 +0100

16303

@@ -67,6 +67,8 @@ AUTOCONF = @AUTOCONF@

16304

AUTOHEADER = @AUTOHEADER@

16305

AUTOMAKE = @AUTOMAKE@

16306

AWK = @AWK@

16307

+BBC_CFLAGS = @BBC_CFLAGS@

16308

+BBC_LIBS = @BBC_LIBS@

16309

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16310

BEMUSED_LIBS = @BEMUSED_LIBS@

16311

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16312

@@ -237,7 +239,6 @@ XGETTEXT = @XGETTEXT@

16313

XINE_CFLAGS = @XINE_CFLAGS@

16314

XINE_LIBS = @XINE_LIBS@

16315

XMKMF = @XMKMF@

16316

-XTEST_LIBS = @XTEST_LIBS@

16317

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16318

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16319

X_LIBS = @X_LIBS@

16320

@@ -294,7 +295,6 @@ sharedstatedir = @sharedstatedir@

16321

srcdir = @srcdir@

16322

sysconfdir = @sysconfdir@

16323

target_alias = @target_alias@

16324

-top_build_prefix = @top_build_prefix@

16325

top_builddir = @top_builddir@

16326

top_srcdir = @top_srcdir@

16327

icondir = $(datadir)/icons/hicolor/scalable/apps

16328

Index: totem-2.24.3/help/Makefile.in

16329

===================================================================

16330

--- totem-2.24.3.orig/help/Makefile.in 2008-10-26 15:40:46.000000000 +0100

16331

+++ totem-2.24.3/help/Makefile.in 2009-01-23 17:07:51.900651471 +0100

16332

@@ -94,6 +94,8 @@ AUTOCONF = @AUTOCONF@

16333

AUTOHEADER = @AUTOHEADER@

16334

AUTOMAKE = @AUTOMAKE@

16335

AWK = @AWK@

16336

+BBC_CFLAGS = @BBC_CFLAGS@

16337

+BBC_LIBS = @BBC_LIBS@

16338

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16339

BEMUSED_LIBS = @BEMUSED_LIBS@

16340

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16341

@@ -264,7 +266,6 @@ XGETTEXT = @XGETTEXT@

16342

XINE_CFLAGS = @XINE_CFLAGS@

16343

XINE_LIBS = @XINE_LIBS@

16344

XMKMF = @XMKMF@

16345

-XTEST_LIBS = @XTEST_LIBS@

16346

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16347

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16348

X_LIBS = @X_LIBS@

16349

@@ -321,7 +322,6 @@ sharedstatedir = @sharedstatedir@

16350

srcdir = @srcdir@

16351

sysconfdir = @sysconfdir@

16352

target_alias = @target_alias@

16353

-top_build_prefix = @top_build_prefix@

16354

top_builddir = @top_builddir@

16355

top_srcdir = @top_srcdir@

16356

_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)

16357

Index: totem-2.24.3/help/bg/Makefile.in

16358

===================================================================

16359

--- totem-2.24.3.orig/help/bg/Makefile.in 2008-10-26 15:40:46.000000000 +0100

16360

+++ totem-2.24.3/help/bg/Makefile.in 2009-01-23 17:07:52.036651088 +0100

16361

@@ -122,6 +122,8 @@ AUTOCONF = @AUTOCONF@

16362

AUTOHEADER = @AUTOHEADER@

16363

AUTOMAKE = @AUTOMAKE@

16364

AWK = @AWK@

16365

+BBC_CFLAGS = @BBC_CFLAGS@

16366

+BBC_LIBS = @BBC_LIBS@

16367

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16368

BEMUSED_LIBS = @BEMUSED_LIBS@

16369

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16370

@@ -292,7 +294,6 @@ XGETTEXT = @XGETTEXT@

16371

XINE_CFLAGS = @XINE_CFLAGS@

16372

XINE_LIBS = @XINE_LIBS@

16373

XMKMF = @XMKMF@

16374

-XTEST_LIBS = @XTEST_LIBS@

16375

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16376

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16377

X_LIBS = @X_LIBS@

16378

@@ -354,7 +355,6 @@ sharedstatedir = @sharedstatedir@

16379

srcdir = @srcdir@

16380

sysconfdir = @sysconfdir@

16381

target_alias = @target_alias@

16382

-top_build_prefix = @top_build_prefix@

16383

top_builddir = @top_builddir@

16384

top_srcdir = @top_srcdir@

16385

figdir = figures

16386

Index: totem-2.24.3/lib/Makefile.in

16387

===================================================================

16388

--- totem-2.24.3.orig/lib/Makefile.in 2008-10-26 15:40:46.000000000 +0100

16389

+++ totem-2.24.3/lib/Makefile.in 2009-01-23 17:07:52.196651242 +0100

16390

@@ -43,8 +43,7 @@ CONFIG_HEADER = $(top_builddir)/config.h

16391

CONFIG_CLEAN_FILES =

16392

LTLIBRARIES = $(noinst_LTLIBRARIES)

16393

am__DEPENDENCIES_1 =

16394

-libtotemscrsaver_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \

16395

- $(am__DEPENDENCIES_1)

16396

+libtotemscrsaver_la_DEPENDENCIES = $(am__DEPENDENCIES_1)

16397

am_libtotemscrsaver_la_OBJECTS = \

16398

libtotemscrsaver_la-totem-scrsaver.lo

16399

libtotemscrsaver_la_OBJECTS = $(am_libtotemscrsaver_la_OBJECTS)

16400

@@ -83,6 +82,8 @@ AUTOCONF = @AUTOCONF@

16401

AUTOHEADER = @AUTOHEADER@

16402

AUTOMAKE = @AUTOMAKE@

16403

AWK = @AWK@

16404

+BBC_CFLAGS = @BBC_CFLAGS@

16405

+BBC_LIBS = @BBC_LIBS@

16406

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16407

BEMUSED_LIBS = @BEMUSED_LIBS@

16408

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16409

@@ -253,7 +254,6 @@ XGETTEXT = @XGETTEXT@

16410

XINE_CFLAGS = @XINE_CFLAGS@

16411

XINE_LIBS = @XINE_LIBS@

16412

XMKMF = @XMKMF@

16413

-XTEST_LIBS = @XTEST_LIBS@

16414

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16415

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16416

X_LIBS = @X_LIBS@

16417

@@ -310,7 +310,6 @@ sharedstatedir = @sharedstatedir@

16418

srcdir = @srcdir@

16419

sysconfdir = @sysconfdir@

16420

target_alias = @target_alias@

16421

-top_build_prefix = @top_build_prefix@

16422

top_builddir = @top_builddir@

16423

top_srcdir = @top_srcdir@

16424

noinst_LTLIBRARIES = \

16425

Index: totem-2.24.3/ltmain.sh

16426

===================================================================

16427

--- totem-2.24.3.orig/ltmain.sh 2008-01-30 21:27:02.000000000 +0100

16428

+++ totem-2.24.3/ltmain.sh 2008-04-29 22:21:21.000000000 +0200

16429

@@ -2,7 +2,7 @@

16430

# NOTE: Changing this file will not affect anything until you rerun configure.

16431

#

16432

16433

-# 2007 Free Software Foundation, Inc.

16434

+# 2007, 2008 Free Software Foundation, Inc.

16435

# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

16436

#

16437

# This program is free software; you can redistribute it and/or modify

16438

@@ -43,8 +43,8 @@ EXIT_FAILURE=1

16439

16440

PROGRAM=ltmain.sh

16441

PACKAGE=libtool

16442

-VERSION=1.5.24

16443

-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"

16444

+VERSION="1.5.26 Debian 1.5.26-4"

16445

+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"

16446

16447

# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).

16448

if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

16449

@@ -113,15 +113,21 @@ esac

16450

# These must not be set unconditionally because not all systems understand

16451

# e.g. LANG=C (notably SCO).

16452

# We save the old values to restore during execute mode.

16453

-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES

16454

+lt_env=

16455

+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES

16456

do

16457

eval "if test \"\${$lt_var+set}\" = set; then

16458

save_$lt_var=\$$lt_var

16459

+ lt_env=\"$lt_var=\$$lt_var \$lt_env\"

16460

$lt_var=C

16461

export $lt_var

16462

fi"

16463

done

16464

16465

+if test -n "$lt_env"; then

16466

+ lt_env="env $lt_env"

16467

+fi

16468

+

16469

# Make sure IFS has a sensible default

16470

lt_nl='

16471

'

16472

@@ -485,7 +491,7 @@ do

16473

echo "\

16474

$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP

16475

16476

16477

16478

This is free software; see the source for copying conditions. There is NO

16479

warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."

16480

exit $?

16481

@@ -788,6 +794,7 @@ if test -z "$show_help"; then

16482

*.for) xform=for ;;

16483

*.java) xform=java ;;

16484

*.obj) xform=obj ;;

16485

+ *.sx) xform=sx ;;

16486

esac

16487

16488

libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`

16489

@@ -956,7 +963,7 @@ EOF

16490

$run $rm "$lobj" "$output_obj"

16491

16492

$show "$command"

16493

- if $run eval "$command"; then :

16494

+ if $run eval $lt_env "$command"; then :

16495

else

16496

test -n "$output_obj" && $run $rm $removelist

16497

exit $EXIT_FAILURE

16498

@@ -1028,7 +1035,7 @@ EOF

16499

command="$command$suppress_output"

16500

$run $rm "$obj" "$output_obj"

16501

$show "$command"

16502

- if $run eval "$command"; then :

16503

+ if $run eval $lt_env "$command"; then :

16504

else

16505

$run $rm $removelist

16506

exit $EXIT_FAILURE

16507

@@ -1161,6 +1168,7 @@ EOF

16508

thread_safe=no

16509

vinfo=

16510

vinfo_number=no

16511

+ single_module="${wl}-single_module"

16512

16513

func_infer_tag $base_compile

16514

16515

@@ -1646,6 +1654,11 @@ EOF

16516

continue

16517

;;

16518

16519

+ -multi_module)

16520

+ single_module="${wl}-multi_module"

16521

+ continue

16522

+ ;;

16523

+

16524

-module)

16525

module=yes

16526

continue

16527

@@ -2122,7 +2135,10 @@ EOF

16528

case $pass in

16529

dlopen) libs="$dlfiles" ;;

16530

dlpreopen) libs="$dlprefiles" ;;

16531

- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;

16532

+ link)

16533

+ libs="$deplibs %DEPLIBS%"

16534

+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"

16535

+ ;;

16536

esac

16537

fi

16538

if test "$pass" = dlopen; then

16539

@@ -2149,7 +2165,12 @@ EOF

16540

continue

16541

fi

16542

name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`

16543

- for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do

16544

+ if test "$linkmode" = lib; then

16545

+ searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"

16546

+ else

16547

+ searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"

16548

+ fi

16549

+ for searchdir in $searchdirs; do

16550

for search_ext in .la $std_shrext .so .a; do

16551

# Search the libtool library

16552

lib="$searchdir/lib${name}${search_ext}"

16553

@@ -2945,12 +2966,18 @@ EOF

16554

# we do not want to link against static libs,

16555

# but need to link against shared

16556

eval deplibrary_names=`${SED} -n -e 's/^library_names=$.*$$/\1/p' $deplib`

16557

+ eval deplibdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`

16558

if test -n "$deplibrary_names" ; then

16559

for tmp in $deplibrary_names ; do

16560

depdepl=$tmp

16561

done

16562

- if test -f "$path/$depdepl" ; then

16563

+ if test -f "$deplibdir/$depdepl" ; then

16564

+ depdepl="$deplibdir/$depdepl"

16565

+ elif test -f "$path/$depdepl" ; then

16566

depdepl="$path/$depdepl"

16567

+ else

16568

+ # Can't find it, oh well...

16569

+ depdepl=

16570

fi

16571

# do not add paths which are already there

16572

case " $newlib_search_path " in

16573

@@ -3098,9 +3125,10 @@ EOF

16574

16575

case $linkmode in

16576

oldlib)

16577

- if test -n "$deplibs"; then

16578

- $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2

16579

- fi

16580

+ case " $deplibs" in

16581

+ *\ -l* | *\ -L*)

16582

+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;

16583

+ esac

16584

16585

if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then

16586

$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2

16587

@@ -3244,6 +3272,11 @@ EOF

16588

revision="$number_minor"

16589

lt_irix_increment=no

16590

;;

16591

+ *)

16592

+ $echo "$modename: unknown library version type \`$version_type'" 1>&2

16593

+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2

16594

+ exit $EXIT_FAILURE

16595

+ ;;

16596

esac

16597

;;

16598

no)

16599

@@ -4237,9 +4270,10 @@ EOF

16600

;;

16601

16602

obj)

16603

- if test -n "$deplibs"; then

16604

- $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2

16605

- fi

16606

+ case " $deplibs" in

16607

+ *\ -l* | *\ -L*)

16608

+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;

16609

+ esac

16610

16611

if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then

16612

$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2

16613

@@ -6478,7 +6512,7 @@ relink_command=\"$relink_command\""

16614

fi

16615

16616

# Restore saved environment variables

16617

- for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES

16618

+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES

16619

do

16620

eval "if test \"\${save_$lt_var+set}\" = set; then

16621

$lt_var=\$save_$lt_var; export $lt_var

16622

Index: totem-2.24.3/po/Makefile.in.in

16623

===================================================================

16624

--- totem-2.24.3.orig/po/Makefile.in.in 2008-10-01 16:00:39.000000000 +0200

16625

+++ totem-2.24.3/po/Makefile.in.in 2009-01-23 17:06:37.377158541 +0100

16626

@@ -54,16 +54,16 @@ GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_E

16627

16628

ALL_LINGUAS = @ALL_LINGUAS@

16629

16630

-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)

16631

+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)

16632

16633

-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)

16634

+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)

16635

16636

-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)

16637

+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)

16638

16639

-POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)

16640

+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)

16641

16642

-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)

16643

-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS

16644

+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)

16645

+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS

16646

16647

POTFILES = \

16648

# This comment gets stripped out

16649

@@ -101,7 +101,6 @@ install: install-data

16650

install-data: install-data-@USE_NLS@

16651

install-data-no: all

16652

install-data-yes: all

16653

- $(mkdir_p) $(DESTDIR)$(itlocaledir)

16654

linguas="$(USE_LINGUAS)"; \

16655

for lang in $$linguas; do \

16656

dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \

16657

Index: totem-2.24.3/src/Makefile.in

16658

===================================================================

16659

--- totem-2.24.3.orig/src/Makefile.in 2008-10-26 15:40:47.000000000 +0100

16660

+++ totem-2.24.3/src/Makefile.in 2009-01-23 17:07:52.652652633 +0100

16661

@@ -78,7 +78,6 @@ am__DEPENDENCIES_1 =

16662

@HAVE_NAUTILUS_TRUE@ $(am__DEPENDENCIES_1) \

16663

@HAVE_NAUTILUS_TRUE@ $(am__DEPENDENCIES_1) \

16664

@HAVE_NAUTILUS_TRUE@ $(am__DEPENDENCIES_1) \

16665

-@HAVE_NAUTILUS_TRUE@ $(am__DEPENDENCIES_1) \

16666

@HAVE_NAUTILUS_TRUE@ $(am__DEPENDENCIES_1)

16667

am__libtotem_properties_page_la_SOURCES_DIST = \

16668

totem-properties-main.c totem-properties-view.c \

16669

@@ -120,7 +119,6 @@ test_properties_page_OBJECTS = $(am_test

16670

@HAVE_NAUTILUS_TRUE@ $(am__DEPENDENCIES_1) \

16671

@HAVE_NAUTILUS_TRUE@ $(am__DEPENDENCIES_1) \

16672

@HAVE_NAUTILUS_TRUE@ $(am__DEPENDENCIES_1) \

16673

-@HAVE_NAUTILUS_TRUE@ $(am__DEPENDENCIES_1) \

16674

@HAVE_NAUTILUS_TRUE@ $(am__DEPENDENCIES_1)

16675

test_properties_page_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

16676

$(LIBTOOLFLAGS) --mode=link $(CCLD) \

16677

@@ -147,8 +145,7 @@ totem_DEPENDENCIES = backend/libbaconvid

16678

plugins/libtotemmodule.la libbaconmessageconnection.la \

16679

libtotem_player.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

16680

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

16681

- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

16682

- $(am__DEPENDENCIES_2)

16683

+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)

16684

totem_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

16685

--mode=link $(CCLD) $(totem_CFLAGS) $(CFLAGS) $(totem_LDFLAGS) \

16686

$(LDFLAGS) -o $@

16687

@@ -159,7 +156,7 @@ totem_audio_preview_OBJECTS = $(am_totem

16688

totem_audio_preview_DEPENDENCIES = backend/libbaconvideowidget.la \

16689

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

16690

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

16691

- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

16692

+ $(am__DEPENDENCIES_1)

16693

totem_audio_preview_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

16694

$(LIBTOOLFLAGS) --mode=link $(CCLD) \

16695

$(totem_audio_preview_CFLAGS) $(CFLAGS) \

16696

@@ -171,7 +168,7 @@ totem_video_indexer_OBJECTS = $(am_totem

16697

totem_video_indexer_DEPENDENCIES = backend/libbaconvideowidget.la \

16698

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

16699

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

16700

- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

16701

+ $(am__DEPENDENCIES_1)

16702

totem_video_indexer_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

16703

$(LIBTOOLFLAGS) --mode=link $(CCLD) \

16704

$(totem_video_indexer_CFLAGS) $(CFLAGS) \

16705

@@ -184,7 +181,7 @@ totem_video_thumbnailer_OBJECTS = \

16706

totem_video_thumbnailer_DEPENDENCIES = backend/libbaconvideowidget.la \

16707

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

16708

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

16709

- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

16710

+ $(am__DEPENDENCIES_1)

16711

totem_video_thumbnailer_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

16712

$(LIBTOOLFLAGS) --mode=link $(CCLD) \

16713

$(totem_video_thumbnailer_CFLAGS) $(CFLAGS) \

16714

@@ -240,6 +237,8 @@ AUTOCONF = @AUTOCONF@

16715

AUTOHEADER = @AUTOHEADER@

16716

AUTOMAKE = @AUTOMAKE@

16717

AWK = @AWK@

16718

+BBC_CFLAGS = @BBC_CFLAGS@

16719

+BBC_LIBS = @BBC_LIBS@

16720

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16721

BEMUSED_LIBS = @BEMUSED_LIBS@

16722

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16723

@@ -410,7 +409,6 @@ XGETTEXT = @XGETTEXT@

16724

XINE_CFLAGS = @XINE_CFLAGS@

16725

XINE_LIBS = @XINE_LIBS@

16726

XMKMF = @XMKMF@

16727

-XTEST_LIBS = @XTEST_LIBS@

16728

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16729

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16730

X_LIBS = @X_LIBS@

16731

@@ -467,7 +465,6 @@ sharedstatedir = @sharedstatedir@

16732

srcdir = @srcdir@

16733

sysconfdir = @sysconfdir@

16734

target_alias = @target_alias@

16735

-top_build_prefix = @top_build_prefix@

16736

top_builddir = @top_builddir@

16737

top_srcdir = @top_srcdir@

16738

SUBDIRS = plugins backend

16739

Index: totem-2.24.3/src/backend/Makefile.in

16740

===================================================================

16741

--- totem-2.24.3.orig/src/backend/Makefile.in 2008-10-26 15:40:47.000000000 +0100

16742

+++ totem-2.24.3/src/backend/Makefile.in 2009-01-23 17:07:52.888651553 +0100

16743

@@ -53,15 +53,7 @@ am__configure_deps = $(am__aclocal_m4_de

16744

mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

16745

CONFIG_HEADER = $(top_builddir)/config.h

16746

CONFIG_CLEAN_FILES =

16747

-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

16748

-am__vpath_adj = case $$p in \

16749

- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

16750

- *) f=$$p;; \

16751

- esac;

16752

-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

16753

-am__installdirs = "$(DESTDIR)$(libdir)"

16754

-libLTLIBRARIES_INSTALL = $(INSTALL)

16755

-LTLIBRARIES = $(lib_LTLIBRARIES)

16756

+LTLIBRARIES = $(noinst_LTLIBRARIES)

16757

am__DEPENDENCIES_1 =

16758

libbaconvideowidget_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \

16759

$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \

16760

@@ -94,7 +86,7 @@ PROGRAMS = $(noinst_PROGRAMS)

16761

am_bvw_test_OBJECTS = bvw_test-bvw-test.$(OBJEXT)

16762

bvw_test_OBJECTS = $(am_bvw_test_OBJECTS)

16763

bvw_test_DEPENDENCIES = libbaconvideowidget.la $(am__DEPENDENCIES_1) \

16764

- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)

16765

+ $(am__DEPENDENCIES_1)

16766

bvw_test_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

16767

--mode=link $(CCLD) $(bvw_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \

16768

$(LDFLAGS) -o $@

16769

@@ -130,6 +122,8 @@ AUTOCONF = @AUTOCONF@

16770

AUTOHEADER = @AUTOHEADER@

16771

AUTOMAKE = @AUTOMAKE@

16772

AWK = @AWK@

16773

+BBC_CFLAGS = @BBC_CFLAGS@

16774

+BBC_LIBS = @BBC_LIBS@

16775

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16776

BEMUSED_LIBS = @BEMUSED_LIBS@

16777

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16778

@@ -300,7 +294,6 @@ XGETTEXT = @XGETTEXT@

16779

XINE_CFLAGS = @XINE_CFLAGS@

16780

XINE_LIBS = @XINE_LIBS@

16781

XMKMF = @XMKMF@

16782

-XTEST_LIBS = @XTEST_LIBS@

16783

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16784

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16785

X_LIBS = @X_LIBS@

16786

@@ -357,10 +350,9 @@ sharedstatedir = @sharedstatedir@

16787

srcdir = @srcdir@

16788

sysconfdir = @sysconfdir@

16789

target_alias = @target_alias@

16790

-top_build_prefix = @top_build_prefix@

16791

top_builddir = @top_builddir@

16792

top_srcdir = @top_srcdir@

16793

-lib_LTLIBRARIES = libbaconvideowidget.la

16794

+noinst_LTLIBRARIES = libbaconvideowidget.la

16795

bvw_test_SOURCES = bvw-test.c

16796

bvw_test_CPPFLAGS = \

16797

-I$(top_srcdir)/plparse \

16798

@@ -447,35 +439,17 @@ $(top_srcdir)/configure: @MAINTAINER_MOD

16799

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

16800

$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

16801

cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

16802

-install-libLTLIBRARIES: $(lib_LTLIBRARIES)

16803

- @$(NORMAL_INSTALL)

16804

- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"

16805

- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \

16806

- if test -f $$p; then \

16807

- f=$(am__strip_dir) \

16808

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \

16809

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \

16810

- else :; fi; \

16811

- done

16812

16813

-uninstall-libLTLIBRARIES:

16814

- @$(NORMAL_UNINSTALL)

16815

- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \

16816

- p=$(am__strip_dir) \

16817

- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \

16818

- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \

16819

- done

16820

-

16821

-clean-libLTLIBRARIES:

16822

- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)

16823

- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \

16824

+clean-noinstLTLIBRARIES:

16825

+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)

16826

+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \

16827

dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \

16828

test "$$dir" != "$$p" || dir=.; \

16829

echo "rm -f \"$${dir}/so_locations\""; \

16830

rm -f "$${dir}/so_locations"; \

16831

done

16832

libbaconvideowidget.la: $(libbaconvideowidget_la_OBJECTS) $(libbaconvideowidget_la_DEPENDENCIES)

16833

- $(libbaconvideowidget_la_LINK) -rpath $(libdir) $(libbaconvideowidget_la_OBJECTS) $(libbaconvideowidget_la_LIBADD) $(LIBS)

16834

+ $(libbaconvideowidget_la_LINK) $(libbaconvideowidget_la_OBJECTS) $(libbaconvideowidget_la_LIBADD) $(LIBS)

16835

16836

clean-noinstPROGRAMS:

16837

@list='$(noinst_PROGRAMS)'; for p in $$list; do \

16838

@@ -681,9 +655,6 @@ check: $(BUILT_SOURCES)

16839

$(MAKE) $(AM_MAKEFLAGS) check-am

16840

all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)

16841

installdirs:

16842

- for dir in "$(DESTDIR)$(libdir)"; do \

16843

- test -z "$$dir" || $(MKDIR_P) "$$dir"; \

16844

- done

16845

install: $(BUILT_SOURCES)

16846

$(MAKE) $(AM_MAKEFLAGS) install-am

16847

install-exec: install-exec-am

16848

@@ -713,7 +684,7 @@ maintainer-clean-generic:

16849

-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)

16850

clean: clean-am

16851

16852

-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \

16853

+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \

16854

clean-noinstPROGRAMS mostlyclean-am

16855

16856

distclean: distclean-am

16857

@@ -736,7 +707,7 @@ install-data-am:

16858

16859

install-dvi: install-dvi-am

16860

16861

-install-exec-am: install-libLTLIBRARIES

16862

+install-exec-am:

16863

16864

install-html: install-html-am

16865

16866

@@ -768,23 +739,23 @@ ps: ps-am

16867

16868

ps-am:

16869

16870

-uninstall-am: uninstall-libLTLIBRARIES

16871

+uninstall-am:

16872

16873

.MAKE: install-am install-strip

16874

16875

.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \

16876

- clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \

16877

- distclean distclean-compile distclean-generic \

16878

+ clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \

16879

+ ctags distclean distclean-compile distclean-generic \

16880

distclean-libtool distclean-tags distdir dvi dvi-am html \

16881

html-am info info-am install install-am install-data \

16882

install-data-am install-dvi install-dvi-am install-exec \

16883

install-exec-am install-html install-html-am install-info \

16884

- install-info-am install-libLTLIBRARIES install-man install-pdf \

16885

- install-pdf-am install-ps install-ps-am install-strip \

16886

- installcheck installcheck-am installdirs maintainer-clean \

16887

+ install-info-am install-man install-pdf install-pdf-am \

16888

+ install-ps install-ps-am install-strip installcheck \

16889

+ installcheck-am installdirs maintainer-clean \

16890

maintainer-clean-generic mostlyclean mostlyclean-compile \

16891

mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \

16892

- tags uninstall uninstall-am uninstall-libLTLIBRARIES

16893

+ tags uninstall uninstall-am

16894

16895

$(DISABLE_DEPRECATED) \

16896

$(AM_CPPFLAGS)

16897

Index: totem-2.24.3/src/plugins/Makefile.in

16898

===================================================================

16899

--- totem-2.24.3.orig/src/plugins/Makefile.in 2008-10-26 15:40:47.000000000 +0100

16900

+++ totem-2.24.3/src/plugins/Makefile.in 2009-01-23 17:07:53.092654156 +0100

16901

@@ -118,6 +118,8 @@ AUTOCONF = @AUTOCONF@

16902

AUTOHEADER = @AUTOHEADER@

16903

AUTOMAKE = @AUTOMAKE@

16904

AWK = @AWK@

16905

+BBC_CFLAGS = @BBC_CFLAGS@

16906

+BBC_LIBS = @BBC_LIBS@

16907

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

16908

BEMUSED_LIBS = @BEMUSED_LIBS@

16909

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

16910

@@ -288,7 +290,6 @@ XGETTEXT = @XGETTEXT@

16911

XINE_CFLAGS = @XINE_CFLAGS@

16912

XINE_LIBS = @XINE_LIBS@

16913

XMKMF = @XMKMF@

16914

-XTEST_LIBS = @XTEST_LIBS@

16915

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

16916

XVIDMODE_LIBS = @XVIDMODE_LIBS@

16917

X_LIBS = @X_LIBS@

16918

@@ -345,7 +346,6 @@ sharedstatedir = @sharedstatedir@

16919

srcdir = @srcdir@

16920

sysconfdir = @sysconfdir@

16921

target_alias = @target_alias@

16922

-top_build_prefix = @top_build_prefix@

16923

top_builddir = @top_builddir@

16924

top_srcdir = @top_srcdir@

16925

SUBDIRS = $(PLUGINS) $(am__append_1)

16926

Index: totem-2.24.3/src/plugins/bbc/Makefile.in

16927

===================================================================

16928

--- /dev/null 1970-01-01 00:00:00.000000000 +0000

16929

+++ totem-2.24.3/src/plugins/bbc/Makefile.in 2009-01-23 17:07:53.244650708 +0100

16930

@@ -0,0 +1,542 @@

16931

+# Makefile.in generated by automake 1.10.1 from Makefile.am.

16932

+# @configure_input@

16933

+

16934

16935

+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.

16936

+# This Makefile.in is free software; the Free Software Foundation

16937

+# gives unlimited permission to copy and/or distribute it,

16938

+# with or without modifications, as long as this notice is preserved.

16939

+

16940

+# This program is distributed in the hope that it will be useful,

16941

+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without

16942

+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A

16943

+# PARTICULAR PURPOSE.

16944

+

16945

+@SET_MAKE@

16946

+

16947

+VPATH = @srcdir@

16948

+pkgdatadir = $(datadir)/@PACKAGE@

16949

+pkglibdir = $(libdir)/@PACKAGE@

16950

+pkgincludedir = $(includedir)/@PACKAGE@

16951

+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

16952

+install_sh_DATA = $(install_sh) -c -m 644

16953

+install_sh_PROGRAM = $(install_sh) -c

16954

+install_sh_SCRIPT = $(install_sh) -c

16955

+INSTALL_HEADER = $(INSTALL_DATA)

16956

+transform = $(program_transform_name)

16957

+NORMAL_INSTALL = :

16958

+PRE_INSTALL = :

16959

+POST_INSTALL = :

16960

+NORMAL_UNINSTALL = :

16961

+PRE_UNINSTALL = :

16962

+POST_UNINSTALL = :

16963

+build_triplet = @build@

16964

+host_triplet = @host@

16965

+subdir = src/plugins/bbc

16966

+DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \

16967

+ $(srcdir)/Makefile.in

16968

+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

16969

+am__aclocal_m4_deps = $(top_srcdir)/configure.in

16970

+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

16971

+ $(ACLOCAL_M4)

16972

+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

16973

+CONFIG_HEADER = $(top_builddir)/config.h

16974

+CONFIG_CLEAN_FILES =

16975

+SOURCES =

16976

+DIST_SOURCES =

16977

+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

16978

+am__vpath_adj = case $$p in \

16979

+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

16980

+ *) f=$$p;; \

16981

+ esac;

16982

+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

16983

+am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"

16984

+pluginPYTHON_INSTALL = $(INSTALL_DATA)

16985

+py_compile = $(top_srcdir)/py-compile

16986

+pluginDATA_INSTALL = $(INSTALL_DATA)

16987

+DATA = $(plugin_DATA)

16988

+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

16989

+ACLOCAL = @ACLOCAL@

16990

+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@

16991

+ALL_LINGUAS = @ALL_LINGUAS@

16992

+ALL_PLUGINS = @ALL_PLUGINS@

16993

+AMTAR = @AMTAR@

16994

+AM_CFLAGS = @AM_CFLAGS@

16995

+AM_CPPFLAGS = @AM_CPPFLAGS@

16996

+AM_CXXFLAGS = @AM_CXXFLAGS@

16997

+AM_LDFLAGS = @AM_LDFLAGS@

16998

+AR = @AR@

16999

+AUTOCONF = @AUTOCONF@

17000

+AUTOHEADER = @AUTOHEADER@

17001

+AUTOMAKE = @AUTOMAKE@

17002

+AWK = @AWK@

17003

+BBC_CFLAGS = @BBC_CFLAGS@

17004

+BBC_LIBS = @BBC_LIBS@

17005

+BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17006

+BEMUSED_LIBS = @BEMUSED_LIBS@

17007

+BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17008

+BROWSER_PLUGIN_DIR = @BROWSER_PLUGIN_DIR@

17009

+BROWSER_PLUGIN_LIBS = @BROWSER_PLUGIN_LIBS@

17010

+CATALOGS = @CATALOGS@

17011

+CATOBJEXT = @CATOBJEXT@

17012

+CC = @CC@

17013

+CCDEPMODE = @CCDEPMODE@

17014

+CFLAGS = @CFLAGS@

17015

+CPP = @CPP@

17016

+CPPFLAGS = @CPPFLAGS@

17017

+CXX = @CXX@

17018

+CXXCPP = @CXXCPP@

17019

+CXXDEPMODE = @CXXDEPMODE@

17020

+CXXFLAGS = @CXXFLAGS@

17021

+CYGPATH_W = @CYGPATH_W@

17022

+DATADIRNAME = @DATADIRNAME@

17023

+DBUS_BIND = @DBUS_BIND@

17024

+DBUS_CFLAGS = @DBUS_CFLAGS@

17025

+DBUS_LIBS = @DBUS_LIBS@

17026

+DEFS = @DEFS@

17027

+DEPDIR = @DEPDIR@

17028

+DISABLE_DEPRECATED = @DISABLE_DEPRECATED@

17029

+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@

17030

+DOC_USER_FORMATS = @DOC_USER_FORMATS@

17031

+DSYMUTIL = @DSYMUTIL@

17032

+ECHO = @ECHO@

17033

+ECHO_C = @ECHO_C@

17034

+ECHO_N = @ECHO_N@

17035

+ECHO_T = @ECHO_T@

17036

+EGREP = @EGREP@

17037

+EXEEXT = @EXEEXT@

17038

+EXTRA_GNOME_CFLAGS = @EXTRA_GNOME_CFLAGS@

17039

+EXTRA_GNOME_LIBS = @EXTRA_GNOME_LIBS@

17040

+F77 = @F77@

17041

+FFLAGS = @FFLAGS@

17042

+FULL_LIBEXECDIR = @FULL_LIBEXECDIR@

17043

+GCONFTOOL = @GCONFTOOL@

17044

+GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@

17045

+GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@

17046

+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@

17047

+GLIB_CFLAGS = @GLIB_CFLAGS@

17048

+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@

17049

+GLIB_LIBS = @GLIB_LIBS@

17050

+GLIB_MKENUMS = @GLIB_MKENUMS@

17051

+GMOFILES = @GMOFILES@

17052

+GMSGFMT = @GMSGFMT@

17053

+GMYTH_CFLAGS = @GMYTH_CFLAGS@

17054

+GMYTH_LIBS = @GMYTH_LIBS@

17055

+GREP = @GREP@

17056

+GST_CFLAGS = @GST_CFLAGS@

17057

+GST_LIBS = @GST_LIBS@

17058

+GTK_CFLAGS = @GTK_CFLAGS@

17059

+GTK_LIBS = @GTK_LIBS@

17060

+HELP_DIR = @HELP_DIR@

17061

+INSTALL = @INSTALL@

17062

+INSTALL_DATA = @INSTALL_DATA@

17063

+INSTALL_PROGRAM = @INSTALL_PROGRAM@

17064

+INSTALL_SCRIPT = @INSTALL_SCRIPT@

17065

+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

17066

+INSTOBJEXT = @INSTOBJEXT@

17067

+INTLLIBS = @INTLLIBS@

17068

+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@

17069

+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@

17070

+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@

17071

+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@

17072

+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@

17073

+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@

17074

+INTLTOOL_MERGE = @INTLTOOL_MERGE@

17075

+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@

17076

+INTLTOOL_PERL = @INTLTOOL_PERL@

17077

+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@

17078

+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@

17079

+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@

17080

+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@

17081

+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@

17082

+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@

17083

+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@

17084

+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@

17085

+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@

17086

+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@

17087

+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@

17088

+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@

17089

+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@

17090

+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@

17091

+LDFLAGS = @LDFLAGS@

17092

+LIBEPC_CFLAGS = @LIBEPC_CFLAGS@

17093

+LIBEPC_LIBS = @LIBEPC_LIBS@

17094

+LIBGALAGO_CFLAGS = @LIBGALAGO_CFLAGS@

17095

+LIBGALAGO_LIBS = @LIBGALAGO_LIBS@

17096

+LIBOBJS = @LIBOBJS@

17097

+LIBS = @LIBS@

17098

+LIBTOOL = @LIBTOOL@

17099

+LIRC_LIBS = @LIRC_LIBS@

17100

+LN_S = @LN_S@

17101

+LTLIBOBJS = @LTLIBOBJS@

17102

+MAINT = @MAINT@

17103

+MAKEINFO = @MAKEINFO@

17104

+MEDIA_PLAYER_KEYS_CFLAGS = @MEDIA_PLAYER_KEYS_CFLAGS@

17105

+MEDIA_PLAYER_KEYS_LIBS = @MEDIA_PLAYER_KEYS_LIBS@

17106

+MISSING_PLUGINS_CFLAGS = @MISSING_PLUGINS_CFLAGS@

17107

+MISSING_PLUGINS_LIBS = @MISSING_PLUGINS_LIBS@

17108

+MKDIR_P = @MKDIR_P@

17109

+MKINSTALLDIRS = @MKINSTALLDIRS@

17110

+MM_CFLAGS = @MM_CFLAGS@

17111

+MM_LIBS = @MM_LIBS@

17112

+MSGFMT = @MSGFMT@

17113

+MSGFMT_OPTS = @MSGFMT_OPTS@

17114

+MSGMERGE = @MSGMERGE@

17115

+NAUTILUSDIR = @NAUTILUSDIR@

17116

+NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@

17117

+NAUTILUS_LIBS = @NAUTILUS_LIBS@

17118

+NMEDIT = @NMEDIT@

17119

+NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@

17120

+NVTV_CFLAGS = @NVTV_CFLAGS@

17121

+NVTV_LIBS = @NVTV_LIBS@

17122

+OBJEXT = @OBJEXT@

17123

+OMF_DIR = @OMF_DIR@

17124

+PACKAGE = @PACKAGE@

17125

+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

17126

+PACKAGE_NAME = @PACKAGE_NAME@

17127

+PACKAGE_STRING = @PACKAGE_STRING@

17128

+PACKAGE_TARNAME = @PACKAGE_TARNAME@

17129

+PACKAGE_VERSION = @PACKAGE_VERSION@

17130

+PATH_SEPARATOR = @PATH_SEPARATOR@

17131

+PKG_CONFIG = @PKG_CONFIG@

17132

+PLUGINDIR = @PLUGINDIR@

17133

+PLUGINS = @PLUGINS@

17134

+POFILES = @POFILES@

17135

+POSUB = @POSUB@

17136

+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@

17137

+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@

17138

+PYGTK_CFLAGS = @PYGTK_CFLAGS@

17139

+PYGTK_CODEGEN = @PYGTK_CODEGEN@

17140

+PYGTK_DEFSDIR = @PYGTK_DEFSDIR@

17141

+PYGTK_H2DEF = @PYGTK_H2DEF@

17142

+PYGTK_LIBS = @PYGTK_LIBS@

17143

+PYTHON = @PYTHON@

17144

+PYTHON_CFLAGS = @PYTHON_CFLAGS@

17145

+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

17146

+PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@

17147

+PYTHON_LIBS = @PYTHON_LIBS@

17148

+PYTHON_LIB_LOC = @PYTHON_LIB_LOC@

17149

+PYTHON_PLATFORM = @PYTHON_PLATFORM@

17150

+PYTHON_PREFIX = @PYTHON_PREFIX@

17151

+PYTHON_VERSION = @PYTHON_VERSION@

17152

+RANLIB = @RANLIB@

17153

+SED = @SED@

17154

+SET_MAKE = @SET_MAKE@

17155

+SHELL = @SHELL@

17156

+SN_CFLAGS = @SN_CFLAGS@

17157

+SN_LIBS = @SN_LIBS@

17158

+STRIP = @STRIP@

17159

+TOTEM_VERSION_MAJOR = @TOTEM_VERSION_MAJOR@

17160

+TOTEM_VERSION_MICRO = @TOTEM_VERSION_MICRO@

17161

+TOTEM_VERSION_MINOR = @TOTEM_VERSION_MINOR@

17162

+TRACKER_CFLAGS = @TRACKER_CFLAGS@

17163

+TRACKER_LIBS = @TRACKER_LIBS@

17164

+USE_NLS = @USE_NLS@

17165

+VALAC = @VALAC@

17166

+VALA_CFLAGS = @VALA_CFLAGS@

17167

+VALA_LIBS = @VALA_LIBS@

17168

+VERSION = @VERSION@

17169

+WARN_CFLAGS = @WARN_CFLAGS@

17170

+WARN_CXXFLAGS = @WARN_CXXFLAGS@

17171

+XGETTEXT = @XGETTEXT@

17172

+XINE_CFLAGS = @XINE_CFLAGS@

17173

+XINE_LIBS = @XINE_LIBS@

17174

+XMKMF = @XMKMF@

17175

+XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17176

+XVIDMODE_LIBS = @XVIDMODE_LIBS@

17177

+X_LIBS = @X_LIBS@

17178

+abs_builddir = @abs_builddir@

17179

+abs_srcdir = @abs_srcdir@

17180

+abs_top_builddir = @abs_top_builddir@

17181

+abs_top_srcdir = @abs_top_srcdir@

17182

+ac_ct_CC = @ac_ct_CC@

17183

+ac_ct_CXX = @ac_ct_CXX@

17184

+ac_ct_F77 = @ac_ct_F77@

17185

+am__include = @am__include@

17186

+am__leading_dot = @am__leading_dot@

17187

+am__quote = @am__quote@

17188

+am__tar = @am__tar@

17189

+am__untar = @am__untar@

17190

+bindir = @bindir@

17191

+build = @build@

17192

+build_alias = @build_alias@

17193

+build_cpu = @build_cpu@

17194

+build_os = @build_os@

17195

+build_vendor = @build_vendor@

17196

+builddir = @builddir@

17197

+datadir = @datadir@

17198

+datarootdir = @datarootdir@

17199

+docdir = @docdir@

17200

+dvidir = @dvidir@

17201

+exec_prefix = @exec_prefix@

17202

+host = @host@

17203

+host_alias = @host_alias@

17204

+host_cpu = @host_cpu@

17205

+host_os = @host_os@

17206

+host_vendor = @host_vendor@

17207

+htmldir = @htmldir@

17208

+includedir = @includedir@

17209

+infodir = @infodir@

17210

+install_sh = @install_sh@

17211

+libdir = @libdir@

17212

+libexecdir = @libexecdir@

17213

+localedir = @localedir@

17214

+localstatedir = @localstatedir@

17215

+mandir = @mandir@

17216

+mkdir_p = @mkdir_p@

17217

+oldincludedir = @oldincludedir@

17218

+pdfdir = @pdfdir@

17219

+pkgpyexecdir = @pkgpyexecdir@

17220

+pkgpythondir = @pkgpythondir@

17221

+prefix = @prefix@

17222

+program_transform_name = @program_transform_name@

17223

+psdir = @psdir@

17224

+pyexecdir = @pyexecdir@

17225

+pythondir = @pythondir@

17226

+sbindir = @sbindir@

17227

+sharedstatedir = @sharedstatedir@

17228

+srcdir = @srcdir@

17229

+sysconfdir = @sysconfdir@

17230

+target_alias = @target_alias@

17231

+top_builddir = @top_builddir@

17232

+top_srcdir = @top_srcdir@

17233

+plugindir = $(PLUGINDIR)/bbc

17234

+plugin_PYTHON = bbc.py contentview.py genres.py installablecodecs.py

17235

+plugin_in_files = bbc.totem-plugin.in

17236

+plugin_DATA = $(plugin_in_files:.totem-plugin.in=.totem-plugin)

17237

+EXTRA_DIST = $(plugin_in_files) bbc.py contentview.py genres.py installablecodecs.py

17238

+CLEANFILES = $(plugin_DATA)

17239

+DISTCLEANFILES = $(plugin_DATA)

17240

+all: all-am

17241

+

17242

+.SUFFIXES:

17243

+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)

17244

+ @for dep in $?; do \

17245

+ case '$(am__configure_deps)' in \

17246

+ *$$dep*) \

17247

+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \

17248

+ && exit 0; \

17249

+ exit 1;; \

17250

+ esac; \

17251

+ done; \

17252

+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/plugins/bbc/Makefile'; \

17253

+ cd $(top_srcdir) && \

17254

+ $(AUTOMAKE) --gnu src/plugins/bbc/Makefile

17255

+.PRECIOUS: Makefile

17256

+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

17257

+ @case '$?' in \

17258

+ *config.status*) \

17259

+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \

17260

+ *) \

17261

+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \

17262

+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \

17263

+ esac;

17264

+

17265

+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)

17266

+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

17267

+

17268

+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)

17269

+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

17270

+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

17271

+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

17272

+

17273

+mostlyclean-libtool:

17274

+ -rm -f *.lo

17275

+

17276

+clean-libtool:

17277

+ -rm -rf .libs _libs

17278

+install-pluginPYTHON: $(plugin_PYTHON)

17279

+ @$(NORMAL_INSTALL)

17280

+ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"

17281

+ @list='$(plugin_PYTHON)'; dlist=''; for p in $$list; do\

17282

+ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \

17283

+ if test -f $$b$$p; then \

17284

+ f=$(am__strip_dir) \

17285

+ dlist="$$dlist $$f"; \

17286

+ echo " $(pluginPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(plugindir)/$$f'"; \

17287

+ $(pluginPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(plugindir)/$$f"; \

17288

+ else :; fi; \

17289

+ done; \

17290

+ if test -n "$$dlist"; then \

17291

+ if test -z "$(DESTDIR)"; then \

17292

+ PYTHON=$(PYTHON) $(py_compile) --basedir "$(plugindir)" $$dlist; \

17293

+ else \

17294

+ PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(plugindir)" $$dlist; \

17295

+ fi; \

17296

+ else :; fi

17297

+

17298

+uninstall-pluginPYTHON:

17299

+ @$(NORMAL_UNINSTALL)

17300

+ @list='$(plugin_PYTHON)'; dlist=''; for p in $$list; do\

17301

+ f=$(am__strip_dir) \

17302

+ rm -f "$(DESTDIR)$(plugindir)/$$f"; \

17303

+ rm -f "$(DESTDIR)$(plugindir)/$${f}c"; \

17304

+ rm -f "$(DESTDIR)$(plugindir)/$${f}o"; \

17305

+ done

17306

+install-pluginDATA: $(plugin_DATA)

17307

+ @$(NORMAL_INSTALL)

17308

+ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"

17309

+ @list='$(plugin_DATA)'; for p in $$list; do \

17310

+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

17311

+ f=$(am__strip_dir) \

17312

+ echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \

17313

+ $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \

17314

+ done

17315

+

17316

+uninstall-pluginDATA:

17317

+ @$(NORMAL_UNINSTALL)

17318

+ @list='$(plugin_DATA)'; for p in $$list; do \

17319

+ f=$(am__strip_dir) \

17320

+ echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \

17321

+ rm -f "$(DESTDIR)$(plugindir)/$$f"; \

17322

+ done

17323

+tags: TAGS

17324

+TAGS:

17325

+

17326

+ctags: CTAGS

17327

+CTAGS:

17328

+

17329

+

17330

+distdir: $(DISTFILES)

17331

+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

17332

+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

17333

+ list='$(DISTFILES)'; \

17334

+ dist_files=`for file in $$list; do echo $$file; done | \

17335

+ sed -e "s|^$$srcdirstrip/||;t" \

17336

+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \

17337

+ case $$dist_files in \

17338

+ */*) $(MKDIR_P) `echo "$$dist_files" | \

17339

+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \

17340

+ sort -u` ;; \

17341

+ esac; \

17342

+ for file in $$dist_files; do \

17343

+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

17344

+ if test -d $$d/$$file; then \

17345

+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

17346

+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

17347

+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

17348

+ fi; \

17349

+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \

17350

+ else \

17351

+ test -f $(distdir)/$$file \

17352

+ || cp -p $$d/$$file $(distdir)/$$file \

17353

+ || exit 1; \

17354

+ fi; \

17355

+ done

17356

+check-am: all-am

17357

+check: check-am

17358

+all-am: Makefile $(DATA)

17359

+installdirs:

17360

+ for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \

17361

+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \

17362

+ done

17363

+install: install-am

17364

+install-exec: install-exec-am

17365

+install-data: install-data-am

17366

+uninstall: uninstall-am

17367

+

17368

+install-am: all-am

17369

+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

17370

+

17371

+installcheck: installcheck-am

17372

+install-strip:

17373

+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \

17374

+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \

17375

+ `test -z '$(STRIP)' || \

17376

+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install

17377

+mostlyclean-generic:

17378

+

17379

+clean-generic:

17380

+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

17381

+

17382

+distclean-generic:

17383

+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

17384

+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)

17385

+

17386

+maintainer-clean-generic:

17387

+ @echo "This command is intended for maintainers to use"

17388

+ @echo "it deletes files that may require special tools to rebuild."

17389

+clean: clean-am

17390

+

17391

+clean-am: clean-generic clean-libtool mostlyclean-am

17392

+

17393

+distclean: distclean-am

17394

+ -rm -f Makefile

17395

+distclean-am: clean-am distclean-generic

17396

+

17397

+dvi: dvi-am

17398

+

17399

+dvi-am:

17400

+

17401

+html: html-am

17402

+

17403

+info: info-am

17404

+

17405

+info-am:

17406

+

17407

+install-data-am: install-pluginDATA install-pluginPYTHON

17408

+

17409

+install-dvi: install-dvi-am

17410

+

17411

+install-exec-am:

17412

+

17413

+install-html: install-html-am

17414

+

17415

+install-info: install-info-am

17416

+

17417

+install-man:

17418

+

17419

+install-pdf: install-pdf-am

17420

+

17421

+install-ps: install-ps-am

17422

+

17423

+installcheck-am:

17424

+

17425

+maintainer-clean: maintainer-clean-am

17426

+ -rm -f Makefile

17427

+maintainer-clean-am: distclean-am maintainer-clean-generic

17428

+

17429

+mostlyclean: mostlyclean-am

17430

+

17431

+mostlyclean-am: mostlyclean-generic mostlyclean-libtool

17432

+

17433

+pdf: pdf-am

17434

+

17435

+pdf-am:

17436

+

17437

+ps: ps-am

17438

+

17439

+ps-am:

17440

+

17441

+uninstall-am: uninstall-pluginDATA uninstall-pluginPYTHON

17442

+

17443

+.MAKE: install-am install-strip

17444

+

17445

+.PHONY: all all-am check check-am clean clean-generic clean-libtool \

17446

+ distclean distclean-generic distclean-libtool distdir dvi \

17447

+ dvi-am html html-am info info-am install install-am \

17448

+ install-data install-data-am install-dvi install-dvi-am \

17449

+ install-exec install-exec-am install-html install-html-am \

17450

+ install-info install-info-am install-man install-pdf \

17451

+ install-pdf-am install-pluginDATA install-pluginPYTHON \

17452

+ install-ps install-ps-am install-strip installcheck \

17453

+ installcheck-am installdirs maintainer-clean \

17454

+ maintainer-clean-generic mostlyclean mostlyclean-generic \

17455

+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \

17456

+ uninstall-pluginDATA uninstall-pluginPYTHON

17457

+

17458

+

17459

+%.totem-plugin: %.totem-plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache

17460

+

17461

+pychecker:

17462

+ PYTHONPATH=$(top_srcdir)/src/plugins/bbc:$$PYTHONPATH \

17463

+ pychecker $(wildcard $(top_srcdir)/src/plugins/bbc/*py)

17464

+

17465

+pyflakes:

17466

+ pyflakes $(wildcard $(top_srcdir)/src/plugins/bbc/*py)

17467

+

17468

+check: pychecker pyflakes

17469

+ echo

17470

+# Tell versions [3.59,3.63) of GNU make to not export all variables.

17471

+# Otherwise a system limit (for SysV at least) may be exceeded.

17472

+.NOEXPORT:

17473

Index: totem-2.24.3/src/plugins/bemused/Makefile.in

17474

===================================================================

17475

--- totem-2.24.3.orig/src/plugins/bemused/Makefile.in 2008-10-26 15:40:48.000000000 +0100

17476

+++ totem-2.24.3/src/plugins/bemused/Makefile.in 2009-01-23 17:07:53.412650552 +0100

17477

@@ -90,6 +90,8 @@ AUTOCONF = @AUTOCONF@

17478

AUTOHEADER = @AUTOHEADER@

17479

AUTOMAKE = @AUTOMAKE@

17480

AWK = @AWK@

17481

+BBC_CFLAGS = @BBC_CFLAGS@

17482

+BBC_LIBS = @BBC_LIBS@

17483

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17484

BEMUSED_LIBS = @BEMUSED_LIBS@

17485

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17486

@@ -260,7 +262,6 @@ XGETTEXT = @XGETTEXT@

17487

XINE_CFLAGS = @XINE_CFLAGS@

17488

XINE_LIBS = @XINE_LIBS@

17489

XMKMF = @XMKMF@

17490

-XTEST_LIBS = @XTEST_LIBS@

17491

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17492

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17493

X_LIBS = @X_LIBS@

17494

@@ -317,7 +318,6 @@ sharedstatedir = @sharedstatedir@

17495

srcdir = @srcdir@

17496

sysconfdir = @sysconfdir@

17497

target_alias = @target_alias@

17498

-top_build_prefix = @top_build_prefix@

17499

top_builddir = @top_builddir@

17500

top_srcdir = @top_srcdir@

17501

modules_flags = -export_dynamic -avoid-version -module

17502

Index: totem-2.24.3/src/plugins/galago/Makefile.in

17503

===================================================================

17504

--- totem-2.24.3.orig/src/plugins/galago/Makefile.in 2008-10-26 15:40:48.000000000 +0100

17505

+++ totem-2.24.3/src/plugins/galago/Makefile.in 2009-01-23 17:07:53.584653418 +0100

17506

@@ -91,6 +91,8 @@ AUTOCONF = @AUTOCONF@

17507

AUTOHEADER = @AUTOHEADER@

17508

AUTOMAKE = @AUTOMAKE@

17509

AWK = @AWK@

17510

+BBC_CFLAGS = @BBC_CFLAGS@

17511

+BBC_LIBS = @BBC_LIBS@

17512

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17513

BEMUSED_LIBS = @BEMUSED_LIBS@

17514

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17515

@@ -261,7 +263,6 @@ XGETTEXT = @XGETTEXT@

17516

XINE_CFLAGS = @XINE_CFLAGS@

17517

XINE_LIBS = @XINE_LIBS@

17518

XMKMF = @XMKMF@

17519

-XTEST_LIBS = @XTEST_LIBS@

17520

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17521

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17522

X_LIBS = @X_LIBS@

17523

@@ -318,7 +319,6 @@ sharedstatedir = @sharedstatedir@

17524

srcdir = @srcdir@

17525

sysconfdir = @sysconfdir@

17526

target_alias = @target_alias@

17527

-top_build_prefix = @top_build_prefix@

17528

top_builddir = @top_builddir@

17529

top_srcdir = @top_srcdir@

17530

modules_flags = -export_dynamic -avoid-version -module

17531

Index: totem-2.24.3/src/plugins/gromit/Makefile.in

17532

===================================================================

17533

--- totem-2.24.3.orig/src/plugins/gromit/Makefile.in 2008-10-26 15:40:48.000000000 +0100

17534

+++ totem-2.24.3/src/plugins/gromit/Makefile.in 2009-01-23 17:07:53.752653262 +0100

17535

@@ -90,6 +90,8 @@ AUTOCONF = @AUTOCONF@

17536

AUTOHEADER = @AUTOHEADER@

17537

AUTOMAKE = @AUTOMAKE@

17538

AWK = @AWK@

17539

+BBC_CFLAGS = @BBC_CFLAGS@

17540

+BBC_LIBS = @BBC_LIBS@

17541

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17542

BEMUSED_LIBS = @BEMUSED_LIBS@

17543

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17544

@@ -260,7 +262,6 @@ XGETTEXT = @XGETTEXT@

17545

XINE_CFLAGS = @XINE_CFLAGS@

17546

XINE_LIBS = @XINE_LIBS@

17547

XMKMF = @XMKMF@

17548

-XTEST_LIBS = @XTEST_LIBS@

17549

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17550

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17551

X_LIBS = @X_LIBS@

17552

@@ -317,7 +318,6 @@ sharedstatedir = @sharedstatedir@

17553

srcdir = @srcdir@

17554

sysconfdir = @sysconfdir@

17555

target_alias = @target_alias@

17556

-top_build_prefix = @top_build_prefix@

17557

top_builddir = @top_builddir@

17558

top_srcdir = @top_srcdir@

17559

modules_flags = -export_dynamic -avoid-version -module

17560

Index: totem-2.24.3/src/plugins/lirc/Makefile.in

17561

===================================================================

17562

--- totem-2.24.3.orig/src/plugins/lirc/Makefile.in 2008-10-26 15:40:48.000000000 +0100

17563

+++ totem-2.24.3/src/plugins/lirc/Makefile.in 2009-01-23 17:07:53.928650839 +0100

17564

@@ -93,6 +93,8 @@ AUTOCONF = @AUTOCONF@

17565

AUTOHEADER = @AUTOHEADER@

17566

AUTOMAKE = @AUTOMAKE@

17567

AWK = @AWK@

17568

+BBC_CFLAGS = @BBC_CFLAGS@

17569

+BBC_LIBS = @BBC_LIBS@

17570

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17571

BEMUSED_LIBS = @BEMUSED_LIBS@

17572

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17573

@@ -263,7 +265,6 @@ XGETTEXT = @XGETTEXT@

17574

XINE_CFLAGS = @XINE_CFLAGS@

17575

XINE_LIBS = @XINE_LIBS@

17576

XMKMF = @XMKMF@

17577

-XTEST_LIBS = @XTEST_LIBS@

17578

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17579

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17580

X_LIBS = @X_LIBS@

17581

@@ -320,7 +321,6 @@ sharedstatedir = @sharedstatedir@

17582

srcdir = @srcdir@

17583

sysconfdir = @sysconfdir@

17584

target_alias = @target_alias@

17585

-top_build_prefix = @top_build_prefix@

17586

top_builddir = @top_builddir@

17587

top_srcdir = @top_srcdir@

17588

modules_flags = -export_dynamic -avoid-version -module

17589

Index: totem-2.24.3/src/plugins/media-player-keys/Makefile.in

17590

===================================================================

17591

--- totem-2.24.3.orig/src/plugins/media-player-keys/Makefile.in 2008-10-26 15:40:48.000000000 +0100

17592

+++ totem-2.24.3/src/plugins/media-player-keys/Makefile.in 2009-01-23 17:07:54.108651440 +0100

17593

@@ -96,6 +96,8 @@ AUTOCONF = @AUTOCONF@

17594

AUTOHEADER = @AUTOHEADER@

17595

AUTOMAKE = @AUTOMAKE@

17596

AWK = @AWK@

17597

+BBC_CFLAGS = @BBC_CFLAGS@

17598

+BBC_LIBS = @BBC_LIBS@

17599

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17600

BEMUSED_LIBS = @BEMUSED_LIBS@

17601

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17602

@@ -266,7 +268,6 @@ XGETTEXT = @XGETTEXT@

17603

XINE_CFLAGS = @XINE_CFLAGS@

17604

XINE_LIBS = @XINE_LIBS@

17605

XMKMF = @XMKMF@

17606

-XTEST_LIBS = @XTEST_LIBS@

17607

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17608

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17609

X_LIBS = @X_LIBS@

17610

@@ -323,7 +324,6 @@ sharedstatedir = @sharedstatedir@

17611

srcdir = @srcdir@

17612

sysconfdir = @sysconfdir@

17613

target_alias = @target_alias@

17614

-top_build_prefix = @top_build_prefix@

17615

top_builddir = @top_builddir@

17616

top_srcdir = @top_srcdir@

17617

modules_flags = -export_dynamic -avoid-version -module

17618

Index: totem-2.24.3/src/plugins/mythtv/Makefile.in

17619

===================================================================

17620

--- totem-2.24.3.orig/src/plugins/mythtv/Makefile.in 2008-10-26 15:40:49.000000000 +0100

17621

+++ totem-2.24.3/src/plugins/mythtv/Makefile.in 2009-01-23 17:07:54.288651551 +0100

17622

@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@

17623

AUTOHEADER = @AUTOHEADER@

17624

AUTOMAKE = @AUTOMAKE@

17625

AWK = @AWK@

17626

+BBC_CFLAGS = @BBC_CFLAGS@

17627

+BBC_LIBS = @BBC_LIBS@

17628

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17629

BEMUSED_LIBS = @BEMUSED_LIBS@

17630

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17631

@@ -262,7 +264,6 @@ XGETTEXT = @XGETTEXT@

17632

XINE_CFLAGS = @XINE_CFLAGS@

17633

XINE_LIBS = @XINE_LIBS@

17634

XMKMF = @XMKMF@

17635

-XTEST_LIBS = @XTEST_LIBS@

17636

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17637

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17638

X_LIBS = @X_LIBS@

17639

@@ -319,7 +320,6 @@ sharedstatedir = @sharedstatedir@

17640

srcdir = @srcdir@

17641

sysconfdir = @sysconfdir@

17642

target_alias = @target_alias@

17643

-top_build_prefix = @top_build_prefix@

17644

top_builddir = @top_builddir@

17645

top_srcdir = @top_srcdir@

17646

modules_flags = -export_dynamic -avoid-version -module

17647

Index: totem-2.24.3/src/plugins/ontop/Makefile.in

17648

===================================================================

17649

--- totem-2.24.3.orig/src/plugins/ontop/Makefile.in 2008-10-26 15:40:49.000000000 +0100

17650

+++ totem-2.24.3/src/plugins/ontop/Makefile.in 2009-01-23 17:07:54.456651883 +0100

17651

@@ -90,6 +90,8 @@ AUTOCONF = @AUTOCONF@

17652

AUTOHEADER = @AUTOHEADER@

17653

AUTOMAKE = @AUTOMAKE@

17654

AWK = @AWK@

17655

+BBC_CFLAGS = @BBC_CFLAGS@

17656

+BBC_LIBS = @BBC_LIBS@

17657

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17658

BEMUSED_LIBS = @BEMUSED_LIBS@

17659

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17660

@@ -260,7 +262,6 @@ XGETTEXT = @XGETTEXT@

17661

XINE_CFLAGS = @XINE_CFLAGS@

17662

XINE_LIBS = @XINE_LIBS@

17663

XMKMF = @XMKMF@

17664

-XTEST_LIBS = @XTEST_LIBS@

17665

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17666

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17667

X_LIBS = @X_LIBS@

17668

@@ -317,7 +318,6 @@ sharedstatedir = @sharedstatedir@

17669

srcdir = @srcdir@

17670

sysconfdir = @sysconfdir@

17671

target_alias = @target_alias@

17672

-top_build_prefix = @top_build_prefix@

17673

top_builddir = @top_builddir@

17674

top_srcdir = @top_srcdir@

17675

modules_flags = -export_dynamic -avoid-version -module

17676

Index: totem-2.24.3/src/plugins/properties/Makefile.in

17677

===================================================================

17678

--- totem-2.24.3.orig/src/plugins/properties/Makefile.in 2008-10-26 15:40:49.000000000 +0100

17679

+++ totem-2.24.3/src/plugins/properties/Makefile.in 2009-01-23 17:07:54.652651375 +0100

17680

@@ -103,6 +103,8 @@ AUTOCONF = @AUTOCONF@

17681

AUTOHEADER = @AUTOHEADER@

17682

AUTOMAKE = @AUTOMAKE@

17683

AWK = @AWK@

17684

+BBC_CFLAGS = @BBC_CFLAGS@

17685

+BBC_LIBS = @BBC_LIBS@

17686

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17687

BEMUSED_LIBS = @BEMUSED_LIBS@

17688

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17689

@@ -273,7 +275,6 @@ XGETTEXT = @XGETTEXT@

17690

XINE_CFLAGS = @XINE_CFLAGS@

17691

XINE_LIBS = @XINE_LIBS@

17692

XMKMF = @XMKMF@

17693

-XTEST_LIBS = @XTEST_LIBS@

17694

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17695

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17696

X_LIBS = @X_LIBS@

17697

@@ -330,7 +331,6 @@ sharedstatedir = @sharedstatedir@

17698

srcdir = @srcdir@

17699

sysconfdir = @sysconfdir@

17700

target_alias = @target_alias@

17701

-top_build_prefix = @top_build_prefix@

17702

top_builddir = @top_builddir@

17703

top_srcdir = @top_srcdir@

17704

modules_flags = -export_dynamic -avoid-version -module

17705

Index: totem-2.24.3/src/plugins/publish/Makefile.in

17706

===================================================================

17707

--- totem-2.24.3.orig/src/plugins/publish/Makefile.in 2008-10-26 15:40:49.000000000 +0100

17708

+++ totem-2.24.3/src/plugins/publish/Makefile.in 2009-01-23 17:07:54.832651487 +0100

17709

@@ -93,6 +93,8 @@ AUTOCONF = @AUTOCONF@

17710

AUTOHEADER = @AUTOHEADER@

17711

AUTOMAKE = @AUTOMAKE@

17712

AWK = @AWK@

17713

+BBC_CFLAGS = @BBC_CFLAGS@

17714

+BBC_LIBS = @BBC_LIBS@

17715

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17716

BEMUSED_LIBS = @BEMUSED_LIBS@

17717

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17718

@@ -263,7 +265,6 @@ XGETTEXT = @XGETTEXT@

17719

XINE_CFLAGS = @XINE_CFLAGS@

17720

XINE_LIBS = @XINE_LIBS@

17721

XMKMF = @XMKMF@

17722

-XTEST_LIBS = @XTEST_LIBS@

17723

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17724

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17725

X_LIBS = @X_LIBS@

17726

@@ -320,7 +321,6 @@ sharedstatedir = @sharedstatedir@

17727

srcdir = @srcdir@

17728

sysconfdir = @sysconfdir@

17729

target_alias = @target_alias@

17730

-top_build_prefix = @top_build_prefix@

17731

top_builddir = @top_builddir@

17732

top_srcdir = @top_srcdir@

17733

modules_flags = -export_dynamic -avoid-version -module

17734

Index: totem-2.24.3/src/plugins/pythonconsole/Makefile.in

17735

===================================================================

17736

--- totem-2.24.3.orig/src/plugins/pythonconsole/Makefile.in 2008-10-26 15:40:49.000000000 +0100

17737

+++ totem-2.24.3/src/plugins/pythonconsole/Makefile.in 2009-01-23 17:07:54.972653150 +0100

17738

@@ -70,6 +70,8 @@ AUTOCONF = @AUTOCONF@

17739

AUTOHEADER = @AUTOHEADER@

17740

AUTOMAKE = @AUTOMAKE@

17741

AWK = @AWK@

17742

+BBC_CFLAGS = @BBC_CFLAGS@

17743

+BBC_LIBS = @BBC_LIBS@

17744

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17745

BEMUSED_LIBS = @BEMUSED_LIBS@

17746

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17747

@@ -240,7 +242,6 @@ XGETTEXT = @XGETTEXT@

17748

XINE_CFLAGS = @XINE_CFLAGS@

17749

XINE_LIBS = @XINE_LIBS@

17750

XMKMF = @XMKMF@

17751

-XTEST_LIBS = @XTEST_LIBS@

17752

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17753

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17754

X_LIBS = @X_LIBS@

17755

@@ -297,7 +298,6 @@ sharedstatedir = @sharedstatedir@

17756

srcdir = @srcdir@

17757

sysconfdir = @sysconfdir@

17758

target_alias = @target_alias@

17759

-top_build_prefix = @top_build_prefix@

17760

top_builddir = @top_builddir@

17761

top_srcdir = @top_srcdir@

17762

plugindir = $(PLUGINDIR)/pythonconsole

17763

Index: totem-2.24.3/src/plugins/sample-python/Makefile.in

17764

===================================================================

17765

--- totem-2.24.3.orig/src/plugins/sample-python/Makefile.in 2008-10-26 15:40:49.000000000 +0100

17766

+++ totem-2.24.3/src/plugins/sample-python/Makefile.in 2009-01-23 17:07:55.096650544 +0100

17767

@@ -57,6 +57,8 @@ AUTOCONF = @AUTOCONF@

17768

AUTOHEADER = @AUTOHEADER@

17769

AUTOMAKE = @AUTOMAKE@

17770

AWK = @AWK@

17771

+BBC_CFLAGS = @BBC_CFLAGS@

17772

+BBC_LIBS = @BBC_LIBS@

17773

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17774

BEMUSED_LIBS = @BEMUSED_LIBS@

17775

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17776

@@ -227,7 +229,6 @@ XGETTEXT = @XGETTEXT@

17777

XINE_CFLAGS = @XINE_CFLAGS@

17778

XINE_LIBS = @XINE_LIBS@

17779

XMKMF = @XMKMF@

17780

-XTEST_LIBS = @XTEST_LIBS@

17781

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17782

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17783

X_LIBS = @X_LIBS@

17784

@@ -284,7 +285,6 @@ sharedstatedir = @sharedstatedir@

17785

srcdir = @srcdir@

17786

sysconfdir = @sysconfdir@

17787

target_alias = @target_alias@

17788

-top_build_prefix = @top_build_prefix@

17789

top_builddir = @top_builddir@

17790

top_srcdir = @top_srcdir@

17791

plugindir = $(PLUGINDIR)/sample-python

17792

Index: totem-2.24.3/src/plugins/sample-vala/Makefile.in

17793

===================================================================

17794

--- totem-2.24.3.orig/src/plugins/sample-vala/Makefile.in 2008-10-26 15:40:50.000000000 +0100

17795

+++ totem-2.24.3/src/plugins/sample-vala/Makefile.in 2009-01-23 17:07:55.272651055 +0100

17796

@@ -93,6 +93,8 @@ AUTOCONF = @AUTOCONF@

17797

AUTOHEADER = @AUTOHEADER@

17798

AUTOMAKE = @AUTOMAKE@

17799

AWK = @AWK@

17800

+BBC_CFLAGS = @BBC_CFLAGS@

17801

+BBC_LIBS = @BBC_LIBS@

17802

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17803

BEMUSED_LIBS = @BEMUSED_LIBS@

17804

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17805

@@ -263,7 +265,6 @@ XGETTEXT = @XGETTEXT@

17806

XINE_CFLAGS = @XINE_CFLAGS@

17807

XINE_LIBS = @XINE_LIBS@

17808

XMKMF = @XMKMF@

17809

-XTEST_LIBS = @XTEST_LIBS@

17810

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17811

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17812

X_LIBS = @X_LIBS@

17813

@@ -320,7 +321,6 @@ sharedstatedir = @sharedstatedir@

17814

srcdir = @srcdir@

17815

sysconfdir = @sysconfdir@

17816

target_alias = @target_alias@

17817

-top_build_prefix = @top_build_prefix@

17818

top_builddir = @top_builddir@

17819

top_srcdir = @top_srcdir@

17820

BUILT_SOURCES = totem-sample-vala-plugin.c totem-sample-vala-plugin.h

17821

Index: totem-2.24.3/src/plugins/screensaver/Makefile.in

17822

===================================================================

17823

--- totem-2.24.3.orig/src/plugins/screensaver/Makefile.in 2008-10-26 15:40:50.000000000 +0100

17824

+++ totem-2.24.3/src/plugins/screensaver/Makefile.in 2009-01-23 17:07:55.444650498 +0100

17825

@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@

17826

AUTOHEADER = @AUTOHEADER@

17827

AUTOMAKE = @AUTOMAKE@

17828

AWK = @AWK@

17829

+BBC_CFLAGS = @BBC_CFLAGS@

17830

+BBC_LIBS = @BBC_LIBS@

17831

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17832

BEMUSED_LIBS = @BEMUSED_LIBS@

17833

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17834

@@ -262,7 +264,6 @@ XGETTEXT = @XGETTEXT@

17835

XINE_CFLAGS = @XINE_CFLAGS@

17836

XINE_LIBS = @XINE_LIBS@

17837

XMKMF = @XMKMF@

17838

-XTEST_LIBS = @XTEST_LIBS@

17839

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17840

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17841

X_LIBS = @X_LIBS@

17842

@@ -319,7 +320,6 @@ sharedstatedir = @sharedstatedir@

17843

srcdir = @srcdir@

17844

sysconfdir = @sysconfdir@

17845

target_alias = @target_alias@

17846

-top_build_prefix = @top_build_prefix@

17847

top_builddir = @top_builddir@

17848

top_srcdir = @top_srcdir@

17849

modules_flags = -export_dynamic -avoid-version -module

17850

Index: totem-2.24.3/src/plugins/sidebar-test/Makefile.in

17851

===================================================================

17852

--- totem-2.24.3.orig/src/plugins/sidebar-test/Makefile.in 2008-10-26 15:40:50.000000000 +0100

17853

+++ totem-2.24.3/src/plugins/sidebar-test/Makefile.in 2009-01-23 17:07:55.624651099 +0100

17854

@@ -91,6 +91,8 @@ AUTOCONF = @AUTOCONF@

17855

AUTOHEADER = @AUTOHEADER@

17856

AUTOMAKE = @AUTOMAKE@

17857

AWK = @AWK@

17858

+BBC_CFLAGS = @BBC_CFLAGS@

17859

+BBC_LIBS = @BBC_LIBS@

17860

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17861

BEMUSED_LIBS = @BEMUSED_LIBS@

17862

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17863

@@ -261,7 +263,6 @@ XGETTEXT = @XGETTEXT@

17864

XINE_CFLAGS = @XINE_CFLAGS@

17865

XINE_LIBS = @XINE_LIBS@

17866

XMKMF = @XMKMF@

17867

-XTEST_LIBS = @XTEST_LIBS@

17868

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17869

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17870

X_LIBS = @X_LIBS@

17871

@@ -318,7 +319,6 @@ sharedstatedir = @sharedstatedir@

17872

srcdir = @srcdir@

17873

sysconfdir = @sysconfdir@

17874

target_alias = @target_alias@

17875

-top_build_prefix = @top_build_prefix@

17876

top_builddir = @top_builddir@

17877

top_srcdir = @top_srcdir@

17878

modules_flags = -export_dynamic -avoid-version -module

17879

Index: totem-2.24.3/src/plugins/skipto/Makefile.in

17880

===================================================================

17881

--- totem-2.24.3.orig/src/plugins/skipto/Makefile.in 2008-10-26 15:40:50.000000000 +0100

17882

+++ totem-2.24.3/src/plugins/skipto/Makefile.in 2009-01-23 17:07:55.804650721 +0100

17883

@@ -93,6 +93,8 @@ AUTOCONF = @AUTOCONF@

17884

AUTOHEADER = @AUTOHEADER@

17885

AUTOMAKE = @AUTOMAKE@

17886

AWK = @AWK@

17887

+BBC_CFLAGS = @BBC_CFLAGS@

17888

+BBC_LIBS = @BBC_LIBS@

17889

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17890

BEMUSED_LIBS = @BEMUSED_LIBS@

17891

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17892

@@ -263,7 +265,6 @@ XGETTEXT = @XGETTEXT@

17893

XINE_CFLAGS = @XINE_CFLAGS@

17894

XINE_LIBS = @XINE_LIBS@

17895

XMKMF = @XMKMF@

17896

-XTEST_LIBS = @XTEST_LIBS@

17897

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17898

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17899

X_LIBS = @X_LIBS@

17900

@@ -320,7 +321,6 @@ sharedstatedir = @sharedstatedir@

17901

srcdir = @srcdir@

17902

sysconfdir = @sysconfdir@

17903

target_alias = @target_alias@

17904

-top_build_prefix = @top_build_prefix@

17905

top_builddir = @top_builddir@

17906

top_srcdir = @top_srcdir@

17907

modules_flags = -export_dynamic -avoid-version -module

17908

Index: totem-2.24.3/src/plugins/thumbnail/Makefile.in

17909

===================================================================

17910

--- totem-2.24.3.orig/src/plugins/thumbnail/Makefile.in 2008-10-26 15:40:50.000000000 +0100

17911

+++ totem-2.24.3/src/plugins/thumbnail/Makefile.in 2009-01-23 17:07:55.972651054 +0100

17912

@@ -90,6 +90,8 @@ AUTOCONF = @AUTOCONF@

17913

AUTOHEADER = @AUTOHEADER@

17914

AUTOMAKE = @AUTOMAKE@

17915

AWK = @AWK@

17916

+BBC_CFLAGS = @BBC_CFLAGS@

17917

+BBC_LIBS = @BBC_LIBS@

17918

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17919

BEMUSED_LIBS = @BEMUSED_LIBS@

17920

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17921

@@ -260,7 +262,6 @@ XGETTEXT = @XGETTEXT@

17922

XINE_CFLAGS = @XINE_CFLAGS@

17923

XINE_LIBS = @XINE_LIBS@

17924

XMKMF = @XMKMF@

17925

-XTEST_LIBS = @XTEST_LIBS@

17926

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17927

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17928

X_LIBS = @X_LIBS@

17929

@@ -317,7 +318,6 @@ sharedstatedir = @sharedstatedir@

17930

srcdir = @srcdir@

17931

sysconfdir = @sysconfdir@

17932

target_alias = @target_alias@

17933

-top_build_prefix = @top_build_prefix@

17934

top_builddir = @top_builddir@

17935

top_srcdir = @top_srcdir@

17936

modules_flags = -export_dynamic -avoid-version -module

17937

Index: totem-2.24.3/src/plugins/totem/Makefile.in

17938

===================================================================

17939

--- totem-2.24.3.orig/src/plugins/totem/Makefile.in 2008-10-26 15:40:51.000000000 +0100

17940

+++ totem-2.24.3/src/plugins/totem/Makefile.in 2009-01-23 17:07:56.108653604 +0100

17941

@@ -67,6 +67,8 @@ AUTOCONF = @AUTOCONF@

17942

AUTOHEADER = @AUTOHEADER@

17943

AUTOMAKE = @AUTOMAKE@

17944

AWK = @AWK@

17945

+BBC_CFLAGS = @BBC_CFLAGS@

17946

+BBC_LIBS = @BBC_LIBS@

17947

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17948

BEMUSED_LIBS = @BEMUSED_LIBS@

17949

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17950

@@ -237,7 +239,6 @@ XGETTEXT = @XGETTEXT@

17951

XINE_CFLAGS = @XINE_CFLAGS@

17952

XINE_LIBS = @XINE_LIBS@

17953

XMKMF = @XMKMF@

17954

-XTEST_LIBS = @XTEST_LIBS@

17955

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17956

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17957

X_LIBS = @X_LIBS@

17958

@@ -294,7 +295,6 @@ sharedstatedir = @sharedstatedir@

17959

srcdir = @srcdir@

17960

sysconfdir = @sysconfdir@

17961

target_alias = @target_alias@

17962

-top_build_prefix = @top_build_prefix@

17963

top_builddir = @top_builddir@

17964

top_srcdir = @top_srcdir@

17965

plugindir = $(PLUGINDIR)/totem

17966

Index: totem-2.24.3/src/plugins/tracker/Makefile.in

17967

===================================================================

17968

--- totem-2.24.3.orig/src/plugins/tracker/Makefile.in 2008-10-26 15:40:51.000000000 +0100

17969

+++ totem-2.24.3/src/plugins/tracker/Makefile.in 2009-01-23 17:07:56.292651361 +0100

17970

@@ -92,6 +92,8 @@ AUTOCONF = @AUTOCONF@

17971

AUTOHEADER = @AUTOHEADER@

17972

AUTOMAKE = @AUTOMAKE@

17973

AWK = @AWK@

17974

+BBC_CFLAGS = @BBC_CFLAGS@

17975

+BBC_LIBS = @BBC_LIBS@

17976

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

17977

BEMUSED_LIBS = @BEMUSED_LIBS@

17978

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

17979

@@ -262,7 +264,6 @@ XGETTEXT = @XGETTEXT@

17980

XINE_CFLAGS = @XINE_CFLAGS@

17981

XINE_LIBS = @XINE_LIBS@

17982

XMKMF = @XMKMF@

17983

-XTEST_LIBS = @XTEST_LIBS@

17984

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

17985

XVIDMODE_LIBS = @XVIDMODE_LIBS@

17986

X_LIBS = @X_LIBS@

17987

@@ -319,7 +320,6 @@ sharedstatedir = @sharedstatedir@

17988

srcdir = @srcdir@

17989

sysconfdir = @sysconfdir@

17990

target_alias = @target_alias@

17991

-top_build_prefix = @top_build_prefix@

17992

top_builddir = @top_builddir@

17993

top_srcdir = @top_srcdir@

17994

modules_flags = -export_dynamic -avoid-version -module

17995

Index: totem-2.24.3/src/plugins/youtube/Makefile.in

17996

===================================================================

17997

--- totem-2.24.3.orig/src/plugins/youtube/Makefile.in 2008-10-26 15:40:51.000000000 +0100

17998

+++ totem-2.24.3/src/plugins/youtube/Makefile.in 2009-01-23 17:07:56.436650669 +0100

17999

@@ -72,6 +72,8 @@ AUTOCONF = @AUTOCONF@

18000

AUTOHEADER = @AUTOHEADER@

18001

AUTOMAKE = @AUTOMAKE@

18002

AWK = @AWK@

18003

+BBC_CFLAGS = @BBC_CFLAGS@

18004

+BBC_LIBS = @BBC_LIBS@

18005

BEMUSED_CFLAGS = @BEMUSED_CFLAGS@

18006

BEMUSED_LIBS = @BEMUSED_LIBS@

18007

BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@

18008

@@ -242,7 +244,6 @@ XGETTEXT = @XGETTEXT@

18009

XINE_CFLAGS = @XINE_CFLAGS@

18010

XINE_LIBS = @XINE_LIBS@

18011

XMKMF = @XMKMF@

18012

-XTEST_LIBS = @XTEST_LIBS@

18013

XVIDMODE_CFLAGS = @XVIDMODE_CFLAGS@

18014

XVIDMODE_LIBS = @XVIDMODE_LIBS@

18015

X_LIBS = @X_LIBS@

18016

@@ -299,7 +300,6 @@ sharedstatedir = @sharedstatedir@

18017

srcdir = @srcdir@

18018

sysconfdir = @sysconfdir@

18019

target_alias = @target_alias@

18020

-top_build_prefix = @top_build_prefix@

18021

top_builddir = @top_builddir@

18022

top_srcdir = @top_srcdir@

18023

plugindir = $(PLUGINDIR)/youtube