~ubuntu-branches/ubuntu/raring/hal/raring : revision 175

1

Index: hal/Makefile.in

2

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

3

--- hal.orig/Makefile.in 2011-02-14 11:43:49.671499233 +0100

4

+++ hal/Makefile.in 2011-02-14 11:44:43.000000000 +0100

5

@@ -1,4 +1,4 @@

6

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

7

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

8

# @configure_input@

9

10

11

@@ -196,6 +196,7 @@

12

LIBOBJS = @LIBOBJS@

13

LIBS = @LIBS@

14

LIBTOOL = @LIBTOOL@

15

+LIBUFS_LIBS = @LIBUFS_LIBS@

16

LIBUSB20_LIBS = @LIBUSB20_LIBS@

17

LINUX_INPUT_H = @LINUX_INPUT_H@

18

LIPO = @LIPO@

19

@@ -226,6 +227,8 @@

20

PATH_SEPARATOR = @PATH_SEPARATOR@

21

PCI_IDS_DIR = @PCI_IDS_DIR@

22

PKG_CONFIG = @PKG_CONFIG@

23

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

24

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

25

POLKIT_CFLAGS = @POLKIT_CFLAGS@

26

POLKIT_LIBS = @POLKIT_LIBS@

27

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

28

@@ -426,7 +429,7 @@

29

# (which will cause the Makefiles to be regenerated when you run `make');

30

# (2) otherwise, pass the desired values on the `make' command line.

31

$(RECURSIVE_TARGETS):

32

- @failcom='exit 1'; \

33

+ @fail= failcom='exit 1'; \

34

for f in x $$MAKEFLAGS; do \

35

case $$f in \

36

*=* | --[!k]*);; \

37

@@ -451,7 +454,7 @@

38

fi; test -z "$$fail"

39

40

$(RECURSIVE_CLEAN_TARGETS):

41

- @failcom='exit 1'; \

42

+ @fail= failcom='exit 1'; \

43

for f in x $$MAKEFLAGS; do \

44

case $$f in \

45

*=* | --[!k]*);; \

46

@@ -615,7 +618,8 @@

47

fi; \

48

done

49

-test -n "$(am__skip_mode_fix)" \

50

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

51

+ || find "$(distdir)" -type d ! -perm -755 \

52

+ -exec chmod u+rwx,go+rx {} \; -o \

53

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

54

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

55

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

56

@@ -659,17 +663,17 @@

57

distcheck: dist

58

case '$(DIST_ARCHIVES)' in \

59

*.tar.gz*) \

60

- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\

61

+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\

62

*.tar.bz2*) \

63

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

64

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

65

*.tar.lzma*) \

66

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

67

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

68

*.tar.xz*) \

69

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

70

*.tar.Z*) \

71

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

72

*.shar.gz*) \

73

- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\

74

+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\

75

*.zip*) \

76

unzip $(distdir).zip ;;\

77

esac

78

Index: hal/aclocal.m4

79

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

80

--- hal.orig/aclocal.m4 2011-02-14 11:43:49.901499233 +0100

81

+++ hal/aclocal.m4 2011-02-14 11:44:31.000000000 +0100

82

@@ -1,4 +1,4 @@

83

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

84

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

85

86

87

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

88

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

89

90

m4_ifndef([AC_AUTOCONF_VERSION],

91

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

92

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

93

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

94

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

95

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

96

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

97

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

98

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

99

@@ -2460,7 +2460,7 @@

100

;;

101

102

# This must be Linux ELF.

103

-linux* | k*bsd*-gnu)

104

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

105

version_type=linux

106

need_lib_prefix=no

107

need_version=no

108

@@ -3099,7 +3099,7 @@

109

;;

110

111

# This must be Linux ELF.

112

-linux* | k*bsd*-gnu)

113

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

114

lt_cv_deplibs_check_method=pass_all

115

;;

116

117

@@ -3720,7 +3720,7 @@

118

;;

119

esac

120

;;

121

- linux* | k*bsd*-gnu)

122

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

123

case $cc_basename in

124

KCC*)

125

# KAI C++ Compiler

126

@@ -4004,7 +4004,7 @@

127

_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'

128

;;

129

130

- linux* | k*bsd*-gnu)

131

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

132

case $cc_basename in

133

# old Intel for x86_64 which still supported -KPIC.

134

ecc*)

135

@@ -4300,6 +4300,7 @@

136

fi

137

supports_anon_versioning=no

138

case `$LD -v 2>&1` in

139

+ *GNU\ gold*) supports_anon_versioning=yes ;;

140

*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11

141

*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...

142

*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

143

@@ -4391,7 +4392,7 @@

144

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

145

;;

146

147

- gnu* | linux* | tpf* | k*bsd*-gnu)

148

+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)

149

tmp_diet=no

150

if test "$host_os" = linux-dietlibc; then

151

case $cc_basename in

152

@@ -5871,7 +5872,7 @@

153

_LT_TAGVAR(inherit_rpath, $1)=yes

154

;;

155

156

- linux* | k*bsd*-gnu)

157

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

158

case $cc_basename in

159

KCC*)

160

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

161

@@ -7878,15 +7879,15 @@

162

163

# Generated from ltversion.in.

164

165

-# serial 3012 ltversion.m4

166

+# serial 3017 ltversion.m4

167

# This file is part of GNU Libtool

168

169

-m4_define([LT_PACKAGE_VERSION], [2.2.6])

170

-m4_define([LT_PACKAGE_REVISION], [1.3012])

171

+m4_define([LT_PACKAGE_VERSION], [2.2.6b])

172

+m4_define([LT_PACKAGE_REVISION], [1.3017])

173

174

AC_DEFUN([LTVERSION_VERSION],

175

-[macro_version='2.2.6'

176

-macro_revision='1.3012'

177

+[macro_version='2.2.6b'

178

+macro_revision='1.3017'

179

_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])

180

_LT_DECL(, macro_revision, 0)

181

])

182

@@ -7985,6 +7986,7 @@

183

m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])

184

185

# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-

186

+# serial 1 (pkg-config-0.24)

187

#

188

189

#

190

@@ -8012,7 +8014,10 @@

191

AC_DEFUN([PKG_PROG_PKG_CONFIG],

192

[m4_pattern_forbid([^_?PKG_[A-Z_]+$])

193

m4_pattern_allow([^PKG_CONFIG(_PATH)?$])

194

-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl

195

+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])

196

+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])

197

+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])

198

+

199

if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then

200

AC_PATH_TOOL([PKG_CONFIG], [pkg-config])

201

fi

202

@@ -8025,7 +8030,6 @@

203

AC_MSG_RESULT([no])

204

PKG_CONFIG=""

205

fi

206

-

207

fi[]dnl

208

])# PKG_PROG_PKG_CONFIG

209

210

@@ -8034,34 +8038,31 @@

211

# Check to see whether a particular set of modules exists. Similar

212

# to PKG_CHECK_MODULES(), but does not set variables or print errors.

213

#

214

-#

215

-# Similar to PKG_CHECK_MODULES, make sure that the first instance of

216

-# this or PKG_CHECK_MODULES is called, or make sure to call

217

-# PKG_CHECK_EXISTS manually

218

+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])

219

+# only at the first occurence in configure.ac, so if the first place

220

+# it's called might be skipped (such as if it is within an "if", you

221

+# have to call PKG_CHECK_EXISTS manually

222

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

223

AC_DEFUN([PKG_CHECK_EXISTS],

224

[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl

225

if test -n "$PKG_CONFIG" && \

226

AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then

227

- m4_ifval([$2], [$2], [:])

228

+ m4_default([$2], [:])

229

m4_ifvaln([$3], [else

230

$3])dnl

231

fi])

232

233

-

234

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

235

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

236

m4_define([_PKG_CONFIG],

237

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

238

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

239

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

240

- else

241

- PKG_CHECK_EXISTS([$3],

242

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

243

- [pkg_failed=yes])

244

- fi

245

-else

246

- pkg_failed=untried

247

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

248

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

249

+ elif test -n "$PKG_CONFIG"; then

250

+ PKG_CHECK_EXISTS([$3],

251

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

252

+ [pkg_failed=yes])

253

+ else

254

+ pkg_failed=untried

255

fi[]dnl

256

])# _PKG_CONFIG

257

258

@@ -8103,16 +8104,17 @@

259

See the pkg-config man page for more details.])

260

261

if test $pkg_failed = yes; then

262

+ AC_MSG_RESULT([no])

263

_PKG_SHORT_ERRORS_SUPPORTED

264

if test $_pkg_short_errors_supported = yes; then

265

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

266

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

267

else

268

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

269

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

270

fi

271

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

272

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

273

274

- ifelse([$4], , [AC_MSG_ERROR(dnl

275

+ m4_default([$4], [AC_MSG_ERROR(

276

[Package requirements ($2) were not met:

277

278

$$1_PKG_ERRORS

279

@@ -8120,25 +8122,24 @@

280

Consider adjusting the PKG_CONFIG_PATH environment variable if you

281

installed software in a non-standard prefix.

282

283

-_PKG_TEXT

284

-])],

285

- [AC_MSG_RESULT([no])

286

- $4])

287

+_PKG_TEXT])[]dnl

288

+ ])

289

elif test $pkg_failed = untried; then

290

- ifelse([$4], , [AC_MSG_FAILURE(dnl

291

+ AC_MSG_RESULT([no])

292

+ m4_default([$4], [AC_MSG_FAILURE(

293

[The pkg-config script could not be found or is too old. Make sure it

294

is in your PATH or set the PKG_CONFIG environment variable to the full

295

path to pkg-config.

296

297

_PKG_TEXT

298

299

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],

300

- [$4])

301

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl

302

+ ])

303

else

304

$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

305

$1[]_LIBS=$pkg_cv_[]$1[]_LIBS

306

AC_MSG_RESULT([yes])

307

- ifelse([$3], , :, [$3])

308

+ $3

309

fi[]dnl

310

])# PKG_CHECK_MODULES

311

312

@@ -8157,7 +8158,7 @@

313

[am__api_version='1.11'

314

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

315

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

316

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

317

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

318

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

319

])

320

321

@@ -8173,7 +8174,7 @@

322

# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

323

# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

324

AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

325

-[AM_AUTOMAKE_VERSION([1.11])dnl

326

+[AM_AUTOMAKE_VERSION([1.11.1])dnl

327

m4_ifndef([AC_AUTOCONF_VERSION],

328

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

329

_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

330

Index: hal/config.h.in

331

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

332

--- hal.orig/config.h.in 2011-02-14 11:43:49.271499233 +0100

333

+++ hal/config.h.in 2011-02-14 11:44:37.000000000 +0100

334

@@ -64,12 +64,21 @@

335

/* Define to 1 if you have the `dl' library (-ldl). */

336

#undef HAVE_LIBDL

337

338

+/* Set if we have libufs */

339

+#undef HAVE_LIBUFS

340

+

341

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

342

+#undef HAVE_LIBUFS_H

343

+

344

/* Set if we need libsub20 */

345

#undef HAVE_LIBUSB20

346

347

/* Define to 1 if you have the `uuid' library (-luuid). */

348

#undef HAVE_LIBUUID

349

350

+/* Define to 1 if you have the <linux/videodev.h> header file. */

351

+#undef HAVE_LINUX_VIDEODEV_H

352

+

353

/* Define to 1 if you have the `mallopt' function. */

354

#undef HAVE_MALLOPT

355

356

Index: hal/configure

357

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

358

--- hal.orig/configure 2011-02-14 11:43:49.571499233 +0100

359

+++ hal/configure 2011-02-14 11:44:37.000000000 +0100

360

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

361

#! /bin/sh

362

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

363

-# Generated by GNU Autoconf 2.64 for hal 0.5.14.

364

+# Generated by GNU Autoconf 2.67 for hal 0.5.14.

365

#

366

# Report bugs to <david@fubar.dk>.

367

#

368

+#

369

370

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

371

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

372

# Foundation, Inc.

373

#

374

+#

375

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

376

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

377

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

378

@@ -317,7 +319,7 @@

379

test -d "$as_dir" && break

380

done

381

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

382

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

383

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

384

385

386

} # as_fn_mkdir_p

387

@@ -357,19 +359,19 @@

388

fi # as_fn_arith

389

390

391

-# as_fn_error ERROR [LINENO LOG_FD]

392

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

393

+# as_fn_error STATUS ERROR [LINENO LOG_FD]

394

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

395

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

396

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

397

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

398

+# script with STATUS, using 1 if that was 0.

399

as_fn_error ()

400

{

401

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

402

- if test "$3"; then

403

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

404

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

405

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

406

+ if test "$4"; then

407

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

408

+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4

409

fi

410

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

411

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

412

as_fn_exit $as_status

413

} # as_fn_error

414

415

@@ -676,10 +678,11 @@

416

417

418

419

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

420

+test -n "$DJDIR" || exec 7<&0 </dev/null

421

+exec 6>&1

422

423

# Name of the host.

424

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

425

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

426

# so uname gets run too.

427

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

428

429

@@ -808,6 +811,7 @@

430

LIBUSB20_LIBS

431

HAVE_LIBUSB20_FALSE

432

HAVE_LIBUSB20_TRUE

433

+LIBUFS_LIBS

434

HALD_BACKEND

435

HALD_COMPILE_SOLARIS_FALSE

436

HALD_COMPILE_SOLARIS_TRUE

437

@@ -817,6 +821,8 @@

438

HALD_COMPILE_LINUX_TRUE

439

HALD_COMPILE_DUMMY_FALSE

440

HALD_COMPILE_DUMMY_TRUE

441

+HAVE_V4L1_FALSE

442

+HAVE_V4L1_TRUE

443

HAVE_LIBPCI_FALSE

444

HAVE_LIBPCI_TRUE

445

HAVE_SMBIOS_FALSE

446

@@ -860,6 +866,8 @@

447

USB_IDS_DIR

448

PCI_IDS_DIR

449

udev_prefix

450

+PKG_CONFIG_LIBDIR

451

+PKG_CONFIG_PATH

452

PKG_CONFIG

453

CXXCPP

454

OTOOL64

455

@@ -1058,6 +1066,8 @@

456

CPP

457

CXXCPP

458

PKG_CONFIG

459

+PKG_CONFIG_PATH

460

+PKG_CONFIG_LIBDIR

461

PARTED_CFLAGS

462

PARTED_LIBS

463

POLKIT_CFLAGS

464

@@ -1132,8 +1142,9 @@

465

fi

466

467

case $ac_option in

468

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

469

- *) ac_optarg=yes ;;

470

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

471

+ *=) ac_optarg= ;;

472

+ *) ac_optarg=yes ;;

473

esac

474

475

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

476

@@ -1178,7 +1189,7 @@

477

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

478

# Reject names that are not valid shell variable names.

479

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

480

- as_fn_error "invalid feature name: $ac_useropt"

481

+ as_fn_error $? "invalid feature name: $ac_useropt"

482

ac_useropt_orig=$ac_useropt

483

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

484

case $ac_user_opts in

485

@@ -1204,7 +1215,7 @@

486

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

487

# Reject names that are not valid shell variable names.

488

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

489

- as_fn_error "invalid feature name: $ac_useropt"

490

+ as_fn_error $? "invalid feature name: $ac_useropt"

491

ac_useropt_orig=$ac_useropt

492

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

493

case $ac_user_opts in

494

@@ -1408,7 +1419,7 @@

495

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

496

# Reject names that are not valid shell variable names.

497

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

498

- as_fn_error "invalid package name: $ac_useropt"

499

+ as_fn_error $? "invalid package name: $ac_useropt"

500

ac_useropt_orig=$ac_useropt

501

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

502

case $ac_user_opts in

503

@@ -1424,7 +1435,7 @@

504

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

505

# Reject names that are not valid shell variable names.

506

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

507

- as_fn_error "invalid package name: $ac_useropt"

508

+ as_fn_error $? "invalid package name: $ac_useropt"

509

ac_useropt_orig=$ac_useropt

510

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

511

case $ac_user_opts in

512

@@ -1454,8 +1465,8 @@

513

514

x_libraries=$ac_optarg ;;

515

516

- -*) as_fn_error "unrecognized option: \`$ac_option'

517

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

518

+ -*) as_fn_error $? "unrecognized option: \`$ac_option'

519

+Try \`$0 --help' for more information"

520

;;

521

522

*=*)

523

@@ -1463,7 +1474,7 @@

524

# Reject names that are not valid shell variable names.

525

case $ac_envvar in #(

526

'' | [0-9]* | *[!_$as_cr_alnum]* )

527

- as_fn_error "invalid variable name: \`$ac_envvar'" ;;

528

+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;

529

esac

530

eval $ac_envvar=\$ac_optarg

531

export $ac_envvar ;;

532

@@ -1481,13 +1492,13 @@

533

534

if test -n "$ac_prev"; then

535

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

536

- as_fn_error "missing argument to $ac_option"

537

+ as_fn_error $? "missing argument to $ac_option"

538

fi

539

540

if test -n "$ac_unrecognized_opts"; then

541

case $enable_option_checking in

542

no) ;;

543

- fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;

544

+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;

545

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

546

esac

547

fi

548

@@ -1510,7 +1521,7 @@

549

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

550

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

551

esac

552

- as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"

553

+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"

554

done

555

556

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

557

@@ -1524,8 +1535,8 @@

558

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

559

if test "x$build_alias" = x; then

560

cross_compiling=maybe

561

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

562

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

563

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

564

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

565

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

566

cross_compiling=yes

567

fi

568

@@ -1540,9 +1551,9 @@

569

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

570

ac_ls_di=`ls -di .` &&

571

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

572

- as_fn_error "working directory cannot be determined"

573

+ as_fn_error $? "working directory cannot be determined"

574

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

575

- as_fn_error "pwd does not report name of working directory"

576

+ as_fn_error $? "pwd does not report name of working directory"

577

578

579

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

580

@@ -1581,11 +1592,11 @@

581

fi

582

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

583

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

584

- as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"

585

+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"

586

fi

587

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

588

ac_abs_confdir=`(

589

- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"

590

+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"

591

pwd)`

592

# When building in place, set srcdir=.

593

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

594

@@ -1625,7 +1636,7 @@

595

--help=short display options specific to this package

596

--help=recursive display the short help of all the included packages

597

-V, --version display version information and exit

598

- -q, --quiet, --silent do not print \`checking...' messages

599

+ -q, --quiet, --silent do not print \`checking ...' messages

600

--cache-file=FILE cache test results in FILE [disabled]

601

-C, --config-cache alias for \`--cache-file=config.cache'

602

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

603

@@ -1708,7 +1719,7 @@

604

--enable-verbose-mode support verbose debug mode

605

--enable-docbook-docs build documentation (requires xmlto)

606

--enable-man-pages build manual pages

607

- --enable-gtk-doc use gtk-doc to build documentation default=yes

608

+ --enable-gtk-doc use gtk-doc to build documentation [default=yes]

609

--disable-acpi-acpid Do not use ACPI daemon event source

610

--disable-acpi-proc Do not use ACPI kernel-interface directly

611

--enable-acpi-ibm Forward IBM ACPI events

612

@@ -1766,13 +1777,17 @@

613

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

614

nonstandard directory <lib dir>

615

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

616

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

617

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

618

you have headers in a nonstandard directory <include dir>

619

CXX C++ compiler command

620

CXXFLAGS C++ compiler flags

621

CPP C preprocessor

622

CXXCPP C++ preprocessor

623

PKG_CONFIG path to pkg-config utility

624

+ PKG_CONFIG_PATH

625

+ directories to add to pkg-config's search path

626

+ PKG_CONFIG_LIBDIR

627

+ path overriding pkg-config's built-in search path

628

PARTED_CFLAGS

629

C compiler flags for PARTED, overriding pkg-config

630

PARTED_LIBS linker flags for PARTED, overriding pkg-config

631

@@ -1858,9 +1873,9 @@

632

if $ac_init_version; then

633

cat <<\_ACEOF

634

hal configure 0.5.14

635

-generated by GNU Autoconf 2.64

636

+generated by GNU Autoconf 2.67

637

638

639

640

This configure script is free software; the Free Software Foundation

641

gives unlimited permission to copy, distribute and modify it.

642

_ACEOF

643

@@ -1905,7 +1920,7 @@

644

ac_retval=1

645

fi

646

eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

647

- return $ac_retval

648

+ as_fn_set_status $ac_retval

649

650

} # ac_fn_c_try_compile

651

652

@@ -1951,7 +1966,7 @@

653

# left behind by Apple's compiler. We do this before executing the actions.

654

rm -rf conftest.dSYM conftest_ipa8_conftest.oo

655

eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

656

- return $ac_retval

657

+ as_fn_set_status $ac_retval

658

659

} # ac_fn_c_try_link

660

661

@@ -1989,7 +2004,7 @@

662

ac_retval=1

663

fi

664

eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

665

- return $ac_retval

666

+ as_fn_set_status $ac_retval

667

668

} # ac_fn_cxx_try_compile

669

670

@@ -2014,7 +2029,7 @@

671

mv -f conftest.er1 conftest.err

672

fi

673

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

674

- test $ac_status = 0; } >/dev/null && {

675

+ test $ac_status = 0; } > conftest.i && {

676

test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

677

test ! -s conftest.err

678

}; then :

679

@@ -2026,7 +2041,7 @@

680

ac_retval=1

681

fi

682

eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

683

- return $ac_retval

684

+ as_fn_set_status $ac_retval

685

686

} # ac_fn_c_try_cpp

687

688

@@ -2068,7 +2083,7 @@

689

fi

690

rm -rf conftest.dSYM conftest_ipa8_conftest.oo

691

eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

692

- return $ac_retval

693

+ as_fn_set_status $ac_retval

694

695

} # ac_fn_c_try_run

696

697

@@ -2081,7 +2096,7 @@

698

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

699

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

700

$as_echo_n "checking for $2... " >&6; }

701

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

702

+if eval "test \"\${$3+set}\"" = set; then :

703

$as_echo_n "(cached) " >&6

704

else

705

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

706

@@ -2111,7 +2126,7 @@

707

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

708

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

709

$as_echo_n "checking for $2... " >&6; }

710

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

711

+if eval "test \"\${$3+set}\"" = set; then :

712

$as_echo_n "(cached) " >&6

713

else

714

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

715

@@ -2191,7 +2206,7 @@

716

mv -f conftest.er1 conftest.err

717

fi

718

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

719

- test $ac_status = 0; } >/dev/null && {

720

+ test $ac_status = 0; } > conftest.i && {

721

test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||

722

test ! -s conftest.err

723

}; then :

724

@@ -2203,7 +2218,7 @@

725

ac_retval=1

726

fi

727

eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

728

- return $ac_retval

729

+ as_fn_set_status $ac_retval

730

731

} # ac_fn_cxx_try_cpp

732

733

@@ -2249,7 +2264,7 @@

734

# left behind by Apple's compiler. We do this before executing the actions.

735

rm -rf conftest.dSYM conftest_ipa8_conftest.oo

736

eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

737

- return $ac_retval

738

+ as_fn_set_status $ac_retval

739

740

} # ac_fn_cxx_try_link

741

742

@@ -2261,10 +2276,10 @@

743

ac_fn_c_check_header_mongrel ()

744

{

745

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

746

- if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

747

+ if eval "test \"\${$3+set}\"" = set; then :

748

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

749

$as_echo_n "checking for $2... " >&6; }

750

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

751

+if eval "test \"\${$3+set}\"" = set; then :

752

$as_echo_n "(cached) " >&6

753

fi

754

eval ac_res=\$$3

755

@@ -2300,7 +2315,7 @@

756

else

757

ac_header_preproc=no

758

fi

759

-rm -f conftest.err conftest.$ac_ext

760

+rm -f conftest.err conftest.i conftest.$ac_ext

761

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5

762

$as_echo "$ac_header_preproc" >&6; }

763

764

@@ -2323,17 +2338,15 @@

765

$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}

766

{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5

767

$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}

768

-( cat <<\_ASBOX

769

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

770

+( $as_echo "## ----------------------------- ##

771

## Report this to david@fubar.dk ##

772

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

773

-_ASBOX

774

+## ----------------------------- ##"

775

) | sed "s/^/$as_me: WARNING: /" >&2

776

;;

777

esac

778

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

779

$as_echo_n "checking for $2... " >&6; }

780

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

781

+if eval "test \"\${$3+set}\"" = set; then :

782

$as_echo_n "(cached) " >&6

783

else

784

eval "$3=\$ac_header_compiler"

785

@@ -2355,7 +2368,7 @@

786

as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

787

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

788

$as_echo_n "checking for $2... " >&6; }

789

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

790

+if eval "test \"\${$3+set}\"" = set; then :

791

$as_echo_n "(cached) " >&6

792

else

793

eval "$3=no"

794

@@ -2404,7 +2417,7 @@

795

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

796

797

It was created by hal $as_me 0.5.14, which was

798

-generated by GNU Autoconf 2.64. Invocation command line was

799

+generated by GNU Autoconf 2.67. Invocation command line was

800

801

$ $0 $@

802

803

@@ -2514,11 +2527,9 @@

804

{

805

echo

806

807

- cat <<\_ASBOX

808

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

809

+ $as_echo "## ---------------- ##

810

## Cache variables. ##

811

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

812

-_ASBOX

813

+## ---------------- ##"

814

echo

815

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

816

(

817

@@ -2552,11 +2563,9 @@

818

)

819

echo

820

821

- cat <<\_ASBOX

822

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

823

+ $as_echo "## ----------------- ##

824

## Output variables. ##

825

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

826

-_ASBOX

827

+## ----------------- ##"

828

echo

829

for ac_var in $ac_subst_vars

830

do

831

@@ -2569,11 +2578,9 @@

832

echo

833

834

if test -n "$ac_subst_files"; then

835

- cat <<\_ASBOX

836

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

837

+ $as_echo "## ------------------- ##

838

## File substitutions. ##

839

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

840

-_ASBOX

841

+## ------------------- ##"

842

echo

843

for ac_var in $ac_subst_files

844

do

845

@@ -2587,11 +2594,9 @@

846

fi

847

848

if test -s confdefs.h; then

849

- cat <<\_ASBOX

850

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

851

+ $as_echo "## ----------- ##

852

## confdefs.h. ##

853

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

854

-_ASBOX

855

+## ----------- ##"

856

echo

857

cat confdefs.h

858

echo

859

@@ -2646,7 +2651,12 @@

860

ac_site_file1=NONE

861

ac_site_file2=NONE

862

if test -n "$CONFIG_SITE"; then

863

- ac_site_file1=$CONFIG_SITE

864

+ # We do not want a PATH search for config.site.

865

+ case $CONFIG_SITE in #((

866

+ -*) ac_site_file1=./$CONFIG_SITE;;

867

+ */*) ac_site_file1=$CONFIG_SITE;;

868

+ *) ac_site_file1=./$CONFIG_SITE;;

869

+ esac

870

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

871

ac_site_file1=$prefix/share/config.site

872

ac_site_file2=$prefix/etc/config.site

873

@@ -2657,18 +2667,22 @@

874

for ac_site_file in "$ac_site_file1" "$ac_site_file2"

875

do

876

test "x$ac_site_file" = xNONE && continue

877

- if test -r "$ac_site_file"; then

878

+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then

879

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

880

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

881

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

882

- . "$ac_site_file"

883

+ . "$ac_site_file" \

884

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

885

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

886

+as_fn_error $? "failed to load site script $ac_site_file

887

+See \`config.log' for more details" "$LINENO" 5 ; }

888

fi

889

done

890

891

if test -r "$cache_file"; then

892

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

893

- # files actually), so we avoid doing that.

894

- if test -f "$cache_file"; then

895

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

896

+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.

897

+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then

898

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

899

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

900

case $cache_file in

901

@@ -2737,7 +2751,7 @@

902

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

903

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

904

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

905

- as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5

906

+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5

907

fi

908

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

909

## Main body of script. ##

910

@@ -2754,16 +2768,22 @@

911

912

ac_aux_dir=

913

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

914

- for ac_t in install-sh install.sh shtool; do

915

- if test -f "$ac_dir/$ac_t"; then

916

- ac_aux_dir=$ac_dir

917

- ac_install_sh="$ac_aux_dir/$ac_t -c"

918

- break 2

919

- fi

920

- done

921

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

922

+ ac_aux_dir=$ac_dir

923

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

924

+ break

925

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

926

+ ac_aux_dir=$ac_dir

927

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

928

+ break

929

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

930

+ ac_aux_dir=$ac_dir

931

+ ac_install_sh="$ac_aux_dir/shtool install -c"

932

+ break

933

+ fi

934

done

935

if test -z "$ac_aux_dir"; then

936

- as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5

937

+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5

938

fi

939

940

# These three variables are undocumented and unsupported,

941

@@ -2879,11 +2899,11 @@

942

'

943

case `pwd` in

944

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

945

- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;

946

+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;

947

esac

948

case $srcdir in

949

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

950

- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;

951

+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;

952

esac

953

954

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

955

@@ -2905,7 +2925,7 @@

956

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

957

# broken ls alias from the environment. This has actually

958

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

959

- as_fn_error "ls -t appears to fail. Make sure there is not a broken

960

+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken

961

alias in your environment" "$LINENO" 5

962

fi

963

964

@@ -2915,7 +2935,7 @@

965

# Ok.

966

:

967

else

968

- as_fn_error "newly created file is older than distributed files!

969

+ as_fn_error $? "newly created file is older than distributed files!

970

Check your system clock" "$LINENO" 5

971

fi

972

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

973

@@ -3087,6 +3107,7 @@

974

975

fi

976

977

+ test -d ./--version && rmdir ./--version

978

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

979

MKDIR_P="$ac_cv_path_mkdir -p"

980

else

981

@@ -3094,7 +3115,6 @@

982

# value for MKDIR_P within a source directory, because that will

983

# break other packages using the cache if that directory is

984

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

985

- test -d ./--version && rmdir ./--version

986

MKDIR_P="$ac_install_sh -d"

987

fi

988

fi

989

@@ -3153,7 +3173,7 @@

990

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

991

set x ${MAKE-make}

992

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

993

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

994

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

995

$as_echo_n "(cached) " >&6

996

else

997

cat >conftest.make <<\_ACEOF

998

@@ -3161,7 +3181,7 @@

999

all:

1000

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

1001

_ACEOF

1002

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

1003

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

1004

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

1005

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

1006

eval ac_cv_prog_make_${ac_make}_set=yes;;

1007

@@ -3195,7 +3215,7 @@

1008

am__isrc=' -I$(srcdir)'

1009

# test to see if srcdir already configured

1010

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

1011

- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5

1012

+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5

1013

fi

1014

fi

1015

1016

@@ -3666,8 +3686,8 @@

1017

1018

test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

1019

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

1020

-as_fn_error "no acceptable C compiler found in \$PATH

1021

-See \`config.log' for more details." "$LINENO" 5; }

1022

+as_fn_error $? "no acceptable C compiler found in \$PATH

1023

+See \`config.log' for more details" "$LINENO" 5 ; }

1024

1025

# Provide some information about the compiler.

1026

$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

1027

@@ -3688,32 +3708,30 @@

1028

... rest of stderr output deleted ...

1029

10q' conftest.err >conftest.er1

1030

cat conftest.er1 >&5

1031

- rm -f conftest.er1 conftest.err

1032

fi

1033

+ rm -f conftest.er1 conftest.err

1034

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

1035

test $ac_status = 0; }

1036

done

1037

1038

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

1039

/* end confdefs.h. */

1040

-#include <stdio.h>

1041

+

1042

int

1043

main ()

1044

{

1045

-FILE *f = fopen ("conftest.out", "w");

1046

- return ferror (f) || fclose (f) != 0;

1047

1048

;

1049

return 0;

1050

}

1051

_ACEOF

1052

ac_clean_files_save=$ac_clean_files

1053

-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"

1054

+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"

1055

# Try to create an executable without -o first, disregard a.out.

1056

# It will help us diagnose broken compilers, and finding out an intuition

1057

# of exeext.

1058

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5

1059

-$as_echo_n "checking for C compiler default output file name... " >&6; }

1060

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5

1061

+$as_echo_n "checking whether the C compiler works... " >&6; }

1062

ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`

1063

1064

# The possible output files:

1065

@@ -3775,62 +3793,28 @@

1066

else

1067

ac_file=''

1068

fi

1069

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5

1070

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

1071

if test -z "$ac_file"; then :

1072

- $as_echo "$as_me: failed program was:" >&5

1073

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

1074

+$as_echo "no" >&6; }

1075

+$as_echo "$as_me: failed program was:" >&5

1076

sed 's/^/| /' conftest.$ac_ext >&5

1077

1078

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

1079

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

1080

-{ as_fn_set_status 77

1081

-as_fn_error "C compiler cannot create executables

1082

-See \`config.log' for more details." "$LINENO" 5; }; }

1083

+as_fn_error 77 "C compiler cannot create executables

1084

+See \`config.log' for more details" "$LINENO" 5 ; }

1085

+else

1086

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

1087

+$as_echo "yes" >&6; }

1088

fi

1089

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5

1090

+$as_echo_n "checking for C compiler default output file name... " >&6; }

1091

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5

1092

+$as_echo "$ac_file" >&6; }

1093

ac_exeext=$ac_cv_exeext

1094

1095

-# Check that the compiler produces executables we can run. If not, either

1096

-# the compiler is broken, or we cross compile.

1097

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5

1098

-$as_echo_n "checking whether the C compiler works... " >&6; }

1099

-# If not cross compiling, check that we can run a simple program.

1100

-if test "$cross_compiling" != yes; then

1101

- if { ac_try='./$ac_file'

1102

- { { case "(($ac_try" in

1103

- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

1104

- *) ac_try_echo=$ac_try;;

1105

-esac

1106

-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

1107

-$as_echo "$ac_try_echo"; } >&5

1108

- (eval "$ac_try") 2>&5

1109

- ac_status=$?

1110

- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

1111

- test $ac_status = 0; }; }; then

1112

- cross_compiling=no

1113

- else

1114

- if test "$cross_compiling" = maybe; then

1115

- cross_compiling=yes

1116

- else

1117

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

1118

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

1119

-as_fn_error "cannot run C compiled programs.

1120

-If you meant to cross compile, use \`--host'.

1121

-See \`config.log' for more details." "$LINENO" 5; }

1122

- fi

1123

- fi

1124

-fi

1125

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

1126

-$as_echo "yes" >&6; }

1127

-

1128

-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out

1129

+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out

1130

ac_clean_files=$ac_clean_files_save

1131

-# Check that the compiler produces executables we can run. If not, either

1132

-# the compiler is broken, or we cross compile.

1133

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5

1134

-$as_echo_n "checking whether we are cross compiling... " >&6; }

1135

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5

1136

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

1137

-

1138

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5

1139

$as_echo_n "checking for suffix of executables... " >&6; }

1140

if { { ac_try="$ac_link"

1141

@@ -3860,16 +3844,75 @@

1142

else

1143

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

1144

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

1145

-as_fn_error "cannot compute suffix of executables: cannot compile and link

1146

-See \`config.log' for more details." "$LINENO" 5; }

1147

+as_fn_error $? "cannot compute suffix of executables: cannot compile and link

1148

+See \`config.log' for more details" "$LINENO" 5 ; }

1149

fi

1150

-rm -f conftest$ac_cv_exeext

1151

+rm -f conftest conftest$ac_cv_exeext

1152

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5

1153

$as_echo "$ac_cv_exeext" >&6; }

1154

1155

rm -f conftest.$ac_ext

1156

EXEEXT=$ac_cv_exeext

1157

ac_exeext=$EXEEXT

1158

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

1159

+/* end confdefs.h. */

1160

+#include <stdio.h>

1161

+int

1162

+main ()

1163

+{

1164

+FILE *f = fopen ("conftest.out", "w");

1165

+ return ferror (f) || fclose (f) != 0;

1166

+

1167

+ ;

1168

+ return 0;

1169

+}

1170

+_ACEOF

1171

+ac_clean_files="$ac_clean_files conftest.out"

1172

+# Check that the compiler produces executables we can run. If not, either

1173

+# the compiler is broken, or we cross compile.

1174

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5

1175

+$as_echo_n "checking whether we are cross compiling... " >&6; }

1176

+if test "$cross_compiling" != yes; then

1177

+ { { ac_try="$ac_link"

1178

+case "(($ac_try" in

1179

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

1180

+ *) ac_try_echo=$ac_try;;

1181

+esac

1182

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

1183

+$as_echo "$ac_try_echo"; } >&5

1184

+ (eval "$ac_link") 2>&5

1185

+ ac_status=$?

1186

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

1187

+ test $ac_status = 0; }

1188

+ if { ac_try='./conftest$ac_cv_exeext'

1189

+ { { case "(($ac_try" in

1190

+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

1191

+ *) ac_try_echo=$ac_try;;

1192

+esac

1193

+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""

1194

+$as_echo "$ac_try_echo"; } >&5

1195

+ (eval "$ac_try") 2>&5

1196

+ ac_status=$?

1197

+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

1198

+ test $ac_status = 0; }; }; then

1199

+ cross_compiling=no

1200

+ else

1201

+ if test "$cross_compiling" = maybe; then

1202

+ cross_compiling=yes

1203

+ else

1204

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

1205

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

1206

+as_fn_error $? "cannot run C compiled programs.

1207

+If you meant to cross compile, use \`--host'.

1208

+See \`config.log' for more details" "$LINENO" 5 ; }

1209

+ fi

1210

+ fi

1211

+fi

1212

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5

1213

+$as_echo "$cross_compiling" >&6; }

1214

+

1215

+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out

1216

+ac_clean_files=$ac_clean_files_save

1217

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5

1218

$as_echo_n "checking for suffix of object files... " >&6; }

1219

if test "${ac_cv_objext+set}" = set; then :

1220

@@ -3912,8 +3955,8 @@

1221

1222

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

1223

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

1224

-as_fn_error "cannot compute suffix of object files: cannot compile

1225

-See \`config.log' for more details." "$LINENO" 5; }

1226

+as_fn_error $? "cannot compute suffix of object files: cannot compile

1227

+See \`config.log' for more details" "$LINENO" 5 ; }

1228

fi

1229

rm -f conftest.$ac_cv_objext conftest.$ac_ext

1230

fi

1231

@@ -4617,8 +4660,8 @@

1232

1233

test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

1234

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

1235

-as_fn_error "no acceptable C compiler found in \$PATH

1236

-See \`config.log' for more details." "$LINENO" 5; }

1237

+as_fn_error $? "no acceptable C compiler found in \$PATH

1238

+See \`config.log' for more details" "$LINENO" 5 ; }

1239

1240

# Provide some information about the compiler.

1241

$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5

1242

@@ -4639,8 +4682,8 @@

1243

... rest of stderr output deleted ...

1244

10q' conftest.err >conftest.er1

1245

cat conftest.er1 >&5

1246

- rm -f conftest.er1 conftest.err

1247

fi

1248

+ rm -f conftest.er1 conftest.err

1249

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

1250

test $ac_status = 0; }

1251

done

1252

@@ -5114,8 +5157,8 @@

1253

... rest of stderr output deleted ...

1254

10q' conftest.err >conftest.er1

1255

cat conftest.er1 >&5

1256

- rm -f conftest.er1 conftest.err

1257

fi

1258

+ rm -f conftest.er1 conftest.err

1259

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

1260

test $ac_status = 0; }

1261

done

1262

@@ -5377,7 +5420,7 @@

1263

fi

1264

set dummy $CC; ac_cc=`$as_echo "$2" |

1265

sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`

1266

-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :

1267

+if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :

1268

$as_echo_n "(cached) " >&6

1269

else

1270

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

1271

@@ -5536,7 +5579,7 @@

1272

# Broken: fails on valid input.

1273

continue

1274

fi

1275

-rm -f conftest.err conftest.$ac_ext

1276

+rm -f conftest.err conftest.i conftest.$ac_ext

1277

1278

# OK, works on sane cases. Now check whether nonexistent headers

1279

# can be detected and how.

1280

@@ -5552,11 +5595,11 @@

1281

ac_preproc_ok=:

1282

break

1283

fi

1284

-rm -f conftest.err conftest.$ac_ext

1285

+rm -f conftest.err conftest.i conftest.$ac_ext

1286

1287

done

1288

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

1289

-rm -f conftest.err conftest.$ac_ext

1290

+rm -f conftest.i conftest.err conftest.$ac_ext

1291

if $ac_preproc_ok; then :

1292

break

1293

fi

1294

@@ -5595,7 +5638,7 @@

1295

# Broken: fails on valid input.

1296

continue

1297

fi

1298

-rm -f conftest.err conftest.$ac_ext

1299

+rm -f conftest.err conftest.i conftest.$ac_ext

1300

1301

# OK, works on sane cases. Now check whether nonexistent headers

1302

# can be detected and how.

1303

@@ -5611,18 +5654,18 @@

1304

ac_preproc_ok=:

1305

break

1306

fi

1307

-rm -f conftest.err conftest.$ac_ext

1308

+rm -f conftest.err conftest.i conftest.$ac_ext

1309

1310

done

1311

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

1312

-rm -f conftest.err conftest.$ac_ext

1313

+rm -f conftest.i conftest.err conftest.$ac_ext

1314

if $ac_preproc_ok; then :

1315

1316

else

1317

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

1318

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

1319

-as_fn_error "C preprocessor \"$CPP\" fails sanity check

1320

-See \`config.log' for more details." "$LINENO" 5; }

1321

+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check

1322

+See \`config.log' for more details" "$LINENO" 5 ; }

1323

fi

1324

1325

ac_ext=c

1326

@@ -5683,7 +5726,7 @@

1327

done

1328

IFS=$as_save_IFS

1329

if test -z "$ac_cv_path_GREP"; then

1330

- as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

1331

+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

1332

fi

1333

else

1334

ac_cv_path_GREP=$GREP

1335

@@ -5749,7 +5792,7 @@

1336

done

1337

IFS=$as_save_IFS

1338

if test -z "$ac_cv_path_EGREP"; then

1339

- as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

1340

+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

1341

fi

1342

else

1343

ac_cv_path_EGREP=$EGREP

1344

@@ -5882,8 +5925,8 @@

1345

1346

1347

1348

-macro_version='2.2.6'

1349

-macro_revision='1.3012'

1350

+macro_version='2.2.6b'

1351

+macro_revision='1.3017'

1352

1353

1354

1355

@@ -5901,7 +5944,7 @@

1356

1357

# Make sure we can run config.sub.

1358

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

1359

- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5

1360

+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5

1361

1362

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5

1363

$as_echo_n "checking build system type... " >&6; }

1364

@@ -5912,16 +5955,16 @@

1365

test "x$ac_build_alias" = x &&

1366

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

1367

test "x$ac_build_alias" = x &&

1368

- as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5

1369

+ as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5

1370

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

1371

- as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5

1372

+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5

1373

1374

fi

1375

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5

1376

$as_echo "$ac_cv_build" >&6; }

1377

case $ac_cv_build in

1378

*-*-*) ;;

1379

-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;

1380

+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;

1381

esac

1382

build=$ac_cv_build

1383

ac_save_IFS=$IFS; IFS='-'

1384

@@ -5946,7 +5989,7 @@

1385

ac_cv_host=$ac_cv_build

1386

else

1387

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

1388

- as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5

1389

+ as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5

1390

fi

1391

1392

fi

1393

@@ -5954,7 +5997,7 @@

1394

$as_echo "$ac_cv_host" >&6; }

1395

case $ac_cv_host in

1396

*-*-*) ;;

1397

-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;

1398

+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;

1399

esac

1400

host=$ac_cv_host

1401

ac_save_IFS=$IFS; IFS='-'

1402

@@ -6027,7 +6070,7 @@

1403

done

1404

IFS=$as_save_IFS

1405

if test -z "$ac_cv_path_SED"; then

1406

- as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5

1407

+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5

1408

fi

1409

else

1410

ac_cv_path_SED=$SED

1411

@@ -6106,7 +6149,7 @@

1412

done

1413

IFS=$as_save_IFS

1414

if test -z "$ac_cv_path_FGREP"; then

1415

- as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

1416

+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

1417

fi

1418

else

1419

ac_cv_path_FGREP=$FGREP

1420

@@ -6222,7 +6265,7 @@

1421

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

1422

$as_echo "no" >&6; }

1423

fi

1424

-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5

1425

+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5

1426

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

1427

$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

1428

if test "${lt_cv_prog_gnu_ld+set}" = set; then :

1429

@@ -6424,13 +6467,13 @@

1430

else

1431

lt_cv_nm_interface="BSD nm"

1432

echo "int some_variable = 0;" > conftest.$ac_ext

1433

- (eval echo "\"\$as_me:6427: $ac_compile\"" >&5)

1434

+ (eval echo "\"\$as_me:6470: $ac_compile\"" >&5)

1435

(eval "$ac_compile" 2>conftest.err)

1436

cat conftest.err >&5

1437

- (eval echo "\"\$as_me:6430: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

1438

+ (eval echo "\"\$as_me:6473: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

1439

(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

1440

cat conftest.err >&5

1441

- (eval echo "\"\$as_me:6433: output\"" >&5)

1442

+ (eval echo "\"\$as_me:6476: output\"" >&5)

1443

cat conftest.out >&5

1444

if $GREP 'External.*some_variable' conftest.out > /dev/null; then

1445

lt_cv_nm_interface="MS dumpbin"

1446

@@ -6896,7 +6939,7 @@

1447

;;

1448

1449

# This must be Linux ELF.

1450

-linux* | k*bsd*-gnu)

1451

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

1452

lt_cv_deplibs_check_method=pass_all

1453

;;

1454

1455

@@ -7635,7 +7678,7 @@

1456

;;

1457

*-*-irix6*)

1458

# Find out which ABI we are using.

1459

- echo '#line 7638 "configure"' > conftest.$ac_ext

1460

+ echo '#line 7681 "configure"' > conftest.$ac_ext

1461

if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

1462

(eval $ac_compile) 2>&5

1463

ac_status=$?

1464

@@ -8389,8 +8432,7 @@

1465

as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

1466

ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default

1467

"

1468

-eval as_val=\$$as_ac_Header

1469

- if test "x$as_val" = x""yes; then :

1470

+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :

1471

cat >>confdefs.h <<_ACEOF

1472

#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

1473

_ACEOF

1474

@@ -8545,8 +8587,8 @@

1475

... rest of stderr output deleted ...

1476

10q' conftest.err >conftest.er1

1477

cat conftest.er1 >&5

1478

- rm -f conftest.er1 conftest.err

1479

fi

1480

+ rm -f conftest.er1 conftest.err

1481

$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

1482

test $ac_status = 0; }

1483

done

1484

@@ -8840,7 +8882,7 @@

1485

# Broken: fails on valid input.

1486

continue

1487

fi

1488

-rm -f conftest.err conftest.$ac_ext

1489

+rm -f conftest.err conftest.i conftest.$ac_ext

1490

1491

# OK, works on sane cases. Now check whether nonexistent headers

1492

# can be detected and how.

1493

@@ -8856,11 +8898,11 @@

1494

ac_preproc_ok=:

1495

break

1496

fi

1497

-rm -f conftest.err conftest.$ac_ext

1498

+rm -f conftest.err conftest.i conftest.$ac_ext

1499

1500

done

1501

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

1502

-rm -f conftest.err conftest.$ac_ext

1503

+rm -f conftest.i conftest.err conftest.$ac_ext

1504

if $ac_preproc_ok; then :

1505

break

1506

fi

1507

@@ -8899,7 +8941,7 @@

1508

# Broken: fails on valid input.

1509

continue

1510

fi

1511

-rm -f conftest.err conftest.$ac_ext

1512

+rm -f conftest.err conftest.i conftest.$ac_ext

1513

1514

# OK, works on sane cases. Now check whether nonexistent headers

1515

# can be detected and how.

1516

@@ -8915,11 +8957,11 @@

1517

ac_preproc_ok=:

1518

break

1519

fi

1520

-rm -f conftest.err conftest.$ac_ext

1521

+rm -f conftest.err conftest.i conftest.$ac_ext

1522

1523

done

1524

# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

1525

-rm -f conftest.err conftest.$ac_ext

1526

+rm -f conftest.i conftest.err conftest.$ac_ext

1527

if $ac_preproc_ok; then :

1528

1529

else

1530

@@ -9438,11 +9480,11 @@

1531

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

1532

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

1533

-e 's:$: $lt_compiler_flag:'`

1534

- (eval echo "\"\$as_me:9441: $lt_compile\"" >&5)

1535

+ (eval echo "\"\$as_me:9483: $lt_compile\"" >&5)

1536

(eval "$lt_compile" 2>conftest.err)

1537

ac_status=$?

1538

cat conftest.err >&5

1539

- echo "$as_me:9445: \$? = $ac_status" >&5

1540

+ echo "$as_me:9487: \$? = $ac_status" >&5

1541

if (exit $ac_status) && test -s "$ac_outfile"; then

1542

# The compiler can only warn and ignore the option if not recognized

1543

# So say no if there are warnings other than the usual output.

1544

@@ -9607,7 +9649,7 @@

1545

lt_prog_compiler_static='-non_shared'

1546

;;

1547

1548

- linux* | k*bsd*-gnu)

1549

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

1550

case $cc_basename in

1551

# old Intel for x86_64 which still supported -KPIC.

1552

ecc*)

1553

@@ -9777,11 +9819,11 @@

1554

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

1555

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

1556

-e 's:$: $lt_compiler_flag:'`

1557

- (eval echo "\"\$as_me:9780: $lt_compile\"" >&5)

1558

+ (eval echo "\"\$as_me:9822: $lt_compile\"" >&5)

1559

(eval "$lt_compile" 2>conftest.err)

1560

ac_status=$?

1561

cat conftest.err >&5

1562

- echo "$as_me:9784: \$? = $ac_status" >&5

1563

+ echo "$as_me:9826: \$? = $ac_status" >&5

1564

if (exit $ac_status) && test -s "$ac_outfile"; then

1565

# The compiler can only warn and ignore the option if not recognized

1566

# So say no if there are warnings other than the usual output.

1567

@@ -9882,11 +9924,11 @@

1568

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

1569

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

1570

-e 's:$: $lt_compiler_flag:'`

1571

- (eval echo "\"\$as_me:9885: $lt_compile\"" >&5)

1572

+ (eval echo "\"\$as_me:9927: $lt_compile\"" >&5)

1573

(eval "$lt_compile" 2>out/conftest.err)

1574

ac_status=$?

1575

cat out/conftest.err >&5

1576

- echo "$as_me:9889: \$? = $ac_status" >&5

1577

+ echo "$as_me:9931: \$? = $ac_status" >&5

1578

if (exit $ac_status) && test -s out/conftest2.$ac_objext

1579

then

1580

# The compiler can only warn and ignore the option if not recognized

1581

@@ -9937,11 +9979,11 @@

1582

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

1583

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

1584

-e 's:$: $lt_compiler_flag:'`

1585

- (eval echo "\"\$as_me:9940: $lt_compile\"" >&5)

1586

+ (eval echo "\"\$as_me:9982: $lt_compile\"" >&5)

1587

(eval "$lt_compile" 2>out/conftest.err)

1588

ac_status=$?

1589

cat out/conftest.err >&5

1590

- echo "$as_me:9944: \$? = $ac_status" >&5

1591

+ echo "$as_me:9986: \$? = $ac_status" >&5

1592

if (exit $ac_status) && test -s out/conftest2.$ac_objext

1593

then

1594

# The compiler can only warn and ignore the option if not recognized

1595

@@ -10080,6 +10122,7 @@

1596

fi

1597

supports_anon_versioning=no

1598

case `$LD -v 2>&1` in

1599

+ *GNU\ gold*) supports_anon_versioning=yes ;;

1600

*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11

1601

*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...

1602

*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...

1603

@@ -10171,7 +10214,7 @@

1604

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

1605

;;

1606

1607

- gnu* | linux* | tpf* | k*bsd*-gnu)

1608

+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)

1609

tmp_diet=no

1610

if test "$host_os" = linux-dietlibc; then

1611

case $cc_basename in

1612

@@ -11633,7 +11676,7 @@

1613

;;

1614

1615

# This must be Linux ELF.

1616

-linux* | k*bsd*-gnu)

1617

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

1618

version_type=linux

1619

need_lib_prefix=no

1620

need_version=no

1621

@@ -12320,7 +12363,7 @@

1622

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

1623

lt_status=$lt_dlunknown

1624

cat > conftest.$ac_ext <<_LT_EOF

1625

-#line 12323 "configure"

1626

+#line 12366 "configure"

1627

#include "confdefs.h"

1628

1629

#if HAVE_DLFCN_H

1630

@@ -12416,7 +12459,7 @@

1631

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

1632

lt_status=$lt_dlunknown

1633

cat > conftest.$ac_ext <<_LT_EOF

1634

-#line 12419 "configure"

1635

+#line 12462 "configure"

1636

#include "confdefs.h"

1637

1638

#if HAVE_DLFCN_H

1639

@@ -12831,7 +12874,7 @@

1640

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

1641

$as_echo "no" >&6; }

1642

fi

1643

-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5

1644

+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5

1645

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

1646

$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

1647

if test "${lt_cv_prog_gnu_ld+set}" = set; then :

1648

@@ -13356,7 +13399,7 @@

1649

inherit_rpath_CXX=yes

1650

;;

1651

1652

- linux* | k*bsd*-gnu)

1653

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

1654

case $cc_basename in

1655

KCC*)

1656

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

1657

@@ -14184,7 +14227,7 @@

1658

;;

1659

esac

1660

;;

1661

- linux* | k*bsd*-gnu)

1662

+ linux* | k*bsd*-gnu | kopensolaris*-gnu)

1663

case $cc_basename in

1664

KCC*)

1665

# KAI C++ Compiler

1666

@@ -14372,11 +14415,11 @@

1667

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

1668

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

1669

-e 's:$: $lt_compiler_flag:'`

1670

- (eval echo "\"\$as_me:14375: $lt_compile\"" >&5)

1671

+ (eval echo "\"\$as_me:14418: $lt_compile\"" >&5)

1672

(eval "$lt_compile" 2>conftest.err)

1673

ac_status=$?

1674

cat conftest.err >&5

1675

- echo "$as_me:14379: \$? = $ac_status" >&5

1676

+ echo "$as_me:14422: \$? = $ac_status" >&5

1677

if (exit $ac_status) && test -s "$ac_outfile"; then

1678

# The compiler can only warn and ignore the option if not recognized

1679

# So say no if there are warnings other than the usual output.

1680

@@ -14471,11 +14514,11 @@

1681

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

1682

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

1683

-e 's:$: $lt_compiler_flag:'`

1684

- (eval echo "\"\$as_me:14474: $lt_compile\"" >&5)

1685

+ (eval echo "\"\$as_me:14517: $lt_compile\"" >&5)

1686

(eval "$lt_compile" 2>out/conftest.err)

1687

ac_status=$?

1688

cat out/conftest.err >&5

1689

- echo "$as_me:14478: \$? = $ac_status" >&5

1690

+ echo "$as_me:14521: \$? = $ac_status" >&5

1691

if (exit $ac_status) && test -s out/conftest2.$ac_objext

1692

then

1693

# The compiler can only warn and ignore the option if not recognized

1694

@@ -14523,11 +14566,11 @@

1695

-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

1696

-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

1697

-e 's:$: $lt_compiler_flag:'`

1698

- (eval echo "\"\$as_me:14526: $lt_compile\"" >&5)

1699

+ (eval echo "\"\$as_me:14569: $lt_compile\"" >&5)

1700

(eval "$lt_compile" 2>out/conftest.err)

1701

ac_status=$?

1702

cat out/conftest.err >&5

1703

- echo "$as_me:14530: \$? = $ac_status" >&5

1704

+ echo "$as_me:14573: \$? = $ac_status" >&5

1705

if (exit $ac_status) && test -s out/conftest2.$ac_objext

1706

then

1707

# The compiler can only warn and ignore the option if not recognized

1708

@@ -15101,7 +15144,7 @@

1709

;;

1710

1711

# This must be Linux ELF.

1712

-linux* | k*bsd*-gnu)

1713

+linux* | k*bsd*-gnu | kopensolaris*-gnu)

1714

version_type=linux

1715

need_lib_prefix=no

1716

need_version=no

1717

@@ -15494,7 +15537,7 @@

1718

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

1719

set x ${MAKE-make}

1720

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

1721

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

1722

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

1723

$as_echo_n "(cached) " >&6

1724

else

1725

cat >conftest.make <<\_ACEOF

1726

@@ -15502,7 +15545,7 @@

1727

all:

1728

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

1729

_ACEOF

1730

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

1731

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

1732

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

1733

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

1734

eval ac_cv_prog_make_${ac_make}_set=yes;;

1735

@@ -15732,6 +15775,10 @@

1736

1737

1738

1739

+

1740

+

1741

+

1742

+

1743

if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then

1744

if test -n "$ac_tool_prefix"; then

1745

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

1746

@@ -15844,15 +15891,13 @@

1747

$as_echo "no" >&6; }

1748

PKG_CONFIG=""

1749

fi

1750

-

1751

fi

1752

1753

for ac_header in sys/ioccom.h sys/inotify.h

1754

do :

1755

as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

1756

ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

1757

-eval as_val=\$$as_ac_Header

1758

- if test "x$as_val" = x""yes; then :

1759

+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :

1760

cat >>confdefs.h <<_ACEOF

1761

#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

1762

_ACEOF

1763

@@ -15953,11 +15998,11 @@

1764

as_ac_File=`$as_echo "ac_cv_file_$dir/pci.ids" | $as_tr_sh`

1765

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir/pci.ids" >&5

1766

$as_echo_n "checking for $dir/pci.ids... " >&6; }

1767

-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :

1768

+if eval "test \"\${$as_ac_File+set}\"" = set; then :

1769

$as_echo_n "(cached) " >&6

1770

else

1771

test "$cross_compiling" = yes &&

1772

- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5

1773

+ as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5

1774

if test -r "$dir/pci.ids"; then

1775

eval "$as_ac_File=yes"

1776

else

1777

@@ -15967,14 +16012,13 @@

1778

eval ac_res=\$$as_ac_File

1779

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

1780

$as_echo "$ac_res" >&6; }

1781

-eval as_val=\$$as_ac_File

1782

- if test "x$as_val" = x""yes; then :

1783

+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :

1784

PCI_IDS_DIR=$dir

1785

fi

1786

1787

done

1788

if test -z "$PCI_IDS_DIR"; then

1789

- as_fn_error "cannot find pci.ids. Use --with-pci-ids to specify location" "$LINENO" 5

1790

+ as_fn_error $? "cannot find pci.ids. Use --with-pci-ids to specify location" "$LINENO" 5

1791

else

1792

{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: autodetected pci.ids in $PCI_IDS_DIR" >&5

1793

$as_echo "$as_me: WARNING: autodetected pci.ids in $PCI_IDS_DIR" >&2;}

1794

@@ -15994,11 +16038,11 @@

1795

as_ac_File=`$as_echo "ac_cv_file_$dir/usb.ids" | $as_tr_sh`

1796

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dir/usb.ids" >&5

1797

$as_echo_n "checking for $dir/usb.ids... " >&6; }

1798

-if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :

1799

+if eval "test \"\${$as_ac_File+set}\"" = set; then :

1800

$as_echo_n "(cached) " >&6

1801

else

1802

test "$cross_compiling" = yes &&

1803

- as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5

1804

+ as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5

1805

if test -r "$dir/usb.ids"; then

1806

eval "$as_ac_File=yes"

1807

else

1808

@@ -16008,14 +16052,13 @@

1809

eval ac_res=\$$as_ac_File

1810

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

1811

$as_echo "$ac_res" >&6; }

1812

-eval as_val=\$$as_ac_File

1813

- if test "x$as_val" = x""yes; then :

1814

+if eval test \"x\$"$as_ac_File"\" = x"yes"; then :

1815

USB_IDS_DIR=$dir

1816

fi

1817

1818

done

1819

if test -z "$USB_IDS_DIR"; then

1820

- as_fn_error "cannot find usb.ids. Use --with-usb-ids to specify location" "$LINENO" 5

1821

+ as_fn_error $? "cannot find usb.ids. Use --with-usb-ids to specify location" "$LINENO" 5

1822

else

1823

{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: autodetected usb.ids in $USB_IDS_DIR" >&5

1824

$as_echo "$as_me: WARNING: autodetected usb.ids in $USB_IDS_DIR" >&2;}

1825

@@ -16394,7 +16437,7 @@

1826

LIBS="-luuid $LIBS"

1827

1828

else

1829

- as_fn_error "*** uuid library (libuuid) not found" "$LINENO" 5

1830

+ as_fn_error $? "*** uuid library (libuuid) not found" "$LINENO" 5

1831

fi

1832

1833

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5

1834

@@ -16441,7 +16484,7 @@

1835

LIBS="-ldl $LIBS"

1836

1837

else

1838

- as_fn_error "*** dl library (libdl) not found" "$LINENO" 5

1839

+ as_fn_error $? "*** dl library (libdl) not found" "$LINENO" 5

1840

fi

1841

1842

1843

@@ -16452,8 +16495,8 @@

1844

if test "$cross_compiling" = yes; then :

1845

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

1846

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

1847

-as_fn_error "cannot run test program while cross compiling

1848

-See \`config.log' for more details." "$LINENO" 5; }

1849

+as_fn_error $? "cannot run test program while cross compiling

1850

+See \`config.log' for more details" "$LINENO" 5 ; }

1851

else

1852

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

1853

/* end confdefs.h. */

1854

@@ -16481,7 +16524,7 @@

1855

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

1856

$as_echo "" >&6; }

1857

else

1858

- as_fn_error "*** Requires libparted == 1.7.1 or >= 1.8.0" "$LINENO" 5

1859

+ as_fn_error $? "*** Requires libparted == 1.7.1 or >= 1.8.0" "$LINENO" 5

1860

fi

1861

rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

1862

conftest.$ac_objext conftest.beam conftest.$ac_ext

1863

@@ -16496,11 +16539,10 @@

1864

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PARTED" >&5

1865

$as_echo_n "checking for PARTED... " >&6; }

1866

1867

-if test -n "$PKG_CONFIG"; then

1868

- if test -n "$PARTED_CFLAGS"; then

1869

- pkg_cv_PARTED_CFLAGS="$PARTED_CFLAGS"

1870

- else

1871

- if test -n "$PKG_CONFIG" && \

1872

+if test -n "$PARTED_CFLAGS"; then

1873

+ pkg_cv_PARTED_CFLAGS="$PARTED_CFLAGS"

1874

+ elif test -n "$PKG_CONFIG"; then

1875

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

1876

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libparted\""; } >&5

1877

($PKG_CONFIG --exists --print-errors "libparted") 2>&5

1878

ac_status=$?

1879

@@ -16510,15 +16552,13 @@

1880

else

1881

pkg_failed=yes

1882

fi

1883

- fi

1884

-else

1885

- pkg_failed=untried

1886

+ else

1887

+ pkg_failed=untried

1888

fi

1889

-if test -n "$PKG_CONFIG"; then

1890

- if test -n "$PARTED_LIBS"; then

1891

- pkg_cv_PARTED_LIBS="$PARTED_LIBS"

1892

- else

1893

- if test -n "$PKG_CONFIG" && \

1894

+if test -n "$PARTED_LIBS"; then

1895

+ pkg_cv_PARTED_LIBS="$PARTED_LIBS"

1896

+ elif test -n "$PKG_CONFIG"; then

1897

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

1898

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libparted\""; } >&5

1899

($PKG_CONFIG --exists --print-errors "libparted") 2>&5

1900

ac_status=$?

1901

@@ -16528,14 +16568,15 @@

1902

else

1903

pkg_failed=yes

1904

fi

1905

- fi

1906

-else

1907

- pkg_failed=untried

1908

+ else

1909

+ pkg_failed=untried

1910

fi

1911

1912

1913

1914

if test $pkg_failed = yes; then

1915

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

1916

+$as_echo "no" >&6; }

1917

1918

if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

1919

_pkg_short_errors_supported=yes

1920

@@ -16543,14 +16584,14 @@

1921

_pkg_short_errors_supported=no

1922

fi

1923

if test $_pkg_short_errors_supported = yes; then

1924

- PARTED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libparted"`

1925

+ PARTED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libparted" 2>&1`

1926

else

1927

- PARTED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libparted"`

1928

+ PARTED_PKG_ERRORS=`$PKG_CONFIG --print-errors "libparted" 2>&1`

1929

fi

1930

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

1931

echo "$PARTED_PKG_ERRORS" >&5

1932

1933

- as_fn_error "Package requirements (libparted) were not met:

1934

+ as_fn_error $? "Package requirements (libparted) were not met:

1935

1936

$PARTED_PKG_ERRORS

1937

1938

@@ -16559,12 +16600,13 @@

1939

1940

Alternatively, you may set the environment variables PARTED_CFLAGS

1941

and PARTED_LIBS to avoid the need to call pkg-config.

1942

-See the pkg-config man page for more details.

1943

-" "$LINENO" 5

1944

+See the pkg-config man page for more details." "$LINENO" 5

1945

elif test $pkg_failed = untried; then

1946

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

1947

+$as_echo "no" >&6; }

1948

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

1949

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

1950

-as_fn_error "The pkg-config script could not be found or is too old. Make sure it

1951

+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it

1952

is in your PATH or set the PKG_CONFIG environment variable to the full

1953

path to pkg-config.

1954

1955

@@ -16573,13 +16615,13 @@

1956

See the pkg-config man page for more details.

1957

1958

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

1959

-See \`config.log' for more details." "$LINENO" 5; }

1960

+See \`config.log' for more details" "$LINENO" 5 ; }

1961

else

1962

PARTED_CFLAGS=$pkg_cv_PARTED_CFLAGS

1963

PARTED_LIBS=$pkg_cv_PARTED_LIBS

1964

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

1965

$as_echo "yes" >&6; }

1966

- :

1967

+

1968

fi

1969

fi

1970

1971

@@ -16677,7 +16719,7 @@

1972

fi

1973

else

1974

if test x$enable_gcov = xyes; then

1975

- as_fn_error "--enable-gcov can only be used with gcc" "$LINENO" 5

1976

+ as_fn_error $? "--enable-gcov can only be used with gcc" "$LINENO" 5

1977

fi

1978

fi

1979

1980

@@ -16710,7 +16752,7 @@

1981

$as_echo "#define HAVE_EXPAT_H 1" >>confdefs.h

1982

1983

else

1984

- as_fn_error "Can't find expat.h. Please install expat." "$LINENO" 5

1985

+ as_fn_error $? "Can't find expat.h. Please install expat." "$LINENO" 5

1986

fi

1987

1988

done

1989

@@ -16754,7 +16796,7 @@

1990

if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :

1991

EXPAT_LIB="-lexpat"

1992

else

1993

- as_fn_error "Can't find expat library. Please install expat." "$LINENO" 5

1994

+ as_fn_error $? "Can't find expat library. Please install expat." "$LINENO" 5

1995

fi

1996

1997

1998

@@ -16906,8 +16948,8 @@

1999

if test "$cross_compiling" = yes; then :

2000

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

2001

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

2002

-as_fn_error "cannot run test program while cross compiling

2003

-See \`config.log' for more details." "$LINENO" 5; }

2004

+as_fn_error $? "cannot run test program while cross compiling

2005

+See \`config.log' for more details" "$LINENO" 5 ; }

2006

else

2007

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2008

/* end confdefs.h. */

2009

@@ -16972,8 +17014,8 @@

2010

if test "$cross_compiling" = yes; then :

2011

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

2012

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

2013

-as_fn_error "cannot run test program while cross compiling

2014

-See \`config.log' for more details." "$LINENO" 5; }

2015

+as_fn_error $? "cannot run test program while cross compiling

2016

+See \`config.log' for more details" "$LINENO" 5 ; }

2017

else

2018

cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2019

/* end confdefs.h. */

2020

@@ -17094,9 +17136,27 @@

2021

fi

2022

2023

2024

-USE_LIBUSB20=no

2025

-USE_LIBUSB=no

2026

-LIBUSB20_LIBS=""

2027

+for ac_header in linux/videodev.h

2028

+do :

2029

+ ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"

2030

+if test "x$ac_cv_header_linux_videodev_h" = x""yes; then :

2031

+ cat >>confdefs.h <<_ACEOF

2032

+#define HAVE_LINUX_VIDEODEV_H 1

2033

+_ACEOF

2034

+ have_videodev_h=yes

2035

+fi

2036

+

2037

+done

2038

+

2039

+ if test "x$have_videodev_h" = "xyes"; then

2040

+ HAVE_V4L1_TRUE=

2041

+ HAVE_V4L1_FALSE='#'

2042

+else

2043

+ HAVE_V4L1_TRUE='#'

2044

+ HAVE_V4L1_FALSE=

2045

+fi

2046

+

2047

+

2048

2049

# Check whether --with-backend was given.

2050

if test "${with_backend+set}" = set; then :

2051

@@ -17155,6 +17215,124 @@

2052

2053

2054

if test "x$HALD_BACKEND" = "xfreebsd"; then

2055

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5

2056

+$as_echo_n "checking for library containing clock_gettime... " >&6; }

2057

+if test "${ac_cv_search_clock_gettime+set}" = set; then :

2058

+ $as_echo_n "(cached) " >&6

2059

+else

2060

+ ac_func_search_save_LIBS=$LIBS

2061

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2062

+/* end confdefs.h. */

2063

+

2064

+/* Override any GCC internal prototype to avoid an error.

2065

+ Use char because int might match the return type of a GCC

2066

+ builtin and then its argument prototype would still apply. */

2067

+#ifdef __cplusplus

2068

+extern "C"

2069

+#endif

2070

+char clock_gettime ();

2071

+int

2072

+main ()

2073

+{

2074

+return clock_gettime ();

2075

+ ;

2076

+ return 0;

2077

+}

2078

+_ACEOF

2079

+for ac_lib in '' rt; do

2080

+ if test -z "$ac_lib"; then

2081

+ ac_res="none required"

2082

+ else

2083

+ ac_res=-l$ac_lib

2084

+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"

2085

+ fi

2086

+ if ac_fn_c_try_link "$LINENO"; then :

2087

+ ac_cv_search_clock_gettime=$ac_res

2088

+fi

2089

+rm -f core conftest.err conftest.$ac_objext \

2090

+ conftest$ac_exeext

2091

+ if test "${ac_cv_search_clock_gettime+set}" = set; then :

2092

+ break

2093

+fi

2094

+done

2095

+if test "${ac_cv_search_clock_gettime+set}" = set; then :

2096

+

2097

+else

2098

+ ac_cv_search_clock_gettime=no

2099

+fi

2100

+rm conftest.$ac_ext

2101

+LIBS=$ac_func_search_save_LIBS

2102

+fi

2103

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5

2104

+$as_echo "$ac_cv_search_clock_gettime" >&6; }

2105

+ac_res=$ac_cv_search_clock_gettime

2106

+if test "$ac_res" != no; then :

2107

+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

2108

+

2109

+fi

2110

+

2111

+ LIBUFS_LIBS=""

2112

+ for ac_header in libufs.h

2113

+do :

2114

+ ac_fn_c_check_header_mongrel "$LINENO" "libufs.h" "ac_cv_header_libufs_h" "$ac_includes_default"

2115

+if test "x$ac_cv_header_libufs_h" = x""yes; then :

2116

+ cat >>confdefs.h <<_ACEOF

2117

+#define HAVE_LIBUFS_H 1

2118

+_ACEOF

2119

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ufs_disk_fillout in -llibufs" >&5

2120

+$as_echo_n "checking for ufs_disk_fillout in -llibufs... " >&6; }

2121

+if test "${ac_cv_lib_libufs_ufs_disk_fillout+set}" = set; then :

2122

+ $as_echo_n "(cached) " >&6

2123

+else

2124

+ ac_check_lib_save_LIBS=$LIBS

2125

+LIBS="-llibufs $LIBS"

2126

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

2127

+/* end confdefs.h. */

2128

+

2129

+/* Override any GCC internal prototype to avoid an error.

2130

+ Use char because int might match the return type of a GCC

2131

+ builtin and then its argument prototype would still apply. */

2132

+#ifdef __cplusplus

2133

+extern "C"

2134

+#endif

2135

+char ufs_disk_fillout ();

2136

+int

2137

+main ()

2138

+{

2139

+return ufs_disk_fillout ();

2140

+ ;

2141

+ return 0;

2142

+}

2143

+_ACEOF

2144

+if ac_fn_c_try_link "$LINENO"; then :

2145

+ ac_cv_lib_libufs_ufs_disk_fillout=yes

2146

+else

2147

+ ac_cv_lib_libufs_ufs_disk_fillout=no

2148

+fi

2149

+rm -f core conftest.err conftest.$ac_objext \

2150

+ conftest$ac_exeext conftest.$ac_ext

2151

+LIBS=$ac_check_lib_save_LIBS

2152

+fi

2153

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_libufs_ufs_disk_fillout" >&5

2154

+$as_echo "$ac_cv_lib_libufs_ufs_disk_fillout" >&6; }

2155

+if test "x$ac_cv_lib_libufs_ufs_disk_fillout" = x""yes; then :

2156

+ USE_LIBUFS="yes"

2157

+fi

2158

+

2159

+fi

2160

+

2161

+done

2162

+

2163

+ if test "x$USE_LIBUFS" = "xyes"; then

2164

+

2165

+$as_echo "#define HAVE_LIBUFS 1" >>confdefs.h

2166

+

2167

+ LIBUFS_LIBS="-lufs"

2168

+

2169

+ fi

2170

+ USE_BSDLIBUSB20=no

2171

+ USE_BSDLIBUSB=no

2172

+ LIBUSB20_LIBS=""

2173

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_info in -lusb20" >&5

2174

$as_echo_n "checking for libusb20_dev_get_info in -lusb20... " >&6; }

2175

if test "${ac_cv_lib_usb20_libusb20_dev_get_info+set}" = set; then :

2176

@@ -17192,14 +17370,13 @@

2177

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb20_libusb20_dev_get_info" >&5

2178

$as_echo "$ac_cv_lib_usb20_libusb20_dev_get_info" >&6; }

2179

if test "x$ac_cv_lib_usb20_libusb20_dev_get_info" = x""yes; then :

2180

- USE_LIBUSB20=yes

2181

+ USE_BSDLIBUSB20=yes

2182

else

2183

- USE_LIBUSB20=no

2184

+ USE_BSDLIBUSB20=no

2185

fi

2186

2187

-fi

2188

-if test "x$USE_LIBUSB20" = "xno"; then

2189

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_info in -lusb" >&5

2190

+ if test "x$USE_BSDLIBUSB20" = "xno"; then

2191

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_info in -lusb" >&5

2192

$as_echo_n "checking for libusb20_dev_get_info in -lusb... " >&6; }

2193

if test "${ac_cv_lib_usb_libusb20_dev_get_info+set}" = set; then :

2194

$as_echo_n "(cached) " >&6

2195

@@ -17236,21 +17413,13 @@

2196

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb_libusb20_dev_get_info" >&5

2197

$as_echo "$ac_cv_lib_usb_libusb20_dev_get_info" >&6; }

2198

if test "x$ac_cv_lib_usb_libusb20_dev_get_info" = x""yes; then :

2199

- USE_LIBUSB=yes

2200

+ USE_BSDLIBUSB=yes

2201

else

2202

- USE_LIBUSB=no

2203

+ USE_BSDLIBUSB=no

2204

fi

2205

2206

-fi

2207

- if test "x$USE_LIBUSB20" = "xyes"; then

2208

- HAVE_LIBUSB20_TRUE=

2209

- HAVE_LIBUSB20_FALSE='#'

2210

-else

2211

- HAVE_LIBUSB20_TRUE='#'

2212

- HAVE_LIBUSB20_FALSE=

2213

-fi

2214

-

2215

- if test "x$USE_LIBUSB" = "xyes"; then

2216

+ fi

2217

+ if test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"; then

2218

HAVE_LIBUSB20_TRUE=

2219

HAVE_LIBUSB20_FALSE='#'

2220

else

2221

@@ -17258,18 +17427,28 @@

2222

HAVE_LIBUSB20_FALSE=

2223

fi

2224

2225

-if test "x$USE_LIBUSB20" = "xyes"; then

2226

+ if test "x$USE_BSDLIBUSB20" = "xyes"; then

2227

2228

$as_echo "#define HAVE_LIBUSB20 1" >>confdefs.h

2229

2230

- LIBUSB20_LIBS="-lusb20"

2231

-elif test "x$USE_LIBUSB" = "xyes"; then

2232

+ LIBUSB20_LIBS="-lusb20"

2233

+ elif test "x$USE_BSDLIBUSB" = "xyes"; then

2234

2235

$as_echo "#define HAVE_LIBUSB20 1" >>confdefs.h

2236

2237

- LIBUSB20_LIBS="-lusb"

2238

+ LIBUSB20_LIBS="-lusb"

2239

+ fi

2240

+

2241

+else

2242

+ if false; then

2243

+ HAVE_LIBUSB20_TRUE=

2244

+ HAVE_LIBUSB20_FALSE='#'

2245

+else

2246

+ HAVE_LIBUSB20_TRUE='#'

2247

+ HAVE_LIBUSB20_FALSE=

2248

fi

2249

2250

+fi

2251

2252

2253

cat >>confdefs.h <<_ACEOF

2254

@@ -17443,18 +17622,17 @@

2255

msg_polkit=no

2256

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

2257

if test "x$enable_console_kit" = "xno"; then

2258

- as_fn_error "PolicyKit support requires building with ConsoleKit support too" "$LINENO" 5

2259

+ as_fn_error $? "PolicyKit support requires building with ConsoleKit support too" "$LINENO" 5

2260

fi

2261

2262

pkg_failed=no

2263

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POLKIT" >&5

2264

$as_echo_n "checking for POLKIT... " >&6; }

2265

2266

-if test -n "$PKG_CONFIG"; then

2267

- if test -n "$POLKIT_CFLAGS"; then

2268

- pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"

2269

- else

2270

- if test -n "$PKG_CONFIG" && \

2271

+if test -n "$POLKIT_CFLAGS"; then

2272

+ pkg_cv_POLKIT_CFLAGS="$POLKIT_CFLAGS"

2273

+ elif test -n "$PKG_CONFIG"; then

2274

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

2275

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$polkit_module\""; } >&5

2276

($PKG_CONFIG --exists --print-errors "$polkit_module") 2>&5

2277

ac_status=$?

2278

@@ -17464,15 +17642,13 @@

2279

else

2280

pkg_failed=yes

2281

fi

2282

- fi

2283

-else

2284

- pkg_failed=untried

2285

+ else

2286

+ pkg_failed=untried

2287

fi

2288

-if test -n "$PKG_CONFIG"; then

2289

- if test -n "$POLKIT_LIBS"; then

2290

- pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"

2291

- else

2292

- if test -n "$PKG_CONFIG" && \

2293

+if test -n "$POLKIT_LIBS"; then

2294

+ pkg_cv_POLKIT_LIBS="$POLKIT_LIBS"

2295

+ elif test -n "$PKG_CONFIG"; then

2296

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

2297

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$polkit_module\""; } >&5

2298

($PKG_CONFIG --exists --print-errors "$polkit_module") 2>&5

2299

ac_status=$?

2300

@@ -17482,14 +17658,15 @@

2301

else

2302

pkg_failed=yes

2303

fi

2304

- fi

2305

-else

2306

- pkg_failed=untried

2307

+ else

2308

+ pkg_failed=untried

2309

fi

2310

2311

2312

2313

if test $pkg_failed = yes; then

2314

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

2315

+$as_echo "no" >&6; }

2316

2317

if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

2318

_pkg_short_errors_supported=yes

2319

@@ -17497,16 +17674,14 @@

2320

_pkg_short_errors_supported=no

2321

fi

2322

if test $_pkg_short_errors_supported = yes; then

2323

- POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$polkit_module"`

2324

+ POLKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$polkit_module" 2>&1`

2325

else

2326

- POLKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$polkit_module"`

2327

+ POLKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "$polkit_module" 2>&1`

2328

fi

2329

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

2330

echo "$POLKIT_PKG_ERRORS" >&5

2331

2332

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

2333

-$as_echo "no" >&6; }

2334

- if false; then

2335

+ if false; then

2336

HAVE_POLKIT_TRUE=

2337

HAVE_POLKIT_FALSE='#'

2338

else

2339

@@ -17515,6 +17690,8 @@

2340

fi

2341

2342

elif test $pkg_failed = untried; then

2343

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

2344

+$as_echo "no" >&6; }

2345

if false; then

2346

HAVE_POLKIT_TRUE=

2347

HAVE_POLKIT_FALSE='#'

2348

@@ -17544,7 +17721,7 @@

2349

2350

2351

if test "x$msg_polkit" != "xyes"; then

2352

- as_fn_error "PolicyKit not explicitly disabled and no PolicyKit found" "$LINENO" 5

2353

+ as_fn_error $? "PolicyKit not explicitly disabled and no PolicyKit found" "$LINENO" 5

2354

fi

2355

2356

# Extract the first word of "polkit-policy-file-validate", so it can be a program name with args.

2357

@@ -17585,7 +17762,7 @@

2358

2359

2360

if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then

2361

- as_fn_error "polkit-policy-file-validate not found" "$LINENO" 5

2362

+ as_fn_error $? "polkit-policy-file-validate not found" "$LINENO" 5

2363

fi

2364

fi

2365

2366

@@ -17608,7 +17785,7 @@

2367

msg_aclmgmt=no

2368

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

2369

if test "x$enable_policy_kit" = "xno"; then

2370

- as_fn_error "ACL management support requires building with PolicyKit support" "$LINENO" 5

2371

+ as_fn_error $? "ACL management support requires building with PolicyKit support" "$LINENO" 5

2372

fi

2373

if true; then

2374

HAVE_ACLMGMT_TRUE=

2375

@@ -17758,11 +17935,10 @@

2376

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5

2377

$as_echo_n "checking for DBUS... " >&6; }

2378

2379

-if test -n "$PKG_CONFIG"; then

2380

- if test -n "$DBUS_CFLAGS"; then

2381

- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"

2382

- else

2383

- if test -n "$PKG_CONFIG" && \

2384

+if test -n "$DBUS_CFLAGS"; then

2385

+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"

2386

+ elif test -n "$PKG_CONFIG"; then

2387

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

2388

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$dbus_module\""; } >&5

2389

($PKG_CONFIG --exists --print-errors "$dbus_module") 2>&5

2390

ac_status=$?

2391

@@ -17772,15 +17948,13 @@

2392

else

2393

pkg_failed=yes

2394

fi

2395

- fi

2396

-else

2397

- pkg_failed=untried

2398

+ else

2399

+ pkg_failed=untried

2400

fi

2401

-if test -n "$PKG_CONFIG"; then

2402

- if test -n "$DBUS_LIBS"; then

2403

- pkg_cv_DBUS_LIBS="$DBUS_LIBS"

2404

- else

2405

- if test -n "$PKG_CONFIG" && \

2406

+if test -n "$DBUS_LIBS"; then

2407

+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"

2408

+ elif test -n "$PKG_CONFIG"; then

2409

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

2410

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$dbus_module\""; } >&5

2411

($PKG_CONFIG --exists --print-errors "$dbus_module") 2>&5

2412

ac_status=$?

2413

@@ -17790,14 +17964,15 @@

2414

else

2415

pkg_failed=yes

2416

fi

2417

- fi

2418

-else

2419

- pkg_failed=untried

2420

+ else

2421

+ pkg_failed=untried

2422

fi

2423

2424

2425

2426

if test $pkg_failed = yes; then

2427

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

2428

+$as_echo "no" >&6; }

2429

2430

if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

2431

_pkg_short_errors_supported=yes

2432

@@ -17805,14 +17980,14 @@

2433

_pkg_short_errors_supported=no

2434

fi

2435

if test $_pkg_short_errors_supported = yes; then

2436

- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$dbus_module"`

2437

+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$dbus_module" 2>&1`

2438

else

2439

- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$dbus_module"`

2440

+ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$dbus_module" 2>&1`

2441

fi

2442

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

2443

echo "$DBUS_PKG_ERRORS" >&5

2444

2445

- as_fn_error "Package requirements ($dbus_module) were not met:

2446

+ as_fn_error $? "Package requirements ($dbus_module) were not met:

2447

2448

$DBUS_PKG_ERRORS

2449

2450

@@ -17821,12 +17996,13 @@

2451

2452

Alternatively, you may set the environment variables DBUS_CFLAGS

2453

and DBUS_LIBS to avoid the need to call pkg-config.

2454

-See the pkg-config man page for more details.

2455

-" "$LINENO" 5

2456

+See the pkg-config man page for more details." "$LINENO" 5

2457

elif test $pkg_failed = untried; then

2458

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

2459

+$as_echo "no" >&6; }

2460

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

2461

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

2462

-as_fn_error "The pkg-config script could not be found or is too old. Make sure it

2463

+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it

2464

is in your PATH or set the PKG_CONFIG environment variable to the full

2465

path to pkg-config.

2466

2467

@@ -17835,13 +18011,13 @@

2468

See the pkg-config man page for more details.

2469

2470

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

2471

-See \`config.log' for more details." "$LINENO" 5; }

2472

+See \`config.log' for more details" "$LINENO" 5 ; }

2473

else

2474

DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS

2475

DBUS_LIBS=$pkg_cv_DBUS_LIBS

2476

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

2477

$as_echo "yes" >&6; }

2478

- :

2479

+

2480

fi

2481

2482

2483

@@ -17852,11 +18028,10 @@

2484

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5

2485

$as_echo_n "checking for GLIB... " >&6; }

2486

2487

-if test -n "$PKG_CONFIG"; then

2488

- if test -n "$GLIB_CFLAGS"; then

2489

- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"

2490

- else

2491

- if test -n "$PKG_CONFIG" && \

2492

+if test -n "$GLIB_CFLAGS"; then

2493

+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"

2494

+ elif test -n "$PKG_CONFIG"; then

2495

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

2496

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$glib_module\""; } >&5

2497

($PKG_CONFIG --exists --print-errors "$glib_module") 2>&5

2498

ac_status=$?

2499

@@ -17866,15 +18041,13 @@

2500

else

2501

pkg_failed=yes

2502

fi

2503

- fi

2504

-else

2505

- pkg_failed=untried

2506

+ else

2507

+ pkg_failed=untried

2508

fi

2509

-if test -n "$PKG_CONFIG"; then

2510

- if test -n "$GLIB_LIBS"; then

2511

- pkg_cv_GLIB_LIBS="$GLIB_LIBS"

2512

- else

2513

- if test -n "$PKG_CONFIG" && \

2514

+if test -n "$GLIB_LIBS"; then

2515

+ pkg_cv_GLIB_LIBS="$GLIB_LIBS"

2516

+ elif test -n "$PKG_CONFIG"; then

2517

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

2518

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$glib_module\""; } >&5

2519

($PKG_CONFIG --exists --print-errors "$glib_module") 2>&5

2520

ac_status=$?

2521

@@ -17884,14 +18057,15 @@

2522

else

2523

pkg_failed=yes

2524

fi

2525

- fi

2526

-else

2527

- pkg_failed=untried

2528

+ else

2529

+ pkg_failed=untried

2530

fi

2531

2532

2533

2534

if test $pkg_failed = yes; then

2535

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

2536

+$as_echo "no" >&6; }

2537

2538

if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

2539

_pkg_short_errors_supported=yes

2540

@@ -17899,14 +18073,14 @@

2541

_pkg_short_errors_supported=no

2542

fi

2543

if test $_pkg_short_errors_supported = yes; then

2544

- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$glib_module"`

2545

+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$glib_module" 2>&1`

2546

else

2547

- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$glib_module"`

2548

+ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "$glib_module" 2>&1`

2549

fi

2550

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

2551

echo "$GLIB_PKG_ERRORS" >&5

2552

2553

- as_fn_error "Package requirements ($glib_module) were not met:

2554

+ as_fn_error $? "Package requirements ($glib_module) were not met:

2555

2556

$GLIB_PKG_ERRORS

2557

2558

@@ -17915,12 +18089,13 @@

2559

2560

Alternatively, you may set the environment variables GLIB_CFLAGS

2561

and GLIB_LIBS to avoid the need to call pkg-config.

2562

-See the pkg-config man page for more details.

2563

-" "$LINENO" 5

2564

+See the pkg-config man page for more details." "$LINENO" 5

2565

elif test $pkg_failed = untried; then

2566

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

2567

+$as_echo "no" >&6; }

2568

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

2569

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

2570

-as_fn_error "The pkg-config script could not be found or is too old. Make sure it

2571

+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it

2572

is in your PATH or set the PKG_CONFIG environment variable to the full

2573

path to pkg-config.

2574

2575

@@ -17929,13 +18104,13 @@

2576

See the pkg-config man page for more details.

2577

2578

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

2579

-See \`config.log' for more details." "$LINENO" 5; }

2580

+See \`config.log' for more details" "$LINENO" 5 ; }

2581

else

2582

GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS

2583

GLIB_LIBS=$pkg_cv_GLIB_LIBS

2584

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

2585

$as_echo "yes" >&6; }

2586

- :

2587

+

2588

fi

2589

2590

2591

@@ -17960,11 +18135,10 @@

2592

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VOLUME_ID" >&5

2593

$as_echo_n "checking for VOLUME_ID... " >&6; }

2594

2595

-if test -n "$PKG_CONFIG"; then

2596

- if test -n "$VOLUME_ID_CFLAGS"; then

2597

- pkg_cv_VOLUME_ID_CFLAGS="$VOLUME_ID_CFLAGS"

2598

- else

2599

- if test -n "$PKG_CONFIG" && \

2600

+if test -n "$VOLUME_ID_CFLAGS"; then

2601

+ pkg_cv_VOLUME_ID_CFLAGS="$VOLUME_ID_CFLAGS"

2602

+ elif test -n "$PKG_CONFIG"; then

2603

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

2604

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\""; } >&5

2605

($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5

2606

ac_status=$?

2607

@@ -17974,15 +18148,13 @@

2608

else

2609

pkg_failed=yes

2610

fi

2611

- fi

2612

-else

2613

- pkg_failed=untried

2614

+ else

2615

+ pkg_failed=untried

2616

fi

2617

-if test -n "$PKG_CONFIG"; then

2618

- if test -n "$VOLUME_ID_LIBS"; then

2619

- pkg_cv_VOLUME_ID_LIBS="$VOLUME_ID_LIBS"

2620

- else

2621

- if test -n "$PKG_CONFIG" && \

2622

+if test -n "$VOLUME_ID_LIBS"; then

2623

+ pkg_cv_VOLUME_ID_LIBS="$VOLUME_ID_LIBS"

2624

+ elif test -n "$PKG_CONFIG"; then

2625

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

2626

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$volume_id_module\""; } >&5

2627

($PKG_CONFIG --exists --print-errors "$volume_id_module") 2>&5

2628

ac_status=$?

2629

@@ -17992,14 +18164,15 @@

2630

else

2631

pkg_failed=yes

2632

fi

2633

- fi

2634

-else

2635

- pkg_failed=untried

2636

+ else

2637

+ pkg_failed=untried

2638

fi

2639

2640

2641

2642

if test $pkg_failed = yes; then

2643

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

2644

+$as_echo "no" >&6; }

2645

2646

if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

2647

_pkg_short_errors_supported=yes

2648

@@ -18007,14 +18180,14 @@

2649

_pkg_short_errors_supported=no

2650

fi

2651

if test $_pkg_short_errors_supported = yes; then

2652

- VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$volume_id_module"`

2653

+ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$volume_id_module" 2>&1`

2654

else

2655

- VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$volume_id_module"`

2656

+ VOLUME_ID_PKG_ERRORS=`$PKG_CONFIG --print-errors "$volume_id_module" 2>&1`

2657

fi

2658

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

2659

echo "$VOLUME_ID_PKG_ERRORS" >&5

2660

2661

- as_fn_error "Package requirements ($volume_id_module) were not met:

2662

+ as_fn_error $? "Package requirements ($volume_id_module) were not met:

2663

2664

$VOLUME_ID_PKG_ERRORS

2665

2666

@@ -18023,12 +18196,13 @@

2667

2668

Alternatively, you may set the environment variables VOLUME_ID_CFLAGS

2669

and VOLUME_ID_LIBS to avoid the need to call pkg-config.

2670

-See the pkg-config man page for more details.

2671

-" "$LINENO" 5

2672

+See the pkg-config man page for more details." "$LINENO" 5

2673

elif test $pkg_failed = untried; then

2674

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

2675

+$as_echo "no" >&6; }

2676

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

2677

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

2678

-as_fn_error "The pkg-config script could not be found or is too old. Make sure it

2679

+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it

2680

is in your PATH or set the PKG_CONFIG environment variable to the full

2681

path to pkg-config.

2682

2683

@@ -18037,13 +18211,13 @@

2684

See the pkg-config man page for more details.

2685

2686

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

2687

-See \`config.log' for more details." "$LINENO" 5; }

2688

+See \`config.log' for more details" "$LINENO" 5 ; }

2689

else

2690

VOLUME_ID_CFLAGS=$pkg_cv_VOLUME_ID_CFLAGS

2691

VOLUME_ID_LIBS=$pkg_cv_VOLUME_ID_LIBS

2692

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

2693

$as_echo "yes" >&6; }

2694

- :

2695

+

2696

fi

2697

2698

2699

@@ -18064,11 +18238,10 @@

2700

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLKID" >&5

2701

$as_echo_n "checking for BLKID... " >&6; }

2702

2703

-if test -n "$PKG_CONFIG"; then

2704

- if test -n "$BLKID_CFLAGS"; then

2705

- pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"

2706

- else

2707

- if test -n "$PKG_CONFIG" && \

2708

+if test -n "$BLKID_CFLAGS"; then

2709

+ pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"

2710

+ elif test -n "$PKG_CONFIG"; then

2711

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

2712

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$blkid_module\""; } >&5

2713

($PKG_CONFIG --exists --print-errors "$blkid_module") 2>&5

2714

ac_status=$?

2715

@@ -18078,15 +18251,13 @@

2716

else

2717

pkg_failed=yes

2718

fi

2719

- fi

2720

-else

2721

- pkg_failed=untried

2722

+ else

2723

+ pkg_failed=untried

2724

fi

2725

-if test -n "$PKG_CONFIG"; then

2726

- if test -n "$BLKID_LIBS"; then

2727

- pkg_cv_BLKID_LIBS="$BLKID_LIBS"

2728

- else

2729

- if test -n "$PKG_CONFIG" && \

2730

+if test -n "$BLKID_LIBS"; then

2731

+ pkg_cv_BLKID_LIBS="$BLKID_LIBS"

2732

+ elif test -n "$PKG_CONFIG"; then

2733

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

2734

{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$blkid_module\""; } >&5

2735

($PKG_CONFIG --exists --print-errors "$blkid_module") 2>&5

2736

ac_status=$?

2737

@@ -18096,14 +18267,15 @@

2738

else

2739

pkg_failed=yes

2740

fi

2741

- fi

2742

-else

2743

- pkg_failed=untried

2744

+ else

2745

+ pkg_failed=untried

2746

fi

2747

2748

2749

2750

if test $pkg_failed = yes; then

2751

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

2752

+$as_echo "no" >&6; }

2753

2754

if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

2755

_pkg_short_errors_supported=yes

2756

@@ -18111,14 +18283,14 @@

2757

_pkg_short_errors_supported=no

2758

fi

2759

if test $_pkg_short_errors_supported = yes; then

2760

- BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$blkid_module"`

2761

+ BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$blkid_module" 2>&1`

2762

else

2763

- BLKID_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$blkid_module"`

2764

+ BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors "$blkid_module" 2>&1`

2765

fi

2766

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

2767

echo "$BLKID_PKG_ERRORS" >&5

2768

2769

- as_fn_error "Package requirements ($blkid_module) were not met:

2770

+ as_fn_error $? "Package requirements ($blkid_module) were not met:

2771

2772

$BLKID_PKG_ERRORS

2773

2774

@@ -18127,12 +18299,13 @@

2775

2776

Alternatively, you may set the environment variables BLKID_CFLAGS

2777

and BLKID_LIBS to avoid the need to call pkg-config.

2778

-See the pkg-config man page for more details.

2779

-" "$LINENO" 5

2780

+See the pkg-config man page for more details." "$LINENO" 5

2781

elif test $pkg_failed = untried; then

2782

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

2783

+$as_echo "no" >&6; }

2784

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

2785

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

2786

-as_fn_error "The pkg-config script could not be found or is too old. Make sure it

2787

+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it

2788

is in your PATH or set the PKG_CONFIG environment variable to the full

2789

path to pkg-config.

2790

2791

@@ -18141,13 +18314,13 @@

2792

See the pkg-config man page for more details.

2793

2794

To get pkg-config, see <http://pkg-config.freedesktop.org/>.

2795

-See \`config.log' for more details." "$LINENO" 5; }

2796

+See \`config.log' for more details" "$LINENO" 5 ; }

2797

else

2798

BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS

2799

BLKID_LIBS=$pkg_cv_BLKID_LIBS

2800

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

2801

$as_echo "yes" >&6; }

2802

- :

2803

+

2804

fi

2805

2806

2807

@@ -18193,7 +18366,7 @@

2808

if test x$have_size64 = xno; then

2809

case "$host" in

2810

*-*-linux*)

2811

- as_fn_error "BLKGETSIZE64 is not defined" "$LINENO" 5

2812

+ as_fn_error $? "BLKGETSIZE64 is not defined" "$LINENO" 5

2813

;;

2814

*)

2815

;;

2816

@@ -18355,10 +18528,10 @@

2817

2818

if test x$enable_docbook_docs = xyes; then

2819

if test x$have_xmlto = xno; then

2820

- as_fn_error "Building DocBook docs explicitly required, but xmlto not found" "$LINENO" 5

2821

+ as_fn_error $? "Building DocBook docs explicitly required, but xmlto not found" "$LINENO" 5

2822

fi

2823

if test x$ve_xmllint = xno; then

2824

- as_fn_error "Building DocBook docs explicitly required, but xmllint not found" "$LINENO" 5

2825

+ as_fn_error $? "Building DocBook docs explicitly required, but xmllint not found" "$LINENO" 5

2826

fi

2827

fi

2828

2829

@@ -18671,7 +18844,7 @@

2830

enableval=$enable_sonypic; case "${enableval}" in

2831

yes) ENABLE_SONYPIC=yes ;;

2832

no) ENABLE_SONYPIC=no ;;

2833

- *) as_fn_error "bad value ${enableval} for --enable-sonypic" "$LINENO" 5 ;;

2834

+ *) as_fn_error $? "bad value ${enableval} for --enable-sonypic" "$LINENO" 5 ;;

2835

esac

2836

2837

else

2838

@@ -18699,7 +18872,7 @@

2839

$as_echo "$have_sonypic" >&6; }

2840

2841

if test "x$ENABLE_SONYPIC" = "xyes" && test "x$have_sonypic" != "xyes" ; then

2842

- as_fn_error "Sony PIC support explicitly requested but no support found" "$LINENO" 5

2843

+ as_fn_error $? "Sony PIC support explicitly requested but no support found" "$LINENO" 5

2844

fi

2845

fi

2846

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

2847

@@ -18825,6 +18998,7 @@

2848

2849

ac_libobjs=

2850

ac_ltlibobjs=

2851

+U=

2852

for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue

2853

# 1. Remove the extension, and $U if already installed.

2854

ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'

2855

@@ -18848,219 +19022,223 @@

2856

fi

2857

2858

if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then

2859

- as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.

2860

+ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.

2861

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2862

fi

2863

if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then

2864

- as_fn_error "conditional \"AMDEP\" was never defined.

2865

+ as_fn_error $? "conditional \"AMDEP\" was never defined.

2866

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2867

fi

2868

if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then

2869

- as_fn_error "conditional \"am__fastdepCC\" was never defined.

2870

+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.

2871

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2872

fi

2873

if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then

2874

- as_fn_error "conditional \"am__fastdepCC\" was never defined.

2875

+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.

2876

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2877

fi

2878

if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then

2879

- as_fn_error "conditional \"am__fastdepCXX\" was never defined.

2880

+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.

2881

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2882

fi

2883

if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then

2884

- as_fn_error "conditional \"am__fastdepCXX\" was never defined.

2885

+ as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.

2886

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2887

fi

2888

if test -z "${MAN_PAGES_ENABLED_TRUE}" && test -z "${MAN_PAGES_ENABLED_FALSE}"; then

2889

- as_fn_error "conditional \"MAN_PAGES_ENABLED\" was never defined.

2890

+ as_fn_error $? "conditional \"MAN_PAGES_ENABLED\" was never defined.

2891

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2892

fi

2893

if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then

2894

- as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.

2895

+ as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.

2896

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2897

fi

2898

if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then

2899

- as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.

2900

+ as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.

2901

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2902

fi

2903

if test -z "${ACPI_ACPID_TRUE}" && test -z "${ACPI_ACPID_FALSE}"; then

2904

- as_fn_error "conditional \"ACPI_ACPID\" was never defined.

2905

+ as_fn_error $? "conditional \"ACPI_ACPID\" was never defined.

2906

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2907

fi

2908

if test -z "${ACPI_PROC_TRUE}" && test -z "${ACPI_PROC_FALSE}"; then

2909

- as_fn_error "conditional \"ACPI_PROC\" was never defined.

2910

+ as_fn_error $? "conditional \"ACPI_PROC\" was never defined.

2911

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2912

fi

2913

if test -z "${BUILD_ACPI_IBM_TRUE}" && test -z "${BUILD_ACPI_IBM_FALSE}"; then

2914

- as_fn_error "conditional \"BUILD_ACPI_IBM\" was never defined.

2915

+ as_fn_error $? "conditional \"BUILD_ACPI_IBM\" was never defined.

2916

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2917

fi

2918

if test -z "${BUILD_ACPI_TOSHIBA_TRUE}" && test -z "${BUILD_ACPI_TOSHIBA_FALSE}"; then

2919

- as_fn_error "conditional \"BUILD_ACPI_TOSHIBA\" was never defined.

2920

+ as_fn_error $? "conditional \"BUILD_ACPI_TOSHIBA\" was never defined.

2921

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2922

fi

2923

if test -z "${USE_PARTED_TRUE}" && test -z "${USE_PARTED_FALSE}"; then

2924

- as_fn_error "conditional \"USE_PARTED\" was never defined.

2925

+ as_fn_error $? "conditional \"USE_PARTED\" was never defined.

2926

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2927

fi

2928

if test -z "${GCOV_TRUE}" && test -z "${GCOV_FALSE}"; then

2929

- as_fn_error "conditional \"GCOV\" was never defined.

2930

+ as_fn_error $? "conditional \"GCOV\" was never defined.

2931

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2932

fi

2933

if test -z "${HAVE_LIBUSB_TRUE}" && test -z "${HAVE_LIBUSB_FALSE}"; then

2934

- as_fn_error "conditional \"HAVE_LIBUSB\" was never defined.

2935

+ as_fn_error $? "conditional \"HAVE_LIBUSB\" was never defined.

2936

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2937

fi

2938

if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then

2939

- as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.

2940

+ as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.

2941

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2942

fi

2943

if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then

2944

- as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.

2945

+ as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.

2946

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2947

fi

2948

if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then

2949

- as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.

2950

+ as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.

2951

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2952

fi

2953

if test -z "${HAVE_SMBIOS_TRUE}" && test -z "${HAVE_SMBIOS_FALSE}"; then

2954

- as_fn_error "conditional \"HAVE_SMBIOS\" was never defined.

2955

+ as_fn_error $? "conditional \"HAVE_SMBIOS\" was never defined.

2956

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2957

fi

2958

if test -z "${HAVE_LIBPCI_TRUE}" && test -z "${HAVE_LIBPCI_FALSE}"; then

2959

- as_fn_error "conditional \"HAVE_LIBPCI\" was never defined.

2960

+ as_fn_error $? "conditional \"HAVE_LIBPCI\" was never defined.

2961

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

2962

+fi

2963

+if test -z "${HAVE_V4L1_TRUE}" && test -z "${HAVE_V4L1_FALSE}"; then

2964

+ as_fn_error $? "conditional \"HAVE_V4L1\" was never defined.

2965

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2966

fi

2967

if test -z "${HALD_COMPILE_DUMMY_TRUE}" && test -z "${HALD_COMPILE_DUMMY_FALSE}"; then

2968

- as_fn_error "conditional \"HALD_COMPILE_DUMMY\" was never defined.

2969

+ as_fn_error $? "conditional \"HALD_COMPILE_DUMMY\" was never defined.

2970

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2971

fi

2972

if test -z "${HALD_COMPILE_LINUX_TRUE}" && test -z "${HALD_COMPILE_LINUX_FALSE}"; then

2973

- as_fn_error "conditional \"HALD_COMPILE_LINUX\" was never defined.

2974

+ as_fn_error $? "conditional \"HALD_COMPILE_LINUX\" was never defined.

2975

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2976

fi

2977

if test -z "${HALD_COMPILE_FREEBSD_TRUE}" && test -z "${HALD_COMPILE_FREEBSD_FALSE}"; then

2978

- as_fn_error "conditional \"HALD_COMPILE_FREEBSD\" was never defined.

2979

+ as_fn_error $? "conditional \"HALD_COMPILE_FREEBSD\" was never defined.

2980

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2981

fi

2982

if test -z "${HALD_COMPILE_SOLARIS_TRUE}" && test -z "${HALD_COMPILE_SOLARIS_FALSE}"; then

2983

- as_fn_error "conditional \"HALD_COMPILE_SOLARIS\" was never defined.

2984

+ as_fn_error $? "conditional \"HALD_COMPILE_SOLARIS\" was never defined.

2985

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2986

fi

2987

if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then

2988

- as_fn_error "conditional \"HAVE_LIBUSB20\" was never defined.

2989

+ as_fn_error $? "conditional \"HAVE_LIBUSB20\" was never defined.

2990

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2991

fi

2992

if test -z "${HAVE_LIBUSB20_TRUE}" && test -z "${HAVE_LIBUSB20_FALSE}"; then

2993

- as_fn_error "conditional \"HAVE_LIBUSB20\" was never defined.

2994

+ as_fn_error $? "conditional \"HAVE_LIBUSB20\" was never defined.

2995

Usually this means the macro was only invoked conditionally." "$LINENO" 5

2996

fi

2997

if test -z "${HAVE_CONKIT_TRUE}" && test -z "${HAVE_CONKIT_FALSE}"; then

2998

- as_fn_error "conditional \"HAVE_CONKIT\" was never defined.

2999

+ as_fn_error $? "conditional \"HAVE_CONKIT\" was never defined.

3000

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3001

fi

3002

if test -z "${HAVE_CONKIT_TRUE}" && test -z "${HAVE_CONKIT_FALSE}"; then

3003

- as_fn_error "conditional \"HAVE_CONKIT\" was never defined.

3004

+ as_fn_error $? "conditional \"HAVE_CONKIT\" was never defined.

3005

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3006

fi

3007

if test -z "${HAVE_GPERF_TRUE}" && test -z "${HAVE_GPERF_FALSE}"; then

3008

- as_fn_error "conditional \"HAVE_GPERF\" was never defined.

3009

+ as_fn_error $? "conditional \"HAVE_GPERF\" was never defined.

3010

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3011

fi

3012

if test -z "${BUILD_KEYMAPS_TRUE}" && test -z "${BUILD_KEYMAPS_FALSE}"; then

3013

- as_fn_error "conditional \"BUILD_KEYMAPS\" was never defined.

3014

+ as_fn_error $? "conditional \"BUILD_KEYMAPS\" was never defined.

3015

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3016

fi

3017

if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then

3018

- as_fn_error "conditional \"HAVE_POLKIT\" was never defined.

3019

+ as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.

3020

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3021

fi

3022

if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then

3023

- as_fn_error "conditional \"HAVE_POLKIT\" was never defined.

3024

+ as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.

3025

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3026

fi

3027

if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then

3028

- as_fn_error "conditional \"HAVE_POLKIT\" was never defined.

3029

+ as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.

3030

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3031

fi

3032

if test -z "${HAVE_POLKIT_TRUE}" && test -z "${HAVE_POLKIT_FALSE}"; then

3033

- as_fn_error "conditional \"HAVE_POLKIT\" was never defined.

3034

+ as_fn_error $? "conditional \"HAVE_POLKIT\" was never defined.

3035

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3036

fi

3037

if test -z "${HAVE_ACLMGMT_TRUE}" && test -z "${HAVE_ACLMGMT_FALSE}"; then

3038

- as_fn_error "conditional \"HAVE_ACLMGMT\" was never defined.

3039

+ as_fn_error $? "conditional \"HAVE_ACLMGMT\" was never defined.

3040

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3041

fi

3042

if test -z "${HAVE_ACLMGMT_TRUE}" && test -z "${HAVE_ACLMGMT_FALSE}"; then

3043

- as_fn_error "conditional \"HAVE_ACLMGMT\" was never defined.

3044

+ as_fn_error $? "conditional \"HAVE_ACLMGMT\" was never defined.

3045

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3046

fi

3047

if test -z "${HAVE_UMOUNT_HAL_TRUE}" && test -z "${HAVE_UMOUNT_HAL_FALSE}"; then

3048

- as_fn_error "conditional \"HAVE_UMOUNT_HAL\" was never defined.

3049

+ as_fn_error $? "conditional \"HAVE_UMOUNT_HAL\" was never defined.

3050

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3051

fi

3052

if test -z "${HAVE_UMOUNT_HAL_TRUE}" && test -z "${HAVE_UMOUNT_HAL_FALSE}"; then

3053

- as_fn_error "conditional \"HAVE_UMOUNT_HAL\" was never defined.

3054

+ as_fn_error $? "conditional \"HAVE_UMOUNT_HAL\" was never defined.

3055

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3056

fi

3057

if test -z "${HAVE_ACPI_TRUE}" && test -z "${HAVE_ACPI_FALSE}"; then

3058

- as_fn_error "conditional \"HAVE_ACPI\" was never defined.

3059

+ as_fn_error $? "conditional \"HAVE_ACPI\" was never defined.

3060

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3061

fi

3062

if test -z "${HAVE_APM_TRUE}" && test -z "${HAVE_APM_FALSE}"; then

3063

- as_fn_error "conditional \"HAVE_APM\" was never defined.

3064

+ as_fn_error $? "conditional \"HAVE_APM\" was never defined.

3065

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3066

fi

3067

if test -z "${HAVE_PMU_TRUE}" && test -z "${HAVE_PMU_FALSE}"; then

3068

- as_fn_error "conditional \"HAVE_PMU\" was never defined.

3069

+ as_fn_error $? "conditional \"HAVE_PMU\" was never defined.

3070

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3071

fi

3072

if test -z "${BUILD_DEPRECATED_KEYS_TRUE}" && test -z "${BUILD_DEPRECATED_KEYS_FALSE}"; then

3073

- as_fn_error "conditional \"BUILD_DEPRECATED_KEYS\" was never defined.

3074

+ as_fn_error $? "conditional \"BUILD_DEPRECATED_KEYS\" was never defined.

3075

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3076

fi

3077

if test -z "${DOCBOOK_DOCS_ENABLED_TRUE}" && test -z "${DOCBOOK_DOCS_ENABLED_FALSE}"; then

3078

- as_fn_error "conditional \"DOCBOOK_DOCS_ENABLED\" was never defined.

3079

+ as_fn_error $? "conditional \"DOCBOOK_DOCS_ENABLED\" was never defined.

3080

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3081

fi

3082

if test -z "${OS_TYPE_UNKNOWN_TRUE}" && test -z "${OS_TYPE_UNKNOWN_FALSE}"; then

3083

- as_fn_error "conditional \"OS_TYPE_UNKNOWN\" was never defined.

3084

+ as_fn_error $? "conditional \"OS_TYPE_UNKNOWN\" was never defined.

3085

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3086

fi

3087

if test -z "${OS_TYPE_RED_HAT_TRUE}" && test -z "${OS_TYPE_RED_HAT_FALSE}"; then

3088

- as_fn_error "conditional \"OS_TYPE_RED_HAT\" was never defined.

3089

+ as_fn_error $? "conditional \"OS_TYPE_RED_HAT\" was never defined.

3090

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3091

fi

3092

if test -z "${BUILD_MACBOOKPRO_TRUE}" && test -z "${BUILD_MACBOOKPRO_FALSE}"; then

3093

- as_fn_error "conditional \"BUILD_MACBOOKPRO\" was never defined.

3094

+ as_fn_error $? "conditional \"BUILD_MACBOOKPRO\" was never defined.

3095

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3096

fi

3097

if test -z "${BUILD_MACBOOK_TRUE}" && test -z "${BUILD_MACBOOK_FALSE}"; then

3098

- as_fn_error "conditional \"BUILD_MACBOOK\" was never defined.

3099

+ as_fn_error $? "conditional \"BUILD_MACBOOK\" was never defined.

3100

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3101

fi

3102

if test -z "${BUILD_IMAC_TRUE}" && test -z "${BUILD_IMAC_FALSE}"; then

3103

- as_fn_error "conditional \"BUILD_IMAC\" was never defined.

3104

+ as_fn_error $? "conditional \"BUILD_IMAC\" was never defined.

3105

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3106

fi

3107

if test -z "${BUILD_OMAP_TRUE}" && test -z "${BUILD_OMAP_FALSE}"; then

3108

- as_fn_error "conditional \"BUILD_OMAP\" was never defined.

3109

+ as_fn_error $? "conditional \"BUILD_OMAP\" was never defined.

3110

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3111

fi

3112

if test -z "${BUILD_CPUFREQ_TRUE}" && test -z "${BUILD_CPUFREQ_FALSE}"; then

3113

- as_fn_error "conditional \"BUILD_CPUFREQ\" was never defined.

3114

+ as_fn_error $? "conditional \"BUILD_CPUFREQ\" was never defined.

3115

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3116

fi

3117

if test -z "${BUILD_USBCSR_TRUE}" && test -z "${BUILD_USBCSR_FALSE}"; then

3118

- as_fn_error "conditional \"BUILD_USBCSR\" was never defined.

3119

+ as_fn_error $? "conditional \"BUILD_USBCSR\" was never defined.

3120

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3121

fi

3122

if test -z "${BUILD_DELL_TRUE}" && test -z "${BUILD_DELL_FALSE}"; then

3123

- as_fn_error "conditional \"BUILD_DELL\" was never defined.

3124

+ as_fn_error $? "conditional \"BUILD_DELL\" was never defined.

3125

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3126

fi

3127

if test -z "${HAVE_SONYPIC_TRUE}" && test -z "${HAVE_SONYPIC_FALSE}"; then

3128

- as_fn_error "conditional \"HAVE_SONYPIC\" was never defined.

3129

+ as_fn_error $? "conditional \"HAVE_SONYPIC\" was never defined.

3130

Usually this means the macro was only invoked conditionally." "$LINENO" 5

3131

fi

3132

3133

@@ -19210,19 +19388,19 @@

3134

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

3135

3136

3137

-# as_fn_error ERROR [LINENO LOG_FD]

3138

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

3139

+# as_fn_error STATUS ERROR [LINENO LOG_FD]

3140

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

3141

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

3142

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

3143

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

3144

+# script with STATUS, using 1 if that was 0.

3145

as_fn_error ()

3146

{

3147

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

3148

- if test "$3"; then

3149

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

3150

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

3151

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

3152

+ if test "$4"; then

3153

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

3154

+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4

3155

fi

3156

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

3157

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

3158

as_fn_exit $as_status

3159

} # as_fn_error

3160

3161

@@ -19418,7 +19596,7 @@

3162

test -d "$as_dir" && break

3163

done

3164

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

3165

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

3166

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

3167

3168

3169

} # as_fn_mkdir_p

3170

@@ -19472,7 +19650,7 @@

3171

# values after options handling.

3172

ac_log="

3173

This file was extended by hal $as_me 0.5.14, which was

3174

-generated by GNU Autoconf 2.64. Invocation command line was

3175

+generated by GNU Autoconf 2.67. Invocation command line was

3176

3177

CONFIG_FILES = $CONFIG_FILES

3178

CONFIG_HEADERS = $CONFIG_HEADERS

3179

@@ -19512,6 +19690,7 @@

3180

3181

-h, --help print this help, then exit

3182

-V, --version print version number and configuration settings, then exit

3183

+ --config print configuration, then exit

3184

-q, --quiet, --silent

3185

do not print progress messages

3186

-d, --debug don't remove temporary files

3187

@@ -19534,12 +19713,13 @@

3188

3189

_ACEOF

3190

cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1

3191

+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"

3192

ac_cs_version="\\

3193

hal config.status 0.5.14

3194

-configured by $0, generated by GNU Autoconf 2.64,

3195

- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

3196

+configured by $0, generated by GNU Autoconf 2.67,

3197

+ with options \\"\$ac_cs_config\\"

3198

3199

3200

3201

This config.status script is free software; the Free Software Foundation

3202

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

3203

3204

@@ -19557,11 +19737,16 @@

3205

while test $# != 0

3206

do

3207

case $1 in

3208

- --*=*)

3209

+ --*=?*)

3210

ac_option=`expr "X$1" : 'X$[^=]*$='`

3211

ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'`

3212

ac_shift=:

3213

;;

3214

+ --*=)

3215

+ ac_option=`expr "X$1" : 'X$[^=]*$='`

3216

+ ac_optarg=

3217

+ ac_shift=:

3218

+ ;;

3219

*)

3220

ac_option=$1

3221

ac_optarg=$2

3222

@@ -19575,12 +19760,15 @@

3223

ac_cs_recheck=: ;;

3224

--version | --versio | --versi | --vers | --ver | --ve | --v | -V )

3225

$as_echo "$ac_cs_version"; exit ;;

3226

+ --config | --confi | --conf | --con | --co | --c )

3227

+ $as_echo "$ac_cs_config"; exit ;;

3228

--debug | --debu | --deb | --de | --d | -d )

3229

debug=: ;;

3230

--file | --fil | --fi | --f )

3231

$ac_shift

3232

case $ac_optarg in

3233

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

3234

+ '') as_fn_error $? "missing file argument" ;;

3235

esac

3236

as_fn_append CONFIG_FILES " '$ac_optarg'"

3237

ac_need_defaults=false;;

3238

@@ -19593,7 +19781,7 @@

3239

ac_need_defaults=false;;

3240

--he | --h)

3241

# Conflict between --help and --header

3242

- as_fn_error "ambiguous option: \`$1'

3243

+ as_fn_error $? "ambiguous option: \`$1'

3244

Try \`$0 --help' for more information.";;

3245

--help | --hel | -h )

3246

$as_echo "$ac_cs_usage"; exit ;;

3247

@@ -19602,7 +19790,7 @@

3248

ac_cs_silent=: ;;

3249

3250

# This is an error.

3251

- -*) as_fn_error "unrecognized option: \`$1'

3252

+ -*) as_fn_error $? "unrecognized option: \`$1'

3253

Try \`$0 --help' for more information." ;;

3254

3255

*) as_fn_append ac_config_targets " $1"

3256

@@ -20054,7 +20242,7 @@

3257

"doc/spec/hal-spec.xml.in") CONFIG_FILES="$CONFIG_FILES doc/spec/hal-spec.xml.in" ;;

3258

"doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;

3259

3260

- *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

3261

+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;

3262

esac

3263

done

3264

3265

@@ -20092,7 +20280,7 @@

3266

{

3267

tmp=./conf$$-$RANDOM

3268

(umask 077 && mkdir "$tmp")

3269

-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5

3270

+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5

3271

3272

# Set up the scripts for CONFIG_FILES section.

3273

# No need to generate them if there are no CONFIG_FILES.

3274

@@ -20109,7 +20297,7 @@

3275

fi

3276

ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`

3277

if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then

3278

- ac_cs_awk_cr='\r'

3279

+ ac_cs_awk_cr='\\r'

3280

else

3281

ac_cs_awk_cr=$ac_cr

3282

fi

3283

@@ -20123,18 +20311,18 @@

3284

echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&

3285

echo "_ACEOF"

3286

} >conf$$subs.sh ||

3287

- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

3288

-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`

3289

+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5

3290

+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`

3291

ac_delim='%!_!# '

3292

for ac_last_try in false false false false false :; do

3293

. ./conf$$subs.sh ||

3294

- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

3295

+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5

3296

3297

ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`

3298

if test $ac_delim_n = $ac_delim_num; then

3299

break

3300

elif $ac_last_try; then

3301

- as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5

3302

+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5

3303

else

3304

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

3305

fi

3306

@@ -20156,7 +20344,7 @@

3307

t delim

3308

:nl

3309

h

3310

-s/$.\{148\}$.*/\1/

3311

+s/$.\{148\}$..*/\1/

3312

t more1

3313

s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/

3314

p

3315

@@ -20170,7 +20358,7 @@

3316

t nl

3317

:delim

3318

h

3319

-s/$.\{148\}$.*/\1/

3320

+s/$.\{148\}$..*/\1/

3321

t more2

3322

s/["\\]/\\&/g; s/^/"/; s/$/"/

3323

p

3324

@@ -20223,20 +20411,28 @@

3325

else

3326

cat

3327

fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \

3328

- || as_fn_error "could not setup config files machinery" "$LINENO" 5

3329

+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5

3330

_ACEOF

3331

3332

-# VPATH may cause trouble with some makes, so we remove $(srcdir),

3333

-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and

3334

+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),

3335

+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and

3336

# trailing colons and then remove the whole line if VPATH becomes empty

3337

# (actually we leave an empty line to preserve line numbers).

3338

if test "x$srcdir" = x.; then

3339

- ac_vpsub='/^[ ]*VPATH[ ]*=/{

3340

-s/:*\$(srcdir):*/:/

3341

-s/:*\${srcdir}:*/:/

3342

-s/:*@srcdir@:*/:/

3343

-s/^$[^=]*=[ ]*$:*/\1/

3344

+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{

3345

+h

3346

+s///

3347

+s/^/:/

3348

+s/[ ]*$/:/

3349

+s/:\$(srcdir):/:/g

3350

+s/:\${srcdir}:/:/g

3351

+s/:@srcdir@:/:/g

3352

+s/^:*//

3353

s/:*$//

3354

+x

3355

+s/$=[ ]*$.*/\1/

3356

+G

3357

+s/\n//

3358

s/^[^=]*=[ ]*$//

3359

}'

3360

fi

3361

@@ -20264,7 +20460,7 @@

3362

if test -z "$ac_t"; then

3363

break

3364

elif $ac_last_try; then

3365

- as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5

3366

+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5

3367

else

3368

ac_delim="$ac_delim!$ac_delim _$ac_delim!! "

3369

fi

3370

@@ -20349,7 +20545,7 @@

3371

_ACAWK

3372

_ACEOF

3373

cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

3374

- as_fn_error "could not setup config headers machinery" "$LINENO" 5

3375

+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5

3376

fi # test -n "$CONFIG_HEADERS"

3377

3378

3379

@@ -20362,7 +20558,7 @@

3380

esac

3381

case $ac_mode$ac_tag in

3382

:[FHL]*:*);;

3383

- :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;

3384

+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;

3385

:[FH]-) ac_tag=-:-;;

3386

:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;

3387

esac

3388

@@ -20390,7 +20586,7 @@

3389

[\\/$]*) false;;

3390

*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;

3391

esac ||

3392

- as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;

3393

+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;

3394

esac

3395

case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac

3396

as_fn_append ac_file_inputs " '$ac_f'"

3397

@@ -20417,7 +20613,7 @@

3398

3399

case $ac_tag in

3400

*:-:* | *:-) cat >"$tmp/stdin" \

3401

- || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;

3402

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;

3403

esac

3404

;;

3405

esac

3406

@@ -20554,22 +20750,22 @@

3407

$ac_datarootdir_hack

3408

"

3409

eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \

3410

- || as_fn_error "could not create $ac_file" "$LINENO" 5

3411

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

3412

3413

test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&

3414

{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

3415

{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&

3416

{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'

3417

-which seems to be undefined. Please make sure it is defined." >&5

3418

+which seems to be undefined. Please make sure it is defined" >&5

3419

$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'

3420

-which seems to be undefined. Please make sure it is defined." >&2;}

3421

+which seems to be undefined. Please make sure it is defined" >&2;}

3422

3423

rm -f "$tmp/stdin"

3424

case $ac_file in

3425

-) cat "$tmp/out" && rm -f "$tmp/out";;

3426

*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;

3427

esac \

3428

- || as_fn_error "could not create $ac_file" "$LINENO" 5

3429

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

3430

;;

3431

:H)

3432

#

3433

@@ -20580,19 +20776,19 @@

3434

$as_echo "/* $configure_input */" \

3435

&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"

3436

} >"$tmp/config.h" \

3437

- || as_fn_error "could not create $ac_file" "$LINENO" 5

3438

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

3439

if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then

3440

{ $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5

3441

$as_echo "$as_me: $ac_file is unchanged" >&6;}

3442

else

3443

rm -f "$ac_file"

3444

mv "$tmp/config.h" "$ac_file" \

3445

- || as_fn_error "could not create $ac_file" "$LINENO" 5

3446

+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5

3447

fi

3448

else

3449

$as_echo "/* $configure_input */" \

3450

&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \

3451

- || as_fn_error "could not create -" "$LINENO" 5

3452

+ || as_fn_error $? "could not create -" "$LINENO" 5

3453

fi

3454

# Compute "$ac_file"'s index in $config_headers.

3455

_am_arg="$ac_file"

3456

@@ -21544,7 +21740,7 @@

3457

ac_clean_files=$ac_clean_files_save

3458

3459

test $ac_write_fail = 0 ||

3460

- as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5

3461

+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5

3462

3463

3464

# configure is writing to config.log, and then calls config.status.

3465

@@ -21565,7 +21761,7 @@

3466

exec 5>>config.log

3467

# Use ||, not &&, to avoid exiting from the if with $? = 1, which

3468

# would make configure fail if this is the last instruction.

3469

- $ac_cs_success || as_fn_exit $?

3470

+ $ac_cs_success || as_fn_exit 1

3471

fi

3472

if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then

3473

{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

3474

Index: hal/doc/Makefile.in

3475

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

3476

--- hal.orig/doc/Makefile.in 2011-02-14 11:43:49.281499233 +0100

3477

+++ hal/doc/Makefile.in 2011-02-14 11:44:38.000000000 +0100

3478

@@ -1,4 +1,4 @@

3479

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

3480

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

3481

# @configure_input@

3482

3483

3484

@@ -154,6 +154,7 @@

3485

LIBOBJS = @LIBOBJS@

3486

LIBS = @LIBS@

3487

LIBTOOL = @LIBTOOL@

3488

+LIBUFS_LIBS = @LIBUFS_LIBS@

3489

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3490

LINUX_INPUT_H = @LINUX_INPUT_H@

3491

LIPO = @LIPO@

3492

@@ -184,6 +185,8 @@

3493

PATH_SEPARATOR = @PATH_SEPARATOR@

3494

PCI_IDS_DIR = @PCI_IDS_DIR@

3495

PKG_CONFIG = @PKG_CONFIG@

3496

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3497

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3498

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3499

POLKIT_LIBS = @POLKIT_LIBS@

3500

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3501

@@ -309,7 +312,7 @@

3502

# (which will cause the Makefiles to be regenerated when you run `make');

3503

# (2) otherwise, pass the desired values on the `make' command line.

3504

$(RECURSIVE_TARGETS):

3505

- @failcom='exit 1'; \

3506

+ @fail= failcom='exit 1'; \

3507

for f in x $$MAKEFLAGS; do \

3508

case $$f in \

3509

*=* | --[!k]*);; \

3510

@@ -334,7 +337,7 @@

3511

fi; test -z "$$fail"

3512

3513

$(RECURSIVE_CLEAN_TARGETS):

3514

- @failcom='exit 1'; \

3515

+ @fail= failcom='exit 1'; \

3516

for f in x $$MAKEFLAGS; do \

3517

case $$f in \

3518

*=* | --[!k]*);; \

3519

Index: hal/doc/api/Makefile.in

3520

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

3521

--- hal.orig/doc/api/Makefile.in 2011-02-14 11:43:49.351499233 +0100

3522

+++ hal/doc/api/Makefile.in 2011-02-14 11:44:38.000000000 +0100

3523

@@ -1,4 +1,4 @@

3524

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

3525

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

3526

# @configure_input@

3527

3528

3529

@@ -154,6 +154,7 @@

3530

LIBOBJS = @LIBOBJS@

3531

LIBS = @LIBS@

3532

LIBTOOL = @LIBTOOL@

3533

+LIBUFS_LIBS = @LIBUFS_LIBS@

3534

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3535

LINUX_INPUT_H = @LINUX_INPUT_H@

3536

LIPO = @LIPO@

3537

@@ -184,6 +185,8 @@

3538

PATH_SEPARATOR = @PATH_SEPARATOR@

3539

PCI_IDS_DIR = @PCI_IDS_DIR@

3540

PKG_CONFIG = @PKG_CONFIG@

3541

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3542

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3543

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3544

POLKIT_LIBS = @POLKIT_LIBS@

3545

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3546

@@ -309,7 +312,7 @@

3547

# (which will cause the Makefiles to be regenerated when you run `make');

3548

# (2) otherwise, pass the desired values on the `make' command line.

3549

$(RECURSIVE_TARGETS):

3550

- @failcom='exit 1'; \

3551

+ @fail= failcom='exit 1'; \

3552

for f in x $$MAKEFLAGS; do \

3553

case $$f in \

3554

*=* | --[!k]*);; \

3555

@@ -334,7 +337,7 @@

3556

fi; test -z "$$fail"

3557

3558

$(RECURSIVE_CLEAN_TARGETS):

3559

- @failcom='exit 1'; \

3560

+ @fail= failcom='exit 1'; \

3561

for f in x $$MAKEFLAGS; do \

3562

case $$f in \

3563

*=* | --[!k]*);; \

3564

Index: hal/doc/api/libhal-storage/Makefile.in

3565

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

3566

--- hal.orig/doc/api/libhal-storage/Makefile.in 2011-02-14 11:43:49.321499233 +0100

3567

+++ hal/doc/api/libhal-storage/Makefile.in 2011-02-14 11:44:38.000000000 +0100

3568

@@ -1,4 +1,4 @@

3569

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

3570

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

3571

# @configure_input@

3572

3573

3574

@@ -121,6 +121,7 @@

3575

LIBOBJS = @LIBOBJS@

3576

LIBS = @LIBS@

3577

LIBTOOL = @LIBTOOL@

3578

+LIBUFS_LIBS = @LIBUFS_LIBS@

3579

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3580

LINUX_INPUT_H = @LINUX_INPUT_H@

3581

LIPO = @LIPO@

3582

@@ -151,6 +152,8 @@

3583

PATH_SEPARATOR = @PATH_SEPARATOR@

3584

PCI_IDS_DIR = @PCI_IDS_DIR@

3585

PKG_CONFIG = @PKG_CONFIG@

3586

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3587

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3588

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3589

POLKIT_LIBS = @POLKIT_LIBS@

3590

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3591

Index: hal/doc/api/libhal/Makefile.in

3592

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

3593

--- hal.orig/doc/api/libhal/Makefile.in 2011-02-14 11:43:49.331499233 +0100

3594

+++ hal/doc/api/libhal/Makefile.in 2011-02-14 11:44:39.000000000 +0100

3595

@@ -1,4 +1,4 @@

3596

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

3597

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

3598

# @configure_input@

3599

3600

3601

@@ -121,6 +121,7 @@

3602

LIBOBJS = @LIBOBJS@

3603

LIBS = @LIBS@

3604

LIBTOOL = @LIBTOOL@

3605

+LIBUFS_LIBS = @LIBUFS_LIBS@

3606

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3607

LINUX_INPUT_H = @LINUX_INPUT_H@

3608

LIPO = @LIPO@

3609

@@ -151,6 +152,8 @@

3610

PATH_SEPARATOR = @PATH_SEPARATOR@

3611

PCI_IDS_DIR = @PCI_IDS_DIR@

3612

PKG_CONFIG = @PKG_CONFIG@

3613

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3614

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3615

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3616

POLKIT_LIBS = @POLKIT_LIBS@

3617

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3618

Index: hal/doc/man/Makefile.in

3619

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

3620

--- hal.orig/doc/man/Makefile.in 2011-02-14 11:43:49.301499233 +0100

3621

+++ hal/doc/man/Makefile.in 2011-02-14 11:44:39.000000000 +0100

3622

@@ -1,4 +1,4 @@

3623

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

3624

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

3625

# @configure_input@

3626

3627

3628

@@ -141,6 +141,7 @@

3629

LIBOBJS = @LIBOBJS@

3630

LIBS = @LIBS@

3631

LIBTOOL = @LIBTOOL@

3632

+LIBUFS_LIBS = @LIBUFS_LIBS@

3633

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3634

LINUX_INPUT_H = @LINUX_INPUT_H@

3635

LIPO = @LIPO@

3636

@@ -171,6 +172,8 @@

3637

PATH_SEPARATOR = @PATH_SEPARATOR@

3638

PCI_IDS_DIR = @PCI_IDS_DIR@

3639

PKG_CONFIG = @PKG_CONFIG@

3640

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3641

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3642

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3643

POLKIT_LIBS = @POLKIT_LIBS@

3644

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3645

Index: hal/doc/spec/Makefile.in

3646

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

3647

--- hal.orig/doc/spec/Makefile.in 2011-02-14 11:43:49.371499233 +0100

3648

+++ hal/doc/spec/Makefile.in 2011-02-14 11:44:39.000000000 +0100

3649

@@ -1,4 +1,4 @@

3650

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

3651

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

3652

# @configure_input@

3653

3654

3655

@@ -139,6 +139,7 @@

3656

LIBOBJS = @LIBOBJS@

3657

LIBS = @LIBS@

3658

LIBTOOL = @LIBTOOL@

3659

+LIBUFS_LIBS = @LIBUFS_LIBS@

3660

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3661

LINUX_INPUT_H = @LINUX_INPUT_H@

3662

LIPO = @LIPO@

3663

@@ -169,6 +170,8 @@

3664

PATH_SEPARATOR = @PATH_SEPARATOR@

3665

PCI_IDS_DIR = @PCI_IDS_DIR@

3666

PKG_CONFIG = @PKG_CONFIG@

3667

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3668

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3669

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3670

POLKIT_LIBS = @POLKIT_LIBS@

3671

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3672

Index: hal/fdi/Makefile.in

3673

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

3674

--- hal.orig/fdi/Makefile.in 2011-02-14 11:43:49.451499233 +0100

3675

+++ hal/fdi/Makefile.in 2011-02-14 11:44:39.000000000 +0100

3676

@@ -1,4 +1,4 @@

3677

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

3678

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

3679

# @configure_input@

3680

3681

3682

@@ -179,6 +179,7 @@

3683

LIBOBJS = @LIBOBJS@

3684

LIBS = @LIBS@

3685

LIBTOOL = @LIBTOOL@

3686

+LIBUFS_LIBS = @LIBUFS_LIBS@

3687

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3688

LINUX_INPUT_H = @LINUX_INPUT_H@

3689

LIPO = @LIPO@

3690

@@ -209,6 +210,8 @@

3691

PATH_SEPARATOR = @PATH_SEPARATOR@

3692

PCI_IDS_DIR = @PCI_IDS_DIR@

3693

PKG_CONFIG = @PKG_CONFIG@

3694

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3695

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3696

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3697

POLKIT_LIBS = @POLKIT_LIBS@

3698

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3699

@@ -352,7 +355,7 @@

3700

# (which will cause the Makefiles to be regenerated when you run `make');

3701

# (2) otherwise, pass the desired values on the `make' command line.

3702

$(RECURSIVE_TARGETS):

3703

- @failcom='exit 1'; \

3704

+ @fail= failcom='exit 1'; \

3705

for f in x $$MAKEFLAGS; do \

3706

case $$f in \

3707

*=* | --[!k]*);; \

3708

@@ -377,7 +380,7 @@

3709

fi; test -z "$$fail"

3710

3711

$(RECURSIVE_CLEAN_TARGETS):

3712

- @failcom='exit 1'; \

3713

+ @fail= failcom='exit 1'; \

3714

for f in x $$MAKEFLAGS; do \

3715

case $$f in \

3716

*=* | --[!k]*);; \

3717

Index: hal/fdi/information/10freedesktop/Makefile.in

3718

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

3719

--- hal.orig/fdi/information/10freedesktop/Makefile.in 2011-02-14 11:43:49.501499233 +0100

3720

+++ hal/fdi/information/10freedesktop/Makefile.in 2011-02-14 11:44:39.000000000 +0100

3721

@@ -1,4 +1,4 @@

3722

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

3723

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

3724

# @configure_input@

3725

3726

3727

@@ -141,6 +141,7 @@

3728

LIBOBJS = @LIBOBJS@

3729

LIBS = @LIBS@

3730

LIBTOOL = @LIBTOOL@

3731

+LIBUFS_LIBS = @LIBUFS_LIBS@

3732

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3733

LINUX_INPUT_H = @LINUX_INPUT_H@

3734

LIPO = @LIPO@

3735

@@ -171,6 +172,8 @@

3736

PATH_SEPARATOR = @PATH_SEPARATOR@

3737

PCI_IDS_DIR = @PCI_IDS_DIR@

3738

PKG_CONFIG = @PKG_CONFIG@

3739

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3740

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3741

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3742

POLKIT_LIBS = @POLKIT_LIBS@

3743

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3744

Index: hal/fdi/information/20thirdparty/Makefile.in

3745

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

3746

--- hal.orig/fdi/information/20thirdparty/Makefile.in 2011-02-14 11:43:49.481499233 +0100

3747

+++ hal/fdi/information/20thirdparty/Makefile.in 2011-02-14 11:44:39.000000000 +0100

3748

@@ -1,4 +1,4 @@

3749

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

3750

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

3751

# @configure_input@

3752

3753

3754

@@ -139,6 +139,7 @@

3755

LIBOBJS = @LIBOBJS@

3756

LIBS = @LIBS@

3757

LIBTOOL = @LIBTOOL@

3758

+LIBUFS_LIBS = @LIBUFS_LIBS@

3759

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3760

LINUX_INPUT_H = @LINUX_INPUT_H@

3761

LIPO = @LIPO@

3762

@@ -169,6 +170,8 @@

3763

PATH_SEPARATOR = @PATH_SEPARATOR@

3764

PCI_IDS_DIR = @PCI_IDS_DIR@

3765

PKG_CONFIG = @PKG_CONFIG@

3766

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3767

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3768

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3769

POLKIT_LIBS = @POLKIT_LIBS@

3770

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3771

Index: hal/fdi/information/Makefile.in

3772

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

3773

--- hal.orig/fdi/information/Makefile.in 2011-02-14 11:43:49.471499233 +0100

3774

+++ hal/fdi/information/Makefile.in 2011-02-14 11:44:39.000000000 +0100

3775

@@ -1,4 +1,4 @@

3776

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

3777

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

3778

# @configure_input@

3779

3780

3781

@@ -179,6 +179,7 @@

3782

LIBOBJS = @LIBOBJS@

3783

LIBS = @LIBS@

3784

LIBTOOL = @LIBTOOL@

3785

+LIBUFS_LIBS = @LIBUFS_LIBS@

3786

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3787

LINUX_INPUT_H = @LINUX_INPUT_H@

3788

LIPO = @LIPO@

3789

@@ -209,6 +210,8 @@

3790

PATH_SEPARATOR = @PATH_SEPARATOR@

3791

PCI_IDS_DIR = @PCI_IDS_DIR@

3792

PKG_CONFIG = @PKG_CONFIG@

3793

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3794

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3795

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3796

POLKIT_LIBS = @POLKIT_LIBS@

3797

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3798

@@ -351,7 +354,7 @@

3799

# (which will cause the Makefiles to be regenerated when you run `make');

3800

# (2) otherwise, pass the desired values on the `make' command line.

3801

$(RECURSIVE_TARGETS):

3802

- @failcom='exit 1'; \

3803

+ @fail= failcom='exit 1'; \

3804

for f in x $$MAKEFLAGS; do \

3805

case $$f in \

3806

*=* | --[!k]*);; \

3807

@@ -376,7 +379,7 @@

3808

fi; test -z "$$fail"

3809

3810

$(RECURSIVE_CLEAN_TARGETS):

3811

- @failcom='exit 1'; \

3812

+ @fail= failcom='exit 1'; \

3813

for f in x $$MAKEFLAGS; do \

3814

case $$f in \

3815

*=* | --[!k]*);; \

3816

Index: hal/fdi/policy/10osvendor/Makefile.in

3817

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

3818

--- hal.orig/fdi/policy/10osvendor/Makefile.in 2011-02-14 11:43:49.531499233 +0100

3819

+++ hal/fdi/policy/10osvendor/Makefile.in 2011-02-14 11:44:39.000000000 +0100

3820

@@ -1,4 +1,4 @@

3821

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

3822

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

3823

# @configure_input@

3824

3825

3826

@@ -159,6 +159,7 @@

3827

LIBOBJS = @LIBOBJS@

3828

LIBS = @LIBS@

3829

LIBTOOL = @LIBTOOL@

3830

+LIBUFS_LIBS = @LIBUFS_LIBS@

3831

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3832

LINUX_INPUT_H = @LINUX_INPUT_H@

3833

LIPO = @LIPO@

3834

@@ -189,6 +190,8 @@

3835

PATH_SEPARATOR = @PATH_SEPARATOR@

3836

PCI_IDS_DIR = @PCI_IDS_DIR@

3837

PKG_CONFIG = @PKG_CONFIG@

3838

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3839

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3840

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3841

POLKIT_LIBS = @POLKIT_LIBS@

3842

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3843

Index: hal/fdi/policy/20thirdparty/Makefile.in

3844

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

3845

--- hal.orig/fdi/policy/20thirdparty/Makefile.in 2011-02-14 11:43:49.551499233 +0100

3846

+++ hal/fdi/policy/20thirdparty/Makefile.in 2011-02-14 11:44:39.000000000 +0100

3847

@@ -1,4 +1,4 @@

3848

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

3849

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

3850

# @configure_input@

3851

3852

3853

@@ -139,6 +139,7 @@

3854

LIBOBJS = @LIBOBJS@

3855

LIBS = @LIBS@

3856

LIBTOOL = @LIBTOOL@

3857

+LIBUFS_LIBS = @LIBUFS_LIBS@

3858

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3859

LINUX_INPUT_H = @LINUX_INPUT_H@

3860

LIPO = @LIPO@

3861

@@ -169,6 +170,8 @@

3862

PATH_SEPARATOR = @PATH_SEPARATOR@

3863

PCI_IDS_DIR = @PCI_IDS_DIR@

3864

PKG_CONFIG = @PKG_CONFIG@

3865

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3866

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3867

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3868

POLKIT_LIBS = @POLKIT_LIBS@

3869

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3870

Index: hal/fdi/policy/Makefile.in

3871

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

3872

--- hal.orig/fdi/policy/Makefile.in 2011-02-14 11:43:49.521499233 +0100

3873

+++ hal/fdi/policy/Makefile.in 2011-02-14 11:44:40.000000000 +0100

3874

@@ -1,4 +1,4 @@

3875

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

3876

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

3877

# @configure_input@

3878

3879

3880

@@ -179,6 +179,7 @@

3881

LIBOBJS = @LIBOBJS@

3882

LIBS = @LIBS@

3883

LIBTOOL = @LIBTOOL@

3884

+LIBUFS_LIBS = @LIBUFS_LIBS@

3885

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3886

LINUX_INPUT_H = @LINUX_INPUT_H@

3887

LIPO = @LIPO@

3888

@@ -209,6 +210,8 @@

3889

PATH_SEPARATOR = @PATH_SEPARATOR@

3890

PCI_IDS_DIR = @PCI_IDS_DIR@

3891

PKG_CONFIG = @PKG_CONFIG@

3892

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3893

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3894

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3895

POLKIT_LIBS = @POLKIT_LIBS@

3896

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3897

@@ -351,7 +354,7 @@

3898

# (which will cause the Makefiles to be regenerated when you run `make');

3899

# (2) otherwise, pass the desired values on the `make' command line.

3900

$(RECURSIVE_TARGETS):

3901

- @failcom='exit 1'; \

3902

+ @fail= failcom='exit 1'; \

3903

for f in x $$MAKEFLAGS; do \

3904

case $$f in \

3905

*=* | --[!k]*);; \

3906

@@ -376,7 +379,7 @@

3907

fi; test -z "$$fail"

3908

3909

$(RECURSIVE_CLEAN_TARGETS):

3910

- @failcom='exit 1'; \

3911

+ @fail= failcom='exit 1'; \

3912

for f in x $$MAKEFLAGS; do \

3913

case $$f in \

3914

*=* | --[!k]*);; \

3915

Index: hal/fdi/preprobe/10freedesktop/Makefile.in

3916

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

3917

--- hal.orig/fdi/preprobe/10freedesktop/Makefile.in 2011-02-14 11:43:49.441499233 +0100

3918

+++ hal/fdi/preprobe/10freedesktop/Makefile.in 2011-02-14 11:44:40.000000000 +0100

3919

@@ -1,4 +1,4 @@

3920

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

3921

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

3922

# @configure_input@

3923

3924

3925

@@ -139,6 +139,7 @@

3926

LIBOBJS = @LIBOBJS@

3927

LIBS = @LIBS@

3928

LIBTOOL = @LIBTOOL@

3929

+LIBUFS_LIBS = @LIBUFS_LIBS@

3930

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3931

LINUX_INPUT_H = @LINUX_INPUT_H@

3932

LIPO = @LIPO@

3933

@@ -169,6 +170,8 @@

3934

PATH_SEPARATOR = @PATH_SEPARATOR@

3935

PCI_IDS_DIR = @PCI_IDS_DIR@

3936

PKG_CONFIG = @PKG_CONFIG@

3937

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3938

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3939

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3940

POLKIT_LIBS = @POLKIT_LIBS@

3941

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3942

Index: hal/fdi/preprobe/20thirdparty/Makefile.in

3943

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

3944

--- hal.orig/fdi/preprobe/20thirdparty/Makefile.in 2011-02-14 11:43:49.421499233 +0100

3945

+++ hal/fdi/preprobe/20thirdparty/Makefile.in 2011-02-14 11:44:40.000000000 +0100

3946

@@ -1,4 +1,4 @@

3947

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

3948

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

3949

# @configure_input@

3950

3951

3952

@@ -139,6 +139,7 @@

3953

LIBOBJS = @LIBOBJS@

3954

LIBS = @LIBS@

3955

LIBTOOL = @LIBTOOL@

3956

+LIBUFS_LIBS = @LIBUFS_LIBS@

3957

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3958

LINUX_INPUT_H = @LINUX_INPUT_H@

3959

LIPO = @LIPO@

3960

@@ -169,6 +170,8 @@

3961

PATH_SEPARATOR = @PATH_SEPARATOR@

3962

PCI_IDS_DIR = @PCI_IDS_DIR@

3963

PKG_CONFIG = @PKG_CONFIG@

3964

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3965

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3966

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3967

POLKIT_LIBS = @POLKIT_LIBS@

3968

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3969

Index: hal/fdi/preprobe/Makefile.in

3970

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

3971

--- hal.orig/fdi/preprobe/Makefile.in 2011-02-14 11:43:49.401499233 +0100

3972

+++ hal/fdi/preprobe/Makefile.in 2011-02-14 11:44:40.000000000 +0100

3973

@@ -1,4 +1,4 @@

3974

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

3975

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

3976

# @configure_input@

3977

3978

3979

@@ -179,6 +179,7 @@

3980

LIBOBJS = @LIBOBJS@

3981

LIBS = @LIBS@

3982

LIBTOOL = @LIBTOOL@

3983

+LIBUFS_LIBS = @LIBUFS_LIBS@

3984

LIBUSB20_LIBS = @LIBUSB20_LIBS@

3985

LINUX_INPUT_H = @LINUX_INPUT_H@

3986

LIPO = @LIPO@

3987

@@ -209,6 +210,8 @@

3988

PATH_SEPARATOR = @PATH_SEPARATOR@

3989

PCI_IDS_DIR = @PCI_IDS_DIR@

3990

PKG_CONFIG = @PKG_CONFIG@

3991

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

3992

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

3993

POLKIT_CFLAGS = @POLKIT_CFLAGS@

3994

POLKIT_LIBS = @POLKIT_LIBS@

3995

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

3996

@@ -351,7 +354,7 @@

3997

# (which will cause the Makefiles to be regenerated when you run `make');

3998

# (2) otherwise, pass the desired values on the `make' command line.

3999

$(RECURSIVE_TARGETS):

4000

- @failcom='exit 1'; \

4001

+ @fail= failcom='exit 1'; \

4002

for f in x $$MAKEFLAGS; do \

4003

case $$f in \

4004

*=* | --[!k]*);; \

4005

@@ -376,7 +379,7 @@

4006

fi; test -z "$$fail"

4007

4008

$(RECURSIVE_CLEAN_TARGETS):

4009

- @failcom='exit 1'; \

4010

+ @fail= failcom='exit 1'; \

4011

for f in x $$MAKEFLAGS; do \

4012

case $$f in \

4013

*=* | --[!k]*);; \

4014

Index: hal/hald-runner/Makefile.in

4015

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

4016

--- hal.orig/hald-runner/Makefile.in 2011-02-14 11:43:49.651499233 +0100

4017

+++ hal/hald-runner/Makefile.in 2011-02-14 11:44:40.000000000 +0100

4018

@@ -1,4 +1,4 @@

4019

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

4020

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

4021

# @configure_input@

4022

4023

4024

@@ -147,6 +147,7 @@

4025

LIBOBJS = @LIBOBJS@

4026

LIBS = @LIBS@

4027

LIBTOOL = @LIBTOOL@

4028

+LIBUFS_LIBS = @LIBUFS_LIBS@

4029

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4030

LINUX_INPUT_H = @LINUX_INPUT_H@

4031

LIPO = @LIPO@

4032

@@ -177,6 +178,8 @@

4033

PATH_SEPARATOR = @PATH_SEPARATOR@

4034

PCI_IDS_DIR = @PCI_IDS_DIR@

4035

PKG_CONFIG = @PKG_CONFIG@

4036

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4037

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4038

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4039

POLKIT_LIBS = @POLKIT_LIBS@

4040

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4041

Index: hal/hald/Makefile.in

4042

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

4043

--- hal.orig/hald/Makefile.in 2011-02-14 11:43:49.741499233 +0100

4044

+++ hal/hald/Makefile.in 2011-02-14 11:44:40.000000000 +0100

4045

@@ -1,4 +1,4 @@

4046

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

4047

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

4048

# @configure_input@

4049

4050

4051

@@ -237,6 +237,7 @@

4052

LIBOBJS = @LIBOBJS@

4053

LIBS = @LIBS@

4054

LIBTOOL = @LIBTOOL@

4055

+LIBUFS_LIBS = @LIBUFS_LIBS@

4056

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4057

LINUX_INPUT_H = @LINUX_INPUT_H@

4058

LIPO = @LIPO@

4059

@@ -267,6 +268,8 @@

4060

PATH_SEPARATOR = @PATH_SEPARATOR@

4061

PCI_IDS_DIR = @PCI_IDS_DIR@

4062

PKG_CONFIG = @PKG_CONFIG@

4063

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4064

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4065

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4066

POLKIT_LIBS = @POLKIT_LIBS@

4067

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4068

@@ -642,7 +645,7 @@

4069

# (which will cause the Makefiles to be regenerated when you run `make');

4070

# (2) otherwise, pass the desired values on the `make' command line.

4071

$(RECURSIVE_TARGETS):

4072

- @failcom='exit 1'; \

4073

+ @fail= failcom='exit 1'; \

4074

for f in x $$MAKEFLAGS; do \

4075

case $$f in \

4076

*=* | --[!k]*);; \

4077

@@ -667,7 +670,7 @@

4078

fi; test -z "$$fail"

4079

4080

$(RECURSIVE_CLEAN_TARGETS):

4081

- @failcom='exit 1'; \

4082

+ @fail= failcom='exit 1'; \

4083

for f in x $$MAKEFLAGS; do \

4084

case $$f in \

4085

*=* | --[!k]*);; \

4086

Index: hal/hald/dummy/Makefile.in

4087

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

4088

--- hal.orig/hald/dummy/Makefile.in 2011-02-14 11:43:49.801499233 +0100

4089

+++ hal/hald/dummy/Makefile.in 2011-02-14 11:44:40.000000000 +0100

4090

@@ -1,4 +1,4 @@

4091

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

4092

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

4093

# @configure_input@

4094

4095

4096

@@ -144,6 +144,7 @@

4097

LIBOBJS = @LIBOBJS@

4098

LIBS = @LIBS@

4099

LIBTOOL = @LIBTOOL@

4100

+LIBUFS_LIBS = @LIBUFS_LIBS@

4101

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4102

LINUX_INPUT_H = @LINUX_INPUT_H@

4103

LIPO = @LIPO@

4104

@@ -174,6 +175,8 @@

4105

PATH_SEPARATOR = @PATH_SEPARATOR@

4106

PCI_IDS_DIR = @PCI_IDS_DIR@

4107

PKG_CONFIG = @PKG_CONFIG@

4108

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4109

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4110

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4111

POLKIT_LIBS = @POLKIT_LIBS@

4112

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4113

Index: hal/hald/freebsd/Makefile.in

4114

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

4115

--- hal.orig/hald/freebsd/Makefile.in 2011-02-14 11:43:49.831499233 +0100

4116

+++ hal/hald/freebsd/Makefile.in 2011-02-14 11:44:40.000000000 +0100

4117

@@ -1,4 +1,4 @@

4118

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

4119

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

4120

# @configure_input@

4121

4122

4123

@@ -205,6 +205,7 @@

4124

LIBOBJS = @LIBOBJS@

4125

LIBS = @LIBS@

4126

LIBTOOL = @LIBTOOL@

4127

+LIBUFS_LIBS = @LIBUFS_LIBS@

4128

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4129

LINUX_INPUT_H = @LINUX_INPUT_H@

4130

LIPO = @LIPO@

4131

@@ -235,6 +236,8 @@

4132

PATH_SEPARATOR = @PATH_SEPARATOR@

4133

PCI_IDS_DIR = @PCI_IDS_DIR@

4134

PKG_CONFIG = @PKG_CONFIG@

4135

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4136

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4137

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4138

POLKIT_LIBS = @POLKIT_LIBS@

4139

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4140

@@ -438,7 +441,7 @@

4141

# (which will cause the Makefiles to be regenerated when you run `make');

4142

# (2) otherwise, pass the desired values on the `make' command line.

4143

$(RECURSIVE_TARGETS):

4144

- @failcom='exit 1'; \

4145

+ @fail= failcom='exit 1'; \

4146

for f in x $$MAKEFLAGS; do \

4147

case $$f in \

4148

*=* | --[!k]*);; \

4149

@@ -463,7 +466,7 @@

4150

fi; test -z "$$fail"

4151

4152

$(RECURSIVE_CLEAN_TARGETS):

4153

- @failcom='exit 1'; \

4154

+ @fail= failcom='exit 1'; \

4155

for f in x $$MAKEFLAGS; do \

4156

case $$f in \

4157

*=* | --[!k]*);; \

4158

Index: hal/hald/freebsd/addons/Makefile.in

4159

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

4160

--- hal.orig/hald/freebsd/addons/Makefile.in 2011-02-14 11:43:49.821499233 +0100

4161

+++ hal/hald/freebsd/addons/Makefile.in 2011-02-14 11:44:41.000000000 +0100

4162

@@ -1,4 +1,4 @@

4163

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

4164

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

4165

# @configure_input@

4166

4167

4168

@@ -159,6 +159,7 @@

4169

LIBOBJS = @LIBOBJS@

4170

LIBS = @LIBS@

4171

LIBTOOL = @LIBTOOL@

4172

+LIBUFS_LIBS = @LIBUFS_LIBS@

4173

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4174

LINUX_INPUT_H = @LINUX_INPUT_H@

4175

LIPO = @LIPO@

4176

@@ -189,6 +190,8 @@

4177

PATH_SEPARATOR = @PATH_SEPARATOR@

4178

PCI_IDS_DIR = @PCI_IDS_DIR@

4179

PKG_CONFIG = @PKG_CONFIG@

4180

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4181

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4182

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4183

POLKIT_LIBS = @POLKIT_LIBS@

4184

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4185

Index: hal/hald/freebsd/libprobe/Makefile.in

4186

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

4187

--- hal.orig/hald/freebsd/libprobe/Makefile.in 2011-02-14 11:43:49.851499233 +0100

4188

+++ hal/hald/freebsd/libprobe/Makefile.in 2011-02-14 11:44:41.000000000 +0100

4189

@@ -1,4 +1,4 @@

4190

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

4191

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

4192

# @configure_input@

4193

4194

4195

@@ -150,6 +150,7 @@

4196

LIBOBJS = @LIBOBJS@

4197

LIBS = @LIBS@

4198

LIBTOOL = @LIBTOOL@

4199

+LIBUFS_LIBS = @LIBUFS_LIBS@

4200

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4201

LINUX_INPUT_H = @LINUX_INPUT_H@

4202

LIPO = @LIPO@

4203

@@ -180,6 +181,8 @@

4204

PATH_SEPARATOR = @PATH_SEPARATOR@

4205

PCI_IDS_DIR = @PCI_IDS_DIR@

4206

PKG_CONFIG = @PKG_CONFIG@

4207

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4208

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4209

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4210

POLKIT_LIBS = @POLKIT_LIBS@

4211

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4212

Index: hal/hald/freebsd/probing/Makefile.in

4213

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

4214

--- hal.orig/hald/freebsd/probing/Makefile.in 2011-02-14 11:43:49.871499233 +0100

4215

+++ hal/hald/freebsd/probing/Makefile.in 2011-02-14 11:44:41.000000000 +0100

4216

@@ -1,4 +1,4 @@

4217

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

4218

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

4219

# @configure_input@

4220

4221

4222

@@ -199,6 +199,7 @@

4223

LIBOBJS = @LIBOBJS@

4224

LIBS = @LIBS@

4225

LIBTOOL = @LIBTOOL@

4226

+LIBUFS_LIBS = @LIBUFS_LIBS@

4227

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4228

LINUX_INPUT_H = @LINUX_INPUT_H@

4229

LIPO = @LIPO@

4230

@@ -229,6 +230,8 @@

4231

PATH_SEPARATOR = @PATH_SEPARATOR@

4232

PCI_IDS_DIR = @PCI_IDS_DIR@

4233

PKG_CONFIG = @PKG_CONFIG@

4234

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4235

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4236

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4237

POLKIT_LIBS = @POLKIT_LIBS@

4238

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4239

@@ -341,18 +344,18 @@

4240

$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la

4241

4242

hald_probe_storage_SOURCES = freebsd_dvd_rw_utils.c freebsd_dvd_rw_utils.h probe-storage.c

4243

-hald_probe_storage_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @VOLUME_ID_CFLAGS@

4244

+hald_probe_storage_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @BLKID_CFLAGS@

4245

hald_probe_storage_LDADD = \

4246

@GLIB_LIBS@ \

4247

- @VOLUME_ID_LIBS@ \

4248

+ @BLKID_LIBS@ \

4249

$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la

4250

4251

hald_probe_volume_SOURCES = freebsd_dvd_rw_utils.c freebsd_dvd_rw_utils.h probe-volume.c

4252

-hald_probe_volume_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @VOLUME_ID_CFLAGS@

4253

+hald_probe_volume_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @BLKID_CFLAGS@

4254

hald_probe_volume_LDADD = \

4255

@GLIB_LIBS@ \

4256

- @VOLUME_ID_LIBS@ \

4257

- -lufs \

4258

+ @BLKID_LIBS@ \

4259

+ @LIBUFS_LIBS@ \

4260

$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la

4261

4262

all: all-am

4263

Index: hal/hald/linux/Makefile.in

4264

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

4265

--- hal.orig/hald/linux/Makefile.in 2011-02-14 11:43:49.771499233 +0100

4266

+++ hal/hald/linux/Makefile.in 2011-02-14 11:44:41.000000000 +0100

4267

@@ -1,4 +1,4 @@

4268

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

4269

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

4270

# @configure_input@

4271

4272

4273

@@ -201,6 +201,7 @@

4274

LIBOBJS = @LIBOBJS@

4275

LIBS = @LIBS@

4276

LIBTOOL = @LIBTOOL@

4277

+LIBUFS_LIBS = @LIBUFS_LIBS@

4278

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4279

LINUX_INPUT_H = @LINUX_INPUT_H@

4280

LIPO = @LIPO@

4281

@@ -231,6 +232,8 @@

4282

PATH_SEPARATOR = @PATH_SEPARATOR@

4283

PCI_IDS_DIR = @PCI_IDS_DIR@

4284

PKG_CONFIG = @PKG_CONFIG@

4285

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4286

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4287

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4288

POLKIT_LIBS = @POLKIT_LIBS@

4289

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4290

@@ -418,7 +421,7 @@

4291

# (which will cause the Makefiles to be regenerated when you run `make');

4292

# (2) otherwise, pass the desired values on the `make' command line.

4293

$(RECURSIVE_TARGETS):

4294

- @failcom='exit 1'; \

4295

+ @fail= failcom='exit 1'; \

4296

for f in x $$MAKEFLAGS; do \

4297

case $$f in \

4298

*=* | --[!k]*);; \

4299

@@ -443,7 +446,7 @@

4300

fi; test -z "$$fail"

4301

4302

$(RECURSIVE_CLEAN_TARGETS):

4303

- @failcom='exit 1'; \

4304

+ @fail= failcom='exit 1'; \

4305

for f in x $$MAKEFLAGS; do \

4306

case $$f in \

4307

*=* | --[!k]*);; \

4308

Index: hal/hald/linux/addons/Makefile.in

4309

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

4310

--- hal.orig/hald/linux/addons/Makefile.in 2011-02-14 11:43:49.751499233 +0100

4311

+++ hal/hald/linux/addons/Makefile.in 2011-02-14 11:44:41.000000000 +0100

4312

@@ -1,4 +1,4 @@

4313

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

4314

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

4315

# @configure_input@

4316

4317

4318

@@ -343,6 +343,7 @@

4319

LIBOBJS = @LIBOBJS@

4320

LIBS = @LIBS@

4321

LIBTOOL = @LIBTOOL@

4322

+LIBUFS_LIBS = @LIBUFS_LIBS@

4323

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4324

LINUX_INPUT_H = @LINUX_INPUT_H@

4325

LIPO = @LIPO@

4326

@@ -373,6 +374,8 @@

4327

PATH_SEPARATOR = @PATH_SEPARATOR@

4328

PCI_IDS_DIR = @PCI_IDS_DIR@

4329

PKG_CONFIG = @PKG_CONFIG@

4330

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4331

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4332

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4333

POLKIT_LIBS = @POLKIT_LIBS@

4334

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4335

Index: hal/hald/linux/probing/Makefile.in

4336

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

4337

--- hal.orig/hald/linux/probing/Makefile.in 2011-02-14 11:43:49.791499233 +0100

4338

+++ hal/hald/linux/probing/Makefile.in 2011-02-14 11:44:42.000000000 +0100

4339

@@ -1,4 +1,4 @@

4340

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

4341

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

4342

# @configure_input@

4343

4344

4345

@@ -44,7 +44,8 @@

4346

@HALD_COMPILE_LINUX_TRUE@ hald-probe-serial$(EXEEXT) \

4347

@HALD_COMPILE_LINUX_TRUE@ hald-probe-ieee1394-unit$(EXEEXT) \

4348

@HALD_COMPILE_LINUX_TRUE@ hald-probe-net-bluetooth$(EXEEXT) \

4349

-@HALD_COMPILE_LINUX_TRUE@ hald-probe-video4linux$(EXEEXT)

4350

+@HALD_COMPILE_LINUX_TRUE@ $(am__EXEEXT_1)

4351

+@HALD_COMPILE_LINUX_TRUE@@HAVE_V4L1_TRUE@am__append_1 = hald-probe-video4linux

4352

subdir = hald/linux/probing

4353

DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

4354

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

4355

@@ -56,6 +57,7 @@

4356

CONFIG_HEADER = $(top_builddir)/config.h

4357

CONFIG_CLEAN_FILES =

4358

CONFIG_CLEAN_VPATH_FILES =

4359

+@HALD_COMPILE_LINUX_TRUE@@HAVE_V4L1_TRUE@am__EXEEXT_1 = hald-probe-video4linux$(EXEEXT)

4360

am__installdirs = "$(DESTDIR)$(libexecdir)"

4361

PROGRAMS = $(libexec_PROGRAMS)

4362

am_hald_probe_hiddev_OBJECTS = probe-hiddev.$(OBJEXT) logger.$(OBJEXT)

4363

@@ -215,6 +217,7 @@

4364

LIBOBJS = @LIBOBJS@

4365

LIBS = @LIBS@

4366

LIBTOOL = @LIBTOOL@

4367

+LIBUFS_LIBS = @LIBUFS_LIBS@

4368

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4369

LINUX_INPUT_H = @LINUX_INPUT_H@

4370

LIPO = @LIPO@

4371

@@ -245,6 +248,8 @@

4372

PATH_SEPARATOR = @PATH_SEPARATOR@

4373

PCI_IDS_DIR = @PCI_IDS_DIR@

4374

PKG_CONFIG = @PKG_CONFIG@

4375

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4376

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4377

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4378

POLKIT_LIBS = @POLKIT_LIBS@

4379

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4380

Index: hal/hald/solaris/Makefile.in

4381

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

4382

--- hal.orig/hald/solaris/Makefile.in 2011-02-14 11:43:49.701499233 +0100

4383

+++ hal/hald/solaris/Makefile.in 2011-02-14 11:44:42.000000000 +0100

4384

@@ -1,4 +1,4 @@

4385

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

4386

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

4387

# @configure_input@

4388

4389

4390

@@ -185,6 +185,7 @@

4391

LIBOBJS = @LIBOBJS@

4392

LIBS = @LIBS@

4393

LIBTOOL = @LIBTOOL@

4394

+LIBUFS_LIBS = @LIBUFS_LIBS@

4395

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4396

LINUX_INPUT_H = @LINUX_INPUT_H@

4397

LIPO = @LIPO@

4398

@@ -215,6 +216,8 @@

4399

PATH_SEPARATOR = @PATH_SEPARATOR@

4400

PCI_IDS_DIR = @PCI_IDS_DIR@

4401

PKG_CONFIG = @PKG_CONFIG@

4402

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4403

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4404

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4405

POLKIT_LIBS = @POLKIT_LIBS@

4406

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4407

@@ -401,7 +404,7 @@

4408

# (which will cause the Makefiles to be regenerated when you run `make');

4409

# (2) otherwise, pass the desired values on the `make' command line.

4410

$(RECURSIVE_TARGETS):

4411

- @failcom='exit 1'; \

4412

+ @fail= failcom='exit 1'; \

4413

for f in x $$MAKEFLAGS; do \

4414

case $$f in \

4415

*=* | --[!k]*);; \

4416

@@ -426,7 +429,7 @@

4417

fi; test -z "$$fail"

4418

4419

$(RECURSIVE_CLEAN_TARGETS):

4420

- @failcom='exit 1'; \

4421

+ @fail= failcom='exit 1'; \

4422

for f in x $$MAKEFLAGS; do \

4423

case $$f in \

4424

*=* | --[!k]*);; \

4425

Index: hal/hald/solaris/addons/Makefile.in

4426

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

4427

--- hal.orig/hald/solaris/addons/Makefile.in 2011-02-14 11:43:49.691499233 +0100

4428

+++ hal/hald/solaris/addons/Makefile.in 2011-02-14 11:44:42.000000000 +0100

4429

@@ -1,4 +1,4 @@

4430

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

4431

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

4432

# @configure_input@

4433

4434

4435

@@ -148,6 +148,7 @@

4436

LIBOBJS = @LIBOBJS@

4437

LIBS = @LIBS@

4438

LIBTOOL = @LIBTOOL@

4439

+LIBUFS_LIBS = @LIBUFS_LIBS@

4440

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4441

LINUX_INPUT_H = @LINUX_INPUT_H@

4442

LIPO = @LIPO@

4443

@@ -178,6 +179,8 @@

4444

PATH_SEPARATOR = @PATH_SEPARATOR@

4445

PCI_IDS_DIR = @PCI_IDS_DIR@

4446

PKG_CONFIG = @PKG_CONFIG@

4447

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4448

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4449

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4450

POLKIT_LIBS = @POLKIT_LIBS@

4451

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4452

Index: hal/hald/solaris/probing/Makefile.in

4453

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

4454

--- hal.orig/hald/solaris/probing/Makefile.in 2011-02-14 11:43:49.721499233 +0100

4455

+++ hal/hald/solaris/probing/Makefile.in 2011-02-14 11:44:42.000000000 +0100

4456

@@ -1,4 +1,4 @@

4457

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

4458

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

4459

# @configure_input@

4460

4461

4462

@@ -168,6 +168,7 @@

4463

LIBOBJS = @LIBOBJS@

4464

LIBS = @LIBS@

4465

LIBTOOL = @LIBTOOL@

4466

+LIBUFS_LIBS = @LIBUFS_LIBS@

4467

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4468

LINUX_INPUT_H = @LINUX_INPUT_H@

4469

LIPO = @LIPO@

4470

@@ -198,6 +199,8 @@

4471

PATH_SEPARATOR = @PATH_SEPARATOR@

4472

PCI_IDS_DIR = @PCI_IDS_DIR@

4473

PKG_CONFIG = @PKG_CONFIG@

4474

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4475

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4476

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4477

POLKIT_LIBS = @POLKIT_LIBS@

4478

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4479

Index: hal/libhal-storage/Makefile.in

4480

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

4481

--- hal.orig/libhal-storage/Makefile.in 2011-02-14 11:43:49.391499233 +0100

4482

+++ hal/libhal-storage/Makefile.in 2011-02-14 11:44:42.000000000 +0100

4483

@@ -1,4 +1,4 @@

4484

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

4485

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

4486

# @configure_input@

4487

4488

4489

@@ -174,6 +174,7 @@

4490

LIBOBJS = @LIBOBJS@

4491

LIBS = @LIBS@

4492

LIBTOOL = @LIBTOOL@

4493

+LIBUFS_LIBS = @LIBUFS_LIBS@

4494

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4495

LINUX_INPUT_H = @LINUX_INPUT_H@

4496

LIPO = @LIPO@

4497

@@ -204,6 +205,8 @@

4498

PATH_SEPARATOR = @PATH_SEPARATOR@

4499

PCI_IDS_DIR = @PCI_IDS_DIR@

4500

PKG_CONFIG = @PKG_CONFIG@

4501

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4502

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4503

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4504

POLKIT_LIBS = @POLKIT_LIBS@

4505

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4506

Index: hal/libhal/Makefile.in

4507

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

4508

--- hal.orig/libhal/Makefile.in 2011-02-14 11:43:49.641499233 +0100

4509

+++ hal/libhal/Makefile.in 2011-02-14 11:44:42.000000000 +0100

4510

@@ -1,4 +1,4 @@

4511

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

4512

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

4513

# @configure_input@

4514

4515

4516

@@ -174,6 +174,7 @@

4517

LIBOBJS = @LIBOBJS@

4518

LIBS = @LIBS@

4519

LIBTOOL = @LIBTOOL@

4520

+LIBUFS_LIBS = @LIBUFS_LIBS@

4521

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4522

LINUX_INPUT_H = @LINUX_INPUT_H@

4523

LIPO = @LIPO@

4524

@@ -204,6 +205,8 @@

4525

PATH_SEPARATOR = @PATH_SEPARATOR@

4526

PCI_IDS_DIR = @PCI_IDS_DIR@

4527

PKG_CONFIG = @PKG_CONFIG@

4528

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4529

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4530

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4531

POLKIT_LIBS = @POLKIT_LIBS@

4532

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4533

Index: hal/ltmain.sh

4534

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

4535

--- hal.orig/ltmain.sh 2011-02-14 11:43:49.251499233 +0100

4536

+++ hal/ltmain.sh 2011-02-14 11:44:18.331499235 +0100

4537

@@ -1,6 +1,6 @@

4538

# Generated from ltmain.m4sh.

4539

4540

-# ltmain.sh (GNU libtool) 2.2.6

4541

+# ltmain.sh (GNU libtool) 2.2.6b

4542

# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

4543

4544

4545

@@ -65,7 +65,7 @@

4546

# compiler: $LTCC

4547

# compiler flags: $LTCFLAGS

4548

# linker: $LD (gnu? $with_gnu_ld)

4549

-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4

4550

+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2

4551

# automake: $automake_version

4552

# autoconf: $autoconf_version

4553

#

4554

@@ -73,9 +73,9 @@

4555

4556

PROGRAM=ltmain.sh

4557

PACKAGE=libtool

4558

-VERSION="2.2.6 Debian-2.2.6a-4"

4559

+VERSION="2.2.6b Debian-2.2.6b-2"

4560

TIMESTAMP=""

4561

-package_revision=1.3012

4562

+package_revision=1.3017

4563

4564

# Be Bourne compatible

4565

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

4566

Index: hal/partutil/Makefile.in

4567

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

4568

--- hal.orig/partutil/Makefile.in 2011-02-14 11:43:49.891499233 +0100

4569

+++ hal/partutil/Makefile.in 2011-02-14 11:44:42.000000000 +0100

4570

@@ -1,4 +1,4 @@

4571

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

4572

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

4573

# @configure_input@

4574

4575

4576

@@ -145,6 +145,7 @@

4577

LIBOBJS = @LIBOBJS@

4578

LIBS = @LIBS@

4579

LIBTOOL = @LIBTOOL@

4580

+LIBUFS_LIBS = @LIBUFS_LIBS@

4581

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4582

LINUX_INPUT_H = @LINUX_INPUT_H@

4583

LIPO = @LIPO@

4584

@@ -175,6 +176,8 @@

4585

PATH_SEPARATOR = @PATH_SEPARATOR@

4586

PCI_IDS_DIR = @PCI_IDS_DIR@

4587

PKG_CONFIG = @PKG_CONFIG@

4588

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4589

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4590

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4591

POLKIT_LIBS = @POLKIT_LIBS@

4592

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4593

Index: hal/policy/Makefile.in

4594

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

4595

--- hal.orig/policy/Makefile.in 2011-02-14 11:43:49.921499233 +0100

4596

+++ hal/policy/Makefile.in 2011-02-14 11:44:43.000000000 +0100

4597

@@ -1,4 +1,4 @@

4598

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

4599

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

4600

# @configure_input@

4601

4602

4603

@@ -147,6 +147,7 @@

4604

LIBOBJS = @LIBOBJS@

4605

LIBS = @LIBS@

4606

LIBTOOL = @LIBTOOL@

4607

+LIBUFS_LIBS = @LIBUFS_LIBS@

4608

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4609

LINUX_INPUT_H = @LINUX_INPUT_H@

4610

LIPO = @LIPO@

4611

@@ -177,6 +178,8 @@

4612

PATH_SEPARATOR = @PATH_SEPARATOR@

4613

PCI_IDS_DIR = @PCI_IDS_DIR@

4614

PKG_CONFIG = @PKG_CONFIG@

4615

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4616

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4617

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4618

POLKIT_LIBS = @POLKIT_LIBS@

4619

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4620

Index: hal/tools/Makefile.in

4621

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

4622

--- hal.orig/tools/Makefile.in 2011-02-14 11:43:49.581499233 +0100

4623

+++ hal/tools/Makefile.in 2011-02-14 11:44:43.000000000 +0100

4624

@@ -1,4 +1,4 @@

4625

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

4626

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

4627

# @configure_input@

4628

4629

4630

@@ -389,6 +389,7 @@

4631

LIBOBJS = @LIBOBJS@

4632

LIBS = @LIBS@

4633

LIBTOOL = @LIBTOOL@

4634

+LIBUFS_LIBS = @LIBUFS_LIBS@

4635

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4636

LINUX_INPUT_H = @LINUX_INPUT_H@

4637

LIPO = @LIPO@

4638

@@ -419,6 +420,8 @@

4639

PATH_SEPARATOR = @PATH_SEPARATOR@

4640

PCI_IDS_DIR = @PCI_IDS_DIR@

4641

PKG_CONFIG = @PKG_CONFIG@

4642

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4643

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4644

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4645

POLKIT_LIBS = @POLKIT_LIBS@

4646

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4647

@@ -912,7 +915,7 @@

4648

# (which will cause the Makefiles to be regenerated when you run `make');

4649

# (2) otherwise, pass the desired values on the `make' command line.

4650

$(RECURSIVE_TARGETS):

4651

- @failcom='exit 1'; \

4652

+ @fail= failcom='exit 1'; \

4653

for f in x $$MAKEFLAGS; do \

4654

case $$f in \

4655

*=* | --[!k]*);; \

4656

@@ -937,7 +940,7 @@

4657

fi; test -z "$$fail"

4658

4659

$(RECURSIVE_CLEAN_TARGETS):

4660

- @failcom='exit 1'; \

4661

+ @fail= failcom='exit 1'; \

4662

for f in x $$MAKEFLAGS; do \

4663

case $$f in \

4664

*=* | --[!k]*);; \

4665

Index: hal/tools/freebsd/Makefile.in

4666

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

4667

--- hal.orig/tools/freebsd/Makefile.in 2011-02-14 11:43:49.621499233 +0100

4668

+++ hal/tools/freebsd/Makefile.in 2011-02-14 11:44:43.000000000 +0100

4669

@@ -1,4 +1,4 @@

4670

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

4671

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

4672

# @configure_input@

4673

4674

4675

@@ -138,6 +138,7 @@

4676

LIBOBJS = @LIBOBJS@

4677

LIBS = @LIBS@

4678

LIBTOOL = @LIBTOOL@

4679

+LIBUFS_LIBS = @LIBUFS_LIBS@

4680

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4681

LINUX_INPUT_H = @LINUX_INPUT_H@

4682

LIPO = @LIPO@

4683

@@ -168,6 +169,8 @@

4684

PATH_SEPARATOR = @PATH_SEPARATOR@

4685

PCI_IDS_DIR = @PCI_IDS_DIR@

4686

PKG_CONFIG = @PKG_CONFIG@

4687

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4688

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4689

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4690

POLKIT_LIBS = @POLKIT_LIBS@

4691

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@

4692

Index: hal/tools/linux/Makefile.in

4693

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

4694

--- hal.orig/tools/linux/Makefile.in 2011-02-14 11:43:49.601499233 +0100

4695

+++ hal/tools/linux/Makefile.in 2011-02-14 11:44:43.000000000 +0100

4696

@@ -1,4 +1,4 @@

4697

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

4698

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

4699

# @configure_input@

4700

4701

4702

@@ -144,6 +144,7 @@

4703

LIBOBJS = @LIBOBJS@

4704

LIBS = @LIBS@

4705

LIBTOOL = @LIBTOOL@

4706

+LIBUFS_LIBS = @LIBUFS_LIBS@

4707

LIBUSB20_LIBS = @LIBUSB20_LIBS@

4708

LINUX_INPUT_H = @LINUX_INPUT_H@

4709

LIPO = @LIPO@

4710

@@ -174,6 +175,8 @@

4711

PATH_SEPARATOR = @PATH_SEPARATOR@

4712

PCI_IDS_DIR = @PCI_IDS_DIR@

4713

PKG_CONFIG = @PKG_CONFIG@

4714

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

4715

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

4716

POLKIT_CFLAGS = @POLKIT_CFLAGS@

4717

POLKIT_LIBS = @POLKIT_LIBS@

4718

POLKIT_POLICY_FILE_VALIDATE = @POLKIT_POLICY_FILE_VALIDATE@