~ubuntu-branches/ubuntu/intrepid/gpib/intrepid : revision 2

1

Index: linux-gpib-3.2.02/examples/Makefile.in

2

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

3

--- linux-gpib-3.2.02.orig/examples/Makefile.in 2004-12-30 04:16:27.000000000 +0100

4

+++ linux-gpib-3.2.02/examples/Makefile.in 2005-01-17 15:55:57.293747659 +0100

5

@@ -45,8 +45,7 @@

6

subdir = examples

7

DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

8

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

9

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

10

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

11

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

12

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

13

$(ACLOCAL_M4)

14

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

15

@@ -174,7 +173,6 @@

16

PHP_CONFIG = @PHP_CONFIG@

17

PYTHON = @PYTHON@

18

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

19

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

20

PYTHON_PLATFORM = @PYTHON_PLATFORM@

21

PYTHON_PREFIX = @PYTHON_PREFIX@

22

PYTHON_VERSION = @PYTHON_VERSION@

23

@@ -182,16 +180,6 @@

24

SET_MAKE = @SET_MAKE@

25

SHELL = @SHELL@

26

STRIP = @STRIP@

27

-TCL_BIN_DIR = @TCL_BIN_DIR@

28

-TCL_INC_DIR = @TCL_INC_DIR@

29

-TCL_LIB_FILE = @TCL_LIB_FILE@

30

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

31

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

32

-TCL_SRC_DIR = @TCL_SRC_DIR@

33

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

34

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

35

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

36

-TCL_VERSION = @TCL_VERSION@

37

VERSION = @VERSION@

38

YACC = @YACC@

39

ac_ct_AR = @ac_ct_AR@

40

Index: linux-gpib-3.2.02/language/guile/Makefile.in

41

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

42

--- linux-gpib-3.2.02.orig/language/guile/Makefile.in 2004-12-30 04:16:31.000000000 +0100

43

+++ linux-gpib-3.2.02/language/guile/Makefile.in 2005-01-17 15:56:01.057880903 +0100

44

@@ -52,8 +52,7 @@

45

DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \

46

$(srcdir)/Makefile.in

47

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

48

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

49

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

50

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

51

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

52

$(ACLOCAL_M4)

53

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

54

@@ -167,7 +166,6 @@

55

PHP_CONFIG = @PHP_CONFIG@

56

PYTHON = @PYTHON@

57

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

58

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

59

PYTHON_PLATFORM = @PYTHON_PLATFORM@

60

PYTHON_PREFIX = @PYTHON_PREFIX@

61

PYTHON_VERSION = @PYTHON_VERSION@

62

@@ -175,16 +173,6 @@

63

SET_MAKE = @SET_MAKE@

64

SHELL = @SHELL@

65

STRIP = @STRIP@

66

-TCL_BIN_DIR = @TCL_BIN_DIR@

67

-TCL_INC_DIR = @TCL_INC_DIR@

68

-TCL_LIB_FILE = @TCL_LIB_FILE@

69

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

70

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

71

-TCL_SRC_DIR = @TCL_SRC_DIR@

72

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

73

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

74

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

75

-TCL_VERSION = @TCL_VERSION@

76

VERSION = @VERSION@

77

YACC = @YACC@

78

ac_ct_AR = @ac_ct_AR@

79

Index: linux-gpib-3.2.02/Makefile.in

80

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

81

--- linux-gpib-3.2.02.orig/Makefile.in 2004-12-30 04:16:47.000000000 +0100

82

+++ linux-gpib-3.2.02/Makefile.in 2005-01-17 15:56:11.912265110 +0100

83

@@ -51,8 +51,7 @@

84

ltmain.sh missing mkinstalldirs py-compile

85

subdir = .

86

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

87

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

88

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

89

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

90

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

91

$(ACLOCAL_M4)

92

am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

93

@@ -161,7 +160,6 @@

94

PHP_CONFIG = @PHP_CONFIG@

95

PYTHON = @PYTHON@

96

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

97

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

98

PYTHON_PLATFORM = @PYTHON_PLATFORM@

99

PYTHON_PREFIX = @PYTHON_PREFIX@

100

PYTHON_VERSION = @PYTHON_VERSION@

101

@@ -169,16 +167,6 @@

102

SET_MAKE = @SET_MAKE@

103

SHELL = @SHELL@

104

STRIP = @STRIP@

105

-TCL_BIN_DIR = @TCL_BIN_DIR@

106

-TCL_INC_DIR = @TCL_INC_DIR@

107

-TCL_LIB_FILE = @TCL_LIB_FILE@

108

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

109

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

110

-TCL_SRC_DIR = @TCL_SRC_DIR@

111

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

112

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

113

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

114

-TCL_VERSION = @TCL_VERSION@

115

VERSION = @VERSION@

116

YACC = @YACC@

117

ac_ct_AR = @ac_ct_AR@

118

@@ -419,7 +407,6 @@

119

distdir: $(DISTFILES)

120

$(am__remove_distdir)

121

mkdir $(distdir)

122

- $(mkdir_p) $(distdir)/m4

123

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

124

topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

125

list='$(DISTFILES)'; for file in $$list; do \

126

Index: linux-gpib-3.2.02/missing

127

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

128

--- linux-gpib-3.2.02.orig/missing 2003-07-06 00:04:59.000000000 +0200

129

+++ linux-gpib-3.2.02/missing 2005-01-17 15:55:53.936628821 +0100

130

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

131

#! /bin/sh

132

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

133

134

+

135

+scriptversion=2004-09-07.08

136

+

137

138

+# Free Software Foundation, Inc.

139

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

140

141

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

142

@@ -38,18 +42,24 @@

143

configure_ac=configure.in

144

fi

145

146

+msg="missing on your system"

147

+

148

case "$1" in

149

--run)

150

# Try to run requested program, and just exit if it succeeds.

151

run=

152

shift

153

"$@" && exit 0

154

+ # Exit code 63 means version mismatch. This often happens

155

+ # when the user try to use an ancient version of a tool on

156

+ # a file that requires a minimum version. In this case we

157

+ # we should proceed has if the program had been absent, or

158

+ # if --run hadn't been passed.

159

+ if test $? = 63; then

160

+ run=:

161

+ msg="probably too old"

162

+ fi

163

;;

164

-esac

165

-

166

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

167

-# try to emulate it.

168

-case "$1" in

169

170

-h|--h|--he|--hel|--help)

171

echo "\

172

@@ -74,11 +84,15 @@

173

lex create \`lex.yy.c', if possible, from existing .c

174

makeinfo touch the output file

175

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

176

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

177

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

178

+

179

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

180

+ exit 0

181

;;

182

183

-v|--v|--ve|--ver|--vers|--versi|--versio|--version)

184

- echo "missing 0.3 - GNU automake"

185

+ echo "missing $scriptversion (GNU Automake)"

186

+ exit 0

187

;;

188

189

-*)

190

@@ -87,9 +101,44 @@

191

exit 1

192

;;

193

194

- aclocal)

195

+esac

196

+

197

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

198

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

199

+# the program).

200

+case "$1" in

201

+ lex|yacc)

202

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

203

+ ;;

204

+

205

+ tar)

206

+ if test -n "$run"; then

207

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

208

+ exit 1

209

+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then

210

+ exit 1

211

+ fi

212

+ ;;

213

+

214

+ *)

215

+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then

216

+ # We have it, but it failed.

217

+ exit 1

218

+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then

219

+ # Could not run --version or --help. This is probably someone

220

+ # running `$TOOL --version' or `$TOOL --help' to check whether

221

+ # $TOOL exists and not knowing $TOOL uses missing.

222

+ exit 1

223

+ fi

224

+ ;;

225

+esac

226

+

227

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

228

+# try to emulate it.

229

+case "$1" in

230

+ aclocal*)

231

echo 1>&2 "\

232

-WARNING: \`$1' is missing on your system. You should only need it if

233

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

234

you modified \`acinclude.m4' or \`${configure_ac}'. You might want

235

to install the \`Automake' and \`Perl' packages. Grab them from

236

any GNU archive site."

237

@@ -98,7 +147,7 @@

238

239

autoconf)

240

echo 1>&2 "\

241

-WARNING: \`$1' is missing on your system. You should only need it if

242

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

243

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

244

\`Autoconf' and \`GNU m4' packages. Grab them from any GNU

245

archive site."

246

@@ -107,7 +156,7 @@

247

248

autoheader)

249

echo 1>&2 "\

250

-WARNING: \`$1' is missing on your system. You should only need it if

251

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

252

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

253

to install the \`Autoconf' and \`GNU m4' packages. Grab them

254

from any GNU archive site."

255

@@ -124,9 +173,9 @@

256

touch $touch_files

257

;;

258

259

- automake)

260

+ automake*)

261

echo 1>&2 "\

262

-WARNING: \`$1' is missing on your system. You should only need it if

263

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

264

you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.

265

You might want to install the \`Automake' and \`Perl' packages.

266

Grab them from any GNU archive site."

267

@@ -135,9 +184,32 @@

268

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

269

;;

270

271

+ autom4te)

272

+ echo 1>&2 "\

273

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

274

+ You might have modified some files without having the

275

+ proper tools for further handling them.

276

+ You can get \`$1' as part of \`Autoconf' from any GNU

277

+ archive site."

278

+

279

+ file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'`

280

+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'`

281

+ if test -f "$file"; then

282

+ touch $file

283

+ else

284

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

285

+ echo "#! /bin/sh"

286

+ echo "# Created by GNU Automake missing as a replacement of"

287

+ echo "# $ $@"

288

+ echo "exit 0"

289

+ chmod +x $file

290

+ exit 1

291

+ fi

292

+ ;;

293

+

294

bison|yacc)

295

echo 1>&2 "\

296

-WARNING: \`$1' is missing on your system. You should only need it if

297

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

298

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

299

in order for those modifications to take effect. You can get

300

\`Bison' from any GNU archive site."

301

@@ -167,7 +239,7 @@

302

303

lex|flex)

304

echo 1>&2 "\

305

-WARNING: \`$1' is missing on your system. You should only need it if

306

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

307

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

308

in order for those modifications to take effect. You can get

309

\`Flex' from any GNU archive site."

310

@@ -190,7 +262,7 @@

311

312

help2man)

313

echo 1>&2 "\

314

-WARNING: \`$1' is missing on your system. You should only need it if

315

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

316

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

317

\`Help2man' package in order for those modifications to take

318

effect. You can get \`Help2man' from any GNU archive site."

319

@@ -209,13 +281,8 @@

320

;;

321

322

makeinfo)

323

- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then

324

- # We have makeinfo, but it failed.

325

- exit 1

326

- fi

327

-

328

echo 1>&2 "\

329

-WARNING: \`$1' is missing on your system. You should only need it if

330

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

331

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

332

indirectly affecting the aspect of the manual. The spurious

333

call might also be the consequence of using a buggy \`make' (AIX,

334

@@ -231,32 +298,28 @@

335

336

tar)

337

shift

338

- if test -n "$run"; then

339

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

340

- exit 1

341

- fi

342

343

# We have already tried tar in the generic part.

344

# Look for gnutar/gtar before invocation to avoid ugly error

345

# messages.

346

if (gnutar --version > /dev/null 2>&1); then

347

- gnutar ${1+"$@"} && exit 0

348

+ gnutar "$@" && exit 0

349

fi

350

if (gtar --version > /dev/null 2>&1); then

351

- gtar ${1+"$@"} && exit 0

352

+ gtar "$@" && exit 0

353

fi

354

firstarg="$1"

355

if shift; then

356

case "$firstarg" in

357

*o*)

358

firstarg=`echo "$firstarg" | sed s/o//`

359

- tar "$firstarg" ${1+"$@"} && exit 0

360

+ tar "$firstarg" "$@" && exit 0

361

;;

362

esac

363

case "$firstarg" in

364

*h*)

365

firstarg=`echo "$firstarg" | sed s/h//`

366

- tar "$firstarg" ${1+"$@"} && exit 0

367

+ tar "$firstarg" "$@" && exit 0

368

;;

369

esac

370

fi

371

@@ -270,10 +333,10 @@

372

373

*)

374

echo 1>&2 "\

375

-WARNING: \`$1' is needed, and you do not seem to have it handy on your

376

- system. You might have modified some files without having the

377

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

378

+ You might have modified some files without having the

379

proper tools for further handling them. Check the \`README' file,

380

- it often tells you about the needed prerequirements for installing

381

+ it often tells you about the needed prerequisites for installing

382

this package. You may also peek at any GNU archive site, in case

383

some other package would contain this missing \`$1' program."

384

exit 1

385

@@ -281,3 +344,10 @@

386

esac

387

388

exit 0

389

+

390

+# Local variables:

391

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

392

+# time-stamp-start: "scriptversion="

393

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

394

+# time-stamp-end: "$"

395

+# End:

396

Index: linux-gpib-3.2.02/doc/Makefile.in

397

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

398

--- linux-gpib-3.2.02.orig/doc/Makefile.in 2004-12-30 04:16:23.000000000 +0100

399

+++ linux-gpib-3.2.02/doc/Makefile.in 2005-01-17 15:55:54.377644432 +0100

400

@@ -48,8 +48,7 @@

401

subdir = doc

402

DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

403

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

404

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

405

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

406

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

407

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

408

$(ACLOCAL_M4)

409

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

410

@@ -146,7 +145,6 @@

411

PHP_CONFIG = @PHP_CONFIG@

412

PYTHON = @PYTHON@

413

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

414

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

415

PYTHON_PLATFORM = @PYTHON_PLATFORM@

416

PYTHON_PREFIX = @PYTHON_PREFIX@

417

PYTHON_VERSION = @PYTHON_VERSION@

418

@@ -154,16 +152,6 @@

419

SET_MAKE = @SET_MAKE@

420

SHELL = @SHELL@

421

STRIP = @STRIP@

422

-TCL_BIN_DIR = @TCL_BIN_DIR@

423

-TCL_INC_DIR = @TCL_INC_DIR@

424

-TCL_LIB_FILE = @TCL_LIB_FILE@

425

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

426

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

427

-TCL_SRC_DIR = @TCL_SRC_DIR@

428

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

429

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

430

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

431

-TCL_VERSION = @TCL_VERSION@

432

VERSION = @VERSION@

433

YACC = @YACC@

434

ac_ct_AR = @ac_ct_AR@

435

Index: linux-gpib-3.2.02/driver/Makefile.in

436

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

437

--- linux-gpib-3.2.02.orig/driver/Makefile.in 2004-12-30 04:16:24.000000000 +0100

438

+++ linux-gpib-3.2.02/driver/Makefile.in 2005-01-17 15:55:55.019667159 +0100

439

@@ -47,8 +47,7 @@

440

subdir = driver

441

DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

442

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

443

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

444

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

445

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

446

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

447

$(ACLOCAL_M4)

448

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

449

@@ -145,7 +144,6 @@

450

PHP_CONFIG = @PHP_CONFIG@

451

PYTHON = @PYTHON@

452

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

453

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

454

PYTHON_PLATFORM = @PYTHON_PLATFORM@

455

PYTHON_PREFIX = @PYTHON_PREFIX@

456

PYTHON_VERSION = @PYTHON_VERSION@

457

@@ -153,16 +151,6 @@

458

SET_MAKE = @SET_MAKE@

459

SHELL = @SHELL@

460

STRIP = @STRIP@

461

-TCL_BIN_DIR = @TCL_BIN_DIR@

462

-TCL_INC_DIR = @TCL_INC_DIR@

463

-TCL_LIB_FILE = @TCL_LIB_FILE@

464

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

465

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

466

-TCL_SRC_DIR = @TCL_SRC_DIR@

467

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

468

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

469

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

470

-TCL_VERSION = @TCL_VERSION@

471

VERSION = @VERSION@

472

YACC = @YACC@

473

ac_ct_AR = @ac_ct_AR@

474

@@ -432,7 +420,7 @@

475

dist-hook

476

check-am: all-am

477

check: check-recursive

478

-all-am: Makefile all-local

479

+all-am: Makefile

480

installdirs: installdirs-recursive

481

installdirs-am:

482

install: install-recursive

483

@@ -461,7 +449,7 @@

484

@echo "it deletes files that may require special tools to rebuild."

485

clean: clean-recursive

486

487

-clean-am: clean-generic clean-libtool clean-local mostlyclean-am

488

+clean-am: clean-generic clean-libtool mostlyclean-am

489

490

distclean: distclean-recursive

491

-rm -f Makefile

492

@@ -479,8 +467,6 @@

493

info-am:

494

495

install-data-am:

496

- @$(NORMAL_INSTALL)

497

- $(MAKE) $(AM_MAKEFLAGS) install-data-hook

498

499

install-exec-am:

500

501

@@ -510,35 +496,34 @@

502

503

uninstall-info: uninstall-info-recursive

504

505

-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \

506

- check-am clean clean-generic clean-libtool clean-local \

507

- clean-recursive ctags ctags-recursive dist-hook distclean \

508

- distclean-generic distclean-libtool distclean-recursive \

509

- distclean-tags distdir dvi dvi-am html html-am info info-am \

510

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

511

- install-data-hook install-exec install-exec-am install-info \

512

- install-info-am install-man install-strip installcheck \

513

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

514

- maintainer-clean-generic maintainer-clean-recursive \

515

- mostlyclean mostlyclean-generic mostlyclean-libtool \

516

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

517

- uninstall uninstall-am uninstall-info-am

518

+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \

519

+ clean clean-generic clean-libtool clean-recursive ctags \

520

+ ctags-recursive dist-hook distclean distclean-generic \

521

+ distclean-libtool distclean-recursive distclean-tags distdir \

522

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

523

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

524

+ install-info install-info-am install-man install-strip \

525

+ installcheck installcheck-am installdirs installdirs-am \

526

+ maintainer-clean maintainer-clean-generic \

527

+ maintainer-clean-recursive mostlyclean mostlyclean-generic \

528

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

529

+ tags tags-recursive uninstall uninstall-am uninstall-info-am

530

531

532

-include $(top_srcdir)/util/linux_flags/flags

533

534

-all-local:

535

+modules-all-local:

536

$(RM) $(GPIB_MODVERDIR)/*

537

$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\

538

CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \

539

SUBDIRS="$(GPIB_ABS_MODULE_SUBDIRS)" \

540

MODVERDIR="$(GPIB_MODVERDIR)"

541

542

-clean-local:

543

+modules-clean-local:

544

find $(srcdir) $ -name '*.[oas]' -o -name '*.ko' -o -name core -o -name '.*.cmd' $ -type f \

545

-exec $(RM) {} \;

546

547

-install-data-hook: device-file-check /etc/gpib.conf

548

+setup-data-hook: device-file-check /etc/gpib.conf

549

for module in $(GPIB_MODULES) ; do \

550

$(INSTALL_DATA) -D $$module $(LINUX_MODLIB)/gpib/$$(basename $$module) ; \

551

done

552

Index: linux-gpib-3.2.02/configure

553

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

554

--- linux-gpib-3.2.02.orig/configure 2004-12-30 02:51:29.000000000 +0100

555

+++ linux-gpib-3.2.02/configure 2005-01-17 15:55:34.951956733 +0100

556

@@ -463,7 +463,7 @@

557

# include <unistd.h>

558

#endif"

559

560

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GPIB_SO_VERSION ISODATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LINUX_SRCDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL JW_PATH DEPMOD PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PERL TCL_VERSION TCL_BIN_DIR TCL_INC_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC PHP_CONFIG PYTHON_INCLUDES ALLOCA LIBOBJS LIBGPIB_CFLAGS LIBGPIB_LDFLAGS IBMAJOR BUILD_DOCS_TRUE BUILD_DOCS_FALSE BIND_GUILE_TRUE BIND_GUILE_FALSE BIND_PERL_TRUE BIND_PERL_FALSE BIND_PHP_TRUE BIND_PHP_FALSE BIND_PYTHON_TRUE BIND_PYTHON_FALSE BIND_TCL_TRUE BIND_TCL_FALSE LTLIBOBJS'

561

+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GPIB_SO_VERSION ISODATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LINUX_SRCDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL JW_PATH DEPMOD PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PERL PHP_CONFIG ALLOCA LIBOBJS LIBGPIB_CFLAGS LIBGPIB_LDFLAGS IBMAJOR BUILD_DOCS_TRUE BUILD_DOCS_FALSE BIND_GUILE_TRUE BIND_GUILE_FALSE BIND_PERL_TRUE BIND_PERL_FALSE BIND_PHP_TRUE BIND_PHP_FALSE BIND_PYTHON_TRUE BIND_PYTHON_FALSE BIND_TCL_TRUE BIND_TCL_FALSE LTLIBOBJS'

562

ac_subst_files=''

563

564

# Initialize some variables set by options.

565

@@ -1054,7 +1054,6 @@

566

both]

567

--with-tags[=TAGS]

568

include additional configurations [automatic]

569

- --with-tcl=DIR directory containing tcl configuration (tclConfig.sh)

570

571

Some influential environment variables:

572

CC C compiler command

573

@@ -4207,7 +4206,7 @@

574

;;

575

*-*-irix6*)

576

# Find out which ABI we are using.

577

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

578

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

579

if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

580

(eval $ac_compile) 2>&5

581

ac_status=$?

582

@@ -5771,7 +5770,7 @@

583

584

585

# Provide some information about the compiler.

586

-echo "$as_me:5774:" \

587

+echo "$as_me:5773:" \

588

"checking for Fortran 77 compiler version" >&5

589

ac_compiler=`set X $ac_compile; echo $2`

590

{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5

591

@@ -6803,11 +6802,11 @@

592

-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \

593

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

594

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

595

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

596

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

597

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

598

ac_status=$?

599

cat conftest.err >&5

600

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

601

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

602

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

603

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

604

# So say no if there are warnings

605

@@ -7036,11 +7035,11 @@

606

-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \

607

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

608

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

609

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

610

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

611

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

612

ac_status=$?

613

cat conftest.err >&5

614

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

615

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

616

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

617

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

618

# So say no if there are warnings

619

@@ -7096,11 +7095,11 @@

620

-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \

621

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

622

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

623

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

624

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

625

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

626

ac_status=$?

627

cat out/conftest.err >&5

628

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

629

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

630

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

631

then

632

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

633

@@ -9284,7 +9283,7 @@

634

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

635

lt_status=$lt_dlunknown

636

cat > conftest.$ac_ext <<EOF

637

-#line 9287 "configure"

638

+#line 9286 "configure"

639

#include "confdefs.h"

640

641

#if HAVE_DLFCN_H

642

@@ -9382,7 +9381,7 @@

643

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

644

lt_status=$lt_dlunknown

645

cat > conftest.$ac_ext <<EOF

646

-#line 9385 "configure"

647

+#line 9384 "configure"

648

#include "confdefs.h"

649

650

#if HAVE_DLFCN_H

651

@@ -11559,11 +11558,11 @@

652

-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \

653

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

654

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

655

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

656

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

657

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

658

ac_status=$?

659

cat conftest.err >&5

660

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

661

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

662

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

663

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

664

# So say no if there are warnings

665

@@ -11619,11 +11618,11 @@

666

-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \

667

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

668

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

669

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

670

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

671

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

672

ac_status=$?

673

cat out/conftest.err >&5

674

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

675

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

676

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

677

then

678

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

679

@@ -12988,7 +12987,7 @@

680

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

681

lt_status=$lt_dlunknown

682

cat > conftest.$ac_ext <<EOF

683

-#line 12991 "configure"

684

+#line 12990 "configure"

685

#include "confdefs.h"

686

687

#if HAVE_DLFCN_H

688

@@ -13086,7 +13085,7 @@

689

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

690

lt_status=$lt_dlunknown

691

cat > conftest.$ac_ext <<EOF

692

-#line 13089 "configure"

693

+#line 13088 "configure"

694

#include "confdefs.h"

695

696

#if HAVE_DLFCN_H

697

@@ -13913,11 +13912,11 @@

698

-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \

699

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

700

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

701

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

702

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

703

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

704

ac_status=$?

705

cat conftest.err >&5

706

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

707

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

708

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

709

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

710

# So say no if there are warnings

711

@@ -13973,11 +13972,11 @@

712

-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \

713

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

714

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

715

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

716

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

717

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

718

ac_status=$?

719

cat out/conftest.err >&5

720

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

721

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

722

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

723

then

724

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

725

@@ -16018,11 +16017,11 @@

726

-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \

727

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

728

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

729

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

730

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

731

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

732

ac_status=$?

733

cat conftest.err >&5

734

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

735

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

736

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

737

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

738

# So say no if there are warnings

739

@@ -16251,11 +16250,11 @@

740

-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \

741

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

742

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

743

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

744

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

745

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

746

ac_status=$?

747

cat conftest.err >&5

748

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

749

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

750

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

751

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

752

# So say no if there are warnings

753

@@ -16311,11 +16310,11 @@

754

-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \

755

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

756

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

757

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

758

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

759

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

760

ac_status=$?

761

cat out/conftest.err >&5

762

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

763

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

764

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

765

then

766

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

767

@@ -18499,7 +18498,7 @@

768

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

769

lt_status=$lt_dlunknown

770

cat > conftest.$ac_ext <<EOF

771

-#line 18502 "configure"

772

+#line 18501 "configure"

773

#include "confdefs.h"

774

775

#if HAVE_DLFCN_H

776

@@ -18597,7 +18596,7 @@

777

lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

778

lt_status=$lt_dlunknown

779

cat > conftest.$ac_ext <<EOF

780

-#line 18600 "configure"

781

+#line 18599 "configure"

782

#include "confdefs.h"

783

784

#if HAVE_DLFCN_H

785

@@ -19887,163 +19886,13 @@

786

echo "$as_me: perl not found, disabling perl binding" >&6;}

787

BIND_PERL="no"

788

fi

789

-

790

- #

791

- # Ok, lets find the tcl configuration

792

- # First, look for one uninstalled.

793

- # the alternative search directory is invoked by --with-tcl

794

- #

795

-

796

- if test x"${no_tcl}" = x ; then

797

- # we reset no_tcl in case something fails here

798

- no_tcl=true

799

-

800

-# Check whether --with-tcl or --without-tcl was given.

801

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

802

- withval="$with_tcl"

803

- with_tclconfig=${withval}

804

-fi;

805

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

806

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

807

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

808

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

809

-else

810

-

811

-

812

- # First check to see if --with-tcl was specified.

813

- if test x"${with_tclconfig}" != x ; then

814

- if test -f "${with_tclconfig}/tclConfig.sh" ; then

815

- ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`

816

- else

817

- { { echo "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5

818

-echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;}

819

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

820

- fi

821

- fi

822

-

823

- # then check for a private Tcl installation

824

- if test x"${ac_cv_c_tclconfig}" = x ; then

825

- for i in \

826

- ../tcl \

827

- `ls -dr ../tcl[8-9].[0-9]* 2>/dev/null` \

828

- ../../tcl \

829

- `ls -dr ../../tcl[8-9].[0-9]* 2>/dev/null` \

830

- ../../../tcl \

831

- `ls -dr ../../../tcl[8-9].[0-9]* 2>/dev/null` ; do

832

- if test -f "$i/unix/tclConfig.sh" ; then

833

- ac_cv_c_tclconfig=`(cd $i/unix; pwd)`

834

- break

835

- fi

836

- done

837

- fi

838

-

839

- # check in a few common install locations

840

- if test x"${ac_cv_c_tclconfig}" = x ; then

841

- for i in `ls -d ${libdir} 2>/dev/null` \

842

- `ls -d /usr/local/lib 2>/dev/null` \

843

- `ls -d /usr/contrib/lib 2>/dev/null` \

844

- `ls -d /usr/lib 2>/dev/null` \

845

- `ls -dr /usr/lib/tcl[8-9].[0-9]* 2>/dev/null` \

846

- ; do

847

- if test -f "$i/tclConfig.sh" ; then

848

- ac_cv_c_tclconfig=`(cd $i; pwd)`

849

- break

850

- fi

851

- done

852

- fi

853

-

854

- # check in a few other private locations

855

- if test x"${ac_cv_c_tclconfig}" = x ; then

856

- for i in \

857

- ${srcdir}/../tcl \

858

- `ls -dr ${srcdir}/../tcl[8-9].[0-9]* 2>/dev/null` ; do

859

- if test -f "$i/unix/tclConfig.sh" ; then

860

- ac_cv_c_tclconfig=`(cd $i/unix; pwd)`

861

- break

862

- fi

863

- done

864

- fi

865

-

866

-fi

867

-

868

-

869

- if test x"${ac_cv_c_tclconfig}" = x ; then

870

- TCL_BIN_DIR="# no Tcl configs found"

871

- { echo "$as_me:$LINENO: WARNING:

872

- Can't find Tcl configuration definitions, use --with-tcl to specify

873

- a directory." >&5

874

-echo "$as_me: WARNING:

875

- Can't find Tcl configuration definitions, use --with-tcl to specify

876

- a directory." >&2;}

877

- else

878

- no_tcl=

879

- TCL_BIN_DIR=${ac_cv_c_tclconfig}

880

- echo "$as_me:$LINENO: result: found $TCL_BIN_DIR/tclConfig.sh" >&5

881

-echo "${ECHO_T}found $TCL_BIN_DIR/tclConfig.sh" >&6

882

- fi

883

- fi

884

-

885

+SC_PATH_TCLCONFIG

886

if [ $no_tcl ]; then

887

{ echo "$as_me:$LINENO: TCL config not found, disabling TCL binding" >&5

888

echo "$as_me: TCL config not found, disabling TCL binding" >&6;}

889

BIND_TCL="no"

890

else

891

-

892

- echo "$as_me:$LINENO: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5

893

-echo $ECHO_N "checking for existence of $TCL_BIN_DIR/tclConfig.sh... $ECHO_C" >&6

894

-

895

- if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then

896

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

897

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

898

- . $TCL_BIN_DIR/tclConfig.sh

899

- else

900

- echo "$as_me:$LINENO: result: file not found" >&5

901

-echo "${ECHO_T}file not found" >&6

902

- fi

903

-

904

- #

905

- # If the TCL_BIN_DIR is the build directory (not the install directory),

906

- # then set the common variable name to the value of the build variables.

907

- # For example, the variable TCL_LIB_SPEC will be set to the value

908

- # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC

909

- # instead of TCL_BUILD_LIB_SPEC since it will work with both an

910

- # installed and uninstalled version of Tcl.

911

- #

912

-

913

- if test -f $TCL_BIN_DIR/Makefile ; then

914

- TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}

915

- TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}

916

- TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}

917

- fi

918

-

919

- #

920

- # eval is required to do the TCL_DBGX substitution

921

- #

922

-

923

- eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""

924

- eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""

925

- eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""

926

-

927

- eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""

928

- eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""

929

- eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""

930

-

931

-

932

-

933

- if [ ! $TCL_INC_DIR ]; then

934

- TCL_INC_DIR=${TCL_PREFIX}/include

935

- fi

936

-

937

-

938

-

939

-

940

-

941

-

942

-

943

-

944

-

945

-

946

-

947

+ SC_LOAD_TCLCONFIG

948

fi

949

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

950

set dummy php-config; ac_word=$2

951

@@ -20489,59 +20338,6 @@

952

953

done

954

955

-

956

-echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5

957

-echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6

958

-py_prefix=`$PYTHON -c "import sys; print sys.prefix"`

959

-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`

960

-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"

961

-if test "$py_prefix" != "$py_exec_prefix"; then

962

- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"

963

-fi

964

-

965

-save_CPPFLAGS="$CPPFLAGS"

966

-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"

967

-cat >conftest.$ac_ext <<_ACEOF

968

-/* confdefs.h. */

969

-_ACEOF

970

-cat confdefs.h >>conftest.$ac_ext

971

-cat >>conftest.$ac_ext <<_ACEOF

972

-/* end confdefs.h. */

973

-#include <Python.h>

974

-_ACEOF

975

-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5

976

- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1

977

- ac_status=$?

978

- grep -v '^ *+' conftest.er1 >conftest.err

979

- rm -f conftest.er1

980

- cat conftest.err >&5

981

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

982

- (exit $ac_status); } >/dev/null; then

983

- if test -s conftest.err; then

984

- ac_cpp_err=$ac_c_preproc_warn_flag

985

- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

986

- else

987

- ac_cpp_err=

988

- fi

989

-else

990

- ac_cpp_err=yes

991

-fi

992

-if test -z "$ac_cpp_err"; then

993

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

994

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

995

-

996

-else

997

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

998

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

999

-

1000

- echo "$as_me:$LINENO: result: not found" >&5

1001

-echo "${ECHO_T}not found" >&6

1002

-BIND_PYTHON=no;{ echo "$as_me:$LINENO: python headers not found, disabling python binding" >&5

1003

-echo "$as_me: python headers not found, disabling python binding" >&6;}

1004

-fi

1005

-rm -f conftest.err conftest.$ac_ext

1006

-CPPFLAGS="$save_CPPFLAGS"

1007

-

1008

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

1009

echo "$as_me:$LINENO: checking for libguile.h" >&5

1010

echo $ECHO_N "checking for libguile.h... $ECHO_C" >&6

1011

@@ -23335,18 +23131,7 @@

1012

s,@pyexecdir@,$pyexecdir,;t t

1013

s,@pkgpyexecdir@,$pkgpyexecdir,;t t

1014

s,@PERL@,$PERL,;t t

1015

-s,@TCL_VERSION@,$TCL_VERSION,;t t

1016

-s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t

1017

-s,@TCL_INC_DIR@,$TCL_INC_DIR,;t t

1018

-s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t

1019

-s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t

1020

-s,@TCL_LIB_FLAG@,$TCL_LIB_FLAG,;t t

1021

-s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t

1022

-s,@TCL_STUB_LIB_FILE@,$TCL_STUB_LIB_FILE,;t t

1023

-s,@TCL_STUB_LIB_FLAG@,$TCL_STUB_LIB_FLAG,;t t

1024

-s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t

1025

s,@PHP_CONFIG@,$PHP_CONFIG,;t t

1026

-s,@PYTHON_INCLUDES@,$PYTHON_INCLUDES,;t t

1027

s,@ALLOCA@,$ALLOCA,;t t

1028

s,@LIBOBJS@,$LIBOBJS,;t t

1029

s,@LIBGPIB_CFLAGS@,$LIBGPIB_CFLAGS,;t t

1030

Index: linux-gpib-3.2.02/test/Makefile.in

1031

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

1032

--- linux-gpib-3.2.02.orig/test/Makefile.in 2004-12-30 04:16:43.000000000 +0100

1033

+++ linux-gpib-3.2.02/test/Makefile.in 2005-01-17 15:56:08.203133823 +0100

1034

@@ -42,8 +42,7 @@

1035

subdir = test

1036

DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in

1037

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

1038

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

1039

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

1040

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

1041

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

1042

$(ACLOCAL_M4)

1043

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

1044

@@ -149,7 +148,6 @@

1045

PHP_CONFIG = @PHP_CONFIG@

1046

PYTHON = @PYTHON@

1047

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

1048

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

1049

PYTHON_PLATFORM = @PYTHON_PLATFORM@

1050

PYTHON_PREFIX = @PYTHON_PREFIX@

1051

PYTHON_VERSION = @PYTHON_VERSION@

1052

@@ -157,16 +155,6 @@

1053

SET_MAKE = @SET_MAKE@

1054

SHELL = @SHELL@

1055

STRIP = @STRIP@

1056

-TCL_BIN_DIR = @TCL_BIN_DIR@

1057

-TCL_INC_DIR = @TCL_INC_DIR@

1058

-TCL_LIB_FILE = @TCL_LIB_FILE@

1059

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

1060

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

1061

-TCL_SRC_DIR = @TCL_SRC_DIR@

1062

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

1063

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

1064

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

1065

-TCL_VERSION = @TCL_VERSION@

1066

VERSION = @VERSION@

1067

YACC = @YACC@

1068

ac_ct_AR = @ac_ct_AR@

1069

Index: linux-gpib-3.2.02/language/python/Makefile.in

1070

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

1071

--- linux-gpib-3.2.02.orig/language/python/Makefile.in 2004-12-30 04:16:35.000000000 +0100

1072

+++ linux-gpib-3.2.02/language/python/Makefile.in 2005-01-17 15:56:02.582934886 +0100

1073

@@ -47,8 +47,7 @@

1074

subdir = language/python

1075

DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in

1076

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

1077

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

1078

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

1079

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

1080

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

1081

$(ACLOCAL_M4)

1082

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

1083

@@ -136,7 +135,6 @@

1084

PHP_CONFIG = @PHP_CONFIG@

1085

PYTHON = @PYTHON@

1086

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

1087

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

1088

PYTHON_PLATFORM = @PYTHON_PLATFORM@

1089

PYTHON_PREFIX = @PYTHON_PREFIX@

1090

PYTHON_VERSION = @PYTHON_VERSION@

1091

@@ -144,16 +142,6 @@

1092

SET_MAKE = @SET_MAKE@

1093

SHELL = @SHELL@

1094

STRIP = @STRIP@

1095

-TCL_BIN_DIR = @TCL_BIN_DIR@

1096

-TCL_INC_DIR = @TCL_INC_DIR@

1097

-TCL_LIB_FILE = @TCL_LIB_FILE@

1098

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

1099

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

1100

-TCL_SRC_DIR = @TCL_SRC_DIR@

1101

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

1102

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

1103

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

1104

-TCL_VERSION = @TCL_VERSION@

1105

VERSION = @VERSION@

1106

YACC = @YACC@

1107

ac_ct_AR = @ac_ct_AR@

1108

Index: linux-gpib-3.2.02/language/Makefile.in

1109

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

1110

--- linux-gpib-3.2.02.orig/language/Makefile.in 2004-12-30 04:16:30.000000000 +0100

1111

+++ linux-gpib-3.2.02/language/Makefile.in 2005-01-17 15:56:00.487860725 +0100

1112

@@ -47,8 +47,7 @@

1113

subdir = language

1114

DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

1115

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

1116

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

1117

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

1118

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

1119

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

1120

$(ACLOCAL_M4)

1121

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

1122

@@ -145,7 +144,6 @@

1123

PHP_CONFIG = @PHP_CONFIG@

1124

PYTHON = @PYTHON@

1125

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

1126

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

1127

PYTHON_PLATFORM = @PYTHON_PLATFORM@

1128

PYTHON_PREFIX = @PYTHON_PREFIX@

1129

PYTHON_VERSION = @PYTHON_VERSION@

1130

@@ -153,16 +151,6 @@

1131

SET_MAKE = @SET_MAKE@

1132

SHELL = @SHELL@

1133

STRIP = @STRIP@

1134

-TCL_BIN_DIR = @TCL_BIN_DIR@

1135

-TCL_INC_DIR = @TCL_INC_DIR@

1136

-TCL_LIB_FILE = @TCL_LIB_FILE@

1137

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

1138

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

1139

-TCL_SRC_DIR = @TCL_SRC_DIR@

1140

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

1141

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

1142

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

1143

-TCL_VERSION = @TCL_VERSION@

1144

VERSION = @VERSION@

1145

YACC = @YACC@

1146

ac_ct_AR = @ac_ct_AR@

1147

Index: linux-gpib-3.2.02/driver/include/Makefile.in

1148

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

1149

--- linux-gpib-3.2.02.orig/driver/include/Makefile.in 2004-12-30 04:16:25.000000000 +0100

1150

+++ linux-gpib-3.2.02/driver/include/Makefile.in 2005-01-17 15:55:55.588687302 +0100

1151

@@ -49,8 +49,7 @@

1152

DIST_COMMON = $(headers_HEADERS) $(srcdir)/Makefile.am \

1153

$(srcdir)/Makefile.in

1154

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

1155

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

1156

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

1157

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

1158

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

1159

$(ACLOCAL_M4)

1160

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

1161

@@ -149,7 +148,6 @@

1162

PHP_CONFIG = @PHP_CONFIG@

1163

PYTHON = @PYTHON@

1164

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

1165

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

1166

PYTHON_PLATFORM = @PYTHON_PLATFORM@

1167

PYTHON_PREFIX = @PYTHON_PREFIX@

1168

PYTHON_VERSION = @PYTHON_VERSION@

1169

@@ -157,16 +155,6 @@

1170

SET_MAKE = @SET_MAKE@

1171

SHELL = @SHELL@

1172

STRIP = @STRIP@

1173

-TCL_BIN_DIR = @TCL_BIN_DIR@

1174

-TCL_INC_DIR = @TCL_INC_DIR@

1175

-TCL_LIB_FILE = @TCL_LIB_FILE@

1176

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

1177

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

1178

-TCL_SRC_DIR = @TCL_SRC_DIR@

1179

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

1180

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

1181

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

1182

-TCL_VERSION = @TCL_VERSION@

1183

VERSION = @VERSION@

1184

YACC = @YACC@

1185

ac_ct_AR = @ac_ct_AR@

1186

Index: linux-gpib-3.2.02/mkinstalldirs

1187

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

1188

--- linux-gpib-3.2.02.orig/mkinstalldirs 2003-07-06 00:04:59.000000000 +0200

1189

+++ linux-gpib-3.2.02/mkinstalldirs 2005-01-17 15:56:11.636255341 +0100

1190

@@ -1,40 +1,150 @@

1191

#! /bin/sh

1192

# mkinstalldirs --- make directory hierarchy

1193

-# Author: Noah Friedman <friedman@prep.ai.mit.edu>

1194

-# Created: 1993-05-16

1195

-# Public domain

1196

1197

-# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $

1198

+scriptversion=2004-02-15.20

1199

+

1200

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

1201

+# Created: 1993-05-16

1202

+# Public domain.

1203

+#

1204

+# This file is maintained in Automake, please report

1205

+# bugs to <bug-automake@gnu.org> or send patches to

1206

+# <automake-patches@gnu.org>.

1207

1208

errstatus=0

1209

+dirmode=""

1210

+

1211

+usage="\

1212

+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...

1213

+

1214

+Create each directory DIR (with mode MODE, if specified), including all

1215

+leading file name components.

1216

+

1217

+Report bugs to <bug-automake@gnu.org>."

1218

+

1219

+# process command line arguments

1220

+while test $# -gt 0 ; do

1221

+ case $1 in

1222

+ -h | --help | --h*) # -h for help

1223

+ echo "$usage"

1224

+ exit 0

1225

+ ;;

1226

+ -m) # -m PERM arg

1227

+ shift

1228

+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }

1229

+ dirmode=$1

1230

+ shift

1231

+ ;;

1232

+ --version)

1233

+ echo "$0 $scriptversion"

1234

+ exit 0

1235

+ ;;

1236

+ --) # stop option processing

1237

+ shift

1238

+ break

1239

+ ;;

1240

+ -*) # unknown option

1241

+ echo "$usage" 1>&2

1242

+ exit 1

1243

+ ;;

1244

+ *) # first non-opt arg

1245

+ break

1246

+ ;;

1247

+ esac

1248

+done

1249

+

1250

+for file

1251

+do

1252

+ if test -d "$file"; then

1253

+ shift

1254

+ else

1255

+ break

1256

+ fi

1257

+done

1258

+

1259

+case $# in

1260

+ 0) exit 0 ;;

1261

+esac

1262

+

1263

+# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and

1264

+# mkdir -p a/c at the same time, both will detect that a is missing,

1265

+# one will create a, then the other will try to create a and die with

1266

+# a "File exists" error. This is a problem when calling mkinstalldirs

1267

+# from a parallel make. We use --version in the probe to restrict

1268

+# ourselves to GNU mkdir, which is thread-safe.

1269

+case $dirmode in

1270

+ '')

1271

+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then

1272

+ echo "mkdir -p -- $*"

1273

+ exec mkdir -p -- "$@"

1274

+ else

1275

+ # On NextStep and OpenStep, the `mkdir' command does not

1276

+ # recognize any option. It will interpret all options as

1277

+ # directories to create, and then abort because `.' already

1278

+ # exists.

1279

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

1280

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

1281

+ fi

1282

+ ;;

1283

+ *)

1284

+ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&

1285

+ test ! -d ./--version; then

1286

+ echo "mkdir -m $dirmode -p -- $*"

1287

+ exec mkdir -m "$dirmode" -p -- "$@"

1288

+ else

1289

+ # Clean up after NextStep and OpenStep mkdir.

1290

+ for d in ./-m ./-p ./--version "./$dirmode";

1291

+ do

1292

+ test -d $d && rmdir $d

1293

+ done

1294

+ fi

1295

+ ;;

1296

+esac

1297

1298

for file

1299

do

1300

- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`

1301

- shift

1302

+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`

1303

+ shift

1304

1305

- pathcomp=

1306

- for d

1307

- do

1308

- pathcomp="$pathcomp$d"

1309

- case "$pathcomp" in

1310

- -* ) pathcomp=./$pathcomp ;;

1311

- esac

1312

-

1313

- if test ! -d "$pathcomp"; then

1314

- echo "mkdir $pathcomp"

1315

-

1316

- mkdir "$pathcomp" || lasterr=$?

1317

-

1318

- if test ! -d "$pathcomp"; then

1319

- errstatus=$lasterr

1320

- fi

1321

- fi

1322

+ pathcomp=

1323

+ for d

1324

+ do

1325

+ pathcomp="$pathcomp$d"

1326

+ case $pathcomp in

1327

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

1328

+ esac

1329

+

1330

+ if test ! -d "$pathcomp"; then

1331

+ echo "mkdir $pathcomp"

1332

+

1333

+ mkdir "$pathcomp" || lasterr=$?

1334

+

1335

+ if test ! -d "$pathcomp"; then

1336

+ errstatus=$lasterr

1337

+ else

1338

+ if test ! -z "$dirmode"; then

1339

+ echo "chmod $dirmode $pathcomp"

1340

+ lasterr=""

1341

+ chmod "$dirmode" "$pathcomp" || lasterr=$?

1342

+

1343

+ if test ! -z "$lasterr"; then

1344

+ errstatus=$lasterr

1345

+ fi

1346

+ fi

1347

+ fi

1348

+ fi

1349

1350

- pathcomp="$pathcomp/"

1351

- done

1352

+ pathcomp="$pathcomp/"

1353

+ done

1354

done

1355

1356

exit $errstatus

1357

1358

-# mkinstalldirs ends here

1359

+# Local Variables:

1360

+# mode: shell-script

1361

+# sh-indentation: 2

1362

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

1363

+# time-stamp-start: "scriptversion="

1364

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

1365

+# time-stamp-end: "$"

1366

+# End:

1367

Index: linux-gpib-3.2.02/language/php/Makefile.in

1368

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

1369

--- linux-gpib-3.2.02.orig/language/php/Makefile.in 2004-12-30 04:16:33.000000000 +0100

1370

+++ linux-gpib-3.2.02/language/php/Makefile.in 2005-01-17 15:56:01.913911204 +0100

1371

@@ -50,8 +50,7 @@

1372

subdir = language/php

1373

DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in

1374

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

1375

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

1376

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

1377

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

1378

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

1379

$(ACLOCAL_M4)

1380

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

1381

@@ -171,7 +170,6 @@

1382

PHP_CONFIG = @PHP_CONFIG@

1383

PYTHON = @PYTHON@

1384

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

1385

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

1386

PYTHON_PLATFORM = @PYTHON_PLATFORM@

1387

PYTHON_PREFIX = @PYTHON_PREFIX@

1388

PYTHON_VERSION = @PYTHON_VERSION@

1389

@@ -179,16 +177,6 @@

1390

SET_MAKE = @SET_MAKE@

1391

SHELL = @SHELL@

1392

STRIP = @STRIP@

1393

-TCL_BIN_DIR = @TCL_BIN_DIR@

1394

-TCL_INC_DIR = @TCL_INC_DIR@

1395

-TCL_LIB_FILE = @TCL_LIB_FILE@

1396

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

1397

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

1398

-TCL_SRC_DIR = @TCL_SRC_DIR@

1399

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

1400

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

1401

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

1402

-TCL_VERSION = @TCL_VERSION@

1403

VERSION = @VERSION@

1404

YACC = @YACC@

1405

ac_ct_AR = @ac_ct_AR@

1406

Index: linux-gpib-3.2.02/aclocal.m4

1407

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

1408

--- linux-gpib-3.2.02.orig/aclocal.m4 2004-12-30 02:51:04.000000000 +0100

1409

+++ linux-gpib-3.2.02/aclocal.m4 2005-01-17 15:55:24.485586172 +0100

1410

@@ -7184,5 +7184,3 @@

1411

AC_SUBST([am__untar])

1412

]) # _AM_PROG_TAR

1413

1414

-m4_include([m4/am-check-python-headers.m4])

1415

-m4_include([m4/tcl.m4])

1416

Index: linux-gpib-3.2.02/language/tcl/Makefile.in

1417

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

1418

--- linux-gpib-3.2.02.orig/language/tcl/Makefile.in 2004-12-30 04:16:36.000000000 +0100

1419

+++ linux-gpib-3.2.02/language/tcl/Makefile.in 2005-01-17 15:56:03.060951806 +0100

1420

@@ -50,8 +50,7 @@

1421

subdir = language/tcl

1422

DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in

1423

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

1424

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

1425

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

1426

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

1427

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

1428

$(ACLOCAL_M4)

1429

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

1430

@@ -164,7 +163,6 @@

1431

PHP_CONFIG = @PHP_CONFIG@

1432

PYTHON = @PYTHON@

1433

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

1434

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

1435

PYTHON_PLATFORM = @PYTHON_PLATFORM@

1436

PYTHON_PREFIX = @PYTHON_PREFIX@

1437

PYTHON_VERSION = @PYTHON_VERSION@

1438

@@ -172,16 +170,6 @@

1439

SET_MAKE = @SET_MAKE@

1440

SHELL = @SHELL@

1441

STRIP = @STRIP@

1442

-TCL_BIN_DIR = @TCL_BIN_DIR@

1443

-TCL_INC_DIR = @TCL_INC_DIR@

1444

-TCL_LIB_FILE = @TCL_LIB_FILE@

1445

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

1446

-TCL_LIB_SPEC = $(shell $(SHELL) -c '. $(TCL_CONFIG); eval echo $${TCL_LIB_SPEC};')

1447

-TCL_SRC_DIR = @TCL_SRC_DIR@

1448

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

1449

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

1450

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

1451

-TCL_VERSION = @TCL_VERSION@

1452

VERSION = @VERSION@

1453

YACC = @YACC@

1454

ac_ct_AR = @ac_ct_AR@

1455

@@ -235,6 +223,7 @@

1456

lib_LTLIBRARIES = libgpib_tcl.la

1457

libgpib_tcl_la_SOURCES = ibCmds.c

1458

TCL_CONFIG = $(TCL_BIN_DIR)/tclConfig.sh

1459

+TCL_LIB_SPEC = $(shell $(SHELL) -c '. $(TCL_CONFIG); eval echo $${TCL_LIB_SPEC};')

1460

1461

#fix tcl directory for version independence

1462

libgpib_tcl_la_CFLAGS = $(LIBGPIB_CFLAGS) -I$(TCL_INC_DIR)

1463

Index: linux-gpib-3.2.02/install-sh

1464

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

1465

--- linux-gpib-3.2.02.orig/install-sh 2003-07-06 00:04:59.000000000 +0200

1466

+++ linux-gpib-3.2.02/install-sh 2005-01-17 15:55:53.930628608 +0100

1467

@@ -1,19 +1,38 @@

1468

#!/bin/sh

1469

-#

1470

# install - install a program, script, or datafile

1471

-# This comes from X11R5 (mit/util/scripts/install.sh).

1472

+

1473

+scriptversion=2004-12-17.09

1474

+

1475

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

1476

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

1477

+# following copyright and license.

1478

+#

1479

1480

+#

1481

+# Permission is hereby granted, free of charge, to any person obtaining a copy

1482

+# of this software and associated documentation files (the "Software"), to

1483

+# deal in the Software without restriction, including without limitation the

1484

+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

1485

+# sell copies of the Software, and to permit persons to whom the Software is

1486

+# furnished to do so, subject to the following conditions:

1487

+#

1488

+# The above copyright notice and this permission notice shall be included in

1489

+# all copies or substantial portions of the Software.

1490

#

1491

1492

+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

1493

+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

1494

+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

1495

+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

1496

+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-

1497

+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

1498

#

1499

-# Permission to use, copy, modify, distribute, and sell this software and its

1500

-# documentation for any purpose is hereby granted without fee, provided that

1501

-# the above copyright notice appear in all copies and that both that

1502

-# copyright notice and this permission notice appear in supporting

1503

-# documentation, and that the name of M.I.T. not be used in advertising or

1504

-# publicity pertaining to distribution of the software without specific,

1505

-# written prior permission. M.I.T. makes no representations about the

1506

-# suitability of this software for any purpose. It is provided "as is"

1507

-# without express or implied warranty.

1508

+# Except as contained in this notice, the name of the X Consortium shall not

1509

+# be used in advertising or otherwise to promote the sale, use or other deal-

1510

+# ings in this Software without prior written authorization from the X Consor-

1511

+# tium.

1512

+#

1513

+#

1514

+# FSF changes to this file are in the public domain.

1515

#

1516

# Calling this script install-sh is preferred over install.sh, to prevent

1517

# `make' implicit rules from creating a file called install from it

1518

@@ -23,13 +42,11 @@

1519

# from scratch. It can only install one file at a time, a restriction

1520

# shared with many OS's install programs.

1521

1522

-

1523

# set DOITPROG to echo to test this script

1524

1525

# Don't use :- since 4.3BSD and earlier shells don't like it.

1526

doit="${DOITPROG-}"

1527

1528

-

1529

# put in absolute paths if you don't have them in your path; or use env. vars.

1530

1531

mvprog="${MVPROG-mv}"

1532

@@ -41,211 +58,266 @@

1533

rmprog="${RMPROG-rm}"

1534

mkdirprog="${MKDIRPROG-mkdir}"

1535

1536

-transformbasename=""

1537

-transform_arg=""

1538

-instcmd="$mvprog"

1539

chmodcmd="$chmodprog 0755"

1540

-chowncmd=""

1541

-chgrpcmd=""

1542

-stripcmd=""

1543

+chowncmd=

1544

+chgrpcmd=

1545

+stripcmd=

1546

rmcmd="$rmprog -f"

1547

mvcmd="$mvprog"

1548

-src=""

1549

-dst=""

1550

-dir_arg=""

1551

-

1552

-while [ x"$1" != x ]; do

1553

- case $1 in

1554

- -c) instcmd="$cpprog"

1555

- shift

1556

- continue;;

1557

-

1558

- -d) dir_arg=true

1559

- shift

1560

- continue;;

1561

-

1562

- -m) chmodcmd="$chmodprog $2"

1563

- shift

1564

- shift

1565

- continue;;

1566

-

1567

- -o) chowncmd="$chownprog $2"

1568

- shift

1569

- shift

1570

- continue;;

1571

-

1572

- -g) chgrpcmd="$chgrpprog $2"

1573

- shift

1574

- shift

1575

- continue;;

1576

-

1577

- -s) stripcmd="$stripprog"

1578

- shift

1579

- continue;;

1580

-

1581

- -t=*) transformarg=`echo $1 | sed 's/-t=//'`

1582

- shift

1583

- continue;;

1584

-

1585

- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`

1586

- shift

1587

- continue;;

1588

-

1589

- *) if [ x"$src" = x ]

1590

- then

1591

- src=$1

1592

- else

1593

- # this colon is to work around a 386BSD /bin/sh bug

1594

- :

1595

- dst=$1

1596

- fi

1597

- shift

1598

- continue;;

1599

- esac

1600

-done

1601

-

1602

-if [ x"$src" = x ]

1603

-then

1604

- echo "install: no input file specified"

1605

- exit 1

1606

-else

1607

- true

1608

-fi

1609

-

1610

-if [ x"$dir_arg" != x ]; then

1611

- dst=$src

1612

- src=""

1613

-

1614

- if [ -d $dst ]; then

1615

- instcmd=:

1616

- chmodcmd=""

1617

- else

1618

- instcmd=mkdir

1619

- fi

1620

-else

1621

-

1622

-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command

1623

-# might cause directories to be created, which would be especially bad

1624

-# if $src (and thus $dsttmp) contains '*'.

1625

-

1626

- if [ -f $src -o -d $src ]

1627

- then

1628

- true

1629

- else

1630

- echo "install: $src does not exist"

1631

- exit 1

1632

- fi

1633

-

1634

- if [ x"$dst" = x ]

1635

- then

1636

- echo "install: no destination specified"

1637

- exit 1

1638

- else

1639

- true

1640

- fi

1641

-

1642

-# If destination is a directory, append the input filename; if your system

1643

-# does not like double slashes in filenames, you may need to add some logic

1644

-

1645

- if [ -d $dst ]

1646

- then

1647

- dst="$dst"/`basename $src`

1648

- else

1649

- true

1650

- fi

1651

-fi

1652

-

1653

-## this sed command emulates the dirname command

1654

-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`

1655

-

1656

-# Make sure that the destination directory exists.

1657

-# this part is taken from Noah Friedman's mkinstalldirs script

1658

+src=

1659

+dst=

1660

+dir_arg=

1661

+dstarg=

1662

+no_target_directory=

1663

+

1664

+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE

1665

+ or: $0 [OPTION]... SRCFILES... DIRECTORY

1666

+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...

1667

+ or: $0 [OPTION]... -d DIRECTORIES...

1668

+

1669

+In the 1st form, copy SRCFILE to DSTFILE.

1670

+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.

1671

+In the 4th, create DIRECTORIES.

1672

+

1673

+Options:

1674

+-c (ignored)

1675

+-d create directories instead of installing files.

1676

+-g GROUP $chgrpprog installed files to GROUP.

1677

+-m MODE $chmodprog installed files to MODE.

1678

+-o USER $chownprog installed files to USER.

1679

+-s $stripprog installed files.

1680

+-t DIRECTORY install into DIRECTORY.

1681

+-T report an error if DSTFILE is a directory.

1682

+--help display this help and exit.

1683

+--version display version info and exit.

1684

+

1685

+Environment variables override the default commands:

1686

+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG

1687

+"

1688

+

1689

+while test -n "$1"; do

1690

+ case $1 in

1691

+ -c) shift

1692

+ continue;;

1693

+

1694

+ -d) dir_arg=true

1695

+ shift

1696

+ continue;;

1697

+

1698

+ -g) chgrpcmd="$chgrpprog $2"

1699

+ shift

1700

+ shift

1701

+ continue;;

1702

+

1703

+ --help) echo "$usage"; exit 0;;

1704

+

1705

+ -m) chmodcmd="$chmodprog $2"

1706

+ shift

1707

+ shift

1708

+ continue;;

1709

+

1710

+ -o) chowncmd="$chownprog $2"

1711

+ shift

1712

+ shift

1713

+ continue;;

1714

+

1715

+ -s) stripcmd=$stripprog

1716

+ shift

1717

+ continue;;

1718

1719

-# Skip lots of stat calls in the usual case.

1720

-if [ ! -d "$dstdir" ]; then

1721

-defaultIFS='

1722

-'

1723

-IFS="${IFS-${defaultIFS}}"

1724

-

1725

-oIFS="${IFS}"

1726

-# Some sh's can't handle IFS=/ for some reason.

1727

-IFS='%'

1728

-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`

1729

-IFS="${oIFS}"

1730

-

1731

-pathcomp=''

1732

+ -t) dstarg=$2

1733

+ shift

1734

+ shift

1735

+ continue;;

1736

1737

-while [ $# -ne 0 ] ; do

1738

- pathcomp="${pathcomp}${1}"

1739

+ -T) no_target_directory=true

1740

shift

1741

+ continue;;

1742

1743

- if [ ! -d "${pathcomp}" ] ;

1744

- then

1745

- $mkdirprog "${pathcomp}"

1746

- else

1747

- true

1748

- fi

1749

+ --version) echo "$0 $scriptversion"; exit 0;;

1750

1751

- pathcomp="${pathcomp}/"

1752

+ *) # When -d is used, all remaining arguments are directories to create.

1753

+ # When -t is used, the destination is already specified.

1754

+ test -n "$dir_arg$dstarg" && break

1755

+ # Otherwise, the last argument is the destination. Remove it from $@.

1756

+ for arg

1757

+ do

1758

+ if test -n "$dstarg"; then

1759

+ # $@ is not empty: it contains at least $arg.

1760

+ set fnord "$@" "$dstarg"

1761

+ shift # fnord

1762

+ fi

1763

+ shift # arg

1764

+ dstarg=$arg

1765

+ done

1766

+ break;;

1767

+ esac

1768

done

1769

-fi

1770

-

1771

-if [ x"$dir_arg" != x ]

1772

-then

1773

- $doit $instcmd $dst &&

1774

-

1775

- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&

1776

- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&

1777

- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&

1778

- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi

1779

-else

1780

-

1781

-# If we're going to rename the final executable, determine the name now.

1782

-

1783

- if [ x"$transformarg" = x ]

1784

- then

1785

- dstfile=`basename $dst`

1786

- else

1787

- dstfile=`basename $dst $transformbasename |

1788

- sed $transformarg`$transformbasename

1789

- fi

1790

-

1791

-# don't allow the sed command to completely eliminate the filename

1792

-

1793

- if [ x"$dstfile" = x ]

1794

- then

1795

- dstfile=`basename $dst`

1796

- else

1797

- true

1798

- fi

1799

-

1800

-# Make a temp file name in the proper directory.

1801

-

1802

- dsttmp=$dstdir/#inst.$$#

1803

-

1804

-# Move or copy the file name to the temp name

1805

1806

- $doit $instcmd $src $dsttmp &&

1807

-

1808

- trap "rm -f ${dsttmp}" 0 &&

1809

-

1810

-# and set any options; do chmod last to preserve setuid bits

1811

-

1812

-# If any of these fail, we abort the whole thing. If we want to

1813

-# ignore errors from any of these, just make sure not to ignore

1814

-# errors from the above "$doit $instcmd $src $dsttmp" command.

1815

-

1816

- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&

1817

- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&

1818

- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&

1819

- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&

1820

-

1821

-# Now rename the file to the real destination.

1822

-

1823

- $doit $rmcmd -f $dstdir/$dstfile &&

1824

- $doit $mvcmd $dsttmp $dstdir/$dstfile

1825

+if test -z "$1"; then

1826

+ if test -z "$dir_arg"; then

1827

+ echo "$0: no input file specified." >&2

1828

+ exit 1

1829

+ fi

1830

+ # It's OK to call `install-sh -d' without argument.

1831

+ # This can happen when creating conditional directories.

1832

+ exit 0

1833

+fi

1834

1835

-fi &&

1836

+for src

1837

+do

1838

+ # Protect names starting with `-'.

1839

+ case $src in

1840

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

1841

+ esac

1842

+

1843

+ if test -n "$dir_arg"; then

1844

+ dst=$src

1845

+ src=

1846

+

1847

+ if test -d "$dst"; then

1848

+ mkdircmd=:

1849

+ chmodcmd=

1850

+ else

1851

+ mkdircmd=$mkdirprog

1852

+ fi

1853

+ else

1854

+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command

1855

+ # might cause directories to be created, which would be especially bad

1856

+ # if $src (and thus $dsttmp) contains '*'.

1857

+ if test ! -f "$src" && test ! -d "$src"; then

1858

+ echo "$0: $src does not exist." >&2

1859

+ exit 1

1860

+ fi

1861

+

1862

+ if test -z "$dstarg"; then

1863

+ echo "$0: no destination specified." >&2

1864

+ exit 1

1865

+ fi

1866

+

1867

+ dst=$dstarg

1868

+ # Protect names starting with `-'.

1869

+ case $dst in

1870

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

1871

+ esac

1872

1873

+ # If destination is a directory, append the input filename; won't work

1874

+ # if double slashes aren't ignored.

1875

+ if test -d "$dst"; then

1876

+ if test -n "$no_target_directory"; then

1877

+ echo "$0: $dstarg: Is a directory" >&2

1878

+ exit 1

1879

+ fi

1880

+ dst=$dst/`basename "$src"`

1881

+ fi

1882

+ fi

1883

+

1884

+ # This sed command emulates the dirname command.

1885

+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`

1886

+

1887

+ # Make sure that the destination directory exists.

1888

+

1889

+ # Skip lots of stat calls in the usual case.

1890

+ if test ! -d "$dstdir"; then

1891

+ defaultIFS='

1892

+ '

1893

+ IFS="${IFS-$defaultIFS}"

1894

+

1895

+ oIFS=$IFS

1896

+ # Some sh's can't handle IFS=/ for some reason.

1897

+ IFS='%'

1898

+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`

1899

+ shift

1900

+ IFS=$oIFS

1901

+

1902

+ pathcomp=

1903

+

1904

+ while test $# -ne 0 ; do

1905

+ pathcomp=$pathcomp$1

1906

+ shift

1907

+ if test ! -d "$pathcomp"; then

1908

+ $mkdirprog "$pathcomp"

1909

+ # mkdir can fail with a `File exist' error in case several

1910

+ # install-sh are creating the directory concurrently. This

1911

+ # is OK.

1912

+ test -d "$pathcomp" || exit

1913

+ fi

1914

+ pathcomp=$pathcomp/

1915

+ done

1916

+ fi

1917

+

1918

+ if test -n "$dir_arg"; then

1919

+ $doit $mkdircmd "$dst" \

1920

+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \

1921

+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \

1922

+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \

1923

+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }

1924

+

1925

+ else

1926

+ dstfile=`basename "$dst"`

1927

+

1928

+ # Make a couple of temp file names in the proper directory.

1929

+ dsttmp=$dstdir/_inst.$$_

1930

+ rmtmp=$dstdir/_rm.$$_

1931

+

1932

+ # Trap to clean up those temp files at exit.

1933

+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0

1934

+ trap '(exit $?); exit' 1 2 13 15

1935

+

1936

+ # Copy the file name to the temp name.

1937

+ $doit $cpprog "$src" "$dsttmp" &&

1938

+

1939

+ # and set any options; do chmod last to preserve setuid bits.

1940

+ #

1941

+ # If any of these fail, we abort the whole thing. If we want to

1942

+ # ignore errors from any of these, just make sure not to ignore

1943

+ # errors from the above "$doit $cpprog $src $dsttmp" command.

1944

+ #

1945

+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \

1946

+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \

1947

+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \

1948

+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&

1949

+

1950

+ # Now rename the file to the real destination.

1951

+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \

1952

+ || {

1953

+ # The rename failed, perhaps because mv can't rename something else

1954

+ # to itself, or perhaps because mv is so ancient that it does not

1955

+ # support -f.

1956

+

1957

+ # Now remove or move aside any old file at destination location.

1958

+ # We try this two ways since rm can't unlink itself on some

1959

+ # systems and the destination file might be busy for other

1960

+ # reasons. In this case, the final cleanup might fail but the new

1961

+ # file should still install successfully.

1962

+ {

1963

+ if test -f "$dstdir/$dstfile"; then

1964

+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \

1965

+ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \

1966

+ || {

1967

+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2

1968

+ (exit 1); exit 1

1969

+ }

1970

+ else

1971

+ :

1972

+ fi

1973

+ } &&

1974

+

1975

+ # Now rename the file to the real destination.

1976

+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"

1977

+ }

1978

+ }

1979

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

1980

+done

1981

1982

-exit 0

1983

+# The final little trick to "correctly" pass the exit status to the exit trap.

1984

+{

1985

+ (exit 0); exit 0

1986

+}

1987

+

1988

+# Local variables:

1989

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

1990

+# time-stamp-start: "scriptversion="

1991

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

1992

+# time-stamp-end: "$"

1993

+# End:

1994

Index: linux-gpib-3.2.02/usb/Makefile.in

1995

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

1996

--- linux-gpib-3.2.02.orig/usb/Makefile.in 2004-12-30 04:16:44.000000000 +0100

1997

+++ linux-gpib-3.2.02/usb/Makefile.in 2005-01-17 15:56:08.591147557 +0100

1998

@@ -47,8 +47,7 @@

1999

subdir = usb

2000

DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

2001

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

2002

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

2003

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

2004

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

2005

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

2006

$(ACLOCAL_M4)

2007

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

2008

@@ -145,7 +144,6 @@

2009

PHP_CONFIG = @PHP_CONFIG@

2010

PYTHON = @PYTHON@

2011

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

2012

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

2013

PYTHON_PLATFORM = @PYTHON_PLATFORM@

2014

PYTHON_PREFIX = @PYTHON_PREFIX@

2015

PYTHON_VERSION = @PYTHON_VERSION@

2016

@@ -153,16 +151,6 @@

2017

SET_MAKE = @SET_MAKE@

2018

SHELL = @SHELL@

2019

STRIP = @STRIP@

2020

-TCL_BIN_DIR = @TCL_BIN_DIR@

2021

-TCL_INC_DIR = @TCL_INC_DIR@

2022

-TCL_LIB_FILE = @TCL_LIB_FILE@

2023

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

2024

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

2025

-TCL_SRC_DIR = @TCL_SRC_DIR@

2026

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

2027

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

2028

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

2029

-TCL_VERSION = @TCL_VERSION@

2030

VERSION = @VERSION@

2031

YACC = @YACC@

2032

ac_ct_AR = @ac_ct_AR@

2033

Index: linux-gpib-3.2.02/lib/Makefile.in

2034

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

2035

--- linux-gpib-3.2.02.orig/lib/Makefile.in 2004-12-30 04:16:40.000000000 +0100

2036

+++ linux-gpib-3.2.02/lib/Makefile.in 2005-01-17 15:56:05.737046532 +0100

2037

@@ -52,8 +52,7 @@

2038

DIST_COMMON = $(headers_HEADERS) $(noinst_HEADERS) \

2039

$(srcdir)/Makefile.am $(srcdir)/Makefile.in

2040

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

2041

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

2042

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

2043

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

2044

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

2045

$(ACLOCAL_M4)

2046

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

2047

@@ -189,7 +188,6 @@

2048

PHP_CONFIG = @PHP_CONFIG@

2049

PYTHON = @PYTHON@

2050

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

2051

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

2052

PYTHON_PLATFORM = @PYTHON_PLATFORM@

2053

PYTHON_PREFIX = @PYTHON_PREFIX@

2054

PYTHON_VERSION = @PYTHON_VERSION@

2055

@@ -197,16 +195,6 @@

2056

SET_MAKE = @SET_MAKE@

2057

SHELL = @SHELL@

2058

STRIP = @STRIP@

2059

-TCL_BIN_DIR = @TCL_BIN_DIR@

2060

-TCL_INC_DIR = @TCL_INC_DIR@

2061

-TCL_LIB_FILE = @TCL_LIB_FILE@

2062

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

2063

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

2064

-TCL_SRC_DIR = @TCL_SRC_DIR@

2065

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

2066

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

2067

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

2068

-TCL_VERSION = @TCL_VERSION@

2069

VERSION = @VERSION@

2070

YACC = @YACC@

2071

ac_ct_AR = @ac_ct_AR@

2072

Index: linux-gpib-3.2.02/usb/ni_usb_gpib/Makefile.in

2073

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

2074

--- linux-gpib-3.2.02.orig/usb/ni_usb_gpib/Makefile.in 2004-12-30 04:16:46.000000000 +0100

2075

+++ linux-gpib-3.2.02/usb/ni_usb_gpib/Makefile.in 2005-01-17 15:56:09.576182423 +0100

2076

@@ -47,8 +47,7 @@

2077

subdir = usb/ni_usb_gpib

2078

DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

2079

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

2080

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

2081

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

2082

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

2083

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

2084

$(ACLOCAL_M4)

2085

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

2086

@@ -136,7 +135,6 @@

2087

PHP_CONFIG = @PHP_CONFIG@

2088

PYTHON = @PYTHON@

2089

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

2090

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

2091

PYTHON_PLATFORM = @PYTHON_PLATFORM@

2092

PYTHON_PREFIX = @PYTHON_PREFIX@

2093

PYTHON_VERSION = @PYTHON_VERSION@

2094

@@ -144,16 +142,6 @@

2095

SET_MAKE = @SET_MAKE@

2096

SHELL = @SHELL@

2097

STRIP = @STRIP@

2098

-TCL_BIN_DIR = @TCL_BIN_DIR@

2099

-TCL_INC_DIR = @TCL_INC_DIR@

2100

-TCL_LIB_FILE = @TCL_LIB_FILE@

2101

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

2102

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

2103

-TCL_SRC_DIR = @TCL_SRC_DIR@

2104

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

2105

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

2106

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

2107

-TCL_VERSION = @TCL_VERSION@

2108

VERSION = @VERSION@

2109

YACC = @YACC@

2110

ac_ct_AR = @ac_ct_AR@

2111

@@ -328,7 +316,7 @@

2112

2113

info-am:

2114

2115

-install-data-am: install-data-local

2116

+install-data-am:

2117

2118

install-exec-am:

2119

2120

@@ -359,15 +347,15 @@

2121

.PHONY: all all-am check check-am clean clean-generic clean-libtool \

2122

distclean distclean-generic distclean-libtool distdir dvi \

2123

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

2124

- install-data install-data-am install-data-local install-exec \

2125

- install-exec-am install-info install-info-am install-man \

2126

- install-strip installcheck installcheck-am installdirs \

2127

- maintainer-clean maintainer-clean-generic mostlyclean \

2128

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

2129

- uninstall uninstall-am uninstall-info-am

2130

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

2131

+ install-info install-info-am install-man install-strip \

2132

+ installcheck installcheck-am installdirs maintainer-clean \

2133

+ maintainer-clean-generic mostlyclean mostlyclean-generic \

2134

+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \

2135

+ uninstall-info-am

2136

2137

2138

-install-data-local:

2139

+usb-install-data-local:

2140

test -e $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib || $(INSTALL_SCRIPT) -D ni_usb_gpib $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib

2141

test -e $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap || $(INSTALL_DATA) -D ni_usb_gpib.usermap $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap

2142

$(INSTALL) -d $(USB_FIRMWARE_DIR)/ni_usb_gpib

2143

Index: linux-gpib-3.2.02/usb/agilent_82357a/Makefile.in

2144

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

2145

--- linux-gpib-3.2.02.orig/usb/agilent_82357a/Makefile.in 2004-12-30 04:16:45.000000000 +0100

2146

+++ linux-gpib-3.2.02/usb/agilent_82357a/Makefile.in 2005-01-17 15:56:08.886157999 +0100

2147

@@ -47,8 +47,7 @@

2148

subdir = usb/agilent_82357a

2149

DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

2150

ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

2151

-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \

2152

- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac

2153

+am__aclocal_m4_deps = $(top_srcdir)/configure.ac

2154

am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

2155

$(ACLOCAL_M4)

2156

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

2157

@@ -136,7 +135,6 @@

2158

PHP_CONFIG = @PHP_CONFIG@

2159

PYTHON = @PYTHON@

2160

PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@

2161

-PYTHON_INCLUDES = @PYTHON_INCLUDES@

2162

PYTHON_PLATFORM = @PYTHON_PLATFORM@

2163

PYTHON_PREFIX = @PYTHON_PREFIX@

2164

PYTHON_VERSION = @PYTHON_VERSION@

2165

@@ -144,16 +142,6 @@

2166

SET_MAKE = @SET_MAKE@

2167

SHELL = @SHELL@

2168

STRIP = @STRIP@

2169

-TCL_BIN_DIR = @TCL_BIN_DIR@

2170

-TCL_INC_DIR = @TCL_INC_DIR@

2171

-TCL_LIB_FILE = @TCL_LIB_FILE@

2172

-TCL_LIB_FLAG = @TCL_LIB_FLAG@

2173

-TCL_LIB_SPEC = @TCL_LIB_SPEC@

2174

-TCL_SRC_DIR = @TCL_SRC_DIR@

2175

-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@

2176

-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@

2177

-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@

2178

-TCL_VERSION = @TCL_VERSION@

2179

VERSION = @VERSION@

2180

YACC = @YACC@

2181

ac_ct_AR = @ac_ct_AR@

2182

@@ -328,7 +316,7 @@

2183

2184

info-am:

2185

2186

-install-data-am: install-data-local

2187

+install-data-am:

2188

2189

install-exec-am:

2190

2191

@@ -359,15 +347,15 @@

2192

.PHONY: all all-am check check-am clean clean-generic clean-libtool \

2193

distclean distclean-generic distclean-libtool distdir dvi \

2194

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

2195

- install-data install-data-am install-data-local install-exec \

2196

- install-exec-am install-info install-info-am install-man \

2197

- install-strip installcheck installcheck-am installdirs \

2198

- maintainer-clean maintainer-clean-generic mostlyclean \

2199

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

2200

- uninstall uninstall-am uninstall-info-am

2201

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

2202

+ install-info install-info-am install-man install-strip \

2203

+ installcheck installcheck-am installdirs maintainer-clean \

2204

+ maintainer-clean-generic mostlyclean mostlyclean-generic \

2205

+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \

2206

+ uninstall-info-am

2207

2208

2209

-install-data-local:

2210

+usb-install-data-local:

2211

test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a || $(INSTALL_SCRIPT) -D agilent_82357a $(HOTPLUG_USB_CONF_DIR)/agilent_82357a

2212

test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap || $(INSTALL_DATA) -D agilent_82357a.usermap $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap

2213

$(INSTALL) -d $(USB_FIRMWARE_DIR)/agilent_82357a